From 12db3b91208415364cc1649844e77143a1221a1f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 12:24:39 +0000
Subject: [PATCH 0001/1302] Check if metric is nil before calling SetAggregate

fixes #2146
---
 CHANGELOG.md                          | 3 ++-
 internal/models/running_aggregator.go | 4 +++-
 plugins/inputs/logparser/README.md    | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d3ef5f5..6f5ca5d3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,8 @@
 
 - [#2049](https://github.com/influxdata/telegraf/pull/2049): Fix the Value data format not trimming null characters from input.
 - [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
-- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus
+- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
+- [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/internal/models/running_aggregator.go b/internal/models/running_aggregator.go
index 2e22f1569..8189a6667 100644
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -70,7 +70,9 @@ func (r *RunningAggregator) MakeMetric(
 		t,
 	)
 
-	m.SetAggregate(true)
+	if m != nil {
+		m.SetAggregate(true)
+	}
 
 	return m
 }
diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 1affcd811..5973d9f42 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -40,8 +40,11 @@ regex patterns.
 ## Grok Parser
 
 The grok parser uses a slightly modified version of logstash "grok" patterns,
-with the format `%{<capture_syntax>[:<semantic_name>][:<modifier>]}`
+with the format
 
+```
+%{<capture_syntax>[:<semantic_name>][:<modifier>]}
+```
 
 Telegraf has many of it's own
 [built-in patterns](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/logparser/grok/patterns/influx-patterns),
@@ -92,4 +95,3 @@ Timestamp modifiers can be used to convert captures to the timestamp of the
 CUSTOM time layouts must be within quotes and be the representation of the
 "reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`
 See https://golang.org/pkg/time/#Parse for more details.
-

From fc9f921b629bc582cda6c71dbc34b07bc5bd1e3f Mon Sep 17 00:00:00 2001
From: Rikaard Hosein <rikaard.hosein@gmail.com>
Date: Mon, 3 Oct 2016 20:24:18 -0400
Subject: [PATCH 0002/1302] Can turn pid into tag instead of field

closes #1843
fixes  #1668
---
 CHANGELOG.md                              | 1 +
 plugins/inputs/procstat/procstat.go       | 6 ++++++
 plugins/inputs/procstat/spec_processor.go | 7 ++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f5ca5d3b..1de19eca0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
 - [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
+- [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index e29b5031c..929490e4a 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -21,6 +21,7 @@ type Procstat struct {
 	Prefix      string
 	ProcessName string
 	User        string
+	PidTag      bool
 
 	// pidmap maps a pid to a process object, so we don't recreate every gather
 	pidmap map[int32]*process.Process
@@ -53,6 +54,8 @@ var sampleConfig = `
   prefix = ""
   ## comment this out if you want raw cpu_time stats
   fielddrop = ["cpu_time_*"]
+  ## This is optional; moves pid into a tag instead of a field
+  pid_tag = false
 `
 
 func (_ *Procstat) SampleConfig() string {
@@ -70,6 +73,9 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
 	} else {
 		for pid, proc := range p.pidmap {
+			if p.PidTag {
+				p.tagmap[pid]["pid"] = fmt.Sprint(pid)
+			}
 			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, proc, p.tagmap[pid])
 			p.pushMetrics()
 		}
diff --git a/plugins/inputs/procstat/spec_processor.go b/plugins/inputs/procstat/spec_processor.go
index 5143d8bcc..3b56fbc3e 100644
--- a/plugins/inputs/procstat/spec_processor.go
+++ b/plugins/inputs/procstat/spec_processor.go
@@ -48,7 +48,12 @@ func (p *SpecProcessor) pushMetrics() {
 	if p.Prefix != "" {
 		prefix = p.Prefix + "_"
 	}
-	fields := map[string]interface{}{"pid": p.pid}
+	fields := map[string]interface{}{}
+
+	//If pid is not present as a tag, include it as a field.
+	if _, pidInTags := p.tags["pid"]; !pidInTags {
+		fields["pid"] = p.pid
+	}
 
 	numThreads, err := p.proc.NumThreads()
 	if err == nil {

From 6e241611beffee9e4bed152f8eb505b2ce48c38f Mon Sep 17 00:00:00 2001
From: Leon Barrett <leon@barrettnexus.com>
Date: Tue, 13 Dec 2016 06:13:53 -0800
Subject: [PATCH 0003/1302] Fix bug: too many cloudwatch metrics (#1885)

* Fix bug: too many cloudwatch metrics

Cloudwatch metrics were being added incorrectly. The most obvious
symptom of this was that too many metrics were being added. A simple
check against the name of the metric proved to be a sufficient fix. In
order to test the fix, a metric selection function was factored out.

* Go fmt cloudwatch

* Cloudwatch isSelected checks metric name

* Move cloudwatch line in changelog to 1.2 features
---
 CHANGELOG.md                                 |  1 +
 plugins/inputs/cloudwatch/cloudwatch.go      | 29 ++++--
 plugins/inputs/cloudwatch/cloudwatch_test.go | 96 +++++++++++++++++++-
 3 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1de19eca0..a7b4cf048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#2127](https://github.com/influxdata/telegraf/pull/2127): Update Go version to 1.7.4.
 - [#2126](https://github.com/influxdata/telegraf/pull/2126): Support a metric.Split function.
 - [#2026](https://github.com/influxdata/telegraf/pull/2065): elasticsearch "shield" (basic auth) support doc.
+- [#1885](https://github.com/influxdata/telegraf/pull/1885): Fix over-querying of cloudwatch metrics
 
 ### Bugfixes
 
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index bc8de313e..a812c1265 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -126,11 +126,7 @@ func (c *CloudWatch) Description() string {
 	return "Pull Metric Statistics from Amazon CloudWatch"
 }
 
-func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
-	if c.client == nil {
-		c.initializeCloudWatch()
-	}
-
+func SelectMetrics(c *CloudWatch) ([]*cloudwatch.Metric, error) {
 	var metrics []*cloudwatch.Metric
 
 	// check for provided metric filter
@@ -155,11 +151,11 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 			} else {
 				allMetrics, err := c.fetchNamespaceMetrics()
 				if err != nil {
-					return err
+					return nil, err
 				}
 				for _, name := range m.MetricNames {
 					for _, metric := range allMetrics {
-						if isSelected(metric, m.Dimensions) {
+						if isSelected(name, metric, m.Dimensions) {
 							metrics = append(metrics, &cloudwatch.Metric{
 								Namespace:  aws.String(c.Namespace),
 								MetricName: aws.String(name),
@@ -169,16 +165,26 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 					}
 				}
 			}
-
 		}
 	} else {
 		var err error
 		metrics, err = c.fetchNamespaceMetrics()
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
+	return metrics, nil
+}
 
+func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
+	if c.client == nil {
+		c.initializeCloudWatch()
+	}
+
+	metrics, err := SelectMetrics(c)
+	if err != nil {
+		return err
+	}
 	metricCount := len(metrics)
 	errChan := errchan.New(metricCount)
 
@@ -380,7 +386,10 @@ func hasWilcard(dimensions []*Dimension) bool {
 	return false
 }
 
-func isSelected(metric *cloudwatch.Metric, dimensions []*Dimension) bool {
+func isSelected(name string, metric *cloudwatch.Metric, dimensions []*Dimension) bool {
+	if name != *metric.MetricName {
+		return false
+	}
 	if len(metric.Dimensions) != len(dimensions) {
 		return false
 	}
diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go
index 73fca9253..a1bd7464b 100644
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type mockCloudWatchClient struct{}
+type mockGatherCloudWatchClient struct{}
 
-func (m *mockCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
+func (m *mockGatherCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
 	metric := &cloudwatch.Metric{
 		Namespace:  params.Namespace,
 		MetricName: aws.String("Latency"),
@@ -31,7 +31,7 @@ func (m *mockCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput)
 	return result, nil
 }
 
-func (m *mockCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
+func (m *mockGatherCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
 	dataPoint := &cloudwatch.Datapoint{
 		Timestamp:   params.EndTime,
 		Minimum:     aws.Float64(0.1),
@@ -62,7 +62,7 @@ func TestGather(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	c.client = &mockCloudWatchClient{}
+	c.client = &mockGatherCloudWatchClient{}
 
 	c.Gather(&acc)
 
@@ -83,6 +83,94 @@ func TestGather(t *testing.T) {
 
 }
 
+type mockSelectMetricsCloudWatchClient struct{}
+
+func (m *mockSelectMetricsCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
+	metrics := []*cloudwatch.Metric{}
+	// 4 metrics are available
+	metricNames := []string{"Latency", "RequestCount", "HealthyHostCount", "UnHealthyHostCount"}
+	// for 3 ELBs
+	loadBalancers := []string{"lb-1", "lb-2", "lb-3"}
+	// in 2 AZs
+	availabilityZones := []string{"us-east-1a", "us-east-1b"}
+	for _, m := range metricNames {
+		for _, lb := range loadBalancers {
+			// For each metric/ELB pair, we get an aggregate value across all AZs.
+			metrics = append(metrics, &cloudwatch.Metric{
+				Namespace:  aws.String("AWS/ELB"),
+				MetricName: aws.String(m),
+				Dimensions: []*cloudwatch.Dimension{
+					&cloudwatch.Dimension{
+						Name:  aws.String("LoadBalancerName"),
+						Value: aws.String(lb),
+					},
+				},
+			})
+			for _, az := range availabilityZones {
+				// We get a metric for each metric/ELB/AZ triplet.
+				metrics = append(metrics, &cloudwatch.Metric{
+					Namespace:  aws.String("AWS/ELB"),
+					MetricName: aws.String(m),
+					Dimensions: []*cloudwatch.Dimension{
+						&cloudwatch.Dimension{
+							Name:  aws.String("LoadBalancerName"),
+							Value: aws.String(lb),
+						},
+						&cloudwatch.Dimension{
+							Name:  aws.String("AvailabilityZone"),
+							Value: aws.String(az),
+						},
+					},
+				})
+			}
+		}
+	}
+
+	result := &cloudwatch.ListMetricsOutput{
+		Metrics: metrics,
+	}
+	return result, nil
+}
+
+func (m *mockSelectMetricsCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
+	return nil, nil
+}
+
+func TestSelectMetrics(t *testing.T) {
+	duration, _ := time.ParseDuration("1m")
+	internalDuration := internal.Duration{
+		Duration: duration,
+	}
+	c := &CloudWatch{
+		Region:    "us-east-1",
+		Namespace: "AWS/ELB",
+		Delay:     internalDuration,
+		Period:    internalDuration,
+		RateLimit: 10,
+		Metrics: []*Metric{
+			&Metric{
+				MetricNames: []string{"Latency", "RequestCount"},
+				Dimensions: []*Dimension{
+					&Dimension{
+						Name:  "LoadBalancerName",
+						Value: "*",
+					},
+					&Dimension{
+						Name:  "AvailabilityZone",
+						Value: "*",
+					},
+				},
+			},
+		},
+	}
+	c.client = &mockSelectMetricsCloudWatchClient{}
+	metrics, err := SelectMetrics(c)
+	// We've asked for 2 (out of 4) metrics, over all 3 load balancers in all 2
+	// AZs. We should get 12 metrics.
+	assert.Equal(t, 12, len(metrics))
+	assert.Nil(t, err)
+}
+
 func TestGenerateStatisticsInputParams(t *testing.T) {
 	d := &cloudwatch.Dimension{
 		Name:  aws.String("LoadBalancerName"),

From 755808187398792533eebd394b99756bb878ee2d Mon Sep 17 00:00:00 2001
From: Anthony Arnaud <github@anthony-arnaud.fr>
Date: Tue, 13 Dec 2016 09:15:51 -0500
Subject: [PATCH 0004/1302] Output openTSDB HTTPS with basic auth (#1913)

---
 plugins/outputs/opentsdb/opentsdb.go      | 4 +++-
 plugins/outputs/opentsdb/opentsdb_http.go | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 232edc0b7..ce797e10f 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -90,7 +90,7 @@ func (o *OpenTSDB) Write(metrics []telegraf.Metric) error {
 
 	if u.Scheme == "" || u.Scheme == "tcp" {
 		return o.WriteTelnet(metrics, u)
-	} else if u.Scheme == "http" {
+	} else if u.Scheme == "http" || u.Scheme == "https" {
 		return o.WriteHttp(metrics, u)
 	} else {
 		return fmt.Errorf("Unknown scheme in host parameter.")
@@ -101,6 +101,8 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 	http := openTSDBHttp{
 		Host:      u.Host,
 		Port:      o.Port,
+		Scheme:    u.Scheme,
+		User:      u.User,
 		BatchSize: o.HttpBatchSize,
 		Debug:     o.Debug,
 	}
diff --git a/plugins/outputs/opentsdb/opentsdb_http.go b/plugins/outputs/opentsdb/opentsdb_http.go
index e0a7a66ef..912ca670a 100644
--- a/plugins/outputs/opentsdb/opentsdb_http.go
+++ b/plugins/outputs/opentsdb/opentsdb_http.go
@@ -23,6 +23,8 @@ type HttpMetric struct {
 type openTSDBHttp struct {
 	Host      string
 	Port      int
+	Scheme    string
+	User      *url.Userinfo
 	BatchSize int
 	Debug     bool
 
@@ -118,7 +120,8 @@ func (o *openTSDBHttp) flush() error {
 	o.body.close()
 
 	u := url.URL{
-		Scheme: "http",
+		Scheme: o.Scheme,
+		User:   o.User,
 		Host:   fmt.Sprintf("%s:%d", o.Host, o.Port),
 		Path:   "/api/put",
 	}

From dede3e70add8a4f2249ddb8e1779a383165bcf3b Mon Sep 17 00:00:00 2001
From: Kishore Nallan <kishore.nc@gmail.com>
Date: Tue, 13 Dec 2016 19:47:20 +0530
Subject: [PATCH 0005/1302] Rabbitmq plugin: connection-related metrics.
 (#1908)

* Rabbitmq plugin: connection-related metrics.

* Run go fmt.
---
 plugins/inputs/rabbitmq/rabbitmq.go      | 69 ++++++++++++++++++++++--
 plugins/inputs/rabbitmq/rabbitmq_test.go | 64 ++++++++++++++++++++++
 2 files changed, 130 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 5519ee14a..d1c973dea 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -50,8 +50,9 @@ type RabbitMQ struct {
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
 
 	// InsecureSkipVerify bool
-	Nodes  []string
-	Queues []string
+	Nodes       []string
+	Queues      []string
+	Connections []string
 
 	Client *http.Client
 }
@@ -135,10 +136,22 @@ type Node struct {
 	SocketsUsed   int64 `json:"sockets_used"`
 }
 
+// Connection ...
+type Connection struct {
+	Name         string
+	State        string
+	Vhost        string
+	Host         string
+	Node         string
+	ReceiveCount int64 `json:"recv_cnt"`
+	SendCount    int64 `json:"send_cnt"`
+	SendPend     int64 `json:"send_pend"`
+}
+
 // gatherFunc ...
 type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error)
 
-var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
+var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues, gatherConnections}
 
 var sampleConfig = `
   # url = "http://localhost:15672"
@@ -380,6 +393,42 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
 	errChan <- nil
 }
 
+func gatherConnections(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
+	// Gather information about connections
+	connections := make([]Connection, 0)
+	err := r.requestJSON("/api/connections", &connections)
+	if err != nil {
+		errChan <- err
+		return
+	}
+
+	for _, connection := range connections {
+		if !r.shouldGatherConnection(connection) {
+			continue
+		}
+		tags := map[string]string{
+			"url":        r.URL,
+			"connection": connection.Name,
+			"vhost":      connection.Vhost,
+			"host":       connection.Host,
+			"node":       connection.Node,
+		}
+
+		acc.AddFields(
+			"rabbitmq_connection",
+			map[string]interface{}{
+				"recv_cnt":  connection.ReceiveCount,
+				"send_cnt":  connection.SendCount,
+				"send_pend": connection.SendPend,
+				"state":     connection.State,
+			},
+			tags,
+		)
+	}
+
+	errChan <- nil
+}
+
 func (r *RabbitMQ) shouldGatherNode(node Node) bool {
 	if len(r.Nodes) == 0 {
 		return true
@@ -408,6 +457,20 @@ func (r *RabbitMQ) shouldGatherQueue(queue Queue) bool {
 	return false
 }
 
+func (r *RabbitMQ) shouldGatherConnection(connection Connection) bool {
+	if len(r.Connections) == 0 {
+		return true
+	}
+
+	for _, name := range r.Connections {
+		if name == connection.Name {
+			return true
+		}
+	}
+
+	return false
+}
+
 func init() {
 	inputs.Add("rabbitmq", func() telegraf.Input {
 		return &RabbitMQ{
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index 4bdc980db..bbb3dd450 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -374,6 +374,57 @@ const sampleQueuesResponse = `
 ]
 `
 
+const sampleConnectionsResponse = `
+[
+  {
+    "recv_oct": 166055,
+    "recv_oct_details": {
+      "rate": 0
+    },
+    "send_oct": 589,
+    "send_oct_details": {
+      "rate": 0
+    },
+    "recv_cnt": 124,
+    "send_cnt": 7,
+    "send_pend": 0,
+    "state": "running",
+    "channels": 1,
+    "type": "network",
+    "node": "rabbit@ip-10-0-12-133",
+    "name": "10.0.10.8:32774 -> 10.0.12.131:5672",
+    "port": 5672,
+    "peer_port": 32774,
+    "host": "10.0.12.131",
+    "peer_host": "10.0.10.8",
+    "ssl": false,
+    "peer_cert_subject": null,
+    "peer_cert_issuer": null,
+    "peer_cert_validity": null,
+    "auth_mechanism": "AMQPLAIN",
+    "ssl_protocol": null,
+    "ssl_key_exchange": null,
+    "ssl_cipher": null,
+    "ssl_hash": null,
+    "protocol": "AMQP 0-9-1",
+    "user": "workers",
+    "vhost": "main",
+    "timeout": 0,
+    "frame_max": 131072,
+    "channel_max": 65535,
+    "client_properties": {
+      "product": "py-amqp",
+      "product_version": "1.4.7",
+      "capabilities": {
+        "connection.blocked": true,
+        "consumer_cancel_notify": true
+      }
+    },
+    "connected_at": 1476647837266
+  }
+]
+`
+
 func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var rsp string
@@ -385,6 +436,8 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 			rsp = sampleNodesResponse
 		case "/api/queues":
 			rsp = sampleQueuesResponse
+		case "/api/connections":
+			rsp = sampleConnectionsResponse
 		default:
 			panic("Cannot handle request")
 		}
@@ -441,4 +494,15 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	}
 
 	assert.True(t, acc.HasMeasurement("rabbitmq_queue"))
+
+	assert.True(t, acc.HasMeasurement("rabbitmq_connection"))
+
+	connection_fields := map[string]interface{}{
+		"recv_cnt":  int64(124),
+		"send_cnt":  int64(7),
+		"send_pend": int64(0),
+		"state":     "running",
+	}
+
+	acc.AssertContainsFields(t, "rabbitmq_connection", connection_fields)
 }

From 8e3fbaa9dd74600873ecb7e1956de402df4061c1 Mon Sep 17 00:00:00 2001
From: krise3k <krise3k@gmail.com>
Date: Tue, 13 Dec 2016 15:23:18 +0100
Subject: [PATCH 0006/1302] Add missing slim (#1937)

---
 plugins/inputs/haproxy/haproxy.go      | 5 +++++
 plugins/inputs/haproxy/haproxy_test.go | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index 6b42a0705..c764a5530 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -263,6 +263,11 @@ func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 				if err == nil {
 					fields["smax"] = ival
 				}
+			case HF_SLIM:
+				ival, err := strconv.ParseUint(v, 10, 64)
+				if err == nil {
+					fields["slim"] = ival
+				}
 			case HF_STOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
diff --git a/plugins/inputs/haproxy/haproxy_test.go b/plugins/inputs/haproxy/haproxy_test.go
index ae71ad76c..12be2ed88 100644
--- a/plugins/inputs/haproxy/haproxy_test.go
+++ b/plugins/inputs/haproxy/haproxy_test.go
@@ -198,6 +198,7 @@ func HaproxyGetFieldValues() map[string]interface{} {
 		"rtime":             uint64(312),
 		"scur":              uint64(1),
 		"smax":              uint64(32),
+		"slim":              uint64(32),
 		"srv_abort":         uint64(1),
 		"stot":              uint64(171014),
 		"ttime":             uint64(2341),
@@ -223,6 +224,6 @@ be_static,host1,0,0,0,1,,28,7873,1209688,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,
 be_static,host2,0,0,0,1,,28,13830,1085929,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,9,,28,,2,0,,1,L4OK,,0,0,19,6,3,0,0,0,,,,0,0,,,,,338,,,0,1,1,38,
 be_static,host3,0,0,0,1,,28,17959,1259760,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,10,,28,,2,0,,1,L4OK,,1,0,20,6,2,0,0,0,,,,0,0,,,,,92,,,0,1,1,17,
 be_static,BACKEND,0,0,0,2,200,307,160276,13322728,0,0,,0,0,0,0,UP,11,11,0,,0,70698,0,,2,18,0,,307,,1,0,,4,,,,0,205,73,29,0,0,,,,,0,0,0,0,0,0,92,,,0,1,3,381,
-be_app,host0,0,0,1,32,,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
-be_app,host4,0,0,2,29,,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
+be_app,host0,0,0,1,32,32,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
+be_app,host4,0,0,2,29,32,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
 `

From 17fa6f9b17cfa039ab4b0c1d21b075590ca6eb79 Mon Sep 17 00:00:00 2001
From: Da1den <dennfr@hotmail.de>
Date: Tue, 13 Dec 2016 15:24:41 +0100
Subject: [PATCH 0007/1302] Fixed bug that you cannot gather data on non
 english systems (#1944)

---
 plugins/inputs/win_perf_counters/win_perf_counters.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 60b9ff55d..1f233a3d4 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -116,11 +116,7 @@ func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName s
 	var handle win.PDH_HQUERY
 	var counterHandle win.PDH_HCOUNTER
 	ret := win.PdhOpenQuery(0, 0, &handle)
-	if m.PreVistaSupport {
-		ret = win.PdhAddCounter(handle, query, 0, &counterHandle)
-	} else {
-		ret = win.PdhAddEnglishCounter(handle, query, 0, &counterHandle)
-	}
+	ret = win.PdhAddCounter(handle, query, 0, &counterHandle)
 	_ = ret
 
 	temp := &item{query, objectName, counter, instance, measurement,

From 07684fb03088146406be877c2aa69373dbd60f8f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 14:28:19 +0000
Subject: [PATCH 0008/1302] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7b4cf048..68262c98d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 - [#2126](https://github.com/influxdata/telegraf/pull/2126): Support a metric.Split function.
 - [#2026](https://github.com/influxdata/telegraf/pull/2065): elasticsearch "shield" (basic auth) support doc.
 - [#1885](https://github.com/influxdata/telegraf/pull/1885): Fix over-querying of cloudwatch metrics
+- [#1913](https://github.com/influxdata/telegraf/pull/1913): OpenTSDB basic auth support.
+- [#1908](https://github.com/influxdata/telegraf/pull/1908): RabbitMQ Connection metrics.
+- [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
 
 ### Bugfixes
 
@@ -23,6 +26,7 @@
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
 - [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
 - [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
+- [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
 
 ## v1.1.2 [2016-12-12]
 

From e097ae9632e3b12de4c2516b007f7305841a7530 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 14:49:11 +0000
Subject: [PATCH 0009/1302] Fix possible panic when file info cannot be gotten

closes #2061
---
 CHANGELOG.md                        |  1 +
 plugins/inputs/filestat/filestat.go | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68262c98d..8cb3e6196 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
 - [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
 - [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
+- [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/filestat/filestat.go b/plugins/inputs/filestat/filestat.go
index 938c12e34..83f511a84 100644
--- a/plugins/inputs/filestat/filestat.go
+++ b/plugins/inputs/filestat/filestat.go
@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
+	"log"
 	"os"
 
 	"github.com/influxdata/telegraf"
@@ -78,8 +79,14 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 				"file": fileName,
 			}
 			fields := map[string]interface{}{
-				"exists":     int64(1),
-				"size_bytes": fileInfo.Size(),
+				"exists": int64(1),
+			}
+
+			if fileInfo == nil {
+				log.Printf("E! Unable to get info for file [%s], possible permissions issue",
+					fileName)
+			} else {
+				fields["size_bytes"] = fileInfo.Size()
 			}
 
 			if f.Md5 {

From e2f9617228cebeb5fcdf7b5904bb2033e6d6297e Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 15:24:05 +0000
Subject: [PATCH 0010/1302] Support strings in statsd set measurements

closes #2068
---
 CHANGELOG.md                         |  1 +
 plugins/inputs/statsd/statsd.go      | 13 ++++++++-----
 plugins/inputs/statsd/statsd_test.go |  7 +++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cb3e6196..36e7ea73e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#1913](https://github.com/influxdata/telegraf/pull/1913): OpenTSDB basic auth support.
 - [#1908](https://github.com/influxdata/telegraf/pull/1908): RabbitMQ Connection metrics.
 - [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
+- [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index a46af0a87..7591864c2 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -98,6 +98,7 @@ type metric struct {
 	hash       string
 	intvalue   int64
 	floatvalue float64
+	strvalue   string
 	mtype      string
 	additive   bool
 	samplerate float64
@@ -106,7 +107,7 @@ type metric struct {
 
 type cachedset struct {
 	name   string
-	fields map[string]map[int64]bool
+	fields map[string]map[string]bool
 	tags   map[string]string
 }
 
@@ -435,7 +436,7 @@ func (s *Statsd) parseStatsdLine(line string) error {
 				return errors.New("Error Parsing statsd line")
 			}
 			m.floatvalue = v
-		case "c", "s":
+		case "c":
 			var v int64
 			v, err := strconv.ParseInt(pipesplit[0], 10, 64)
 			if err != nil {
@@ -451,6 +452,8 @@ func (s *Statsd) parseStatsdLine(line string) error {
 				v = int64(float64(v) / m.samplerate)
 			}
 			m.intvalue = v
+		case "s":
+			m.strvalue = pipesplit[0]
 		}
 
 		// Parse the name & tags from bucket
@@ -625,16 +628,16 @@ func (s *Statsd) aggregate(m metric) {
 		if !ok {
 			s.sets[m.hash] = cachedset{
 				name:   m.name,
-				fields: make(map[string]map[int64]bool),
+				fields: make(map[string]map[string]bool),
 				tags:   m.tags,
 			}
 		}
 		// check if the field exists
 		_, ok = s.sets[m.hash].fields[m.field]
 		if !ok {
-			s.sets[m.hash].fields[m.field] = make(map[int64]bool)
+			s.sets[m.hash].fields[m.field] = make(map[string]bool)
 		}
-		s.sets[m.hash].fields[m.field][m.intvalue] = true
+		s.sets[m.hash].fields[m.field][m.strvalue] = true
 	}
 }
 
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index bb0d68c16..9fbaf5372 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -139,6 +139,9 @@ func TestParse_Sets(t *testing.T) {
 		"scientific.notation.sets:4.696E+5|s",
 		"scientific.notation.sets:4.696E+5|s",
 		"scientific.notation.sets:4.697E+5|s",
+		"string.sets:foobar|s",
+		"string.sets:foobar|s",
+		"string.sets:bar|s",
 	}
 
 	for _, line := range valid_lines {
@@ -164,6 +167,10 @@ func TestParse_Sets(t *testing.T) {
 			"oneuser_id",
 			1,
 		},
+		{
+			"string_sets",
+			2,
+		},
 	}
 
 	for _, test := range validations {

From 8a4ab3654d5beb4b8570533af9c56c5900cd6c03 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 16:02:03 +0000
Subject: [PATCH 0011/1302] Fix documentation for net_response plugin

closes #2103
---
 plugins/inputs/net_response/README.md       | 23 +++++++++++++++++++++
 plugins/inputs/net_response/net_response.go | 16 +++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index 1d075d1a1..e3836721c 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -6,6 +6,27 @@ It can also check response text.
 ### Configuration:
 
 ```
+[[inputs.net_response]]
+  ## Protocol, must be "tcp" or "udp"
+  ## NOTE: because the "udp" protocol does not respond to requests, it requires
+  ## a send/expect string pair (see below).
+  protocol = "tcp"
+  ## Server address (default localhost)
+  address = "localhost:80"
+  ## Set timeout
+  timeout = "1s"
+
+  ## Set read timeout (only used if expecting a response)
+  read_timeout = "1s"
+
+  ## The following options are required for UDP checks. For TCP, they are
+  ## optional. The plugin will send the given string to the server and then
+  ## expect to receive the given 'expect' string back.
+  ## string sent to the server
+  # send = "ssh"
+  ## expected string in answer
+  # expect = "ssh"
+
 [[inputs.net_response]]
   protocol = "tcp"
   address = ":80"
@@ -30,6 +51,8 @@ It can also check response text.
   protocol = "udp"
   address = "localhost:161"
   timeout = "2s"
+  send = "hello server"
+  expect = "hello client"
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
index 15725ff27..ad0de46c3 100644
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -29,18 +29,24 @@ func (_ *NetResponse) Description() string {
 
 var sampleConfig = `
   ## Protocol, must be "tcp" or "udp"
+  ## NOTE: because the "udp" protocol does not respond to requests, it requires
+  ## a send/expect string pair (see below).
   protocol = "tcp"
   ## Server address (default localhost)
-  address = "github.com:80"
+  address = "localhost:80"
   ## Set timeout
   timeout = "1s"
 
-  ## Optional string sent to the server
-  # send = "ssh"
-  ## Optional expected string in answer
-  # expect = "ssh"
   ## Set read timeout (only used if expecting a response)
   read_timeout = "1s"
+
+  ## The following options are required for UDP checks. For TCP, they are
+  ## optional. The plugin will send the given string to the server and then
+  ## expect to receive the given 'expect' string back.
+  ## string sent to the server
+  # send = "ssh"
+  ## expected string in answer
+  # expect = "ssh"
 `
 
 func (_ *NetResponse) SampleConfig() string {

From 5f06bd2566175eb1acdb4199109c260a22d3489d Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 16:10:59 +0000
Subject: [PATCH 0012/1302] Graylog output should set short_message field

closes #2045
---
 CHANGELOG.md                       | 1 +
 plugins/outputs/graylog/README.md  | 2 +-
 plugins/outputs/graylog/graylog.go | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36e7ea73e..d23402afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
 - [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
 - [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
+- [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/outputs/graylog/README.md b/plugins/outputs/graylog/README.md
index 833482047..39863b541 100644
--- a/plugins/outputs/graylog/README.md
+++ b/plugins/outputs/graylog/README.md
@@ -9,6 +9,6 @@ It requires a `servers` name.
 ```toml
 # Send telegraf metrics to graylog(s)
 [[outputs.graylog]]
-  ## Udp endpoint for your graylog instance.
+  ## UDP endpoint for your graylog instance(s).
   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
 ```
diff --git a/plugins/outputs/graylog/graylog.go b/plugins/outputs/graylog/graylog.go
index 64624bcb4..e77eae558 100644
--- a/plugins/outputs/graylog/graylog.go
+++ b/plugins/outputs/graylog/graylog.go
@@ -154,7 +154,7 @@ type Graylog struct {
 }
 
 var sampleConfig = `
-  ## Udp endpoint for your graylog instance.
+  ## UDP endpoint for your graylog instance.
   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
 `
 
@@ -213,7 +213,7 @@ func serialize(metric telegraf.Metric) ([]string, error) {
 	m := make(map[string]interface{})
 	m["version"] = "1.1"
 	m["timestamp"] = metric.UnixNano() / 1000000000
-	m["short_message"] = " "
+	m["short_message"] = "telegraf"
 	m["name"] = metric.Name()
 
 	if host, ok := metric.Tags()["host"]; ok {

From b4f9bc8745de54fb673e651bfa58f3e1dfaebaed Mon Sep 17 00:00:00 2001
From: Jonas Falck <jonas.falck@gmail.com>
Date: Tue, 13 Dec 2016 20:40:55 +0100
Subject: [PATCH 0013/1302] Change hddtemp to always put temperature in
 temperature field (#1905)

Added unit tests for the changes

Fixes #1904
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/hddtemp/README.md              | 23 +++++-
 plugins/inputs/hddtemp/go-hddtemp/hddtemp.go  | 15 +++-
 .../inputs/hddtemp/go-hddtemp/hddtemp_test.go | 14 ++--
 plugins/inputs/hddtemp/hddtemp.go             | 12 ++-
 plugins/inputs/hddtemp/hddtemp_test.go        | 80 +++++++++++++++++++
 6 files changed, 131 insertions(+), 14 deletions(-)
 create mode 100644 plugins/inputs/hddtemp/hddtemp_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d23402afd..d899f9074 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
 - [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
 - [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
+- [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/hddtemp/README.md b/plugins/inputs/hddtemp/README.md
index d87ae625d..3bafb4f21 100644
--- a/plugins/inputs/hddtemp/README.md
+++ b/plugins/inputs/hddtemp/README.md
@@ -8,7 +8,7 @@ Hddtemp should be installed and its daemon running
 
 ## Configuration
 
-```
+```toml
 [[inputs.hddtemp]]
 ## By default, telegraf gathers temps data from all disks detected by the
 ## hddtemp.
@@ -20,3 +20,24 @@ Hddtemp should be installed and its daemon running
 # address = "127.0.0.1:7634"
 # devices = ["sda", "*"]
 ```
+
+## Measurements
+
+- hddtemp
+  - temperature
+
+Tags:
+- device
+- model
+- unit
+- status
+
+
+
+## Example output
+
+```
+> hddtemp,unit=C,status=,host=server1,device=sdb,model=WDC\ WD740GD-00FLA1 temperature=43i 1481655647000000000
+> hddtemp,device=sdc,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=38i 148165564700000000
+> hddtemp,device=sdd,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=36i 1481655647000000000
+```
diff --git a/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go b/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go
index d7d650b79..2d0e67fee 100644
--- a/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/go-hddtemp/hddtemp.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-type disk struct {
+type Disk struct {
 	DeviceName  string
 	Model       string
 	Temperature int32
@@ -16,12 +16,19 @@ type disk struct {
 	Status      string
 }
 
-func Fetch(address string) ([]disk, error) {
+type hddtemp struct {
+}
+
+func New() *hddtemp {
+	return &hddtemp{}
+}
+
+func (h *hddtemp) Fetch(address string) ([]Disk, error) {
 	var (
 		err    error
 		conn   net.Conn
 		buffer bytes.Buffer
-		disks  []disk
+		disks  []Disk
 	)
 
 	if conn, err = net.Dial("tcp", address); err != nil {
@@ -48,7 +55,7 @@ func Fetch(address string) ([]disk, error) {
 			status = temperatureField
 		}
 
-		disks = append(disks, disk{
+		disks = append(disks, Disk{
 			DeviceName:  device,
 			Model:       fields[offset+2],
 			Temperature: int32(temperature),
diff --git a/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go b/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go
index 858e91a90..a3fda2abd 100644
--- a/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go
+++ b/plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go
@@ -10,13 +10,13 @@ func TestFetch(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|36|C|"))
 	defer l.Close()
 
-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -31,7 +31,7 @@ func TestFetch(t *testing.T) {
 }
 
 func TestFetchWrongAddress(t *testing.T) {
-	_, err := Fetch("127.0.0.1:1")
+	_, err := New().Fetch("127.0.0.1:1")
 
 	if err == nil {
 		t.Error("expecting err to be non-nil")
@@ -42,13 +42,13 @@ func TestFetchStatus(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|SLP|C|"))
 	defer l.Close()
 
-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -67,13 +67,13 @@ func TestFetchTwoDisks(t *testing.T) {
 	l := serve(t, []byte("|/dev/hda|ST380011A|46|C||/dev/hdd|ST340016A|SLP|*|"))
 	defer l.Close()
 
-	disks, err := Fetch(l.Addr().String())
+	disks, err := New().Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []disk{
+	expected := []Disk{
 		{
 			DeviceName:  "hda",
 			Model:       "ST380011A",
diff --git a/plugins/inputs/hddtemp/hddtemp.go b/plugins/inputs/hddtemp/hddtemp.go
index c1e01c3c6..ac11218dd 100644
--- a/plugins/inputs/hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/hddtemp.go
@@ -13,6 +13,11 @@ const defaultAddress = "127.0.0.1:7634"
 type HDDTemp struct {
 	Address string
 	Devices []string
+	fetcher Fetcher
+}
+
+type Fetcher interface {
+	Fetch(address string) ([]gohddtemp.Disk, error)
 }
 
 func (_ *HDDTemp) Description() string {
@@ -36,7 +41,10 @@ func (_ *HDDTemp) SampleConfig() string {
 }
 
 func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
-	disks, err := gohddtemp.Fetch(h.Address)
+	if h.fetcher == nil {
+		h.fetcher = gohddtemp.New()
+	}
+	disks, err := h.fetcher.Fetch(h.Address)
 
 	if err != nil {
 		return err
@@ -53,7 +61,7 @@ func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
 				}
 
 				fields := map[string]interface{}{
-					disk.DeviceName: disk.Temperature,
+					"temperature": disk.Temperature,
 				}
 
 				acc.AddFields("hddtemp", fields, tags)
diff --git a/plugins/inputs/hddtemp/hddtemp_test.go b/plugins/inputs/hddtemp/hddtemp_test.go
new file mode 100644
index 000000000..37dfef7d6
--- /dev/null
+++ b/plugins/inputs/hddtemp/hddtemp_test.go
@@ -0,0 +1,80 @@
+package hddtemp
+
+import (
+	"testing"
+
+	hddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type mockFetcher struct {
+}
+
+func (h *mockFetcher) Fetch(address string) ([]hddtemp.Disk, error) {
+	return []hddtemp.Disk{
+		hddtemp.Disk{
+			DeviceName:  "Disk1",
+			Model:       "Model1",
+			Temperature: 13,
+			Unit:        "C",
+		},
+		hddtemp.Disk{
+			DeviceName:  "Disk2",
+			Model:       "Model2",
+			Temperature: 14,
+			Unit:        "C",
+		},
+	}, nil
+
+}
+func newMockFetcher() *mockFetcher {
+	return &mockFetcher{}
+}
+
+func TestFetch(t *testing.T) {
+	hddtemp := &HDDTemp{
+		fetcher: newMockFetcher(),
+		Devices: []string{"*"},
+	}
+
+	acc := &testutil.Accumulator{}
+	err := hddtemp.Gather(acc)
+
+	require.NoError(t, err)
+	assert.Equal(t, acc.NFields(), 2)
+
+	var tests = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"temperature": int32(13),
+			},
+			map[string]string{
+				"device": "Disk1",
+				"model":  "Model1",
+				"unit":   "C",
+				"status": "",
+			},
+		},
+		{
+			map[string]interface{}{
+				"temperature": int32(14),
+			},
+			map[string]string{
+				"device": "Disk2",
+				"model":  "Model2",
+				"unit":   "C",
+				"status": "",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		acc.AssertContainsTaggedFields(t, "hddtemp", test.fields, test.tags)
+	}
+
+}

From f39db08c6dc7fa5adf66fef0c9d55d29e0df16f3 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Dec 2016 16:34:52 +0000
Subject: [PATCH 0014/1302] Set default values for delete_ configuration
 options

closes #1893
---
 CHANGELOG.md                    |  5 +++++
 plugins/inputs/statsd/README.md | 19 ++++++++++++-------
 plugins/inputs/statsd/statsd.go | 24 +++++++++++++++++-------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d899f9074..c745d462f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Release Notes
 
+- The StatsD plugin will now default all "delete_" config options to "true". This
+will change te default behavior for users who were not specifying these parameters
+in their config file.
+
 ### Features
 
 - [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
@@ -19,6 +23,7 @@
 - [#1908](https://github.com/influxdata/telegraf/pull/1908): RabbitMQ Connection metrics.
 - [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
 - [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
+- [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index a17f8c888..91070419a 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -7,14 +7,19 @@
 [[inputs.statsd]]
   ## Address and port to host UDP listener on
   service_address = ":8125"
-  ## Delete gauges every interval (default=false)
-  delete_gauges = false
-  ## Delete counters every interval (default=false)
-  delete_counters = false
-  ## Delete sets every interval (default=false)
-  delete_sets = false
-  ## Delete timings & histograms every interval (default=true)
+
+  ## The following configuration options control when telegraf clears it's cache
+  ## of previous values. If set to false, then telegraf will only clear it's
+  ## cache when the daemon is restarted.
+  ## Reset gauges every interval (default=true)
+  delete_gauges = true
+  ## Reset counters every interval (default=true)
+  delete_counters = true
+  ## Reset sets every interval (default=true)
+  delete_sets = true
+  ## Reset timings & histograms every interval (default=true)
   delete_timings = true
+
   ## Percentiles to calculate for timing & histogram stats
   percentiles = [90]
 
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 7591864c2..75dfc915e 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -136,14 +136,19 @@ func (_ *Statsd) Description() string {
 const sampleConfig = `
   ## Address and port to host UDP listener on
   service_address = ":8125"
-  ## Delete gauges every interval (default=false)
-  delete_gauges = false
-  ## Delete counters every interval (default=false)
-  delete_counters = false
-  ## Delete sets every interval (default=false)
-  delete_sets = false
-  ## Delete timings & histograms every interval (default=true)
+
+  ## The following configuration options control when telegraf clears it's cache
+  ## of previous values. If set to false, then telegraf will only clear it's
+  ## cache when the daemon is restarted.
+  ## Reset gauges every interval (default=true)
+  delete_gauges = true
+  ## Reset counters every interval (default=true)
+  delete_counters = true
+  ## Reset sets every interval (default=true)
+  delete_sets = true
+  ## Reset timings & histograms every interval (default=true)
   delete_timings = true
+
   ## Percentiles to calculate for timing & histogram stats
   percentiles = [90]
 
@@ -654,8 +659,13 @@ func (s *Statsd) Stop() {
 func init() {
 	inputs.Add("statsd", func() telegraf.Input {
 		return &Statsd{
+			ServiceAddress:         ":8125",
 			MetricSeparator:        "_",
 			AllowedPendingMessages: defaultAllowPendingMessage,
+			DeleteCounters:         true,
+			DeleteGauges:           true,
+			DeleteSets:             true,
+			DeleteTimings:          true,
 		}
 	})
 }

From c630212dde2d741912bdf09fe9b7f22e97e8194d Mon Sep 17 00:00:00 2001
From: Pieter Slabbert <zan.xhipe@gmail.com>
Date: Thu, 24 Nov 2016 17:11:24 +0200
Subject: [PATCH 0015/1302] Enable setting a clientID for MQTT Output

closes #2079
closes #1910
---
 CHANGELOG.md                 |  1 +
 plugins/outputs/mqtt/mqtt.go | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c745d462f..d5c08c3b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ in their config file.
 - [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
 - [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
 - [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
+- [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
 
 ### Bugfixes
 
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 45f2c91c8..b1d94f87c 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -25,6 +25,9 @@ var sampleConfig = `
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
+  ## client ID, if not set a random ID is generated
+  # client_id = ""
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -46,7 +49,8 @@ type MQTT struct {
 	Database    string
 	Timeout     internal.Duration
 	TopicPrefix string
-	QoS         int `toml:"qos"`
+	QoS         int    `toml:"qos"`
+	ClientID    string `toml:"client_id"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -155,7 +159,11 @@ func (m *MQTT) publish(topic string, body []byte) error {
 func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	opts := paho.NewClientOptions()
 
-	opts.SetClientID("Telegraf-Output-" + internal.RandomString(5))
+	if m.ClientID != "" {
+		opts.SetClientID(m.ClientID)
+	} else {
+		opts.SetClientID("Telegraf-Output-" + internal.RandomString(5))
+	}
 
 	tlsCfg, err := internal.GetTLSConfig(
 		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)

From 393f5044bbc92f97b34548c835d651f6bfb14e8a Mon Sep 17 00:00:00 2001
From: Jose Luis Navarro <jlnavarro111@gmail.com>
Date: Fri, 4 Nov 2016 12:32:20 +0100
Subject: [PATCH 0016/1302] Collect JSON values recursively

closes #1993
closes #1693
---
 CHANGELOG.md                           |  1 +
 plugins/inputs/jolokia/jolokia.go      | 27 +++++------
 plugins/inputs/jolokia/jolokia_test.go | 63 ++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5c08c3b2..ed7ff2a2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ in their config file.
 - [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
 - [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
 - [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
+- [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 2cc0d6422..6a51e9b43 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -220,6 +220,16 @@ func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, e
 	return req, nil
 }
 
+func extractValues(measurement string, value interface{}, fields map[string]interface{}) {
+	if mapValues, ok := value.(map[string]interface{}); ok {
+		for k2, v2 := range mapValues {
+			extractValues(measurement+"_"+k2, v2, fields)
+		}
+	} else {
+		fields[measurement] = value
+	}
+}
+
 func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 	servers := j.Servers
 	metrics := j.Metrics
@@ -244,23 +254,8 @@ func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 			if err != nil {
 				fmt.Printf("Error handling response: %s\n", err)
 			} else {
-
 				if values, ok := out["value"]; ok {
-					switch t := values.(type) {
-					case map[string]interface{}:
-						for k, v := range t {
-							switch t2 := v.(type) {
-							case map[string]interface{}:
-								for k2, v2 := range t2 {
-									fields[measurement+"_"+k+"_"+k2] = v2
-								}
-							case interface{}:
-								fields[measurement+"_"+k] = t2
-							}
-						}
-					case interface{}:
-						fields[measurement] = t
-					}
+					extractValues(measurement, values, fields)
 				} else {
 					fmt.Printf("Missing key 'value' in output response\n")
 				}
diff --git a/plugins/inputs/jolokia/jolokia_test.go b/plugins/inputs/jolokia/jolokia_test.go
index 13724b937..ccde619b5 100644
--- a/plugins/inputs/jolokia/jolokia_test.go
+++ b/plugins/inputs/jolokia/jolokia_test.go
@@ -12,6 +12,37 @@ import (
 	_ "github.com/stretchr/testify/require"
 )
 
+const validThreeLevelMultiValueJSON = `
+{
+  "request":{
+    "mbean":"java.lang:type=*",
+    "type":"read"
+  },
+  "value":{
+		"java.lang:type=Memory":{
+			"ObjectPendingFinalizationCount":0,
+			"Verbose":false,
+			"HeapMemoryUsage":{
+				"init":134217728,
+				"committed":173015040,
+				"max":1908932608,
+				"used":16840016
+			},
+			"NonHeapMemoryUsage":{
+				"init":2555904,
+				"committed":51380224,
+				"max":-1,
+				"used":49944048
+			},
+			"ObjectName":{
+				"objectName":"java.lang:type=Memory"
+			}
+		}
+  },
+  "timestamp":1446129191,
+  "status":200
+}`
+
 const validMultiValueJSON = `
 {
   "request":{
@@ -103,6 +134,38 @@ func TestHttpJsonMultiValue(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
 }
 
+// Test that the proper values are ignored or collected
+func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
+	jolokia := genJolokiaClientStub(validThreeLevelMultiValueJSON, 200, Servers, []Metric{HeapMetric})
+
+	var acc testutil.Accumulator
+	err := jolokia.Gather(&acc)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(acc.Metrics))
+
+	fields := map[string]interface{}{
+		"heap_memory_usage_java.lang:type=Memory_ObjectPendingFinalizationCount": 0.0,
+		"heap_memory_usage_java.lang:type=Memory_Verbose":                        false,
+		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_init":           134217728.0,
+		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_max":            1908932608.0,
+		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_used":           16840016.0,
+		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_committed":      173015040.0,
+		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_init":        2555904.0,
+		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_committed":   51380224.0,
+		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_max":         -1.0,
+		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_used":        49944048.0,
+		"heap_memory_usage_java.lang:type=Memory_ObjectName_objectName":          "java.lang:type=Memory",
+	}
+
+	tags := map[string]string{
+		"jolokia_host": "127.0.0.1",
+		"jolokia_port": "8080",
+		"jolokia_name": "as1",
+	}
+	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
+}
+
 // Test that the proper values are ignored or collected
 func TestHttpJsonOn404(t *testing.T) {
 

From 17b307a7bca6f9639fb816ec61bb0254c650b4f2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 14 Dec 2016 20:47:48 +0100
Subject: [PATCH 0017/1302] ping: fix typo in README (#2163)

---
 plugins/inputs/ping/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 1f087c774..38558a33c 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -3,7 +3,7 @@
 This input plugin will measures the round-trip
 
 ## Windows:
-### Configration:
+### Configuration:
 ```
 	## urls to ping
 	urls = ["www.google.com"] # required
@@ -33,4 +33,4 @@ This input plugin will measures the round-trip
 ```
 * Plugin: ping, Collection 1
 ping,host=WIN-PBAPLP511R7,url=www.google.com average_response_ms=7i,maximum_response_ms=9i,minimum_response_ms=7i,packets_received=4i,packets_transmitted=4i,percent_packet_loss=0,percent_reply_loss=0,reply_received=4i 1469879119000000000
-```
\ No newline at end of file
+```

From a970b9c62c198fe6ad87723ae0bc56e15eb733e1 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <sparrc@users.noreply.github.com>
Date: Thu, 15 Dec 2016 19:31:40 +0000
Subject: [PATCH 0018/1302] Revert "Rabbitmq plugin: connection-related
 metrics." (#2169)

---
 plugins/inputs/rabbitmq/rabbitmq.go      | 69 ++----------------------
 plugins/inputs/rabbitmq/rabbitmq_test.go | 64 ----------------------
 2 files changed, 3 insertions(+), 130 deletions(-)

diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index d1c973dea..5519ee14a 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -50,9 +50,8 @@ type RabbitMQ struct {
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
 
 	// InsecureSkipVerify bool
-	Nodes       []string
-	Queues      []string
-	Connections []string
+	Nodes  []string
+	Queues []string
 
 	Client *http.Client
 }
@@ -136,22 +135,10 @@ type Node struct {
 	SocketsUsed   int64 `json:"sockets_used"`
 }
 
-// Connection ...
-type Connection struct {
-	Name         string
-	State        string
-	Vhost        string
-	Host         string
-	Node         string
-	ReceiveCount int64 `json:"recv_cnt"`
-	SendCount    int64 `json:"send_cnt"`
-	SendPend     int64 `json:"send_pend"`
-}
-
 // gatherFunc ...
 type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error)
 
-var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues, gatherConnections}
+var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
 
 var sampleConfig = `
   # url = "http://localhost:15672"
@@ -393,42 +380,6 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
 	errChan <- nil
 }
 
-func gatherConnections(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
-	// Gather information about connections
-	connections := make([]Connection, 0)
-	err := r.requestJSON("/api/connections", &connections)
-	if err != nil {
-		errChan <- err
-		return
-	}
-
-	for _, connection := range connections {
-		if !r.shouldGatherConnection(connection) {
-			continue
-		}
-		tags := map[string]string{
-			"url":        r.URL,
-			"connection": connection.Name,
-			"vhost":      connection.Vhost,
-			"host":       connection.Host,
-			"node":       connection.Node,
-		}
-
-		acc.AddFields(
-			"rabbitmq_connection",
-			map[string]interface{}{
-				"recv_cnt":  connection.ReceiveCount,
-				"send_cnt":  connection.SendCount,
-				"send_pend": connection.SendPend,
-				"state":     connection.State,
-			},
-			tags,
-		)
-	}
-
-	errChan <- nil
-}
-
 func (r *RabbitMQ) shouldGatherNode(node Node) bool {
 	if len(r.Nodes) == 0 {
 		return true
@@ -457,20 +408,6 @@ func (r *RabbitMQ) shouldGatherQueue(queue Queue) bool {
 	return false
 }
 
-func (r *RabbitMQ) shouldGatherConnection(connection Connection) bool {
-	if len(r.Connections) == 0 {
-		return true
-	}
-
-	for _, name := range r.Connections {
-		if name == connection.Name {
-			return true
-		}
-	}
-
-	return false
-}
-
 func init() {
 	inputs.Add("rabbitmq", func() telegraf.Input {
 		return &RabbitMQ{
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index bbb3dd450..4bdc980db 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -374,57 +374,6 @@ const sampleQueuesResponse = `
 ]
 `
 
-const sampleConnectionsResponse = `
-[
-  {
-    "recv_oct": 166055,
-    "recv_oct_details": {
-      "rate": 0
-    },
-    "send_oct": 589,
-    "send_oct_details": {
-      "rate": 0
-    },
-    "recv_cnt": 124,
-    "send_cnt": 7,
-    "send_pend": 0,
-    "state": "running",
-    "channels": 1,
-    "type": "network",
-    "node": "rabbit@ip-10-0-12-133",
-    "name": "10.0.10.8:32774 -> 10.0.12.131:5672",
-    "port": 5672,
-    "peer_port": 32774,
-    "host": "10.0.12.131",
-    "peer_host": "10.0.10.8",
-    "ssl": false,
-    "peer_cert_subject": null,
-    "peer_cert_issuer": null,
-    "peer_cert_validity": null,
-    "auth_mechanism": "AMQPLAIN",
-    "ssl_protocol": null,
-    "ssl_key_exchange": null,
-    "ssl_cipher": null,
-    "ssl_hash": null,
-    "protocol": "AMQP 0-9-1",
-    "user": "workers",
-    "vhost": "main",
-    "timeout": 0,
-    "frame_max": 131072,
-    "channel_max": 65535,
-    "client_properties": {
-      "product": "py-amqp",
-      "product_version": "1.4.7",
-      "capabilities": {
-        "connection.blocked": true,
-        "consumer_cancel_notify": true
-      }
-    },
-    "connected_at": 1476647837266
-  }
-]
-`
-
 func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var rsp string
@@ -436,8 +385,6 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 			rsp = sampleNodesResponse
 		case "/api/queues":
 			rsp = sampleQueuesResponse
-		case "/api/connections":
-			rsp = sampleConnectionsResponse
 		default:
 			panic("Cannot handle request")
 		}
@@ -494,15 +441,4 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	}
 
 	assert.True(t, acc.HasMeasurement("rabbitmq_queue"))
-
-	assert.True(t, acc.HasMeasurement("rabbitmq_connection"))
-
-	connection_fields := map[string]interface{}{
-		"recv_cnt":  int64(124),
-		"send_cnt":  int64(7),
-		"send_pend": int64(0),
-		"state":     "running",
-	}
-
-	acc.AssertContainsFields(t, "rabbitmq_connection", connection_fields)
 }

From e6fc32bdf0652e1defcfdb79be98f60020e1f9a0 Mon Sep 17 00:00:00 2001
From: Frank Stutz <frank.stutz@xoom.com>
Date: Tue, 18 Oct 2016 14:09:35 -0700
Subject: [PATCH 0019/1302] fix for puppetagent config - test 1

put Makefile back to normal

removed comment from puppetagent.go

changed config_version to config_version_string and fixed yaml for build

changed workind from branch to environment for config_string

fixed casing and Changelog

fixed test case

closes #1917
---
 CHANGELOG.md                                     | 1 +
 plugins/inputs/puppetagent/last_run_summary.yaml | 4 ++--
 plugins/inputs/puppetagent/puppetagent.go        | 4 ++--
 plugins/inputs/puppetagent/puppetagent_test.go   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed7ff2a2e..1357e6d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ in their config file.
 - [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
 - [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
 - [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
+- [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/puppetagent/last_run_summary.yaml b/plugins/inputs/puppetagent/last_run_summary.yaml
index 1f5dea3ce..be2f01746 100644
--- a/plugins/inputs/puppetagent/last_run_summary.yaml
+++ b/plugins/inputs/puppetagent/last_run_summary.yaml
@@ -30,5 +30,5 @@
     last_run: 1444936531
     cron: 0.000584
   version:
-    config: 1444936521
-    puppet: "3.7.5"
\ No newline at end of file
+    config: "environment:d6018ce"
+    puppet: "3.7.5"
diff --git a/plugins/inputs/puppetagent/puppetagent.go b/plugins/inputs/puppetagent/puppetagent.go
index f66aa989f..c8a265bb8 100644
--- a/plugins/inputs/puppetagent/puppetagent.go
+++ b/plugins/inputs/puppetagent/puppetagent.go
@@ -68,8 +68,8 @@ type time struct {
 }
 
 type version struct {
-	Config int64  `yaml:"config"`
-	Puppet string `yaml:"puppet"`
+	ConfigString string `yaml:"config"`
+	Puppet       string `yaml:"puppet"`
 }
 
 // SampleConfig returns sample configuration message
diff --git a/plugins/inputs/puppetagent/puppetagent_test.go b/plugins/inputs/puppetagent/puppetagent_test.go
index d1470bc27..b1c447887 100644
--- a/plugins/inputs/puppetagent/puppetagent_test.go
+++ b/plugins/inputs/puppetagent/puppetagent_test.go
@@ -28,7 +28,7 @@ func TestGather(t *testing.T) {
 		"resources_outofsync":       int64(0),
 		"changes_total":             int64(0),
 		"time_lastrun":              int64(1444936531),
-		"version_config":            int64(1444936521),
+		"version_configstring":      "environment:d6018ce",
 		"time_user":                 float64(0.004331),
 		"time_schedule":             float64(0.001123),
 		"time_filebucket":           float64(0.000353),

From bc13d32d53caba8c035a9b853d1a0fb7e83f264e Mon Sep 17 00:00:00 2001
From: Doug Reese <doug@reesesystems.com>
Date: Fri, 16 Dec 2016 05:46:32 -0800
Subject: [PATCH 0020/1302] MongoDB input plugin: Improve state data (#2001)

* MongoDB input plugin: Improve state data

Adds ARB as a "member_status" (replica set arbiter).
Uses MongoDB replica set state string for "state" value.

* MongoDB input plugin: Improve state data - changelog update
---
 CHANGELOG.md                                | 1 +
 plugins/inputs/mongodb/mongodb_data.go      | 4 +---
 plugins/inputs/mongodb/mongodb_data_test.go | 3 ++-
 plugins/inputs/mongodb/mongostat.go         | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1357e6d90..efb599ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ in their config file.
 - [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
 - [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
 - [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
+- [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index afa4ddd2f..47f35f199 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -21,9 +21,6 @@ type DbData struct {
 }
 
 func NewMongodbData(statLine *StatLine, tags map[string]string) *MongodbData {
-	if statLine.NodeType != "" && statLine.NodeType != "UNK" {
-		tags["state"] = statLine.NodeType
-	}
 	return &MongodbData{
 		StatLine: statLine,
 		Tags:     tags,
@@ -61,6 +58,7 @@ var DefaultReplStats = map[string]string{
 	"repl_getmores_per_sec": "GetMoreR",
 	"repl_commands_per_sec": "CommandR",
 	"member_status":         "NodeType",
+	"state":                 "NodeState",
 	"repl_lag":              "ReplLag",
 }
 
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index a08549cfd..a74d9ed65 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -95,12 +95,12 @@ func TestStateTag(t *testing.T) {
 			Insert:        0,
 			Query:         0,
 			NodeType:      "PRI",
+			NodeState:     "PRIMARY",
 		},
 		tags,
 	)
 
 	stateTags := make(map[string]string)
-	stateTags["state"] = "PRI"
 
 	var acc testutil.Accumulator
 
@@ -115,6 +115,7 @@ func TestStateTag(t *testing.T) {
 		"getmores_per_sec":      int64(0),
 		"inserts_per_sec":       int64(0),
 		"member_status":         "PRI",
+		"state":                 "PRIMARY",
 		"net_in_bytes":          int64(0),
 		"net_out_bytes":         int64(0),
 		"open_connections":      int64(0),
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index da539f8aa..e77c67e15 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -107,6 +107,7 @@ type ReplSetStatus struct {
 type ReplSetMember struct {
 	Name       string               `bson:"name"`
 	State      int64                `bson:"state"`
+	StateStr   string               `bson:"stateStr"`
 	OptimeDate *bson.MongoTimestamp `bson:"optimeDate"`
 }
 
@@ -420,6 +421,7 @@ type StatLine struct {
 	NumConnections                                        int64
 	ReplSetName                                           string
 	NodeType                                              string
+	NodeState                                             string
 
 	// Cluster fields
 	JumboChunksCount int64
@@ -566,6 +568,8 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 			returnVal.NodeType = "PRI"
 		} else if newStat.Repl.Secondary.(bool) {
 			returnVal.NodeType = "SEC"
+		} else if newStat.Repl.ArbiterOnly != nil && newStat.Repl.ArbiterOnly.(bool) {
+			returnVal.NodeType = "ARB"
 		} else {
 			returnVal.NodeType = "UNK"
 		}
@@ -692,6 +696,8 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		me := ReplSetMember{}
 		for _, member := range newReplStat.Members {
 			if member.Name == myName {
+				// Store my state string
+				returnVal.NodeState = member.StateStr
 				if member.State == 1 {
 					// I'm the master
 					returnVal.ReplLag = 0

From 4a83c8c518a89b2fd752cef331834c9bd12a2f6c Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Fri, 16 Dec 2016 08:47:47 -0500
Subject: [PATCH 0021/1302] Add Questions status variable for issue: #1988
 (#2004)

---
 plugins/inputs/mysql/mysql.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index ece5e1447..5cf19f2db 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -828,6 +828,13 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 			}
 
 			fields["queries"] = i
+		case "Questions":
+			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
+			if err != nil {
+				return err
+			}
+
+			fields["questions"] = i
 		case "Slow_queries":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {

From 3a45d8851dc10b13dfff198e3c4c9045b8ce16fd Mon Sep 17 00:00:00 2001
From: Alex Sherwin <alex-sherwin@users.noreply.github.com>
Date: Fri, 16 Dec 2016 08:53:16 -0500
Subject: [PATCH 0022/1302] fixes #1987 custom docker repos with non-standard
 port (#2018)

* fixed parsing of docker image name/version

now accounts for custom docker repo's which contain a colon for a non-default port

* 1978: modifying docker test case to have a custom repo with non-standard port

* using a temp var to store index, ran gofmt

* fixes #1987, renaming iterator to 'i'
---
 plugins/inputs/docker/docker.go      | 16 ++++++++++------
 plugins/inputs/docker/docker_test.go |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index e2c488dc8..7fc48689f 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -221,14 +221,18 @@ func (d *Docker) gatherContainer(
 		cname = strings.TrimPrefix(container.Names[0], "/")
 	}
 
-	// the image name sometimes has a version part.
-	//   ie, rabbitmq:3-management
-	imageParts := strings.Split(container.Image, ":")
-	imageName := imageParts[0]
+	// the image name sometimes has a version part, or a private repo
+	//   ie, rabbitmq:3-management or docker.someco.net:4443/rabbitmq:3-management
+	imageName := ""
 	imageVersion := "unknown"
-	if len(imageParts) > 1 {
-		imageVersion = imageParts[1]
+	i := strings.LastIndex(container.Image, ":") // index of last ':' character
+	if i > -1 {
+		imageVersion = container.Image[i+1:]
+		imageName = container.Image[:i]
+	} else {
+		imageName = container.Image
 	}
+
 	tags := map[string]string{
 		"engine_host":       d.engine_host,
 		"container_name":    cname,
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 21960a4d8..a60203af5 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -340,7 +340,7 @@ func (d FakeDockerClient) ContainerList(octx context.Context, options types.Cont
 	container2 := types.Container{
 		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		Names:   []string{"/etcd2"},
-		Image:   "quay.io/coreos/etcd:v2.2.2",
+		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941933,
 		Status:  "Up 4 hours",
@@ -429,7 +429,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		},
 		map[string]string{
 			"container_name":    "etcd2",
-			"container_image":   "quay.io/coreos/etcd",
+			"container_image":   "quay.io:4443/coreos/etcd",
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
@@ -477,7 +477,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		map[string]string{
 			"engine_host":       "absol",
 			"container_name":    "etcd2",
-			"container_image":   "quay.io/coreos/etcd",
+			"container_image":   "quay.io:4443/coreos/etcd",
 			"container_version": "v2.2.2",
 		},
 	)

From bcbf82f8e8d151bfe53137ed05aa7131243422d5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 16 Dec 2016 13:54:51 +0000
Subject: [PATCH 0023/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb599ded..8cf403e4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ in their config file.
 - [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
 - [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
 - [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
+- [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
 
 ## v1.1.2 [2016-12-12]
 

From 90cec20d1db04e2aefaa40805540ac1f2dd45ee0 Mon Sep 17 00:00:00 2001
From: alekseyp <aleksey.potaneyko@gmail.com>
Date: Fri, 16 Dec 2016 08:58:27 -0500
Subject: [PATCH 0024/1302] Standard deviation (jitter) for Input plugin Ping
 (#2078)

---
 plugins/inputs/ping/ping.go      | 20 ++++++++++++--------
 plugins/inputs/ping/ping_test.go | 26 +++++++++++++++-----------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 089248efe..32264eec7 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -84,7 +84,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					strings.TrimSpace(out) + ", " + err.Error())
 			}
 			tags := map[string]string{"url": u}
-			trans, rec, avg, err := processPingOutput(out)
+			trans, rec, avg, stddev, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
 				errorChannel <- err
@@ -100,6 +100,9 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			if avg > 0 {
 				fields["average_response_ms"] = avg
 			}
+			if stddev > 0 {
+				fields["standard_deviation_ms"] = stddev
+			}
 			acc.AddFields("ping", fields, tags)
 		}(url)
 	}
@@ -166,9 +169,9 @@ func (p *Ping) args(url string) []string {
 //     round-trip min/avg/max/stddev = 34.843/43.508/52.172/8.664 ms
 //
 // It returns (<transmitted packets>, <received packets>, <average response>)
-func processPingOutput(out string) (int, int, float64, error) {
+func processPingOutput(out string) (int, int, float64, float64, error) {
 	var trans, recv int
-	var avg float64
+	var avg, stddev float64
 	// Set this error to nil if we find a 'transmitted' line
 	err := errors.New("Fatal error processing ping output")
 	lines := strings.Split(out, "\n")
@@ -180,22 +183,23 @@ func processPingOutput(out string) (int, int, float64, error) {
 			// Transmitted packets
 			trans, err = strconv.Atoi(strings.Split(stats[0], " ")[0])
 			if err != nil {
-				return trans, recv, avg, err
+				return trans, recv, avg, stddev, err
 			}
 			// Received packets
 			recv, err = strconv.Atoi(strings.Split(stats[1], " ")[0])
 			if err != nil {
-				return trans, recv, avg, err
+				return trans, recv, avg, stddev, err
 			}
 		} else if strings.Contains(line, "min/avg/max") {
-			stats := strings.Split(line, " = ")[1]
+			stats := strings.Split(line, " ")[3]
 			avg, err = strconv.ParseFloat(strings.Split(stats, "/")[1], 64)
+			stddev, err = strconv.ParseFloat(strings.Split(stats, "/")[3], 64)
 			if err != nil {
-				return trans, recv, avg, err
+				return trans, recv, avg, stddev, err
 			}
 		}
 	}
-	return trans, recv, avg, err
+	return trans, recv, avg, stddev, err
 }
 
 func init() {
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index b5d0d16e7..a7a6931f5 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -48,23 +48,25 @@ ping: -i interval too short: Operation not permitted
 
 // Test that ping command output is processed properly
 func TestProcessPingOutput(t *testing.T) {
-	trans, rec, avg, err := processPingOutput(bsdPingOutput)
+	trans, rec, avg, stddev, err := processPingOutput(bsdPingOutput)
 	assert.NoError(t, err)
 	assert.Equal(t, 5, trans, "5 packets were transmitted")
 	assert.Equal(t, 5, rec, "5 packets were transmitted")
 	assert.InDelta(t, 20.224, avg, 0.001)
+	assert.InDelta(t, 4.076, stddev, 0.001)
 
-	trans, rec, avg, err = processPingOutput(linuxPingOutput)
+	trans, rec, avg, stddev, err = processPingOutput(linuxPingOutput)
 	assert.NoError(t, err)
 	assert.Equal(t, 5, trans, "5 packets were transmitted")
 	assert.Equal(t, 5, rec, "5 packets were transmitted")
 	assert.InDelta(t, 43.628, avg, 0.001)
+	assert.InDelta(t, 5.325, stddev, 0.001)
 }
 
 // Test that processPingOutput returns an error when 'ping' fails to run, such
 // as when an invalid argument is provided
 func TestErrorProcessPingOutput(t *testing.T) {
-	_, _, _, err := processPingOutput(fatalPingOutput)
+	_, _, _, _, err := processPingOutput(fatalPingOutput)
 	assert.Error(t, err, "Error was expected from processPingOutput")
 }
 
@@ -145,10 +147,11 @@ func TestPingGather(t *testing.T) {
 	p.Gather(&acc)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
-		"packets_transmitted": 5,
-		"packets_received":    5,
-		"percent_packet_loss": 0.0,
-		"average_response_ms": 43.628,
+		"packets_transmitted":   5,
+		"packets_received":      5,
+		"percent_packet_loss":   0.0,
+		"average_response_ms":   43.628,
+		"standard_deviation_ms": 5.325,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 
@@ -182,10 +185,11 @@ func TestLossyPingGather(t *testing.T) {
 	p.Gather(&acc)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
-		"packets_transmitted": 5,
-		"packets_received":    3,
-		"percent_packet_loss": 40.0,
-		"average_response_ms": 44.033,
+		"packets_transmitted":   5,
+		"packets_received":      3,
+		"percent_packet_loss":   40.0,
+		"average_response_ms":   44.033,
+		"standard_deviation_ms": 5.325,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }

From ecbc6342211f4e469e7ce3c240c198dc0a38ea03 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 16 Dec 2016 09:01:49 -0500
Subject: [PATCH 0025/1302] fix tail input seeking when used with pipe (#2090)

---
 CHANGELOG.md                  |  2 ++
 plugins/inputs/tail/README.md |  2 ++
 plugins/inputs/tail/tail.go   | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cf403e4d..12e635e14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ in their config file.
 
 - [#2049](https://github.com/influxdata/telegraf/pull/2049): Fix the Value data format not trimming null characters from input.
 - [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
+- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
 - [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
 - [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
@@ -41,6 +42,7 @@ in their config file.
 - [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
 - [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
 - [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
+- [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/tail/README.md b/plugins/inputs/tail/README.md
index 9ae120e91..3aa0c4ac4 100644
--- a/plugins/inputs/tail/README.md
+++ b/plugins/inputs/tail/README.md
@@ -36,6 +36,8 @@ The plugin expects messages in one of the
   files = ["/var/mymetrics.out"]
   ## Read file from beginning.
   from_beginning = false
+  ## Whether file is a named pipe
+  pipe = false
 
   ## Data format to consume.
   ## Each data format has it's own unique set of configuration options, read
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index e1bc32e51..508c1e320 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -16,6 +16,7 @@ import (
 type Tail struct {
 	Files         []string
 	FromBeginning bool
+	Pipe          bool
 
 	tailers []*tail.Tail
 	parser  parsers.Parser
@@ -44,6 +45,8 @@ const sampleConfig = `
   files = ["/var/mymetrics.out"]
   ## Read file from beginning.
   from_beginning = false
+  ## Whether file is a named pipe
+  pipe = false
 
   ## Data format to consume.
   ## Each data format has it's own unique set of configuration options, read
@@ -70,10 +73,12 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 
 	t.acc = acc
 
-	var seek tail.SeekInfo
-	if !t.FromBeginning {
-		seek.Whence = 2
-		seek.Offset = 0
+	var seek *tail.SeekInfo
+	if !t.Pipe && !t.FromBeginning {
+		seek = &tail.SeekInfo{
+			Whence: 2,
+			Offset: 0,
+		}
 	}
 
 	var errS string
@@ -88,8 +93,9 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 				tail.Config{
 					ReOpen:    true,
 					Follow:    true,
-					Location:  &seek,
+					Location:  seek,
 					MustExist: true,
+					Pipe:      t.Pipe,
 				})
 			if err != nil {
 				errS += err.Error() + " "
@@ -130,6 +136,10 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 				tailer.Filename, line.Text, err)
 		}
 	}
+	if err := tailer.Err(); err != nil {
+		log.Printf("E! Error tailing file %s, Error: %s\n",
+			tailer.Filename, err)
+	}
 }
 
 func (t *Tail) Stop() {

From 21fac3ebec3875a675b02857cfaec88766417140 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 16 Dec 2016 14:01:58 +0000
Subject: [PATCH 0026/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12e635e14..95ad6d1a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ in their config file.
 - [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
 - [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
 - [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
+- [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
 
 ### Bugfixes
 

From 4957717df5726b2f0d453e5ae97194632ec4b530 Mon Sep 17 00:00:00 2001
From: Tevin Jeffrey <tev.jeffrey@gmail.com>
Date: Fri, 16 Dec 2016 09:03:53 -0500
Subject: [PATCH 0027/1302] Add field for last GC pause time (#2121)

---
 CHANGELOG.md                             |  1 +
 plugins/inputs/influxdb/influxdb.go      | 54 ++++++++++++------------
 plugins/inputs/influxdb/influxdb_test.go |  1 +
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95ad6d1a2..357d9f22d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ in their config file.
 - [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
 - [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
 - [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
+- [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go
index bb11cfee4..3c98eead3 100644
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -94,32 +94,33 @@ type point struct {
 }
 
 type memstats struct {
-	Alloc         int64   `json:"Alloc"`
-	TotalAlloc    int64   `json:"TotalAlloc"`
-	Sys           int64   `json:"Sys"`
-	Lookups       int64   `json:"Lookups"`
-	Mallocs       int64   `json:"Mallocs"`
-	Frees         int64   `json:"Frees"`
-	HeapAlloc     int64   `json:"HeapAlloc"`
-	HeapSys       int64   `json:"HeapSys"`
-	HeapIdle      int64   `json:"HeapIdle"`
-	HeapInuse     int64   `json:"HeapInuse"`
-	HeapReleased  int64   `json:"HeapReleased"`
-	HeapObjects   int64   `json:"HeapObjects"`
-	StackInuse    int64   `json:"StackInuse"`
-	StackSys      int64   `json:"StackSys"`
-	MSpanInuse    int64   `json:"MSpanInuse"`
-	MSpanSys      int64   `json:"MSpanSys"`
-	MCacheInuse   int64   `json:"MCacheInuse"`
-	MCacheSys     int64   `json:"MCacheSys"`
-	BuckHashSys   int64   `json:"BuckHashSys"`
-	GCSys         int64   `json:"GCSys"`
-	OtherSys      int64   `json:"OtherSys"`
-	NextGC        int64   `json:"NextGC"`
-	LastGC        int64   `json:"LastGC"`
-	PauseTotalNs  int64   `json:"PauseTotalNs"`
-	NumGC         int64   `json:"NumGC"`
-	GCCPUFraction float64 `json:"GCCPUFraction"`
+	Alloc         int64      `json:"Alloc"`
+	TotalAlloc    int64      `json:"TotalAlloc"`
+	Sys           int64      `json:"Sys"`
+	Lookups       int64      `json:"Lookups"`
+	Mallocs       int64      `json:"Mallocs"`
+	Frees         int64      `json:"Frees"`
+	HeapAlloc     int64      `json:"HeapAlloc"`
+	HeapSys       int64      `json:"HeapSys"`
+	HeapIdle      int64      `json:"HeapIdle"`
+	HeapInuse     int64      `json:"HeapInuse"`
+	HeapReleased  int64      `json:"HeapReleased"`
+	HeapObjects   int64      `json:"HeapObjects"`
+	StackInuse    int64      `json:"StackInuse"`
+	StackSys      int64      `json:"StackSys"`
+	MSpanInuse    int64      `json:"MSpanInuse"`
+	MSpanSys      int64      `json:"MSpanSys"`
+	MCacheInuse   int64      `json:"MCacheInuse"`
+	MCacheSys     int64      `json:"MCacheSys"`
+	BuckHashSys   int64      `json:"BuckHashSys"`
+	GCSys         int64      `json:"GCSys"`
+	OtherSys      int64      `json:"OtherSys"`
+	NextGC        int64      `json:"NextGC"`
+	LastGC        int64      `json:"LastGC"`
+	PauseTotalNs  int64      `json:"PauseTotalNs"`
+	PauseNs       [256]int64 `json:"PauseNs"`
+	NumGC         int64      `json:"NumGC"`
+	GCCPUFraction float64    `json:"GCCPUFraction"`
 }
 
 // Gathers data from a particular URL
@@ -202,6 +203,7 @@ func (i *InfluxDB) gatherURL(
 						"next_gc":         m.NextGC,
 						"last_gc":         m.LastGC,
 						"pause_total_ns":  m.PauseTotalNs,
+						"pause_ns":        m.PauseNs[(m.NumGC+255)%256],
 						"num_gc":          m.NumGC,
 						"gcc_pu_fraction": m.GCCPUFraction,
 					},
diff --git a/plugins/inputs/influxdb/influxdb_test.go b/plugins/inputs/influxdb/influxdb_test.go
index 09707a548..c27aa77dc 100644
--- a/plugins/inputs/influxdb/influxdb_test.go
+++ b/plugins/inputs/influxdb/influxdb_test.go
@@ -86,6 +86,7 @@ func TestInfluxDB(t *testing.T) {
 		"frees":           int64(381008),
 		"heap_idle":       int64(15802368),
 		"pause_total_ns":  int64(5132914),
+		"pause_ns":        int64(127053),
 		"lookups":         int64(77),
 		"heap_sys":        int64(33849344),
 		"mcache_sys":      int64(16384),

From 9c8f24601fd0d8fb299bd9fd499bc22d49896502 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 16 Dec 2016 14:11:28 +0000
Subject: [PATCH 0028/1302] rabbitmq, decrease timeout verbosity in config

---
 plugins/inputs/rabbitmq/rabbitmq.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 5519ee14a..c33b11e66 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -155,17 +155,12 @@ var sampleConfig = `
 
   ## Optional request timeouts
   ##
-  ## ResponseHeaderTimeout, if non-zero, specifies the amount of
-  ## time to wait for a server's response headers after fully
-  ## writing the request (including its body, if any). This
-  ## time does not include the time to read the response body.
-  ## See http.Transport.ResponseHeaderTimeout
+  ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
+  ## for a server's response headers after fully writing the request.
   # header_timeout = "3s"
   ##
-  ## Timeout specifies a time limit for requests made by this
-  ## Client. The timeout includes connection time, any
-  ## redirects, and reading the response body.
-  ## See http.Client.Timeout
+  ## client_timeout specifies a time limit for requests made by this client.
+  ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
   ## A list of nodes to pull metrics about. If not specified, metrics for

From e8bf968c78f63dc619d3d205de622941a1e45cb2 Mon Sep 17 00:00:00 2001
From: Vincent <vincent_wangxi@126.com>
Date: Sat, 17 Dec 2016 01:29:04 +0800
Subject: [PATCH 0029/1302] fix mongodb replica set lag awalys 0 #1449 (#2125)

---
 plugins/inputs/mongodb/mongostat.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index e77c67e15..c5ccf5a86 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -11,8 +11,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
-	"gopkg.in/mgo.v2/bson"
 )
 
 const (
@@ -105,10 +103,10 @@ type ReplSetStatus struct {
 
 // ReplSetMember stores information related to a replica set member
 type ReplSetMember struct {
-	Name       string               `bson:"name"`
-	State      int64                `bson:"state"`
-	StateStr   string               `bson:"stateStr"`
-	OptimeDate *bson.MongoTimestamp `bson:"optimeDate"`
+	Name       string    `bson:"name"`
+	State      int64     `bson:"state"`
+	StateStr   string    `bson:"stateStr"`
+	OptimeDate time.Time `bson:"optimeDate"`
 }
 
 // WiredTiger stores information related to the WiredTiger storage engine.
@@ -712,9 +710,9 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 			}
 		}
 
-		if me.OptimeDate != nil && master.OptimeDate != nil && me.State == 2 {
-			// MongoTimestamp type is int64 where the first 32bits are the unix timestamp
-			lag := int64(*master.OptimeDate>>32 - *me.OptimeDate>>32)
+		if me.State == 2 {
+			// OptimeDate.Unix() type is int64
+			lag := master.OptimeDate.Unix() - me.OptimeDate.Unix()
 			if lag < 0 {
 				returnVal.ReplLag = 0
 			} else {

From 6723ea5fe66b0df729a65e42dfa67ab7b6f80972 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 16 Dec 2016 17:30:13 +0000
Subject: [PATCH 0030/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 357d9f22d..6bd0ee0e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ in their config file.
 - [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
 - [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
 - [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
+- [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
 
 ## v1.1.2 [2016-12-12]
 

From 0e8122a2fca6073d00a324790f3f6cf54e7c1baf Mon Sep 17 00:00:00 2001
From: Steven Pall <mail@stevenpall.ca>
Date: Sat, 17 Dec 2016 07:51:46 -0500
Subject: [PATCH 0031/1302] Add trailing slash to jolokia context (#2105)

---
 plugins/inputs/jolokia/README.md  | 3 ++-
 plugins/inputs/jolokia/jolokia.go | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/jolokia/README.md b/plugins/inputs/jolokia/README.md
index 596dbed5f..d25ab6f46 100644
--- a/plugins/inputs/jolokia/README.md
+++ b/plugins/inputs/jolokia/README.md
@@ -6,7 +6,8 @@
 # Read JMX metrics through Jolokia
 [[inputs.jolokia]]
   ## This is the context root used to compose the jolokia url
-  context = "/jolokia"
+  ## NOTE that Jolokia requires a trailing slash at the end of the context root
+  context = "/jolokia/"
 
   ## This specifies the mode used
   # mode = "proxy"
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 6a51e9b43..812e5e66b 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -52,8 +52,9 @@ type Jolokia struct {
 
 const sampleConfig = `
   ## This is the context root used to compose the jolokia url
+  ## NOTE that Jolokia requires a trailing slash at the end of the context root
   ## NOTE that your jolokia security policy must allow for POST requests.
-  context = "/jolokia"
+  context = "/jolokia/"
 
   ## This specifies the mode used
   # mode = "proxy"
@@ -148,7 +149,7 @@ func (j *Jolokia) doRequest(req *http.Request) (map[string]interface{}, error) {
 
 func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, error) {
 	var jolokiaUrl *url.URL
-	context := j.Context // Usually "/jolokia"
+	context := j.Context // Usually "/jolokia/"
 
 	// Create bodyContent
 	bodyContent := map[string]interface{}{

From f09c08d1f3805270a4a22d7f9c9c96ea3caf6f90 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Mon, 7 Nov 2016 11:34:02 -0500
Subject: [PATCH 0032/1302] Added response_timeout property

closes #2006
---
 CHANGELOG.md                            |  1 +
 plugins/inputs/prometheus/README.md     | 11 +++++++++++
 plugins/inputs/prometheus/prometheus.go |  9 +++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bd0ee0e0..d53e46093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ in their config file.
 - [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
 - [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
 - [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
+- [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index 8298b9d27..e2b1b45ae 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -13,6 +13,17 @@ Example for Kubernetes apiserver
   urls = ["http://my-kube-apiserver:8080/metrics"]
 ```
 
+Specify a 10 second timeout for slower/over-loaded clients
+```toml
+# Get all metrics from Kube-apiserver
+[[inputs.prometheus]]
+  # An array of urls to scrape metrics from.
+  urls = ["http://my-kube-apiserver:8080/metrics"]
+
+  # Specify timeout duration for slower prometheus clients (default is 3s)
+  response_timeout = "10s"
+```
+
 You can use more complex configuration
 to filter and some tags
 
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 12f7fd38e..821f71f21 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -21,6 +21,8 @@ type Prometheus struct {
 	// Bearer Token authorization file path
 	BearerToken string `toml:"bearer_token"`
 
+	ResponseTimeout internal.Duration `toml:"response_timeout"`
+
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
 	// Path to host cert file
@@ -38,6 +40,9 @@ var sampleConfig = `
   ## Use bearer token for authorization
   # bearer_token = /path/to/bearer/token
 
+  ## Specify timeout duration for slower prometheus clients (default is 3s)
+  # response_timeout = "3s"
+
   ## Optional SSL Config
   # ssl_ca = /path/to/cafile
   # ssl_cert = /path/to/certfile
@@ -105,7 +110,7 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 		}).Dial,
 		TLSHandshakeTimeout:   5 * time.Second,
 		TLSClientConfig:       tlsCfg,
-		ResponseHeaderTimeout: time.Duration(3 * time.Second),
+		ResponseHeaderTimeout: p.ResponseTimeout.Duration,
 		DisableKeepAlives:     true,
 	}
 
@@ -148,6 +153,6 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("prometheus", func() telegraf.Input {
-		return &Prometheus{}
+		return &Prometheus{ResponseTimeout: "3s"}
 	})
 }

From e36c354ff5e08696acce13e6739d8ca1433b42e8 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 17 Dec 2016 13:10:33 +0000
Subject: [PATCH 0033/1302] internal.Duration build fixup

---
 plugins/inputs/prometheus/prometheus.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 821f71f21..97da17f04 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -153,6 +153,6 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("prometheus", func() telegraf.Input {
-		return &Prometheus{ResponseTimeout: "3s"}
+		return &Prometheus{ResponseTimeout: internal.Duration{Duration: time.Second * 3}}
 	})
 }

From eb96443a341671895356fee79dfb54a7d758d69f Mon Sep 17 00:00:00 2001
From: Ken Dilley <vanceavalon@gmail.com>
Date: Tue, 20 Dec 2016 03:17:00 -0700
Subject: [PATCH 0034/1302] Update MySQL Readme to clarify connection string
 examples. (#2175)

* Update MySQL Readme to clarify connection string examples.

* Update mysql sample config to clarify connection string examples
---
 plugins/inputs/mysql/README.md | 4 ++--
 plugins/inputs/mysql/mysql.go  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index 3599b2fb8..34bb07bef 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -25,8 +25,8 @@ This plugin gathers the statistic data from MySQL server
   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
   ##  e.g.
-  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+  ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
+  ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
   #
   ## If no servers are specified, then localhost is used as the host.
   servers = ["tcp(127.0.0.1:3306)/"]
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 5cf19f2db..54f296586 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -41,8 +41,8 @@ var sampleConfig = `
   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
   ##  e.g.
-  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+  ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
+  ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
   #
   ## If no servers are specified, then localhost is used as the host.
   servers = ["tcp(127.0.0.1:3306)/"]

From 4e808c5c20a79d35b20eb7c7ec236eede6ca85c6 Mon Sep 17 00:00:00 2001
From: Jeff Ashton <JeffAshton@users.noreply.github.com>
Date: Wed, 9 Nov 2016 13:43:39 -0500
Subject: [PATCH 0035/1302] Importing pdh from github.com/lxn/win

closes #1763
closes #2017
---
 CHANGELOG.md                                  |   1 +
 Godeps_windows                                |   1 -
 plugins/inputs/win_perf_counters/pdh.go       | 419 ++++++++++++++++++
 .../win_perf_counters/win_perf_counters.go    |  45 +-
 4 files changed, 442 insertions(+), 24 deletions(-)
 create mode 100644 plugins/inputs/win_perf_counters/pdh.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d53e46093..e69a1004e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ in their config file.
 - [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
 - [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
 - [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
+- [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf
 
 ### Bugfixes
 
diff --git a/Godeps_windows b/Godeps_windows
index 067c98c1c..129fce1a2 100644
--- a/Godeps_windows
+++ b/Godeps_windows
@@ -1,7 +1,6 @@
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/lxn/win 950a0e81e7678e63d8e6cd32412bdecb325ccd88
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
 github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
new file mode 100644
index 000000000..36563d6b7
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -0,0 +1,419 @@
+// Copyright (c) 2010 The win Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The names of the authors may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This is the official list of 'win' authors for copyright purposes.
+//
+// Alexander Neumann <an2048@googlemail.com>
+// Joseph Watson <jtwatson@linux-consulting.us>
+// Kevin Pors <krpors@gmail.com>
+
+// +build windows
+
+package win_perf_counters
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// Error codes
+const (
+	ERROR_SUCCESS          = 0
+	ERROR_INVALID_FUNCTION = 1
+)
+
+type (
+	HANDLE uintptr
+)
+
+// PDH error codes, which can be returned by all Pdh* functions. Taken from mingw-w64 pdhmsg.h
+const (
+	PDH_CSTATUS_VALID_DATA                     = 0x00000000 // The returned data is valid.
+	PDH_CSTATUS_NEW_DATA                       = 0x00000001 // The return data value is valid and different from the last sample.
+	PDH_CSTATUS_NO_MACHINE                     = 0x800007D0 // Unable to connect to the specified computer, or the computer is offline.
+	PDH_CSTATUS_NO_INSTANCE                    = 0x800007D1
+	PDH_MORE_DATA                              = 0x800007D2 // The PdhGetFormattedCounterArray* function can return this if there's 'more data to be displayed'.
+	PDH_CSTATUS_ITEM_NOT_VALIDATED             = 0x800007D3
+	PDH_RETRY                                  = 0x800007D4
+	PDH_NO_DATA                                = 0x800007D5 // The query does not currently contain any counters (for example, limited access)
+	PDH_CALC_NEGATIVE_DENOMINATOR              = 0x800007D6
+	PDH_CALC_NEGATIVE_TIMEBASE                 = 0x800007D7
+	PDH_CALC_NEGATIVE_VALUE                    = 0x800007D8
+	PDH_DIALOG_CANCELLED                       = 0x800007D9
+	PDH_END_OF_LOG_FILE                        = 0x800007DA
+	PDH_ASYNC_QUERY_TIMEOUT                    = 0x800007DB
+	PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE = 0x800007DC
+	PDH_CSTATUS_NO_OBJECT                      = 0xC0000BB8
+	PDH_CSTATUS_NO_COUNTER                     = 0xC0000BB9 // The specified counter could not be found.
+	PDH_CSTATUS_INVALID_DATA                   = 0xC0000BBA // The counter was successfully found, but the data returned is not valid.
+	PDH_MEMORY_ALLOCATION_FAILURE              = 0xC0000BBB
+	PDH_INVALID_HANDLE                         = 0xC0000BBC
+	PDH_INVALID_ARGUMENT                       = 0xC0000BBD // Required argument is missing or incorrect.
+	PDH_FUNCTION_NOT_FOUND                     = 0xC0000BBE
+	PDH_CSTATUS_NO_COUNTERNAME                 = 0xC0000BBF
+	PDH_CSTATUS_BAD_COUNTERNAME                = 0xC0000BC0 // Unable to parse the counter path. Check the format and syntax of the specified path.
+	PDH_INVALID_BUFFER                         = 0xC0000BC1
+	PDH_INSUFFICIENT_BUFFER                    = 0xC0000BC2
+	PDH_CANNOT_CONNECT_MACHINE                 = 0xC0000BC3
+	PDH_INVALID_PATH                           = 0xC0000BC4
+	PDH_INVALID_INSTANCE                       = 0xC0000BC5
+	PDH_INVALID_DATA                           = 0xC0000BC6 // specified counter does not contain valid data or a successful status code.
+	PDH_NO_DIALOG_DATA                         = 0xC0000BC7
+	PDH_CANNOT_READ_NAME_STRINGS               = 0xC0000BC8
+	PDH_LOG_FILE_CREATE_ERROR                  = 0xC0000BC9
+	PDH_LOG_FILE_OPEN_ERROR                    = 0xC0000BCA
+	PDH_LOG_TYPE_NOT_FOUND                     = 0xC0000BCB
+	PDH_NO_MORE_DATA                           = 0xC0000BCC
+	PDH_ENTRY_NOT_IN_LOG_FILE                  = 0xC0000BCD
+	PDH_DATA_SOURCE_IS_LOG_FILE                = 0xC0000BCE
+	PDH_DATA_SOURCE_IS_REAL_TIME               = 0xC0000BCF
+	PDH_UNABLE_READ_LOG_HEADER                 = 0xC0000BD0
+	PDH_FILE_NOT_FOUND                         = 0xC0000BD1
+	PDH_FILE_ALREADY_EXISTS                    = 0xC0000BD2
+	PDH_NOT_IMPLEMENTED                        = 0xC0000BD3
+	PDH_STRING_NOT_FOUND                       = 0xC0000BD4
+	PDH_UNABLE_MAP_NAME_FILES                  = 0x80000BD5
+	PDH_UNKNOWN_LOG_FORMAT                     = 0xC0000BD6
+	PDH_UNKNOWN_LOGSVC_COMMAND                 = 0xC0000BD7
+	PDH_LOGSVC_QUERY_NOT_FOUND                 = 0xC0000BD8
+	PDH_LOGSVC_NOT_OPENED                      = 0xC0000BD9
+	PDH_WBEM_ERROR                             = 0xC0000BDA
+	PDH_ACCESS_DENIED                          = 0xC0000BDB
+	PDH_LOG_FILE_TOO_SMALL                     = 0xC0000BDC
+	PDH_INVALID_DATASOURCE                     = 0xC0000BDD
+	PDH_INVALID_SQLDB                          = 0xC0000BDE
+	PDH_NO_COUNTERS                            = 0xC0000BDF
+	PDH_SQL_ALLOC_FAILED                       = 0xC0000BE0
+	PDH_SQL_ALLOCCON_FAILED                    = 0xC0000BE1
+	PDH_SQL_EXEC_DIRECT_FAILED                 = 0xC0000BE2
+	PDH_SQL_FETCH_FAILED                       = 0xC0000BE3
+	PDH_SQL_ROWCOUNT_FAILED                    = 0xC0000BE4
+	PDH_SQL_MORE_RESULTS_FAILED                = 0xC0000BE5
+	PDH_SQL_CONNECT_FAILED                     = 0xC0000BE6
+	PDH_SQL_BIND_FAILED                        = 0xC0000BE7
+	PDH_CANNOT_CONNECT_WMI_SERVER              = 0xC0000BE8
+	PDH_PLA_COLLECTION_ALREADY_RUNNING         = 0xC0000BE9
+	PDH_PLA_ERROR_SCHEDULE_OVERLAP             = 0xC0000BEA
+	PDH_PLA_COLLECTION_NOT_FOUND               = 0xC0000BEB
+	PDH_PLA_ERROR_SCHEDULE_ELAPSED             = 0xC0000BEC
+	PDH_PLA_ERROR_NOSTART                      = 0xC0000BED
+	PDH_PLA_ERROR_ALREADY_EXISTS               = 0xC0000BEE
+	PDH_PLA_ERROR_TYPE_MISMATCH                = 0xC0000BEF
+	PDH_PLA_ERROR_FILEPATH                     = 0xC0000BF0
+	PDH_PLA_SERVICE_ERROR                      = 0xC0000BF1
+	PDH_PLA_VALIDATION_ERROR                   = 0xC0000BF2
+	PDH_PLA_VALIDATION_WARNING                 = 0x80000BF3
+	PDH_PLA_ERROR_NAME_TOO_LONG                = 0xC0000BF4
+	PDH_INVALID_SQL_LOG_FORMAT                 = 0xC0000BF5
+	PDH_COUNTER_ALREADY_IN_QUERY               = 0xC0000BF6
+	PDH_BINARY_LOG_CORRUPT                     = 0xC0000BF7
+	PDH_LOG_SAMPLE_TOO_SMALL                   = 0xC0000BF8
+	PDH_OS_LATER_VERSION                       = 0xC0000BF9
+	PDH_OS_EARLIER_VERSION                     = 0xC0000BFA
+	PDH_INCORRECT_APPEND_TIME                  = 0xC0000BFB
+	PDH_UNMATCHED_APPEND_COUNTER               = 0xC0000BFC
+	PDH_SQL_ALTER_DETAIL_FAILED                = 0xC0000BFD
+	PDH_QUERY_PERF_DATA_TIMEOUT                = 0xC0000BFE
+)
+
+// Formatting options for GetFormattedCounterValue().
+const (
+	PDH_FMT_RAW          = 0x00000010
+	PDH_FMT_ANSI         = 0x00000020
+	PDH_FMT_UNICODE      = 0x00000040
+	PDH_FMT_LONG         = 0x00000100 // Return data as a long int.
+	PDH_FMT_DOUBLE       = 0x00000200 // Return data as a double precision floating point real.
+	PDH_FMT_LARGE        = 0x00000400 // Return data as a 64 bit integer.
+	PDH_FMT_NOSCALE      = 0x00001000 // can be OR-ed: Do not apply the counter's default scaling factor.
+	PDH_FMT_1000         = 0x00002000 // can be OR-ed: multiply the actual value by 1,000.
+	PDH_FMT_NODATA       = 0x00004000 // can be OR-ed: unknown what this is for, MSDN says nothing.
+	PDH_FMT_NOCAP100     = 0x00008000 // can be OR-ed: do not cap values > 100.
+	PERF_DETAIL_COSTLY   = 0x00010000
+	PERF_DETAIL_STANDARD = 0x0000FFFF
+)
+
+type (
+	PDH_HQUERY   HANDLE // query handle
+	PDH_HCOUNTER HANDLE // counter handle
+)
+
+// Union specialization for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	DoubleValue float64
+}
+
+// Union specialization for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	LargeValue int64
+}
+
+// Union specialization for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+// Union specialization for double values, used by PdhGetFormattedCounterArrayDouble()
+type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
+}
+
+// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LARGE
+}
+
+// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LONG
+}
+
+var (
+	// Library
+	libpdhDll *syscall.DLL
+
+	// Functions
+	pdh_AddCounterW               *syscall.Proc
+	pdh_AddEnglishCounterW        *syscall.Proc
+	pdh_CloseQuery                *syscall.Proc
+	pdh_CollectQueryData          *syscall.Proc
+	pdh_GetFormattedCounterValue  *syscall.Proc
+	pdh_GetFormattedCounterArrayW *syscall.Proc
+	pdh_OpenQuery                 *syscall.Proc
+	pdh_ValidatePathW             *syscall.Proc
+)
+
+func init() {
+	// Library
+	libpdhDll = syscall.MustLoadDLL("pdh.dll")
+
+	// Functions
+	pdh_AddCounterW = libpdhDll.MustFindProc("PdhAddCounterW")
+	pdh_AddEnglishCounterW, _ = libpdhDll.FindProc("PdhAddEnglishCounterW") // XXX: only supported on versions > Vista.
+	pdh_CloseQuery = libpdhDll.MustFindProc("PdhCloseQuery")
+	pdh_CollectQueryData = libpdhDll.MustFindProc("PdhCollectQueryData")
+	pdh_GetFormattedCounterValue = libpdhDll.MustFindProc("PdhGetFormattedCounterValue")
+	pdh_GetFormattedCounterArrayW = libpdhDll.MustFindProc("PdhGetFormattedCounterArrayW")
+	pdh_OpenQuery = libpdhDll.MustFindProc("PdhOpenQuery")
+	pdh_ValidatePathW = libpdhDll.MustFindProc("PdhValidatePathW")
+}
+
+// Adds the specified counter to the query. This is the internationalized version. Preferably, use the
+// function PdhAddEnglishCounter instead. hQuery is the query handle, which has been fetched by PdhOpenQuery.
+// szFullCounterPath is a full, internationalized counter path (this will differ per Windows language version).
+// dwUserData is a 'user-defined value', which becomes part of the counter information. To retrieve this value
+// later, call PdhGetCounterInfo() and access dwQueryUserData of the PDH_COUNTER_INFO structure.
+//
+// Examples of szFullCounterPath (in an English version of Windows):
+//
+//	\\Processor(_Total)\\% Idle Time
+//	\\Processor(_Total)\\% Processor Time
+//	\\LogicalDisk(C:)\% Free Space
+//
+// To view all (internationalized...) counters on a system, there are three non-programmatic ways: perfmon utility,
+// the typeperf command, and the the registry editor. perfmon.exe is perhaps the easiest way, because it's basically a
+// full implemention of the pdh.dll API, except with a GUI and all that. The registry setting also provides an
+// interface to the available counters, and can be found at the following key:
+//
+// 	HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib\CurrentLanguage
+//
+// This registry key contains several values as follows:
+//
+//	1
+//	1847
+//	2
+//	System
+//	4
+//	Memory
+//	6
+//	% Processor Time
+//	... many, many more
+//
+// Somehow, these numeric values can be used as szFullCounterPath too:
+//
+//	\2\6 will correspond to \\System\% Processor Time
+//
+// The typeperf command may also be pretty easy. To find all performance counters, simply execute:
+//
+//	typeperf -qx
+func PdhAddCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintptr, phCounter *PDH_HCOUNTER) uint32 {
+	ptxt, _ := syscall.UTF16PtrFromString(szFullCounterPath)
+	ret, _, _ := pdh_AddCounterW.Call(
+		uintptr(hQuery),
+		uintptr(unsafe.Pointer(ptxt)),
+		dwUserData,
+		uintptr(unsafe.Pointer(phCounter)))
+
+	return uint32(ret)
+}
+
+// Adds the specified language-neutral counter to the query. See the PdhAddCounter function. This function only exists on
+// Windows versions higher than Vista.
+func PdhAddEnglishCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintptr, phCounter *PDH_HCOUNTER) uint32 {
+	if pdh_AddEnglishCounterW == nil {
+		return ERROR_INVALID_FUNCTION
+	}
+
+	ptxt, _ := syscall.UTF16PtrFromString(szFullCounterPath)
+	ret, _, _ := pdh_AddEnglishCounterW.Call(
+		uintptr(hQuery),
+		uintptr(unsafe.Pointer(ptxt)),
+		dwUserData,
+		uintptr(unsafe.Pointer(phCounter)))
+
+	return uint32(ret)
+}
+
+// Closes all counters contained in the specified query, closes all handles related to the query,
+// and frees all memory associated with the query.
+func PdhCloseQuery(hQuery PDH_HQUERY) uint32 {
+	ret, _, _ := pdh_CloseQuery.Call(uintptr(hQuery))
+
+	return uint32(ret)
+}
+
+// Collects the current raw data value for all counters in the specified query and updates the status
+// code of each counter. With some counters, this function needs to be repeatedly called before the value
+// of the counter can be extracted with PdhGetFormattedCounterValue(). For example, the following code
+// requires at least two calls:
+//
+// 	var handle win.PDH_HQUERY
+// 	var counterHandle win.PDH_HCOUNTER
+// 	ret := win.PdhOpenQuery(0, 0, &handle)
+//	ret = win.PdhAddEnglishCounter(handle, "\\Processor(_Total)\\% Idle Time", 0, &counterHandle)
+//	var derp win.PDH_FMT_COUNTERVALUE_DOUBLE
+//
+//	ret = win.PdhCollectQueryData(handle)
+//	fmt.Printf("Collect return code is %x\n", ret) // return code will be PDH_CSTATUS_INVALID_DATA
+//	ret = win.PdhGetFormattedCounterValueDouble(counterHandle, 0, &derp)
+//
+//	ret = win.PdhCollectQueryData(handle)
+//	fmt.Printf("Collect return code is %x\n", ret) // return code will be ERROR_SUCCESS
+//	ret = win.PdhGetFormattedCounterValueDouble(counterHandle, 0, &derp)
+//
+// The PdhCollectQueryData will return an error in the first call because it needs two values for
+// displaying the correct data for the processor idle time. The second call will have a 0 return code.
+func PdhCollectQueryData(hQuery PDH_HQUERY) uint32 {
+	ret, _, _ := pdh_CollectQueryData.Call(uintptr(hQuery))
+
+	return uint32(ret)
+}
+
+// Formats the given hCounter using a 'double'. The result is set into the specialized union struct pValue.
+// This function does not directly translate to a Windows counterpart due to union specialization tricks.
+func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32, pValue *PDH_FMT_COUNTERVALUE_DOUBLE) uint32 {
+	ret, _, _ := pdh_GetFormattedCounterValue.Call(
+		uintptr(hCounter),
+		uintptr(PDH_FMT_DOUBLE),
+		uintptr(unsafe.Pointer(lpdwType)),
+		uintptr(unsafe.Pointer(pValue)))
+
+	return uint32(ret)
+}
+
+// Returns an array of formatted counter values. Use this function when you want to format the counter values of a
+// counter that contains a wildcard character for the instance name. The itemBuffer must a slice of type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE.
+// An example of how this function can be used:
+//
+//	okPath := "\\Process(*)\\% Processor Time" // notice the wildcard * character
+//
+//	// ommitted all necessary stuff ...
+//
+//	var bufSize uint32
+//	var bufCount uint32
+//	var size uint32 = uint32(unsafe.Sizeof(win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
+//	var emptyBuf [1]win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
+//
+//	for {
+//		// collect
+//		ret := win.PdhCollectQueryData(queryHandle)
+//		if ret == win.ERROR_SUCCESS {
+//			ret = win.PdhGetFormattedCounterArrayDouble(counterHandle, &bufSize, &bufCount, &emptyBuf[0]) // uses null ptr here according to MSDN.
+//			if ret == win.PDH_MORE_DATA {
+//				filledBuf := make([]win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE, bufCount*size)
+//				ret = win.PdhGetFormattedCounterArrayDouble(counterHandle, &bufSize, &bufCount, &filledBuf[0])
+//				for i := 0; i < int(bufCount); i++ {
+//					c := filledBuf[i]
+//					var s string = win.UTF16PtrToString(c.SzName)
+//					fmt.Printf("Index %d -> %s, value %v\n", i, s, c.FmtValue.DoubleValue)
+//				}
+//
+//				filledBuf = nil
+//				// Need to at least set bufSize to zero, because if not, the function will not
+//				// return PDH_MORE_DATA and will not set the bufSize.
+//				bufCount = 0
+//				bufSize = 0
+//			}
+//
+//			time.Sleep(2000 * time.Millisecond)
+//		}
+//	}
+func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *PDH_FMT_COUNTERVALUE_ITEM_DOUBLE) uint32 {
+	ret, _, _ := pdh_GetFormattedCounterArrayW.Call(
+		uintptr(hCounter),
+		uintptr(PDH_FMT_DOUBLE),
+		uintptr(unsafe.Pointer(lpdwBufferSize)),
+		uintptr(unsafe.Pointer(lpdwBufferCount)),
+		uintptr(unsafe.Pointer(itemBuffer)))
+
+	return uint32(ret)
+}
+
+// Creates a new query that is used to manage the collection of performance data.
+// szDataSource is a null terminated string that specifies the name of the log file from which to
+// retrieve the performance data. If 0, performance data is collected from a real-time data source.
+// dwUserData is a user-defined value to associate with this query. To retrieve the user data later,
+// call PdhGetCounterInfo and access dwQueryUserData of the PDH_COUNTER_INFO structure. phQuery is
+// the handle to the query, and must be used in subsequent calls. This function returns a PDH_
+// constant error code, or ERROR_SUCCESS if the call succeeded.
+func PdhOpenQuery(szDataSource uintptr, dwUserData uintptr, phQuery *PDH_HQUERY) uint32 {
+	ret, _, _ := pdh_OpenQuery.Call(
+		szDataSource,
+		dwUserData,
+		uintptr(unsafe.Pointer(phQuery)))
+
+	return uint32(ret)
+}
+
+// Validates a path. Will return ERROR_SUCCESS when ok, or PDH_CSTATUS_BAD_COUNTERNAME when the path is
+// erroneous.
+func PdhValidatePath(path string) uint32 {
+	ptxt, _ := syscall.UTF16PtrFromString(path)
+	ret, _, _ := pdh_ValidatePathW.Call(uintptr(unsafe.Pointer(ptxt)))
+
+	return uint32(ret)
+}
+
+func UTF16PtrToString(s *uint16) string {
+	if s == nil {
+		return ""
+	}
+	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
+}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 1f233a3d4..691f67a01 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"github.com/lxn/win"
 )
 
 var sampleConfig string = `
@@ -103,8 +102,8 @@ type item struct {
 	instance      string
 	measurement   string
 	include_total bool
-	handle        win.PDH_HQUERY
-	counterHandle win.PDH_HCOUNTER
+	handle        PDH_HQUERY
+	counterHandle PDH_HCOUNTER
 }
 
 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
@@ -113,10 +112,10 @@ var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName string, counter string, instance string,
 	measurement string, include_total bool) {
 
-	var handle win.PDH_HQUERY
-	var counterHandle win.PDH_HCOUNTER
-	ret := win.PdhOpenQuery(0, 0, &handle)
-	ret = win.PdhAddCounter(handle, query, 0, &counterHandle)
+	var handle PDH_HQUERY
+	var counterHandle PDH_HCOUNTER
+	ret := PdhOpenQuery(0, 0, &handle)
+	ret = PdhAddCounter(handle, query, 0, &counterHandle)
 	_ = ret
 
 	temp := &item{query, objectName, counter, instance, measurement,
@@ -131,14 +130,14 @@ func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName s
 }
 
 func (m *Win_PerfCounters) InvalidObject(exists uint32, query string, PerfObject perfobject, instance string, counter string) error {
-	if exists == 3221228472 { // win.PDH_CSTATUS_NO_OBJECT
+	if exists == 3221228472 { // PDH_CSTATUS_NO_OBJECT
 		if PerfObject.FailOnMissing {
 			err := errors.New("Performance object does not exist")
 			return err
 		} else {
 			fmt.Printf("Performance Object '%s' does not exist in query: %s\n", PerfObject.ObjectName, query)
 		}
-	} else if exists == 3221228473 { //win.PDH_CSTATUS_NO_COUNTER
+	} else if exists == 3221228473 { // PDH_CSTATUS_NO_COUNTER
 
 		if PerfObject.FailOnMissing {
 			err := errors.New("Counter in Performance object does not exist")
@@ -146,7 +145,7 @@ func (m *Win_PerfCounters) InvalidObject(exists uint32, query string, PerfObject
 		} else {
 			fmt.Printf("Counter '%s' does not exist in query: %s\n", counter, query)
 		}
-	} else if exists == 2147485649 { //win.PDH_CSTATUS_NO_INSTANCE
+	} else if exists == 2147485649 { // PDH_CSTATUS_NO_INSTANCE
 		if PerfObject.FailOnMissing {
 			err := errors.New("Instance in Performance object does not exist")
 			return err
@@ -189,9 +188,9 @@ func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
 						query = "\\" + objectname + "(" + instance + ")\\" + counter
 					}
 
-					var exists uint32 = win.PdhValidatePath(query)
+					var exists uint32 = PdhValidatePath(query)
 
-					if exists == win.ERROR_SUCCESS {
+					if exists == ERROR_SUCCESS {
 						if m.PrintValid {
 							fmt.Printf("Valid: %s\n", query)
 						}
@@ -218,7 +217,7 @@ func (m *Win_PerfCounters) Cleanup(metrics *itemList) {
 	// Cleanup
 
 	for _, metric := range metrics.items {
-		ret := win.PdhCloseQuery(metric.handle)
+		ret := PdhCloseQuery(metric.handle)
 		_ = ret
 	}
 }
@@ -227,7 +226,7 @@ func (m *Win_PerfCounters) CleanupTestMode() {
 	// Cleanup for the testmode.
 
 	for _, metric := range gItemList {
-		ret := win.PdhCloseQuery(metric.handle)
+		ret := PdhCloseQuery(metric.handle)
 		_ = ret
 	}
 }
@@ -256,26 +255,26 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 
 	var bufSize uint32
 	var bufCount uint32
-	var size uint32 = uint32(unsafe.Sizeof(win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
-	var emptyBuf [1]win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
+	var size uint32 = uint32(unsafe.Sizeof(PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
+	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
 
 	// For iterate over the known metrics and get the samples.
 	for _, metric := range gItemList {
 		// collect
-		ret := win.PdhCollectQueryData(metric.handle)
-		if ret == win.ERROR_SUCCESS {
-			ret = win.PdhGetFormattedCounterArrayDouble(metric.counterHandle, &bufSize,
+		ret := PdhCollectQueryData(metric.handle)
+		if ret == ERROR_SUCCESS {
+			ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle, &bufSize,
 				&bufCount, &emptyBuf[0]) // uses null ptr here according to MSDN.
-			if ret == win.PDH_MORE_DATA {
-				filledBuf := make([]win.PDH_FMT_COUNTERVALUE_ITEM_DOUBLE, bufCount*size)
+			if ret == PDH_MORE_DATA {
+				filledBuf := make([]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE, bufCount*size)
 				if len(filledBuf) == 0 {
 					continue
 				}
-				ret = win.PdhGetFormattedCounterArrayDouble(metric.counterHandle,
+				ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle,
 					&bufSize, &bufCount, &filledBuf[0])
 				for i := 0; i < int(bufCount); i++ {
 					c := filledBuf[i]
-					var s string = win.UTF16PtrToString(c.SzName)
+					var s string = UTF16PtrToString(c.SzName)
 
 					var add bool
 

From 48ae105a11fb2bdd2e05d853c601dc48eb701664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Harasimowicz?=
 <harnash@users.noreply.github.com>
Date: Tue, 20 Dec 2016 14:03:31 +0100
Subject: [PATCH 0036/1302] Fixing consul with multiple health checks per
 service (#1994)

* plugins/input/consul: moved check_id from regular fields to tags.

When service has more than one check sending data for both would overwrite each other
resulting only in one check being written (the last one). Adding check_id as a tag
ensures we will get info for all unique checks per service.

* plugins/inputs/consul: updated tests
---
 plugins/inputs/consul/README.md      | 6 +++---
 plugins/inputs/consul/consul.go      | 2 +-
 plugins/inputs/consul/consul_test.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index a2685e2bf..01a39cbf7 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -29,9 +29,9 @@ to query the data. It will not report the [telemetry](https://www.consul.io/docs
 Tags:
 - node: on which node check/service is registered on
 - service_name: name of the service (this is the service name not the service ID)
+- check_id
 
 Fields:
-- check_id
 - check_name
 - service_id
 - status
@@ -41,6 +41,6 @@ Fields:
 ```
 $ telegraf --config ./telegraf.conf -input-filter consul -test
 * Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node check_id="serfHealth",check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com check_id="service:www-example-com.test01",check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
+> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
+> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
 ```
diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index eaeae73c1..4c28f4d12 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -95,13 +95,13 @@ func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.Healt
 		record := make(map[string]interface{})
 		tags := make(map[string]string)
 
-		record["check_id"] = check.CheckID
 		record["check_name"] = check.Name
 		record["service_id"] = check.ServiceID
 		record["status"] = check.Status
 
 		tags["node"] = check.Node
 		tags["service_name"] = check.ServiceName
+		tags["check_id"] = check.CheckID
 
 		acc.AddFields("consul_health_checks", record, tags)
 	}
diff --git a/plugins/inputs/consul/consul_test.go b/plugins/inputs/consul/consul_test.go
index 772ccba91..f970d4449 100644
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -22,7 +22,6 @@ var sampleChecks = []*api.HealthCheck{
 
 func TestGatherHealtCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
-		"check_id":   "foo.health123",
 		"check_name": "foo.health",
 		"status":     "passing",
 		"service_id": "foo.123",
@@ -31,6 +30,7 @@ func TestGatherHealtCheck(t *testing.T) {
 	expectedTags := map[string]string{
 		"node":         "localhost",
 		"service_name": "foo",
+		"check_id":     "foo.health123",
 	}
 
 	var acc testutil.Accumulator

From 8df325a68c9b771a64770969e99500ad751c3384 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 13:04:51 +0000
Subject: [PATCH 0037/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69a1004e..751ee1eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ in their config file.
 - [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
 - [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
 - [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
+- [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
 
 ## v1.1.2 [2016-12-12]
 

From 986614654571ea62c791c0b5042b292cd3deb92d Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 13:21:51 +0000
Subject: [PATCH 0038/1302] Support negative statsd counters

closes #1898
---
 CHANGELOG.md                         | 3 ++-
 plugins/inputs/statsd/statsd.go      | 4 ++--
 plugins/inputs/statsd/statsd_test.go | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 751ee1eaa..b228a891d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,8 @@ in their config file.
 - [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
 - [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
 - [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
-- [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf
+- [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf.
+- [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 75dfc915e..1b0189a9e 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -426,8 +426,8 @@ func (s *Statsd) parseStatsdLine(line string) error {
 
 		// Parse the value
 		if strings.HasPrefix(pipesplit[0], "-") || strings.HasPrefix(pipesplit[0], "+") {
-			if m.mtype != "g" {
-				log.Printf("E! Error: +- values are only supported for gauges: %s\n", line)
+			if m.mtype != "g" && m.mtype != "c" {
+				log.Printf("E! Error: +- values are only supported for gauges & counters: %s\n", line)
 				return errors.New("Error Parsing statsd line")
 			}
 			m.additive = true
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index 9fbaf5372..ff3002d2c 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -197,6 +197,8 @@ func TestParse_Counters(t *testing.T) {
 		"sample.rate:1|c|@0.1",
 		"sample.rate:1|c",
 		"scientific.notation:4.696E+5|c",
+		"negative.test:100|c",
+		"negative.test:-5|c",
 	}
 
 	for _, line := range valid_lines {
@@ -230,6 +232,10 @@ func TestParse_Counters(t *testing.T) {
 			"sample_rate",
 			11,
 		},
+		{
+			"negative_test",
+			95,
+		},
 	}
 
 	for _, test := range validations {
@@ -299,11 +305,9 @@ func TestParse_InvalidLines(t *testing.T) {
 		"i.dont.have.a.pipe:45g",
 		"i.dont.have.a.colon45|c",
 		"invalid.metric.type:45|e",
-		"invalid.plus.minus.non.gauge:+10|c",
 		"invalid.plus.minus.non.gauge:+10|s",
 		"invalid.plus.minus.non.gauge:+10|ms",
 		"invalid.plus.minus.non.gauge:+10|h",
-		"invalid.plus.minus.non.gauge:-10|c",
 		"invalid.value:foobar|c",
 		"invalid.value:d11|c",
 		"invalid.value:1d1|c",

From a90afd95c6ff204f6ee6f4544a34f379fceec8a0 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 15:57:32 +0000
Subject: [PATCH 0039/1302] Fix & unit test logparser CLF pattern with IPv6

deals partially with #1973

see also https://github.com/vjeantet/grok/issues/17
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/logparser/grok/grok_test.go    | 40 +++++++++++++++++++
 .../inputs/logparser/grok/influx_patterns.go  |  2 +-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b228a891d..a444b19ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ in their config file.
 - [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
 - [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
 - [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
+- [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 105cc048c..1344896b8 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -82,6 +82,46 @@ func TestMeasurementName(t *testing.T) {
 	assert.Equal(t, "my_web_log", m.Name())
 }
 
+func TestCLF_IPv6(t *testing.T) {
+	p := &Parser{
+		Measurement: "my_web_log",
+		Patterns:    []string{"%{COMMON_LOG_FORMAT}"},
+	}
+	assert.NoError(t, p.Compile())
+
+	m, err := p.ParseLine(`2001:0db8:85a3:0000:0000:8a2e:0370:7334 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
+	require.NotNil(t, m)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"resp_bytes":   int64(2326),
+			"auth":         "frank",
+			"client_ip":    "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+			"http_version": float64(1.0),
+			"ident":        "user-identifier",
+			"request":      "/apache_pb.gif",
+		},
+		m.Fields())
+	assert.Equal(t, map[string]string{"verb": "GET", "resp_code": "200"}, m.Tags())
+	assert.Equal(t, "my_web_log", m.Name())
+
+	m, err = p.ParseLine(`::1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
+	require.NotNil(t, m)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"resp_bytes":   int64(2326),
+			"auth":         "frank",
+			"client_ip":    "::1",
+			"http_version": float64(1.0),
+			"ident":        "user-identifier",
+			"request":      "/apache_pb.gif",
+		},
+		m.Fields())
+	assert.Equal(t, map[string]string{"verb": "GET", "resp_code": "200"}, m.Tags())
+	assert.Equal(t, "my_web_log", m.Name())
+}
+
 func TestCustomInfluxdbHttpd(t *testing.T) {
 	p := &Parser{
 		Patterns: []string{`\[httpd\] %{COMBINED_LOG_FORMAT} %{UUID:uuid:drop} %{NUMBER:response_time_us:int}`},
diff --git a/plugins/inputs/logparser/grok/influx_patterns.go b/plugins/inputs/logparser/grok/influx_patterns.go
index 052791140..1b115dadd 100644
--- a/plugins/inputs/logparser/grok/influx_patterns.go
+++ b/plugins/inputs/logparser/grok/influx_patterns.go
@@ -56,7 +56,7 @@ EXAMPLE_LOG \[%{HTTPDATE:ts:ts-httpd}\] %{NUMBER:myfloat:float} %{RESPONSE_CODE}
 NGUSERNAME [a-zA-Z0-9\.\@\-\+_%]+
 NGUSER %{NGUSERNAME}
 # Wider-ranging client IP matching
-CLIENT (?:%{IPORHOST}|%{HOSTPORT}|::1)
+CLIENT (?:%{IPV6}|%{IPV4}|%{HOSTNAME}|%{HOSTPORT})
 
 ##
 ## COMMON LOG PATTERNS

From 1392e73125a3d08869ab16379f0ebb4bc12ca365 Mon Sep 17 00:00:00 2001
From: Matt O'Hara <mhohara@users.noreply.github.com>
Date: Tue, 20 Dec 2016 10:30:03 -0600
Subject: [PATCH 0040/1302] Add clusterstats to elasticsearch plugin (#1979)

* add clusterstats to elasticsearch input plugin

* add clusterstats to elasticsearch input plugin

* add clusterstats to elasticsearch input plugin

* add clusterstats to elasticsearch input plugin

* add clusterstats to elasticsearch input plugin

* responses to requested changes

* remove unnecessary recommendation
---
 etc/telegraf.conf                             |  11 +-
 plugins/inputs/elasticsearch/README.md        |  14 +-
 plugins/inputs/elasticsearch/elasticsearch.go | 167 ++++++++--
 .../elasticsearch/elasticsearch_test.go       | 142 +++++++--
 plugins/inputs/elasticsearch/testdata_test.go | 292 +++++++++++++++++-
 plugins/parsers/json/parser.go                |  33 +-
 6 files changed, 583 insertions(+), 76 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index a7b903388..a6058434c 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -784,13 +784,18 @@
 #   ## Timeout for HTTP requests to the elastic search server(s)
 #   http_timeout = "5s"
 #
-#   ## set local to false when you want to read the indices stats from all nodes
-#   ## within the cluster
+#   ## When local is true (the default), the node will read only its own stats.
+#   ## Set local to false when you want to read the node stats from all nodes
+#   ## of the cluster.
 #   local = true
 #
-#   ## set cluster_health to true when you want to also obtain cluster level stats
+#   ## set cluster_health to true when you want to also obtain cluster health stats
 #   cluster_health = false
 #
+#   ## Set cluster_stats to true when you want to obtain cluster stats from the
+#   ## Master node.
+#   cluster_stats = false
+
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index 2cf6f4d77..9cf9b9b09 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -2,7 +2,8 @@
 
 The [elasticsearch](https://www.elastic.co/) plugin queries endpoints to obtain
 [node](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html)
-and optionally [cluster](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html) stats.
+and optionally [cluster-health](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html)
+or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-stats.html) metrics.
 
 ### Configuration:
 
@@ -14,13 +15,18 @@ and optionally [cluster](https://www.elastic.co/guide/en/elasticsearch/reference
   ## Timeout for HTTP requests to the elastic search server(s)
   http_timeout = "5s"
 
-  ## set local to false when you want to read the indices stats from all nodes
-  ## within the cluster
+  ## When local is true (the default), the node will read only its own stats.
+  ## Set local to false when you want to read the node stats from all nodes
+  ## of the cluster. 
   local = true
 
-  ## set cluster_health to true when you want to also obtain cluster level stats
+  ## Set cluster_health to true when you want to also obtain cluster health stats
   cluster_health = false
 
+  ## Set cluster_stats to true when you want to obtain cluster stats from the 
+  ## Master node. 
+  cluster_stats = false
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index cce3d94ff..5d5d64909 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -12,13 +12,15 @@ import (
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
+	"io/ioutil"
+	"strings"
 )
 
+// Nodestats are always generated, so simply define a constant for these endpoints
 const statsPath = "/_nodes/stats"
 const statsPathLocal = "/_nodes/_local/stats"
-const healthPath = "/_cluster/health"
 
-type node struct {
+type nodeStat struct {
 	Host       string            `json:"host"`
 	Name       string            `json:"name"`
 	Attributes map[string]string `json:"attributes"`
@@ -58,6 +60,20 @@ type indexHealth struct {
 	UnassignedShards    int    `json:"unassigned_shards"`
 }
 
+type clusterStats struct {
+	NodeName    string      `json:"node_name"`
+	ClusterName string      `json:"cluster_name"`
+	Status      string      `json:"status"`
+	Indices     interface{} `json:"indices"`
+	Nodes       interface{} `json:"nodes"`
+}
+
+type catMaster struct {
+	NodeID   string `json:"id"`
+	NodeIP   string `json:"ip"`
+	NodeName string `json:"node"`
+}
+
 const sampleConfig = `
   ## specify a list of one or more Elasticsearch servers
   # you can add username and password to your url to use basic authentication:
@@ -67,13 +83,18 @@ const sampleConfig = `
   ## Timeout for HTTP requests to the elastic search server(s)
   http_timeout = "5s"
 
-  ## set local to false when you want to read the indices stats from all nodes
-  ## within the cluster
+  ## When local is true (the default), the node will read only its own stats.
+  ## Set local to false when you want to read the node stats from all nodes
+  ## of the cluster.
   local = true
 
-  ## set cluster_health to true when you want to also obtain cluster level stats
+  ## Set cluster_health to true when you want to also obtain cluster health stats
   cluster_health = false
 
+  ## Set cluster_stats to true when you want to also obtain cluster stats from the
+  ## Master node.
+  cluster_stats = false
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -85,15 +106,18 @@ const sampleConfig = `
 // Elasticsearch is a plugin to read stats from one or many Elasticsearch
 // servers.
 type Elasticsearch struct {
-	Local              bool
-	Servers            []string
-	HttpTimeout        internal.Duration
-	ClusterHealth      bool
-	SSLCA              string `toml:"ssl_ca"`   // Path to CA file
-	SSLCert            string `toml:"ssl_cert"` // Path to host cert file
-	SSLKey             string `toml:"ssl_key"`  // Path to cert key file
-	InsecureSkipVerify bool   // Use SSL but skip chain & host verification
-	client             *http.Client
+	Local                   bool
+	Servers                 []string
+	HttpTimeout             internal.Duration
+	ClusterHealth           bool
+	ClusterStats            bool
+	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
+	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
+	SSLKey                  string `toml:"ssl_key"`  // Path to cert key file
+	InsecureSkipVerify      bool   // Use SSL but skip chain & host verification
+	client                  *http.Client
+	catMasterResponseTokens []string
+	isMaster                bool
 }
 
 // NewElasticsearch return a new instance of Elasticsearch
@@ -138,12 +162,27 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 			} else {
 				url = s + statsPath
 			}
+			e.isMaster = false
+
+			if e.ClusterStats {
+				// get cat/master information here so NodeStats can determine
+				// whether this node is the Master
+				e.setCatMaster(s + "/_cat/master")
+			}
+
+			// Always gather node states
 			if err := e.gatherNodeStats(url, acc); err != nil {
 				errChan.C <- err
 				return
 			}
+
 			if e.ClusterHealth {
-				e.gatherClusterStats(fmt.Sprintf("%s/_cluster/health?level=indices", s), acc)
+				url = s + "/_cluster/health?level=indices"
+				e.gatherClusterHealth(url, acc)
+			}
+
+			if e.ClusterStats && e.isMaster {
+				e.gatherClusterStats(s+"/_cluster/stats", acc)
 			}
 		}(serv, acc)
 	}
@@ -171,12 +210,13 @@ func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
 
 func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
 	nodeStats := &struct {
-		ClusterName string           `json:"cluster_name"`
-		Nodes       map[string]*node `json:"nodes"`
+		ClusterName string               `json:"cluster_name"`
+		Nodes       map[string]*nodeStat `json:"nodes"`
 	}{}
-	if err := e.gatherData(url, nodeStats); err != nil {
+	if err := e.gatherJsonData(url, nodeStats); err != nil {
 		return err
 	}
+
 	for id, n := range nodeStats.Nodes {
 		tags := map[string]string{
 			"node_id":      id,
@@ -185,6 +225,11 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 			"cluster_name": nodeStats.ClusterName,
 		}
 
+		if e.ClusterStats {
+			// check for master
+			e.isMaster = (id == e.catMasterResponseTokens[0])
+		}
+
 		for k, v := range n.Attributes {
 			tags["node_attribute_"+k] = v
 		}
@@ -204,6 +249,7 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 		now := time.Now()
 		for p, s := range stats {
 			f := jsonparser.JSONFlattener{}
+			// parse Json, ignoring strings and bools
 			err := f.FlattenJSON("", s)
 			if err != nil {
 				return err
@@ -214,31 +260,31 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 	return nil
 }
 
-func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
-	clusterStats := &clusterHealth{}
-	if err := e.gatherData(url, clusterStats); err != nil {
+func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator) error {
+	healthStats := &clusterHealth{}
+	if err := e.gatherJsonData(url, healthStats); err != nil {
 		return err
 	}
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
-		"status":                clusterStats.Status,
-		"timed_out":             clusterStats.TimedOut,
-		"number_of_nodes":       clusterStats.NumberOfNodes,
-		"number_of_data_nodes":  clusterStats.NumberOfDataNodes,
-		"active_primary_shards": clusterStats.ActivePrimaryShards,
-		"active_shards":         clusterStats.ActiveShards,
-		"relocating_shards":     clusterStats.RelocatingShards,
-		"initializing_shards":   clusterStats.InitializingShards,
-		"unassigned_shards":     clusterStats.UnassignedShards,
+		"status":                healthStats.Status,
+		"timed_out":             healthStats.TimedOut,
+		"number_of_nodes":       healthStats.NumberOfNodes,
+		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
+		"active_primary_shards": healthStats.ActivePrimaryShards,
+		"active_shards":         healthStats.ActiveShards,
+		"relocating_shards":     healthStats.RelocatingShards,
+		"initializing_shards":   healthStats.InitializingShards,
+		"unassigned_shards":     healthStats.UnassignedShards,
 	}
 	acc.AddFields(
 		"elasticsearch_cluster_health",
 		clusterFields,
-		map[string]string{"name": clusterStats.ClusterName},
+		map[string]string{"name": healthStats.ClusterName},
 		measurementTime,
 	)
 
-	for name, health := range clusterStats.Indices {
+	for name, health := range healthStats.Indices {
 		indexFields := map[string]interface{}{
 			"status":                health.Status,
 			"number_of_shards":      health.NumberOfShards,
@@ -259,7 +305,60 @@ func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator)
 	return nil
 }
 
-func (e *Elasticsearch) gatherData(url string, v interface{}) error {
+func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
+	clusterStats := &clusterStats{}
+	if err := e.gatherJsonData(url, clusterStats); err != nil {
+		return err
+	}
+	now := time.Now()
+	tags := map[string]string{
+		"node_name":    clusterStats.NodeName,
+		"cluster_name": clusterStats.ClusterName,
+		"status":       clusterStats.Status,
+	}
+
+	stats := map[string]interface{}{
+		"nodes":   clusterStats.Nodes,
+		"indices": clusterStats.Indices,
+	}
+
+	for p, s := range stats {
+		f := jsonparser.JSONFlattener{}
+		// parse json, including bools and strings
+		err := f.FullFlattenJSON("", s, true, true)
+		if err != nil {
+			return err
+		}
+		acc.AddFields("elasticsearch_clusterstats_"+p, f.Fields, tags, now)
+	}
+
+	return nil
+}
+
+func (e *Elasticsearch) setCatMaster(url string) error {
+	r, err := e.client.Get(url)
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+	if r.StatusCode != http.StatusOK {
+		// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
+		// to let the underlying transport close the connection and re-establish a new one for
+		// future calls.
+		return fmt.Errorf("status-code %d, expected %d", r.StatusCode, http.StatusOK)
+	}
+	response, err := ioutil.ReadAll(r.Body)
+
+	if err != nil {
+		return err
+	}
+
+	e.catMasterResponseTokens = strings.Split(string(response), " ")
+
+	return nil
+}
+
+func (e *Elasticsearch) gatherJsonData(url string, v interface{}) error {
 	r, err := e.client.Get(url)
 	if err != nil {
 		return err
@@ -272,9 +371,11 @@ func (e *Elasticsearch) gatherData(url string, v interface{}) error {
 		return fmt.Errorf("elasticsearch: API responded with status-code %d, expected %d",
 			r.StatusCode, http.StatusOK)
 	}
+
 	if err = json.NewDecoder(r.Body).Decode(v); err != nil {
 		return err
 	}
+
 	return nil
 }
 
diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
index 760ac921b..59caa4306 100644
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -8,6 +8,8 @@ import (
 
 	"github.com/influxdata/telegraf/testutil"
 
+	"fmt"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -37,16 +39,13 @@ func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
 func (t *transportMock) CancelRequest(_ *http.Request) {
 }
 
-func TestElasticsearch(t *testing.T) {
-	es := newElasticsearchWithClient()
-	es.Servers = []string{"http://example.com:9200"}
-	es.client.Transport = newTransportMock(http.StatusOK, statsResponse)
-
-	var acc testutil.Accumulator
-	if err := es.Gather(&acc); err != nil {
-		t.Fatal(err)
+func checkIsMaster(es *Elasticsearch, expected bool, t *testing.T) {
+	if es.isMaster != expected {
+		msg := fmt.Sprintf("IsMaster set incorrectly")
+		assert.Fail(t, msg)
 	}
-
+}
+func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
 	tags := map[string]string{
 		"cluster_name":          "es-testcluster",
 		"node_attribute_master": "true",
@@ -55,25 +54,55 @@ func TestElasticsearch(t *testing.T) {
 		"node_host":             "test",
 	}
 
-	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", indicesExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_os", osExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_process", processExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", jvmExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", threadPoolExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", fsExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", transportExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_http", httpExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", breakersExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", nodestatsIndicesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_os", nodestatsOsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_process", nodestatsProcessExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", nodestatsJvmExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
 }
 
-func TestGatherClusterStats(t *testing.T) {
+func TestGather(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+
+	var acc testutil.Accumulator
+	if err := es.Gather(&acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+}
+
+func TestGatherNodeStats(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+
+	var acc testutil.Accumulator
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+}
+
+func TestGatherClusterHealth(t *testing.T) {
 	es := newElasticsearchWithClient()
 	es.Servers = []string{"http://example.com:9200"}
 	es.ClusterHealth = true
-	es.client.Transport = newTransportMock(http.StatusOK, clusterResponse)
+	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponse)
 
 	var acc testutil.Accumulator
-	require.NoError(t, es.Gather(&acc))
+	require.NoError(t, es.gatherClusterHealth("junk", &acc))
+
+	checkIsMaster(es, false, t)
 
 	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
 		clusterHealthExpected,
@@ -88,6 +117,77 @@ func TestGatherClusterStats(t *testing.T) {
 		map[string]string{"index": "v2"})
 }
 
+func TestGatherClusterStatsMaster(t *testing.T) {
+	// This needs multiple steps to replicate the multiple calls internally.
+	es := newElasticsearchWithClient()
+	es.ClusterStats = true
+	es.Servers = []string{"http://example.com:9200"}
+
+	// first get catMaster
+	es.client.Transport = newTransportMock(http.StatusOK, IsMasterResult)
+	require.NoError(t, es.setCatMaster("junk"))
+
+	IsMasterResultTokens := strings.Split(string(IsMasterResult), " ")
+	if es.catMasterResponseTokens[0] != IsMasterResultTokens[0] {
+		msg := fmt.Sprintf("catmaster is incorrect")
+		assert.Fail(t, msg)
+	}
+
+	// now get node status, which determines whether we're master
+	var acc testutil.Accumulator
+	es.Local = true
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, true, t)
+	checkNodeStatsResult(t, &acc)
+
+	// now test the clusterstats method
+	es.client.Transport = newTransportMock(http.StatusOK, clusterStatsResponse)
+	require.NoError(t, es.gatherClusterStats("junk", &acc))
+
+	tags := map[string]string{
+		"cluster_name": "es-testcluster",
+		"node_name":    "test.host.com",
+		"status":       "red",
+	}
+
+	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_nodes", clusterstatsNodesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_indices", clusterstatsIndicesExpected, tags)
+}
+
+func TestGatherClusterStatsNonMaster(t *testing.T) {
+	// This needs multiple steps to replicate the multiple calls internally.
+	es := newElasticsearchWithClient()
+	es.ClusterStats = true
+	es.Servers = []string{"http://example.com:9200"}
+
+	// first get catMaster
+	es.client.Transport = newTransportMock(http.StatusOK, IsNotMasterResult)
+	require.NoError(t, es.setCatMaster("junk"))
+
+	IsNotMasterResultTokens := strings.Split(string(IsNotMasterResult), " ")
+	if es.catMasterResponseTokens[0] != IsNotMasterResultTokens[0] {
+		msg := fmt.Sprintf("catmaster is incorrect")
+		assert.Fail(t, msg)
+	}
+
+	// now get node status, which determines whether we're master
+	var acc testutil.Accumulator
+	es.Local = true
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
+	if err := es.gatherNodeStats("junk", &acc); err != nil {
+		t.Fatal(err)
+	}
+
+	// ensure flag is clear so Cluster Stats would not be done
+	checkIsMaster(es, false, t)
+	checkNodeStatsResult(t, &acc)
+
+}
+
 func newElasticsearchWithClient() *Elasticsearch {
 	es := NewElasticsearch()
 	es.client = &http.Client{}
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index bca1f9e45..19ebb3bfb 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -1,6 +1,6 @@
 package elasticsearch
 
-const clusterResponse = `
+const clusterHealthResponse = `
 {
    "cluster_name": "elasticsearch_telegraf",
    "status": "green",
@@ -71,7 +71,7 @@ var v2IndexExpected = map[string]interface{}{
 	"unassigned_shards":     20,
 }
 
-const statsResponse = `
+const nodeStatsResponse = `
 {
   "cluster_name": "es-testcluster",
   "nodes": {
@@ -489,7 +489,7 @@ const statsResponse = `
 }
 `
 
-var indicesExpected = map[string]interface{}{
+var nodestatsIndicesExpected = map[string]interface{}{
 	"id_cache_memory_size_in_bytes":             float64(0),
 	"completion_size_in_bytes":                  float64(0),
 	"suggest_total":                             float64(0),
@@ -561,7 +561,7 @@ var indicesExpected = map[string]interface{}{
 	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
 }
 
-var osExpected = map[string]interface{}{
+var nodestatsOsExpected = map[string]interface{}{
 	"load_average_0":           float64(0.01),
 	"load_average_1":           float64(0.04),
 	"load_average_2":           float64(0.05),
@@ -576,7 +576,7 @@ var osExpected = map[string]interface{}{
 	"mem_used_in_bytes":        float64(1621868544),
 }
 
-var processExpected = map[string]interface{}{
+var nodestatsProcessExpected = map[string]interface{}{
 	"mem_total_virtual_in_bytes": float64(4747890688),
 	"timestamp":                  float64(1436460392945),
 	"open_file_descriptors":      float64(160),
@@ -586,7 +586,7 @@ var processExpected = map[string]interface{}{
 	"cpu_user_in_millis":         float64(13610),
 }
 
-var jvmExpected = map[string]interface{}{
+var nodestatsJvmExpected = map[string]interface{}{
 	"timestamp":                                     float64(1436460392945),
 	"uptime_in_millis":                              float64(202245),
 	"mem_non_heap_used_in_bytes":                    float64(39634576),
@@ -621,7 +621,7 @@ var jvmExpected = map[string]interface{}{
 	"buffer_pools_mapped_total_capacity_in_bytes":   float64(0),
 }
 
-var threadPoolExpected = map[string]interface{}{
+var nodestatsThreadPoolExpected = map[string]interface{}{
 	"merge_threads":                 float64(6),
 	"merge_queue":                   float64(4),
 	"merge_active":                  float64(5),
@@ -726,7 +726,7 @@ var threadPoolExpected = map[string]interface{}{
 	"flush_completed":               float64(3),
 }
 
-var fsExpected = map[string]interface{}{
+var nodestatsFsExpected = map[string]interface{}{
 	"data_0_total_in_bytes":     float64(19507089408),
 	"data_0_free_in_bytes":      float64(16909316096),
 	"data_0_available_in_bytes": float64(15894814720),
@@ -736,7 +736,7 @@ var fsExpected = map[string]interface{}{
 	"total_total_in_bytes":      float64(19507089408),
 }
 
-var transportExpected = map[string]interface{}{
+var nodestatsTransportExpected = map[string]interface{}{
 	"server_open":      float64(13),
 	"rx_count":         float64(6),
 	"rx_size_in_bytes": float64(1380),
@@ -744,12 +744,12 @@ var transportExpected = map[string]interface{}{
 	"tx_size_in_bytes": float64(1380),
 }
 
-var httpExpected = map[string]interface{}{
+var nodestatsHttpExpected = map[string]interface{}{
 	"current_open": float64(3),
 	"total_opened": float64(3),
 }
 
-var breakersExpected = map[string]interface{}{
+var nodestatsBreakersExpected = map[string]interface{}{
 	"fielddata_estimated_size_in_bytes": float64(0),
 	"fielddata_overhead":                float64(1.03),
 	"fielddata_tripped":                 float64(0),
@@ -763,3 +763,273 @@ var breakersExpected = map[string]interface{}{
 	"parent_limit_size_in_bytes":        float64(727213670),
 	"parent_estimated_size_in_bytes":    float64(0),
 }
+
+const clusterStatsResponse = `
+{
+   "host":"ip-10-0-1-214",
+   "log_type":"metrics",
+   "timestamp":1475767451229,
+   "log_level":"INFO",
+   "node_name":"test.host.com",
+   "cluster_name":"es-testcluster",
+   "status":"red",
+   "indices":{
+      "count":1,
+      "shards":{
+         "total":4,
+         "primaries":4,
+         "replication":0.0,
+         "index":{
+            "shards":{
+               "min":4,
+               "max":4,
+               "avg":4.0
+            },
+            "primaries":{
+               "min":4,
+               "max":4,
+               "avg":4.0
+            },
+            "replication":{
+               "min":0.0,
+               "max":0.0,
+               "avg":0.0
+            }
+         }
+      },
+      "docs":{
+         "count":4,
+         "deleted":0
+      },
+      "store":{
+         "size_in_bytes":17084,
+         "throttle_time_in_millis":0
+      },
+      "fielddata":{
+         "memory_size_in_bytes":0,
+         "evictions":0
+      },
+      "query_cache":{
+         "memory_size_in_bytes":0,
+         "total_count":0,
+         "hit_count":0,
+         "miss_count":0,
+         "cache_size":0,
+         "cache_count":0,
+         "evictions":0
+      },
+      "completion":{
+         "size_in_bytes":0
+      },
+      "segments":{
+         "count":4,
+         "memory_in_bytes":11828,
+         "terms_memory_in_bytes":8932,
+         "stored_fields_memory_in_bytes":1248,
+         "term_vectors_memory_in_bytes":0,
+         "norms_memory_in_bytes":1280,
+         "doc_values_memory_in_bytes":368,
+         "index_writer_memory_in_bytes":0,
+         "index_writer_max_memory_in_bytes":2048000,
+         "version_map_memory_in_bytes":0,
+         "fixed_bit_set_memory_in_bytes":0
+      },
+      "percolate":{
+         "total":0,
+         "time_in_millis":0,
+         "current":0,
+         "memory_size_in_bytes":-1,
+         "memory_size":"-1b",
+         "queries":0
+      }
+   },
+   "nodes":{
+      "count":{
+         "total":1,
+         "master_only":0,
+         "data_only":0,
+         "master_data":1,
+         "client":0
+      },
+      "versions":[
+         {
+         "version": "2.3.3"
+         }
+      ],
+      "os":{
+         "available_processors":1,
+         "allocated_processors":1,
+         "mem":{
+            "total_in_bytes":593301504
+         },
+         "names":[
+            {
+               "name":"Linux",
+               "count":1
+            }
+         ]
+      },
+      "process":{
+         "cpu":{
+            "percent":0
+         },
+         "open_file_descriptors":{
+            "min":145,
+            "max":145,
+            "avg":145
+         }
+      },
+      "jvm":{
+         "max_uptime_in_millis":11580527,
+         "versions":[
+            {
+               "version":"1.8.0_101",
+               "vm_name":"OpenJDK 64-Bit Server VM",
+               "vm_version":"25.101-b13",
+               "vm_vendor":"Oracle Corporation",
+               "count":1
+            }
+         ],
+         "mem":{
+            "heap_used_in_bytes":70550288,
+            "heap_max_in_bytes":1065025536
+         },
+         "threads":30
+      },
+      "fs":{
+         "total_in_bytes":8318783488,
+         "free_in_bytes":6447439872,
+         "available_in_bytes":6344785920
+      },
+      "plugins":[
+         {
+            "name":"cloud-aws",
+            "version":"2.3.3",
+            "description":"The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
+            "jvm":true,
+            "classname":"org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
+            "isolated":true,
+            "site":false
+         },
+         {
+            "name":"kopf",
+            "version":"2.0.1",
+            "description":"kopf - simple web administration tool for Elasticsearch",
+            "url":"/_plugin/kopf/",
+            "jvm":false,
+            "site":true
+         },
+         {
+            "name":"tr-metrics",
+            "version":"7bd5b4b",
+            "description":"Logs cluster and node stats for performance monitoring.",
+            "jvm":true,
+            "classname":"com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
+            "isolated":true,
+            "site":false
+         }
+      ]
+   }
+}
+`
+
+var clusterstatsIndicesExpected = map[string]interface{}{
+	"completion_size_in_bytes":                  float64(0),
+	"count":                                     float64(1),
+	"docs_count":                                float64(4),
+	"docs_deleted":                              float64(0),
+	"fielddata_evictions":                       float64(0),
+	"fielddata_memory_size_in_bytes":            float64(0),
+	"percolate_current":                         float64(0),
+	"percolate_memory_size_in_bytes":            float64(-1),
+	"percolate_queries":                         float64(0),
+	"percolate_time_in_millis":                  float64(0),
+	"percolate_total":                           float64(0),
+	"percolate_memory_size":                     "-1b",
+	"query_cache_cache_count":                   float64(0),
+	"query_cache_cache_size":                    float64(0),
+	"query_cache_evictions":                     float64(0),
+	"query_cache_hit_count":                     float64(0),
+	"query_cache_memory_size_in_bytes":          float64(0),
+	"query_cache_miss_count":                    float64(0),
+	"query_cache_total_count":                   float64(0),
+	"segments_count":                            float64(4),
+	"segments_doc_values_memory_in_bytes":       float64(368),
+	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
+	"segments_index_writer_max_memory_in_bytes": float64(2.048e+06),
+	"segments_index_writer_memory_in_bytes":     float64(0),
+	"segments_memory_in_bytes":                  float64(11828),
+	"segments_norms_memory_in_bytes":            float64(1280),
+	"segments_stored_fields_memory_in_bytes":    float64(1248),
+	"segments_term_vectors_memory_in_bytes":     float64(0),
+	"segments_terms_memory_in_bytes":            float64(8932),
+	"segments_version_map_memory_in_bytes":      float64(0),
+	"shards_index_primaries_avg":                float64(4),
+	"shards_index_primaries_max":                float64(4),
+	"shards_index_primaries_min":                float64(4),
+	"shards_index_replication_avg":              float64(0),
+	"shards_index_replication_max":              float64(0),
+	"shards_index_replication_min":              float64(0),
+	"shards_index_shards_avg":                   float64(4),
+	"shards_index_shards_max":                   float64(4),
+	"shards_index_shards_min":                   float64(4),
+	"shards_primaries":                          float64(4),
+	"shards_replication":                        float64(0),
+	"shards_total":                              float64(4),
+	"store_size_in_bytes":                       float64(17084),
+	"store_throttle_time_in_millis":             float64(0),
+}
+
+var clusterstatsNodesExpected = map[string]interface{}{
+	"count_client":                      float64(0),
+	"count_data_only":                   float64(0),
+	"count_master_data":                 float64(1),
+	"count_master_only":                 float64(0),
+	"count_total":                       float64(1),
+	"fs_available_in_bytes":             float64(6.34478592e+09),
+	"fs_free_in_bytes":                  float64(6.447439872e+09),
+	"fs_total_in_bytes":                 float64(8.318783488e+09),
+	"jvm_max_uptime_in_millis":          float64(1.1580527e+07),
+	"jvm_mem_heap_max_in_bytes":         float64(1.065025536e+09),
+	"jvm_mem_heap_used_in_bytes":        float64(7.0550288e+07),
+	"jvm_threads":                       float64(30),
+	"jvm_versions_0_count":              float64(1),
+	"jvm_versions_0_version":            "1.8.0_101",
+	"jvm_versions_0_vm_name":            "OpenJDK 64-Bit Server VM",
+	"jvm_versions_0_vm_vendor":          "Oracle Corporation",
+	"jvm_versions_0_vm_version":         "25.101-b13",
+	"os_allocated_processors":           float64(1),
+	"os_available_processors":           float64(1),
+	"os_mem_total_in_bytes":             float64(5.93301504e+08),
+	"os_names_0_count":                  float64(1),
+	"os_names_0_name":                   "Linux",
+	"process_cpu_percent":               float64(0),
+	"process_open_file_descriptors_avg": float64(145),
+	"process_open_file_descriptors_max": float64(145),
+	"process_open_file_descriptors_min": float64(145),
+	"versions_0_version":                "2.3.3",
+	"plugins_0_classname":               "org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
+	"plugins_0_description":             "The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
+	"plugins_0_isolated":                true,
+	"plugins_0_jvm":                     true,
+	"plugins_0_name":                    "cloud-aws",
+	"plugins_0_site":                    false,
+	"plugins_0_version":                 "2.3.3",
+	"plugins_1_description":             "kopf - simple web administration tool for Elasticsearch",
+	"plugins_1_jvm":                     false,
+	"plugins_1_name":                    "kopf",
+	"plugins_1_site":                    true,
+	"plugins_1_url":                     "/_plugin/kopf/",
+	"plugins_1_version":                 "2.0.1",
+	"plugins_2_classname":               "com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
+	"plugins_2_description":             "Logs cluster and node stats for performance monitoring.",
+	"plugins_2_isolated":                true,
+	"plugins_2_jvm":                     true,
+	"plugins_2_name":                    "tr-metrics",
+	"plugins_2_site":                    false,
+	"plugins_2_version":                 "7bd5b4b",
+}
+
+const IsMasterResult = "SDFsfSDFsdfFSDSDfSFDSDF 10.206.124.66 10.206.124.66 test.host.com "
+
+const IsNotMasterResult = "junk 10.206.124.66 10.206.124.66 test.junk.com "
diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index edd5afc54..a8743558d 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -103,10 +103,22 @@ type JSONFlattener struct {
 	Fields map[string]interface{}
 }
 
-// FlattenJSON flattens nested maps/interfaces into a fields map
+// FlattenJSON flattens nested maps/interfaces into a fields map (ignoring bools and string)
 func (f *JSONFlattener) FlattenJSON(
+	fieldname string,
+	v interface{}) error {
+	if f.Fields == nil {
+		f.Fields = make(map[string]interface{})
+	}
+	return f.FullFlattenJSON(fieldname, v, false, false)
+}
+
+// FullFlattenJSON flattens nested maps/interfaces into a fields map (including bools and string)
+func (f *JSONFlattener) FullFlattenJSON(
 	fieldname string,
 	v interface{},
+	convertString bool,
+	convertBool bool,
 ) error {
 	if f.Fields == nil {
 		f.Fields = make(map[string]interface{})
@@ -115,7 +127,7 @@ func (f *JSONFlattener) FlattenJSON(
 	switch t := v.(type) {
 	case map[string]interface{}:
 		for k, v := range t {
-			err := f.FlattenJSON(fieldname+"_"+k+"_", v)
+			err := f.FullFlattenJSON(fieldname+"_"+k+"_", v, convertString, convertBool)
 			if err != nil {
 				return err
 			}
@@ -123,15 +135,28 @@ func (f *JSONFlattener) FlattenJSON(
 	case []interface{}:
 		for i, v := range t {
 			k := strconv.Itoa(i)
-			err := f.FlattenJSON(fieldname+"_"+k+"_", v)
+			err := f.FullFlattenJSON(fieldname+"_"+k+"_", v, convertString, convertBool)
 			if err != nil {
 				return nil
 			}
 		}
 	case float64:
 		f.Fields[fieldname] = t
-	case bool, string, nil:
+	case string:
+		if convertString {
+			f.Fields[fieldname] = v.(string)
+		} else {
+			return nil
+		}
+	case bool:
+		if convertBool {
+			f.Fields[fieldname] = v.(bool)
+		} else {
+			return nil
+		}
+	case nil:
 		// ignored types
+		fmt.Println("json parser ignoring " + fieldname)
 		return nil
 	default:
 		return fmt.Errorf("JSON Flattener: got unexpected type %T with value %v (%s)",

From 0ae1e0611c5fc43cb859e2557a50e1b65b76b0df Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 16:30:49 +0000
Subject: [PATCH 0041/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a444b19ca..b85e95195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ in their config file.
 - [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
 - [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf.
 - [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
+- [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
 
 ### Bugfixes
 

From 200237a51559de7f36453e33af736ef23e7af129 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 17:48:06 +0000
Subject: [PATCH 0042/1302] Do not create a global statsd "previous instance"

this basically reverts #887

at some point we might want to do some special handling of reloading
plugins and keeping their state intact, but that will need to be done at
a higher level, and in a way that is thread-safe for multiple input
plugins of the same type.

Unfortunately this is a rather large feature that will not have a quick
fix available for it.

fixes #1975
fixes #2102
---
 CHANGELOG.md                    | 10 ++++++++++
 plugins/inputs/statsd/statsd.go | 18 ++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b85e95195..ed25cf7f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@
 will change te default behavior for users who were not specifying these parameters
 in their config file.
 
+- The StatsD plugin will also no longer save it's state on a service reload.
+Essentially we have reverted PR [#887](https://github.com/influxdata/telegraf/pull/887).
+The reason for this is that saving the state in a global variable is not
+thread-safe (see [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102)),
+and this creates issues if users want to define multiple instances
+of the statsd plugin. Saving state on reload may be considered in the future,
+but this would need to be implemented at a higher level and applied to all
+plugins, not just statsd.
+
 ### Features
 
 - [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
@@ -52,6 +61,7 @@ in their config file.
 - [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
 - [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
 - [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
+- [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 1b0189a9e..d2c627b8a 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -32,8 +32,6 @@ var dropwarn = "E! Error: statsd message queue full. " +
 	"We have dropped %d messages so far. " +
 	"You may want to increase allowed_pending_messages in the config\n"
 
-var prevInstance *Statsd
-
 type Statsd struct {
 	// Address & Port to serve from
 	ServiceAddress string
@@ -244,17 +242,10 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 	s.done = make(chan struct{})
 	s.in = make(chan []byte, s.AllowedPendingMessages)
 
-	if prevInstance == nil {
-		s.gauges = make(map[string]cachedgauge)
-		s.counters = make(map[string]cachedcounter)
-		s.sets = make(map[string]cachedset)
-		s.timings = make(map[string]cachedtimings)
-	} else {
-		s.gauges = prevInstance.gauges
-		s.counters = prevInstance.counters
-		s.sets = prevInstance.sets
-		s.timings = prevInstance.timings
-	}
+	s.gauges = make(map[string]cachedgauge)
+	s.counters = make(map[string]cachedcounter)
+	s.sets = make(map[string]cachedset)
+	s.timings = make(map[string]cachedtimings)
 
 	if s.ConvertNames {
 		log.Printf("I! WARNING statsd: convert_names config option is deprecated," +
@@ -271,7 +262,6 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 	// Start the line parser
 	go s.parser()
 	log.Printf("I! Started the statsd service on %s\n", s.ServiceAddress)
-	prevInstance = s
 	return nil
 }
 

From 8a982ca68fd1a08451f9c1362e243f10ca642f25 Mon Sep 17 00:00:00 2001
From: Mark Wolfe <mark@wolfe.id.au>
Date: Wed, 21 Dec 2016 05:49:28 +1100
Subject: [PATCH 0043/1302] Moved to using the inbuilt serializer. (#1942)

* Moved to using the inbuilt serializer.

* Remove Atomic variable as it is not required.

* Adjusted metric type in line with latest changes.
---
 plugins/outputs/kinesis/kinesis.go      | 46 +++++++++++++------------
 plugins/outputs/kinesis/kinesis_test.go | 39 ---------------------
 2 files changed, 24 insertions(+), 61 deletions(-)
 delete mode 100644 plugins/outputs/kinesis/kinesis_test.go

diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index a30ab8801..8cbdea682 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -1,10 +1,8 @@
 package kinesis
 
 import (
-	"fmt"
 	"log"
 	"os"
-	"sync/atomic"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -13,6 +11,7 @@ import (
 	"github.com/influxdata/telegraf"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
 	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/influxdata/telegraf/plugins/serializers"
 )
 
 type KinesisOutput struct {
@@ -26,9 +25,10 @@ type KinesisOutput struct {
 
 	StreamName   string `toml:"streamname"`
 	PartitionKey string `toml:"partitionkey"`
-	Format       string `toml:"format"`
 	Debug        bool   `toml:"debug"`
 	svc          *kinesis.Kinesis
+
+	serializer serializers.Serializer
 }
 
 var sampleConfig = `
@@ -54,9 +54,13 @@ var sampleConfig = `
   streamname = "StreamName"
   ## PartitionKey as used for sharding data.
   partitionkey = "PartitionKey"
-  ## format of the Data payload in the kinesis PutRecord, supported
-  ## String and Custom.
-  format = "string"
+
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+
   ## debug will show upstream aws messages.
   debug = false
 `
@@ -125,16 +129,8 @@ func (k *KinesisOutput) Close() error {
 	return nil
 }
 
-func FormatMetric(k *KinesisOutput, point telegraf.Metric) (string, error) {
-	if k.Format == "string" {
-		return point.String(), nil
-	} else {
-		m := fmt.Sprintf("%+v,%+v,%+v",
-			point.Name(),
-			point.Tags(),
-			point.String())
-		return m, nil
-	}
+func (k *KinesisOutput) SetSerializer(serializer serializers.Serializer) {
+	k.serializer = serializer
 }
 
 func writekinesis(k *KinesisOutput, r []*kinesis.PutRecordsRequestEntry) time.Duration {
@@ -161,7 +157,7 @@ func writekinesis(k *KinesisOutput, r []*kinesis.PutRecordsRequestEntry) time.Du
 }
 
 func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
-	var sz uint32 = 0
+	var sz uint32
 
 	if len(metrics) == 0 {
 		return nil
@@ -169,23 +165,29 @@ func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 
 	r := []*kinesis.PutRecordsRequestEntry{}
 
-	for _, p := range metrics {
-		atomic.AddUint32(&sz, 1)
+	for _, metric := range metrics {
+		sz++
+
+		values, err := k.serializer.Serialize(metric)
+		if err != nil {
+			return err
+		}
 
-		metric, _ := FormatMetric(k, p)
 		d := kinesis.PutRecordsRequestEntry{
-			Data:         []byte(metric),
+			Data:         values,
 			PartitionKey: aws.String(k.PartitionKey),
 		}
+
 		r = append(r, &d)
 
 		if sz == 500 {
 			// Max Messages Per PutRecordRequest is 500
 			elapsed := writekinesis(k, r)
 			log.Printf("E! Wrote a %+v point batch to Kinesis in %+v.\n", sz, elapsed)
-			atomic.StoreUint32(&sz, 0)
+			sz = 0
 			r = nil
 		}
+
 	}
 
 	writekinesis(k, r)
diff --git a/plugins/outputs/kinesis/kinesis_test.go b/plugins/outputs/kinesis/kinesis_test.go
deleted file mode 100644
index de365fa99..000000000
--- a/plugins/outputs/kinesis/kinesis_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package kinesis
-
-import (
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func TestFormatMetric(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	k := &KinesisOutput{
-		Format: "string",
-	}
-
-	p := testutil.MockMetrics()[0]
-
-	valid_string := "test1,tag1=value1 value=1 1257894000000000000\n"
-	func_string, err := FormatMetric(k, p)
-
-	if func_string != valid_string {
-		t.Error("Expected ", valid_string)
-	}
-	require.NoError(t, err)
-
-	k = &KinesisOutput{
-		Format: "custom",
-	}
-
-	valid_custom := "test1,map[tag1:value1],test1,tag1=value1 value=1 1257894000000000000\n"
-	func_custom, err := FormatMetric(k, p)
-
-	if func_custom != valid_custom {
-		t.Error("Expected ", valid_custom)
-	}
-	require.NoError(t, err)
-}

From 7fc57812a711247c4abcb0d160bddfdc5a354ba8 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 18:50:32 +0000
Subject: [PATCH 0044/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed25cf7f7..07e589ce3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ plugins, not just statsd.
 - [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf.
 - [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
 - [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
+- [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
 
 ### Bugfixes
 

From a9f03a72f5aadf198f8c4ef8a99513b0801c4050 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 19:32:04 +0000
Subject: [PATCH 0045/1302] Mask username/password from error messages

closes #1980
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/elasticsearch/elasticsearch.go | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07e589ce3..7ad357f66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ plugins, not just statsd.
 - [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
 - [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
 - [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
+- [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 5d5d64909..370e3fbdd 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"regexp"
 	"sync"
 	"time"
 
@@ -16,6 +17,9 @@ import (
 	"strings"
 )
 
+// mask for masking username/password from error messages
+var mask = regexp.MustCompile(`https?:\/\/\S+:\S+@`)
+
 // Nodestats are always generated, so simply define a constant for these endpoints
 const statsPath = "/_nodes/stats"
 const statsPathLocal = "/_nodes/_local/stats"
@@ -149,7 +153,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 		e.client = client
 	}
 
-	errChan := errchan.New(len(e.Servers))
+	errChan := errchan.New(len(e.Servers) * 3)
 	var wg sync.WaitGroup
 	wg.Add(len(e.Servers))
 
@@ -172,17 +176,26 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 
 			// Always gather node states
 			if err := e.gatherNodeStats(url, acc); err != nil {
+				err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
 				errChan.C <- err
 				return
 			}
 
 			if e.ClusterHealth {
 				url = s + "/_cluster/health?level=indices"
-				e.gatherClusterHealth(url, acc)
+				if err := e.gatherClusterHealth(url, acc); err != nil {
+					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
+					errChan.C <- err
+					return
+				}
 			}
 
 			if e.ClusterStats && e.isMaster {
-				e.gatherClusterStats(s+"/_cluster/stats", acc)
+				if err := e.gatherClusterStats(s+"/_cluster/stats", acc); err != nil {
+					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
+					errChan.C <- err
+					return
+				}
 			}
 		}(serv, acc)
 	}

From d2787e8ef53b95c95603f9f1a339c0eb9e32df3e Mon Sep 17 00:00:00 2001
From: Mark Wolfe <mark@wolfe.id.au>
Date: Wed, 21 Dec 2016 09:56:02 +1100
Subject: [PATCH 0046/1302] Fix for loop over value array range issue. (#2187)

---
 plugins/inputs/system/ps.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index a885e2d59..b0e021e40 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -73,7 +73,10 @@ func (s *systemPS) DiskUsage(
 	var usage []*disk.UsageStat
 	var partitions []*disk.PartitionStat
 
-	for _, p := range parts {
+	for i := range parts {
+
+		p := parts[i]
+
 		if len(mountPointFilter) > 0 {
 			// If the mount point is not a member of the filter set,
 			// don't gather info on it.

From bf5f2659a15e5bfae673ae66f25edff0d4c9a49c Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 20 Dec 2016 23:21:40 +0000
Subject: [PATCH 0047/1302] Do not try Uint parsing in redis plugin

this is just a waste of cpu cycles, since telegraf converts all uints to
int64 anyways.
---
 plugins/inputs/redis/redis.go      | 16 ++----
 plugins/inputs/redis/redis_test.go | 84 +++++++++++++++---------------
 2 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 98a6bc659..2dd947a2a 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -158,7 +158,7 @@ func gatherInfoOutput(
 	tags map[string]string,
 ) error {
 	var section string
-	var keyspace_hits, keyspace_misses uint64 = 0, 0
+	var keyspace_hits, keyspace_misses int64
 
 	scanner := bufio.NewScanner(rdr)
 	fields := make(map[string]interface{})
@@ -210,8 +210,8 @@ func gatherInfoOutput(
 
 		val := strings.TrimSpace(parts[1])
 
-		// Try parsing as a uint
-		if ival, err := strconv.ParseUint(val, 10, 64); err == nil {
+		// Try parsing as int
+		if ival, err := strconv.ParseInt(val, 10, 64); err == nil {
 			switch name {
 			case "keyspace_hits":
 				keyspace_hits = ival
@@ -219,18 +219,12 @@ func gatherInfoOutput(
 				keyspace_misses = ival
 			case "rdb_last_save_time":
 				// influxdb can't calculate this, so we have to do it
-				fields["rdb_last_save_time_elapsed"] = uint64(time.Now().Unix()) - ival
+				fields["rdb_last_save_time_elapsed"] = time.Now().Unix() - ival
 			}
 			fields[metric] = ival
 			continue
 		}
 
-		// Try parsing as an int
-		if ival, err := strconv.ParseInt(val, 10, 64); err == nil {
-			fields[metric] = ival
-			continue
-		}
-
 		// Try parsing as a float
 		if fval, err := strconv.ParseFloat(val, 64); err == nil {
 			fields[metric] = fval
@@ -275,7 +269,7 @@ func gatherKeyspaceLine(
 		dbparts := strings.Split(line, ",")
 		for _, dbp := range dbparts {
 			kv := strings.Split(dbp, "=")
-			ival, err := strconv.ParseUint(kv[1], 10, 64)
+			ival, err := strconv.ParseInt(kv[1], 10, 64)
 			if err == nil {
 				fields[kv[0]] = ival
 			}
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index cf62da0bd..0c3781500 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -39,53 +39,53 @@ func TestRedis_ParseMetrics(t *testing.T) {
 
 	tags = map[string]string{"host": "redis.net", "replication_role": "master"}
 	fields := map[string]interface{}{
-		"uptime":                         uint64(238),
-		"lru_clock":                      uint64(2364819),
-		"clients":                        uint64(1),
-		"client_longest_output_list":     uint64(0),
-		"client_biggest_input_buf":       uint64(0),
-		"blocked_clients":                uint64(0),
-		"used_memory":                    uint64(1003936),
-		"used_memory_rss":                uint64(811008),
-		"used_memory_peak":               uint64(1003936),
-		"used_memory_lua":                uint64(33792),
+		"uptime":                         int64(238),
+		"lru_clock":                      int64(2364819),
+		"clients":                        int64(1),
+		"client_longest_output_list":     int64(0),
+		"client_biggest_input_buf":       int64(0),
+		"blocked_clients":                int64(0),
+		"used_memory":                    int64(1003936),
+		"used_memory_rss":                int64(811008),
+		"used_memory_peak":               int64(1003936),
+		"used_memory_lua":                int64(33792),
 		"mem_fragmentation_ratio":        float64(0.81),
-		"loading":                        uint64(0),
-		"rdb_changes_since_last_save":    uint64(0),
-		"rdb_bgsave_in_progress":         uint64(0),
-		"rdb_last_save_time":             uint64(1428427941),
+		"loading":                        int64(0),
+		"rdb_changes_since_last_save":    int64(0),
+		"rdb_bgsave_in_progress":         int64(0),
+		"rdb_last_save_time":             int64(1428427941),
 		"rdb_last_bgsave_status":         "ok",
 		"rdb_last_bgsave_time_sec":       int64(-1),
 		"rdb_current_bgsave_time_sec":    int64(-1),
-		"aof_enabled":                    uint64(0),
-		"aof_rewrite_in_progress":        uint64(0),
-		"aof_rewrite_scheduled":          uint64(0),
+		"aof_enabled":                    int64(0),
+		"aof_rewrite_in_progress":        int64(0),
+		"aof_rewrite_scheduled":          int64(0),
 		"aof_last_rewrite_time_sec":      int64(-1),
 		"aof_current_rewrite_time_sec":   int64(-1),
 		"aof_last_bgrewrite_status":      "ok",
 		"aof_last_write_status":          "ok",
-		"total_connections_received":     uint64(2),
-		"total_commands_processed":       uint64(1),
-		"instantaneous_ops_per_sec":      uint64(0),
+		"total_connections_received":     int64(2),
+		"total_commands_processed":       int64(1),
+		"instantaneous_ops_per_sec":      int64(0),
 		"instantaneous_input_kbps":       float64(876.16),
 		"instantaneous_output_kbps":      float64(3010.23),
-		"rejected_connections":           uint64(0),
-		"sync_full":                      uint64(0),
-		"sync_partial_ok":                uint64(0),
-		"sync_partial_err":               uint64(0),
-		"expired_keys":                   uint64(0),
-		"evicted_keys":                   uint64(0),
-		"keyspace_hits":                  uint64(1),
-		"keyspace_misses":                uint64(1),
-		"pubsub_channels":                uint64(0),
-		"pubsub_patterns":                uint64(0),
-		"latest_fork_usec":               uint64(0),
-		"connected_slaves":               uint64(0),
-		"master_repl_offset":             uint64(0),
-		"repl_backlog_active":            uint64(0),
-		"repl_backlog_size":              uint64(1048576),
-		"repl_backlog_first_byte_offset": uint64(0),
-		"repl_backlog_histlen":           uint64(0),
+		"rejected_connections":           int64(0),
+		"sync_full":                      int64(0),
+		"sync_partial_ok":                int64(0),
+		"sync_partial_err":               int64(0),
+		"expired_keys":                   int64(0),
+		"evicted_keys":                   int64(0),
+		"keyspace_hits":                  int64(1),
+		"keyspace_misses":                int64(1),
+		"pubsub_channels":                int64(0),
+		"pubsub_patterns":                int64(0),
+		"latest_fork_usec":               int64(0),
+		"connected_slaves":               int64(0),
+		"master_repl_offset":             int64(0),
+		"repl_backlog_active":            int64(0),
+		"repl_backlog_size":              int64(1048576),
+		"repl_backlog_first_byte_offset": int64(0),
+		"repl_backlog_histlen":           int64(0),
 		"used_cpu_sys":                   float64(0.14),
 		"used_cpu_user":                  float64(0.05),
 		"used_cpu_sys_children":          float64(0.00),
@@ -102,15 +102,15 @@ func TestRedis_ParseMetrics(t *testing.T) {
 		}
 	}
 	assert.InDelta(t,
-		uint64(time.Now().Unix())-fields["rdb_last_save_time"].(uint64),
-		fields["rdb_last_save_time_elapsed"].(uint64),
+		time.Now().Unix()-fields["rdb_last_save_time"].(int64),
+		fields["rdb_last_save_time_elapsed"].(int64),
 		2) // allow for 2 seconds worth of offset
 
 	keyspaceTags := map[string]string{"host": "redis.net", "replication_role": "master", "database": "db0"}
 	keyspaceFields := map[string]interface{}{
-		"avg_ttl": uint64(0),
-		"expires": uint64(0),
-		"keys":    uint64(2),
+		"avg_ttl": int64(0),
+		"expires": int64(0),
+		"keys":    int64(2),
 	}
 	acc.AssertContainsTaggedFields(t, "redis", fields, tags)
 	acc.AssertContainsTaggedFields(t, "redis_keyspace", keyspaceFields, keyspaceTags)

From b762546fa7aa17be693f392cdf719fbebaccf663 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 21 Dec 2016 10:51:07 +0000
Subject: [PATCH 0048/1302] docker: check type when totalling blkio & net
 metrics

closes #2027
---
 CHANGELOG.md                    |  1 +
 plugins/inputs/docker/docker.go | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ad357f66..dd0f848a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ plugins, not just statsd.
 - [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
 - [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
 - [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
+- [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 7fc48689f..82a3791b6 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -368,11 +368,22 @@ func gatherContainerStats(
 				if field == "container_id" {
 					continue
 				}
+
+				var uintV uint64
+				switch v := value.(type) {
+				case uint64:
+					uintV = v
+				case int64:
+					uintV = uint64(v)
+				default:
+					continue
+				}
+
 				_, ok := totalNetworkStatMap[field]
 				if ok {
-					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + value.(uint64)
+					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + uintV
 				} else {
-					totalNetworkStatMap[field] = value
+					totalNetworkStatMap[field] = uintV
 				}
 			}
 		}
@@ -491,11 +502,22 @@ func gatherBlockIOMetrics(
 				if field == "container_id" {
 					continue
 				}
+
+				var uintV uint64
+				switch v := value.(type) {
+				case uint64:
+					uintV = v
+				case int64:
+					uintV = uint64(v)
+				default:
+					continue
+				}
+
 				_, ok := totalStatMap[field]
 				if ok {
-					totalStatMap[field] = totalStatMap[field].(uint64) + value.(uint64)
+					totalStatMap[field] = totalStatMap[field].(uint64) + uintV
 				} else {
-					totalStatMap[field] = value
+					totalStatMap[field] = uintV
 				}
 			}
 		}

From 37bc9cf79514184f065519bbacf972d0b686aed7 Mon Sep 17 00:00:00 2001
From: Dominik Labuda <dominikla@gmail.com>
Date: Wed, 21 Dec 2016 13:41:58 +0100
Subject: [PATCH 0049/1302] [plugins] jolokia input plugin: configurable http
 timeouts (#2098)

---
 CHANGELOG.md                      |  1 +
 plugins/inputs/jolokia/README.md  | 11 +++++++++-
 plugins/inputs/jolokia/jolokia.go | 34 ++++++++++++++++++++++++++-----
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd0f848a2..dd044a941 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ plugins, not just statsd.
 - [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
 - [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
 - [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
+- [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 
 ### Bugfixes
 
diff --git a/plugins/inputs/jolokia/README.md b/plugins/inputs/jolokia/README.md
index d25ab6f46..9d33c8a2b 100644
--- a/plugins/inputs/jolokia/README.md
+++ b/plugins/inputs/jolokia/README.md
@@ -18,7 +18,16 @@
   # [inputs.jolokia.proxy]
   #   host = "127.0.0.1"
   #   port = "8080"
-
+  
+  ## Optional http timeouts
+  ##
+  ## response_header_timeout, if non-zero, specifies the amount of time to wait
+  ## for a server's response headers after fully writing the request.
+  # response_header_timeout = "3s"
+  ##
+  ## client_timeout specifies a time limit for requests made by this client.
+  ## Includes connection time, any redirects, and reading the response body.
+  # client_timeout = "4s"
 
   ## List of servers exposing jolokia read service
   [[inputs.jolokia.servers]]
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 812e5e66b..32e6a9f57 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -11,9 +11,14 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+// Default http timeouts
+var DefaultResponseHeaderTimeout = internal.Duration{Duration: 3 * time.Second}
+var DefaultClientTimeout = internal.Duration{Duration: 4 * time.Second}
+
 type Server struct {
 	Name     string
 	Host     string
@@ -48,6 +53,9 @@ type Jolokia struct {
 	Servers []Server
 	Metrics []Metric
 	Proxy   Server
+
+	ResponseHeaderTimeout internal.Duration `toml:"response_header_timeout"`
+	ClientTimeout         internal.Duration `toml:"client_timeout"`
 }
 
 const sampleConfig = `
@@ -66,6 +74,15 @@ const sampleConfig = `
   #   host = "127.0.0.1"
   #   port = "8080"
 
+  ## Optional http timeouts
+  ##
+  ## response_header_timeout, if non-zero, specifies the amount of time to wait
+  ## for a server's response headers after fully writing the request.
+  # response_header_timeout = "3s"
+  ##
+  ## client_timeout specifies a time limit for requests made by this client.
+  ## Includes connection time, any redirects, and reading the response body.
+  # client_timeout = "4s"
 
   ## List of servers exposing jolokia read service
   [[inputs.jolokia.servers]]
@@ -232,6 +249,15 @@ func extractValues(measurement string, value interface{}, fields map[string]inte
 }
 
 func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
+
+	if j.jClient == nil {
+		tr := &http.Transport{ResponseHeaderTimeout: j.ResponseHeaderTimeout.Duration}
+		j.jClient = &JolokiaClientImpl{&http.Client{
+			Transport: tr,
+			Timeout:   j.ClientTimeout.Duration,
+		}}
+	}
+
 	servers := j.Servers
 	metrics := j.Metrics
 	tags := make(map[string]string)
@@ -272,11 +298,9 @@ func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("jolokia", func() telegraf.Input {
-		tr := &http.Transport{ResponseHeaderTimeout: time.Duration(3 * time.Second)}
-		client := &http.Client{
-			Transport: tr,
-			Timeout:   time.Duration(4 * time.Second),
+		return &Jolokia{
+			ResponseHeaderTimeout: DefaultResponseHeaderTimeout,
+			ClientTimeout:         DefaultClientTimeout,
 		}
-		return &Jolokia{jClient: &JolokiaClientImpl{client: client}}
 	})
 }

From fd1feff7b4cb48cbde3adc25c0a44a6d7bea947f Mon Sep 17 00:00:00 2001
From: YKlausz <yklausz@ippon.fr>
Date: Wed, 21 Dec 2016 18:23:54 +0100
Subject: [PATCH 0050/1302] Remove print call in cassandra plugin (#2192)

---
 plugins/inputs/cassandra/cassandra.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index dc4bb2b72..710a2b661 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -289,7 +289,6 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 				requestUrl.User = url.UserPassword(serverTokens["user"],
 					serverTokens["passwd"])
 			}
-			fmt.Printf("host %s url %s\n", serverTokens["host"], requestUrl)
 
 			out, err := c.getAttr(requestUrl)
 			if out["status"] != 200.0 {

From 4b08d127e0c87235d560f6633ebd79f4a0457235 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 6 Jan 2017 13:11:24 +0100
Subject: [PATCH 0051/1302] mongodb: dont print unecessary & inaccurate auth
 failure

closes #2209
---
 plugins/inputs/mongodb/mongodb.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index a4bdabd96..0bf822a4c 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -130,7 +130,6 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 
 		sess, err := mgo.DialWithInfo(dialInfo)
 		if err != nil {
-			fmt.Printf("error dialing over ssl, %s\n", err.Error())
 			return fmt.Errorf("Unable to connect to MongoDB, %s\n", err.Error())
 		}
 		server.Session = sess

From 7279018cfee7827fb67c4487c41fc3c35f255977 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 9 Jan 2017 12:28:13 +0000
Subject: [PATCH 0052/1302] readme fixup & test output fixup

---
 internal/models/running_input.go       | 2 +-
 plugins/inputs/system/SYSTEM_README.md | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/models/running_input.go b/internal/models/running_input.go
index 4279a7f62..e9b757bbf 100644
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -75,7 +75,7 @@ func (r *RunningInput) MakeMetric(
 	)
 
 	if r.trace && m != nil {
-		fmt.Println("> " + m.String())
+		fmt.Print("> " + m.String())
 	}
 
 	r.MetricsGathered.Incr(1)
diff --git a/plugins/inputs/system/SYSTEM_README.md b/plugins/inputs/system/SYSTEM_README.md
index fc873c7e8..2fcde4e6b 100644
--- a/plugins/inputs/system/SYSTEM_README.md
+++ b/plugins/inputs/system/SYSTEM_README.md
@@ -19,6 +19,7 @@ to the unix `uptime` command.
     - load15 (float)
     - load5 (float)
     - n_users (integer)
+    - n_cpus (integer)
     - uptime (integer, seconds)
     - uptime_format (string)
 
@@ -31,5 +32,7 @@ None
 ```
 $ telegraf -config ~/ws/telegraf.conf -input-filter system -test
 * Plugin: system, Collection 1
-> system load1=2.05,load15=2.38,load5=2.03,n_users=4i,uptime=239043i,uptime_format="2 days, 18:24" 1457546165399253452
+* Plugin: inputs.system, Collection 1
+> system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
+> system,host=tyrion uptime=1249632i,uptime_format="14 days, 11:07" 1483964144000000000
 ```

From 5f6766f6e18ec8f5d3e639fd70364d0ed5574aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vizcaino?=
 <j-vizcaino@users.noreply.github.com>
Date: Mon, 9 Jan 2017 13:51:15 +0100
Subject: [PATCH 0053/1302] ceph: sample config should reflect actual defaults
 (#2228)

---
 plugins/inputs/ceph/README.md | 2 +-
 plugins/inputs/ceph/ceph.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/ceph/README.md b/plugins/inputs/ceph/README.md
index 49ae09e73..b3bba1e50 100644
--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -82,7 +82,7 @@ the cluster.  The currently supported commands are:
 
   ## Whether to gather statistics via ceph commands, requires ceph_user and ceph_config
   ## to be specified
-  gather_cluster_stats = true
+  gather_cluster_stats = false
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go
index 9f0a6ac78..e43c3d7d3 100644
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -68,7 +68,7 @@ var sampleConfig = `
   gather_admin_socket_stats = true
 
   ## Whether to gather statistics via ceph commands
-  gather_cluster_stats = true
+  gather_cluster_stats = false
 `
 
 func (c *Ceph) SampleConfig() string {

From a658e6c509510b39d2fc924c64bf97863265dc94 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 9 Jan 2017 08:03:33 -0500
Subject: [PATCH 0054/1302] ensure proper context on snmp error messages
 (#2220)

---
 CHANGELOG.md                |  1 +
 plugins/inputs/snmp/snmp.go | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd044a941..74bed1278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ plugins, not just statsd.
 - [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
 - [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
 - [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
+- [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 5426bf28c..6f515e227 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -146,13 +146,13 @@ func (s *Snmp) init() error {
 
 	for i := range s.Tables {
 		if err := s.Tables[i].init(); err != nil {
-			return err
+			return Errorf(err, "initializing table %s", s.Tables[i].Name)
 		}
 	}
 
 	for i := range s.Fields {
 		if err := s.Fields[i].init(); err != nil {
-			return err
+			return Errorf(err, "initializing field %s", s.Fields[i].Name)
 		}
 	}
 
@@ -192,7 +192,7 @@ func (t *Table) init() error {
 	// initialize all the nested fields
 	for i := range t.Fields {
 		if err := t.Fields[i].init(); err != nil {
-			return err
+			return Errorf(err, "initializing field %s", t.Fields[i].Name)
 		}
 	}
 
@@ -210,7 +210,7 @@ func (t *Table) initBuild() error {
 
 	_, _, oidText, fields, err := snmpTable(t.Oid)
 	if err != nil {
-		return Errorf(err, "initializing table %s", t.Oid)
+		return err
 	}
 	if t.Name == "" {
 		t.Name = oidText
@@ -252,7 +252,7 @@ func (f *Field) init() error {
 
 	_, oidNum, oidText, conversion, err := snmpTranslate(f.Oid)
 	if err != nil {
-		return Errorf(err, "translating %s", f.Oid)
+		return Errorf(err, "translating")
 	}
 	f.Oid = oidNum
 	if f.Name == "" {
@@ -358,7 +358,7 @@ func (s *Snmp) Gather(acc telegraf.Accumulator) error {
 		// Now is the real tables.
 		for _, t := range s.Tables {
 			if err := s.gatherTable(acc, gs, t, topTags, true); err != nil {
-				acc.AddError(Errorf(err, "agent %s", agent))
+				acc.AddError(Errorf(err, "agent %s: gathering table %s", agent, t.Name))
 			}
 		}
 	}
@@ -406,7 +406,7 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 		}
 
 		if len(f.Oid) == 0 {
-			return nil, fmt.Errorf("cannot have empty OID")
+			return nil, fmt.Errorf("cannot have empty OID on field %s", f.Name)
 		}
 		var oid string
 		if f.Oid[0] == '.' {
@@ -426,12 +426,12 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 			// empty string. This results in all the non-table fields sharing the same
 			// index, and being added on the same row.
 			if pkt, err := gs.Get([]string{oid}); err != nil {
-				return nil, Errorf(err, "performing get")
+				return nil, Errorf(err, "performing get on field %s", f.Name)
 			} else if pkt != nil && len(pkt.Variables) > 0 && pkt.Variables[0].Type != gosnmp.NoSuchObject && pkt.Variables[0].Type != gosnmp.NoSuchInstance {
 				ent := pkt.Variables[0]
 				fv, err := fieldConvert(f.Conversion, ent.Value)
 				if err != nil {
-					return nil, Errorf(err, "converting %q", ent.Value)
+					return nil, Errorf(err, "converting %q (OID %s) for field %s", ent.Value, ent.Name, f.Name)
 				}
 				if fvs, ok := fv.(string); !ok || fvs != "" {
 					ifv[""] = fv
@@ -454,7 +454,7 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 
 				fv, err := fieldConvert(f.Conversion, ent.Value)
 				if err != nil {
-					return Errorf(err, "converting %q", ent.Value)
+					return Errorf(err, "converting %q (OID %s) for field %s", ent.Value, ent.Name, f.Name)
 				}
 				if fvs, ok := fv.(string); !ok || fvs != "" {
 					ifv[idx] = fv
@@ -463,7 +463,7 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 			})
 			if err != nil {
 				if _, ok := err.(NestedError); !ok {
-					return nil, Errorf(err, "performing bulk walk")
+					return nil, Errorf(err, "performing bulk walk for field %s", f.Name)
 				}
 			}
 		}

From 2aa2c796e5867c5652144c341d259e2b2c61746f Mon Sep 17 00:00:00 2001
From: Kurt Mackey <mrkurt@gmail.com>
Date: Mon, 9 Jan 2017 08:48:32 -0600
Subject: [PATCH 0055/1302] Fix for broken librato output (#2225)

* Fix for broken librato output

These errors are delightful, but I'd rather avoid them:

```
Error parsing /etc/telegraf/telegraf.conf, line 2: field corresponding to `api_user' is not defined in `*librato.Librato'
```

* Fixed bad format from last commit
---
 plugins/outputs/librato/librato.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go
index 3c4cb6d2a..ed020d54f 100644
--- a/plugins/outputs/librato/librato.go
+++ b/plugins/outputs/librato/librato.go
@@ -17,8 +17,8 @@ import (
 
 // Librato structure for configuration and client
 type Librato struct {
-	APIUser   string
-	APIToken  string
+	APIUser   string `toml:"api_user"`
+	APIToken  string `toml:"api_token"`
 	Debug     bool
 	SourceTag string // Deprecated, keeping for backward-compatibility
 	Timeout   internal.Duration

From 81f95e7a298b0a938bb8522f2f8b4c0b34ea7cb2 Mon Sep 17 00:00:00 2001
From: Emil Haugbergsmyr <emil@raeven.net>
Date: Wed, 11 Jan 2017 17:24:09 +0100
Subject: [PATCH 0056/1302] Fixes change in Kafka consumer input plugin (#2222)

* Fixes change to the error api in the kafka project.

* Updated test to reflect the change.

* Update kafka to match master branch.
---
 Godeps                                               | 2 +-
 plugins/inputs/kafka_consumer/kafka_consumer.go      | 2 +-
 plugins/inputs/kafka_consumer/kafka_consumer_test.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Godeps b/Godeps
index 6a0a17df1..885213c96 100644
--- a/Godeps
+++ b/Godeps
@@ -52,7 +52,7 @@ github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
-github.com/wvanbergen/kafka 46f9a1cf3f670edec492029fadded9c2d9e18866
+github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
 github.com/yuin/gopher-lua bf3808abd44b1e55143a2d7f08571aaa80db1808
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index 52117759d..f4176edd3 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -33,7 +33,7 @@ type Kafka struct {
 	// channel for all incoming kafka messages
 	in <-chan *sarama.ConsumerMessage
 	// channel for all kafka consumer errors
-	errs <-chan *sarama.ConsumerError
+	errs <-chan error
 	done chan struct{}
 
 	// keep the accumulator internally:
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 1777aa89e..c4936974f 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -27,7 +27,7 @@ func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) {
 		Offset:          "oldest",
 		in:              in,
 		doNotCommitMsgs: true,
-		errs:            make(chan *sarama.ConsumerError, 1000),
+		errs:            make(chan error, 1000),
 		done:            make(chan struct{}),
 	}
 	return &k, in

From 31a4f03031dcec9db7da6d8d0cddd09122bb11d5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 11 Jan 2017 17:50:01 +0000
Subject: [PATCH 0057/1302] mongodb: Remove superfluous ReplSet log message

closes #2248
---
 plugins/inputs/mongodb/mongodb_server.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/mongodb/mongodb_server.go b/plugins/inputs/mongodb/mongodb_server.go
index e843c70f0..2bab8242b 100644
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -40,15 +40,14 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		return err
 	}
 	result_repl := &ReplSetStatus{}
-	err = s.Session.DB("admin").Run(bson.D{
+	// ignore error because it simply indicates that the db is not a member
+	// in a replica set, which is fine.
+	_ = s.Session.DB("admin").Run(bson.D{
 		{
 			Name:  "replSetGetStatus",
 			Value: 1,
 		},
 	}, result_repl)
-	if err != nil {
-		log.Println("E! Not gathering replica set status, member not in replica set (" + err.Error() + ")")
-	}
 
 	jumbo_chunks, _ := s.Session.DB("config").C("chunks").Find(bson.M{"jumbo": true}).Count()
 

From 947e1909ff96a700c5eed44d9f8c2f9a742b0379 Mon Sep 17 00:00:00 2001
From: Mohammad Ali Alfarra <ma.alfarra@gmail.com>
Date: Thu, 12 Jan 2017 16:47:01 +0800
Subject: [PATCH 0058/1302] Document basic auth for haproxy (#2258)

* Document basic auth for haproxy

* Typo in haproxy readme
---
 plugins/inputs/haproxy/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index 52be25aa7..7f2bfa1dd 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -12,6 +12,8 @@
 
 Server addresses need to explicitly start with 'http' if you wish to use HAproxy status page. Otherwise, address will be assumed to be an UNIX socket and protocol (if present) will be discarded.
 
+For basic authentication you need to add username and password in the URL: `http://user:password@1.2.3.4/haproxy?stats`.
+
 Following examples will all resolve to the same socket:
 ```
 socket:/var/run/haproxy.sock

From b7d29ca0e94cb9a89af16f313aefd5d19d5fc002 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Thu, 12 Jan 2017 06:08:22 -0500
Subject: [PATCH 0059/1302] allow changing jolokia delimiter (#2255)

---
 CHANGELOG.md                           |  1 +
 plugins/inputs/jolokia/jolokia.go      | 27 +++++++++++++++++---------
 plugins/inputs/jolokia/jolokia_test.go |  7 ++++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74bed1278..8919669d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ plugins, not just statsd.
 - [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
 - [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
 - [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
+- [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
 
 ### Bugfixes
 
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 32e6a9f57..7f371c935 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -47,12 +47,13 @@ func (c JolokiaClientImpl) MakeRequest(req *http.Request) (*http.Response, error
 }
 
 type Jolokia struct {
-	jClient JolokiaClient
-	Context string
-	Mode    string
-	Servers []Server
-	Metrics []Metric
-	Proxy   Server
+	jClient   JolokiaClient
+	Context   string
+	Mode      string
+	Servers   []Server
+	Metrics   []Metric
+	Proxy     Server
+	Delimiter string
 
 	ResponseHeaderTimeout internal.Duration `toml:"response_header_timeout"`
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
@@ -84,6 +85,13 @@ const sampleConfig = `
   ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
+  ## Attribute delimiter
+  ##
+  ## When multiple attributes are returned for a single
+  ## [inputs.jolokia.metrics], the field name is a concatenation of the metric
+  ## name, and the attribute name, separated by the given delimiter.
+  # delimiter = "_"
+
   ## List of servers exposing jolokia read service
   [[inputs.jolokia.servers]]
     name = "as-server-01"
@@ -238,10 +246,10 @@ func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, e
 	return req, nil
 }
 
-func extractValues(measurement string, value interface{}, fields map[string]interface{}) {
+func (j *Jolokia) extractValues(measurement string, value interface{}, fields map[string]interface{}) {
 	if mapValues, ok := value.(map[string]interface{}); ok {
 		for k2, v2 := range mapValues {
-			extractValues(measurement+"_"+k2, v2, fields)
+			j.extractValues(measurement+j.Delimiter+k2, v2, fields)
 		}
 	} else {
 		fields[measurement] = value
@@ -282,7 +290,7 @@ func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 				fmt.Printf("Error handling response: %s\n", err)
 			} else {
 				if values, ok := out["value"]; ok {
-					extractValues(measurement, values, fields)
+					j.extractValues(measurement, values, fields)
 				} else {
 					fmt.Printf("Missing key 'value' in output response\n")
 				}
@@ -301,6 +309,7 @@ func init() {
 		return &Jolokia{
 			ResponseHeaderTimeout: DefaultResponseHeaderTimeout,
 			ClientTimeout:         DefaultClientTimeout,
+			Delimiter:             "_",
 		}
 	})
 }
diff --git a/plugins/inputs/jolokia/jolokia_test.go b/plugins/inputs/jolokia/jolokia_test.go
index ccde619b5..3c4fc2561 100644
--- a/plugins/inputs/jolokia/jolokia_test.go
+++ b/plugins/inputs/jolokia/jolokia_test.go
@@ -104,9 +104,10 @@ func (c jolokiaClientStub) MakeRequest(req *http.Request) (*http.Response, error
 //     *HttpJson: Pointer to an HttpJson object that uses the generated mock HTTP client
 func genJolokiaClientStub(response string, statusCode int, servers []Server, metrics []Metric) *Jolokia {
 	return &Jolokia{
-		jClient: jolokiaClientStub{responseBody: response, statusCode: statusCode},
-		Servers: servers,
-		Metrics: metrics,
+		jClient:   jolokiaClientStub{responseBody: response, statusCode: statusCode},
+		Servers:   servers,
+		Metrics:   metrics,
+		Delimiter: "_",
 	}
 }
 

From 411853fc74306c2fae685b750ecfbdc9754b6425 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 12 Jan 2017 11:14:12 +0000
Subject: [PATCH 0060/1302] update etc/telegraf.conf

---
 etc/telegraf.conf | 130 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 106 insertions(+), 24 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index a6058434c..3d0cdfd3a 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -140,8 +140,6 @@
 #   # retention_policy = "default"
 #   ## InfluxDB database
 #   # database = "telegraf"
-#   ## InfluxDB precision
-#   # precision = "s"
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -190,6 +188,11 @@
 #   # timeout = "5s"
 
 
+# # Send metrics to nowhere at all
+# [[outputs.discard]]
+#   # no configuration
+
+
 # # Send telegraf metrics to file(s)
 # [[outputs.file]]
 #   ## Files to write to, "stdout" is a specially handled file.
@@ -219,7 +222,7 @@
 
 # # Send telegraf metrics to graylog(s)
 # [[outputs.graylog]]
-#   ## Udp endpoint for your graylog instance.
+#   ## UDP endpoint for your graylog instance.
 #   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
 
 
@@ -312,9 +315,13 @@
 #   streamname = "StreamName"
 #   ## PartitionKey as used for sharding data.
 #   partitionkey = "PartitionKey"
-#   ## format of the Data payload in the kinesis PutRecord, supported
-#   ## String and Custom.
-#   format = "string"
+#
+#   ## Data format to output.
+#   ## Each data format has it's own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+#
 #   ## debug will show upstream aws messages.
 #   debug = false
 
@@ -351,6 +358,9 @@
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
+#   ## client ID, if not set a random ID is generated
+#   # client_id = ""
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -428,6 +438,9 @@
 # [[outputs.prometheus_client]]
 #   ## Address to listen on
 #   # listen = ":9126"
+#
+#   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
+#   # expiration_interval = "60s"
 
 
 # # Configuration for the Riemann server to send metrics to
@@ -538,6 +551,19 @@
 #   ## An array of Apache status URI to gather stats.
 #   ## Default is "http://localhost/server-status?auto".
 #   urls = ["http://localhost/server-status?auto"]
+#   ## user credentials for basic HTTP authentication
+#   username = "myuser"
+#   password = "mypassword"
+#
+#   ## Timeout to the complete conection and reponse time in seconds
+#   response_timeout = "25s" ## default to 5 seconds
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Read metrics of bcache from stats_total and dirty_data
@@ -640,6 +666,13 @@
 #   #profile = ""
 #   #shared_credential_file = ""
 #
+#   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
+#   # metrics are made available to the 1 minute period. Some are collected at
+#   # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+#   # Note that if a period is configured that is smaller than the minimum for a
+#   # particular metric, that metric will not be returned by the Cloudwatch API
+#   # and will not be collected by Telegraf.
+#   #
 #   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
 #   period = "5m"
 #
@@ -789,13 +822,13 @@
 #   ## of the cluster.
 #   local = true
 #
-#   ## set cluster_health to true when you want to also obtain cluster health stats
+#   ## Set cluster_health to true when you want to also obtain cluster health stats
 #   cluster_health = false
 #
-#   ## Set cluster_stats to true when you want to obtain cluster stats from the
+#   ## Set cluster_stats to true when you want to also obtain cluster stats from the
 #   ## Master node.
 #   cluster_stats = false
-
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -980,6 +1013,12 @@
 #   timeout = "5s"
 
 
+# # Collect statistics about itself
+# [[inputs.internal]]
+#   ## If true, collect telegraf memory stats.
+#   # collect_memstats = true
+
+
 # # Read metrics from one or many bare metal servers
 # [[inputs.ipmi_sensor]]
 #   ## specify servers via a url matching:
@@ -993,8 +1032,9 @@
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
 #   ## This is the context root used to compose the jolokia url
+#   ## NOTE that Jolokia requires a trailing slash at the end of the context root
 #   ## NOTE that your jolokia security policy must allow for POST requests.
-#   context = "/jolokia"
+#   context = "/jolokia/"
 #
 #   ## This specifies the mode used
 #   # mode = "proxy"
@@ -1006,6 +1046,15 @@
 #   #   host = "127.0.0.1"
 #   #   port = "8080"
 #
+#   ## Optional http timeouts
+#   ##
+#   ## response_header_timeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # response_header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
 #
 #   ## List of servers exposing jolokia read service
 #   [[inputs.jolokia.servers]]
@@ -1144,8 +1193,8 @@
 #   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
 #   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
 #   ##  e.g.
-#   ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
-#   ##    db_user@tcp(127.0.0.1:3306)/?tls=false
+#   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
+#   ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]
@@ -1206,18 +1255,24 @@
 # # TCP or UDP 'ping' given url and collect response time in seconds
 # [[inputs.net_response]]
 #   ## Protocol, must be "tcp" or "udp"
+#   ## NOTE: because the "udp" protocol does not respond to requests, it requires
+#   ## a send/expect string pair (see below).
 #   protocol = "tcp"
 #   ## Server address (default localhost)
-#   address = "github.com:80"
+#   address = "localhost:80"
 #   ## Set timeout
 #   timeout = "1s"
 #
-#   ## Optional string sent to the server
-#   # send = "ssh"
-#   ## Optional expected string in answer
-#   # expect = "ssh"
 #   ## Set read timeout (only used if expecting a response)
 #   read_timeout = "1s"
+#
+#   ## The following options are required for UDP checks. For TCP, they are
+#   ## optional. The plugin will send the given string to the server and then
+#   ## expect to receive the given 'expect' string back.
+#   ## string sent to the server
+#   # send = "ssh"
+#   ## expected string in answer
+#   # expect = "ssh"
 
 
 # # Read TCP metrics such as established, time wait and sockets counts.
@@ -1419,6 +1474,8 @@
 #   prefix = ""
 #   ## comment this out if you want raw cpu_time stats
 #   fielddrop = ["cpu_time_*"]
+#   ## This is optional; moves pid into a tag instead of a field
+#   pid_tag = false
 
 
 # # Read metrics from one or many prometheus clients
@@ -1429,6 +1486,9 @@
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
+#   ## Specify timeout duration for slower prometheus clients (default is 3s)
+#   # response_timeout = "3s"
+#
 #   ## Optional SSL Config
 #   # ssl_ca = /path/to/cafile
 #   # ssl_cert = /path/to/certfile
@@ -1457,6 +1517,16 @@
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Optional request timeouts
+#   ##
+#   ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
+#
 #   ## A list of nodes to pull metrics about. If not specified, metrics for
 #   ## all nodes are gathered.
 #   # nodes = ["rabbit@node1", "rabbit@node2"]
@@ -1879,14 +1949,19 @@
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
-#   ## Delete gauges every interval (default=false)
-#   delete_gauges = false
-#   ## Delete counters every interval (default=false)
-#   delete_counters = false
-#   ## Delete sets every interval (default=false)
-#   delete_sets = false
-#   ## Delete timings & histograms every interval (default=true)
+#
+#   ## The following configuration options control when telegraf clears it's cache
+#   ## of previous values. If set to false, then telegraf will only clear it's
+#   ## cache when the daemon is restarted.
+#   ## Reset gauges every interval (default=true)
+#   delete_gauges = true
+#   ## Reset counters every interval (default=true)
+#   delete_counters = true
+#   ## Reset sets every interval (default=true)
+#   delete_sets = true
+#   ## Reset timings & histograms every interval (default=true)
 #   delete_timings = true
+#
 #   ## Percentiles to calculate for timing & histogram stats
 #   percentiles = [90]
 #
@@ -1927,6 +2002,8 @@
 #   files = ["/var/mymetrics.out"]
 #   ## Read file from beginning.
 #   from_beginning = false
+#   ## Whether file is a named pipe
+#   pipe = false
 #
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
@@ -1963,6 +2040,10 @@
 #   ## UDP listener will start dropping packets.
 #   # allowed_pending_messages = 10000
 #
+#   ## Set the buffer size of the UDP connection outside of OS default (in bytes)
+#   ## If set to 0, take OS default
+#   udp_buffer_size = 16777216
+#
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -1986,3 +2067,4 @@
 #
 #   [inputs.webhooks.rollbar]
 #     path = "/rollbar"
+

From e812a2efc6880084c177074d14d4f2a6f649d895 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <sparrc@users.noreply.github.com>
Date: Fri, 13 Jan 2017 11:43:50 +0000
Subject: [PATCH 0061/1302] Accept an HTTP request body without newline at end
 (#2266)

I don't like this behavior, but it's what InfluxDB accepts, so the
telegraf listener should be consistent with that.

I accidentally reverted this behavior when I refactored the telegraf
metric representation earlier in this release cycle.
---
 plugins/inputs/http_listener/http_listener.go |  3 +++
 .../http_listener/http_listener_test.go       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 0f426f809..05551a966 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -300,6 +300,9 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time) error {
+	if !bytes.HasSuffix(b, []byte("\n")) {
+		b = append(b, '\n')
+	}
 	metrics, err := h.parser.ParseWithDefaultTime(b, t)
 
 	for _, m := range metrics {
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 84cf209ff..b5f858fde 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -16,6 +16,8 @@ import (
 const (
 	testMsg = "cpu_load_short,host=server01 value=12.0 1422568543702900257\n"
 
+	testMsgNoNewline = "cpu_load_short,host=server01 value=12.0 1422568543702900257"
+
 	testMsgs = `cpu_load_short,host=server02 value=12.0 1422568543702900257
 cpu_load_short,host=server03 value=12.0 1422568543702900257
 cpu_load_short,host=server04 value=12.0 1422568543702900257
@@ -81,6 +83,28 @@ func TestWriteHTTP(t *testing.T) {
 	)
 }
 
+// http listener should add a newline at the end of the buffer if it's not there
+func TestWriteHTTPNoNewline(t *testing.T) {
+	listener := newTestHTTPListener()
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+
+	// post single message to listener
+	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgNoNewline)))
+	require.NoError(t, err)
+	require.EqualValues(t, 204, resp.StatusCode)
+
+	time.Sleep(time.Millisecond * 15)
+	acc.AssertContainsTaggedFields(t, "cpu_load_short",
+		map[string]interface{}{"value": float64(12)},
+		map[string]string{"host": "server01"},
+	)
+}
+
 func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	listener := &HTTPListener{
 		ServiceAddress: ":8296",

From 95bad9e55b635862a10af7b15976bda99301f0a4 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 13 Jan 2017 11:35:36 +0000
Subject: [PATCH 0062/1302] OpenTSDB filter types for HTTP AND telnet

---
 plugins/outputs/opentsdb/opentsdb.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index ce797e10f..84ff99058 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -157,6 +157,15 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 		tags := ToLineFormat(cleanTags(m.Tags()))
 
 		for fieldName, value := range m.Fields() {
+			switch value.(type) {
+			case int64:
+			case uint64:
+			case float64:
+			default:
+				log.Printf("D! OpenTSDB does not support metric value: [%s] of type [%T].\n", value, value)
+				continue
+			}
+
 			metricValue, buildError := buildValue(value)
 			if buildError != nil {
 				log.Printf("E! OpenTSDB: %s\n", buildError.Error())

From 734988d732819761e84fc665a9aebf3effd4d1a9 Mon Sep 17 00:00:00 2001
From: Kebus1 <moeloj@gmail.com>
Date: Fri, 13 Jan 2017 14:47:47 +0100
Subject: [PATCH 0063/1302] Fixed Bug 2077 SQL Server (#2212)

---
 plugins/inputs/sqlserver/sqlserver.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index e428d3098..5afbb067e 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -402,8 +402,8 @@ IF OBJECT_ID('tempdb..#baseline') IS NOT NULL
 	DROP TABLE #baseline;
 SELECT
     DB_NAME(mf.database_id) AS database_name ,
-    mf.size as database_size_8k_pages,
-    mf.max_size as database_max_size_8k_pages,
+    CAST(mf.size AS BIGINT) as database_size_8k_pages,
+    CAST(mf.max_size AS BIGINT) as database_max_size_8k_pages,
     size_on_disk_bytes ,
 	type_desc as datafile_type,
     GETDATE() AS baselineDate

From b60b360f13cec961a18294350dae333112058ab1 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 13 Jan 2017 13:50:07 +0000
Subject: [PATCH 0064/1302] Changelog update

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8919669d1..eb42e511d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
-## v1.2 [unreleased]
+## v1.3 [unreleased]
+
+### Release Notes
+
+### Features
+
+### Bugfixes
+
+- [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
+
+## v1.2 [2017-01-00]
 
 ### Release Notes
 

From b89c45b858728a8f7330ec65cd064575035402e7 Mon Sep 17 00:00:00 2001
From: Viet Hung Nguyen <hvnsweeting@gmail.com>
Date: Fri, 13 Jan 2017 21:19:57 +0700
Subject: [PATCH 0065/1302] Ignore devfs on OSX (#2232)

---
 plugins/inputs/system/disk.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index f308a243b..548a9ce23 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -29,7 +29,7 @@ var diskSampleConfig = `
 
   ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
   ## present on /run, /var/run, /dev/shm or /dev).
-  ignore_fs = ["tmpfs", "devtmpfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
 `
 
 func (_ *DiskStats) SampleConfig() string {

From 0c9da0985a5af267fad2beb0483b8ab9b47ee059 Mon Sep 17 00:00:00 2001
From: acezellponce <acezellponce@gmail.com>
Date: Fri, 13 Jan 2017 06:25:25 -0800
Subject: [PATCH 0066/1302] Added userstats to mysql input plugin (#2137)

* Added GatherUserStatistics, row Uptime in gatherGlobalStatuses, and version fields & tags

* Updated README file

* pulling in latest from master

* ran go fmt to fix formatting

* fix unreachable code

* few fixes

* cleaning up and applying suggestions from sparrc
---
 plugins/inputs/mysql/README.md |  30 ++++++
 plugins/inputs/mysql/mysql.go  | 177 ++++++++++++++++++++++++++++++++-
 2 files changed, 206 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index 34bb07bef..a55ddb8ff 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -7,6 +7,7 @@ This plugin gathers the statistic data from MySQL server
 * Slave statuses
 * Binlog size
 * Process list
+* User Statistics
 * Info schema auto increment columns
 * Table I/O waits
 * Index I/O waits
@@ -44,6 +45,9 @@ This plugin gathers the statistic data from MySQL server
   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
   gather_process_list                       = true
   #
+  ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
+  gather_user_statistics                    = true
+  #
   ## gather auto_increment columns and max values from information schema
   gather_info_schema_auto_inc               = true
   #
@@ -89,6 +93,30 @@ Requires to be turned on in configuration.
     * binary_files_count(int, number)
 * Process list - connection metrics from processlist for each user. It has the following tags
     * connections(int, number)
+* User Statistics - connection metrics from user statistics for each user. It has the following fields
+    * access_denied
+    * binlog_bytes_written
+    * busy_time
+    * bytes_received
+    * bytes_sent
+    * commit_transactions
+    * concurrent_connections
+    * connected_time
+    * cpu_time
+    * denied_connections
+    * empty_queries
+    * hostlost_connections
+    * other_commands
+    * rollback_transactions
+    * rows_fetched
+    * rows_updated
+    * select_commands
+    * server
+    * table_rows_read
+    * total_connections
+    * total_ssl_connections
+    * update_commands
+    * user
 * Perf Table IO waits - total count and time of I/O waits event for each table
 and process. It has following fields:
     * table_io_waits_total_fetch(float, number)
@@ -158,6 +186,8 @@ The unit of fields varies by the tags.
     * server (the host name from which the metrics are gathered)
 * Process list measurement has following tags
     * user (username for whom the metrics are gathered)
+* User Statistics measurement has following tags
+    * user (username for whom the metrics are gathered)
 * Perf table IO waits measurement has following tags
     * schema
     * name (object name for event or process)
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 54f296586..c0a31aeed 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -23,6 +23,7 @@ type Mysql struct {
 	PerfEventsStatementsTimeLimit       int64    `toml:"perf_events_statemetns_time_limit"`
 	TableSchemaDatabases                []string `toml:"table_schema_databases"`
 	GatherProcessList                   bool     `toml:"gather_process_list"`
+	GatherUserStatistics                bool     `toml:"gather_user_statistics"`
 	GatherInfoSchemaAutoInc             bool     `toml:"gather_info_schema_auto_inc"`
 	GatherSlaveStatus                   bool     `toml:"gather_slave_status"`
 	GatherBinaryLogs                    bool     `toml:"gather_binary_logs"`
@@ -60,6 +61,9 @@ var sampleConfig = `
   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
   gather_process_list                       = true
   #
+  ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
+  gather_user_statistics                    = true
+  #
   ## gather auto_increment columns and max values from information schema
   gather_info_schema_auto_inc               = true
   #
@@ -415,6 +419,10 @@ const (
         WHERE ID != connection_id()
         GROUP BY command,state
         ORDER BY null`
+	infoSchemaUserStatisticsQuery = `
+        SELECT *,count(*)
+        FROM information_schema.user_statistics
+	GROUP BY user`
 	infoSchemaAutoIncQuery = `
         SELECT table_schema, table_name, column_name, auto_increment,
           CAST(pow(2, case data_type
@@ -530,7 +538,6 @@ const (
 			table_name
 			FROM information_schema.tables
 		WHERE table_schema = 'performance_schema' AND table_name = ?
-
 	`
 )
 
@@ -582,6 +589,13 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 		}
 	}
 
+	if m.GatherUserStatistics {
+		err = m.GatherUserStatisticsStatuses(db, serv, acc)
+		if err != nil {
+			return err
+		}
+	}
+
 	if m.GatherSlaveStatus {
 		err = m.gatherSlaveStatuses(db, serv, acc)
 		if err != nil {
@@ -669,6 +683,11 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accu
 			return err
 		}
 		key = strings.ToLower(key)
+                // parse mysql version and put into field and tag
+		if strings.Contains(key, "version") {
+			fields[key] = string(val)
+			tags[key] = string(val)
+		}
 		// parse value, if it is numeric then save, otherwise ignore
 		if floatVal, ok := parseValue(val); ok {
 			fields[key] = floatVal
@@ -854,6 +873,12 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 				return err
 			}
 			fields["syncs"] = i
+		case "Uptime":
+			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
+			if err != nil {
+				return err
+			}
+			fields["uptime"] = i
 		}
 	}
 	// Send any remaining fields
@@ -884,6 +909,74 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 		}
 	}
 
+	// gather connection metrics from user_statistics for each user
+	if m.GatherUserStatistics {
+		conn_rows, err := db.Query("select user, total_connections, concurrent_connections, connected_time, busy_time, cpu_time, bytes_received, bytes_sent, binlog_bytes_written, rows_fetched, rows_updated, table_rows_read, select_commands, update_commands, other_commands, commit_transactions, rollback_transactions, denied_connections, lost_connections, access_denied, empty_queries, total_ssl_connections FROM INFORMATION_SCHEMA.USER_STATISTICS GROUP BY user")
+
+		for conn_rows.Next() {
+			var user string
+			var total_connections int64
+			var concurrent_connections int64
+			var connected_time int64
+			var busy_time int64
+			var cpu_time int64
+			var bytes_received int64
+			var bytes_sent int64
+			var binlog_bytes_written int64
+			var rows_fetched int64
+			var rows_updated int64
+			var table_rows_read int64
+			var select_commands int64
+			var update_commands int64
+			var other_commands int64
+			var commit_transactions int64
+			var rollback_transactions int64
+			var denied_connections int64
+			var lost_connections int64
+			var access_denied int64
+			var empty_queries int64
+			var total_ssl_connections int64
+
+			err = conn_rows.Scan(&user, &total_connections, &concurrent_connections,
+				&connected_time, &busy_time, &cpu_time, &bytes_received, &bytes_sent, &binlog_bytes_written,
+				&rows_fetched, &rows_updated, &table_rows_read, &select_commands, &update_commands, &other_commands,
+				&commit_transactions, &rollback_transactions, &denied_connections, &lost_connections, &access_denied,
+				&empty_queries, &total_ssl_connections,
+			)
+
+			if err != nil {
+				return err
+			}
+
+			tags := map[string]string{"server": servtag, "user": user}
+			fields := map[string]interface{}{
+			  "total_connections": total_connections,
+			  "concurrent_connections": concurrent_connections,
+			  "connected_time": connected_time,
+			  "busy_time": busy_time,
+			  "cpu_time": cpu_time,
+			  "bytes_received": bytes_received,
+			  "bytes_sent": bytes_sent,
+			  "binlog_bytes_written": binlog_bytes_written,
+			  "rows_fetched": rows_fetched,
+			  "rows_updated": rows_updated,
+			  "table_rows_read": table_rows_read,
+			  "select_commands": select_commands,
+			  "update_commands": update_commands,
+			  "other_commands": other_commands,
+			  "commit_transactions": commit_transactions,
+			  "rollback_transactions": rollback_transactions,
+			  "denied_connections": denied_connections,
+			  "lost_connections": lost_connections,
+			  "access_denied": access_denied,
+			  "empty_queries": empty_queries,
+			  "total_ssl_connections": total_ssl_connections,
+                        }
+
+			acc.AddFields("mysql_user_stats", fields, tags)
+		}
+	}
+
 	return nil
 }
 
@@ -932,6 +1025,88 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.
 	return nil
 }
 
+// GatherUserStatistics can be used to collect metrics on each running command
+// and its state with its running count
+func (m *Mysql) GatherUserStatisticsStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
+	// run query
+	rows, err := db.Query(infoSchemaUserStatisticsQuery)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+	var (
+		user                   string
+		total_connections      int64
+		concurrent_connections int64
+		connected_time         int64
+		busy_time              int64
+		cpu_time               int64
+		bytes_received         int64
+		bytes_sent             int64
+		binlog_bytes_written   int64
+		rows_fetched           int64
+		rows_updated           int64
+		table_rows_read        int64
+		select_commands        int64
+		update_commands        int64
+		other_commands         int64
+		commit_transactions    int64
+		rollback_transactions  int64
+		denied_connections     int64
+		lost_connections       int64
+		access_denied          int64
+		empty_queries          int64
+		total_ssl_connections  int64
+		count                  uint32
+	)
+
+	var servtag string
+	servtag, err = parseDSN(serv)
+	if err != nil {
+		servtag = "localhost"
+	}
+
+	for rows.Next() {
+		err = rows.Scan(&user, &total_connections, &concurrent_connections,
+			&connected_time, &busy_time, &cpu_time, &bytes_received, &bytes_sent, &binlog_bytes_written,
+			&rows_fetched, &rows_updated, &table_rows_read, &select_commands, &update_commands, &other_commands,
+			&commit_transactions, &rollback_transactions, &denied_connections, &lost_connections, &access_denied,
+			&empty_queries, &total_ssl_connections, &count,
+		)
+		if err != nil {
+			return err
+		}
+
+		tags := map[string]string{"server": servtag, "user": user}
+		fields := map[string]interface{}{
+
+			"total_connections":      total_connections,
+			"concurrent_connections": concurrent_connections,
+			"connected_time":         connected_time,
+			"busy_time":              busy_time,
+			"cpu_time":               cpu_time,
+			"bytes_received":         bytes_received,
+			"bytes_sent":             bytes_sent,
+			"binlog_bytes_written":   binlog_bytes_written,
+			"rows_fetched":           rows_fetched,
+			"rows_updated":           rows_updated,
+			"table_rows_read":        table_rows_read,
+			"select_commands":        select_commands,
+			"update_commands":        update_commands,
+			"other_commands":         other_commands,
+			"commit_transactions":    commit_transactions,
+			"rollback_transactions":  rollback_transactions,
+			"denied_connections":     denied_connections,
+			"lost_connections":       lost_connections,
+			"access_denied":          access_denied,
+			"empty_queries":          empty_queries,
+			"total_ssl_connections":  total_ssl_connections,
+		}
+		acc.AddFields("mysql_user_stats", fields, tags)
+	}
+	return nil
+}
+
 // gatherPerfTableIOWaits can be used to get total count and time
 // of I/O wait event for each table and process
 func (m *Mysql) gatherPerfTableIOWaits(db *sql.DB, serv string, acc telegraf.Accumulator) error {

From 9262712f0ab6c8c44d13738efcf594c7d4290b8b Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 13 Jan 2017 14:27:20 +0000
Subject: [PATCH 0067/1302] Changelog update and go fmt

---
 CHANGELOG.md                  |  2 ++
 plugins/inputs/mysql/mysql.go | 46 +++++++++++++++++------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb42e511d..990d417e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
+
 ### Bugfixes
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index c0a31aeed..ca169f0d4 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -683,7 +683,7 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accu
 			return err
 		}
 		key = strings.ToLower(key)
-                // parse mysql version and put into field and tag
+		// parse mysql version and put into field and tag
 		if strings.Contains(key, "version") {
 			fields[key] = string(val)
 			tags[key] = string(val)
@@ -950,28 +950,28 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 
 			tags := map[string]string{"server": servtag, "user": user}
 			fields := map[string]interface{}{
-			  "total_connections": total_connections,
-			  "concurrent_connections": concurrent_connections,
-			  "connected_time": connected_time,
-			  "busy_time": busy_time,
-			  "cpu_time": cpu_time,
-			  "bytes_received": bytes_received,
-			  "bytes_sent": bytes_sent,
-			  "binlog_bytes_written": binlog_bytes_written,
-			  "rows_fetched": rows_fetched,
-			  "rows_updated": rows_updated,
-			  "table_rows_read": table_rows_read,
-			  "select_commands": select_commands,
-			  "update_commands": update_commands,
-			  "other_commands": other_commands,
-			  "commit_transactions": commit_transactions,
-			  "rollback_transactions": rollback_transactions,
-			  "denied_connections": denied_connections,
-			  "lost_connections": lost_connections,
-			  "access_denied": access_denied,
-			  "empty_queries": empty_queries,
-			  "total_ssl_connections": total_ssl_connections,
-                        }
+				"total_connections":      total_connections,
+				"concurrent_connections": concurrent_connections,
+				"connected_time":         connected_time,
+				"busy_time":              busy_time,
+				"cpu_time":               cpu_time,
+				"bytes_received":         bytes_received,
+				"bytes_sent":             bytes_sent,
+				"binlog_bytes_written":   binlog_bytes_written,
+				"rows_fetched":           rows_fetched,
+				"rows_updated":           rows_updated,
+				"table_rows_read":        table_rows_read,
+				"select_commands":        select_commands,
+				"update_commands":        update_commands,
+				"other_commands":         other_commands,
+				"commit_transactions":    commit_transactions,
+				"rollback_transactions":  rollback_transactions,
+				"denied_connections":     denied_connections,
+				"lost_connections":       lost_connections,
+				"access_denied":          access_denied,
+				"empty_queries":          empty_queries,
+				"total_ssl_connections":  total_ssl_connections,
+			}
 
 			acc.AddFields("mysql_user_stats", fields, tags)
 		}

From 9b2f6499e7b0c41aa97ed5d2f137e14e644b243a Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Fri, 13 Jan 2017 15:28:56 +0100
Subject: [PATCH 0068/1302] Added more InnoDB metric to MySQL plugin (#2179)

---
 plugins/inputs/mysql/README.md |  5 ++++
 plugins/inputs/mysql/mysql.go  | 55 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index a55ddb8ff..f941207c9 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -9,6 +9,7 @@ This plugin gathers the statistic data from MySQL server
 * Process list
 * User Statistics
 * Info schema auto increment columns
+* InnoDB metrics
 * Table I/O waits
 * Index I/O waits
 * Perf Schema table lock waits
@@ -51,6 +52,9 @@ This plugin gathers the statistic data from MySQL server
   ## gather auto_increment columns and max values from information schema
   gather_info_schema_auto_inc               = true
   #
+  ## gather metrics from INFORMATION_SCHEMA.INNODB_METRICS
+  gather_innodb_metrics                     = true
+  #
   ## gather metrics from SHOW SLAVE STATUS command output
   gather_slave_status                       = true
   #
@@ -141,6 +145,7 @@ and process. It has following fields:
 for them. It has following fields:
     * auto_increment_column(int, number)
     * auto_increment_column_max(int, number)
+* InnoDB metrics - all metrics of information_schema.INNODB_METRICS with a status "enabled"
 * Perf table lock waits - gathers total number and time for SQL and external
 lock waits events for each table and operation. It has following fields.
 The unit of fields varies by the tags.
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index ca169f0d4..956b3f9b0 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -25,6 +25,7 @@ type Mysql struct {
 	GatherProcessList                   bool     `toml:"gather_process_list"`
 	GatherUserStatistics                bool     `toml:"gather_user_statistics"`
 	GatherInfoSchemaAutoInc             bool     `toml:"gather_info_schema_auto_inc"`
+	GatherInnoDBMetrics                 bool     `toml:"gather_innodb_metrics"`
 	GatherSlaveStatus                   bool     `toml:"gather_slave_status"`
 	GatherBinaryLogs                    bool     `toml:"gather_binary_logs"`
 	GatherTableIOWaits                  bool     `toml:"gather_table_io_waits"`
@@ -67,6 +68,9 @@ var sampleConfig = `
   ## gather auto_increment columns and max values from information schema
   gather_info_schema_auto_inc               = true
   #
+  ## gather metrics from INFORMATION_SCHEMA.INNODB_METRICS
+  gather_innodb_metrics                     = true
+  #
   ## gather metrics from SHOW SLAVE STATUS command output
   gather_slave_status                       = true
   #
@@ -435,6 +439,11 @@ const (
           FROM information_schema.tables t
           JOIN information_schema.columns c USING (table_schema,table_name)
           WHERE c.extra = 'auto_increment' AND t.auto_increment IS NOT NULL
+    `
+	innoDBMetricsQuery = `
+        SELECT NAME, COUNT
+        FROM information_schema.INNODB_METRICS
+        WHERE status='enabled'
     `
 	perfTableIOWaitsQuery = `
         SELECT OBJECT_SCHEMA, OBJECT_NAME, COUNT_FETCH, COUNT_INSERT, COUNT_UPDATE, COUNT_DELETE,
@@ -610,6 +619,13 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 		}
 	}
 
+	if m.GatherInnoDBMetrics {
+		err = m.gatherInnoDBMetrics(db, serv, acc)
+		if err != nil {
+			return err
+		}
+	}
+
 	if m.GatherTableIOWaits {
 		err = m.gatherPerfTableIOWaits(db, serv, acc)
 		if err != nil {
@@ -1244,6 +1260,45 @@ func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc tel
 	return nil
 }
 
+// gatherInnoDBMetrics can be used to fetch enabled metrics from
+// information_schema.INNODB_METRICS
+func (m *Mysql) gatherInnoDBMetrics(db *sql.DB, serv string, acc telegraf.Accumulator) error {
+	// run query
+	rows, err := db.Query(innoDBMetricsQuery)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+
+	var key string
+	var val sql.RawBytes
+
+	// parse DSN and save server tag
+	servtag := getDSNTag(serv)
+	tags := map[string]string{"server": servtag}
+	fields := make(map[string]interface{})
+	for rows.Next() {
+		if err := rows.Scan(&key, &val); err != nil {
+			return err
+		}
+		key = strings.ToLower(key)
+		// parse value, if it is numeric then save, otherwise ignore
+		if floatVal, ok := parseValue(val); ok {
+			fields[key] = floatVal
+		}
+		// Send 20 fields at a time
+		if len(fields) >= 20 {
+			acc.AddFields("mysql_innodb", fields, tags)
+			fields = make(map[string]interface{})
+		}
+	}
+	// Send any remaining fields
+	if len(fields) > 0 {
+		acc.AddFields("mysql_innodb", fields, tags)
+	}
+	return nil
+}
+
 // gatherPerfTableLockWaits can be used to get
 // the total number and time for SQL and external lock wait events
 // for each table and operation

From e0c6262e0bf5372109b7e525ee640d15e13f0263 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 13 Jan 2017 14:34:07 +0000
Subject: [PATCH 0069/1302] mysql build fixup and changelog update

---
 CHANGELOG.md                  | 1 +
 plugins/inputs/mysql/mysql.go | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 990d417e5..c0c96476a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
+- [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 956b3f9b0..adc21880b 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -1076,12 +1076,7 @@ func (m *Mysql) GatherUserStatisticsStatuses(db *sql.DB, serv string, acc telegr
 		count                  uint32
 	)
 
-	var servtag string
-	servtag, err = parseDSN(serv)
-	if err != nil {
-		servtag = "localhost"
-	}
-
+	servtag := getDSNTag(serv)
 	for rows.Next() {
 		err = rows.Scan(&user, &total_connections, &concurrent_connections,
 			&connected_time, &busy_time, &cpu_time, &bytes_received, &bytes_sent, &binlog_bytes_written,

From 3de6bfbcb809c15c18adb2dc6b4f9a1ad3f68c54 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 13 Jan 2017 17:02:10 +0000
Subject: [PATCH 0070/1302] Direct people to downloads page for installation

---
 README.md                      | 60 ++++++----------------------------
 plugins/outputs/amqp/README.md | 34 +++++++++++++++++++
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index b11412065..b758609d3 100644
--- a/README.md
+++ b/README.md
@@ -25,60 +25,20 @@ new plugins.
 
 ## Installation:
 
-### Linux deb and rpm Packages:
+You can either download the binaries directly from the
+[downloads](https://www.influxdata.com/downloads) page.
 
-Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.1.1_amd64.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1.x86_64.rpm
-
-Latest (arm):
-* https://dl.influxdata.com/telegraf/releases/telegraf_1.1.1_armhf.deb
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1.armhf.rpm
-
-##### Package Instructions:
-
-* Telegraf binary is installed in `/usr/bin/telegraf`
-* Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf`
-* On sysv systems, the telegraf daemon can be controlled via
-`service telegraf [action]`
-* On systemd systems (such as Ubuntu 15+), the telegraf daemon can be
-controlled via `systemctl [action] telegraf`
-
-### yum/apt Repositories:
-
-There is a yum/apt repo available for the whole InfluxData stack, see
-[here](https://docs.influxdata.com/influxdb/latest/introduction/installation/#installation)
-for instructions on setting up the repo. Once it is configured, you will be able
-to use this repo to install & update telegraf.
-
-### Linux tarballs:
-
-Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_amd64.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_i386.tar.gz
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_linux_armhf.tar.gz
+A few alternate installs are available here as well:
 
 ### FreeBSD tarball:
 
 Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_freebsd_amd64.tar.gz
+* https://dl.influxdata.com/telegraf/releases/telegraf-VERSION_freebsd_amd64.tar.gz
 
 ### Ansible Role:
 
 Ansible role: https://github.com/rossmcdonald/telegraf
 
-### OSX via Homebrew:
-
-```
-brew update
-brew install telegraf
-```
-
-### Windows Binaries (EXPERIMENTAL)
-
-Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-1.1.1_windows_amd64.zip
-
 ### From Source:
 
 Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
@@ -99,31 +59,31 @@ See usage with:
 telegraf --help
 ```
 
-### Generate a telegraf config file:
+#### Generate a telegraf config file:
 
 ```
 telegraf config > telegraf.conf
 ```
 
-### Generate config with only cpu input & influxdb output plugins defined
+#### Generate config with only cpu input & influxdb output plugins defined
 
 ```
 telegraf --input-filter cpu --output-filter influxdb config
 ```
 
-### Run a single telegraf collection, outputing metrics to stdout
+#### Run a single telegraf collection, outputing metrics to stdout
 
 ```
 telegraf --config telegraf.conf -test
 ```
 
-### Run telegraf with all plugins defined in config file
+#### Run telegraf with all plugins defined in config file
 
 ```
 telegraf --config telegraf.conf
 ```
 
-### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
+#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
 
 ```
 telegraf --config telegraf.conf -input-filter cpu:mem -output-filter influxdb
@@ -242,7 +202,7 @@ Telegraf can also collect metrics via the following service plugins:
 
 * [influxdb](./plugins/outputs/influxdb)
 * [amon](./plugins/outputs/amon)
-* [amqp](./plugins/outputs/amqp)
+* [amqp](./plugins/outputs/amqp) (rabbitmq)
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
 * [datadog](./plugins/outputs/datadog)
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 2fdedfbf1..d49c507b8 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -7,3 +7,37 @@ If RoutingTag is empty, then empty routing key will be used.
 Metrics are grouped in batches by RoutingTag.
 
 This plugin doesn't bind exchange to a queue, so it should be done by consumer.
+
+### Configuration:
+
+```
+# Configuration for the AMQP server to send metrics to
+[[outputs.amqp]]
+  ## AMQP url
+  url = "amqp://localhost:5672/influxdb"
+  ## AMQP exchange
+  exchange = "telegraf"
+  ## Auth method. PLAIN and EXTERNAL are supported
+  # auth_method = "PLAIN"
+  ## Telegraf tag to use as a routing key
+  ##  ie, if this tag exists, it's value will be used as the routing key
+  routing_tag = "host"
+
+  ## InfluxDB retention policy
+  # retention_policy = "default"
+  ## InfluxDB database
+  # database = "telegraf"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+```

From 20bf90ee52d7be1d2f0864b05b0d75ed2da2f5c2 Mon Sep 17 00:00:00 2001
From: Claudius Zingerli <githubmail@zeuz.ch>
Date: Sun, 22 Jan 2017 00:08:17 +0100
Subject: [PATCH 0071/1302] Add minimal documentation to the diskio plugin
 (#2296)

* Add documentation to diskio plugin

* Update spelling, fix iops_in_progress unit
---
 plugins/inputs/system/DISK_README.md | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index c510615ee..b79ca07b3 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -51,3 +51,57 @@ In this case, the host's root volume should be mounted into the container and th
 > disk,fstype=autofs,path=/net free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274157077
 > disk,fstype=autofs,path=/home free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274169688
 ```
+
+
+# DiskIO Input Plugin
+
+The diskio input plugin gathers metrics about disk traffic and timing.
+
+### Configuration:
+
+```
+# Read metrics about disk IO by device
+[[inputs.diskio]]
+  ## By default, telegraf will gather stats for all devices including
+  ## disk partitions.
+  ## Setting devices will restrict the stats to the specified devices.
+  # devices = ["sda", "sdb"]
+  ## Uncomment the following line if you need disk serial numbers.
+  # skip_serial_number = false
+```
+
+Data collection is based on github.com/shirou/gopsutil. This package handles platform dependencies and converts all timing information to milliseconds.
+
+
+### Measurements & Fields:
+
+- diskio
+    - reads (integer, counter)
+    - writes (integer, counter)
+    - read_bytes (integer, bytes)
+    - write_bytes (integer, bytes)
+    - read_time (integer, milliseconds)
+    - write_time (integer, milliseconds)
+    - io_time (integer, milliseconds)
+    - iops_in_progress (integer, counter) (since #2037, not yet in STABLE)
+
+### Tags:
+
+- All measurements have the following tags:
+    - name (device name)
+- If configured to use serial numbers (default: disabled):
+    - serial (device serial number)
+
+### Example Output:
+
+```
+% telegraf -config ~/.telegraf/telegraf.conf -input-filter diskio -test
+* Plugin: inputs.diskio, Collection 1
+> diskio,name=mmcblk1p2 io_time=244i,read_bytes=966656i,read_time=276i,reads=128i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+> diskio,name=mmcblk1boot1 io_time=264i,read_bytes=90112i,read_time=264i,reads=22i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+> diskio,name=mmcblk1boot0 io_time=212i,read_bytes=90112i,read_time=212i,reads=22i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+> diskio,name=mmcblk0 io_time=1855380i,read_bytes=135861248i,read_time=58484i,reads=4081i,write_bytes=364068864i,write_time=7128792i,writes=18019i 1484916036000000000
+> diskio,name=mmcblk0p1 io_time=1855256i,read_bytes=134915072i,read_time=58256i,reads=3958i,write_bytes=364068864i,write_time=7128792i,writes=18019i 1484916036000000000
+> diskio,name=mmcblk1 io_time=384i,read_bytes=2633728i,read_time=728i,reads=323i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+> diskio,name=mmcblk1p1 io_time=216i,read_bytes=860160i,read_time=288i,reads=106i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+```

From c15504c509752b688f853fce97eeff2e01e33cd5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 23 Jan 2017 11:19:51 -0800
Subject: [PATCH 0072/1302] opentsdb: add tcp:// prefix if not present

closes #2299
---
 CHANGELOG.md                         | 1 +
 plugins/outputs/opentsdb/opentsdb.go | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0c96476a..a3c26132a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ plugins, not just statsd.
 - [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
 - [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
 - [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages
+- [#2299](https://github.com/influxdata/telegraf/issues/2299): opentsdb: add tcp:// prefix if no scheme provided.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 84ff99058..ac4d1224e 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -59,6 +59,9 @@ func ToLineFormat(tags map[string]string) string {
 }
 
 func (o *OpenTSDB) Connect() error {
+	if !strings.HasPrefix(o.Host, "http") && !strings.HasPrefix(o.Host, "tcp") {
+		o.Host = "tcp://" + o.Host
+	}
 	// Test Connection to OpenTSDB Server
 	u, err := url.Parse(o.Host)
 	if err != nil {
@@ -68,11 +71,11 @@ func (o *OpenTSDB) Connect() error {
 	uri := fmt.Sprintf("%s:%d", u.Host, o.Port)
 	tcpAddr, err := net.ResolveTCPAddr("tcp", uri)
 	if err != nil {
-		return fmt.Errorf("OpenTSDB: TCP address cannot be resolved")
+		return fmt.Errorf("OpenTSDB TCP address cannot be resolved: %s", err)
 	}
 	connection, err := net.DialTCP("tcp", nil, tcpAddr)
 	if err != nil {
-		return fmt.Errorf("OpenTSDB: Telnet connect fail")
+		return fmt.Errorf("OpenTSDB Telnet connect fail: %s", err)
 	}
 	defer connection.Close()
 	return nil

From 22340ad98462d2c9092ea93a510db920963d422b Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 23 Jan 2017 13:50:52 -0800
Subject: [PATCH 0073/1302] Add newline to influx line-protocol if not present

closes #2297
---
 CHANGELOG.md                                  |  3 ++-
 plugins/inputs/http_listener/http_listener.go |  3 ---
 plugins/parsers/influx/parser.go              |  3 +++
 plugins/parsers/influx/parser_test.go         | 21 +++++++++++++++----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c26132a..c9c85953f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,8 +80,9 @@ plugins, not just statsd.
 - [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
 - [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
 - [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
-- [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages
+- [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages.
 - [#2299](https://github.com/influxdata/telegraf/issues/2299): opentsdb: add tcp:// prefix if no scheme provided.
+- [#2297](https://github.com/influxdata/telegraf/issues/2297): influx parser: parse line-protocol without newlines.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 05551a966..0f426f809 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -300,9 +300,6 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time) error {
-	if !bytes.HasSuffix(b, []byte("\n")) {
-		b = append(b, '\n')
-	}
 	metrics, err := h.parser.ParseWithDefaultTime(b, t)
 
 	for _, m := range metrics {
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index f04058552..c15c503f7 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -16,6 +16,9 @@ type InfluxParser struct {
 }
 
 func (p *InfluxParser) ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+	if !bytes.HasSuffix(buf, []byte("\n")) {
+		buf = append(buf, '\n')
+	}
 	// parse even if the buffer begins with a newline
 	buf = bytes.TrimPrefix(buf, []byte("\n"))
 	metrics, err := metric.ParseWithDefaultTime(buf, t)
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 477cea36e..58531ff90 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -18,10 +18,11 @@ var (
 )
 
 const (
-	validInflux        = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
-	validInfluxNewline = "\ncpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
-	invalidInflux      = "I don't think this is line protocol\n"
-	invalidInflux2     = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
+	validInflux          = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
+	validInfluxNewline   = "\ncpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
+	validInfluxNoNewline = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000"
+	invalidInflux        = "I don't think this is line protocol\n"
+	invalidInflux2       = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
 )
 
 const influxMulti = `
@@ -69,6 +70,18 @@ func TestParseValidInflux(t *testing.T) {
 		"cpu": "cpu0",
 	}, metrics[0].Tags())
 	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
+
+	metrics, err = parser.Parse([]byte(validInfluxNoNewline))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "cpu_load_short", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"value": float64(10),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{
+		"cpu": "cpu0",
+	}, metrics[0].Tags())
+	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
 }
 
 func TestParseLineValidInflux(t *testing.T) {

From 6df3f0fdae91881167c27589e12cb99d0867f65f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 17 Jan 2017 15:01:12 -0800
Subject: [PATCH 0074/1302] Run scheduled flushes in background

doing this unblocks incoming metrics while waiting for a flush to take
place.

we have to create a semaphore so that we can
'skip' flushes that try to run while a flush is already running.

closes #2262
---
 CHANGELOG.md   |  1 +
 agent/agent.go | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9c85953f..fd37abcb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Bugfixes
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
+- [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 
 ## v1.2 [2017-01-00]
 
diff --git a/agent/agent.go b/agent/agent.go
index ab64154e0..a9e42643a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -286,6 +286,7 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) er
 	}()
 
 	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
+	semaphore := make(chan struct{}, 1)
 	for {
 		select {
 		case <-shutdown:
@@ -295,8 +296,18 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) er
 			a.flush()
 			return nil
 		case <-ticker.C:
-			internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
-			a.flush()
+			go func() {
+				select {
+				case semaphore <- struct{}{}:
+					internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
+					a.flush()
+					<-semaphore
+				default:
+					// skipping this flush because one is already happening
+					log.Println("W! Skipping a scheduled flush because there is" +
+						" already a flush ongoing.")
+				}
+			}()
 		case metric := <-metricC:
 			// NOTE potential bottleneck here as we put each metric through the
 			// processors serially.

From 80411f99f06293f48352b8dcc6b804dc2ef859cb Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 23 Jan 2017 16:38:07 -0800
Subject: [PATCH 0075/1302] influxdb output: treat field type conflicts as a
 successful write

If we write a batch of points and get a "field type conflict" error
message in return, we should drop the entire batch of points because
this indicates that one or more points have a type that doesnt match the
database.

These errors will never go away on their own, and InfluxDB will
successfully write the points that dont have a conflict.

closes #2245
---
 CHANGELOG.md                         |  1 +
 plugins/outputs/influxdb/influxdb.go | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd37abcb8..d321e89b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@ plugins, not just statsd.
 - [#1814](https://github.com/influxdata/telegraf/issues/1814): snmp: ensure proper context is present on error messages.
 - [#2299](https://github.com/influxdata/telegraf/issues/2299): opentsdb: add tcp:// prefix if no scheme provided.
 - [#2297](https://github.com/influxdata/telegraf/issues/2297): influx parser: parse line-protocol without newlines.
+- [#2245](https://github.com/influxdata/telegraf/issues/2245): influxdb output: fix field type conflict blocking output buffer.
 
 ## v1.1.2 [2016-12-12]
 
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 8c23b2c5a..999e1bc6f 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -200,8 +200,6 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	p := rand.Perm(len(i.conns))
 	for _, n := range p {
 		if e := i.conns[n].Write(bp); e != nil {
-			// Log write failure
-			log.Printf("E! InfluxDB Output Error: %s", e)
 			// If the database was not found, try to recreate it
 			if strings.Contains(e.Error(), "database not found") {
 				if errc := createDatabase(i.conns[n], i.Database); errc != nil {
@@ -209,6 +207,15 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 						i.Database)
 				}
 			}
+			if strings.Contains(e.Error(), "field type conflict") {
+				log.Printf("E! Field type conflict, dropping conflicted points: %s", e)
+				// setting err to nil, otherwise we will keep retrying and points
+				// w/ conflicting types will get stuck in the buffer forever.
+				err = nil
+				break
+			}
+			// Log write failure
+			log.Printf("E! InfluxDB Output Error: %s", e)
 		} else {
 			err = nil
 			break

From c882570983018c3d2aceeff1e3d2cd992c0d549f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 23 Jan 2017 20:28:13 -0800
Subject: [PATCH 0076/1302] 32-bit binary for windows and freebsd

closes #1346
closes #2218
---
 scripts/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index 0221cf3c4..57208bf7f 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -83,9 +83,9 @@ targets = {
 }
 
 supported_builds = {
-    "windows": [ "amd64" ],
+    "windows": [ "amd64", "i386" ],
     "linux": [ "amd64", "i386", "armhf", "armel", "arm64", "static_amd64" ],
-    "freebsd": [ "amd64" ]
+    "freebsd": [ "amd64", "i386" ]
 }
 
 supported_packages = {

From b9ae3d6a57dbcf27aeaaeeea994e818a27f6a9be Mon Sep 17 00:00:00 2001
From: James <james-lawrence@users.noreply.github.com>
Date: Tue, 24 Jan 2017 15:36:36 -0500
Subject: [PATCH 0077/1302] fix postgresql 'name', and 'oid' data types by
 switching to a driver (#1750)

that handles them properly
---
 CHANGELOG.md                                  |  3 +
 Godeps                                        |  2 +-
 plugins/inputs/postgresql/README.md           |  4 +-
 plugins/inputs/postgresql/connect.go          | 99 +++++++++++++++++++
 plugins/inputs/postgresql/postgresql.go       | 14 +--
 plugins/inputs/postgresql/postgresql_test.go  | 31 +++++-
 .../postgresql_extensible.go                  | 23 +++--
 .../postgresql_extensible_test.go             | 25 +++++
 testutil/accumulator.go                       | 38 ++++++-
 9 files changed, 211 insertions(+), 28 deletions(-)
 create mode 100644 plugins/inputs/postgresql/connect.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d321e89b9..68d43f2f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -235,8 +235,11 @@ which can be installed via
 evaluated at every flush interval, rather than once at startup. This makes it
 consistent with the behavior of `collection_jitter`.
 
+- postgresql plugins now handle oid and name typed columns seamlessly, previously they were ignored/skipped.
+
 ### Features
 
+- [#1617](https://github.com/influxdata/telegraf/pull/1617): postgresql_extensible now handles name and oid types correctly.
 - [#1413](https://github.com/influxdata/telegraf/issues/1413): Separate container_version from container_image tag.
 - [#1525](https://github.com/influxdata/telegraf/pull/1525): Support setting per-device and total metrics for Docker network and blockio.
 - [#1466](https://github.com/influxdata/telegraf/pull/1466): MongoDB input plugin: adding per DB stats from db.stats()
diff --git a/Godeps b/Godeps
index 885213c96..99606414e 100644
--- a/Godeps
+++ b/Godeps
@@ -33,7 +33,6 @@ github.com/kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
 github.com/kardianos/service 5e335590050d6d00f3aa270217d288dda1c94d0a
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
-github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
 github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
 github.com/miekg/dns cce6c130cdb92c752850880fd285bea1d64439dd
 github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
@@ -63,3 +62,4 @@ gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef
 gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
 gopkg.in/mgo.v2 d90005c5262a3463800497ea5a89aed5fe22c886
 gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4
+github.com/jackc/pgx bb73d8427902891bbad7b949b9c60b32949d935f
diff --git a/plugins/inputs/postgresql/README.md b/plugins/inputs/postgresql/README.md
index e5e9a8961..e309aa80f 100644
--- a/plugins/inputs/postgresql/README.md
+++ b/plugins/inputs/postgresql/README.md
@@ -4,8 +4,8 @@ This postgresql plugin provides metrics for your postgres database. It currently
 ```
 pg version      9.2+   9.1   8.3-9.0   8.1-8.2   7.4-8.0(unsupported)
 ---             ---    ---   -------   -------   -------
-datid*           x      x       x         x
-datname*         x      x       x         x
+datid            x      x       x         x
+datname          x      x       x         x
 numbackends      x      x       x         x         x
 xact_commit      x      x       x         x         x
 xact_rollback    x      x       x         x         x
diff --git a/plugins/inputs/postgresql/connect.go b/plugins/inputs/postgresql/connect.go
new file mode 100644
index 000000000..77858cda2
--- /dev/null
+++ b/plugins/inputs/postgresql/connect.go
@@ -0,0 +1,99 @@
+package postgresql
+
+import (
+	"database/sql"
+	"fmt"
+	"net"
+	"net/url"
+	"sort"
+	"strings"
+
+	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/stdlib"
+)
+
+// pulled from lib/pq
+// ParseURL no longer needs to be used by clients of this library since supplying a URL as a
+// connection string to sql.Open() is now supported:
+//
+//	sql.Open("postgres", "postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full")
+//
+// It remains exported here for backwards-compatibility.
+//
+// ParseURL converts a url to a connection string for driver.Open.
+// Example:
+//
+//	"postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full"
+//
+// converts to:
+//
+//	"user=bob password=secret host=1.2.3.4 port=5432 dbname=mydb sslmode=verify-full"
+//
+// A minimal example:
+//
+//	"postgres://"
+//
+// This will be blank, causing driver.Open to use all of the defaults
+func ParseURL(uri string) (string, error) {
+	u, err := url.Parse(uri)
+	if err != nil {
+		return "", err
+	}
+
+	if u.Scheme != "postgres" && u.Scheme != "postgresql" {
+		return "", fmt.Errorf("invalid connection protocol: %s", u.Scheme)
+	}
+
+	var kvs []string
+	escaper := strings.NewReplacer(` `, `\ `, `'`, `\'`, `\`, `\\`)
+	accrue := func(k, v string) {
+		if v != "" {
+			kvs = append(kvs, k+"="+escaper.Replace(v))
+		}
+	}
+
+	if u.User != nil {
+		v := u.User.Username()
+		accrue("user", v)
+
+		v, _ = u.User.Password()
+		accrue("password", v)
+	}
+
+	if host, port, err := net.SplitHostPort(u.Host); err != nil {
+		accrue("host", u.Host)
+	} else {
+		accrue("host", host)
+		accrue("port", port)
+	}
+
+	if u.Path != "" {
+		accrue("dbname", u.Path[1:])
+	}
+
+	q := u.Query()
+	for k := range q {
+		accrue(k, q.Get(k))
+	}
+
+	sort.Strings(kvs) // Makes testing easier (not a performance concern)
+	return strings.Join(kvs, " "), nil
+}
+
+func Connect(address string) (*sql.DB, error) {
+	if strings.HasPrefix(address, "postgres://") || strings.HasPrefix(address, "postgresql://") {
+		return sql.Open("pgx", address)
+	}
+
+	config, err := pgx.ParseDSN(address)
+	if err != nil {
+		return nil, err
+	}
+
+	pool, err := pgx.NewConnPool(pgx.ConnPoolConfig{ConnConfig: config})
+	if err != nil {
+		return nil, err
+	}
+
+	return stdlib.OpenFromConnPool(pool)
+}
diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go
index 0e7cdb509..7019762ed 100644
--- a/plugins/inputs/postgresql/postgresql.go
+++ b/plugins/inputs/postgresql/postgresql.go
@@ -2,7 +2,6 @@ package postgresql
 
 import (
 	"bytes"
-	"database/sql"
 	"fmt"
 	"regexp"
 	"sort"
@@ -10,8 +9,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-
-	"github.com/lib/pq"
 )
 
 type Postgresql struct {
@@ -23,7 +20,7 @@ type Postgresql struct {
 	sanitizedAddress string
 }
 
-var ignoredColumns = map[string]bool{"datid": true, "datname": true, "stats_reset": true}
+var ignoredColumns = map[string]bool{"stats_reset": true}
 
 var sampleConfig = `
   ## specify address via a url matching:
@@ -71,7 +68,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 		p.Address = localhost
 	}
 
-	db, err := sql.Open("postgres", p.Address)
+	db, err := Connect(p.Address)
 	if err != nil {
 		return err
 	}
@@ -149,7 +146,7 @@ var passwordKVMatcher, _ = regexp.Compile("password=\\S+ ?")
 func (p *Postgresql) SanitizedAddress() (_ string, err error) {
 	var canonicalizedAddress string
 	if strings.HasPrefix(p.Address, "postgres://") || strings.HasPrefix(p.Address, "postgresql://") {
-		canonicalizedAddress, err = pq.ParseURL(p.Address)
+		canonicalizedAddress, err = ParseURL(p.Address)
 		if err != nil {
 			return p.sanitizedAddress, err
 		}
@@ -185,10 +182,7 @@ func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator) error {
 	}
 	if columnMap["datname"] != nil {
 		// extract the database name from the column map
-		dbnameChars := (*columnMap["datname"]).([]uint8)
-		for i := 0; i < len(dbnameChars); i++ {
-			dbname.WriteString(string(dbnameChars[i]))
-		}
+		dbname.WriteString((*columnMap["datname"]).(string))
 	} else {
 		dbname.WriteString("postgres")
 	}
diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go
index 64926f61e..a0690961d 100644
--- a/plugins/inputs/postgresql/postgresql_test.go
+++ b/plugins/inputs/postgresql/postgresql_test.go
@@ -28,6 +28,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, col := range p.AllColumns {
 		availableColumns[col] = true
 	}
+
 	intMetrics := []string{
 		"xact_commit",
 		"xact_rollback",
@@ -42,7 +43,6 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"temp_files",
 		"temp_bytes",
 		"deadlocks",
-		"numbackends",
 		"buffers_alloc",
 		"buffers_backend",
 		"buffers_backend_fsync",
@@ -53,9 +53,20 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"maxwritten_clean",
 	}
 
+	int32Metrics := []string{
+		"numbackends",
+	}
+
 	floatMetrics := []string{
 		"blk_read_time",
 		"blk_write_time",
+		"checkpoint_write_time",
+		"checkpoint_sync_time",
+	}
+
+	stringMetrics := []string{
+		"datname",
+		"datid",
 	}
 
 	metricsCounted := 0
@@ -68,6 +79,14 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		}
 	}
 
+	for _, metric := range int32Metrics {
+		_, ok := availableColumns[metric]
+		if ok {
+			assert.True(t, acc.HasInt32Field("postgresql", metric))
+			metricsCounted++
+		}
+	}
+
 	for _, metric := range floatMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
@@ -76,8 +95,16 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		}
 	}
 
+	for _, metric := range stringMetrics {
+		_, ok := availableColumns[metric]
+		if ok {
+			assert.True(t, acc.HasStringField("postgresql", metric))
+			metricsCounted++
+		}
+	}
+
 	assert.True(t, metricsCounted > 0)
-	//assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
+	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
 }
 
 func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index beb010fce..00729bf75 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -2,7 +2,6 @@ package postgresql_extensible
 
 import (
 	"bytes"
-	"database/sql"
 	"fmt"
 	"log"
 	"regexp"
@@ -10,8 +9,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-
-	"github.com/lib/pq"
+	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
 )
 
 type Postgresql struct {
@@ -40,7 +38,7 @@ type query []struct {
 	Measurement string
 }
 
-var ignoredColumns = map[string]bool{"datid": true, "datname": true, "stats_reset": true}
+var ignoredColumns = map[string]bool{"stats_reset": true}
 
 var sampleConfig = `
   ## specify address via a url matching:
@@ -126,7 +124,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 		p.Address = localhost
 	}
 
-	db, err := sql.Open("postgres", p.Address)
+	db, err := postgresql.Connect(p.Address)
 	if err != nil {
 		return err
 	}
@@ -212,7 +210,7 @@ func (p *Postgresql) SanitizedAddress() (_ string, err error) {
 	}
 	var canonicalizedAddress string
 	if strings.HasPrefix(p.Address, "postgres://") || strings.HasPrefix(p.Address, "postgresql://") {
-		canonicalizedAddress, err = pq.ParseURL(p.Address)
+		canonicalizedAddress, err = postgresql.ParseURL(p.Address)
 		if err != nil {
 			return p.sanitizedAddress, err
 		}
@@ -248,10 +246,7 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 	}
 	if columnMap["datname"] != nil {
 		// extract the database name from the column map
-		dbnameChars := (*columnMap["datname"]).([]uint8)
-		for i := 0; i < len(dbnameChars); i++ {
-			dbname.WriteString(string(dbnameChars[i]))
-		}
+		dbname.WriteString((*columnMap["datname"]).(string))
 	} else {
 		dbname.WriteString("postgres")
 	}
@@ -275,19 +270,23 @@ COLUMN:
 		if ignore || *val == nil {
 			continue
 		}
+
 		for _, tag := range p.AdditionalTags {
 			if col != tag {
 				continue
 			}
 			switch v := (*val).(type) {
+			case string:
+				tags[col] = v
 			case []byte:
 				tags[col] = string(v)
-			case int64:
+			case int64, int32, int:
 				tags[col] = fmt.Sprintf("%d", v)
+			default:
+				log.Println("failed to add additional tag", col)
 			}
 			continue COLUMN
 		}
-
 		if v, ok := (*val).([]byte); ok {
 			fields[col] = string(v)
 		} else {
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 7fd907102..f92284ee4 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -33,6 +33,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, col := range p.AllColumns {
 		availableColumns[col] = true
 	}
+
 	intMetrics := []string{
 		"xact_commit",
 		"xact_rollback",
@@ -47,6 +48,9 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"temp_files",
 		"temp_bytes",
 		"deadlocks",
+	}
+
+	int32Metrics := []string{
 		"numbackends",
 	}
 
@@ -55,6 +59,11 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"blk_write_time",
 	}
 
+	stringMetrics := []string{
+		"datname",
+		"datid",
+	}
+
 	metricsCounted := 0
 
 	for _, metric := range intMetrics {
@@ -65,6 +74,14 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		}
 	}
 
+	for _, metric := range int32Metrics {
+		_, ok := availableColumns[metric]
+		if ok {
+			assert.True(t, acc.HasInt32Field("postgresql", metric))
+			metricsCounted++
+		}
+	}
+
 	for _, metric := range floatMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
@@ -73,6 +90,14 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		}
 	}
 
+	for _, metric := range stringMetrics {
+		_, ok := availableColumns[metric]
+		if ok {
+			assert.True(t, acc.HasStringField("postgresql", metric))
+			metricsCounted++
+		}
+	}
+
 	assert.True(t, metricsCounted > 0)
 	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 2efee5572..4f131ec8f 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -221,7 +221,7 @@ func (a *Accumulator) AssertDoesNotContainMeasurement(t *testing.T, measurement
 	}
 }
 
-// HasIntValue returns true if the measurement has an Int value
+// HasIntField returns true if the measurement has an Int value
 func (a *Accumulator) HasIntField(measurement string, field string) bool {
 	a.Lock()
 	defer a.Unlock()
@@ -239,6 +239,42 @@ func (a *Accumulator) HasIntField(measurement string, field string) bool {
 	return false
 }
 
+// HasInt32Field returns true if the measurement has an Int value
+func (a *Accumulator) HasInt32Field(measurement string, field string) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					_, ok := value.(int32)
+					return ok
+				}
+			}
+		}
+	}
+
+	return false
+}
+
+// HasStringField returns true if the measurement has an String value
+func (a *Accumulator) HasStringField(measurement string, field string) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					_, ok := value.(string)
+					return ok
+				}
+			}
+		}
+	}
+
+	return false
+}
+
 // HasUIntValue returns true if the measurement has a UInt value
 func (a *Accumulator) HasUIntField(measurement string, field string) bool {
 	a.Lock()

From be10b19760f9c9596d5d974741bf2e8570e0c5cc Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Tue, 24 Jan 2017 21:38:10 +0100
Subject: [PATCH 0078/1302] Added more Windows metrics (#2290)

Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
---
 etc/telegraf_windows.conf | 66 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index ca0357ef3..7380ab8a3 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -105,10 +105,11 @@
       "% Privileged Time",
       "% User Time",
       "% Processor Time",
+      "% DPC Time",
     ]
     Measurement = "win_cpu"
     # Set to true to include _Total instance when querying for all (*).
-    #IncludeTotal=false
+    IncludeTotal=true
 
   [[inputs.win_perf_counters.object]]
     # Disk times and queues
@@ -118,19 +119,51 @@
       "% Idle Time",
       "% Disk Time","% Disk Read Time",
       "% Disk Write Time",
-      "% User Time",
       "Current Disk Queue Length",
+      "% Free Space",
+      "Free Megabytes",
     ]
     Measurement = "win_disk"
     # Set to true to include _Total instance when querying for all (*).
     #IncludeTotal=false
 
+  [[inputs.win_perf_counters.object]]
+    ObjectName = "PhysicalDisk"
+    Instances = ["*"]
+    Counters = [
+      "Disk Read Bytes/sec",
+      "Disk Write Bytes/sec",
+      "Current Disk Queue Length",
+      "Disk Reads/sec",
+      "Disk Writes/sec",
+      "% Disk Time",
+      "% Disk Read Time",
+      "% Disk Write Time",
+    ]
+    Measurement = "win_diskio"
+
+  [[inputs.win_perf_counters.object]]
+    ObjectName = "Network Interface"
+    Instances = ["*"]
+    Counters = [
+      "Bytes Received/sec",
+      "Bytes Sent/sec",
+      "Packets Received/sec",
+      "Packets Sent/sec",
+      "Packets Received Discarded",
+      "Packets Outbound Discarded",
+      "Packets Received Errors",
+      "Packets Outbound Errors",
+    ]
+    Measurement = "win_net"
+
   [[inputs.win_perf_counters.object]]
     ObjectName = "System"
     Counters = [
       "Context Switches/sec",
       "System Calls/sec",
       "Processor Queue Length",
+      "System Up Time",
     ]
     Instances = ["------"]
     Measurement = "win_system"
@@ -150,6 +183,10 @@
       "Transition Faults/sec",
       "Pool Nonpaged Bytes",
       "Pool Paged Bytes",
+      "Standby Cache Reserve Bytes",
+      "Standby Cache Normal Priority Bytes",
+      "Standby Cache Core Bytes",
+
     ]
     # Use 6 x - to remove the Instance bit from the query.
     Instances = ["------"]
@@ -157,6 +194,31 @@
     # Set to true to include _Total instance when querying for all (*).
     #IncludeTotal=false
 
+  [[inputs.win_perf_counters.object]]
+    # Example query where the Instance portion must be removed to get data back,
+    # such as from the Paging File object.
+    ObjectName = "Paging File"
+    Counters = [
+      "% Usage",
+    ]
+    Instances = ["_Total"]
+    Measurement = "win_swap"
+
+  [[inputs.win_perf_counters.object]]
+    ObjectName = "Network Interface"
+    Instances = ["*"]
+    Counters = [
+      "Bytes Sent/sec",
+      "Bytes Received/sec",
+      "Packets Sent/sec",
+      "Packets Received/sec",
+      "Packets Received Discarded",
+      "Packets Received Errors",
+      "Packets Outbound Discarded",
+      "Packets Outbound Errors",
+    ]
+
+
 
 # Windows system plugins using WMI (disabled by default, using
 # win_perf_counters over WMI is recommended)

From a505123e60df6d260395fe2c18787ff723b2b783 Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Tue, 24 Jan 2017 21:46:06 +0100
Subject: [PATCH 0079/1302] Improve win_perf_counters on non English systems
 (#2261)

---
 CHANGELOG.md                                  |  2 +-
 .../win_perf_counters/win_perf_counters.go    | 60 ++++++-------------
 2 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d43f2f9..58912b2fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,7 @@ plugins, not just statsd.
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
 - [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
 - [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
-- [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
+- [#1730](https://github.com/influxdata/telegraf/issues/1730) & [#2261](https://github.com/influxdata/telegraf/pull/2261): Fix win_perf_counters not gathering non-English counters.
 - [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
 - [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
 - [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 691f67a01..da59c3040 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -110,13 +110,23 @@ var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")
 
 func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName string, counter string, instance string,
-	measurement string, include_total bool) {
+	measurement string, include_total bool) error {
 
 	var handle PDH_HQUERY
 	var counterHandle PDH_HCOUNTER
 	ret := PdhOpenQuery(0, 0, &handle)
-	ret = PdhAddCounter(handle, query, 0, &counterHandle)
-	_ = ret
+	if m.PreVistaSupport {
+		ret = PdhAddCounter(handle, query, 0, &counterHandle)
+	} else {
+		ret = PdhAddEnglishCounter(handle, query, 0, &counterHandle)
+	}
+
+	// Call PdhCollectQueryData one time to check existance of the counter
+	ret = PdhCollectQueryData(handle)
+	if ret != ERROR_SUCCESS {
+		ret = PdhCloseQuery(handle)
+		return errors.New("Invalid query for Performance Counters")
+	}
 
 	temp := &item{query, objectName, counter, instance, measurement,
 		include_total, handle, counterHandle}
@@ -127,39 +137,6 @@ func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName s
 		metrics.items = make(map[int]*item)
 	}
 	metrics.items[index] = temp
-}
-
-func (m *Win_PerfCounters) InvalidObject(exists uint32, query string, PerfObject perfobject, instance string, counter string) error {
-	if exists == 3221228472 { // PDH_CSTATUS_NO_OBJECT
-		if PerfObject.FailOnMissing {
-			err := errors.New("Performance object does not exist")
-			return err
-		} else {
-			fmt.Printf("Performance Object '%s' does not exist in query: %s\n", PerfObject.ObjectName, query)
-		}
-	} else if exists == 3221228473 { // PDH_CSTATUS_NO_COUNTER
-
-		if PerfObject.FailOnMissing {
-			err := errors.New("Counter in Performance object does not exist")
-			return err
-		} else {
-			fmt.Printf("Counter '%s' does not exist in query: %s\n", counter, query)
-		}
-	} else if exists == 2147485649 { // PDH_CSTATUS_NO_INSTANCE
-		if PerfObject.FailOnMissing {
-			err := errors.New("Instance in Performance object does not exist")
-			return err
-		} else {
-			fmt.Printf("Instance '%s' does not exist in query: %s\n", instance, query)
-
-		}
-	} else {
-		fmt.Printf("Invalid result: %v, query: %s\n", exists, query)
-		if PerfObject.FailOnMissing {
-			err := errors.New("Invalid query for Performance Counters")
-			return err
-		}
-	}
 	return nil
 }
 
@@ -188,17 +165,18 @@ func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
 						query = "\\" + objectname + "(" + instance + ")\\" + counter
 					}
 
-					var exists uint32 = PdhValidatePath(query)
+					err := m.AddItem(metrics, query, objectname, counter, instance,
+						PerfObject.Measurement, PerfObject.IncludeTotal)
 
-					if exists == ERROR_SUCCESS {
+					if err == nil {
 						if m.PrintValid {
 							fmt.Printf("Valid: %s\n", query)
 						}
-						m.AddItem(metrics, query, objectname, counter, instance,
-							PerfObject.Measurement, PerfObject.IncludeTotal)
 					} else {
 						if PerfObject.FailOnMissing || PerfObject.WarnOnMissing {
-							err := m.InvalidObject(exists, query, PerfObject, instance, counter)
+							fmt.Printf("Invalid query: %s\n", query)
+						}
+						if PerfObject.FailOnMissing {
 							return err
 						}
 					}

From d7a8bb22145a68c36a3e01a718393ec442481ece Mon Sep 17 00:00:00 2001
From: Will Pearson <will.pearson@digital.cabinet-office.gov.uk>
Date: Tue, 24 Jan 2017 20:50:29 +0000
Subject: [PATCH 0080/1302] Fix problem with graphite talking to closed
 connections (#2171)

We were having problems with telegraf talking to
carbon-relay-ng using the graphite output. When
the carbon-relay-ng server restarted the connection
the telegraf side would go into CLOSE_WAIT but telegraf
would continue to send statistics through the connection.

Reading around it seems you need to a read from the connection
and see a EOF error. We've implemented this and added a test
that replicates roughly the error we were having.

Pair: @whpearson @joshmyers
---
 plugins/outputs/graphite/graphite.go      | 29 ++++++++++++++-
 plugins/outputs/graphite/graphite_test.go | 43 +++++++++++++++++++----
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 24f8e08d0..8d4447cdd 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -2,6 +2,7 @@ package graphite
 
 import (
 	"errors"
+	"io"
 	"log"
 	"math/rand"
 	"net"
@@ -71,6 +72,31 @@ func (g *Graphite) Description() string {
 	return "Configuration for Graphite server to send metrics to"
 }
 
+// We need check eof as we can write to nothing without noticing anything is wrong
+// the connection stays in a close_wait
+// We can detect that by finding an eof
+// if not for this, we can happily write and flush without getting errors (in Go) but getting RST tcp packets back (!)
+// props to Tv via the authors of carbon-relay-ng` for this trick.
+func checkEOF(conn net.Conn) {
+	b := make([]byte, 1024)
+	conn.SetReadDeadline(time.Now().Add(10 * time.Millisecond))
+	num, err := conn.Read(b)
+	if err == io.EOF {
+		log.Printf("E! Conn %s is closed. closing conn explicitly", conn)
+		conn.Close()
+		return
+	}
+	// just in case i misunderstand something or the remote behaves badly
+	if num != 0 {
+		log.Printf("I! conn %s .conn.Read data? did not expect that.  data: %s\n", conn, b[:num])
+	}
+	// Log non-timeout errors or close.
+	if e, ok := err.(net.Error); !(ok && e.Timeout()) {
+		log.Printf("E! conn %s checkEOF .conn.Read returned err != EOF, which is unexpected.  closing conn. error: %s\n", conn, err)
+		conn.Close()
+	}
+}
+
 // Choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (g *Graphite) Write(metrics []telegraf.Metric) error {
@@ -91,13 +117,13 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 
 	// This will get set to nil if a successful write occurs
 	err = errors.New("Could not write to any Graphite server in cluster\n")
-
 	// Send data to a random server
 	p := rand.Perm(len(g.conns))
 	for _, n := range p {
 		if g.Timeout > 0 {
 			g.conns[n].SetWriteDeadline(time.Now().Add(time.Duration(g.Timeout) * time.Second))
 		}
+		checkEOF(g.conns[n])
 		if _, e := g.conns[n].Write(batch); e != nil {
 			// Error
 			log.Println("E! Graphite Error: " + e.Error())
@@ -110,6 +136,7 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 	}
 	// try to reconnect
 	if err != nil {
+		log.Println("E! Reconnecting: ")
 		g.Connect()
 	}
 	return err
diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go
index c4f132725..4f1f2fef6 100644
--- a/plugins/outputs/graphite/graphite_test.go
+++ b/plugins/outputs/graphite/graphite_test.go
@@ -43,7 +43,8 @@ func TestGraphiteOK(t *testing.T) {
 	var wg sync.WaitGroup
 	// Start TCP server
 	wg.Add(1)
-	go TCPServer(t, &wg)
+	t.Log("Starting server")
+	go TCPServer1(t, &wg)
 	// Give the fake graphite TCP server some time to start:
 	time.Sleep(time.Millisecond * 100)
 
@@ -51,6 +52,7 @@ func TestGraphiteOK(t *testing.T) {
 	g := Graphite{
 		Prefix: "my.prefix",
 	}
+
 	// Init metrics
 	m1, _ := metric.New(
 		"mymeasurement",
@@ -72,29 +74,58 @@ func TestGraphiteOK(t *testing.T) {
 	)
 
 	// Prepare point list
-	metrics := []telegraf.Metric{m1, m2, m3}
+	metrics := []telegraf.Metric{m1}
+	metrics2 := []telegraf.Metric{m2, m3}
 	err1 := g.Connect()
 	require.NoError(t, err1)
 	// Send Data
+	t.Log("Send first data")
 	err2 := g.Write(metrics)
 	require.NoError(t, err2)
 
 	// Waiting TCPserver
 	wg.Wait()
+	t.Log("Finished Waiting for first data")
+	var wg2 sync.WaitGroup
+	// Start TCP server
+	time.Sleep(time.Millisecond * 100)
+	wg2.Add(1)
+	go TCPServer2(t, &wg2)
+	time.Sleep(time.Millisecond * 100)
+	//Write but expect an error, but reconnect
+	g.Write(metrics2)
+	err3 := g.Write(metrics2)
+	t.Log("Finished writing second data, it should have failed")
+	//Actually write the new metrics
+
+	require.NoError(t, err3)
+	t.Log("Finished writing third data")
+	wg2.Wait()
 	g.Close()
 }
 
-func TCPServer(t *testing.T, wg *sync.WaitGroup) {
-	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
+func TCPServer1(t *testing.T, wg *sync.WaitGroup) {
 	defer wg.Done()
-	conn, _ := tcpServer.Accept()
+	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
+	conn, _ := (tcpServer).Accept()
 	reader := bufio.NewReader(conn)
 	tp := textproto.NewReader(reader)
 	data1, _ := tp.ReadLine()
 	assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1)
+	conn.Close()
+	tcpServer.Close()
+}
+
+func TCPServer2(t *testing.T, wg *sync.WaitGroup) {
+	defer wg.Done()
+	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
+	conn2, _ := (tcpServer).Accept()
+	reader := bufio.NewReader(conn2)
+	tp := textproto.NewReader(reader)
 	data2, _ := tp.ReadLine()
 	assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2)
 	data3, _ := tp.ReadLine()
 	assert.Equal(t, "my.prefix.192_168_0_1.my_measurement 3.14 1289430000", data3)
-	conn.Close()
+	conn2.Close()
+	tcpServer.Close()
 }

From 822333690f60cfdbf7859317a36b39657dd27ad6 Mon Sep 17 00:00:00 2001
From: Kali Hernandez <drinkkali@gmail.com>
Date: Tue, 24 Jan 2017 23:54:19 +0100
Subject: [PATCH 0081/1302] Debian package: check for group before useradd
 (#2107)

Fixes #2106
---
 scripts/post-install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 95045be1f..45a19d26c 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -26,7 +26,12 @@ function install_chkconfig {
 
 id telegraf &>/dev/null
 if [[ $? -ne 0 ]]; then
-    useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf
+    grep "^telegraf:" /etc/group &>/dev/null
+    if [[ $? -ne 0 ]]; then
+        useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf
+    else
+        useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf -g telegraf
+    fi
 fi
 
 test -d $LOG_DIR || mkdir -p $LOG_DIR

From c4d4185fb5155d2d4298ef3e34500a5e5f4e341d Mon Sep 17 00:00:00 2001
From: Jonas Hahnfeld <hahnjo@hahnjo.de>
Date: Tue, 24 Jan 2017 23:57:43 +0100
Subject: [PATCH 0082/1302] snmp: Allow lines with empty or missing tags
 (#2172)

The changes in #1848 resulted in lines being dropped if they had an empty
tag. Let's allow all lines that have empty or missing tags!
---
 plugins/inputs/snmp/snmp.go      | 27 +++++++++++----------------
 plugins/inputs/snmp/snmp_test.go | 17 ++++++++++++++++-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 6f515e227..9296bc043 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -433,9 +433,7 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 				if err != nil {
 					return nil, Errorf(err, "converting %q (OID %s) for field %s", ent.Value, ent.Name, f.Name)
 				}
-				if fvs, ok := fv.(string); !ok || fvs != "" {
-					ifv[""] = fv
-				}
+				ifv[""] = fv
 			}
 		} else {
 			err := gs.Walk(oid, func(ent gosnmp.SnmpPDU) error {
@@ -456,9 +454,7 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 				if err != nil {
 					return Errorf(err, "converting %q (OID %s) for field %s", ent.Value, ent.Name, f.Name)
 				}
-				if fvs, ok := fv.(string); !ok || fvs != "" {
-					ifv[idx] = fv
-				}
+				ifv[idx] = fv
 				return nil
 			})
 			if err != nil {
@@ -476,14 +472,17 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 				rtr.Fields = map[string]interface{}{}
 				rows[i] = rtr
 			}
-			if f.IsTag {
-				if vs, ok := v.(string); ok {
-					rtr.Tags[f.Name] = vs
+			// don't add an empty string
+			if vs, ok := v.(string); !ok || vs != "" {
+				if f.IsTag {
+					if ok {
+						rtr.Tags[f.Name] = vs
+					} else {
+						rtr.Tags[f.Name] = fmt.Sprintf("%v", v)
+					}
 				} else {
-					rtr.Tags[f.Name] = fmt.Sprintf("%v", v)
+					rtr.Fields[f.Name] = v
 				}
-			} else {
-				rtr.Fields[f.Name] = v
 			}
 		}
 	}
@@ -494,10 +493,6 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 		Rows: make([]RTableRow, 0, len(rows)),
 	}
 	for _, r := range rows {
-		if len(r.Tags) < tagCount {
-			// don't add rows which are missing tags, as without tags you can't filter
-			continue
-		}
 		rt.Rows = append(rt.Rows, r)
 	}
 	return &rt, nil
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index ed01508f2..62b19fcea 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -457,9 +457,24 @@ func TestTableBuild_walk(t *testing.T) {
 			"myfield4": 22,
 		},
 	}
-	assert.Len(t, tb.Rows, 2)
+	rtr3 := RTableRow{
+		Tags: map[string]string{},
+		Fields: map[string]interface{}{
+			"myfield2": 0,
+			"myfield3": float64(0.0),
+		},
+	}
+	rtr4 := RTableRow{
+		Tags: map[string]string{},
+		Fields: map[string]interface{}{
+			"myfield3": float64(9.999),
+		},
+	}
+	assert.Len(t, tb.Rows, 4)
 	assert.Contains(t, tb.Rows, rtr1)
 	assert.Contains(t, tb.Rows, rtr2)
+	assert.Contains(t, tb.Rows, rtr3)
+	assert.Contains(t, tb.Rows, rtr4)
 }
 
 func TestTableBuild_noWalk(t *testing.T) {

From 168270ea5faf4eadb84942fb4531adeb12ac482f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 24 Jan 2017 15:27:44 -0800
Subject: [PATCH 0083/1302] ntpq: correct number of seconds in an hour

closes #2256
---
 plugins/inputs/ntpq/ntpq.go      | 2 +-
 plugins/inputs/ntpq/ntpq_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go
index 674cd7216..601d5b2df 100644
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -136,7 +136,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 							continue
 						}
 						// seconds in an hour
-						mFields[key] = int64(m) * 360
+						mFields[key] = int64(m) * 3600
 						continue
 					case strings.HasSuffix(when, "d"):
 						m, err := strconv.Atoi(strings.TrimSuffix(fields[index], "d"))
diff --git a/plugins/inputs/ntpq/ntpq_test.go b/plugins/inputs/ntpq/ntpq_test.go
index 4b6489949..68abab7be 100644
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -171,7 +171,7 @@ func TestHoursNTPQ(t *testing.T) {
 	assert.NoError(t, n.Gather(&acc))
 
 	fields := map[string]interface{}{
-		"when":   int64(720),
+		"when":   int64(7200),
 		"poll":   int64(256),
 		"reach":  int64(37),
 		"delay":  float64(51.016),

From 4a5d3136934bf6d25ea2c6fb0b8d0aedc13baa18 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sun, 4 Dec 2016 20:18:13 +0000
Subject: [PATCH 0084/1302] Improve the InfluxDB through-put performance

This changes the current use of the InfluxDB client to instead use a
baked-in client that uses the fasthttp library.

This allows for significantly smaller allocations, the re-use of http
body buffers, and the re-use of the actual bytes of the line-protocol
metric representations.
---
 Godeps                                        |   2 +
 metric.go                                     |   9 +-
 metric/metric.go                              |  42 ++
 metric/reader.go                              | 155 ++++++
 metric/reader_test.go                         | 487 ++++++++++++++++++
 plugins/inputs/http_listener/http_listener.go |   3 +
 plugins/outputs/influxdb/client/client.go     |  22 +
 plugins/outputs/influxdb/client/http.go       | 258 ++++++++++
 plugins/outputs/influxdb/client/http_test.go  | 343 ++++++++++++
 plugins/outputs/influxdb/client/udp.go        |  99 ++++
 plugins/outputs/influxdb/client/udp_test.go   | 163 ++++++
 plugins/outputs/influxdb/influxdb.go          | 124 ++---
 plugins/outputs/influxdb/influxdb_test.go     | 113 +++-
 13 files changed, 1735 insertions(+), 85 deletions(-)
 create mode 100644 metric/reader.go
 create mode 100644 metric/reader_test.go
 create mode 100644 plugins/outputs/influxdb/client/client.go
 create mode 100644 plugins/outputs/influxdb/client/http.go
 create mode 100644 plugins/outputs/influxdb/client/http_test.go
 create mode 100644 plugins/outputs/influxdb/client/udp.go
 create mode 100644 plugins/outputs/influxdb/client/udp_test.go

diff --git a/Godeps b/Godeps
index 99606414e..83b9e4561 100644
--- a/Godeps
+++ b/Godeps
@@ -50,6 +50,8 @@ github.com/shirou/gopsutil 1516eb9ddc5e61ba58874047a98f8b44b5e585e8
 github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
+github.com/valyala/bytebufferpool e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7
+github.com/valyala/fasthttp 2f4876aaf2b591786efc9b49f34b86ad44c25074
 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
diff --git a/metric.go b/metric.go
index cb230512f..b1ab1b29f 100644
--- a/metric.go
+++ b/metric.go
@@ -19,8 +19,15 @@ const (
 )
 
 type Metric interface {
+	// Serialize serializes the metric into a line-protocol byte buffer,
+	// including a newline at the end.
 	Serialize() []byte
-	String() string // convenience function for string(Serialize())
+	// same as Serialize, but avoids an allocation.
+	// returns number of bytes copied into dst.
+	SerializeTo(dst []byte) int
+	// String is the same as Serialize, but returns a string.
+	String() string
+	// Copy deep-copies the metric.
 	Copy() Metric
 	// Split will attempt to return multiple metrics with the same timestamp
 	// whose string representations are no longer than maxSize.
diff --git a/metric/metric.go b/metric/metric.go
index 8a18c0f2c..4fbee0ad1 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -178,6 +178,48 @@ func (m *metric) Serialize() []byte {
 	return tmp
 }
 
+func (m *metric) SerializeTo(dst []byte) int {
+	i := 0
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.name)
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.tags)
+	if i >= len(dst) {
+		return i
+	}
+
+	dst[i] = ' '
+	i++
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.fields)
+	if i >= len(dst) {
+		return i
+	}
+
+	dst[i] = ' '
+	i++
+	if i >= len(dst) {
+		return i
+	}
+
+	i += copy(dst[i:], m.t)
+	if i >= len(dst) {
+		return i
+	}
+	dst[i] = '\n'
+
+	return i + 1
+}
+
 func (m *metric) Split(maxSize int) []telegraf.Metric {
 	if m.Len() < maxSize {
 		return []telegraf.Metric{m}
diff --git a/metric/reader.go b/metric/reader.go
new file mode 100644
index 000000000..df0729963
--- /dev/null
+++ b/metric/reader.go
@@ -0,0 +1,155 @@
+package metric
+
+import (
+	"io"
+
+	"github.com/influxdata/telegraf"
+)
+
+type state int
+
+const (
+	_ state = iota
+	// normal state copies whole metrics into the given buffer until we can't
+	// fit the next metric.
+	normal
+	// split state means that we have a metric that we were able to split, so
+	// that we can fit it into multiple metrics (and calls to Read)
+	split
+	// overflow state means that we have a metric that didn't fit into a single
+	// buffer, and needs to be split across multiple calls to Read.
+	overflow
+	// splitOverflow state means that a split metric didn't fit into a single
+	// buffer, and needs to be split across multiple calls to Read.
+	splitOverflow
+	// done means we're done reading metrics, and now always return (0, io.EOF)
+	done
+)
+
+type reader struct {
+	metrics      []telegraf.Metric
+	splitMetrics []telegraf.Metric
+	buf          []byte
+	state        state
+
+	// metric index
+	iM int
+	// split metric index
+	iSM int
+	// buffer index
+	iB int
+}
+
+func NewReader(metrics []telegraf.Metric) io.Reader {
+	return &reader{
+		metrics: metrics,
+		state:   normal,
+	}
+}
+
+func (r *reader) Read(p []byte) (n int, err error) {
+	var i int
+	switch r.state {
+	case done:
+		return 0, io.EOF
+	case normal:
+		for {
+			// this for-loop is the sunny-day scenario, where we are given a
+			// buffer that is large enough to hold at least a single metric.
+			// all of the cases below it are edge-cases.
+			if r.metrics[r.iM].Len() < len(p[i:]) {
+				i += r.metrics[r.iM].SerializeTo(p[i:])
+			} else {
+				break
+			}
+			r.iM++
+			if r.iM == len(r.metrics) {
+				r.state = done
+				return i, io.EOF
+			}
+		}
+
+		// if we haven't written any bytes, check if we can split the current
+		// metric into multiple full metrics at a smaller size.
+		if i == 0 {
+			tmp := r.metrics[r.iM].Split(len(p))
+			if len(tmp) > 1 {
+				r.splitMetrics = tmp
+				r.state = split
+				if r.splitMetrics[0].Len() < len(p) {
+					i += r.splitMetrics[0].SerializeTo(p)
+					r.iSM = 1
+				} else {
+					// splitting didn't quite work, so we'll drop down and
+					// overflow the metric.
+					r.state = normal
+					r.iSM = 0
+				}
+			}
+		}
+
+		// if we haven't written any bytes and we're not at the end of the metrics
+		// slice, then it means we have a single metric that is larger than the
+		// provided buffer.
+		if i == 0 {
+			r.buf = r.metrics[r.iM].Serialize()
+			i += copy(p, r.buf[r.iB:])
+			r.iB += i
+			r.state = overflow
+		}
+
+	case split:
+		if r.splitMetrics[r.iSM].Len() < len(p) {
+			// write the current split metric
+			i += r.splitMetrics[r.iSM].SerializeTo(p)
+			r.iSM++
+			if r.iSM >= len(r.splitMetrics) {
+				// done writing the current split metrics
+				r.iSM = 0
+				r.iM++
+				if r.iM == len(r.metrics) {
+					r.state = done
+					return i, io.EOF
+				}
+				r.state = normal
+			}
+		} else {
+			// This would only happen if we split the metric, and then a
+			// subsequent buffer was smaller than the initial one given,
+			// so that our split metric no longer fits.
+			r.buf = r.splitMetrics[r.iSM].Serialize()
+			i += copy(p, r.buf[r.iB:])
+			r.iB += i
+			r.state = splitOverflow
+		}
+
+	case splitOverflow:
+		i = copy(p, r.buf[r.iB:])
+		r.iB += i
+		if r.iB >= len(r.buf) {
+			r.iB = 0
+			r.iSM++
+			if r.iSM == len(r.splitMetrics) {
+				r.iM++
+				r.state = normal
+			} else {
+				r.state = split
+			}
+		}
+
+	case overflow:
+		i = copy(p, r.buf[r.iB:])
+		r.iB += i
+		if r.iB >= len(r.buf) {
+			r.iB = 0
+			r.iM++
+			if r.iM == len(r.metrics) {
+				r.state = done
+				return i, io.EOF
+			}
+			r.state = normal
+		}
+	}
+
+	return i, nil
+}
diff --git a/metric/reader_test.go b/metric/reader_test.go
new file mode 100644
index 000000000..a1c864ad5
--- /dev/null
+++ b/metric/reader_test.go
@@ -0,0 +1,487 @@
+package metric
+
+import (
+	"io"
+	"io/ioutil"
+	"regexp"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func BenchmarkMetricReader(b *testing.B) {
+	metrics := make([]telegraf.Metric, 10)
+	for i := 0; i < 10; i++ {
+		metrics[i], _ = New("foo", map[string]string{},
+			map[string]interface{}{"value": int64(1)}, time.Now())
+	}
+	for n := 0; n < b.N; n++ {
+		r := NewReader(metrics)
+		io.Copy(ioutil.Discard, r)
+	}
+}
+
+func TestMetricReader(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	metrics := make([]telegraf.Metric, 10)
+	for i := 0; i < 10; i++ {
+		metrics[i], _ = New("foo", map[string]string{},
+			map[string]interface{}{"value": int64(1)}, ts)
+	}
+
+	r := NewReader(metrics)
+
+	buf := make([]byte, 35)
+	for i := 0; i < 10; i++ {
+		n, err := r.Read(buf)
+		if err != nil {
+			assert.True(t, err == io.EOF, err.Error())
+		}
+		assert.Equal(t, 33, n)
+		assert.Equal(t, "foo value=1i 1481032190000000000\n", string(buf[0:n]))
+	}
+
+	// reader should now be done, and always return 0, io.EOF
+	for i := 0; i < 10; i++ {
+		n, err := r.Read(buf)
+		assert.True(t, err == io.EOF, err.Error())
+		assert.Equal(t, 0, n)
+	}
+}
+
+func TestMetricReader_OverflowMetric(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m, _ := New("foo", map[string]string{},
+		map[string]interface{}{"value": int64(10)}, ts)
+	metrics := []telegraf.Metric{m}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 5)
+
+	tests := []struct {
+		exp string
+		err error
+		n   int
+	}{
+		{
+			"foo v",
+			nil,
+			5,
+		},
+		{
+			"alue=",
+			nil,
+			5,
+		},
+		{
+			"10i 1",
+			nil,
+			5,
+		},
+		{
+			"48103",
+			nil,
+			5,
+		},
+		{
+			"21900",
+			nil,
+			5,
+		},
+		{
+			"00000",
+			nil,
+			5,
+		},
+		{
+			"000\n",
+			io.EOF,
+			4,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		assert.Equal(t, test.exp, string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m, _ := New("foo", map[string]string{},
+		map[string]interface{}{"value": int64(10)}, ts)
+	metrics := []telegraf.Metric{m, m.Copy()}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 10)
+
+	tests := []struct {
+		exp string
+		err error
+		n   int
+	}{
+		{
+			"foo value=",
+			nil,
+			10,
+		},
+		{
+			"10i 148103",
+			nil,
+			10,
+		},
+		{
+			"2190000000",
+			nil,
+			10,
+		},
+		{
+			"000\n",
+			nil,
+			4,
+		},
+		{
+			"foo value=",
+			nil,
+			10,
+		},
+		{
+			"10i 148103",
+			nil,
+			10,
+		},
+		{
+			"2190000000",
+			nil,
+			10,
+		},
+		{
+			"000\n",
+			io.EOF,
+			4,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		assert.Equal(t, test.exp, string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test splitting a metric
+func TestMetricReader_SplitMetric(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+			"value4": int64(10),
+			"value5": int64(10),
+			"value6": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 60)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			io.EOF,
+			57,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test an array with one split metric and one unsplit
+func TestMetricReader_SplitMetric2(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+			"value4": int64(10),
+			"value5": int64(10),
+			"value6": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 60)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
+			nil,
+			57,
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test split that results in metrics that are still too long, which results in
+// the reader falling back to regular overflow.
+func TestMetricReader_SplitMetricTooLong(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+	}{
+		{
+			`foo value\d=10i,value\d=10i 1481`,
+			nil,
+			30,
+		},
+		{
+			`032190000000000\n`,
+			io.EOF,
+			16,
+		},
+		{
+			"",
+			io.EOF,
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(buf)
+		assert.Equal(t, test.n, n)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
+		assert.Equal(t, test.err, err)
+	}
+}
+
+// test split with a changing buffer size in the middle of subsequent calls
+// to Read
+func TestMetricReader_SplitMetricChangingBuffer(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+			"value3": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+		buf      []byte
+	}{
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value\d=10i 148103219000000`,
+			nil,
+			30,
+			make([]byte, 30),
+		},
+		{
+			`0000\n`,
+			nil,
+			5,
+			make([]byte, 30),
+		},
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+			make([]byte, 36),
+		},
+		{
+			"",
+			io.EOF,
+			0,
+			make([]byte, 36),
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(test.buf)
+		assert.Equal(t, test.n, n, test.expRegex)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
+		assert.Equal(t, test.err, err, test.expRegex)
+	}
+}
+
+// test split with a changing buffer size in the middle of subsequent calls
+// to Read
+func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+			"value2": int64(10),
+		},
+		ts,
+	)
+	m2, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"value1": int64(10),
+		},
+		ts,
+	)
+	metrics := []telegraf.Metric{m1, m2}
+
+	r := NewReader(metrics)
+
+	tests := []struct {
+		expRegex string
+		err      error
+		n        int
+		buf      []byte
+	}{
+		{
+			`foo value\d=10i 1481032190000000000\n`,
+			nil,
+			35,
+			make([]byte, 36),
+		},
+		{
+			`foo value\d=10i 148103219000000`,
+			nil,
+			30,
+			make([]byte, 30),
+		},
+		{
+			`0000\n`,
+			nil,
+			5,
+			make([]byte, 30),
+		},
+		{
+			`foo value1=10i 1481032190000000000\n`,
+			io.EOF,
+			35,
+			make([]byte, 36),
+		},
+		{
+			"",
+			io.EOF,
+			0,
+			make([]byte, 36),
+		},
+	}
+
+	for _, test := range tests {
+		n, err := r.Read(test.buf)
+		assert.Equal(t, test.n, n, test.expRegex)
+		re := regexp.MustCompile(test.expRegex)
+		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
+		assert.Equal(t, test.err, err, test.expRegex)
+	}
+}
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 0f426f809..05551a966 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -300,6 +300,9 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time) error {
+	if !bytes.HasSuffix(b, []byte("\n")) {
+		b = append(b, '\n')
+	}
 	metrics, err := h.parser.ParseWithDefaultTime(b, t)
 
 	for _, m := range metrics {
diff --git a/plugins/outputs/influxdb/client/client.go b/plugins/outputs/influxdb/client/client.go
new file mode 100644
index 000000000..3f52752ad
--- /dev/null
+++ b/plugins/outputs/influxdb/client/client.go
@@ -0,0 +1,22 @@
+package client
+
+import "io"
+
+type Client interface {
+	Query(command string) error
+
+	Write(b []byte) (int, error)
+	WriteWithParams(b []byte, params WriteParams) (int, error)
+
+	WriteStream(b io.Reader, contentLength int) (int, error)
+	WriteStreamWithParams(b io.Reader, contentLength int, params WriteParams) (int, error)
+
+	Close() error
+}
+
+type WriteParams struct {
+	Database        string
+	RetentionPolicy string
+	Precision       string
+	Consistency     string
+}
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
new file mode 100644
index 000000000..68cc3e094
--- /dev/null
+++ b/plugins/outputs/influxdb/client/http.go
@@ -0,0 +1,258 @@
+package client
+
+import (
+	"crypto/tls"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/url"
+	"time"
+
+	"github.com/valyala/fasthttp"
+)
+
+var (
+	defaultRequestTimeout = time.Second * 5
+)
+
+//
+func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
+	// validate required parameters:
+	if len(config.URL) == 0 {
+		return nil, fmt.Errorf("config.URL is required to create an HTTP client")
+	}
+	if len(defaultWP.Database) == 0 {
+		return nil, fmt.Errorf("A default database is required to create an HTTP client")
+	}
+
+	// set defaults:
+	if config.Timeout == 0 {
+		config.Timeout = defaultRequestTimeout
+	}
+
+	// parse URL:
+	u, err := url.Parse(config.URL)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing config.URL: %s", err)
+	}
+	if u.Scheme != "http" && u.Scheme != "https" {
+		return nil, fmt.Errorf("config.URL scheme must be http(s), got %s", u.Scheme)
+	}
+
+	wu := writeURL(u, defaultWP)
+	return &httpClient{
+		writeURL: []byte(wu),
+		config:   config,
+		url:      u,
+		client: &fasthttp.Client{
+			TLSConfig: config.TLSConfig,
+		},
+	}, nil
+}
+
+type HTTPConfig struct {
+	// URL should be of the form "http://host:port" (REQUIRED)
+	URL string
+
+	// UserAgent sets the User-Agent header.
+	UserAgent string
+
+	// Timeout is the time to wait for a response to each HTTP request (writes
+	// and queries).
+	Timeout time.Duration
+
+	// Username is the basic auth username for the server.
+	Username string
+	// Password is the basic auth password for the server.
+	Password string
+
+	// TLSConfig is the tls auth settings to use for each request.
+	TLSConfig *tls.Config
+
+	// Gzip, if true, compresses each payload using gzip.
+	// TODO
+	// Gzip bool
+}
+
+// Response represents a list of statement results.
+type Response struct {
+	// ignore Results:
+	Results []interface{} `json:"-"`
+	Err     string        `json:"error,omitempty"`
+}
+
+// Error returns the first error from any statement.
+// Returns nil if no errors occurred on any statements.
+func (r *Response) Error() error {
+	if r.Err != "" {
+		return fmt.Errorf(r.Err)
+	}
+	return nil
+}
+
+type httpClient struct {
+	writeURL []byte
+	config   HTTPConfig
+	client   *fasthttp.Client
+	url      *url.URL
+}
+
+func (c *httpClient) Query(command string) error {
+	req := c.makeRequest()
+	req.Header.SetRequestURI(queryURL(c.url, command))
+
+	return c.doRequest(req, fasthttp.StatusOK)
+}
+
+func (c *httpClient) Write(b []byte) (int, error) {
+	req := c.makeWriteRequest(len(b), c.writeURL)
+	req.SetBody(b)
+
+	err := c.doRequest(req, fasthttp.StatusNoContent)
+	if err == nil {
+		return len(b), nil
+	}
+	return 0, err
+}
+
+func (c *httpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
+	req := c.makeWriteRequest(len(b), []byte(writeURL(c.url, wp)))
+	req.SetBody(b)
+
+	err := c.doRequest(req, fasthttp.StatusNoContent)
+	if err == nil {
+		return len(b), nil
+	}
+	return 0, err
+}
+
+func (c *httpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
+	req := c.makeWriteRequest(contentLength, c.writeURL)
+	req.SetBodyStream(r, contentLength)
+
+	err := c.doRequest(req, fasthttp.StatusNoContent)
+	if err == nil {
+		return contentLength, nil
+	}
+	return 0, err
+}
+
+func (c *httpClient) WriteStreamWithParams(
+	r io.Reader,
+	contentLength int,
+	wp WriteParams,
+) (int, error) {
+	req := c.makeWriteRequest(contentLength, []byte(writeURL(c.url, wp)))
+	req.SetBodyStream(r, contentLength)
+
+	err := c.doRequest(req, fasthttp.StatusNoContent)
+	if err == nil {
+		return contentLength, nil
+	}
+	return 0, err
+}
+
+func (c *httpClient) doRequest(
+	req *fasthttp.Request,
+	expectedCode int,
+) error {
+	resp := fasthttp.AcquireResponse()
+
+	err := c.client.DoTimeout(req, resp, c.config.Timeout)
+
+	code := resp.StatusCode()
+	// If it's a "no content" response, then release and return nil
+	if code == fasthttp.StatusNoContent {
+		fasthttp.ReleaseResponse(resp)
+		fasthttp.ReleaseRequest(req)
+		return nil
+	}
+
+	// not a "no content" response, so parse the result:
+	var response Response
+	decErr := json.Unmarshal(resp.Body(), &response)
+
+	// If we got a JSON decode error, send that back
+	if decErr != nil {
+		err = fmt.Errorf("Unable to decode json: received status code %d err: %s", code, decErr)
+	}
+	// Unexpected response code OR error in JSON response body overrides
+	// a JSON decode error:
+	if code != expectedCode || response.Error() != nil {
+		err = fmt.Errorf("Response Error: Status Code [%d], expected [%d], [%v]",
+			code, expectedCode, response.Error())
+	}
+
+	fasthttp.ReleaseResponse(resp)
+	fasthttp.ReleaseRequest(req)
+
+	return err
+}
+
+func (c *httpClient) makeWriteRequest(
+	contentLength int,
+	writeURL []byte,
+) *fasthttp.Request {
+	req := c.makeRequest()
+	req.Header.SetContentLength(contentLength)
+	req.Header.SetRequestURIBytes(writeURL)
+	// TODO
+	// if gzip {
+	// 	req.Header.SetBytesKV([]byte("Content-Encoding"), []byte("gzip"))
+	// }
+	return req
+}
+
+func (c *httpClient) makeRequest() *fasthttp.Request {
+	req := fasthttp.AcquireRequest()
+	req.Header.SetContentTypeBytes([]byte("text/plain"))
+	req.Header.SetMethodBytes([]byte("POST"))
+	req.Header.SetUserAgent(c.config.UserAgent)
+	if c.config.Username != "" && c.config.Password != "" {
+		req.Header.Set("Authorization", "Basic "+basicAuth(c.config.Username, c.config.Password))
+	}
+	return req
+}
+
+func (c *httpClient) Close() error {
+	// Nothing to do.
+	return nil
+}
+
+func writeURL(u *url.URL, wp WriteParams) string {
+	params := url.Values{}
+	params.Set("db", wp.Database)
+	if wp.RetentionPolicy != "" {
+		params.Set("rp", wp.RetentionPolicy)
+	}
+	if wp.Precision != "n" && wp.Precision != "" {
+		params.Set("precision", wp.Precision)
+	}
+	if wp.Consistency != "one" && wp.Consistency != "" {
+		params.Set("consistency", wp.Consistency)
+	}
+
+	u.RawQuery = params.Encode()
+	u.Path = "write"
+	return u.String()
+}
+
+func queryURL(u *url.URL, command string) string {
+	params := url.Values{}
+	params.Set("q", command)
+
+	u.RawQuery = params.Encode()
+	u.Path = "query"
+	return u.String()
+}
+
+// See 2 (end of page 4) http://www.ietf.org/rfc/rfc2617.txt
+// "To receive authorization, the httpClient sends the userid and password,
+// separated by a single colon (":") character, within a base64
+// encoded string in the credentials."
+// It is not meant to be urlencoded.
+func basicAuth(username, password string) string {
+	auth := username + ":" + password
+	return base64.StdEncoding.EncodeToString([]byte(auth))
+}
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
new file mode 100644
index 000000000..8fa02dd22
--- /dev/null
+++ b/plugins/outputs/influxdb/client/http_test.go
@@ -0,0 +1,343 @@
+package client
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestHTTPClient_Write(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			// test form values:
+			if r.FormValue("db") != "test" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong db name"}`)
+			}
+			if r.FormValue("rp") != "policy" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong rp name"}`)
+			}
+			if r.FormValue("precision") != "ns" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong precision"}`)
+			}
+			if r.FormValue("consistency") != "all" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong consistency"}`)
+			}
+			// test that user agent is set properly
+			if r.UserAgent() != "test-agent" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong agent name"}`)
+			}
+			// test basic auth params
+			user, pass, ok := r.BasicAuth()
+			if !ok {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"basic auth not set"}`)
+			}
+			if user != "test-user" || pass != "test-password" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"basic auth incorrect"}`)
+			}
+
+			// Validate Content-Length Header
+			if r.ContentLength != 13 {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				msg := fmt.Sprintf(`{"results":[{}],"error":"Content-Length: expected [13], got [%d]"}`, r.ContentLength)
+				fmt.Fprintln(w, msg)
+			}
+
+			// Validate the request body:
+			buf := make([]byte, 100)
+			n, _ := r.Body.Read(buf)
+			expected := "cpu value=99"
+			got := string(buf[0 : n-1])
+			if expected != got {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				msg := fmt.Sprintf(`{"results":[{}],"error":"expected [%s], got [%s]"}`, expected, got)
+				fmt.Fprintln(w, msg)
+			}
+
+			w.WriteHeader(http.StatusNoContent)
+			w.Header().Set("Content-Type", "application/json")
+		case "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL:       ts.URL,
+		UserAgent: "test-agent",
+		Username:  "test-user",
+		Password:  "test-password",
+	}
+	wp := WriteParams{
+		Database:        "test",
+		RetentionPolicy: "policy",
+		Precision:       "ns",
+		Consistency:     "all",
+	}
+	client, err := NewHTTP(config, wp)
+	defer client.Close()
+	assert.NoError(t, err)
+	n, err := client.Write([]byte("cpu value=99\n"))
+	assert.Equal(t, 13, n)
+	assert.NoError(t, err)
+
+	_, err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")), 13)
+	assert.NoError(t, err)
+}
+
+func TestHTTPClient_WriteParamsOverride(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			// test that database is set properly
+			if r.FormValue("db") != "override" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong db name"}`)
+			}
+
+			// Validate the request body:
+			buf := make([]byte, 100)
+			n, _ := r.Body.Read(buf)
+			expected := "cpu value=99"
+			got := string(buf[0 : n-1])
+			if expected != got {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				msg := fmt.Sprintf(`{"results":[{}],"error":"expected [%s], got [%s]"}`, expected, got)
+				fmt.Fprintln(w, msg)
+			}
+
+			w.WriteHeader(http.StatusNoContent)
+			w.Header().Set("Content-Type", "application/json")
+		case "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL,
+	}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	defer client.Close()
+	assert.NoError(t, err)
+
+	// test that WriteWithParams overrides the default write params
+	wp := WriteParams{
+		Database: "override",
+	}
+	n, err := client.WriteWithParams([]byte("cpu value=99\n"), wp)
+	assert.Equal(t, 13, n)
+	assert.NoError(t, err)
+
+	_, err = client.WriteStreamWithParams(bytes.NewReader([]byte("cpu value=99\n")), 13, wp)
+	assert.NoError(t, err)
+}
+
+func TestHTTPClient_Write_Errors(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusTeapot)
+		case "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL,
+	}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	defer client.Close()
+	assert.NoError(t, err)
+
+	lp := []byte("cpu value=99\n")
+	n, err := client.Write(lp)
+	assert.Equal(t, 0, n)
+	assert.Error(t, err)
+
+	n, err = client.WriteStream(bytes.NewReader(lp), 13)
+	assert.Equal(t, 0, n)
+	assert.Error(t, err)
+
+	wp := WriteParams{
+		Database: "override",
+	}
+	n, err = client.WriteWithParams(lp, wp)
+	assert.Equal(t, 0, n)
+	assert.Error(t, err)
+
+	n, err = client.WriteStreamWithParams(bytes.NewReader(lp), 13, wp)
+	assert.Equal(t, 0, n)
+	assert.Error(t, err)
+}
+
+func TestNewHTTPErrors(t *testing.T) {
+	// No URL:
+	config := HTTPConfig{}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	assert.Error(t, err)
+	assert.Nil(t, client)
+
+	// No Database:
+	config = HTTPConfig{
+		URL: "http://localhost:8086",
+	}
+	defaultWP = WriteParams{}
+	client, err = NewHTTP(config, defaultWP)
+	assert.Nil(t, client)
+	assert.Error(t, err)
+
+	// Invalid URL:
+	config = HTTPConfig{
+		URL: "http://192.168.0.%31:8080/",
+	}
+	defaultWP = WriteParams{
+		Database: "test",
+	}
+	client, err = NewHTTP(config, defaultWP)
+	assert.Nil(t, client)
+	assert.Error(t, err)
+
+	// Invalid URL scheme:
+	config = HTTPConfig{
+		URL: "mailto://localhost:8086",
+	}
+	defaultWP = WriteParams{
+		Database: "test",
+	}
+	client, err = NewHTTP(config, defaultWP)
+	assert.Nil(t, client)
+	assert.Error(t, err)
+}
+
+func TestHTTPClient_Query(t *testing.T) {
+	command := "CREATE DATABASE test"
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusNoContent)
+		case "/query":
+			// validate the create database command is correct
+			got := r.FormValue("q")
+			if got != command {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				msg := fmt.Sprintf(`{"results":[{}],"error":"got %s, expected %s"}`, got, command)
+				fmt.Fprintln(w, msg)
+			}
+
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL,
+	}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	defer client.Close()
+	assert.NoError(t, err)
+	err = client.Query(command)
+	assert.NoError(t, err)
+}
+
+func TestHTTPClient_Query_ResponseError(t *testing.T) {
+	command := "CREATE DATABASE test"
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusNoContent)
+		case "/query":
+			w.WriteHeader(http.StatusTeapot)
+			w.Header().Set("Content-Type", "application/json")
+			msg := fmt.Sprintf(`{"results":[{}],"error":"couldnt create database"}`)
+			fmt.Fprintln(w, msg)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL,
+	}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	defer client.Close()
+	assert.NoError(t, err)
+	err = client.Query(command)
+	assert.Error(t, err)
+}
+
+func TestHTTPClient_Query_JSONDecodeError(t *testing.T) {
+	command := "CREATE DATABASE test"
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusNoContent)
+		case "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			// write JSON missing a ']'
+			msg := fmt.Sprintf(`{"results":[{}}`)
+			fmt.Fprintln(w, msg)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL,
+	}
+	defaultWP := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, defaultWP)
+	defer client.Close()
+	assert.NoError(t, err)
+	err = client.Query(command)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "json")
+}
diff --git a/plugins/outputs/influxdb/client/udp.go b/plugins/outputs/influxdb/client/udp.go
new file mode 100644
index 000000000..d542ecf63
--- /dev/null
+++ b/plugins/outputs/influxdb/client/udp.go
@@ -0,0 +1,99 @@
+package client
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+)
+
+const (
+	// UDPPayloadSize is a reasonable default payload size for UDP packets that
+	// could be travelling over the internet.
+	UDPPayloadSize = 512
+)
+
+// UDPConfig is the config data needed to create a UDP Client
+type UDPConfig struct {
+	// URL should be of the form "udp://host:port"
+	// or "udp://[ipv6-host%zone]:port".
+	URL string
+
+	// PayloadSize is the maximum size of a UDP client message, optional
+	// Tune this based on your network. Defaults to UDPPayloadSize.
+	PayloadSize int
+}
+
+func NewUDP(config UDPConfig) (Client, error) {
+	p, err := url.Parse(config.URL)
+	if err != nil {
+		return nil, fmt.Errorf("Error parsing UDP url [%s]: %s", config.URL, err)
+	}
+
+	udpAddr, err := net.ResolveUDPAddr("udp", p.Host)
+	if err != nil {
+		return nil, fmt.Errorf("Error resolving UDP Address [%s]: %s", p.Host, err)
+	}
+
+	conn, err := net.DialUDP("udp", nil, udpAddr)
+	if err != nil {
+		return nil, fmt.Errorf("Error dialing UDP address [%s]: %s",
+			udpAddr.String(), err)
+	}
+
+	size := config.PayloadSize
+	if size == 0 {
+		size = UDPPayloadSize
+	}
+	buf := make([]byte, size)
+	return &udpClient{conn: conn, buffer: buf}, nil
+}
+
+type udpClient struct {
+	conn   *net.UDPConn
+	buffer []byte
+}
+
+func (c *udpClient) Query(command string) error {
+	return nil
+}
+
+func (c *udpClient) Write(b []byte) (int, error) {
+	return c.WriteStream(bytes.NewReader(b), -1)
+}
+
+// write params are ignored by the UDP client
+func (c *udpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
+	return c.WriteStream(bytes.NewReader(b), -1)
+}
+
+// contentLength is ignored by the UDP client.
+func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
+	var totaln int
+	for {
+		nR, err := r.Read(c.buffer)
+		if nR == 0 {
+			break
+		}
+		if err != io.EOF && err != nil {
+			return totaln, err
+		}
+		nW, err := c.conn.Write(c.buffer[0:nR])
+		totaln += nW
+		if err != nil {
+			return totaln, err
+		}
+	}
+	return totaln, nil
+}
+
+// contentLength is ignored by the UDP client.
+// write params are ignored by the UDP client
+func (c *udpClient) WriteStreamWithParams(r io.Reader, contentLength int, wp WriteParams) (int, error) {
+	return c.WriteStream(r, -1)
+}
+
+func (c *udpClient) Close() error {
+	return c.conn.Close()
+}
diff --git a/plugins/outputs/influxdb/client/udp_test.go b/plugins/outputs/influxdb/client/udp_test.go
new file mode 100644
index 000000000..31196ddca
--- /dev/null
+++ b/plugins/outputs/influxdb/client/udp_test.go
@@ -0,0 +1,163 @@
+package client
+
+import (
+	"bytes"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestUDPClient(t *testing.T) {
+	config := UDPConfig{
+		URL: "udp://localhost:8089",
+	}
+	client, err := NewUDP(config)
+	assert.NoError(t, err)
+
+	err = client.Query("ANY QUERY RETURNS NIL")
+	assert.NoError(t, err)
+
+	assert.NoError(t, client.Close())
+}
+
+func TestNewUDPClient_Errors(t *testing.T) {
+	// url.Parse Error
+	config := UDPConfig{
+		URL: "udp://localhost%35:8089",
+	}
+	_, err := NewUDP(config)
+	assert.Error(t, err)
+
+	// ResolveUDPAddr Error
+	config = UDPConfig{
+		URL: "udp://localhost:999999",
+	}
+	_, err = NewUDP(config)
+	assert.Error(t, err)
+}
+
+func TestUDPClient_Write(t *testing.T) {
+	config := UDPConfig{
+		URL: "udp://localhost:8199",
+	}
+	client, err := NewUDP(config)
+	assert.NoError(t, err)
+
+	packets := make(chan string, 100)
+	address, err := net.ResolveUDPAddr("udp", "localhost:8199")
+	assert.NoError(t, err)
+	listener, err := net.ListenUDP("udp", address)
+	defer listener.Close()
+	assert.NoError(t, err)
+	go func() {
+		buf := make([]byte, 200)
+		for {
+			n, _, err := listener.ReadFromUDP(buf)
+			if err != nil {
+				packets <- err.Error()
+			}
+			packets <- string(buf[0:n])
+		}
+	}()
+
+	// test sending simple metric
+	time.Sleep(time.Second)
+	n, err := client.Write([]byte("cpu value=99\n"))
+	assert.Equal(t, n, 13)
+	assert.NoError(t, err)
+	pkt := <-packets
+	assert.Equal(t, "cpu value=99\n", pkt)
+
+	metrics := `cpu value=99
+cpu value=55
+cpu value=44
+cpu value=101
+cpu value=91
+cpu value=92
+`
+	// test sending packet with 6 metrics in a stream.
+	reader := bytes.NewReader([]byte(metrics))
+	// contentLength is ignored:
+	n, err = client.WriteStream(reader, 10)
+	assert.Equal(t, n, len(metrics))
+	assert.NoError(t, err)
+	pkt = <-packets
+	assert.Equal(t, "cpu value=99\ncpu value=55\ncpu value=44\ncpu value=101\ncpu value=91\ncpu value=92\n", pkt)
+
+	//
+	// Test that UDP packets get broken up properly:
+	config2 := UDPConfig{
+		URL:         "udp://localhost:8199",
+		PayloadSize: 25,
+	}
+	client2, err := NewUDP(config2)
+	assert.NoError(t, err)
+
+	wp := WriteParams{}
+
+	//
+	// Using Write():
+	buf := []byte(metrics)
+	n, err = client2.WriteWithParams(buf, wp)
+	assert.Equal(t, n, len(metrics))
+	assert.NoError(t, err)
+	pkt = <-packets
+	assert.Equal(t, "cpu value=99\ncpu value=55", pkt)
+	pkt = <-packets
+	assert.Equal(t, "\ncpu value=44\ncpu value=1", pkt)
+	pkt = <-packets
+	assert.Equal(t, "01\ncpu value=91\ncpu value", pkt)
+	pkt = <-packets
+	assert.Equal(t, "=92\n", pkt)
+
+	//
+	// Using WriteStream():
+	reader = bytes.NewReader([]byte(metrics))
+	n, err = client2.WriteStreamWithParams(reader, 10, wp)
+	assert.Equal(t, n, len(metrics))
+	assert.NoError(t, err)
+	pkt = <-packets
+	assert.Equal(t, "cpu value=99\ncpu value=55", pkt)
+	pkt = <-packets
+	assert.Equal(t, "\ncpu value=44\ncpu value=1", pkt)
+	pkt = <-packets
+	assert.Equal(t, "01\ncpu value=91\ncpu value", pkt)
+	pkt = <-packets
+	assert.Equal(t, "=92\n", pkt)
+
+	//
+	// Using WriteStream() & a metric.Reader:
+	config3 := UDPConfig{
+		URL:         "udp://localhost:8199",
+		PayloadSize: 40,
+	}
+	client3, err := NewUDP(config3)
+	assert.NoError(t, err)
+
+	now := time.Unix(1484142942, 0)
+	m1, _ := metric.New("test", map[string]string{},
+		map[string]interface{}{"value": 1.1}, now)
+	m2, _ := metric.New("test", map[string]string{},
+		map[string]interface{}{"value": 1.1}, now)
+	m3, _ := metric.New("test", map[string]string{},
+		map[string]interface{}{"value": 1.1}, now)
+	ms := []telegraf.Metric{m1, m2, m3}
+	mReader := metric.NewReader(ms)
+	n, err = client3.WriteStreamWithParams(mReader, 10, wp)
+	// 3 metrics at 35 bytes each (including the newline)
+	assert.Equal(t, 105, n)
+	assert.NoError(t, err)
+	pkt = <-packets
+	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
+	pkt = <-packets
+	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
+	pkt = <-packets
+	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
+
+	assert.NoError(t, client.Close())
+}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 999e1bc6f..06d8bd042 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -1,19 +1,18 @@
 package influxdb
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"math/rand"
-	"net/url"
 	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs"
 
-	"github.com/influxdata/influxdb/client/v2"
+	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
 )
 
 type InfluxDB struct {
@@ -41,7 +40,7 @@ type InfluxDB struct {
 	// Precision is only here for legacy support. It will be ignored.
 	Precision string
 
-	conns []client.Client
+	clients []client.Client
 }
 
 var sampleConfig = `
@@ -88,79 +87,56 @@ func (i *InfluxDB) Connect() error {
 		urls = append(urls, i.URL)
 	}
 
-	tlsCfg, err := internal.GetTLSConfig(
+	tlsConfig, err := internal.GetTLSConfig(
 		i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
 	if err != nil {
 		return err
 	}
 
-	var conns []client.Client
 	for _, u := range urls {
 		switch {
 		case strings.HasPrefix(u, "udp"):
-			parsed_url, err := url.Parse(u)
-			if err != nil {
-				return err
-			}
-
-			if i.UDPPayload == 0 {
-				i.UDPPayload = client.UDPPayloadSize
-			}
-			c, err := client.NewUDPClient(client.UDPConfig{
-				Addr:        parsed_url.Host,
+			config := client.UDPConfig{
+				URL:         u,
 				PayloadSize: i.UDPPayload,
-			})
-			if err != nil {
-				return err
+			c, err := client.NewUDP(config)
 			}
-			conns = append(conns, c)
+			if err != nil {
+				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
+			}
+			i.clients = append(i.clients, c)
 		default:
 			// If URL doesn't start with "udp", assume HTTP client
-			c, err := client.NewHTTPClient(client.HTTPConfig{
-				Addr:      u,
-				Username:  i.Username,
-				Password:  i.Password,
-				UserAgent: i.UserAgent,
+			config := client.HTTPConfig{
+				URL:       u,
 				Timeout:   i.Timeout.Duration,
-				TLSConfig: tlsCfg,
-			})
-			if err != nil {
-				return err
+				TLSConfig: tlsConfig,
+				UserAgent: i.UserAgent,
 			}
+			wp := client.WriteParams{
+				Database:        i.Database,
+				RetentionPolicy: i.RetentionPolicy,
+				Consistency:     i.WriteConsistency,
+			}
+			c, err := client.NewHTTP(config, wp)
+			if err != nil {
+				return fmt.Errorf("Error creating HTTP Client [%s]: %s", u, err)
+			}
+			i.clients = append(i.clients, c)
 
-			err = createDatabase(c, i.Database)
+			err = c.Query("CREATE DATABASE " + i.Database)
 			if err != nil {
 				log.Println("E! Database creation failed: " + err.Error())
 				continue
 			}
-
-			conns = append(conns, c)
 		}
 	}
 
-	i.conns = conns
 	rand.Seed(time.Now().UnixNano())
 	return nil
 }
 
-func createDatabase(c client.Client, database string) error {
-	// Create Database if it doesn't exist
-	_, err := c.Query(client.Query{
-		Command: fmt.Sprintf("CREATE DATABASE \"%s\"", database),
-	})
-	return err
-}
-
 func (i *InfluxDB) Close() error {
-	var errS string
-	for j, _ := range i.conns {
-		if err := i.conns[j].Close(); err != nil {
-			errS += err.Error()
-		}
-	}
-	if errS != "" {
-		return fmt.Errorf("output influxdb close failed: %s", errS)
-	}
 	return nil
 }
 
@@ -175,34 +151,24 @@ func (i *InfluxDB) Description() string {
 // Choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
-	if len(i.conns) == 0 {
-		err := i.Connect()
-		if err != nil {
-			return err
-		}
-	}
-	bp, err := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:         i.Database,
-		RetentionPolicy:  i.RetentionPolicy,
-		WriteConsistency: i.WriteConsistency,
-	})
-	if err != nil {
-		return err
-	}
-
-	for _, metric := range metrics {
-		bp.AddPoint(metric.Point())
+	bufsize := 0
+	for _, m := range metrics {
+		bufsize += m.Len()
+	r := metric.NewReader(metrics)
 	}
 
 	// This will get set to nil if a successful write occurs
-	err = errors.New("Could not write to any InfluxDB server in cluster")
+	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")
 
-	p := rand.Perm(len(i.conns))
+	p := rand.Perm(len(i.clients))
 	for _, n := range p {
-		if e := i.conns[n].Write(bp); e != nil {
-			// If the database was not found, try to recreate it
+		if _, e := i.clients[n].WriteStream(r, bufsize); e != nil {
+			// Log write failure:
+			log.Printf("E! InfluxDB Output Error: %s", e)
+
+			// If the database was not found, try to recreate it:
 			if strings.Contains(e.Error(), "database not found") {
-				if errc := createDatabase(i.conns[n], i.Database); errc != nil {
+				if errc := i.clients[n].Query("CREATE DATABASE  " + i.Database); errc != nil {
 					log.Printf("E! Error: Database %s not found and failed to recreate\n",
 						i.Database)
 				}
@@ -225,10 +191,12 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	return err
 }
 
-func init() {
-	outputs.Add("influxdb", func() telegraf.Output {
-		return &InfluxDB{
-			Timeout: internal.Duration{Duration: time.Second * 5},
-		}
-	})
+func newInflux() *InfluxDB {
+	return &InfluxDB{
+		Timeout: internal.Duration{Duration: time.Second * 5},
+	}
+}
+
+func init() {
+	outputs.Add("influxdb", func() telegraf.Output { return newInflux() })
 }
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 1414fa839..db2cd5ec7 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -20,22 +20,123 @@ func TestUDPInflux(t *testing.T) {
 	require.NoError(t, err)
 	err = i.Write(testutil.MockMetrics())
 	require.NoError(t, err)
+	require.NoError(t, i.Close())
 }
 
 func TestHTTPInflux(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprintln(w, `{"results":[{}]}`)
+		switch r.URL.Path {
+		case "/write":
+			// test that database is set properly
+			if r.FormValue("db") != "test" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+			}
+			// test that user agent is set properly
+			if r.UserAgent() != "telegraf" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+			}
+			w.WriteHeader(http.StatusNoContent)
+			w.Header().Set("Content-Type", "application/json")
+		case "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}
 	}))
 	defer ts.Close()
 
-	i := InfluxDB{
-		URLs: []string{ts.URL},
-	}
+	i := newInflux()
+	i.URLs = []string{ts.URL}
+	i.Database = "test"
+	i.UserAgent = "telegraf"
 
 	err := i.Connect()
 	require.NoError(t, err)
 	err = i.Write(testutil.MockMetrics())
 	require.NoError(t, err)
+	require.NoError(t, i.Close())
+}
+
+func TestUDPConnectError(t *testing.T) {
+	i := InfluxDB{
+		URLs: []string{"udp://foobar:8089"},
+	}
+
+	err := i.Connect()
+	require.Error(t, err)
+
+	i = InfluxDB{
+		URLs: []string{"udp://localhost:9999999"},
+	}
+
+	err = i.Connect()
+	require.Error(t, err)
+}
+
+func TestHTTPConnectError_InvalidURL(t *testing.T) {
+	i := InfluxDB{
+		URLs: []string{"http://foobar:8089"},
+	}
+
+	err := i.Connect()
+	require.Error(t, err)
+
+	i = InfluxDB{
+		URLs: []string{"http://localhost:9999999"},
+	}
+
+	err = i.Connect()
+	require.Error(t, err)
+}
+
+func TestHTTPConnectError_DatabaseCreateFail(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/query":
+			w.WriteHeader(http.StatusNotFound)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}],"error":"test error"}`)
+		}
+	}))
+	defer ts.Close()
+
+	i := InfluxDB{
+		URLs:     []string{ts.URL},
+		Database: "test",
+	}
+
+	// database creation errors do not return an error from Connect
+	// they are only logged.
+	err := i.Connect()
+	require.NoError(t, err)
+	require.NoError(t, i.Close())
+}
+
+func TestHTTPError_DatabaseNotFound(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusNotFound)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}],"error":"database not found"}`)
+		case "/query":
+			w.WriteHeader(http.StatusNotFound)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}],"error":"database not found"}`)
+		}
+	}))
+	defer ts.Close()
+
+	i := InfluxDB{
+		URLs:     []string{ts.URL},
+		Database: "test",
+	}
+
+	err := i.Connect()
+	require.NoError(t, err)
+	err = i.Write(testutil.MockMetrics())
+	require.Error(t, err)
+	require.NoError(t, i.Close())
 }

From c9e87a39f8129aa7aacf45a6342d781f50be69fa Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 11 Jan 2017 16:01:32 +0000
Subject: [PATCH 0085/1302] Revert using fasthttp library to net/http

---
 CHANGELOG.md                                  |   1 +
 Godeps                                        |   2 -
 plugins/inputs/http_listener/http_listener.go |   3 -
 plugins/outputs/influxdb/client/http.go       | 139 ++++++++++--------
 plugins/outputs/influxdb/influxdb.go          |   7 +-
 plugins/outputs/influxdb/influxdb_test.go     |  24 +++
 6 files changed, 102 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58912b2fe..7ebea6184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
+- [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
 
 ### Bugfixes
 
diff --git a/Godeps b/Godeps
index 83b9e4561..99606414e 100644
--- a/Godeps
+++ b/Godeps
@@ -50,8 +50,6 @@ github.com/shirou/gopsutil 1516eb9ddc5e61ba58874047a98f8b44b5e585e8
 github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
-github.com/valyala/bytebufferpool e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7
-github.com/valyala/fasthttp 2f4876aaf2b591786efc9b49f34b86ad44c25074
 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 05551a966..0f426f809 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -300,9 +300,6 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time) error {
-	if !bytes.HasSuffix(b, []byte("\n")) {
-		b = append(b, '\n')
-	}
 	metrics, err := h.parser.ParseWithDefaultTime(b, t)
 
 	for _, m := range metrics {
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 68cc3e094..62ca1315b 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -1,15 +1,15 @@
 package client
 
 import (
+	"bytes"
 	"crypto/tls"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
+	"net/http"
 	"net/url"
 	"time"
-
-	"github.com/valyala/fasthttp"
 )
 
 var (
@@ -40,13 +40,15 @@ func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
 		return nil, fmt.Errorf("config.URL scheme must be http(s), got %s", u.Scheme)
 	}
 
-	wu := writeURL(u, defaultWP)
 	return &httpClient{
-		writeURL: []byte(wu),
+		writeURL: writeURL(u, defaultWP),
 		config:   config,
 		url:      u,
-		client: &fasthttp.Client{
-			TLSConfig: config.TLSConfig,
+		client: &http.Client{
+			Timeout: config.Timeout,
+			Transport: &http.Transport{
+				TLSClientConfig: config.TLSConfig,
+			},
 		},
 	}, nil
 }
@@ -58,8 +60,13 @@ type HTTPConfig struct {
 	// UserAgent sets the User-Agent header.
 	UserAgent string
 
-	// Timeout is the time to wait for a response to each HTTP request (writes
-	// and queries).
+	// Timeout specifies a time limit for requests made by this
+	// Client. The timeout includes connection time, any
+	// redirects, and reading the response body. The timer remains
+	// running after Get, Head, Post, or Do return and will
+	// interrupt reading of the Response.Body.
+	//
+	// A Timeout of zero means no timeout.
 	Timeout time.Duration
 
 	// Username is the basic auth username for the server.
@@ -92,24 +99,27 @@ func (r *Response) Error() error {
 }
 
 type httpClient struct {
-	writeURL []byte
+	writeURL string
 	config   HTTPConfig
-	client   *fasthttp.Client
+	client   *http.Client
 	url      *url.URL
 }
 
 func (c *httpClient) Query(command string) error {
-	req := c.makeRequest()
-	req.Header.SetRequestURI(queryURL(c.url, command))
-
-	return c.doRequest(req, fasthttp.StatusOK)
+	req, err := c.makeRequest(queryURL(c.url, command), bytes.NewReader([]byte("")))
+	if err != nil {
+		return err
+	}
+	return c.doRequest(req, http.StatusOK)
 }
 
 func (c *httpClient) Write(b []byte) (int, error) {
-	req := c.makeWriteRequest(len(b), c.writeURL)
-	req.SetBody(b)
+	req, err := c.makeWriteRequest(bytes.NewReader(b), len(b), c.writeURL)
+	if err != nil {
+		return 0, nil
+	}
 
-	err := c.doRequest(req, fasthttp.StatusNoContent)
+	err = c.doRequest(req, http.StatusNoContent)
 	if err == nil {
 		return len(b), nil
 	}
@@ -117,10 +127,12 @@ func (c *httpClient) Write(b []byte) (int, error) {
 }
 
 func (c *httpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
-	req := c.makeWriteRequest(len(b), []byte(writeURL(c.url, wp)))
-	req.SetBody(b)
+	req, err := c.makeWriteRequest(bytes.NewReader(b), len(b), writeURL(c.url, wp))
+	if err != nil {
+		return 0, nil
+	}
 
-	err := c.doRequest(req, fasthttp.StatusNoContent)
+	err = c.doRequest(req, http.StatusNoContent)
 	if err == nil {
 		return len(b), nil
 	}
@@ -128,10 +140,12 @@ func (c *httpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
 }
 
 func (c *httpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
-	req := c.makeWriteRequest(contentLength, c.writeURL)
-	req.SetBodyStream(r, contentLength)
+	req, err := c.makeWriteRequest(r, contentLength, c.writeURL)
+	if err != nil {
+		return 0, nil
+	}
 
-	err := c.doRequest(req, fasthttp.StatusNoContent)
+	err = c.doRequest(req, http.StatusNoContent)
 	if err == nil {
 		return contentLength, nil
 	}
@@ -143,10 +157,12 @@ func (c *httpClient) WriteStreamWithParams(
 	contentLength int,
 	wp WriteParams,
 ) (int, error) {
-	req := c.makeWriteRequest(contentLength, []byte(writeURL(c.url, wp)))
-	req.SetBodyStream(r, contentLength)
+	req, err := c.makeWriteRequest(r, contentLength, writeURL(c.url, wp))
+	if err != nil {
+		return 0, nil
+	}
 
-	err := c.doRequest(req, fasthttp.StatusNoContent)
+	err = c.doRequest(req, http.StatusNoContent)
 	if err == nil {
 		return contentLength, nil
 	}
@@ -154,24 +170,27 @@ func (c *httpClient) WriteStreamWithParams(
 }
 
 func (c *httpClient) doRequest(
-	req *fasthttp.Request,
+	req *http.Request,
 	expectedCode int,
 ) error {
-	resp := fasthttp.AcquireResponse()
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return err
+	}
 
-	err := c.client.DoTimeout(req, resp, c.config.Timeout)
-
-	code := resp.StatusCode()
+	code := resp.StatusCode
 	// If it's a "no content" response, then release and return nil
-	if code == fasthttp.StatusNoContent {
-		fasthttp.ReleaseResponse(resp)
-		fasthttp.ReleaseRequest(req)
+	if code == http.StatusNoContent {
 		return nil
 	}
 
 	// not a "no content" response, so parse the result:
 	var response Response
-	decErr := json.Unmarshal(resp.Body(), &response)
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("Fatal error reading body: %s", err)
+	}
+	decErr := json.Unmarshal(body, &response)
 
 	// If we got a JSON decode error, send that back
 	if decErr != nil {
@@ -184,35 +203,37 @@ func (c *httpClient) doRequest(
 			code, expectedCode, response.Error())
 	}
 
-	fasthttp.ReleaseResponse(resp)
-	fasthttp.ReleaseRequest(req)
-
 	return err
 }
 
 func (c *httpClient) makeWriteRequest(
+	body io.Reader,
 	contentLength int,
-	writeURL []byte,
-) *fasthttp.Request {
-	req := c.makeRequest()
-	req.Header.SetContentLength(contentLength)
-	req.Header.SetRequestURIBytes(writeURL)
+	writeURL string,
+) (*http.Request, error) {
+	req, err := c.makeRequest(writeURL, body)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Content-Length", fmt.Sprint(contentLength))
 	// TODO
 	// if gzip {
-	// 	req.Header.SetBytesKV([]byte("Content-Encoding"), []byte("gzip"))
+	// 	req.Header.Set("Content-Encoding", "gzip")
 	// }
-	return req
+	return req, nil
 }
 
-func (c *httpClient) makeRequest() *fasthttp.Request {
-	req := fasthttp.AcquireRequest()
-	req.Header.SetContentTypeBytes([]byte("text/plain"))
-	req.Header.SetMethodBytes([]byte("POST"))
-	req.Header.SetUserAgent(c.config.UserAgent)
-	if c.config.Username != "" && c.config.Password != "" {
-		req.Header.Set("Authorization", "Basic "+basicAuth(c.config.Username, c.config.Password))
+func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, error) {
+	req, err := http.NewRequest("POST", uri, body)
+	if err != nil {
+		return nil, err
 	}
-	return req
+	req.Header.Set("Content-Type", "text/plain")
+	req.Header.Set("User-Agent", c.config.UserAgent)
+	if c.config.Username != "" && c.config.Password != "" {
+		req.SetBasicAuth(c.config.Username, c.config.Password)
+	}
+	return req, nil
 }
 
 func (c *httpClient) Close() error {
@@ -246,13 +267,3 @@ func queryURL(u *url.URL, command string) string {
 	u.Path = "query"
 	return u.String()
 }
-
-// See 2 (end of page 4) http://www.ietf.org/rfc/rfc2617.txt
-// "To receive authorization, the httpClient sends the userid and password,
-// separated by a single colon (":") character, within a base64
-// encoded string in the credentials."
-// It is not meant to be urlencoded.
-func basicAuth(username, password string) string {
-	auth := username + ":" + password
-	return base64.StdEncoding.EncodeToString([]byte(auth))
-}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 06d8bd042..5a5899a60 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -99,8 +99,8 @@ func (i *InfluxDB) Connect() error {
 			config := client.UDPConfig{
 				URL:         u,
 				PayloadSize: i.UDPPayload,
-			c, err := client.NewUDP(config)
 			}
+			c, err := client.NewUDP(config)
 			if err != nil {
 				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
 			}
@@ -154,8 +154,8 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	bufsize := 0
 	for _, m := range metrics {
 		bufsize += m.Len()
-	r := metric.NewReader(metrics)
 	}
+	r := metric.NewReader(metrics)
 
 	// This will get set to nil if a successful write occurs
 	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")
@@ -163,9 +163,6 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	p := rand.Perm(len(i.clients))
 	for _, n := range p {
 		if _, e := i.clients[n].WriteStream(r, bufsize); e != nil {
-			// Log write failure:
-			log.Printf("E! InfluxDB Output Error: %s", e)
-
 			// If the database was not found, try to recreate it:
 			if strings.Contains(e.Error(), "database not found") {
 				if errc := i.clients[n].Query("CREATE DATABASE  " + i.Database); errc != nil {
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index db2cd5ec7..0ece8a1c2 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -140,3 +140,27 @@ func TestHTTPError_DatabaseNotFound(t *testing.T) {
 	require.Error(t, err)
 	require.NoError(t, i.Close())
 }
+
+// field type conflict does not return an error, instead we
+func TestHTTPError_FieldTypeConflict(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/write":
+			w.WriteHeader(http.StatusNotFound)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}],"error":"field type conflict: input field \"value\" on measurement \"test\" is type integer, already exists as type float dropped=1"}`)
+		}
+	}))
+	defer ts.Close()
+
+	i := InfluxDB{
+		URLs:     []string{ts.URL},
+		Database: "test",
+	}
+
+	err := i.Connect()
+	require.NoError(t, err)
+	err = i.Write(testutil.MockMetrics())
+	require.NoError(t, err)
+	require.NoError(t, i.Close())
+}

From 3fa37a9212dfdec35b38b6436ba26622492e930c Mon Sep 17 00:00:00 2001
From: Fabio Berchtold <jamesclonk@jamesclonk.ch>
Date: Fri, 27 Jan 2017 23:54:59 +0100
Subject: [PATCH 0086/1302] Rewriting Riemann output plugin (#1900)

* rename to riemann_legacy

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* initial draft for Riemann output plugin rewrite

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* add unit tests

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* add option to send string metrics as states

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* add integration tests

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* add plugin README.md

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* bump riemann library

* clarify settings description

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* update Readme.md with updated description

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* add Riemann event examples

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

* use full URL for Riemann server address

Signed-off-by: Fabio Berchtold <fabio.berchtold@swisscom.com>

closes #1878
---
 Godeps                                        |   2 +-
 Makefile                                      |   4 +-
 README.md                                     |   1 +
 etc/telegraf.conf                             |  33 ++-
 plugins/outputs/all/all.go                    |   1 +
 plugins/outputs/riemann/README.md             |  83 ++++++++
 plugins/outputs/riemann/riemann.go            | 183 +++++++++++------
 plugins/outputs/riemann/riemann_test.go       | 194 +++++++++++++++++-
 plugins/outputs/riemann_legacy/riemann.go     | 156 ++++++++++++++
 .../outputs/riemann_legacy/riemann_test.go    |  27 +++
 10 files changed, 615 insertions(+), 69 deletions(-)
 create mode 100644 plugins/outputs/riemann/README.md
 create mode 100644 plugins/outputs/riemann_legacy/riemann.go
 create mode 100644 plugins/outputs/riemann_legacy/riemann_test.go

diff --git a/Godeps b/Godeps
index 99606414e..c033159c3 100644
--- a/Godeps
+++ b/Godeps
@@ -1,7 +1,7 @@
 github.com/Shopify/sarama 8aadb476e66ca998f2f6bb3c993e9a2daa3666b9
 github.com/Sirupsen/logrus 219c8cb75c258c552e999735be6df753ffc7afdc
 github.com/aerospike/aerospike-client-go 7f3a312c3b2a60ac083ec6da296091c52c795c63
-github.com/amir/raidman 53c1b967405155bfc8758557863bf2e14f814687
+github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/aws/aws-sdk-go 13a12060f716145019378a10e2806c174356b857
 github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4
 github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
diff --git a/Makefile b/Makefile
index 6c75b9295..79276f887 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ docker-run:
 	docker run --name redis -p "6379:6379" -d redis
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d blalor/riemann
+	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
 
 # Run docker containers necessary for CircleCI unit tests
@@ -71,7 +71,7 @@ docker-run-circle:
 		-d spotify/kafka
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d blalor/riemann
+	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
 
 # Kill all docker containers, ignore errors
diff --git a/README.md b/README.md
index b758609d3..29892426c 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,7 @@ Telegraf can also collect metrics via the following service plugins:
 * [opentsdb](./plugins/outputs/opentsdb)
 * [prometheus](./plugins/outputs/prometheus_client)
 * [riemann](./plugins/outputs/riemann)
+* [riemann_legacy](./plugins/outputs/riemann_legacy)
 
 ## Contributing
 
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 3d0cdfd3a..aabdf180e 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -443,8 +443,39 @@
 #   # expiration_interval = "60s"
 
 
-# # Configuration for the Riemann server to send metrics to
+# # Configuration for Riemann server to send metrics to
 # [[outputs.riemann]]
+#   ## The full TCP or UDP URL of the Riemann server
+#   url = "tcp://localhost:5555"
+#
+#   ## Riemann event TTL, floating-point time in seconds.
+#   ## Defines how long that an event is considered valid for in Riemann
+#   # ttl = 30.0
+#
+#   ## Separator to use between measurement and field name in Riemann service name
+#   ## This does not have any effect if 'measurement_as_attribute' is set to 'true'
+#   separator = "/"
+#
+#   ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name
+#   # measurement_as_attribute = false
+#
+#   ## Send string metrics as Riemann event states.
+#   ## Unless enabled all string metrics will be ignored
+#   # string_as_state = false
+#
+#   ## A list of tag keys whose values get sent as Riemann tags.
+#   ## If empty, all Telegraf tag values will be sent as tags
+#   # tag_keys = ["telegraf","custom_tag"]
+#
+#   ## Additional Riemann tags to send.
+#   # tags = ["telegraf-output"]
+#
+#   ## Description for Riemann event
+#   # description_text = "metrics collected from telegraf"
+
+
+# # Configuration for the legacy Riemann plugin
+# [[outputs.riemann_legacy]]
 #   ## URL of server
 #   url = "localhost:5555"
 #   ## transport protocol to use either tcp or udp
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 96091b2ad..c10e00f78 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -20,4 +20,5 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/opentsdb"
 	_ "github.com/influxdata/telegraf/plugins/outputs/prometheus_client"
 	_ "github.com/influxdata/telegraf/plugins/outputs/riemann"
+	_ "github.com/influxdata/telegraf/plugins/outputs/riemann_legacy"
 )
diff --git a/plugins/outputs/riemann/README.md b/plugins/outputs/riemann/README.md
new file mode 100644
index 000000000..2338a00dc
--- /dev/null
+++ b/plugins/outputs/riemann/README.md
@@ -0,0 +1,83 @@
+# Riemann Output Plugin
+
+This plugin writes to [Riemann](http://riemann.io/) via TCP or UDP.
+
+### Configuration:
+
+```toml
+# Configuration for Riemann to send metrics to
+[[outputs.riemann]]
+  ## The full TCP or UDP URL of the Riemann server
+  url = "tcp://localhost:5555"
+
+  ## Riemann event TTL, floating-point time in seconds.
+  ## Defines how long that an event is considered valid for in Riemann
+  # ttl = 30.0
+
+  ## Separator to use between measurement and field name in Riemann service name
+  ## This does not have any effect if 'measurement_as_attribute' is set to 'true'
+  separator = "/"
+
+  ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name
+  # measurement_as_attribute = false
+
+  ## Send string metrics as Riemann event states.
+  ## Unless enabled all string metrics will be ignored
+  # string_as_state = false
+
+  ## A list of tag keys whose values get sent as Riemann tags.
+  ## If empty, all Telegraf tag values will be sent as tags
+  # tag_keys = ["telegraf","custom_tag"]
+
+  ## Additional Riemann tags to send.
+  # tags = ["telegraf-output"]
+
+  ## Description for Riemann event
+  # description_text = "metrics collected from telegraf"
+```
+
+### Required parameters:
+
+* `url`: The full TCP or UDP URL of the Riemann server to send events to.
+
+### Optional parameters:
+
+* `ttl`: Riemann event TTL, floating-point time in seconds. Defines how long that an event is considered valid for in Riemann.
+* `separator`: Separator to use between measurement and field name in Riemann service name.
+* `measurement_as_attribute`: Set measurement name as a Riemann attribute, instead of prepending it to the Riemann service name.
+* `string_as_state`: Send string metrics as Riemann event states. If this is not enabled then all string metrics will be ignored.
+* `tag_keys`: A list of tag keys whose values get sent as Riemann tags. If empty, all Telegraf tag values will be sent as tags.
+* `tags`: Additional Riemann tags that will be sent.
+* `description_text`: Description text for Riemann event.
+
+### Example Events:
+
+Riemann event emitted by Telegraf with default configuration:
+```
+#riemann.codec.Event{
+:host "postgresql-1e612b44-e92f-4d27-9f30-5e2f53947870", :state nil, :description nil, :ttl 30.0,
+:service "disk/used_percent", :metric 73.16736001949994, :path "/boot", :fstype "ext4", :time 1475605021}
+```
+
+Telegraf emitting the same Riemann event with `measurement_as_attribute` set to `true`:
+```
+#riemann.codec.Event{ ...
+:measurement "disk", :service "used_percent", :metric 73.16736001949994,
+... :time 1475605021}
+```
+
+Telegraf emitting the same Riemann event with additional Riemann tags defined:
+```
+#riemann.codec.Event{
+:host "postgresql-1e612b44-e92f-4d27-9f30-5e2f53947870", :state nil, :description nil, :ttl 30.0,
+:service "disk/used_percent", :metric 73.16736001949994, :path "/boot", :fstype "ext4", :time 1475605021,
+:tags ["telegraf" "postgres_cluster"]}
+```
+
+Telegraf emitting a Riemann event with a status text and `string_as_state` set to `true`, and a `description_text` defined:
+```
+#riemann.codec.Event{
+:host "postgresql-1e612b44-e92f-4d27-9f30-5e2f53947870", :state "Running", :ttl 30.0,
+:description "PostgreSQL master node is up and running",
+:service "status", :time 1475605021}
+```
diff --git a/plugins/outputs/riemann/riemann.go b/plugins/outputs/riemann/riemann.go
index fa150e097..25cf3011a 100644
--- a/plugins/outputs/riemann/riemann.go
+++ b/plugins/outputs/riemann/riemann.go
@@ -3,6 +3,7 @@ package riemann
 import (
 	"fmt"
 	"log"
+	"net/url"
 	"os"
 	"sort"
 	"strings"
@@ -12,44 +13,70 @@ import (
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
-const deprecationMsg = "I! WARNING: this Riemann output plugin will be deprecated in a future release, see https://github.com/influxdata/telegraf/issues/1878 for more details & discussion."
-
 type Riemann struct {
-	URL       string
-	Transport string
-	Separator string
+	URL                    string
+	TTL                    float32
+	Separator              string
+	MeasurementAsAttribute bool
+	StringAsState          bool
+	TagKeys                []string
+	Tags                   []string
+	DescriptionText        string
 
 	client *raidman.Client
 }
 
 var sampleConfig = `
-  ## URL of server
-  url = "localhost:5555"
-  ## transport protocol to use either tcp or udp
-  transport = "tcp"
-  ## separator to use between input name and field name in Riemann service name
-  separator = " "
+  ## The full TCP or UDP URL of the Riemann server
+  url = "tcp://localhost:5555"
+
+  ## Riemann event TTL, floating-point time in seconds.
+  ## Defines how long that an event is considered valid for in Riemann
+  # ttl = 30.0
+
+  ## Separator to use between measurement and field name in Riemann service name
+  ## This does not have any effect if 'measurement_as_attribute' is set to 'true'
+  separator = "/"
+
+  ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name
+  # measurement_as_attribute = false
+
+  ## Send string metrics as Riemann event states.
+  ## Unless enabled all string metrics will be ignored
+  # string_as_state = false
+
+  ## A list of tag keys whose values get sent as Riemann tags.
+  ## If empty, all Telegraf tag values will be sent as tags
+  # tag_keys = ["telegraf","custom_tag"]
+
+  ## Additional Riemann tags to send.
+  # tags = ["telegraf-output"]
+
+  ## Description for Riemann event
+  # description_text = "metrics collected from telegraf"
 `
 
 func (r *Riemann) Connect() error {
-	log.Printf(deprecationMsg)
-	c, err := raidman.Dial(r.Transport, r.URL)
+	parsed_url, err := url.Parse(r.URL)
+	if err != nil {
+		return err
+	}
 
+	client, err := raidman.Dial(parsed_url.Scheme, parsed_url.Host)
 	if err != nil {
 		r.client = nil
 		return err
 	}
 
-	r.client = c
+	r.client = client
 	return nil
 }
 
 func (r *Riemann) Close() error {
-	if r.client == nil {
-		return nil
+	if r.client != nil {
+		r.client.Close()
+		r.client = nil
 	}
-	r.client.Close()
-	r.client = nil
 	return nil
 }
 
@@ -62,91 +89,125 @@ func (r *Riemann) Description() string {
 }
 
 func (r *Riemann) Write(metrics []telegraf.Metric) error {
-	log.Printf(deprecationMsg)
 	if len(metrics) == 0 {
 		return nil
 	}
 
 	if r.client == nil {
-		err := r.Connect()
-		if err != nil {
-			return fmt.Errorf("FAILED to (re)connect to Riemann. Error: %s\n", err)
+		if err := r.Connect(); err != nil {
+			return fmt.Errorf("Failed to (re)connect to Riemann: %s", err.Error())
 		}
 	}
 
+	// build list of Riemann events to send
 	var events []*raidman.Event
-	for _, p := range metrics {
-		evs := buildEvents(p, r.Separator)
+	for _, m := range metrics {
+		evs := r.buildRiemannEvents(m)
 		for _, ev := range evs {
 			events = append(events, ev)
 		}
 	}
 
-	var senderr = r.client.SendMulti(events)
-	if senderr != nil {
-		r.Close() // always retuns nil
-		return fmt.Errorf("FAILED to send riemann message (will try to reconnect). Error: %s\n",
-			senderr)
+	if err := r.client.SendMulti(events); err != nil {
+		r.Close()
+		return fmt.Errorf("Failed to send riemann message: %s", err)
 	}
-
 	return nil
 }
 
-func buildEvents(p telegraf.Metric, s string) []*raidman.Event {
+func (r *Riemann) buildRiemannEvents(m telegraf.Metric) []*raidman.Event {
 	events := []*raidman.Event{}
-	for fieldName, value := range p.Fields() {
-		host, ok := p.Tags()["host"]
+	for fieldName, value := range m.Fields() {
+		// get host for Riemann event
+		host, ok := m.Tags()["host"]
 		if !ok {
-			hostname, err := os.Hostname()
-			if err != nil {
-				host = "unknown"
-			} else {
+			if hostname, err := os.Hostname(); err == nil {
 				host = hostname
+			} else {
+				host = "unknown"
 			}
 		}
 
 		event := &raidman.Event{
-			Host:    host,
-			Service: serviceName(s, p.Name(), p.Tags(), fieldName),
+			Host:        host,
+			Ttl:         r.TTL,
+			Description: r.DescriptionText,
+			Time:        m.Time().Unix(),
+
+			Attributes: r.attributes(m.Name(), m.Tags()),
+			Service:    r.service(m.Name(), fieldName),
+			Tags:       r.tags(m.Tags()),
 		}
 
 		switch value.(type) {
 		case string:
+			// only send string metrics if explicitly enabled, skip otherwise
+			if !r.StringAsState {
+				log.Printf("D! Riemann event states disabled, skipping metric value [%s]\n", value)
+				continue
+			}
 			event.State = value.(string)
-		default:
+		case int, int64, uint64, float32, float64:
 			event.Metric = value
+		default:
+			log.Printf("D! Riemann does not support metric value [%s]\n", value)
+			continue
 		}
 
 		events = append(events, event)
 	}
-
 	return events
 }
 
-func serviceName(s string, n string, t map[string]string, f string) string {
-	serviceStrings := []string{}
-	serviceStrings = append(serviceStrings, n)
-
-	// we'll skip the 'host' tag
-	tagStrings := []string{}
-	tagNames := []string{}
-
-	for tagName := range t {
-		tagNames = append(tagNames, tagName)
+func (r *Riemann) attributes(name string, tags map[string]string) map[string]string {
+	if r.MeasurementAsAttribute {
+		tags["measurement"] = name
 	}
-	sort.Strings(tagNames)
 
-	for _, tagName := range tagNames {
-		if tagName != "host" {
-			tagStrings = append(tagStrings, t[tagName])
+	delete(tags, "host") // exclude 'host' tag
+	return tags
+}
+
+func (r *Riemann) service(name string, field string) string {
+	var serviceStrings []string
+
+	// if measurement is not enabled as an attribute then prepend it to service name
+	if !r.MeasurementAsAttribute {
+		serviceStrings = append(serviceStrings, name)
+	}
+	serviceStrings = append(serviceStrings, field)
+
+	return strings.Join(serviceStrings, r.Separator)
+}
+
+func (r *Riemann) tags(tags map[string]string) []string {
+	// always add specified Riemann tags
+	values := r.Tags
+
+	// if tag_keys are specified, add those and return tag list
+	if len(r.TagKeys) > 0 {
+		for _, tagName := range r.TagKeys {
+			value, ok := tags[tagName]
+			if ok {
+				values = append(values, value)
+			}
+		}
+		return values
+	}
+
+	// otherwise add all values from telegraf tag key/value pairs
+	var keys []string
+	for key := range tags {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	for _, key := range keys {
+		if key != "host" { // exclude 'host' tag
+			values = append(values, tags[key])
 		}
 	}
-	var tagString string = strings.Join(tagStrings, s)
-	if tagString != "" {
-		serviceStrings = append(serviceStrings, tagString)
-	}
-	serviceStrings = append(serviceStrings, f)
-	return strings.Join(serviceStrings, s)
+	return values
 }
 
 func init() {
diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index b599cdf60..10f89e786 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -1,22 +1,180 @@
 package riemann
 
 import (
+	"fmt"
 	"testing"
+	"time"
 
+	"github.com/amir/raidman"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 
+func TestAttributes(t *testing.T) {
+	tags := map[string]string{"tag1": "value1", "tag2": "value2"}
+
+	r := &Riemann{}
+	require.Equal(t,
+		map[string]string{"tag1": "value1", "tag2": "value2"},
+		r.attributes("test", tags))
+
+	// enable measurement as attribute, should now be included
+	r.MeasurementAsAttribute = true
+	require.Equal(t,
+		map[string]string{"tag1": "value1", "tag2": "value2", "measurement": "test"},
+		r.attributes("test", tags))
+}
+
+func TestService(t *testing.T) {
+	r := &Riemann{
+		Separator: "/",
+	}
+	require.Equal(t, "test/value", r.service("test", "value"))
+
+	// enable measurement as attribute, should not be part of service name anymore
+	r.MeasurementAsAttribute = true
+	require.Equal(t, "value", r.service("test", "value"))
+}
+
+func TestTags(t *testing.T) {
+	tags := map[string]string{"tag1": "value1", "tag2": "value2"}
+
+	// all tag values plus additional tag should be present
+	r := &Riemann{
+		Tags: []string{"test"},
+	}
+	require.Equal(t,
+		[]string{"test", "value1", "value2"},
+		r.tags(tags))
+
+	// only tag2 value plus additional tag should be present
+	r.TagKeys = []string{"tag2"}
+	require.Equal(t,
+		[]string{"test", "value2"},
+		r.tags(tags))
+
+	// only tag1 value should be present
+	r.Tags = nil
+	r.TagKeys = []string{"tag1"}
+	require.Equal(t,
+		[]string{"value1"},
+		r.tags(tags))
+}
+
+func TestMetricEvents(t *testing.T) {
+	r := &Riemann{
+		TTL:                    20.0,
+		Separator:              "/",
+		MeasurementAsAttribute: false,
+		DescriptionText:        "metrics from telegraf",
+		Tags:                   []string{"telegraf"},
+	}
+
+	// build a single event
+	metric, _ := telegraf.NewMetric(
+		"test1",
+		map[string]string{"tag1": "value1", "host": "abc123"},
+		map[string]interface{}{"value": 5.6},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+
+	events := r.buildRiemannEvents(metric)
+	require.Len(t, events, 1)
+
+	// is event as expected?
+	expectedEvent := &raidman.Event{
+		Ttl:         20.0,
+		Time:        1257894000,
+		Tags:        []string{"telegraf", "value1"},
+		Host:        "abc123",
+		State:       "",
+		Service:     "test1/value",
+		Metric:      5.6,
+		Description: "metrics from telegraf",
+		Attributes:  map[string]string{"tag1": "value1"},
+	}
+	require.Equal(t, expectedEvent, events[0])
+
+	// build 2 events
+	metric, _ = telegraf.NewMetric(
+		"test2",
+		map[string]string{"host": "xyz987"},
+		map[string]interface{}{"point": 1},
+		time.Date(2012, time.November, 2, 3, 0, 0, 0, time.UTC),
+	)
+
+	events = append(events, r.buildRiemannEvents(metric)...)
+	require.Len(t, events, 2)
+
+	// first event should still be the same
+	require.Equal(t, expectedEvent, events[0])
+
+	// second event
+	expectedEvent = &raidman.Event{
+		Ttl:         20.0,
+		Time:        1351825200,
+		Tags:        []string{"telegraf"},
+		Host:        "xyz987",
+		State:       "",
+		Service:     "test2/point",
+		Metric:      int64(1),
+		Description: "metrics from telegraf",
+		Attributes:  map[string]string{},
+	}
+	require.Equal(t, expectedEvent, events[1])
+}
+
+func TestStateEvents(t *testing.T) {
+	r := &Riemann{
+		MeasurementAsAttribute: true,
+	}
+
+	// string metrics will be skipped unless explicitly enabled
+	metric, _ := telegraf.NewMetric(
+		"test",
+		map[string]string{"host": "host"},
+		map[string]interface{}{"value": "running"},
+		time.Date(2015, time.November, 9, 22, 0, 0, 0, time.UTC),
+	)
+
+	events := r.buildRiemannEvents(metric)
+	// no event should be present
+	require.Len(t, events, 0)
+
+	// enable string metrics as event states
+	r.StringAsState = true
+	events = r.buildRiemannEvents(metric)
+	require.Len(t, events, 1)
+
+	// is event as expected?
+	expectedEvent := &raidman.Event{
+		Ttl:         0,
+		Time:        1447106400,
+		Tags:        nil,
+		Host:        "host",
+		State:       "running",
+		Service:     "value",
+		Metric:      nil,
+		Description: "",
+		Attributes:  map[string]string{"measurement": "test"},
+	}
+	require.Equal(t, expectedEvent, events[0])
+}
+
 func TestConnectAndWrite(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	url := testutil.GetLocalHost() + ":5555"
-
 	r := &Riemann{
-		URL:       url,
-		Transport: "tcp",
+		URL:                    fmt.Sprintf("tcp://%s:5555", testutil.GetLocalHost()),
+		TTL:                    15.0,
+		Separator:              "/",
+		MeasurementAsAttribute: false,
+		StringAsState:          true,
+		DescriptionText:        "metrics from telegraf",
+		Tags:                   []string{"docker"},
 	}
 
 	err := r.Connect()
@@ -24,4 +182,32 @@ func TestConnectAndWrite(t *testing.T) {
 
 	err = r.Write(testutil.MockMetrics())
 	require.NoError(t, err)
+
+	metrics := make([]telegraf.Metric, 0)
+	metrics = append(metrics, testutil.TestMetric(2))
+	metrics = append(metrics, testutil.TestMetric(3.456789))
+	metrics = append(metrics, testutil.TestMetric(uint(0)))
+	metrics = append(metrics, testutil.TestMetric("ok"))
+	metrics = append(metrics, testutil.TestMetric("running"))
+	err = r.Write(metrics)
+	require.NoError(t, err)
+
+	time.Sleep(200 * time.Millisecond)
+
+	// are there any "docker" tagged events in Riemann?
+	events, err := r.client.Query(`tagged "docker"`)
+	require.NoError(t, err)
+	require.NotZero(t, len(events))
+
+	// get Riemann events with state = "running", should be 1 event
+	events, err = r.client.Query(`state = "running"`)
+	require.NoError(t, err)
+	require.Len(t, events, 1)
+
+	// is event as expected?
+	require.Equal(t, []string{"docker", "value1"}, events[0].Tags)
+	require.Equal(t, "running", events[0].State)
+	require.Equal(t, "test1/value", events[0].Service)
+	require.Equal(t, "metrics from telegraf", events[0].Description)
+	require.Equal(t, map[string]string{"tag1": "value1"}, events[0].Attributes)
 }
diff --git a/plugins/outputs/riemann_legacy/riemann.go b/plugins/outputs/riemann_legacy/riemann.go
new file mode 100644
index 000000000..69de7f521
--- /dev/null
+++ b/plugins/outputs/riemann_legacy/riemann.go
@@ -0,0 +1,156 @@
+package riemann_legacy
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"sort"
+	"strings"
+
+	"github.com/amir/raidman"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/outputs"
+)
+
+const deprecationMsg = "E! Error: this Riemann output plugin will be deprecated in a future release, see https://github.com/influxdata/telegraf/issues/1878 for more details & discussion."
+
+type Riemann struct {
+	URL       string
+	Transport string
+	Separator string
+
+	client *raidman.Client
+}
+
+var sampleConfig = `
+  ## URL of server
+  url = "localhost:5555"
+  ## transport protocol to use either tcp or udp
+  transport = "tcp"
+  ## separator to use between input name and field name in Riemann service name
+  separator = " "
+`
+
+func (r *Riemann) Connect() error {
+	log.Printf(deprecationMsg)
+	c, err := raidman.Dial(r.Transport, r.URL)
+
+	if err != nil {
+		r.client = nil
+		return err
+	}
+
+	r.client = c
+	return nil
+}
+
+func (r *Riemann) Close() error {
+	if r.client == nil {
+		return nil
+	}
+	r.client.Close()
+	r.client = nil
+	return nil
+}
+
+func (r *Riemann) SampleConfig() string {
+	return sampleConfig
+}
+
+func (r *Riemann) Description() string {
+	return "Configuration for the Riemann server to send metrics to"
+}
+
+func (r *Riemann) Write(metrics []telegraf.Metric) error {
+	log.Printf(deprecationMsg)
+	if len(metrics) == 0 {
+		return nil
+	}
+
+	if r.client == nil {
+		err := r.Connect()
+		if err != nil {
+			return fmt.Errorf("FAILED to (re)connect to Riemann. Error: %s\n", err)
+		}
+	}
+
+	var events []*raidman.Event
+	for _, p := range metrics {
+		evs := buildEvents(p, r.Separator)
+		for _, ev := range evs {
+			events = append(events, ev)
+		}
+	}
+
+	var senderr = r.client.SendMulti(events)
+	if senderr != nil {
+		r.Close() // always retuns nil
+		return fmt.Errorf("FAILED to send riemann message (will try to reconnect). Error: %s\n",
+			senderr)
+	}
+
+	return nil
+}
+
+func buildEvents(p telegraf.Metric, s string) []*raidman.Event {
+	events := []*raidman.Event{}
+	for fieldName, value := range p.Fields() {
+		host, ok := p.Tags()["host"]
+		if !ok {
+			hostname, err := os.Hostname()
+			if err != nil {
+				host = "unknown"
+			} else {
+				host = hostname
+			}
+		}
+
+		event := &raidman.Event{
+			Host:    host,
+			Service: serviceName(s, p.Name(), p.Tags(), fieldName),
+		}
+
+		switch value.(type) {
+		case string:
+			event.State = value.(string)
+		default:
+			event.Metric = value
+		}
+
+		events = append(events, event)
+	}
+
+	return events
+}
+
+func serviceName(s string, n string, t map[string]string, f string) string {
+	serviceStrings := []string{}
+	serviceStrings = append(serviceStrings, n)
+
+	// we'll skip the 'host' tag
+	tagStrings := []string{}
+	tagNames := []string{}
+
+	for tagName := range t {
+		tagNames = append(tagNames, tagName)
+	}
+	sort.Strings(tagNames)
+
+	for _, tagName := range tagNames {
+		if tagName != "host" {
+			tagStrings = append(tagStrings, t[tagName])
+		}
+	}
+	var tagString string = strings.Join(tagStrings, s)
+	if tagString != "" {
+		serviceStrings = append(serviceStrings, tagString)
+	}
+	serviceStrings = append(serviceStrings, f)
+	return strings.Join(serviceStrings, s)
+}
+
+func init() {
+	outputs.Add("riemann_legacy", func() telegraf.Output {
+		return &Riemann{}
+	})
+}
diff --git a/plugins/outputs/riemann_legacy/riemann_test.go b/plugins/outputs/riemann_legacy/riemann_test.go
new file mode 100644
index 000000000..e57cbb43c
--- /dev/null
+++ b/plugins/outputs/riemann_legacy/riemann_test.go
@@ -0,0 +1,27 @@
+package riemann_legacy
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestConnectAndWrite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	url := testutil.GetLocalHost() + ":5555"
+
+	r := &Riemann{
+		URL:       url,
+		Transport: "tcp",
+	}
+
+	err := r.Connect()
+	require.NoError(t, err)
+
+	err = r.Write(testutil.MockMetrics())
+	require.NoError(t, err)
+}

From e9decadf75cc87e7b0eb4adaf0fdbeb2233640b6 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 27 Jan 2017 14:59:35 -0800
Subject: [PATCH 0087/1302] Riemann rewrite changelog update

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ebea6184..e0d7f635e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,19 @@
 
 ### Release Notes
 
+- The [Riemann output plugin](./plugins/outputs/riemann) has been rewritten
+and the previous riemann plugin is _incompatible_ with the new one. The reasons
+for this are outlined in issue [#1878](https://github.com/influxdata/telegraf/issues/1878).
+The previous riemann output will still be available using
+`outputs.riemann_legacy` if needed, but that will eventually be deprecated.
+It is highly recommended that all users migrate to the new riemann output plugin.
+
 ### Features
 
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
+- [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 
 ### Bugfixes
 

From 1d864ebd407c937ac18d7b9e7914e14a02a97f52 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 27 Jan 2017 15:08:21 -0800
Subject: [PATCH 0088/1302] Fix riemann output unit tests

---
 plugins/outputs/riemann/riemann_test.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index 10f89e786..e03d720ce 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/amir/raidman"
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
@@ -72,14 +73,14 @@ func TestMetricEvents(t *testing.T) {
 	}
 
 	// build a single event
-	metric, _ := telegraf.NewMetric(
+	m, _ := metric.New(
 		"test1",
 		map[string]string{"tag1": "value1", "host": "abc123"},
 		map[string]interface{}{"value": 5.6},
 		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
 	)
 
-	events := r.buildRiemannEvents(metric)
+	events := r.buildRiemannEvents(m)
 	require.Len(t, events, 1)
 
 	// is event as expected?
@@ -97,14 +98,14 @@ func TestMetricEvents(t *testing.T) {
 	require.Equal(t, expectedEvent, events[0])
 
 	// build 2 events
-	metric, _ = telegraf.NewMetric(
+	m, _ = metric.New(
 		"test2",
 		map[string]string{"host": "xyz987"},
 		map[string]interface{}{"point": 1},
 		time.Date(2012, time.November, 2, 3, 0, 0, 0, time.UTC),
 	)
 
-	events = append(events, r.buildRiemannEvents(metric)...)
+	events = append(events, r.buildRiemannEvents(m)...)
 	require.Len(t, events, 2)
 
 	// first event should still be the same
@@ -131,20 +132,20 @@ func TestStateEvents(t *testing.T) {
 	}
 
 	// string metrics will be skipped unless explicitly enabled
-	metric, _ := telegraf.NewMetric(
+	m, _ := metric.New(
 		"test",
 		map[string]string{"host": "host"},
 		map[string]interface{}{"value": "running"},
 		time.Date(2015, time.November, 9, 22, 0, 0, 0, time.UTC),
 	)
 
-	events := r.buildRiemannEvents(metric)
+	events := r.buildRiemannEvents(m)
 	// no event should be present
 	require.Len(t, events, 0)
 
 	// enable string metrics as event states
 	r.StringAsState = true
-	events = r.buildRiemannEvents(metric)
+	events = r.buildRiemannEvents(m)
 	require.Len(t, events, 1)
 
 	// is event as expected?

From 074e6d177cd35861a9677898a7a04e8f5eb4b421 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <patrick.hemmer@gmail.com>
Date: Mon, 4 Jul 2016 18:48:37 -0400
Subject: [PATCH 0089/1302] add support for diskio name templates & udev tags

closes #1453
closes #1386
closes #1428
---
 CHANGELOG.md                             |   1 +
 plugins/inputs/system/disk.go            |  85 ++++++++++++++++++-
 plugins/inputs/system/disk_linux.go      |  66 +++++++++++++++
 plugins/inputs/system/disk_linux_test.go | 101 +++++++++++++++++++++++
 plugins/inputs/system/disk_other.go      |   9 ++
 5 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/system/disk_linux.go
 create mode 100644 plugins/inputs/system/disk_linux_test.go
 create mode 100644 plugins/inputs/system/disk_other.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0d7f635e..777eefbdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
+- [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 548a9ce23..3f6d83c1c 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/influxdata/telegraf"
@@ -82,7 +83,11 @@ type DiskIOStats struct {
 	ps PS
 
 	Devices          []string
+	DeviceTags       []string
+	NameTemplates    []string
 	SkipSerialNumber bool
+
+	infoCache map[string]diskInfoCache
 }
 
 func (_ *DiskIOStats) Description() string {
@@ -96,6 +101,23 @@ var diskIoSampleConfig = `
   # devices = ["sda", "sdb"]
   ## Uncomment the following line if you need disk serial numbers.
   # skip_serial_number = false
+  #
+  ## On systems which support it, device metadata can be added in the form of
+  ## tags.
+  ## Currently only Linux is supported via udev properties. You can view
+  ## available properties for a device by running:
+  ## 'udevadm info -q property -n /dev/sda'
+  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+  #
+  ## Using the same metadata source as device_tags, you can also customize the
+  ## name of the device via templates.
+  ## The 'name_templates' parameter is a list of templates to try and apply to
+  ## the device. The template may contain variables in the form of '$PROPERTY' or
+  ## '${PROPERTY}'. The first template which does not contain any variables not
+  ## present for the device is used as the device name tag.
+  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+  ## the near-meaningless DM-0 name.
+  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
 `
 
 func (_ *DiskIOStats) SampleConfig() string {
@@ -123,7 +145,10 @@ func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
 			continue
 		}
 		tags := map[string]string{}
-		tags["name"] = io.Name
+		tags["name"] = s.diskName(io.Name)
+		for t, v := range s.diskTags(io.Name) {
+			tags[t] = v
+		}
 		if !s.SkipSerialNumber {
 			if len(io.SerialNumber) != 0 {
 				tags["serial"] = io.SerialNumber
@@ -148,6 +173,64 @@ func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+var varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`)
+
+func (s *DiskIOStats) diskName(devName string) string {
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		// discard error :-(
+		// We can't return error because it's non-fatal to the Gather().
+		// And we have no logger, so we can't log it.
+		return devName
+	}
+	if di == nil {
+		return devName
+	}
+
+	for _, nt := range s.NameTemplates {
+		miss := false
+		name := varRegex.ReplaceAllStringFunc(nt, func(sub string) string {
+			sub = sub[1:] // strip leading '$'
+			if sub[0] == '{' {
+				sub = sub[1 : len(sub)-1] // strip leading & trailing '{' '}'
+			}
+			if v, ok := di[sub]; ok {
+				return v
+			}
+			miss = true
+			return ""
+		})
+
+		if !miss {
+			return name
+		}
+	}
+
+	return devName
+}
+
+func (s *DiskIOStats) diskTags(devName string) map[string]string {
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		// discard error :-(
+		// We can't return error because it's non-fatal to the Gather().
+		// And we have no logger, so we can't log it.
+		return nil
+	}
+	if di == nil {
+		return nil
+	}
+
+	tags := map[string]string{}
+	for _, dt := range s.DeviceTags {
+		if v, ok := di[dt]; ok {
+			tags[dt] = v
+		}
+	}
+
+	return tags
+}
+
 func init() {
 	inputs.Add("disk", func() telegraf.Input {
 		return &DiskStats{ps: &systemPS{}}
diff --git a/plugins/inputs/system/disk_linux.go b/plugins/inputs/system/disk_linux.go
new file mode 100644
index 000000000..e5a0cff55
--- /dev/null
+++ b/plugins/inputs/system/disk_linux.go
@@ -0,0 +1,66 @@
+package system
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+	"syscall"
+)
+
+type diskInfoCache struct {
+	stat   syscall.Stat_t
+	values map[string]string
+}
+
+var udevPath = "/run/udev/data"
+
+func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
+	fi, err := os.Stat("/dev/" + devName)
+	if err != nil {
+		return nil, err
+	}
+	stat, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return nil, nil
+	}
+
+	if s.infoCache == nil {
+		s.infoCache = map[string]diskInfoCache{}
+	}
+	ic, ok := s.infoCache[devName]
+	if ok {
+		return ic.values, nil
+	} else {
+		ic = diskInfoCache{
+			stat:   *stat,
+			values: map[string]string{},
+		}
+		s.infoCache[devName] = ic
+	}
+	di := ic.values
+
+	major := stat.Rdev >> 8 & 0xff
+	minor := stat.Rdev & 0xff
+
+	f, err := os.Open(fmt.Sprintf("%s/b%d:%d", udevPath, major, minor))
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	scnr := bufio.NewScanner(f)
+
+	for scnr.Scan() {
+		l := scnr.Text()
+		if len(l) < 4 || l[:2] != "E:" {
+			continue
+		}
+		kv := strings.SplitN(l[2:], "=", 2)
+		if len(kv) < 2 {
+			continue
+		}
+		di[kv[0]] = kv[1]
+	}
+
+	return di, nil
+}
diff --git a/plugins/inputs/system/disk_linux_test.go b/plugins/inputs/system/disk_linux_test.go
new file mode 100644
index 000000000..801ad328a
--- /dev/null
+++ b/plugins/inputs/system/disk_linux_test.go
@@ -0,0 +1,101 @@
+// +build linux
+
+package system
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var nullDiskInfo = []byte(`
+E:MY_PARAM_1=myval1
+E:MY_PARAM_2=myval2
+`)
+
+// setupNullDisk sets up fake udev info as if /dev/null were a disk.
+func setupNullDisk(t *testing.T) func() error {
+	td, err := ioutil.TempDir("", ".telegraf.TestDiskInfo")
+	require.NoError(t, err)
+
+	origUdevPath := udevPath
+
+	cleanFunc := func() error {
+		udevPath = origUdevPath
+		return os.RemoveAll(td)
+	}
+
+	udevPath = td
+	err = ioutil.WriteFile(td+"/b1:3", nullDiskInfo, 0644) // 1:3 is the 'null' device
+	if err != nil {
+		cleanFunc()
+		t.Fatal(err)
+	}
+
+	return cleanFunc
+}
+
+func TestDiskInfo(t *testing.T) {
+	clean := setupNullDisk(t)
+	defer clean()
+
+	s := &DiskIOStats{}
+	di, err := s.diskInfo("null")
+	require.NoError(t, err)
+	assert.Equal(t, "myval1", di["MY_PARAM_1"])
+	assert.Equal(t, "myval2", di["MY_PARAM_2"])
+
+	// test that data is cached
+	err = clean()
+	require.NoError(t, err)
+
+	di, err = s.diskInfo("null")
+	require.NoError(t, err)
+	assert.Equal(t, "myval1", di["MY_PARAM_1"])
+	assert.Equal(t, "myval2", di["MY_PARAM_2"])
+
+	// unfortunately we can't adjust mtime on /dev/null to test cache invalidation
+}
+
+// DiskIOStats.diskName isn't a linux specific function, but dependent
+// functions are a no-op on non-Linux.
+func TestDiskIOStats_diskName(t *testing.T) {
+	defer setupNullDisk(t)()
+
+	tests := []struct {
+		templates []string
+		expected  string
+	}{
+		{[]string{"$MY_PARAM_1"}, "myval1"},
+		{[]string{"${MY_PARAM_1}"}, "myval1"},
+		{[]string{"x$MY_PARAM_1"}, "xmyval1"},
+		{[]string{"x${MY_PARAM_1}x"}, "xmyval1x"},
+		{[]string{"$MISSING", "$MY_PARAM_1"}, "myval1"},
+		{[]string{"$MY_PARAM_1", "$MY_PARAM_2"}, "myval1"},
+		{[]string{"$MISSING"}, "null"},
+		{[]string{"$MY_PARAM_1/$MY_PARAM_2"}, "myval1/myval2"},
+		{[]string{"$MY_PARAM_2/$MISSING"}, "null"},
+	}
+
+	for _, tc := range tests {
+		s := DiskIOStats{
+			NameTemplates: tc.templates,
+		}
+		assert.Equal(t, tc.expected, s.diskName("null"), "Templates: %#v", tc.templates)
+	}
+}
+
+// DiskIOStats.diskTags isn't a linux specific function, but dependent
+// functions are a no-op on non-Linux.
+func TestDiskIOStats_diskTags(t *testing.T) {
+	defer setupNullDisk(t)()
+
+	s := &DiskIOStats{
+		DeviceTags: []string{"MY_PARAM_2"},
+	}
+	dt := s.diskTags("null")
+	assert.Equal(t, map[string]string{"MY_PARAM_2": "myval2"}, dt)
+}
diff --git a/plugins/inputs/system/disk_other.go b/plugins/inputs/system/disk_other.go
new file mode 100644
index 000000000..fa9121cdf
--- /dev/null
+++ b/plugins/inputs/system/disk_other.go
@@ -0,0 +1,9 @@
+// +build !linux
+
+package system
+
+type diskInfoCache struct{}
+
+func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
+	return nil, nil
+}

From 738cbbdbb6ff9bb9fa1a561270ed4e60e5d7127c Mon Sep 17 00:00:00 2001
From: John Engelman <john.r.engelman@gmail.com>
Date: Sat, 28 Jan 2017 18:47:25 -0600
Subject: [PATCH 0090/1302] Add numerical representation of Consul health check
 state. (#2277)

---
 CHANGELOG.md                         |  1 +
 plugins/inputs/consul/README.md      | 11 +++++++++--
 plugins/inputs/consul/consul.go      |  5 +++++
 plugins/inputs/consul/consul_test.go |  3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 777eefbdf..f3e0626d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
+- [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index 01a39cbf7..dbb576421 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -35,12 +35,19 @@ Fields:
 - check_name
 - service_id
 - status
+- passing
+- critical
+- warning
+
+`passing`, `critical`, and `warning` are integer representations of the health
+check state. A value of `1` represents that the status was the state of the
+the health check at this sample.
 
 ## Example output
 
 ```
 $ telegraf --config ./telegraf.conf -input-filter consul -test
 * Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
+> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
+> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
 ```
diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index 4c28f4d12..0eaa25604 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -97,7 +97,12 @@ func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.Healt
 
 		record["check_name"] = check.Name
 		record["service_id"] = check.ServiceID
+
 		record["status"] = check.Status
+		record["passing"] = 0
+		record["critical"] = 0
+		record["warning"] = 0
+		record[check.Status] = 1
 
 		tags["node"] = check.Node
 		tags["service_name"] = check.ServiceName
diff --git a/plugins/inputs/consul/consul_test.go b/plugins/inputs/consul/consul_test.go
index f970d4449..d0595508d 100644
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -24,6 +24,9 @@ func TestGatherHealtCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
 		"check_name": "foo.health",
 		"status":     "passing",
+		"passing":    1,
+		"critical":   0,
+		"warning":    0,
 		"service_id": "foo.123",
 	}
 

From e87ce22af9900064cf15eb0ea6a579d988de06b4 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 08:55:22 +0000
Subject: [PATCH 0091/1302] running output: Drop nil metrics

fixes #2317
---
 internal/models/running_output.go      |  3 +++
 internal/models/running_output_test.go | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 0ae78c983..0ce756f47 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -90,6 +90,9 @@ func NewRunningOutput(
 // AddMetric adds a metric to the output. This function can also write cached
 // points if FlushBufferWhenFull is true.
 func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
+	if m == nil {
+		return
+	}
 	// Filter any tagexclude/taginclude parameters before adding metric
 	if ro.Config.Filter.IsActive() {
 		// In order to filter out tags, we need to create a new metric, since
diff --git a/internal/models/running_output_test.go b/internal/models/running_output_test.go
index c55334218..bd39f2f9b 100644
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -75,6 +75,23 @@ func BenchmarkRunningOutputAddFailWrites(b *testing.B) {
 	}
 }
 
+func TestAddingNilMetric(t *testing.T) {
+	conf := &OutputConfig{
+		Filter: Filter{},
+	}
+
+	m := &mockOutput{}
+	ro := NewRunningOutput("test", m, conf, 1000, 10000)
+
+	ro.AddMetric(nil)
+	ro.AddMetric(nil)
+	ro.AddMetric(nil)
+
+	err := ro.Write()
+	assert.NoError(t, err)
+	assert.Len(t, m.Metrics(), 0)
+}
+
 // Test that NameDrop filters ger properly applied.
 func TestRunningOutput_DropFilter(t *testing.T) {
 	conf := &OutputConfig{

From fb7931591d50a720191787eb429242c630ce7197 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 08:59:54 +0000
Subject: [PATCH 0092/1302] Changelog update

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3e0626d8..836745df6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,12 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 
+## v1.2.1 [unreleased]
+
+### Bugfixes
+
+- [#2317](https://github.com/influxdata/telegraf/issues/2317): Fix segfault on nil metrics with influxdb output.
+
 ## v1.2 [2017-01-00]
 
 ### Release Notes

From 3e37dda7b0480fe5a206332bccdb34bb2456bf73 Mon Sep 17 00:00:00 2001
From: Martin <martin@seener.de>
Date: Wed, 1 Feb 2017 11:07:02 +0100
Subject: [PATCH 0093/1302] Go version 1.7.4 -> 1.7.5 (#2348)

---
 CHANGELOG.md | 1 +
 circle.yml   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836745df6..a750450c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
+- [#2348](https://github.com/influxdata/telegraf/pull/2348): Go version 1.7.4 -> 1.7.5
 
 ### Bugfixes
 
diff --git a/circle.yml b/circle.yml
index 31b28602f..c237040a2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,9 +4,9 @@ machine:
   post:
     - sudo service zookeeper stop
     - go version
-    - go version | grep 1.7.4 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.7.4.linux-amd64.tar.gz
+    - go version | grep 1.7.5 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.7.5.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.7.5.linux-amd64.tar.gz
     - go version
 
 dependencies:

From 54cfbb5b87f10cf0229524c840198e78ac7798db Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 09:50:34 +0000
Subject: [PATCH 0094/1302] metric: Fix negative number handling

closes #2324
---
 metric/metric.go                              |  2 +-
 metric/parse_test.go                          | 23 +++++++++++++++++++
 .../mqtt_consumer/mqtt_consumer_test.go       | 18 ++++++++++++++-
 plugins/parsers/influx/parser_test.go         | 13 +++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/metric/metric.go b/metric/metric.go
index 4fbee0ad1..936d0907e 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -305,7 +305,7 @@ func (m *metric) Fields() map[string]interface{} {
 		case '"':
 			// string field
 			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = unescape(string(m.fields[i:][i2+1:i3-1]), "fieldval")
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
 			// number field
 			switch m.fields[i:][i3-1] {
 			case 'i':
diff --git a/metric/parse_test.go b/metric/parse_test.go
index 8b7a8ff4d..40bcf60b8 100644
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -44,6 +44,9 @@ cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
 cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
 `
 
+const negMetrics = `weather,host=local temp=-99i,temp_float=-99.4 1465839830100400200
+`
+
 // some metrics are invalid
 const someInvalid = `cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
 cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
@@ -85,6 +88,26 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func TestParseNegNumbers(t *testing.T) {
+	metrics, err := Parse([]byte(negMetrics))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+
+	assert.Equal(t,
+		map[string]interface{}{
+			"temp":       int64(-99),
+			"temp_float": float64(-99.4),
+		},
+		metrics[0].Fields(),
+	)
+	assert.Equal(t,
+		map[string]string{
+			"host": "local",
+		},
+		metrics[0].Tags(),
+	)
+}
+
 func TestParseErrors(t *testing.T) {
 	start := time.Now()
 	metrics, err := Parse([]byte(someInvalid))
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
index 7b8e0b834..2f5276191 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
@@ -14,6 +14,7 @@ import (
 
 const (
 	testMsg         = "cpu_load_short,host=server01 value=23422.0 1422568543702900257\n"
+	testMsgNeg      = "cpu_load_short,host=server01 value=-23422.0 1422568543702900257\n"
 	testMsgGraphite = "cpu.load.short.graphite 23422 1454780029"
 	testMsgJSON     = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
 	invalidMsg      = "cpu_load_short,host=server01 1422568543702900257\n"
@@ -76,13 +77,28 @@ func TestPersistentClientIDFail(t *testing.T) {
 	assert.Error(t, err)
 }
 
-// Test that the parser parses NATS messages into metrics
 func TestRunParser(t *testing.T) {
 	n, in := newTestMQTTConsumer()
 	acc := testutil.Accumulator{}
 	n.acc = &acc
 	defer close(n.done)
 
+	n.parser, _ = parsers.NewInfluxParser()
+	go n.receiver()
+	in <- mqttMsg(testMsgNeg)
+	time.Sleep(time.Millisecond * 250)
+
+	if a := acc.NFields(); a != 1 {
+		t.Errorf("got %v, expected %v", a, 1)
+	}
+}
+
+func TestRunParserNegativeNumber(t *testing.T) {
+	n, in := newTestMQTTConsumer()
+	acc := testutil.Accumulator{}
+	n.acc = &acc
+	defer close(n.done)
+
 	n.parser, _ = parsers.NewInfluxParser()
 	go n.receiver()
 	in <- mqttMsg(testMsg)
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 58531ff90..6b2ba8d56 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -19,6 +19,7 @@ var (
 
 const (
 	validInflux          = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
+	negativeFloat        = "cpu_load_short,cpu=cpu0 value=-13.4 1257894000000000000\n"
 	validInfluxNewline   = "\ncpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
 	validInfluxNoNewline = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000"
 	invalidInflux        = "I don't think this is line protocol\n"
@@ -82,6 +83,18 @@ func TestParseValidInflux(t *testing.T) {
 		"cpu": "cpu0",
 	}, metrics[0].Tags())
 	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
+
+	metrics, err = parser.Parse([]byte(negativeFloat))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "cpu_load_short", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"value": float64(-13.4),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{
+		"cpu": "cpu0",
+	}, metrics[0].Tags())
+	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
 }
 
 func TestParseLineValidInflux(t *testing.T) {

From 4dad723088c54eef153e875872239fdc1827148e Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 09:52:26 +0000
Subject: [PATCH 0095/1302] Changelog update

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a750450c9..2175b5cc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,11 +24,12 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 
-## v1.2.1 [unreleased]
+## v1.2.1 [2017-02-01]
 
 ### Bugfixes
 
 - [#2317](https://github.com/influxdata/telegraf/issues/2317): Fix segfault on nil metrics with influxdb output.
+- [#2324](https://github.com/influxdata/telegraf/issues/2324): Fix negative number handling.
 
 ## v1.2 [2017-01-00]
 

From 19dee32287def9617ffa26dd691d6cf093ce979f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 10:11:16 +0000
Subject: [PATCH 0096/1302] Go 1.7.5 update cherry-picked to 1.2.1 release

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2175b5cc5..7d1b1bb5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,6 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
-- [#2348](https://github.com/influxdata/telegraf/pull/2348): Go version 1.7.4 -> 1.7.5
 
 ### Bugfixes
 
@@ -31,6 +30,10 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2317](https://github.com/influxdata/telegraf/issues/2317): Fix segfault on nil metrics with influxdb output.
 - [#2324](https://github.com/influxdata/telegraf/issues/2324): Fix negative number handling.
 
+### Features
+
+- [#2348](https://github.com/influxdata/telegraf/pull/2348): Go version 1.7.4 -> 1.7.5
+
 ## v1.2 [2017-01-00]
 
 ### Release Notes

From 2932db84804f7f6d02f1779029a903fd778a7ffc Mon Sep 17 00:00:00 2001
From: njwhite <n.j.white@gmail.com>
Date: Wed, 1 Feb 2017 14:11:39 +0000
Subject: [PATCH 0097/1302] Make Logparser Plugin Check For New Files (#2141)

* Make Logparser Plugin Check For New Files

Check in the Gather metric to see if any new files matching the glob
have appeared. If so, start tailing them from the beginning.

* changelog update for #2141
---
 CHANGELOG.md                               |  1 +
 plugins/inputs/logparser/logparser.go      | 36 ++++++++++++++----
 plugins/inputs/logparser/logparser_test.go | 43 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1b1bb5b..8e5865e7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 ### Features
 
+- [#2141](https://github.com/influxdata/telegraf/pull/2141): Logparser handles newly-created files.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 0778a8a6d..8ec328358 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -26,7 +26,7 @@ type LogParserPlugin struct {
 	Files         []string
 	FromBeginning bool
 
-	tailers []*tail.Tail
+	tailers map[string]*tail.Tail
 	lines   chan string
 	done    chan struct{}
 	wg      sync.WaitGroup
@@ -46,7 +46,9 @@ const sampleConfig = `
   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
   ##   /var/log/apache.log -> only tail the apache log file
   files = ["/var/log/apache/access.log"]
-  ## Read file from beginning.
+  ## Read files that currently exist from the beginning. Files that are created
+  ## while telegraf is running (and that match the "files" globs) will always
+  ## be read from the beginning.
   from_beginning = false
 
   ## Parse logstash-style "grok" patterns:
@@ -77,7 +79,11 @@ func (l *LogParserPlugin) Description() string {
 }
 
 func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
-	return nil
+	l.Lock()
+	defer l.Unlock()
+
+	// always start from the beginning of files that appear while we're running
+	return l.tailNewfiles(true)
 }
 
 func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
@@ -87,6 +93,7 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	l.acc = acc
 	l.lines = make(chan string, 1000)
 	l.done = make(chan struct{})
+	l.tailers = make(map[string]*tail.Tail)
 
 	// Looks for fields which implement LogParser interface
 	l.parsers = []LogParser{}
@@ -121,14 +128,22 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 		return err
 	}
 
+	l.wg.Add(1)
+	go l.parser()
+
+	return l.tailNewfiles(l.FromBeginning)
+}
+
+// check the globs against files on disk, and start tailing any new files.
+// Assumes l's lock is held!
+func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 	var seek tail.SeekInfo
-	if !l.FromBeginning {
+	if !fromBeginning {
 		seek.Whence = 2
 		seek.Offset = 0
 	}
 
-	l.wg.Add(1)
-	go l.parser()
+	errChan := errchan.New(len(l.Files))
 
 	// Create a "tailer" for each file
 	for _, filepath := range l.Files {
@@ -139,7 +154,13 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 		}
 		files := g.Match()
 		errChan = errchan.New(len(files))
+
 		for file, _ := range files {
+			if _, ok := l.tailers[file]; ok {
+				// we're already tailing this file
+				continue
+			}
+
 			tailer, err := tail.TailFile(file,
 				tail.Config{
 					ReOpen:    true,
@@ -152,7 +173,7 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 			// create a goroutine for each "tailer"
 			l.wg.Add(1)
 			go l.receiver(tailer)
-			l.tailers = append(l.tailers, tailer)
+			l.tailers[file] = tailer
 		}
 	}
 
@@ -166,6 +187,7 @@ func (l *LogParserPlugin) receiver(tailer *tail.Tail) {
 
 	var line *tail.Line
 	for line = range tailer.Lines {
+
 		if line.Err != nil {
 			log.Printf("E! Error tailing file %s, Error: %s\n",
 				tailer.Filename, line.Err)
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index 97f33067e..059bfd266 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -1,6 +1,8 @@
 package logparser
 
 import (
+	"io/ioutil"
+	"os"
 	"runtime"
 	"strings"
 	"testing"
@@ -80,6 +82,47 @@ func TestGrokParseLogFiles(t *testing.T) {
 		map[string]string{})
 }
 
+func TestGrokParseLogFilesAppearLater(t *testing.T) {
+	emptydir, err := ioutil.TempDir("", "TestGrokParseLogFilesAppearLater")
+	defer os.RemoveAll(emptydir)
+	assert.NoError(t, err)
+
+	thisdir := getCurrentDir()
+	p := &grok.Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"},
+	}
+
+	logparser := &LogParserPlugin{
+		FromBeginning: true,
+		Files:         []string{emptydir + "/*.log"},
+		GrokParser:    p,
+	}
+
+	acc := testutil.Accumulator{}
+	assert.NoError(t, logparser.Start(&acc))
+
+	time.Sleep(time.Millisecond * 500)
+	assert.Equal(t, acc.NFields(), 0)
+
+	os.Symlink(
+		thisdir+"grok/testdata/test_a.log",
+		emptydir+"/test_a.log")
+	assert.NoError(t, logparser.Gather(&acc))
+	time.Sleep(time.Millisecond * 500)
+
+	logparser.Stop()
+
+	acc.AssertContainsTaggedFields(t, "logparser_grok",
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		map[string]string{"response_code": "200"})
+}
+
 // Test that test_a.log line gets parsed even though we don't have the correct
 // pattern available for test_b.log
 func TestGrokParseLogFilesOneBad(t *testing.T) {

From 32e06a489ddbaac11d4b5f2d98af67d41a804da8 Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Wed, 1 Feb 2017 15:12:35 +0100
Subject: [PATCH 0098/1302] Keep -config-directory when running as Windows
 service (#2330)

* Keep -config-directory when running as Windows service

* Update changelog
---
 CHANGELOG.md             | 2 +-
 cmd/telegraf/telegraf.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e5865e7c..5131f50eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,10 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 ### Features
 
-- [#2141](https://github.com/influxdata/telegraf/pull/2141): Logparser handles newly-created files.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
+- [#2330](https://github.com/influxdata/telegraf/pull/2330): Keep -config-directory when running as Windows service.
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 0f94c6e2c..398617e09 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -327,6 +327,9 @@ func main() {
 			if *fConfig != "" {
 				(*svcConfig).Arguments = []string{"-config", *fConfig}
 			}
+			if *fConfigDirectory != "" {
+				(*svcConfig).Arguments = append((*svcConfig).Arguments, "-config-directory", *fConfigDirectory)
+			}
 			err := service.Control(s, *fService)
 			if err != nil {
 				log.Fatal("E! " + err.Error())

From 9003efc3fa756cb3550e76b9ec494cae21c00a15 Mon Sep 17 00:00:00 2001
From: Len Smith <lrsmith@umich.edu>
Date: Wed, 1 Feb 2017 09:21:08 -0500
Subject: [PATCH 0099/1302] http_response : Add in support for looking for
 substring in response (#2204)

* Add in support for looking for substring in response

* Add note to CHANGELOG.md

* Switch from substring match to regex match

* Requested code changes

* Make requested changes and refactor to avoid nested if-else.

* Convert tabs to space and compile regex once
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/http_response/README.md        |  5 ++
 plugins/inputs/http_response/http_response.go | 51 +++++++++--
 .../http_response/http_response_test.go       | 84 +++++++++++++++++++
 4 files changed, 135 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5131f50eb..e123e33a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ plugins, not just statsd.
 
 ### Features
 
+- [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
 - [#1564](https://github.com/influxdata/telegraf/issues/1564): Use RFC3339 timestamps in log output.
 - [#1997](https://github.com/influxdata/telegraf/issues/1997): Non-default HTTP timeouts for RabbitMQ plugin.
diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index ec873ad2b..01dd09536 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -23,6 +23,11 @@ This input plugin will test HTTP/HTTPS connections.
   # {'fake':'data'}
   # '''
 
+  ## Optional substring or regex match in body of the response
+  ## response_string_match = "\"service_status\": \"up\""
+  ## response_string_match = "ok"
+  ## response_string_match = "\".*_status\".?:.?\"up\""
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 34eadaa4f..111e35518 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -3,8 +3,11 @@ package http_response
 import (
 	"errors"
 	"io"
+	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
+	"regexp"
 	"strings"
 	"time"
 
@@ -15,12 +18,14 @@ import (
 
 // HTTPResponse struct
 type HTTPResponse struct {
-	Address         string
-	Body            string
-	Method          string
-	ResponseTimeout internal.Duration
-	Headers         map[string]string
-	FollowRedirects bool
+	Address             string
+	Body                string
+	Method              string
+	ResponseTimeout     internal.Duration
+	Headers             map[string]string
+	FollowRedirects     bool
+	ResponseStringMatch string
+	compiledStringMatch *regexp.Regexp
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -54,6 +59,11 @@ var sampleConfig = `
   # {'fake':'data'}
   # '''
 
+  ## Optional substring or regex match in body of the response
+  ## response_string_match = "\"service_status\": \"up\""
+  ## response_string_match = "ok"
+  ## response_string_match = "\".*_status\".?:.?\"up\""
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -137,6 +147,35 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 	}
 	fields["response_time"] = time.Since(start).Seconds()
 	fields["http_response_code"] = resp.StatusCode
+
+	// Check the response for a regex match.
+	if h.ResponseStringMatch != "" {
+
+		// Compile once and reuse
+		if h.compiledStringMatch == nil {
+			h.compiledStringMatch = regexp.MustCompile(h.ResponseStringMatch)
+			if err != nil {
+				log.Printf("E! Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
+				fields["response_string_match"] = 0
+				return fields, nil
+			}
+		}
+
+		bodyBytes, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			log.Printf("E! Failed to read body of HTTP Response : %s", err)
+			fields["response_string_match"] = 0
+			return fields, nil
+		}
+
+		if h.compiledStringMatch.Match(bodyBytes) {
+			fields["response_string_match"] = 1
+		} else {
+			fields["response_string_match"] = 0
+		}
+
+	}
+
 	return fields, nil
 }
 
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index f0d0040d6..236e5d88b 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -22,6 +22,9 @@ func setUpTestMux() http.Handler {
 	mux.HandleFunc("/good", func(w http.ResponseWriter, req *http.Request) {
 		fmt.Fprintf(w, "hit the good page!")
 	})
+	mux.HandleFunc("/jsonresponse", func(w http.ResponseWriter, req *http.Request) {
+		fmt.Fprintf(w, "\"service_status\": \"up\", \"healthy\" : \"true\"")
+	})
 	mux.HandleFunc("/badredirect", func(w http.ResponseWriter, req *http.Request) {
 		http.Redirect(w, req, "/badredirect", http.StatusMovedPermanently)
 	})
@@ -236,6 +239,87 @@ func TestBody(t *testing.T) {
 	}
 }
 
+func TestStringMatch(t *testing.T) {
+	mux := setUpTestMux()
+	ts := httptest.NewServer(mux)
+	defer ts.Close()
+
+	h := &HTTPResponse{
+		Address:             ts.URL + "/good",
+		Body:                "{ 'test': 'data'}",
+		Method:              "GET",
+		ResponseStringMatch: "hit the good page",
+		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+		FollowRedirects: true,
+	}
+	fields, err := h.HTTPGather()
+	require.NoError(t, err)
+	assert.NotEmpty(t, fields)
+	if assert.NotNil(t, fields["http_response_code"]) {
+		assert.Equal(t, http.StatusOK, fields["http_response_code"])
+	}
+	assert.Equal(t, 1, fields["response_string_match"])
+	assert.NotNil(t, fields["response_time"])
+
+}
+
+func TestStringMatchJson(t *testing.T) {
+	mux := setUpTestMux()
+	ts := httptest.NewServer(mux)
+	defer ts.Close()
+
+	h := &HTTPResponse{
+		Address:             ts.URL + "/jsonresponse",
+		Body:                "{ 'test': 'data'}",
+		Method:              "GET",
+		ResponseStringMatch: "\"service_status\": \"up\"",
+		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+		FollowRedirects: true,
+	}
+	fields, err := h.HTTPGather()
+	require.NoError(t, err)
+	assert.NotEmpty(t, fields)
+	if assert.NotNil(t, fields["http_response_code"]) {
+		assert.Equal(t, http.StatusOK, fields["http_response_code"])
+	}
+	assert.Equal(t, 1, fields["response_string_match"])
+	assert.NotNil(t, fields["response_time"])
+
+}
+
+func TestStringMatchFail(t *testing.T) {
+	mux := setUpTestMux()
+	ts := httptest.NewServer(mux)
+	defer ts.Close()
+
+	h := &HTTPResponse{
+		Address:             ts.URL + "/good",
+		Body:                "{ 'test': 'data'}",
+		Method:              "GET",
+		ResponseStringMatch: "hit the bad page",
+		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+		FollowRedirects: true,
+	}
+	fields, err := h.HTTPGather()
+	require.NoError(t, err)
+	assert.NotEmpty(t, fields)
+	if assert.NotNil(t, fields["http_response_code"]) {
+		assert.Equal(t, http.StatusOK, fields["http_response_code"])
+	}
+	assert.Equal(t, 0, fields["response_string_match"])
+	assert.NotNil(t, fields["response_time"])
+
+}
+
 func TestTimeout(t *testing.T) {
 	mux := setUpTestMux()
 	ts := httptest.NewServer(mux)

From aeb849d74464a48d870f47a86137a308d24ada08 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 14:22:31 +0000
Subject: [PATCH 0100/1302] changelog fix

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e123e33a7..9834fe1a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 ### Features
 
+- [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
@@ -54,7 +55,6 @@ plugins, not just statsd.
 
 ### Features
 
-- [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
 - [#1564](https://github.com/influxdata/telegraf/issues/1564): Use RFC3339 timestamps in log output.
 - [#1997](https://github.com/influxdata/telegraf/issues/1997): Non-default HTTP timeouts for RabbitMQ plugin.

From 07a622393232881f8289b25b4b32e9897e406af2 Mon Sep 17 00:00:00 2001
From: ldep30 <dludo59@gmail.com>
Date: Wed, 1 Feb 2017 15:37:18 +0100
Subject: [PATCH 0101/1302] Add lock option to the IPtables input plugin
 (#2201)

* Update README.md

* Add lock support to the IPtables input plugin

* Update iptables.go

Doc cleaning
---
 plugins/inputs/iptables/README.md   |  6 ++++++
 plugins/inputs/iptables/iptables.go | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/iptables/README.md b/plugins/inputs/iptables/README.md
index f5ebd4780..a711f1d4e 100644
--- a/plugins/inputs/iptables/README.md
+++ b/plugins/inputs/iptables/README.md
@@ -30,11 +30,17 @@ You may edit your sudo configuration with the following:
 telegraf ALL=(root) NOPASSWD: /usr/bin/iptables -nvL *
 ```
 
+### Using IPtables lock feature
+
+Defining multiple instances of this plugin in telegraf.conf can lead to concurrent IPtables access resulting in "ERROR in input [inputs.iptables]: exit status 4" messages in telegraf.log and missing metrics. Setting 'use_lock = true' in the plugin configuration will run IPtables with the '-w' switch, allowing a lock usage to prevent this error.
+
 ### Configuration:
 
 ```toml
   # use sudo to run iptables
   use_sudo = false
+  # run iptables with the lock option
+  use_lock = false
   # defines the table to monitor:
   table = "filter"
   # defines the chains to monitor:
diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index 4ceb45230..31b049d9f 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -16,6 +16,7 @@ import (
 // Iptables is a telegraf plugin to gather packets and bytes throughput from Linux's iptables packet filter.
 type Iptables struct {
 	UseSudo bool
+	UseLock bool
 	Table   string
 	Chains  []string
 	lister  chainLister
@@ -32,8 +33,11 @@ func (ipt *Iptables) SampleConfig() string {
   ## iptables require root access on most systems.
   ## Setting 'use_sudo' to true will make use of sudo to run iptables.
   ## Users must configure sudo to allow telegraf user to run iptables with no password.
-  ## iptables can be restricted to only list command  "iptables -nvL"
+  ## iptables can be restricted to only list command "iptables -nvL"
   use_sudo = false
+  ## Setting 'use_lock' to true runs iptables with the "-w" option.
+  ## Adjust your sudo settings appropriately if using this option ("iptables -wnvl")
+  use_lock = false
   ## defines the table to monitor:
   table = "filter"
   ## defines the chains to monitor:
@@ -75,7 +79,11 @@ func (ipt *Iptables) chainList(table, chain string) (string, error) {
 		name = "sudo"
 		args = append(args, iptablePath)
 	}
-	args = append(args, "-nvL", chain, "-t", table, "-x")
+	iptablesBaseArgs := "-nvL"
+	if ipt.UseLock {
+		iptablesBaseArgs = "-wnvL"
+	}
+	args = append(args, iptablesBaseArgs, chain, "-t", table, "-x")
 	c := exec.Command(name, args...)
 	out, err := c.Output()
 	return string(out), err

From c528c53e5b1244aca9ba2df2ef66807924a19153 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 14:39:08 +0000
Subject: [PATCH 0102/1302] iptables changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9834fe1a7..81b92976a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
+- [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
 
 ### Bugfixes
 

From eafd1dcc7ca88b7a6b36de735be3bb5ae28459bd Mon Sep 17 00:00:00 2001
From: James Gregory <james@jagregory.com>
Date: Thu, 2 Feb 2017 01:41:04 +1100
Subject: [PATCH 0103/1302] Kubernetes input: Handle null startTime for stopped
 pods (#2335)

---
 .../inputs/kubernetes/kubernetes_metrics.go   |  2 +-
 plugins/inputs/kubernetes/kubernetes_test.go  | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/kubernetes/kubernetes_metrics.go b/plugins/inputs/kubernetes/kubernetes_metrics.go
index a767a604a..96814bcbe 100644
--- a/plugins/inputs/kubernetes/kubernetes_metrics.go
+++ b/plugins/inputs/kubernetes/kubernetes_metrics.go
@@ -45,7 +45,7 @@ type CPUMetrics struct {
 // PodMetrics contains metric data on a given pod
 type PodMetrics struct {
 	PodRef     PodReference       `json:"podRef"`
-	StartTime  time.Time          `json:"startTime"`
+	StartTime  *time.Time         `json:"startTime"`
 	Containers []ContainerMetrics `json:"containers"`
 	Network    NetworkMetrics     `json:"network"`
 	Volumes    []VolumeMetrics    `json:"volume"`
diff --git a/plugins/inputs/kubernetes/kubernetes_test.go b/plugins/inputs/kubernetes/kubernetes_test.go
index 14134c150..528299be1 100644
--- a/plugins/inputs/kubernetes/kubernetes_test.go
+++ b/plugins/inputs/kubernetes/kubernetes_test.go
@@ -92,6 +92,29 @@ func TestKubernetesStats(t *testing.T) {
 	}
 	acc.AssertContainsTaggedFields(t, "kubernetes_pod_container", fields, tags)
 
+	fields = map[string]interface{}{
+		"cpu_usage_nanocores":        int64(846503),
+		"cpu_usage_core_nanoseconds": int64(56507553554),
+		"memory_usage_bytes":         int64(0),
+		"memory_working_set_bytes":   int64(0),
+		"memory_rss_bytes":           int64(0),
+		"memory_page_faults":         int64(0),
+		"memory_major_page_faults":   int64(0),
+		"rootfs_available_bytes":     int64(0),
+		"rootfs_capacity_bytes":      int64(0),
+		"rootfs_used_bytes":          int64(0),
+		"logsfs_avaialble_bytes":     int64(0),
+		"logsfs_capacity_bytes":      int64(0),
+		"logsfs_used_bytes":          int64(0),
+	}
+	tags = map[string]string{
+		"node_name":      "node1",
+		"container_name": "stopped-container",
+		"namespace":      "foons",
+		"pod_name":       "stopped-pod",
+	}
+	acc.AssertContainsTaggedFields(t, "kubernetes_pod_container", fields, tags)
+
 	fields = map[string]interface{}{
 		"available_bytes": int64(7903948800),
 		"capacity_bytes":  int64(7903961088),
@@ -284,6 +307,25 @@ var response = `
       "name": "volume4"
      }
     ]
+   },
+   {
+    "podRef": {
+     "name": "stopped-pod",
+     "namespace": "foons",
+     "uid": "da7c1865-d67d-4688-b679-c485ed44b2aa"
+    },
+    "startTime": null,
+    "containers": [
+     {
+      "name": "stopped-container",
+      "startTime": "2016-09-26T18:46:43Z",
+      "cpu": {
+       "time": "2016-09-27T16:57:32Z",
+       "usageNanoCores": 846503,
+       "usageCoreNanoSeconds": 56507553554
+      }
+     }
+    ]
    }
   ]
  }`

From 97050e9669e4067ce5ceb2faca1a5bde495f75e9 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 14:41:53 +0000
Subject: [PATCH 0104/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81b92976a..a7c7cde15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
+- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods
 
 ## v1.2.1 [2017-02-01]
 

From c0bbde03eae6965fc54af25f64958e90a2391961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vizcaino?=
 <j-vizcaino@users.noreply.github.com>
Date: Wed, 1 Feb 2017 15:47:23 +0100
Subject: [PATCH 0105/1302] Ceph: represent pgmap states using tags (#2229)

* ceph: maps are already refs, no need to use a pointer

* ceph: pgmap_states are represented in a single metric "count", differenciated by tag

* Update CHANGELOG
---
 CHANGELOG.md                     |  19 ++++
 plugins/inputs/ceph/README.md    |   7 +-
 plugins/inputs/ceph/ceph.go      |  88 +++++++++--------
 plugins/inputs/ceph/ceph_test.go | 161 +++++++++++++++++++++++++++++--
 4 files changed, 228 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7c7cde15..aa0ae6056 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 ### Release Notes
 
+- Ceph: the `ceph_pgmap_state` metric content has been modified to use a unique field `count`, with each state expressed as a `state` tag.
+
+Telegraf < 1.3:
+
+```
+# field_name             value
+active+clean             123
+active+clean+scrubbing   3
+```
+
+Telegraf >= 1.3:
+
+```
+# field_name    value       tag
+count           123         state=active+clean
+count           3           state=active+clean+scrubbing
+```
+
 - The [Riemann output plugin](./plugins/outputs/riemann) has been rewritten
 and the previous riemann plugin is _incompatible_ with the new one. The reasons
 for this are outlined in issue [#1878](https://github.com/influxdata/telegraf/issues/1878).
@@ -14,6 +32,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
+- [#2229](https://github.com/influxdata/telegraf/pull/2229): `ceph_pgmap_state` metric now uses a single field `count`, with PG state published as `state` tag. 
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
 - [#2330](https://github.com/influxdata/telegraf/pull/2330): Keep -config-directory when running as Windows service.
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
diff --git a/plugins/inputs/ceph/README.md b/plugins/inputs/ceph/README.md
index b3bba1e50..771ec665b 100644
--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -117,7 +117,7 @@ All fields are collected under the **ceph** measurement and stored as float64s.
   * recovering\_objects\_per\_sec (float)
 
 * ceph\_pgmap\_state
-  * state name e.g. active+clean (float)
+  * count (float)
 
 * ceph\_usage
   * bytes\_used (float)
@@ -186,7 +186,7 @@ All measurements will have the following tags:
 
 *Cluster Stats*
 
-* ceph\_pg\_state has the following tags:
+* ceph\_pgmap\_state has the following tags:
   * state (state for which the value applies e.g. active+clean, active+remapped+backfill)
 * ceph\_pool\_usage has the following tags:
   * id
@@ -213,7 +213,8 @@ telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegr
 <pre>
 > ceph_osdmap,host=ceph-mon-0 epoch=170772,full=false,nearfull=false,num_in_osds=340,num_osds=340,num_remapped_pgs=0,num_up_osds=340 1468841037000000000
 > ceph_pgmap,host=ceph-mon-0 bytes_avail=634895531270144,bytes_total=812117151809536,bytes_used=177221620539392,data_bytes=56979991615058,num_pgs=22952,op_per_sec=15869,read_bytes_sec=43956026,version=39387592,write_bytes_sec=165344818 1468841037000000000
-> ceph_pgmap_state,host=ceph-mon-0 active+clean=22952 1468928660000000000
+> ceph_pgmap_state,host=ceph-mon-0,state=active+clean count=22952 1468928660000000000
+> ceph_pgmap_state,host=ceph-mon-0,state=active+degraded count=16 1468928660000000000
 > ceph_usage,host=ceph-mon-0 total_avail_bytes=634895514791936,total_bytes=812117151809536,total_used_bytes=177221637017600 1468841037000000000
 > ceph_pool_usage,host=ceph-mon-0,id=150,name=cinder.volumes bytes_used=12648553794802,kb_used=12352103316,max_avail=154342562489244,objects=3026295 1468841037000000000
 > ceph_pool_usage,host=ceph-mon-0,id=182,name=cinder.volumes.flash bytes_used=8541308223964,kb_used=8341121313,max_avail=39388593563936,objects=2075066 1468841037000000000
diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go
index e43c3d7d3..7c03b6262 100644
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"log"
 	"os/exec"
 	"path/filepath"
 	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const (
@@ -108,7 +109,7 @@ func (c *Ceph) gatherAdminSocketStats(acc telegraf.Accumulator) error {
 			log.Printf("E! error parsing dump from socket '%s': %v", s.socket, err)
 			continue
 		}
-		for tag, metrics := range *data {
+		for tag, metrics := range data {
 			acc.AddFields(measurement,
 				map[string]interface{}(metrics),
 				map[string]string{"type": s.sockType, "id": s.sockId, "collection": tag})
@@ -244,25 +245,19 @@ type taggedMetricMap map[string]metricMap
 
 // Parses a raw JSON string into a taggedMetricMap
 // Delegates the actual parsing to newTaggedMetricMap(..)
-func parseDump(dump string) (*taggedMetricMap, error) {
+func parseDump(dump string) (taggedMetricMap, error) {
 	data := make(map[string]interface{})
 	err := json.Unmarshal([]byte(dump), &data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse json: '%s': %v", dump, err)
 	}
 
-	tmm := newTaggedMetricMap(data)
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to tag dataset: '%v': %v", tmm, err)
-	}
-
-	return tmm, nil
+	return newTaggedMetricMap(data), nil
 }
 
 // Builds a TaggedMetricMap out of a generic string map.
 // The top-level key is used as a tag and all sub-keys are flattened into metrics
-func newTaggedMetricMap(data map[string]interface{}) *taggedMetricMap {
+func newTaggedMetricMap(data map[string]interface{}) taggedMetricMap {
 	tmm := make(taggedMetricMap)
 	for tag, datapoints := range data {
 		mm := make(metricMap)
@@ -271,7 +266,7 @@ func newTaggedMetricMap(data map[string]interface{}) *taggedMetricMap {
 		}
 		tmm[tag] = mm
 	}
-	return &tmm
+	return tmm
 }
 
 // Recursively flattens any k-v hierarchy present in data.
@@ -376,36 +371,53 @@ func decodeStatusPgmap(acc telegraf.Accumulator, data map[string]interface{}) er
 	return nil
 }
 
-func decodeStatusPgmapState(acc telegraf.Accumulator, data map[string]interface{}) error {
+func extractPgmapStates(data map[string]interface{}) ([]interface{}, error) {
+	const key = "pgs_by_state"
+
 	pgmap, ok := data["pgmap"].(map[string]interface{})
 	if !ok {
-		return fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
+		return nil, fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
 	}
-	fields := make(map[string]interface{})
-	for key, value := range pgmap {
-		switch value.(type) {
-		case []interface{}:
-			if key != "pgs_by_state" {
-				continue
-			}
-			for _, state := range value.([]interface{}) {
-				state_map, ok := state.(map[string]interface{})
-				if !ok {
-					return fmt.Errorf("WARNING %s - unable to decode pg state", measurement)
-				}
-				state_name, ok := state_map["state_name"].(string)
-				if !ok {
-					return fmt.Errorf("WARNING %s - unable to decode pg state name", measurement)
-				}
-				state_count, ok := state_map["count"].(float64)
-				if !ok {
-					return fmt.Errorf("WARNING %s - unable to decode pg state count", measurement)
-				}
-				fields[state_name] = state_count
-			}
+
+	s, ok := pgmap[key]
+	if !ok {
+		return nil, fmt.Errorf("WARNING %s - pgmap is missing the %s field", measurement, key)
+	}
+
+	states, ok := s.([]interface{})
+	if !ok {
+		return nil, fmt.Errorf("WARNING %s - pgmap[%s] is not a list", measurement, key)
+	}
+	return states, nil
+}
+
+func decodeStatusPgmapState(acc telegraf.Accumulator, data map[string]interface{}) error {
+	states, err := extractPgmapStates(data)
+	if err != nil {
+		return err
+	}
+	for _, state := range states {
+		stateMap, ok := state.(map[string]interface{})
+		if !ok {
+			return fmt.Errorf("WARNING %s - unable to decode pg state", measurement)
 		}
+		stateName, ok := stateMap["state_name"].(string)
+		if !ok {
+			return fmt.Errorf("WARNING %s - unable to decode pg state name", measurement)
+		}
+		stateCount, ok := stateMap["count"].(float64)
+		if !ok {
+			return fmt.Errorf("WARNING %s - unable to decode pg state count", measurement)
+		}
+
+		tags := map[string]string{
+			"state": stateName,
+		}
+		fields := map[string]interface{}{
+			"count": stateCount,
+		}
+		acc.AddFields("ceph_pgmap_state", fields, tags)
 	}
-	acc.AddFields("ceph_pgmap_state", fields, map[string]string{})
 	return nil
 }
 
diff --git a/plugins/inputs/ceph/ceph_test.go b/plugins/inputs/ceph/ceph_test.go
index f7b17ece3..4a75acd15 100644
--- a/plugins/inputs/ceph/ceph_test.go
+++ b/plugins/inputs/ceph/ceph_test.go
@@ -1,15 +1,17 @@
 package ceph
 
 import (
+	"encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
 )
 
 const (
@@ -24,15 +26,38 @@ func TestParseSockId(t *testing.T) {
 func TestParseMonDump(t *testing.T) {
 	dump, err := parseDump(monPerfDump)
 	assert.NoError(t, err)
-	assert.InEpsilon(t, 5678670180, (*dump)["cluster"]["osd_kb_used"], epsilon)
-	assert.InEpsilon(t, 6866.540527000, (*dump)["paxos"]["store_state_latency.sum"], epsilon)
+	assert.InEpsilon(t, 5678670180, dump["cluster"]["osd_kb_used"], epsilon)
+	assert.InEpsilon(t, 6866.540527000, dump["paxos"]["store_state_latency.sum"], epsilon)
 }
 
 func TestParseOsdDump(t *testing.T) {
 	dump, err := parseDump(osdPerfDump)
 	assert.NoError(t, err)
-	assert.InEpsilon(t, 552132.109360000, (*dump)["filestore"]["commitcycle_interval.sum"], epsilon)
-	assert.Equal(t, float64(0), (*dump)["mutex-FileJournal::finisher_lock"]["wait.avgcount"])
+	assert.InEpsilon(t, 552132.109360000, dump["filestore"]["commitcycle_interval.sum"], epsilon)
+	assert.Equal(t, float64(0), dump["mutex-FileJournal::finisher_lock"]["wait.avgcount"])
+}
+
+func TestDecodeStatusPgmapState(t *testing.T) {
+	data := make(map[string]interface{})
+	err := json.Unmarshal([]byte(clusterStatusDump), &data)
+	assert.NoError(t, err)
+
+	acc := &testutil.Accumulator{}
+	err = decodeStatusPgmapState(acc, data)
+	assert.NoError(t, err)
+
+	var results = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{map[string]interface{}{"count": float64(2560)}, map[string]string{"state": "active+clean"}},
+		{map[string]interface{}{"count": float64(10)}, map[string]string{"state": "active+scrubbing"}},
+		{map[string]interface{}{"count": float64(5)}, map[string]string{"state": "active+backfilling"}},
+	}
+
+	for _, r := range results {
+		acc.AssertContainsTaggedFields(t, "ceph_pgmap_state", r.fields, r.tags)
+	}
 }
 
 func TestGather(t *testing.T) {
@@ -685,3 +710,127 @@ var osdPerfDump = `
       "wait": { "avgcount": 0,
           "sum": 0.000000000}}}
 `
+var clusterStatusDump = `
+{
+  "health": {
+    "health": {
+      "health_services": [
+        {
+          "mons": [
+            {
+              "name": "a",
+              "kb_total": 114289256,
+              "kb_used": 26995516,
+              "kb_avail": 81465132,
+              "avail_percent": 71,
+              "last_updated": "2017-01-03 17:20:57.595004",
+              "store_stats": {
+                "bytes_total": 942117141,
+                "bytes_sst": 0,
+                "bytes_log": 4345406,
+                "bytes_misc": 937771735,
+                "last_updated": "0.000000"
+              },
+              "health": "HEALTH_OK"
+            },
+            {
+              "name": "b",
+              "kb_total": 114289256,
+              "kb_used": 27871624,
+              "kb_avail": 80589024,
+              "avail_percent": 70,
+              "last_updated": "2017-01-03 17:20:47.784331",
+              "store_stats": {
+                "bytes_total": 454853104,
+                "bytes_sst": 0,
+                "bytes_log": 5788320,
+                "bytes_misc": 449064784,
+                "last_updated": "0.000000"
+              },
+              "health": "HEALTH_OK"
+            },
+            {
+              "name": "c",
+              "kb_total": 130258508,
+              "kb_used": 38076996,
+              "kb_avail": 85541692,
+              "avail_percent": 65,
+              "last_updated": "2017-01-03 17:21:03.311123",
+              "store_stats": {
+                "bytes_total": 455555199,
+                "bytes_sst": 0,
+                "bytes_log": 6950876,
+                "bytes_misc": 448604323,
+                "last_updated": "0.000000"
+              },
+              "health": "HEALTH_OK"
+            }
+          ]
+        }
+      ]
+    },
+    "timechecks": {
+      "epoch": 504,
+      "round": 34642,
+      "round_status": "finished",
+      "mons": [
+        { "name": "a", "skew": 0, "latency": 0, "health": "HEALTH_OK" },
+        { "name": "b", "skew": -0, "latency": 0.000951, "health": "HEALTH_OK" },
+        { "name": "c", "skew": -0, "latency": 0.000946, "health": "HEALTH_OK" }
+      ]
+    },
+    "summary": [],
+    "overall_status": "HEALTH_OK",
+    "detail": []
+  },
+  "fsid": "01234567-abcd-9876-0123-ffeeddccbbaa",
+  "election_epoch": 504,
+  "quorum": [ 0, 1, 2 ],
+  "quorum_names": [ "a", "b", "c" ],
+  "monmap": {
+    "epoch": 17,
+    "fsid": "01234567-abcd-9876-0123-ffeeddccbbaa",
+    "modified": "2016-04-11 14:01:52.600198",
+    "created": "0.000000",
+    "mons": [
+      { "rank": 0, "name": "a", "addr": "192.168.0.1:6789/0" },
+      { "rank": 1, "name": "b", "addr": "192.168.0.2:6789/0" },
+      { "rank": 2, "name": "c", "addr": "192.168.0.3:6789/0" }
+    ]
+  },
+  "osdmap": {
+    "osdmap": {
+      "epoch": 21734,
+      "num_osds": 24,
+      "num_up_osds": 24,
+      "num_in_osds": 24,
+      "full": false,
+      "nearfull": false,
+      "num_remapped_pgs": 0
+    }
+  },
+  "pgmap": {
+    "pgs_by_state": [
+      { "state_name": "active+clean", "count": 2560 },
+      { "state_name": "active+scrubbing", "count": 10 },
+      { "state_name": "active+backfilling", "count": 5 }
+    ],
+    "version": 52314277,
+    "num_pgs": 2560,
+    "data_bytes": 2700031960713,
+    "bytes_used": 7478347665408,
+    "bytes_avail": 9857462382592,
+    "bytes_total": 17335810048000,
+    "read_bytes_sec": 0,
+    "write_bytes_sec": 367217,
+    "op_per_sec": 98
+  },
+  "mdsmap": {
+    "epoch": 1,
+    "up": 0,
+    "in": 0,
+    "max": 0,
+    "by_rank": []
+  }
+}
+`

From 3f224a15d56ab90e79dadcabb0cda1b8ddfeaf1e Mon Sep 17 00:00:00 2001
From: Nathan Haugo <nhaugo@gmail.com>
Date: Wed, 1 Feb 2017 13:23:45 -0800
Subject: [PATCH 0106/1302] Update readme to link to k8s plugin (#2355)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 29892426c..f8a465591 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,7 @@ configuration options.
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
 * [jolokia](./plugins/inputs/jolokia)
+* [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
 * [lustre2](./plugins/inputs/lustre2)
 * [mailchimp](./plugins/inputs/mailchimp)

From f7d551a807a06731b79d68888a162c45f898d4af Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 22:43:23 +0000
Subject: [PATCH 0107/1302] Add more nested globpath tests

---
 internal/globpath/globpath_test.go                   | 12 +++++++++++-
 .../globpath/testdata/nested1/nested2/nested.txt     |  0
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 internal/globpath/testdata/nested1/nested2/nested.txt

diff --git a/internal/globpath/globpath_test.go b/internal/globpath/globpath_test.go
index db72c94f4..720572411 100644
--- a/internal/globpath/globpath_test.go
+++ b/internal/globpath/globpath_test.go
@@ -28,7 +28,7 @@ func TestCompileAndMatch(t *testing.T) {
 	require.NoError(t, err)
 
 	matches := g1.Match()
-	assert.Len(t, matches, 3)
+	assert.Len(t, matches, 6)
 	matches = g2.Match()
 	assert.Len(t, matches, 2)
 	matches = g3.Match()
@@ -56,6 +56,16 @@ func TestFindRootDir(t *testing.T) {
 	}
 }
 
+func TestFindNestedTextFile(t *testing.T) {
+	dir := getTestdataDir()
+	// test super asterisk
+	g1, err := Compile(dir + "/**.txt")
+	require.NoError(t, err)
+
+	matches := g1.Match()
+	assert.Len(t, matches, 1)
+}
+
 func getTestdataDir() string {
 	_, filename, _, _ := runtime.Caller(1)
 	return strings.Replace(filename, "globpath_test.go", "testdata", 1)
diff --git a/internal/globpath/testdata/nested1/nested2/nested.txt b/internal/globpath/testdata/nested1/nested2/nested.txt
new file mode 100644
index 000000000..e69de29bb

From 285be648c4c23159d40b4cf756bf786f2304653a Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 16:18:39 +0000
Subject: [PATCH 0108/1302] Godeps update

closes #2356
---
 CHANGELOG.md                         |   5 +-
 Godeps                               | 110 ++++++++++++++-------------
 metric/metric_test.go                |   3 +-
 plugins/inputs/docker/docker_test.go |   1 -
 plugins/outputs/kafka/kafka.go       |   1 +
 5 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa0ae6056..1f377a98c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
-- [#2229](https://github.com/influxdata/telegraf/pull/2229): `ceph_pgmap_state` metric now uses a single field `count`, with PG state published as `state` tag. 
+- [#2229](https://github.com/influxdata/telegraf/pull/2229): `ceph_pgmap_state` metric now uses a single field `count`, with PG state published as `state` tag.
 - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations.
 - [#2330](https://github.com/influxdata/telegraf/pull/2330): Keep -config-directory when running as Windows service.
 - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite.
@@ -44,7 +44,8 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
-- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods
+- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
+- [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/Godeps b/Godeps
index c033159c3..5443c1039 100644
--- a/Godeps
+++ b/Godeps
@@ -1,65 +1,67 @@
-github.com/Shopify/sarama 8aadb476e66ca998f2f6bb3c993e9a2daa3666b9
-github.com/Sirupsen/logrus 219c8cb75c258c552e999735be6df753ffc7afdc
-github.com/aerospike/aerospike-client-go 7f3a312c3b2a60ac083ec6da296091c52c795c63
+github.com/Shopify/sarama 574d3147eee384229bf96a5d12c207fe7b5234f3
+github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
+github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/aws/aws-sdk-go 13a12060f716145019378a10e2806c174356b857
-github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4
-github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99
-github.com/couchbase/go-couchbase cb664315a324d87d19c879d9cc67fda6be8c2ac1
-github.com/couchbase/gomemcached a5ea6356f648fec6ab89add00edd09151455b4b2
+github.com/aws/aws-sdk-go 7524cb911daddd6e5c9195def8e59ae892bef8d9
+github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
+github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
+github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
-github.com/dancannon/gorethink e7cac92ea2bc52638791a021f212145acfedb1fc
-github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
-github.com/docker/engine-api 8924d6900370b4c7e7984be5adc61f50a80d7537
-github.com/docker/go-connections f549a9393d05688dff0992ef3efd8bbe6c628aeb
-github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444
+github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
+github.com/docker/distribution fb0bebc4b64e3881cc52a2478d749845ed76d2a8
+github.com/docker/engine-api 4290f40c056686fcaa5c9caf02eac1dde9315adf
+github.com/docker/go-connections 9670439d95da2651d9dfc7acc5d2ed92d3f25ee6
+github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
-github.com/eclipse/paho.mqtt.golang 0f7a459f04f13a41b7ed752d47944528d4bf9a86
-github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
-github.com/gobwas/glob 49571a1557cd20e6a2410adc6421f85b66c730b5
-github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
-github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380
-github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a
-github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e
+github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
+github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
+github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
+github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
+github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
+github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
+github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
+github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 5aa90455ce78d4d41578bafc86305e6e6b28d7d2
-github.com/hpcloud/tail b2940955ab8b26e19d43a43c4da0475dd81bdb56
-github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
-github.com/influxdata/influxdb fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae
-github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
+github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
+github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
+github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92
+github.com/influxdata/influxdb 2fe8ed308439a98a9b01943939b44048ed952c90
+github.com/influxdata/toml ad49a5c2936f96b8f5943c3fdba47630ccf45a0d
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
-github.com/kardianos/service 5e335590050d6d00f3aa270217d288dda1c94d0a
+github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
+github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
+github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
-github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
-github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
-github.com/miekg/dns cce6c130cdb92c752850880fd285bea1d64439dd
-github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504
+github.com/klauspost/crc32 cb6bfca970f6908083f26f39a79009d608efd5cd
+github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
+github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/nats-io/nats ea8b4fd12ebb823073c0004b9f09ac8748f4f165
-github.com/nats-io/nuid a5152d67cf63cbfb5d992a395458722a45194715
-github.com/nsqio/go-nsq 0b80d6f05e15ca1930e0c5e1d540ed627e299980
-github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-github.com/prometheus/client_golang 18acf9993a863f4c4b40612e19cdd243e7c86831
+github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
+github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
+github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
+github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
+github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
+github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
+github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
 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 1516eb9ddc5e61ba58874047a98f8b44b5e585e8
-github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26
-github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
-github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
+github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
+github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
+github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
+github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
+github.com/shirou/gopsutil 77b5d0080adb6f028e457906f1944d9fcca34442
+github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
+github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
+github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8
-github.com/yuin/gopher-lua bf3808abd44b1e55143a2d7f08571aaa80db1808
+github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
+github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
-golang.org/x/crypto c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6
-golang.org/x/net 6acef71eb69611914f7a30939ea9f6e194c78172
-golang.org/x/text a71fd10341b064c10f4a81ceac72bcf70f26ea34
-gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef
-gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715
-gopkg.in/mgo.v2 d90005c5262a3463800497ea5a89aed5fe22c886
-gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4
-github.com/jackc/pgx bb73d8427902891bbad7b949b9c60b32949d935f
+golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
+golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
+golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
+gopkg.in/dancannon/gorethink.v1 edc7a6a68e2d8015f5ffe1b2560eed989f8a45be
+gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
+gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
+gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/metric/metric_test.go b/metric/metric_test.go
index f209dc3e4..65b4b0fba 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -608,9 +608,10 @@ func TestNewMetricPoint(t *testing.T) {
 	assert.NoError(t, err)
 
 	p := m.Point()
+	pfields, _ := p.Fields()
 
 	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, fields, p.Fields())
+	assert.Equal(t, fields, pfields)
 	assert.Equal(t, "cpu", p.Name())
 }
 
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index a60203af5..cc0ada3c4 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -273,7 +273,6 @@ func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) {
 		Name:               "absol",
 		SwapLimit:          false,
 		IPv4Forwarding:     true,
-		ExecutionDriver:    "native-0.2",
 		ExperimentalBuild:  false,
 		CPUCfsPeriod:       true,
 		RegistryConfig: &registry.ServiceConfig{
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 0bec92812..3815f5726 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -109,6 +109,7 @@ func (k *Kafka) Connect() error {
 	config.Producer.RequiredAcks = sarama.RequiredAcks(k.RequiredAcks)
 	config.Producer.Compression = sarama.CompressionCodec(k.CompressionCodec)
 	config.Producer.Retry.Max = k.MaxRetry
+	config.Producer.Return.Successes = true
 
 	// Legacy support ssl config
 	if k.Certificate != "" {

From dfba3ff37a33da2c7286801b4a2b7ca8b8731c79 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Feb 2017 17:14:47 +0000
Subject: [PATCH 0109/1302] fix telegraf swallowing panics in --test mode

this defer function was causing telegraf to call os.Exit(0) instead of
panicking when it was supposed to.

closes #2341
---
 CHANGELOG.md             |   1 +
 cmd/telegraf/telegraf.go | 193 +++++++++++++++++++++------------------
 2 files changed, 105 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f377a98c..87748d2bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
+- [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 398617e09..a3631d38a 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -109,94 +109,17 @@ Examples:
 
 var stop chan struct{}
 
-var srvc service.Service
-
-type program struct{}
-
-func reloadLoop(stop chan struct{}, s service.Service) {
-	defer func() {
-		if service.Interactive() {
-			os.Exit(0)
-		}
-		return
-	}()
+func reloadLoop(
+	stop chan struct{},
+	inputFilters []string,
+	outputFilters []string,
+	aggregatorFilters []string,
+	processorFilters []string,
+) {
 	reload := make(chan bool, 1)
 	reload <- true
 	for <-reload {
 		reload <- false
-		flag.Parse()
-		args := flag.Args()
-
-		var inputFilters []string
-		if *fInputFilters != "" {
-			inputFilter := strings.TrimSpace(*fInputFilters)
-			inputFilters = strings.Split(":"+inputFilter+":", ":")
-		}
-		var outputFilters []string
-		if *fOutputFilters != "" {
-			outputFilter := strings.TrimSpace(*fOutputFilters)
-			outputFilters = strings.Split(":"+outputFilter+":", ":")
-		}
-		var aggregatorFilters []string
-		if *fAggregatorFilters != "" {
-			aggregatorFilter := strings.TrimSpace(*fAggregatorFilters)
-			aggregatorFilters = strings.Split(":"+aggregatorFilter+":", ":")
-		}
-		var processorFilters []string
-		if *fProcessorFilters != "" {
-			processorFilter := strings.TrimSpace(*fProcessorFilters)
-			processorFilters = strings.Split(":"+processorFilter+":", ":")
-		}
-
-		if len(args) > 0 {
-			switch args[0] {
-			case "version":
-				fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
-				return
-			case "config":
-				config.PrintSampleConfig(
-					inputFilters,
-					outputFilters,
-					aggregatorFilters,
-					processorFilters,
-				)
-				return
-			}
-		}
-
-		// switch for flags which just do something and exit immediately
-		switch {
-		case *fOutputList:
-			fmt.Println("Available Output Plugins:")
-			for k, _ := range outputs.Outputs {
-				fmt.Printf("  %s\n", k)
-			}
-			return
-		case *fInputList:
-			fmt.Println("Available Input Plugins:")
-			for k, _ := range inputs.Inputs {
-				fmt.Printf("  %s\n", k)
-			}
-			return
-		case *fVersion:
-			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
-			return
-		case *fSampleConfig:
-			config.PrintSampleConfig(
-				inputFilters,
-				outputFilters,
-				aggregatorFilters,
-				processorFilters,
-			)
-			return
-		case *fUsage != "":
-			if err := config.PrintInputConfig(*fUsage); err != nil {
-				if err2 := config.PrintOutputConfig(*fUsage); err2 != nil {
-					log.Fatalf("E! %s and %s", err, err2)
-				}
-			}
-			return
-		}
 
 		// If no other options are specified, load the config file and run.
 		c := config.NewConfig()
@@ -237,7 +160,7 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 			if err != nil {
 				log.Fatal("E! " + err.Error())
 			}
-			return
+			os.Exit(0)
 		}
 
 		err = ag.Connect()
@@ -290,14 +213,26 @@ func usageExit(rc int) {
 	os.Exit(rc)
 }
 
+type program struct {
+	inputFilters      []string
+	outputFilters     []string
+	aggregatorFilters []string
+	processorFilters  []string
+}
+
 func (p *program) Start(s service.Service) error {
-	srvc = s
 	go p.run()
 	return nil
 }
 func (p *program) run() {
 	stop = make(chan struct{})
-	reloadLoop(stop, srvc)
+	reloadLoop(
+		stop,
+		p.inputFilters,
+		p.outputFilters,
+		p.aggregatorFilters,
+		p.processorFilters,
+	)
 }
 func (p *program) Stop(s service.Service) error {
 	close(stop)
@@ -307,6 +242,74 @@ func (p *program) Stop(s service.Service) error {
 func main() {
 	flag.Usage = func() { usageExit(0) }
 	flag.Parse()
+	args := flag.Args()
+
+	inputFilters, outputFilters := []string{}, []string{}
+	if *fInputFilters != "" {
+		inputFilters = strings.Split(":"+strings.TrimSpace(*fInputFilters)+":", ":")
+	}
+	if *fOutputFilters != "" {
+		outputFilters = strings.Split(":"+strings.TrimSpace(*fOutputFilters)+":", ":")
+	}
+
+	aggregatorFilters, processorFilters := []string{}, []string{}
+	if *fAggregatorFilters != "" {
+		aggregatorFilters = strings.Split(":"+strings.TrimSpace(*fAggregatorFilters)+":", ":")
+	}
+	if *fProcessorFilters != "" {
+		processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":")
+	}
+
+	if len(args) > 0 {
+		switch args[0] {
+		case "version":
+			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
+			return
+		case "config":
+			config.PrintSampleConfig(
+				inputFilters,
+				outputFilters,
+				aggregatorFilters,
+				processorFilters,
+			)
+			return
+		}
+	}
+
+	// switch for flags which just do something and exit immediately
+	switch {
+	case *fOutputList:
+		fmt.Println("Available Output Plugins:")
+		for k, _ := range outputs.Outputs {
+			fmt.Printf("  %s\n", k)
+		}
+		return
+	case *fInputList:
+		fmt.Println("Available Input Plugins:")
+		for k, _ := range inputs.Inputs {
+			fmt.Printf("  %s\n", k)
+		}
+		return
+	case *fVersion:
+		fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
+		return
+	case *fSampleConfig:
+		config.PrintSampleConfig(
+			inputFilters,
+			outputFilters,
+			aggregatorFilters,
+			processorFilters,
+		)
+		return
+	case *fUsage != "":
+		err := config.PrintInputConfig(*fUsage)
+		err2 := config.PrintOutputConfig(*fUsage)
+		if err != nil && err2 != nil {
+			log.Fatalf("E! %s and %s", err, err2)
+		}
+		return
+	}
+
 	if runtime.GOOS == "windows" {
 		svcConfig := &service.Config{
 			Name:        "telegraf",
@@ -316,7 +319,12 @@ func main() {
 			Arguments: []string{"-config", "C:\\Program Files\\Telegraf\\telegraf.conf"},
 		}
 
-		prg := &program{}
+		prg := &program{
+			inputFilters:      inputFilters,
+			outputFilters:     outputFilters,
+			aggregatorFilters: aggregatorFilters,
+			processorFilters:  processorFilters,
+		}
 		s, err := service.New(prg, svcConfig)
 		if err != nil {
 			log.Fatal("E! " + err.Error())
@@ -334,6 +342,7 @@ func main() {
 			if err != nil {
 				log.Fatal("E! " + err.Error())
 			}
+			os.Exit(0)
 		} else {
 			err = s.Run()
 			if err != nil {
@@ -342,6 +351,12 @@ func main() {
 		}
 	} else {
 		stop = make(chan struct{})
-		reloadLoop(stop, nil)
+		reloadLoop(
+			stop,
+			inputFilters,
+			outputFilters,
+			aggregatorFilters,
+			processorFilters,
+		)
 	}
 }

From a610f8bd03f0ced2c38ed9b31eaf840bd7683cfb Mon Sep 17 00:00:00 2001
From: Matteo Cerutti <matteo.cerutti@rkrepsilon.com>
Date: Mon, 9 Jan 2017 10:45:31 +0000
Subject: [PATCH 0110/1302] allow querying sensors via the open interface

closes #2244
closes #1547
---
 CHANGELOG.md                             |   1 +
 plugins/inputs/ipmi_sensor/README.md     |  38 ++-
 plugins/inputs/ipmi_sensor/command.go    |  35 ---
 plugins/inputs/ipmi_sensor/connection.go |   1 -
 plugins/inputs/ipmi_sensor/ipmi.go       |  80 +++--
 plugins/inputs/ipmi_sensor/ipmi_test.go  | 354 +++++++++++++++--------
 6 files changed, 315 insertions(+), 194 deletions(-)
 delete mode 100644 plugins/inputs/ipmi_sensor/command.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87748d2bc..3696cdb8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#1453](https://github.com/influxdata/telegraf/pull/1453): diskio: add support for name templates and udev tags.
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
 - [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
+- [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index 4a248fdc9..3a75d0c65 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -4,33 +4,50 @@ Get bare metal metrics using the command line utility `ipmitool`
 
 see ipmitool(https://sourceforge.net/projects/ipmitool/files/ipmitool/)
 
-The plugin will use the following command to collect remote host sensor stats:
+If no servers are specified, the plugin will query the local machine sensor stats via the following command:
 
-ipmitool -I lan -H 192.168.1.1 -U USERID -P PASSW0RD sdr
+```
+ipmitool sdr
+```
+
+When one or more servers are specified, the plugin will use the following command to collect remote host sensor stats:
+
+```
+ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
+```
 
 ## Measurements
 
 - ipmi_sensor:
 
-    * Tags: `name`, `server`, `unit`
+    * Tags: `name`, `unit`
     * Fields:
       - status
       - value
 
+The `server` tag will be made available when retrieving stats from remote server(s).
+
 ## Configuration
 
 ```toml
+# Read metrics from the bare metal servers via IPMI
 [[inputs.ipmi_sensor]]
-  ## specify servers via a url matching:
+  ## optionally specify the path to the ipmitool executable
+  # path = "/usr/bin/ipmitool"
+  #
+  ## optionally specify one or more servers via a url matching
   ##  [username[:password]@][protocol[(address)]]
   ##  e.g.
   ##    root:passwd@lan(127.0.0.1)
   ##
-  servers = ["USERID:PASSW0RD@lan(10.20.2.203)"]
+  ## if no servers are specified, local machine sensor stats will be queried
+  ##
+  # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
 ```
 
 ## Output
 
+When retrieving stats from a remote server:
 ```
 > ipmi_sensor,server=10.20.2.203,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
 > ipmi_sensor,server=10.20.2.203,unit=feet,name=altitude status=1i,value=80 1458488465012688613
@@ -40,3 +57,14 @@ ipmitool -I lan -H 192.168.1.1 -U USERID -P PASSW0RD sdr
 > ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
 > ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
 ```
+
+When retrieving stats from the local machine (no server specified):
+```
+> ipmi_sensor,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
+> ipmi_sensor,unit=feet,name=altitude status=1i,value=80 1458488465012688613
+> ipmi_sensor,unit=watts,name=avg_power status=1i,value=220 1458488465012776511
+> ipmi_sensor,unit=volts,name=planar_3.3v status=1i,value=3.28 1458488465012861875
+> ipmi_sensor,unit=volts,name=planar_vbat status=1i,value=3.04 1458488465013072508
+> ipmi_sensor,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
+> ipmi_sensor,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
+```
diff --git a/plugins/inputs/ipmi_sensor/command.go b/plugins/inputs/ipmi_sensor/command.go
deleted file mode 100644
index 76374c494..000000000
--- a/plugins/inputs/ipmi_sensor/command.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package ipmi_sensor
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/influxdata/telegraf/internal"
-)
-
-type CommandRunner struct{}
-
-func (t CommandRunner) cmd(conn *Connection, args ...string) *exec.Cmd {
-	path := conn.Path
-	opts := append(conn.options(), args...)
-
-	if path == "" {
-		path = "ipmitool"
-	}
-
-	return exec.Command(path, opts...)
-}
-
-func (t CommandRunner) Run(conn *Connection, args ...string) (string, error) {
-	cmd := t.cmd(conn, args...)
-
-	output, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
-	if err != nil {
-		return "", fmt.Errorf("run %s %s: %s (%s)",
-			cmd.Path, strings.Join(cmd.Args, " "), string(output), err)
-	}
-
-	return string(output), err
-}
diff --git a/plugins/inputs/ipmi_sensor/connection.go b/plugins/inputs/ipmi_sensor/connection.go
index 1e9bfbdcb..432b4aa02 100644
--- a/plugins/inputs/ipmi_sensor/connection.go
+++ b/plugins/inputs/ipmi_sensor/connection.go
@@ -12,7 +12,6 @@ type Connection struct {
 	Hostname  string
 	Username  string
 	Password  string
-	Path      string
 	Port      int
 	Interface string
 }
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index aec56a0e4..b2389a675 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -1,48 +1,62 @@
 package ipmi_sensor
 
 import (
+	"fmt"
+	"os/exec"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+var (
+	execCommand = exec.Command // execCommand is used to mock commands in tests.
+)
+
 type Ipmi struct {
+	path    string
 	Servers []string
-	runner  Runner
 }
 
 var sampleConfig = `
-  ## specify servers via a url matching:
+  ## optionally specify the path to the ipmitool executable
+  # path = "/usr/bin/ipmitool"
+  #
+  ## optionally specify one or more servers via a url matching
   ##  [username[:password]@][protocol[(address)]]
   ##  e.g.
   ##    root:passwd@lan(127.0.0.1)
   ##
-  servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+  ## if no servers are specified, local machine sensor stats will be queried
+  ##
+  # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
 `
 
-func NewIpmi() *Ipmi {
-	return &Ipmi{
-		runner: CommandRunner{},
-	}
-}
-
 func (m *Ipmi) SampleConfig() string {
 	return sampleConfig
 }
 
 func (m *Ipmi) Description() string {
-	return "Read metrics from one or many bare metal servers"
+	return "Read metrics from the bare metal servers via IPMI"
 }
 
 func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
-	if m.runner == nil {
-		m.runner = CommandRunner{}
+	if len(m.path) == 0 {
+		return fmt.Errorf("ipmitool not found: verify that ipmitool is installed and that ipmitool is in your PATH")
 	}
-	for _, serv := range m.Servers {
-		err := m.gatherServer(serv, acc)
+
+	if len(m.Servers) > 0 {
+		for _, server := range m.Servers {
+			err := m.parse(acc, server)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		err := m.parse(acc, "")
 		if err != nil {
 			return err
 		}
@@ -51,17 +65,26 @@ func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func (m *Ipmi) gatherServer(serv string, acc telegraf.Accumulator) error {
-	conn := NewConnection(serv)
+func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
+	opts := make([]string, 0)
+	hostname := ""
 
-	res, err := m.runner.Run(conn, "sdr")
+	if server != "" {
+		conn := NewConnection(server)
+		hostname = conn.Hostname
+		opts = conn.options()
+	}
+
+	opts = append(opts, "sdr")
+	cmd := execCommand(m.path, opts...)
+	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
 	}
 
 	// each line will look something like
 	// Planar VBAT      | 3.05 Volts        | ok
-	lines := strings.Split(res, "\n")
+	lines := strings.Split(string(out), "\n")
 	for i := 0; i < len(lines); i++ {
 		vals := strings.Split(lines[i], "|")
 		if len(vals) != 3 {
@@ -69,8 +92,12 @@ func (m *Ipmi) gatherServer(serv string, acc telegraf.Accumulator) error {
 		}
 
 		tags := map[string]string{
-			"server": conn.Hostname,
-			"name":   transform(vals[0]),
+			"name": transform(vals[0]),
+		}
+
+		// tag the server is we have one
+		if hostname != "" {
+			tags["server"] = hostname
 		}
 
 		fields := make(map[string]interface{})
@@ -99,10 +126,6 @@ func (m *Ipmi) gatherServer(serv string, acc telegraf.Accumulator) error {
 	return nil
 }
 
-type Runner interface {
-	Run(conn *Connection, args ...string) (string, error)
-}
-
 func Atofloat(val string) float64 {
 	f, err := strconv.ParseFloat(val, 64)
 	if err != nil {
@@ -123,7 +146,12 @@ func transform(s string) string {
 }
 
 func init() {
+	m := Ipmi{}
+	path, _ := exec.LookPath("ipmitool")
+	if len(path) > 0 {
+		m.path = path
+	}
 	inputs.Add("ipmi_sensor", func() telegraf.Input {
-		return &Ipmi{}
+		return &m
 	})
 }
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index c62447e39..94dc066c8 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -1,6 +1,9 @@
 package ipmi_sensor
 
 import (
+	"fmt"
+	"os"
+	"os/exec"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
@@ -8,10 +11,219 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const serv = "USERID:PASSW0RD@lan(192.168.1.1)"
+func TestGather(t *testing.T) {
+	i := &Ipmi{
+		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
+		path:    "ipmitool",
+	}
+	// overwriting exec commands with mock commands
+	execCommand = fakeExecCommand
+	var acc testutil.Accumulator
 
-const cmdReturn = `
-Ambient Temp     | 20 degrees C      | ok
+	err := i.Gather(&acc)
+
+	require.NoError(t, err)
+
+	assert.Equal(t, acc.NFields(), 266, "non-numeric measurements should be ignored")
+
+	conn := NewConnection(i.Servers[0])
+	assert.Equal(t, "USERID", conn.Username)
+	assert.Equal(t, "lan", conn.Interface)
+
+	var testsWithServer = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"value":  float64(20),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "ambient_temp",
+				"server": "192.168.1.1",
+				"unit":   "degrees_c",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(80),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "altitude",
+				"server": "192.168.1.1",
+				"unit":   "feet",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(210),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "avg_power",
+				"server": "192.168.1.1",
+				"unit":   "watts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(4.9),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "planar_5v",
+				"server": "192.168.1.1",
+				"unit":   "volts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(3.05),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "planar_vbat",
+				"server": "192.168.1.1",
+				"unit":   "volts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(2610),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "fan_1a_tach",
+				"server": "192.168.1.1",
+				"unit":   "rpm",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(1775),
+				"status": int(1),
+			},
+			map[string]string{
+				"name":   "fan_1b_tach",
+				"server": "192.168.1.1",
+				"unit":   "rpm",
+			},
+		},
+	}
+
+	for _, test := range testsWithServer {
+		acc.AssertContainsTaggedFields(t, "ipmi_sensor", test.fields, test.tags)
+	}
+
+	i = &Ipmi{
+		path: "ipmitool",
+	}
+
+	err = i.Gather(&acc)
+
+	var testsWithoutServer = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"value":  float64(20),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "ambient_temp",
+				"unit": "degrees_c",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(80),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "altitude",
+				"unit": "feet",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(210),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "avg_power",
+				"unit": "watts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(4.9),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "planar_5v",
+				"unit": "volts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(3.05),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "planar_vbat",
+				"unit": "volts",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(2610),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "fan_1a_tach",
+				"unit": "rpm",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":  float64(1775),
+				"status": int(1),
+			},
+			map[string]string{
+				"name": "fan_1b_tach",
+				"unit": "rpm",
+			},
+		},
+	}
+
+	for _, test := range testsWithoutServer {
+		acc.AssertContainsTaggedFields(t, "ipmi_sensor", test.fields, test.tags)
+	}
+}
+
+// fackeExecCommand is a helper function that mock
+// the exec.Command call (and call the test binary)
+func fakeExecCommand(command string, args ...string) *exec.Cmd {
+	cs := []string{"-test.run=TestHelperProcess", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+// TestHelperProcess isn't a real test. It's used to mock exec.Command
+// For example, if you run:
+// GO_WANT_HELPER_PROCESS=1 go test -test.run=TestHelperProcess -- chrony tracking
+// it returns below mockData.
+func TestHelperProcess(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+
+	mockData := `Ambient Temp     | 20 degrees C      | ok
 Altitude         | 80 feet           | ok
 Avg Power        | 210 Watts         | ok
 Planar 3.3V      | 3.29 Volts        | ok
@@ -146,130 +358,18 @@ PCI 5            | 0x00              | ok
 OS RealTime Mod  | 0x00              | ok
 `
 
-type runnerMock struct {
-	out string
-	err error
-}
+	args := os.Args
+
+	// Previous arguments are tests stuff, that looks like :
+	// /tmp/go-build970079519/…/_test/integration.test -test.run=TestHelperProcess --
+	cmd, args := args[3], args[4:]
+
+	if cmd == "ipmitool" {
+		fmt.Fprint(os.Stdout, mockData)
+	} else {
+		fmt.Fprint(os.Stdout, "command not found")
+		os.Exit(1)
 
-func newRunnerMock(out string, err error) Runner {
-	return &runnerMock{
-		out: out,
-		err: err,
 	}
-}
-
-func (r runnerMock) Run(conn *Connection, args ...string) (out string, err error) {
-	if r.err != nil {
-		return out, r.err
-	}
-	return r.out, nil
-}
-
-func TestIpmi(t *testing.T) {
-	i := &Ipmi{
-		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
-		runner:  newRunnerMock(cmdReturn, nil),
-	}
-
-	var acc testutil.Accumulator
-
-	err := i.Gather(&acc)
-
-	require.NoError(t, err)
-
-	assert.Equal(t, acc.NFields(), 266, "non-numeric measurements should be ignored")
-
-	var tests = []struct {
-		fields map[string]interface{}
-		tags   map[string]string
-	}{
-		{
-			map[string]interface{}{
-				"value":  float64(20),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "ambient_temp",
-				"server": "192.168.1.1",
-				"unit":   "degrees_c",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(80),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "altitude",
-				"server": "192.168.1.1",
-				"unit":   "feet",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(210),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "avg_power",
-				"server": "192.168.1.1",
-				"unit":   "watts",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(4.9),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "planar_5v",
-				"server": "192.168.1.1",
-				"unit":   "volts",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(3.05),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "planar_vbat",
-				"server": "192.168.1.1",
-				"unit":   "volts",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(2610),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "fan_1a_tach",
-				"server": "192.168.1.1",
-				"unit":   "rpm",
-			},
-		},
-		{
-			map[string]interface{}{
-				"value":  float64(1775),
-				"status": int(1),
-			},
-			map[string]string{
-				"name":   "fan_1b_tach",
-				"server": "192.168.1.1",
-				"unit":   "rpm",
-			},
-		},
-	}
-
-	for _, test := range tests {
-		acc.AssertContainsTaggedFields(t, "ipmi_sensor", test.fields, test.tags)
-	}
-}
-
-func TestIpmiConnection(t *testing.T) {
-	conn := NewConnection(serv)
-	assert.Equal(t, "USERID", conn.Username)
-	assert.Equal(t, "lan", conn.Interface)
-
+	os.Exit(0)
 }

From 55d3f70771996ed91cf29271ee0f4b39aff4b299 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Thu, 2 Feb 2017 08:46:53 -0500
Subject: [PATCH 0111/1302] add missing fields to haproxy input (#2323)

---
 CHANGELOG.md                           |   1 +
 plugins/inputs/haproxy/README.md       |   6 +-
 plugins/inputs/haproxy/haproxy.go      | 354 +++++++------------------
 plugins/inputs/haproxy/haproxy_test.go | 182 +++++++++----
 4 files changed, 226 insertions(+), 317 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3696cdb8e..2e348ad47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
+- [#2318](https://github.com/influxdata/telegraf/issues/2318): haproxy input - Add missing fields.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index 7f2bfa1dd..81c8fb894 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -10,6 +10,7 @@
   servers = ["http://1.2.3.4/haproxy?stats", "/var/run/haproxy*.sock"]
 ```
 
+#### `servers`
 Server addresses need to explicitly start with 'http' if you wish to use HAproxy status page. Otherwise, address will be assumed to be an UNIX socket and protocol (if present) will be discarded.
 
 For basic authentication you need to add username and password in the URL: `http://user:password@1.2.3.4/haproxy?stats`.
@@ -26,9 +27,12 @@ When using socket names, wildcard expansion is supported so plugin can gather st
 
 If no servers are specified, then the default address of `http://127.0.0.1:1936/haproxy?stats` will be used.
 
+#### `keep_field_names`
+By default, some of the fields are renamed from what haproxy calls them. Setting the `keep_field_names` parameter to `true` will result in the plugin keeping the original field names.
+
 ### Measurements & Fields:
 
-Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1).
+Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.7/management.html#9.1).
 
 ### Tags:
 
diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index c764a5530..2be418a65 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -14,80 +14,17 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 //CSV format: https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1
-const (
-	HF_PXNAME         = 0  // 0. pxname [LFBS]: proxy name
-	HF_SVNAME         = 1  // 1. svname [LFBS]: service name (FRONTEND for frontend, BACKEND for backend, any name for server/listener)
-	HF_QCUR           = 2  //2. qcur [..BS]: current queued requests. For the backend this reports the number queued without a server assigned.
-	HF_QMAX           = 3  //3. qmax [..BS]: max value of qcur
-	HF_SCUR           = 4  // 4. scur [LFBS]: current sessions
-	HF_SMAX           = 5  //5. smax [LFBS]: max sessions
-	HF_SLIM           = 6  //6. slim [LFBS]: configured session limit
-	HF_STOT           = 7  //7. stot [LFBS]: cumulative number of connections
-	HF_BIN            = 8  //8. bin [LFBS]: bytes in
-	HF_BOUT           = 9  //9. bout [LFBS]: bytes out
-	HF_DREQ           = 10 //10. dreq [LFB.]: requests denied because of security concerns.
-	HF_DRESP          = 11 //11. dresp [LFBS]: responses denied because of security concerns.
-	HF_EREQ           = 12 //12. ereq [LF..]: request errors. Some of the possible causes are:
-	HF_ECON           = 13 //13. econ [..BS]: number of requests that encountered an error trying to
-	HF_ERESP          = 14 //14. eresp [..BS]: response errors. srv_abrt will be counted here also.  Some other errors are: - write error on the client socket (won't be counted for the server stat) - failure applying filters to the response.
-	HF_WRETR          = 15 //15. wretr [..BS]: number of times a connection to a server was retried.
-	HF_WREDIS         = 16 //16. wredis [..BS]: number of times a request was redispatched to another server. The server value counts the number of times that server was switched away from.
-	HF_STATUS         = 17 //17. status [LFBS]: status (UP/DOWN/NOLB/MAINT/MAINT(via)...)
-	HF_WEIGHT         = 18 //18. weight [..BS]: total weight (backend), server weight (server)
-	HF_ACT            = 19 //19. act [..BS]: number of active servers (backend), server is active (server)
-	HF_BCK            = 20 //20. bck [..BS]: number of backup servers (backend), server is backup (server)
-	HF_CHKFAIL        = 21 //21. chkfail [...S]: number of failed checks. (Only counts checks failed when the server is up.)
-	HF_CHKDOWN        = 22 //22. chkdown [..BS]: number of UP->DOWN transitions. The backend counter counts transitions to the whole backend being down, rather than the sum of the counters for each server.
-	HF_LASTCHG        = 23 //23. lastchg [..BS]: number of seconds since the last UP<->DOWN transition
-	HF_DOWNTIME       = 24 //24. downtime [..BS]: total downtime (in seconds). The value for the backend is the downtime for the whole backend, not the sum of the server downtime.
-	HF_QLIMIT         = 25 //25. qlimit [...S]: configured maxqueue for the server, or nothing in the value is 0 (default, meaning no limit)
-	HF_PID            = 26 //26. pid [LFBS]: process id (0 for first instance, 1 for second, ...)
-	HF_IID            = 27 //27. iid [LFBS]: unique proxy id
-	HF_SID            = 28 //28. sid [L..S]: server id (unique inside a proxy)
-	HF_THROTTLE       = 29 //29. throttle [...S]: current throttle percentage for the server, when slowstart is active, or no value if not in slowstart.
-	HF_LBTOT          = 30 //30. lbtot [..BS]: total number of times a server was selected, either for new sessions, or when re-dispatching. The server counter is the number of times that server was selected.
-	HF_TRACKED        = 31 //31. tracked [...S]: id of proxy/server if tracking is enabled.
-	HF_TYPE           = 32 //32. type [LFBS]: (0 = frontend, 1 = backend, 2 = server, 3 = socket/listener)
-	HF_RATE           = 33 //33. rate [.FBS]: number of sessions per second over last elapsed second
-	HF_RATE_LIM       = 34 //34. rate_lim [.F..]: configured limit on new sessions per second
-	HF_RATE_MAX       = 35 //35. rate_max [.FBS]: max number of new sessions per second
-	HF_CHECK_STATUS   = 36 //36. check_status [...S]: status of last health check, one of:
-	HF_CHECK_CODE     = 37 //37. check_code [...S]: layer5-7 code, if available
-	HF_CHECK_DURATION = 38 //38. check_duration [...S]: time in ms took to finish last health check
-	HF_HRSP_1xx       = 39 //39. hrsp_1xx [.FBS]: http responses with 1xx code
-	HF_HRSP_2xx       = 40 //40. hrsp_2xx [.FBS]: http responses with 2xx code
-	HF_HRSP_3xx       = 41 //41. hrsp_3xx [.FBS]: http responses with 3xx code
-	HF_HRSP_4xx       = 42 //42. hrsp_4xx [.FBS]: http responses with 4xx code
-	HF_HRSP_5xx       = 43 //43. hrsp_5xx [.FBS]: http responses with 5xx code
-	HF_HRSP_OTHER     = 44 //44. hrsp_other [.FBS]: http responses with other codes (protocol error)
-	HF_HANAFAIL       = 45 //45. hanafail [...S]: failed health checks details
-	HF_REQ_RATE       = 46 //46. req_rate [.F..]: HTTP requests per second over last elapsed second
-	HF_REQ_RATE_MAX   = 47 //47. req_rate_max [.F..]: max number of HTTP requests per second observed
-	HF_REQ_TOT        = 48 //48. req_tot [.F..]: total number of HTTP requests received
-	HF_CLI_ABRT       = 49 //49. cli_abrt [..BS]: number of data transfers aborted by the client
-	HF_SRV_ABRT       = 50 //50. srv_abrt [..BS]: number of data transfers aborted by the server (inc. in eresp)
-	HF_COMP_IN        = 51 //51. comp_in [.FB.]: number of HTTP response bytes fed to the compressor
-	HF_COMP_OUT       = 52 //52. comp_out [.FB.]: number of HTTP response bytes emitted by the compressor
-	HF_COMP_BYP       = 53 //53. comp_byp [.FB.]: number of bytes that bypassed the HTTP compressor (CPU/BW limit)
-	HF_COMP_RSP       = 54 //54. comp_rsp [.FB.]: number of HTTP responses that were compressed
-	HF_LASTSESS       = 55 //55. lastsess [..BS]: number of seconds since last session assigned to server/backend
-	HF_LAST_CHK       = 56 //56. last_chk [...S]: last health check contents or textual error
-	HF_LAST_AGT       = 57 //57. last_agt [...S]: last agent check contents or textual error
-	HF_QTIME          = 58 //58. qtime [..BS]:
-	HF_CTIME          = 59 //59. ctime [..BS]:
-	HF_RTIME          = 60 //60. rtime [..BS]: (0 for TCP)
-	HF_TTIME          = 61 //61. ttime [..BS]: the average total session time in ms over the 1024 last requests
-)
 
 type haproxy struct {
 	Servers []string
 
 	client *http.Client
+
+	KeepFieldNames bool
 }
 
 var sampleConfig = `
@@ -103,6 +40,11 @@ var sampleConfig = `
   ## Server address not starting with 'http' will be treated as a possible
   ## socket, so both examples below are valid.
   ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+  #
+  ## By default, some of the fields are renamed from what haproxy calls them.
+  ## Setting this option to true results in the plugin keeping the original
+  ## field names.
+  ## keep_field_names = true
 `
 
 func (r *haproxy) SampleConfig() string {
@@ -147,17 +89,18 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(endpoints))
 	wg.Add(len(endpoints))
 	for _, server := range endpoints {
 		go func(serv string) {
 			defer wg.Done()
-			errChan.C <- g.gatherServer(serv, acc)
+			if err := g.gatherServer(serv, acc); err != nil {
+				acc.AddError(err)
+			}
 		}(server)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) error {
@@ -175,7 +118,7 @@ func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) erro
 		return fmt.Errorf("Could not write to socket '%s': %s", addr, errw)
 	}
 
-	return importCsvResult(c, acc, socketPath)
+	return g.importCsvResult(c, acc, socketPath)
 }
 
 func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
@@ -216,7 +159,11 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 		return fmt.Errorf("Unable to get valid stat result from '%s', http response code : %d", addr, res.StatusCode)
 	}
 
-	return importCsvResult(res.Body, acc, u.Host)
+	if err := g.importCsvResult(res.Body, acc, u.Host); err != nil {
+		return fmt.Errorf("Unable to parse stat result from '%s': %s", addr, err)
+	}
+
+	return nil
 }
 
 func getSocketAddr(sock string) string {
@@ -229,205 +176,96 @@ func getSocketAddr(sock string) string {
 	}
 }
 
-func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
-	csv := csv.NewReader(r)
-	result, err := csv.ReadAll()
+var typeNames = []string{"frontend", "backend", "server", "listener"}
+var fieldRenames = map[string]string{
+	"pxname":     "proxy",
+	"svname":     "sv",
+	"act":        "active_servers",
+	"bck":        "backup_servers",
+	"cli_abrt":   "cli_abort",
+	"srv_abrt":   "srv_abort",
+	"hrsp_1xx":   "http_response.1xx",
+	"hrsp_2xx":   "http_response.2xx",
+	"hrsp_3xx":   "http_response.3xx",
+	"hrsp_4xx":   "http_response.4xx",
+	"hrsp_5xx":   "http_response.5xx",
+	"hrsp_other": "http_response.other",
+}
+
+func (g *haproxy) importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
+	csvr := csv.NewReader(r)
 	now := time.Now()
 
-	for _, row := range result {
+	headers, err := csvr.Read()
+	if err != nil {
+		return err
+	}
+	if len(headers[0]) <= 2 || headers[0][:2] != "# " {
+		return fmt.Errorf("did not receive standard haproxy headers")
+	}
+	headers[0] = headers[0][2:]
+
+	for {
+		row, err := csvr.Read()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+
 		fields := make(map[string]interface{})
 		tags := map[string]string{
 			"server": host,
-			"proxy":  row[HF_PXNAME],
-			"sv":     row[HF_SVNAME],
 		}
-		for field, v := range row {
-			switch field {
-			case HF_QCUR:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["qcur"] = ival
+
+		if len(row) != len(headers) {
+			return fmt.Errorf("number of columns does not match number of headers. headers=%d columns=%d", len(headers), len(row))
+		}
+		for i, v := range row {
+			if v == "" {
+				continue
+			}
+
+			colName := headers[i]
+			fieldName := colName
+			if !g.KeepFieldNames {
+				if fieldRename, ok := fieldRenames[colName]; ok {
+					fieldName = fieldRename
 				}
-			case HF_QMAX:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["qmax"] = ival
+			}
+
+			switch colName {
+			case "pxname", "svname":
+				tags[fieldName] = v
+			case "type":
+				vi, err := strconv.ParseInt(v, 10, 64)
+				if err != nil {
+					return fmt.Errorf("unable to parse type value '%s'", v)
 				}
-			case HF_SCUR:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["scur"] = ival
+				if int(vi) >= len(typeNames) {
+					return fmt.Errorf("received unknown type value: %d", vi)
 				}
-			case HF_SMAX:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["smax"] = ival
+				tags[fieldName] = typeNames[vi]
+			case "check_desc", "agent_desc":
+				// do nothing. These fields are just a more verbose description of the check_status & agent_status fields
+			case "status", "check_status", "last_chk", "mode", "tracked", "agent_status", "last_agt", "addr", "cookie":
+				// these are string fields
+				fields[fieldName] = v
+			case "lastsess":
+				vi, err := strconv.ParseInt(v, 10, 64)
+				if err != nil {
+					//TODO log the error. And just once (per column) so we don't spam the log
+					continue
 				}
-			case HF_SLIM:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["slim"] = ival
-				}
-			case HF_STOT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["stot"] = ival
-				}
-			case HF_BIN:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["bin"] = ival
-				}
-			case HF_BOUT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["bout"] = ival
-				}
-			case HF_DREQ:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["dreq"] = ival
-				}
-			case HF_DRESP:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["dresp"] = ival
-				}
-			case HF_EREQ:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["ereq"] = ival
-				}
-			case HF_ECON:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["econ"] = ival
-				}
-			case HF_ERESP:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["eresp"] = ival
-				}
-			case HF_WRETR:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["wretr"] = ival
-				}
-			case HF_WREDIS:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["wredis"] = ival
-				}
-			case HF_ACT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["active_servers"] = ival
-				}
-			case HF_BCK:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["backup_servers"] = ival
-				}
-			case HF_DOWNTIME:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["downtime"] = ival
-				}
-			case HF_THROTTLE:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["throttle"] = ival
-				}
-			case HF_LBTOT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["lbtot"] = ival
-				}
-			case HF_RATE:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["rate"] = ival
-				}
-			case HF_RATE_MAX:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["rate_max"] = ival
-				}
-			case HF_CHECK_DURATION:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["check_duration"] = ival
-				}
-			case HF_HRSP_1xx:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["http_response.1xx"] = ival
-				}
-			case HF_HRSP_2xx:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["http_response.2xx"] = ival
-				}
-			case HF_HRSP_3xx:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["http_response.3xx"] = ival
-				}
-			case HF_HRSP_4xx:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["http_response.4xx"] = ival
-				}
-			case HF_HRSP_5xx:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["http_response.5xx"] = ival
-				}
-			case HF_REQ_RATE:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["req_rate"] = ival
-				}
-			case HF_REQ_RATE_MAX:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["req_rate_max"] = ival
-				}
-			case HF_REQ_TOT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["req_tot"] = ival
-				}
-			case HF_CLI_ABRT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["cli_abort"] = ival
-				}
-			case HF_SRV_ABRT:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["srv_abort"] = ival
-				}
-			case HF_QTIME:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["qtime"] = ival
-				}
-			case HF_CTIME:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["ctime"] = ival
-				}
-			case HF_RTIME:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["rtime"] = ival
-				}
-			case HF_TTIME:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["ttime"] = ival
+				fields[fieldName] = vi
+			default:
+				vi, err := strconv.ParseUint(v, 10, 64)
+				if err != nil {
+					//TODO log the error. And just once (per column) so we don't spam the log
+					continue
 				}
+				fields[fieldName] = vi
 			}
 		}
 		acc.AddFields("haproxy", fields, tags, now)
diff --git a/plugins/inputs/haproxy/haproxy_test.go b/plugins/inputs/haproxy/haproxy_test.go
index 12be2ed88..27a197304 100644
--- a/plugins/inputs/haproxy/haproxy_test.go
+++ b/plugins/inputs/haproxy/haproxy_test.go
@@ -68,8 +68,9 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 
 	tags := map[string]string{
 		"server": ts.Listener.Addr().String(),
-		"proxy":  "be_app",
-		"sv":     "host0",
+		"proxy":  "git",
+		"sv":     "www",
+		"type":   "server",
 	}
 
 	fields := HaproxyGetFieldValues()
@@ -80,8 +81,8 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 		Servers: []string{ts.URL},
 	}
 
-	err = r.Gather(&acc)
-	require.Error(t, err)
+	r.Gather(&acc)
+	require.NotEmpty(t, acc.Errors)
 }
 
 func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
@@ -100,9 +101,10 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
 	require.NoError(t, err)
 
 	tags := map[string]string{
-		"proxy":  "be_app",
 		"server": ts.Listener.Addr().String(),
-		"sv":     "host0",
+		"proxy":  "git",
+		"sv":     "www",
+		"type":   "server",
 	}
 
 	fields := HaproxyGetFieldValues()
@@ -144,9 +146,10 @@ func TestHaproxyGeneratesMetricsUsingSocket(t *testing.T) {
 
 	for _, sock := range sockets {
 		tags := map[string]string{
-			"proxy":  "be_app",
 			"server": sock.Addr().String(),
-			"sv":     "host0",
+			"proxy":  "git",
+			"sv":     "www",
+			"type":   "server",
 		}
 
 		acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
@@ -155,8 +158,8 @@ func TestHaproxyGeneratesMetricsUsingSocket(t *testing.T) {
 	// This mask should not match any socket
 	r.Servers = []string{_badmask}
 
-	err = r.Gather(&acc)
-	require.Error(t, err)
+	r.Gather(&acc)
+	require.NotEmpty(t, acc.Errors)
 }
 
 //When not passing server config, we default to localhost
@@ -171,59 +174,122 @@ func TestHaproxyDefaultGetFromLocalhost(t *testing.T) {
 	assert.Contains(t, err.Error(), "127.0.0.1:1936/haproxy?stats/;csv")
 }
 
+func TestHaproxyKeepFieldNames(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprint(w, csvOutputSample)
+	}))
+	defer ts.Close()
+
+	r := &haproxy{
+		Servers:        []string{ts.URL},
+		KeepFieldNames: true,
+	}
+
+	var acc testutil.Accumulator
+
+	err := r.Gather(&acc)
+	require.NoError(t, err)
+
+	tags := map[string]string{
+		"server": ts.Listener.Addr().String(),
+		"pxname": "git",
+		"svname": "www",
+		"type":   "server",
+	}
+
+	fields := HaproxyGetFieldValues()
+	fields["act"] = fields["active_servers"]
+	delete(fields, "active_servers")
+	fields["bck"] = fields["backup_servers"]
+	delete(fields, "backup_servers")
+	fields["cli_abrt"] = fields["cli_abort"]
+	delete(fields, "cli_abort")
+	fields["srv_abrt"] = fields["srv_abort"]
+	delete(fields, "srv_abort")
+	fields["hrsp_1xx"] = fields["http_response.1xx"]
+	delete(fields, "http_response.1xx")
+	fields["hrsp_2xx"] = fields["http_response.2xx"]
+	delete(fields, "http_response.2xx")
+	fields["hrsp_3xx"] = fields["http_response.3xx"]
+	delete(fields, "http_response.3xx")
+	fields["hrsp_4xx"] = fields["http_response.4xx"]
+	delete(fields, "http_response.4xx")
+	fields["hrsp_5xx"] = fields["http_response.5xx"]
+	delete(fields, "http_response.5xx")
+	fields["hrsp_other"] = fields["http_response.other"]
+	delete(fields, "http_response.other")
+
+	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
+}
+
 func HaproxyGetFieldValues() map[string]interface{} {
 	fields := map[string]interface{}{
-		"active_servers":    uint64(1),
-		"backup_servers":    uint64(0),
-		"bin":               uint64(510913516),
-		"bout":              uint64(2193856571),
-		"check_duration":    uint64(10),
-		"cli_abort":         uint64(73),
-		"ctime":             uint64(2),
-		"downtime":          uint64(0),
-		"dresp":             uint64(0),
-		"econ":              uint64(0),
-		"eresp":             uint64(1),
-		"http_response.1xx": uint64(0),
-		"http_response.2xx": uint64(119534),
-		"http_response.3xx": uint64(48051),
-		"http_response.4xx": uint64(2345),
-		"http_response.5xx": uint64(1056),
-		"lbtot":             uint64(171013),
-		"qcur":              uint64(0),
-		"qmax":              uint64(0),
-		"qtime":             uint64(0),
-		"rate":              uint64(3),
-		"rate_max":          uint64(12),
-		"rtime":             uint64(312),
-		"scur":              uint64(1),
-		"smax":              uint64(32),
-		"slim":              uint64(32),
-		"srv_abort":         uint64(1),
-		"stot":              uint64(171014),
-		"ttime":             uint64(2341),
-		"wredis":            uint64(0),
-		"wretr":             uint64(1),
+		"active_servers":      uint64(1),
+		"backup_servers":      uint64(0),
+		"bin":                 uint64(5228218),
+		"bout":                uint64(303747244),
+		"check_code":          uint64(200),
+		"check_duration":      uint64(3),
+		"check_fall":          uint64(3),
+		"check_health":        uint64(4),
+		"check_rise":          uint64(2),
+		"check_status":        "L7OK",
+		"chkdown":             uint64(84),
+		"chkfail":             uint64(559),
+		"cli_abort":           uint64(690),
+		"ctime":               uint64(1),
+		"downtime":            uint64(3352),
+		"dresp":               uint64(0),
+		"econ":                uint64(0),
+		"eresp":               uint64(21),
+		"http_response.1xx":   uint64(0),
+		"http_response.2xx":   uint64(5668),
+		"http_response.3xx":   uint64(8710),
+		"http_response.4xx":   uint64(140),
+		"http_response.5xx":   uint64(0),
+		"http_response.other": uint64(0),
+		"iid":       uint64(4),
+		"last_chk":  "OK",
+		"lastchg":   uint64(1036557),
+		"lastsess":  int64(1342),
+		"lbtot":     uint64(9481),
+		"mode":      "http",
+		"pid":       uint64(1),
+		"qcur":      uint64(0),
+		"qmax":      uint64(0),
+		"qtime":     uint64(1268),
+		"rate":      uint64(0),
+		"rate_max":  uint64(2),
+		"rtime":     uint64(2908),
+		"sid":       uint64(1),
+		"scur":      uint64(0),
+		"slim":      uint64(2),
+		"smax":      uint64(2),
+		"srv_abort": uint64(0),
+		"status":    "UP",
+		"stot":      uint64(14539),
+		"ttime":     uint64(4500),
+		"weight":    uint64(1),
+		"wredis":    uint64(0),
+		"wretr":     uint64(0),
 	}
 	return fields
 }
 
+// Can obtain from official haproxy demo: 'http://demo.haproxy.org/;csv'
 const csvOutputSample = `
-# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,
-fe_app,FRONTEND,,81,288,713,2000,1094063,5557055817,24096715169,1102,80,95740,,,17,19,OPEN,,,,,,,,,2,16,113,13,114,,0,18,0,102,,,,0,1314093,537036,123452,11966,1360,,35,140,1987928,,,0,0,0,0,,,,,,,,
-be_static,host0,0,0,0,3,,3209,1141294,17389596,,0,,0,0,0,0,no check,1,1,0,,,,,,2,17,1,,3209,,2,0,,7,,,,0,218,1497,1494,0,0,0,,,,0,0,,,,,2,,,0,2,23,545,
-be_static,BACKEND,0,0,0,3,200,3209,1141294,17389596,0,0,,0,0,0,0,UP,1,1,0,,0,70698,0,,2,17,0,,3209,,1,0,,7,,,,0,218,1497,1494,0,0,,,,,0,0,0,0,0,0,2,,,0,2,23,545,
-be_static,host0,0,0,0,1,,28,17313,466003,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,1,,28,,2,0,,1,L4OK,,1,0,17,6,5,0,0,0,,,,0,0,,,,,2103,,,0,1,1,36,
-be_static,host4,0,0,0,1,,28,15358,1281073,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,2,,28,,2,0,,1,L4OK,,1,0,20,5,3,0,0,0,,,,0,0,,,,,2076,,,0,1,1,54,
-be_static,host5,0,0,0,1,,28,17547,1970404,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,3,,28,,2,0,,1,L4OK,,0,0,20,5,3,0,0,0,,,,0,0,,,,,1495,,,0,1,1,53,
-be_static,host6,0,0,0,1,,28,14105,1328679,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,4,,28,,2,0,,1,L4OK,,0,0,18,8,2,0,0,0,,,,0,0,,,,,1418,,,0,0,1,49,
-be_static,host7,0,0,0,1,,28,15258,1965185,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,5,,28,,2,0,,1,L4OK,,0,0,17,8,3,0,0,0,,,,0,0,,,,,935,,,0,0,1,28,
-be_static,host8,0,0,0,1,,28,12934,1034779,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,6,,28,,2,0,,1,L4OK,,0,0,17,9,2,0,0,0,,,,0,0,,,,,582,,,0,1,1,66,
-be_static,host9,0,0,0,1,,28,13434,134063,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,7,,28,,2,0,,1,L4OK,,0,0,17,8,3,0,0,0,,,,0,0,,,,,539,,,0,0,1,80,
-be_static,host1,0,0,0,1,,28,7873,1209688,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,8,,28,,2,0,,1,L4OK,,0,0,22,6,0,0,0,0,,,,0,0,,,,,487,,,0,0,1,36,
-be_static,host2,0,0,0,1,,28,13830,1085929,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,9,,28,,2,0,,1,L4OK,,0,0,19,6,3,0,0,0,,,,0,0,,,,,338,,,0,1,1,38,
-be_static,host3,0,0,0,1,,28,17959,1259760,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,10,,28,,2,0,,1,L4OK,,1,0,20,6,2,0,0,0,,,,0,0,,,,,92,,,0,1,1,17,
-be_static,BACKEND,0,0,0,2,200,307,160276,13322728,0,0,,0,0,0,0,UP,11,11,0,,0,70698,0,,2,18,0,,307,,1,0,,4,,,,0,205,73,29,0,0,,,,,0,0,0,0,0,0,92,,,0,1,3,381,
-be_app,host0,0,0,1,32,32,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
-be_app,host4,0,0,2,29,32,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
+# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,agent_status,agent_code,agent_duration,check_desc,agent_desc,check_rise,check_fall,check_health,agent_rise,agent_fall,agent_health,addr,cookie,mode,algo,conn_rate,conn_rate_max,conn_tot,intercepted,dcon,dses,
+http-in,FRONTEND,,,3,100,100,2639994,813557487,65937668635,505252,0,47567,,,,,OPEN,,,,,,,,,1,2,0,,,,0,1,0,157,,,,0,1514640,606647,136264,496535,14948,,1,155,2754255,,,36370569635,17435137766,0,642264,,,,,,,,,,,,,,,,,,,,,http,,1,157,2649922,339471,0,0,
+http-in,IPv4-direct,,,3,41,100,349801,57445827,1503928881,269899,0,287,,,,,OPEN,,,,,,,,,1,2,1,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
+http-in,IPv4-cached,,,0,33,100,1786155,644395819,57905460294,60511,0,1,,,,,OPEN,,,,,,,,,1,2,2,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
+http-in,IPv6-direct,,,0,100,100,325619,92414745,6205208728,3399,0,47279,,,,,OPEN,,,,,,,,,1,2,3,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
+http-in,local,,,0,0,100,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,4,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
+http-in,local-https,,,0,5,100,188347,19301096,323070732,171443,0,0,,,,,OPEN,,,,,,,,,1,2,5,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
+www,www,0,0,0,20,20,1719698,672044109,64806076656,,0,,0,5285,22,0,UP,1,1,0,561,84,1036557,3356,,1,3,1,,1715117,,2,0,,45,L7OK,200,5,671,1144889,481714,87038,4,0,,,,,105016,167,,,,,5,OK,,0,5,16,1167,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
+www,bck,0,0,0,10,10,1483,537137,7544118,,0,,0,0,0,0,UP,1,0,1,4,0,5218087,0,,1,3,2,,1371,,2,0,,17,L7OK,200,2,0,629,99,755,0,0,,,,,16,0,,,,,1036557,OK,,756,1,13,1184,,,,Layer7 check passed,,2,5,6,,,,,,http,,,,,,,,
+www,BACKEND,0,25,0,46,100,1721835,674684790,64813732170,314,0,,130,5285,22,0,UP,1,1,1,,0,5218087,0,,1,3,0,,1716488,,1,0,,45,,,,0,1145518,481813,88664,5719,121,,,,1721835,105172,167,35669268059,17250148556,0,556042,5,,,0,5,16,1167,,,,,,,,,,,,,,http,,,,,,,,
+git,www,0,0,0,2,2,14539,5228218,303747244,,0,,0,21,0,0,UP,1,1,0,559,84,1036557,3352,,1,4,1,,9481,,2,0,,2,L7OK,200,3,0,5668,8710,140,0,0,,,,,690,0,,,,,1342,OK,,1268,1,2908,4500,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
+git,bck,0,0,0,0,2,0,0,0,,0,,0,0,0,0,UP,1,0,1,2,0,5218087,0,,1,4,2,,0,,2,0,,0,L7OK,200,2,0,0,0,0,0,0,,,,,0,0,,,,,-1,OK,,0,0,0,0,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
+git,BACKEND,0,6,0,8,2,14541,8082393,303747668,0,0,,2,21,0,0,UP,1,1,1,,0,5218087,0,,1,4,0,,9481,,1,0,,7,,,,0,5668,8710,140,23,0,,,,14541,690,0,133458298,38104818,0,4379,1342,,,1268,1,2908,4500,,,,,,,,,,,,,,http,,,,,,,,
+demo,BACKEND,0,0,1,5,20,24063,7876647,659864417,48,0,,1,0,0,0,UP,0,0,0,,0,5218087,,,1,17,0,,0,,1,1,,26,,,,0,23983,21,0,1,57,,,,24062,111,0,567843278,146884392,0,1083,0,,,2706,0,0,887,,,,,,,,,,,,,,http,,,,,,,,
 `

From 0ce44648cfa6d358f559a90e259dd4fd105a5c30 Mon Sep 17 00:00:00 2001
From: Yaron de Leeuw <me@jarondl.net>
Date: Thu, 2 Feb 2017 09:12:22 -0500
Subject: [PATCH 0112/1302] Procstat: don't cache PIDs (#2206)

* Procstat: don't cache PIDs

Changed the procstat input plugin to not cache PIDs. Solves #1636.
The logic of creating a process by pid was moved from `procstat.go` to
`spec_processor.go`.

* Procstat: go fmt

* procstat: modify changelog for #2206
---
 CHANGELOG.md                              |  2 +
 plugins/inputs/procstat/procstat.go       | 44 +++----------------
 plugins/inputs/procstat/procstat_test.go  |  2 -
 plugins/inputs/procstat/spec_processor.go | 53 +++++++++++++----------
 4 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e348ad47..41ef6e488 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,8 @@ It is highly recommended that all users migrate to the new riemann output plugin
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
+- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods
+- [#1636](https://github.com/influxdata/telegraf/issues/1636): procstat - stop caching PIDs.
 - [#2318](https://github.com/influxdata/telegraf/issues/2318): haproxy input - Add missing fields.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 929490e4a..565d0ebd1 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -8,8 +8,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/process"
-
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -23,15 +21,12 @@ type Procstat struct {
 	User        string
 	PidTag      bool
 
-	// pidmap maps a pid to a process object, so we don't recreate every gather
-	pidmap map[int32]*process.Process
 	// tagmap maps a pid to a map of tags for that pid
 	tagmap map[int32]map[string]string
 }
 
 func NewProcstat() *Procstat {
 	return &Procstat{
-		pidmap: make(map[int32]*process.Process),
 		tagmap: make(map[int32]map[string]string),
 	}
 }
@@ -67,51 +62,26 @@ func (_ *Procstat) Description() string {
 }
 
 func (p *Procstat) Gather(acc telegraf.Accumulator) error {
-	err := p.createProcesses()
+	pids, err := p.getAllPids()
 	if err != nil {
 		log.Printf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
 	} else {
-		for pid, proc := range p.pidmap {
+		for _, pid := range pids {
 			if p.PidTag {
 				p.tagmap[pid]["pid"] = fmt.Sprint(pid)
 			}
-			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, proc, p.tagmap[pid])
-			p.pushMetrics()
+			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, p.tagmap[pid])
+			err := p.pushMetrics()
+			if err != nil {
+				log.Printf("E! Error: procstat: %s", err.Error())
+			}
 		}
 	}
 
 	return nil
 }
 
-func (p *Procstat) createProcesses() error {
-	var errstring string
-	var outerr error
-
-	pids, err := p.getAllPids()
-	if err != nil {
-		errstring += err.Error() + " "
-	}
-
-	for _, pid := range pids {
-		_, ok := p.pidmap[pid]
-		if !ok {
-			proc, err := process.NewProcess(pid)
-			if err == nil {
-				p.pidmap[pid] = proc
-			} else {
-				errstring += err.Error() + " "
-			}
-		}
-	}
-
-	if errstring != "" {
-		outerr = fmt.Errorf("%s", errstring)
-	}
-
-	return outerr
-}
-
 func (p *Procstat) getAllPids() ([]int32, error) {
 	var pids []int32
 	var err error
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index ccc72bdbb..001537178 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/shirou/gopsutil/process"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -24,7 +23,6 @@ func TestGather(t *testing.T) {
 	p := Procstat{
 		PidFile: file.Name(),
 		Prefix:  "foo",
-		pidmap:  make(map[int32]*process.Process),
 		tagmap:  make(map[int32]map[string]string),
 	}
 	p.Gather(&acc)
diff --git a/plugins/inputs/procstat/spec_processor.go b/plugins/inputs/procstat/spec_processor.go
index 3b56fbc3e..1b9f63126 100644
--- a/plugins/inputs/procstat/spec_processor.go
+++ b/plugins/inputs/procstat/spec_processor.go
@@ -1,6 +1,7 @@
 package procstat
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/shirou/gopsutil/process"
@@ -9,12 +10,13 @@ import (
 )
 
 type SpecProcessor struct {
-	Prefix string
-	pid    int32
-	tags   map[string]string
-	fields map[string]interface{}
-	acc    telegraf.Accumulator
-	proc   *process.Process
+	ProcessName string
+	Prefix      string
+	pid         int32
+	tags        map[string]string
+	fields      map[string]interface{}
+	acc         telegraf.Accumulator
+	proc        *process.Process
 }
 
 func NewSpecProcessor(
@@ -22,29 +24,35 @@ func NewSpecProcessor(
 	prefix string,
 	pid int32,
 	acc telegraf.Accumulator,
-	p *process.Process,
 	tags map[string]string,
 ) *SpecProcessor {
-	if processName != "" {
-		tags["process_name"] = processName
-	} else {
-		name, err := p.Name()
-		if err == nil {
-			tags["process_name"] = name
-		}
-	}
 	return &SpecProcessor{
-		Prefix: prefix,
-		pid:    pid,
-		tags:   tags,
-		fields: make(map[string]interface{}),
-		acc:    acc,
-		proc:   p,
+		ProcessName: processName,
+		Prefix:      prefix,
+		pid:         pid,
+		tags:        tags,
+		fields:      make(map[string]interface{}),
+		acc:         acc,
 	}
 }
 
-func (p *SpecProcessor) pushMetrics() {
+func (p *SpecProcessor) pushMetrics() error {
 	var prefix string
+	proc, err := process.NewProcess(p.pid)
+	if err != nil {
+		return fmt.Errorf("Failed to open process with pid '%d'. Error: '%s'",
+			p.pid, err)
+	}
+	p.proc = proc
+	if p.ProcessName != "" {
+		p.tags["process_name"] = p.ProcessName
+	} else {
+		name, err := p.proc.Name()
+		if err == nil {
+			p.tags["process_name"] = name
+		}
+	}
+
 	if p.Prefix != "" {
 		prefix = p.Prefix + "_"
 	}
@@ -107,4 +115,5 @@ func (p *SpecProcessor) pushMetrics() {
 	}
 
 	p.acc.AddFields("procstat", fields, p.tags)
+	return nil
 }

From b3537ef2a8e56f9647c1c281d88e092b651c392c Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Thu, 2 Feb 2017 11:24:03 -0500
Subject: [PATCH 0113/1302] add socket listener & writer (#2094)

closes #1516
closes #1711
closes #1721
closes #1526
---
 CHANGELOG.md                                  |   1 +
 README.md                                     |   2 +
 plugins/inputs/all/all.go                     |   1 +
 .../inputs/socket_listener/socket_listener.go | 240 ++++++++++++++++++
 .../socket_listener/socket_listener_test.go   | 122 +++++++++
 plugins/outputs/all/all.go                    |   1 +
 .../outputs/socket_writer/socket_writer.go    | 106 ++++++++
 .../socket_writer/socket_writer_test.go       | 187 ++++++++++++++
 testutil/accumulator.go                       |  17 +-
 9 files changed, 675 insertions(+), 2 deletions(-)
 create mode 100644 plugins/inputs/socket_listener/socket_listener.go
 create mode 100644 plugins/inputs/socket_listener/socket_listener_test.go
 create mode 100644 plugins/outputs/socket_writer/socket_writer.go
 create mode 100644 plugins/outputs/socket_writer/socket_writer_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ef6e488..7ec1b5737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@ plugins, not just statsd.
 - [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
 - [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 - [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
+- [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index f8a465591..9b8a9ddd1 100644
--- a/README.md
+++ b/README.md
@@ -182,6 +182,7 @@ Telegraf can also collect metrics via the following service plugins:
 * [nsq_consumer](./plugins/inputs/nsq_consumer)
 * [logparser](./plugins/inputs/logparser)
 * [statsd](./plugins/inputs/statsd)
+* [socket_listener](./plugins/inputs/socket_listener)
 * [tail](./plugins/inputs/tail)
 * [tcp_listener](./plugins/inputs/tcp_listener)
 * [udp_listener](./plugins/inputs/udp_listener)
@@ -219,6 +220,7 @@ Telegraf can also collect metrics via the following service plugins:
 * [nsq](./plugins/outputs/nsq)
 * [opentsdb](./plugins/outputs/opentsdb)
 * [prometheus](./plugins/outputs/prometheus_client)
+* [socket_writer](./plugins/outputs/socket_writer)
 * [riemann](./plugins/outputs/riemann)
 * [riemann_legacy](./plugins/outputs/riemann_legacy)
 
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 7846f8c9a..924dffe3d 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -66,6 +66,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
+	_ "github.com/influxdata/telegraf/plugins/inputs/socket_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
new file mode 100644
index 000000000..9d3a8e1fe
--- /dev/null
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -0,0 +1,240 @@
+package socket_listener
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"strings"
+	"sync"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+type setReadBufferer interface {
+	SetReadBuffer(bytes int) error
+}
+
+type streamSocketListener struct {
+	net.Listener
+	*SocketListener
+
+	connections    map[string]net.Conn
+	connectionsMtx sync.Mutex
+}
+
+func (ssl *streamSocketListener) listen() {
+	ssl.connections = map[string]net.Conn{}
+
+	for {
+		c, err := ssl.Accept()
+		if err != nil {
+			ssl.AddError(err)
+			break
+		}
+
+		ssl.connectionsMtx.Lock()
+		if ssl.MaxConnections > 0 && len(ssl.connections) >= ssl.MaxConnections {
+			ssl.connectionsMtx.Unlock()
+			c.Close()
+			continue
+		}
+		ssl.connections[c.RemoteAddr().String()] = c
+		ssl.connectionsMtx.Unlock()
+		go ssl.read(c)
+	}
+
+	ssl.connectionsMtx.Lock()
+	for _, c := range ssl.connections {
+		c.Close()
+	}
+	ssl.connectionsMtx.Unlock()
+}
+
+func (ssl *streamSocketListener) removeConnection(c net.Conn) {
+	ssl.connectionsMtx.Lock()
+	delete(ssl.connections, c.RemoteAddr().String())
+	ssl.connectionsMtx.Unlock()
+}
+
+func (ssl *streamSocketListener) read(c net.Conn) {
+	defer ssl.removeConnection(c)
+	defer c.Close()
+
+	scnr := bufio.NewScanner(c)
+	for scnr.Scan() {
+		metrics, err := ssl.Parse(scnr.Bytes())
+		if err != nil {
+			ssl.AddError(fmt.Errorf("unable to parse incoming line"))
+			//TODO rate limit
+			continue
+		}
+		for _, m := range metrics {
+			ssl.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+		}
+	}
+
+	if err := scnr.Err(); err != nil {
+		ssl.AddError(err)
+	}
+}
+
+type packetSocketListener struct {
+	net.PacketConn
+	*SocketListener
+}
+
+func (psl *packetSocketListener) listen() {
+	buf := make([]byte, 64*1024) // 64kb - maximum size of IP packet
+	for {
+		n, _, err := psl.ReadFrom(buf)
+		if err != nil {
+			psl.AddError(err)
+			break
+		}
+
+		metrics, err := psl.Parse(buf[:n])
+		if err != nil {
+			psl.AddError(fmt.Errorf("unable to parse incoming packet"))
+			//TODO rate limit
+			continue
+		}
+		for _, m := range metrics {
+			psl.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+		}
+	}
+}
+
+type SocketListener struct {
+	ServiceAddress string
+	MaxConnections int
+	ReadBufferSize int
+
+	parsers.Parser
+	telegraf.Accumulator
+	io.Closer
+}
+
+func (sl *SocketListener) Description() string {
+	return "Generic socket listener capable of handling multiple socket types."
+}
+
+func (sl *SocketListener) SampleConfig() string {
+	return `
+  ## URL to listen on
+  # service_address = "tcp://:8094"
+  # service_address = "tcp://127.0.0.1:http"
+  # service_address = "tcp4://:8094"
+  # service_address = "tcp6://:8094"
+  # service_address = "tcp6://[2001:db8::1]:8094"
+  # service_address = "udp://:8094"
+  # service_address = "udp4://:8094"
+  # service_address = "udp6://:8094"
+  # service_address = "unix:///tmp/telegraf.sock"
+  # service_address = "unixgram:///tmp/telegraf.sock"
+
+  ## Maximum number of concurrent connections.
+  ## Only applies to stream sockets (e.g. TCP).
+  ## 0 (default) is unlimited.
+  # max_connections = 1024
+
+  ## Maximum socket buffer size in bytes.
+  ## For stream sockets, once the buffer fills up, the sender will start backing up.
+  ## For datagram sockets, once the buffer fills up, metrics will start dropping.
+  ## Defaults to the OS default.
+  # read_buffer_size = 65535
+
+  ## Data format to consume.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+`
+}
+
+func (sl *SocketListener) Gather(_ telegraf.Accumulator) error {
+	return nil
+}
+
+func (sl *SocketListener) SetParser(parser parsers.Parser) {
+	sl.Parser = parser
+}
+
+func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
+	sl.Accumulator = acc
+	spl := strings.SplitN(sl.ServiceAddress, "://", 2)
+	if len(spl) != 2 {
+		return fmt.Errorf("invalid service address: %s", sl.ServiceAddress)
+	}
+
+	switch spl[0] {
+	case "tcp", "tcp4", "tcp6", "unix", "unixpacket":
+		l, err := net.Listen(spl[0], spl[1])
+		if err != nil {
+			return err
+		}
+
+		if sl.ReadBufferSize > 0 {
+			if srb, ok := l.(setReadBufferer); ok {
+				srb.SetReadBuffer(sl.ReadBufferSize)
+			} else {
+				log.Printf("W! Unable to set read buffer on a %s socket", spl[0])
+			}
+		}
+
+		ssl := &streamSocketListener{
+			Listener:       l,
+			SocketListener: sl,
+		}
+
+		sl.Closer = ssl
+		go ssl.listen()
+	case "udp", "udp4", "udp6", "ip", "ip4", "ip6", "unixgram":
+		pc, err := net.ListenPacket(spl[0], spl[1])
+		if err != nil {
+			return err
+		}
+
+		if sl.ReadBufferSize > 0 {
+			if srb, ok := pc.(setReadBufferer); ok {
+				srb.SetReadBuffer(sl.ReadBufferSize)
+			} else {
+				log.Printf("W! Unable to set read buffer on a %s socket", spl[0])
+			}
+		}
+
+		psl := &packetSocketListener{
+			PacketConn:     pc,
+			SocketListener: sl,
+		}
+
+		sl.Closer = psl
+		go psl.listen()
+	default:
+		return fmt.Errorf("unknown protocol '%s' in '%s'", spl[0], sl.ServiceAddress)
+	}
+
+	return nil
+}
+
+func (sl *SocketListener) Stop() {
+	if sl.Closer != nil {
+		sl.Close()
+		sl.Closer = nil
+	}
+}
+
+func newSocketListener() *SocketListener {
+	parser, _ := parsers.NewInfluxParser()
+
+	return &SocketListener{
+		Parser: parser,
+	}
+}
+
+func init() {
+	inputs.Add("socket_listener", func() telegraf.Input { return newSocketListener() })
+}
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
new file mode 100644
index 000000000..6764b6d2d
--- /dev/null
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -0,0 +1,122 @@
+package socket_listener
+
+import (
+	"net"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSocketListener_tcp(t *testing.T) {
+	sl := newSocketListener()
+	sl.ServiceAddress = "tcp://127.0.0.1:0"
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+
+	client, err := net.Dial("tcp", sl.Closer.(net.Listener).Addr().String())
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, client)
+}
+
+func TestSocketListener_udp(t *testing.T) {
+	sl := newSocketListener()
+	sl.ServiceAddress = "udp://127.0.0.1:0"
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+
+	client, err := net.Dial("udp", sl.Closer.(net.PacketConn).LocalAddr().String())
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, client)
+}
+
+func TestSocketListener_unix(t *testing.T) {
+	defer os.Remove("/tmp/telegraf_test.sock")
+	sl := newSocketListener()
+	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+
+	client, err := net.Dial("unix", "/tmp/telegraf_test.sock")
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, client)
+}
+
+func TestSocketListener_unixgram(t *testing.T) {
+	defer os.Remove("/tmp/telegraf_test.sock")
+	sl := newSocketListener()
+	sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock"
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+
+	client, err := net.Dial("unixgram", "/tmp/telegraf_test.sock")
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, client)
+}
+
+func testSocketListener(t *testing.T, sl *SocketListener, client net.Conn) {
+	mstr12 := "test,foo=bar v=1i 123456789\ntest,foo=baz v=2i 123456790\n"
+	mstr3 := "test,foo=zab v=3i 123456791"
+	client.Write([]byte(mstr12))
+	client.Write([]byte(mstr3))
+	if _, ok := client.(net.Conn); ok {
+		// stream connection. needs trailing newline to terminate mstr3
+		client.Write([]byte{'\n'})
+	}
+
+	acc := sl.Accumulator.(*testutil.Accumulator)
+
+	acc.Lock()
+	if len(acc.Metrics) < 1 {
+		acc.Wait()
+	}
+	require.True(t, len(acc.Metrics) >= 1)
+	m := acc.Metrics[0]
+	acc.Unlock()
+
+	assert.Equal(t, "test", m.Measurement)
+	assert.Equal(t, map[string]string{"foo": "bar"}, m.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(1)}, m.Fields)
+	assert.True(t, time.Unix(0, 123456789).Equal(m.Time))
+
+	acc.Lock()
+	if len(acc.Metrics) < 2 {
+		acc.Wait()
+	}
+	require.True(t, len(acc.Metrics) >= 2)
+	m = acc.Metrics[1]
+	acc.Unlock()
+
+	assert.Equal(t, "test", m.Measurement)
+	assert.Equal(t, map[string]string{"foo": "baz"}, m.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(2)}, m.Fields)
+	assert.True(t, time.Unix(0, 123456790).Equal(m.Time))
+
+	acc.Lock()
+	if len(acc.Metrics) < 3 {
+		acc.Wait()
+	}
+	require.True(t, len(acc.Metrics) >= 3)
+	m = acc.Metrics[2]
+	acc.Unlock()
+
+	assert.Equal(t, "test", m.Measurement)
+	assert.Equal(t, map[string]string{"foo": "zab"}, m.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(3)}, m.Fields)
+	assert.True(t, time.Unix(0, 123456791).Equal(m.Time))
+}
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index c10e00f78..eec2b95e3 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -21,4 +21,5 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/prometheus_client"
 	_ "github.com/influxdata/telegraf/plugins/outputs/riemann"
 	_ "github.com/influxdata/telegraf/plugins/outputs/riemann_legacy"
+	_ "github.com/influxdata/telegraf/plugins/outputs/socket_writer"
 )
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
new file mode 100644
index 000000000..2c54bb0bb
--- /dev/null
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -0,0 +1,106 @@
+package socket_writer
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/influxdata/telegraf/plugins/serializers"
+)
+
+type SocketWriter struct {
+	Address string
+
+	serializers.Serializer
+
+	net.Conn
+}
+
+func (sw *SocketWriter) Description() string {
+	return "Generic socket writer capable of handling multiple socket types."
+}
+
+func (sw *SocketWriter) SampleConfig() string {
+	return `
+  ## URL to connect to
+  # address = "tcp://127.0.0.1:8094"
+  # address = "tcp://example.com:http"
+  # address = "tcp4://127.0.0.1:8094"
+  # address = "tcp6://127.0.0.1:8094"
+  # address = "tcp6://[2001:db8::1]:8094"
+  # address = "udp://127.0.0.1:8094"
+  # address = "udp4://127.0.0.1:8094"
+  # address = "udp6://127.0.0.1:8094"
+  # address = "unix:///tmp/telegraf.sock"
+  # address = "unixgram:///tmp/telegraf.sock"
+
+  ## Data format to generate.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+`
+}
+
+func (sw *SocketWriter) SetSerializer(s serializers.Serializer) {
+	sw.Serializer = s
+}
+
+func (sw *SocketWriter) Connect() error {
+	spl := strings.SplitN(sw.Address, "://", 2)
+	if len(spl) != 2 {
+		return fmt.Errorf("invalid address: %s", sw.Address)
+	}
+
+	c, err := net.Dial(spl[0], spl[1])
+	if err != nil {
+		return err
+	}
+
+	sw.Conn = c
+	return nil
+}
+
+// Write writes the given metrics to the destination.
+// If an error is encountered, it is up to the caller to retry the same write again later.
+// Not parallel safe.
+func (sw *SocketWriter) Write(metrics []telegraf.Metric) error {
+	if sw.Conn == nil {
+		// previous write failed with permanent error and socket was closed.
+		if err := sw.Connect(); err != nil {
+			return err
+		}
+	}
+
+	for _, m := range metrics {
+		bs, err := sw.Serialize(m)
+		if err != nil {
+			//TODO log & keep going with remaining metrics
+			return err
+		}
+		if _, err := sw.Conn.Write(bs); err != nil {
+			//TODO log & keep going with remaining strings
+			if err, ok := err.(net.Error); !ok || !err.Temporary() {
+				// permanent error. close the connection
+				sw.Close()
+				sw.Conn = nil
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func newSocketWriter() *SocketWriter {
+	s, _ := serializers.NewInfluxSerializer()
+	return &SocketWriter{
+		Serializer: s,
+	}
+}
+
+func init() {
+	outputs.Add("socket_writer", func() telegraf.Output { return newSocketWriter() })
+}
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
new file mode 100644
index 000000000..3ab9d1e34
--- /dev/null
+++ b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -0,0 +1,187 @@
+package socket_writer
+
+import (
+	"bufio"
+	"bytes"
+	"net"
+	"os"
+	"sync"
+	"testing"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSocketWriter_tcp(t *testing.T) {
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "tcp://" + listener.Addr().String()
+
+	err = sw.Connect()
+	require.NoError(t, err)
+
+	lconn, err := listener.Accept()
+	require.NoError(t, err)
+
+	testSocketWriter_stream(t, sw, lconn)
+}
+
+func TestSocketWriter_udp(t *testing.T) {
+	listener, err := net.ListenPacket("udp", "127.0.0.1:0")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "udp://" + listener.LocalAddr().String()
+
+	err = sw.Connect()
+	require.NoError(t, err)
+
+	testSocketWriter_packet(t, sw, listener)
+}
+
+func TestSocketWriter_unix(t *testing.T) {
+	defer os.Remove("/tmp/telegraf_test.sock")
+	listener, err := net.Listen("unix", "/tmp/telegraf_test.sock")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "unix:///tmp/telegraf_test.sock"
+
+	err = sw.Connect()
+	require.NoError(t, err)
+
+	lconn, err := listener.Accept()
+	require.NoError(t, err)
+
+	testSocketWriter_stream(t, sw, lconn)
+}
+
+func TestSocketWriter_unixgram(t *testing.T) {
+	defer os.Remove("/tmp/telegraf_test.sock")
+	listener, err := net.ListenPacket("unixgram", "/tmp/telegraf_test.sock")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "unixgram:///tmp/telegraf_test.sock"
+
+	err = sw.Connect()
+	require.NoError(t, err)
+
+	testSocketWriter_packet(t, sw, listener)
+}
+
+func testSocketWriter_stream(t *testing.T, sw *SocketWriter, lconn net.Conn) {
+	metrics := []telegraf.Metric{}
+	metrics = append(metrics, testutil.TestMetric(1, "test"))
+	mbs1out, _ := sw.Serialize(metrics[0])
+	metrics = append(metrics, testutil.TestMetric(2, "test"))
+	mbs2out, _ := sw.Serialize(metrics[1])
+
+	err := sw.Write(metrics)
+	require.NoError(t, err)
+
+	scnr := bufio.NewScanner(lconn)
+	require.True(t, scnr.Scan())
+	mstr1in := scnr.Text() + "\n"
+	require.True(t, scnr.Scan())
+	mstr2in := scnr.Text() + "\n"
+
+	assert.Equal(t, string(mbs1out), mstr1in)
+	assert.Equal(t, string(mbs2out), mstr2in)
+}
+
+func testSocketWriter_packet(t *testing.T, sw *SocketWriter, lconn net.PacketConn) {
+	metrics := []telegraf.Metric{}
+	metrics = append(metrics, testutil.TestMetric(1, "test"))
+	mbs1out, _ := sw.Serialize(metrics[0])
+	metrics = append(metrics, testutil.TestMetric(2, "test"))
+	mbs2out, _ := sw.Serialize(metrics[1])
+
+	err := sw.Write(metrics)
+	require.NoError(t, err)
+
+	buf := make([]byte, 256)
+	var mstrins []string
+	for len(mstrins) < 2 {
+		n, _, err := lconn.ReadFrom(buf)
+		require.NoError(t, err)
+		for _, bs := range bytes.Split(buf[:n], []byte{'\n'}) {
+			if len(bs) == 0 {
+				continue
+			}
+			mstrins = append(mstrins, string(bs)+"\n")
+		}
+	}
+	require.Len(t, mstrins, 2)
+
+	assert.Equal(t, string(mbs1out), mstrins[0])
+	assert.Equal(t, string(mbs2out), mstrins[1])
+}
+
+func TestSocketWriter_Write_err(t *testing.T) {
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "tcp://" + listener.Addr().String()
+
+	err = sw.Connect()
+	require.NoError(t, err)
+	sw.Conn.(*net.TCPConn).SetReadBuffer(256)
+
+	lconn, err := listener.Accept()
+	require.NoError(t, err)
+	lconn.(*net.TCPConn).SetWriteBuffer(256)
+
+	metrics := []telegraf.Metric{testutil.TestMetric(1, "testerr")}
+
+	// close the socket to generate an error
+	lconn.Close()
+	sw.Close()
+	err = sw.Write(metrics)
+	require.Error(t, err)
+	assert.Nil(t, sw.Conn)
+}
+
+func TestSocketWriter_Write_reconnect(t *testing.T) {
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+
+	sw := newSocketWriter()
+	sw.Address = "tcp://" + listener.Addr().String()
+
+	err = sw.Connect()
+	require.NoError(t, err)
+	sw.Conn.(*net.TCPConn).SetReadBuffer(256)
+
+	lconn, err := listener.Accept()
+	require.NoError(t, err)
+	lconn.(*net.TCPConn).SetWriteBuffer(256)
+	lconn.Close()
+	sw.Conn = nil
+
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+	var lerr error
+	go func() {
+		lconn, lerr = listener.Accept()
+		wg.Done()
+	}()
+
+	metrics := []telegraf.Metric{testutil.TestMetric(1, "testerr")}
+	err = sw.Write(metrics)
+	require.NoError(t, err)
+
+	wg.Wait()
+	assert.NoError(t, lerr)
+
+	mbsout, _ := sw.Serialize(metrics[0])
+	buf := make([]byte, 256)
+	n, err := lconn.Read(buf)
+	require.NoError(t, err)
+	assert.Equal(t, string(mbsout), string(buf[:n]))
+}
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 4f131ec8f..25e60920b 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -29,6 +29,7 @@ func (p *Metric) String() string {
 // Accumulator defines a mocked out accumulator
 type Accumulator struct {
 	sync.Mutex
+	*sync.Cond
 
 	Metrics  []*Metric
 	nMetrics uint64
@@ -56,11 +57,14 @@ func (a *Accumulator) AddFields(
 	timestamp ...time.Time,
 ) {
 	atomic.AddUint64(&a.nMetrics, 1)
+	a.Lock()
+	defer a.Unlock()
+	if a.Cond != nil {
+		a.Cond.Broadcast()
+	}
 	if a.Discard {
 		return
 	}
-	a.Lock()
-	defer a.Unlock()
 	if tags == nil {
 		tags = map[string]string{}
 	}
@@ -171,6 +175,15 @@ func (a *Accumulator) NFields() int {
 	return counter
 }
 
+// Wait waits for a metric to be added to the accumulator.
+// Accumulator must already be locked.
+func (a *Accumulator) Wait() {
+	if a.Cond == nil {
+		a.Cond = sync.NewCond(&a.Mutex)
+	}
+	a.Cond.Wait()
+}
+
 func (a *Accumulator) AssertContainsTaggedFields(
 	t *testing.T,
 	measurement string,

From dfb4038654af897d2213d4d306cba1bf2fae914e Mon Sep 17 00:00:00 2001
From: Nick Irvine <nfirvine@nfirvine.com>
Date: Fri, 3 Feb 2017 02:02:19 -0800
Subject: [PATCH 0114/1302] Remove pidfile if pidfile was created (#2358)

Also, ensure pidfile perms are 644
---
 cmd/telegraf/telegraf.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index a3631d38a..16f7845d0 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -194,14 +194,21 @@ func reloadLoop(
 		log.Printf("I! Tags enabled: %s", c.ListTags())
 
 		if *fPidfile != "" {
-			f, err := os.Create(*fPidfile)
+			f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644)
 			if err != nil {
-				log.Fatalf("E! Unable to create pidfile: %s", err)
+				log.Printf("E! Unable to create pidfile: %s", err)
+			} else {
+				fmt.Fprintf(f, "%d\n", os.Getpid())
+
+				f.Close()
+
+				defer func() {
+					err := os.Remove(*fPidfile)
+					if err != nil {
+						log.Printf("E! Unable to remove pidfile: %s", err)
+					}
+				}()
 			}
-
-			fmt.Fprintf(f, "%d\n", os.Getpid())
-
-			f.Close()
 		}
 
 		ag.Run(shutdown)

From 1c4673e90086605909b7cf99a2931c82d67c49cb Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 3 Feb 2017 10:04:50 +0000
Subject: [PATCH 0115/1302] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ec1b5737..62f693c55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
+- [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
 
 ## v1.2.1 [2017-02-01]
 

From b1945c0493a482aff480610fc86071abd2b33ad3 Mon Sep 17 00:00:00 2001
From: Cosmo Petrich <cosmo.petrich@invoice2go.com>
Date: Mon, 30 Jan 2017 09:28:52 +1100
Subject: [PATCH 0116/1302] Increment gather_errors for all input errors

closes #2339
---
 CHANGELOG.md   | 1 +
 agent/agent.go | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f693c55..3cdd544d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
 - [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
 - [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
+- [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
 
 ### Bugfixes
 
diff --git a/agent/agent.go b/agent/agent.go
index a9e42643a..192e8c112 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -157,13 +157,13 @@ func gatherWithTimeout(
 		select {
 		case err := <-done:
 			if err != nil {
-				log.Printf("E! ERROR in input [%s]: %s", input.Name(), err)
+				acc.AddError(err)
 			}
 			return
 		case <-ticker.C:
-			log.Printf("E! ERROR: input [%s] took longer to collect than "+
-				"collection interval (%s)",
-				input.Name(), timeout)
+			err := fmt.Errorf("took longer to collect than collection interval (%s)",
+				timeout)
+			acc.AddError(err)
 			continue
 		case <-shutdown:
 			return

From 694955c87bde9320148544783936947ae337272e Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 3 Feb 2017 16:41:45 +0000
Subject: [PATCH 0117/1302] Remove metric.Point from metric interface

---
 Godeps                |  1 -
 metric.go             |  7 -------
 metric/metric.go      |  8 --------
 metric/metric_test.go | 20 --------------------
 4 files changed, 36 deletions(-)

diff --git a/Godeps b/Godeps
index 5443c1039..d2293e142 100644
--- a/Godeps
+++ b/Godeps
@@ -26,7 +26,6 @@ github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
 github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92
-github.com/influxdata/influxdb 2fe8ed308439a98a9b01943939b44048ed952c90
 github.com/influxdata/toml ad49a5c2936f96b8f5943c3fdba47630ccf45a0d
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
diff --git a/metric.go b/metric.go
index b1ab1b29f..fc479b51d 100644
--- a/metric.go
+++ b/metric.go
@@ -2,9 +2,6 @@ package telegraf
 
 import (
 	"time"
-
-	// TODO remove
-	"github.com/influxdata/influxdb/client/v2"
 )
 
 // ValueType is an enumeration of metric types that represent a simple value.
@@ -62,8 +59,4 @@ type Metric interface {
 	// aggregator things:
 	SetAggregate(bool)
 	IsAggregate() bool
-
-	// Point returns a influxdb client.Point object
-	// TODO remove this function
-	Point() *client.Point
 }
diff --git a/metric/metric.go b/metric/metric.go
index 936d0907e..0a2ca41b6 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -9,9 +9,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-
-	// TODO remove
-	"github.com/influxdata/influxdb/client/v2"
 )
 
 const MaxInt = int(^uint(0) >> 1)
@@ -137,11 +134,6 @@ type metric struct {
 	nsec   int64
 }
 
-func (m *metric) Point() *client.Point {
-	c, _ := client.NewPoint(m.Name(), m.Tags(), m.Fields(), m.Time())
-	return c
-}
-
 func (m *metric) String() string {
 	return string(m.name) + string(m.tags) + " " + string(m.fields) + " " + string(m.t) + "\n"
 }
diff --git a/metric/metric_test.go b/metric/metric_test.go
index 65b4b0fba..f133a507c 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -595,26 +595,6 @@ func TestNewMetricAggregate(t *testing.T) {
 	assert.True(t, m.IsAggregate())
 }
 
-func TestNewMetricPoint(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	p := m.Point()
-	pfields, _ := p.Fields()
-
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, fields, pfields)
-	assert.Equal(t, "cpu", p.Name())
-}
-
 func TestNewMetricString(t *testing.T) {
 	now := time.Now()
 

From c8cc01ba6a27a68a5d161152d9323d3e801edfbd Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 2 Feb 2017 17:06:41 +0000
Subject: [PATCH 0118/1302] deprecate udp_listener & tcp_listener

---
 CHANGELOG.md                                |   8 +-
 README.md                                   |   8 +-
 plugins/inputs/socket_listener/README.md    | 112 ++++++++++++++++++++
 plugins/inputs/tcp_listener/README.md       |  30 +-----
 plugins/inputs/tcp_listener/tcp_listener.go |  22 ++--
 plugins/inputs/udp_listener/README.md       |  86 +--------------
 plugins/inputs/udp_listener/udp_listener.go |  23 ++--
 7 files changed, 142 insertions(+), 147 deletions(-)
 create mode 100644 plugins/inputs/socket_listener/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cdd544d0..283c5ccba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,8 +27,15 @@ The previous riemann output will still be available using
 `outputs.riemann_legacy` if needed, but that will eventually be deprecated.
 It is highly recommended that all users migrate to the new riemann output plugin.
 
+- Generic [socket_listener](./plugins/inputs/socket_listener) and
+[socket_writer](./plugins/outputs/socket_writer) plugins have been implemented
+for receiving and sending UDP, TCP, unix, & unix-datagram data. These plugins
+will replace udp_listener and tcp_listener, which are still available but will
+be deprecated eventually.
+
 ### Features
 
+- [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
 - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin.
@@ -112,7 +119,6 @@ plugins, not just statsd.
 - [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
 - [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 - [#2255](https://github.com/influxdata/telegraf/pull/2255): Allow changing jolokia attribute delimiter
-- [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9b8a9ddd1..462076dca 100644
--- a/README.md
+++ b/README.md
@@ -184,8 +184,8 @@ Telegraf can also collect metrics via the following service plugins:
 * [statsd](./plugins/inputs/statsd)
 * [socket_listener](./plugins/inputs/socket_listener)
 * [tail](./plugins/inputs/tail)
-* [tcp_listener](./plugins/inputs/tcp_listener)
-* [udp_listener](./plugins/inputs/udp_listener)
+* [tcp_listener](./plugins/inputs/socket_listener)
+* [udp_listener](./plugins/inputs/socket_listener)
 * [webhooks](./plugins/inputs/webhooks)
   * [filestack](./plugins/inputs/webhooks/filestack)
   * [github](./plugins/inputs/webhooks/github)
@@ -220,9 +220,11 @@ Telegraf can also collect metrics via the following service plugins:
 * [nsq](./plugins/outputs/nsq)
 * [opentsdb](./plugins/outputs/opentsdb)
 * [prometheus](./plugins/outputs/prometheus_client)
-* [socket_writer](./plugins/outputs/socket_writer)
 * [riemann](./plugins/outputs/riemann)
 * [riemann_legacy](./plugins/outputs/riemann_legacy)
+* [socket_writer](./plugins/outputs/socket_writer)
+* [tcp](./plugins/outputs/socket_writer)
+* [udp](./plugins/outputs/socket_writer)
 
 ## Contributing
 
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
new file mode 100644
index 000000000..e73296804
--- /dev/null
+++ b/plugins/inputs/socket_listener/README.md
@@ -0,0 +1,112 @@
+# socket listener service input plugin
+
+The Socket Listener is a service input plugin that listens for messages from
+streaming (tcp, unix) or datagram (udp, unixgram) protocols.
+
+The plugin expects messages in the
+[Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
+
+### Configuration:
+
+This is a sample configuration for the plugin.
+
+```toml
+# Generic socket listener capable of handling multiple socket types.
+[[inputs.socket_listener]]
+  ## URL to listen on
+  # service_address = "tcp://:8094"
+  # service_address = "tcp://127.0.0.1:http"
+  # service_address = "tcp4://:8094"
+  # service_address = "tcp6://:8094"
+  # service_address = "tcp6://[2001:db8::1]:8094"
+  # service_address = "udp://:8094"
+  # service_address = "udp4://:8094"
+  # service_address = "udp6://:8094"
+  # service_address = "unix:///tmp/telegraf.sock"
+  # service_address = "unixgram:///tmp/telegraf.sock"
+
+  ## Maximum number of concurrent connections.
+  ## Only applies to stream sockets (e.g. TCP).
+  ## 0 (default) is unlimited.
+  # max_connections = 1024
+
+  ## Maximum socket buffer size in bytes.
+  ## For stream sockets, once the buffer fills up, the sender will start backing up.
+  ## For datagram sockets, once the buffer fills up, metrics will start dropping.
+  ## Defaults to the OS default.
+  # read_buffer_size = 65535
+
+  ## Data format to consume.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+```
+
+## A Note on UDP OS Buffer Sizes
+
+The `read_buffer_size` config option can be used to adjust the size of the socket
+buffer, but this number is limited by OS settings. On Linux, `read_buffer_size`
+will default to `rmem_default` and will be capped by `rmem_max`. On BSD systems,
+`read_buffer_size` is capped by `maxsockbuf`, and there is no OS default
+setting.
+
+Instructions on how to adjust these OS settings are available below.
+
+Some OSes (most notably, Linux) place very restricive limits on the performance
+of UDP protocols. It is _highly_ recommended that you increase these OS limits to
+at least 8MB before trying to run large amounts of UDP traffic to your instance.
+8MB is just a recommendation, and can be adjusted higher.
+
+### Linux
+Check the current UDP/IP receive buffer limit & default by typing the following
+commands:
+
+```
+sysctl net.core.rmem_max
+sysctl net.core.rmem_default
+```
+
+If the values are less than 8388608 bytes you should add the following lines to
+the /etc/sysctl.conf file:
+
+```
+net.core.rmem_max=8388608
+net.core.rmem_default=8388608
+```
+
+Changes to /etc/sysctl.conf do not take effect until reboot.
+To update the values immediately, type the following commands as root:
+
+```
+sysctl -w net.core.rmem_max=8388608
+sysctl -w net.core.rmem_default=8388608
+```
+
+### BSD/Darwin
+
+On BSD/Darwin systems you need to add about a 15% padding to the kernel limit
+socket buffer. Meaning if you want an 8MB buffer (8388608 bytes) you need to set
+the kernel limit to `8388608*1.15 = 9646900`. This is not documented anywhere but
+happens
+[in the kernel here.](https://github.com/freebsd/freebsd/blob/master/sys/kern/uipc_sockbuf.c#L63-L64)
+
+Check the current UDP/IP buffer limit by typing the following command:
+
+```
+sysctl kern.ipc.maxsockbuf
+```
+
+If the value is less than 9646900 bytes you should add the following lines
+to the /etc/sysctl.conf file (create it if necessary):
+
+```
+kern.ipc.maxsockbuf=9646900
+```
+
+Changes to /etc/sysctl.conf do not take effect until reboot.
+To update the values immediately, type the following command as root:
+
+```
+sysctl -w kern.ipc.maxsockbuf=9646900
+```
diff --git a/plugins/inputs/tcp_listener/README.md b/plugins/inputs/tcp_listener/README.md
index 0066ea801..f858c7179 100644
--- a/plugins/inputs/tcp_listener/README.md
+++ b/plugins/inputs/tcp_listener/README.md
@@ -1,30 +1,4 @@
 # TCP listener service input plugin
 
-The TCP listener is a service input plugin that listens for messages on a TCP
-socket and adds those messages to InfluxDB.
-The plugin expects messages in the
-[Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
-
-### Configuration:
-
-This is a sample configuration for the plugin.
-
-```toml
-# Generic TCP listener
-[[inputs.tcp_listener]]
-  ## Address and port to host TCP listener on
-  service_address = ":8094"
-
-  ## Number of TCP messages allowed to queue up. Once filled, the
-  ## TCP listener will start dropping packets.
-  allowed_pending_messages = 10000
-
-  ## Maximum number of concurrent TCP connections to allow
-  max_tcp_connections = 250
-
-  ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
-```
+> DEPRECATED: As of version 1.3 the TCP listener plugin has been deprecated in favor of the
+> [socket_listener plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)
diff --git a/plugins/inputs/tcp_listener/tcp_listener.go b/plugins/inputs/tcp_listener/tcp_listener.go
index 3ce4d87b4..544f36bd6 100644
--- a/plugins/inputs/tcp_listener/tcp_listener.go
+++ b/plugins/inputs/tcp_listener/tcp_listener.go
@@ -58,21 +58,9 @@ var malformedwarn = "E! tcp_listener has received %d malformed packets" +
 	" thus far."
 
 const sampleConfig = `
-  ## Address and port to host TCP listener on
-  # service_address = ":8094"
-
-  ## Number of TCP messages allowed to queue up. Once filled, the
-  ## TCP listener will start dropping packets.
-  # allowed_pending_messages = 10000
-
-  ## Maximum number of concurrent TCP connections to allow
-  # max_tcp_connections = 250
-
-  ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
+  # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+  # socket_listener plugin
+  # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 `
 
 func (t *TcpListener) SampleConfig() string {
@@ -98,6 +86,10 @@ func (t *TcpListener) Start(acc telegraf.Accumulator) error {
 	t.Lock()
 	defer t.Unlock()
 
+	log.Println("W! DEPRECATED: the TCP listener plugin has been deprecated " +
+		"in favor of the socket_listener plugin " +
+		"(https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)")
+
 	tags := map[string]string{
 		"address": t.ServiceAddress,
 	}
diff --git a/plugins/inputs/udp_listener/README.md b/plugins/inputs/udp_listener/README.md
index ee675f535..6228090b6 100644
--- a/plugins/inputs/udp_listener/README.md
+++ b/plugins/inputs/udp_listener/README.md
@@ -1,86 +1,4 @@
 # UDP listener service input plugin
 
-The UDP listener is a service input plugin that listens for messages on a UDP
-socket and adds those messages to InfluxDB.
-The plugin expects messages in the
-[Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
-
-### Configuration:
-
-This is a sample configuration for the plugin.
-
-```toml
-[[inputs.udp_listener]]
-  ## Address and port to host UDP listener on
-  service_address = ":8092"
-
-  ## Number of UDP messages allowed to queue up. Once filled, the
-  ## UDP listener will start dropping packets.
-  allowed_pending_messages = 10000
-
-  ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
-```
-
-## A Note on UDP OS Buffer Sizes
-
-Some OSes (most notably, Linux) place very restricive limits on the performance
-of UDP protocols. It is _highly_ recommended that you increase these OS limits to
-at least 8MB before trying to run large amounts of UDP traffic to your instance.
-8MB is just a recommendation, and can be adjusted higher.
-
-### Linux
-Check the current UDP/IP receive buffer limit & default by typing the following
-commands:
-
-```
-sysctl net.core.rmem_max
-sysctl net.core.rmem_default
-```
-
-If the values are less than 8388608 bytes you should add the following lines to
-the /etc/sysctl.conf file:
-
-```
-net.core.rmem_max=8388608
-net.core.rmem_default=8388608
-```
-
-Changes to /etc/sysctl.conf do not take effect until reboot.
-To update the values immediately, type the following commands as root:
-
-```
-sysctl -w net.core.rmem_max=8388608
-sysctl -w net.core.rmem_default=8388608
-```
-
-### BSD/Darwin
-
-On BSD/Darwin systems you need to add about a 15% padding to the kernel limit
-socket buffer. Meaning if you want an 8MB buffer (8388608 bytes) you need to set
-the kernel limit to `8388608*1.15 = 9646900`. This is not documented anywhere but
-happens
-[in the kernel here.](https://github.com/freebsd/freebsd/blob/master/sys/kern/uipc_sockbuf.c#L63-L64)
-
-Check the current UDP/IP buffer limit by typing the following command:
-
-```
-sysctl kern.ipc.maxsockbuf
-```
-
-If the value is less than 9646900 bytes you should add the following lines
-to the /etc/sysctl.conf file (create it if necessary):
-
-```
-kern.ipc.maxsockbuf=9646900
-```
-
-Changes to /etc/sysctl.conf do not take effect until reboot.
-To update the values immediately, type the following commands as root:
-
-```
-sysctl -w kern.ipc.maxsockbuf=9646900
-```
+> DEPRECATED: As of version 1.3 the UDP listener plugin has been deprecated in favor of the
+> [socket_listener plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)
diff --git a/plugins/inputs/udp_listener/udp_listener.go b/plugins/inputs/udp_listener/udp_listener.go
index 518a3fe48..53c6a72f5 100644
--- a/plugins/inputs/udp_listener/udp_listener.go
+++ b/plugins/inputs/udp_listener/udp_listener.go
@@ -66,22 +66,9 @@ var malformedwarn = "E! udp_listener has received %d malformed packets" +
 	" thus far."
 
 const sampleConfig = `
-  ## Address and port to host UDP listener on
-  # service_address = ":8092"
-
-  ## Number of UDP messages allowed to queue up. Once filled, the
-  ## UDP listener will start dropping packets.
-  # allowed_pending_messages = 10000
-
-  ## Set the buffer size of the UDP connection outside of OS default (in bytes)
-  ## If set to 0, take OS default
-  udp_buffer_size = 16777216
-
-  ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "influx"
+  # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+  # socket_listener plugin
+  # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 `
 
 func (u *UdpListener) SampleConfig() string {
@@ -106,6 +93,10 @@ func (u *UdpListener) Start(acc telegraf.Accumulator) error {
 	u.Lock()
 	defer u.Unlock()
 
+	log.Println("W! DEPRECATED: the UDP listener plugin has been deprecated " +
+		"in favor of the socket_listener plugin " +
+		"(https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)")
+
 	tags := map[string]string{
 		"address": u.ServiceAddress,
 	}

From f05fac74cbf6d5c1642838062a82998f17f0f1f0 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 10 Feb 2017 17:05:13 +0000
Subject: [PATCH 0119/1302] update naoina/toml to do config validation

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index d2293e142..69c1ab3a6 100644
--- a/Godeps
+++ b/Godeps
@@ -26,7 +26,7 @@ github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
 github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92
-github.com/influxdata/toml ad49a5c2936f96b8f5943c3fdba47630ccf45a0d
+github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413

From 21cf79163c3b0d9ee9575b1dca5e458fa9d858b0 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 10 Feb 2017 17:27:18 +0000
Subject: [PATCH 0120/1302] don't use influxdata/config, just use
 influxdata/toml

---
 Godeps                    |  1 -
 internal/config/config.go | 17 ++++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Godeps b/Godeps
index 69c1ab3a6..fb8e23860 100644
--- a/Godeps
+++ b/Godeps
@@ -25,7 +25,6 @@ github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
-github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
diff --git a/internal/config/config.go b/internal/config/config.go
index 24dec4169..90b158716 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -25,7 +25,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/processors"
 	"github.com/influxdata/telegraf/plugins/serializers"
 
-	"github.com/influxdata/config"
 	"github.com/influxdata/toml"
 	"github.com/influxdata/toml/ast"
 )
@@ -566,7 +565,7 @@ func (c *Config) LoadConfig(path string) error {
 			if !ok {
 				return fmt.Errorf("%s: invalid configuration", path)
 			}
-			if err = config.UnmarshalTable(subTable, c.Tags); err != nil {
+			if err = toml.UnmarshalTable(subTable, c.Tags); err != nil {
 				log.Printf("E! Could not parse [global_tags] config\n")
 				return fmt.Errorf("Error parsing %s, %s", path, err)
 			}
@@ -579,7 +578,7 @@ func (c *Config) LoadConfig(path string) error {
 		if !ok {
 			return fmt.Errorf("%s: invalid configuration", path)
 		}
-		if err = config.UnmarshalTable(subTable, c.Agent); err != nil {
+		if err = toml.UnmarshalTable(subTable, c.Agent); err != nil {
 			log.Printf("E! Could not parse [agent] config\n")
 			return fmt.Errorf("Error parsing %s, %s", path, err)
 		}
@@ -716,7 +715,7 @@ func (c *Config) addAggregator(name string, table *ast.Table) error {
 		return err
 	}
 
-	if err := config.UnmarshalTable(table, aggregator); err != nil {
+	if err := toml.UnmarshalTable(table, aggregator); err != nil {
 		return err
 	}
 
@@ -736,7 +735,7 @@ func (c *Config) addProcessor(name string, table *ast.Table) error {
 		return err
 	}
 
-	if err := config.UnmarshalTable(table, processor); err != nil {
+	if err := toml.UnmarshalTable(table, processor); err != nil {
 		return err
 	}
 
@@ -776,7 +775,7 @@ func (c *Config) addOutput(name string, table *ast.Table) error {
 		return err
 	}
 
-	if err := config.UnmarshalTable(table, output); err != nil {
+	if err := toml.UnmarshalTable(table, output); err != nil {
 		return err
 	}
 
@@ -817,7 +816,7 @@ func (c *Config) addInput(name string, table *ast.Table) error {
 		return err
 	}
 
-	if err := config.UnmarshalTable(table, input); err != nil {
+	if err := toml.UnmarshalTable(table, input); err != nil {
 		return err
 	}
 
@@ -909,7 +908,7 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
 	conf.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := config.UnmarshalTable(subtbl, conf.Tags); err != nil {
+			if err := toml.UnmarshalTable(subtbl, conf.Tags); err != nil {
 				log.Printf("Could not parse tags for input %s\n", name)
 			}
 		}
@@ -1146,7 +1145,7 @@ func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
 	cp.Tags = make(map[string]string)
 	if node, ok := tbl.Fields["tags"]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
-			if err := config.UnmarshalTable(subtbl, cp.Tags); err != nil {
+			if err := toml.UnmarshalTable(subtbl, cp.Tags); err != nil {
 				log.Printf("E! Could not parse tags for input %s\n", name)
 			}
 		}

From ff9369f1a1cb69fa44fdd8e664ffffddc7949a13 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 13 Feb 2017 10:33:51 +0000
Subject: [PATCH 0121/1302] prepend 'inputs.' to --test output check

---
 agent/agent.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/agent.go b/agent/agent.go
index 192e8c112..11f343632 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -209,7 +209,7 @@ func (a *Agent) Test() error {
 		// Special instructions for some inputs. cpu, for example, needs to be
 		// run twice in order to return cpu usage percentages.
 		switch input.Name() {
-		case "cpu", "mongodb", "procstat":
+		case "inputs.cpu", "inputs.mongodb", "inputs.procstat":
 			time.Sleep(500 * time.Millisecond)
 			fmt.Printf("* Plugin: %s, Collection 2\n", input.Name())
 			if err := input.Input.Gather(acc); err != nil {

From 22243a8354d0c88cf20e853fce1124d421e3c979 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 13 Feb 2017 10:40:38 +0000
Subject: [PATCH 0122/1302] Skip service input plugins in test mode

---
 agent/agent.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/agent/agent.go b/agent/agent.go
index 11f343632..7909a4c8a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -191,6 +191,12 @@ func (a *Agent) Test() error {
 	}()
 
 	for _, input := range a.Config.Inputs {
+		if _, ok := input.Input.(telegraf.ServiceInput); ok {
+			fmt.Printf("\nWARNING: skipping plugin [[%s]]: service inputs not supported in --test mode\n",
+				input.Name())
+			continue
+		}
+
 		acc := NewAccumulator(input, metricC)
 		acc.SetPrecision(a.Config.Agent.Precision.Duration,
 			a.Config.Agent.Interval.Duration)

From 45a168e4253477b0ecace60ea78af5cab905ddef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Mon, 13 Feb 2017 15:30:30 +0000
Subject: [PATCH 0123/1302] Fix setting the username and the password to the
 influxdb output. (#2401)

---
 plugins/outputs/influxdb/influxdb.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 5a5899a60..6c19a35fc 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -112,6 +112,8 @@ func (i *InfluxDB) Connect() error {
 				Timeout:   i.Timeout.Duration,
 				TLSConfig: tlsConfig,
 				UserAgent: i.UserAgent,
+				Username:  i.Username,
+				Password:  i.Password,
 			}
 			wp := client.WriteParams{
 				Database:        i.Database,

From c19fb1535e8b72824622b745c533eea47cb97af3 Mon Sep 17 00:00:00 2001
From: Yaron de Leeuw <me@jarondl.net>
Date: Wed, 15 Feb 2017 12:17:26 -0500
Subject: [PATCH 0124/1302] README: update golang requirement to 1.7 (#2412)

The docker engine-api package we use needs golang 1.7+, see:
https://github.com/docker/engine-api/pull/382#issuecomment-244512952

So telegraf won't compile without 1.7
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 462076dca..3c0bedd1a 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
 which gets installed via the Makefile
-if you don't have it already. You also must build with golang version 1.5+.
+if you don't have it already. You also must build with golang version 1.7+.
 
 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)

From 25c55419dfcb8546e0c38be568cfdf673c254878 Mon Sep 17 00:00:00 2001
From: Priyank Trivedi <priyankt68@gmail.com>
Date: Fri, 17 Feb 2017 00:33:17 +0530
Subject: [PATCH 0125/1302] Fix typo - Default from Defalt (#2417)

---
 plugins/inputs/apache/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/apache/README.md b/plugins/inputs/apache/README.md
index b700a1b44..ffebbcbf8 100644
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -4,7 +4,7 @@
 - **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
 - **username** string: Username for HTTP basic authentication
 - **password** string: Password for HTTP basic authentication
-- **timeout** duration: time that the HTTP connection will remain waiting for response. Defalt 4 seconds ("4s")
+- **timeout** duration: time that the HTTP connection will remain waiting for response. Default 4 seconds ("4s")
 
 ##### Optional SSL Config
 

From 54c9a385d503957bcd61ab951fc992e5db9c351d Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 21 Jan 2017 15:37:53 -0800
Subject: [PATCH 0126/1302] Fix prometheus_client reload behavior

fixes #2282
---
 CHANGELOG.md                                  |  1 +
 agent/agent.go                                |  1 +
 circle.yml                                    |  6 ++--
 .../prometheus_client/prometheus_client.go    | 30 +++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 283c5ccba..2aaf94adb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ be deprecated eventually.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
 - [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
+- [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/agent/agent.go b/agent/agent.go
index 7909a4c8a..e82caf148 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -398,5 +398,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	}
 
 	wg.Wait()
+	a.Close()
 	return nil
 }
diff --git a/circle.yml b/circle.yml
index c237040a2..a7d15368d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,9 +4,9 @@ machine:
   post:
     - sudo service zookeeper stop
     - go version
-    - go version | grep 1.7.5 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.7.5.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.7.5.linux-amd64.tar.gz
+    - sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
     - go version
 
 dependencies:
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index e86a0a526..8c52b3358 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -1,6 +1,7 @@
 package prometheus_client
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -24,6 +25,7 @@ type MetricWithExpiration struct {
 type PrometheusClient struct {
 	Listen             string
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
+	server             *http.Server
 
 	metrics map[string]*MetricWithExpiration
 
@@ -41,30 +43,25 @@ var sampleConfig = `
 func (p *PrometheusClient) Start() error {
 	p.metrics = make(map[string]*MetricWithExpiration)
 	prometheus.Register(p)
-	defer func() {
-		if r := recover(); r != nil {
-			// recovering from panic here because there is no way to stop a
-			// running http go server except by a kill signal. Since the server
-			// does not stop on SIGHUP, Start() will panic when the process
-			// is reloaded.
-		}
-	}()
+
 	if p.Listen == "" {
 		p.Listen = "localhost:9126"
 	}
 
-	http.Handle("/metrics", prometheus.Handler())
-	server := &http.Server{
-		Addr: p.Listen,
+	mux := http.NewServeMux()
+	mux.Handle("/metrics", prometheus.Handler())
+
+	p.server = &http.Server{
+		Addr:    p.Listen,
+		Handler: mux,
 	}
 
-	go server.ListenAndServe()
+	go p.server.ListenAndServe()
 	return nil
 }
 
 func (p *PrometheusClient) Stop() {
-	// TODO: Use a listener for http.Server that counts active connections
-	//       that can be stopped and closed gracefully
+	// plugin gets cleaned up in Close() already.
 }
 
 func (p *PrometheusClient) Connect() error {
@@ -73,8 +70,9 @@ func (p *PrometheusClient) Connect() error {
 }
 
 func (p *PrometheusClient) Close() error {
-	// This service output does not need to close any of its connections
-	return nil
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+	return p.server.Shutdown(ctx)
 }
 
 func (p *PrometheusClient) SampleConfig() string {

From 5da40d56adba8b416ae45a886918f4c04b56ddeb Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <piccilli@gmail.com>
Date: Tue, 14 Feb 2017 00:56:48 +0100
Subject: [PATCH 0127/1302] Check if tag value is empty before allocation

closes #2390
closes #2404
---
 CHANGELOG.md                             |  1 +
 metric/metric.go                         |  7 ++++++-
 metric/metric_test.go                    | 23 +++++++++++++++++++++++
 plugins/inputs/prometheus/parser_test.go |  8 +++-----
 plugins/parsers/nagios/parser_test.go    |  2 +-
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aaf94adb..a49f5e8f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ be deprecated eventually.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
 - [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
 - [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
+- [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/metric/metric.go b/metric/metric.go
index 0a2ca41b6..edf3b7794 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -44,13 +44,18 @@ func New(
 	// pre-allocate exact size of the tags slice
 	taglen := 0
 	for k, v := range tags {
-		// TODO check that length of tag key & value are > 0
+		if len(k) == 0 || len(v) == 0 {
+			continue
+		}
 		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
 	}
 	m.tags = make([]byte, taglen)
 
 	i := 0
 	for k, v := range tags {
+		if len(k) == 0 || len(v) == 0 {
+			continue
+		}
 		m.tags[i] = ','
 		i++
 		i += copy(m.tags[i:], escape(k, "tagkey"))
diff --git a/metric/metric_test.go b/metric/metric_test.go
index f133a507c..dd231f8c4 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -625,3 +625,26 @@ func TestNewMetricFailNaN(t *testing.T) {
 	_, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 }
+
+func TestEmptyTagValueOrKey(t *testing.T) {
+	now := time.Now()
+
+	tags := map[string]string{
+		"host":     "localhost",
+		"emptytag": "",
+		"":         "valuewithoutkey",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(99),
+	}
+	m, err := New("cpu", tags, fields, now)
+
+	assert.True(t, m.HasTag("host"))
+	assert.False(t, m.HasTag("emptytag"))
+	assert.Equal(t,
+		fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n", now.UnixNano()),
+		m.String())
+
+	assert.NoError(t, err)
+
+}
diff --git a/plugins/inputs/prometheus/parser_test.go b/plugins/inputs/prometheus/parser_test.go
index fcd32ad43..4f2a8516f 100644
--- a/plugins/inputs/prometheus/parser_test.go
+++ b/plugins/inputs/prometheus/parser_test.go
@@ -111,11 +111,9 @@ func TestParseValidPrometheus(t *testing.T) {
 		"gauge": float64(1),
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{
-		"osVersion":        "CentOS Linux 7 (Core)",
-		"dockerVersion":    "1.8.2",
-		"kernelVersion":    "3.10.0-229.20.1.el7.x86_64",
-		"cadvisorRevision": "",
-		"cadvisorVersion":  "",
+		"osVersion":     "CentOS Linux 7 (Core)",
+		"dockerVersion": "1.8.2",
+		"kernelVersion": "3.10.0-229.20.1.el7.x86_64",
 	}, metrics[0].Tags())
 
 	// Counter value
diff --git a/plugins/parsers/nagios/parser_test.go b/plugins/parsers/nagios/parser_test.go
index ee21ea117..b1e3d6fdd 100644
--- a/plugins/parsers/nagios/parser_test.go
+++ b/plugins/parsers/nagios/parser_test.go
@@ -67,7 +67,7 @@ func TestParseValidOutput(t *testing.T) {
 	assert.Equal(t, map[string]interface{}{
 		"value": float64(0.008457),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"unit": ""}, metrics[0].Tags())
+	assert.Equal(t, map[string]string{}, metrics[0].Tags())
 }
 
 func TestParseInvalidOutput(t *testing.T) {

From 2a3448c8f3b0add54a28da87ce83509d1f83bf2b Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 16 Feb 2017 23:13:14 +0000
Subject: [PATCH 0128/1302] socket_writer output plugin README

---
 plugins/outputs/socket_writer/README.md | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/outputs/socket_writer/README.md

diff --git a/plugins/outputs/socket_writer/README.md b/plugins/outputs/socket_writer/README.md
new file mode 100644
index 000000000..441cdf1f7
--- /dev/null
+++ b/plugins/outputs/socket_writer/README.md
@@ -0,0 +1,27 @@
+# socket_writer Plugin
+
+The socket_writer plugin can write to a UDP, TCP, or unix socket.
+
+It can output data in any of the [supported output formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md).
+
+```toml
+# Generic socket writer capable of handling multiple socket types.
+[[outputs.socket_writer]]
+  ## URL to connect to
+  # address = "tcp://127.0.0.1:8094"
+  # address = "tcp://example.com:http"
+  # address = "tcp4://127.0.0.1:8094"
+  # address = "tcp6://127.0.0.1:8094"
+  # address = "tcp6://[2001:db8::1]:8094"
+  # address = "udp://127.0.0.1:8094"
+  # address = "udp4://127.0.0.1:8094"
+  # address = "udp6://127.0.0.1:8094"
+  # address = "unix:///tmp/telegraf.sock"
+  # address = "unixgram:///tmp/telegraf.sock"
+
+  ## Data format to generate.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+```

From 06176ef410c51854580c4340cd0aa7085ad49bd7 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 16 Feb 2017 19:37:55 +0000
Subject: [PATCH 0129/1302] Only set the buffer size once

fixes #2380
---
 CHANGELOG.md                      | 1 +
 internal/models/running_output.go | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a49f5e8f8..6896a7ad7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@ be deprecated eventually.
 - [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
 - [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
+- [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 0ce756f47..61f26add1 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -122,9 +122,9 @@ func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 // Write writes all cached points to this output.
 func (ro *RunningOutput) Write() error {
 	nFails, nMetrics := ro.failMetrics.Len(), ro.metrics.Len()
+	ro.BufferSize.Set(int64(nFails + nMetrics))
 	log.Printf("D! Output [%s] buffer fullness: %d / %d metrics. ",
 		ro.Name, nFails+nMetrics, ro.MetricBufferLimit)
-	ro.BufferSize.Incr(int64(nFails + nMetrics))
 	var err error
 	if !ro.failMetrics.IsEmpty() {
 		// how many batches of failed writes we need to write.
@@ -176,7 +176,6 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 		log.Printf("D! Output [%s] wrote batch of %d metrics in %s\n",
 			ro.Name, nMetrics, elapsed)
 		ro.MetricsWritten.Incr(int64(nMetrics))
-		ro.BufferSize.Incr(-int64(nMetrics))
 		ro.WriteTime.Incr(elapsed.Nanoseconds())
 	}
 	return err

From e5349393f878bb994990d6b2d33e82e731f50802 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 16 Feb 2017 22:24:42 +0000
Subject: [PATCH 0130/1302] Check for errors in user stats & process list

closes #2414
---
 CHANGELOG.md                  |   1 +
 plugins/inputs/mysql/mysql.go | 153 ++++++++++++++++++----------------
 2 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6896a7ad7..8febc3e50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ be deprecated eventually.
 - [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
+- [#2414](https://github.com/influxdata/telegraf/issues/2414): Missing error handling in the MySQL plugin leads to segmentation violation.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index adc21880b..1ff7c3421 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"database/sql"
 	"fmt"
+	"log"
 	"strconv"
 	"strings"
 	"sync"
@@ -904,92 +905,98 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 	// gather connection metrics from processlist for each user
 	if m.GatherProcessList {
 		conn_rows, err := db.Query("SELECT user, sum(1) FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user")
+		if err != nil {
+			log.Printf("E! MySQL Error gathering process list: %s", err)
+		} else {
+			for conn_rows.Next() {
+				var user string
+				var connections int64
 
-		for conn_rows.Next() {
-			var user string
-			var connections int64
+				err = conn_rows.Scan(&user, &connections)
+				if err != nil {
+					return err
+				}
 
-			err = conn_rows.Scan(&user, &connections)
-			if err != nil {
-				return err
+				tags := map[string]string{"server": servtag, "user": user}
+				fields := make(map[string]interface{})
+
+				if err != nil {
+					return err
+				}
+				fields["connections"] = connections
+				acc.AddFields("mysql_users", fields, tags)
 			}
-
-			tags := map[string]string{"server": servtag, "user": user}
-			fields := make(map[string]interface{})
-
-			if err != nil {
-				return err
-			}
-			fields["connections"] = connections
-			acc.AddFields("mysql_users", fields, tags)
 		}
 	}
 
 	// gather connection metrics from user_statistics for each user
 	if m.GatherUserStatistics {
 		conn_rows, err := db.Query("select user, total_connections, concurrent_connections, connected_time, busy_time, cpu_time, bytes_received, bytes_sent, binlog_bytes_written, rows_fetched, rows_updated, table_rows_read, select_commands, update_commands, other_commands, commit_transactions, rollback_transactions, denied_connections, lost_connections, access_denied, empty_queries, total_ssl_connections FROM INFORMATION_SCHEMA.USER_STATISTICS GROUP BY user")
+		if err != nil {
+			log.Printf("E! MySQL Error gathering user stats: %s", err)
+		} else {
+			for conn_rows.Next() {
+				var user string
+				var total_connections int64
+				var concurrent_connections int64
+				var connected_time int64
+				var busy_time int64
+				var cpu_time int64
+				var bytes_received int64
+				var bytes_sent int64
+				var binlog_bytes_written int64
+				var rows_fetched int64
+				var rows_updated int64
+				var table_rows_read int64
+				var select_commands int64
+				var update_commands int64
+				var other_commands int64
+				var commit_transactions int64
+				var rollback_transactions int64
+				var denied_connections int64
+				var lost_connections int64
+				var access_denied int64
+				var empty_queries int64
+				var total_ssl_connections int64
 
-		for conn_rows.Next() {
-			var user string
-			var total_connections int64
-			var concurrent_connections int64
-			var connected_time int64
-			var busy_time int64
-			var cpu_time int64
-			var bytes_received int64
-			var bytes_sent int64
-			var binlog_bytes_written int64
-			var rows_fetched int64
-			var rows_updated int64
-			var table_rows_read int64
-			var select_commands int64
-			var update_commands int64
-			var other_commands int64
-			var commit_transactions int64
-			var rollback_transactions int64
-			var denied_connections int64
-			var lost_connections int64
-			var access_denied int64
-			var empty_queries int64
-			var total_ssl_connections int64
+				err = conn_rows.Scan(&user, &total_connections, &concurrent_connections,
+					&connected_time, &busy_time, &cpu_time, &bytes_received, &bytes_sent, &binlog_bytes_written,
+					&rows_fetched, &rows_updated, &table_rows_read, &select_commands, &update_commands, &other_commands,
+					&commit_transactions, &rollback_transactions, &denied_connections, &lost_connections, &access_denied,
+					&empty_queries, &total_ssl_connections,
+				)
 
-			err = conn_rows.Scan(&user, &total_connections, &concurrent_connections,
-				&connected_time, &busy_time, &cpu_time, &bytes_received, &bytes_sent, &binlog_bytes_written,
-				&rows_fetched, &rows_updated, &table_rows_read, &select_commands, &update_commands, &other_commands,
-				&commit_transactions, &rollback_transactions, &denied_connections, &lost_connections, &access_denied,
-				&empty_queries, &total_ssl_connections,
-			)
+				if err != nil {
+					return err
+				}
 
-			if err != nil {
-				return err
+				tags := map[string]string{"server": servtag, "user": user}
+				fields := map[string]interface{}{
+					"total_connections":      total_connections,
+					"concurrent_connections": concurrent_connections,
+					"connected_time":         connected_time,
+					"busy_time":              busy_time,
+					"cpu_time":               cpu_time,
+					"bytes_received":         bytes_received,
+					"bytes_sent":             bytes_sent,
+					"binlog_bytes_written":   binlog_bytes_written,
+					"rows_fetched":           rows_fetched,
+					"rows_updated":           rows_updated,
+					"table_rows_read":        table_rows_read,
+					"select_commands":        select_commands,
+					"update_commands":        update_commands,
+					"other_commands":         other_commands,
+					"commit_transactions":    commit_transactions,
+					"rollback_transactions":  rollback_transactions,
+					"denied_connections":     denied_connections,
+					"lost_connections":       lost_connections,
+					"access_denied":          access_denied,
+					"empty_queries":          empty_queries,
+					"total_ssl_connections":  total_ssl_connections,
+				}
+
+				acc.AddFields("mysql_user_stats", fields, tags)
 			}
-
-			tags := map[string]string{"server": servtag, "user": user}
-			fields := map[string]interface{}{
-				"total_connections":      total_connections,
-				"concurrent_connections": concurrent_connections,
-				"connected_time":         connected_time,
-				"busy_time":              busy_time,
-				"cpu_time":               cpu_time,
-				"bytes_received":         bytes_received,
-				"bytes_sent":             bytes_sent,
-				"binlog_bytes_written":   binlog_bytes_written,
-				"rows_fetched":           rows_fetched,
-				"rows_updated":           rows_updated,
-				"table_rows_read":        table_rows_read,
-				"select_commands":        select_commands,
-				"update_commands":        update_commands,
-				"other_commands":         other_commands,
-				"commit_transactions":    commit_transactions,
-				"rollback_transactions":  rollback_transactions,
-				"denied_connections":     denied_connections,
-				"lost_connections":       lost_connections,
-				"access_denied":          access_denied,
-				"empty_queries":          empty_queries,
-				"total_ssl_connections":  total_ssl_connections,
-			}
-
-			acc.AddFields("mysql_user_stats", fields, tags)
 		}
 	}
 

From e17164d3f09a292078b528cb96c75456b2297c28 Mon Sep 17 00:00:00 2001
From: Carlos <theistian@gmail.com>
Date: Mon, 20 Feb 2017 11:50:39 +0100
Subject: [PATCH 0131/1302] Added default config to file output pugin's README
 (#2426)

---
 plugins/outputs/file/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/plugins/outputs/file/README.md b/plugins/outputs/file/README.md
index 6f3b7f513..a75297bb2 100644
--- a/plugins/outputs/file/README.md
+++ b/plugins/outputs/file/README.md
@@ -1 +1,16 @@
 # file Output Plugin
+
+This plugin writes telegraf metrics to files
+
+### Configuration
+```
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout", "/tmp/metrics.out"]
+
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+```

From c4212d69c942ec07a87fdd6ddfb6795d50112f0c Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Tue, 21 Feb 2017 22:13:22 +0100
Subject: [PATCH 0132/1302] Updated readme, now requires Go 1.8 (#2455)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c0bedd1a..258464237 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
 which gets installed via the Makefile
-if you don't have it already. You also must build with golang version 1.7+.
+if you don't have it already. You also must build with golang version 1.8+.
 
 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)

From 81408f9da7f124e8fa811e90297d5b2870443acd Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 17 Feb 2017 19:36:44 +0000
Subject: [PATCH 0133/1302] switch out deprecated docker client library

closes #2071
---
 CHANGELOG.md                         |   1 +
 Godeps                               |   5 +-
 plugins/inputs/docker/README.md      |  16 ++-
 plugins/inputs/docker/docker.go      |  63 ++++++++---
 plugins/inputs/docker/docker_test.go | 150 ++-------------------------
 plugins/inputs/docker/fake_client.go | 143 +++++++++++++++++++++++++
 6 files changed, 210 insertions(+), 168 deletions(-)
 create mode 100644 plugins/inputs/docker/fake_client.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8febc3e50..509d6f2f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ be deprecated eventually.
 - [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
 - [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
 - [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
+- [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
 
 ### Bugfixes
 
diff --git a/Godeps b/Godeps
index fb8e23860..de326cb19 100644
--- a/Godeps
+++ b/Godeps
@@ -9,10 +9,7 @@ github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/docker/distribution fb0bebc4b64e3881cc52a2478d749845ed76d2a8
-github.com/docker/engine-api 4290f40c056686fcaa5c9caf02eac1dde9315adf
-github.com/docker/go-connections 9670439d95da2651d9dfc7acc5d2ed92d3f25ee6
-github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
+github.com/docker/docker b89aff1afa1f61993ab2ba18fd62d9375a195f5d
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 5e8910677..94965213f 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -16,12 +16,20 @@ for the stat structure can be found
 ```
 # Read metrics about docker containers
 [[inputs.docker]]
-  # Docker Endpoint
-  #   To use TCP, set endpoint = "tcp://[ip]:[port]"
-  #   To use environment variables (ie, docker-machine), set endpoint = "ENV"
+  ## Docker Endpoint
+  ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
+  ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
-  # Only collect metrics for these containers, collect all if empty
+  ## Only collect metrics for these containers, collect all if empty
   container_names = []
+  ## Timeout for docker list, info, and stats commands
+  timeout = "5s"
+
+  ## Whether to report for each container per-device blkio (8:0, 8:1...) and
+  ## network (eth0, eth1, ...) stats or not
+  perdevice = true
+  ## Whether to report for each container total blkio and network stats or not
+  total = false
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 82a3791b6..ec192efd5 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -1,6 +1,7 @@
-package system
+package docker
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -11,10 +12,9 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/client"
 
-	"github.com/docker/engine-api/client"
-	"github.com/docker/engine-api/types"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -28,15 +28,46 @@ type Docker struct {
 	PerDevice      bool `toml:"perdevice"`
 	Total          bool `toml:"total"`
 
-	client      DockerClient
+	client      *client.Client
 	engine_host string
+
+	testing bool
 }
 
-// DockerClient interface, useful for testing
-type DockerClient interface {
-	Info(ctx context.Context) (types.Info, error)
-	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
-	ContainerStats(ctx context.Context, containerID string, stream bool) (io.ReadCloser, error)
+// infoWrapper wraps client.Client.List for testing.
+func infoWrapper(c *client.Client, ctx context.Context) (types.Info, error) {
+	if c != nil {
+		return c.Info(ctx)
+	}
+	fc := FakeDockerClient{}
+	return fc.Info(ctx)
+}
+
+// listWrapper wraps client.Client.ContainerList for testing.
+func listWrapper(
+	c *client.Client,
+	ctx context.Context,
+	options types.ContainerListOptions,
+) ([]types.Container, error) {
+	if c != nil {
+		return c.ContainerList(ctx, options)
+	}
+	fc := FakeDockerClient{}
+	return fc.ContainerList(ctx, options)
+}
+
+// statsWrapper wraps client.Client.ContainerStats for testing.
+func statsWrapper(
+	c *client.Client,
+	ctx context.Context,
+	containerID string,
+	stream bool,
+) (types.ContainerStats, error) {
+	if c != nil {
+		return c.ContainerStats(ctx, containerID, stream)
+	}
+	fc := FakeDockerClient{}
+	return fc.ContainerStats(ctx, containerID, stream)
 }
 
 // KB, MB, GB, TB, PB...human friendly
@@ -80,7 +111,7 @@ func (d *Docker) SampleConfig() string { return sampleConfig }
 
 // Gather starts stats collection
 func (d *Docker) Gather(acc telegraf.Accumulator) error {
-	if d.client == nil {
+	if d.client == nil && !d.testing {
 		var c *client.Client
 		var err error
 		defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"}
@@ -113,7 +144,7 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	opts := types.ContainerListOptions{}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	containers, err := d.client.ContainerList(ctx, opts)
+	containers, err := listWrapper(d.client, ctx, opts)
 	if err != nil {
 		return err
 	}
@@ -144,7 +175,7 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 	// Get info from docker daemon
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	info, err := d.client.Info(ctx)
+	info, err := infoWrapper(d.client, ctx)
 	if err != nil {
 		return err
 	}
@@ -247,12 +278,12 @@ func (d *Docker) gatherContainer(
 
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	r, err := d.client.ContainerStats(ctx, container.ID, false)
+	r, err := statsWrapper(d.client, ctx, container.ID, false)
 	if err != nil {
 		return fmt.Errorf("Error getting docker stats: %s", err.Error())
 	}
-	defer r.Close()
-	dec := json.NewDecoder(r)
+	defer r.Body.Close()
+	dec := json.NewDecoder(r.Body)
 	if err = dec.Decode(&v); err != nil {
 		if err == io.EOF {
 			return nil
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index cc0ada3c4..f0add03ea 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -1,18 +1,12 @@
-package system
+package docker
 
 import (
-	"io"
-	"io/ioutil"
-	"strings"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/registry"
 	"github.com/influxdata/telegraf/testutil"
 
+	"github.com/docker/docker/api/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -250,146 +244,14 @@ func testStats() *types.StatsJSON {
 	return stats
 }
 
-type FakeDockerClient struct {
-}
-
-func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) {
-	env := types.Info{
-		Containers:         108,
-		ContainersRunning:  98,
-		ContainersStopped:  6,
-		ContainersPaused:   3,
-		OomKillDisable:     false,
-		SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
-		NEventsListener:    0,
-		ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
-		Debug:              false,
-		LoggingDriver:      "json-file",
-		KernelVersion:      "4.3.0-1-amd64",
-		IndexServerAddress: "https://index.docker.io/v1/",
-		MemTotal:           3840757760,
-		Images:             199,
-		CPUCfsQuota:        true,
-		Name:               "absol",
-		SwapLimit:          false,
-		IPv4Forwarding:     true,
-		ExperimentalBuild:  false,
-		CPUCfsPeriod:       true,
-		RegistryConfig: &registry.ServiceConfig{
-			IndexConfigs: map[string]*registry.IndexInfo{
-				"docker.io": {
-					Name:     "docker.io",
-					Mirrors:  []string{},
-					Official: true,
-					Secure:   true,
-				},
-			}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
-		OperatingSystem:   "Linux Mint LMDE (containerized)",
-		BridgeNfIptables:  true,
-		HTTPSProxy:        "",
-		Labels:            []string{},
-		MemoryLimit:       false,
-		DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
-		NFd:               19,
-		HTTPProxy:         "",
-		Driver:            "devicemapper",
-		NGoroutines:       39,
-		NCPU:              4,
-		DockerRootDir:     "/var/lib/docker",
-		NoProxy:           "",
-		BridgeNfIP6tables: true,
-	}
-	return env, nil
-}
-
-func (d FakeDockerClient) ContainerList(octx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-	container1 := types.Container{
-		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
-		Names:   []string{"/etcd"},
-		Image:   "quay.io/coreos/etcd:v2.2.2",
-		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
-		Created: 1455941930,
-		Status:  "Up 4 hours",
-		Ports: []types.Port{
-			types.Port{
-				PrivatePort: 7001,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 4001,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2380,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2379,
-				PublicPort:  2379,
-				Type:        "tcp",
-				IP:          "0.0.0.0",
-			},
-		},
-		SizeRw:     0,
-		SizeRootFs: 0,
-	}
-	container2 := types.Container{
-		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
-		Names:   []string{"/etcd2"},
-		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
-		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
-		Created: 1455941933,
-		Status:  "Up 4 hours",
-		Ports: []types.Port{
-			types.Port{
-				PrivatePort: 7002,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 4002,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2381,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2382,
-				PublicPort:  2382,
-				Type:        "tcp",
-				IP:          "0.0.0.0",
-			},
-		},
-		SizeRw:     0,
-		SizeRootFs: 0,
-	}
-
-	containers := []types.Container{container1, container2}
-	return containers, nil
-
-	//#{e6a96c84ca91a5258b7cb752579fb68826b68b49ff957487695cd4d13c343b44 titilambert/snmpsim /bin/sh -c 'snmpsimd --agent-udpv4-endpoint=0.0.0.0:31161 --process-user=root --process-group=user' 1455724831 Up 4 hours [{31161 31161 udp 0.0.0.0}] 0 0 [/snmp] map[]}]2016/02/24 01:05:01 Gathered metrics, (3s interval), from 1 inputs in 1.233836656s
-}
-
-func (d FakeDockerClient) ContainerStats(ctx context.Context, containerID string, stream bool) (io.ReadCloser, error) {
-	var stat io.ReadCloser
-	jsonStat := `{"read":"2016-02-24T11:42:27.472459608-05:00","memory_stats":{"stats":{},"limit":18935443456},"blkio_stats":{"io_service_bytes_recursive":[{"major":252,"minor":1,"op":"Read","value":753664},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":753664},{"major":252,"minor":1,"op":"Total","value":753664}],"io_serviced_recursive":[{"major":252,"minor":1,"op":"Read","value":26},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":26},{"major":252,"minor":1,"op":"Total","value":26}]},"cpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052607520000000,"throttling_data":{}},"precpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052599550000000,"throttling_data":{}}}`
-	stat = ioutil.NopCloser(strings.NewReader(jsonStat))
-	return stat, nil
-}
-
 func TestDockerGatherInfo(t *testing.T) {
 	var acc testutil.Accumulator
-	client := FakeDockerClient{}
-	d := Docker{client: client}
+	d := Docker{
+		client:  nil,
+		testing: true,
+	}
 
 	err := d.Gather(&acc)
-
 	require.NoError(t, err)
 
 	acc.AssertContainsTaggedFields(t,
diff --git a/plugins/inputs/docker/fake_client.go b/plugins/inputs/docker/fake_client.go
new file mode 100644
index 000000000..03da23198
--- /dev/null
+++ b/plugins/inputs/docker/fake_client.go
@@ -0,0 +1,143 @@
+package docker
+
+import (
+	"context"
+	"io/ioutil"
+	"strings"
+
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/registry"
+)
+
+type FakeDockerClient struct {
+}
+
+func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) {
+	env := types.Info{
+		Containers:         108,
+		ContainersRunning:  98,
+		ContainersStopped:  6,
+		ContainersPaused:   3,
+		OomKillDisable:     false,
+		SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
+		NEventsListener:    0,
+		ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
+		Debug:              false,
+		LoggingDriver:      "json-file",
+		KernelVersion:      "4.3.0-1-amd64",
+		IndexServerAddress: "https://index.docker.io/v1/",
+		MemTotal:           3840757760,
+		Images:             199,
+		CPUCfsQuota:        true,
+		Name:               "absol",
+		SwapLimit:          false,
+		IPv4Forwarding:     true,
+		ExperimentalBuild:  false,
+		CPUCfsPeriod:       true,
+		RegistryConfig: &registry.ServiceConfig{
+			IndexConfigs: map[string]*registry.IndexInfo{
+				"docker.io": {
+					Name:     "docker.io",
+					Mirrors:  []string{},
+					Official: true,
+					Secure:   true,
+				},
+			}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
+		OperatingSystem:   "Linux Mint LMDE (containerized)",
+		BridgeNfIptables:  true,
+		HTTPSProxy:        "",
+		Labels:            []string{},
+		MemoryLimit:       false,
+		DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
+		NFd:               19,
+		HTTPProxy:         "",
+		Driver:            "devicemapper",
+		NGoroutines:       39,
+		NCPU:              4,
+		DockerRootDir:     "/var/lib/docker",
+		NoProxy:           "",
+		BridgeNfIP6tables: true,
+	}
+	return env, nil
+}
+
+func (d FakeDockerClient) ContainerList(octx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
+	container1 := types.Container{
+		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
+		Names:   []string{"/etcd"},
+		Image:   "quay.io/coreos/etcd:v2.2.2",
+		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
+		Created: 1455941930,
+		Status:  "Up 4 hours",
+		Ports: []types.Port{
+			types.Port{
+				PrivatePort: 7001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 4001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2380,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2379,
+				PublicPort:  2379,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+	}
+	container2 := types.Container{
+		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+		Names:   []string{"/etcd2"},
+		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
+		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
+		Created: 1455941933,
+		Status:  "Up 4 hours",
+		Ports: []types.Port{
+			types.Port{
+				PrivatePort: 7002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 4002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2381,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2382,
+				PublicPort:  2382,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+	}
+
+	containers := []types.Container{container1, container2}
+	return containers, nil
+
+	//#{e6a96c84ca91a5258b7cb752579fb68826b68b49ff957487695cd4d13c343b44 titilambert/snmpsim /bin/sh -c 'snmpsimd --agent-udpv4-endpoint=0.0.0.0:31161 --process-user=root --process-group=user' 1455724831 Up 4 hours [{31161 31161 udp 0.0.0.0}] 0 0 [/snmp] map[]}]2016/02/24 01:05:01 Gathered metrics, (3s interval), from 1 inputs in 1.233836656s
+}
+
+func (d FakeDockerClient) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
+	var stat types.ContainerStats
+	jsonStat := `{"read":"2016-02-24T11:42:27.472459608-05:00","memory_stats":{"stats":{},"limit":18935443456},"blkio_stats":{"io_service_bytes_recursive":[{"major":252,"minor":1,"op":"Read","value":753664},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":753664},{"major":252,"minor":1,"op":"Total","value":753664}],"io_serviced_recursive":[{"major":252,"minor":1,"op":"Read","value":26},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":26},{"major":252,"minor":1,"op":"Total","value":26}]},"cpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052607520000000,"throttling_data":{}},"precpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052599550000000,"throttling_data":{}}}`
+	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
+	return stat, nil
+}

From 42a41d33cc537058396e702908fb62337ef109fe Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 24 Feb 2017 09:43:22 +0000
Subject: [PATCH 0134/1302] add cgroup plugin to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 258464237..3dd06e93a 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ configuration options.
 * [bcache](./plugins/inputs/bcache)
 * [cassandra](./plugins/inputs/cassandra)
 * [ceph](./plugins/inputs/ceph)
+* [cgroup](./plugins/inputs/cgroup)
 * [chrony](./plugins/inputs/chrony)
 * [consul](./plugins/inputs/consul)
 * [conntrack](./plugins/inputs/conntrack)

From 6f2eeae49822782b85caf7639067685b812bc325 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 28 Feb 2017 12:46:27 +0000
Subject: [PATCH 0135/1302] Remove sleep from riemann test

---
 plugins/outputs/riemann/riemann_test.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index e03d720ce..67a161be5 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -193,7 +193,16 @@ func TestConnectAndWrite(t *testing.T) {
 	err = r.Write(metrics)
 	require.NoError(t, err)
 
-	time.Sleep(200 * time.Millisecond)
+	start := time.Now()
+	for true {
+		events, _ := r.client.Query(`tagged "docker"`)
+		if len(events) > 0 {
+			break
+		}
+		if time.Since(start) > time.Second {
+			break
+		}
+	}
 
 	// are there any "docker" tagged events in Riemann?
 	events, err := r.client.Query(`tagged "docker"`)

From b9457a109268ef1c055f4aa5b4f92a42afc21c24 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 21 Feb 2017 19:50:10 +0100
Subject: [PATCH 0136/1302] log error message when invalid regex is used

closes #2178
---
 CHANGELOG.md                               |  1 +
 plugins/inputs/logparser/grok/grok_test.go | 37 ++++++++++++++++++++++
 plugins/inputs/logparser/logparser.go      |  2 ++
 3 files changed, 40 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 509d6f2f1..2a43e844f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ be deprecated eventually.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
 - [#2414](https://github.com/influxdata/telegraf/issues/2414): Missing error handling in the MySQL plugin leads to segmentation violation.
+- [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 1344896b8..4e0ead6e9 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -57,6 +57,43 @@ func Benchmark_ParseLine_CustomPattern(b *testing.B) {
 	benchM = m
 }
 
+// Test a very simple parse pattern.
+func TestSimpleParse(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{"%{TESTLOG}"},
+		CustomPatterns: `
+			TESTLOG %{NUMBER:num:int} %{WORD:client}
+		`,
+	}
+	assert.NoError(t, p.Compile())
+
+	m, err := p.ParseLine(`142 bot`)
+	assert.NoError(t, err)
+	require.NotNil(t, m)
+
+	assert.Equal(t,
+		map[string]interface{}{
+			"num":    int64(142),
+			"client": "bot",
+		},
+		m.Fields())
+}
+
+// Verify that patterns with a regex lookahead fail at compile time.
+func TestParsePatternsWithLookahead(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{"%{MYLOG}"},
+		CustomPatterns: `
+			NOBOT ((?!bot|crawl).)*
+			MYLOG %{NUMBER:num:int} %{NOBOT:client}
+		`,
+	}
+	assert.NoError(t, p.Compile())
+
+	_, err := p.ParseLine(`1466004605359052000 bot`)
+	assert.Error(t, err)
+}
+
 func TestMeasurementName(t *testing.T) {
 	p := &Parser{
 		Measurement: "my_web_log",
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 8ec328358..a22832277 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -226,6 +226,8 @@ func (l *LogParserPlugin) parser() {
 				if m != nil {
 					l.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
 				}
+			} else {
+				log.Println("E! Error parsing log line: " + err.Error())
 			}
 		}
 	}

From 9e810ac46369e723f14fb3c51cbada859b4d0f8c Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 23 Feb 2017 13:45:36 +0000
Subject: [PATCH 0137/1302] Handle nil os.FileInfo in filepath.Walk

closes #2466
---
 CHANGELOG.md              | 1 +
 internal/config/config.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a43e844f..622243458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ be deprecated eventually.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
 - [#2414](https://github.com/influxdata/telegraf/issues/2414): Missing error handling in the MySQL plugin leads to segmentation violation.
 - [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
+- [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/internal/config/config.go b/internal/config/config.go
index 90b158716..651c4e9ef 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -505,6 +505,10 @@ func PrintOutputConfig(name string) error {
 
 func (c *Config) LoadDirectory(path string) error {
 	walkfn := func(thispath string, info os.FileInfo, _ error) error {
+		if info == nil {
+			log.Printf("W! Telegraf is not permitted to read %s", thispath)
+			return nil
+		}
 		if info.IsDir() {
 			return nil
 		}

From a251adb838cbcdc24f678a59d6551cc3ec94fea2 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <sparrc@users.noreply.github.com>
Date: Wed, 1 Mar 2017 11:22:42 +0000
Subject: [PATCH 0138/1302] Fix type conflict on windows ping plugin (#2462)

closes #1433
---
 CHANGELOG.md                             |  7 +++++++
 plugins/inputs/ping/ping_windows.go      | 12 ++++++------
 plugins/inputs/ping/ping_windows_test.go |  6 +++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 622243458..d8dc382d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ### Release Notes
 
+- Users of the windows `ping` plugin will need to drop or migrate their
+measurements in order to continue using the plugin. The reason for this is that
+the windows plugin was outputting a different type than the linux plugin. This
+made it impossible to use the `ping` plugin for both windows and linux
+machines.
+
 - Ceph: the `ceph_pgmap_state` metric content has been modified to use a unique field `count`, with each state expressed as a `state` tag.
 
 Telegraf < 1.3:
@@ -65,6 +71,7 @@ be deprecated eventually.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
 - [#2414](https://github.com/influxdata/telegraf/issues/2414): Missing error handling in the MySQL plugin leads to segmentation violation.
+- [#2462](https://github.com/influxdata/telegraf/pull/2462): Fix type conflict in windows ping plugin.
 - [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
 - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
 
diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 7fb112810..b1212eaaa 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -40,10 +40,10 @@ func (s *Ping) Description() string {
 const sampleConfig = `
 	## urls to ping
 	urls = ["www.google.com"] # required
-	
+
 	## number of pings to send per collection (ping -n <COUNT>)
 	count = 4 # required
-	
+
 	## Ping timeout, in seconds. 0 means default timeout (ping -w <TIMEOUT>)
 	Timeout = 0
 `
@@ -64,7 +64,7 @@ func hostPinger(timeout float64, args ...string) (string, error) {
 }
 
 // processPingOutput takes in a string output from the ping command
-// based on linux implementation but using regex ( multilanguage support ) ( shouldn't affect the performance of the program )
+// based on linux implementation but using regex ( multilanguage support )
 // It returns (<transmitted packets>, <received reply>, <received packet>, <average response>, <min response>, <max response>)
 func processPingOutput(out string) (int, int, int, int, int, int, error) {
 	// So find a line contain 3 numbers except reply lines
@@ -189,13 +189,13 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 				"percent_reply_loss":  lossReply,
 			}
 			if avg > 0 {
-				fields["average_response_ms"] = avg
+				fields["average_response_ms"] = float64(avg)
 			}
 			if min > 0 {
-				fields["minimum_response_ms"] = min
+				fields["minimum_response_ms"] = float64(min)
 			}
 			if max > 0 {
-				fields["maximum_response_ms"] = max
+				fields["maximum_response_ms"] = float64(max)
 			}
 			acc.AddFields("ping", fields, tags)
 		}(url)
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index 34428b814..b55b7955b 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -77,9 +77,9 @@ func TestPingGather(t *testing.T) {
 		"reply_received":      4,
 		"percent_packet_loss": 0.0,
 		"percent_reply_loss":  0.0,
-		"average_response_ms": 50,
-		"minimum_response_ms": 50,
-		"maximum_response_ms": 52,
+		"average_response_ms": 50.0,
+		"minimum_response_ms": 50.0,
+		"maximum_response_ms": 52.0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 

From 96185159264e5e1a5259cf6329c71ac3a3944ca8 Mon Sep 17 00:00:00 2001
From: Chris Koehnke <chris.koehnke@gmail.com>
Date: Thu, 2 Mar 2017 03:43:33 -0500
Subject: [PATCH 0139/1302] Disk counter array newline (#2481)

Tweak formatting of `LogicalDisk` counter array to have one entry per
line.
---
 etc/telegraf_windows.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 7380ab8a3..535b0f414 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -117,7 +117,8 @@
     Instances = ["*"]
     Counters = [
       "% Idle Time",
-      "% Disk Time","% Disk Read Time",
+      "% Disk Time",
+      "% Disk Read Time",
       "% Disk Write Time",
       "Current Disk Queue Length",
       "% Free Space",

From 1873abd2484987280b29322cfb03b29f471fca7b Mon Sep 17 00:00:00 2001
From: Charles-Henri <ririsoft@dadhemar.fr>
Date: Thu, 2 Mar 2017 10:58:26 +0100
Subject: [PATCH 0140/1302] Iptables input: document better the ignored rules
 behavior (#2482)

During issue #2215 it was highlighted that the current behavior where
rules without a comment are ignored is confusing for several users.

This commit improves the documentation and adds a NOTE to the sample
config to clarify the behavior for new users.
---
 CHANGELOG.md                        | 1 +
 plugins/inputs/iptables/README.md   | 6 +++++-
 plugins/inputs/iptables/iptables.go | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8dc382d7..fe5631767 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ be deprecated eventually.
 - [#2462](https://github.com/influxdata/telegraf/pull/2462): Fix type conflict in windows ping plugin.
 - [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
 - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
+- [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/iptables/README.md b/plugins/inputs/iptables/README.md
index a711f1d4e..2b226b9fe 100644
--- a/plugins/inputs/iptables/README.md
+++ b/plugins/inputs/iptables/README.md
@@ -2,7 +2,11 @@
 
 The iptables plugin gathers packets and bytes counters for rules within a set of table and chain from the Linux's iptables firewall.
 
-Rules are identified through associated comment. Rules without comment are ignored.
+Rules are identified through associated comment. **Rules without comment are ignored**.
+Indeed we need a unique ID for the rule and the rule number is not a constant: it may vary when rules are inserted/deleted at start-up or by automatic tools (interactive firewalls, fail2ban, ...).
+Also when the rule set is becoming big (hundreds of lines) most people are interested in monitoring only a small part of the rule set.
+
+Before using this plugin **you must ensure that the rules you want to monitor are named with a unique comment**. Comments are added using the `-m comment --comment "my comment"` iptables options.
 
 The iptables command requires CAP_NET_ADMIN and CAP_NET_RAW capabilities. You have several options to grant telegraf to run iptables:
 
diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index 31b049d9f..eab33bf9f 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -33,14 +33,16 @@ func (ipt *Iptables) SampleConfig() string {
   ## iptables require root access on most systems.
   ## Setting 'use_sudo' to true will make use of sudo to run iptables.
   ## Users must configure sudo to allow telegraf user to run iptables with no password.
-  ## iptables can be restricted to only list command "iptables -nvL"
+  ## iptables can be restricted to only list command "iptables -nvL".
   use_sudo = false
   ## Setting 'use_lock' to true runs iptables with the "-w" option.
   ## Adjust your sudo settings appropriately if using this option ("iptables -wnvl")
   use_lock = false
   ## defines the table to monitor:
   table = "filter"
-  ## defines the chains to monitor:
+  ## defines the chains to monitor.
+  ## NOTE: iptables rules without a comment will not be monitored.
+  ## Read the plugin documentation for more information.
   chains = [ "INPUT" ]
 `
 }

From 10744646dbdd52dea349dd7773bcd7115e4a838d Mon Sep 17 00:00:00 2001
From: Jack Zampolin <jack.zampolin@gmail.com>
Date: Fri, 3 Mar 2017 10:24:50 -0800
Subject: [PATCH 0141/1302] AMQP Consumer plugin (#1678)

---
 CHANGELOG.md                                  |   1 +
 README.md                                     |   3 +-
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/amqp_consumer/README.md        |  47 +++
 plugins/inputs/amqp_consumer/amqp_consumer.go | 280 ++++++++++++++++++
 plugins/outputs/amqp/README.md                |  11 +-
 plugins/outputs/amqp/amqp.go                  |  20 +-
 7 files changed, 357 insertions(+), 6 deletions(-)
 create mode 100644 plugins/inputs/amqp_consumer/README.md
 create mode 100644 plugins/inputs/amqp_consumer/amqp_consumer.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe5631767..323b23915 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ be deprecated eventually.
 - [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
 - [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
 - [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
+- [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 3dd06e93a..915c7b761 100644
--- a/README.md
+++ b/README.md
@@ -97,9 +97,10 @@ configuration options.
 
 ## Input Plugins
 
-* [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [aerospike](./plugins/inputs/aerospike)
+* [amqp_consumer](./plugins/inputs/amqp_consumer) (rabbitmq)
 * [apache](./plugins/inputs/apache)
+* [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
 * [cassandra](./plugins/inputs/cassandra)
 * [ceph](./plugins/inputs/ceph)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 924dffe3d..a9147c53e 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -2,6 +2,7 @@ package all
 
 import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
+	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
new file mode 100644
index 000000000..85780700f
--- /dev/null
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -0,0 +1,47 @@
+# AMQP Consumer Input Plugin
+
+This plugin provides a consumer for use with AMQP 0-9-1, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
+
+Metrics are read from a topic exchange using the configured queue and binding_key.
+
+Message payload should be formatted in one of the [Telegraf Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
+
+For an introduction to AMQP see:
+- https://www.rabbitmq.com/tutorials/amqp-concepts.html
+- https://www.rabbitmq.com/getstarted.html
+
+The following defaults are known to work with RabbitMQ:
+
+```toml
+# AMQP consumer plugin
+[[inputs.amqp_consumer]]
+  ## AMQP url
+  url = "amqp://localhost:5672/influxdb"
+  ## AMQP exchange
+  exchange = "telegraf"
+  ## AMQP queue name
+  queue = "telegraf"
+  ## Binding Key
+  binding_key = "#"
+
+  ## Controls how many messages the server will try to keep on the network
+  ## for consumers before receiving delivery acks.
+  #prefetch_count = 50
+
+  ## Auth method. PLAIN and EXTERNAL are supported.
+  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+  ## described here: https://www.rabbitmq.com/plugins.html
+  # auth_method = "PLAIN"
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+```
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
new file mode 100644
index 000000000..6f12244aa
--- /dev/null
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -0,0 +1,280 @@
+package amqp_consumer
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/streadway/amqp"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+// AMQPConsumer is the top level struct for this plugin
+type AMQPConsumer struct {
+	URL string
+	// AMQP exchange
+	Exchange string
+	// Queue Name
+	Queue string
+	// Binding Key
+	BindingKey string `toml:"binding_key"`
+
+	// Controls how many messages the server will try to keep on the network
+	// for consumers before receiving delivery acks.
+	PrefetchCount int
+
+	// AMQP Auth method
+	AuthMethod string
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
+
+	parser parsers.Parser
+	conn   *amqp.Connection
+	wg     *sync.WaitGroup
+}
+
+type externalAuth struct{}
+
+func (a *externalAuth) Mechanism() string {
+	return "EXTERNAL"
+}
+func (a *externalAuth) Response() string {
+	return fmt.Sprintf("\000")
+}
+
+const (
+	DefaultAuthMethod    = "PLAIN"
+	DefaultPrefetchCount = 50
+)
+
+func (a *AMQPConsumer) SampleConfig() string {
+	return `
+  ## AMQP url
+  url = "amqp://localhost:5672/influxdb"
+  ## AMQP exchange
+  exchange = "telegraf"
+  ## AMQP queue name
+  queue = "telegraf"
+  ## Binding Key
+  binding_key = "#"
+
+  ## Maximum number of messages server should give to the worker.
+  prefetch_count = 50
+
+  ## Auth method. PLAIN and EXTERNAL are supported
+  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+  ## described here: https://www.rabbitmq.com/plugins.html
+  # auth_method = "PLAIN"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+`
+}
+
+func (a *AMQPConsumer) Description() string {
+	return "AMQP consumer plugin"
+}
+
+func (a *AMQPConsumer) SetParser(parser parsers.Parser) {
+	a.parser = parser
+}
+
+// All gathering is done in the Start function
+func (a *AMQPConsumer) Gather(_ telegraf.Accumulator) error {
+	return nil
+}
+
+func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
+	// make new tls config
+	tls, err := internal.GetTLSConfig(
+		a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	// parse auth method
+	var sasl []amqp.Authentication // nil by default
+
+	if strings.ToUpper(a.AuthMethod) == "EXTERNAL" {
+		sasl = []amqp.Authentication{&externalAuth{}}
+	}
+
+	config := amqp.Config{
+		TLSClientConfig: tls,
+		SASL:            sasl, // if nil, it will be PLAIN
+	}
+	return &config, nil
+}
+
+// Start satisfies the telegraf.ServiceInput interface
+func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
+	amqpConf, err := a.createConfig()
+	if err != nil {
+		return err
+	}
+
+	msgs, err := a.connect(amqpConf)
+	if err != nil {
+		return err
+	}
+
+	a.wg = &sync.WaitGroup{}
+	a.wg.Add(1)
+	go a.process(msgs, acc)
+
+	go func() {
+		err := <-a.conn.NotifyClose(make(chan *amqp.Error))
+		if err == nil {
+			return
+		}
+
+		log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
+		for {
+			msgs, err := a.connect(amqpConf)
+			if err != nil {
+				log.Printf("E! AMQP connection failed: %s", err)
+				time.Sleep(10 * time.Second)
+				continue
+			}
+
+			a.wg.Add(1)
+			go a.process(msgs, acc)
+			break
+		}
+	}()
+
+	return nil
+}
+
+func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, error) {
+	conn, err := amqp.DialConfig(a.URL, *amqpConf)
+	if err != nil {
+		return nil, err
+	}
+	a.conn = conn
+
+	ch, err := conn.Channel()
+	if err != nil {
+		return nil, fmt.Errorf("Failed to open a channel: %s", err)
+	}
+
+	err = ch.ExchangeDeclare(
+		a.Exchange, // name
+		"topic",    // type
+		true,       // durable
+		false,      // auto-deleted
+		false,      // internal
+		false,      // no-wait
+		nil,        // arguments
+	)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
+	}
+
+	q, err := ch.QueueDeclare(
+		a.Queue, // queue
+		true,    // durable
+		false,   // delete when unused
+		false,   // exclusive
+		false,   // no-wait
+		nil,     // arguments
+	)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to declare a queue: %s", err)
+	}
+
+	err = ch.QueueBind(
+		q.Name,       // queue
+		a.BindingKey, // binding-key
+		a.Exchange,   // exchange
+		false,
+		nil,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to bind a queue: %s", err)
+	}
+
+	err = ch.Qos(
+		a.PrefetchCount,
+		0,     // prefetch-size
+		false, // global
+	)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to set QoS: %s", err)
+	}
+
+	msgs, err := ch.Consume(
+		q.Name, // queue
+		"",     // consumer
+		false,  // auto-ack
+		false,  // exclusive
+		false,  // no-local
+		false,  // no-wait
+		nil,    // arguments
+	)
+	if err != nil {
+		return nil, fmt.Errorf("Failed establishing connection to queue: %s", err)
+	}
+
+	log.Println("I! Started AMQP consumer")
+	return msgs, err
+}
+
+// Read messages from queue and add them to the Accumulator
+func (a *AMQPConsumer) process(msgs <-chan amqp.Delivery, acc telegraf.Accumulator) {
+	defer a.wg.Done()
+	for d := range msgs {
+		metrics, err := a.parser.Parse(d.Body)
+		if err != nil {
+			log.Printf("E! %v: error parsing metric - %v", err, string(d.Body))
+		} else {
+			for _, m := range metrics {
+				acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+			}
+		}
+
+		d.Ack(false)
+	}
+	log.Printf("I! AMQP consumer queue closed")
+}
+
+func (a *AMQPConsumer) Stop() {
+	err := a.conn.Close()
+	if err != nil && err != amqp.ErrClosed {
+		log.Printf("E! Error closing AMQP connection: %s", err)
+		return
+	}
+	a.wg.Wait()
+	log.Println("I! Stopped AMQP service")
+}
+
+func init() {
+	inputs.Add("amqp_consumer", func() telegraf.Input {
+		return &AMQPConsumer{
+			AuthMethod:    DefaultAuthMethod,
+			PrefetchCount: DefaultPrefetchCount,
+		}
+	})
+}
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index d49c507b8..208ae934c 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -1,13 +1,18 @@
 # AMQP Output Plugin
 
-This plugin writes to a AMQP exchange using tag, defined in configuration file
-as RoutingTag, as a routing key.
+This plugin writes to a AMQP 0-9-1 Exchange, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
+
+Metrics are written to a topic exchange using tag, defined in configuration file as RoutingTag, as a routing key.
 
 If RoutingTag is empty, then empty routing key will be used.
 Metrics are grouped in batches by RoutingTag.
 
 This plugin doesn't bind exchange to a queue, so it should be done by consumer.
 
+For an introduction to AMQP see:
+- https://www.rabbitmq.com/tutorials/amqp-concepts.html
+- https://www.rabbitmq.com/getstarted.html
+
 ### Configuration:
 
 ```
@@ -18,6 +23,8 @@ This plugin doesn't bind exchange to a queue, so it should be done by consumer.
   ## AMQP exchange
   exchange = "telegraf"
   ## Auth method. PLAIN and EXTERNAL are supported
+  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+  ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, it's value will be used as the routing key
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index d86cac596..7b4c7d4c9 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -40,6 +40,7 @@ type AMQP struct {
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 
+	conn    *amqp.Connection
 	channel *amqp.Channel
 	sync.Mutex
 	headers amqp.Table
@@ -68,6 +69,8 @@ var sampleConfig = `
   ## AMQP exchange
   exchange = "telegraf"
   ## Auth method. PLAIN and EXTERNAL are supported
+  ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+  ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, it's value will be used as the routing key
@@ -129,6 +132,8 @@ func (q *AMQP) Connect() error {
 	if err != nil {
 		return err
 	}
+	q.conn = connection
+
 	channel, err := connection.Channel()
 	if err != nil {
 		return fmt.Errorf("Failed to open a channel: %s", err)
@@ -148,7 +153,11 @@ func (q *AMQP) Connect() error {
 	}
 	q.channel = channel
 	go func() {
-		log.Printf("I! Closing: %s", <-connection.NotifyClose(make(chan *amqp.Error)))
+		err := <-connection.NotifyClose(make(chan *amqp.Error))
+		if err == nil {
+			return
+		}
+		log.Printf("I! Closing: %s", err)
 		log.Printf("I! Trying to reconnect")
 		for err := q.Connect(); err != nil; err = q.Connect() {
 			log.Println("E! ", err.Error())
@@ -160,7 +169,12 @@ func (q *AMQP) Connect() error {
 }
 
 func (q *AMQP) Close() error {
-	return q.channel.Close()
+	err := q.conn.Close()
+	if err != nil && err != amqp.ErrClosed {
+		log.Printf("E! Error closing AMQP connection: %s", err)
+		return err
+	}
+	return nil
 }
 
 func (q *AMQP) SampleConfig() string {
@@ -207,7 +221,7 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 				Body:        buf,
 			})
 		if err != nil {
-			return fmt.Errorf("FAILED to send amqp message: %s", err)
+			return fmt.Errorf("Failed to send AMQP message: %s", err)
 		}
 	}
 	return nil

From 76bcdecd21e7aa63734564715563392fa64ad0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Mon, 6 Mar 2017 12:34:41 +0000
Subject: [PATCH 0142/1302] Respond 200 when receiving a ping event. (#2492)

---
 plugins/inputs/webhooks/github/github_webhooks.go      | 9 ++++++---
 plugins/inputs/webhooks/github/github_webhooks_test.go | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/webhooks/github/github_webhooks.go b/plugins/inputs/webhooks/github/github_webhooks.go
index 139c76971..a31c6fdf2 100644
--- a/plugins/inputs/webhooks/github/github_webhooks.go
+++ b/plugins/inputs/webhooks/github/github_webhooks.go
@@ -34,9 +34,10 @@ func (gh *GithubWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-
-	p := e.NewMetric()
-	gh.acc.AddFields("github_webhooks", p.Fields(), p.Tags(), p.Time())
+	if e != nil {
+		p := e.NewMetric()
+		gh.acc.AddFields("github_webhooks", p.Fields(), p.Tags(), p.Time())
+	}
 
 	w.WriteHeader(http.StatusOK)
 }
@@ -84,6 +85,8 @@ func NewEvent(data []byte, name string) (Event, error) {
 		return generateEvent(data, &MembershipEvent{})
 	case "page_build":
 		return generateEvent(data, &PageBuildEvent{})
+	case "ping":
+		return nil, nil
 	case "public":
 		return generateEvent(data, &PublicEvent{})
 	case "pull_request":
diff --git a/plugins/inputs/webhooks/github/github_webhooks_test.go b/plugins/inputs/webhooks/github/github_webhooks_test.go
index 7bee5372d..0ec991726 100644
--- a/plugins/inputs/webhooks/github/github_webhooks_test.go
+++ b/plugins/inputs/webhooks/github/github_webhooks_test.go
@@ -25,6 +25,10 @@ func TestCommitCommentEvent(t *testing.T) {
 	GithubWebhookRequest("commit_comment", CommitCommentEventJSON(), t)
 }
 
+func TestPingEvent(t *testing.T) {
+	GithubWebhookRequest("ping", "", t)
+}
+
 func TestDeleteEvent(t *testing.T) {
 	GithubWebhookRequest("delete", DeleteEventJSON(), t)
 }

From 7a8e8217318236b9fc0e5b306cbe91b1142a7472 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <sparrc@users.noreply.github.com>
Date: Mon, 6 Mar 2017 15:59:36 +0000
Subject: [PATCH 0143/1302] Revert "Procstat: don't cache PIDs" (#2479)

---
 CHANGELOG.md                              |  2 -
 plugins/inputs/procstat/procstat.go       | 44 ++++++++++++++++---
 plugins/inputs/procstat/procstat_test.go  |  2 +
 plugins/inputs/procstat/spec_processor.go | 53 ++++++++++-------------
 4 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 323b23915..5773179b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,8 +61,6 @@ be deprecated eventually.
 
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
-- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods
-- [#1636](https://github.com/influxdata/telegraf/issues/1636): procstat - stop caching PIDs.
 - [#2318](https://github.com/influxdata/telegraf/issues/2318): haproxy input - Add missing fields.
 - [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 565d0ebd1..929490e4a 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -8,6 +8,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/shirou/gopsutil/process"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -21,12 +23,15 @@ type Procstat struct {
 	User        string
 	PidTag      bool
 
+	// pidmap maps a pid to a process object, so we don't recreate every gather
+	pidmap map[int32]*process.Process
 	// tagmap maps a pid to a map of tags for that pid
 	tagmap map[int32]map[string]string
 }
 
 func NewProcstat() *Procstat {
 	return &Procstat{
+		pidmap: make(map[int32]*process.Process),
 		tagmap: make(map[int32]map[string]string),
 	}
 }
@@ -62,26 +67,51 @@ func (_ *Procstat) Description() string {
 }
 
 func (p *Procstat) Gather(acc telegraf.Accumulator) error {
-	pids, err := p.getAllPids()
+	err := p.createProcesses()
 	if err != nil {
 		log.Printf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
 	} else {
-		for _, pid := range pids {
+		for pid, proc := range p.pidmap {
 			if p.PidTag {
 				p.tagmap[pid]["pid"] = fmt.Sprint(pid)
 			}
-			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, p.tagmap[pid])
-			err := p.pushMetrics()
-			if err != nil {
-				log.Printf("E! Error: procstat: %s", err.Error())
-			}
+			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, proc, p.tagmap[pid])
+			p.pushMetrics()
 		}
 	}
 
 	return nil
 }
 
+func (p *Procstat) createProcesses() error {
+	var errstring string
+	var outerr error
+
+	pids, err := p.getAllPids()
+	if err != nil {
+		errstring += err.Error() + " "
+	}
+
+	for _, pid := range pids {
+		_, ok := p.pidmap[pid]
+		if !ok {
+			proc, err := process.NewProcess(pid)
+			if err == nil {
+				p.pidmap[pid] = proc
+			} else {
+				errstring += err.Error() + " "
+			}
+		}
+	}
+
+	if errstring != "" {
+		outerr = fmt.Errorf("%s", errstring)
+	}
+
+	return outerr
+}
+
 func (p *Procstat) getAllPids() ([]int32, error) {
 	var pids []int32
 	var err error
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index 001537178..ccc72bdbb 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/shirou/gopsutil/process"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -23,6 +24,7 @@ func TestGather(t *testing.T) {
 	p := Procstat{
 		PidFile: file.Name(),
 		Prefix:  "foo",
+		pidmap:  make(map[int32]*process.Process),
 		tagmap:  make(map[int32]map[string]string),
 	}
 	p.Gather(&acc)
diff --git a/plugins/inputs/procstat/spec_processor.go b/plugins/inputs/procstat/spec_processor.go
index 1b9f63126..3b56fbc3e 100644
--- a/plugins/inputs/procstat/spec_processor.go
+++ b/plugins/inputs/procstat/spec_processor.go
@@ -1,7 +1,6 @@
 package procstat
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/shirou/gopsutil/process"
@@ -10,13 +9,12 @@ import (
 )
 
 type SpecProcessor struct {
-	ProcessName string
-	Prefix      string
-	pid         int32
-	tags        map[string]string
-	fields      map[string]interface{}
-	acc         telegraf.Accumulator
-	proc        *process.Process
+	Prefix string
+	pid    int32
+	tags   map[string]string
+	fields map[string]interface{}
+	acc    telegraf.Accumulator
+	proc   *process.Process
 }
 
 func NewSpecProcessor(
@@ -24,35 +22,29 @@ func NewSpecProcessor(
 	prefix string,
 	pid int32,
 	acc telegraf.Accumulator,
+	p *process.Process,
 	tags map[string]string,
 ) *SpecProcessor {
+	if processName != "" {
+		tags["process_name"] = processName
+	} else {
+		name, err := p.Name()
+		if err == nil {
+			tags["process_name"] = name
+		}
+	}
 	return &SpecProcessor{
-		ProcessName: processName,
-		Prefix:      prefix,
-		pid:         pid,
-		tags:        tags,
-		fields:      make(map[string]interface{}),
-		acc:         acc,
+		Prefix: prefix,
+		pid:    pid,
+		tags:   tags,
+		fields: make(map[string]interface{}),
+		acc:    acc,
+		proc:   p,
 	}
 }
 
-func (p *SpecProcessor) pushMetrics() error {
+func (p *SpecProcessor) pushMetrics() {
 	var prefix string
-	proc, err := process.NewProcess(p.pid)
-	if err != nil {
-		return fmt.Errorf("Failed to open process with pid '%d'. Error: '%s'",
-			p.pid, err)
-	}
-	p.proc = proc
-	if p.ProcessName != "" {
-		p.tags["process_name"] = p.ProcessName
-	} else {
-		name, err := p.proc.Name()
-		if err == nil {
-			p.tags["process_name"] = name
-		}
-	}
-
 	if p.Prefix != "" {
 		prefix = p.Prefix + "_"
 	}
@@ -115,5 +107,4 @@ func (p *SpecProcessor) pushMetrics() error {
 	}
 
 	p.acc.AddFields("procstat", fields, p.tags)
-	return nil
 }

From ceb36adac7b459d1b286ac20c411ea288c1558b4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 6 Mar 2017 11:20:53 -0800
Subject: [PATCH 0144/1302] Update issue template

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b59da651a..f4190e3ec 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 ## Directions
 
 GitHub Issues are reserved for actionable bug reports and feature requests.
-General questions should be sent to the [InfluxDB mailing list](https://groups.google.com/forum/#!forum/influxdb).
+General questions should be asked at the [InfluxData Community](https://community.influxdata.com) site.
 
 Before opening an issue, search for similar bug reports or feature requests on GitHub Issues.
 If no similar issue can be found, fill out either the "Bug Report" or the "Feature Request" section below.

From 9df2974a0fa227c39725cc6bc2f9a4176343f996 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 28 Feb 2017 12:24:41 +0000
Subject: [PATCH 0145/1302] update gopsutil for file close fixes

hopefully this will fix #2472
---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index de326cb19..2d0419ef6 100644
--- a/Godeps
+++ b/Godeps
@@ -44,7 +44,7 @@ github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
 github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/shirou/gopsutil 77b5d0080adb6f028e457906f1944d9fcca34442
+github.com/shirou/gopsutil d371ba1293cb48fedc6850526ea48b3846c54f2c
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987

From 7513fcac4e3fc811549bdc132e35380c4668a88a Mon Sep 17 00:00:00 2001
From: vvvkamper <vvvkamper@gmail.com>
Date: Thu, 2 Mar 2017 19:15:33 +0700
Subject: [PATCH 0146/1302] Fix part 2 of #1291

added PDH_FMT_NOCAP100 format option

closes #2483
---
 CHANGELOG.md                            | 1 +
 plugins/inputs/win_perf_counters/pdh.go | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5773179b6..8418ffd21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ be deprecated eventually.
 - [#2178](https://github.com/influxdata/telegraf/issues/2178): logparser: regexp with lookahead.
 - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
 - [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored.
+- [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index 36563d6b7..fa00e0603 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -331,7 +331,7 @@ func PdhCollectQueryData(hQuery PDH_HQUERY) uint32 {
 func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32, pValue *PDH_FMT_COUNTERVALUE_DOUBLE) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterValue.Call(
 		uintptr(hCounter),
-		uintptr(PDH_FMT_DOUBLE),
+		uintptr(PDH_FMT_DOUBLE|PDH_FMT_NOCAP100),
 		uintptr(unsafe.Pointer(lpdwType)),
 		uintptr(unsafe.Pointer(pValue)))
 
@@ -378,7 +378,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *PDH_FMT_COUNTERVALUE_ITEM_DOUBLE) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterArrayW.Call(
 		uintptr(hCounter),
-		uintptr(PDH_FMT_DOUBLE),
+		uintptr(PDH_FMT_DOUBLE|PDH_FMT_NOCAP100),
 		uintptr(unsafe.Pointer(lpdwBufferSize)),
 		uintptr(unsafe.Pointer(lpdwBufferCount)),
 		uintptr(unsafe.Pointer(itemBuffer)))

From 56aa89e5c86f38e566c6ecadb568c68cd9dcaea7 Mon Sep 17 00:00:00 2001
From: Robpol86 <robpol86@gmail.com>
Date: Wed, 8 Mar 2017 08:38:36 -0800
Subject: [PATCH 0147/1302] Exporting Ipmi.Path to be set by config. (#2498)

* Exporting Ipmi.Path to be set by config.

Currently "path" is not exported, giving this error when users try to
override the variable via telegraf.conf as per the sample config:

`field corresponding to `path' is not defined in `*ipmi_sensor.Ipmi'`

Exporting the variable solves the problem.

* Updating changelog.
---
 CHANGELOG.md                            | 1 +
 plugins/inputs/ipmi_sensor/ipmi.go      | 8 ++++----
 plugins/inputs/ipmi_sensor/ipmi_test.go | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8418ffd21..3a8e586f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@ be deprecated eventually.
 - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files.
 - [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored.
 - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
+- [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index b2389a675..0114812d3 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -17,7 +17,7 @@ var (
 )
 
 type Ipmi struct {
-	path    string
+	Path    string
 	Servers []string
 }
 
@@ -44,7 +44,7 @@ func (m *Ipmi) Description() string {
 }
 
 func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
-	if len(m.path) == 0 {
+	if len(m.Path) == 0 {
 		return fmt.Errorf("ipmitool not found: verify that ipmitool is installed and that ipmitool is in your PATH")
 	}
 
@@ -76,7 +76,7 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 	}
 
 	opts = append(opts, "sdr")
-	cmd := execCommand(m.path, opts...)
+	cmd := execCommand(m.Path, opts...)
 	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
 	if err != nil {
 		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
@@ -149,7 +149,7 @@ func init() {
 	m := Ipmi{}
 	path, _ := exec.LookPath("ipmitool")
 	if len(path) > 0 {
-		m.path = path
+		m.Path = path
 	}
 	inputs.Add("ipmi_sensor", func() telegraf.Input {
 		return &m
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index 94dc066c8..84bcdcac0 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -14,7 +14,7 @@ import (
 func TestGather(t *testing.T) {
 	i := &Ipmi{
 		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
-		path:    "ipmitool",
+		Path:    "ipmitool",
 	}
 	// overwriting exec commands with mock commands
 	execCommand = fakeExecCommand
@@ -118,7 +118,7 @@ func TestGather(t *testing.T) {
 	}
 
 	i = &Ipmi{
-		path: "ipmitool",
+		Path: "ipmitool",
 	}
 
 	err = i.Gather(&acc)

From ae6a5d2255f7eeadc910c424632a665275c8b598 Mon Sep 17 00:00:00 2001
From: jeremydenoun <denoun_j@epita.fr>
Date: Wed, 8 Mar 2017 23:08:55 +0100
Subject: [PATCH 0148/1302] Remove warning if parse empty content (#2500)

closes #2448
---
 CHANGELOG.md                     |  1 +
 metric/parse.go                  |  3 +++
 plugins/inputs/exec/exec_test.go | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a8e586f1..01eeb8bef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@ be deprecated eventually.
 - [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored.
 - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
 - [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config.
+- [#2500](https://github.com/influxdata/telegraf/pull/2500): Remove warning if parse empty content
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/metric/parse.go b/metric/parse.go
index fe2cffdc1..15b88e552 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -44,6 +44,9 @@ func Parse(buf []byte) ([]telegraf.Metric, error) {
 }
 
 func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+	if len(buf) == 0 {
+		return []telegraf.Metric{}, nil
+	}
 	if len(buf) <= 6 {
 		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
 	}
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index 71d33fb71..975eb9642 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -37,6 +37,8 @@ const malformedJson = `
 `
 
 const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1\n"
+const lineProtocolEmpty = ""
+const lineProtocolShort = "ab"
 
 const lineProtocolMulti = `
 cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
@@ -167,6 +169,33 @@ func TestLineProtocolParse(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
 }
 
+func TestLineProtocolEmptyParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolEmpty), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.NoError(t, err)
+}
+
+func TestLineProtocolShortParse(t *testing.T) {
+	parser, _ := parsers.NewInfluxParser()
+	e := &Exec{
+		runner:   newRunnerMock([]byte(lineProtocolShort), nil),
+		Commands: []string{"line-protocol"},
+		parser:   parser,
+	}
+
+	var acc testutil.Accumulator
+	err := e.Gather(&acc)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "buffer too short", "A buffer too short error was expected")
+}
+
 func TestLineProtocolParseMultiple(t *testing.T) {
 	parser, _ := parsers.NewInfluxParser()
 	e := &Exec{

From d243d69a09dd27b67c960fcead800669957fa90b Mon Sep 17 00:00:00 2001
From: Dennis Dryden <ddryden@gmail.com>
Date: Thu, 9 Mar 2017 11:19:03 +0000
Subject: [PATCH 0149/1302] Add configuration docs to Postgresql input plugin
 (#2515)

* Add configuration docs to Postgresql input plugin

Add configuration docs to PostgreSQL input plugin README (mostly from the source code) though I've not included the configuration example that seems to use all he connections on the database[1].

[1] https://github.com/influxdata/telegraf/issues/2410

* Fix typo in readme and sampleConfig string.
---
 plugins/inputs/postgresql/README.md     | 22 ++++++++++++++++++++++
 plugins/inputs/postgresql/postgresql.go |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/postgresql/README.md b/plugins/inputs/postgresql/README.md
index e309aa80f..aed041bc6 100644
--- a/plugins/inputs/postgresql/README.md
+++ b/plugins/inputs/postgresql/README.md
@@ -29,3 +29,25 @@ _* value ignored and therefore not recorded._
 
 
 More information about the meaning of these metrics can be found in the [PostgreSQL Documentation](http://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-DATABASE-VIEW)
+
+## Configruation
+Specify address via a url matching:
+
+  `postgres://[pqgotest[:password]]@localhost[/dbname]?sslmode=[disable|verify-ca|verify-full]`
+
+All connection parameters are optional. Without the dbname parameter, the driver will default to a database with the same name as the user. This dbname is just for instantiating a connection with the server and doesn't restrict the databases we are trying to grab metrics for.
+  
+A  list of databases to explicitly ignore.  If not specified, metrics for all databases are gathered.  Do NOT use with the 'databases' option.
+
+  `ignored_databases = ["postgres", "template0", "template1"]`
+  
+A list of databases to pull metrics about. If not specified, metrics for all databases are gathered.  Do NOT use with the 'ignored_databases' option.
+
+  `databases = ["app_production", "testing"]`
+  
+### Configuration example
+```
+[[inputs.postgresql]]
+  address = "postgres://telegraf@localhost/someDB"
+  ignored_databases = ["template0", "template1"]
+```
diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go
index 7019762ed..7c854dfd3 100644
--- a/plugins/inputs/postgresql/postgresql.go
+++ b/plugins/inputs/postgresql/postgresql.go
@@ -43,7 +43,7 @@ var sampleConfig = `
   # ignored_databases = ["postgres", "template0", "template1"]
 
   ## A list of databases to pull metrics about. If not specified, metrics for all
-  ## databases are gathered.  Do NOT use with the 'ignore_databases' option.
+  ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
   # databases = ["app_production", "testing"]
 `
 

From 49c212337f49a50729f80f7d3577c5905da638df Mon Sep 17 00:00:00 2001
From: Timothy <timothy.vanheest@gmail.com>
Date: Thu, 9 Mar 2017 06:21:03 -0500
Subject: [PATCH 0150/1302] Update CONFIGURATION.md (#2516)

Add information about default configuration file locations.  Also mention that the config directory option is available.
---
 docs/CONFIGURATION.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 9b2eb99d8..ff4814b82 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -24,6 +24,16 @@ Environment variables can be used anywhere in the config file, simply prepend
 them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
 for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
 
+## Configuration file locations
+
+The location of the configuration file can be set via the `--config` command
+line flag. Telegraf will also pick up all files matching the pattern `*.conf` if
+the `-config-directory` command line flag is used.
+
+On most systems, the default locations are `/etc/telegraf/telegraf.conf` for
+the main configuration file and `/etc/telegraf/telegraf.d` for the directory of
+configuration files.
+
 # Global Tags
 
 Global tags can be specified in the `[global_tags]` section of the config file
@@ -351,4 +361,4 @@ to the system load metrics due to the `namepass` parameter.
 
 [[outputs.file]]
   files = ["stdout"]
-```
\ No newline at end of file
+```

From e811e2600d16872869e09f9fb769e3c536743d45 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 8 Mar 2017 15:26:33 +0000
Subject: [PATCH 0151/1302] create telegraf.d directory in tarball

closes #2513
---
 CHANGELOG.md     | 1 +
 scripts/build.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01eeb8bef..f6053bd66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ be deprecated eventually.
 - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
 - [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config.
 - [#2500](https://github.com/influxdata/telegraf/pull/2500): Remove warning if parse empty content
+- [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/scripts/build.py b/scripts/build.py
index 57208bf7f..aeaa04fd3 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -22,6 +22,7 @@ INSTALL_ROOT_DIR = "/usr/bin"
 LOG_DIR = "/var/log/telegraf"
 SCRIPT_DIR = "/usr/lib/telegraf/scripts"
 CONFIG_DIR = "/etc/telegraf"
+CONFIG_DIR_D = "/etc/telegraf/telegraf.d"
 LOGROTATE_DIR = "/etc/logrotate.d"
 
 INIT_SCRIPT = "scripts/init.sh"
@@ -115,7 +116,7 @@ def create_package_fs(build_root):
     logging.debug("Creating a filesystem hierarchy from directory: {}".format(build_root))
     # Using [1:] for the path names due to them being absolute
     # (will overwrite previous paths, per 'os.path.join' documentation)
-    dirs = [ INSTALL_ROOT_DIR[1:], LOG_DIR[1:], SCRIPT_DIR[1:], CONFIG_DIR[1:], LOGROTATE_DIR[1:] ]
+    dirs = [ INSTALL_ROOT_DIR[1:], LOG_DIR[1:], SCRIPT_DIR[1:], CONFIG_DIR[1:], LOGROTATE_DIR[1:], CONFIG_DIR_D[1:] ]
     for d in dirs:
         os.makedirs(os.path.join(build_root, d))
         os.chmod(os.path.join(build_root, d), 0o755)

From ea6e0b82595ffcd53f955496ec90d2e1377d0e07 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 9 Mar 2017 10:13:31 -0800
Subject: [PATCH 0152/1302] Fix typo in postgresql README

---
 plugins/inputs/postgresql/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/postgresql/README.md b/plugins/inputs/postgresql/README.md
index aed041bc6..e31fcff69 100644
--- a/plugins/inputs/postgresql/README.md
+++ b/plugins/inputs/postgresql/README.md
@@ -30,21 +30,21 @@ _* value ignored and therefore not recorded._
 
 More information about the meaning of these metrics can be found in the [PostgreSQL Documentation](http://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-DATABASE-VIEW)
 
-## Configruation
+## Configuration
 Specify address via a url matching:
 
   `postgres://[pqgotest[:password]]@localhost[/dbname]?sslmode=[disable|verify-ca|verify-full]`
 
 All connection parameters are optional. Without the dbname parameter, the driver will default to a database with the same name as the user. This dbname is just for instantiating a connection with the server and doesn't restrict the databases we are trying to grab metrics for.
-  
+
 A  list of databases to explicitly ignore.  If not specified, metrics for all databases are gathered.  Do NOT use with the 'databases' option.
 
   `ignored_databases = ["postgres", "template0", "template1"]`
-  
+
 A list of databases to pull metrics about. If not specified, metrics for all databases are gathered.  Do NOT use with the 'ignored_databases' option.
 
   `databases = ["app_production", "testing"]`
-  
+
 ### Configuration example
 ```
 [[inputs.postgresql]]

From 13f314a5076a47b208aeef5bdab12470837e26c1 Mon Sep 17 00:00:00 2001
From: jeremydenoun <denoun_j@epita.fr>
Date: Thu, 9 Mar 2017 20:28:54 +0100
Subject: [PATCH 0153/1302] Report DEAD (X) State Process (#2501)

Report count of processes in dead (X) process state from the processes input.  This process state is only valid on Linux.
---
 CHANGELOG.md                              | 1 +
 plugins/inputs/system/PROCESSES_README.md | 4 +++-
 plugins/inputs/system/processes.go        | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6053bd66..a11752b5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ be deprecated eventually.
 - [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
 - [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
 - [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
+- [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/system/PROCESSES_README.md b/plugins/inputs/system/PROCESSES_README.md
index 006e043fb..aaeb279f8 100644
--- a/plugins/inputs/system/PROCESSES_README.md
+++ b/plugins/inputs/system/PROCESSES_README.md
@@ -23,6 +23,7 @@ it requires access to execute `ps`.
     - stopped
     - total
     - zombie
+    - dead
     - wait (freebsd only)
     - idle (bsd only)
     - paging (linux only)
@@ -39,6 +40,7 @@ Linux  FreeBSD  Darwin  meaning
   R       R       R     running
   S       S       S     sleeping
   Z       Z       Z     zombie
+  X      none    none   dead
   T       T       T     stopped
  none     I       I     idle (sleeping for longer than about 20 seconds)
   D      D,L      U     blocked (waiting in uninterruptible sleep, or locked)
@@ -54,5 +56,5 @@ None
 ```
 $ telegraf -config ~/ws/telegraf.conf -input-filter processes -test
 * Plugin: processes, Collection 1
-> processes blocked=8i,running=1i,sleeping=265i,stopped=0i,total=274i,zombie=0i,paging=0i,total_threads=687i 1457478636980905042
+> processes blocked=8i,running=1i,sleeping=265i,stopped=0i,total=274i,zombie=0i,dead=0i,paging=0i,total_threads=687i 1457478636980905042
 ```
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index 0950323fd..202bdf058 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -81,6 +81,7 @@ func getEmptyFields() map[string]interface{} {
 	case "openbsd":
 		fields["idle"] = int64(0)
 	case "linux":
+		fields["dead"] = int64(0)
 		fields["paging"] = int64(0)
 		fields["total_threads"] = int64(0)
 	}
@@ -107,6 +108,8 @@ func (p *Processes) gatherFromPS(fields map[string]interface{}) error {
 			fields["blocked"] = fields["blocked"].(int64) + int64(1)
 		case 'Z':
 			fields["zombies"] = fields["zombies"].(int64) + int64(1)
+		case 'X':
+			fields["dead"] = fields["dead"].(int64) + int64(1)
 		case 'T':
 			fields["stopped"] = fields["stopped"].(int64) + int64(1)
 		case 'R':
@@ -164,6 +167,8 @@ func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
 			fields["blocked"] = fields["blocked"].(int64) + int64(1)
 		case 'Z':
 			fields["zombies"] = fields["zombies"].(int64) + int64(1)
+		case 'X':
+			fields["dead"] = fields["dead"].(int64) + int64(1)
 		case 'T', 't':
 			fields["stopped"] = fields["stopped"].(int64) + int64(1)
 		case 'W':

From 7a5d8578467ac6a58575bd6a661a1c16f383455c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 10 Mar 2017 11:27:55 -0800
Subject: [PATCH 0154/1302] Add support for new SSL configuration to mongodb
 (#2522)

closes #2519
---
 CHANGELOG.md                      |  1 +
 plugins/inputs/mongodb/README.md  |  9 ++++++++-
 plugins/inputs/mongodb/mongodb.go | 29 ++++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a11752b5c..20a036555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ be deprecated eventually.
 - [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
 - [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
 - [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
+- [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 72f87feb8..678fe0777 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -11,9 +11,16 @@
   ##   10.0.0.1:10000, etc.
   servers = ["127.0.0.1:27017"]
   gather_perdb_stats = false
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
-For authenticated mongodb istances use connection mongdb connection URI
+For authenticated mongodb instances use `mongodb://` connection URI
 
 ```toml
 [[inputs.mongodb]]
diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index 0bf822a4c..a80b94690 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
@@ -20,6 +21,15 @@ type MongoDB struct {
 	Ssl              Ssl
 	mongos           map[string]*Server
 	GatherPerdbStats bool
+
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
 }
 
 type Ssl struct {
@@ -35,6 +45,13 @@ var sampleConfig = `
   ##   10.0.0.1:10000, etc.
   servers = ["127.0.0.1:27017"]
   gather_perdb_stats = false
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (m *MongoDB) SampleConfig() string {
@@ -105,8 +122,11 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 		dialInfo.Direct = true
 		dialInfo.Timeout = 5 * time.Second
 
+		var tlsConfig *tls.Config
+
 		if m.Ssl.Enabled {
-			tlsConfig := &tls.Config{}
+			// Deprecated SSL config
+			tlsConfig = &tls.Config{}
 			if len(m.Ssl.CaCerts) > 0 {
 				roots := x509.NewCertPool()
 				for _, caCert := range m.Ssl.CaCerts {
@@ -119,6 +139,13 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 			} else {
 				tlsConfig.InsecureSkipVerify = true
 			}
+		} else {
+			tlsConfig, err = internal.GetTLSConfig(
+				m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+		}
+
+		// If configured to use TLS, add a dial function
+		if tlsConfig != nil {
 			dialInfo.DialServer = func(addr *mgo.ServerAddr) (net.Conn, error) {
 				conn, err := tls.Dial("tcp", addr.String(), tlsConfig)
 				if err != nil {

From 426182b81a3b78164212e3b3e9ebab0d89023934 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <AntoineAugusti@users.noreply.github.com>
Date: Wed, 15 Mar 2017 23:20:18 +0100
Subject: [PATCH 0155/1302] Update default value for Cloudwatch rate limit
 (#2520)

---
 CHANGELOG.md                                 | 1 +
 plugins/inputs/cloudwatch/README.md          | 7 ++++---
 plugins/inputs/cloudwatch/cloudwatch.go      | 9 +++++----
 plugins/inputs/cloudwatch/cloudwatch_test.go | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a036555..ea1ccca4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@ be deprecated eventually.
 - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100.
 - [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config.
 - [#2500](https://github.com/influxdata/telegraf/pull/2500): Remove warning if parse empty content
+- [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit
 - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
 
 ## v1.2.1 [2017-02-01]
diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 643e18c3b..3a3c708a2 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -42,9 +42,10 @@ API endpoint. In the following order the plugin will attempt to authenticate.
   namespace = "AWS/ELB"
 
   ## Maximum requests per second. Note that the global default AWS rate limit is
-  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
-  ## maximum of 10. Optional - default value is 10.
-  ratelimit = 10
+  ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+  ## maximum of 400. Optional - default value is 200.
+  ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+  ratelimit = 200
 
   ## Metrics to Pull (optional)
   ## Defaults to all Metrics in Namespace if nothing is provided
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index a812c1265..f0a067001 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -105,9 +105,10 @@ func (c *CloudWatch) SampleConfig() string {
   namespace = "AWS/ELB"
 
   ## Maximum requests per second. Note that the global default AWS rate limit is
-  ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
-  ## maximum of 10. Optional - default value is 10.
-  ratelimit = 10
+  ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+  ## maximum of 400. Optional - default value is 200.
+  ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+  ratelimit = 200
 
   ## Metrics to Pull (optional)
   ## Defaults to all Metrics in Namespace if nothing is provided
@@ -214,7 +215,7 @@ func init() {
 		ttl, _ := time.ParseDuration("1hr")
 		return &CloudWatch{
 			CacheTTL:  internal.Duration{Duration: ttl},
-			RateLimit: 10,
+			RateLimit: 200,
 		}
 	})
 }
diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go
index a1bd7464b..f2d58a00c 100644
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -58,7 +58,7 @@ func TestGather(t *testing.T) {
 		Namespace: "AWS/ELB",
 		Delay:     internalDuration,
 		Period:    internalDuration,
-		RateLimit: 10,
+		RateLimit: 200,
 	}
 
 	var acc testutil.Accumulator
@@ -146,7 +146,7 @@ func TestSelectMetrics(t *testing.T) {
 		Namespace: "AWS/ELB",
 		Delay:     internalDuration,
 		Period:    internalDuration,
-		RateLimit: 10,
+		RateLimit: 200,
 		Metrics: []*Metric{
 			&Metric{
 				MetricNames: []string{"Latency", "RequestCount"},

From 8514acdc3cbdcedce660017b6a55068743710d2e Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 17 Mar 2017 13:14:03 -0400
Subject: [PATCH 0156/1302] return error on unsupported serializer data format
 (#2542)

---
 CHANGELOG.md                    | 1 +
 plugins/serializers/registry.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea1ccca4d..5ef7f580b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ be deprecated eventually.
 - [#2500](https://github.com/influxdata/telegraf/pull/2500): Remove warning if parse empty content
 - [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit
 - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
+- [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 83be4900b..cb1e03b46 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -1,6 +1,8 @@
 package serializers
 
 import (
+	"fmt"
+
 	"github.com/influxdata/telegraf"
 
 	"github.com/influxdata/telegraf/plugins/serializers/graphite"
@@ -49,6 +51,8 @@ func NewSerializer(config *Config) (Serializer, error) {
 		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template)
 	case "json":
 		serializer, err = NewJsonSerializer()
+	default:
+		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
 	return serializer, err
 }

From a962e958ebf64118cdd48fd3d6ff1583a56c7702 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 17 Mar 2017 16:49:11 -0700
Subject: [PATCH 0157/1302] Refactor procstat input (#2540)

fixes #1636
fixes #2315
---
 plugins/inputs/procstat/pgrep.go          |  91 +++++++
 plugins/inputs/procstat/process.go        |  60 +++++
 plugins/inputs/procstat/procstat.go       | 312 +++++++++++-----------
 plugins/inputs/procstat/procstat_test.go  | 299 +++++++++++++++++++--
 plugins/inputs/procstat/spec_processor.go | 110 --------
 testutil/accumulator.go                   |  23 ++
 6 files changed, 608 insertions(+), 287 deletions(-)
 create mode 100644 plugins/inputs/procstat/pgrep.go
 create mode 100644 plugins/inputs/procstat/process.go
 delete mode 100644 plugins/inputs/procstat/spec_processor.go

diff --git a/plugins/inputs/procstat/pgrep.go b/plugins/inputs/procstat/pgrep.go
new file mode 100644
index 000000000..bae5161e4
--- /dev/null
+++ b/plugins/inputs/procstat/pgrep.go
@@ -0,0 +1,91 @@
+package procstat
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+type PIDFinder interface {
+	PidFile(path string) ([]PID, error)
+	Pattern(pattern string) ([]PID, error)
+	Uid(user string) ([]PID, error)
+	FullPattern(path string) ([]PID, error)
+}
+
+// Implemention of PIDGatherer that execs pgrep to find processes
+type Pgrep struct {
+	path string
+}
+
+func NewPgrep() (PIDFinder, error) {
+	path, err := exec.LookPath("pgrep")
+	if err != nil {
+		return nil, fmt.Errorf("Could not find pgrep binary: %s", err)
+	}
+	return &Pgrep{path}, nil
+}
+
+func (pg *Pgrep) PidFile(path string) ([]PID, error) {
+	var pids []PID
+	pidString, err := ioutil.ReadFile(path)
+	if err != nil {
+		return pids, fmt.Errorf("Failed to read pidfile '%s'. Error: '%s'",
+			path, err)
+	}
+	pid, err := strconv.Atoi(strings.TrimSpace(string(pidString)))
+	if err != nil {
+		return pids, err
+	}
+	pids = append(pids, PID(pid))
+	return pids, nil
+}
+
+func (pg *Pgrep) Pattern(pattern string) ([]PID, error) {
+	args := []string{pattern}
+	return find(pg.path, args)
+}
+
+func (pg *Pgrep) Uid(user string) ([]PID, error) {
+	args := []string{"-u", user}
+	return find(pg.path, args)
+}
+
+func (pg *Pgrep) FullPattern(pattern string) ([]PID, error) {
+	args := []string{"-f", pattern}
+	return find(pg.path, args)
+}
+
+func find(path string, args []string) ([]PID, error) {
+	out, err := run(path, args)
+	if err != nil {
+		return nil, err
+	}
+
+	return parseOutput(out)
+}
+
+func run(path string, args []string) (string, error) {
+	out, err := exec.Command(path, args...).Output()
+	if err != nil {
+		return "", fmt.Errorf("Error running %s: %s", path, err)
+	}
+	return string(out), err
+}
+
+func parseOutput(out string) ([]PID, error) {
+	pids := []PID{}
+	fields := strings.Fields(out)
+	for _, field := range fields {
+		pid, err := strconv.Atoi(field)
+		if err != nil {
+			return nil, err
+		}
+		if err == nil {
+			pids = append(pids, PID(pid))
+		}
+	}
+	return pids, nil
+}
diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
new file mode 100644
index 000000000..ec2363f6e
--- /dev/null
+++ b/plugins/inputs/procstat/process.go
@@ -0,0 +1,60 @@
+package procstat
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/process"
+)
+
+type Process interface {
+	PID() PID
+	Tags() map[string]string
+
+	IOCounters() (*process.IOCountersStat, error)
+	MemoryInfo() (*process.MemoryInfoStat, error)
+	Name() (string, error)
+	NumCtxSwitches() (*process.NumCtxSwitchesStat, error)
+	NumFDs() (int32, error)
+	NumThreads() (int32, error)
+	Percent(interval time.Duration) (float64, error)
+	Times() (*cpu.TimesStat, error)
+}
+
+type Proc struct {
+	hasCPUTimes bool
+	tags        map[string]string
+	*process.Process
+}
+
+func NewProc(pid PID) (Process, error) {
+	process, err := process.NewProcess(int32(pid))
+	if err != nil {
+		return nil, err
+	}
+
+	proc := &Proc{
+		Process:     process,
+		hasCPUTimes: false,
+		tags:        make(map[string]string),
+	}
+	return proc, nil
+}
+
+func (p *Proc) Tags() map[string]string {
+	return p.tags
+}
+
+func (p *Proc) PID() PID {
+	return PID(p.Process.Pid)
+}
+
+func (p *Proc) Percent(interval time.Duration) (float64, error) {
+	cpu_perc, err := p.Process.Percent(time.Duration(0))
+	if !p.hasCPUTimes && err == nil {
+		p.hasCPUTimes = true
+		return 0, fmt.Errorf("Must call Percent twice to compute percent cpu.")
+	}
+	return cpu_perc, err
+}
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 929490e4a..46b88fbcf 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -2,18 +2,20 @@ package procstat
 
 import (
 	"fmt"
-	"io/ioutil"
-	"log"
-	"os/exec"
 	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/process"
+	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+var (
+	defaultPIDFinder = NewPgrep
+	defaultProcess   = NewProc
+)
+
+type PID int32
+
 type Procstat struct {
 	PidFile     string `toml:"pid_file"`
 	Exe         string
@@ -23,17 +25,10 @@ type Procstat struct {
 	User        string
 	PidTag      bool
 
-	// pidmap maps a pid to a process object, so we don't recreate every gather
-	pidmap map[int32]*process.Process
-	// tagmap maps a pid to a map of tags for that pid
-	tagmap map[int32]map[string]string
-}
-
-func NewProcstat() *Procstat {
-	return &Procstat{
-		pidmap: make(map[int32]*process.Process),
-		tagmap: make(map[int32]map[string]string),
-	}
+	pidFinder       PIDFinder
+	createPIDFinder func() (PIDFinder, error)
+	procs           map[PID]Process
+	createProcess   func(PID) (Process, error)
 }
 
 var sampleConfig = `
@@ -67,174 +62,179 @@ func (_ *Procstat) Description() string {
 }
 
 func (p *Procstat) Gather(acc telegraf.Accumulator) error {
-	err := p.createProcesses()
+	procs, err := p.updateProcesses(p.procs)
 	if err != nil {
-		log.Printf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
+		return fmt.Errorf(
+			"E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
-	} else {
-		for pid, proc := range p.pidmap {
-			if p.PidTag {
-				p.tagmap[pid]["pid"] = fmt.Sprint(pid)
-			}
-			p := NewSpecProcessor(p.ProcessName, p.Prefix, pid, acc, proc, p.tagmap[pid])
-			p.pushMetrics()
-		}
+	}
+	p.procs = procs
+
+	for _, proc := range p.procs {
+		p.addMetrics(proc, acc)
 	}
 
 	return nil
 }
 
-func (p *Procstat) createProcesses() error {
-	var errstring string
-	var outerr error
-
-	pids, err := p.getAllPids()
-	if err != nil {
-		errstring += err.Error() + " "
+// Add metrics a single Process
+func (p *Procstat) addMetrics(proc Process, acc telegraf.Accumulator) {
+	var prefix string
+	if p.Prefix != "" {
+		prefix = p.Prefix + "_"
 	}
 
-	for _, pid := range pids {
-		_, ok := p.pidmap[pid]
-		if !ok {
-			proc, err := process.NewProcess(pid)
-			if err == nil {
-				p.pidmap[pid] = proc
-			} else {
-				errstring += err.Error() + " "
-			}
+	fields := map[string]interface{}{}
+
+	//If process_name tag is not already set, set to actual name
+	if _, nameInTags := proc.Tags()["process_name"]; !nameInTags {
+		name, err := proc.Name()
+		if err == nil {
+			proc.Tags()["process_name"] = name
 		}
 	}
 
-	if errstring != "" {
-		outerr = fmt.Errorf("%s", errstring)
+	//If pid is not present as a tag, include it as a field.
+	if _, pidInTags := proc.Tags()["pid"]; !pidInTags {
+		fields["pid"] = int32(proc.PID())
 	}
 
-	return outerr
+	numThreads, err := proc.NumThreads()
+	if err == nil {
+		fields[prefix+"num_threads"] = numThreads
+	}
+
+	fds, err := proc.NumFDs()
+	if err == nil {
+		fields[prefix+"num_fds"] = fds
+	}
+
+	ctx, err := proc.NumCtxSwitches()
+	if err == nil {
+		fields[prefix+"voluntary_context_switches"] = ctx.Voluntary
+		fields[prefix+"involuntary_context_switches"] = ctx.Involuntary
+	}
+
+	io, err := proc.IOCounters()
+	if err == nil {
+		fields[prefix+"read_count"] = io.ReadCount
+		fields[prefix+"write_count"] = io.WriteCount
+		fields[prefix+"read_bytes"] = io.ReadBytes
+		fields[prefix+"write_bytes"] = io.WriteBytes
+	}
+
+	cpu_time, err := proc.Times()
+	if err == nil {
+		fields[prefix+"cpu_time_user"] = cpu_time.User
+		fields[prefix+"cpu_time_system"] = cpu_time.System
+		fields[prefix+"cpu_time_idle"] = cpu_time.Idle
+		fields[prefix+"cpu_time_nice"] = cpu_time.Nice
+		fields[prefix+"cpu_time_iowait"] = cpu_time.Iowait
+		fields[prefix+"cpu_time_irq"] = cpu_time.Irq
+		fields[prefix+"cpu_time_soft_irq"] = cpu_time.Softirq
+		fields[prefix+"cpu_time_steal"] = cpu_time.Steal
+		fields[prefix+"cpu_time_stolen"] = cpu_time.Stolen
+		fields[prefix+"cpu_time_guest"] = cpu_time.Guest
+		fields[prefix+"cpu_time_guest_nice"] = cpu_time.GuestNice
+	}
+
+	cpu_perc, err := proc.Percent(time.Duration(0))
+	if err == nil {
+		fields[prefix+"cpu_usage"] = cpu_perc
+	}
+
+	mem, err := proc.MemoryInfo()
+	if err == nil {
+		fields[prefix+"memory_rss"] = mem.RSS
+		fields[prefix+"memory_vms"] = mem.VMS
+		fields[prefix+"memory_swap"] = mem.Swap
+	}
+
+	acc.AddFields("procstat", fields, proc.Tags())
 }
 
-func (p *Procstat) getAllPids() ([]int32, error) {
-	var pids []int32
+// Update monitored Processes
+func (p *Procstat) updateProcesses(prevInfo map[PID]Process) (map[PID]Process, error) {
+	pids, tags, err := p.findPids()
+	if err != nil {
+		return nil, err
+	}
+
+	procs := make(map[PID]Process, len(prevInfo))
+
+	for _, pid := range pids {
+		info, ok := prevInfo[pid]
+		if ok {
+			procs[pid] = info
+		} else {
+			proc, err := p.createProcess(pid)
+			if err != nil {
+				// No problem; process may have ended after we found it
+				continue
+			}
+			procs[pid] = proc
+
+			// Add initial tags
+			for k, v := range tags {
+				proc.Tags()[k] = v
+			}
+
+			// Add pid tag if needed
+			if p.PidTag {
+				proc.Tags()["pid"] = strconv.Itoa(int(pid))
+			}
+			if p.ProcessName != "" {
+				proc.Tags()["process_name"] = p.ProcessName
+			}
+		}
+	}
+	return procs, nil
+}
+
+// Create and return PIDGatherer lazily
+func (p *Procstat) getPIDFinder() (PIDFinder, error) {
+	if p.pidFinder == nil {
+		f, err := p.createPIDFinder()
+		if err != nil {
+			return nil, err
+		}
+		p.pidFinder = f
+	}
+	return p.pidFinder, nil
+}
+
+// Get matching PIDs and their initial tags
+func (p *Procstat) findPids() ([]PID, map[string]string, error) {
+	var pids []PID
+	var tags map[string]string
 	var err error
 
+	f, err := p.getPIDFinder()
+	if err != nil {
+		return nil, nil, err
+	}
+
 	if p.PidFile != "" {
-		pids, err = p.pidsFromFile()
+		pids, err = f.PidFile(p.PidFile)
+		tags = map[string]string{"pidfile": p.PidFile}
 	} else if p.Exe != "" {
-		pids, err = p.pidsFromExe()
+		pids, err = f.Pattern(p.Exe)
+		tags = map[string]string{"exe": p.Exe}
 	} else if p.Pattern != "" {
-		pids, err = p.pidsFromPattern()
+		pids, err = f.FullPattern(p.Pattern)
+		tags = map[string]string{"pattern": p.Pattern}
 	} else if p.User != "" {
-		pids, err = p.pidsFromUser()
+		pids, err = f.Uid(p.User)
+		tags = map[string]string{"user": p.User}
 	} else {
 		err = fmt.Errorf("Either exe, pid_file, user, or pattern has to be specified")
 	}
 
-	return pids, err
-}
-
-func (p *Procstat) pidsFromFile() ([]int32, error) {
-	var out []int32
-	var outerr error
-	pidString, err := ioutil.ReadFile(p.PidFile)
-	if err != nil {
-		outerr = fmt.Errorf("Failed to read pidfile '%s'. Error: '%s'",
-			p.PidFile, err)
-	} else {
-		pid, err := strconv.Atoi(strings.TrimSpace(string(pidString)))
-		if err != nil {
-			outerr = err
-		} else {
-			out = append(out, int32(pid))
-			p.tagmap[int32(pid)] = map[string]string{
-				"pidfile": p.PidFile,
-			}
-		}
-	}
-	return out, outerr
-}
-
-func (p *Procstat) pidsFromExe() ([]int32, error) {
-	var out []int32
-	var outerr error
-	bin, err := exec.LookPath("pgrep")
-	if err != nil {
-		return out, fmt.Errorf("Couldn't find pgrep binary: %s", err)
-	}
-	pgrep, err := exec.Command(bin, p.Exe).Output()
-	if err != nil {
-		return out, fmt.Errorf("Failed to execute %s. Error: '%s'", bin, err)
-	} else {
-		pids := strings.Fields(string(pgrep))
-		for _, pid := range pids {
-			ipid, err := strconv.Atoi(pid)
-			if err == nil {
-				out = append(out, int32(ipid))
-				p.tagmap[int32(ipid)] = map[string]string{
-					"exe": p.Exe,
-				}
-			} else {
-				outerr = err
-			}
-		}
-	}
-	return out, outerr
-}
-
-func (p *Procstat) pidsFromPattern() ([]int32, error) {
-	var out []int32
-	var outerr error
-	bin, err := exec.LookPath("pgrep")
-	if err != nil {
-		return out, fmt.Errorf("Couldn't find pgrep binary: %s", err)
-	}
-	pgrep, err := exec.Command(bin, "-f", p.Pattern).Output()
-	if err != nil {
-		return out, fmt.Errorf("Failed to execute %s. Error: '%s'", bin, err)
-	} else {
-		pids := strings.Fields(string(pgrep))
-		for _, pid := range pids {
-			ipid, err := strconv.Atoi(pid)
-			if err == nil {
-				out = append(out, int32(ipid))
-				p.tagmap[int32(ipid)] = map[string]string{
-					"pattern": p.Pattern,
-				}
-			} else {
-				outerr = err
-			}
-		}
-	}
-	return out, outerr
-}
-
-func (p *Procstat) pidsFromUser() ([]int32, error) {
-	var out []int32
-	var outerr error
-	bin, err := exec.LookPath("pgrep")
-	if err != nil {
-		return out, fmt.Errorf("Couldn't find pgrep binary: %s", err)
-	}
-	pgrep, err := exec.Command(bin, "-u", p.User).Output()
-	if err != nil {
-		return out, fmt.Errorf("Failed to execute %s. Error: '%s'", bin, err)
-	} else {
-		pids := strings.Fields(string(pgrep))
-		for _, pid := range pids {
-			ipid, err := strconv.Atoi(pid)
-			if err == nil {
-				out = append(out, int32(ipid))
-				p.tagmap[int32(ipid)] = map[string]string{
-					"user": p.User,
-				}
-			} else {
-				outerr = err
-			}
-		}
-	}
-	return out, outerr
+	return pids, tags, err
 }
 
 func init() {
 	inputs.Add("procstat", func() telegraf.Input {
-		return NewProcstat()
+		return &Procstat{}
 	})
 }
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index ccc72bdbb..1f6f27642 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -1,33 +1,290 @@
 package procstat
 
 import (
-	"io/ioutil"
+	"fmt"
 	"os"
-	"strconv"
 	"testing"
+	"time"
 
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/process"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/influxdata/telegraf/testutil"
 )
 
-func TestGather(t *testing.T) {
-	var acc testutil.Accumulator
-	pid := os.Getpid()
-	file, err := ioutil.TempFile(os.TempDir(), "telegraf")
-	require.NoError(t, err)
-	file.Write([]byte(strconv.Itoa(pid)))
-	file.Close()
-	defer os.Remove(file.Name())
-	p := Procstat{
-		PidFile: file.Name(),
-		Prefix:  "foo",
-		pidmap:  make(map[int32]*process.Process),
-		tagmap:  make(map[int32]map[string]string),
-	}
-	p.Gather(&acc)
-	assert.True(t, acc.HasFloatField("procstat", "foo_cpu_time_user"))
-	assert.True(t, acc.HasUIntField("procstat", "foo_memory_vms"))
+type testPgrep struct {
+	pids []PID
+	err  error
+}
+
+func pidFinder(pids []PID, err error) func() (PIDFinder, error) {
+	return func() (PIDFinder, error) {
+		return &testPgrep{
+			pids: pids,
+			err:  err,
+		}, nil
+	}
+}
+
+func (pg *testPgrep) PidFile(path string) ([]PID, error) {
+	return pg.pids, pg.err
+}
+
+func (pg *testPgrep) Pattern(pattern string) ([]PID, error) {
+	return pg.pids, pg.err
+}
+
+func (pg *testPgrep) Uid(user string) ([]PID, error) {
+	return pg.pids, pg.err
+}
+
+func (pg *testPgrep) FullPattern(pattern string) ([]PID, error) {
+	return pg.pids, pg.err
+}
+
+type testProc struct {
+	pid  PID
+	tags map[string]string
+}
+
+func newTestProc(pid PID) (Process, error) {
+	proc := &testProc{
+		tags: make(map[string]string),
+	}
+	return proc, nil
+}
+
+func (p *testProc) PID() PID {
+	return p.pid
+}
+
+func (p *testProc) Tags() map[string]string {
+	return p.tags
+}
+
+func (p *testProc) IOCounters() (*process.IOCountersStat, error) {
+	return &process.IOCountersStat{}, nil
+}
+
+func (p *testProc) MemoryInfo() (*process.MemoryInfoStat, error) {
+	return &process.MemoryInfoStat{}, nil
+}
+
+func (p *testProc) Name() (string, error) {
+	return "test_proc", nil
+}
+
+func (p *testProc) NumCtxSwitches() (*process.NumCtxSwitchesStat, error) {
+	return &process.NumCtxSwitchesStat{}, nil
+}
+
+func (p *testProc) NumFDs() (int32, error) {
+	return 0, nil
+}
+
+func (p *testProc) NumThreads() (int32, error) {
+	return 0, nil
+}
+
+func (p *testProc) Percent(interval time.Duration) (float64, error) {
+	return 0, nil
+}
+
+func (p *testProc) Times() (*cpu.TimesStat, error) {
+	return &cpu.TimesStat{}, nil
+}
+
+var pid PID = PID(42)
+var exe string = "foo"
+
+func TestGather_CreateProcessErrorOk(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess: func(PID) (Process, error) {
+			return nil, fmt.Errorf("createProcess error")
+		},
+	}
+	require.NoError(t, p.Gather(&acc))
+}
+
+func TestGather_CreatePIDFinderError(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		createPIDFinder: func() (PIDFinder, error) {
+			return nil, fmt.Errorf("createPIDFinder error")
+		},
+		createProcess: newTestProc,
+	}
+	require.Error(t, p.Gather(&acc))
+}
+
+func TestGather_ProcessName(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		ProcessName:     "custom_name",
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.Equal(t, "custom_name", acc.TagValue("procstat", "process_name"))
+}
+
+func TestGather_NoProcessNameUsesReal(t *testing.T) {
+	var acc testutil.Accumulator
+	pid := PID(os.Getpid())
+
+	p := Procstat{
+		Exe:             exe,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.True(t, acc.HasTag("procstat", "process_name"))
+}
+
+func TestGather_NoPidTag(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+	assert.True(t, acc.HasInt32Field("procstat", "pid"))
+	assert.False(t, acc.HasTag("procstat", "pid"))
+}
+
+func TestGather_PidTag(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		PidTag:          true,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+	assert.Equal(t, "42", acc.TagValue("procstat", "pid"))
+	assert.False(t, acc.HasInt32Field("procstat", "pid"))
+}
+
+func TestGather_Prefix(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		Prefix:          "custom_prefix",
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+	assert.True(t, acc.HasInt32Field("procstat", "custom_prefix_num_fds"))
+}
+
+func TestGather_Exe(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		Exe:             exe,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.Equal(t, exe, acc.TagValue("procstat", "exe"))
+}
+
+func TestGather_User(t *testing.T) {
+	var acc testutil.Accumulator
+	user := "ada"
+
+	p := Procstat{
+		User:            user,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.Equal(t, user, acc.TagValue("procstat", "user"))
+}
+
+func TestGather_Pattern(t *testing.T) {
+	var acc testutil.Accumulator
+	pattern := "foo"
+
+	p := Procstat{
+		Pattern:         pattern,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.Equal(t, pattern, acc.TagValue("procstat", "pattern"))
+}
+
+func TestGather_MissingPidMethod(t *testing.T) {
+	var acc testutil.Accumulator
+
+	p := Procstat{
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.Error(t, p.Gather(&acc))
+}
+
+func TestGather_PidFile(t *testing.T) {
+	var acc testutil.Accumulator
+	pidfile := "/path/to/pidfile"
+
+	p := Procstat{
+		PidFile:         pidfile,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   newTestProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.Equal(t, pidfile, acc.TagValue("procstat", "pidfile"))
+}
+
+func TestGather_PercentFirstPass(t *testing.T) {
+	var acc testutil.Accumulator
+	pid := PID(os.Getpid())
+
+	p := Procstat{
+		Pattern:         "foo",
+		PidTag:          true,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   NewProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+
+	assert.True(t, acc.HasFloatField("procstat", "cpu_time_user"))
+	assert.False(t, acc.HasFloatField("procstat", "cpu_usage"))
+}
+
+func TestGather_PercentSecondPass(t *testing.T) {
+	var acc testutil.Accumulator
+	pid := PID(os.Getpid())
+
+	p := Procstat{
+		Pattern:         "foo",
+		PidTag:          true,
+		createPIDFinder: pidFinder([]PID{pid}, nil),
+		createProcess:   NewProc,
+	}
+	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, p.Gather(&acc))
+
+	assert.True(t, acc.HasFloatField("procstat", "cpu_time_user"))
+	assert.True(t, acc.HasFloatField("procstat", "cpu_usage"))
 }
diff --git a/plugins/inputs/procstat/spec_processor.go b/plugins/inputs/procstat/spec_processor.go
deleted file mode 100644
index 3b56fbc3e..000000000
--- a/plugins/inputs/procstat/spec_processor.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package procstat
-
-import (
-	"time"
-
-	"github.com/shirou/gopsutil/process"
-
-	"github.com/influxdata/telegraf"
-)
-
-type SpecProcessor struct {
-	Prefix string
-	pid    int32
-	tags   map[string]string
-	fields map[string]interface{}
-	acc    telegraf.Accumulator
-	proc   *process.Process
-}
-
-func NewSpecProcessor(
-	processName string,
-	prefix string,
-	pid int32,
-	acc telegraf.Accumulator,
-	p *process.Process,
-	tags map[string]string,
-) *SpecProcessor {
-	if processName != "" {
-		tags["process_name"] = processName
-	} else {
-		name, err := p.Name()
-		if err == nil {
-			tags["process_name"] = name
-		}
-	}
-	return &SpecProcessor{
-		Prefix: prefix,
-		pid:    pid,
-		tags:   tags,
-		fields: make(map[string]interface{}),
-		acc:    acc,
-		proc:   p,
-	}
-}
-
-func (p *SpecProcessor) pushMetrics() {
-	var prefix string
-	if p.Prefix != "" {
-		prefix = p.Prefix + "_"
-	}
-	fields := map[string]interface{}{}
-
-	//If pid is not present as a tag, include it as a field.
-	if _, pidInTags := p.tags["pid"]; !pidInTags {
-		fields["pid"] = p.pid
-	}
-
-	numThreads, err := p.proc.NumThreads()
-	if err == nil {
-		fields[prefix+"num_threads"] = numThreads
-	}
-
-	fds, err := p.proc.NumFDs()
-	if err == nil {
-		fields[prefix+"num_fds"] = fds
-	}
-
-	ctx, err := p.proc.NumCtxSwitches()
-	if err == nil {
-		fields[prefix+"voluntary_context_switches"] = ctx.Voluntary
-		fields[prefix+"involuntary_context_switches"] = ctx.Involuntary
-	}
-
-	io, err := p.proc.IOCounters()
-	if err == nil {
-		fields[prefix+"read_count"] = io.ReadCount
-		fields[prefix+"write_count"] = io.WriteCount
-		fields[prefix+"read_bytes"] = io.ReadBytes
-		fields[prefix+"write_bytes"] = io.WriteBytes
-	}
-
-	cpu_time, err := p.proc.Times()
-	if err == nil {
-		fields[prefix+"cpu_time_user"] = cpu_time.User
-		fields[prefix+"cpu_time_system"] = cpu_time.System
-		fields[prefix+"cpu_time_idle"] = cpu_time.Idle
-		fields[prefix+"cpu_time_nice"] = cpu_time.Nice
-		fields[prefix+"cpu_time_iowait"] = cpu_time.Iowait
-		fields[prefix+"cpu_time_irq"] = cpu_time.Irq
-		fields[prefix+"cpu_time_soft_irq"] = cpu_time.Softirq
-		fields[prefix+"cpu_time_steal"] = cpu_time.Steal
-		fields[prefix+"cpu_time_stolen"] = cpu_time.Stolen
-		fields[prefix+"cpu_time_guest"] = cpu_time.Guest
-		fields[prefix+"cpu_time_guest_nice"] = cpu_time.GuestNice
-	}
-
-	cpu_perc, err := p.proc.Percent(time.Duration(0))
-	if err == nil && cpu_perc != 0 {
-		fields[prefix+"cpu_usage"] = cpu_perc
-	}
-
-	mem, err := p.proc.MemoryInfo()
-	if err == nil {
-		fields[prefix+"memory_rss"] = mem.RSS
-		fields[prefix+"memory_vms"] = mem.VMS
-		fields[prefix+"memory_swap"] = mem.Swap
-	}
-
-	p.acc.AddFields("procstat", fields, p.tags)
-}
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 25e60920b..63dfddd7a 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -161,6 +161,29 @@ func (a *Accumulator) Get(measurement string) (*Metric, bool) {
 	return nil, false
 }
 
+func (a *Accumulator) HasTag(measurement string, key string) bool {
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			_, ok := p.Tags[key]
+			return ok
+		}
+	}
+	return false
+}
+
+func (a *Accumulator) TagValue(measurement string, key string) string {
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			v, ok := p.Tags[key]
+			if !ok {
+				return ""
+			}
+			return v
+		}
+	}
+	return ""
+}
+
 // NFields returns the total number of fields in the accumulator, across all
 // measurements
 func (a *Accumulator) NFields() int {

From bb28fb256b4595676714f22b2742738f96a184e5 Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Tue, 21 Mar 2017 01:47:57 +0100
Subject: [PATCH 0158/1302] Add Elasticsearch 5.x output (#2332)

---
 Godeps                                        |   1 +
 Makefile                                      |   6 +-
 README.md                                     |   1 +
 plugins/outputs/all/all.go                    |   1 +
 plugins/outputs/elasticsearch/README.md       | 218 +++++++++++++
 .../outputs/elasticsearch/elasticsearch.go    | 308 ++++++++++++++++++
 .../elasticsearch/elasticsearch_test.go       | 126 +++++++
 7 files changed, 659 insertions(+), 2 deletions(-)
 create mode 100644 plugins/outputs/elasticsearch/README.md
 create mode 100644 plugins/outputs/elasticsearch/elasticsearch.go
 create mode 100644 plugins/outputs/elasticsearch/elasticsearch_test.go

diff --git a/Godeps b/Godeps
index 2d0419ef6..6cbe9efa7 100644
--- a/Godeps
+++ b/Godeps
@@ -59,4 +59,5 @@ golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/dancannon/gorethink.v1 edc7a6a68e2d8015f5ffe1b2560eed989f8a45be
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
+gopkg.in/olivere/elastic.v5 ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/Makefile b/Makefile
index 79276f887..d2bad656d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ docker-run:
 		-e ADVERTISED_PORT=9092 \
 		-p "2181:2181" -p "9092:9092" \
 		-d spotify/kafka
+	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
 	docker run --name memcached -p "11211:11211" -d memcached
 	docker run --name postgres -p "5432:5432" -d postgres
@@ -69,6 +70,7 @@ docker-run-circle:
 		-e ADVERTISED_PORT=9092 \
 		-p "2181:2181" -p "9092:9092" \
 		-d spotify/kafka
+	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
 	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
@@ -76,8 +78,8 @@ docker-run-circle:
 
 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats
-	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats
+	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats elasticsearch
+	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats elasticsearch
 
 # Run full unit tests using docker containers (includes setup and teardown)
 test: vet docker-kill docker-run
diff --git a/README.md b/README.md
index 915c7b761..906862714 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,7 @@ Telegraf can also collect metrics via the following service plugins:
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)
+* [elasticsearch](./plugins/outputs/elasticsearch)
 * [file](./plugins/outputs/file)
 * [graphite](./plugins/outputs/graphite)
 * [graylog](./plugins/outputs/graylog)
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index eec2b95e3..089a56909 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -6,6 +6,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/cloudwatch"
 	_ "github.com/influxdata/telegraf/plugins/outputs/datadog"
 	_ "github.com/influxdata/telegraf/plugins/outputs/discard"
+	_ "github.com/influxdata/telegraf/plugins/outputs/elasticsearch"
 	_ "github.com/influxdata/telegraf/plugins/outputs/file"
 	_ "github.com/influxdata/telegraf/plugins/outputs/graphite"
 	_ "github.com/influxdata/telegraf/plugins/outputs/graylog"
diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md
new file mode 100644
index 000000000..620d5a82c
--- /dev/null
+++ b/plugins/outputs/elasticsearch/README.md
@@ -0,0 +1,218 @@
+## Elasticsearch Output Plugin for Telegraf
+
+This plugin writes to [Elasticsearch](https://www.elastic.co) via HTTP using Elastic (http://olivere.github.io/elastic/).
+
+Currently it only supports Elasticsearch 5.x series.
+
+## Elasticsearch indexes and templates
+
+### Indexes per time-frame
+
+This plugin can manage indexes per time-frame, as commonly done in other tools with Elasticsearch.
+
+The timestamp of the metric collected will be used to decide the index destination.
+
+For more information about this usage on Elasticsearch, check https://www.elastic.co/guide/en/elasticsearch/guide/master/time-based.html#index-per-timeframe
+
+### Template management
+
+Index templates are used in Elasticsearch to define settings and mappings for the indexes and how the fields should be analyzed.
+For more information on how this works, see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+
+This plugin can create a working template for use with telegraf metrics. It uses Elasticsearch dynamic templates feature to set proper types for the tags and metrics fields.
+If the template specified already exists, it will not overwrite unless you configure this plugin to do so. Thus you can customize this template after its creation if necessary.
+
+Example of an index template created by telegraf:
+
+```json
+{
+  "order": 0,
+  "template": "telegraf-*",
+  "settings": {
+    "index": {
+      "mapping": {
+        "total_fields": {
+          "limit": "5000"
+        }
+      },
+      "refresh_interval": "10s"
+    }
+  },
+  "mappings": {
+    "_default_": {
+      "dynamic_templates": [
+        {
+          "tags": {
+            "path_match": "tag.*",
+            "mapping": {
+              "ignore_above": 512,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        },
+        {
+          "metrics_long": {
+            "mapping": {
+              "index": false,
+              "type": "float"
+            },
+            "match_mapping_type": "long"
+          }
+        },
+        {
+          "metrics_double": {
+            "mapping": {
+              "index": false,
+              "type": "float"
+            },
+            "match_mapping_type": "double"
+          }
+        },
+        {
+          "text_fields": {
+            "mapping": {
+              "norms": false
+            },
+            "match": "*"
+          }
+        }
+      ],
+      "_all": {
+        "enabled": false
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "measurement_name": {
+          "type": "keyword"
+        }
+      }
+    }
+  },
+  "aliases": {}
+}
+
+```
+
+### Example events:
+
+This plugin will format the events in the following way:
+
+```json
+{
+  "@timestamp": "2017-01-01T00:00:00+00:00",
+  "measurement_name": "cpu",
+  "cpu": {
+    "usage_guest": 0,
+    "usage_guest_nice": 0,
+    "usage_idle": 71.85413456197966,
+    "usage_iowait": 0.256805341656516,
+    "usage_irq": 0,
+    "usage_nice": 0,
+    "usage_softirq": 0.2054442732579466,
+    "usage_steal": 0,
+    "usage_system": 15.04879301548127,
+    "usage_user": 12.634822807288275
+  },
+  "tag": {
+    "cpu": "cpu-total",
+    "host": "elastichost",
+    "dc": "datacenter1"
+  }
+}
+```
+
+```json
+{
+  "@timestamp": "2017-01-01T00:00:00+00:00",
+  "measurement_name": "system",
+  "system": {
+    "load1": 0.78,
+    "load15": 0.8,
+    "load5": 0.8,
+    "n_cpus": 2,
+    "n_users": 2
+  },
+  "tag": {
+    "host": "elastichost",
+    "dc": "datacenter1"
+  }
+}
+```
+
+### Configuration:
+
+```toml
+# Configuration for Elasticsearch to send metrics to.
+[[outputs.elasticsearch]]
+  ## The full HTTP endpoint URL for your Elasticsearch instance
+  ## Multiple urls can be specified as part of the same cluster,
+  ## this means that only ONE of the urls will be written to each interval.
+  urls = [ "http://node1.es.example.com:9200" ] # required.
+  ## Elasticsearch client timeout, defaults to "5s" if not set.
+  timeout = "5s"
+  ## Set to true to ask Elasticsearch a list of all cluster nodes,
+  ## thus it is not necessary to list all nodes in the urls config option
+  enable_sniffer = false
+  ## Set the interval to check if the Elasticsearch nodes are available
+  ## Setting to "0s" will disable the health check (not recommended in production)
+  health_check_interval = "10s"
+  ## HTTP basic authentication details (eg. when using Shield)
+  # username = "telegraf"
+  # password = "mypassword"
+
+  ## Index Config
+  ## The target index for metrics (Elasticsearch will create if it not exists).
+  ## You can use the date specifiers below to create indexes per time frame.
+  ## The metric timestamp will be used to decide the destination index name
+  # %Y - year (2016)
+  # %y - last two digits of year (00..99)
+  # %m - month (01..12)
+  # %d - day of month (e.g., 01)
+  # %H - hour (00..23)
+  index_name = "telegraf-%Y.%m.%d" # required.
+
+  ## Template Config
+  ## Set to true if you want telegraf to manage its index template.
+  ## If enabled it will create a recommended index template for telegraf indexes
+  manage_template = true
+  ## The template name used for telegraf indexes
+  template_name = "telegraf"
+  ## Set to true if you want telegraf to overwrite an existing template
+  overwrite_template = false
+```
+
+### Required parameters:
+
+* `urls`: A list containing the full HTTP URL of one or more nodes from your Elasticsearch instance.
+* `index_name`: The target index for metrics. You can use the date specifiers below to create indexes per time frame.
+
+```   %Y - year (2017)
+  %y - last two digits of year (00..99)
+  %m - month (01..12)
+  %d - day of month (e.g., 01)
+  %H - hour (00..23)
+```
+
+### Optional parameters:
+
+* `timeout`: Elasticsearch client timeout, defaults to "5s" if not set.
+* `enable_sniffer`: Set to true to ask Elasticsearch a list of all cluster nodes, thus it is not necessary to list all nodes in the urls config option.
+* `health_check_interval`: Set the interval to check if the nodes are available, in seconds. Setting to 0 will disable the health check (not recommended in production).
+* `username`: The username for HTTP basic authentication details (eg. when using Shield).
+* `password`: The password for HTTP basic authentication details (eg. when using Shield).
+* `manage_template`: Set to true if you want telegraf to manage its index template. If enabled it will create a recommended index template for telegraf indexes.
+* `template_name`: The template name used for telegraf indexes.
+* `overwrite_template`: Set to true if you want telegraf to overwrite an existing template.
+
+## Known issues
+
+Integer values collected that are bigger than 2^63 and smaller than 1e21 (or in this exact same window of their negative counterparts) are encoded by golang JSON encoder in decimal format and that is not fully supported by Elasticsearch dynamic field mapping. This causes the metrics with such values to be dropped in case a field mapping has not been created yet on the telegraf index. If that's the case you will see an exception on Elasticsearch side like this:
+
+```{"error":{"root_cause":[{"type":"mapper_parsing_exception","reason":"failed to parse"}],"type":"mapper_parsing_exception","reason":"failed to parse","caused_by":{"type":"illegal_state_exception","reason":"No matching token for number_type [BIG_INTEGER]"}},"status":400}```
+
+The correct field mapping will be created on the telegraf index as soon as a supported JSON value is received by Elasticsearch, and subsequent insertions will work because the field mapping will already exist. 
+
+This issue is caused by the way Elasticsearch tries to detect integer fields, and by how golang encodes numbers in JSON. There is no clear workaround for this at the moment.
\ No newline at end of file
diff --git a/plugins/outputs/elasticsearch/elasticsearch.go b/plugins/outputs/elasticsearch/elasticsearch.go
new file mode 100644
index 000000000..dbd359b90
--- /dev/null
+++ b/plugins/outputs/elasticsearch/elasticsearch.go
@@ -0,0 +1,308 @@
+package elasticsearch
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"gopkg.in/olivere/elastic.v5"
+)
+
+type Elasticsearch struct {
+	URLs                []string `toml:"urls"`
+	IndexName           string
+	Username            string
+	Password            string
+	EnableSniffer       bool
+	Timeout             internal.Duration
+	HealthCheckInterval internal.Duration
+	ManageTemplate      bool
+	TemplateName        string
+	OverwriteTemplate   bool
+	Client              *elastic.Client
+}
+
+var sampleConfig = `
+  ## The full HTTP endpoint URL for your Elasticsearch instance
+  ## Multiple urls can be specified as part of the same cluster,
+  ## this means that only ONE of the urls will be written to each interval.
+  urls = [ "http://node1.es.example.com:9200" ] # required.
+  ## Elasticsearch client timeout, defaults to "5s" if not set. 
+  timeout = "5s"
+  ## Set to true to ask Elasticsearch a list of all cluster nodes,
+  ## thus it is not necessary to list all nodes in the urls config option.
+  enable_sniffer = false
+  ## Set the interval to check if the Elasticsearch nodes are available
+  ## Setting to "0s" will disable the health check (not recommended in production)
+  health_check_interval = "10s"
+  ## HTTP basic authentication details (eg. when using Shield)
+  # username = "telegraf"
+  # password = "mypassword"
+
+  ## Index Config
+  ## The target index for metrics (Elasticsearch will create if it not exists).
+  ## You can use the date specifiers below to create indexes per time frame.
+  ## The metric timestamp will be used to decide the destination index name
+  # %Y - year (2016)
+  # %y - last two digits of year (00..99)
+  # %m - month (01..12)
+  # %d - day of month (e.g., 01)
+  # %H - hour (00..23)
+  index_name = "telegraf-%Y.%m.%d" # required.
+
+  ## Template Config
+  ## Set to true if you want telegraf to manage its index template.
+  ## If enabled it will create a recommended index template for telegraf indexes
+  manage_template = true
+  ## The template name used for telegraf indexes
+  template_name = "telegraf"
+  ## Set to true if you want telegraf to overwrite an existing template
+  overwrite_template = false
+`
+
+func (a *Elasticsearch) Connect() error {
+	if a.URLs == nil || a.IndexName == "" {
+		return fmt.Errorf("Elasticsearch urls or index_name is not defined")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), a.Timeout.Duration)
+	defer cancel()
+
+	var clientOptions []elastic.ClientOptionFunc
+
+	clientOptions = append(clientOptions,
+		elastic.SetSniff(a.EnableSniffer),
+		elastic.SetURL(a.URLs...),
+		elastic.SetHealthcheckInterval(a.HealthCheckInterval.Duration),
+	)
+
+	if a.Username != "" && a.Password != "" {
+		clientOptions = append(clientOptions,
+			elastic.SetBasicAuth(a.Username, a.Password),
+		)
+	}
+
+	if a.HealthCheckInterval.Duration == 0 {
+		clientOptions = append(clientOptions,
+			elastic.SetHealthcheck(false),
+		)
+		log.Printf("D! Elasticsearch output: disabling health check")
+	}
+
+	client, err := elastic.NewClient(clientOptions...)
+
+	if err != nil {
+		return err
+	}
+
+	// check for ES version on first node
+	esVersion, err := client.ElasticsearchVersion(a.URLs[0])
+
+	if err != nil {
+		return fmt.Errorf("Elasticsearch version check failed: %s", err)
+	}
+
+	// quit if ES version is not supported
+	i, err := strconv.Atoi(strings.Split(esVersion, ".")[0])
+	if err != nil || i < 5 {
+		return fmt.Errorf("Elasticsearch version not supported: %s", esVersion)
+	}
+
+	log.Println("I! Elasticsearch version: " + esVersion)
+
+	a.Client = client
+
+	if a.ManageTemplate {
+		err := a.manageTemplate(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (a *Elasticsearch) Write(metrics []telegraf.Metric) error {
+	if len(metrics) == 0 {
+		return nil
+	}
+
+	bulkRequest := a.Client.Bulk()
+
+	for _, metric := range metrics {
+		var name = metric.Name()
+
+		// index name has to be re-evaluated each time for telegraf
+		// to send the metric to the correct time-based index
+		indexName := a.GetIndexName(a.IndexName, metric.Time())
+
+		m := make(map[string]interface{})
+
+		m["@timestamp"] = metric.Time()
+		m["measurement_name"] = name
+		m["tag"] = metric.Tags()
+		m[name] = metric.Fields()
+
+		bulkRequest.Add(elastic.NewBulkIndexRequest().
+			Index(indexName).
+			Type("metrics").
+			Doc(m))
+
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), a.Timeout.Duration)
+	defer cancel()
+
+	res, err := bulkRequest.Do(ctx)
+
+	if err != nil {
+		return fmt.Errorf("Error sending bulk request to Elasticsearch: %s", err)
+	}
+
+	if res.Errors {
+		for id, err := range res.Failed() {
+			log.Printf("E! Elasticsearch indexing failure, id: %d, error: %s, caused by: %s, %s", id, err.Error.Reason, err.Error.CausedBy["reason"], err.Error.CausedBy["type"])
+		}
+		return fmt.Errorf("W! Elasticsearch failed to index %d metrics", len(res.Failed()))
+	}
+
+	return nil
+
+}
+
+func (a *Elasticsearch) manageTemplate(ctx context.Context) error {
+	if a.TemplateName == "" {
+		return fmt.Errorf("Elasticsearch template_name configuration not defined")
+	}
+
+	templateExists, errExists := a.Client.IndexTemplateExists(a.TemplateName).Do(ctx)
+
+	if errExists != nil {
+		return fmt.Errorf("Elasticsearch template check failed, template name: %s, error: %s", a.TemplateName, errExists)
+	}
+
+	templatePattern := a.IndexName + "*"
+
+	if strings.Contains(a.IndexName, "%") {
+		templatePattern = a.IndexName[0:strings.Index(a.IndexName, "%")] + "*"
+	}
+
+	if (a.OverwriteTemplate) || (!templateExists) {
+		// Create or update the template
+		tmpl := fmt.Sprintf(`
+			{
+				"template":"%s",
+				"settings": {
+					"index": {
+						"refresh_interval": "10s",
+						"mapping.total_fields.limit": 5000
+					}
+				},
+				"mappings" : {
+					"_default_" : {
+						"_all": { "enabled": false	  },
+						"properties" : {
+							"@timestamp" : { "type" : "date" },
+							"measurement_name" : { "type" : "keyword" }
+						},
+						"dynamic_templates": [
+							{
+								"tags": {
+									"match_mapping_type": "string",
+									"path_match": "tag.*",
+									"mapping": {
+										"ignore_above": 512,
+										"type": "keyword"
+									}
+								}
+							},
+							{
+								"metrics_long": {
+									"match_mapping_type": "long",
+									"mapping": {
+										"type": "float",
+										"index": false
+									}
+								}
+							},
+							{
+								"metrics_double": {
+									"match_mapping_type": "double",
+									"mapping": {
+										"type": "float",
+										"index": false
+									}
+								}
+							},
+							{
+								"text_fields": {
+									"match": "*",
+									"mapping": {
+										"norms": false
+									}
+								}
+							}
+						]
+					}
+				}
+			}`, templatePattern)
+		_, errCreateTemplate := a.Client.IndexPutTemplate(a.TemplateName).BodyString(tmpl).Do(ctx)
+
+		if errCreateTemplate != nil {
+			return fmt.Errorf("Elasticsearch failed to create index template %s : %s", a.TemplateName, errCreateTemplate)
+		}
+
+		log.Printf("D! Elasticsearch template %s created or updated\n", a.TemplateName)
+
+	} else {
+
+		log.Println("D! Found existing Elasticsearch template. Skipping template management")
+
+	}
+	return nil
+}
+
+func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time) string {
+	if strings.Contains(indexName, "%") {
+		var dateReplacer = strings.NewReplacer(
+			"%Y", eventTime.UTC().Format("2006"),
+			"%y", eventTime.UTC().Format("06"),
+			"%m", eventTime.UTC().Format("01"),
+			"%d", eventTime.UTC().Format("02"),
+			"%H", eventTime.UTC().Format("15"),
+		)
+
+		indexName = dateReplacer.Replace(indexName)
+	}
+
+	return indexName
+
+}
+
+func (a *Elasticsearch) SampleConfig() string {
+	return sampleConfig
+}
+
+func (a *Elasticsearch) Description() string {
+	return "Configuration for Elasticsearch to send metrics to."
+}
+
+func (a *Elasticsearch) Close() error {
+	a.Client = nil
+	return nil
+}
+
+func init() {
+	outputs.Add("elasticsearch", func() telegraf.Output {
+		return &Elasticsearch{
+			Timeout:             internal.Duration{Duration: time.Second * 5},
+			HealthCheckInterval: internal.Duration{Duration: time.Second * 10},
+		}
+	})
+}
diff --git a/plugins/outputs/elasticsearch/elasticsearch_test.go b/plugins/outputs/elasticsearch/elasticsearch_test.go
new file mode 100644
index 000000000..9163a2bbe
--- /dev/null
+++ b/plugins/outputs/elasticsearch/elasticsearch_test.go
@@ -0,0 +1,126 @@
+package elasticsearch
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestConnectAndWrite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
+
+	e := &Elasticsearch{
+		URLs:                urls,
+		IndexName:           "test-%Y.%m.%d",
+		Timeout:             internal.Duration{Duration: time.Second * 5},
+		ManageTemplate:      true,
+		TemplateName:        "telegraf",
+		OverwriteTemplate:   false,
+		HealthCheckInterval: internal.Duration{Duration: time.Second * 10},
+	}
+
+	// Verify that we can connect to Elasticsearch
+	err := e.Connect()
+	require.NoError(t, err)
+
+	// Verify that we can successfully write data to Elasticsearch
+	err = e.Write(testutil.MockMetrics())
+	require.NoError(t, err)
+
+}
+
+func TestTemplateManagementEmptyTemplate(t *testing.T) {
+	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
+
+	ctx := context.Background()
+
+	e := &Elasticsearch{
+		URLs:              urls,
+		IndexName:         "test-%Y.%m.%d",
+		Timeout:           internal.Duration{Duration: time.Second * 5},
+		ManageTemplate:    true,
+		TemplateName:      "",
+		OverwriteTemplate: true,
+	}
+
+	err := e.manageTemplate(ctx)
+	require.Error(t, err)
+
+}
+
+func TestTemplateManagement(t *testing.T) {
+	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
+
+	e := &Elasticsearch{
+		URLs:              urls,
+		IndexName:         "test-%Y.%m.%d",
+		Timeout:           internal.Duration{Duration: time.Second * 5},
+		ManageTemplate:    true,
+		TemplateName:      "telegraf",
+		OverwriteTemplate: true,
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), e.Timeout.Duration)
+	defer cancel()
+
+	err := e.Connect()
+	require.NoError(t, err)
+
+	err = e.manageTemplate(ctx)
+	require.NoError(t, err)
+}
+
+func TestGetIndexName(t *testing.T) {
+	e := &Elasticsearch{}
+
+	var tests = []struct {
+		EventTime time.Time
+		IndexName string
+		Expected  string
+	}{
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname",
+			"indexname",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%Y",
+			"indexname-2014",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%Y-%m",
+			"indexname-2014-12",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%Y-%m-%d",
+			"indexname-2014-12-01",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%Y-%m-%d-%H",
+			"indexname-2014-12-01-23",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%y-%m",
+			"indexname-14-12",
+		},
+	}
+	for _, test := range tests {
+		indexName := e.GetIndexName(test.IndexName, test.EventTime)
+		if indexName != test.Expected {
+			t.Errorf("Expected indexname %s, got %s\n", indexName, test.Expected)
+		}
+	}
+}

From 5c33c760c7acd2bae24894250606a87fc78c8425 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 21 Mar 2017 10:59:41 -0700
Subject: [PATCH 0159/1302] Fix procstat initialization

---
 plugins/inputs/procstat/procstat.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 46b88fbcf..20c5af9d2 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -235,6 +235,9 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 
 func init() {
 	inputs.Add("procstat", func() telegraf.Input {
-		return &Procstat{}
+		return &Procstat{
+			createPIDFinder: defaultPIDFinder,
+			createProcess:   defaultProcess,
+		}
 	})
 }

From 70a0a848821b9e602f8cb8a3e3dce7e5db8a1f31 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 21 Mar 2017 11:40:51 -0700
Subject: [PATCH 0160/1302] Really fix procstat initialization

---
 plugins/inputs/procstat/procstat.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 20c5af9d2..d689ecf3e 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -62,6 +62,13 @@ func (_ *Procstat) Description() string {
 }
 
 func (p *Procstat) Gather(acc telegraf.Accumulator) error {
+	if p.createPIDFinder == nil {
+		p.createPIDFinder = defaultPIDFinder
+	}
+	if p.createProcess == nil {
+		p.createProcess = defaultProcess
+	}
+
 	procs, err := p.updateProcesses(p.procs)
 	if err != nil {
 		return fmt.Errorf(
@@ -235,9 +242,6 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 
 func init() {
 	inputs.Add("procstat", func() telegraf.Input {
-		return &Procstat{
-			createPIDFinder: defaultPIDFinder,
-			createProcess:   defaultProcess,
-		}
+		return &Procstat{}
 	})
 }

From 616b66f5cb12ae9b95cd6e101e709a4681a56bb7 Mon Sep 17 00:00:00 2001
From: Oskar <bullshit@users.noreply.github.com>
Date: Wed, 22 Mar 2017 20:04:58 +0100
Subject: [PATCH 0161/1302] Multi instances in win_perf_counters (#2352)

---
 CHANGELOG.md                                          | 2 ++
 plugins/inputs/win_perf_counters/win_perf_counters.go | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ef7f580b..fd1ec5136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,8 @@ be deprecated eventually.
 - [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit
 - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
 - [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
+- [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
+
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index da59c3040..5365dc68b 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -265,6 +265,11 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 					} else if metric.instance == s {
 						// Catch if we set it to total or some form of it
 						add = true
+					} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, s) {
+						// If you are using a multiple instance identifier such as "w3wp#1"
+						// phd.dll returns only the first 2 characters of the identifier.
+						add = true
+						s = metric.instance
 					} else if metric.instance == "------" {
 						add = true
 					}

From 1402c158b74789132af2b885315d619648003f83 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 24 Mar 2017 15:03:36 -0400
Subject: [PATCH 0162/1302] remove sleep from tests (#2555)

---
 plugins/inputs/cloudwatch/cloudwatch_test.go  |  5 +-
 .../http_listener/http_listener_test.go       | 47 +++----------
 .../http_response/http_response_test.go       |  2 +-
 .../inputs/kafka_consumer/kafka_consumer.go   |  9 +--
 .../kafka_consumer/kafka_consumer_test.go     | 11 ++-
 plugins/inputs/logparser/logparser_test.go    | 10 ++-
 plugins/inputs/mongodb/mongodb_server_test.go |  4 +-
 plugins/inputs/mqtt_consumer/mqtt_consumer.go | 10 +--
 .../mqtt_consumer/mqtt_consumer_test.go       | 15 ++--
 plugins/inputs/nats_consumer/nats_consumer.go |  8 +--
 .../nats_consumer/nats_consumer_test.go       | 20 +++---
 .../socket_listener/socket_listener_test.go   | 49 +++++--------
 plugins/inputs/tail/tail.go                   | 23 +++---
 plugins/inputs/tail/tail_test.go              | 19 +++--
 .../inputs/tcp_listener/tcp_listener_test.go  | 63 +++++++++--------
 plugins/inputs/udp_listener/udp_listener.go   | 25 ++++---
 .../inputs/udp_listener/udp_listener_test.go  | 57 ++++++++-------
 plugins/outputs/graphite/graphite_test.go     | 48 ++++++-------
 plugins/outputs/influxdb/client/udp_test.go   |  1 -
 .../outputs/instrumental/instrumental_test.go | 70 +++++++++----------
 testutil/accumulator.go                       | 26 +++++--
 21 files changed, 252 insertions(+), 270 deletions(-)

diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go
index f2d58a00c..3aaab7d45 100644
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -207,14 +207,13 @@ func TestGenerateStatisticsInputParams(t *testing.T) {
 }
 
 func TestMetricsCacheTimeout(t *testing.T) {
-	ttl, _ := time.ParseDuration("5ms")
 	cache := &MetricCache{
 		Metrics: []*cloudwatch.Metric{},
 		Fetched: time.Now(),
-		TTL:     ttl,
+		TTL:     time.Minute,
 	}
 
 	assert.True(t, cache.IsValid())
-	time.Sleep(ttl)
+	cache.Fetched = time.Now().Add(-time.Minute)
 	assert.False(t, cache.IsValid())
 }
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index b5f858fde..7e6fbc8ab 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 
@@ -43,14 +42,12 @@ func TestWriteHTTP(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post single message to listener
 	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -61,7 +58,7 @@ func TestWriteHTTP(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(2)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
 	for _, hostTag := range hostTags {
@@ -76,7 +73,7 @@ func TestWriteHTTP(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, 400, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(3)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -91,14 +88,12 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post single message to listener
 	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgNoNewline)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -115,8 +110,6 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// Post a gigantic metric to the listener and verify that it writes OK this time:
 	resp, err := http.Post("http://localhost:8296/write?db=mydb", "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
@@ -133,8 +126,6 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	resp, err := http.Post("http://localhost:8297/write", "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	require.EqualValues(t, 413, resp.StatusCode)
@@ -150,15 +141,13 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	resp, err := http.Post("http://localhost:8298/write", "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
+	acc.Wait(len(hostTags))
 	for _, hostTag := range hostTags {
 		acc.AssertContainsTaggedFields(t, "cpu_load_short",
 			map[string]interface{}{"value": float64(12)},
@@ -177,15 +166,13 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	resp, err := http.Post("http://localhost:8300/write", "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
 	require.NoError(t, err)
 	require.EqualValues(t, 400, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 15)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
+	acc.Wait(len(hostTags))
 	for _, hostTag := range hostTags {
 		acc.AssertContainsTaggedFields(t, "cpu_load_short",
 			map[string]interface{}{"value": float64(12)},
@@ -204,8 +191,6 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	data, err := ioutil.ReadFile("./testdata/testmsgs.gz")
 	require.NoError(t, err)
 
@@ -218,9 +203,9 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
-	time.Sleep(time.Millisecond * 50)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
+	acc.Wait(len(hostTags))
 	for _, hostTag := range hostTags {
 		acc.AssertContainsTaggedFields(t, "cpu_load_short",
 			map[string]interface{}{"value": float64(12)},
@@ -237,8 +222,6 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post many messages to listener
 	var wg sync.WaitGroup
 	for i := 0; i < 10; i++ {
@@ -254,9 +237,9 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 	}
 
 	wg.Wait()
-	time.Sleep(time.Millisecond * 250)
 	listener.Gather(acc)
 
+	acc.Wait(25000)
 	require.Equal(t, int64(25000), int64(acc.NMetrics()))
 }
 
@@ -267,8 +250,6 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post single message to listener
 	resp, err := http.Post("http://localhost:8186/foobar", "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
@@ -276,16 +257,12 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 }
 
 func TestWriteHTTPInvalid(t *testing.T) {
-	time.Sleep(time.Millisecond * 250)
-
 	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post single message to listener
 	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(badMsg)))
 	require.NoError(t, err)
@@ -293,16 +270,12 @@ func TestWriteHTTPInvalid(t *testing.T) {
 }
 
 func TestWriteHTTPEmpty(t *testing.T) {
-	time.Sleep(time.Millisecond * 250)
-
 	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post single message to listener
 	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(emptyMsg)))
 	require.NoError(t, err)
@@ -310,16 +283,12 @@ func TestWriteHTTPEmpty(t *testing.T) {
 }
 
 func TestQueryAndPingHTTP(t *testing.T) {
-	time.Sleep(time.Millisecond * 250)
-
 	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
-
 	// post query to listener
 	resp, err := http.Post("http://localhost:8186/query?db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22", "", nil)
 	require.NoError(t, err)
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index 236e5d88b..b65b1f954 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -329,7 +329,7 @@ func TestTimeout(t *testing.T) {
 		Address:         ts.URL + "/twosecondnap",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 1},
+		ResponseTimeout: internal.Duration{Duration: time.Millisecond},
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index f4176edd3..6f1f4020b 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -1,6 +1,7 @@
 package kafka_consumer
 
 import (
+	"fmt"
 	"log"
 	"strings"
 	"sync"
@@ -129,13 +130,13 @@ func (k *Kafka) receiver() {
 			return
 		case err := <-k.errs:
 			if err != nil {
-				log.Printf("E! Kafka Consumer Error: %s\n", err)
+				k.acc.AddError(fmt.Errorf("Kafka Consumer Error: %s\n", err))
 			}
 		case msg := <-k.in:
 			metrics, err := k.parser.Parse(msg.Value)
 			if err != nil {
-				log.Printf("E! Kafka Message Parse Error\nmessage: %s\nerror: %s",
-					string(msg.Value), err.Error())
+				k.acc.AddError(fmt.Errorf("E! Kafka Message Parse Error\nmessage: %s\nerror: %s",
+					string(msg.Value), err.Error()))
 			}
 
 			for _, metric := range metrics {
@@ -158,7 +159,7 @@ func (k *Kafka) Stop() {
 	defer k.Unlock()
 	close(k.done)
 	if err := k.Consumer.Close(); err != nil {
-		log.Printf("E! Error closing kafka consumer: %s\n", err.Error())
+		k.acc.AddError(fmt.Errorf("E! Error closing kafka consumer: %s\n", err.Error()))
 	}
 }
 
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index c4936974f..e1c24adbe 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -2,7 +2,6 @@ package kafka_consumer
 
 import (
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -43,7 +42,7 @@ func TestRunParser(t *testing.T) {
 	k.parser, _ = parsers.NewInfluxParser()
 	go k.receiver()
 	in <- saramaMsg(testMsg)
-	time.Sleep(time.Millisecond * 5)
+	acc.Wait(1)
 
 	assert.Equal(t, acc.NFields(), 1)
 }
@@ -58,7 +57,7 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	k.parser, _ = parsers.NewInfluxParser()
 	go k.receiver()
 	in <- saramaMsg(invalidMsg)
-	time.Sleep(time.Millisecond * 5)
+	acc.WaitError(1)
 
 	assert.Equal(t, acc.NFields(), 0)
 }
@@ -73,7 +72,7 @@ func TestRunParserAndGather(t *testing.T) {
 	k.parser, _ = parsers.NewInfluxParser()
 	go k.receiver()
 	in <- saramaMsg(testMsg)
-	time.Sleep(time.Millisecond * 5)
+	acc.Wait(1)
 
 	k.Gather(&acc)
 
@@ -92,7 +91,7 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
 	k.parser, _ = parsers.NewGraphiteParser("_", []string{}, nil)
 	go k.receiver()
 	in <- saramaMsg(testMsgGraphite)
-	time.Sleep(time.Millisecond * 5)
+	acc.Wait(1)
 
 	k.Gather(&acc)
 
@@ -111,7 +110,7 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
 	go k.receiver()
 	in <- saramaMsg(testMsgJSON)
-	time.Sleep(time.Millisecond * 5)
+	acc.Wait(1)
 
 	k.Gather(&acc)
 
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index 059bfd266..db9795f28 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -6,7 +6,6 @@ import (
 	"runtime"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 
@@ -41,7 +40,6 @@ func TestGrokParseLogFilesNonExistPattern(t *testing.T) {
 	acc := testutil.Accumulator{}
 	assert.Error(t, logparser.Start(&acc))
 
-	time.Sleep(time.Millisecond * 500)
 	logparser.Stop()
 }
 
@@ -61,7 +59,8 @@ func TestGrokParseLogFiles(t *testing.T) {
 	acc := testutil.Accumulator{}
 	assert.NoError(t, logparser.Start(&acc))
 
-	time.Sleep(time.Millisecond * 500)
+	acc.Wait(2)
+
 	logparser.Stop()
 
 	acc.AssertContainsTaggedFields(t, "logparser_grok",
@@ -102,14 +101,13 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 	acc := testutil.Accumulator{}
 	assert.NoError(t, logparser.Start(&acc))
 
-	time.Sleep(time.Millisecond * 500)
 	assert.Equal(t, acc.NFields(), 0)
 
 	os.Symlink(
 		thisdir+"grok/testdata/test_a.log",
 		emptydir+"/test_a.log")
 	assert.NoError(t, logparser.Gather(&acc))
-	time.Sleep(time.Millisecond * 500)
+	acc.Wait(1)
 
 	logparser.Stop()
 
@@ -143,7 +141,7 @@ func TestGrokParseLogFilesOneBad(t *testing.T) {
 	acc.SetDebug(true)
 	assert.NoError(t, logparser.Start(&acc))
 
-	time.Sleep(time.Millisecond * 500)
+	acc.Wait(1)
 	logparser.Stop()
 
 	acc.AssertContainsTaggedFields(t, "logparser_grok",
diff --git a/plugins/inputs/mongodb/mongodb_server_test.go b/plugins/inputs/mongodb/mongodb_server_test.go
index 7ad0f38a2..e9d1bae9e 100644
--- a/plugins/inputs/mongodb/mongodb_server_test.go
+++ b/plugins/inputs/mongodb/mongodb_server_test.go
@@ -4,7 +4,6 @@ package mongodb
 
 import (
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
@@ -32,12 +31,11 @@ func TestAddDefaultStats(t *testing.T) {
 	err := server.gatherData(&acc, false)
 	require.NoError(t, err)
 
-	time.Sleep(time.Duration(1) * time.Second)
 	// need to call this twice so it can perform the diff
 	err = server.gatherData(&acc, false)
 	require.NoError(t, err)
 
 	for key, _ := range DefaultStats {
-		assert.True(t, acc.HasIntValue(key))
+		assert.True(t, acc.HasIntField("mongodb", key))
 	}
 }
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index cfade2944..3ea0480b8 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -142,8 +142,8 @@ func (m *MQTTConsumer) onConnect(c mqtt.Client) {
 		subscribeToken := c.SubscribeMultiple(topics, m.recvMessage)
 		subscribeToken.Wait()
 		if subscribeToken.Error() != nil {
-			log.Printf("E! MQTT Subscribe Error\ntopics: %s\nerror: %s",
-				strings.Join(m.Topics[:], ","), subscribeToken.Error())
+			m.acc.AddError(fmt.Errorf("E! MQTT Subscribe Error\ntopics: %s\nerror: %s",
+				strings.Join(m.Topics[:], ","), subscribeToken.Error()))
 		}
 		m.started = true
 	}
@@ -151,7 +151,7 @@ func (m *MQTTConsumer) onConnect(c mqtt.Client) {
 }
 
 func (m *MQTTConsumer) onConnectionLost(c mqtt.Client, err error) {
-	log.Printf("E! MQTT Connection lost\nerror: %s\nMQTT Client will try to reconnect", err.Error())
+	m.acc.AddError(fmt.Errorf("E! MQTT Connection lost\nerror: %s\nMQTT Client will try to reconnect", err.Error()))
 	return
 }
 
@@ -166,8 +166,8 @@ func (m *MQTTConsumer) receiver() {
 			topic := msg.Topic()
 			metrics, err := m.parser.Parse(msg.Payload())
 			if err != nil {
-				log.Printf("E! MQTT Parse Error\nmessage: %s\nerror: %s",
-					string(msg.Payload()), err.Error())
+				m.acc.AddError(fmt.Errorf("E! MQTT Parse Error\nmessage: %s\nerror: %s",
+					string(msg.Payload()), err.Error()))
 			}
 
 			for _, metric := range metrics {
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
index 2f5276191..027e4818b 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
@@ -2,7 +2,6 @@ package mqtt_consumer
 
 import (
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -86,7 +85,7 @@ func TestRunParser(t *testing.T) {
 	n.parser, _ = parsers.NewInfluxParser()
 	go n.receiver()
 	in <- mqttMsg(testMsgNeg)
-	time.Sleep(time.Millisecond * 250)
+	acc.Wait(1)
 
 	if a := acc.NFields(); a != 1 {
 		t.Errorf("got %v, expected %v", a, 1)
@@ -102,7 +101,7 @@ func TestRunParserNegativeNumber(t *testing.T) {
 	n.parser, _ = parsers.NewInfluxParser()
 	go n.receiver()
 	in <- mqttMsg(testMsg)
-	time.Sleep(time.Millisecond * 25)
+	acc.Wait(1)
 
 	if a := acc.NFields(); a != 1 {
 		t.Errorf("got %v, expected %v", a, 1)
@@ -119,11 +118,12 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	n.parser, _ = parsers.NewInfluxParser()
 	go n.receiver()
 	in <- mqttMsg(invalidMsg)
-	time.Sleep(time.Millisecond * 25)
+	acc.WaitError(1)
 
 	if a := acc.NFields(); a != 0 {
 		t.Errorf("got %v, expected %v", a, 0)
 	}
+	assert.Contains(t, acc.Errors[0].Error(), "MQTT Parse Error")
 }
 
 // Test that the parser parses line format messages into metrics
@@ -136,7 +136,7 @@ func TestRunParserAndGather(t *testing.T) {
 	n.parser, _ = parsers.NewInfluxParser()
 	go n.receiver()
 	in <- mqttMsg(testMsg)
-	time.Sleep(time.Millisecond * 25)
+	acc.Wait(1)
 
 	n.Gather(&acc)
 
@@ -154,9 +154,9 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
 	n.parser, _ = parsers.NewGraphiteParser("_", []string{}, nil)
 	go n.receiver()
 	in <- mqttMsg(testMsgGraphite)
-	time.Sleep(time.Millisecond * 25)
 
 	n.Gather(&acc)
+	acc.Wait(1)
 
 	acc.AssertContainsFields(t, "cpu_load_short_graphite",
 		map[string]interface{}{"value": float64(23422)})
@@ -172,10 +172,11 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil)
 	go n.receiver()
 	in <- mqttMsg(testMsgJSON)
-	time.Sleep(time.Millisecond * 25)
 
 	n.Gather(&acc)
 
+	acc.Wait(1)
+
 	acc.AssertContainsFields(t, "nats_json_test",
 		map[string]interface{}{
 			"a":   float64(5),
diff --git a/plugins/inputs/nats_consumer/nats_consumer.go b/plugins/inputs/nats_consumer/nats_consumer.go
index cbb85e016..7c9f53941 100644
--- a/plugins/inputs/nats_consumer/nats_consumer.go
+++ b/plugins/inputs/nats_consumer/nats_consumer.go
@@ -162,11 +162,11 @@ func (n *natsConsumer) receiver() {
 		case <-n.done:
 			return
 		case err := <-n.errs:
-			log.Printf("E! error reading from %s\n", err.Error())
+			n.acc.AddError(fmt.Errorf("E! error reading from %s\n", err.Error()))
 		case msg := <-n.in:
 			metrics, err := n.parser.Parse(msg.Data)
 			if err != nil {
-				log.Printf("E! subject: %s, error: %s", msg.Subject, err.Error())
+				n.acc.AddError(fmt.Errorf("E! subject: %s, error: %s", msg.Subject, err.Error()))
 			}
 
 			for _, metric := range metrics {
@@ -179,8 +179,8 @@ func (n *natsConsumer) receiver() {
 func (n *natsConsumer) clean() {
 	for _, sub := range n.Subs {
 		if err := sub.Unsubscribe(); err != nil {
-			log.Printf("E! Error unsubscribing from subject %s in queue %s: %s\n",
-				sub.Subject, sub.Queue, err.Error())
+			n.acc.AddError(fmt.Errorf("E! Error unsubscribing from subject %s in queue %s: %s\n",
+				sub.Subject, sub.Queue, err.Error()))
 		}
 	}
 
diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go
index 2f4d14d73..30ba0d2af 100644
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -2,11 +2,11 @@ package natsconsumer
 
 import (
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/nats-io/nats"
+	"github.com/stretchr/testify/assert"
 )
 
 const (
@@ -42,11 +42,8 @@ func TestRunParser(t *testing.T) {
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsg)
-	time.Sleep(time.Millisecond * 25)
 
-	if acc.NFields() != 1 {
-		t.Errorf("got %v, expected %v", acc.NFields(), 1)
-	}
+	acc.Wait(1)
 }
 
 // Test that the parser ignores invalid messages
@@ -60,11 +57,10 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(invalidMsg)
-	time.Sleep(time.Millisecond * 25)
 
-	if acc.NFields() != 0 {
-		t.Errorf("got %v, expected %v", acc.NFields(), 0)
-	}
+	acc.WaitError(1)
+	assert.Contains(t, acc.Errors[0].Error(), "E! subject: telegraf, error:  metric parsing error")
+	assert.EqualValues(t, 0, acc.NMetrics())
 }
 
 // Test that the parser parses line format messages into metrics
@@ -78,10 +74,10 @@ func TestRunParserAndGather(t *testing.T) {
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsg)
-	time.Sleep(time.Millisecond * 25)
 
 	n.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(23422)})
 }
@@ -97,10 +93,10 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsgGraphite)
-	time.Sleep(time.Millisecond * 25)
 
 	n.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "cpu_load_short_graphite",
 		map[string]interface{}{"value": float64(23422)})
 }
@@ -116,10 +112,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsgJSON)
-	time.Sleep(time.Millisecond * 25)
 
 	n.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "nats_json_test",
 		map[string]interface{}{
 			"a":   float64(5),
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index 6764b6d2d..9fa472809 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -81,42 +81,25 @@ func testSocketListener(t *testing.T, sl *SocketListener, client net.Conn) {
 
 	acc := sl.Accumulator.(*testutil.Accumulator)
 
+	acc.Wait(3)
 	acc.Lock()
-	if len(acc.Metrics) < 1 {
-		acc.Wait()
-	}
-	require.True(t, len(acc.Metrics) >= 1)
-	m := acc.Metrics[0]
+	m1 := acc.Metrics[0]
+	m2 := acc.Metrics[1]
+	m3 := acc.Metrics[2]
 	acc.Unlock()
 
-	assert.Equal(t, "test", m.Measurement)
-	assert.Equal(t, map[string]string{"foo": "bar"}, m.Tags)
-	assert.Equal(t, map[string]interface{}{"v": int64(1)}, m.Fields)
-	assert.True(t, time.Unix(0, 123456789).Equal(m.Time))
+	assert.Equal(t, "test", m1.Measurement)
+	assert.Equal(t, map[string]string{"foo": "bar"}, m1.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(1)}, m1.Fields)
+	assert.True(t, time.Unix(0, 123456789).Equal(m1.Time))
 
-	acc.Lock()
-	if len(acc.Metrics) < 2 {
-		acc.Wait()
-	}
-	require.True(t, len(acc.Metrics) >= 2)
-	m = acc.Metrics[1]
-	acc.Unlock()
+	assert.Equal(t, "test", m2.Measurement)
+	assert.Equal(t, map[string]string{"foo": "baz"}, m2.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(2)}, m2.Fields)
+	assert.True(t, time.Unix(0, 123456790).Equal(m2.Time))
 
-	assert.Equal(t, "test", m.Measurement)
-	assert.Equal(t, map[string]string{"foo": "baz"}, m.Tags)
-	assert.Equal(t, map[string]interface{}{"v": int64(2)}, m.Fields)
-	assert.True(t, time.Unix(0, 123456790).Equal(m.Time))
-
-	acc.Lock()
-	if len(acc.Metrics) < 3 {
-		acc.Wait()
-	}
-	require.True(t, len(acc.Metrics) >= 3)
-	m = acc.Metrics[2]
-	acc.Unlock()
-
-	assert.Equal(t, "test", m.Measurement)
-	assert.Equal(t, map[string]string{"foo": "zab"}, m.Tags)
-	assert.Equal(t, map[string]interface{}{"v": int64(3)}, m.Fields)
-	assert.True(t, time.Unix(0, 123456791).Equal(m.Time))
+	assert.Equal(t, "test", m3.Measurement)
+	assert.Equal(t, map[string]string{"foo": "zab"}, m3.Tags)
+	assert.Equal(t, map[string]interface{}{"v": int64(3)}, m3.Fields)
+	assert.True(t, time.Unix(0, 123456791).Equal(m3.Time))
 }
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 508c1e320..0c19f9116 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -2,7 +2,6 @@ package tail
 
 import (
 	"fmt"
-	"log"
 	"sync"
 
 	"github.com/hpcloud/tail"
@@ -86,7 +85,7 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 	for _, filepath := range t.Files {
 		g, err := globpath.Compile(filepath)
 		if err != nil {
-			log.Printf("E! Error Glob %s failed to compile, %s", filepath, err)
+			t.acc.AddError(fmt.Errorf("E! Error Glob %s failed to compile, %s", filepath, err))
 		}
 		for file, _ := range g.Match() {
 			tailer, err := tail.TailFile(file,
@@ -124,21 +123,21 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 	var line *tail.Line
 	for line = range tailer.Lines {
 		if line.Err != nil {
-			log.Printf("E! Error tailing file %s, Error: %s\n",
-				tailer.Filename, err)
+			t.acc.AddError(fmt.Errorf("E! Error tailing file %s, Error: %s\n",
+				tailer.Filename, err))
 			continue
 		}
 		m, err = t.parser.ParseLine(line.Text)
 		if err == nil {
 			t.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
 		} else {
-			log.Printf("E! Malformed log line in %s: [%s], Error: %s\n",
-				tailer.Filename, line.Text, err)
+			t.acc.AddError(fmt.Errorf("E! Malformed log line in %s: [%s], Error: %s\n",
+				tailer.Filename, line.Text, err))
 		}
 	}
 	if err := tailer.Err(); err != nil {
-		log.Printf("E! Error tailing file %s, Error: %s\n",
-			tailer.Filename, err)
+		t.acc.AddError(fmt.Errorf("E! Error tailing file %s, Error: %s\n",
+			tailer.Filename, err))
 	}
 }
 
@@ -146,12 +145,12 @@ func (t *Tail) Stop() {
 	t.Lock()
 	defer t.Unlock()
 
-	for _, t := range t.tailers {
-		err := t.Stop()
+	for _, tailer := range t.tailers {
+		err := tailer.Stop()
 		if err != nil {
-			log.Printf("E! Error stopping tail on file %s\n", t.Filename)
+			t.acc.AddError(fmt.Errorf("E! Error stopping tail on file %s\n", tailer.Filename))
 		}
-		t.Cleanup()
+		tailer.Cleanup()
 	}
 	t.wg.Wait()
 }
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 31ecfbf30..b927d160c 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -3,6 +3,7 @@ package tail
 import (
 	"io/ioutil"
 	"os"
+	"runtime"
 	"testing"
 	"time"
 
@@ -30,11 +31,9 @@ func TestTailFromBeginning(t *testing.T) {
 
 	acc := testutil.Accumulator{}
 	require.NoError(t, tt.Start(&acc))
-	time.Sleep(time.Millisecond * 100)
 	require.NoError(t, tt.Gather(&acc))
-	// arbitrary sleep to wait for message to show up
-	time.Sleep(time.Millisecond * 150)
 
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu",
 		map[string]interface{}{
 			"usage_idle": float64(100),
@@ -60,13 +59,19 @@ func TestTailFromEnd(t *testing.T) {
 
 	acc := testutil.Accumulator{}
 	require.NoError(t, tt.Start(&acc))
-	time.Sleep(time.Millisecond * 100)
+	time.Sleep(time.Millisecond * 200) //TODO remove once https://github.com/hpcloud/tail/pull/114 is merged & added to Godeps
+	for _, tailer := range tt.tailers {
+		for n, err := tailer.Tell(); err == nil && n == 0; n, err = tailer.Tell() {
+			// wait for tailer to jump to end
+			runtime.Gosched()
+		}
+	}
 
 	_, err = tmpfile.WriteString("cpu,othertag=foo usage_idle=100\n")
 	require.NoError(t, err)
 	require.NoError(t, tt.Gather(&acc))
-	time.Sleep(time.Millisecond * 50)
 
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu",
 		map[string]interface{}{
 			"usage_idle": float64(100),
@@ -96,7 +101,7 @@ func TestTailBadLine(t *testing.T) {
 	_, err = tmpfile.WriteString("cpu mytag= foo usage_idle= 100\n")
 	require.NoError(t, err)
 	require.NoError(t, tt.Gather(&acc))
-	time.Sleep(time.Millisecond * 50)
 
-	assert.Len(t, acc.Metrics, 0)
+	acc.WaitError(1)
+	assert.Contains(t, acc.Errors[0].Error(), "E! Malformed log line")
 }
diff --git a/plugins/inputs/tcp_listener/tcp_listener_test.go b/plugins/inputs/tcp_listener/tcp_listener_test.go
index f7e5784d3..27ced791c 100644
--- a/plugins/inputs/tcp_listener/tcp_listener_test.go
+++ b/plugins/inputs/tcp_listener/tcp_listener_test.go
@@ -1,10 +1,15 @@
 package tcp_listener
 
 import (
+	"bufio"
+	"bytes"
 	"fmt"
+	"io"
+	"log"
 	"net"
+	"os"
+	"strings"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -54,7 +59,6 @@ func BenchmarkTCP(b *testing.B) {
 			panic(err)
 		}
 
-		time.Sleep(time.Millisecond * 25)
 		conn, err := net.Dial("tcp", "127.0.0.1:8198")
 		if err != nil {
 			panic(err)
@@ -62,8 +66,10 @@ func BenchmarkTCP(b *testing.B) {
 		for i := 0; i < 100000; i++ {
 			fmt.Fprintf(conn, testMsg)
 		}
-		// wait for 100,000 metrics to get added to accumulator
-		time.Sleep(time.Millisecond)
+		conn.(*net.TCPConn).CloseWrite()
+		// wait for all 100,000 metrics to be processed
+		buf := []byte{0}
+		conn.Read(buf) // will EOF when completed
 		listener.Stop()
 	}
 }
@@ -81,16 +87,18 @@ func TestHighTrafficTCP(t *testing.T) {
 	err := listener.Start(acc)
 	require.NoError(t, err)
 
-	time.Sleep(time.Millisecond * 25)
 	conn, err := net.Dial("tcp", "127.0.0.1:8199")
 	require.NoError(t, err)
 	for i := 0; i < 100000; i++ {
 		fmt.Fprintf(conn, testMsg)
 	}
-	time.Sleep(time.Millisecond)
+	conn.(*net.TCPConn).CloseWrite()
+	buf := []byte{0}
+	_, err = conn.Read(buf)
+	assert.Equal(t, err, io.EOF)
 	listener.Stop()
 
-	assert.Equal(t, 100000, len(acc.Metrics))
+	assert.Equal(t, 100000, int(acc.NMetrics()))
 }
 
 func TestConnectTCP(t *testing.T) {
@@ -105,13 +113,12 @@ func TestConnectTCP(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
 	conn, err := net.Dial("tcp", "127.0.0.1:8194")
 	require.NoError(t, err)
 
 	// send single message to socket
 	fmt.Fprintf(conn, testMsg)
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -119,7 +126,7 @@ func TestConnectTCP(t *testing.T) {
 
 	// send multiple messages to socket
 	fmt.Fprintf(conn, testMsgs)
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(6)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
 	for _, hostTag := range hostTags {
@@ -143,7 +150,6 @@ func TestConcurrentConns(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
 	_, err := net.Dial("tcp", "127.0.0.1:8195")
 	assert.NoError(t, err)
 	_, err = net.Dial("tcp", "127.0.0.1:8195")
@@ -162,10 +168,8 @@ func TestConcurrentConns(t *testing.T) {
 			" the Telegraf tcp listener configuration.\n",
 		string(buf[:n]))
 
-	_, err = conn.Write([]byte(testMsg))
-	assert.NoError(t, err)
-	time.Sleep(time.Millisecond * 10)
-	assert.Zero(t, acc.NFields())
+	_, err = conn.Read(buf)
+	assert.Equal(t, io.EOF, err)
 }
 
 // Test that MaxTCPConections is respected when max==1
@@ -181,7 +185,6 @@ func TestConcurrentConns1(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
 	_, err := net.Dial("tcp", "127.0.0.1:8196")
 	assert.NoError(t, err)
 
@@ -198,10 +201,8 @@ func TestConcurrentConns1(t *testing.T) {
 			" the Telegraf tcp listener configuration.\n",
 		string(buf[:n]))
 
-	_, err = conn.Write([]byte(testMsg))
-	assert.NoError(t, err)
-	time.Sleep(time.Millisecond * 10)
-	assert.Zero(t, acc.NFields())
+	_, err = conn.Read(buf)
+	assert.Equal(t, io.EOF, err)
 }
 
 // Test that MaxTCPConections is respected
@@ -216,7 +217,6 @@ func TestCloseConcurrentConns(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 
-	time.Sleep(time.Millisecond * 25)
 	_, err := net.Dial("tcp", "127.0.0.1:8195")
 	assert.NoError(t, err)
 	_, err = net.Dial("tcp", "127.0.0.1:8195")
@@ -238,13 +238,9 @@ func TestRunParser(t *testing.T) {
 	go listener.tcpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
-	if a := acc.NFields(); a != 1 {
-		t.Errorf("got %v, expected %v", a, 1)
-	}
-
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -263,11 +259,16 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	listener.wg.Add(1)
 	go listener.tcpParser()
 
+	buf := bytes.NewBuffer(nil)
+	log.SetOutput(buf)
+	defer log.SetOutput(os.Stderr)
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 
-	if a := acc.NFields(); a != 0 {
-		t.Errorf("got %v, expected %v", a, 0)
+	scnr := bufio.NewScanner(buf)
+	for scnr.Scan() {
+		if strings.Contains(scnr.Text(), fmt.Sprintf(malformedwarn, 1)) {
+			break
+		}
 	}
 }
 
@@ -284,9 +285,9 @@ func TestRunParserGraphiteMsg(t *testing.T) {
 	go listener.tcpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "cpu_load_graphite",
 		map[string]interface{}{"value": float64(12)})
 }
@@ -304,9 +305,9 @@ func TestRunParserJSONMsg(t *testing.T) {
 	go listener.tcpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "udp_json_test",
 		map[string]interface{}{
 			"a":   float64(5),
diff --git a/plugins/inputs/udp_listener/udp_listener.go b/plugins/inputs/udp_listener/udp_listener.go
index 53c6a72f5..d0a728b3c 100644
--- a/plugins/inputs/udp_listener/udp_listener.go
+++ b/plugins/inputs/udp_listener/udp_listener.go
@@ -1,6 +1,7 @@
 package udp_listener
 
 import (
+	"fmt"
 	"log"
 	"net"
 	"sync"
@@ -107,8 +108,9 @@ func (u *UdpListener) Start(acc telegraf.Accumulator) error {
 	u.in = make(chan []byte, u.AllowedPendingMessages)
 	u.done = make(chan struct{})
 
-	u.wg.Add(2)
-	go u.udpListen()
+	u.udpListen()
+
+	u.wg.Add(1)
 	go u.udpParser()
 
 	log.Printf("I! Started UDP listener service on %s (ReadBuffer: %d)\n", u.ServiceAddress, u.UDPBufferSize)
@@ -126,32 +128,37 @@ func (u *UdpListener) Stop() {
 }
 
 func (u *UdpListener) udpListen() error {
-	defer u.wg.Done()
 	var err error
 
 	address, _ := net.ResolveUDPAddr("udp", u.ServiceAddress)
 	u.listener, err = net.ListenUDP("udp", address)
 
 	if err != nil {
-		log.Fatalf("E! Error: ListenUDP - %s", err)
+		return fmt.Errorf("E! Error: ListenUDP - %s", err)
 	}
 
 	log.Println("I! UDP server listening on: ", u.listener.LocalAddr().String())
 
-	buf := make([]byte, UDP_MAX_PACKET_SIZE)
-
 	if u.UDPBufferSize > 0 {
 		err = u.listener.SetReadBuffer(u.UDPBufferSize) // if we want to move away from OS default
 		if err != nil {
-			log.Printf("E! Failed to set UDP read buffer to %d: %s", u.UDPBufferSize, err)
-			return err
+			return fmt.Errorf("E! Failed to set UDP read buffer to %d: %s", u.UDPBufferSize, err)
 		}
 	}
 
+	u.wg.Add(1)
+	go u.udpListenLoop()
+	return nil
+}
+
+func (u *UdpListener) udpListenLoop() {
+	defer u.wg.Done()
+
+	buf := make([]byte, UDP_MAX_PACKET_SIZE)
 	for {
 		select {
 		case <-u.done:
-			return nil
+			return
 		default:
 			u.listener.SetReadDeadline(time.Now().Add(time.Second))
 
diff --git a/plugins/inputs/udp_listener/udp_listener_test.go b/plugins/inputs/udp_listener/udp_listener_test.go
index eefdd593e..4d78a1a42 100644
--- a/plugins/inputs/udp_listener/udp_listener_test.go
+++ b/plugins/inputs/udp_listener/udp_listener_test.go
@@ -1,12 +1,16 @@
 package udp_listener
 
 import (
+	"bufio"
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"net"
+	"os"
+	"runtime"
+	"strings"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -50,22 +54,27 @@ func TestHighTrafficUDP(t *testing.T) {
 	err := listener.Start(acc)
 	require.NoError(t, err)
 
-	time.Sleep(time.Millisecond * 25)
 	conn, err := net.Dial("udp", "127.0.0.1:8126")
 	require.NoError(t, err)
+	mlen := int64(len(testMsgs))
+	var sent int64
 	for i := 0; i < 20000; i++ {
-		// arbitrary, just to give the OS buffer some slack handling the
-		// packet storm.
-		time.Sleep(time.Microsecond)
-		fmt.Fprintf(conn, testMsgs)
+		for sent > listener.BytesRecv.Get()+32000 {
+			// more than 32kb sitting in OS buffer, let it drain
+			runtime.Gosched()
+		}
+		conn.Write([]byte(testMsgs))
+		sent += mlen
+	}
+	for sent > listener.BytesRecv.Get() {
+		runtime.Gosched()
+	}
+	for len(listener.in) > 0 {
+		runtime.Gosched()
 	}
-	time.Sleep(time.Millisecond)
 	listener.Stop()
 
-	// this is not an exact science, since UDP packets can easily get lost or
-	// dropped, but assume that the OS will be able to
-	// handle at least 90% of the sent UDP packets.
-	assert.InDelta(t, 100000, len(acc.Metrics), 10000)
+	assert.Equal(t, uint64(100000), acc.NMetrics())
 }
 
 func TestConnectUDP(t *testing.T) {
@@ -79,13 +88,12 @@ func TestConnectUDP(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
 	conn, err := net.Dial("udp", "127.0.0.1:8127")
 	require.NoError(t, err)
 
 	// send single message to socket
 	fmt.Fprintf(conn, testMsg)
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -93,7 +101,7 @@ func TestConnectUDP(t *testing.T) {
 
 	// send multiple messages to socket
 	fmt.Fprintf(conn, testMsgs)
-	time.Sleep(time.Millisecond * 15)
+	acc.Wait(6)
 	hostTags := []string{"server02", "server03",
 		"server04", "server05", "server06"}
 	for _, hostTag := range hostTags {
@@ -118,13 +126,9 @@ func TestRunParser(t *testing.T) {
 	go listener.udpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
-	if a := acc.NFields(); a != 1 {
-		t.Errorf("got %v, expected %v", a, 1)
-	}
-
+	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(12)},
 		map[string]string{"host": "server01"},
@@ -144,11 +148,16 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	listener.wg.Add(1)
 	go listener.udpParser()
 
+	buf := bytes.NewBuffer(nil)
+	log.SetOutput(buf)
+	defer log.SetOutput(os.Stderr)
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 
-	if a := acc.NFields(); a != 0 {
-		t.Errorf("got %v, expected %v", a, 0)
+	scnr := bufio.NewScanner(buf)
+	for scnr.Scan() {
+		if strings.Contains(scnr.Text(), fmt.Sprintf(malformedwarn, 1)) {
+			break
+		}
 	}
 }
 
@@ -166,9 +175,9 @@ func TestRunParserGraphiteMsg(t *testing.T) {
 	go listener.udpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "cpu_load_graphite",
 		map[string]interface{}{"value": float64(12)})
 }
@@ -187,9 +196,9 @@ func TestRunParserJSONMsg(t *testing.T) {
 	go listener.udpParser()
 
 	in <- testmsg
-	time.Sleep(time.Millisecond * 25)
 	listener.Gather(&acc)
 
+	acc.Wait(1)
 	acc.AssertContainsFields(t, "udp_json_test",
 		map[string]interface{}{
 			"a":   float64(5),
diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go
index 4f1f2fef6..3984728af 100644
--- a/plugins/outputs/graphite/graphite_test.go
+++ b/plugins/outputs/graphite/graphite_test.go
@@ -44,9 +44,7 @@ func TestGraphiteOK(t *testing.T) {
 	// Start TCP server
 	wg.Add(1)
 	t.Log("Starting server")
-	go TCPServer1(t, &wg)
-	// Give the fake graphite TCP server some time to start:
-	time.Sleep(time.Millisecond * 100)
+	TCPServer1(t, &wg)
 
 	// Init plugin
 	g := Graphite{
@@ -88,10 +86,8 @@ func TestGraphiteOK(t *testing.T) {
 	t.Log("Finished Waiting for first data")
 	var wg2 sync.WaitGroup
 	// Start TCP server
-	time.Sleep(time.Millisecond * 100)
 	wg2.Add(1)
-	go TCPServer2(t, &wg2)
-	time.Sleep(time.Millisecond * 100)
+	TCPServer2(t, &wg2)
 	//Write but expect an error, but reconnect
 	g.Write(metrics2)
 	err3 := g.Write(metrics2)
@@ -105,27 +101,31 @@ func TestGraphiteOK(t *testing.T) {
 }
 
 func TCPServer1(t *testing.T, wg *sync.WaitGroup) {
-	defer wg.Done()
 	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
-	conn, _ := (tcpServer).Accept()
-	reader := bufio.NewReader(conn)
-	tp := textproto.NewReader(reader)
-	data1, _ := tp.ReadLine()
-	assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1)
-	conn.Close()
-	tcpServer.Close()
+	go func() {
+		defer wg.Done()
+		conn, _ := (tcpServer).Accept()
+		reader := bufio.NewReader(conn)
+		tp := textproto.NewReader(reader)
+		data1, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1)
+		conn.Close()
+		tcpServer.Close()
+	}()
 }
 
 func TCPServer2(t *testing.T, wg *sync.WaitGroup) {
-	defer wg.Done()
 	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
-	conn2, _ := (tcpServer).Accept()
-	reader := bufio.NewReader(conn2)
-	tp := textproto.NewReader(reader)
-	data2, _ := tp.ReadLine()
-	assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2)
-	data3, _ := tp.ReadLine()
-	assert.Equal(t, "my.prefix.192_168_0_1.my_measurement 3.14 1289430000", data3)
-	conn2.Close()
-	tcpServer.Close()
+	go func() {
+		defer wg.Done()
+		conn2, _ := (tcpServer).Accept()
+		reader := bufio.NewReader(conn2)
+		tp := textproto.NewReader(reader)
+		data2, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2)
+		data3, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.192_168_0_1.my_measurement 3.14 1289430000", data3)
+		conn2.Close()
+		tcpServer.Close()
+	}()
 }
diff --git a/plugins/outputs/influxdb/client/udp_test.go b/plugins/outputs/influxdb/client/udp_test.go
index 31196ddca..84efe0b22 100644
--- a/plugins/outputs/influxdb/client/udp_test.go
+++ b/plugins/outputs/influxdb/client/udp_test.go
@@ -66,7 +66,6 @@ func TestUDPClient_Write(t *testing.T) {
 	}()
 
 	// test sending simple metric
-	time.Sleep(time.Second)
 	n, err := client.Write([]byte("cpu value=99\n"))
 	assert.Equal(t, n, 13)
 	assert.NoError(t, err)
diff --git a/plugins/outputs/instrumental/instrumental_test.go b/plugins/outputs/instrumental/instrumental_test.go
index d77d8eb05..0d3ce9040 100644
--- a/plugins/outputs/instrumental/instrumental_test.go
+++ b/plugins/outputs/instrumental/instrumental_test.go
@@ -16,9 +16,7 @@ import (
 func TestWrite(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
-	go TCPServer(t, &wg)
-	// Give the fake TCP server some time to start:
-	time.Sleep(time.Millisecond * 100)
+	TCPServer(t, &wg)
 
 	i := Instrumental{
 		Host:     "127.0.0.1",
@@ -79,45 +77,47 @@ func TestWrite(t *testing.T) {
 
 func TCPServer(t *testing.T, wg *sync.WaitGroup) {
 	tcpServer, _ := net.Listen("tcp", "127.0.0.1:8000")
-	defer wg.Done()
-	conn, _ := tcpServer.Accept()
-	conn.SetDeadline(time.Now().Add(1 * time.Second))
-	reader := bufio.NewReader(conn)
-	tp := textproto.NewReader(reader)
+	go func() {
+		defer wg.Done()
+		conn, _ := tcpServer.Accept()
+		conn.SetDeadline(time.Now().Add(1 * time.Second))
+		reader := bufio.NewReader(conn)
+		tp := textproto.NewReader(reader)
 
-	hello, _ := tp.ReadLine()
-	assert.Equal(t, "hello version go/telegraf/1.1", hello)
-	auth, _ := tp.ReadLine()
-	assert.Equal(t, "authenticate abc123token", auth)
-	conn.Write([]byte("ok\nok\n"))
+		hello, _ := tp.ReadLine()
+		assert.Equal(t, "hello version go/telegraf/1.1", hello)
+		auth, _ := tp.ReadLine()
+		assert.Equal(t, "authenticate abc123token", auth)
+		conn.Write([]byte("ok\nok\n"))
 
-	data1, _ := tp.ReadLine()
-	assert.Equal(t, "gauge my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1)
-	data2, _ := tp.ReadLine()
-	assert.Equal(t, "gauge my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2)
+		data1, _ := tp.ReadLine()
+		assert.Equal(t, "gauge my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1)
+		data2, _ := tp.ReadLine()
+		assert.Equal(t, "gauge my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2)
 
-	conn, _ = tcpServer.Accept()
-	conn.SetDeadline(time.Now().Add(1 * time.Second))
-	reader = bufio.NewReader(conn)
-	tp = textproto.NewReader(reader)
+		conn, _ = tcpServer.Accept()
+		conn.SetDeadline(time.Now().Add(1 * time.Second))
+		reader = bufio.NewReader(conn)
+		tp = textproto.NewReader(reader)
 
-	hello, _ = tp.ReadLine()
-	assert.Equal(t, "hello version go/telegraf/1.1", hello)
-	auth, _ = tp.ReadLine()
-	assert.Equal(t, "authenticate abc123token", auth)
-	conn.Write([]byte("ok\nok\n"))
+		hello, _ = tp.ReadLine()
+		assert.Equal(t, "hello version go/telegraf/1.1", hello)
+		auth, _ = tp.ReadLine()
+		assert.Equal(t, "authenticate abc123token", auth)
+		conn.Write([]byte("ok\nok\n"))
 
-	data3, _ := tp.ReadLine()
-	assert.Equal(t, "increment my.prefix.192_168_0_1.my_histogram 3.14 1289430000", data3)
+		data3, _ := tp.ReadLine()
+		assert.Equal(t, "increment my.prefix.192_168_0_1.my_histogram 3.14 1289430000", data3)
 
-	data4, _ := tp.ReadLine()
-	assert.Equal(t, "increment my.prefix.192_168_0_1_8888_123.bad_metric_name 1 1289430000", data4)
+		data4, _ := tp.ReadLine()
+		assert.Equal(t, "increment my.prefix.192_168_0_1_8888_123.bad_metric_name 1 1289430000", data4)
 
-	data5, _ := tp.ReadLine()
-	assert.Equal(t, "increment my.prefix.192_168_0_1.my_counter 3.14 1289430000", data5)
+		data5, _ := tp.ReadLine()
+		assert.Equal(t, "increment my.prefix.192_168_0_1.my_counter 3.14 1289430000", data5)
 
-	data6, _ := tp.ReadLine()
-	assert.Equal(t, "", data6)
+		data6, _ := tp.ReadLine()
+		assert.Equal(t, "", data6)
 
-	conn.Close()
+		conn.Close()
+	}()
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 63dfddd7a..02bebf9c8 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -129,6 +129,9 @@ func (a *Accumulator) AddError(err error) {
 	}
 	a.Lock()
 	a.Errors = append(a.Errors, err)
+	if a.Cond != nil {
+		a.Cond.Broadcast()
+	}
 	a.Unlock()
 }
 
@@ -198,13 +201,28 @@ func (a *Accumulator) NFields() int {
 	return counter
 }
 
-// Wait waits for a metric to be added to the accumulator.
-// Accumulator must already be locked.
-func (a *Accumulator) Wait() {
+// Wait waits for the given number of metrics to be added to the accumulator.
+func (a *Accumulator) Wait(n int) {
+	a.Lock()
 	if a.Cond == nil {
 		a.Cond = sync.NewCond(&a.Mutex)
 	}
-	a.Cond.Wait()
+	for int(a.NMetrics()) < n {
+		a.Cond.Wait()
+	}
+	a.Unlock()
+}
+
+// WaitError waits for the given number of errors to be added to the accumulator.
+func (a *Accumulator) WaitError(n int) {
+	a.Lock()
+	if a.Cond == nil {
+		a.Cond = sync.NewCond(&a.Mutex)
+	}
+	for len(a.Errors) < n {
+		a.Cond.Wait()
+	}
+	a.Unlock()
 }
 
 func (a *Accumulator) AssertContainsTaggedFields(

From 995546e7c685136924c9d30ba5b49b30d6e2ddb1 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 24 Mar 2017 15:06:52 -0400
Subject: [PATCH 0163/1302] snmp: support table indexes as tags (#2366)

---
 CHANGELOG.md                     |  1 +
 plugins/inputs/snmp/README.md    |  3 +++
 plugins/inputs/snmp/snmp.go      | 15 ++++++++++++---
 plugins/inputs/snmp/snmp_test.go | 21 ++++++++++++++++-----
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd1ec5136..b1655f77d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ be deprecated eventually.
 - [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
 - [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
 - [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
+- [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/snmp/README.md b/plugins/inputs/snmp/README.md
index 473f2a52b..27b1f7571 100644
--- a/plugins/inputs/snmp/README.md
+++ b/plugins/inputs/snmp/README.md
@@ -168,6 +168,9 @@ If not specified, it defaults to the value of `oid`.  If `oid` is numeric, an at
 * `inherit_tags`:
 Which tags to inherit from the top-level config and to use in the output of this table's measurement.
 
+* `index_as_tag`:
+Adds each row's index within the table as a tag.  
+
 ### MIB lookups
 If the plugin is configured such that it needs to perform lookups from the MIB, it will use the net-snmp utilities `snmptranslate` and `snmptable`.
 
diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 9296bc043..5394e57db 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -168,6 +168,9 @@ type Table struct {
 	// Which tags to inherit from the top-level config.
 	InheritTags []string
 
+	// Adds each row's table index as a tag.
+	IndexAsTag bool
+
 	// Fields is the tags and values to look up.
 	Fields []Field `toml:"field"`
 
@@ -464,13 +467,19 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 			}
 		}
 
-		for i, v := range ifv {
-			rtr, ok := rows[i]
+		for idx, v := range ifv {
+			rtr, ok := rows[idx]
 			if !ok {
 				rtr = RTableRow{}
 				rtr.Tags = map[string]string{}
 				rtr.Fields = map[string]interface{}{}
-				rows[i] = rtr
+				rows[idx] = rtr
+			}
+			if t.IndexAsTag && idx != "" {
+				if idx[0] == '.' {
+					idx = idx[1:]
+				}
+				rtr.Tags["index"] = idx
 			}
 			// don't add an empty string
 			if vs, ok := v.(string); !ok || vs != "" {
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index 62b19fcea..07fdeddc1 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -413,7 +413,8 @@ func TestGosnmpWrapper_get_retry(t *testing.T) {
 
 func TestTableBuild_walk(t *testing.T) {
 	tbl := Table{
-		Name: "mytable",
+		Name:       "mytable",
+		IndexAsTag: true,
 		Fields: []Field{
 			{
 				Name:  "myfield1",
@@ -442,7 +443,10 @@ func TestTableBuild_walk(t *testing.T) {
 
 	assert.Equal(t, tb.Name, "mytable")
 	rtr1 := RTableRow{
-		Tags: map[string]string{"myfield1": "foo"},
+		Tags: map[string]string{
+			"myfield1": "foo",
+			"index":    "0",
+		},
 		Fields: map[string]interface{}{
 			"myfield2": 1,
 			"myfield3": float64(0.123),
@@ -450,7 +454,10 @@ func TestTableBuild_walk(t *testing.T) {
 		},
 	}
 	rtr2 := RTableRow{
-		Tags: map[string]string{"myfield1": "bar"},
+		Tags: map[string]string{
+			"myfield1": "bar",
+			"index":    "1",
+		},
 		Fields: map[string]interface{}{
 			"myfield2": 2,
 			"myfield3": float64(0.456),
@@ -458,14 +465,18 @@ func TestTableBuild_walk(t *testing.T) {
 		},
 	}
 	rtr3 := RTableRow{
-		Tags: map[string]string{},
+		Tags: map[string]string{
+			"index": "2",
+		},
 		Fields: map[string]interface{}{
 			"myfield2": 0,
 			"myfield3": float64(0.0),
 		},
 	}
 	rtr4 := RTableRow{
-		Tags: map[string]string{},
+		Tags: map[string]string{
+			"index": "3",
+		},
 		Fields: map[string]interface{}{
 			"myfield3": float64(9.999),
 		},

From 0fa90014532e57139bf2987b0b908889da712a63 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 24 Mar 2017 16:01:35 -0700
Subject: [PATCH 0164/1302] Clarify influxdb output url format

closes #2568
---
 plugins/outputs/influxdb/README.md   | 5 ++++-
 plugins/outputs/influxdb/influxdb.go | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 864177a36..5acac6cca 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -7,7 +7,10 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
 ```toml
 # Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
-  ## The full HTTP or UDP endpoint URL for your InfluxDB instance.
+  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
+  ## of the form:
+  ##   scheme "://" host [ ":" port]
+  ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
   # urls = ["udp://localhost:8089"] # UDP endpoint example
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 6c19a35fc..6419d43ea 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -44,7 +44,10 @@ type InfluxDB struct {
 }
 
 var sampleConfig = `
-  ## The full HTTP or UDP endpoint URL for your InfluxDB instance.
+  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
+  ## of the form:
+  ##   scheme "://" host [ ":" port]
+  ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
   # urls = ["udp://localhost:8089"] # UDP endpoint example

From 5612df48f961face923bfd3bba9bf4c174a9da97 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Mar 2017 14:49:04 -0700
Subject: [PATCH 0165/1302] Update telegraf.conf

---
 etc/telegraf.conf | 378 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 334 insertions(+), 44 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index aabdf180e..63e41d7bb 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -81,7 +81,10 @@
 
 # Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
-  ## The full HTTP or UDP endpoint URL for your InfluxDB instance.
+  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
+  ## of the form:
+  ##   scheme "://" host [ ":" port]
+  ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
   # urls = ["udp://localhost:8089"] # UDP endpoint example
@@ -131,6 +134,8 @@
 #   ## AMQP exchange
 #   exchange = "telegraf"
 #   ## Auth method. PLAIN and EXTERNAL are supported
+#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+#   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, it's value will be used as the routing key
@@ -193,6 +198,45 @@
 #   # no configuration
 
 
+# # Configuration for Elasticsearch to send metrics to.
+# [[outputs.elasticsearch]]
+#   ## The full HTTP endpoint URL for your Elasticsearch instance
+#   ## Multiple urls can be specified as part of the same cluster,
+#   ## this means that only ONE of the urls will be written to each interval.
+#   urls = [ "http://node1.es.example.com:9200" ] # required.
+#   ## Elasticsearch client timeout, defaults to "5s" if not set.
+#   timeout = "5s"
+#   ## Set to true to ask Elasticsearch a list of all cluster nodes,
+#   ## thus it is not necessary to list all nodes in the urls config option.
+#   enable_sniffer = false
+#   ## Set the interval to check if the Elasticsearch nodes are available
+#   ## Setting to "0s" will disable the health check (not recommended in production)
+#   health_check_interval = "10s"
+#   ## HTTP basic authentication details (eg. when using Shield)
+#   # username = "telegraf"
+#   # password = "mypassword"
+#
+#   ## Index Config
+#   ## The target index for metrics (Elasticsearch will create if it not exists).
+#   ## You can use the date specifiers below to create indexes per time frame.
+#   ## The metric timestamp will be used to decide the destination index name
+#   # %Y - year (2016)
+#   # %y - last two digits of year (00..99)
+#   # %m - month (01..12)
+#   # %d - day of month (e.g., 01)
+#   # %H - hour (00..23)
+#   index_name = "telegraf-%Y.%m.%d" # required.
+#
+#   ## Template Config
+#   ## Set to true if you want telegraf to manage its index template.
+#   ## If enabled it will create a recommended index template for telegraf indexes
+#   manage_template = true
+#   ## The template name used for telegraf indexes
+#   template_name = "telegraf"
+#   ## Set to true if you want telegraf to overwrite an existing template
+#   overwrite_template = false
+
+
 # # Send telegraf metrics to file(s)
 # [[outputs.file]]
 #   ## Files to write to, "stdout" is a specially handled file.
@@ -443,7 +487,7 @@
 #   # expiration_interval = "60s"
 
 
-# # Configuration for Riemann server to send metrics to
+# # Configuration for the Riemann server to send metrics to
 # [[outputs.riemann]]
 #   ## The full TCP or UDP URL of the Riemann server
 #   url = "tcp://localhost:5555"
@@ -472,9 +516,12 @@
 #
 #   ## Description for Riemann event
 #   # description_text = "metrics collected from telegraf"
+#
+#   ## Riemann client write timeout, defaults to "5s" if not set.
+#   # timeout = "5s"
 
 
-# # Configuration for the legacy Riemann plugin
+# # Configuration for the Riemann server to send metrics to
 # [[outputs.riemann_legacy]]
 #   ## URL of server
 #   url = "localhost:5555"
@@ -484,6 +531,27 @@
 #   separator = " "
 
 
+# # Generic socket writer capable of handling multiple socket types.
+# [[outputs.socket_writer]]
+#   ## URL to connect to
+#   # address = "tcp://127.0.0.1:8094"
+#   # address = "tcp://example.com:http"
+#   # address = "tcp4://127.0.0.1:8094"
+#   # address = "tcp6://127.0.0.1:8094"
+#   # address = "tcp6://[2001:db8::1]:8094"
+#   # address = "udp://127.0.0.1:8094"
+#   # address = "udp4://127.0.0.1:8094"
+#   # address = "udp6://127.0.0.1:8094"
+#   # address = "unix:///tmp/telegraf.sock"
+#   # address = "unixgram:///tmp/telegraf.sock"
+#
+#   ## Data format to generate.
+#   ## Each data format has it's own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   # data_format = "influx"
+
+
 
 ###############################################################################
 #                            PROCESSOR PLUGINS                                #
@@ -531,7 +599,7 @@
 
   ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
   ## present on /run, /var/run, /dev/shm or /dev).
-  ignore_fs = ["tmpfs", "devtmpfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
 
 
 # Read metrics about disk IO by device
@@ -542,6 +610,23 @@
   # devices = ["sda", "sdb"]
   ## Uncomment the following line if you need disk serial numbers.
   # skip_serial_number = false
+  #
+  ## On systems which support it, device metadata can be added in the form of
+  ## tags.
+  ## Currently only Linux is supported via udev properties. You can view
+  ## available properties for a device by running:
+  ## 'udevadm info -q property -n /dev/sda'
+  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+  #
+  ## Using the same metadata source as device_tags, you can also customize the
+  ## name of the device via templates.
+  ## The 'name_templates' parameter is a list of templates to try and apply to
+  ## the device. The template may contain variables in the form of '$PROPERTY' or
+  ## '${PROPERTY}'. The first template which does not contain any variables not
+  ## present for the device is used as the device name tag.
+  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+  ## the near-meaningless DM-0 name.
+  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
 
 
 # Get kernel statistics from /proc/stat
@@ -658,7 +743,7 @@
 #   gather_admin_socket_stats = true
 #
 #   ## Whether to gather statistics via ceph commands
-#   gather_cluster_stats = true
+#   gather_cluster_stats = false
 
 
 # # Read specific statistics per cgroup
@@ -677,6 +762,12 @@
 #   # files = ["memory.*usage*", "memory.limit_in_bytes"]
 
 
+# # Get standard chrony metrics, requires chronyc executable.
+# [[inputs.chrony]]
+#   ## If true, chronyc tries to perform a DNS lookup for the time server.
+#   # dns_lookup = false
+
+
 # # Pull Metric Statistics from Amazon CloudWatch
 # [[inputs.cloudwatch]]
 #   ## Amazon Region
@@ -722,9 +813,10 @@
 #   namespace = "AWS/ELB"
 #
 #   ## Maximum requests per second. Note that the global default AWS rate limit is
-#   ## 10 reqs/sec, so if you define multiple namespaces, these should add up to a
-#   ## maximum of 10. Optional - default value is 10.
-#   ratelimit = 10
+#   ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+#   ## maximum of 400. Optional - default value is 200.
+#   ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+#   ratelimit = 200
 #
 #   ## Metrics to Pull (optional)
 #   ## Defaults to all Metrics in Namespace if nothing is provided
@@ -738,6 +830,22 @@
 #   #    value = "p-example"
 
 
+# # Collects conntrack stats from the configured directories and files.
+# [[inputs.conntrack]]
+#    ## The following defaults would work with multiple versions of conntrack.
+#    ## Note the nf_ and ip_ filename prefixes are mutually exclusive across
+#    ## kernel versions, as are the directory locations.
+#
+#    ## Superset of filenames to look for within the conntrack dirs.
+#    ## Missing files will be ignored.
+#    files = ["ip_conntrack_count","ip_conntrack_max",
+#             "nf_conntrack_count","nf_conntrack_max"]
+#
+#    ## Directories to search within for the conntrack files above.
+#    ## Missing directrories will be ignored.
+#    dirs = ["/proc/sys/net/ipv4/netfilter","/proc/sys/net/netfilter"]
+
+
 # # Gather health check statuses from services registered in Consul
 # [[inputs.consul]]
 #   ## Most of these values defaults to the one configured on a Consul's agent level.
@@ -957,6 +1065,24 @@
 #   ## Server address not starting with 'http' will be treated as a possible
 #   ## socket, so both examples below are valid.
 #   ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+#   #
+#   ## By default, some of the fields are renamed from what haproxy calls them.
+#   ## Setting this option to true results in the plugin keeping the original
+#   ## field names.
+#   ## keep_field_names = true
+
+
+# # Monitor disks' temperatures using hddtemp
+# [[inputs.hddtemp]]
+#   ## By default, telegraf gathers temps data from all disks detected by the
+#   ## hddtemp.
+#   ##
+#   ## Only collect temps from the selected disks.
+#   ##
+#   ## A * as the device name will return the temperature values of all disks.
+#   ##
+#   # address = "127.0.0.1:7634"
+#   # devices = ["sda", "*"]
 
 
 # # HTTP/HTTPS request given an address a method and a timeout
@@ -977,6 +1103,11 @@
 #   # {'fake':'data'}
 #   # '''
 #
+#   ## Optional substring or regex match in body of the response
+#   ## response_string_match = "\"service_status\": \"up\""
+#   ## response_string_match = "ok"
+#   ## response_string_match = "\".*_status\".?:.?\"up\""
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -1050,14 +1181,37 @@
 #   # collect_memstats = true
 
 
-# # Read metrics from one or many bare metal servers
+# # Read metrics from the bare metal servers via IPMI
 # [[inputs.ipmi_sensor]]
-#   ## specify servers via a url matching:
+#   ## optionally specify the path to the ipmitool executable
+#   # path = "/usr/bin/ipmitool"
+#   #
+#   ## optionally specify one or more servers via a url matching
 #   ##  [username[:password]@][protocol[(address)]]
 #   ##  e.g.
 #   ##    root:passwd@lan(127.0.0.1)
 #   ##
-#   servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+#   ## if no servers are specified, local machine sensor stats will be queried
+#   ##
+#   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+
+
+# # Gather packets and bytes throughput from iptables
+# [[inputs.iptables]]
+#   ## iptables require root access on most systems.
+#   ## Setting 'use_sudo' to true will make use of sudo to run iptables.
+#   ## Users must configure sudo to allow telegraf user to run iptables with no password.
+#   ## iptables can be restricted to only list command "iptables -nvL".
+#   use_sudo = false
+#   ## Setting 'use_lock' to true runs iptables with the "-w" option.
+#   ## Adjust your sudo settings appropriately if using this option ("iptables -wnvl")
+#   use_lock = false
+#   ## defines the table to monitor:
+#   table = "filter"
+#   ## defines the chains to monitor.
+#   ## NOTE: iptables rules without a comment will not be monitored.
+#   ## Read the plugin documentation for more information.
+#   chains = [ "INPUT" ]
 
 
 # # Read JMX metrics through Jolokia
@@ -1087,6 +1241,13 @@
 #   ## Includes connection time, any redirects, and reading the response body.
 #   # client_timeout = "4s"
 #
+#   ## Attribute delimiter
+#   ##
+#   ## When multiple attributes are returned for a single
+#   ## [inputs.jolokia.metrics], the field name is a concatenation of the metric
+#   ## name, and the attribute name, separated by the given delimiter.
+#   # delimiter = "_"
+#
 #   ## List of servers exposing jolokia read service
 #   [[inputs.jolokia.servers]]
 #     name = "as-server-01"
@@ -1117,6 +1278,11 @@
 #     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
 
 
+# # Get kernel statistics from /proc/vmstat
+# [[inputs.kernel_vmstat]]
+#   # no configuration
+
+
 # # Read metrics from the kubernetes kubelet api
 # [[inputs.kubernetes]]
 #   ## URL for the kubelet
@@ -1216,6 +1382,13 @@
 #   ##   10.0.0.1:10000, etc.
 #   servers = ["127.0.0.1:27017"]
 #   gather_perdb_stats = false
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Read metrics from one or many mysql servers
@@ -1243,9 +1416,15 @@
 #   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
 #   gather_process_list                       = true
 #   #
+#   ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
+#   gather_user_statistics                    = true
+#   #
 #   ## gather auto_increment columns and max values from information schema
 #   gather_info_schema_auto_inc               = true
 #   #
+#   ## gather metrics from INFORMATION_SCHEMA.INNODB_METRICS
+#   gather_innodb_metrics                     = true
+#   #
 #   ## gather metrics from SHOW SLAVE STATUS command output
 #   gather_slave_status                       = true
 #   #
@@ -1417,7 +1596,7 @@
 #   # ignored_databases = ["postgres", "template0", "template1"]
 #
 #   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'ignore_databases' option.
+#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
 #   # databases = ["app_production", "testing"]
 
 
@@ -1599,6 +1778,13 @@
 #   servers = ["http://localhost:8098"]
 
 
+# # Monitor sensors, requires lm-sensors package
+# [[inputs.sensors]]
+#   ## Remove numbers from field names.
+#   ## If true, a field name like 'temp1_input' will be changed to 'temp_input'.
+#   # remove_numbers = true
+
+
 # # Retrieves SNMP values from remote agents
 # [[inputs.snmp]]
 #   agents = [ "127.0.0.1:161" ]
@@ -1775,6 +1961,68 @@
 #   # ]
 
 
+# # Sysstat metrics collector
+# [[inputs.sysstat]]
+#   ## Path to the sadc command.
+#   #
+#   ## Common Defaults:
+#   ##   Debian/Ubuntu: /usr/lib/sysstat/sadc
+#   ##   Arch:          /usr/lib/sa/sadc
+#   ##   RHEL/CentOS:   /usr/lib64/sa/sadc
+#   sadc_path = "/usr/lib/sa/sadc" # required
+#   #
+#   #
+#   ## Path to the sadf command, if it is not in PATH
+#   # sadf_path = "/usr/bin/sadf"
+#   #
+#   #
+#   ## Activities is a list of activities, that are passed as argument to the
+#   ## sadc collector utility (e.g: DISK, SNMP etc...)
+#   ## The more activities that are added, the more data is collected.
+#   # activities = ["DISK"]
+#   #
+#   #
+#   ## Group metrics to measurements.
+#   ##
+#   ## If group is false each metric will be prefixed with a description
+#   ## and represents itself a measurement.
+#   ##
+#   ## If Group is true, corresponding metrics are grouped to a single measurement.
+#   # group = true
+#   #
+#   #
+#   ## Options for the sadf command. The values on the left represent the sadf
+#   ## options and the values on the right their description (wich are used for
+#   ## grouping and prefixing metrics).
+#   ##
+#   ## Run 'sar -h' or 'man sar' to find out the supported options for your
+#   ## sysstat version.
+#   [inputs.sysstat.options]
+#     -C = "cpu"
+#     -B = "paging"
+#     -b = "io"
+#     -d = "disk"             # requires DISK activity
+#     "-n ALL" = "network"
+#     "-P ALL" = "per_cpu"
+#     -q = "queue"
+#     -R = "mem"
+#     -r = "mem_util"
+#     -S = "swap_util"
+#     -u = "cpu_util"
+#     -v = "inode"
+#     -W = "swap"
+#     -w = "task"
+#   #  -H = "hugepages"        # only available for newer linux distributions
+#   #  "-I ALL" = "interrupts" # requires INT activity
+#   #
+#   #
+#   ## Device tags can be used to add additional tags for devices.
+#   ## For example the configuration below adds a tag vg with value rootvg for
+#   ## all metrics with sda devices.
+#   # [[inputs.sysstat.device_tags.sda]]
+#   #  vg = "rootvg"
+
+
 # # Inserts sine and cosine waves for demonstration purposes
 # [[inputs.trig]]
 #   ## Set the amplitude
@@ -1830,6 +2078,39 @@
 #                            SERVICE INPUT PLUGINS                            #
 ###############################################################################
 
+# # AMQP consumer plugin
+# [[inputs.amqp_consumer]]
+#   ## AMQP url
+#   url = "amqp://localhost:5672/influxdb"
+#   ## AMQP exchange
+#   exchange = "telegraf"
+#   ## AMQP queue name
+#   queue = "telegraf"
+#   ## Binding Key
+#   binding_key = "#"
+#
+#   ## Maximum number of messages server should give to the worker.
+#   prefetch_count = 50
+#
+#   ## Auth method. PLAIN and EXTERNAL are supported
+#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+#   ## described here: https://www.rabbitmq.com/plugins.html
+#   # auth_method = "PLAIN"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has it's own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
 # # Influx HTTP write listener
 # [[inputs.http_listener]]
 #   ## Address and port to host HTTP listener on
@@ -1878,7 +2159,9 @@
 #   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
 #   ##   /var/log/apache.log -> only tail the apache log file
 #   files = ["/var/log/apache/access.log"]
-#   ## Read file from beginning.
+#   ## Read files that currently exist from the beginning. Files that are created
+#   ## while telegraf is running (and that match the "files" globs) will always
+#   ## be read from the beginning.
 #   from_beginning = false
 #
 #   ## Parse logstash-style "grok" patterns:
@@ -1976,6 +2259,38 @@
 #   data_format = "influx"
 
 
+# # Generic socket listener capable of handling multiple socket types.
+# [[inputs.socket_listener]]
+#   ## URL to listen on
+#   # service_address = "tcp://:8094"
+#   # service_address = "tcp://127.0.0.1:http"
+#   # service_address = "tcp4://:8094"
+#   # service_address = "tcp6://:8094"
+#   # service_address = "tcp6://[2001:db8::1]:8094"
+#   # service_address = "udp://:8094"
+#   # service_address = "udp4://:8094"
+#   # service_address = "udp6://:8094"
+#   # service_address = "unix:///tmp/telegraf.sock"
+#   # service_address = "unixgram:///tmp/telegraf.sock"
+#
+#   ## Maximum number of concurrent connections.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   ## 0 (default) is unlimited.
+#   # max_connections = 1024
+#
+#   ## Maximum socket buffer size in bytes.
+#   ## For stream sockets, once the buffer fills up, the sender will start backing up.
+#   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
+#   ## Defaults to the OS default.
+#   # read_buffer_size = 65535
+#
+#   ## Data format to consume.
+#   ## Each data format has it's own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   # data_format = "influx"
+
+
 # # Statsd Server
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on
@@ -2045,41 +2360,16 @@
 
 # # Generic TCP listener
 # [[inputs.tcp_listener]]
-#   ## Address and port to host TCP listener on
-#   # service_address = ":8094"
-#
-#   ## Number of TCP messages allowed to queue up. Once filled, the
-#   ## TCP listener will start dropping packets.
-#   # allowed_pending_messages = 10000
-#
-#   ## Maximum number of concurrent TCP connections to allow
-#   # max_tcp_connections = 250
-#
-#   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
+#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+#   # socket_listener plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 
 
 # # Generic UDP listener
 # [[inputs.udp_listener]]
-#   ## Address and port to host UDP listener on
-#   # service_address = ":8092"
-#
-#   ## Number of UDP messages allowed to queue up. Once filled, the
-#   ## UDP listener will start dropping packets.
-#   # allowed_pending_messages = 10000
-#
-#   ## Set the buffer size of the UDP connection outside of OS default (in bytes)
-#   ## If set to 0, take OS default
-#   udp_buffer_size = 16777216
-#
-#   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
+#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+#   # socket_listener plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 
 
 # # A Webhooks Event collector

From 84a9f91f5c090561b93fb505a87970a9165a532e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Mar 2017 15:05:06 -0700
Subject: [PATCH 0166/1302] Skip elasticsearch output integration test in short
 mode

---
 plugins/outputs/elasticsearch/elasticsearch_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/outputs/elasticsearch/elasticsearch_test.go b/plugins/outputs/elasticsearch/elasticsearch_test.go
index 9163a2bbe..9000676d9 100644
--- a/plugins/outputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/outputs/elasticsearch/elasticsearch_test.go
@@ -57,6 +57,10 @@ func TestTemplateManagementEmptyTemplate(t *testing.T) {
 }
 
 func TestTemplateManagement(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
 	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
 
 	e := &Elasticsearch{

From 78c7f4e4af827a96cacdea3593b85293e30ff745 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Mon, 27 Mar 2017 15:49:45 -0700
Subject: [PATCH 0167/1302] Add write timeout to Riemann output (#2576)

---
 CHANGELOG.md                       |  1 +
 plugins/outputs/riemann/README.md  |  3 +++
 plugins/outputs/riemann/riemann.go | 12 ++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1655f77d..5da830d32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@ be deprecated eventually.
 - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
 - [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
 - [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
+- [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
 
 
 ## v1.2.1 [2017-02-01]
diff --git a/plugins/outputs/riemann/README.md b/plugins/outputs/riemann/README.md
index 2338a00dc..82615728c 100644
--- a/plugins/outputs/riemann/README.md
+++ b/plugins/outputs/riemann/README.md
@@ -34,6 +34,9 @@ This plugin writes to [Riemann](http://riemann.io/) via TCP or UDP.
 
   ## Description for Riemann event
   # description_text = "metrics collected from telegraf"
+
+  ## Riemann client write timeout, defaults to "5s" if not set.
+  # timeout = "5s"
 ```
 
 ### Required parameters:
diff --git a/plugins/outputs/riemann/riemann.go b/plugins/outputs/riemann/riemann.go
index 25cf3011a..1738ca537 100644
--- a/plugins/outputs/riemann/riemann.go
+++ b/plugins/outputs/riemann/riemann.go
@@ -7,9 +7,11 @@ import (
 	"os"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/amir/raidman"
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
@@ -22,6 +24,7 @@ type Riemann struct {
 	TagKeys                []string
 	Tags                   []string
 	DescriptionText        string
+	Timeout                internal.Duration
 
 	client *raidman.Client
 }
@@ -54,6 +57,9 @@ var sampleConfig = `
 
   ## Description for Riemann event
   # description_text = "metrics collected from telegraf"
+
+  ## Riemann client write timeout, defaults to "5s" if not set.
+  # timeout = "5s"
 `
 
 func (r *Riemann) Connect() error {
@@ -62,7 +68,7 @@ func (r *Riemann) Connect() error {
 		return err
 	}
 
-	client, err := raidman.Dial(parsed_url.Scheme, parsed_url.Host)
+	client, err := raidman.DialWithTimeout(parsed_url.Scheme, parsed_url.Host, r.Timeout.Duration)
 	if err != nil {
 		r.client = nil
 		return err
@@ -212,6 +218,8 @@ func (r *Riemann) tags(tags map[string]string) []string {
 
 func init() {
 	outputs.Add("riemann", func() telegraf.Output {
-		return &Riemann{}
+		return &Riemann{
+			Timeout: internal.Duration{Duration: time.Second * 5},
+		}
 	})
 }

From 37689f4df60872948425b57baaada82e99872f6e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 28 Mar 2017 10:22:28 -0700
Subject: [PATCH 0168/1302] Add elasticsearch output to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5da830d32..2650e5716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@ be deprecated eventually.
 - [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
 - [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
 - [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
+- [#2332](https://github.com/influxdata/telegraf/pull/2332): Add Elasticsearch 5.x output
 
 ### Bugfixes
 

From 1100a98f11b3a90ee6aacf7294331caa3d3d919c Mon Sep 17 00:00:00 2001
From: mgresser <mgresser@gmail.com>
Date: Tue, 28 Mar 2017 13:47:00 -0400
Subject: [PATCH 0169/1302] Removed duplicate evictions metric (#2577)

---
 plugins/inputs/memcached/memcached.go      | 1 -
 plugins/inputs/memcached/memcached_test.go | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/inputs/memcached/memcached.go b/plugins/inputs/memcached/memcached.go
index 5ee538e93..d174abeda 100644
--- a/plugins/inputs/memcached/memcached.go
+++ b/plugins/inputs/memcached/memcached.go
@@ -51,7 +51,6 @@ var sendMetrics = []string{
 	"decr_misses",
 	"cas_hits",
 	"cas_misses",
-	"evictions",
 	"bytes_read",
 	"bytes_written",
 	"threads",
diff --git a/plugins/inputs/memcached/memcached_test.go b/plugins/inputs/memcached/memcached_test.go
index 210adffdb..436c978f7 100644
--- a/plugins/inputs/memcached/memcached_test.go
+++ b/plugins/inputs/memcached/memcached_test.go
@@ -28,7 +28,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 		"limit_maxbytes", "bytes", "uptime", "curr_items", "total_items",
 		"curr_connections", "total_connections", "connection_structures", "cmd_get",
 		"cmd_set", "delete_hits", "delete_misses", "incr_hits", "incr_misses",
-		"decr_hits", "decr_misses", "cas_hits", "cas_misses", "evictions",
+		"decr_hits", "decr_misses", "cas_hits", "cas_misses",
 		"bytes_read", "bytes_written", "threads", "conn_yields"}
 
 	for _, metric := range intMetrics {

From 9e036b2d6553b47c8d556a29b96e3b3215f4a338 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 28 Mar 2017 12:31:36 -0700
Subject: [PATCH 0170/1302] Remove wait loop in riemann tests

This testcase still has a race condition but I believe it is when the
test does not complete quickly enough.
---
 plugins/outputs/riemann/riemann_test.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index 67a161be5..0b7c85403 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -193,17 +193,6 @@ func TestConnectAndWrite(t *testing.T) {
 	err = r.Write(metrics)
 	require.NoError(t, err)
 
-	start := time.Now()
-	for true {
-		events, _ := r.client.Query(`tagged "docker"`)
-		if len(events) > 0 {
-			break
-		}
-		if time.Since(start) > time.Second {
-			break
-		}
-	}
-
 	// are there any "docker" tagged events in Riemann?
 	events, err := r.client.Query(`tagged "docker"`)
 	require.NoError(t, err)

From 2d7f612bd70b8832e464dd908a7d976cb3a408c4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Wed, 29 Mar 2017 14:25:33 -0700
Subject: [PATCH 0171/1302] Use fork of hpcloud/tail (#2595)

---
 Godeps                                | 2 +-
 plugins/inputs/logparser/logparser.go | 2 +-
 plugins/inputs/tail/tail.go           | 2 +-
 plugins/inputs/tail/tail_test.go      | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Godeps b/Godeps
index 6cbe9efa7..9717cec2f 100644
--- a/Godeps
+++ b/Godeps
@@ -21,7 +21,7 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3
+github.com/influxdata/tail e9ef7e826dafcb3093b40b989fefa90eeb9a8ca1
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index a22832277..c5641ba28 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/hpcloud/tail"
+	"github.com/influxdata/tail"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 0c19f9116..f57d970cf 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/hpcloud/tail"
+	"github.com/influxdata/tail"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/globpath"
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index b927d160c..7ddb502f9 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"runtime"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -59,7 +58,6 @@ func TestTailFromEnd(t *testing.T) {
 
 	acc := testutil.Accumulator{}
 	require.NoError(t, tt.Start(&acc))
-	time.Sleep(time.Millisecond * 200) //TODO remove once https://github.com/hpcloud/tail/pull/114 is merged & added to Godeps
 	for _, tailer := range tt.tailers {
 		for n, err := tailer.Tell(); err == nil && n == 0; n, err = tailer.Tell() {
 			// wait for tailer to jump to end

From cc5b2f68b69ec76886555cbae9c08b75155a6ffc Mon Sep 17 00:00:00 2001
From: djjorjinho <dl.lopes@gmail.com>
Date: Wed, 29 Mar 2017 23:04:29 +0100
Subject: [PATCH 0172/1302] fix timestamp parsing on prometheus plugin (#2596)

---
 CHANGELOG.md                                 |  1 +
 plugins/inputs/prometheus/prometheus.go      | 10 +++++-----
 plugins/inputs/prometheus/prometheus_test.go |  7 +++++++
 testutil/accumulator.go                      | 13 +++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2650e5716..f9a29d075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@ be deprecated eventually.
 - [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
 - [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
 - [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
+- [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
 
 
 ## v1.2.1 [2017-02-01]
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 97da17f04..c12127965 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -3,14 +3,15 @@ package prometheus
 import (
 	"errors"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited;q=0.7,text/plain;version=0.0.4;q=0.3`
@@ -91,7 +92,6 @@ var client = &http.Client{
 }
 
 func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
-	collectDate := time.Now()
 	var req, err = http.NewRequest("GET", url, nil)
 	req.Header.Add("Accept", acceptHeader)
 	var token []byte
@@ -145,7 +145,7 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 	for _, metric := range metrics {
 		tags := metric.Tags()
 		tags["url"] = url
-		acc.AddFields(metric.Name(), metric.Fields(), tags, collectDate)
+		acc.AddFields(metric.Name(), metric.Fields(), tags, metric.Time())
 	}
 
 	return nil
diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
index 8a8fea9e3..4b316a3b4 100644
--- a/plugins/inputs/prometheus/prometheus_test.go
+++ b/plugins/inputs/prometheus/prometheus_test.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
@@ -23,6 +24,9 @@ go_gc_duration_seconds_count 7
 # HELP go_goroutines Number of goroutines that currently exist.
 # TYPE go_goroutines gauge
 go_goroutines 15
+# HELP test_metric An untyped metric with a timestamp
+# TYPE test_metric untyped
+test_metric{label="value"} 1.0 1490802350000
 `
 
 func TestPrometheusGeneratesMetrics(t *testing.T) {
@@ -42,4 +46,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
 
 	assert.True(t, acc.HasFloatField("go_gc_duration_seconds", "count"))
 	assert.True(t, acc.HasFloatField("go_goroutines", "gauge"))
+	assert.True(t, acc.HasFloatField("test_metric", "value"))
+	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
+
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 02bebf9c8..b958e8cc9 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -275,6 +275,19 @@ func (a *Accumulator) AssertDoesNotContainMeasurement(t *testing.T, measurement
 	}
 }
 
+// HasTimestamp returns true if the measurement has a matching Time value
+func (a *Accumulator) HasTimestamp(measurement string, timestamp time.Time) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			return timestamp.Equal(p.Time)
+		}
+	}
+
+	return false
+}
+
 // HasIntField returns true if the measurement has an Int value
 func (a *Accumulator) HasIntField(measurement string, field string) bool {
 	a.Lock()

From 03ee6022f305dd0d73bb03dbb2fd3d81c9909a1f Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Wed, 29 Mar 2017 20:03:06 -0400
Subject: [PATCH 0173/1302] fix race in testutil Accumulator.Wait() (#2598)

---
 testutil/accumulator.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index b958e8cc9..9ebf77cf7 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -43,9 +43,9 @@ func (a *Accumulator) NMetrics() uint64 {
 }
 
 func (a *Accumulator) ClearMetrics() {
-	atomic.StoreUint64(&a.nMetrics, 0)
 	a.Lock()
 	defer a.Unlock()
+	atomic.StoreUint64(&a.nMetrics, 0)
 	a.Metrics = make([]*Metric, 0)
 }
 
@@ -56,9 +56,9 @@ func (a *Accumulator) AddFields(
 	tags map[string]string,
 	timestamp ...time.Time,
 ) {
-	atomic.AddUint64(&a.nMetrics, 1)
 	a.Lock()
 	defer a.Unlock()
+	atomic.AddUint64(&a.nMetrics, 1)
 	if a.Cond != nil {
 		a.Cond.Broadcast()
 	}

From fb1c7d01547bcb82ffd5583b1f7c38565c487335 Mon Sep 17 00:00:00 2001
From: tjmcs <tjmcs@bendbroadband.com>
Date: Wed, 29 Mar 2017 17:12:29 -0700
Subject: [PATCH 0174/1302] Adds a new json_timestamp_units configuration
 parameter (#2587)

---
 docs/DATA_FORMATS_OUTPUT.md      | 10 ++++++++++
 internal/config/config.go        | 20 +++++++++++++++++++-
 plugins/serializers/json/json.go | 10 +++++++++-
 plugins/serializers/registry.go  | 12 ++++++++----
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 177734d16..633460846 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -147,4 +147,14 @@ The JSON data format serialized Telegraf metrics in json format. The format is:
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "json"
+  json_timestamp_units = "1ns"
 ```
+
+By default, the timestamp that is output in JSON data format serialized Telegraf
+metrics is in seconds. The precision of this timestamp can be adjusted for any output
+by adding the optional `json_timestamp_units` parameter to the configuration for
+that output. This parameter can be used to set the timestamp units to  nanoseconds (`ns`),
+microseconds (`us` or `µs`), milliseconds (`ms`), or seconds (`s`). Note that this
+parameter will be truncated to the nearest power of 10 that, so if the `json_timestamp_units`
+are set to `15ms` the timestamps for the JSON format serialized Telegraf metrics will be
+output in hundredths of a second (`10ms`).
diff --git a/internal/config/config.go b/internal/config/config.go
index 651c4e9ef..013e81c12 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"math"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -1244,7 +1245,7 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 // a serializers.Serializer object, and creates it, which can then be added onto
 // an Output object.
 func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error) {
-	c := &serializers.Config{}
+	c := &serializers.Config{TimestampUnits: time.Duration(1 * time.Second)}
 
 	if node, ok := tbl.Fields["data_format"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
@@ -1274,9 +1275,26 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				timestampVal, err := time.ParseDuration(str.Value)
+				if err != nil {
+					return nil, fmt.Errorf("Unable to parse json_timestamp_units as a duration, %s", err)
+				}
+				// now that we have a duration, truncate it to the nearest
+				// power of ten (just in case)
+				nearest_exponent := int64(math.Log10(float64(timestampVal.Nanoseconds())))
+				new_nanoseconds := int64(math.Pow(10.0, float64(nearest_exponent)))
+				c.TimestampUnits = time.Duration(new_nanoseconds)
+			}
+		}
+	}
+
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
+	delete(tbl.Fields, "json_timestamp_units")
 	return serializers.NewSerializer(c)
 }
 
diff --git a/plugins/serializers/json/json.go b/plugins/serializers/json/json.go
index 3e259fafd..452364c95 100644
--- a/plugins/serializers/json/json.go
+++ b/plugins/serializers/json/json.go
@@ -2,19 +2,27 @@ package json
 
 import (
 	ejson "encoding/json"
+	"time"
 
 	"github.com/influxdata/telegraf"
 )
 
 type JsonSerializer struct {
+	TimestampUnits time.Duration
 }
 
 func (s *JsonSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	m := make(map[string]interface{})
+	units_nanoseconds := s.TimestampUnits.Nanoseconds()
+	// if the units passed in were less than or equal to zero,
+	// then serialize the timestamp in seconds (the default)
+	if units_nanoseconds <= 0 {
+		units_nanoseconds = 1000000000
+	}
 	m["tags"] = metric.Tags()
 	m["fields"] = metric.Fields()
 	m["name"] = metric.Name()
-	m["timestamp"] = metric.UnixNano() / 1000000000
+	m["timestamp"] = metric.UnixNano() / units_nanoseconds
 	serialized, err := ejson.Marshal(m)
 	if err != nil {
 		return []byte{}, err
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index cb1e03b46..368f6f449 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -2,6 +2,7 @@ package serializers
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/influxdata/telegraf"
 
@@ -29,7 +30,7 @@ type Serializer interface {
 // Config is a struct that covers the data types needed for all serializer types,
 // and can be used to instantiate _any_ of the serializers.
 type Config struct {
-	// Dataformat can be one of: influx, graphite
+	// Dataformat can be one of: influx, graphite, or json
 	DataFormat string
 
 	// Prefix to add to all measurements, only supports Graphite
@@ -38,6 +39,9 @@ type Config struct {
 	// Template for converting telegraf metrics into Graphite
 	// only supports Graphite
 	Template string
+
+	// Timestamp units to use for JSON formatted output
+	TimestampUnits time.Duration
 }
 
 // NewSerializer a Serializer interface based on the given config.
@@ -50,15 +54,15 @@ func NewSerializer(config *Config) (Serializer, error) {
 	case "graphite":
 		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template)
 	case "json":
-		serializer, err = NewJsonSerializer()
+		serializer, err = NewJsonSerializer(config.TimestampUnits)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
 	return serializer, err
 }
 
-func NewJsonSerializer() (Serializer, error) {
-	return &json.JsonSerializer{}, nil
+func NewJsonSerializer(timestampUnits time.Duration) (Serializer, error) {
+	return &json.JsonSerializer{TimestampUnits: timestampUnits}, nil
 }
 
 func NewInfluxSerializer() (Serializer, error) {

From 9495b615f55a937e0f1a79670451227d3df5166d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Mar 2017 17:14:57 -0700
Subject: [PATCH 0175/1302] Update changelog for #2587

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a29d075..2ab699600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ be deprecated eventually.
 - [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
 - [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
 - [#2332](https://github.com/influxdata/telegraf/pull/2332): Add Elasticsearch 5.x output
+- [#2587](https://github.com/influxdata/telegraf/pull/2587): Add json timestamp units configurability
 
 ### Bugfixes
 

From c980c92cd5d7f5d4d4b3f3c81401c70a65eb5a0a Mon Sep 17 00:00:00 2001
From: Dmitry Ulyanov <swhile@ya.ru>
Date: Thu, 30 Mar 2017 04:28:43 +0300
Subject: [PATCH 0176/1302] Added pprof tool (#2512)

---
 CHANGELOG.md             |  1 +
 cmd/telegraf/telegraf.go | 25 +++++++++++++++++++++++++
 docs/PROFILING.md        | 24 ++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 docs/PROFILING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab699600..9f90157f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ be deprecated eventually.
 - [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
 - [#2071](https://github.com/influxdata/telegraf/issues/2071): Use official docker SDK.
 - [#1678](https://github.com/influxdata/telegraf/pull/1678): Add AMQP consumer input plugin
+- [#2512](https://github.com/influxdata/telegraf/pull/2512): Added pprof tool.
 - [#2501](https://github.com/influxdata/telegraf/pull/2501): Support DEAD(X) state in system input plugin.
 - [#2522](https://github.com/influxdata/telegraf/pull/2522): Add support for mongodb client certificates.
 - [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 16f7845d0..40e90a1ec 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -4,6 +4,8 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net/http"
+	_ "net/http/pprof" // Comment this line to disable pprof endpoint.
 	"os"
 	"os/signal"
 	"runtime"
@@ -24,6 +26,8 @@ import (
 
 var fDebug = flag.Bool("debug", false,
 	"turn on debug logging")
+var pprofAddr = flag.String("pprof-addr", "",
+	"pprof address to listen on, not activate pprof if empty")
 var fQuiet = flag.Bool("quiet", false,
 	"run in quiet mode")
 var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
@@ -87,6 +91,7 @@ The commands & flags are:
   --output-filter     filter the output plugins to enable, separator is :
   --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
   --debug             print metrics as they're generated to stdout
+  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
   --quiet             run in quiet mode
 
 Examples:
@@ -105,6 +110,9 @@ Examples:
 
   # run telegraf, enabling the cpu & memory input, and influxdb output plugins
   telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
+
+  # run telegraf with pprof
+  telegraf --config telegraf.conf --pprof-addr localhost:6060
 `
 
 var stop chan struct{}
@@ -267,6 +275,23 @@ func main() {
 		processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":")
 	}
 
+	if *pprofAddr != "" {
+		go func() {
+			pprofHostPort := *pprofAddr
+			parts := strings.Split(pprofHostPort, ":")
+			if len(parts) == 2 && parts[0] == "" {
+				pprofHostPort = fmt.Sprintf("localhost:%s", parts[1])
+			}
+			pprofHostPort = "http://" + pprofHostPort + "/debug/pprof"
+
+			log.Printf("I! Starting pprof HTTP server at: %s", pprofHostPort)
+
+			if err := http.ListenAndServe(*pprofAddr, nil); err != nil {
+				log.Fatal("E! " + err.Error())
+			}
+		}()
+	}
+
 	if len(args) > 0 {
 		switch args[0] {
 		case "version":
diff --git a/docs/PROFILING.md b/docs/PROFILING.md
new file mode 100644
index 000000000..a0851c8f1
--- /dev/null
+++ b/docs/PROFILING.md
@@ -0,0 +1,24 @@
+# Telegraf profiling
+
+Telegraf uses the standard package `net/http/pprof`. This package serves via its HTTP server runtime profiling data in the format expected by the pprof visualization tool.
+
+By default, the profiling is turned off.
+
+To enable profiling you need to specify address to config parameter `pprof-addr`, for example:
+
+```
+telegraf --config telegraf.conf --pprof-addr localhost:6060
+```
+
+There are several paths to get different profiling information:
+
+To look at the heap profile:
+
+`go tool pprof http://localhost:6060/debug/pprof/heap`
+
+or to look at a 30-second CPU profile:
+
+`go tool pprof http://localhost:6060/debug/pprof/profile?seconds=30`
+
+To view all available profiles, open `http://localhost:6060/debug/pprof/` in your browser.
+

From 540f98e2280f5fa85b0cdbd33b16cb95691cf2a4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 31 Mar 2017 12:45:28 -0700
Subject: [PATCH 0177/1302] Fix possible deadlock when output cannot write.
 (#2610)

---
 CHANGELOG.md              | 1 +
 internal/buffer/buffer.go | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f90157f7..cf7c31c4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@ be deprecated eventually.
 - [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
 - [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
 - [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
+- [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
 
 
 ## v1.2.1 [2017-02-01]
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index 5e7818ef1..cdc81fed3 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -45,9 +45,11 @@ func (b *Buffer) Add(metrics ...telegraf.Metric) {
 		select {
 		case b.buf <- metrics[i]:
 		default:
+			b.mu.Lock()
 			MetricsDropped.Incr(1)
 			<-b.buf
 			b.buf <- metrics[i]
+			b.mu.Unlock()
 		}
 	}
 }

From 51c99d5b67f7a6d58d801e4dfcb041f3ade74fb6 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 31 Mar 2017 17:01:02 -0400
Subject: [PATCH 0178/1302] add support for linux sysctl fs metrics (#2609)

---
 CHANGELOG.md                                  |  1 +
 README.md                                     |  1 +
 .../inputs/system/LINUX_SYSCTL_FS_README.md   |  9 ++
 plugins/inputs/system/linux_sysctl_fs.go      | 88 +++++++++++++++++++
 plugins/inputs/system/linux_sysctl_fs_test.go | 41 +++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 plugins/inputs/system/LINUX_SYSCTL_FS_README.md
 create mode 100644 plugins/inputs/system/linux_sysctl_fs.go
 create mode 100644 plugins/inputs/system/linux_sysctl_fs_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf7c31c4b..fa4b820c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@ be deprecated eventually.
 - [#1948](https://github.com/influxdata/telegraf/pull/1948): Support adding SNMP table indexes as tags.
 - [#2332](https://github.com/influxdata/telegraf/pull/2332): Add Elasticsearch 5.x output
 - [#2587](https://github.com/influxdata/telegraf/pull/2587): Add json timestamp units configurability
+- [#2597](https://github.com/influxdata/telegraf/issues/2597): Add support for Linux sysctl-fs metrics.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 906862714..55154e36a 100644
--- a/README.md
+++ b/README.md
@@ -174,6 +174,7 @@ configuration options.
     * processes
     * kernel (/proc/stat)
     * kernel (/proc/vmstat)
+    * linux_sysctl_fs (/proc/sys/fs)
 
 Telegraf can also collect metrics via the following service plugins:
 
diff --git a/plugins/inputs/system/LINUX_SYSCTL_FS_README.md b/plugins/inputs/system/LINUX_SYSCTL_FS_README.md
new file mode 100644
index 000000000..e9341c322
--- /dev/null
+++ b/plugins/inputs/system/LINUX_SYSCTL_FS_README.md
@@ -0,0 +1,9 @@
+# Linux Sysctl FS Input
+
+The linux_sysctl_fs input provides Linux system level file metrics. The documentation on these fields can be found at https://www.kernel.org/doc/Documentation/sysctl/fs.txt.
+
+Example output:
+
+```
+> linux_sysctl_fs,host=foo dentry-want-pages=0i,file-max=44222i,aio-max-nr=65536i,inode-preshrink-nr=0i,dentry-nr=64340i,dentry-unused-nr=55274i,file-nr=1568i,aio-nr=0i,inode-nr=35952i,inode-free-nr=12957i,dentry-age-limit=45i 1490982022000000000
+```
diff --git a/plugins/inputs/system/linux_sysctl_fs.go b/plugins/inputs/system/linux_sysctl_fs.go
new file mode 100644
index 000000000..93e426e75
--- /dev/null
+++ b/plugins/inputs/system/linux_sysctl_fs.go
@@ -0,0 +1,88 @@
+package system
+
+import (
+	"bytes"
+	"io/ioutil"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+// https://www.kernel.org/doc/Documentation/sysctl/fs.txt
+type SysctlFS struct {
+	path string
+}
+
+var sysctlFSDescription = `Provides Linux sysctl fs metrics`
+var sysctlFSSampleConfig = ``
+
+func (_ SysctlFS) Description() string {
+	return sysctlFSDescription
+}
+func (_ SysctlFS) SampleConfig() string {
+	return sysctlFSSampleConfig
+}
+
+func (sfs *SysctlFS) gatherList(file string, fields map[string]interface{}, fieldNames ...string) error {
+	bs, err := ioutil.ReadFile(sfs.path + "/" + file)
+	if err != nil {
+		return err
+	}
+
+	bsplit := bytes.Split(bytes.TrimRight(bs, "\n"), []byte{'\t'})
+	for i, name := range fieldNames {
+		if i >= len(bsplit) {
+			break
+		}
+		if name == "" {
+			continue
+		}
+
+		v, err := strconv.ParseUint(string(bsplit[i]), 10, 64)
+		if err != nil {
+			return err
+		}
+		fields[name] = v
+	}
+
+	return nil
+}
+
+func (sfs *SysctlFS) gatherOne(name string, fields map[string]interface{}) error {
+	bs, err := ioutil.ReadFile(sfs.path + "/" + name)
+	if err != nil {
+		return err
+	}
+
+	v, err := strconv.ParseUint(string(bytes.TrimRight(bs, "\n")), 10, 64)
+	if err != nil {
+		return err
+	}
+
+	fields[name] = v
+	return nil
+}
+
+func (sfs *SysctlFS) Gather(acc telegraf.Accumulator) error {
+	fields := map[string]interface{}{}
+
+	for _, n := range []string{"aio-nr", "aio-max-nr", "dquot-nr", "dquot-max", "super-nr", "super-max"} {
+		sfs.gatherOne(n, fields)
+	}
+
+	sfs.gatherList("inode-state", fields, "inode-nr", "inode-free-nr", "inode-preshrink-nr")
+	sfs.gatherList("dentry-state", fields, "dentry-nr", "dentry-unused-nr", "dentry-age-limit", "dentry-want-pages")
+	sfs.gatherList("file-nr", fields, "file-nr", "", "file-max")
+
+	acc.AddFields("linux_sysctl_fs", fields, nil)
+	return nil
+}
+
+func init() {
+	inputs.Add("linux_sysctl_fs", func() telegraf.Input {
+		return &SysctlFS{
+			path: "/proc/sys/fs",
+		}
+	})
+}
diff --git a/plugins/inputs/system/linux_sysctl_fs_test.go b/plugins/inputs/system/linux_sysctl_fs_test.go
new file mode 100644
index 000000000..6561465cb
--- /dev/null
+++ b/plugins/inputs/system/linux_sysctl_fs_test.go
@@ -0,0 +1,41 @@
+package system
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSysctlFSGather(t *testing.T) {
+	td, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer os.RemoveAll(td)
+
+	require.NoError(t, ioutil.WriteFile(td+"/aio-nr", []byte("100\n"), 0644))
+	require.NoError(t, ioutil.WriteFile(td+"/aio-max-nr", []byte("101\n"), 0644))
+	require.NoError(t, ioutil.WriteFile(td+"/super-nr", []byte("102\n"), 0644))
+	require.NoError(t, ioutil.WriteFile(td+"/super-max", []byte("103\n"), 0644))
+	require.NoError(t, ioutil.WriteFile(td+"/file-nr", []byte("104\t0\t106\n"), 0644))
+	require.NoError(t, ioutil.WriteFile(td+"/inode-state", []byte("107\t108\t109\t0\t0\t0\t0\n"), 0644))
+
+	sfs := &SysctlFS{
+		path: td,
+	}
+	var acc testutil.Accumulator
+	require.NoError(t, sfs.Gather(&acc))
+
+	acc.AssertContainsFields(t, "linux_sysctl_fs", map[string]interface{}{
+		"aio-nr":             uint64(100),
+		"aio-max-nr":         uint64(101),
+		"super-nr":           uint64(102),
+		"super-max":          uint64(103),
+		"file-nr":            uint64(104),
+		"file-max":           uint64(106),
+		"inode-nr":           uint64(107),
+		"inode-free-nr":      uint64(108),
+		"inode-preshrink-nr": uint64(109),
+	})
+}

From 35e439016825b49d6b41223b7494f433c21eceb4 Mon Sep 17 00:00:00 2001
From: Shakeel Sorathia <ssorathia@users.noreply.github.com>
Date: Mon, 3 Apr 2017 13:43:15 -0700
Subject: [PATCH 0179/1302] Docker: optionally add labels as tags (#2425)

---
 CHANGELOG.md                         |  1 +
 plugins/inputs/docker/README.md      | 26 ++++++++----
 plugins/inputs/docker/docker.go      | 61 ++++++++++++++++++++++++----
 plugins/inputs/docker/docker_test.go | 55 +++++++++++++++++++++++++
 plugins/inputs/docker/fake_client.go |  8 ++++
 5 files changed, 135 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa4b820c7..e7da095d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ be deprecated eventually.
 - [#2332](https://github.com/influxdata/telegraf/pull/2332): Add Elasticsearch 5.x output
 - [#2587](https://github.com/influxdata/telegraf/pull/2587): Add json timestamp units configurability
 - [#2597](https://github.com/influxdata/telegraf/issues/2597): Add support for Linux sysctl-fs metrics.
+- [#2425](https://github.com/influxdata/telegraf/pull/2425): Support to include/exclude docker container labels as tags
 
 ### Bugfixes
 
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 94965213f..849450b33 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -30,6 +30,12 @@ for the stat structure can be found
   perdevice = true
   ## Whether to report for each container total blkio and network stats or not
   total = false
+  
+  ## docker labels to include and exclude as tags.  Globs accepted.
+  ## Note that an empty array for both will include all labels as tags
+  docker_label_include = []
+  docker_label_exclude = []
+  
 ```
 
 ### Measurements & Fields:
@@ -130,30 +136,32 @@ based on the availability of per-cpu stats on your system.
 
 
 ### Tags:
-
+#### Docker Engine tags
 - docker (memory_total)
     - unit=bytes
+    - engine_host
 - docker (pool_blocksize)
     - unit=bytes
+    - engine_host
 - docker_data
     - unit=bytes
+    - engine_host
 - docker_metadata
     - unit=bytes
+    - engine_host
 
+#### Docker Container tags
+- Tags on all containers:
+    - engine_host
+    - container_image
+    - container_name
+    - container_version
 - docker_container_mem specific:
-    - container_image
-    - container_name
 - docker_container_cpu specific:
-    - container_image
-    - container_name
     - cpu
 - docker_container_net specific:
-    - container_image
-    - container_name
     - network
 - docker_container_blkio specific:
-    - container_image
-    - container_name
     - device
 
 ### Example Output:
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index ec192efd5..47d1db14b 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -14,24 +14,34 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+type DockerLabelFilter struct {
+	labelInclude filter.Filter
+	labelExclude filter.Filter
+}
+
 // Docker object
 type Docker struct {
 	Endpoint       string
 	ContainerNames []string
 	Timeout        internal.Duration
-	PerDevice      bool `toml:"perdevice"`
-	Total          bool `toml:"total"`
+	PerDevice      bool     `toml:"perdevice"`
+	Total          bool     `toml:"total"`
+	LabelInclude   []string `toml:"docker_label_include"`
+	LabelExclude   []string `toml:"docker_label_exclude"`
+
+	LabelFilter DockerLabelFilter
 
 	client      *client.Client
 	engine_host string
 
-	testing bool
+	testing             bool
+	labelFiltersCreated bool
 }
 
 // infoWrapper wraps client.Client.List for testing.
@@ -99,6 +109,10 @@ var sampleConfig = `
   ## Whether to report for each container total blkio and network stats or not
   total = false
 
+  ## docker labels to include and exclude as tags.  Globs accepted.
+  ## Note that an empty array for both will include all labels as tags
+  docker_label_include = []
+  docker_label_exclude = []
 `
 
 // Description returns input description
@@ -133,6 +147,14 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		}
 		d.client = c
 	}
+	// Create label filters if not already created
+	if !d.labelFiltersCreated {
+		err := d.createLabelFilters()
+		if err != nil {
+			return err
+		}
+		d.labelFiltersCreated = true
+	}
 
 	// Get daemon info
 	err := d.gatherInfo(acc)
@@ -293,7 +315,11 @@ func (d *Docker) gatherContainer(
 
 	// Add labels to tags
 	for k, label := range container.Labels {
-		tags[k] = label
+		if len(d.LabelInclude) == 0 || d.LabelFilter.labelInclude.Match(k) {
+			if len(d.LabelExclude) == 0 || !d.LabelFilter.labelExclude.Match(k) {
+				tags[k] = label
+			}
+		}
 	}
 
 	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total)
@@ -599,11 +625,32 @@ func parseSize(sizeStr string) (int64, error) {
 	return int64(size), nil
 }
 
+func (d *Docker) createLabelFilters() error {
+	if len(d.LabelInclude) != 0 && d.LabelFilter.labelInclude == nil {
+		var err error
+		d.LabelFilter.labelInclude, err = filter.Compile(d.LabelInclude)
+		if err != nil {
+			return err
+		}
+	}
+
+	if len(d.LabelExclude) != 0 && d.LabelFilter.labelExclude == nil {
+		var err error
+		d.LabelFilter.labelExclude, err = filter.Compile(d.LabelExclude)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func init() {
 	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
-			PerDevice: true,
-			Timeout:   internal.Duration{Duration: time.Second * 5},
+			PerDevice:           true,
+			Timeout:             internal.Duration{Duration: time.Second * 5},
+			labelFiltersCreated: false,
 		}
 	})
 }
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index f0add03ea..3e2e1607b 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -244,6 +244,57 @@ func testStats() *types.StatsJSON {
 	return stats
 }
 
+var gatherLabelsTests = []struct {
+	include     []string
+	exclude     []string
+	expected    []string
+	notexpected []string
+}{
+	{[]string{}, []string{}, []string{"label1", "label2"}, []string{}},
+	{[]string{"*"}, []string{}, []string{"label1", "label2"}, []string{}},
+	{[]string{"lab*"}, []string{}, []string{"label1", "label2"}, []string{}},
+	{[]string{"label1"}, []string{}, []string{"label1"}, []string{"label2"}},
+	{[]string{"label1*"}, []string{}, []string{"label1"}, []string{"label2"}},
+	{[]string{}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+	{[]string{}, []string{"lab*"}, []string{}, []string{"label1", "label2"}},
+	{[]string{}, []string{"label1"}, []string{"label2"}, []string{"label1"}},
+	{[]string{"*"}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+}
+
+func TestDockerGatherLabels(t *testing.T) {
+	for _, tt := range gatherLabelsTests {
+		var acc testutil.Accumulator
+		d := Docker{
+			client:  nil,
+			testing: true,
+		}
+
+		for _, label := range tt.include {
+			d.LabelInclude = append(d.LabelInclude, label)
+		}
+		for _, label := range tt.exclude {
+			d.LabelExclude = append(d.LabelExclude, label)
+		}
+
+		err := d.Gather(&acc)
+		require.NoError(t, err)
+
+		for _, label := range tt.expected {
+			if !acc.HasTag("docker_container_cpu", label) {
+				t.Errorf("Didn't get expected label of %s.  Test was:  Include: %s  Exclude %s",
+					label, tt.include, tt.exclude)
+			}
+		}
+
+		for _, label := range tt.notexpected {
+			if acc.HasTag("docker_container_cpu", label) {
+				t.Errorf("Got unexpected label of %s.  Test was:  Include: %s  Exclude %s",
+					label, tt.include, tt.exclude)
+			}
+		}
+	}
+}
+
 func TestDockerGatherInfo(t *testing.T) {
 	var acc testutil.Accumulator
 	d := Docker{
@@ -294,6 +345,8 @@ func TestDockerGatherInfo(t *testing.T) {
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
+			"label1":            "test_value_1",
+			"label2":            "test_value_2",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
@@ -340,6 +393,8 @@ func TestDockerGatherInfo(t *testing.T) {
 			"container_name":    "etcd2",
 			"container_image":   "quay.io:4443/coreos/etcd",
 			"container_version": "v2.2.2",
+			"label1":            "test_value_1",
+			"label2":            "test_value_2",
 		},
 	)
 
diff --git a/plugins/inputs/docker/fake_client.go b/plugins/inputs/docker/fake_client.go
index 03da23198..dcca6f235 100644
--- a/plugins/inputs/docker/fake_client.go
+++ b/plugins/inputs/docker/fake_client.go
@@ -92,6 +92,10 @@ func (d FakeDockerClient) ContainerList(octx context.Context, options types.Cont
 				IP:          "0.0.0.0",
 			},
 		},
+		Labels: map[string]string{
+			"label1": "test_value_1",
+			"label2": "test_value_2",
+		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	}
@@ -125,6 +129,10 @@ func (d FakeDockerClient) ContainerList(octx context.Context, options types.Cont
 				IP:          "0.0.0.0",
 			},
 		},
+		Labels: map[string]string{
+			"label1": "test_value_1",
+			"label2": "test_value_2",
+		},
 		SizeRw:     0,
 		SizeRootFs: 0,
 	}

From f2805fd4aa8eaba02127e68291427592bb3b0d68 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 3 Apr 2017 21:06:51 -0400
Subject: [PATCH 0180/1302] socket_listener: clean up unix socket file on start
 & stop (#2618)

---
 .../inputs/socket_listener/socket_listener.go | 35 +++++++++++++++++--
 .../socket_listener/socket_listener_test.go   |  8 +++--
 .../socket_writer/socket_writer_test.go       |  2 ++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 9d3a8e1fe..b5c0202cc 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"log"
 	"net"
+	"os"
 	"strings"
 	"sync"
 
@@ -32,7 +33,9 @@ func (ssl *streamSocketListener) listen() {
 	for {
 		c, err := ssl.Accept()
 		if err != nil {
-			ssl.AddError(err)
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				ssl.AddError(err)
+			}
 			break
 		}
 
@@ -78,7 +81,9 @@ func (ssl *streamSocketListener) read(c net.Conn) {
 	}
 
 	if err := scnr.Err(); err != nil {
-		ssl.AddError(err)
+		if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+			ssl.AddError(err)
+		}
 	}
 }
 
@@ -92,7 +97,9 @@ func (psl *packetSocketListener) listen() {
 	for {
 		n, _, err := psl.ReadFrom(buf)
 		if err != nil {
-			psl.AddError(err)
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				psl.AddError(err)
+			}
 			break
 		}
 
@@ -170,6 +177,13 @@ func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
 		return fmt.Errorf("invalid service address: %s", sl.ServiceAddress)
 	}
 
+	if spl[0] == "unix" || spl[0] == "unixpacket" || spl[0] == "unixgram" {
+		// no good way of testing for "file does not exist".
+		// Instead just ignore error and blow up when we try to listen, which will
+		// indicate "address already in use" if file existed and we couldn't remove.
+		os.Remove(spl[1])
+	}
+
 	switch spl[0] {
 	case "tcp", "tcp4", "tcp6", "unix", "unixpacket":
 		l, err := net.Listen(spl[0], spl[1])
@@ -217,6 +231,10 @@ func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
 		return fmt.Errorf("unknown protocol '%s' in '%s'", spl[0], sl.ServiceAddress)
 	}
 
+	if spl[0] == "unix" || spl[0] == "unixpacket" || spl[0] == "unixgram" {
+		sl.Closer = unixCloser{path: spl[1], closer: sl.Closer}
+	}
+
 	return nil
 }
 
@@ -235,6 +253,17 @@ func newSocketListener() *SocketListener {
 	}
 }
 
+type unixCloser struct {
+	path   string
+	closer io.Closer
+}
+
+func (uc unixCloser) Close() error {
+	err := uc.closer.Close()
+	os.Remove(uc.path) // ignore error
+	return err
+}
+
 func init() {
 	inputs.Add("socket_listener", func() telegraf.Input { return newSocketListener() })
 }
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index 9fa472809..b263e5082 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -18,6 +18,7 @@ func TestSocketListener_tcp(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
+	defer sl.Stop()
 
 	client, err := net.Dial("tcp", sl.Closer.(net.Listener).Addr().String())
 	require.NoError(t, err)
@@ -32,6 +33,7 @@ func TestSocketListener_udp(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
+	defer sl.Stop()
 
 	client, err := net.Dial("udp", sl.Closer.(net.PacketConn).LocalAddr().String())
 	require.NoError(t, err)
@@ -40,13 +42,14 @@ func TestSocketListener_udp(t *testing.T) {
 }
 
 func TestSocketListener_unix(t *testing.T) {
-	defer os.Remove("/tmp/telegraf_test.sock")
+	os.Create("/tmp/telegraf_test.sock")
 	sl := newSocketListener()
 	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
+	defer sl.Stop()
 
 	client, err := net.Dial("unix", "/tmp/telegraf_test.sock")
 	require.NoError(t, err)
@@ -55,13 +58,14 @@ func TestSocketListener_unix(t *testing.T) {
 }
 
 func TestSocketListener_unixgram(t *testing.T) {
-	defer os.Remove("/tmp/telegraf_test.sock")
+	os.Create("/tmp/telegraf_test.sock")
 	sl := newSocketListener()
 	sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock"
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
+	defer sl.Stop()
 
 	client, err := net.Dial("unixgram", "/tmp/telegraf_test.sock")
 	require.NoError(t, err)
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
index 3ab9d1e34..6be2b0905 100644
--- a/plugins/outputs/socket_writer/socket_writer_test.go
+++ b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -44,6 +44,7 @@ func TestSocketWriter_udp(t *testing.T) {
 }
 
 func TestSocketWriter_unix(t *testing.T) {
+	os.Remove("/tmp/telegraf_test.sock")
 	defer os.Remove("/tmp/telegraf_test.sock")
 	listener, err := net.Listen("unix", "/tmp/telegraf_test.sock")
 	require.NoError(t, err)
@@ -61,6 +62,7 @@ func TestSocketWriter_unix(t *testing.T) {
 }
 
 func TestSocketWriter_unixgram(t *testing.T) {
+	os.Remove("/tmp/telegraf_test.sock")
 	defer os.Remove("/tmp/telegraf_test.sock")
 	listener, err := net.ListenPacket("unixgram", "/tmp/telegraf_test.sock")
 	require.NoError(t, err)

From 8bf193dc064f27f917d3aeb0549d792e41d8f013 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Mon, 3 Apr 2017 18:34:04 -0700
Subject: [PATCH 0181/1302] Update httpjson documentation (#2619)

closes  #2536
---
 plugins/inputs/EXAMPLE_README.md    |   2 +-
 plugins/inputs/httpjson/README.md   | 227 ++++++++++------------------
 plugins/inputs/httpjson/httpjson.go |  17 ++-
 3 files changed, 90 insertions(+), 156 deletions(-)

diff --git a/plugins/inputs/EXAMPLE_README.md b/plugins/inputs/EXAMPLE_README.md
index d6fcfdb91..a38064a7a 100644
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -27,7 +27,7 @@ The example plugin gathers metrics about example things
     - tag2
 - measurement2 has the following tags:
     - tag3
-    
+
 ### Sample Queries:
 
 These are some useful queries (to generate dashboards or other) to run against data from this plugin:
diff --git a/plugins/inputs/httpjson/README.md b/plugins/inputs/httpjson/README.md
index c7c0e6797..1aa1ad1a4 100644
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -1,128 +1,79 @@
-# HTTP JSON Plugin
+# HTTP JSON Input Plugin
 
-The httpjson plugin can collect data from remote URLs which respond with JSON. Then it flattens JSON and finds all numeric values, treating them as floats.
+The httpjson plugin collects data from HTTP URLs which respond with JSON.  It flattens the JSON and finds all numeric values, treating them as floats.
 
-For example, if you have a service called _mycollector_, which has HTTP endpoint for gathering stats at http://my.service.com/_stats, you would configure the HTTP JSON plugin like this:
+### Configuration:
 
-```
+```toml
 [[inputs.httpjson]]
-  name = "mycollector"
+  ## NOTE This plugin only reads numerical measurements, strings and booleans
+  ## will be ignored.
 
+  ## Name for the service being polled.  Will be appended to the name of the
+  ## measurement e.g. "httpjson_webserver_stats".
+  ##
+  ## Deprecated (1.3.0): Use name_override, name_suffix, name_prefix instead.
+  name = "webserver_stats"
+
+  ## URL of each server in the service's cluster
   servers = [
-    "http://my.service.com/_stats"
+    "http://localhost:9999/stats/",
+    "http://localhost:9998/stats/",
   ]
-
-  # HTTP method to use (case-sensitive)
-  method = "GET"
-
-  # Set response_timeout (default 5 seconds)
+  ## Set response_timeout (default 5 seconds)
   response_timeout = "5s"
-```
 
-`name` is used as a prefix for the measurements.
-
-`method` specifies HTTP method to use for requests.
-
-`response_timeout` specifies timeout to wait to get the response
-
-You can also specify which keys from server response should be considered tags:
-
-```
-[[inputs.httpjson]]
-  ...
-
-  tag_keys = [
-    "role",
-    "version"
-  ]
-```
-
-If the JSON response is an array of objects, then each object will be parsed with the same configuration.
-
-You can also specify additional request parameters for the service:
-
-```
-[[inputs.httpjson]]
-  ...
-
- [inputs.httpjson.parameters]
-    event_type = "cpu_spike"
-    threshold = "0.75"
-
-```
-
-You can also specify additional request header parameters for the service:
-
-```
-[[inputs.httpjson]]
-  ...
-
- [inputs.httpjson.headers]
-    X-Auth-Token = "my-xauth-token"
-    apiVersion = "v1"
-```
-
-# Example:
-
-Let's say that we have a service named "mycollector" configured like this:
-
-```
-[[inputs.httpjson]]
-  name = "mycollector"
-  servers = [
-    "http://my.service.com/_stats"
-  ]
-  # HTTP method to use (case-sensitive)
-  method = "GET"
-  tag_keys = ["service"]
-```
-
-which responds with the following JSON:
-
-```json
-{
-    "service": "service01",
-    "a": 0.5,
-    "b": {
-        "c": "some text",
-        "d": 0.1,
-        "e": 5
-    }
-}
-```
-
-The collected metrics will be:
-```
-httpjson_mycollector_a,service='service01',server='http://my.service.com/_stats' value=0.5
-httpjson_mycollector_b_d,service='service01',server='http://my.service.com/_stats' value=0.1
-httpjson_mycollector_b_e,service='service01',server='http://my.service.com/_stats' value=5
-```
-
-# Example 2, Multiple Services:
-
-There is also the option to collect JSON from multiple services, here is an example doing that.
-
-```
-[[inputs.httpjson]]
-  name = "mycollector1"
-  servers = [
-    "http://my.service1.com/_stats"
-  ]
-  # HTTP method to use (case-sensitive)
+  ## HTTP method to use: GET or POST (case-sensitive)
   method = "GET"
 
-[[inputs.httpjson]]
-  name = "mycollector2"
-  servers = [
-    "http://service.net/json/stats"
-  ]
-  # HTTP method to use (case-sensitive)
-  method = "POST"
+  ## Tags to extract from top-level of JSON server response.
+  # tag_keys = [
+  #   "my_tag_1",
+  #   "my_tag_2"
+  # ]
+
+  ## HTTP Request Parameters (all values must be strings).  For "GET" requests, data
+  ## will be included in the query.  For "POST" requests, data will be included
+  ## in the request body as "x-www-form-urlencoded".
+  # [inputs.httpjson.parameters]
+  #   event_type = "cpu_spike"
+  #   threshold = "0.75"
+
+  ## HTTP Request Headers (all values must be strings).
+  # [inputs.httpjson.headers]
+  #   X-Auth-Token = "my-xauth-token"
+  #   apiVersion = "v1"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
-The services respond with the following JSON:
+### Measurements & Fields:
 
-mycollector1:
+- httpjson
+	- response_time (float): Response time in seconds
+
+Additional fields are dependant on the response of the remote service being polled.
+
+### Tags:
+
+- All measurements have the following tags:
+	- server: HTTP origin as defined in configuration as `servers`.
+
+Any top level keys listed under `tag_keys` in the configuration are added as tags.  Top level keys are defined as keys in the root level of the object in a single object response, or in the root level of each object within an array of objects.
+
+
+### Examples Output:
+
+This plugin understands responses containing a single JSON object, or a JSON Array of Objects.
+
+**Object Output:**
+
+Given the following response body:
 ```json
 {
     "a": 0.5,
@@ -130,45 +81,30 @@ mycollector1:
         "c": "some text",
         "d": 0.1,
         "e": 5
-    }
+    },
+    "service": "service01"
 }
 ```
+The following metric is produced:
 
-mycollector2:
-```json
-{
-    "load": 100,
-    "users": 1335
-}
-```
+`httpjson,server=http://localhost:9999/stats/ b_d=0.1,a=0.5,b_e=5,response_time=0.001`
 
-The collected metrics will be:
+Note that only numerical values are extracted and the type is float.
 
-```
-httpjson_mycollector1_a,server='http://my.service.com/_stats' value=0.5
-httpjson_mycollector1_b_d,server='http://my.service.com/_stats' value=0.1
-httpjson_mycollector1_b_e,server='http://my.service.com/_stats' value=5
+If `tag_keys` is included in the configuration:
 
-httpjson_mycollector2_load,server='http://service.net/json/stats' value=100
-httpjson_mycollector2_users,server='http://service.net/json/stats' value=1335
-```
-
-# Example 3, Multiple Metrics in Response:
-
-The response JSON can be treated as an array of data points that are all parsed with the same configuration.
-
-```
+```toml
 [[inputs.httpjson]]
-  name = "mycollector"
-  servers = [
-    "http://my.service.com/_stats"
-  ]
-  # HTTP method to use (case-sensitive)
-  method = "GET"
   tag_keys = ["service"]
 ```
 
-which responds with the following JSON:
+Then the `service` tag will also be added:
+
+`httpjson,server=http://localhost:9999/stats/,service=service01 b_d=0.1,a=0.5,b_e=5,response_time=0.001`
+
+**Array Output:**
+
+If the service returns an array of objects, one metric is be created for each object:
 
 ```json
 [
@@ -193,12 +129,5 @@ which responds with the following JSON:
 ]
 ```
 
-The collected metrics will be:
-```
-httpjson_mycollector_a,service='service01',server='http://my.service.com/_stats' value=0.5
-httpjson_mycollector_b_d,service='service01',server='http://my.service.com/_stats' value=0.1
-httpjson_mycollector_b_e,service='service01',server='http://my.service.com/_stats' value=5
-httpjson_mycollector_a,service='service02',server='http://my.service.com/_stats' value=0.6
-httpjson_mycollector_b_d,service='service02',server='http://my.service.com/_stats' value=0.2
-httpjson_mycollector_b_e,service='service02',server='http://my.service.com/_stats' value=6
-```
+`httpjson,server=http://localhost:9999/stats/,service=service01 a=0.5,b_d=0.1,b_e=5,response_time=0.003`
+`httpjson,server=http://localhost:9999/stats/,service=service02 a=0.6,b_d=0.2,b_e=6,response_time=0.003`
diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index 89bfccf77..8bfe22bff 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -73,7 +73,10 @@ var sampleConfig = `
   ## NOTE This plugin only reads numerical measurements, strings and booleans
   ## will be ignored.
 
-  ## a name for the service being polled
+  ## Name for the service being polled.  Will be appended to the name of the
+  ## measurement e.g. httpjson_webserver_stats
+  ##
+  ## Deprecated (1.3.0): Use name_override, name_suffix, name_prefix instead.
   name = "webserver_stats"
 
   ## URL of each server in the service's cluster
@@ -93,12 +96,14 @@ var sampleConfig = `
   #   "my_tag_2"
   # ]
 
-  ## HTTP parameters (all values must be strings)
-  [inputs.httpjson.parameters]
-    event_type = "cpu_spike"
-    threshold = "0.75"
+  ## HTTP parameters (all values must be strings).  For "GET" requests, data
+  ## will be included in the query.  For "POST" requests, data will be included
+  ## in the request body as "x-www-form-urlencoded".
+  # [inputs.httpjson.parameters]
+  #   event_type = "cpu_spike"
+  #   threshold = "0.75"
 
-  ## HTTP Header parameters (all values must be strings)
+  ## HTTP Headers (all values must be strings)
   # [inputs.httpjson.headers]
   #   X-Auth-Token = "my-xauth-token"
   #   apiVersion = "v1"

From 5ffc9fd379bcce9185346decf89fd1eab3b64d5e Mon Sep 17 00:00:00 2001
From: James <james-lawrence@users.noreply.github.com>
Date: Tue, 4 Apr 2017 20:37:44 -0400
Subject: [PATCH 0182/1302] fix postgresql connection leak (#2611)

---
 CHANGELOG.md                                  |  2 +-
 Godeps                                        |  2 +-
 plugins/inputs/postgresql/connect.go          | 22 ----------------
 plugins/inputs/postgresql/postgresql.go       | 16 ++++++++----
 .../postgresql_extensible.go                  | 25 +++++++++++--------
 5 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7da095d4..043a51a69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,7 +92,7 @@ be deprecated eventually.
 - [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
 - [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
 - [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
-
+- [#2410](https://github.com/influxdata/telegraf/issues/2410): Fix connection leak in postgresql.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/Godeps b/Godeps
index 9717cec2f..ab72be8f2 100644
--- a/Godeps
+++ b/Godeps
@@ -24,7 +24,7 @@ github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/influxdata/tail e9ef7e826dafcb3093b40b989fefa90eeb9a8ca1
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c
+github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
diff --git a/plugins/inputs/postgresql/connect.go b/plugins/inputs/postgresql/connect.go
index 77858cda2..011ae32e0 100644
--- a/plugins/inputs/postgresql/connect.go
+++ b/plugins/inputs/postgresql/connect.go
@@ -1,15 +1,11 @@
 package postgresql
 
 import (
-	"database/sql"
 	"fmt"
 	"net"
 	"net/url"
 	"sort"
 	"strings"
-
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/stdlib"
 )
 
 // pulled from lib/pq
@@ -79,21 +75,3 @@ func ParseURL(uri string) (string, error) {
 	sort.Strings(kvs) // Makes testing easier (not a performance concern)
 	return strings.Join(kvs, " "), nil
 }
-
-func Connect(address string) (*sql.DB, error) {
-	if strings.HasPrefix(address, "postgres://") || strings.HasPrefix(address, "postgresql://") {
-		return sql.Open("pgx", address)
-	}
-
-	config, err := pgx.ParseDSN(address)
-	if err != nil {
-		return nil, err
-	}
-
-	pool, err := pgx.NewConnPool(pgx.ConnPoolConfig{ConnConfig: config})
-	if err != nil {
-		return nil, err
-	}
-
-	return stdlib.OpenFromConnPool(pool)
-}
diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go
index 7c854dfd3..832c433ed 100644
--- a/plugins/inputs/postgresql/postgresql.go
+++ b/plugins/inputs/postgresql/postgresql.go
@@ -2,11 +2,15 @@ package postgresql
 
 import (
 	"bytes"
+	"database/sql"
 	"fmt"
 	"regexp"
 	"sort"
 	"strings"
 
+	// register in driver.
+	_ "github.com/jackc/pgx/stdlib"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -62,17 +66,19 @@ func (p *Postgresql) IgnoredColumns() map[string]bool {
 var localhost = "host=localhost sslmode=disable"
 
 func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
-	var query string
+	var (
+		err   error
+		db    *sql.DB
+		query string
+	)
 
 	if p.Address == "" || p.Address == "localhost" {
 		p.Address = localhost
 	}
 
-	db, err := Connect(p.Address)
-	if err != nil {
+	if db, err = sql.Open("pgx", p.Address); err != nil {
 		return err
 	}
-
 	defer db.Close()
 
 	if len(p.Databases) == 0 && len(p.IgnoredDatabases) == 0 {
@@ -107,7 +113,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			return err
 		}
 	}
-	//return rows.Err()
+
 	query = `SELECT * FROM pg_stat_bgwriter`
 
 	bg_writer_row, err := db.Query(query)
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 00729bf75..b8d3be625 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -2,11 +2,15 @@ package postgresql_extensible
 
 import (
 	"bytes"
+	"database/sql"
 	"fmt"
 	"log"
 	"regexp"
 	"strings"
 
+	// register in driver.
+	_ "github.com/jackc/pgx/stdlib"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
@@ -112,23 +116,24 @@ func (p *Postgresql) IgnoredColumns() map[string]bool {
 var localhost = "host=localhost sslmode=disable"
 
 func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
-
-	var sql_query string
-	var query_addon string
-	var db_version int
-	var query string
-	var tag_value string
-	var meas_name string
+	var (
+		err         error
+		db          *sql.DB
+		sql_query   string
+		query_addon string
+		db_version  int
+		query       string
+		tag_value   string
+		meas_name   string
+	)
 
 	if p.Address == "" || p.Address == "localhost" {
 		p.Address = localhost
 	}
 
-	db, err := postgresql.Connect(p.Address)
-	if err != nil {
+	if db, err = sql.Open("pgx", p.Address); err != nil {
 		return err
 	}
-
 	defer db.Close()
 
 	// Retreiving the database version

From c9f8308f27aa849332f08acf1930a0781849d882 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Thu, 6 Apr 2017 12:06:08 -0700
Subject: [PATCH 0183/1302] Update filtering documentation (#2631)

---
 docs/CONFIGURATION.md | 57 +++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index ff4814b82..ad6e903fc 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -124,31 +124,40 @@ is not specified then processor execution order will be random.
 Filters can be configured per input, output, processor, or aggregator,
 see below for examples.
 
-* **namepass**: An array of strings that is used to filter metrics generated by the
-current input. Each string in the array is tested as a glob match against
-measurement names and if it matches, the field is emitted.
-* **namedrop**: The inverse of pass, if a measurement name matches, it is not emitted.
-* **fieldpass**: An array of strings that is used to filter metrics generated by the
-current input. Each string in the array is tested as a glob match against field names
-and if it matches, the field is emitted. fieldpass is not available for outputs.
-* **fielddrop**: The inverse of pass, if a field name matches, it is not emitted.
-fielddrop is not available for outputs.
-* **tagpass**: tag names and arrays of strings that are used to filter
-measurements by the current input. Each string in the array is tested as a glob
-match against the tag name, and if it matches the measurement is emitted.
-* **tagdrop**: The inverse of tagpass. If a tag matches, the measurement is not
-emitted. This is tested on measurements that have passed the tagpass test.
-* **tagexclude**: tagexclude can be used to exclude a tag from measurement(s).
-As opposed to tagdrop, which will drop an entire measurement based on it's
-tags, tagexclude simply strips the given tag keys from the measurement. This
-can be used on inputs & outputs, but it is _recommended_ to be used on inputs,
-as it is more efficient to filter out tags at the ingestion point.
-* **taginclude**: taginclude is the inverse of tagexclude. It will only include
-the tag keys in the final measurement.
+* **namepass**:
+An array of glob pattern strings.  Only points whose measurement name matches
+a pattern in this list are emitted.
+* **namedrop**:
+The inverse of `namepass`.  If a match is found the point is discarded. This
+is tested on points after they have passed the `namepass` test.
+* **fieldpass**:
+An array of glob pattern strings.  Only fields whose field key matches a
+pattern in this list are emitted.  Not available for outputs.
+* **fielddrop**:
+The inverse of `fieldpass`. Fields with a field key matching one of the
+patterns will be discarded from the point.  Not available for outputs.
+* **tagpass**:
+A table mapping tag keys to arrays of glob pattern strings.  Only points
+that contain a tag key in the table and a tag value matching one of its
+patterns is emitted.
+* **tagdrop**:
+The inverse of `tagpass`.  If a match is found the point is discarded. This
+is tested on points after they have passed the `tagpass` test.
+* **taginclude**:
+An array of glob pattern strings.  Only tags with a tag key matching one of
+the patterns are emitted.  In contrast to `tagpass`, which will pass an entire
+point based on its tag, `taginclude` removes all non matching tags from the
+point.  This filter can be used on both inputs & outputs, but it is
+_recommended_ to be used on inputs, as it is more efficient to filter out tags
+at the ingestion point.
+* **tagexclude**:
+The inverse of `taginclude`. Tags with a tag key matching one of the patterns
+will be discarded from the point.
 
-**NOTE** `tagpass` and `tagdrop` parameters must be defined at the _end_ of
-the plugin definition, otherwise subsequent plugin config options will be
-interpreted as part of the tagpass/tagdrop map.
+**NOTE** Due to the way TOML is parsed, `tagpass` and `tagdrop` parameters
+must be defined at the _end_ of the plugin definition, otherwise subsequent
+plugin config options will be interpreted as part of the tagpass/tagdrop
+tables.
 
 #### Input Configuration Examples
 

From 92fa20cef2da6c502c93bf5b1607c7ef9bca5742 Mon Sep 17 00:00:00 2001
From: Victor Yunevich <v.t.g.m.b.x@gmail.com>
Date: Fri, 7 Apr 2017 00:40:34 +0300
Subject: [PATCH 0184/1302] ipmi_sensor: allow @ symbol in password (#2633)

---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/ipmi_sensor/connection.go      |  2 +-
 plugins/inputs/ipmi_sensor/connection_test.go | 42 +++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/ipmi_sensor/connection_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043a51a69..333963bd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ be deprecated eventually.
 
 ### Bugfixes
 
+- [#2633](https://github.com/influxdata/telegraf/pull/2633): ipmi_sensor: allow @ symbol in password
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 - [#2318](https://github.com/influxdata/telegraf/issues/2318): haproxy input - Add missing fields.
diff --git a/plugins/inputs/ipmi_sensor/connection.go b/plugins/inputs/ipmi_sensor/connection.go
index 432b4aa02..b93cda7d4 100644
--- a/plugins/inputs/ipmi_sensor/connection.go
+++ b/plugins/inputs/ipmi_sensor/connection.go
@@ -18,7 +18,7 @@ type Connection struct {
 
 func NewConnection(server string) *Connection {
 	conn := &Connection{}
-	inx1 := strings.Index(server, "@")
+	inx1 := strings.LastIndex(server, "@")
 	inx2 := strings.Index(server, "(")
 	inx3 := strings.Index(server, ")")
 
diff --git a/plugins/inputs/ipmi_sensor/connection_test.go b/plugins/inputs/ipmi_sensor/connection_test.go
new file mode 100644
index 000000000..13a62061d
--- /dev/null
+++ b/plugins/inputs/ipmi_sensor/connection_test.go
@@ -0,0 +1,42 @@
+package ipmi_sensor
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type conTest struct {
+	Got  string
+	Want *Connection
+}
+
+func TestNewConnection(t *testing.T) {
+	testData := []struct {
+		addr string
+		con  *Connection
+	}{
+		{
+			"USERID:PASSW0RD@lan(192.168.1.1)",
+			&Connection{
+				Hostname:  "192.168.1.1",
+				Username:  "USERID",
+				Password:  "PASSW0RD",
+				Interface: "lan",
+			},
+		},
+		{
+			"USERID:PASS:!@#$%^&*(234)_+W0RD@lan(192.168.1.1)",
+			&Connection{
+				Hostname:  "192.168.1.1",
+				Username:  "USERID",
+				Password:  "PASS:!@#$%^&*(234)_+W0RD",
+				Interface: "lan",
+			},
+		},
+	}
+
+	for _, v := range testData {
+		assert.Equal(t, v.con, NewConnection(v.addr))
+	}
+}

From 7cc4ca23418b2ccb8caa96dc1f10125d7b6a0e8d Mon Sep 17 00:00:00 2001
From: Rajaseelan Ganeswaran <rajaseelan@users.noreply.github.com>
Date: Fri, 7 Apr 2017 05:44:02 +0800
Subject: [PATCH 0185/1302] Add sample config stanza for CPU (#2620)

---
 plugins/inputs/system/CPU_README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/inputs/system/CPU_README.md b/plugins/inputs/system/CPU_README.md
index 26eb7ffbe..01d57855b 100644
--- a/plugins/inputs/system/CPU_README.md
+++ b/plugins/inputs/system/CPU_README.md
@@ -4,6 +4,18 @@
 - **totalcpu** boolean: If true, include `cpu-total` data
 - **percpu** boolean: If true, include data on a per-cpu basis `cpu0, cpu1, etc.`
 
+
+##### Configuration:
+```
+[[inputs.cpu]]
+  ## Whether to report per-cpu stats or not
+  percpu = true
+  ## Whether to report total system cpu stats or not
+  totalcpu = true
+  ## If true, collect raw CPU time metrics.
+  collect_cpu_time = false
+```
+
 #### Description
 
 The CPU plugin collects standard CPU metrics as defined in `man proc`. All

From aa722fac9b6585069d405a9bc1772d4900d971b0 Mon Sep 17 00:00:00 2001
From: Vladimir S <vlasad@gmail.com>
Date: Sat, 8 Apr 2017 01:39:43 +0300
Subject: [PATCH 0186/1302] Add dmcache input plugin (#1667)

---
 CHANGELOG.md                               |   1 +
 plugins/inputs/all/all.go                  |   1 +
 plugins/inputs/dmcache/README.md           |  47 +++++
 plugins/inputs/dmcache/dmcache.go          |  33 ++++
 plugins/inputs/dmcache/dmcache_linux.go    | 190 +++++++++++++++++++++
 plugins/inputs/dmcache/dmcache_notlinux.go |  15 ++
 plugins/inputs/dmcache/dmcache_test.go     | 169 ++++++++++++++++++
 7 files changed, 456 insertions(+)
 create mode 100644 plugins/inputs/dmcache/README.md
 create mode 100644 plugins/inputs/dmcache/dmcache.go
 create mode 100644 plugins/inputs/dmcache/dmcache_linux.go
 create mode 100644 plugins/inputs/dmcache/dmcache_notlinux.go
 create mode 100644 plugins/inputs/dmcache/dmcache_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 333963bd5..46d8b57d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ be deprecated eventually.
 - [#2587](https://github.com/influxdata/telegraf/pull/2587): Add json timestamp units configurability
 - [#2597](https://github.com/influxdata/telegraf/issues/2597): Add support for Linux sysctl-fs metrics.
 - [#2425](https://github.com/influxdata/telegraf/pull/2425): Support to include/exclude docker container labels as tags
+- [#1667](https://github.com/influxdata/telegraf/pull/1667): dmcache input plugin
 
 ### Bugfixes
 
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index a9147c53e..983179e90 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -15,6 +15,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
+	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
 	_ "github.com/influxdata/telegraf/plugins/inputs/docker"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dovecot"
diff --git a/plugins/inputs/dmcache/README.md b/plugins/inputs/dmcache/README.md
new file mode 100644
index 000000000..536d3f518
--- /dev/null
+++ b/plugins/inputs/dmcache/README.md
@@ -0,0 +1,47 @@
+# DMCache Input Plugin
+
+This plugin provide a native collection for dmsetup based statistics for dm-cache.
+
+This plugin requires sudo, that is why you should setup and be sure that the telegraf is able to execute sudo without a password.
+
+`sudo /sbin/dmsetup status --target cache` is the full command that telegraf will run for debugging purposes.
+
+### Configuration
+
+```toml
+[[inputs.dmcache]]
+  ## Whether to report per-device stats or not
+  per_device = true
+```
+
+### Measurements & Fields:
+
+- dmcache
+    - length
+    - target
+    - metadata_blocksize
+    - metadata_used
+    - metadata_total
+    - cache_blocksize
+    - cache_used
+    - cache_total
+    - read_hits
+    - read_misses
+    - write_hits
+    - write_misses
+    - demotions
+    - promotions
+    - dirty
+
+### Tags:
+
+- All measurements have the following tags:
+    - device
+
+### Example Output:
+
+```
+$ ./telegraf --test --config /etc/telegraf/telegraf.conf --input-filter dmcache
+* Plugin: inputs.dmcache, Collection 1
+> dmcache,device=example cache_blocksize=0i,read_hits=995134034411520i,read_misses=916807089127424i,write_hits=195107267543040i,metadata_used=12861440i,write_misses=563725346013184i,promotions=3265223720960i,dirty=0i,metadata_blocksize=0i,cache_used=1099511627776ii,cache_total=0i,length=0i,metadata_total=1073741824i,demotions=3265223720960i 1491482035000000000
+```
diff --git a/plugins/inputs/dmcache/dmcache.go b/plugins/inputs/dmcache/dmcache.go
new file mode 100644
index 000000000..25a398194
--- /dev/null
+++ b/plugins/inputs/dmcache/dmcache.go
@@ -0,0 +1,33 @@
+package dmcache
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type DMCache struct {
+	PerDevice        bool `toml:"per_device"`
+	getCurrentStatus func() ([]string, error)
+}
+
+var sampleConfig = `
+  ## Whether to report per-device stats or not
+  per_device = true
+`
+
+func (c *DMCache) SampleConfig() string {
+	return sampleConfig
+}
+
+func (c *DMCache) Description() string {
+	return "Provide a native collection for dmsetup based statistics for dm-cache"
+}
+
+func init() {
+	inputs.Add("dmcache", func() telegraf.Input {
+		return &DMCache{
+			PerDevice:        true,
+			getCurrentStatus: dmSetupStatus,
+		}
+	})
+}
diff --git a/plugins/inputs/dmcache/dmcache_linux.go b/plugins/inputs/dmcache/dmcache_linux.go
new file mode 100644
index 000000000..7ac1c96ca
--- /dev/null
+++ b/plugins/inputs/dmcache/dmcache_linux.go
@@ -0,0 +1,190 @@
+// +build linux
+
+package dmcache
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"errors"
+
+	"github.com/influxdata/telegraf"
+)
+
+const metricName = "dmcache"
+
+type cacheStatus struct {
+	device            string
+	length            int
+	target            string
+	metadataBlocksize int
+	metadataUsed      int
+	metadataTotal     int
+	cacheBlocksize    int
+	cacheUsed         int
+	cacheTotal        int
+	readHits          int
+	readMisses        int
+	writeHits         int
+	writeMisses       int
+	demotions         int
+	promotions        int
+	dirty             int
+}
+
+func (c *DMCache) Gather(acc telegraf.Accumulator) error {
+	outputLines, err := c.getCurrentStatus()
+	if err != nil {
+		return err
+	}
+
+	totalStatus := cacheStatus{}
+
+	for _, s := range outputLines {
+		status, err := parseDMSetupStatus(s)
+		if err != nil {
+			return err
+		}
+
+		if c.PerDevice {
+			tags := map[string]string{"device": status.device}
+			acc.AddFields(metricName, toFields(status), tags)
+		}
+		aggregateStats(&totalStatus, status)
+	}
+
+	acc.AddFields(metricName, toFields(totalStatus), map[string]string{"device": "all"})
+
+	return nil
+}
+
+func parseDMSetupStatus(line string) (cacheStatus, error) {
+	var err error
+	parseError := errors.New("Output from dmsetup could not be parsed")
+	status := cacheStatus{}
+	values := strings.Fields(line)
+	if len(values) < 15 {
+		return cacheStatus{}, parseError
+	}
+
+	status.device = strings.TrimRight(values[0], ":")
+	status.length, err = strconv.Atoi(values[2])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.target = values[3]
+	status.metadataBlocksize, err = strconv.Atoi(values[4])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	metadata := strings.Split(values[5], "/")
+	if len(metadata) != 2 {
+		return cacheStatus{}, parseError
+	}
+	status.metadataUsed, err = strconv.Atoi(metadata[0])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.metadataTotal, err = strconv.Atoi(metadata[1])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.cacheBlocksize, err = strconv.Atoi(values[6])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	cache := strings.Split(values[7], "/")
+	if len(cache) != 2 {
+		return cacheStatus{}, parseError
+	}
+	status.cacheUsed, err = strconv.Atoi(cache[0])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.cacheTotal, err = strconv.Atoi(cache[1])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.readHits, err = strconv.Atoi(values[8])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.readMisses, err = strconv.Atoi(values[9])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.writeHits, err = strconv.Atoi(values[10])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.writeMisses, err = strconv.Atoi(values[11])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.demotions, err = strconv.Atoi(values[12])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.promotions, err = strconv.Atoi(values[13])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+	status.dirty, err = strconv.Atoi(values[14])
+	if err != nil {
+		return cacheStatus{}, err
+	}
+
+	return status, nil
+}
+
+func aggregateStats(totalStatus *cacheStatus, status cacheStatus) {
+	totalStatus.length += status.length
+	totalStatus.metadataBlocksize += status.metadataBlocksize
+	totalStatus.metadataUsed += status.metadataUsed
+	totalStatus.metadataTotal += status.metadataTotal
+	totalStatus.cacheBlocksize += status.cacheBlocksize
+	totalStatus.cacheUsed += status.cacheUsed
+	totalStatus.cacheTotal += status.cacheTotal
+	totalStatus.readHits += status.readHits
+	totalStatus.readMisses += status.readMisses
+	totalStatus.writeHits += status.writeHits
+	totalStatus.writeMisses += status.writeMisses
+	totalStatus.demotions += status.demotions
+	totalStatus.promotions += status.promotions
+	totalStatus.dirty += status.dirty
+}
+
+func toFields(status cacheStatus) map[string]interface{} {
+	fields := make(map[string]interface{})
+	fields["length"] = status.length
+	fields["metadata_blocksize"] = status.metadataBlocksize
+	fields["metadata_used"] = status.metadataUsed
+	fields["metadata_total"] = status.metadataTotal
+	fields["cache_blocksize"] = status.cacheBlocksize
+	fields["cache_used"] = status.cacheUsed
+	fields["cache_total"] = status.cacheTotal
+	fields["read_hits"] = status.readHits
+	fields["read_misses"] = status.readMisses
+	fields["write_hits"] = status.writeHits
+	fields["write_misses"] = status.writeMisses
+	fields["demotions"] = status.demotions
+	fields["promotions"] = status.promotions
+	fields["dirty"] = status.dirty
+	return fields
+}
+
+func dmSetupStatus() ([]string, error) {
+	out, err := exec.Command("/bin/sh", "-c", "sudo /sbin/dmsetup status --target cache").Output()
+	if err != nil {
+		return nil, err
+	}
+	if string(out) == "No devices found\n" {
+		return []string{}, nil
+	}
+
+	outString := strings.TrimRight(string(out), "\n")
+	status := strings.Split(outString, "\n")
+
+	return status, nil
+}
diff --git a/plugins/inputs/dmcache/dmcache_notlinux.go b/plugins/inputs/dmcache/dmcache_notlinux.go
new file mode 100644
index 000000000..ee1065638
--- /dev/null
+++ b/plugins/inputs/dmcache/dmcache_notlinux.go
@@ -0,0 +1,15 @@
+// +build !linux
+
+package dmcache
+
+import (
+	"github.com/influxdata/telegraf"
+)
+
+func (c *DMCache) Gather(acc telegraf.Accumulator) error {
+	return nil
+}
+
+func dmSetupStatus() ([]string, error) {
+	return []string{}, nil
+}
diff --git a/plugins/inputs/dmcache/dmcache_test.go b/plugins/inputs/dmcache/dmcache_test.go
new file mode 100644
index 000000000..c5989c413
--- /dev/null
+++ b/plugins/inputs/dmcache/dmcache_test.go
@@ -0,0 +1,169 @@
+package dmcache
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	measurement              = "dmcache"
+	badFormatOutput          = []string{"cs-1: 0 4883791872 cache 8 1018/1501122 512 7/464962 139 352643 "}
+	good2DevicesFormatOutput = []string{
+		"cs-1: 0 4883791872 cache 8 1018/1501122 512 7/464962 139 352643 15 46 0 7 0 1 writeback 2 migration_threshold 2048 mq 10 random_threshold 4 sequential_threshold 512 discard_promote_adjustment 1 read_promote_adjustment 4 write_promote_adjustment 8",
+		"cs-2: 0 4294967296 cache 8 72352/1310720 128 26/24327168 2409 286 265 524682 0 0 0 1 writethrough 2 migration_threshold 2048 mq 10 random_threshold 4 sequential_threshold 512 discard_promote_adjustment 1 read_promote_adjustment 4 write_promote_adjustment 8",
+	}
+)
+
+func TestPerDeviceGoodOutput(t *testing.T) {
+	var acc testutil.Accumulator
+	var plugin = &DMCache{
+		PerDevice: true,
+		getCurrentStatus: func() ([]string, error) {
+			return good2DevicesFormatOutput, nil
+		},
+	}
+
+	err := plugin.Gather(&acc)
+	require.NoError(t, err)
+
+	tags1 := map[string]string{
+		"device": "cs-1",
+	}
+	fields1 := map[string]interface{}{
+		"length":             4883791872,
+		"metadata_blocksize": 8,
+		"metadata_used":      1018,
+		"metadata_total":     1501122,
+		"cache_blocksize":    512,
+		"cache_used":         7,
+		"cache_total":        464962,
+		"read_hits":          139,
+		"read_misses":        352643,
+		"write_hits":         15,
+		"write_misses":       46,
+		"demotions":          0,
+		"promotions":         7,
+		"dirty":              0,
+	}
+	acc.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	tags2 := map[string]string{
+		"device": "cs-2",
+	}
+	fields2 := map[string]interface{}{
+		"length":             4294967296,
+		"metadata_blocksize": 8,
+		"metadata_used":      72352,
+		"metadata_total":     1310720,
+		"cache_blocksize":    128,
+		"cache_used":         26,
+		"cache_total":        24327168,
+		"read_hits":          2409,
+		"read_misses":        286,
+		"write_hits":         265,
+		"write_misses":       524682,
+		"demotions":          0,
+		"promotions":         0,
+		"dirty":              0,
+	}
+	acc.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+
+	tags3 := map[string]string{
+		"device": "all",
+	}
+
+	fields3 := map[string]interface{}{
+		"length":             9178759168,
+		"metadata_blocksize": 16,
+		"metadata_used":      73370,
+		"metadata_total":     2811842,
+		"cache_blocksize":    640,
+		"cache_used":         33,
+		"cache_total":        24792130,
+		"read_hits":          2548,
+		"read_misses":        352929,
+		"write_hits":         280,
+		"write_misses":       524728,
+		"demotions":          0,
+		"promotions":         7,
+		"dirty":              0,
+	}
+	acc.AssertContainsTaggedFields(t, measurement, fields3, tags3)
+}
+
+func TestNotPerDeviceGoodOutput(t *testing.T) {
+	var acc testutil.Accumulator
+	var plugin = &DMCache{
+		PerDevice: false,
+		getCurrentStatus: func() ([]string, error) {
+			return good2DevicesFormatOutput, nil
+		},
+	}
+
+	err := plugin.Gather(&acc)
+	require.NoError(t, err)
+
+	tags := map[string]string{
+		"device": "all",
+	}
+
+	fields := map[string]interface{}{
+		"length":             9178759168,
+		"metadata_blocksize": 16,
+		"metadata_used":      73370,
+		"metadata_total":     2811842,
+		"cache_blocksize":    640,
+		"cache_used":         33,
+		"cache_total":        24792130,
+		"read_hits":          2548,
+		"read_misses":        352929,
+		"write_hits":         280,
+		"write_misses":       524728,
+		"demotions":          0,
+		"promotions":         7,
+		"dirty":              0,
+	}
+	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
+}
+
+func TestNoDevicesOutput(t *testing.T) {
+	var acc testutil.Accumulator
+	var plugin = &DMCache{
+		PerDevice: true,
+		getCurrentStatus: func() ([]string, error) {
+			return []string{}, nil
+		},
+	}
+
+	err := plugin.Gather(&acc)
+	require.NoError(t, err)
+}
+
+func TestErrorDuringGettingStatus(t *testing.T) {
+	var acc testutil.Accumulator
+	var plugin = &DMCache{
+		PerDevice: true,
+		getCurrentStatus: func() ([]string, error) {
+			return nil, errors.New("dmsetup doesn't exist")
+		},
+	}
+
+	err := plugin.Gather(&acc)
+	require.Error(t, err)
+}
+
+func TestBadFormatOfStatus(t *testing.T) {
+	var acc testutil.Accumulator
+	var plugin = &DMCache{
+		PerDevice: true,
+		getCurrentStatus: func() ([]string, error) {
+			return badFormatOutput, nil
+		},
+	}
+
+	err := plugin.Gather(&acc)
+	require.Error(t, err)
+}

From 07c428ef89e225a480a7835f32890f4db3cd534d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Apr 2017 14:33:17 -0700
Subject: [PATCH 0187/1302] Use random port in http_listener tests

---
 plugins/inputs/http_listener/http_listener.go |  2 +
 .../http_listener/http_listener_test.go       | 59 +++++++++++--------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 0f426f809..f0ad5752e 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -35,6 +35,7 @@ type HTTPListener struct {
 	WriteTimeout   internal.Duration
 	MaxBodySize    int64
 	MaxLineSize    int
+	Port           int
 
 	mu sync.Mutex
 	wg sync.WaitGroup
@@ -124,6 +125,7 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 		return err
 	}
 	h.listener = listener
+	h.Port = listener.Addr().(*net.TCPAddr).Port
 
 	h.wg.Add(1)
 	go func() {
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 7e6fbc8ab..41c0e9db8 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"io/ioutil"
 	"net/http"
+	"net/url"
+	"strconv"
 	"sync"
 	"testing"
 
@@ -30,11 +32,21 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 
 func newTestHTTPListener() *HTTPListener {
 	listener := &HTTPListener{
-		ServiceAddress: ":8186",
+		ServiceAddress: ":0",
 	}
 	return listener
 }
 
+func createURL(listener *HTTPListener, path string, rawquery string) string {
+	u := url.URL{
+		Scheme:   "http",
+		Host:     "localhost:" + strconv.Itoa(listener.Port),
+		Path:     path,
+		RawQuery: rawquery,
+	}
+	return u.String()
+}
+
 func TestWriteHTTP(t *testing.T) {
 	listener := newTestHTTPListener()
 
@@ -43,7 +55,7 @@ func TestWriteHTTP(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsg)))
+	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
@@ -54,7 +66,7 @@ func TestWriteHTTP(t *testing.T) {
 	)
 
 	// post multiple message to listener
-	resp, err = http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgs)))
+	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
@@ -69,7 +81,7 @@ func TestWriteHTTP(t *testing.T) {
 	}
 
 	// Post a gigantic metric to the listener and verify that an error is returned:
-	resp, err = http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	require.EqualValues(t, 400, resp.StatusCode)
 
@@ -89,7 +101,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgNoNewline)))
+	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
@@ -102,7 +114,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 
 func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":8296",
+		ServiceAddress: ":0",
 		MaxLineSize:    128 * 1000,
 	}
 
@@ -111,14 +123,14 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	defer listener.Stop()
 
 	// Post a gigantic metric to the listener and verify that it writes OK this time:
-	resp, err := http.Post("http://localhost:8296/write?db=mydb", "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
 func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":8297",
+		ServiceAddress: ":0",
 		MaxBodySize:    4096,
 	}
 
@@ -126,14 +138,14 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post("http://localhost:8297/write", "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	require.EqualValues(t, 413, resp.StatusCode)
 }
 
 func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":8298",
+		ServiceAddress: ":0",
 		MaxLineSize:    70,
 	}
 
@@ -141,7 +153,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post("http://localhost:8298/write", "", bytes.NewBuffer([]byte(testMsgs)))
+	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 
@@ -158,7 +170,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 
 func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":8300",
+		ServiceAddress: ":0",
 		MaxLineSize:    100,
 	}
 
@@ -166,7 +178,7 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post("http://localhost:8300/write", "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
+	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
 	require.NoError(t, err)
 	require.EqualValues(t, 400, resp.StatusCode)
 
@@ -183,9 +195,7 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 
 // test that writing gzipped data works
 func TestWriteHTTPGzippedData(t *testing.T) {
-	listener := &HTTPListener{
-		ServiceAddress: ":8299",
-	}
+	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -194,7 +204,7 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 	data, err := ioutil.ReadFile("./testdata/testmsgs.gz")
 	require.NoError(t, err)
 
-	req, err := http.NewRequest("POST", "http://localhost:8299/write", bytes.NewBuffer(data))
+	req, err := http.NewRequest("POST", createURL(listener, "/write", ""), bytes.NewBuffer(data))
 	require.NoError(t, err)
 	req.Header.Set("Content-Encoding", "gzip")
 
@@ -216,7 +226,7 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 
 // writes 25,000 metrics to the listener with 10 different writers
 func TestWriteHTTPHighTraffic(t *testing.T) {
-	listener := &HTTPListener{ServiceAddress: ":8286"}
+	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
@@ -229,7 +239,7 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 		go func(innerwg *sync.WaitGroup) {
 			defer innerwg.Done()
 			for i := 0; i < 500; i++ {
-				resp, err := http.Post("http://localhost:8286/write?db=mydb", "", bytes.NewBuffer([]byte(testMsgs)))
+				resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 				require.NoError(t, err)
 				require.EqualValues(t, 204, resp.StatusCode)
 			}
@@ -251,7 +261,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post("http://localhost:8186/foobar", "", bytes.NewBuffer([]byte(testMsg)))
+	resp, err := http.Post(createURL(listener, "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
 	require.EqualValues(t, 404, resp.StatusCode)
 }
@@ -264,7 +274,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(badMsg)))
+	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg)))
 	require.NoError(t, err)
 	require.EqualValues(t, 400, resp.StatusCode)
 }
@@ -277,7 +287,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post("http://localhost:8186/write?db=mydb", "", bytes.NewBuffer([]byte(emptyMsg)))
+	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg)))
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 }
@@ -290,12 +300,13 @@ func TestQueryAndPingHTTP(t *testing.T) {
 	defer listener.Stop()
 
 	// post query to listener
-	resp, err := http.Post("http://localhost:8186/query?db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22", "", nil)
+	resp, err := http.Post(
+		createURL(listener, "/query", "db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22"), "", nil)
 	require.NoError(t, err)
 	require.EqualValues(t, 200, resp.StatusCode)
 
 	// post ping to listener
-	resp, err = http.Post("http://localhost:8186/ping", "", nil)
+	resp, err = http.Post(createURL(listener, "/ping", ""), "", nil)
 	require.NoError(t, err)
 	require.EqualValues(t, 204, resp.StatusCode)
 }

From 62b5c1f7e765c80a1c1d95c91b964207ef4d5dde Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Mon, 10 Apr 2017 16:39:40 -0700
Subject: [PATCH 0188/1302] Add support for precision in http_listener (#2644)

---
 CHANGELOG.md                                  |  1 +
 metric/parse.go                               | 50 +++++++++++++++++--
 metric/parse_test.go                          | 21 ++++++++
 plugins/inputs/http_listener/README.md        | 11 +++-
 plugins/inputs/http_listener/http_listener.go | 12 +++--
 .../http_listener/http_listener_test.go       | 19 +++++++
 plugins/parsers/influx/parser.go              |  6 +--
 7 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46d8b57d5..9aab18fcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ be deprecated eventually.
 - [#2597](https://github.com/influxdata/telegraf/issues/2597): Add support for Linux sysctl-fs metrics.
 - [#2425](https://github.com/influxdata/telegraf/pull/2425): Support to include/exclude docker container labels as tags
 - [#1667](https://github.com/influxdata/telegraf/pull/1667): dmcache input plugin
+- [#2637](https://github.com/influxdata/telegraf/issues/2637): Add support for precision in http_listener
 
 ### Bugfixes
 
diff --git a/metric/parse.go b/metric/parse.go
index 15b88e552..92dc4918b 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -40,10 +41,18 @@ const (
 )
 
 func Parse(buf []byte) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTime(buf, time.Now())
+	return ParseWithDefaultTimePrecision(buf, time.Now(), "")
 }
 
 func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+	return ParseWithDefaultTimePrecision(buf, t, "")
+}
+
+func ParseWithDefaultTimePrecision(
+	buf []byte,
+	t time.Time,
+	precision string,
+) ([]telegraf.Metric, error) {
 	if len(buf) == 0 {
 		return []telegraf.Metric{}, nil
 	}
@@ -63,7 +72,7 @@ func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
 			continue
 		}
 
-		m, err := parseMetric(buf[i:i+j], t)
+		m, err := parseMetric(buf[i:i+j], t, precision)
 		if err != nil {
 			i += j + 1 // increment i past the previous newline
 			errStr += " " + err.Error()
@@ -80,7 +89,10 @@ func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
 	return metrics, nil
 }
 
-func parseMetric(buf []byte, defaultTime time.Time) (telegraf.Metric, error) {
+func parseMetric(buf []byte,
+	defaultTime time.Time,
+	precision string,
+) (telegraf.Metric, error) {
 	var dTime string
 	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
 	pos, key, err := scanKey(buf, 0)
@@ -114,9 +126,23 @@ func parseMetric(buf []byte, defaultTime time.Time) (telegraf.Metric, error) {
 		return nil, err
 	}
 
+	// apply precision multiplier
+	var nsec int64
+	multiplier := getPrecisionMultiplier(precision)
+	if multiplier > 1 {
+		tsint, err := parseIntBytes(ts, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+
+		nsec := multiplier * tsint
+		ts = []byte(strconv.FormatInt(nsec, 10))
+	}
+
 	m := &metric{
 		fields: fields,
 		t:      ts,
+		nsec:   nsec,
 	}
 
 	// parse out the measurement name
@@ -628,3 +654,21 @@ func makeError(reason string, buf []byte, i int) error {
 	return fmt.Errorf("metric parsing error, reason: [%s], buffer: [%s], index: [%d]",
 		reason, buf, i)
 }
+
+// getPrecisionMultiplier will return a multiplier for the precision specified.
+func getPrecisionMultiplier(precision string) int64 {
+	d := time.Nanosecond
+	switch precision {
+	case "u":
+		d = time.Microsecond
+	case "ms":
+		d = time.Millisecond
+	case "s":
+		d = time.Second
+	case "m":
+		d = time.Minute
+	case "h":
+		d = time.Hour
+	}
+	return int64(d)
+}
diff --git a/metric/parse_test.go b/metric/parse_test.go
index 40bcf60b8..89ade9f56 100644
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -364,6 +364,27 @@ func TestParseNegativeTimestamps(t *testing.T) {
 	}
 }
 
+func TestParsePrecision(t *testing.T) {
+	for _, tt := range []struct {
+		line      string
+		precision string
+		expected  int64
+	}{
+		{"test v=42 1491847420", "s", 1491847420000000000},
+		{"test v=42 1491847420123", "ms", 1491847420123000000},
+		{"test v=42 1491847420123456", "u", 1491847420123456000},
+		{"test v=42 1491847420123456789", "ns", 1491847420123456789},
+
+		{"test v=42 1491847420123456789", "1s", 1491847420123456789},
+		{"test v=42 1491847420123456789", "asdf", 1491847420123456789},
+	} {
+		metrics, err := ParseWithDefaultTimePrecision(
+			[]byte(tt.line+"\n"), time.Now(), tt.precision)
+		assert.NoError(t, err, tt)
+		assert.Equal(t, tt.expected, metrics[0].UnixNano())
+	}
+}
+
 func TestParseMaxKeyLength(t *testing.T) {
 	key := ""
 	for {
diff --git a/plugins/inputs/http_listener/README.md b/plugins/inputs/http_listener/README.md
index 9643f6a2e..994df654a 100644
--- a/plugins/inputs/http_listener/README.md
+++ b/plugins/inputs/http_listener/README.md
@@ -2,11 +2,18 @@
 
 The HTTP listener is a service input plugin that listens for messages sent via HTTP POST.
 The plugin expects messages in the InfluxDB line-protocol ONLY, other Telegraf input data formats are not supported.
-The intent of the plugin is to allow Telegraf to serve as a proxy/router for the /write endpoint of the InfluxDB HTTP API.
+The intent of the plugin is to allow Telegraf to serve as a proxy/router for the `/write` endpoint of the InfluxDB HTTP API.
+
+The `/write` endpoint supports the `precision` query parameter and can be set to one of `ns`, `u`, `ms`, `s`, `m`, `h`.  All other parameters are ignored and defer to the output plugins configuration.
+
 When chaining Telegraf instances using this plugin, CREATE DATABASE requests receive a 200 OK response with message body `{"results":[]}` but they are not relayed. The output configuration of the Telegraf instance which ultimately submits data to InfluxDB determines the destination database.
 
 See: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx).
-Example:  curl -i -XPOST 'http://localhost:8186/write' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000'
+
+**Example:**
+```
+curl -i -XPOST 'http://localhost:8186/write' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000'
+```
 
 ### Configuration:
 
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index f0ad5752e..5ef260304 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -207,10 +207,12 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 	}
 	now := time.Now()
 
+	precision := req.URL.Query().Get("precision")
+
 	// Handle gzip request bodies
 	body := req.Body
-	var err error
 	if req.Header.Get("Content-Encoding") == "gzip" {
+		var err error
 		body, err = gzip.NewReader(req.Body)
 		defer body.Close()
 		if err != nil {
@@ -263,7 +265,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 
 		if err == io.ErrUnexpectedEOF {
 			// finished reading the request body
-			if err := h.parse(buf[:n+bufStart], now); err != nil {
+			if err := h.parse(buf[:n+bufStart], now, precision); err != nil {
 				log.Println("E! " + err.Error())
 				return400 = true
 			}
@@ -288,7 +290,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 			bufStart = 0
 			continue
 		}
-		if err := h.parse(buf[:i+1], now); err != nil {
+		if err := h.parse(buf[:i+1], now, precision); err != nil {
 			log.Println("E! " + err.Error())
 			return400 = true
 		}
@@ -301,8 +303,8 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func (h *HTTPListener) parse(b []byte, t time.Time) error {
-	metrics, err := h.parser.ParseWithDefaultTime(b, t)
+func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
+	metrics, err := h.parser.ParseWithDefaultTimePrecision(b, t, precision)
 
 	for _, m := range metrics {
 		h.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 41c0e9db8..654f2f83d 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 
@@ -311,5 +312,23 @@ func TestQueryAndPingHTTP(t *testing.T) {
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
+func TestWriteWithPrecision(t *testing.T) {
+	listener := newTestHTTPListener()
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	msg := "xyzzy value=42 1422568543\n"
+	resp, err := http.Post(
+		createURL(listener, "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg)))
+	require.NoError(t, err)
+	require.EqualValues(t, 204, resp.StatusCode)
+
+	acc.Wait(1)
+	require.Equal(t, 1, len(acc.Metrics))
+	require.Equal(t, time.Unix(0, 1422568543000000000), acc.Metrics[0].Time)
+}
+
 const hugeMetric = `super_long_metric,foo=bar clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i
 `
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index c15c503f7..0abb330e8 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -15,13 +15,13 @@ type InfluxParser struct {
 	DefaultTags map[string]string
 }
 
-func (p *InfluxParser) ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
+func (p *InfluxParser) ParseWithDefaultTimePrecision(buf []byte, t time.Time, precision string) ([]telegraf.Metric, error) {
 	if !bytes.HasSuffix(buf, []byte("\n")) {
 		buf = append(buf, '\n')
 	}
 	// parse even if the buffer begins with a newline
 	buf = bytes.TrimPrefix(buf, []byte("\n"))
-	metrics, err := metric.ParseWithDefaultTime(buf, t)
+	metrics, err := metric.ParseWithDefaultTimePrecision(buf, t, precision)
 	if len(p.DefaultTags) > 0 {
 		for _, m := range metrics {
 			for k, v := range p.DefaultTags {
@@ -41,7 +41,7 @@ func (p *InfluxParser) ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf
 // a non-nil error will be returned in addition to the metrics that parsed
 // successfully.
 func (p *InfluxParser) Parse(buf []byte) ([]telegraf.Metric, error) {
-	return p.ParseWithDefaultTime(buf, time.Now())
+	return p.ParseWithDefaultTimePrecision(buf, time.Now(), "")
 }
 
 func (p *InfluxParser) ParseLine(line string) (telegraf.Metric, error) {

From 516dffa4c4579fffd6a2f757e866707e22272f6f Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 10 Apr 2017 19:45:02 -0400
Subject: [PATCH 0189/1302] set default measurement name on snmp input (#2639)

---
 CHANGELOG.md                | 1 +
 plugins/inputs/snmp/snmp.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aab18fcd..3a1698214 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@ be deprecated eventually.
 - [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
 - [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
 - [#2410](https://github.com/influxdata/telegraf/issues/2410): Fix connection leak in postgresql.
+- [#2628](https://github.com/influxdata/telegraf/issues/2628): Set default measurement name for snmp input.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 5394e57db..2aef729b3 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -314,6 +314,7 @@ func Errorf(err error, msg string, format ...interface{}) error {
 func init() {
 	inputs.Add("snmp", func() telegraf.Input {
 		return &Snmp{
+			Name:           "snmp",
 			Retries:        3,
 			MaxRepetitions: 10,
 			Timeout:        internal.Duration{Duration: 5 * time.Second},

From f55af7d21f7e6f124f69009fb4b9a8ff2c91d52a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Tue, 11 Apr 2017 11:41:09 -0700
Subject: [PATCH 0190/1302] Use name filter for IOCounters in diskio (#2649)

Use IOCountersForNames for disk counters.
---
 CHANGELOG.md                     |  1 +
 Godeps                           |  2 +-
 plugins/inputs/system/disk.go    | 15 +--------------
 plugins/inputs/system/mock_PS.go |  2 +-
 plugins/inputs/system/ps.go      |  6 +++---
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a1698214..12381152c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@ be deprecated eventually.
 - [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
 - [#2410](https://github.com/influxdata/telegraf/issues/2410): Fix connection leak in postgresql.
 - [#2628](https://github.com/influxdata/telegraf/issues/2628): Set default measurement name for snmp input.
+- [#2649](https://github.com/influxdata/telegraf/pull/2649): Improve performance of diskio with many disks
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/Godeps b/Godeps
index ab72be8f2..2e04c0cdd 100644
--- a/Godeps
+++ b/Godeps
@@ -44,7 +44,7 @@ github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
 github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/shirou/gopsutil d371ba1293cb48fedc6850526ea48b3846c54f2c
+github.com/shirou/gopsutil dfbb3e40da8d6fcd1aa0d87003e965fe0ca745ea
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 3f6d83c1c..004466f83 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -125,25 +125,12 @@ func (_ *DiskIOStats) SampleConfig() string {
 }
 
 func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
-	diskio, err := s.ps.DiskIO()
+	diskio, err := s.ps.DiskIO(s.Devices)
 	if err != nil {
 		return fmt.Errorf("error getting disk io info: %s", err)
 	}
 
-	var restrictDevices bool
-	devices := make(map[string]bool)
-	if len(s.Devices) != 0 {
-		restrictDevices = true
-		for _, dev := range s.Devices {
-			devices[dev] = true
-		}
-	}
-
 	for _, io := range diskio {
-		_, member := devices[io.Name]
-		if restrictDevices && !member {
-			continue
-		}
 		tags := map[string]string{}
 		tags["name"] = s.diskName(io.Name)
 		for t, v := range s.diskTags(io.Name) {
diff --git a/plugins/inputs/system/mock_PS.go b/plugins/inputs/system/mock_PS.go
index e9f96a6c7..a83a8b803 100644
--- a/plugins/inputs/system/mock_PS.go
+++ b/plugins/inputs/system/mock_PS.go
@@ -61,7 +61,7 @@ func (m *MockPS) NetProto() ([]net.ProtoCountersStat, error) {
 	return r0, r1
 }
 
-func (m *MockPS) DiskIO() (map[string]disk.IOCountersStat, error) {
+func (m *MockPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
 	ret := m.Called()
 
 	r0 := ret.Get(0).(map[string]disk.IOCountersStat)
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index b0e021e40..d25327812 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -17,7 +17,7 @@ type PS interface {
 	DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.UsageStat, []*disk.PartitionStat, error)
 	NetIO() ([]net.IOCountersStat, error)
 	NetProto() ([]net.ProtoCountersStat, error)
-	DiskIO() (map[string]disk.IOCountersStat, error)
+	DiskIO(names []string) (map[string]disk.IOCountersStat, error)
 	VMStat() (*mem.VirtualMemoryStat, error)
 	SwapStat() (*mem.SwapMemoryStat, error)
 	NetConnections() ([]net.ConnectionStat, error)
@@ -120,8 +120,8 @@ func (s *systemPS) NetConnections() ([]net.ConnectionStat, error) {
 	return net.Connections("all")
 }
 
-func (s *systemPS) DiskIO() (map[string]disk.IOCountersStat, error) {
-	m, err := disk.IOCounters()
+func (s *systemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
+	m, err := disk.IOCountersForNames(names)
 	if err == internal.NotImplementedError {
 		return nil, nil
 	}

From 0193cbee513bbd66b61f36a533241b9b212758fb Mon Sep 17 00:00:00 2001
From: Nick Irvine <nfirvine@nfirvine.com>
Date: Tue, 11 Apr 2017 12:05:39 -0700
Subject: [PATCH 0191/1302] Add max_message_len in kafka_consumer input (#2636)

---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/kafka_consumer/README.md       |  4 +++
 .../inputs/kafka_consumer/kafka_consumer.go   | 31 ++++++++++++-------
 .../kafka_consumer/kafka_consumer_test.go     | 18 +++++++++++
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12381152c..10934f7fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ be deprecated eventually.
 - [#2425](https://github.com/influxdata/telegraf/pull/2425): Support to include/exclude docker container labels as tags
 - [#1667](https://github.com/influxdata/telegraf/pull/1667): dmcache input plugin
 - [#2637](https://github.com/influxdata/telegraf/issues/2637): Add support for precision in http_listener
+- [#2636](https://github.com/influxdata/telegraf/pull/2636): Add `message_len_max` option to `kafka_consumer` input
 
 ### Bugfixes
 
diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index afdb51e32..6a95a7c54 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -28,6 +28,10 @@ from the same topic in parallel.
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
+
+  ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+  ## larger messages are dropped
+  max_message_len = 65536
 ```
 
 ## Testing
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index 6f1f4020b..2f6933db0 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -17,6 +17,7 @@ import (
 type Kafka struct {
 	ConsumerGroup   string
 	Topics          []string
+	MaxMessageLen   int
 	ZookeeperPeers  []string
 	ZookeeperChroot string
 	Consumer        *consumergroup.ConsumerGroup
@@ -58,10 +59,14 @@ var sampleConfig = `
   offset = "oldest"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
+
+  ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+  ## larger messages are dropped
+  max_message_len = 65536
 `
 
 func (k *Kafka) SampleConfig() string {
@@ -130,17 +135,21 @@ func (k *Kafka) receiver() {
 			return
 		case err := <-k.errs:
 			if err != nil {
-				k.acc.AddError(fmt.Errorf("Kafka Consumer Error: %s\n", err))
+				k.acc.AddError(fmt.Errorf("Consumer Error: %s\n", err))
 			}
 		case msg := <-k.in:
-			metrics, err := k.parser.Parse(msg.Value)
-			if err != nil {
-				k.acc.AddError(fmt.Errorf("E! Kafka Message Parse Error\nmessage: %s\nerror: %s",
-					string(msg.Value), err.Error()))
-			}
-
-			for _, metric := range metrics {
-				k.acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
+			if k.MaxMessageLen != 0 && len(msg.Value) > k.MaxMessageLen {
+				k.acc.AddError(fmt.Errorf("Message longer than max_message_len (%d > %d)",
+					len(msg.Value), k.MaxMessageLen))
+			} else {
+				metrics, err := k.parser.Parse(msg.Value)
+				if err != nil {
+					k.acc.AddError(fmt.Errorf("Message Parse Error\nmessage: %s\nerror: %s",
+						string(msg.Value), err.Error()))
+				}
+				for _, metric := range metrics {
+					k.acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
+				}
 			}
 
 			if !k.doNotCommitMsgs {
@@ -159,7 +168,7 @@ func (k *Kafka) Stop() {
 	defer k.Unlock()
 	close(k.done)
 	if err := k.Consumer.Close(); err != nil {
-		k.acc.AddError(fmt.Errorf("E! Error closing kafka consumer: %s\n", err.Error()))
+		k.acc.AddError(fmt.Errorf("Error closing consumer: %s\n", err.Error()))
 	}
 }
 
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index e1c24adbe..04498261c 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -1,6 +1,7 @@
 package kafka_consumer
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/influxdata/telegraf/plugins/parsers"
@@ -62,6 +63,23 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	assert.Equal(t, acc.NFields(), 0)
 }
 
+// Test that overlong messages are dropped
+func TestDropOverlongMsg(t *testing.T) {
+	const maxMessageLen = 64 * 1024
+	k, in := newTestKafka()
+	k.MaxMessageLen = maxMessageLen
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+	overlongMsg := strings.Repeat("v", maxMessageLen+1)
+
+	go k.receiver()
+	in <- saramaMsg(overlongMsg)
+	acc.WaitError(1)
+
+	assert.Equal(t, acc.NFields(), 0)
+}
+
 // Test that the parser parses kafka messages into points
 func TestRunParserAndGather(t *testing.T) {
 	k, in := newTestKafka()

From 2c98e5ae66127c87d44f5a2ac5b819879a4b76e5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Wed, 12 Apr 2017 10:41:26 -0700
Subject: [PATCH 0192/1302] Add collectd parser (#2654)

---
 CHANGELOG.md                                  |   1 +
 Godeps                                        |   1 +
 README.md                                     |  10 +
 docs/DATA_FORMATS_INPUT.md                    |  41 +++
 docs/LICENSE_OF_DEPENDENCIES.md               |   2 +-
 internal/config/config.go                     |  31 ++
 logger/logger.go                              |  11 +-
 logger/logger_test.go                         |  13 +
 .../inputs/socket_listener/socket_listener.go |   4 +-
 plugins/parsers/collectd/parser.go            | 165 ++++++++++
 plugins/parsers/collectd/parser_test.go       | 298 ++++++++++++++++++
 plugins/parsers/registry.go                   |  19 ++
 12 files changed, 592 insertions(+), 4 deletions(-)
 create mode 100644 plugins/parsers/collectd/parser.go
 create mode 100644 plugins/parsers/collectd/parser_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10934f7fd..a2d9fc68e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ be deprecated eventually.
 - [#1667](https://github.com/influxdata/telegraf/pull/1667): dmcache input plugin
 - [#2637](https://github.com/influxdata/telegraf/issues/2637): Add support for precision in http_listener
 - [#2636](https://github.com/influxdata/telegraf/pull/2636): Add `message_len_max` option to `kafka_consumer` input
+- [#1100](https://github.com/influxdata/telegraf/issues/1100): Add collectd parser
 
 ### Bugfixes
 
diff --git a/Godeps b/Godeps
index 2e04c0cdd..a41d028c8 100644
--- a/Godeps
+++ b/Godeps
@@ -1,3 +1,4 @@
+collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
 github.com/Shopify/sarama 574d3147eee384229bf96a5d12c207fe7b5234f3
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
diff --git a/README.md b/README.md
index 55154e36a..f46c2e298 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,16 @@ Telegraf can also collect metrics via the following service plugins:
   * [mandrill](./plugins/inputs/webhooks/mandrill)
   * [rollbar](./plugins/inputs/webhooks/rollbar)
 
+Telegraf is able to parse the following input data formats into metrics, these
+formats may be used with input plugins supporting the `data_format` option:
+
+* [InfluxDB Line Protocol](./docs/DATA_FORMATS_INPUT.md#influx)
+* [JSON](./docs/DATA_FORMATS_INPUT.md#json)
+* [Graphite](./docs/DATA_FORMATS_INPUT.md#graphite)
+* [Value](./docs/DATA_FORMATS_INPUT.md#value)
+* [Nagios](./docs/DATA_FORMATS_INPUT.md#nagios)
+* [Collectd](./docs/DATA_FORMATS_INPUT.md#collectd)
+
 ## Processor Plugins
 
 * [printer](./plugins/processors/printer)
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index f2a635d89..59287e4a4 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -7,6 +7,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite)
 1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
 1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
+1. [Collectd](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#collectd)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -438,3 +439,43 @@ Note: Nagios Input Data Formats is only supported in `exec` input plugin.
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "nagios"
 ```
+
+# Collectd:
+
+The collectd format parses the collectd binary network protocol.  Tags are
+created for host, instance, type, and type instance.  All collectd values are
+added as float64 fields.
+
+For more information about the binary network protocol see
+[here](https://collectd.org/wiki/index.php/Binary_protocol).
+
+You can control the cryptographic settings with parser options.  Create an
+authentication file and set `collectd_auth_file` to the path of the file, then
+set the desired security level in `collectd_security_level`.
+
+Additional information including client setup can be found
+[here](https://collectd.org/wiki/index.php/Networking_introduction#Cryptographic_setup).
+
+You can also change the path to the typesdb or add additional typesdb using
+`collectd_typesdb`.
+
+#### Collectd Configuration:
+
+```toml
+[[inputs.socket_listener]]
+  service_address = "udp://127.0.0.1:25826"
+  name_prefix = "collectd_"
+
+  ## Data format to consume.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  data_format = "collectd"
+
+  ## Authentication file for cryptographic security levels
+  collectd_auth_file = "/etc/collectd/auth_file"
+  ## One of none (default), sign, or encrypt
+  collectd_security_level = "encrypt"
+  ## Path of to TypesDB specifications
+  collectd_typesdb = ["/usr/share/collectd/types.db"]
+```
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 5bb1bd036..a367aa7fb 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -1,4 +1,5 @@
 # List
+- collectd.org [MIT LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE)
 - github.com/Shopify/sarama [MIT LICENSE](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
 - github.com/Sirupsen/logrus [MIT LICENSE](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
 - github.com/armon/go-metrics [MIT LICENSE](https://github.com/armon/go-metrics/blob/master/LICENSE)
@@ -30,4 +31,3 @@
 - gopkg.in/dancannon/gorethink.v1 [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/mgo.v2 [BSD LICENSE](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - golang.org/x/crypto/ [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
-
diff --git a/internal/config/config.go b/internal/config/config.go
index 013e81c12..f8c304179 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1230,6 +1230,34 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	if node, ok := tbl.Fields["collectd_auth_file"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CollectdAuthFile = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["collectd_security_level"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.CollectdSecurityLevel = str.Value
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["collectd_typesdb"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if ary, ok := kv.Value.(*ast.Array); ok {
+				for _, elem := range ary.Value {
+					if str, ok := elem.(*ast.String); ok {
+						c.CollectdTypesDB = append(c.CollectdTypesDB, str.Value)
+					}
+				}
+			}
+		}
+	}
+
 	c.MetricName = name
 
 	delete(tbl.Fields, "data_format")
@@ -1237,6 +1265,9 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "templates")
 	delete(tbl.Fields, "tag_keys")
 	delete(tbl.Fields, "data_type")
+	delete(tbl.Fields, "collectd_auth_file")
+	delete(tbl.Fields, "collectd_security_level")
+	delete(tbl.Fields, "collectd_typesdb")
 
 	return parsers.NewParser(c)
 }
diff --git a/logger/logger.go b/logger/logger.go
index 49613c27d..7ad1c8069 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -4,11 +4,14 @@ import (
 	"io"
 	"log"
 	"os"
+	"regexp"
 	"time"
 
 	"github.com/influxdata/wlog"
 )
 
+var prefixRegex = regexp.MustCompile("^[DIWE]!")
+
 // newTelegrafWriter returns a logging-wrapped writer.
 func newTelegrafWriter(w io.Writer) io.Writer {
 	return &telegrafLog{
@@ -21,7 +24,13 @@ type telegrafLog struct {
 }
 
 func (t *telegrafLog) Write(b []byte) (n int, err error) {
-	return t.writer.Write(append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...))
+	var line []byte
+	if !prefixRegex.Match(b) {
+		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" I! "), b...)
+	} else {
+		line = append([]byte(time.Now().UTC().Format(time.RFC3339)+" "), b...)
+	}
+	return t.writer.Write(line)
 }
 
 // SetupLogging configures the logging output.
diff --git a/logger/logger_test.go b/logger/logger_test.go
index 8c0826e65..09c7c82eb 100644
--- a/logger/logger_test.go
+++ b/logger/logger_test.go
@@ -51,6 +51,19 @@ func TestErrorWriteLogToFile(t *testing.T) {
 	assert.Equal(t, f[19:], []byte("Z E! TEST\n"))
 }
 
+func TestAddDefaultLogLevel(t *testing.T) {
+	tmpfile, err := ioutil.TempFile("", "")
+	assert.NoError(t, err)
+	defer func() { os.Remove(tmpfile.Name()) }()
+
+	SetupLogging(true, false, tmpfile.Name())
+	log.Printf("TEST")
+
+	f, err := ioutil.ReadFile(tmpfile.Name())
+	assert.NoError(t, err)
+	assert.Equal(t, f[19:], []byte("Z I! TEST\n"))
+}
+
 func BenchmarkTelegrafLogWrite(b *testing.B) {
 	var msg = []byte("test")
 	var buf bytes.Buffer
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index b5c0202cc..4a9a470a7 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -71,7 +71,7 @@ func (ssl *streamSocketListener) read(c net.Conn) {
 	for scnr.Scan() {
 		metrics, err := ssl.Parse(scnr.Bytes())
 		if err != nil {
-			ssl.AddError(fmt.Errorf("unable to parse incoming line"))
+			ssl.AddError(fmt.Errorf("unable to parse incoming line: %s", err))
 			//TODO rate limit
 			continue
 		}
@@ -105,7 +105,7 @@ func (psl *packetSocketListener) listen() {
 
 		metrics, err := psl.Parse(buf[:n])
 		if err != nil {
-			psl.AddError(fmt.Errorf("unable to parse incoming packet"))
+			psl.AddError(fmt.Errorf("unable to parse incoming packet: %s", err))
 			//TODO rate limit
 			continue
 		}
diff --git a/plugins/parsers/collectd/parser.go b/plugins/parsers/collectd/parser.go
new file mode 100644
index 000000000..20525610c
--- /dev/null
+++ b/plugins/parsers/collectd/parser.go
@@ -0,0 +1,165 @@
+package collectd
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"os"
+
+	"collectd.org/api"
+	"collectd.org/network"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+)
+
+const (
+	DefaultAuthFile = "/etc/collectd/auth_file"
+)
+
+type CollectdParser struct {
+	// DefaultTags will be added to every parsed metric
+	DefaultTags map[string]string
+
+	popts network.ParseOpts
+}
+
+func (p *CollectdParser) SetParseOpts(popts *network.ParseOpts) {
+	p.popts = *popts
+}
+
+func NewCollectdParser(
+	authFile string,
+	securityLevel string,
+	typesDB []string,
+) (*CollectdParser, error) {
+	popts := network.ParseOpts{}
+
+	switch securityLevel {
+	case "none":
+		popts.SecurityLevel = network.None
+	case "sign":
+		popts.SecurityLevel = network.Sign
+	case "encrypt":
+		popts.SecurityLevel = network.Encrypt
+	default:
+		popts.SecurityLevel = network.None
+	}
+
+	if authFile == "" {
+		authFile = DefaultAuthFile
+	}
+	popts.PasswordLookup = network.NewAuthFile(authFile)
+
+	for _, path := range typesDB {
+		db, err := LoadTypesDB(path)
+		if err != nil {
+			return nil, err
+		}
+
+		if popts.TypesDB != nil {
+			popts.TypesDB.Merge(db)
+		} else {
+			popts.TypesDB = db
+		}
+	}
+
+	parser := CollectdParser{popts: popts}
+	return &parser, nil
+}
+
+func (p *CollectdParser) Parse(buf []byte) ([]telegraf.Metric, error) {
+	valueLists, err := network.Parse(buf, p.popts)
+	if err != nil {
+		return nil, fmt.Errorf("Collectd parser error: %s", err)
+	}
+
+	metrics := []telegraf.Metric{}
+	for _, valueList := range valueLists {
+		metrics = append(metrics, UnmarshalValueList(valueList)...)
+	}
+
+	if len(p.DefaultTags) > 0 {
+		for _, m := range metrics {
+			for k, v := range p.DefaultTags {
+				// only set the default tag if it doesn't already exist:
+				if !m.HasTag(k) {
+					m.AddTag(k, v)
+				}
+			}
+		}
+	}
+
+	return metrics, nil
+}
+
+func (p *CollectdParser) ParseLine(line string) (telegraf.Metric, error) {
+	metrics, err := p.Parse([]byte(line))
+	if err != nil {
+		return nil, err
+	}
+
+	if len(metrics) != 1 {
+		return nil, errors.New("Line contains multiple metrics")
+	}
+
+	return metrics[0], nil
+}
+
+func (p *CollectdParser) SetDefaultTags(tags map[string]string) {
+	p.DefaultTags = tags
+}
+
+// UnmarshalValueList translates a ValueList into a Telegraf metric.
+func UnmarshalValueList(vl *api.ValueList) []telegraf.Metric {
+	timestamp := vl.Time.UTC()
+
+	var metrics []telegraf.Metric
+	for i := range vl.Values {
+		var name string
+		name = fmt.Sprintf("%s_%s", vl.Identifier.Plugin, vl.DSName(i))
+		tags := make(map[string]string)
+		fields := make(map[string]interface{})
+
+		// Convert interface back to actual type, then to float64
+		switch value := vl.Values[i].(type) {
+		case api.Gauge:
+			fields["value"] = float64(value)
+		case api.Derive:
+			fields["value"] = float64(value)
+		case api.Counter:
+			fields["value"] = float64(value)
+		}
+
+		if vl.Identifier.Host != "" {
+			tags["host"] = vl.Identifier.Host
+		}
+		if vl.Identifier.PluginInstance != "" {
+			tags["instance"] = vl.Identifier.PluginInstance
+		}
+		if vl.Identifier.Type != "" {
+			tags["type"] = vl.Identifier.Type
+		}
+		if vl.Identifier.TypeInstance != "" {
+			tags["type_instance"] = vl.Identifier.TypeInstance
+		}
+
+		// Drop invalid points
+		m, err := metric.New(name, tags, fields, timestamp)
+		if err != nil {
+			log.Printf("E! Dropping metric %v: %v", name, err)
+			continue
+		}
+
+		metrics = append(metrics, m)
+	}
+	return metrics
+}
+
+func LoadTypesDB(path string) (*api.TypesDB, error) {
+	reader, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	return api.NewTypesDB(reader)
+}
diff --git a/plugins/parsers/collectd/parser_test.go b/plugins/parsers/collectd/parser_test.go
new file mode 100644
index 000000000..3aad04013
--- /dev/null
+++ b/plugins/parsers/collectd/parser_test.go
@@ -0,0 +1,298 @@
+package collectd
+
+import (
+	"context"
+	"testing"
+
+	"collectd.org/api"
+	"collectd.org/network"
+	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf"
+)
+
+type AuthMap struct {
+	Passwd map[string]string
+}
+
+func (p *AuthMap) Password(user string) (string, error) {
+	return p.Passwd[user], nil
+}
+
+type metricData struct {
+	name   string
+	tags   map[string]string
+	fields map[string]interface{}
+}
+
+type testCase struct {
+	vl       []api.ValueList
+	expected []metricData
+}
+
+var singleMetric = testCase{
+	[]api.ValueList{
+		api.ValueList{
+			Identifier: api.Identifier{
+				Host:           "xyzzy",
+				Plugin:         "cpu",
+				PluginInstance: "1",
+				Type:           "cpu",
+				TypeInstance:   "user",
+			},
+			Values: []api.Value{
+				api.Counter(42),
+			},
+			DSNames: []string(nil),
+		},
+	},
+	[]metricData{
+		metricData{
+			"cpu_value",
+			map[string]string{
+				"type_instance": "user",
+				"host":          "xyzzy",
+				"instance":      "1",
+				"type":          "cpu",
+			},
+			map[string]interface{}{
+				"value": float64(42),
+			},
+		},
+	},
+}
+
+var multiMetric = testCase{
+	[]api.ValueList{
+		api.ValueList{
+			Identifier: api.Identifier{
+				Host:           "xyzzy",
+				Plugin:         "cpu",
+				PluginInstance: "0",
+				Type:           "cpu",
+				TypeInstance:   "user",
+			},
+			Values: []api.Value{
+				api.Derive(42),
+				api.Gauge(42),
+			},
+			DSNames: []string(nil),
+		},
+	},
+	[]metricData{
+		metricData{
+			"cpu_0",
+			map[string]string{
+				"type_instance": "user",
+				"host":          "xyzzy",
+				"instance":      "0",
+				"type":          "cpu",
+			},
+			map[string]interface{}{
+				"value": float64(42),
+			},
+		},
+		metricData{
+			"cpu_1",
+			map[string]string{
+				"type_instance": "user",
+				"host":          "xyzzy",
+				"instance":      "0",
+				"type":          "cpu",
+			},
+			map[string]interface{}{
+				"value": float64(42),
+			},
+		},
+	},
+}
+
+func TestNewCollectdParser(t *testing.T) {
+	parser, err := NewCollectdParser("", "", []string{})
+	require.Nil(t, err)
+	require.Equal(t, parser.popts.SecurityLevel, network.None)
+	require.NotNil(t, parser.popts.PasswordLookup)
+	require.Nil(t, parser.popts.TypesDB)
+}
+
+func TestParse(t *testing.T) {
+	cases := []testCase{singleMetric, multiMetric}
+
+	for _, tc := range cases {
+		buf, err := writeValueList(tc.vl)
+		require.Nil(t, err)
+		bytes, err := buf.Bytes()
+		require.Nil(t, err)
+
+		parser := &CollectdParser{}
+		require.Nil(t, err)
+		metrics, err := parser.Parse(bytes)
+		require.Nil(t, err)
+
+		assertEqualMetrics(t, tc.expected, metrics)
+	}
+}
+
+func TestParse_DefaultTags(t *testing.T) {
+	buf, err := writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	bytes, err := buf.Bytes()
+	require.Nil(t, err)
+
+	parser := &CollectdParser{}
+	parser.SetDefaultTags(map[string]string{
+		"foo": "bar",
+	})
+	require.Nil(t, err)
+	metrics, err := parser.Parse(bytes)
+	require.Nil(t, err)
+
+	require.Equal(t, "bar", metrics[0].Tags()["foo"])
+}
+
+func TestParse_SignSecurityLevel(t *testing.T) {
+	parser := &CollectdParser{}
+	popts := &network.ParseOpts{
+		SecurityLevel: network.Sign,
+		PasswordLookup: &AuthMap{
+			map[string]string{
+				"user0": "bar",
+			},
+		},
+	}
+	parser.SetParseOpts(popts)
+
+	// Signed data
+	buf, err := writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Sign("user0", "bar")
+	bytes, err := buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err := parser.Parse(bytes)
+	require.Nil(t, err)
+	assertEqualMetrics(t, singleMetric.expected, metrics)
+
+	// Encrypted data
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Encrypt("user0", "bar")
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.Nil(t, err)
+	assertEqualMetrics(t, singleMetric.expected, metrics)
+
+	// Plain text data skipped
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.Nil(t, err)
+	require.Equal(t, []telegraf.Metric{}, metrics)
+
+	// Wrong password error
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Sign("x", "y")
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.NotNil(t, err)
+}
+
+func TestParse_EncryptSecurityLevel(t *testing.T) {
+	parser := &CollectdParser{}
+	popts := &network.ParseOpts{
+		SecurityLevel: network.Encrypt,
+		PasswordLookup: &AuthMap{
+			map[string]string{
+				"user0": "bar",
+			},
+		},
+	}
+	parser.SetParseOpts(popts)
+
+	// Signed data skipped
+	buf, err := writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Sign("user0", "bar")
+	bytes, err := buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err := parser.Parse(bytes)
+	require.Nil(t, err)
+	require.Equal(t, []telegraf.Metric{}, metrics)
+
+	// Encrypted data
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Encrypt("user0", "bar")
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.Nil(t, err)
+	assertEqualMetrics(t, singleMetric.expected, metrics)
+
+	// Plain text data skipped
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.Nil(t, err)
+	require.Equal(t, []telegraf.Metric{}, metrics)
+
+	// Wrong password error
+	buf, err = writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	buf.Sign("x", "y")
+	bytes, err = buf.Bytes()
+	require.Nil(t, err)
+
+	metrics, err = parser.Parse(bytes)
+	require.NotNil(t, err)
+}
+
+func TestParseLine(t *testing.T) {
+	buf, err := writeValueList(singleMetric.vl)
+	require.Nil(t, err)
+	bytes, err := buf.Bytes()
+	require.Nil(t, err)
+
+	parser, err := NewCollectdParser("", "", []string{})
+	require.Nil(t, err)
+	metric, err := parser.ParseLine(string(bytes))
+	require.Nil(t, err)
+
+	assertEqualMetrics(t, singleMetric.expected, []telegraf.Metric{metric})
+}
+
+func writeValueList(valueLists []api.ValueList) (*network.Buffer, error) {
+	buffer := network.NewBuffer(0)
+
+	ctx := context.Background()
+	for _, vl := range valueLists {
+		err := buffer.Write(ctx, &vl)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return buffer, nil
+}
+
+func assertEqualMetrics(t *testing.T, expected []metricData, received []telegraf.Metric) {
+	require.Equal(t, len(expected), len(received))
+	for i, m := range received {
+		require.Equal(t, expected[i].name, m.Name())
+		require.Equal(t, expected[i].tags, m.Tags())
+		require.Equal(t, expected[i].fields, m.Fields())
+	}
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 360d795bc..bda6aeba3 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 
+	"github.com/influxdata/telegraf/plugins/parsers/collectd"
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
@@ -53,6 +54,13 @@ type Config struct {
 	// MetricName applies to JSON & value. This will be the name of the measurement.
 	MetricName string
 
+	// Authentication file for collectd
+	CollectdAuthFile string
+	// One of none (default), sign, or encrypt
+	CollectdSecurityLevel string
+	// Dataset specification for collectd
+	CollectdTypesDB []string
+
 	// DataType only applies to value, this will be the type to parse value to
 	DataType string
 
@@ -78,6 +86,9 @@ func NewParser(config *Config) (Parser, error) {
 	case "graphite":
 		parser, err = NewGraphiteParser(config.Separator,
 			config.Templates, config.DefaultTags)
+	case "collectd":
+		parser, err = NewCollectdParser(config.CollectdAuthFile,
+			config.CollectdSecurityLevel, config.CollectdTypesDB)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
@@ -124,3 +135,11 @@ func NewValueParser(
 		DefaultTags: defaultTags,
 	}, nil
 }
+
+func NewCollectdParser(
+	authFile string,
+	securityLevel string,
+	typesDB []string,
+) (Parser, error) {
+	return collectd.NewCollectdParser(authFile, securityLevel, typesDB)
+}

From 360b10c4deecb5a3b5f9322cb5702c42ed205671 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Wed, 12 Apr 2017 10:42:11 -0700
Subject: [PATCH 0193/1302] Clarify precision documentation (#2655)

---
 internal/config/config.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index f8c304179..61263f49a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -85,8 +85,8 @@ type AgentConfig struct {
 	//     ie, if Interval=10s then always collect on :00, :10, :20, etc.
 	RoundInterval bool
 
-	// By default, precision will be set to the same timestamp order as the
-	// collection interval, with the maximum being 1s.
+	// By default or when set to "0s", precision will be set to the same
+	// timestamp order as the collection interval, with the maximum being 1s.
 	//   ie, when interval = "10s", precision will be "1s"
 	//       when interval = "250ms", precision will be "1ms"
 	// Precision will NOT be used for service inputs. It is up to each individual
@@ -230,10 +230,13 @@ var header = `# Telegraf Configuration
   ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
   flush_jitter = "0s"
 
-  ## By default, precision will be set to the same timestamp order as the
-  ## collection interval, with the maximum being 1s.
-  ## Precision will NOT be used for service inputs, such as logparser and statsd.
-  ## Valid values are "ns", "us" (or "µs"), "ms", "s".
+  ## By default or when set to "0s", precision will be set to the same
+  ## timestamp order as the collection interval, with the maximum being 1s.
+  ##   ie, when interval = "10s", precision will be "1s"
+  ##       when interval = "250ms", precision will be "1ms"
+  ## Precision will NOT be used for service inputs. It is up to each individual
+  ## service input to set the timestamp at the appropriate precision.
+  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
   precision = ""
 
   ## Logging configuration:

From 49ab4e26f8ea6d22d52958fc29c8e8908fa8fca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Roncero?= <jroncero@gmail.com>
Date: Wed, 12 Apr 2017 20:04:44 +0100
Subject: [PATCH 0194/1302] Nagios plugin documentation fix (#2659)

---
 docs/DATA_FORMATS_INPUT.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 59287e4a4..8f80b560e 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -428,13 +428,13 @@ Note: Nagios Input Data Formats is only supported in `exec` input plugin.
 ```toml
 [[inputs.exec]]
   ## Commands array
-  commands = ["/usr/lib/nagios/plugins/check_load", "-w 5,6,7 -c 7,8,9"]
+  commands = ["/usr/lib/nagios/plugins/check_load -w 5,6,7 -c 7,8,9"]
 
   ## measurement name suffix (for separating different commands)
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "nagios"

From 3e0c55bff9cdbc9dec34c49d8d65972812ad9d9a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Wed, 12 Apr 2017 17:10:17 -0700
Subject: [PATCH 0195/1302] Update grok version (#2662)

---
 Godeps                                     |  2 +-
 plugins/inputs/logparser/grok/grok_test.go | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index a41d028c8..0a7cc30a5 100644
--- a/Godeps
+++ b/Godeps
@@ -49,7 +49,7 @@ github.com/shirou/gopsutil dfbb3e40da8d6fcd1aa0d87003e965fe0ca745ea
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
-github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2
+github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
 github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 4e0ead6e9..64fb20c43 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -687,3 +687,23 @@ func TestTsModder_Rollover(t *testing.T) {
 	}
 	assert.Equal(t, reftime.Add(time.Nanosecond*1000), modt)
 }
+
+func TestShortPatternRegression(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{"%{TS_UNIX:timestamp:ts-unix} %{NUMBER:value:int}"},
+		CustomPatterns: `
+		  TS_UNIX %{DAY} %{MONTH} %{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} %{TZ} %{YEAR}
+		`,
+	}
+	require.NoError(t, p.Compile())
+
+	metric, err := p.ParseLine(`Wed Apr 12 13:10:34 PST 2017 42`)
+	require.NoError(t, err)
+	require.NotNil(t, metric)
+
+	require.Equal(t,
+		map[string]interface{}{
+			"value": int64(42),
+		},
+		metric.Fields())
+}

From 9388fff1f7366da864c1331ec3f7810a7a308282 Mon Sep 17 00:00:00 2001
From: Chris Goffinet <chris@chrisgoffinet.com>
Date: Wed, 12 Apr 2017 20:40:10 -0400
Subject: [PATCH 0196/1302] Fixed content-type header in output plugin OpenTSDB
 (#2663)

---
 plugins/outputs/opentsdb/opentsdb_http.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/outputs/opentsdb/opentsdb_http.go b/plugins/outputs/opentsdb/opentsdb_http.go
index 912ca670a..e74e74f03 100644
--- a/plugins/outputs/opentsdb/opentsdb_http.go
+++ b/plugins/outputs/opentsdb/opentsdb_http.go
@@ -134,7 +134,7 @@ func (o *openTSDBHttp) flush() error {
 	if err != nil {
 		return fmt.Errorf("Error when building request: %s", err.Error())
 	}
-	req.Header.Set("Content-Type", "applicaton/json")
+	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Content-Encoding", "gzip")
 
 	if o.Debug {

From 45c9b867f63b665c0edbf15dc71bf650100a7709 Mon Sep 17 00:00:00 2001
From: Gregory Kman <gregorykman@gmail.com>
Date: Wed, 12 Apr 2017 19:46:48 -0500
Subject: [PATCH 0197/1302] Update ping-input-plugin Readme (#2651)

---
 plugins/inputs/ping/README.md | 35 +++++++++++++++++++++++------------
 plugins/inputs/ping/ping.go   |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 38558a33c..b02345e8e 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -1,20 +1,27 @@
-# Ping input plugin
+# Ping Input plugin
 
 This input plugin will measures the round-trip
 
-## Windows:
 ### Configuration:
+
 ```
-	## urls to ping
-	urls = ["www.google.com"] # required
-	
-	## number of pings to send per collection (ping -n <COUNT>)
-	count = 4 # required
-	
-	## Ping timeout, in seconds. 0 means default timeout (ping -w <TIMEOUT>)
-	Timeout = 0
+# NOTE: this plugin forks the ping command. You may need to set capabilities
+# via setcap cap_net_raw+p /bin/ping
+[[inputs.ping]]
+## List of urls to ping
+urls = ["www.google.com"] # required
+## number of pings to send per collection (ping -c <COUNT>)
+# count = 1
+## interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
+# ping_interval = 1.0
+## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
+# timeout = 1.0
+## interface to send ping from (ping -I <INTERFACE>)
+# interface = ""
 ```
+
 ### Measurements & Fields:
+
 - packets_transmitted ( from ping output )
 - reply_received ( increasing only on valid metric from echo replay, eg. 'Destination net unreachable' reply will increment packets_received but not reply_received )
 - packets_received ( from ping output )
@@ -25,12 +32,16 @@ This input plugin will measures the round-trip
     - average_response_ms ( compute from minimum_response_ms and maximum_response_ms )
     - minimum_response_ms ( from ping output )
     - maximum_response_ms ( from ping output )
-	
+
 ### Tags:
-- server
+
+- host
+- url
 
 ### Example Output:
+
 ```
+$ ./telegraf -config telegraf.conf -input-filter ping -test
 * Plugin: ping, Collection 1
 ping,host=WIN-PBAPLP511R7,url=www.google.com average_response_ms=7i,maximum_response_ms=9i,minimum_response_ms=7i,packets_received=4i,packets_transmitted=4i,percent_packet_loss=0,percent_reply_loss=0,reply_received=4i 1469879119000000000
 ```
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 32264eec7..f5256750d 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -49,7 +49,7 @@ const sampleConfig = `
   ## NOTE: this plugin forks the ping command. You may need to set capabilities
   ## via setcap cap_net_raw+p /bin/ping
   #
-  ## urls to ping
+  ## List of urls to ping
   urls = ["www.google.com"] # required
   ## number of pings to send per collection (ping -c <COUNT>)
   # count = 1

From dff216c44d5fae38db0ae78a5dc67a320b5c5397 Mon Sep 17 00:00:00 2001
From: ingosus <ingosus@users.noreply.github.com>
Date: Thu, 13 Apr 2017 22:59:28 +0300
Subject: [PATCH 0198/1302] Feature #1820: add testing without outputs (#2446)

---
 CHANGELOG.md             | 1 +
 cmd/telegraf/telegraf.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2d9fc68e..dd3ee39df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@ be deprecated eventually.
 - [#2637](https://github.com/influxdata/telegraf/issues/2637): Add support for precision in http_listener
 - [#2636](https://github.com/influxdata/telegraf/pull/2636): Add `message_len_max` option to `kafka_consumer` input
 - [#1100](https://github.com/influxdata/telegraf/issues/1100): Add collectd parser
+- [#1820](https://github.com/influxdata/telegraf/issues/1820): easier plugin testing without outputs
 
 ### Bugfixes
 
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 40e90a1ec..af11e6682 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -144,7 +144,7 @@ func reloadLoop(
 				log.Fatal("E! " + err.Error())
 			}
 		}
-		if len(c.Outputs) == 0 {
+		if !*fTest && len(c.Outputs) == 0 {
 			log.Fatalf("E! Error: no outputs found, did you provide a valid config file?")
 		}
 		if len(c.Inputs) == 0 {

From cadd845b36e7ed745e136e4bc42ff4caab6b1c82 Mon Sep 17 00:00:00 2001
From: calerogers <cale.rogers.m@gmail.com>
Date: Thu, 13 Apr 2017 15:53:02 -0700
Subject: [PATCH 0199/1302] Irqstat input plugin (#2494)

closes #2469
---
 CHANGELOG.md                                 |   1 +
 README.md                                    |   1 +
 plugins/inputs/all/all.go                    |   1 +
 plugins/inputs/interrupts/README.md          |  35 +++++
 plugins/inputs/interrupts/interrupts.go      | 140 +++++++++++++++++++
 plugins/inputs/interrupts/interrupts_test.go |  59 ++++++++
 6 files changed, 237 insertions(+)
 create mode 100644 plugins/inputs/interrupts/README.md
 create mode 100644 plugins/inputs/interrupts/interrupts.go
 create mode 100644 plugins/inputs/interrupts/interrupts_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd3ee39df..d4792790f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ be deprecated eventually.
 
 ### Features
 
+- [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin.
 - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
 - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin.
diff --git a/README.md b/README.md
index f46c2e298..2dc6997d6 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,7 @@ configuration options.
 * [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
 * [internal](./plugins/inputs/internal)
 * [influxdb](./plugins/inputs/influxdb)
+* [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
 * [jolokia](./plugins/inputs/jolokia)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 983179e90..f7207da84 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -30,6 +30,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
 	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
+	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
diff --git a/plugins/inputs/interrupts/README.md b/plugins/inputs/interrupts/README.md
new file mode 100644
index 000000000..aec30094e
--- /dev/null
+++ b/plugins/inputs/interrupts/README.md
@@ -0,0 +1,35 @@
+# Interrupts Input Plugin
+
+The interrupts plugin gathers metrics about IRQs from `/proc/interrupts` and `/proc/softirqs`.
+
+### Configuration
+```
+[[inputs.interrupts]]
+  ## A list of IRQs to include for metric ingestion, if not specified
+  ## will default to collecting all IRQs.
+  include = ["0", "1", "30", "NET_RX"]
+```
+
+### Measurements
+There are two measurements reported by this plugin.
+- `interrupts` gathers metrics from the `/proc/interrupts` file
+- `soft_interrupts` gathers metrics from the `/proc/softirqs` file
+
+### Fields
+- CPUx: the amount of interrupts for the IRQ handled by that CPU
+- total: total amount of interrupts for all CPUs
+
+### Tags
+- irq: the IRQ
+- type: the type of interrupt
+- device: the name of the device that is located at that IRQ
+
+### Example Output
+```
+./telegraf -config ~/interrupts_config.conf -test
+* Plugin: inputs.interrupts, Collection 1
+> interrupts,irq=0,type=IO-APIC,device=2-edge\ timer,host=hostname CPU0=23i,total=23i 1489346531000000000
+> interrupts,irq=1,host=hostname,type=IO-APIC,device=1-edge\ i8042 CPU0=9i,total=9i 1489346531000000000
+> interrupts,irq=30,type=PCI-MSI,device=65537-edge\ virtio1-input.0,host=hostname CPU0=1i,total=1i 1489346531000000000
+> soft_interrupts,irq=NET_RX,host=hostname CPU0=280879i,total=280879i 1489346531000000000
+```
diff --git a/plugins/inputs/interrupts/interrupts.go b/plugins/inputs/interrupts/interrupts.go
new file mode 100644
index 000000000..1feb6441c
--- /dev/null
+++ b/plugins/inputs/interrupts/interrupts.go
@@ -0,0 +1,140 @@
+package interrupts
+
+import (
+	"bufio"
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"io/ioutil"
+	"strconv"
+	"strings"
+)
+
+type Interrupts struct{}
+
+type IRQ struct {
+	ID     string
+	Type   string
+	Device string
+	Total  int64
+	Cpus   []int64
+}
+
+func NewIRQ(id string) *IRQ {
+	return &IRQ{ID: id, Cpus: []int64{}}
+}
+
+const sampleConfig = `
+  ## To filter which IRQs to collect, make use of tagpass / tagdrop, i.e.
+  # [inputs.interrupts.tagdrop]
+    # irq = [ "NET_RX", "TASKLET" ]
+`
+
+func (s *Interrupts) Description() string {
+	return "This plugin gathers interrupts data from /proc/interrupts and /proc/softirqs."
+}
+
+func (s *Interrupts) SampleConfig() string {
+	return sampleConfig
+}
+
+func parseInterrupts(irqdata string) ([]IRQ, error) {
+	var irqs []IRQ
+	var cpucount int
+	scanner := bufio.NewScanner(strings.NewReader(irqdata))
+	ok := scanner.Scan()
+	if ok {
+		cpus := strings.Fields(scanner.Text())
+		if cpus[0] == "CPU0" {
+			cpucount = len(cpus)
+		}
+	} else if scanner.Err() != nil {
+		return irqs, fmt.Errorf("Reading %s: %s", scanner.Text(), scanner.Err())
+	}
+	for scanner.Scan() {
+		fields := strings.Fields(scanner.Text())
+		if !strings.HasSuffix(fields[0], ":") {
+			continue
+		}
+		irqid := strings.TrimRight(fields[0], ":")
+		irq := NewIRQ(irqid)
+		irqvals := fields[1:len(fields)]
+		for i := 0; i < cpucount; i++ {
+			if i < len(irqvals) {
+				irqval, err := strconv.ParseInt(irqvals[i], 10, 64)
+				if err != nil {
+					return irqs, fmt.Errorf("Unable to parse %q from %q: %s", irqvals[i], scanner.Text(), err)
+				}
+				irq.Cpus = append(irq.Cpus, irqval)
+			}
+		}
+		for _, irqval := range irq.Cpus {
+			irq.Total += irqval
+		}
+		_, err := strconv.ParseInt(irqid, 10, 64)
+		if err == nil && len(fields) >= cpucount+2 {
+			irq.Type = fields[cpucount+1]
+			irq.Device = strings.Join(fields[cpucount+2:], " ")
+		} else if len(fields) > cpucount {
+			irq.Type = strings.Join(fields[cpucount+1:], " ")
+		}
+		irqs = append(irqs, *irq)
+	}
+	return irqs, nil
+}
+
+func fileToString(path string) (string, error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return "", err
+	}
+	content := string(data)
+	return content, nil
+}
+
+func gatherTagsFields(irq IRQ) (map[string]string, map[string]interface{}) {
+	tags := map[string]string{"irq": irq.ID, "type": irq.Type, "device": irq.Device}
+	fields := map[string]interface{}{"total": irq.Total}
+	for i := 0; i < len(irq.Cpus); i++ {
+		cpu := fmt.Sprintf("CPU%d", i)
+		fields[cpu] = irq.Cpus[i]
+	}
+	return tags, fields
+}
+
+func (s *Interrupts) Gather(acc telegraf.Accumulator) error {
+	irqdata, err := fileToString("/proc/interrupts")
+	if err != nil {
+		acc.AddError(fmt.Errorf("Reading %s: %s", "/proc/interrupts", err))
+	}
+	irqs, err := parseInterrupts(irqdata)
+	if err != nil {
+		acc.AddError(fmt.Errorf("Parsing %s: %s", "/proc/interrupts", err))
+	} else {
+		for _, irq := range irqs {
+			tags, fields := gatherTagsFields(irq)
+			acc.AddFields("interrupts", fields, tags)
+		}
+	}
+
+	irqdata, err = fileToString("/proc/softirqs")
+	if err != nil {
+		acc.AddError(fmt.Errorf("Reading %s: %s", "/proc/softirqs", err))
+	}
+	irqs, err = parseInterrupts(irqdata)
+	if err != nil {
+		acc.AddError(fmt.Errorf("Parsing %s: %s", "/proc/softirqs", err))
+	} else {
+		for _, irq := range irqs {
+			tags, fields := gatherTagsFields(irq)
+			acc.AddFields("softirqs", fields, tags)
+		}
+	}
+	return nil
+}
+
+func init() {
+	inputs.Add("interrupts", func() telegraf.Input {
+		return &Interrupts{}
+	})
+}
diff --git a/plugins/inputs/interrupts/interrupts_test.go b/plugins/inputs/interrupts/interrupts_test.go
new file mode 100644
index 000000000..d968eb094
--- /dev/null
+++ b/plugins/inputs/interrupts/interrupts_test.go
@@ -0,0 +1,59 @@
+package interrupts
+
+import (
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestParseInterrupts(t *testing.T) {
+	interruptStr := `           CPU0       CPU1
+  0:        134          0   IO-APIC-edge      timer
+  1:          7          3   IO-APIC-edge      i8042
+NMI:          0          0   Non-maskable interrupts
+LOC: 2338608687 2334309625   Local timer interrupts
+MIS:          0
+NET_RX:     867028		225
+TASKLET:	205			0`
+
+	parsed := []IRQ{
+		IRQ{
+			ID: "0", Type: "IO-APIC-edge", Device: "timer",
+			Cpus: []int64{int64(134), int64(0)}, Total: int64(134),
+		},
+		IRQ{
+			ID: "1", Type: "IO-APIC-edge", Device: "i8042",
+			Cpus: []int64{int64(7), int64(3)}, Total: int64(10),
+		},
+		IRQ{
+			ID: "NMI", Type: "Non-maskable interrupts",
+			Cpus: []int64{int64(0), int64(0)}, Total: int64(0),
+		},
+		IRQ{
+			ID: "LOC", Type: "Local timer interrupts",
+			Cpus:  []int64{int64(2338608687), int64(2334309625)},
+			Total: int64(4672918312),
+		},
+		IRQ{
+			ID: "MIS", Cpus: []int64{int64(0)}, Total: int64(0),
+		},
+		IRQ{
+			ID: "NET_RX", Cpus: []int64{int64(867028), int64(225)},
+			Total: int64(867253),
+		},
+		IRQ{
+			ID: "TASKLET", Cpus: []int64{int64(205), int64(0)},
+			Total: int64(205),
+		},
+	}
+	got, err := parseInterrupts(interruptStr)
+	require.Equal(t, nil, err)
+	require.NotEqual(t, 0, len(got))
+	require.Equal(t, len(got), len(parsed))
+	for i := 0; i < len(parsed); i++ {
+		assert.Equal(t, parsed[i], got[i])
+		for k := 0; k < len(parsed[i].Cpus); k++ {
+			assert.Equal(t, parsed[i].Cpus[k], got[i].Cpus[k])
+		}
+	}
+}

From a12e082dbe875fec6bac5e027248694bbccb72b3 Mon Sep 17 00:00:00 2001
From: calerogers <cale.rogers.m@gmail.com>
Date: Fri, 14 Apr 2017 13:40:36 -0700
Subject: [PATCH 0200/1302] Refactor interrupts plugin code (#2670)

---
 plugins/inputs/interrupts/README.md          |  6 +-
 plugins/inputs/interrupts/interrupts.go      | 63 +++++++-------------
 plugins/inputs/interrupts/interrupts_test.go |  5 +-
 3 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/plugins/inputs/interrupts/README.md b/plugins/inputs/interrupts/README.md
index aec30094e..f823aae07 100644
--- a/plugins/inputs/interrupts/README.md
+++ b/plugins/inputs/interrupts/README.md
@@ -5,9 +5,9 @@ The interrupts plugin gathers metrics about IRQs from `/proc/interrupts` and `/p
 ### Configuration
 ```
 [[inputs.interrupts]]
-  ## A list of IRQs to include for metric ingestion, if not specified
-  ## will default to collecting all IRQs.
-  include = ["0", "1", "30", "NET_RX"]
+  ## To filter which IRQs to collect, make use of tagpass / tagdrop, i.e.
+  # [inputs.interrupts.tagdrop]
+    # irq = [ "NET_RX", "TASKLET" ]
 ```
 
 ### Measurements
diff --git a/plugins/inputs/interrupts/interrupts.go b/plugins/inputs/interrupts/interrupts.go
index 1feb6441c..75cbf3be1 100644
--- a/plugins/inputs/interrupts/interrupts.go
+++ b/plugins/inputs/interrupts/interrupts.go
@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"io/ioutil"
+	"io"
+	"os"
 	"strconv"
 	"strings"
 )
@@ -38,18 +39,16 @@ func (s *Interrupts) SampleConfig() string {
 	return sampleConfig
 }
 
-func parseInterrupts(irqdata string) ([]IRQ, error) {
+func parseInterrupts(r io.Reader) ([]IRQ, error) {
 	var irqs []IRQ
 	var cpucount int
-	scanner := bufio.NewScanner(strings.NewReader(irqdata))
-	ok := scanner.Scan()
-	if ok {
+	scanner := bufio.NewScanner(r)
+	if scanner.Scan() {
 		cpus := strings.Fields(scanner.Text())
-		if cpus[0] == "CPU0" {
-			cpucount = len(cpus)
+		if cpus[0] != "CPU0" {
+			return nil, fmt.Errorf("Expected first line to start with CPU0, but was %s", scanner.Text())
 		}
-	} else if scanner.Err() != nil {
-		return irqs, fmt.Errorf("Reading %s: %s", scanner.Text(), scanner.Err())
+		cpucount = len(cpus)
 	}
 	for scanner.Scan() {
 		fields := strings.Fields(scanner.Text())
@@ -80,16 +79,10 @@ func parseInterrupts(irqdata string) ([]IRQ, error) {
 		}
 		irqs = append(irqs, *irq)
 	}
-	return irqs, nil
-}
-
-func fileToString(path string) (string, error) {
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return "", err
+	if scanner.Err() != nil {
+		return nil, fmt.Errorf("Error scanning file: %s", scanner.Err())
 	}
-	content := string(data)
-	return content, nil
+	return irqs, nil
 }
 
 func gatherTagsFields(irq IRQ) (map[string]string, map[string]interface{}) {
@@ -103,31 +96,21 @@ func gatherTagsFields(irq IRQ) (map[string]string, map[string]interface{}) {
 }
 
 func (s *Interrupts) Gather(acc telegraf.Accumulator) error {
-	irqdata, err := fileToString("/proc/interrupts")
-	if err != nil {
-		acc.AddError(fmt.Errorf("Reading %s: %s", "/proc/interrupts", err))
-	}
-	irqs, err := parseInterrupts(irqdata)
-	if err != nil {
-		acc.AddError(fmt.Errorf("Parsing %s: %s", "/proc/interrupts", err))
-	} else {
-		for _, irq := range irqs {
-			tags, fields := gatherTagsFields(irq)
-			acc.AddFields("interrupts", fields, tags)
+	for measurement, file := range map[string]string{"interrupts": "/proc/interrupts", "soft_interrupts": "/proc/softirqs"} {
+		f, err := os.Open(file)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Could not open file: %s", file))
+			continue
+		}
+		defer f.Close()
+		irqs, err := parseInterrupts(f)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Parsing %s: %s", file, err))
+			continue
 		}
-	}
-
-	irqdata, err = fileToString("/proc/softirqs")
-	if err != nil {
-		acc.AddError(fmt.Errorf("Reading %s: %s", "/proc/softirqs", err))
-	}
-	irqs, err = parseInterrupts(irqdata)
-	if err != nil {
-		acc.AddError(fmt.Errorf("Parsing %s: %s", "/proc/softirqs", err))
-	} else {
 		for _, irq := range irqs {
 			tags, fields := gatherTagsFields(irq)
-			acc.AddFields("softirqs", fields, tags)
+			acc.AddFields(measurement, fields, tags)
 		}
 	}
 	return nil
diff --git a/plugins/inputs/interrupts/interrupts_test.go b/plugins/inputs/interrupts/interrupts_test.go
index d968eb094..6c76c8504 100644
--- a/plugins/inputs/interrupts/interrupts_test.go
+++ b/plugins/inputs/interrupts/interrupts_test.go
@@ -1,6 +1,7 @@
 package interrupts
 
 import (
+	"bytes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
@@ -15,7 +16,7 @@ LOC: 2338608687 2334309625   Local timer interrupts
 MIS:          0
 NET_RX:     867028		225
 TASKLET:	205			0`
-
+	f := bytes.NewBufferString(interruptStr)
 	parsed := []IRQ{
 		IRQ{
 			ID: "0", Type: "IO-APIC-edge", Device: "timer",
@@ -46,7 +47,7 @@ TASKLET:	205			0`
 			Total: int64(205),
 		},
 	}
-	got, err := parseInterrupts(interruptStr)
+	got, err := parseInterrupts(f)
 	require.Equal(t, nil, err)
 	require.NotEqual(t, 0, len(got))
 	require.Equal(t, len(got), len(parsed))

From b90a5b48a1e322a8484ae496311ff7e95e4eb5a2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 14 Apr 2017 13:47:43 -0700
Subject: [PATCH 0201/1302] Improve logparser README (#2664)

---
 plugins/inputs/logparser/README.md    | 142 ++++++++++++++++++++++----
 plugins/inputs/logparser/grok/grok.go |   1 +
 2 files changed, 121 insertions(+), 22 deletions(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 5973d9f42..177d77a98 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -1,6 +1,6 @@
-# logparser Input Plugin
+# Logparser Input Plugin
 
-The logparser plugin streams and parses the given logfiles. Currently it only
+The `logparser` plugin streams and parses the given logfiles. Currently it
 has the capability of parsing "grok" patterns from logfiles, which also supports
 regex patterns.
 
@@ -37,35 +37,28 @@ regex patterns.
     '''
 ```
 
-## Grok Parser
-
-The grok parser uses a slightly modified version of logstash "grok" patterns,
-with the format
-
-```
-%{<capture_syntax>[:<semantic_name>][:<modifier>]}
-```
-
-Telegraf has many of it's own
-[built-in patterns](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/logparser/grok/patterns/influx-patterns),
-as well as supporting
-[logstash's builtin patterns](https://github.com/logstash-plugins/logstash-patterns-core/blob/master/patterns/grok-patterns).
-
+### Grok Parser
 
 The best way to get acquainted with grok patterns is to read the logstash docs,
 which are available here:
   https://www.elastic.co/guide/en/logstash/current/plugins-filters-grok.html
 
+The Telegraf grok parser uses a slightly modified version of logstash "grok"
+patterns, with the format
 
-If you need help building patterns to match your logs,
-you will find the http://grokdebug.herokuapp.com application quite useful!
+```
+%{<capture_syntax>[:<semantic_name>][:<modifier>]}
+```
 
+The `capture_syntax` defines the grok pattern that's used to parse the input
+line and the `semantic_name` is used to name the field or tag.  The extension
+`modifier` controls the data type that the parsed item is converted to or
+other special handling.
 
 By default all named captures are converted into string fields.
-Modifiers can be used to convert captures to other types or tags.
 Timestamp modifiers can be used to convert captures to the timestamp of the
- parsed metric.
-
+parsed metric.  If no timestamp is parsed the metric will be created using the
+current time.
 
 - Available modifiers:
   - string   (default if nothing is specified)
@@ -91,7 +84,112 @@ Timestamp modifiers can be used to convert captures to the timestamp of the
   - ts-epochnano     (nanoseconds since unix epoch)
   - ts-"CUSTOM"
 
-
 CUSTOM time layouts must be within quotes and be the representation of the
 "reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`
 See https://golang.org/pkg/time/#Parse for more details.
+
+Telegraf has many of its own
+[built-in patterns](./grok/patterns/influx-patterns),
+as well as supporting
+[logstash's builtin patterns](https://github.com/logstash-plugins/logstash-patterns-core/blob/master/patterns/grok-patterns).
+
+If you need help building patterns to match your logs,
+you will find the https://grokdebug.herokuapp.com application quite useful!
+
+#### Timestamp Examples
+
+This example input and config parses a file using a custom timestamp conversion:
+
+```
+2017-02-21 13:10:34 value=42
+```
+
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+    patterns = ['%{TIMESTAMP_ISO8601:timestamp:ts-"2006-01-02 15:04:05"} value=%{NUMBER:value:int}']
+```
+
+This example parses a file using a built-in conversion and a custom pattern:
+
+```
+Wed Apr 12 13:10:34 PST 2017 value=42
+```
+
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+	patterns = ["%{TS_UNIX:timestamp:ts-unix} value=%{NUMBER:value:int}"]
+    custom_patterns = '''
+      TS_UNIX %{DAY} %{MONTH} %{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} %{TZ} %{YEAR}
+    '''
+```
+
+#### TOML Escaping
+
+When saving patterns to the configuration file, keep in mind the different TOML
+[string](https://github.com/toml-lang/toml#string) types and the escaping
+rules for each.  These escaping rules must be applied in addition to the
+escaping required by the grok syntax.  Using the Multi-line line literal
+syntax with `'''` may be useful.
+
+The following config examples will parse this input file:
+
+```
+|42|\uD83D\uDC2F|'telegraf'|
+```
+
+Since `|` is a special character in the grok language, we must escape it to
+get a literal `|`.  With a basic TOML string, special characters such as
+backslash must be escaped, requiring us to escape the backslash a second time.
+
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+    patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+    custom_patterns = "UNICODE_ESCAPE (?:\\\\u[0-9A-F]{4})+"
+```
+
+We cannot use a literal TOML string for the pattern, because we cannot match a
+`'` within it.  However, it works well for the custom pattern.
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+    patterns = ["\\|%{NUMBER:value:int}\\|%{UNICODE_ESCAPE:escape}\\|'%{WORD:name}'\\|"]
+    custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
+```
+
+A multi-line literal string allows us to encode the pattern:
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+    patterns = ['''
+	  \|%{NUMBER:value:int}\|%{UNICODE_ESCAPE:escape}\|'%{WORD:name}'\|
+	''']
+    custom_patterns = 'UNICODE_ESCAPE (?:\\u[0-9A-F]{4})+'
+```
+
+### Tips for creating patterns
+
+Writing complex patterns can be difficult, here is some advice for writing a
+new pattern or testing a pattern developed [online](https://grokdebug.herokuapp.com).
+
+Create a file output that writes to stdout, and disable other outputs while
+testing.  This will allow you to see the captured metrics.  Keep in mind that
+the file output will only print once per `flush_interval`.
+
+```toml
+[[outputs.file]]
+  files = ["stdout"]
+```
+
+- Start with a file containing only a single line of your input.
+- Remove all but the first token or piece of the line.
+- Add the section of your pattern to match this piece to your configuration file.
+- Verify that the metric is parsed successfully by running Telegraf.
+- If successful, add the next token, update the pattern and retest.
+- Continue one token at a time until the entire line is successfully parsed.
+
+### Additional Resources
+
+- https://www.influxdata.com/telegraf-correlate-log-metrics-data-performance-bottlenecks/
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 7131b8249..f684e9339 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -168,6 +168,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	}
 
 	if len(values) == 0 {
+		log.Printf("D! Grok no match found for: %q", line)
 		return nil, nil
 	}
 

From b968759d1015f47bf60de5ec05e762a994692110 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 13 Apr 2017 18:56:04 -0700
Subject: [PATCH 0202/1302] Use variadic disk.IOCounters() function

---
 Godeps                      | 2 +-
 plugins/inputs/system/ps.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Godeps b/Godeps
index 0a7cc30a5..510f5b1ed 100644
--- a/Godeps
+++ b/Godeps
@@ -45,7 +45,7 @@ github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
 github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/shirou/gopsutil dfbb3e40da8d6fcd1aa0d87003e965fe0ca745ea
+github.com/shirou/gopsutil 70693b6a3da51a8a686d31f1b346077bbc066062
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index d25327812..20e01742a 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -121,7 +121,7 @@ func (s *systemPS) NetConnections() ([]net.ConnectionStat, error) {
 }
 
 func (s *systemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
-	m, err := disk.IOCountersForNames(names)
+	m, err := disk.IOCounters(names...)
 	if err == internal.NotImplementedError {
 		return nil, nil
 	}

From dc5779e2a7f60bd28db4161115d0e2b871b27e76 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 14 Apr 2017 17:32:14 -0700
Subject: [PATCH 0203/1302] Rename heap_objects_bytes to heap_objects in
 internal plugin. (#2674)

* Rename heap_objects_bytes to heap_objects in internal plugin.

This field does not contain bytes

fixes #2671
---
 CHANGELOG.md                        | 1 +
 plugins/inputs/internal/internal.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4792790f..989e3f7a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@ be deprecated eventually.
 - [#2410](https://github.com/influxdata/telegraf/issues/2410): Fix connection leak in postgresql.
 - [#2628](https://github.com/influxdata/telegraf/issues/2628): Set default measurement name for snmp input.
 - [#2649](https://github.com/influxdata/telegraf/pull/2649): Improve performance of diskio with many disks
+- [#2671](https://github.com/influxdata/telegraf/issues/2671): The internal input plugin uses the wrong units for `heap_objects`
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/internal/internal.go b/plugins/inputs/internal/internal.go
index f6123edd5..8b5286f56 100644
--- a/plugins/inputs/internal/internal.go
+++ b/plugins/inputs/internal/internal.go
@@ -48,7 +48,7 @@ func (s *Self) Gather(acc telegraf.Accumulator) error {
 			"heap_idle_bytes":     m.HeapIdle,     // bytes in idle spans
 			"heap_in_use_bytes":   m.HeapInuse,    // bytes in non-idle span
 			"heap_released_bytes": m.HeapReleased, // bytes released to the OS
-			"heap_objects_bytes":  m.HeapObjects,  // total number of allocated objects
+			"heap_objects":        m.HeapObjects,  // total number of allocated objects
 			"num_gc":              m.NumGC,
 		}
 		acc.AddFields("internal_memstats", fields, map[string]string{})

From 58ee96267900a5451efd9eb488b7f4e72fe4694d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Mon, 17 Apr 2017 18:42:03 +0000
Subject: [PATCH 0204/1302] GitHub webhooks: check signature (#2493)

---
 CHANGELOG.md                                  |  1 +
 etc/telegraf.conf                             |  1 +
 plugins/inputs/webhooks/github/README.md      |  2 ++
 .../inputs/webhooks/github/github_webhooks.go | 28 ++++++++++++++--
 .../webhooks/github/github_webhooks_test.go   | 33 +++++++++++++++++++
 plugins/inputs/webhooks/webhooks.go           |  1 +
 6 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 989e3f7a9..6715ef3bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@ be deprecated eventually.
 - [#2636](https://github.com/influxdata/telegraf/pull/2636): Add `message_len_max` option to `kafka_consumer` input
 - [#1100](https://github.com/influxdata/telegraf/issues/1100): Add collectd parser
 - [#1820](https://github.com/influxdata/telegraf/issues/1820): easier plugin testing without outputs
+- [#2493](https://github.com/influxdata/telegraf/pull/2493): Check signature in the GitHub webhook plugin
 
 ### Bugfixes
 
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 63e41d7bb..07ae5ac8f 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2382,6 +2382,7 @@
 #
 #   [inputs.webhooks.github]
 #     path = "/github"
+#     # secret = ""
 #
 #   [inputs.webhooks.mandrill]
 #     path = "/mandrill"
diff --git a/plugins/inputs/webhooks/github/README.md b/plugins/inputs/webhooks/github/README.md
index 68594cd78..908d92a63 100644
--- a/plugins/inputs/webhooks/github/README.md
+++ b/plugins/inputs/webhooks/github/README.md
@@ -2,6 +2,8 @@
 
 You should configure your Organization's Webhooks to point at the `webhooks` service. To do this go to `github.com/{my_organization}` and click `Settings > Webhooks > Add webhook`. In the resulting menu set `Payload URL` to `http://<my_ip>:1619/github`, `Content type` to `application/json` and under the section `Which events would you like to trigger this webhook?` select 'Send me <b>everything</b>'. By default all of the events will write to the `github_webhooks` measurement, this is configurable by setting the `measurement_name` in the config file.
 
+You can also add a secret that will be used by telegraf to verify the authenticity of the requests.
+
 ## Events
 
 The titles of the following sections are links to the full payloads and details for each event. The body contains what information from the event is persisted. The format is as follows:
diff --git a/plugins/inputs/webhooks/github/github_webhooks.go b/plugins/inputs/webhooks/github/github_webhooks.go
index a31c6fdf2..0bb792bf5 100644
--- a/plugins/inputs/webhooks/github/github_webhooks.go
+++ b/plugins/inputs/webhooks/github/github_webhooks.go
@@ -1,6 +1,9 @@
 package github
 
 import (
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/hex"
 	"encoding/json"
 	"io/ioutil"
 	"log"
@@ -11,8 +14,9 @@ import (
 )
 
 type GithubWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
+	Path   string
+	Secret string
+	acc    telegraf.Accumulator
 }
 
 func (gh *GithubWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
@@ -23,12 +27,19 @@ func (gh *GithubWebhook) Register(router *mux.Router, acc telegraf.Accumulator)
 
 func (gh *GithubWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
-	eventType := r.Header["X-Github-Event"][0]
+	eventType := r.Header.Get("X-Github-Event")
 	data, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
+
+	if gh.Secret != "" && !checkSignature(gh.Secret, data, r.Header.Get("X-Hub-Signature")) {
+		log.Printf("E! Fail to check the github webhook signature\n")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
 	e, err := NewEvent(data, eventType)
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
@@ -108,3 +119,14 @@ func NewEvent(data []byte, name string) (Event, error) {
 	}
 	return nil, &newEventError{"Not a recognized event type"}
 }
+
+func checkSignature(secret string, data []byte, signature string) bool {
+	return hmac.Equal([]byte(signature), []byte(generateSignature(secret, data)))
+}
+
+func generateSignature(secret string, data []byte) string {
+	mac := hmac.New(sha1.New, []byte(secret))
+	mac.Write(data)
+	result := mac.Sum(nil)
+	return "sha1=" + hex.EncodeToString(result)
+}
diff --git a/plugins/inputs/webhooks/github/github_webhooks_test.go b/plugins/inputs/webhooks/github/github_webhooks_test.go
index 0ec991726..65041e4a0 100644
--- a/plugins/inputs/webhooks/github/github_webhooks_test.go
+++ b/plugins/inputs/webhooks/github/github_webhooks_test.go
@@ -21,6 +21,19 @@ func GithubWebhookRequest(event string, jsonString string, t *testing.T) {
 	}
 }
 
+func GithubWebhookRequestWithSignature(event string, jsonString string, t *testing.T, signature string, expectedStatus int) {
+	var acc testutil.Accumulator
+	gh := &GithubWebhook{Path: "/github", Secret: "signature", acc: &acc}
+	req, _ := http.NewRequest("POST", "/github", strings.NewReader(jsonString))
+	req.Header.Add("X-Github-Event", event)
+	req.Header.Add("X-Hub-Signature", signature)
+	w := httptest.NewRecorder()
+	gh.eventHandler(w, req)
+	if w.Code != expectedStatus {
+		t.Errorf("POST "+event+" returned HTTP status code %v.\nExpected %v", w.Code, expectedStatus)
+	}
+}
+
 func TestCommitCommentEvent(t *testing.T) {
 	GithubWebhookRequest("commit_comment", CommitCommentEventJSON(), t)
 }
@@ -100,3 +113,23 @@ func TestTeamAddEvent(t *testing.T) {
 func TestWatchEvent(t *testing.T) {
 	GithubWebhookRequest("watch", WatchEventJSON(), t)
 }
+
+func TestEventWithSignatureFail(t *testing.T) {
+	GithubWebhookRequestWithSignature("watch", WatchEventJSON(), t, "signature", http.StatusBadRequest)
+}
+
+func TestEventWithSignatureSuccess(t *testing.T) {
+	GithubWebhookRequestWithSignature("watch", WatchEventJSON(), t, generateSignature("signature", []byte(WatchEventJSON())), http.StatusOK)
+}
+
+func TestCheckSignatureSuccess(t *testing.T) {
+	if !checkSignature("my_little_secret", []byte("random-signature-body"), "sha1=3dca279e731c97c38e3019a075dee9ebbd0a99f0") {
+		t.Errorf("check signature failed")
+	}
+}
+
+func TestCheckSignatureFailed(t *testing.T) {
+	if checkSignature("m_little_secret", []byte("random-signature-body"), "sha1=3dca279e731c97c38e3019a075dee9ebbd0a99f0") {
+		t.Errorf("check signature failed")
+	}
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index fcddbebd7..bc8519d7a 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -47,6 +47,7 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.github]
     path = "/github"
+    # secret = ""
 
   [inputs.webhooks.mandrill]
     path = "/mandrill"

From 70b3e763e79d2c9dfaed228f9eaf9591655a1505 Mon Sep 17 00:00:00 2001
From: Ross McDonald <rossmcdonald@users.noreply.github.com>
Date: Mon, 17 Apr 2017 15:49:36 -0500
Subject: [PATCH 0205/1302] Add input for receiving papertrail webhooks (#2038)

---
 CHANGELOG.md                                  |   1 +
 plugins/inputs/webhooks/README.md             |   1 +
 plugins/inputs/webhooks/papertrail/README.md  |  32 ++++
 .../webhooks/papertrail/papertrail_test.go    | 181 ++++++++++++++++++
 .../papertrail/papertrail_webhooks.go         |  79 ++++++++
 .../papertrail/papertrail_webhooks_models.go  |  41 ++++
 plugins/inputs/webhooks/webhooks.go           |  13 +-
 plugins/inputs/webhooks/webhooks_test.go      |   7 +
 8 files changed, 351 insertions(+), 4 deletions(-)
 create mode 100644 plugins/inputs/webhooks/papertrail/README.md
 create mode 100644 plugins/inputs/webhooks/papertrail/papertrail_test.go
 create mode 100644 plugins/inputs/webhooks/papertrail/papertrail_webhooks.go
 create mode 100644 plugins/inputs/webhooks/papertrail/papertrail_webhooks_models.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6715ef3bb..0c7b7c2fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ be deprecated eventually.
 - [#1100](https://github.com/influxdata/telegraf/issues/1100): Add collectd parser
 - [#1820](https://github.com/influxdata/telegraf/issues/1820): easier plugin testing without outputs
 - [#2493](https://github.com/influxdata/telegraf/pull/2493): Check signature in the GitHub webhook plugin
+- [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
 
 ### Bugfixes
 
diff --git a/plugins/inputs/webhooks/README.md b/plugins/inputs/webhooks/README.md
index bc7714e9e..8b789e338 100644
--- a/plugins/inputs/webhooks/README.md
+++ b/plugins/inputs/webhooks/README.md
@@ -19,6 +19,7 @@ $ sudo service telegraf start
 - [Github](github/)
 - [Mandrill](mandrill/)
 - [Rollbar](rollbar/)
+- [Papertrail](papertrail/)
 
 ## Adding new webhooks plugin
 
diff --git a/plugins/inputs/webhooks/papertrail/README.md b/plugins/inputs/webhooks/papertrail/README.md
new file mode 100644
index 000000000..a3463dcaa
--- /dev/null
+++ b/plugins/inputs/webhooks/papertrail/README.md
@@ -0,0 +1,32 @@
+# papertrail webhooks
+
+Enables Telegraf to act as a [Papertrail Webhook](http://help.papertrailapp.com/kb/how-it-works/web-hooks/).
+
+## Events
+
+[Full documentation](http://help.papertrailapp.com/kb/how-it-works/web-hooks/#callback).
+
+Events from Papertrail come in two forms:
+
+* The [event-based callback](http://help.papertrailapp.com/kb/how-it-works/web-hooks/#callback):
+
+  * A point is created per event, with the timestamp as `received_at`
+  * Each point has a field counter (`count`), which is set to `1` (signifying the event occurred)
+  * Each event "hostname" object is converted to a `host` tag
+  * The "saved_search" name in the payload is added as an `event` tag
+
+* The [count-based callback](http://help.papertrailapp.com/kb/how-it-works/web-hooks/#count-only-webhooks)
+
+  * A point is created per timeseries object per count, with the timestamp as the "timeseries" key (the unix epoch of the event)
+  * Each point has a field counter (`count`), which is set to the value of each "timeseries" object
+  * Each count "source_name" object is converted to a `host` tag
+  * The "saved_search" name in the payload is added as an `event` tag
+
+The current functionality is very basic, however this allows you to
+track the number of events by host and saved search.
+
+When an event is received, any point will look similar to:
+
+```
+papertrail,host=myserver.example.com,event=saved_search_name count=3i 1453248892000000000
+```
diff --git a/plugins/inputs/webhooks/papertrail/papertrail_test.go b/plugins/inputs/webhooks/papertrail/papertrail_test.go
new file mode 100644
index 000000000..14b8aec89
--- /dev/null
+++ b/plugins/inputs/webhooks/papertrail/papertrail_test.go
@@ -0,0 +1,181 @@
+package papertrail
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	contentType = "application/x-www-form-urlencoded"
+)
+
+func post(pt *PapertrailWebhook, contentType string, body string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(body))
+	req.Header.Set("Content-Type", contentType)
+	w := httptest.NewRecorder()
+	pt.eventHandler(w, req)
+	return w
+}
+
+func TestWrongContentType(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+	form := url.Values{}
+	form.Set("payload", sampleEventPayload)
+	data := form.Encode()
+
+	resp := post(pt, "", data)
+	require.Equal(t, http.StatusUnsupportedMediaType, resp.Code)
+}
+
+func TestMissingPayload(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+
+	resp := post(pt, contentType, "")
+	require.Equal(t, http.StatusBadRequest, resp.Code)
+}
+
+func TestPayloadNotJSON(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+
+	resp := post(pt, contentType, "payload={asdf]")
+	require.Equal(t, http.StatusBadRequest, resp.Code)
+}
+
+func TestPayloadInvalidJSON(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+
+	resp := post(pt, contentType, `payload={"value": 42}`)
+	require.Equal(t, http.StatusBadRequest, resp.Code)
+}
+
+func TestEventPayload(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+
+	form := url.Values{}
+	form.Set("payload", sampleEventPayload)
+	resp := post(pt, contentType, form.Encode())
+	require.Equal(t, http.StatusOK, resp.Code)
+
+	fields := map[string]interface{}{
+		"count": uint64(1),
+	}
+
+	tags1 := map[string]string{
+		"event": "Important stuff",
+		"host":  "abc",
+	}
+	tags2 := map[string]string{
+		"event": "Important stuff",
+		"host":  "def",
+	}
+
+	acc.AssertContainsTaggedFields(t, "papertrail", fields, tags1)
+	acc.AssertContainsTaggedFields(t, "papertrail", fields, tags2)
+}
+
+func TestCountPayload(t *testing.T) {
+	var acc testutil.Accumulator
+	pt := &PapertrailWebhook{Path: "/papertrail", acc: &acc}
+	form := url.Values{}
+	form.Set("payload", sampleCountPayload)
+	resp := post(pt, contentType, form.Encode())
+	require.Equal(t, http.StatusOK, resp.Code)
+
+	fields1 := map[string]interface{}{
+		"count": uint64(5),
+	}
+	fields2 := map[string]interface{}{
+		"count": uint64(3),
+	}
+
+	tags1 := map[string]string{
+		"event": "Important stuff",
+		"host":  "arthur",
+	}
+	tags2 := map[string]string{
+		"event": "Important stuff",
+		"host":  "ford",
+	}
+
+	acc.AssertContainsTaggedFields(t, "papertrail", fields1, tags1)
+	acc.AssertContainsTaggedFields(t, "papertrail", fields2, tags2)
+}
+
+const sampleEventPayload = `{
+  "events": [
+    {
+      "id": 7711561783320576,
+      "received_at": "2011-05-18T20:30:02-07:00",
+      "display_received_at": "May 18 20:30:02",
+      "source_ip": "208.75.57.121",
+      "source_name": "abc",
+      "source_id": 2,
+      "hostname": "abc",
+      "program": "CROND",
+      "severity": "Info",
+      "facility": "Cron",
+      "message": "message body"
+    },
+    {
+      "id": 7711562567655424,
+      "received_at": "2011-05-18T20:30:02-07:00",
+      "display_received_at": "May 18 20:30:02",
+      "source_ip": "208.75.57.120",
+      "source_name": "server1",
+      "source_id": 19,
+      "hostname": "def",
+      "program": "CROND",
+      "severity": "Info",
+      "facility": "Cron",
+      "message": "A short event"
+    }
+  ],
+  "saved_search": {
+    "id": 42,
+    "name": "Important stuff",
+    "query": "cron OR server1",
+    "html_edit_url": "https://papertrailapp.com/searches/42/edit",
+    "html_search_url": "https://papertrailapp.com/searches/42"
+  },
+  "max_id": "7711582041804800",
+  "min_id": "7711561783320576"
+}`
+
+const sampleCountPayload = `{
+   "counts": [
+     {
+       "source_name": "arthur",
+       "source_id": 4,
+       "timeseries": {
+         "1453248895": 5
+       }
+     },
+     {
+       "source_name": "ford",
+       "source_id": 3,
+       "timeseries": {
+         "1453248927": 3
+       }
+     }
+   ],
+   "saved_search": {
+     "id": 42,
+     "name": "Important stuff",
+     "query": "cron OR server1",
+     "html_edit_url": "https://papertrailapp.com/searches/42/edit",
+     "html_search_url": "https://papertrailapp.com/searches/42"
+   },
+   "max_id": "7711582041804800",
+   "min_id": "7711561783320576"
+}`
diff --git a/plugins/inputs/webhooks/papertrail/papertrail_webhooks.go b/plugins/inputs/webhooks/papertrail/papertrail_webhooks.go
new file mode 100644
index 000000000..42453c130
--- /dev/null
+++ b/plugins/inputs/webhooks/papertrail/papertrail_webhooks.go
@@ -0,0 +1,79 @@
+package papertrail
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+)
+
+type PapertrailWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (pt *PapertrailWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(pt.Path, pt.eventHandler).Methods("POST")
+	log.Printf("I! Started the papertrail_webhook on %s", pt.Path)
+	pt.acc = acc
+}
+
+func (pt *PapertrailWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	if r.Header.Get("Content-Type") != "application/x-www-form-urlencoded" {
+		http.Error(w, "Unsupported Media Type", http.StatusUnsupportedMediaType)
+		return
+	}
+
+	data := r.PostFormValue("payload")
+	if data == "" {
+		http.Error(w, "Bad Request", http.StatusBadRequest)
+		return
+	}
+
+	var payload Payload
+	err := json.Unmarshal([]byte(data), &payload)
+	if err != nil {
+		http.Error(w, "Bad Request", http.StatusBadRequest)
+		return
+	}
+
+	if payload.Events != nil {
+
+		// Handle event-based payload
+		for _, e := range payload.Events {
+			// Warning: Duplicate event timestamps will overwrite each other
+			tags := map[string]string{
+				"host":  e.Hostname,
+				"event": payload.SavedSearch.Name,
+			}
+			fields := map[string]interface{}{
+				"count": uint64(1),
+			}
+			pt.acc.AddFields("papertrail", fields, tags, e.ReceivedAt)
+		}
+
+	} else if payload.Counts != nil {
+
+		// Handle count-based payload
+		for _, c := range payload.Counts {
+			for ts, count := range *c.TimeSeries {
+				tags := map[string]string{
+					"host":  c.SourceName,
+					"event": payload.SavedSearch.Name,
+				}
+				fields := map[string]interface{}{
+					"count": count,
+				}
+				pt.acc.AddFields("papertrail", fields, tags, time.Unix(ts, 0))
+			}
+		}
+	} else {
+		http.Error(w, "Bad Request", http.StatusBadRequest)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/papertrail/papertrail_webhooks_models.go b/plugins/inputs/webhooks/papertrail/papertrail_webhooks_models.go
new file mode 100644
index 000000000..dd4e8d8bd
--- /dev/null
+++ b/plugins/inputs/webhooks/papertrail/papertrail_webhooks_models.go
@@ -0,0 +1,41 @@
+package papertrail
+
+import (
+	"time"
+)
+
+type Event struct {
+	ID                int64     `json:"id"`
+	ReceivedAt        time.Time `json:"received_at"`
+	DisplayReceivedAt string    `json:"display_received_at"`
+	SourceIP          string    `json:"source_ip"`
+	SourceName        string    `json:"source_name"`
+	SourceID          int       `json:"source_id"`
+	Hostname          string    `json:"hostname"`
+	Program           string    `json:"program"`
+	Severity          string    `json:"severity"`
+	Facility          string    `json:"facility"`
+	Message           string    `json:"message"`
+}
+
+type Count struct {
+	SourceName string            `json:"source_name"`
+	SourceID   int64             `json:"source_id"`
+	TimeSeries *map[int64]uint64 `json:"timeseries"`
+}
+
+type SavedSearch struct {
+	ID        int64  `json:"id"`
+	Name      string `json:"name"`
+	Query     string `json:"query"`
+	EditURL   string `json:"html_edit_url"`
+	SearchURL string `json:"html_search_url"`
+}
+
+type Payload struct {
+	Events      []*Event     `json:"events"`
+	Counts      []*Count     `json:"counts"`
+	SavedSearch *SavedSearch `json:"saved_search"`
+	MaxID       string       `json:"max_id"`
+	MinID       string       `json:"min_id"`
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index bc8519d7a..7ed1ccd51 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -13,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/filestack"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -27,10 +28,11 @@ func init() {
 type Webhooks struct {
 	ServiceAddress string
 
-	Github    *github.GithubWebhook
-	Filestack *filestack.FilestackWebhook
-	Mandrill  *mandrill.MandrillWebhook
-	Rollbar   *rollbar.RollbarWebhook
+	Github     *github.GithubWebhook
+	Filestack  *filestack.FilestackWebhook
+	Mandrill   *mandrill.MandrillWebhook
+	Rollbar    *rollbar.RollbarWebhook
+	Papertrail *papertrail.PapertrailWebhook
 }
 
 func NewWebhooks() *Webhooks {
@@ -54,6 +56,9 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.rollbar]
     path = "/rollbar"
+
+  [inputs.webhooks.papertrail]
+    path = "/papertrail"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 85d359e1c..6d3448870 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -26,4 +27,10 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
+
+	wb.Papertrail = &papertrail.PapertrailWebhook{Path: "/papertrail"}
+	expected = append(expected, wb.Papertrail)
+	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
+		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
+	}
 }

From eb7ef5392e14b964877a2239976267d86dbd83c6 Mon Sep 17 00:00:00 2001
From: Nikolay Denev <ndenev@gmail.com>
Date: Tue, 18 Apr 2017 19:42:58 +0100
Subject: [PATCH 0206/1302] Simplify system.DiskUsage() (#2630)

---
 plugins/inputs/system/cpu.go       |   2 +-
 plugins/inputs/system/disk.go      |   5 +-
 plugins/inputs/system/disk_test.go | 108 +++++++++++++++++++++++++++++
 plugins/inputs/system/memory.go    |   5 +-
 plugins/inputs/system/mock_PS.go   |  44 ++++++++++++
 plugins/inputs/system/net.go       |   2 +-
 plugins/inputs/system/netstat.go   |   2 +-
 plugins/inputs/system/ps.go        |  72 +++++++++++++------
 8 files changed, 212 insertions(+), 28 deletions(-)

diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/system/cpu.go
index 3ed2606fa..e6aa9f22d 100644
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/system/cpu.go
@@ -121,7 +121,7 @@ func init() {
 		return &CPUStats{
 			PerCPU:   true,
 			TotalCPU: true,
-			ps:       &systemPS{},
+			ps:       newSystemPS(),
 		}
 	})
 }
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 004466f83..46f2219a7 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -219,11 +219,12 @@ func (s *DiskIOStats) diskTags(devName string) map[string]string {
 }
 
 func init() {
+	ps := newSystemPS()
 	inputs.Add("disk", func() telegraf.Input {
-		return &DiskStats{ps: &systemPS{}}
+		return &DiskStats{ps: ps}
 	})
 
 	inputs.Add("diskio", func() telegraf.Input {
-		return &DiskIOStats{ps: &systemPS{}, SkipSerialNumber: true}
+		return &DiskIOStats{ps: ps, SkipSerialNumber: true}
 	})
 }
diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/system/disk_test.go
index fc0ff4d0d..5ba4d041f 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -1,14 +1,122 @@
 package system
 
 import (
+	"os"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
+type MockFileInfo struct {
+	os.FileInfo
+}
+
+func TestDiskUsage(t *testing.T) {
+	mck := &mock.Mock{}
+	mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+	defer mps.AssertExpectations(t)
+
+	var acc testutil.Accumulator
+	var err error
+
+	psAll := []disk.PartitionStat{
+		{
+			Device:     "/dev/sda",
+			Mountpoint: "/",
+			Fstype:     "ext4",
+			Opts:       "",
+		},
+		{
+			Device:     "/dev/sdb",
+			Mountpoint: "/home",
+			Fstype:     "ext4",
+			Opts:       "",
+		},
+	}
+	duAll := []disk.UsageStat{
+		{
+			Path:        "/",
+			Fstype:      "ext4",
+			Total:       128,
+			Free:        23,
+			Used:        100,
+			InodesTotal: 1234,
+			InodesFree:  234,
+			InodesUsed:  1000,
+		},
+		{
+			Path:        "/home",
+			Fstype:      "ext4",
+			Total:       256,
+			Free:        46,
+			Used:        200,
+			InodesTotal: 2468,
+			InodesFree:  468,
+			InodesUsed:  2000,
+		},
+	}
+
+	mps.On("Partitions", true).Return(psAll, nil)
+	mps.On("OSGetenv", "HOST_MOUNT_PREFIX").Return("")
+	mps.On("OSStat", "/").Return(MockFileInfo{}, nil)
+	mps.On("OSStat", "/home").Return(MockFileInfo{}, nil)
+	mps.On("PSDiskUsage", "/").Return(&duAll[0], nil)
+	mps.On("PSDiskUsage", "/home").Return(&duAll[1], nil)
+
+	err = (&DiskStats{ps: mps}).Gather(&acc)
+	require.NoError(t, err)
+
+	numDiskMetrics := acc.NFields()
+	expectedAllDiskMetrics := 14
+	assert.Equal(t, expectedAllDiskMetrics, numDiskMetrics)
+
+	tags1 := map[string]string{
+		"path":   "/",
+		"fstype": "ext4",
+		"device": "sda",
+	}
+	tags2 := map[string]string{
+		"path":   "/home",
+		"fstype": "ext4",
+		"device": "sdb",
+	}
+
+	fields1 := map[string]interface{}{
+		"total":        uint64(128),
+		"used":         uint64(100),
+		"free":         uint64(23),
+		"inodes_total": uint64(1234),
+		"inodes_free":  uint64(234),
+		"inodes_used":  uint64(1000),
+		"used_percent": float64(81.30081300813008),
+	}
+	fields2 := map[string]interface{}{
+		"total":        uint64(256),
+		"used":         uint64(200),
+		"free":         uint64(46),
+		"inodes_total": uint64(2468),
+		"inodes_free":  uint64(468),
+		"inodes_used":  uint64(2000),
+		"used_percent": float64(81.30081300813008),
+	}
+	acc.AssertContainsTaggedFields(t, "disk", fields1, tags1)
+	acc.AssertContainsTaggedFields(t, "disk", fields2, tags2)
+
+	// We expect 6 more DiskMetrics to show up with an explicit match on "/"
+	// and /home not matching the /dev in MountPoints
+	err = (&DiskStats{ps: &mps, MountPoints: []string{"/", "/dev"}}).Gather(&acc)
+	assert.Equal(t, expectedAllDiskMetrics+7, acc.NFields())
+
+	// We should see all the diskpoints as MountPoints includes both
+	// / and /home
+	err = (&DiskStats{ps: &mps, MountPoints: []string{"/", "/home"}}).Gather(&acc)
+	assert.Equal(t, 2*expectedAllDiskMetrics+7, acc.NFields())
+}
+
 func TestDiskStats(t *testing.T) {
 	var mps MockPS
 	defer mps.AssertExpectations(t)
diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go
index 26dc550f8..3f679b36c 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -73,11 +73,12 @@ func (s *SwapStats) Gather(acc telegraf.Accumulator) error {
 }
 
 func init() {
+	ps := newSystemPS()
 	inputs.Add("mem", func() telegraf.Input {
-		return &MemStats{ps: &systemPS{}}
+		return &MemStats{ps: ps}
 	})
 
 	inputs.Add("swap", func() telegraf.Input {
-		return &SwapStats{ps: &systemPS{}}
+		return &SwapStats{ps: ps}
 	})
 }
diff --git a/plugins/inputs/system/mock_PS.go b/plugins/inputs/system/mock_PS.go
index a83a8b803..d5093f031 100644
--- a/plugins/inputs/system/mock_PS.go
+++ b/plugins/inputs/system/mock_PS.go
@@ -1,6 +1,8 @@
 package system
 
 import (
+	"os"
+
 	"github.com/stretchr/testify/mock"
 
 	"github.com/shirou/gopsutil/cpu"
@@ -13,6 +15,16 @@ import (
 
 type MockPS struct {
 	mock.Mock
+	PSDiskDeps
+}
+
+type MockPSDisk struct {
+	*systemPS
+	*mock.Mock
+}
+
+type mockDiskUsage struct {
+	*mock.Mock
 }
 
 func (m *MockPS) LoadAvg() (*load.AvgStat, error) {
@@ -96,3 +108,35 @@ func (m *MockPS) NetConnections() ([]net.ConnectionStat, error) {
 
 	return r0, r1
 }
+
+func (m *mockDiskUsage) Partitions(all bool) ([]disk.PartitionStat, error) {
+	ret := m.Called(all)
+
+	r0 := ret.Get(0).([]disk.PartitionStat)
+	r1 := ret.Error(1)
+
+	return r0, r1
+}
+
+func (m *mockDiskUsage) OSGetenv(key string) string {
+	ret := m.Called(key)
+	return ret.Get(0).(string)
+}
+
+func (m *mockDiskUsage) OSStat(name string) (os.FileInfo, error) {
+	ret := m.Called(name)
+
+	r0 := ret.Get(0).(os.FileInfo)
+	r1 := ret.Error(1)
+
+	return r0, r1
+}
+
+func (m *mockDiskUsage) PSDiskUsage(path string) (*disk.UsageStat, error) {
+	ret := m.Called(path)
+
+	r0 := ret.Get(0).(*disk.UsageStat)
+	r1 := ret.Error(1)
+
+	return r0, r1
+}
diff --git a/plugins/inputs/system/net.go b/plugins/inputs/system/net.go
index 3f89176fb..f47a2cc6c 100644
--- a/plugins/inputs/system/net.go
+++ b/plugins/inputs/system/net.go
@@ -105,6 +105,6 @@ func (s *NetIOStats) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("net", func() telegraf.Input {
-		return &NetIOStats{ps: &systemPS{}}
+		return &NetIOStats{ps: newSystemPS()}
 	})
 }
diff --git a/plugins/inputs/system/netstat.go b/plugins/inputs/system/netstat.go
index 98b729bbe..1699e0808 100644
--- a/plugins/inputs/system/netstat.go
+++ b/plugins/inputs/system/netstat.go
@@ -66,6 +66,6 @@ func (s *NetStats) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("netstat", func() telegraf.Input {
-		return &NetStats{ps: &systemPS{}}
+		return &NetStats{ps: newSystemPS()}
 	})
 }
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index 20e01742a..979a3b164 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -23,6 +23,13 @@ type PS interface {
 	NetConnections() ([]net.ConnectionStat, error)
 }
 
+type PSDiskDeps interface {
+	Partitions(all bool) ([]disk.PartitionStat, error)
+	OSGetenv(key string) string
+	OSStat(name string) (os.FileInfo, error)
+	PSDiskUsage(path string) (*disk.UsageStat, error)
+}
+
 func add(acc telegraf.Accumulator,
 	name string, val float64, tags map[string]string) {
 	if val >= 0 {
@@ -30,7 +37,15 @@ func add(acc telegraf.Accumulator,
 	}
 }
 
-type systemPS struct{}
+func newSystemPS() *systemPS {
+	return &systemPS{&systemPSDisk{}}
+}
+
+type systemPS struct {
+	PSDiskDeps
+}
+
+type systemPSDisk struct{}
 
 func (s *systemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
 	var cpuTimes []cpu.TimesStat
@@ -55,7 +70,7 @@ func (s *systemPS) DiskUsage(
 	mountPointFilter []string,
 	fstypeExclude []string,
 ) ([]*disk.UsageStat, []*disk.PartitionStat, error) {
-	parts, err := disk.Partitions(true)
+	parts, err := s.Partitions(true)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -74,35 +89,34 @@ func (s *systemPS) DiskUsage(
 	var partitions []*disk.PartitionStat
 
 	for i := range parts {
-
 		p := parts[i]
 
 		if len(mountPointFilter) > 0 {
 			// If the mount point is not a member of the filter set,
 			// don't gather info on it.
-			_, ok := mountPointFilterSet[p.Mountpoint]
-			if !ok {
+			if _, ok := mountPointFilterSet[p.Mountpoint]; !ok {
 				continue
 			}
 		}
-		mountpoint := os.Getenv("HOST_MOUNT_PREFIX") + p.Mountpoint
-		if _, err := os.Stat(mountpoint); err == nil {
-			du, err := disk.Usage(mountpoint)
-			if err != nil {
-				return nil, nil, err
-			}
-			du.Path = p.Mountpoint
 
-			// If the mount point is a member of the exclude set,
-			// don't gather info on it.
-			_, ok := fstypeExcludeSet[p.Fstype]
-			if ok {
-				continue
-			}
-			du.Fstype = p.Fstype
-			usage = append(usage, du)
-			partitions = append(partitions, &p)
+		// If the mount point is a member of the exclude set,
+		// don't gather info on it.
+		if _, ok := fstypeExcludeSet[p.Fstype]; ok {
+			continue
 		}
+
+		mountpoint := s.OSGetenv("HOST_MOUNT_PREFIX") + p.Mountpoint
+		if _, err := s.OSStat(mountpoint); err != nil {
+			continue
+		}
+		du, err := s.PSDiskUsage(mountpoint)
+		if err != nil {
+			continue
+		}
+		du.Path = p.Mountpoint
+		du.Fstype = p.Fstype
+		usage = append(usage, du)
+		partitions = append(partitions, &p)
 	}
 
 	return usage, partitions, nil
@@ -136,3 +150,19 @@ func (s *systemPS) VMStat() (*mem.VirtualMemoryStat, error) {
 func (s *systemPS) SwapStat() (*mem.SwapMemoryStat, error) {
 	return mem.SwapMemory()
 }
+
+func (s *systemPSDisk) Partitions(all bool) ([]disk.PartitionStat, error) {
+	return disk.Partitions(all)
+}
+
+func (s *systemPSDisk) OSGetenv(key string) string {
+	return os.Getenv(key)
+}
+
+func (s *systemPSDisk) OSStat(name string) (os.FileInfo, error) {
+	return os.Stat(name)
+}
+
+func (s *systemPSDisk) PSDiskUsage(path string) (*disk.UsageStat, error) {
+	return disk.Usage(path)
+}

From 2542ef6d6207941a0e2e8610d0add75db7d90ede Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Tue, 18 Apr 2017 16:00:41 -0400
Subject: [PATCH 0207/1302] change jolokia input to use bulk requests (#2253)

---
 CHANGELOG.md                           |   1 +
 plugins/inputs/jolokia/jolokia.go      | 175 ++++++++++++------------
 plugins/inputs/jolokia/jolokia_test.go | 178 +++++++++++++++++--------
 3 files changed, 215 insertions(+), 139 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c7b7c2fd..7437e4ad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ be deprecated eventually.
 - [#1820](https://github.com/influxdata/telegraf/issues/1820): easier plugin testing without outputs
 - [#2493](https://github.com/influxdata/telegraf/pull/2493): Check signature in the GitHub webhook plugin
 - [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
+- [#2253](https://github.com/influxdata/telegraf/pull/2253): Change jolokia plugin to use bulk requests.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 7f371c935..0a9122b87 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -3,7 +3,6 @@ package jolokia
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -130,7 +129,7 @@ func (j *Jolokia) Description() string {
 	return "Read JMX metrics through Jolokia"
 }
 
-func (j *Jolokia) doRequest(req *http.Request) (map[string]interface{}, error) {
+func (j *Jolokia) doRequest(req *http.Request) ([]map[string]interface{}, error) {
 	resp, err := j.jClient.MakeRequest(req)
 	if err != nil {
 		return nil, err
@@ -155,85 +154,81 @@ func (j *Jolokia) doRequest(req *http.Request) (map[string]interface{}, error) {
 	}
 
 	// Unmarshal json
-	var jsonOut map[string]interface{}
+	var jsonOut []map[string]interface{}
 	if err = json.Unmarshal([]byte(body), &jsonOut); err != nil {
-		return nil, errors.New("Error decoding JSON response")
-	}
-
-	if status, ok := jsonOut["status"]; ok {
-		if status != float64(200) {
-			return nil, fmt.Errorf("Not expected status value in response body: %3.f",
-				status)
-		}
-	} else {
-		return nil, fmt.Errorf("Missing status in response body")
+		return nil, fmt.Errorf("Error decoding JSON response: %s: %s", err, body)
 	}
 
 	return jsonOut, nil
 }
 
-func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, error) {
+func (j *Jolokia) prepareRequest(server Server, metrics []Metric) (*http.Request, error) {
 	var jolokiaUrl *url.URL
 	context := j.Context // Usually "/jolokia/"
 
-	// Create bodyContent
-	bodyContent := map[string]interface{}{
-		"type":  "read",
-		"mbean": metric.Mbean,
+	var bulkBodyContent []map[string]interface{}
+	for _, metric := range metrics {
+		// Create bodyContent
+		bodyContent := map[string]interface{}{
+			"type":  "read",
+			"mbean": metric.Mbean,
+		}
+
+		if metric.Attribute != "" {
+			bodyContent["attribute"] = metric.Attribute
+			if metric.Path != "" {
+				bodyContent["path"] = metric.Path
+			}
+		}
+
+		// Add target, only in proxy mode
+		if j.Mode == "proxy" {
+			serviceUrl := fmt.Sprintf("service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi",
+				server.Host, server.Port)
+
+			target := map[string]string{
+				"url": serviceUrl,
+			}
+
+			if server.Username != "" {
+				target["user"] = server.Username
+			}
+
+			if server.Password != "" {
+				target["password"] = server.Password
+			}
+
+			bodyContent["target"] = target
+
+			proxy := j.Proxy
+
+			// Prepare ProxyURL
+			proxyUrl, err := url.Parse("http://" + proxy.Host + ":" + proxy.Port + context)
+			if err != nil {
+				return nil, err
+			}
+			if proxy.Username != "" || proxy.Password != "" {
+				proxyUrl.User = url.UserPassword(proxy.Username, proxy.Password)
+			}
+
+			jolokiaUrl = proxyUrl
+
+		} else {
+			serverUrl, err := url.Parse("http://" + server.Host + ":" + server.Port + context)
+			if err != nil {
+				return nil, err
+			}
+			if server.Username != "" || server.Password != "" {
+				serverUrl.User = url.UserPassword(server.Username, server.Password)
+			}
+
+			jolokiaUrl = serverUrl
+		}
+
+		bulkBodyContent = append(bulkBodyContent, bodyContent)
 	}
 
-	if metric.Attribute != "" {
-		bodyContent["attribute"] = metric.Attribute
-		if metric.Path != "" {
-			bodyContent["path"] = metric.Path
-		}
-	}
-
-	// Add target, only in proxy mode
-	if j.Mode == "proxy" {
-		serviceUrl := fmt.Sprintf("service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi",
-			server.Host, server.Port)
-
-		target := map[string]string{
-			"url": serviceUrl,
-		}
-
-		if server.Username != "" {
-			target["user"] = server.Username
-		}
-
-		if server.Password != "" {
-			target["password"] = server.Password
-		}
-
-		bodyContent["target"] = target
-
-		proxy := j.Proxy
-
-		// Prepare ProxyURL
-		proxyUrl, err := url.Parse("http://" + proxy.Host + ":" + proxy.Port + context)
-		if err != nil {
-			return nil, err
-		}
-		if proxy.Username != "" || proxy.Password != "" {
-			proxyUrl.User = url.UserPassword(proxy.Username, proxy.Password)
-		}
-
-		jolokiaUrl = proxyUrl
-
-	} else {
-		serverUrl, err := url.Parse("http://" + server.Host + ":" + server.Port + context)
-		if err != nil {
-			return nil, err
-		}
-		if server.Username != "" || server.Password != "" {
-			serverUrl.User = url.UserPassword(server.Username, server.Password)
-		}
-
-		jolokiaUrl = serverUrl
-	}
-
-	requestBody, err := json.Marshal(bodyContent)
+	requestBody, err := json.Marshal(bulkBodyContent)
 
 	req, err := http.NewRequest("POST", jolokiaUrl.String(), bytes.NewBuffer(requestBody))
 
@@ -276,25 +271,35 @@ func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 		tags["jolokia_host"] = server.Host
 		fields := make(map[string]interface{})
 
-		for _, metric := range metrics {
-			measurement := metric.Name
+		req, err := j.prepareRequest(server, metrics)
+		if err != nil {
+			acc.AddError(fmt.Errorf("unable to create request: %s", err))
+			continue
+		}
+		out, err := j.doRequest(req)
+		if err != nil {
+			acc.AddError(fmt.Errorf("error performing request: %s", err))
+			continue
+		}
 
-			req, err := j.prepareRequest(server, metric)
-			if err != nil {
-				return err
+		if len(out) != len(metrics) {
+			acc.AddError(fmt.Errorf("did not receive the correct number of metrics in response. expected %d, received %d", len(metrics), len(out)))
+			continue
+		}
+		for i, resp := range out {
+			if status, ok := resp["status"]; ok && status != float64(200) {
+				acc.AddError(fmt.Errorf("Not expected status value in response body (%s:%s mbean=\"%s\" attribute=\"%s\"): %3.f",
+					server.Host, server.Port, metrics[i].Mbean, metrics[i].Attribute, status))
+				continue
+			} else if !ok {
+				acc.AddError(fmt.Errorf("Missing status in response body"))
+				continue
 			}
 
-			out, err := j.doRequest(req)
-
-			if err != nil {
-				fmt.Printf("Error handling response: %s\n", err)
+			if values, ok := resp["value"]; ok {
+				j.extractValues(metrics[i].Name, values, fields)
 			} else {
-				if values, ok := out["value"]; ok {
-					j.extractValues(measurement, values, fields)
-				} else {
-					fmt.Printf("Missing key 'value' in output response\n")
-				}
-
+				acc.AddError(fmt.Errorf("Missing key 'value' in output response\n"))
 			}
 		}
 
diff --git a/plugins/inputs/jolokia/jolokia_test.go b/plugins/inputs/jolokia/jolokia_test.go
index 3c4fc2561..cf415f36f 100644
--- a/plugins/inputs/jolokia/jolokia_test.go
+++ b/plugins/inputs/jolokia/jolokia_test.go
@@ -13,65 +13,105 @@ import (
 )
 
 const validThreeLevelMultiValueJSON = `
-{
-  "request":{
-    "mbean":"java.lang:type=*",
-    "type":"read"
+[
+  {
+    "request":{
+      "mbean":"java.lang:type=*",
+      "type":"read"
+    },
+    "value":{
+      "java.lang:type=Memory":{
+        "ObjectPendingFinalizationCount":0,
+        "Verbose":false,
+        "HeapMemoryUsage":{
+          "init":134217728,
+          "committed":173015040,
+          "max":1908932608,
+          "used":16840016
+        },
+        "NonHeapMemoryUsage":{
+          "init":2555904,
+          "committed":51380224,
+          "max":-1,
+          "used":49944048
+        },
+        "ObjectName":{
+          "objectName":"java.lang:type=Memory"
+        }
+      }
+    },
+    "timestamp":1446129191,
+    "status":200
+  }
+]`
+
+const validBulkResponseJSON = `
+[
+  {
+    "request":{
+      "mbean":"java.lang:type=Memory",
+      "attribute":"HeapMemoryUsage",
+      "type":"read"
+    },
+    "value":{
+      "init":67108864,
+      "committed":456130560,
+      "max":477626368,
+      "used":203288528
+    },
+    "timestamp":1446129191,
+    "status":200
   },
-  "value":{
-		"java.lang:type=Memory":{
-			"ObjectPendingFinalizationCount":0,
-			"Verbose":false,
-			"HeapMemoryUsage":{
-				"init":134217728,
-				"committed":173015040,
-				"max":1908932608,
-				"used":16840016
-			},
-			"NonHeapMemoryUsage":{
-				"init":2555904,
-				"committed":51380224,
-				"max":-1,
-				"used":49944048
-			},
-			"ObjectName":{
-				"objectName":"java.lang:type=Memory"
-			}
-		}
-  },
-  "timestamp":1446129191,
-  "status":200
-}`
+  {
+    "request":{
+      "mbean":"java.lang:type=Memory",
+      "attribute":"NonHeapMemoryUsage",
+      "type":"read"
+    },
+    "value":{
+      "init":2555904,
+      "committed":51380224,
+      "max":-1,
+      "used":49944048
+    },
+    "timestamp":1446129191,
+    "status":200
+  }
+]`
 
 const validMultiValueJSON = `
-{
-  "request":{
-    "mbean":"java.lang:type=Memory",
-    "attribute":"HeapMemoryUsage",
-    "type":"read"
-  },
-  "value":{
-    "init":67108864,
-    "committed":456130560,
-    "max":477626368,
-    "used":203288528
-  },
-  "timestamp":1446129191,
-  "status":200
-}`
+[
+  {
+    "request":{
+      "mbean":"java.lang:type=Memory",
+      "attribute":"HeapMemoryUsage",
+      "type":"read"
+    },
+    "value":{
+      "init":67108864,
+      "committed":456130560,
+      "max":477626368,
+      "used":203288528
+    },
+    "timestamp":1446129191,
+    "status":200
+  }
+]`
 
 const validSingleValueJSON = `
-{
-  "request":{
-    "path":"used",
-    "mbean":"java.lang:type=Memory",
-    "attribute":"HeapMemoryUsage",
-    "type":"read"
-  },
-  "value":209274376,
-  "timestamp":1446129256,
-  "status":200
-}`
+[
+  {
+    "request":{
+      "path":"used",
+      "mbean":"java.lang:type=Memory",
+      "attribute":"HeapMemoryUsage",
+      "type":"read"
+    },
+    "value":209274376,
+    "timestamp":1446129256,
+    "status":200
+  }
+]`
 
 const invalidJSON = "I don't think this is JSON"
 
@@ -82,6 +122,8 @@ var HeapMetric = Metric{Name: "heap_memory_usage",
 	Mbean: "java.lang:type=Memory", Attribute: "HeapMemoryUsage"}
 var UsedHeapMetric = Metric{Name: "heap_memory_usage",
 	Mbean: "java.lang:type=Memory", Attribute: "HeapMemoryUsage"}
+var NonHeapMetric = Metric{Name: "non_heap_memory_usage",
+	Mbean: "java.lang:type=Memory", Attribute: "NonHeapMemoryUsage"}
 
 type jolokiaClientStub struct {
 	responseBody string
@@ -135,6 +177,34 @@ func TestHttpJsonMultiValue(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
 }
 
+// Test that bulk responses are handled
+func TestHttpJsonBulkResponse(t *testing.T) {
+	jolokia := genJolokiaClientStub(validBulkResponseJSON, 200, Servers, []Metric{HeapMetric, NonHeapMetric})
+
+	var acc testutil.Accumulator
+	err := jolokia.Gather(&acc)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(acc.Metrics))
+
+	fields := map[string]interface{}{
+		"heap_memory_usage_init":          67108864.0,
+		"heap_memory_usage_committed":     456130560.0,
+		"heap_memory_usage_max":           477626368.0,
+		"heap_memory_usage_used":          203288528.0,
+		"non_heap_memory_usage_init":      2555904.0,
+		"non_heap_memory_usage_committed": 51380224.0,
+		"non_heap_memory_usage_max":       -1.0,
+		"non_heap_memory_usage_used":      49944048.0,
+	}
+	tags := map[string]string{
+		"jolokia_host": "127.0.0.1",
+		"jolokia_port": "8080",
+		"jolokia_name": "as1",
+	}
+	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
+}
+
 // Test that the proper values are ignored or collected
 func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
 	jolokia := genJolokiaClientStub(validThreeLevelMultiValueJSON, 200, Servers, []Metric{HeapMetric})

From 3690e1b9bf0e222f544f1b5b2e08dea7b65ccf84 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 19 Apr 2017 13:42:24 -0700
Subject: [PATCH 0208/1302] Add diskio for darwin to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7437e4ad5..c32367cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@ be deprecated eventually.
 - [#2493](https://github.com/influxdata/telegraf/pull/2493): Check signature in the GitHub webhook plugin
 - [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
 - [#2253](https://github.com/influxdata/telegraf/pull/2253): Change jolokia plugin to use bulk requests.
+- [#2575](https://github.com/influxdata/telegraf/issues/2575) Add diskio input for Darwin
 
 ### Bugfixes
 

From bf30ef89ee013b59d0fd2638055180b58043b374 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Wed, 19 Apr 2017 17:02:44 -0700
Subject: [PATCH 0209/1302] Fix ipmi_sensor config is shared between all plugin
 instances (#2684)

---
 CHANGELOG.md                       | 1 +
 plugins/inputs/ipmi_sensor/ipmi.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c32367cb4..6160d7558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@ be deprecated eventually.
 - [#2628](https://github.com/influxdata/telegraf/issues/2628): Set default measurement name for snmp input.
 - [#2649](https://github.com/influxdata/telegraf/pull/2649): Improve performance of diskio with many disks
 - [#2671](https://github.com/influxdata/telegraf/issues/2671): The internal input plugin uses the wrong units for `heap_objects`
+- [#2684](https://github.com/influxdata/telegraf/pull/2684): Fix ipmi_sensor config is shared between all plugin instances
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index 0114812d3..a3beeb297 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -152,6 +152,7 @@ func init() {
 		m.Path = path
 	}
 	inputs.Add("ipmi_sensor", func() telegraf.Input {
+		m := m
 		return &m
 	})
 }

From 748ca7d50377217378920bf36bbffced964a369f Mon Sep 17 00:00:00 2001
From: Martin <martin@seener.de>
Date: Thu, 20 Apr 2017 20:19:33 +0200
Subject: [PATCH 0210/1302] Fixed install/remove of telegraf on non-systemd
 Debian/Ubuntu systems (#2360)

---
 CHANGELOG.md            |  1 +
 scripts/post-install.sh | 51 +++++++++++++++++++++++---------------
 scripts/post-remove.sh  | 55 +++++++++++++++++++++++++++--------------
 scripts/pre-install.sh  | 16 ++++++------
 scripts/pre-remove.sh   |  9 +++----
 5 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6160d7558..b19c3785a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@ be deprecated eventually.
 - [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty.
 - [#2341](https://github.com/influxdata/telegraf/issues/2341): telegraf swallowing panics in --test mode.
 - [#2358](https://github.com/influxdata/telegraf/pull/2358): Create pidfile with 644 permissions & defer file deletion.
+- [#2360](https://github.com/influxdata/telegraf/pull/2360): Fixed install/remove of telegraf on non-systemd Debian/Ubuntu systems
 - [#2282](https://github.com/influxdata/telegraf/issues/2282): Reloading telegraf freezes prometheus output.
 - [#2390](https://github.com/influxdata/telegraf/issues/2390): Empty tag value causes error on InfluxDB output.
 - [#2380](https://github.com/influxdata/telegraf/issues/2380): buffer_size field value is negative number from "internal" plugin.
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 45a19d26c..2baabe69a 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -24,10 +24,8 @@ function install_chkconfig {
     chkconfig --add telegraf
 }
 
-id telegraf &>/dev/null
-if [[ $? -ne 0 ]]; then
-    grep "^telegraf:" /etc/group &>/dev/null
-    if [[ $? -ne 0 ]]; then
+if ! id telegraf &>/dev/null; then
+    if ! grep "^telegraf:" /etc/group &>/dev/null; then
         useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf
     else
         useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf -g telegraf
@@ -60,31 +58,44 @@ fi
 # Distribution-specific logic
 if [[ -f /etc/redhat-release ]]; then
     # RHEL-variant logic
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-	    install_systemd
+    if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+        install_systemd
     else
-	    # Assuming sysv
-	    install_init
-	    install_chkconfig
+        # Assuming SysVinit
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
     fi
 elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-	    install_systemd
-	    systemctl restart telegraf || echo "WARNING: systemd not running."
+    if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+        install_systemd
+        systemctl restart telegraf || echo "WARNING: systemd not running."
     else
-	    # Assuming sysv
-	    install_init
-	    install_update_rcd
-	    invoke-rc.d telegraf restart
+	    # Assuming SysVinit
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
+        invoke-rc.d telegraf restart
     fi
 elif [[ -f /etc/os-release ]]; then
     source /etc/os-release
     if [[ $ID = "amzn" ]]; then
 	    # Amazon Linux logic
-	    install_init
-	    install_chkconfig
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
     fi
 fi
diff --git a/scripts/post-remove.sh b/scripts/post-remove.sh
index 0f262d225..b66a3aa9a 100644
--- a/scripts/post-remove.sh
+++ b/scripts/post-remove.sh
@@ -15,28 +15,45 @@ function disable_chkconfig {
     rm -f /etc/init.d/telegraf
 }
 
-if [[ "$1" == "0" ]]; then
-    # RHEL and any distribution that follow RHEL, Amazon Linux covered
-    # telegraf is no longer installed, remove from init system
-    rm -f /etc/default/telegraf
+if [[ -f /etc/redhat-release ]]; then
+    # RHEL-variant logic
+    if [[ "$1" = "0" ]]; then
+        # InfluxDB is no longer installed, remove from init system
+        rm -f /etc/default/telegraf
 
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-        disable_systemd
-    else
-        # Assuming sysv
-        disable_chkconfig
+        if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+            disable_systemd
+        else
+            # Assuming sysv
+            disable_chkconfig
+        fi
     fi
-elif [ "$1" == "remove" -o "$1" == "purge" ]; then
+elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
-    # Remove/purge
-    rm -f /etc/default/telegraf
+    if [ "$1" == "remove" -o "$1" == "purge" ]; then
+        # Remove/purge
+        rm -f /etc/default/telegraf
 
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-        disable_systemd
-    else
-        # Assuming sysv
-        disable_update_rcd
+        if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+            disable_systemd
+        else
+            # Assuming sysv
+            # Run update-rc.d or fallback to chkconfig if not available
+            if which update-rc.d &>/dev/null; then
+                disable_update_rcd
+            else
+                disable_chkconfig
+            fi
+        fi
+    fi
+elif [[ -f /etc/os-release ]]; then
+    source /etc/os-release
+    if [[ $ID = "amzn" ]]; then
+        # Amazon Linux logic
+        if [[ "$1" = "0" ]]; then
+            # InfluxDB is no longer installed, remove from init system
+            rm -f /etc/default/telegraf
+            disable_chkconfig
+        fi
     fi
 fi
diff --git a/scripts/pre-install.sh b/scripts/pre-install.sh
index 443d6bc87..b371f462d 100644
--- a/scripts/pre-install.sh
+++ b/scripts/pre-install.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-if [[ -f /etc/opt/telegraf/telegraf.conf ]]; then
+if [[ -d /etc/opt/telegraf ]]; then
     # Legacy configuration found
     if [[ ! -d /etc/telegraf ]]; then
-	# New configuration does not exist, move legacy configuration to new location
-	echo -e "Please note, Telegraf's configuration is now located at '/etc/telegraf' (previously '/etc/opt/telegraf')."
-	mv /etc/opt/telegraf /etc/telegraf
+        # New configuration does not exist, move legacy configuration to new location
+        echo -e "Please note, Telegraf's configuration is now located at '/etc/telegraf' (previously '/etc/opt/telegraf')."
+        mv -vn /etc/opt/telegraf /etc/telegraf
 
-	backup_name="telegraf.conf.$(date +%s).backup"
-	echo "A backup of your current configuration can be found at: /etc/telegraf/$backup_name"
-	cp -a /etc/telegraf/telegraf.conf /etc/telegraf/$backup_name
+        if [[ -f /etc/telegraf/telegraf.conf ]]; then
+            backup_name="telegraf.conf.$(date +%s).backup"
+            echo "A backup of your current configuration can be found at: /etc/telegraf/${backup_name}"
+            cp -a "/etc/telegraf/telegraf.conf" "/etc/telegraf/${backup_name}"
+        fi
     fi
 fi
diff --git a/scripts/pre-remove.sh b/scripts/pre-remove.sh
index a57184630..2887fc9b6 100644
--- a/scripts/pre-remove.sh
+++ b/scripts/pre-remove.sh
@@ -5,11 +5,10 @@ BIN_DIR=/usr/bin
 # Distribution-specific logic
 if [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-	deb-systemd-invoke stop telegraf.service
+    if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+        deb-systemd-invoke stop telegraf.service
     else
-	# Assuming sysv
-	invoke-rc.d telegraf stop
+        # Assuming sysv
+        invoke-rc.d telegraf stop
     fi
 fi

From b03d78d00f4401950f2863506a2c12afcade4473 Mon Sep 17 00:00:00 2001
From: Oleg Grytsynevych <oleg.gritsinevich@gmail.com>
Date: Thu, 20 Apr 2017 20:22:44 +0200
Subject: [PATCH 0211/1302] win_perf_counters: Format errors reported by
 pdh.dll in human-readable format (#2338)

---
 plugins/inputs/win_perf_counters/pdh.go             | 13 +++++++++++++
 .../inputs/win_perf_counters/win_perf_counters.go   |  9 ++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index fa00e0603..2caa21445 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -33,8 +33,11 @@
 package win_perf_counters
 
 import (
+	"fmt"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/windows"
 )
 
 // Error codes
@@ -417,3 +420,13 @@ func UTF16PtrToString(s *uint16) string {
 	}
 	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
 }
+
+func PdhFormatError(msgId uint32) string {
+	var flags uint32 = windows.FORMAT_MESSAGE_FROM_HMODULE | windows.FORMAT_MESSAGE_ARGUMENT_ARRAY | windows.FORMAT_MESSAGE_IGNORE_INSERTS
+	buf := make([]uint16, 300)
+	_, err := windows.FormatMessage(flags, uintptr(libpdhDll.Handle), msgId, 0, buf, nil)
+	if err == nil {
+		return fmt.Sprintf("%s", UTF16PtrToString(&buf[0]))
+	}
+	return fmt.Sprintf("(pdhErr=%d) %s", msgId, err.Error())
+}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 5365dc68b..3cc946669 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -12,7 +12,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-var sampleConfig string = `
+var sampleConfig = `
   ## By default this plugin returns basic CPU and Disk statistics.
   ## See the README file for more examples.
   ## Uncomment examples below or write your own as you see fit. If the system
@@ -124,8 +124,8 @@ func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName s
 	// Call PdhCollectQueryData one time to check existance of the counter
 	ret = PdhCollectQueryData(handle)
 	if ret != ERROR_SUCCESS {
-		ret = PdhCloseQuery(handle)
-		return errors.New("Invalid query for Performance Counters")
+		PdhCloseQuery(handle)
+		return errors.New(PdhFormatError(ret))
 	}
 
 	temp := &item{query, objectName, counter, instance, measurement,
@@ -174,7 +174,7 @@ func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
 						}
 					} else {
 						if PerfObject.FailOnMissing || PerfObject.WarnOnMissing {
-							fmt.Printf("Invalid query: %s\n", query)
+							fmt.Printf("Invalid query: '%s'. Error: %s", query, err.Error())
 						}
 						if PerfObject.FailOnMissing {
 							return err
@@ -298,7 +298,6 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 				bufCount = 0
 				bufSize = 0
 			}
-
 		}
 	}
 

From a2373019324322f768ec382435fe425ed4d8bdcb Mon Sep 17 00:00:00 2001
From: Alexander Blagoev <alexander.i.blagoev@gmail.com>
Date: Thu, 20 Apr 2017 21:25:22 +0300
Subject: [PATCH 0212/1302] Memcached input documentation (#2685)

Closes #2615
---
 plugins/inputs/memcached/README.md | 69 ++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 plugins/inputs/memcached/README.md

diff --git a/plugins/inputs/memcached/README.md b/plugins/inputs/memcached/README.md
new file mode 100644
index 000000000..ed4ebe7ff
--- /dev/null
+++ b/plugins/inputs/memcached/README.md
@@ -0,0 +1,69 @@
+# Memcached Input Plugin
+
+This plugin gathers statistics data from a Memcached server.
+
+### Configuration:
+
+```toml
+# Read metrics from one or many memcached servers.
+[[inputs.memcached]]
+  # An array of address to gather stats about. Specify an ip on hostname
+  # with optional port. ie localhost, 10.0.0.1:11211, etc.
+  servers = ["localhost:11211"]
+  # An array of unix memcached sockets to gather stats about.
+  # unix_sockets = ["/var/run/memcached.sock"]
+```
+
+### Measurements & Fields:
+
+The fields from this plugin are gathered in the *memcached* measurement.
+
+Fields:
+
+* get_hits - Number of keys that have been requested and found present
+* get_misses - Number of items that have been requested and not found
+* evictions - Number of valid items removed from cache to free memory for new items
+* limit_maxbytes - Number of bytes this server is allowed to use for storage
+* bytes - Current number of bytes used to store items
+* uptime - Number of secs since the server started
+* curr_items - Current number of items stored
+* total_items - Total number of items stored since the server started
+* curr_connections - Number of open connections
+* total_connections - Total number of connections opened since the server started running
+* connection_structures - Number of connection structures allocated by the server
+* cmd_get - Cumulative number of retrieval reqs
+* cmd_set - Cumulative number of storage reqs
+* delete_hits - Number of deletion reqs resulting in an item being removed
+* delete_misses - umber of deletions reqs for missing keys
+* incr_hits - Number of successful incr reqs
+* incr_misses - Number of incr reqs against missing keys
+* decr_hits - Number of successful decr reqs
+* decr_misses - Number of decr reqs against missing keys
+* cas_hits - Number of successful CAS reqs
+* cas_misses - Number of CAS reqs against missing keys
+* bytes_read - Total number of bytes read by this server from network
+* bytes_written - Total number of bytes sent by this server to network
+* threads - Number of worker threads requested
+* conn_yields - Number of times any connection yielded to another due to hitting the -R limit
+
+Description of gathered fields taken from [here](https://github.com/memcached/memcached/blob/master/doc/protocol.txt).
+
+### Tags:
+
+* Memcached measurements have the following tags:
+    - server (the host name from which metrics are gathered)
+
+### Sample Queries:
+
+You can use the following query to get the average get hit and miss ratio, as well as the total average size of cached items, number of cached items and average connection counts per server.
+
+```
+SELECT mean(get_hits) / mean(cmd_get) as get_ratio, mean(get_misses) / mean(cmd_get) as get_misses_ratio, mean(bytes), mean(curr_items), mean(curr_connections) FROM memcached WHERE time > now() - 1h GROUP BY server
+```
+
+### Example Output:
+
+```
+$ ./telegraf -config telegraf.conf -input-filter memcached -test
+memcached,server=localhost:11211 get_hits=1,get_misses=2,evictions=0,limit_maxbytes=0,bytes=10,uptime=3600,curr_items=2,total_items=2,curr_connections=1,total_connections=2,connection_structures=1,cmd_get=2,cmd_set=1,delete_hits=0,delete_misses=0,incr_hits=0,incr_misses=0,decr_hits=0,decr_misses=0,cas_hits=0,cas_misses=0,bytes_read=10,bytes_written=10,threads=1,conn_yields=0 1453831884664956455
+```

From 799c8bed299d3e897209c65b7d5e0015db051689 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 20 Apr 2017 15:33:54 -0700
Subject: [PATCH 0213/1302] Add fix for network aliases to changelog

Change was made in gopsutil
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b19c3785a..626a9ef93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,7 @@ be deprecated eventually.
 - [#2649](https://github.com/influxdata/telegraf/pull/2649): Improve performance of diskio with many disks
 - [#2671](https://github.com/influxdata/telegraf/issues/2671): The internal input plugin uses the wrong units for `heap_objects`
 - [#2684](https://github.com/influxdata/telegraf/pull/2684): Fix ipmi_sensor config is shared between all plugin instances
+- [#2450](https://github.com/influxdata/telegraf/issues/2450): Network statistics not collected when system has alias interfaces
 
 ## v1.2.1 [2017-02-01]
 

From 38e1c1de779dfdd34e6952c1f8e9ca0a234927e6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 20 Apr 2017 16:29:39 -0700
Subject: [PATCH 0214/1302] Update commit hash of tail fork

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 510f5b1ed..9ffd7e1b8 100644
--- a/Godeps
+++ b/Godeps
@@ -22,7 +22,7 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/influxdata/tail e9ef7e826dafcb3093b40b989fefa90eeb9a8ca1
+github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8

From da0773151b970a342e1b2a84dab52a1ca20b669a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 21 Apr 2017 10:55:54 -0700
Subject: [PATCH 0215/1302] Use C locale when running sadf (#2690)

fixes #1911
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/sysstat/sysstat.go             | 26 +++++++++++++++++++
 .../inputs/sysstat/sysstat_interval_test.go   |  3 +++
 3 files changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 626a9ef93..c2ddc9d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@ be deprecated eventually.
 - [#2671](https://github.com/influxdata/telegraf/issues/2671): The internal input plugin uses the wrong units for `heap_objects`
 - [#2684](https://github.com/influxdata/telegraf/pull/2684): Fix ipmi_sensor config is shared between all plugin instances
 - [#2450](https://github.com/influxdata/telegraf/issues/2450): Network statistics not collected when system has alias interfaces
+- [#1911](https://github.com/influxdata/telegraf/issues/1911): Sysstat plugin needs LANG=C or similar locale
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
index 9c9ef6b05..27e181002 100644
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -210,11 +210,37 @@ func (s *Sysstat) collect() error {
 	return nil
 }
 
+func filterEnviron(env []string, prefix string) []string {
+	newenv := env[:0]
+	for _, envvar := range env {
+		if !strings.HasPrefix(envvar, prefix) {
+			newenv = append(newenv, envvar)
+		}
+	}
+	return newenv
+}
+
+// Return the Cmd with its environment configured to use the C locale
+func withCLocale(cmd *exec.Cmd) *exec.Cmd {
+	var env []string
+	if cmd.Env != nil {
+		env = cmd.Env
+	} else {
+		env = os.Environ()
+	}
+	env = filterEnviron(env, "LANG")
+	env = filterEnviron(env, "LC_")
+	env = append(env, "LANG=C")
+	cmd.Env = env
+	return cmd
+}
+
 // parse runs Sadf on the previously saved tmpFile:
 //    Sadf -p -- -p <option> tmpFile
 // and parses the output to add it to the telegraf.Accumulator acc.
 func (s *Sysstat) parse(acc telegraf.Accumulator, option string, ts time.Time) error {
 	cmd := execCommand(s.Sadf, s.sadfOptions(option)...)
+	cmd = withCLocale(cmd)
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return err
diff --git a/plugins/inputs/sysstat/sysstat_interval_test.go b/plugins/inputs/sysstat/sysstat_interval_test.go
index fd660e72b..747158392 100644
--- a/plugins/inputs/sysstat/sysstat_interval_test.go
+++ b/plugins/inputs/sysstat/sysstat_interval_test.go
@@ -15,6 +15,9 @@ import (
 // run with -race option, because in that scenario interval between the two
 // Gather calls is greater than wantedInterval.
 func TestInterval(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test with sleep in short mode.")
+	}
 	// overwriting exec commands with mock commands
 	execCommand = fakeExecCommand
 	defer func() { execCommand = exec.Command }()

From 3684ec6315e8bf47633ad3b50740de6cb0f52bd8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Apr 2017 14:25:37 -0700
Subject: [PATCH 0216/1302] Update EXAMPLE_README.md

---
 plugins/inputs/EXAMPLE_README.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/EXAMPLE_README.md b/plugins/inputs/EXAMPLE_README.md
index a38064a7a..5d806f72d 100644
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -1,6 +1,8 @@
 # Example Input Plugin
 
-The example plugin gathers metrics about example things
+The example plugin gathers metrics about example things.  This description
+explains at a high level what the plugin does and provides links to where
+additional information can be found.
 
 ### Configuration:
 
@@ -12,7 +14,8 @@ The example plugin gathers metrics about example things
 
 ### Measurements & Fields:
 
-<optional description>
+Here you should add an optional description and links to where the user can
+get more information about the measurements.
 
 - measurement1
     - field1 (type, unit)
@@ -30,8 +33,11 @@ The example plugin gathers metrics about example things
 
 ### Sample Queries:
 
-These are some useful queries (to generate dashboards or other) to run against data from this plugin:
+This section should contain some useful InfluxDB queries that can be used to
+get started with the plugin or to generate dashboards.  For each query listed,
+describe at a high level what data is returned.
 
+Get the max, mean, and min for the measurement in the last hour:
 ```
 SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar AND time > now() - 1h GROUP BY tag
 ```
@@ -39,7 +45,7 @@ SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar A
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter example -test
+$ telegraf -input-filter example -test
 measurement1,tag1=foo,tag2=bar field1=1i,field2=2.1 1453831884664956455
 measurement2,tag1=foo,tag2=bar,tag3=baz field3=1i 1453831884664956455
 ```

From 801f6cb8a0b5be194b93e67f55153513267e9bc4 Mon Sep 17 00:00:00 2001
From: Alexander Blagoev <alexander.i.blagoev@gmail.com>
Date: Mon, 24 Apr 2017 21:03:53 +0300
Subject: [PATCH 0217/1302] System net input documentation (#2698)

closes #2166
---
 plugins/inputs/system/NET_README.md | 66 +++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 plugins/inputs/system/NET_README.md

diff --git a/plugins/inputs/system/NET_README.md b/plugins/inputs/system/NET_README.md
new file mode 100644
index 000000000..d4984c0ee
--- /dev/null
+++ b/plugins/inputs/system/NET_README.md
@@ -0,0 +1,66 @@
+# Net Input Plugin
+
+This plugin gathers metrics about network interface and protocol usage (Linux only).
+
+### Configuration:
+
+```toml
+# Gather metrics about network interfaces
+[[inputs.net]]
+  ## By default, telegraf gathers stats from any up interface (excluding loopback)
+  ## Setting interfaces will tell it to gather these explicit interfaces,
+  ## regardless of status.
+  ##
+  # interfaces = ["eth0"]
+```
+
+### Measurements & Fields:
+
+The fields from this plugin are gathered in the _net_ measurement.
+
+Fields (all platforms):
+
+* bytes_sent - The total number of bytes sent by the interface
+* bytes_recv - The total number of bytes received by the interface
+* packets_sent - The total number of packets sent by the interface
+* packets_recv - The total number of packets received by the interface
+* err_in - The total number of receive errors detected by the interface
+* err_out - The total number of transmit errors detected by the interface
+* drop_in - The total number of received packets dropped by the interface
+* drop_out - The total number of transmitted packets dropped by the interface
+
+Different platforms gather the data above with different mechanisms. Telegraf uses the ([gopsutil](https://github.com/shirou/gopsutil)) package, which under Linux reads the /proc/net/dev file.
+Under freebsd/openbsd and darwin the plugin uses netstat.
+
+Additionally, for the time being _only under Linux_, the plugin gathers system wide stats for different network protocols using /proc/net/snmp (tcp, udp, icmp, etc.).
+Explanation of the different metrics exposed by snmp is out of the scope of this document. The best way to find information would be tracing the constants in the Linux kernel source [here](http://lxr.free-electrons.com/source/net/ipv4/proc.c) and their usage. If /proc/net/snmp cannot be read for some reason, telegraf ignores the error silently.
+
+### Tags:
+
+* Net measurements have the following tags:
+    - interface (the interface from which metrics are gathered)
+
+Under Linux the system wide protocol metrics have the interface=all tag.
+
+### Sample Queries:
+
+You can use the following query to get the upload/download traffic rate per second for all interfaces in the last hour. The query uses the (derivative function)[https://docs.influxdata.com/influxdb/v1.2/query_language/functions#derivative] which calculates the rate of change between subsequent field values.
+
+```
+SELECT derivative(first(bytes_recv), 1s) as "download bytes/sec", derivative(first(bytes_sent), 1s) as "upload bytes/sec" FROM net WHERE time > now() - 1h AND interface != 'all' GROUP BY time(10s), interface fill(0);
+```
+
+### Example Output:
+
+```
+# All platforms
+$ ./telegraf -config telegraf.conf -input-filter net -test
+net,interface=eth0,host=HOST bytes_sent=451838509i,bytes_recv=3284081640i,packets_sent=2663590i,packets_recv=3585442i,err_in=0i,err_out=0i,drop_in=4i,drop_out=0i 1492834180000000000
+```
+
+```
+# Linux
+$ ./telegraf -config telegraf.conf -input-filter net -test
+net,interface=eth0,host=HOST bytes_sent=451838509i,bytes_recv=3284081640i,packets_sent=2663590i,packets_recv=3585442i,err_in=0i,err_out=0i,drop_in=4i,drop_out=0i 1492834180000000000
+net,interface=all,host=HOST ip_reasmfails=0i,icmp_insrcquenchs=0i,icmp_outtimestamps=0i,ip_inhdrerrors=0i,ip_inunknownprotos=0i,icmp_intimeexcds=10i,icmp_outaddrmasks=0i,icmp_indestunreachs=11005i,icmpmsg_outtype0=6i,tcp_retranssegs=14669i,udplite_outdatagrams=0i,ip_reasmtimeout=0i,ip_outnoroutes=2577i,ip_inaddrerrors=186i,icmp_outaddrmaskreps=0i,tcp_incsumerrors=0i,tcp_activeopens=55965i,ip_reasmoks=0i,icmp_inechos=6i,icmp_outdestunreachs=9417i,ip_reasmreqds=0i,icmp_outtimestampreps=0i,tcp_rtoalgorithm=1i,icmpmsg_intype3=11005i,icmpmsg_outtype69=129i,tcp_outsegs=2777459i,udplite_rcvbuferrors=0i,ip_fragoks=0i,icmp_inmsgs=13398i,icmp_outerrors=0i,tcp_outrsts=14951i,udplite_noports=0i,icmp_outmsgs=11517i,icmp_outechoreps=6i,icmpmsg_intype11=10i,icmp_inparmprobs=0i,ip_forwdatagrams=0i,icmp_inechoreps=1909i,icmp_outredirects=0i,icmp_intimestampreps=0i,icmpmsg_intype5=468i,tcp_rtomax=120000i,tcp_maxconn=-1i,ip_fragcreates=0i,ip_fragfails=0i,icmp_inredirects=468i,icmp_outtimeexcds=0i,icmp_outechos=1965i,icmp_inaddrmasks=0i,tcp_inerrs=389i,tcp_rtomin=200i,ip_defaultttl=64i,ip_outrequests=3366408i,ip_forwarding=2i,udp_incsumerrors=0i,udp_indatagrams=522136i,udplite_incsumerrors=0i,ip_outdiscards=871i,icmp_inerrors=958i,icmp_outsrcquenchs=0i,icmpmsg_intype0=1909i,tcp_insegs=3580226i,udp_outdatagrams=577265i,udp_rcvbuferrors=0i,udplite_sndbuferrors=0i,icmp_incsumerrors=0i,icmp_outparmprobs=0i,icmpmsg_outtype3=9417i,tcp_attemptfails=2652i,udplite_inerrors=0i,udplite_indatagrams=0i,ip_inreceives=4172969i,icmpmsg_outtype8=1965i,tcp_currestab=59i,udp_noports=5961i,ip_indelivers=4099279i,ip_indiscards=0i,tcp_estabresets=5818i,udp_sndbuferrors=3i,icmp_intimestamps=0i,icmpmsg_intype8=6i,udp_inerrors=0i,icmp_inaddrmaskreps=0i,tcp_passiveopens=452i 1492831540000000000
+``

From 06baf7cf78bbdc2cd04ec141f2603498567b131a Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 24 Apr 2017 14:13:26 -0400
Subject: [PATCH 0218/1302] use AddError everywhere (#2372)

---
 internal/errchan/errchan.go                   | 37 -------------------
 plugins/inputs/aerospike/aerospike.go         |  6 +--
 plugins/inputs/aerospike/aerospike_test.go    |  5 +--
 plugins/inputs/apache/apache.go               | 22 +++++------
 plugins/inputs/apache/apache_test.go          |  2 +-
 plugins/inputs/cassandra/cassandra.go         | 26 +++++++------
 plugins/inputs/cassandra/cassandra_test.go    | 17 +++++----
 plugins/inputs/ceph/ceph.go                   |  4 +-
 plugins/inputs/cgroup/cgroup_linux.go         |  5 ++-
 plugins/inputs/cgroup/cgroup_test.go          | 12 +++---
 plugins/inputs/cloudwatch/cloudwatch.go       | 15 +++-----
 plugins/inputs/cloudwatch/cloudwatch_test.go  |  2 +-
 plugins/inputs/conntrack/conntrack.go         |  7 ++--
 plugins/inputs/couchbase/couchbase.go         |  6 +--
 plugins/inputs/couchdb/couchdb.go             | 20 +---------
 plugins/inputs/couchdb/couchdb_test.go        |  2 +-
 plugins/inputs/disque/disque.go               |  9 ++---
 plugins/inputs/disque/disque_test.go          |  4 +-
 plugins/inputs/dns_query/dns_query.go         |  6 +--
 plugins/inputs/dns_query/dns_query_test.go    | 10 ++---
 plugins/inputs/docker/docker.go               |  7 ++--
 plugins/inputs/docker/docker_test.go          |  2 +-
 plugins/inputs/dovecot/dovecot.go             |  6 +--
 plugins/inputs/elasticsearch/elasticsearch.go | 13 ++-----
 .../elasticsearch/elasticsearch_test.go       |  2 +-
 plugins/inputs/exec/exec.go                   | 16 +++-----
 plugins/inputs/exec/exec_test.go              | 21 +++++------
 plugins/inputs/filestat/filestat.go           |  8 +---
 plugins/inputs/filestat/filestat_test.go      |  8 ++--
 plugins/inputs/graylog/graylog.go             | 19 +---------
 plugins/inputs/graylog/graylog_test.go        | 14 +++----
 plugins/inputs/httpjson/httpjson.go           | 19 +---------
 plugins/inputs/httpjson/httpjson_test.go      | 28 +++++++-------
 plugins/inputs/influxdb/influxdb.go           | 19 +---------
 plugins/inputs/influxdb/influxdb_test.go      | 10 ++---
 plugins/inputs/ipmi_sensor/ipmi.go            |  3 +-
 plugins/inputs/ipmi_sensor/ipmi_test.go       |  4 +-
 plugins/inputs/iptables/iptables.go           |  7 ++--
 plugins/inputs/iptables/iptables_test.go      |  4 +-
 plugins/inputs/jolokia/jolokia_test.go        | 18 +++++----
 .../kafka_consumer_integration_test.go        |  2 +-
 .../kafka_consumer/kafka_consumer_test.go     |  6 +--
 plugins/inputs/kubernetes/kubernetes.go       |  6 +--
 plugins/inputs/kubernetes/kubernetes_test.go  |  2 +-
 plugins/inputs/leofs/leofs.go                 | 11 +++---
 plugins/inputs/leofs/leofs_test.go            |  2 +-
 plugins/inputs/logparser/logparser.go         | 17 ++++-----
 plugins/inputs/logparser/logparser_test.go    |  7 +++-
 plugins/inputs/mailchimp/mailchimp_test.go    |  2 +-
 plugins/inputs/memcached/memcached.go         |  8 ++--
 plugins/inputs/memcached/memcached_test.go    |  2 +-
 plugins/inputs/mesos/mesos.go                 | 22 ++---------
 plugins/inputs/mesos/mesos_test.go            |  4 +-
 plugins/inputs/mongodb/mongodb.go             |  9 ++---
 plugins/inputs/mysql/mysql.go                 |  6 +--
 plugins/inputs/nginx/nginx.go                 |  8 ++--
 plugins/inputs/nginx/nginx_test.go            |  4 +-
 plugins/inputs/nsq/nsq.go                     |  6 +--
 plugins/inputs/nsq/nsq_test.go                |  2 +-
 plugins/inputs/nsq_consumer/nsq_consumer.go   |  4 +-
 plugins/inputs/ntpq/ntpq.go                   | 12 +++---
 plugins/inputs/ntpq/ntpq_test.go              | 24 ++++++------
 plugins/inputs/phpfpm/phpfpm.go               |  6 +--
 plugins/inputs/phpfpm/phpfpm_test.go          | 14 +++----
 plugins/inputs/ping/ping.go                   | 19 ++--------
 plugins/inputs/ping/ping_test.go              |  8 ++--
 plugins/inputs/ping/ping_windows_test.go      | 12 +++---
 .../postgresql_extensible.go                  |  9 +++--
 .../postgresql_extensible_test.go             |  4 +-
 plugins/inputs/powerdns/powerdns.go           |  2 +-
 plugins/inputs/powerdns/powerdns_test.go      |  2 +-
 plugins/inputs/procstat/procstat.go           |  5 +--
 plugins/inputs/procstat/procstat_test.go      | 30 +++++++--------
 plugins/inputs/prometheus/prometheus.go       |  6 +--
 plugins/inputs/prometheus/prometheus_test.go  |  2 +-
 plugins/inputs/rabbitmq/rabbitmq.go           | 28 +++++---------
 plugins/inputs/rabbitmq/rabbitmq_test.go      |  2 +-
 plugins/inputs/raindrops/raindrops.go         |  8 ++--
 plugins/inputs/raindrops/raindrops_test.go    |  2 +-
 plugins/inputs/redis/redis.go                 |  9 ++---
 plugins/inputs/redis/redis_test.go            |  2 +-
 plugins/inputs/rethinkdb/rethinkdb.go         |  9 ++---
 plugins/inputs/riak/riak.go                   |  4 +-
 plugins/inputs/snmp_legacy/snmp_legacy.go     |  7 ++--
 plugins/inputs/sqlserver/sqlserver.go         |  5 +--
 plugins/inputs/sysstat/sysstat.go             | 21 ++---------
 .../inputs/sysstat/sysstat_interval_test.go   |  4 +-
 plugins/inputs/sysstat/sysstat_test.go        |  4 +-
 plugins/inputs/tail/tail.go                   |  6 +--
 plugins/inputs/tail/tail_test.go              |  6 +--
 plugins/inputs/varnish/varnish.go             |  5 +--
 plugins/inputs/webhooks/webhooks.go           |  2 +-
 plugins/inputs/zookeeper/zookeeper.go         |  4 +-
 plugins/inputs/zookeeper/zookeeper_test.go    |  3 +-
 testutil/accumulator.go                       | 11 ++++++
 95 files changed, 341 insertions(+), 531 deletions(-)
 delete mode 100644 internal/errchan/errchan.go

diff --git a/internal/errchan/errchan.go b/internal/errchan/errchan.go
deleted file mode 100644
index 467a0f4a7..000000000
--- a/internal/errchan/errchan.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package errchan
-
-import (
-	"fmt"
-	"strings"
-)
-
-type ErrChan struct {
-	C chan error
-}
-
-// New returns an error channel of max length 'n'
-// errors can be sent to the ErrChan.C channel, and will be returned when
-// ErrChan.Error() is called.
-func New(n int) *ErrChan {
-	return &ErrChan{
-		C: make(chan error, n),
-	}
-}
-
-// Error closes the ErrChan.C channel and returns an error if there are any
-// non-nil errors, otherwise returns nil.
-func (e *ErrChan) Error() error {
-	close(e.C)
-
-	var out string
-	for err := range e.C {
-		if err != nil {
-			out += "[" + err.Error() + "], "
-		}
-	}
-
-	if out != "" {
-		return fmt.Errorf("Errors encountered: " + strings.TrimRight(out, ", "))
-	}
-	return nil
-}
diff --git a/plugins/inputs/aerospike/aerospike.go b/plugins/inputs/aerospike/aerospike.go
index 10f7fcd40..10cccc689 100644
--- a/plugins/inputs/aerospike/aerospike.go
+++ b/plugins/inputs/aerospike/aerospike.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
 	as "github.com/aerospike/aerospike-client-go"
@@ -41,17 +40,16 @@ func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(a.Servers))
 	wg.Add(len(a.Servers))
 	for _, server := range a.Servers {
 		go func(serv string) {
 			defer wg.Done()
-			errChan.C <- a.gatherServer(serv, acc)
+			acc.AddError(a.gatherServer(serv, acc))
 		}(server)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/aerospike/aerospike_test.go b/plugins/inputs/aerospike/aerospike_test.go
index b20af1657..2055da3bb 100644
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -19,7 +19,7 @@ func TestAerospikeStatistics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := a.Gather(&acc)
+	err := acc.GatherError(a.Gather)
 	require.NoError(t, err)
 
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
@@ -41,8 +41,7 @@ func TestAerospikeStatisticsPartialErr(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := a.Gather(&acc)
-	require.Error(t, err)
+	require.Error(t, acc.GatherError(a.Gather))
 
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index 85e7ee4d9..b50860cfb 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -65,28 +66,23 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 		n.ResponseTimeout.Duration = time.Second * 5
 	}
 
-	var outerr error
-	var errch = make(chan error)
-
+	var wg sync.WaitGroup
+	wg.Add(len(n.Urls))
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
-			return fmt.Errorf("Unable to parse address '%s': %s", u, err)
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
 		}
 
 		go func(addr *url.URL) {
-			errch <- n.gatherUrl(addr, acc)
+			defer wg.Done()
+			acc.AddError(n.gatherUrl(addr, acc))
 		}(addr)
 	}
 
-	// Drain channel, waiting for all requests to finish and save last error.
-	for range n.Urls {
-		if err := <-errch; err != nil {
-			outerr = err
-		}
-	}
-
-	return outerr
+	wg.Wait()
+	return nil
 }
 
 func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/apache/apache_test.go b/plugins/inputs/apache/apache_test.go
index 2a80b3868..ca8f4733c 100644
--- a/plugins/inputs/apache/apache_test.go
+++ b/plugins/inputs/apache/apache_test.go
@@ -41,7 +41,7 @@ func TestHTTPApache(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := a.Gather(&acc)
+	err := acc.GatherError(a.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index 710a2b661..88bb3f577 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -7,7 +7,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -123,8 +122,8 @@ func (j javaMetric) addTagsFields(out map[string]interface{}) {
 		}
 		j.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)
 	} else {
-		fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-			j.metric, out)
+		j.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+			j.metric, out))
 	}
 }
 
@@ -155,8 +154,8 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 				addCassandraMetric(k, c, v.(map[string]interface{}))
 			}
 		} else {
-			fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out)
+			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+				c.metric, out))
 			return
 		}
 	} else {
@@ -164,8 +163,8 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 			addCassandraMetric(r.(map[string]interface{})["mbean"].(string),
 				c, values.(map[string]interface{}))
 		} else {
-			fmt.Printf("Missing key 'value' in '%s' output response\n%v\n",
-				c.metric, out)
+			c.acc.AddError(fmt.Errorf("Missing key 'value' in '%s' output response\n%v\n",
+				c.metric, out))
 			return
 		}
 	}
@@ -274,8 +273,8 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 				m = newCassandraMetric(serverTokens["host"], metric, acc)
 			} else {
 				// unsupported metric type
-				log.Printf("I! Unsupported Cassandra metric [%s], skipping",
-					metric)
+				acc.AddError(fmt.Errorf("E! Unsupported Cassandra metric [%s], skipping",
+					metric))
 				continue
 			}
 
@@ -283,7 +282,8 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 			requestUrl, err := url.Parse("http://" + serverTokens["host"] + ":" +
 				serverTokens["port"] + context + metric)
 			if err != nil {
-				return err
+				acc.AddError(err)
+				continue
 			}
 			if serverTokens["user"] != "" && serverTokens["passwd"] != "" {
 				requestUrl.User = url.UserPassword(serverTokens["user"],
@@ -291,8 +291,12 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 			}
 
 			out, err := c.getAttr(requestUrl)
+			if err != nil {
+				acc.AddError(err)
+				continue
+			}
 			if out["status"] != 200.0 {
-				fmt.Printf("URL returned with status %v\n", out["status"])
+				acc.AddError(fmt.Errorf("URL returned with status %v\n", out["status"]))
 				continue
 			}
 			m.addTagsFields(out)
diff --git a/plugins/inputs/cassandra/cassandra_test.go b/plugins/inputs/cassandra/cassandra_test.go
index aa39017fe..1a7e5a657 100644
--- a/plugins/inputs/cassandra/cassandra_test.go
+++ b/plugins/inputs/cassandra/cassandra_test.go
@@ -151,7 +151,7 @@ func TestHttpJsonJavaMultiValue(t *testing.T) {
 
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := cassandra.Gather(&acc)
+	err := acc.GatherError(cassandra.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
@@ -180,7 +180,7 @@ func TestHttpJsonJavaMultiType(t *testing.T) {
 
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := cassandra.Gather(&acc)
+	err := acc.GatherError(cassandra.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
@@ -197,16 +197,17 @@ func TestHttpJsonJavaMultiType(t *testing.T) {
 }
 
 // Test that the proper values are ignored or collected
-func TestHttpJsonOn404(t *testing.T) {
+func TestHttp404(t *testing.T) {
 
-	jolokia := genJolokiaClientStub(validJavaMultiValueJSON, 404, Servers,
+	jolokia := genJolokiaClientStub(invalidJSON, 404, Servers,
 		[]string{HeapMetric})
 
 	var acc testutil.Accumulator
-	err := jolokia.Gather(&acc)
+	err := acc.GatherError(jolokia.Gather)
 
-	assert.Nil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, len(acc.Metrics))
+	assert.Contains(t, err.Error(), "has status code 404")
 }
 
 // Test that the proper values are ignored or collected for class=Cassandra
@@ -214,7 +215,7 @@ func TestHttpJsonCassandraMultiValue(t *testing.T) {
 	cassandra := genJolokiaClientStub(validCassandraMultiValueJSON, 200, Servers, []string{ReadLatencyMetric})
 
 	var acc testutil.Accumulator
-	err := cassandra.Gather(&acc)
+	err := acc.GatherError(cassandra.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 1, len(acc.Metrics))
@@ -246,7 +247,7 @@ func TestHttpJsonCassandraNestedMultiValue(t *testing.T) {
 
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := cassandra.Gather(&acc)
+	err := acc.GatherError(cassandra.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(acc.Metrics))
diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go
index 7c03b6262..0de9cb13b 100644
--- a/plugins/inputs/ceph/ceph.go
+++ b/plugins/inputs/ceph/ceph.go
@@ -101,12 +101,12 @@ func (c *Ceph) gatherAdminSocketStats(acc telegraf.Accumulator) error {
 	for _, s := range sockets {
 		dump, err := perfDump(c.CephBinary, s)
 		if err != nil {
-			log.Printf("E! error reading from socket '%s': %v", s.socket, err)
+			acc.AddError(fmt.Errorf("E! error reading from socket '%s': %v", s.socket, err))
 			continue
 		}
 		data, err := parseDump(dump)
 		if err != nil {
-			log.Printf("E! error parsing dump from socket '%s': %v", s.socket, err)
+			acc.AddError(fmt.Errorf("E! error parsing dump from socket '%s': %v", s.socket, err))
 			continue
 		}
 		for tag, metrics := range data {
diff --git a/plugins/inputs/cgroup/cgroup_linux.go b/plugins/inputs/cgroup/cgroup_linux.go
index e8ba6f881..f43b58975 100644
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -22,10 +22,11 @@ func (g *CGroup) Gather(acc telegraf.Accumulator) error {
 
 	for dir := range list {
 		if dir.err != nil {
-			return dir.err
+			acc.AddError(dir.err)
+			continue
 		}
 		if err := g.gatherDir(dir.path, acc); err != nil {
-			return err
+			acc.AddError(err)
 		}
 	}
 
diff --git a/plugins/inputs/cgroup/cgroup_test.go b/plugins/inputs/cgroup/cgroup_test.go
index 206b51f6d..0ad3a5b24 100644
--- a/plugins/inputs/cgroup/cgroup_test.go
+++ b/plugins/inputs/cgroup/cgroup_test.go
@@ -24,7 +24,7 @@ var cg1 = &CGroup{
 func TestCgroupStatistics_1(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg1.Gather(&acc)
+	err := acc.GatherError(cg1.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -56,7 +56,7 @@ var cg2 = &CGroup{
 func TestCgroupStatistics_2(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg2.Gather(&acc)
+	err := acc.GatherError(cg2.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -81,7 +81,7 @@ var cg3 = &CGroup{
 func TestCgroupStatistics_3(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg3.Gather(&acc)
+	err := acc.GatherError(cg3.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -108,7 +108,7 @@ var cg4 = &CGroup{
 func TestCgroupStatistics_4(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg4.Gather(&acc)
+	err := acc.GatherError(cg4.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -140,7 +140,7 @@ var cg5 = &CGroup{
 func TestCgroupStatistics_5(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg5.Gather(&acc)
+	err := acc.GatherError(cg5.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -167,7 +167,7 @@ var cg6 = &CGroup{
 func TestCgroupStatistics_6(t *testing.T) {
 	var acc testutil.Accumulator
 
-	err := cg6.Gather(&acc)
+	err := acc.GatherError(cg6.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index f0a067001..2e8bee671 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -13,7 +13,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/internal/limiter"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -186,8 +185,6 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 	if err != nil {
 		return err
 	}
-	metricCount := len(metrics)
-	errChan := errchan.New(metricCount)
 
 	now := time.Now()
 
@@ -202,12 +199,12 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
 		<-lmtr.C
 		go func(inm *cloudwatch.Metric) {
 			defer wg.Done()
-			c.gatherMetric(acc, inm, now, errChan.C)
+			acc.AddError(c.gatherMetric(acc, inm, now))
 		}(m)
 	}
 	wg.Wait()
 
-	return errChan.Error()
+	return nil
 }
 
 func init() {
@@ -285,13 +282,11 @@ func (c *CloudWatch) gatherMetric(
 	acc telegraf.Accumulator,
 	metric *cloudwatch.Metric,
 	now time.Time,
-	errChan chan error,
-) {
+) error {
 	params := c.getStatisticsInput(metric, now)
 	resp, err := c.client.GetMetricStatistics(params)
 	if err != nil {
-		errChan <- err
-		return
+		return err
 	}
 
 	for _, point := range resp.Datapoints {
@@ -326,7 +321,7 @@ func (c *CloudWatch) gatherMetric(
 		acc.AddFields(formatMeasurement(c.Namespace), fields, tags, *point.Timestamp)
 	}
 
-	errChan <- nil
+	return nil
 }
 
 /*
diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go
index 3aaab7d45..c52b3a353 100644
--- a/plugins/inputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/inputs/cloudwatch/cloudwatch_test.go
@@ -64,7 +64,7 @@ func TestGather(t *testing.T) {
 	var acc testutil.Accumulator
 	c.client = &mockGatherCloudWatchClient{}
 
-	c.Gather(&acc)
+	acc.GatherError(c.Gather)
 
 	fields := map[string]interface{}{}
 	fields["latency_minimum"] = 0.1
diff --git a/plugins/inputs/conntrack/conntrack.go b/plugins/inputs/conntrack/conntrack.go
index 841aedb54..4df01a31f 100644
--- a/plugins/inputs/conntrack/conntrack.go
+++ b/plugins/inputs/conntrack/conntrack.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"log"
 	"path/filepath"
 )
 
@@ -93,15 +92,15 @@ func (c *Conntrack) Gather(acc telegraf.Accumulator) error {
 
 			contents, err := ioutil.ReadFile(fName)
 			if err != nil {
-				log.Printf("E! failed to read file '%s': %v", fName, err)
+				acc.AddError(fmt.Errorf("E! failed to read file '%s': %v", fName, err))
 				continue
 			}
 
 			v := strings.TrimSpace(string(contents))
 			fields[metricKey], err = strconv.ParseFloat(v, 64)
 			if err != nil {
-				log.Printf("E! failed to parse metric, expected number but "+
-					" found '%s': %v", v, err)
+				acc.AddError(fmt.Errorf("E! failed to parse metric, expected number but "+
+					" found '%s': %v", v, err))
 			}
 		}
 	}
diff --git a/plugins/inputs/couchbase/couchbase.go b/plugins/inputs/couchbase/couchbase.go
index 48e0c1a75..3c3bb3671 100644
--- a/plugins/inputs/couchbase/couchbase.go
+++ b/plugins/inputs/couchbase/couchbase.go
@@ -42,19 +42,17 @@ func (r *Couchbase) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	var outerr error
-
 	for _, serv := range r.Servers {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			outerr = r.gatherServer(serv, acc, nil)
+			acc.AddError(r.gatherServer(serv, acc, nil))
 		}(serv)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *couchbase.Pool) error {
diff --git a/plugins/inputs/couchdb/couchdb.go b/plugins/inputs/couchdb/couchdb.go
index bf241649a..da6ba67dc 100644
--- a/plugins/inputs/couchdb/couchdb.go
+++ b/plugins/inputs/couchdb/couchdb.go
@@ -2,13 +2,11 @@ package couchdb
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"net/http"
 	"reflect"
-	"strings"
 	"sync"
 	"time"
 )
@@ -83,34 +81,20 @@ func (*CouchDB) SampleConfig() string {
 }
 
 func (c *CouchDB) Gather(accumulator telegraf.Accumulator) error {
-	errorChannel := make(chan error, len(c.HOSTs))
 	var wg sync.WaitGroup
 	for _, u := range c.HOSTs {
 		wg.Add(1)
 		go func(host string) {
 			defer wg.Done()
 			if err := c.fetchAndInsertData(accumulator, host); err != nil {
-				errorChannel <- fmt.Errorf("[host=%s]: %s", host, err)
+				accumulator.AddError(fmt.Errorf("[host=%s]: %s", host, err))
 			}
 		}(u)
 	}
 
 	wg.Wait()
-	close(errorChannel)
-
-	// If there weren't any errors, we can return nil now.
-	if len(errorChannel) == 0 {
-		return nil
-	}
-
-	// There were errors, so join them all together as one big error.
-	errorStrings := make([]string, 0, len(errorChannel))
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	return errors.New(strings.Join(errorStrings, "\n"))
 
+	return nil
 }
 
 var tr = &http.Transport{
diff --git a/plugins/inputs/couchdb/couchdb_test.go b/plugins/inputs/couchdb/couchdb_test.go
index 7b824e748..4c0370852 100644
--- a/plugins/inputs/couchdb/couchdb_test.go
+++ b/plugins/inputs/couchdb/couchdb_test.go
@@ -316,5 +316,5 @@ func TestBasic(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.NoError(t, plugin.Gather(&acc))
+	require.NoError(t, acc.GatherError(plugin.Gather))
 }
diff --git a/plugins/inputs/disque/disque.go b/plugins/inputs/disque/disque.go
index 0e4baf9cb..6585ab88e 100644
--- a/plugins/inputs/disque/disque.go
+++ b/plugins/inputs/disque/disque.go
@@ -75,12 +75,11 @@ func (g *Disque) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	var outerr error
-
 	for _, serv := range g.Servers {
 		u, err := url.Parse(serv)
 		if err != nil {
-			return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
+			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			continue
 		} else if u.Scheme == "" {
 			// fallback to simple string based address (i.e. "10.0.0.1:10000")
 			u.Scheme = "tcp"
@@ -90,13 +89,13 @@ func (g *Disque) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			outerr = g.gatherServer(u, acc)
+			acc.AddError(g.gatherServer(u, acc))
 		}(serv)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 const defaultPort = "7711"
diff --git a/plugins/inputs/disque/disque_test.go b/plugins/inputs/disque/disque_test.go
index f060e9568..1e5b764f9 100644
--- a/plugins/inputs/disque/disque_test.go
+++ b/plugins/inputs/disque/disque_test.go
@@ -51,7 +51,7 @@ func TestDisqueGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err = r.Gather(&acc)
+	err = acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
@@ -117,7 +117,7 @@ func TestDisqueCanPullStatsFromMultipleServers(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err = r.Gather(&acc)
+	err = acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go
index 1bccc52c0..2f1fc5482 100644
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -58,11 +57,10 @@ func (d *DnsQuery) Description() string {
 func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 	d.setDefaultValues()
 
-	errChan := errchan.New(len(d.Domains) * len(d.Servers))
 	for _, domain := range d.Domains {
 		for _, server := range d.Servers {
 			dnsQueryTime, err := d.getDnsQueryTime(domain, server)
-			errChan.C <- err
+			acc.AddError(err)
 			tags := map[string]string{
 				"server":      server,
 				"domain":      domain,
@@ -74,7 +72,7 @@ func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	return errChan.Error()
+	return nil
 }
 
 func (d *DnsQuery) setDefaultValues() {
diff --git a/plugins/inputs/dns_query/dns_query_test.go b/plugins/inputs/dns_query/dns_query_test.go
index aeeb7656f..3f70153e4 100644
--- a/plugins/inputs/dns_query/dns_query_test.go
+++ b/plugins/inputs/dns_query/dns_query_test.go
@@ -24,7 +24,7 @@ func TestGathering(t *testing.T) {
 	}
 	var acc testutil.Accumulator
 
-	err := dnsConfig.Gather(&acc)
+	err := acc.GatherError(dnsConfig.Gather)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -44,7 +44,7 @@ func TestGatheringMxRecord(t *testing.T) {
 	var acc testutil.Accumulator
 	dnsConfig.RecordType = "MX"
 
-	err := dnsConfig.Gather(&acc)
+	err := acc.GatherError(dnsConfig.Gather)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -70,7 +70,7 @@ func TestGatheringRootDomain(t *testing.T) {
 	}
 	fields := map[string]interface{}{}
 
-	err := dnsConfig.Gather(&acc)
+	err := acc.GatherError(dnsConfig.Gather)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -96,7 +96,7 @@ func TestMetricContainsServerAndDomainAndRecordTypeTags(t *testing.T) {
 	}
 	fields := map[string]interface{}{}
 
-	err := dnsConfig.Gather(&acc)
+	err := acc.GatherError(dnsConfig.Gather)
 	assert.NoError(t, err)
 	metric, ok := acc.Get("dns_query")
 	require.True(t, ok)
@@ -121,7 +121,7 @@ func TestGatheringTimeout(t *testing.T) {
 
 	channel := make(chan error, 1)
 	go func() {
-		channel <- dnsConfig.Gather(&acc)
+		channel <- acc.GatherError(dnsConfig.Gather)
 	}()
 	select {
 	case res := <-channel:
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 47d1db14b..a439af068 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"regexp"
 	"strconv"
 	"strings"
@@ -159,7 +158,7 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	// Get daemon info
 	err := d.gatherInfo(acc)
 	if err != nil {
-		fmt.Println(err.Error())
+		acc.AddError(err)
 	}
 
 	// List containers
@@ -179,8 +178,8 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 			defer wg.Done()
 			err := d.gatherContainer(c, acc)
 			if err != nil {
-				log.Printf("E! Error gathering container %s stats: %s\n",
-					c.Names, err.Error())
+				acc.AddError(fmt.Errorf("E! Error gathering container %s stats: %s\n",
+					c.Names, err.Error()))
 			}
 		}(container)
 	}
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 3e2e1607b..cc385bd5d 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -302,7 +302,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		testing: true,
 	}
 
-	err := d.Gather(&acc)
+	err := acc.GatherError(d.Gather)
 	require.NoError(t, err)
 
 	acc.AssertContainsTaggedFields(t,
diff --git a/plugins/inputs/dovecot/dovecot.go b/plugins/inputs/dovecot/dovecot.go
index 56290e759..a621252e5 100644
--- a/plugins/inputs/dovecot/dovecot.go
+++ b/plugins/inputs/dovecot/dovecot.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -66,19 +65,18 @@ func (d *Dovecot) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(d.Servers) * len(d.Filters))
 	for _, server := range d.Servers {
 		for _, filter := range d.Filters {
 			wg.Add(1)
 			go func(s string, f string) {
 				defer wg.Done()
-				errChan.C <- d.gatherServer(s, acc, d.Type, f)
+				acc.AddError(d.gatherServer(s, acc, d.Type, f))
 			}(server, filter)
 		}
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, qtype string, filter string) error {
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 370e3fbdd..c11bfdd2f 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 	"io/ioutil"
@@ -153,7 +152,6 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 		e.client = client
 	}
 
-	errChan := errchan.New(len(e.Servers) * 3)
 	var wg sync.WaitGroup
 	wg.Add(len(e.Servers))
 
@@ -176,24 +174,21 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 
 			// Always gather node states
 			if err := e.gatherNodeStats(url, acc); err != nil {
-				err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
-				errChan.C <- err
+				acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
 				return
 			}
 
 			if e.ClusterHealth {
 				url = s + "/_cluster/health?level=indices"
 				if err := e.gatherClusterHealth(url, acc); err != nil {
-					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
-					errChan.C <- err
+					acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
 					return
 				}
 			}
 
 			if e.ClusterStats && e.isMaster {
 				if err := e.gatherClusterStats(s+"/_cluster/stats", acc); err != nil {
-					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
-					errChan.C <- err
+					acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
 					return
 				}
 			}
@@ -201,7 +196,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
index 59caa4306..f057cfd8b 100644
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -71,7 +71,7 @@ func TestGather(t *testing.T) {
 	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
 
 	var acc testutil.Accumulator
-	if err := es.Gather(&acc); err != nil {
+	if err := acc.GatherError(es.Gather); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/plugins/inputs/exec/exec.go b/plugins/inputs/exec/exec.go
index 154080138..e9ce4551e 100644
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/plugins/parsers/nagios"
@@ -49,8 +48,7 @@ type Exec struct {
 
 	parser parsers.Parser
 
-	runner  Runner
-	errChan chan error
+	runner Runner
 }
 
 func NewExec() *Exec {
@@ -150,13 +148,13 @@ func (e *Exec) ProcessCommand(command string, acc telegraf.Accumulator, wg *sync
 
 	out, err := e.runner.Run(e, command, acc)
 	if err != nil {
-		e.errChan <- err
+		acc.AddError(err)
 		return
 	}
 
 	metrics, err := e.parser.Parse(out)
 	if err != nil {
-		e.errChan <- err
+		acc.AddError(err)
 	} else {
 		for _, metric := range metrics {
 			acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
@@ -193,7 +191,8 @@ func (e *Exec) Gather(acc telegraf.Accumulator) error {
 
 		matches, err := filepath.Glob(cmdAndArgs[0])
 		if err != nil {
-			return err
+			acc.AddError(err)
+			continue
 		}
 
 		if len(matches) == 0 {
@@ -214,15 +213,12 @@ func (e *Exec) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	errChan := errchan.New(len(commands))
-	e.errChan = errChan.C
-
 	wg.Add(len(commands))
 	for _, command := range commands {
 		go e.ProcessCommand(command, acc, &wg)
 	}
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func init() {
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index 975eb9642..52bcd1fb4 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -101,7 +101,7 @@ func TestExec(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
 	assert.Equal(t, acc.NFields(), 8, "non-numeric measurements should be ignored")
 
@@ -127,8 +127,7 @@ func TestExecMalformed(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.Error(t, err)
+	require.Error(t, acc.GatherError(e.Gather))
 	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
 }
 
@@ -141,8 +140,7 @@ func TestCommandError(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.Error(t, err)
+	require.Error(t, acc.GatherError(e.Gather))
 	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
 }
 
@@ -155,8 +153,7 @@ func TestLineProtocolParse(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, acc.GatherError(e.Gather))
 
 	fields := map[string]interface{}{
 		"usage_idle": float64(99),
@@ -191,7 +188,7 @@ func TestLineProtocolShortParse(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "buffer too short", "A buffer too short error was expected")
 }
@@ -205,7 +202,7 @@ func TestLineProtocolParseMultiple(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
@@ -231,7 +228,7 @@ func TestExecCommandWithGlob(t *testing.T) {
 	e.SetParser(parser)
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
@@ -247,7 +244,7 @@ func TestExecCommandWithoutGlob(t *testing.T) {
 	e.SetParser(parser)
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
@@ -263,7 +260,7 @@ func TestExecCommandWithoutGlobAndPath(t *testing.T) {
 	e.SetParser(parser)
 
 	var acc testutil.Accumulator
-	err := e.Gather(&acc)
+	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/filestat/filestat.go b/plugins/inputs/filestat/filestat.go
index 83f511a84..7519e295c 100644
--- a/plugins/inputs/filestat/filestat.go
+++ b/plugins/inputs/filestat/filestat.go
@@ -48,7 +48,6 @@ func (_ *FileStat) Description() string {
 func (_ *FileStat) SampleConfig() string { return sampleConfig }
 
 func (f *FileStat) Gather(acc telegraf.Accumulator) error {
-	var errS string
 	var err error
 
 	for _, filepath := range f.Files {
@@ -56,7 +55,7 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 		g, ok := f.globs[filepath]
 		if !ok {
 			if g, err = globpath.Compile(filepath); err != nil {
-				errS += err.Error() + " "
+				acc.AddError(err)
 				continue
 			}
 			f.globs[filepath] = g
@@ -92,7 +91,7 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 			if f.Md5 {
 				md5, err := getMd5(fileName)
 				if err != nil {
-					errS += err.Error() + " "
+					acc.AddError(err)
 				} else {
 					fields["md5_sum"] = md5
 				}
@@ -102,9 +101,6 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	if errS != "" {
-		return fmt.Errorf(errS)
-	}
 	return nil
 }
 
diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go
index a404869d9..83d3c87cc 100644
--- a/plugins/inputs/filestat/filestat_test.go
+++ b/plugins/inputs/filestat/filestat_test.go
@@ -19,7 +19,7 @@ func TestGatherNoMd5(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	fs.Gather(&acc)
+	acc.GatherError(fs.Gather)
 
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
@@ -59,7 +59,7 @@ func TestGatherExplicitFiles(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	fs.Gather(&acc)
+	acc.GatherError(fs.Gather)
 
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
@@ -99,7 +99,7 @@ func TestGatherGlob(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	fs.Gather(&acc)
+	acc.GatherError(fs.Gather)
 
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
@@ -131,7 +131,7 @@ func TestGatherSuperAsterisk(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	fs.Gather(&acc)
+	acc.GatherError(fs.Gather)
 
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
diff --git a/plugins/inputs/graylog/graylog.go b/plugins/inputs/graylog/graylog.go
index 52e2ef42a..6dcc9b979 100644
--- a/plugins/inputs/graylog/graylog.go
+++ b/plugins/inputs/graylog/graylog.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -149,31 +148,17 @@ func (h *GrayLog) Gather(acc telegraf.Accumulator) error {
 		h.client.SetHTTPClient(client)
 	}
 
-	errorChannel := make(chan error, len(h.Servers))
-
 	for _, server := range h.Servers {
 		wg.Add(1)
 		go func(server string) {
 			defer wg.Done()
-			if err := h.gatherServer(acc, server); err != nil {
-				errorChannel <- err
-			}
+			acc.AddError(h.gatherServer(acc, server))
 		}(server)
 	}
 
 	wg.Wait()
-	close(errorChannel)
 
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
+	return nil
 }
 
 // Gathers data from a particular server
diff --git a/plugins/inputs/graylog/graylog_test.go b/plugins/inputs/graylog/graylog_test.go
index 09bca454d..a5088cf7d 100644
--- a/plugins/inputs/graylog/graylog_test.go
+++ b/plugins/inputs/graylog/graylog_test.go
@@ -157,7 +157,7 @@ func TestNormalResponse(t *testing.T) {
 
 	for _, service := range graylog {
 		var acc testutil.Accumulator
-		err := service.Gather(&acc)
+		err := acc.GatherError(service.Gather)
 		require.NoError(t, err)
 		for k, v := range expectedFields {
 			acc.AssertContainsTaggedFields(t, k, v, validTags[k])
@@ -170,9 +170,9 @@ func TestHttpJson500(t *testing.T) {
 	graylog := genMockGrayLog(validJSON, 500)
 
 	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
+	err := acc.GatherError(graylog[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -181,9 +181,9 @@ func TestHttpJsonBadJson(t *testing.T) {
 	graylog := genMockGrayLog(invalidJSON, 200)
 
 	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
+	err := acc.GatherError(graylog[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -192,8 +192,8 @@ func TestHttpJsonEmptyResponse(t *testing.T) {
 	graylog := genMockGrayLog(empty, 200)
 
 	var acc testutil.Accumulator
-	err := graylog[0].Gather(&acc)
+	err := acc.GatherError(graylog[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index 8bfe22bff..ba5d7734d 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -1,7 +1,6 @@
 package httpjson
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -145,31 +144,17 @@ func (h *HttpJson) Gather(acc telegraf.Accumulator) error {
 		h.client.SetHTTPClient(client)
 	}
 
-	errorChannel := make(chan error, len(h.Servers))
-
 	for _, server := range h.Servers {
 		wg.Add(1)
 		go func(server string) {
 			defer wg.Done()
-			if err := h.gatherServer(acc, server); err != nil {
-				errorChannel <- err
-			}
+			acc.AddError(h.gatherServer(acc, server))
 		}(server)
 	}
 
 	wg.Wait()
-	close(errorChannel)
 
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
+	return nil
 }
 
 // Gathers data from a particular server
diff --git a/plugins/inputs/httpjson/httpjson_test.go b/plugins/inputs/httpjson/httpjson_test.go
index 0029eb3e9..629da8b5f 100644
--- a/plugins/inputs/httpjson/httpjson_test.go
+++ b/plugins/inputs/httpjson/httpjson_test.go
@@ -210,7 +210,7 @@ func TestHttpJson200(t *testing.T) {
 
 	for _, service := range httpjson {
 		var acc testutil.Accumulator
-		err := service.Gather(&acc)
+		err := acc.GatherError(service.Gather)
 		require.NoError(t, err)
 		assert.Equal(t, 12, acc.NFields())
 		// Set responsetime
@@ -245,7 +245,7 @@ func TestHttpJsonGET_URL(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := a.Gather(&acc)
+	err := acc.GatherError(a.Gather)
 	require.NoError(t, err)
 
 	// remove response_time from gathered fields because it's non-deterministic
@@ -318,7 +318,7 @@ func TestHttpJsonGET(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := a.Gather(&acc)
+	err := acc.GatherError(a.Gather)
 	require.NoError(t, err)
 
 	// remove response_time from gathered fields because it's non-deterministic
@@ -392,7 +392,7 @@ func TestHttpJsonPOST(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := a.Gather(&acc)
+	err := acc.GatherError(a.Gather)
 	require.NoError(t, err)
 
 	// remove response_time from gathered fields because it's non-deterministic
@@ -448,9 +448,9 @@ func TestHttpJson500(t *testing.T) {
 	httpjson := genMockHttpJson(validJSON, 500)
 
 	var acc testutil.Accumulator
-	err := httpjson[0].Gather(&acc)
+	err := acc.GatherError(httpjson[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -460,9 +460,9 @@ func TestHttpJsonBadMethod(t *testing.T) {
 	httpjson[0].Method = "NOT_A_REAL_METHOD"
 
 	var acc testutil.Accumulator
-	err := httpjson[0].Gather(&acc)
+	err := acc.GatherError(httpjson[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -471,9 +471,9 @@ func TestHttpJsonBadJson(t *testing.T) {
 	httpjson := genMockHttpJson(invalidJSON, 200)
 
 	var acc testutil.Accumulator
-	err := httpjson[0].Gather(&acc)
+	err := acc.GatherError(httpjson[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -482,9 +482,9 @@ func TestHttpJsonEmptyResponse(t *testing.T) {
 	httpjson := genMockHttpJson(empty, 200)
 
 	var acc testutil.Accumulator
-	err := httpjson[0].Gather(&acc)
+	err := acc.GatherError(httpjson[0].Gather)
 
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, acc.NFields())
 }
 
@@ -495,7 +495,7 @@ func TestHttpJson200Tags(t *testing.T) {
 	for _, service := range httpjson {
 		if service.Name == "other_webapp" {
 			var acc testutil.Accumulator
-			err := service.Gather(&acc)
+			err := acc.GatherError(service.Gather)
 			// Set responsetime
 			for _, p := range acc.Metrics {
 				p.Fields["response_time"] = 1.0
@@ -533,7 +533,7 @@ func TestHttpJsonArray200Tags(t *testing.T) {
 	for _, service := range httpjson {
 		if service.Name == "other_webapp" {
 			var acc testutil.Accumulator
-			err := service.Gather(&acc)
+			err := acc.GatherError(service.Gather)
 			// Set responsetime
 			for _, p := range acc.Metrics {
 				p.Fields["response_time"] = 1.0
diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go
index 3c98eead3..fc84d7c92 100644
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
@@ -57,34 +56,20 @@ func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	errorChannel := make(chan error, len(i.URLs))
-
 	var wg sync.WaitGroup
 	for _, u := range i.URLs {
 		wg.Add(1)
 		go func(url string) {
 			defer wg.Done()
 			if err := i.gatherURL(acc, url); err != nil {
-				errorChannel <- fmt.Errorf("[url=%s]: %s", url, err)
+				acc.AddError(fmt.Errorf("[url=%s]: %s", url, err))
 			}
 		}(u)
 	}
 
 	wg.Wait()
-	close(errorChannel)
 
-	// If there weren't any errors, we can return nil now.
-	if len(errorChannel) == 0 {
-		return nil
-	}
-
-	// There were errors, so join them all together as one big error.
-	errorStrings := make([]string, 0, len(errorChannel))
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	return errors.New(strings.Join(errorStrings, "\n"))
+	return nil
 }
 
 type point struct {
diff --git a/plugins/inputs/influxdb/influxdb_test.go b/plugins/inputs/influxdb/influxdb_test.go
index c27aa77dc..f24ecc24c 100644
--- a/plugins/inputs/influxdb/influxdb_test.go
+++ b/plugins/inputs/influxdb/influxdb_test.go
@@ -25,7 +25,7 @@ func TestBasic(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.NoError(t, plugin.Gather(&acc))
+	require.NoError(t, acc.GatherError(plugin.Gather))
 
 	require.Len(t, acc.Metrics, 3)
 	fields := map[string]interface{}{
@@ -72,7 +72,7 @@ func TestInfluxDB(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.NoError(t, plugin.Gather(&acc))
+	require.NoError(t, acc.GatherError(plugin.Gather))
 
 	require.Len(t, acc.Metrics, 34)
 
@@ -132,7 +132,7 @@ func TestInfluxDB2(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.NoError(t, plugin.Gather(&acc))
+	require.NoError(t, acc.GatherError(plugin.Gather))
 
 	require.Len(t, acc.Metrics, 34)
 
@@ -157,7 +157,7 @@ func TestErrorHandling(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.Error(t, plugin.Gather(&acc))
+	require.Error(t, acc.GatherError(plugin.Gather))
 }
 
 func TestErrorHandling404(t *testing.T) {
@@ -175,7 +175,7 @@ func TestErrorHandling404(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	require.Error(t, plugin.Gather(&acc))
+	require.Error(t, acc.GatherError(plugin.Gather))
 }
 
 const basicJSON = `
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index a3beeb297..73f22b393 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -52,7 +52,8 @@ func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 		for _, server := range m.Servers {
 			err := m.parse(acc, server)
 			if err != nil {
-				return err
+				acc.AddError(err)
+				continue
 			}
 		}
 	} else {
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index 84bcdcac0..9e846065e 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -20,7 +20,7 @@ func TestGather(t *testing.T) {
 	execCommand = fakeExecCommand
 	var acc testutil.Accumulator
 
-	err := i.Gather(&acc)
+	err := acc.GatherError(i.Gather)
 
 	require.NoError(t, err)
 
@@ -121,7 +121,7 @@ func TestGather(t *testing.T) {
 		Path: "ipmitool",
 	}
 
-	err = i.Gather(&acc)
+	err = acc.GatherError(i.Gather)
 
 	var testsWithoutServer = []struct {
 		fields map[string]interface{}
diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index eab33bf9f..af3941718 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -54,20 +54,19 @@ func (ipt *Iptables) Gather(acc telegraf.Accumulator) error {
 	}
 	// best effort : we continue through the chains even if an error is encountered,
 	// but we keep track of the last error.
-	var err error
 	for _, chain := range ipt.Chains {
 		data, e := ipt.lister(ipt.Table, chain)
 		if e != nil {
-			err = e
+			acc.AddError(e)
 			continue
 		}
 		e = ipt.parseAndGather(data, acc)
 		if e != nil {
-			err = e
+			acc.AddError(e)
 			continue
 		}
 	}
-	return err
+	return nil
 }
 
 func (ipt *Iptables) chainList(table, chain string) (string, error) {
diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go
index bd8a2a726..96190713f 100644
--- a/plugins/inputs/iptables/iptables_test.go
+++ b/plugins/inputs/iptables/iptables_test.go
@@ -141,7 +141,7 @@ func TestIptables_Gather(t *testing.T) {
 			},
 		}
 		acc := new(testutil.Accumulator)
-		err := ipt.Gather(acc)
+		err := acc.GatherError(ipt.Gather)
 		if !reflect.DeepEqual(tt.err, err) {
 			t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
 		}
@@ -199,7 +199,7 @@ func TestIptables_Gather_listerError(t *testing.T) {
 		},
 	}
 	acc := new(testutil.Accumulator)
-	err := ipt.Gather(acc)
+	err := acc.GatherError(ipt.Gather)
 	if !reflect.DeepEqual(err, errFoo) {
 		t.Errorf("Expected error %#v got\n%#v\n", errFoo, err)
 	}
diff --git a/plugins/inputs/jolokia/jolokia_test.go b/plugins/inputs/jolokia/jolokia_test.go
index cf415f36f..b47ffbc26 100644
--- a/plugins/inputs/jolokia/jolokia_test.go
+++ b/plugins/inputs/jolokia/jolokia_test.go
@@ -158,7 +158,7 @@ func TestHttpJsonMultiValue(t *testing.T) {
 	jolokia := genJolokiaClientStub(validMultiValueJSON, 200, Servers, []Metric{HeapMetric})
 
 	var acc testutil.Accumulator
-	err := jolokia.Gather(&acc)
+	err := acc.GatherError(jolokia.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 1, len(acc.Metrics))
@@ -210,7 +210,7 @@ func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
 	jolokia := genJolokiaClientStub(validThreeLevelMultiValueJSON, 200, Servers, []Metric{HeapMetric})
 
 	var acc testutil.Accumulator
-	err := jolokia.Gather(&acc)
+	err := acc.GatherError(jolokia.Gather)
 
 	assert.Nil(t, err)
 	assert.Equal(t, 1, len(acc.Metrics))
@@ -238,17 +238,18 @@ func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
 }
 
 // Test that the proper values are ignored or collected
-func TestHttpJsonOn404(t *testing.T) {
+func TestHttp404(t *testing.T) {
 
-	jolokia := genJolokiaClientStub(validMultiValueJSON, 404, Servers,
+	jolokia := genJolokiaClientStub(invalidJSON, 404, Servers,
 		[]Metric{UsedHeapMetric})
 
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := jolokia.Gather(&acc)
+	err := acc.GatherError(jolokia.Gather)
 
-	assert.Nil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, len(acc.Metrics))
+	assert.Contains(t, err.Error(), "has status code 404")
 }
 
 // Test that the proper values are ignored or collected
@@ -259,8 +260,9 @@ func TestHttpInvalidJson(t *testing.T) {
 
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
-	err := jolokia.Gather(&acc)
+	err := acc.GatherError(jolokia.Gather)
 
-	assert.Nil(t, err)
+	assert.Error(t, err)
 	assert.Equal(t, 0, len(acc.Metrics))
+	assert.Contains(t, err.Error(), "Error decoding JSON response")
 }
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
index c1c93e7cb..41ce10157 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
@@ -59,7 +59,7 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 	waitForPoint(&acc, t)
 
 	// Gather points
-	err = k.Gather(&acc)
+	err = acc.GatherError(k.Gather)
 	require.NoError(t, err)
 	if len(acc.Metrics) == 1 {
 		point := acc.Metrics[0]
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 04498261c..5519dd0d1 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -92,7 +92,7 @@ func TestRunParserAndGather(t *testing.T) {
 	in <- saramaMsg(testMsg)
 	acc.Wait(1)
 
-	k.Gather(&acc)
+	acc.GatherError(k.Gather)
 
 	assert.Equal(t, acc.NFields(), 1)
 	acc.AssertContainsFields(t, "cpu_load_short",
@@ -111,7 +111,7 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
 	in <- saramaMsg(testMsgGraphite)
 	acc.Wait(1)
 
-	k.Gather(&acc)
+	acc.GatherError(k.Gather)
 
 	assert.Equal(t, acc.NFields(), 1)
 	acc.AssertContainsFields(t, "cpu_load_short_graphite",
@@ -130,7 +130,7 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	in <- saramaMsg(testMsgJSON)
 	acc.Wait(1)
 
-	k.Gather(&acc)
+	acc.GatherError(k.Gather)
 
 	assert.Equal(t, acc.NFields(), 2)
 	acc.AssertContainsFields(t, "kafka_json_test",
diff --git a/plugins/inputs/kubernetes/kubernetes.go b/plugins/inputs/kubernetes/kubernetes.go
index ee95d560f..87d08aa94 100644
--- a/plugins/inputs/kubernetes/kubernetes.go
+++ b/plugins/inputs/kubernetes/kubernetes.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -72,14 +71,13 @@ func (k *Kubernetes) Description() string {
 //Gather collects kubernetes metrics from a given URL
 func (k *Kubernetes) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	errChan := errchan.New(1)
 	wg.Add(1)
 	go func(k *Kubernetes) {
 		defer wg.Done()
-		errChan.C <- k.gatherSummary(k.URL, acc)
+		acc.AddError(k.gatherSummary(k.URL, acc))
 	}(k)
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func buildURL(endpoint string, base string) (*url.URL, error) {
diff --git a/plugins/inputs/kubernetes/kubernetes_test.go b/plugins/inputs/kubernetes/kubernetes_test.go
index 528299be1..289e36ae4 100644
--- a/plugins/inputs/kubernetes/kubernetes_test.go
+++ b/plugins/inputs/kubernetes/kubernetes_test.go
@@ -22,7 +22,7 @@ func TestKubernetesStats(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := k.Gather(&acc)
+	err := acc.GatherError(k.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/leofs/leofs.go b/plugins/inputs/leofs/leofs.go
index 06c71e932..e1daf7034 100644
--- a/plugins/inputs/leofs/leofs.go
+++ b/plugins/inputs/leofs/leofs.go
@@ -154,15 +154,16 @@ func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
 		return nil
 	}
 	var wg sync.WaitGroup
-	var outerr error
 	for _, endpoint := range l.Servers {
 		_, err := url.Parse(endpoint)
 		if err != nil {
-			return fmt.Errorf("Unable to parse the address:%s, err:%s", endpoint, err)
+			acc.AddError(fmt.Errorf("Unable to parse the address:%s, err:%s", endpoint, err))
+			continue
 		}
 		port, err := retrieveTokenAfterColon(endpoint)
 		if err != nil {
-			return err
+			acc.AddError(err)
+			continue
 		}
 		st, ok := serverTypeMapping[port]
 		if !ok {
@@ -171,11 +172,11 @@ func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(endpoint string, st ServerType) {
 			defer wg.Done()
-			outerr = l.gatherServer(endpoint, st, acc)
+			acc.AddError(l.gatherServer(endpoint, st, acc))
 		}(endpoint, st)
 	}
 	wg.Wait()
-	return outerr
+	return nil
 }
 
 func (l *LeoFS) gatherServer(
diff --git a/plugins/inputs/leofs/leofs_test.go b/plugins/inputs/leofs/leofs_test.go
index 292cd15d0..a5ca30432 100644
--- a/plugins/inputs/leofs/leofs_test.go
+++ b/plugins/inputs/leofs/leofs_test.go
@@ -146,7 +146,7 @@ func testMain(t *testing.T, code string, endpoint string, serverType ServerType)
 	var acc testutil.Accumulator
 	acc.SetDebug(true)
 
-	err := l.Gather(&acc)
+	err := acc.GatherError(l.Gather)
 	require.NoError(t, err)
 
 	floatMetrics := KeyMapping[serverType]
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index c5641ba28..0b5bcb811 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -9,7 +9,6 @@ import (
 	"github.com/influxdata/tail"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/internal/globpath"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
@@ -118,14 +117,15 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	}
 
 	// compile log parser patterns:
-	errChan := errchan.New(len(l.parsers))
+	var haveError bool
 	for _, parser := range l.parsers {
 		if err := parser.Compile(); err != nil {
-			errChan.C <- err
+			acc.AddError(err)
+			haveError = true
 		}
 	}
-	if err := errChan.Error(); err != nil {
-		return err
+	if haveError {
+		return nil
 	}
 
 	l.wg.Add(1)
@@ -143,8 +143,6 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 		seek.Offset = 0
 	}
 
-	errChan := errchan.New(len(l.Files))
-
 	// Create a "tailer" for each file
 	for _, filepath := range l.Files {
 		g, err := globpath.Compile(filepath)
@@ -153,7 +151,6 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 			continue
 		}
 		files := g.Match()
-		errChan = errchan.New(len(files))
 
 		for file, _ := range files {
 			if _, ok := l.tailers[file]; ok {
@@ -168,7 +165,7 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Location:  &seek,
 					MustExist: true,
 				})
-			errChan.C <- err
+			l.acc.AddError(err)
 
 			// create a goroutine for each "tailer"
 			l.wg.Add(1)
@@ -177,7 +174,7 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 		}
 	}
 
-	return errChan.Error()
+	return nil
 }
 
 // receiver is launched as a goroutine to continuously watch a tailed logfile
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index db9795f28..66802da4f 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -38,7 +38,10 @@ func TestGrokParseLogFilesNonExistPattern(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.Error(t, logparser.Start(&acc))
+	logparser.Start(&acc)
+	if assert.NotEmpty(t, acc.Errors) {
+		assert.Error(t, acc.Errors[0])
+	}
 
 	logparser.Stop()
 }
@@ -106,7 +109,7 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 	os.Symlink(
 		thisdir+"grok/testdata/test_a.log",
 		emptydir+"/test_a.log")
-	assert.NoError(t, logparser.Gather(&acc))
+	assert.NoError(t, acc.GatherError(logparser.Gather))
 	acc.Wait(1)
 
 	logparser.Stop()
diff --git a/plugins/inputs/mailchimp/mailchimp_test.go b/plugins/inputs/mailchimp/mailchimp_test.go
index 0c4dab56d..ed6898e60 100644
--- a/plugins/inputs/mailchimp/mailchimp_test.go
+++ b/plugins/inputs/mailchimp/mailchimp_test.go
@@ -140,7 +140,7 @@ func TestMailChimpGatherReport(t *testing.T) {
 
 }
 
-func TestMailChimpGatherError(t *testing.T) {
+func TestMailChimpGatherErroror(t *testing.T) {
 	ts := httptest.NewServer(
 		http.HandlerFunc(
 			func(w http.ResponseWriter, r *http.Request) {
diff --git a/plugins/inputs/memcached/memcached.go b/plugins/inputs/memcached/memcached.go
index d174abeda..2b6b120c8 100644
--- a/plugins/inputs/memcached/memcached.go
+++ b/plugins/inputs/memcached/memcached.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -73,16 +72,15 @@ func (m *Memcached) Gather(acc telegraf.Accumulator) error {
 		return m.gatherServer(":11211", false, acc)
 	}
 
-	errChan := errchan.New(len(m.Servers) + len(m.UnixSockets))
 	for _, serverAddress := range m.Servers {
-		errChan.C <- m.gatherServer(serverAddress, false, acc)
+		acc.AddError(m.gatherServer(serverAddress, false, acc))
 	}
 
 	for _, unixAddress := range m.UnixSockets {
-		errChan.C <- m.gatherServer(unixAddress, true, acc)
+		acc.AddError(m.gatherServer(unixAddress, true, acc))
 	}
 
-	return errChan.Error()
+	return nil
 }
 
 func (m *Memcached) gatherServer(
diff --git a/plugins/inputs/memcached/memcached_test.go b/plugins/inputs/memcached/memcached_test.go
index 436c978f7..aae59dbc8 100644
--- a/plugins/inputs/memcached/memcached_test.go
+++ b/plugins/inputs/memcached/memcached_test.go
@@ -21,7 +21,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := m.Gather(&acc)
+	err := acc.GatherError(m.Gather)
 	require.NoError(t, err)
 
 	intMetrics := []string{"get_hits", "get_misses", "evictions",
diff --git a/plugins/inputs/mesos/mesos.go b/plugins/inputs/mesos/mesos.go
index e6c68bd7d..26b55c352 100644
--- a/plugins/inputs/mesos/mesos.go
+++ b/plugins/inputs/mesos/mesos.go
@@ -8,7 +8,6 @@ import (
 	"net"
 	"net/http"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -96,16 +95,13 @@ func (m *Mesos) SetDefaults() {
 // Gather() metrics from given list of Mesos Masters
 func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	var errorChannel chan error
 
 	m.SetDefaults()
 
-	errorChannel = make(chan error, len(m.Masters)+2*len(m.Slaves))
-
 	for _, v := range m.Masters {
 		wg.Add(1)
 		go func(c string) {
-			errorChannel <- m.gatherMainMetrics(c, ":5050", MASTER, acc)
+			acc.AddError(m.gatherMainMetrics(c, ":5050", MASTER, acc))
 			wg.Done()
 			return
 		}(v)
@@ -114,7 +110,7 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 	for _, v := range m.Slaves {
 		wg.Add(1)
 		go func(c string) {
-			errorChannel <- m.gatherMainMetrics(c, ":5051", SLAVE, acc)
+			acc.AddError(m.gatherMainMetrics(c, ":5051", SLAVE, acc))
 			wg.Done()
 			return
 		}(v)
@@ -125,26 +121,14 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 
 		// wg.Add(1)
 		// go func(c string) {
-		// 	errorChannel <- m.gatherSlaveTaskMetrics(c, ":5051", acc)
+		// 	acc.AddError(m.gatherSlaveTaskMetrics(c, ":5051", acc))
 		// 	wg.Done()
 		// 	return
 		// }(v)
 	}
 
 	wg.Wait()
-	close(errorChannel)
-	errorStrings := []string{}
 
-	// Gather all errors for returning them at once
-	for err := range errorChannel {
-		if err != nil {
-			errorStrings = append(errorStrings, err.Error())
-		}
-	}
-
-	if len(errorStrings) > 0 {
-		return errors.New(strings.Join(errorStrings, "\n"))
-	}
 	return nil
 }
 
diff --git a/plugins/inputs/mesos/mesos_test.go b/plugins/inputs/mesos/mesos_test.go
index 5c83e294c..a7705d11e 100644
--- a/plugins/inputs/mesos/mesos_test.go
+++ b/plugins/inputs/mesos/mesos_test.go
@@ -282,7 +282,7 @@ func TestMesosMaster(t *testing.T) {
 		Timeout: 10,
 	}
 
-	err := m.Gather(&acc)
+	err := acc.GatherError(m.Gather)
 
 	if err != nil {
 		t.Errorf(err.Error())
@@ -330,7 +330,7 @@ func TestMesosSlave(t *testing.T) {
 		Timeout: 10,
 	}
 
-	err := m.Gather(&acc)
+	err := acc.GatherError(m.Gather)
 
 	if err != nil {
 		t.Errorf(err.Error())
diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index a80b94690..510a313c1 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
 )
@@ -73,11 +72,11 @@ func (m *MongoDB) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(m.Servers))
 	for _, serv := range m.Servers {
 		u, err := url.Parse(serv)
 		if err != nil {
-			return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
+			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			continue
 		} else if u.Scheme == "" {
 			u.Scheme = "mongodb"
 			// fallback to simple string based address (i.e. "10.0.0.1:10000")
@@ -89,12 +88,12 @@ func (m *MongoDB) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(srv *Server) {
 			defer wg.Done()
-			errChan.C <- m.gatherServer(srv, acc)
+			acc.AddError(m.gatherServer(srv, acc))
 		}(m.getMongoServer(u))
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (m *MongoDB) getMongoServer(url *url.URL) *Server {
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 1ff7c3421..e3861c82f 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
 	"github.com/go-sql-driver/mysql"
@@ -137,19 +136,18 @@ func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 		m.InitMysql()
 	}
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(m.Servers))
 
 	// Loop through each server and collect metrics
 	for _, server := range m.Servers {
 		wg.Add(1)
 		go func(s string) {
 			defer wg.Done()
-			errChan.C <- m.gatherServer(s, acc)
+			acc.AddError(m.gatherServer(s, acc))
 		}(server)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 type mapping struct {
diff --git a/plugins/inputs/nginx/nginx.go b/plugins/inputs/nginx/nginx.go
index 3fe8c04d1..f439c1eeb 100644
--- a/plugins/inputs/nginx/nginx.go
+++ b/plugins/inputs/nginx/nginx.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -35,23 +34,22 @@ func (n *Nginx) Description() string {
 
 func (n *Nginx) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(n.Urls))
 
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
-			return fmt.Errorf("Unable to parse address '%s': %s", u, err)
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
 		}
 
 		wg.Add(1)
 		go func(addr *url.URL) {
 			defer wg.Done()
-			errChan.C <- n.gatherUrl(addr, acc)
+			acc.AddError(n.gatherUrl(addr, acc))
 		}(addr)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 var tr = &http.Transport{
diff --git a/plugins/inputs/nginx/nginx_test.go b/plugins/inputs/nginx/nginx_test.go
index 4c8fabfe0..7eb9e90b6 100644
--- a/plugins/inputs/nginx/nginx_test.go
+++ b/plugins/inputs/nginx/nginx_test.go
@@ -64,8 +64,8 @@ func TestNginxGeneratesMetrics(t *testing.T) {
 	var acc_nginx testutil.Accumulator
 	var acc_tengine testutil.Accumulator
 
-	err_nginx := n.Gather(&acc_nginx)
-	err_tengine := nt.Gather(&acc_tengine)
+	err_nginx := acc_nginx.GatherError(n.Gather)
+	err_tengine := acc_tengine.GatherError(nt.Gather)
 
 	require.NoError(t, err_nginx)
 	require.NoError(t, err_tengine)
diff --git a/plugins/inputs/nsq/nsq.go b/plugins/inputs/nsq/nsq.go
index 8bfd72788..b59420c26 100644
--- a/plugins/inputs/nsq/nsq.go
+++ b/plugins/inputs/nsq/nsq.go
@@ -32,7 +32,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -66,17 +65,16 @@ func (n *NSQ) Description() string {
 
 func (n *NSQ) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(n.Endpoints))
 	for _, e := range n.Endpoints {
 		wg.Add(1)
 		go func(e string) {
 			defer wg.Done()
-			errChan.C <- n.gatherEndpoint(e, acc)
+			acc.AddError(n.gatherEndpoint(e, acc))
 		}(e)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 var tr = &http.Transport{
diff --git a/plugins/inputs/nsq/nsq_test.go b/plugins/inputs/nsq/nsq_test.go
index 23fd19a42..926f99638 100644
--- a/plugins/inputs/nsq/nsq_test.go
+++ b/plugins/inputs/nsq/nsq_test.go
@@ -24,7 +24,7 @@ func TestNSQStats(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err := n.Gather(&acc)
+	err := acc.GatherError(n.Gather)
 	require.NoError(t, err)
 
 	u, err := url.Parse(ts.URL)
diff --git a/plugins/inputs/nsq_consumer/nsq_consumer.go b/plugins/inputs/nsq_consumer/nsq_consumer.go
index d4f4e9679..b82b005c9 100644
--- a/plugins/inputs/nsq_consumer/nsq_consumer.go
+++ b/plugins/inputs/nsq_consumer/nsq_consumer.go
@@ -1,7 +1,7 @@
 package nsq_consumer
 
 import (
-	"log"
+	"fmt"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -62,7 +62,7 @@ func (n *NSQConsumer) Start(acc telegraf.Accumulator) error {
 	n.consumer.AddConcurrentHandlers(nsq.HandlerFunc(func(message *nsq.Message) error {
 		metrics, err := n.parser.Parse(message.Body)
 		if err != nil {
-			log.Printf("E! NSQConsumer Parse Error\nmessage:%s\nerror:%s", string(message.Body), err.Error())
+			acc.AddError(fmt.Errorf("E! NSQConsumer Parse Error\nmessage:%s\nerror:%s", string(message.Body), err.Error()))
 			return nil
 		}
 		for _, metric := range metrics {
diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go
index 601d5b2df..8280e51c1 100644
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -5,7 +5,7 @@ package ntpq
 import (
 	"bufio"
 	"bytes"
-	"log"
+	"fmt"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -132,7 +132,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 					case strings.HasSuffix(when, "h"):
 						m, err := strconv.Atoi(strings.TrimSuffix(fields[index], "h"))
 						if err != nil {
-							log.Printf("E! Error ntpq: parsing int: %s", fields[index])
+							acc.AddError(fmt.Errorf("E! Error ntpq: parsing int: %s", fields[index]))
 							continue
 						}
 						// seconds in an hour
@@ -141,7 +141,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 					case strings.HasSuffix(when, "d"):
 						m, err := strconv.Atoi(strings.TrimSuffix(fields[index], "d"))
 						if err != nil {
-							log.Printf("E! Error ntpq: parsing int: %s", fields[index])
+							acc.AddError(fmt.Errorf("E! Error ntpq: parsing int: %s", fields[index]))
 							continue
 						}
 						// seconds in a day
@@ -150,7 +150,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 					case strings.HasSuffix(when, "m"):
 						m, err := strconv.Atoi(strings.TrimSuffix(fields[index], "m"))
 						if err != nil {
-							log.Printf("E! Error ntpq: parsing int: %s", fields[index])
+							acc.AddError(fmt.Errorf("E! Error ntpq: parsing int: %s", fields[index]))
 							continue
 						}
 						// seconds in a day
@@ -161,7 +161,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 
 				m, err := strconv.Atoi(fields[index])
 				if err != nil {
-					log.Printf("E! Error ntpq: parsing int: %s", fields[index])
+					acc.AddError(fmt.Errorf("E! Error ntpq: parsing int: %s", fields[index]))
 					continue
 				}
 				mFields[key] = int64(m)
@@ -178,7 +178,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 
 				m, err := strconv.ParseFloat(fields[index], 64)
 				if err != nil {
-					log.Printf("E! Error ntpq: parsing float: %s", fields[index])
+					acc.AddError(fmt.Errorf("E! Error ntpq: parsing float: %s", fields[index]))
 					continue
 				}
 				mFields[key] = m
diff --git a/plugins/inputs/ntpq/ntpq_test.go b/plugins/inputs/ntpq/ntpq_test.go
index 68abab7be..4b356e1f1 100644
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -21,7 +21,7 @@ func TestSingleNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(101),
@@ -51,7 +51,7 @@ func TestMissingJitterField(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(101),
@@ -80,7 +80,7 @@ func TestBadIntNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.Error(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(101),
@@ -109,7 +109,7 @@ func TestBadFloatNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.Error(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(2),
@@ -138,7 +138,7 @@ func TestDaysNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(172800),
@@ -168,7 +168,7 @@ func TestHoursNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(7200),
@@ -198,7 +198,7 @@ func TestMinutesNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(120),
@@ -228,7 +228,7 @@ func TestBadWhenNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.Error(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"poll":   int64(256),
@@ -257,7 +257,7 @@ func TestMultiNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"delay":  float64(54.033),
@@ -303,7 +303,7 @@ func TestBadHeaderNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(101),
@@ -333,7 +333,7 @@ func TestMissingDelayColumnNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.NoError(t, n.Gather(&acc))
+	assert.NoError(t, acc.GatherError(n.Gather))
 
 	fields := map[string]interface{}{
 		"when":   int64(101),
@@ -361,7 +361,7 @@ func TestFailedNTPQ(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	assert.Error(t, n.Gather(&acc))
+	assert.Error(t, acc.GatherError(n.Gather))
 }
 
 type tester struct {
diff --git a/plugins/inputs/phpfpm/phpfpm.go b/plugins/inputs/phpfpm/phpfpm.go
index d7a14d0ee..36cd02f59 100644
--- a/plugins/inputs/phpfpm/phpfpm.go
+++ b/plugins/inputs/phpfpm/phpfpm.go
@@ -80,19 +80,17 @@ func (g *phpfpm) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	var outerr error
-
 	for _, serv := range g.Urls {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			outerr = g.gatherServer(serv, acc)
+			acc.AddError(g.gatherServer(serv, acc))
 		}(serv)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 // Request status page to get stat raw data and import it
diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go
index c965e5a13..80a5d4bcf 100644
--- a/plugins/inputs/phpfpm/phpfpm_test.go
+++ b/plugins/inputs/phpfpm/phpfpm_test.go
@@ -35,7 +35,7 @@ func TestPhpFpmGeneratesMetrics_From_Http(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -75,7 +75,7 @@ func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	err = r.Gather(&acc)
+	err = acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -119,7 +119,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err = r.Gather(&acc)
+	err = acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -163,7 +163,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket_Custom_Status_Path(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err = r.Gather(&acc)
+	err = acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	tags := map[string]string{
@@ -193,7 +193,7 @@ func TestPhpFpmDefaultGetFromLocalhost(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "127.0.0.1/status")
 }
@@ -205,7 +205,7 @@ func TestPhpFpmGeneratesMetrics_Throw_Error_When_Fpm_Status_Is_Not_Responding(t
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), `Unable to connect to phpfpm status page 'http://aninvalidone': Get http://aninvalidone: dial tcp: lookup aninvalidone`)
 }
@@ -217,7 +217,7 @@ func TestPhpFpmGeneratesMetrics_Throw_Error_When_Socket_Path_Is_Invalid(t *testi
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.Error(t, err)
 	assert.Equal(t, `Socket doesn't exist  '/tmp/invalid.sock': stat /tmp/invalid.sock: no such file or directory`, err.Error())
 
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index f5256750d..de33ebee1 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -68,7 +68,6 @@ func (_ *Ping) SampleConfig() string {
 func (p *Ping) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
-	errorChannel := make(chan error, len(p.Urls)*2)
 
 	// Spin off a go routine for each url to ping
 	for _, url := range p.Urls {
@@ -80,14 +79,14 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			out, err := p.pingHost(totalTimeout, args...)
 			if err != nil {
 				// Combine go err + stderr output
-				errorChannel <- errors.New(
-					strings.TrimSpace(out) + ", " + err.Error())
+				acc.AddError(errors.New(
+					strings.TrimSpace(out) + ", " + err.Error()))
 			}
 			tags := map[string]string{"url": u}
 			trans, rec, avg, stddev, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
-				errorChannel <- err
+				acc.AddError(err)
 				return
 			}
 			// Calculate packet loss percentage
@@ -108,18 +107,8 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 	}
 
 	wg.Wait()
-	close(errorChannel)
 
-	// Get all errors and return them as one giant error
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
-
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
+	return nil
 }
 
 func hostPinger(timeout float64, args ...string) (string, error) {
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index a7a6931f5..22dac4e65 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -144,7 +144,7 @@ func TestPingGather(t *testing.T) {
 		pingHost: mockHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted":   5,
@@ -182,7 +182,7 @@ func TestLossyPingGather(t *testing.T) {
 		pingHost: mockLossyHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted":   5,
@@ -215,7 +215,7 @@ func TestBadPingGather(t *testing.T) {
 		pingHost: mockErrorHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.amazon.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted": 2,
@@ -237,7 +237,7 @@ func TestFatalPingGather(t *testing.T) {
 		pingHost: mockFatalHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	assert.False(t, acc.HasMeasurement("packets_transmitted"),
 		"Fatal ping should not have packet measurements")
 	assert.False(t, acc.HasMeasurement("packets_received"),
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index b55b7955b..70ff78f75 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -69,7 +69,7 @@ func TestPingGather(t *testing.T) {
 		pingHost: mockHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted": 4,
@@ -112,7 +112,7 @@ func TestBadPingGather(t *testing.T) {
 		pingHost: mockErrorHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.amazon.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted": 4,
@@ -155,7 +155,7 @@ func TestLossyPingGather(t *testing.T) {
 		pingHost: mockLossyHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
 		"packets_transmitted": 9,
@@ -214,7 +214,7 @@ func TestFatalPingGather(t *testing.T) {
 		pingHost: mockFatalHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 	assert.True(t, acc.HasFloatField("ping", "errors"),
 		"Fatal ping should have packet measurements")
 	assert.False(t, acc.HasIntField("ping", "packets_transmitted"),
@@ -259,7 +259,7 @@ func TestUnreachablePingGather(t *testing.T) {
 		pingHost: mockUnreachableHostPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
@@ -305,7 +305,7 @@ func TestTTLExpiredPingGather(t *testing.T) {
 		pingHost: mockTTLExpiredPinger,
 	}
 
-	p.Gather(&acc)
+	acc.GatherError(p.Gather)
 
 	tags := map[string]string{"url": "www.google.com"}
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index b8d3be625..24326511e 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -170,7 +170,8 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 		if p.Query[i].Version <= db_version {
 			rows, err := db.Query(sql_query)
 			if err != nil {
-				return err
+				acc.AddError(err)
+				continue
 			}
 
 			defer rows.Close()
@@ -178,7 +179,8 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			// grab the column information from the result
 			p.OrderedColumns, err = rows.Columns()
 			if err != nil {
-				return err
+				acc.AddError(err)
+				continue
 			} else {
 				for _, v := range p.OrderedColumns {
 					p.AllColumns = append(p.AllColumns, v)
@@ -195,7 +197,8 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			for rows.Next() {
 				err = p.accRow(meas_name, rows, acc)
 				if err != nil {
-					return err
+					acc.AddError(err)
+					break
 				}
 			}
 		}
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index f92284ee4..0b2785cad 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -26,7 +26,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		},
 	}
 	var acc testutil.Accumulator
-	err := p.Gather(&acc)
+	err := acc.GatherError(p.Gather)
 	require.NoError(t, err)
 
 	availableColumns := make(map[string]bool)
@@ -114,7 +114,7 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := p.Gather(&acc)
+	err := acc.GatherError(p.Gather)
 	require.NoError(t, err)
 
 	for col := range p.IgnoredColumns() {
diff --git a/plugins/inputs/powerdns/powerdns.go b/plugins/inputs/powerdns/powerdns.go
index 68b1696e0..e53373baf 100644
--- a/plugins/inputs/powerdns/powerdns.go
+++ b/plugins/inputs/powerdns/powerdns.go
@@ -41,7 +41,7 @@ func (p *Powerdns) Gather(acc telegraf.Accumulator) error {
 
 	for _, serverSocket := range p.UnixSockets {
 		if err := p.gatherServer(serverSocket, acc); err != nil {
-			return err
+			acc.AddError(err)
 		}
 	}
 
diff --git a/plugins/inputs/powerdns/powerdns_test.go b/plugins/inputs/powerdns/powerdns_test.go
index 78845c23d..c2d4413e2 100644
--- a/plugins/inputs/powerdns/powerdns_test.go
+++ b/plugins/inputs/powerdns/powerdns_test.go
@@ -90,7 +90,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err = p.Gather(&acc)
+	err = acc.GatherError(p.Gather)
 	require.NoError(t, err)
 
 	intMetrics := []string{"corrupt-packets", "deferred-cache-inserts",
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index d689ecf3e..3715d390b 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -71,9 +71,8 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 
 	procs, err := p.updateProcesses(p.procs)
 	if err != nil {
-		return fmt.Errorf(
-			"E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
-			p.Exe, p.PidFile, p.Pattern, p.User, err.Error())
+		acc.AddError(fmt.Errorf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
+			p.Exe, p.PidFile, p.Pattern, p.User, err.Error()))
 	}
 	p.procs = procs
 
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index 1f6f27642..97cf34582 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -108,7 +108,7 @@ func TestGather_CreateProcessErrorOk(t *testing.T) {
 			return nil, fmt.Errorf("createProcess error")
 		},
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 }
 
 func TestGather_CreatePIDFinderError(t *testing.T) {
@@ -120,7 +120,7 @@ func TestGather_CreatePIDFinderError(t *testing.T) {
 		},
 		createProcess: newTestProc,
 	}
-	require.Error(t, p.Gather(&acc))
+	require.Error(t, acc.GatherError(p.Gather))
 }
 
 func TestGather_ProcessName(t *testing.T) {
@@ -132,7 +132,7 @@ func TestGather_ProcessName(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.Equal(t, "custom_name", acc.TagValue("procstat", "process_name"))
 }
@@ -146,7 +146,7 @@ func TestGather_NoProcessNameUsesReal(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.True(t, acc.HasTag("procstat", "process_name"))
 }
@@ -159,7 +159,7 @@ func TestGather_NoPidTag(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 	assert.True(t, acc.HasInt32Field("procstat", "pid"))
 	assert.False(t, acc.HasTag("procstat", "pid"))
 }
@@ -173,7 +173,7 @@ func TestGather_PidTag(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 	assert.Equal(t, "42", acc.TagValue("procstat", "pid"))
 	assert.False(t, acc.HasInt32Field("procstat", "pid"))
 }
@@ -187,7 +187,7 @@ func TestGather_Prefix(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 	assert.True(t, acc.HasInt32Field("procstat", "custom_prefix_num_fds"))
 }
 
@@ -199,7 +199,7 @@ func TestGather_Exe(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.Equal(t, exe, acc.TagValue("procstat", "exe"))
 }
@@ -213,7 +213,7 @@ func TestGather_User(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.Equal(t, user, acc.TagValue("procstat", "user"))
 }
@@ -227,7 +227,7 @@ func TestGather_Pattern(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.Equal(t, pattern, acc.TagValue("procstat", "pattern"))
 }
@@ -239,7 +239,7 @@ func TestGather_MissingPidMethod(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.Error(t, p.Gather(&acc))
+	require.Error(t, acc.GatherError(p.Gather))
 }
 
 func TestGather_PidFile(t *testing.T) {
@@ -251,7 +251,7 @@ func TestGather_PidFile(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   newTestProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.Equal(t, pidfile, acc.TagValue("procstat", "pidfile"))
 }
@@ -266,7 +266,7 @@ func TestGather_PercentFirstPass(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   NewProc,
 	}
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.True(t, acc.HasFloatField("procstat", "cpu_time_user"))
 	assert.False(t, acc.HasFloatField("procstat", "cpu_usage"))
@@ -282,8 +282,8 @@ func TestGather_PercentSecondPass(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{pid}, nil),
 		createProcess:   NewProc,
 	}
-	require.NoError(t, p.Gather(&acc))
-	require.NoError(t, p.Gather(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
+	require.NoError(t, acc.GatherError(p.Gather))
 
 	assert.True(t, acc.HasFloatField("procstat", "cpu_time_user"))
 	assert.True(t, acc.HasFloatField("procstat", "cpu_usage"))
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index c12127965..2e613e2c0 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -67,19 +67,17 @@ var ErrProtocolError = errors.New("prometheus protocol error")
 func (p *Prometheus) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
-	var outerr error
-
 	for _, serv := range p.Urls {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			outerr = p.gatherURL(serv, acc)
+			acc.AddError(p.gatherURL(serv, acc))
 		}(serv)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 var tr = &http.Transport{
diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
index 4b316a3b4..64959b2e2 100644
--- a/plugins/inputs/prometheus/prometheus_test.go
+++ b/plugins/inputs/prometheus/prometheus_test.go
@@ -41,7 +41,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := p.Gather(&acc)
+	err := acc.GatherError(p.Gather)
 	require.NoError(t, err)
 
 	assert.True(t, acc.HasFloatField("go_gc_duration_seconds", "count"))
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index c33b11e66..d8bf45913 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -136,7 +135,7 @@ type Node struct {
 }
 
 // gatherFunc ...
-type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error)
+type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator)
 
 var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
 
@@ -198,16 +197,15 @@ func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 	wg.Add(len(gatherFunctions))
-	errChan := errchan.New(len(gatherFunctions))
 	for _, f := range gatherFunctions {
 		go func(gf gatherFunc) {
 			defer wg.Done()
-			gf(r, acc, errChan.C)
+			gf(r, acc)
 		}(f)
 	}
 	wg.Wait()
 
-	return errChan.Error()
+	return nil
 }
 
 func (r *RabbitMQ) requestJSON(u string, target interface{}) error {
@@ -245,17 +243,17 @@ func (r *RabbitMQ) requestJSON(u string, target interface{}) error {
 	return nil
 }
 
-func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
+func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator) {
 	overview := &OverviewResponse{}
 
 	err := r.requestJSON("/api/overview", &overview)
 	if err != nil {
-		errChan <- err
+		acc.AddError(err)
 		return
 	}
 
 	if overview.QueueTotals == nil || overview.ObjectTotals == nil || overview.MessageStats == nil {
-		errChan <- fmt.Errorf("Wrong answer from rabbitmq. Probably auth issue")
+		acc.AddError(fmt.Errorf("Wrong answer from rabbitmq. Probably auth issue"))
 		return
 	}
 
@@ -277,16 +275,14 @@ func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
 		"messages_published": overview.MessageStats.Publish,
 	}
 	acc.AddFields("rabbitmq_overview", fields, tags)
-
-	errChan <- nil
 }
 
-func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
+func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator) {
 	nodes := make([]Node, 0)
 	// Gather information about nodes
 	err := r.requestJSON("/api/nodes", &nodes)
 	if err != nil {
-		errChan <- err
+		acc.AddError(err)
 		return
 	}
 	now := time.Now()
@@ -314,16 +310,14 @@ func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
 		}
 		acc.AddFields("rabbitmq_node", fields, tags, now)
 	}
-
-	errChan <- nil
 }
 
-func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
+func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator) {
 	// Gather information about queues
 	queues := make([]Queue, 0)
 	err := r.requestJSON("/api/queues", &queues)
 	if err != nil {
-		errChan <- err
+		acc.AddError(err)
 		return
 	}
 
@@ -371,8 +365,6 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator, errChan chan error) {
 			tags,
 		)
 	}
-
-	errChan <- nil
 }
 
 func (r *RabbitMQ) shouldGatherNode(node Node) bool {
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index 4bdc980db..7ff0a5d57 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -399,7 +399,7 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.NoError(t, err)
 
 	intMetrics := []string{
diff --git a/plugins/inputs/raindrops/raindrops.go b/plugins/inputs/raindrops/raindrops.go
index 6851f5d93..bcbf77368 100644
--- a/plugins/inputs/raindrops/raindrops.go
+++ b/plugins/inputs/raindrops/raindrops.go
@@ -35,24 +35,24 @@ func (r *Raindrops) Description() string {
 
 func (r *Raindrops) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
-	var outerr error
 
 	for _, u := range r.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
-			return fmt.Errorf("Unable to parse address '%s': %s", u, err)
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
 		}
 
 		wg.Add(1)
 		go func(addr *url.URL) {
 			defer wg.Done()
-			outerr = r.gatherUrl(addr, acc)
+			acc.AddError(r.gatherUrl(addr, acc))
 		}(addr)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 func (r *Raindrops) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/raindrops/raindrops_test.go b/plugins/inputs/raindrops/raindrops_test.go
index 0dee9b1cc..b0b601cec 100644
--- a/plugins/inputs/raindrops/raindrops_test.go
+++ b/plugins/inputs/raindrops/raindrops_test.go
@@ -68,7 +68,7 @@ func TestRaindropsGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := n.Gather(&acc)
+	err := acc.GatherError(n.Gather)
 	require.NoError(t, err)
 
 	fields := map[string]interface{}{
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 2dd947a2a..cb976cada 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -66,7 +65,6 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(r.Servers))
 	for _, serv := range r.Servers {
 		if !strings.HasPrefix(serv, "tcp://") && !strings.HasPrefix(serv, "unix://") {
 			serv = "tcp://" + serv
@@ -74,7 +72,8 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
 
 		u, err := url.Parse(serv)
 		if err != nil {
-			return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
+			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			continue
 		} else if u.Scheme == "" {
 			// fallback to simple string based address (i.e. "10.0.0.1:10000")
 			u.Scheme = "tcp"
@@ -91,12 +90,12 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			errChan.C <- r.gatherServer(u, acc)
+			acc.AddError(r.gatherServer(u, acc))
 		}(serv)
 	}
 
 	wg.Wait()
-	return errChan.Error()
+	return nil
 }
 
 func (r *Redis) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index 0c3781500..904a80d37 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -25,7 +25,7 @@ func TestRedisConnect(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := r.Gather(&acc)
+	err := acc.GatherError(r.Gather)
 	require.NoError(t, err)
 }
 
diff --git a/plugins/inputs/rethinkdb/rethinkdb.go b/plugins/inputs/rethinkdb/rethinkdb.go
index 32237a80f..e32f79731 100644
--- a/plugins/inputs/rethinkdb/rethinkdb.go
+++ b/plugins/inputs/rethinkdb/rethinkdb.go
@@ -44,12 +44,11 @@ func (r *RethinkDB) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	var outerr error
-
 	for _, serv := range r.Servers {
 		u, err := url.Parse(serv)
 		if err != nil {
-			return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
+			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			continue
 		} else if u.Scheme == "" {
 			// fallback to simple string based address (i.e. "10.0.0.1:10000")
 			u.Host = serv
@@ -57,13 +56,13 @@ func (r *RethinkDB) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(serv string) {
 			defer wg.Done()
-			outerr = r.gatherServer(&Server{Url: u}, acc)
+			acc.AddError(r.gatherServer(&Server{Url: u}, acc))
 		}(serv)
 	}
 
 	wg.Wait()
 
-	return outerr
+	return nil
 }
 
 func (r *RethinkDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/riak/riak.go b/plugins/inputs/riak/riak.go
index 19bf7df04..9ddbbfa65 100644
--- a/plugins/inputs/riak/riak.go
+++ b/plugins/inputs/riak/riak.go
@@ -104,9 +104,7 @@ func (r *Riak) Gather(acc telegraf.Accumulator) error {
 
 	// Range over all servers, gathering stats. Returns early in case of any error.
 	for _, s := range r.Servers {
-		if err := r.gatherServer(s, acc); err != nil {
-			return err
-		}
+		acc.AddError(r.gatherServer(s, acc))
 	}
 
 	return nil
diff --git a/plugins/inputs/snmp_legacy/snmp_legacy.go b/plugins/inputs/snmp_legacy/snmp_legacy.go
index e5dbbc459..57f9f4fe2 100644
--- a/plugins/inputs/snmp_legacy/snmp_legacy.go
+++ b/plugins/inputs/snmp_legacy/snmp_legacy.go
@@ -1,6 +1,7 @@
 package snmp_legacy
 
 import (
+	"fmt"
 	"io/ioutil"
 	"log"
 	"net"
@@ -394,16 +395,16 @@ func (s *Snmp) Gather(acc telegraf.Accumulator) error {
 		// only if len(s.OidInstanceMapping) == 0
 		if len(host.OidInstanceMapping) >= 0 {
 			if err := host.SNMPMap(acc, s.nameToOid, s.subTableMap); err != nil {
-				log.Printf("E! SNMP Mapping error for host '%s': %s", host.Address, err)
+				acc.AddError(fmt.Errorf("E! SNMP Mapping error for host '%s': %s", host.Address, err))
 				continue
 			}
 		}
 		// Launch Get requests
 		if err := host.SNMPGet(acc, s.initNode); err != nil {
-			log.Printf("E! SNMP Error for host '%s': %s", host.Address, err)
+			acc.AddError(fmt.Errorf("E! SNMP Error for host '%s': %s", host.Address, err))
 		}
 		if err := host.SNMPBulk(acc, s.initNode); err != nil {
-			log.Printf("E! SNMP Error for host '%s': %s", host.Address, err)
+			acc.AddError(fmt.Errorf("E! SNMP Error for host '%s': %s", host.Address, err))
 		}
 	}
 	return nil
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 5afbb067e..1e7f92dff 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -79,20 +79,19 @@ func (s *SQLServer) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	var outerr error
 
 	for _, serv := range s.Servers {
 		for _, query := range queries {
 			wg.Add(1)
 			go func(serv string, query Query) {
 				defer wg.Done()
-				outerr = s.gatherServer(serv, query, acc)
+				acc.AddError(s.gatherServer(serv, query, acc))
 			}(serv, query)
 		}
 	}
 
 	wg.Wait()
-	return outerr
+	return nil
 }
 
 func (s *SQLServer) gatherServer(server string, query Query, acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
index 27e181002..551cd37aa 100644
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -5,7 +5,6 @@ package sysstat
 import (
 	"bufio"
 	"encoding/csv"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -149,34 +148,20 @@ func (s *Sysstat) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 	var wg sync.WaitGroup
-	errorChannel := make(chan error, len(s.Options)*2)
 	for option := range s.Options {
 		wg.Add(1)
 		go func(acc telegraf.Accumulator, option string) {
 			defer wg.Done()
-			if err := s.parse(acc, option, ts); err != nil {
-				errorChannel <- err
-			}
+			acc.AddError(s.parse(acc, option, ts))
 		}(acc, option)
 	}
 	wg.Wait()
-	close(errorChannel)
-
-	errorStrings := []string{}
-	for err := range errorChannel {
-		errorStrings = append(errorStrings, err.Error())
-	}
 
 	if _, err := os.Stat(s.tmpFile); err == nil {
-		if err := os.Remove(s.tmpFile); err != nil {
-			errorStrings = append(errorStrings, err.Error())
-		}
+		acc.AddError(os.Remove(s.tmpFile))
 	}
 
-	if len(errorStrings) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errorStrings, "\n"))
+	return nil
 }
 
 // collect collects sysstat data with the collector utility sadc.
diff --git a/plugins/inputs/sysstat/sysstat_interval_test.go b/plugins/inputs/sysstat/sysstat_interval_test.go
index 747158392..972eb9af9 100644
--- a/plugins/inputs/sysstat/sysstat_interval_test.go
+++ b/plugins/inputs/sysstat/sysstat_interval_test.go
@@ -26,14 +26,14 @@ func TestInterval(t *testing.T) {
 	s.interval = 0
 	wantedInterval := 3
 
-	err := s.Gather(&acc)
+	err := acc.GatherError(s.Gather)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	time.Sleep(time.Duration(wantedInterval) * time.Second)
 
-	err = s.Gather(&acc)
+	err = acc.GatherError(s.Gather)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/plugins/inputs/sysstat/sysstat_test.go b/plugins/inputs/sysstat/sysstat_test.go
index e344d307d..876e6d2c8 100644
--- a/plugins/inputs/sysstat/sysstat_test.go
+++ b/plugins/inputs/sysstat/sysstat_test.go
@@ -37,7 +37,7 @@ func TestGather(t *testing.T) {
 	defer func() { execCommand = exec.Command }()
 	var acc testutil.Accumulator
 
-	err := s.Gather(&acc)
+	err := acc.GatherError(s.Gather)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,7 +160,7 @@ func TestGatherGrouped(t *testing.T) {
 	defer func() { execCommand = exec.Command }()
 	var acc testutil.Accumulator
 
-	err := s.Gather(&acc)
+	err := acc.GatherError(s.Gather)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index f57d970cf..151b3c685 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -80,7 +80,6 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 		}
 	}
 
-	var errS string
 	// Create a "tailer" for each file
 	for _, filepath := range t.Files {
 		g, err := globpath.Compile(filepath)
@@ -97,7 +96,7 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 					Pipe:      t.Pipe,
 				})
 			if err != nil {
-				errS += err.Error() + " "
+				acc.AddError(err)
 				continue
 			}
 			// create a goroutine for each "tailer"
@@ -107,9 +106,6 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 		}
 	}
 
-	if errS != "" {
-		return fmt.Errorf(errS)
-	}
 	return nil
 }
 
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 7ddb502f9..9e3888a1d 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -30,7 +30,7 @@ func TestTailFromBeginning(t *testing.T) {
 
 	acc := testutil.Accumulator{}
 	require.NoError(t, tt.Start(&acc))
-	require.NoError(t, tt.Gather(&acc))
+	require.NoError(t, acc.GatherError(tt.Gather))
 
 	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu",
@@ -67,7 +67,7 @@ func TestTailFromEnd(t *testing.T) {
 
 	_, err = tmpfile.WriteString("cpu,othertag=foo usage_idle=100\n")
 	require.NoError(t, err)
-	require.NoError(t, tt.Gather(&acc))
+	require.NoError(t, acc.GatherError(tt.Gather))
 
 	acc.Wait(1)
 	acc.AssertContainsTaggedFields(t, "cpu",
@@ -98,7 +98,7 @@ func TestTailBadLine(t *testing.T) {
 
 	_, err = tmpfile.WriteString("cpu mytag= foo usage_idle= 100\n")
 	require.NoError(t, err)
-	require.NoError(t, tt.Gather(&acc))
+	require.NoError(t, acc.GatherError(tt.Gather))
 
 	acc.WaitError(1)
 	assert.Contains(t, acc.Errors[0].Error(), "E! Malformed log line")
diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
index c75041221..896215aa0 100644
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -6,7 +6,6 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -124,8 +123,8 @@ func (s *Varnish) Gather(acc telegraf.Accumulator) error {
 
 		sectionMap[section][field], err = strconv.ParseUint(value, 10, 64)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Expected a numeric value for %s = %v\n",
-				stat, value)
+			acc.AddError(fmt.Errorf("Expected a numeric value for %s = %v\n",
+				stat, value))
 		}
 	}
 
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 7ed1ccd51..9a86b7eff 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -79,7 +79,7 @@ func (wb *Webhooks) Listen(acc telegraf.Accumulator) {
 
 	err := http.ListenAndServe(fmt.Sprintf("%s", wb.ServiceAddress), r)
 	if err != nil {
-		log.Printf("E! Error starting server: %v", err)
+		acc.AddError(fmt.Errorf("E! Error starting server: %v", err))
 	}
 }
 
diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go
index c11b55f68..977a1f1ed 100644
--- a/plugins/inputs/zookeeper/zookeeper.go
+++ b/plugins/inputs/zookeeper/zookeeper.go
@@ -47,9 +47,7 @@ func (z *Zookeeper) Gather(acc telegraf.Accumulator) error {
 	}
 
 	for _, serverAddress := range z.Servers {
-		if err := z.gatherServer(serverAddress, acc); err != nil {
-			return err
-		}
+		acc.AddError(z.gatherServer(serverAddress, acc))
 	}
 	return nil
 }
diff --git a/plugins/inputs/zookeeper/zookeeper_test.go b/plugins/inputs/zookeeper/zookeeper_test.go
index bc02ffb9d..e8bcc11d5 100644
--- a/plugins/inputs/zookeeper/zookeeper_test.go
+++ b/plugins/inputs/zookeeper/zookeeper_test.go
@@ -19,8 +19,7 @@ func TestZookeeperGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	err := z.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, acc.GatherError(z.Gather))
 
 	intMetrics := []string{
 		"avg_latency",
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 9ebf77cf7..75472f944 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -187,6 +187,17 @@ func (a *Accumulator) TagValue(measurement string, key string) string {
 	return ""
 }
 
+// Calls the given Gather function and returns the first error found.
+func (a *Accumulator) GatherError(gf func(telegraf.Accumulator) error) error {
+	if err := gf(a); err != nil {
+		return err
+	}
+	if len(a.Errors) > 0 {
+		return a.Errors[0]
+	}
+	return nil
+}
+
 // NFields returns the total number of fields in the accumulator, across all
 // measurements
 func (a *Accumulator) NFields() int {

From 3c28b9351459ef4a2390c77d8c93e411076f9992 Mon Sep 17 00:00:00 2001
From: Alexander Blagoev <alexander.i.blagoev@gmail.com>
Date: Mon, 24 Apr 2017 21:18:55 +0300
Subject: [PATCH 0219/1302] Improve procstat input documentation (#2699)

closes #1895
---
 plugins/inputs/procstat/README.md | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index d31120743..7f3d468cc 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -5,8 +5,6 @@
 The procstat plugin can be used to monitor system resource usage by an
 individual process using their /proc data.
 
-The plugin will tag processes by their PID and their process name.
-
 Processes can be specified either by pid file, by executable name, by command
 line pattern matching, or by username (in this order or priority. Procstat
 plugin will use `pgrep` when executable name is provided to obtain the pid.
@@ -14,6 +12,19 @@ Procstat plugin will transmit IO, memory, cpu, file descriptor related
 measurements for every process specified. A prefix can be set to isolate
 individual process specific measurements.
 
+The plugin will tag processes according to how they are specified in the configuration. If a pid file is used, a "pidfile" tag will be generated.
+On the other hand, if an executable is used an "exe" tag will be generated. Possible tag names:
+
+* pidfile
+* exe
+* pattern
+* user
+
+Additionally the plugin will tag processes by their PID (pid_tag = true in the config) and their process name:
+
+* pid
+* process_name
+
 Example:
 
 ```
@@ -28,8 +39,8 @@ Example:
 The above configuration would result in output like:
 
 ```
-> procstat,name="dnsmasq",pid="44979" cpu_user=0.14,cpu_system=0.07
-> procstat,name="influxd",pid="34337" influxd_cpu_user=25.43,influxd_cpu_system=21.82
+> procstat,pidfile=/var/run/lxc/dnsmasq.pid,process_name=dnsmasq,pid=44979 cpu_user=0.14,cpu_system=0.07
+> procstat,exe=influxd,process_name=influxd,pid=34337 influxd_cpu_user=25.43,influxd_cpu_system=21.82
 ```
 
 # Measurements

From 8f5cd6c2ae2b8a5c7a8f694fd63eccb872a51e38 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 24 Apr 2017 16:14:42 -0400
Subject: [PATCH 0220/1302] add keep-alive support to socket_listener &
 socket_writer (#2697)

closes #2635
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/socket_listener/README.md      |  6 ++++
 .../inputs/socket_listener/socket_listener.go | 36 +++++++++++++++++--
 plugins/outputs/socket_writer/README.md       |  6 ++++
 .../outputs/socket_writer/socket_writer.go    | 32 ++++++++++++++++-
 5 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2ddc9d27..775933713 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ be deprecated eventually.
 - [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
 - [#2253](https://github.com/influxdata/telegraf/pull/2253): Change jolokia plugin to use bulk requests.
 - [#2575](https://github.com/influxdata/telegraf/issues/2575) Add diskio input for Darwin
+- [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 
 ### Bugfixes
 
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
index e73296804..604b8e893 100644
--- a/plugins/inputs/socket_listener/README.md
+++ b/plugins/inputs/socket_listener/README.md
@@ -36,6 +36,12 @@ This is a sample configuration for the plugin.
   ## Defaults to the OS default.
   # read_buffer_size = 65535
 
+  ## Period between keep alive probes.
+  ## Only applies to TCP sockets.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  # keep_alive_period = "5m"
+
   ## Data format to consume.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 4a9a470a7..eb5fc23ab 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
@@ -47,6 +48,11 @@ func (ssl *streamSocketListener) listen() {
 		}
 		ssl.connections[c.RemoteAddr().String()] = c
 		ssl.connectionsMtx.Unlock()
+
+		if err := ssl.setKeepAlive(c); err != nil {
+			ssl.AddError(fmt.Errorf("unable to configure keep alive (%s): %s", ssl.ServiceAddress, err))
+		}
+
 		go ssl.read(c)
 	}
 
@@ -57,6 +63,23 @@ func (ssl *streamSocketListener) listen() {
 	ssl.connectionsMtx.Unlock()
 }
 
+func (ssl *streamSocketListener) setKeepAlive(c net.Conn) error {
+	if ssl.KeepAlivePeriod == nil {
+		return nil
+	}
+	tcpc, ok := c.(*net.TCPConn)
+	if !ok {
+		return fmt.Errorf("cannot set keep alive on a %s socket", strings.SplitN(ssl.ServiceAddress, "://", 2)[0])
+	}
+	if ssl.KeepAlivePeriod.Duration == 0 {
+		return tcpc.SetKeepAlive(false)
+	}
+	if err := tcpc.SetKeepAlive(true); err != nil {
+		return err
+	}
+	return tcpc.SetKeepAlivePeriod(ssl.KeepAlivePeriod.Duration)
+}
+
 func (ssl *streamSocketListener) removeConnection(c net.Conn) {
 	ssl.connectionsMtx.Lock()
 	delete(ssl.connections, c.RemoteAddr().String())
@@ -116,9 +139,10 @@ func (psl *packetSocketListener) listen() {
 }
 
 type SocketListener struct {
-	ServiceAddress string
-	MaxConnections int
-	ReadBufferSize int
+	ServiceAddress  string
+	MaxConnections  int
+	ReadBufferSize  int
+	KeepAlivePeriod *internal.Duration
 
 	parsers.Parser
 	telegraf.Accumulator
@@ -154,6 +178,12 @@ func (sl *SocketListener) SampleConfig() string {
   ## Defaults to the OS default.
   # read_buffer_size = 65535
 
+  ## Period between keep alive probes.
+  ## Only applies to TCP sockets.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  # keep_alive_period = "5m"
+
   ## Data format to consume.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
diff --git a/plugins/outputs/socket_writer/README.md b/plugins/outputs/socket_writer/README.md
index 441cdf1f7..027e92fe8 100644
--- a/plugins/outputs/socket_writer/README.md
+++ b/plugins/outputs/socket_writer/README.md
@@ -19,6 +19,12 @@ It can output data in any of the [supported output formats](https://github.com/i
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
+  ## Period between keep alive probes.
+  ## Only applies to TCP sockets.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  # keep_alive_period = "5m"
+
   ## Data format to generate.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 2c54bb0bb..dbc3cba05 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -2,16 +2,19 @@ package socket_writer
 
 import (
 	"fmt"
+	"log"
 	"net"
 	"strings"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
 
 type SocketWriter struct {
-	Address string
+	Address         string
+	KeepAlivePeriod *internal.Duration
 
 	serializers.Serializer
 
@@ -36,6 +39,12 @@ func (sw *SocketWriter) SampleConfig() string {
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
+  ## Period between keep alive probes.
+  ## Only applies to TCP sockets.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  # keep_alive_period = "5m"
+
   ## Data format to generate.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
@@ -59,10 +68,31 @@ func (sw *SocketWriter) Connect() error {
 		return err
 	}
 
+	if err := sw.setKeepAlive(c); err != nil {
+		log.Printf("unable to configure keep alive (%s): %s", sw.Address, err)
+	}
+
 	sw.Conn = c
 	return nil
 }
 
+func (sw *SocketWriter) setKeepAlive(c net.Conn) error {
+	if sw.KeepAlivePeriod == nil {
+		return nil
+	}
+	tcpc, ok := c.(*net.TCPConn)
+	if !ok {
+		return fmt.Errorf("cannot set keep alive on a %s socket", strings.SplitN(sw.Address, "://", 2)[0])
+	}
+	if sw.KeepAlivePeriod.Duration == 0 {
+		return tcpc.SetKeepAlive(false)
+	}
+	if err := tcpc.SetKeepAlive(true); err != nil {
+		return err
+	}
+	return tcpc.SetKeepAlivePeriod(sw.KeepAlivePeriod.Duration)
+}
+
 // Write writes the given metrics to the destination.
 // If an error is encountered, it is up to the caller to retry the same write again later.
 // Not parallel safe.

From b243faa22be00fce2cce98092ce43ed1e48f7c4b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Mon, 24 Apr 2017 16:18:58 -0700
Subject: [PATCH 0221/1302] Don't close stdout on config reload. (#2707)

fixes #2528
---
 CHANGELOG.md                 | 1 +
 plugins/outputs/file/file.go | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 775933713..9fdfbc32d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@ be deprecated eventually.
 - [#2684](https://github.com/influxdata/telegraf/pull/2684): Fix ipmi_sensor config is shared between all plugin instances
 - [#2450](https://github.com/influxdata/telegraf/issues/2450): Network statistics not collected when system has alias interfaces
 - [#1911](https://github.com/influxdata/telegraf/issues/1911): Sysstat plugin needs LANG=C or similar locale
+- [#2528](https://github.com/influxdata/telegraf/issues/2528): File output closes standard streams on reload.
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go
index e05d0fe83..41605213e 100644
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -44,7 +44,6 @@ func (f *File) Connect() error {
 	for _, file := range f.Files {
 		if file == "stdout" {
 			writers = append(writers, os.Stdout)
-			f.closers = append(f.closers, os.Stdout)
 		} else {
 			var of *os.File
 			var err error

From 9b874dff8df2aeeed1cc641b5564d6994c596bde Mon Sep 17 00:00:00 2001
From: Jeff Zellner <jeffz@eml.cc>
Date: Tue, 25 Apr 2017 14:17:15 -0600
Subject: [PATCH 0222/1302] Update README.md (#2719)

---
 .../inputs/postgresql_extensible/README.md    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/postgresql_extensible/README.md b/plugins/inputs/postgresql_extensible/README.md
index e9fbc571c..ab5222955 100644
--- a/plugins/inputs/postgresql_extensible/README.md
+++ b/plugins/inputs/postgresql_extensible/README.md
@@ -1,16 +1,15 @@
 # PostgreSQL plugin
 
 This postgresql plugin provides metrics for your postgres database. It has been
-designed to parse ithe sql queries in the plugin section of your telegraf.conf.
+designed to parse SQL queries in the plugin section of your `telegraf.conf`.
 
-For now only two queries are specified and it's up to you to add more; some per
-query parameters have been added :
+The example below has two queries are specified, with the following parameters:
 
-* The SQl query itself
-* The minimum version supported (here in numeric display visible in pg_settings)
-* A boolean to define if the query have to be run against some specific
-* variables (defined in the databaes variable of the plugin section)
-* The list of the column that have to be defined has tags
+* The SQL query itself
+* The minimum PostgreSQL version supported (the numeric display visible in pg_settings)
+* A boolean to define if the query has to be run against some specific database (defined in the `databases` variable of the plugin section)
+* The name of the measurement
+* A list of the columns to be defined as tags
 
 ```
 [[inputs.postgresql_extensible]]
@@ -19,7 +18,7 @@ query parameters have been added :
   # or a simple string:
   #   host=localhost user=pqotest password=... sslmode=... dbname=app_production
   #
-  # All connection parameters are optional.  #
+  # All connection parameters are optional.  
   # Without the dbname parameter, the driver will default to a database
   # with the same name as the user. This dbname is just for instantiating a
   # connection with the server and doesn't restrict the databases we are trying
@@ -65,7 +64,7 @@ query parameters have been added :
 ```
 
 The system can be easily extended using homemade metrics collection tools or
-using postgreql extensions ([pg_stat_statements](http://www.postgresql.org/docs/current/static/pgstatstatements.html), [pg_proctab](https://github.com/markwkm/pg_proctab),[powa](http://dalibo.github.io/powa/)...)
+using postgreql extensions ([pg_stat_statements](http://www.postgresql.org/docs/current/static/pgstatstatements.html), [pg_proctab](https://github.com/markwkm/pg_proctab) or [powa](http://dalibo.github.io/powa/))
 
 # Sample Queries :
 - telegraf.conf postgresql_extensible queries (assuming that you have configured

From c66e2896c658cc2d3ccf9fdec3be8072e87162a2 Mon Sep 17 00:00:00 2001
From: Nevins <nevins-b@users.noreply.github.com>
Date: Wed, 26 Apr 2017 13:54:24 -0400
Subject: [PATCH 0223/1302] add option to randomize Kinesis partition key
 (#2705)

---
 CHANGELOG.md                       |  1 +
 Godeps                             |  1 +
 plugins/outputs/kinesis/README.md  |  5 +++++
 plugins/outputs/kinesis/kinesis.go | 23 ++++++++++++++++++-----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fdfbc32d..b2bfd9a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ be deprecated eventually.
 - [#2038](https://github.com/influxdata/telegraf/issues/2038): Add papertrail support to webhooks
 - [#2253](https://github.com/influxdata/telegraf/pull/2253): Change jolokia plugin to use bulk requests.
 - [#2575](https://github.com/influxdata/telegraf/issues/2575) Add diskio input for Darwin
+- [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 
 ### Bugfixes
diff --git a/Godeps b/Godeps
index 9ffd7e1b8..aa9ace1ab 100644
--- a/Godeps
+++ b/Godeps
@@ -45,6 +45,7 @@ github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
 github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
+github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
 github.com/shirou/gopsutil 70693b6a3da51a8a686d31f1b346077bbc066062
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
diff --git a/plugins/outputs/kinesis/README.md b/plugins/outputs/kinesis/README.md
index 115d14355..52b80208a 100644
--- a/plugins/outputs/kinesis/README.md
+++ b/plugins/outputs/kinesis/README.md
@@ -50,6 +50,11 @@ This is used to group data within a stream. Currently this plugin only supports
 Manually configuring different hosts, or groups of hosts with manually selected partitionkeys might be a workable
 solution to scale out.
 
+### use_random_partitionkey
+
+When true a random UUID will be generated and used as the partitionkey when sending data to Kinesis. This allows data to evenly spread across multiple shards in the stream. Due to using a random paritionKey there can be no guarantee of ordering when consuming the data off the shards.
+If true then the partitionkey option will be ignored.
+
 ### format
 
 The format configuration value has been designated to allow people to change the format of the Point as written to
diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index 8cbdea682..d69ae3954 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/kinesis"
+	"github.com/satori/go.uuid"
 
 	"github.com/influxdata/telegraf"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
@@ -23,10 +24,11 @@ type KinesisOutput struct {
 	Filename  string `toml:"shared_credential_file"`
 	Token     string `toml:"token"`
 
-	StreamName   string `toml:"streamname"`
-	PartitionKey string `toml:"partitionkey"`
-	Debug        bool   `toml:"debug"`
-	svc          *kinesis.Kinesis
+	StreamName         string `toml:"streamname"`
+	PartitionKey       string `toml:"partitionkey"`
+	RandomPartitionKey bool   `toml:"use_random_partitionkey"`
+	Debug              bool   `toml:"debug"`
+	svc                *kinesis.Kinesis
 
 	serializer serializers.Serializer
 }
@@ -54,6 +56,11 @@ var sampleConfig = `
   streamname = "StreamName"
   ## PartitionKey as used for sharding data.
   partitionkey = "PartitionKey"
+  ## If set the paritionKey will be a random UUID on every put.
+  ## This allows for scaling across multiple shards in a stream.
+  ## This will cause issues with ordering.
+  use_random_partitionkey = false
+
 
   ## Data format to output.
   ## Each data format has it's own unique set of configuration options, read
@@ -173,9 +180,15 @@ func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 			return err
 		}
 
+		partitionKey := k.PartitionKey
+		if k.RandomPartitionKey {
+			u := uuid.NewV4()
+			partitionKey = u.String()
+		}
+
 		d := kinesis.PutRecordsRequestEntry{
 			Data:         values,
-			PartitionKey: aws.String(k.PartitionKey),
+			PartitionKey: aws.String(partitionKey),
 		}
 
 		r = append(r, &d)

From cb9aecbf040f7f5f4c69ce9b90d22c590391fdbf Mon Sep 17 00:00:00 2001
From: Damien Krotkine <dams@zarb.org>
Date: Thu, 27 Apr 2017 20:06:40 +0200
Subject: [PATCH 0224/1302] it's -> its (#2729)

---
 plugins/outputs/kafka/kafka.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 3815f5726..bdc93eaec 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -56,7 +56,7 @@ var sampleConfig = `
   ## Kafka topic for producer messages
   topic = "telegraf"
   ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, it's value will be used as the routing key
+  ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
 
   ## CompressionCodec represents the various compression codecs recognized by
@@ -93,7 +93,7 @@ var sampleConfig = `
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"

From 153304d92b76a0d5adf0306200701cbc73e42989 Mon Sep 17 00:00:00 2001
From: Damien Krotkine <dams@zarb.org>
Date: Thu, 27 Apr 2017 20:10:00 +0200
Subject: [PATCH 0225/1302] it's -> its (#2728)

---
 plugins/outputs/kafka/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 390407e14..8f50f1814 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -9,7 +9,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ## Kafka topic for producer messages
   topic = "telegraf"
   ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, it's value will be used as the routing key
+  ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
 
   ## CompressionCodec represents the various compression codecs recognized by
@@ -56,7 +56,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
 
 ### Optional parameters:
 
-* `routing_tag`:  if this tag exists, it's value will be used as the routing key
+* `routing_tag`:  if this tag exists, its value will be used as the routing key
 * `compression_codec`: What level of compression to use: `0` -> no compression, `1` -> gzip compression, `2` -> snappy compression
 * `required_acks`: a setting for how may `acks` required from the `kafka` broker cluster.
 * `max_retry`: Max number of times to retry failed write

From 5fe5c46c6d4cdcc351420de3c3ea9ea813c1964d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Thu, 27 Apr 2017 11:10:30 -0700
Subject: [PATCH 0226/1302] Fix amqp output block on write if disconnected
 (#2727)

fixes #2603
---
 CHANGELOG.md                   |  1 +
 plugins/outputs/amqp/README.md |  4 ++
 plugins/outputs/amqp/amqp.go   | 72 +++++++++++++++++++++++++++-------
 3 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bfd9a79..d58777b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@ be deprecated eventually.
 - [#2450](https://github.com/influxdata/telegraf/issues/2450): Network statistics not collected when system has alias interfaces
 - [#1911](https://github.com/influxdata/telegraf/issues/1911): Sysstat plugin needs LANG=C or similar locale
 - [#2528](https://github.com/influxdata/telegraf/issues/2528): File output closes standard streams on reload.
+- [#2603](https://github.com/influxdata/telegraf/issues/2603): AMQP output disconnect blocks all outputs
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 208ae934c..ab5900bcf 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -35,6 +35,10 @@ For an introduction to AMQP see:
   ## InfluxDB database
   # database = "telegraf"
 
+  ## Write timeout, formatted as a string.  If not provided, will default
+  ## to 5s. 0s means no timeout (not recommended).
+  # timeout = "5s"
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index 7b4c7d4c9..63c6db6fd 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -3,6 +3,7 @@ package amqp
 import (
 	"fmt"
 	"log"
+	"net"
 	"strings"
 	"sync"
 	"time"
@@ -15,6 +16,12 @@ import (
 	"github.com/streadway/amqp"
 )
 
+type client struct {
+	conn    *amqp.Connection
+	channel *amqp.Channel
+	headers amqp.Table
+}
+
 type AMQP struct {
 	// AMQP brokers to send metrics to
 	URL string
@@ -30,6 +37,8 @@ type AMQP struct {
 	RetentionPolicy string
 	// InfluxDB precision (DEPRECATED)
 	Precision string
+	// Connection timeout
+	Timeout internal.Duration
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -40,10 +49,8 @@ type AMQP struct {
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 
-	conn    *amqp.Connection
-	channel *amqp.Channel
 	sync.Mutex
-	headers amqp.Table
+	c *client
 
 	serializer serializers.Serializer
 }
@@ -81,6 +88,10 @@ var sampleConfig = `
   ## InfluxDB database
   # database = "telegraf"
 
+  ## Write timeout, formatted as a string.  If not provided, will default
+  ## to 5s. 0s means no timeout (not recommended).
+  # timeout = "5s"
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -100,10 +111,7 @@ func (a *AMQP) SetSerializer(serializer serializers.Serializer) {
 }
 
 func (q *AMQP) Connect() error {
-	q.Lock()
-	defer q.Unlock()
-
-	q.headers = amqp.Table{
+	headers := amqp.Table{
 		"database":         q.Database,
 		"retention_policy": q.RetentionPolicy,
 	}
@@ -126,13 +134,15 @@ func (q *AMQP) Connect() error {
 	amqpConf := amqp.Config{
 		TLSClientConfig: tls,
 		SASL:            sasl, // if nil, it will be PLAIN
+		Dial: func(network, addr string) (net.Conn, error) {
+			return net.DialTimeout(network, addr, q.Timeout.Duration)
+		},
 	}
 
 	connection, err = amqp.DialConfig(q.URL, amqpConf)
 	if err != nil {
 		return err
 	}
-	q.conn = connection
 
 	channel, err := connection.Channel()
 	if err != nil {
@@ -151,25 +161,38 @@ func (q *AMQP) Connect() error {
 	if err != nil {
 		return fmt.Errorf("Failed to declare an exchange: %s", err)
 	}
-	q.channel = channel
+
+	q.setClient(&client{
+		conn:    connection,
+		channel: channel,
+		headers: headers,
+	})
+
 	go func() {
 		err := <-connection.NotifyClose(make(chan *amqp.Error))
 		if err == nil {
 			return
 		}
+
+		q.setClient(nil)
+
 		log.Printf("I! Closing: %s", err)
 		log.Printf("I! Trying to reconnect")
 		for err := q.Connect(); err != nil; err = q.Connect() {
 			log.Println("E! ", err.Error())
 			time.Sleep(10 * time.Second)
 		}
-
 	}()
 	return nil
 }
 
 func (q *AMQP) Close() error {
-	err := q.conn.Close()
+	c := q.getClient()
+	if c == nil {
+		return nil
+	}
+
+	err := c.conn.Close()
 	if err != nil && err != amqp.ErrClosed {
 		log.Printf("E! Error closing AMQP connection: %s", err)
 		return err
@@ -186,11 +209,15 @@ func (q *AMQP) Description() string {
 }
 
 func (q *AMQP) Write(metrics []telegraf.Metric) error {
-	q.Lock()
-	defer q.Unlock()
 	if len(metrics) == 0 {
 		return nil
 	}
+
+	c := q.getClient()
+	if c == nil {
+		return fmt.Errorf("connection is not open")
+	}
+
 	outbuf := make(map[string][]byte)
 
 	for _, metric := range metrics {
@@ -210,13 +237,15 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 	}
 
 	for key, buf := range outbuf {
-		err := q.channel.Publish(
+		// Note that since the channel is not in confirm mode, the absence of
+		// an error does not indicate successful delivery.
+		err := c.channel.Publish(
 			q.Exchange, // exchange
 			key,        // routing key
 			false,      // mandatory
 			false,      // immediate
 			amqp.Publishing{
-				Headers:     q.headers,
+				Headers:     c.headers,
 				ContentType: "text/plain",
 				Body:        buf,
 			})
@@ -227,12 +256,25 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 	return nil
 }
 
+func (q *AMQP) getClient() *client {
+	q.Lock()
+	defer q.Unlock()
+	return q.c
+}
+
+func (q *AMQP) setClient(c *client) {
+	q.Lock()
+	q.c = c
+	q.Unlock()
+}
+
 func init() {
 	outputs.Add("amqp", func() telegraf.Output {
 		return &AMQP{
 			AuthMethod:      DefaultAuthMethod,
 			Database:        DefaultDatabase,
 			RetentionPolicy: DefaultRetentionPolicy,
+			Timeout:         internal.Duration{Duration: time.Second * 5},
 		}
 	})
 }

From 4e2fe598acdd0322128d7ca03cc9e5ddff518db3 Mon Sep 17 00:00:00 2001
From: Seuf <seuf76@gmail.com>
Date: Thu, 27 Apr 2017 20:20:41 +0200
Subject: [PATCH 0227/1302] Added SSL configuration for input haproxy (#2723)

---
 CHANGELOG.md                      |  1 +
 plugins/inputs/haproxy/README.md  |  6 ++++++
 plugins/inputs/haproxy/haproxy.go | 27 ++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d58777b98..2c9930f98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ be deprecated eventually.
 
 ### Features
 
+- [#2723](https://github.com/influxdata/telegraf/pull/2723): Added SSL configuration for input haproxy.
 - [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin.
 - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
 - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0.
diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index 81c8fb894..fe107b559 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -8,6 +8,12 @@
 # SampleConfig
 [[inputs.haproxy]]
   servers = ["http://1.2.3.4/haproxy?stats", "/var/run/haproxy*.sock"]
+#  ssl_ca = "/etc/telegraf/ca.pem"
+#  ssl_cert = "/etc/telegraf/cert.pem"
+#  ssl_key = "/etc/telegraf/key.pem"
+## Use SSL but skip chain & host verification
+#  insecure_skip_verify = false
+
 ```
 
 #### `servers`
diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index 2be418a65..151312d66 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -25,6 +26,15 @@ type haproxy struct {
 	client *http.Client
 
 	KeepFieldNames bool
+
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
 }
 
 var sampleConfig = `
@@ -45,6 +55,13 @@ var sampleConfig = `
   ## Setting this option to true results in the plugin keeping the original
   ## field names.
   ## keep_field_names = true
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (r *haproxy) SampleConfig() string {
@@ -127,7 +144,15 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	}
 
 	if g.client == nil {
-		tr := &http.Transport{ResponseHeaderTimeout: time.Duration(3 * time.Second)}
+		tlsCfg, err := internal.GetTLSConfig(
+			g.SSLCert, g.SSLKey, g.SSLCA, g.InsecureSkipVerify)
+		if err != nil {
+			return err
+		}
+		tr := &http.Transport{
+			ResponseHeaderTimeout: time.Duration(3 * time.Second),
+			TLSClientConfig:       tlsCfg,
+		}
 		client := &http.Client{
 			Transport: tr,
 			Timeout:   time.Duration(4 * time.Second),

From 53ab56de72ca00be208b3509da7593a0ce8acdb0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Apr 2017 11:23:37 -0700
Subject: [PATCH 0228/1302] Update haproxy README

---
 plugins/inputs/haproxy/README.md  | 29 +++++++++++++++++++++++------
 plugins/inputs/haproxy/haproxy.go | 10 +++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index fe107b559..dfb955796 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -7,13 +7,30 @@
 ```toml
 # SampleConfig
 [[inputs.haproxy]]
-  servers = ["http://1.2.3.4/haproxy?stats", "/var/run/haproxy*.sock"]
-#  ssl_ca = "/etc/telegraf/ca.pem"
-#  ssl_cert = "/etc/telegraf/cert.pem"
-#  ssl_key = "/etc/telegraf/key.pem"
-## Use SSL but skip chain & host verification
-#  insecure_skip_verify = false
+  ## An array of address to gather stats about. Specify an ip on hostname
+  ## with optional port. ie localhost, 10.10.3.33:1936, etc.
+  ## Make sure you specify the complete path to the stats endpoint
+  ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
 
+  ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
+  servers = ["http://myhaproxy.com:1936/haproxy?stats"]
+
+  ## You can also use local socket with standard wildcard globbing.
+  ## Server address not starting with 'http' will be treated as a possible
+  ## socket, so both examples below are valid.
+  # servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+
+  ## By default, some of the fields are renamed from what haproxy calls them.
+  ## Setting this option to true results in the plugin keeping the original
+  ## field names.
+  # keep_field_names = true
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 #### `servers`
diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index 151312d66..c5c83e5d4 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -42,19 +42,19 @@ var sampleConfig = `
   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
   ## Make sure you specify the complete path to the stats endpoint
   ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
-  #
+
   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-  ##
+
   ## You can also use local socket with standard wildcard globbing.
   ## Server address not starting with 'http' will be treated as a possible
   ## socket, so both examples below are valid.
-  ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
-  #
+  # servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+
   ## By default, some of the fields are renamed from what haproxy calls them.
   ## Setting this option to true results in the plugin keeping the original
   ## field names.
-  ## keep_field_names = true
+  # keep_field_names = true
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"

From e1a734c5259a15dc47747a96204a1fd4d98026c2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Apr 2017 11:38:49 -0700
Subject: [PATCH 0229/1302] Fix logfile documentation

---
 docs/CONFIGURATION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index ad6e903fc..45ef09338 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -70,7 +70,7 @@ ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s
 as the collection interval, with the maximum being 1s. Precision will NOT
 be used for service inputs, such as logparser and statsd. Valid values are
 "ns", "us" (or "µs"), "ms", "s".
-* **logfile**: Specify the log file name. The empty string means to log to stdout.
+* **logfile**: Specify the log file name. The empty string means to log to stderr.
 * **debug**: Run telegraf in debug mode.
 * **quiet**: Run telegraf in quiet mode (error messages only).
 * **hostname**: Override default hostname, if empty use os.Hostname().

From a3feacbd2f0bc39894b26739a4b8bb5bd99c03b4 Mon Sep 17 00:00:00 2001
From: Ross McDonald <rossmcdonald@users.noreply.github.com>
Date: Thu, 27 Apr 2017 13:47:22 -0500
Subject: [PATCH 0230/1302] Kapacitor input plugin (#2031)

---
 CHANGELOG.md                               |   1 +
 plugins/inputs/all/all.go                  |   1 +
 plugins/inputs/internal/README.md          |   2 +-
 plugins/inputs/kapacitor/README.md         | 149 ++++++++++++++
 plugins/inputs/kapacitor/kapacitor.go      | 228 +++++++++++++++++++++
 plugins/inputs/kapacitor/kapacitor_test.go | 141 +++++++++++++
 testutil/accumulator.go                    |  16 ++
 7 files changed, 537 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/kapacitor/README.md
 create mode 100644 plugins/inputs/kapacitor/kapacitor.go
 create mode 100644 plugins/inputs/kapacitor/kapacitor_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c9930f98..1b2651e3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ be deprecated eventually.
 - [#2575](https://github.com/influxdata/telegraf/issues/2575) Add diskio input for Darwin
 - [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
+- [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
 
 ### Bugfixes
 
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index f7207da84..10af14864 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -35,6 +35,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
diff --git a/plugins/inputs/internal/README.md b/plugins/inputs/internal/README.md
index 4e6d3795b..fbec4d86f 100644
--- a/plugins/inputs/internal/README.md
+++ b/plugins/inputs/internal/README.md
@@ -80,4 +80,4 @@ internal_write,output=file,host=tyrion buffer_limit=10000i,write_time_ns=636609i
 internal_gather,input=internal,host=tyrion metrics_gathered=19i,gather_time_ns=442114i 1480682800000000000
 internal_gather,input=http_listener,host=tyrion metrics_gathered=0i,gather_time_ns=167285i 1480682800000000000
 internal_http_listener,address=:8186,host=tyrion queries_received=0i,writes_received=0i,requests_received=0i,buffers_created=0i,requests_served=0i,pings_received=0i,bytes_received=0i,not_founds_served=0i,pings_served=0i,queries_served=0i,writes_served=0i 1480682800000000000
-```
\ No newline at end of file
+```
diff --git a/plugins/inputs/kapacitor/README.md b/plugins/inputs/kapacitor/README.md
new file mode 100644
index 000000000..b1ae356b1
--- /dev/null
+++ b/plugins/inputs/kapacitor/README.md
@@ -0,0 +1,149 @@
+# Kapacitor Plugin
+
+The Kapacitor plugin will collect metrics from the given Kapacitor instances.
+
+### Configuration:
+
+```toml
+[[inputs.kapacitor]]
+  ## Multiple URLs from which to read Kapacitor-formatted JSON
+  ## Default is "http://localhost:9092/kapacitor/v1/debug/vars".
+  urls = [
+    "http://localhost:9092/kapacitor/v1/debug/vars"
+  ]
+
+  ## Time limit for http requests
+  timeout = "5s"
+```
+
+### Measurements & Fields
+
+- kapacitor
+    - num_enabled_tasks, integer
+    - num_subscriptions, integer
+    - num_tasks, integer
+- kapacitor_edges
+    - collected, integer
+    - emitted, integer
+- kapacitor_ingress
+    - points_received, integer
+- kapacitor_memstats
+    - alloc_bytes, integer
+    - buck_hash_sys_bytes, integer
+    - frees, integer
+    - gcc_pu_fraction, float
+    - gc_sys_bytes, integer
+    - heap_alloc_bytes, integer
+    - heap_idle_bytes, integer
+    - heap_inuse_bytes, integer
+    - heap_objects, integer
+    - heap_released_bytes, integer
+    - heap_sys_bytes, integer
+    - last_gc_ns, integer
+    - lookups, integer
+    - mallocs, integer
+    - mcache_in_use_bytes, integer
+    - mcache_sys_bytes, integer
+    - mspan_in_use_bytes, integer
+    - mspan_sys_bytes, integer
+    - next_gc_ns, integer
+    - num_gc, integer
+    - other_sys_bytes, integer
+    - pause_total_ns, integer
+    - stack_in_use_bytes, integer
+    - stack_sys_bytes, integer
+    - sys_bytes, integer
+    - total_alloc_bytes, integer
+- kapacitor_nodes
+    - alerts_triggered, integer
+    - avg_exec_time_ns, integer
+    - batches_queried, integer
+    - crits_triggered, integer
+    - eval_errors, integer
+    - fields_defaulted, integer
+    - infos_triggered, integer
+    - oks_triggered, integer
+    - points_queried, integer
+    - points_written, integer
+    - query_errors, integer
+    - tags_defaulted, integer
+    - warns_triggered, integer
+    - write_errors, integer
+
+*Note:* The Kapacitor variables `host`, `cluster_id`, and `server_id`
+are currently not recorded due to the potential high cardinality of
+these values.
+
+### Example Output:
+
+```
+$ telegraf -config /etc/telegraf.conf -input-filter kapacitor -test
+* Plugin: inputs.kapacitor, Collection 1
+> kapacitor_memstats,host=hostname.local,kap_version=1.1.0~rc2,url=http://localhost:9092/kapacitor/v1/debug/vars alloc_bytes=6974808i,buck_hash_sys_bytes=1452609i,frees=207281i,gc_sys_bytes=802816i,gcc_pu_fraction=0.00004693548939673313,heap_alloc_bytes=6974808i,heap_idle_bytes=6742016i,heap_in_use_bytes=9183232i,heap_objects=23216i,heap_released_bytes=0i,heap_sys_bytes=15925248i,last_gc_ns=1478791460012676997i,lookups=88i,mallocs=230497i,mcache_in_use_bytes=9600i,mcache_sys_bytes=16384i,mspan_in_use_bytes=98560i,mspan_sys_bytes=131072i,next_gc_ns=11467528i,num_gc=8i,other_sys_bytes=2236087i,pause_total_ns=2994110i,stack_in_use_bytes=1900544i,stack_sys_bytes=1900544i,sys_bytes=22464760i,total_alloc_bytes=35023600i 1478791462000000000
+> kapacitor,host=hostname.local,kap_version=1.1.0~rc2,url=http://localhost:9092/kapacitor/v1/debug/vars num_enabled_tasks=5i,num_subscriptions=5i,num_tasks=5i 1478791462000000000
+> kapacitor_edges,child=stream0,host=hostname.local,parent=stream,task=deadman-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=shard,retention_policy=monitor,task_master=main points_received=120 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=subscriber,retention_policy=monitor,task_master=main points_received=60 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=http_out,node=http_out3,task=sys-stats,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=window6,host=hostname.local,parent=derivative5,task=deadman-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=from,node=from1,task=sys-stats,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=stream,node=stream0,task=test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=window,node=window6,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=cq,retention_policy=monitor,task_master=main points_received=10 1478791462000000000
+> kapacitor_edges,child=http_out3,host=hostname.local,parent=window2,task=sys-stats,type=batch collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=mean4,host=hostname.local,parent=log3,task=deadman-test,type=batch collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_kapacitor,host=hostname.local,measurement=nodes,retention_policy=autogen,task_master=main points_received=207 1478791462000000000
+> kapacitor_edges,child=stream0,host=hostname.local,parent=stream,task=sys-stats,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=log6,host=hostname.local,parent=sum5,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=from1,host=hostname.local,parent=stream0,task=sys-stats,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=alert,node=alert2,task=test,type=stream alerts_triggered=0,avg_exec_time_ns=0i,crits_triggered=0,infos_triggered=0,oks_triggered=0,warns_triggered=0 1478791462000000000
+> kapacitor_edges,child=log3,host=hostname.local,parent=derivative2,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_kapacitor,host=hostname.local,measurement=runtime,retention_policy=autogen,task_master=main points_received=9 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=tsm1_filestore,retention_policy=monitor,task_master=main points_received=120 1478791462000000000
+> kapacitor_edges,child=derivative2,host=hostname.local,parent=from1,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=stream,node=stream0,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=queryExecutor,retention_policy=monitor,task_master=main points_received=10 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=tsm1_wal,retention_policy=monitor,task_master=main points_received=120 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=log,node=log6,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=stream,host=hostname.local,parent=stats,task=task_master:main,type=stream collected=598,emitted=598 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=write,retention_policy=monitor,task_master=main points_received=10 1478791462000000000
+> kapacitor_edges,child=stream0,host=hostname.local,parent=stream,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=log,node=log3,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=from,node=from1,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_kapacitor,host=hostname.local,measurement=ingress,retention_policy=autogen,task_master=main points_received=148 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=eval,node=eval4,task=derivative-test,type=stream avg_exec_time_ns=0i,eval_errors=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=derivative,node=derivative2,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=runtime,retention_policy=monitor,task_master=main points_received=10 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=httpd,retention_policy=monitor,task_master=main points_received=10 1478791462000000000
+> kapacitor_edges,child=sum5,host=hostname.local,parent=eval4,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_kapacitor,host=hostname.local,measurement=kapacitor,retention_policy=autogen,task_master=main points_received=9 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=from,node=from1,task=test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=tsm1_engine,retention_policy=monitor,task_master=main points_received=120 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=window,node=window2,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=stream,node=stream0,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=influxdb_out4,host=hostname.local,parent=http_out3,task=sys-stats,type=batch collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=window2,host=hostname.local,parent=from1,task=deadman-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=from,node=from1,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=from1,host=hostname.local,parent=stream0,task=deadman-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=database,retention_policy=monitor,task_master=main points_received=40 1478791462000000000
+> kapacitor_edges,child=stream,host=hostname.local,parent=write_points,task=task_master:main,type=stream collected=750,emitted=750 1478791462000000000
+> kapacitor_edges,child=log7,host=hostname.local,parent=window6,task=deadman-test,type=batch collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=window2,host=hostname.local,parent=from1,task=sys-stats,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=log,node=log7,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_ingress,database=_kapacitor,host=hostname.local,measurement=edges,retention_policy=autogen,task_master=main points_received=225 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=derivative,node=derivative5,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=from1,host=hostname.local,parent=stream0,task=test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=alert2,host=hostname.local,parent=from1,task=test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=log,node=log3,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=influxdb_out,node=influxdb_out4,task=sys-stats,type=stream avg_exec_time_ns=0i,points_written=0,write_errors=0 1478791462000000000
+> kapacitor_edges,child=stream0,host=hostname.local,parent=stream,task=test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=log3,host=hostname.local,parent=window2,task=deadman-test,type=batch collected=0,emitted=0 1478791462000000000
+> kapacitor_edges,child=derivative5,host=hostname.local,parent=mean4,task=deadman-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=stream,node=stream0,task=sys-stats,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=window,node=window2,task=sys-stats,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=mean,node=mean4,task=deadman-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=from1,host=hostname.local,parent=stream0,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+> kapacitor_ingress,database=_internal,host=hostname.local,measurement=tsm1_cache,retention_policy=monitor,task_master=main points_received=120 1478791462000000000
+> kapacitor_nodes,host=hostname.local,kind=sum,node=sum5,task=derivative-test,type=stream avg_exec_time_ns=0i 1478791462000000000
+> kapacitor_edges,child=eval4,host=hostname.local,parent=log3,task=derivative-test,type=stream collected=0,emitted=0 1478791462000000000
+```
diff --git a/plugins/inputs/kapacitor/kapacitor.go b/plugins/inputs/kapacitor/kapacitor.go
new file mode 100644
index 000000000..4c75bd0ce
--- /dev/null
+++ b/plugins/inputs/kapacitor/kapacitor.go
@@ -0,0 +1,228 @@
+package kapacitor
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const (
+	defaultURL = "http://localhost:9092/kapacitor/v1/debug/vars"
+)
+
+type Kapacitor struct {
+	URLs []string `toml:"urls"`
+
+	Timeout internal.Duration
+
+	client *http.Client
+}
+
+func (*Kapacitor) Description() string {
+	return "Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints"
+}
+
+func (*Kapacitor) SampleConfig() string {
+	return `
+  ## Multiple URLs from which to read Kapacitor-formatted JSON
+  ## Default is "http://localhost:9092/kapacitor/v1/debug/vars".
+  urls = [
+    "http://localhost:9092/kapacitor/v1/debug/vars"
+  ]
+
+  ## Time limit for http requests
+  timeout = "5s"
+`
+}
+
+func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
+	if k.client == nil {
+		k.client = &http.Client{Timeout: k.Timeout.Duration}
+	}
+
+	var wg sync.WaitGroup
+	for _, u := range k.URLs {
+		wg.Add(1)
+		go func(url string) {
+			defer wg.Done()
+			if err := k.gatherURL(acc, url); err != nil {
+				acc.AddError(fmt.Errorf("[url=%s]: %s", url, err))
+			}
+		}(u)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+type object struct {
+	Name   string                 `json:"name"`
+	Values map[string]interface{} `json:"values"`
+	Tags   map[string]string      `json:"tags"`
+}
+
+type memstats struct {
+	Alloc         int64   `json:"Alloc"`
+	TotalAlloc    int64   `json:"TotalAlloc"`
+	Sys           int64   `json:"Sys"`
+	Lookups       int64   `json:"Lookups"`
+	Mallocs       int64   `json:"Mallocs"`
+	Frees         int64   `json:"Frees"`
+	HeapAlloc     int64   `json:"HeapAlloc"`
+	HeapSys       int64   `json:"HeapSys"`
+	HeapIdle      int64   `json:"HeapIdle"`
+	HeapInuse     int64   `json:"HeapInuse"`
+	HeapReleased  int64   `json:"HeapReleased"`
+	HeapObjects   int64   `json:"HeapObjects"`
+	StackInuse    int64   `json:"StackInuse"`
+	StackSys      int64   `json:"StackSys"`
+	MSpanInuse    int64   `json:"MSpanInuse"`
+	MSpanSys      int64   `json:"MSpanSys"`
+	MCacheInuse   int64   `json:"MCacheInuse"`
+	MCacheSys     int64   `json:"MCacheSys"`
+	BuckHashSys   int64   `json:"BuckHashSys"`
+	GCSys         int64   `json:"GCSys"`
+	OtherSys      int64   `json:"OtherSys"`
+	NextGC        int64   `json:"NextGC"`
+	LastGC        int64   `json:"LastGC"`
+	PauseTotalNs  int64   `json:"PauseTotalNs"`
+	NumGC         int64   `json:"NumGC"`
+	GCCPUFraction float64 `json:"GCCPUFraction"`
+}
+
+type stats struct {
+	CmdLine          []string           `json:"cmdline"`
+	ClusterID        string             `json:"cluster_id"`
+	Host             string             `json:"host"`
+	Kapacitor        *map[string]object `json:"kapacitor"`
+	MemStats         *memstats          `json:"memstats"`
+	NumEnabledTasks  int                `json:"num_enabled_tasks"`
+	NumSubscriptions int                `json:"num_subscriptions"`
+	NumTasks         int                `json:"num_tasks"`
+	Product          string             `json:"product"`
+	ServerID         string             `json:"server_id"`
+	Version          string             `json:"version"`
+}
+
+// Gathers data from a particular URL
+// Parameters:
+//     acc    : The telegraf Accumulator to use
+//     url    : endpoint to send request to
+//
+// Returns:
+//     error: Any error that may have occurred
+func (k *Kapacitor) gatherURL(
+	acc telegraf.Accumulator,
+	url string,
+) error {
+	now := time.Now()
+
+	resp, err := k.client.Get(url)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	dec := json.NewDecoder(resp.Body)
+
+	var s stats
+	err = dec.Decode(&s)
+	if err != nil {
+		return err
+	}
+
+	if s.MemStats != nil {
+		acc.AddFields("kapacitor_memstats",
+			map[string]interface{}{
+				"alloc_bytes":         s.MemStats.Alloc,
+				"buck_hash_sys_bytes": s.MemStats.BuckHashSys,
+				"frees":               s.MemStats.Frees,
+				"gcc_pu_fraction":     s.MemStats.GCCPUFraction,
+				"gc_sys_bytes":        s.MemStats.GCSys,
+				"heap_alloc_bytes":    s.MemStats.HeapAlloc,
+				"heap_idle_bytes":     s.MemStats.HeapIdle,
+				"heap_in_use_bytes":   s.MemStats.HeapInuse,
+				"heap_objects":        s.MemStats.HeapObjects,
+				"heap_released_bytes": s.MemStats.HeapReleased,
+				"heap_sys_bytes":      s.MemStats.HeapSys,
+				"last_gc_ns":          s.MemStats.LastGC,
+				"lookups":             s.MemStats.Lookups,
+				"mallocs":             s.MemStats.Mallocs,
+				"mcache_in_use_bytes": s.MemStats.MCacheInuse,
+				"mcache_sys_bytes":    s.MemStats.MCacheSys,
+				"mspan_in_use_bytes":  s.MemStats.MSpanInuse,
+				"mspan_sys_bytes":     s.MemStats.MSpanSys,
+				"next_gc_ns":          s.MemStats.NextGC,
+				"num_gc":              s.MemStats.NumGC,
+				"other_sys_bytes":     s.MemStats.OtherSys,
+				"pause_total_ns":      s.MemStats.PauseTotalNs,
+				"stack_in_use_bytes":  s.MemStats.StackInuse,
+				"stack_sys_bytes":     s.MemStats.StackSys,
+				"sys_bytes":           s.MemStats.Sys,
+				"total_alloc_bytes":   s.MemStats.TotalAlloc,
+			},
+			map[string]string{
+				"kap_version": s.Version,
+				"url":         url,
+			},
+			now)
+	}
+
+	acc.AddFields("kapacitor",
+		map[string]interface{}{
+			"num_enabled_tasks": s.NumEnabledTasks,
+			"num_subscriptions": s.NumSubscriptions,
+			"num_tasks":         s.NumTasks,
+		},
+		map[string]string{
+			"kap_version": s.Version,
+			"url":         url,
+		},
+		now)
+
+	if s.Kapacitor != nil {
+		for _, obj := range *s.Kapacitor {
+
+			// Strip out high-cardinality or duplicative tags
+			excludeTags := []string{"host", "cluster_id", "server_id"}
+			for _, key := range excludeTags {
+				if _, ok := obj.Tags[key]; ok {
+					delete(obj.Tags, key)
+				}
+			}
+
+			// Convert time-related string field to int
+			if _, ok := obj.Values["avg_exec_time_ns"]; ok {
+				d, err := time.ParseDuration(obj.Values["avg_exec_time_ns"].(string))
+				if err != nil {
+					continue
+				}
+				obj.Values["avg_exec_time_ns"] = d.Nanoseconds()
+			}
+
+			acc.AddFields(
+				"kapacitor_"+obj.Name,
+				obj.Values,
+				obj.Tags,
+				now,
+			)
+		}
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("kapacitor", func() telegraf.Input {
+		return &Kapacitor{
+			URLs:    []string{defaultURL},
+			Timeout: internal.Duration{Duration: time.Second * 5},
+		}
+	})
+}
diff --git a/plugins/inputs/kapacitor/kapacitor_test.go b/plugins/inputs/kapacitor/kapacitor_test.go
new file mode 100644
index 000000000..b32aeec24
--- /dev/null
+++ b/plugins/inputs/kapacitor/kapacitor_test.go
@@ -0,0 +1,141 @@
+package kapacitor_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/inputs/kapacitor"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestKapacitor(t *testing.T) {
+	fakeInfluxServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/endpoint" {
+			_, _ = w.Write([]byte(kapacitorReturn))
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeInfluxServer.Close()
+
+	plugin := &kapacitor.Kapacitor{
+		URLs: []string{fakeInfluxServer.URL + "/endpoint"},
+	}
+
+	var acc testutil.Accumulator
+	require.NoError(t, plugin.Gather(&acc))
+
+	require.Len(t, acc.Metrics, 63)
+
+	fields := map[string]interface{}{
+		"alloc_bytes":         int64(6950624),
+		"buck_hash_sys_bytes": int64(1446737),
+		"frees":               int64(129656),
+		"gcc_pu_fraction":     float64(0.006757149597237818),
+		"gc_sys_bytes":        int64(575488),
+		"heap_alloc_bytes":    int64(6950624),
+		"heap_idle_bytes":     int64(499712),
+		"heap_in_use_bytes":   int64(9166848),
+		"heap_objects":        int64(28070),
+		"heap_released_bytes": int64(0),
+		"heap_sys_bytes":      int64(9666560),
+		"last_gc_ns":          int64(1478813691405406556),
+		"lookups":             int64(40),
+		"mallocs":             int64(157726),
+		"mcache_in_use_bytes": int64(9600),
+		"mcache_sys_bytes":    int64(16384),
+		"mspan_in_use_bytes":  int64(105600),
+		"mspan_sys_bytes":     int64(114688),
+		"next_gc_ns":          int64(10996691),
+		"num_gc":              int64(4),
+		"other_sys_bytes":     int64(1985959),
+		"pause_total_ns":      int64(767327),
+		"stack_in_use_bytes":  int64(819200),
+		"stack_sys_bytes":     int64(819200),
+		"sys_bytes":           int64(14625016),
+		"total_alloc_bytes":   int64(13475176),
+	}
+
+	tags := map[string]string{
+		"kap_version": "1.1.0~rc2",
+		"url":         fakeInfluxServer.URL + "/endpoint",
+	}
+	acc.AssertContainsTaggedFields(t, "kapacitor_memstats", fields, tags)
+
+	acc.AssertContainsTaggedFields(t, "kapacitor",
+		map[string]interface{}{
+			"num_enabled_tasks": 5,
+			"num_subscriptions": 6,
+			"num_tasks":         5,
+		}, tags)
+}
+
+func TestMissingStats(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	plugin := &kapacitor.Kapacitor{
+		URLs: []string{server.URL},
+	}
+
+	var acc testutil.Accumulator
+	plugin.Gather(&acc)
+
+	require.False(t, acc.HasField("kapacitor_memstats", "alloc_bytes"))
+	require.True(t, acc.HasField("kapacitor", "num_tasks"))
+}
+
+func TestErrorHandling(t *testing.T) {
+	badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/endpoint" {
+			_, _ = w.Write([]byte("not json"))
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer badServer.Close()
+
+	plugin := &kapacitor.Kapacitor{
+		URLs: []string{badServer.URL + "/endpoint"},
+	}
+
+	var acc testutil.Accumulator
+	plugin.Gather(&acc)
+	acc.WaitError(1)
+	require.Equal(t, uint64(0), acc.NMetrics())
+}
+
+func TestErrorHandling404(t *testing.T) {
+	badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNotFound)
+	}))
+	defer badServer.Close()
+
+	plugin := &kapacitor.Kapacitor{
+		URLs: []string{badServer.URL},
+	}
+
+	var acc testutil.Accumulator
+	plugin.Gather(&acc)
+	acc.WaitError(1)
+	require.Equal(t, uint64(0), acc.NMetrics())
+}
+
+const kapacitorReturn = `{
+"cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842",
+"cmdline": ["./build/kapacitord","-config","/Users/ross/.kapacitor/config"],
+"host": "localhost",
+"kapacitor": {"4360b884-4f1b-4915-90b9-e40a27cd366a": {"name": "ingress", "tags": {"task_master": "main", "database": "_internal", "retention_policy": "monitor", "measurement": "cq", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"points_received": 1}}, "b5ca6839-5cda-4330-b7aa-fccc50ce1320": {"name": "edges", "tags": {"type": "stream", "task": "task_master:main", "parent": "write_points", "child": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 72, "emitted": 72}}, "e4f4dd29-96fe-41ca-9107-43030f67d47c": {"name": "edges", "tags": {"host": "localhost", "task": "deadman-test", "parent": "log3", "child": "mean4", "type": "batch", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"collected": 0, "emitted": 0}}, "f8bb9712-52ea-44c8-a0d9-8b6ee47b9cb8": {"name": "edges", "tags": {"task": "derivative-test", "parent": "sum5", "child": "log6", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "340391e7-8fc7-447d-ad07-547c5dd51f2c": {"tags": {"child": "from1", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "sys-stats", "parent": "stream0"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "2fd00546-3b38-4118-97e6-38489e5732a8": {"name": "edges", "tags": {"task": "sys-stats", "parent": "stream", "child": "stream0", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "type": "stream"}, "values": {"collected": 0, "emitted": 0}}, "5467712d-b3b9-45c5-acae-43a686c345e3": {"name": "edges", "tags": {"host": "localhost", "task": "test", "parent": "stream", "child": "stream0", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"collected": 0, "emitted": 0}}, "2ce99d1d-d26f-4daa-8857-36568a9effc1": {"name": "nodes", "tags": {"task": "deadman-test", "node": "window2", "type": "stream", "kind": "window", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "975e59b2-d0ab-4ebf-9054-4de9751e0e87": {"name": "edges", "tags": {"task": "deadman-test", "parent": "derivative5", "child": "window6", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "14fc028b-bda9-4b29-bf8e-8f682dd42bab": {"name": "nodes", "tags": {"task": "derivative-test", "node": "from1", "type": "stream", "kind": "from", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "69f374fb-1289-457a-9ae6-79263e2dc430": {"tags": {"child": "derivative2", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "parent": "from1"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "0c0a0463-4588-494b-b871-f20dea1b4c71": {"name": "nodes", "tags": {"task": "derivative-test", "node": "log6", "type": "stream", "kind": "log", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "e6eedf33-a07c-4daf-87fb-9429ee38847f": {"name": "nodes", "tags": {"host": "localhost", "kind": "from", "task": "deadman-test", "node": "from1", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"avg_exec_time_ns": "0s"}}, "c8da7d8a-6ea1-4cac-88aa-0804c413eecb": {"tags": {"child": "from1", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "parent": "stream0"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "ad4ca70d-1e56-422e-b36d-af565a8e1df0": {"tags": {"type": "stream", "kind": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "node": "stream0"}, "values": {"avg_exec_time_ns": "0s"}, "name": "nodes"}, "39fd1e7d-24bf-4cae-9c52-f9d876cc92af": {"name": "edges", "tags": {"task": "test", "parent": "from1", "child": "alert2", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"emitted": 0, "collected": 0}}, "1be18262-c33e-4cd6-bd49-7c82b819d4e1": {"values": {"avg_exec_time_ns": "0s"}, "name": "nodes", "tags": {"host": "localhost", "task": "deadman-test", "node": "stream0", "type": "stream", "kind": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}}, "ce957f67-bef1-4755-acf1-1a335cbf0dcb": {"name": "edges", "tags": {"task": "deadman-test", "parent": "from1", "child": "window2", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "c33ac068-6216-4ab2-b10d-b82f08891a10": {"name": "nodes", "tags": {"kind": "window", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "node": "window6", "type": "stream"}, "values": {"avg_exec_time_ns": "0s"}}, "2ab14f75-6a7d-49a8-a5bd-b829ec7588b5": {"name": "edges", "tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "parent": "derivative2", "child": "log3", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"collected": 0, "emitted": 0}}, "94031aa9-20fa-448a-8952-ba37d69a991a": {"name": "nodes", "tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "node": "eval4", "type": "stream", "kind": "eval", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"avg_exec_time_ns": "0s", "eval_errors": 0}}, "d3b76aba-b2a2-4e72-a23d-f54c5037d6ee": {"values": {"avg_exec_time_ns": "0s"}, "name": "nodes", "tags": {"host": "localhost", "kind": "stream", "task": "sys-stats", "node": "stream0", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}}, "fe2569b7-275d-411f-86f1-4c75127b0a77": {"name": "nodes", "tags": {"node": "window2", "type": "stream", "kind": "window", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "sys-stats"}, "values": {"avg_exec_time_ns": "0s"}}, "067d801e-48de-4fec-98fe-d6691d3db1fe": {"name": "nodes", "tags": {"task": "derivative-test", "node": "sum5", "type": "stream", "kind": "sum", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "5bc09b36-f1d7-460f-b533-91aa79b79ee3": {"name": "nodes", "tags": {"host": "localhost", "task": "test", "node": "alert2", "type": "stream", "kind": "alert", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"warns_triggered": 0, "crits_triggered": 0, "avg_exec_time_ns": "0s", "alerts_triggered": 0, "oks_triggered": 0, "infos_triggered": 0}}, "874c38c5-380f-4c76-b1ed-af2b7e1bd0f7": {"name": "ingress", "tags": {"database": "_internal", "retention_policy": "monitor", "measurement": "queryExecutor", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task_master": "main"}, "values": {"points_received": 1}}, "38e0634f-9f11-4c3e-8621-96200dfb0ec4": {"name": "nodes", "tags": {"node": "log3", "type": "stream", "kind": "log", "task": "deadman-test", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "193ccaeb-7206-454d-9acc-457506848a09": {"tags": {"child": "sum5", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "parent": "eval4"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "68565c38-e5d2-4563-a2e8-991718154623": {"tags": {"child": "http_out3", "type": "batch", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "sys-stats", "parent": "window2"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "dd1dc51c-ae09-43af-b511-e6d23a7b1940": {"name": "ingress", "tags": {"cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task_master": "main", "database": "_internal", "retention_policy": "monitor", "measurement": "runtime"}, "values": {"points_received": 1}}, "1f60fe6b-3dda-4811-a218-4e54cc6ff20f": {"tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "node": "log7", "type": "stream", "kind": "log", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"avg_exec_time_ns": "0s"}, "name": "nodes"}, "969d3962-ed99-4032-8625-465a2cccb2d9": {"name": "edges", "tags": {"host": "localhost", "task": "derivative-test", "parent": "stream", "child": "stream0", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"collected": 0, "emitted": 0}}, "5d237ee6-8362-427c-982b-f3be4a901e4b": {"tags": {"type": "stream", "kind": "derivative", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "node": "derivative5"}, "values": {"avg_exec_time_ns": "0s"}, "name": "nodes"}, "b92a8b07-713f-4d94-8c99-e1311129018a": {"name": "edges", "tags": {"task": "sys-stats", "parent": "http_out3", "child": "influxdb_out4", "type": "batch", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "bba6ca07-a577-46b5-90eb-e034b43e2d72": {"name": "nodes", "tags": {"task": "test", "node": "stream0", "type": "stream", "kind": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "056bca53-554b-43e4-8402-7d5e8441f888": {"tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "parent": "window6", "child": "log7", "type": "batch", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "bd5a6337-0a7b-44f1-9768-1d3418fd8d66": {"values": {"collected": 0, "emitted": 0}, "name": "edges", "tags": {"child": "eval4", "type": "stream", "task": "derivative-test", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "parent": "log3"}}, "faec1062-7c9a-44bc-aa7a-3b55bf3c0a45": {"values": {"avg_exec_time_ns": "0s", "points_written": 0, "write_errors": 0}, "name": "nodes", "tags": {"task": "sys-stats", "node": "influxdb_out4", "type": "stream", "kind": "influxdb_out", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}}, "5cb5470f-da25-4d61-977a-9b50d9a3d2d2": {"name": "ingress", "tags": {"host": "localhost", "database": "_internal", "retention_policy": "monitor", "measurement": "tsm1_wal", "task_master": "main", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"points_received": 12}}, "c746289f-c2d3-4c15-8cbc-4ceb9ac72ee4": {"name": "ingress", "tags": {"task_master": "main", "database": "_internal", "retention_policy": "monitor", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "measurement": "database"}, "values": {"points_received": 4}}, "b4e6202b-e826-40bf-835b-f3deb413495f": {"name": "ingress", "tags": {"host": "localhost", "task_master": "main", "database": "_internal", "retention_policy": "monitor", "measurement": "write", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"points_received": 1}}, "bdb9c35c-8f0f-4c64-b111-5afedde6fe26": {"name": "ingress", "tags": {"host": "localhost", "database": "_internal", "retention_policy": "monitor", "measurement": "httpd", "task_master": "main", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"points_received": 1}}, "006be0dc-5861-4fbc-b5af-833d8fccb36c": {"tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "parent": "window2", "child": "log3", "type": "batch", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"collected": 0, "emitted": 0}, "name": "edges"}, "3fa5469d-4599-4307-b67b-934ae74f9266": {"name": "nodes", "tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "deadman-test", "node": "mean4", "type": "stream", "kind": "mean", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"avg_exec_time_ns": "0s"}}, "9636063d-79d2-4480-a03f-10e1b7680a40": {"name": "nodes", "tags": {"kind": "http_out", "task": "sys-stats", "node": "http_out3", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "1ba6153d-227d-4771-ab83-a7bf9f64d1b0": {"name": "edges", "tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "type": "stream", "task": "task_master:main", "parent": "stats", "child": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"collected": 0, "emitted": 0}}, "e7936e59-313c-4fd1-8ae9-06aa11c0ffcb": {"name": "ingress", "tags": {"retention_policy": "monitor", "measurement": "shard", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task_master": "main", "database": "_internal"}, "values": {"points_received": 12}}, "94be0dc3-bee4-4e94-8e3b-7fb856abc490": {"tags": {"type": "stream", "kind": "log", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "node": "log3"}, "values": {"avg_exec_time_ns": "0s"}, "name": "nodes"}, "7cb4de43-c440-477c-beaa-7b402ab16e06": {"name": "edges", "tags": {"child": "window2", "type": "stream", "task": "sys-stats", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "parent": "from1"}, "values": {"collected": 0, "emitted": 0}}, "a2666b71-3057-43d0-887b-8d88ca653b2f": {"name": "ingress", "tags": {"host": "localhost", "task_master": "main", "database": "_internal", "retention_policy": "monitor", "measurement": "subscriber", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"points_received": 2}}, "56727a9f-6f8e-4c34-af3c-32dfb365a407": {"name": "edges", "tags": {"type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "derivative-test", "parent": "stream0", "child": "from1"}, "values": {"collected": 0, "emitted": 0}}, "d2840a0c-b140-419b-b10b-bef3f74cc696": {"name": "nodes", "tags": {"task": "derivative-test", "node": "derivative2", "type": "stream", "kind": "derivative", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "1d223093-e785-4d11-aa9f-8160cf2ddb4d": {"name": "ingress", "tags": {"task_master": "main", "database": "_internal", "retention_policy": "monitor", "measurement": "udp", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"points_received": 1}}, "f1be8ef4-9552-4f6a-83a9-ae2ca0b6e6b5": {"name": "edges", "tags": {"task": "deadman-test", "parent": "mean4", "child": "derivative5", "type": "stream", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "c1c380da-60b4-422e-a37b-89aff6d11fd1": {"name": "nodes", "tags": {"node": "from1", "type": "stream", "kind": "from", "task": "sys-stats", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"avg_exec_time_ns": "0s"}}, "29321d3f-9f22-4c37-9d48-b8d60aafe1ba": {"name": "nodes", "tags": {"kind": "from", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "task": "test", "node": "from1", "type": "stream"}, "values": {"avg_exec_time_ns": "0s"}}, "901f8a35-b363-47f1-bdfc-c85e3561cc19": {"values": {"collected": 0, "emitted": 0}, "name": "edges", "tags": {"type": "stream", "task": "test", "parent": "stream0", "child": "from1", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}}, "b729d0a0-474e-4bdb-823b-fa810bba3843": {"tags": {"server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost", "measurement": "tsm1_cache", "task_master": "main", "database": "_internal", "retention_policy": "monitor", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842"}, "values": {"points_received": 12}, "name": "ingress"}, "d1526a79-a5f0-45f0-836d-53a924457352": {"name": "edges", "tags": {"type": "stream", "task": "deadman-test", "parent": "stream", "child": "stream0", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"collected": 0, "emitted": 0}}, "fa5165cb-76f0-4127-a9cb-99ab3c34d009": {"name": "ingress", "tags": {"retention_policy": "monitor", "measurement": "tsm1_engine", "task_master": "main", "database": "_internal", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff", "host": "localhost"}, "values": {"points_received": 12}}, "649ffe5d-2682-4675-a943-baec4718fc8f": {"name": "ingress", "tags": {"host": "localhost", "database": "_internal", "retention_policy": "monitor", "measurement": "tsm1_filestore", "task_master": "main", "cluster_id": "aaa1cb78-8277-4886-a8ea-4706bca20842", "server_id": "81e38258-5f18-4201-8d47-db603bfceeff"}, "values": {"points_received": 12}}},
+"memstats": {"Alloc":6950624,"TotalAlloc":13475176,"Sys":14625016,"Lookups":40,"Mallocs":157726,"Frees":129656,"HeapAlloc":6950624,"HeapSys":9666560,"HeapIdle":499712,"HeapInuse":9166848,"HeapReleased":0,"HeapObjects":28070,"StackInuse":819200,"StackSys":819200,"MSpanInuse":105600,"MSpanSys":114688,"MCacheInuse":9600,"MCacheSys":16384,"BuckHashSys":1446737,"GCSys":575488,"OtherSys":1985959,"NextGC":10996691,"LastGC":1478813691405406556,"PauseTotalNs":767327,"PauseNs":[106224,484338,77201,99564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"PauseEnd":[1478813691247788813,1478813691256256020,1478813691262214751,1478813691405406556,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"NumGC":4,"GCCPUFraction":0.006757149597237818,"EnableGC":true,"DebugGC":false,"BySize":[{"Size":0,"Mallocs":0,"Frees":0},{"Size":8,"Mallocs":16193,"Frees":15733},{"Size":16,"Mallocs":54267,"Frees":45512},{"Size":32,"Mallocs":35006,"Frees":25861},{"Size":48,"Mallocs":7130,"Frees":5066},{"Size":64,"Mallocs":3421,"Frees":2554},{"Size":80,"Mallocs":3749,"Frees":3225},{"Size":96,"Mallocs":13973,"Frees":13413},{"Size":112,"Mallocs":1269,"Frees":825},{"Size":128,"Mallocs":1851,"Frees":1755},{"Size":144,"Mallocs":181,"Frees":95},{"Size":160,"Mallocs":558,"Frees":184},{"Size":176,"Mallocs":303,"Frees":249},{"Size":192,"Mallocs":2485,"Frees":278},{"Size":208,"Mallocs":255,"Frees":124},{"Size":224,"Mallocs":316,"Frees":131},{"Size":240,"Mallocs":64,"Frees":28},{"Size":256,"Mallocs":128,"Frees":91},{"Size":288,"Mallocs":734,"Frees":194},{"Size":320,"Mallocs":257,"Frees":15},{"Size":352,"Mallocs":531,"Frees":284},{"Size":384,"Mallocs":63,"Frees":7},{"Size":416,"Mallocs":189,"Frees":66},{"Size":448,"Mallocs":60,"Frees":11},{"Size":480,"Mallocs":19,"Frees":6},{"Size":512,"Mallocs":72,"Frees":56},{"Size":576,"Mallocs":157,"Frees":61},{"Size":640,"Mallocs":27,"Frees":14},{"Size":704,"Mallocs":159,"Frees":146},{"Size":768,"Mallocs":182,"Frees":179},{"Size":896,"Mallocs":82,"Frees":43},{"Size":1024,"Mallocs":108,"Frees":39},{"Size":1152,"Mallocs":245,"Frees":27},{"Size":1280,"Mallocs":49,"Frees":32},{"Size":1408,"Mallocs":70,"Frees":37},{"Size":1536,"Mallocs":61,"Frees":31},{"Size":1664,"Mallocs":29,"Frees":17},{"Size":2048,"Mallocs":102,"Frees":74},{"Size":2304,"Mallocs":27,"Frees":15},{"Size":2560,"Mallocs":17,"Frees":14},{"Size":2816,"Mallocs":92,"Frees":90},{"Size":3072,"Mallocs":4,"Frees":4},{"Size":3328,"Mallocs":20,"Frees":12},{"Size":4096,"Mallocs":85,"Frees":63},{"Size":4608,"Mallocs":25,"Frees":10},{"Size":5376,"Mallocs":50,"Frees":7},{"Size":6144,"Mallocs":13,"Frees":2},{"Size":6400,"Mallocs":0,"Frees":0},{"Size":6656,"Mallocs":2,"Frees":0},{"Size":6912,"Mallocs":0,"Frees":0},{"Size":8192,"Mallocs":31,"Frees":1},{"Size":8448,"Mallocs":0,"Frees":0},{"Size":8704,"Mallocs":1,"Frees":1},{"Size":9472,"Mallocs":0,"Frees":0},{"Size":10496,"Mallocs":0,"Frees":0},{"Size":12288,"Mallocs":5,"Frees":1},{"Size":13568,"Mallocs":0,"Frees":0},{"Size":14080,"Mallocs":0,"Frees":0},{"Size":16384,"Mallocs":4,"Frees":0},{"Size":16640,"Mallocs":0,"Frees":0},{"Size":17664,"Mallocs":0,"Frees":0}]},
+"num_enabled_tasks": 5,
+"num_subscriptions": 6,
+"num_tasks": 5,
+"product": "kapacitor",
+"server_id": "81e38258-5f18-4201-8d47-db603bfceeff",
+"version": "1.1.0~rc2"
+}
+`
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 75472f944..2ff5bc667 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -299,6 +299,22 @@ func (a *Accumulator) HasTimestamp(measurement string, timestamp time.Time) bool
 	return false
 }
 
+// HasField returns true if the given measurement has a field with the given
+// name
+func (a *Accumulator) HasField(measurement string, field string) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			if _, ok := p.Fields[field]; ok {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
 // HasIntField returns true if the measurement has an Int value
 func (a *Accumulator) HasIntField(measurement string, field string) bool {
 	a.Lock()

From cd103c85dbbd80917040f29ff6e28cb1be6d6aeb Mon Sep 17 00:00:00 2001
From: Seuf <seuf76@gmail.com>
Date: Thu, 27 Apr 2017 20:50:25 +0200
Subject: [PATCH 0231/1302] Added SASL options for ouput kafka plugin (#2721)

---
 CHANGELOG.md                    |  1 +
 plugins/outputs/kafka/README.md |  4 ++++
 plugins/outputs/kafka/kafka.go  | 15 +++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2651e3a..717642528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ be deprecated eventually.
 
 ### Features
 
+- [#2721](https://github.com/influxdata/telegraf/pull/2721): Added SASL options for kafka output plugin.
 - [#2723](https://github.com/influxdata/telegraf/pull/2723): Added SSL configuration for input haproxy.
 - [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin.
 - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.
diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 8f50f1814..abd9c4921 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -45,6 +45,10 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## Optional SASL Config
+  # sasl_username = "kafka"
+  # sasl_password = "secret"
+
   data_format = "influx"
 ```
 
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index bdc93eaec..421b5c2a1 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -44,6 +44,11 @@ type Kafka struct {
 	// Skip SSL verification
 	InsecureSkipVerify bool
 
+	// SASL Username
+	SASLUsername string `toml:"sasl_username"`
+	// SASL Password
+	SASLPassword string `toml:"sasl_password"`
+
 	tlsConfig tls.Config
 	producer  sarama.SyncProducer
 
@@ -92,6 +97,10 @@ var sampleConfig = `
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## Optional SASL Config
+  # sasl_username = "kafka"
+  # sasl_password = "secret"
+
   ## Data format to output.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
@@ -129,6 +138,12 @@ func (k *Kafka) Connect() error {
 		config.Net.TLS.Enable = true
 	}
 
+	if k.SASLUsername != "" && k.SASLPassword != "" {
+		config.Net.SASL.User = k.SASLUsername
+		config.Net.SASL.Password = k.SASLPassword
+		config.Net.SASL.Enable = true
+	}
+
 	producer, err := sarama.NewSyncProducer(k.Brokers, config)
 	if err != nil {
 		return err

From b9ce455bba41e8565d209afaf4af59fc81b8f075 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Apr 2017 11:52:50 -0700
Subject: [PATCH 0232/1302] Update telegraf.conf

---
 etc/telegraf.conf | 103 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 84 insertions(+), 19 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 07ae5ac8f..8aadcb2a7 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -55,10 +55,13 @@
   ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
   flush_jitter = "0s"
 
-  ## By default, precision will be set to the same timestamp order as the
-  ## collection interval, with the maximum being 1s.
-  ## Precision will NOT be used for service inputs, such as logparser and statsd.
-  ## Valid values are "ns", "us" (or "µs"), "ms", "s".
+  ## By default or when set to "0s", precision will be set to the same
+  ## timestamp order as the collection interval, with the maximum being 1s.
+  ##   ie, when interval = "10s", precision will be "1s"
+  ##       when interval = "250ms", precision will be "1ms"
+  ## Precision will NOT be used for service inputs. It is up to each individual
+  ## service input to set the timestamp at the appropriate precision.
+  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
   precision = ""
 
   ## Logging configuration:
@@ -146,6 +149,10 @@
 #   ## InfluxDB database
 #   # database = "telegraf"
 #
+#   ## Write timeout, formatted as a string.  If not provided, will default
+#   ## to 5s. 0s means no timeout (not recommended).
+#   # timeout = "5s"
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -292,7 +299,7 @@
 #   ## Kafka topic for producer messages
 #   topic = "telegraf"
 #   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, it's value will be used as the routing key
+#   ##  ie, if this tag exists, its value will be used as the routing key
 #   routing_tag = "host"
 #
 #   ## CompressionCodec represents the various compression codecs recognized by
@@ -329,7 +336,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -359,6 +366,11 @@
 #   streamname = "StreamName"
 #   ## PartitionKey as used for sharding data.
 #   partitionkey = "PartitionKey"
+#   ## If set the paritionKey will be a random UUID on every put.
+#   ## This allows for scaling across multiple shards in a stream.
+#   ## This will cause issues with ordering.
+#   use_random_partitionkey = false
+#
 #
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
@@ -545,6 +557,12 @@
 #   # address = "unix:///tmp/telegraf.sock"
 #   # address = "unixgram:///tmp/telegraf.sock"
 #
+#   ## Period between keep alive probes.
+#   ## Only applies to TCP sockets.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   # keep_alive_period = "5m"
+#
 #   ## Data format to generate.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -893,6 +911,12 @@
 #   servers = ["localhost"]
 
 
+# # Provide a native collection for dmsetup based statistics for dm-cache
+# [[inputs.dmcache]]
+#   ## Whether to report per-device stats or not
+#   per_device = true
+
+
 # # Query given DNS server and gives statistics
 # [[inputs.dns_query]]
 #   ## servers to query
@@ -929,6 +953,10 @@
 #   ## Whether to report for each container total blkio and network stats or not
 #   total = false
 #
+#   ## docker labels to include and exclude as tags.  Globs accepted.
+#   ## Note that an empty array for both will include all labels as tags
+#   docker_label_include = []
+#   docker_label_exclude = []
 
 
 # # Read statistics from one or many dovecot servers
@@ -1057,19 +1085,26 @@
 #   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
 #   ## Make sure you specify the complete path to the stats endpoint
 #   ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
-#   #
+#
 #   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
 #   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-#   ##
+#
 #   ## You can also use local socket with standard wildcard globbing.
 #   ## Server address not starting with 'http' will be treated as a possible
 #   ## socket, so both examples below are valid.
-#   ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
-#   #
+#   # servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+#
 #   ## By default, some of the fields are renamed from what haproxy calls them.
 #   ## Setting this option to true results in the plugin keeping the original
 #   ## field names.
-#   ## keep_field_names = true
+#   # keep_field_names = true
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Monitor disks' temperatures using hddtemp
@@ -1121,7 +1156,10 @@
 #   ## NOTE This plugin only reads numerical measurements, strings and booleans
 #   ## will be ignored.
 #
-#   ## a name for the service being polled
+#   ## Name for the service being polled.  Will be appended to the name of the
+#   ## measurement e.g. httpjson_webserver_stats
+#   ##
+#   ## Deprecated (1.3.0): Use name_override, name_suffix, name_prefix instead.
 #   name = "webserver_stats"
 #
 #   ## URL of each server in the service's cluster
@@ -1141,12 +1179,14 @@
 #   #   "my_tag_2"
 #   # ]
 #
-#   ## HTTP parameters (all values must be strings)
-#   [inputs.httpjson.parameters]
-#     event_type = "cpu_spike"
-#     threshold = "0.75"
+#   ## HTTP parameters (all values must be strings).  For "GET" requests, data
+#   ## will be included in the query.  For "POST" requests, data will be included
+#   ## in the request body as "x-www-form-urlencoded".
+#   # [inputs.httpjson.parameters]
+#   #   event_type = "cpu_spike"
+#   #   threshold = "0.75"
 #
-#   ## HTTP Header parameters (all values must be strings)
+#   ## HTTP Headers (all values must be strings)
 #   # [inputs.httpjson.headers]
 #   #   X-Auth-Token = "my-xauth-token"
 #   #   apiVersion = "v1"
@@ -1181,6 +1221,13 @@
 #   # collect_memstats = true
 
 
+# # This plugin gathers interrupts data from /proc/interrupts and /proc/softirqs.
+# [[inputs.interrupts]]
+#   ## To filter which IRQs to collect, make use of tagpass / tagdrop, i.e.
+#   # [inputs.interrupts.tagdrop]
+#     # irq = [ "NET_RX", "TASKLET" ]
+
+
 # # Read metrics from the bare metal servers via IPMI
 # [[inputs.ipmi_sensor]]
 #   ## optionally specify the path to the ipmitool executable
@@ -1306,6 +1353,11 @@
 #   servers = ["127.0.0.1:4021"]
 
 
+# # Provides Linux sysctl fs metrics
+# [[inputs.linux_sysctl_fs]]
+#   # no configuration
+
+
 # # Read metrics from local Lustre service on OST, MDS
 # [[inputs.lustre2]]
 #   ## An array of /proc globs to search for Lustre stats
@@ -1562,7 +1614,7 @@
 #   ## NOTE: this plugin forks the ping command. You may need to set capabilities
 #   ## via setcap cap_net_raw+p /bin/ping
 #   #
-#   ## urls to ping
+#   ## List of urls to ping
 #   urls = ["www.google.com"] # required
 #   ## number of pings to send per collection (ping -c <COUNT>)
 #   # count = 1
@@ -2144,10 +2196,14 @@
 #   offset = "oldest"
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
+#
+#   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+#   ## larger messages are dropped
+#   max_message_len = 65536
 
 
 # # Stream and parse log file(s).
@@ -2284,6 +2340,12 @@
 #   ## Defaults to the OS default.
 #   # read_buffer_size = 65535
 #
+#   ## Period between keep alive probes.
+#   ## Only applies to TCP sockets.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   # keep_alive_period = "5m"
+#
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -2389,4 +2451,7 @@
 #
 #   [inputs.webhooks.rollbar]
 #     path = "/rollbar"
+#
+#   [inputs.webhooks.papertrail]
+#     path = "/papertrail"
 

From 052e88ad5ea5fa5872fba8998f1bf819ce418acb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Apr 2017 14:59:18 -0700
Subject: [PATCH 0233/1302] Fix grammar

---
 CONTRIBUTING.md                               |  4 +--
 docs/DATA_FORMATS_INPUT.md                    | 14 +++++-----
 docs/DATA_FORMATS_OUTPUT.md                   |  8 +++---
 etc/telegraf.conf                             | 28 +++++++++----------
 internal/config/testdata/telegraf-agent.toml  |  2 +-
 plugins/inputs/amqp_consumer/README.md        |  2 +-
 plugins/inputs/amqp_consumer/amqp_consumer.go |  2 +-
 plugins/inputs/exec/exec.go                   |  2 +-
 plugins/inputs/kafka_consumer/README.md       |  2 +-
 plugins/inputs/mqtt_consumer/README.md        |  2 +-
 plugins/inputs/mqtt_consumer/mqtt_consumer.go |  2 +-
 plugins/inputs/nats_consumer/README.md        |  2 +-
 plugins/inputs/nats_consumer/nats_consumer.go |  2 +-
 plugins/inputs/nsq_consumer/README.md         |  2 +-
 plugins/inputs/nsq_consumer/nsq_consumer.go   |  2 +-
 plugins/inputs/socket_listener/README.md      |  2 +-
 .../inputs/socket_listener/socket_listener.go |  2 +-
 plugins/inputs/tail/README.md                 |  2 +-
 plugins/inputs/tail/tail.go                   |  2 +-
 plugins/outputs/amqp/README.md                |  4 +--
 plugins/outputs/amqp/amqp.go                  |  4 +--
 plugins/outputs/file/README.md                |  2 +-
 plugins/outputs/file/file.go                  |  2 +-
 plugins/outputs/kinesis/kinesis.go            |  2 +-
 plugins/outputs/mqtt/mqtt.go                  |  2 +-
 plugins/outputs/nats/README.md                |  4 +--
 plugins/outputs/nats/nats.go                  |  2 +-
 plugins/outputs/nsq/nsq.go                    |  2 +-
 plugins/outputs/socket_writer/README.md       |  2 +-
 .../outputs/socket_writer/socket_writer.go    |  2 +-
 30 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5aefbfdcb..1e94daff4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -124,7 +124,7 @@ You should also add the following to your SampleConfig() return:
 
 ```toml
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
@@ -254,7 +254,7 @@ You should also add the following to your SampleConfig() return:
 
 ```toml
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 8f80b560e..1b6c0b683 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -41,7 +41,7 @@ example, in the exec plugin:
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "json"
@@ -68,7 +68,7 @@ metrics are parsed directly into Telegraf metrics.
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
@@ -118,7 +118,7 @@ For example, if you had this configuration:
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "json"
@@ -162,7 +162,7 @@ For example, if the following configuration:
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "json"
@@ -233,7 +233,7 @@ name of the plugin.
   name_override = "entropy_available"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "value"
@@ -391,7 +391,7 @@ There are many more options available,
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "graphite"
@@ -467,7 +467,7 @@ You can also change the path to the typesdb or add additional typesdb using
   name_prefix = "collectd_"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "collectd"
diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 633460846..2ede82305 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -36,7 +36,7 @@ config option, for example, in the `file` output plugin:
   files = ["stdout"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
@@ -60,7 +60,7 @@ metrics are serialized directly into InfluxDB line-protocol.
   files = ["stdout", "/tmp/metrics.out"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
@@ -104,7 +104,7 @@ tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
   files = ["stdout", "/tmp/metrics.out"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "graphite"
@@ -143,7 +143,7 @@ The JSON data format serialized Telegraf metrics in json format. The format is:
   files = ["stdout", "/tmp/metrics.out"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "json"
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 8aadcb2a7..9022fac07 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -161,7 +161,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -250,7 +250,7 @@
 #   files = ["stdout", "/tmp/metrics.out"]
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -373,7 +373,7 @@
 #
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -425,7 +425,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -449,7 +449,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -463,7 +463,7 @@
 #   topic = "telegraf"
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -564,7 +564,7 @@
 #   # keep_alive_period = "5m"
 #
 #   ## Data format to generate.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   # data_format = "influx"
@@ -1020,7 +1020,7 @@
 #   name_suffix = "_mycollector"
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
@@ -2157,7 +2157,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   data_format = "influx"
@@ -2271,7 +2271,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
@@ -2294,7 +2294,7 @@
 #   # pending_bytes_limit = 67108864
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
@@ -2309,7 +2309,7 @@
 #   max_in_flight = 100
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
@@ -2347,7 +2347,7 @@
 #   # keep_alive_period = "5m"
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   # data_format = "influx"
@@ -2414,7 +2414,7 @@
 #   pipe = false
 #
 #   ## Data format to consume.
-#   ## Each data format has it's own unique set of configuration options, read
+#   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
diff --git a/internal/config/testdata/telegraf-agent.toml b/internal/config/testdata/telegraf-agent.toml
index 1e6a6a276..5cf82af76 100644
--- a/internal/config/testdata/telegraf-agent.toml
+++ b/internal/config/testdata/telegraf-agent.toml
@@ -60,7 +60,7 @@
   # Kafka topic for producer messages
   topic = "telegraf"
   # Telegraf tag to use as a routing key
-  #  ie, if this tag exists, it's value will be used as the routing key
+  #  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
 
 
diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index 85780700f..2bc06686e 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -40,7 +40,7 @@ The following defaults are known to work with RabbitMQ:
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 6f12244aa..7f7dfb11d 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -86,7 +86,7 @@ func (a *AMQPConsumer) SampleConfig() string {
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/exec/exec.go b/plugins/inputs/exec/exec.go
index e9ce4551e..bcd1cc8e5 100644
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -35,7 +35,7 @@ const sampleConfig = `
   name_suffix = "_mycollector"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 6a95a7c54..ae04c9515 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -24,7 +24,7 @@ from the same topic in parallel.
 
   ## Data format to consume.
 
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md
index 1feef9d3a..0e8d540f3 100644
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -40,7 +40,7 @@ The plugin expects messages in the
   # insecure_skip_verify = false
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index 3ea0480b8..1c75aaf65 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -82,7 +82,7 @@ var sampleConfig = `
   # insecure_skip_verify = false
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/nats_consumer/README.md b/plugins/inputs/nats_consumer/README.md
index 31d947588..18dd57f07 100644
--- a/plugins/inputs/nats_consumer/README.md
+++ b/plugins/inputs/nats_consumer/README.md
@@ -25,7 +25,7 @@ from a NATS cluster in parallel.
 
   ## Data format to consume. 
 
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/nats_consumer/nats_consumer.go b/plugins/inputs/nats_consumer/nats_consumer.go
index 7c9f53941..a4a781699 100644
--- a/plugins/inputs/nats_consumer/nats_consumer.go
+++ b/plugins/inputs/nats_consumer/nats_consumer.go
@@ -66,7 +66,7 @@ var sampleConfig = `
   # pending_bytes_limit = 67108864
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/nsq_consumer/README.md b/plugins/inputs/nsq_consumer/README.md
index eac494ccb..d207d8de1 100644
--- a/plugins/inputs/nsq_consumer/README.md
+++ b/plugins/inputs/nsq_consumer/README.md
@@ -15,7 +15,7 @@ topic and adds messages to InfluxDB. This plugin allows a message to be in any o
   max_in_flight = 100
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/nsq_consumer/nsq_consumer.go b/plugins/inputs/nsq_consumer/nsq_consumer.go
index b82b005c9..b93c4c68e 100644
--- a/plugins/inputs/nsq_consumer/nsq_consumer.go
+++ b/plugins/inputs/nsq_consumer/nsq_consumer.go
@@ -28,7 +28,7 @@ var sampleConfig = `
   max_in_flight = 100
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
index 604b8e893..7baa0bffc 100644
--- a/plugins/inputs/socket_listener/README.md
+++ b/plugins/inputs/socket_listener/README.md
@@ -43,7 +43,7 @@ This is a sample configuration for the plugin.
   # keep_alive_period = "5m"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   # data_format = "influx"
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index eb5fc23ab..839b28368 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -185,7 +185,7 @@ func (sl *SocketListener) SampleConfig() string {
   # keep_alive_period = "5m"
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   # data_format = "influx"
diff --git a/plugins/inputs/tail/README.md b/plugins/inputs/tail/README.md
index 3aa0c4ac4..38f124174 100644
--- a/plugins/inputs/tail/README.md
+++ b/plugins/inputs/tail/README.md
@@ -40,7 +40,7 @@ The plugin expects messages in one of the
   pipe = false
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 151b3c685..e360dcb64 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -48,7 +48,7 @@ const sampleConfig = `
   pipe = false
 
   ## Data format to consume.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index ab5900bcf..d79af597a 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -27,7 +27,7 @@ For an introduction to AMQP see:
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
   ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, it's value will be used as the routing key
+  ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
 
   ## InfluxDB retention policy
@@ -47,7 +47,7 @@ For an introduction to AMQP see:
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index 63c6db6fd..75fe4c711 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -80,7 +80,7 @@ var sampleConfig = `
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
   ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, it's value will be used as the routing key
+  ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
 
   ## InfluxDB retention policy
@@ -100,7 +100,7 @@ var sampleConfig = `
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/file/README.md b/plugins/outputs/file/README.md
index a75297bb2..de577eacf 100644
--- a/plugins/outputs/file/README.md
+++ b/plugins/outputs/file/README.md
@@ -9,7 +9,7 @@ This plugin writes telegraf metrics to files
   files = ["stdout", "/tmp/metrics.out"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go
index 41605213e..4f0bcca77 100644
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -24,7 +24,7 @@ var sampleConfig = `
   files = ["stdout", "/tmp/metrics.out"]
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index d69ae3954..8c807ceed 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -63,7 +63,7 @@ var sampleConfig = `
 
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index b1d94f87c..3bcf1b7d8 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -36,7 +36,7 @@ var sampleConfig = `
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/nats/README.md b/plugins/outputs/nats/README.md
index 501bd377c..d9462650a 100644
--- a/plugins/outputs/nats/README.md
+++ b/plugins/outputs/nats/README.md
@@ -1,7 +1,7 @@
 # NATS Output Plugin
 
 This plugin writes to a (list of) specified NATS instance(s).
- 
+
 ```
 [[outputs.nats]]
   ## URLs of NATS servers
@@ -18,7 +18,7 @@ This plugin writes to a (list of) specified NATS instance(s).
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/nats/nats.go b/plugins/outputs/nats/nats.go
index e65e799cf..d97c4688d 100644
--- a/plugins/outputs/nats/nats.go
+++ b/plugins/outputs/nats/nats.go
@@ -50,7 +50,7 @@ var sampleConfig = `
   # insecure_skip_verify = false
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/nsq/nsq.go b/plugins/outputs/nsq/nsq.go
index bd1705c10..c826ab648 100644
--- a/plugins/outputs/nsq/nsq.go
+++ b/plugins/outputs/nsq/nsq.go
@@ -25,7 +25,7 @@ var sampleConfig = `
   topic = "telegraf"
 
   ## Data format to output.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
diff --git a/plugins/outputs/socket_writer/README.md b/plugins/outputs/socket_writer/README.md
index 027e92fe8..e8b5a0174 100644
--- a/plugins/outputs/socket_writer/README.md
+++ b/plugins/outputs/socket_writer/README.md
@@ -26,7 +26,7 @@ It can output data in any of the [supported output formats](https://github.com/i
   # keep_alive_period = "5m"
 
   ## Data format to generate.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   # data_format = "influx"
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index dbc3cba05..32baa40c4 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -46,7 +46,7 @@ func (sw *SocketWriter) SampleConfig() string {
   # keep_alive_period = "5m"
 
   ## Data format to generate.
-  ## Each data format has it's own unique set of configuration options, read
+  ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   # data_format = "influx"

From a083e1af7df580e070aaa1610df7131329346973 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Thu, 27 Apr 2017 16:18:11 -0700
Subject: [PATCH 0234/1302] Use go 1.8.1 for CI and Release builds (#2732)

---
 CHANGELOG.md |  1 +
 circle.yml   | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 717642528..7d66ee661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@ be deprecated eventually.
 - [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
+- [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1
 
 ### Bugfixes
 
diff --git a/circle.yml b/circle.yml
index a7d15368d..3982c1036 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,13 +1,11 @@
 machine:
+  go:
+    version: 1.8.1
   services:
     - docker
-  post:
-    - sudo service zookeeper stop
-    - go version
-    - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
-    - go version
+    - memcached
+    - redis
+    - rabbitmq-server
 
 dependencies:
   override:

From 1da1c4753e213841031dfd2dfa331826f71418bd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 28 Apr 2017 13:40:58 -0700
Subject: [PATCH 0235/1302] Clarify retention policy option for influxdb output

closes #2696
---
 plugins/outputs/influxdb/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 5acac6cca..3cd029d8c 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -18,7 +18,8 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 
-  ## Retention policy to write to. Empty string writes to the default rp.
+  ## Name of existing retention policy to write to.  Empty string writes to
+  ## the default retention policy.
   retention_policy = ""
   ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
   write_consistency = "any"
@@ -52,7 +53,7 @@ to write to. Each URL should start with either `http://` or `udp://`
 ### Optional parameters:
 
 * `write_consistency`: Write consistency (clusters only), can be: "any", "one", "quorum", "all".
-* `retention_policy`:  Retention policy to write to.
+* `retention_policy`:  Name of existing retention policy to write to.  Empty string writes to the default retention policy.
 * `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

From 086a2f5f12ca4ed12bd356006dfe43712cb490d9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 28 Apr 2017 13:46:23 -0700
Subject: [PATCH 0236/1302] Clarify retention policy option for influxdb output

closes #2696
---
 plugins/outputs/influxdb/influxdb.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 6419d43ea..f0e138156 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -55,7 +55,8 @@ var sampleConfig = `
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 
-  ## Retention policy to write to. Empty string writes to the default rp.
+  ## Name of existing retention policy to write to.  Empty string writes to
+  ## the default retention policy.
   retention_policy = ""
   ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
   write_consistency = "any"

From c7a0e40c87d69eab11dfac226e0d3b8b258dc198 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 28 Apr 2017 13:47:32 -0700
Subject: [PATCH 0237/1302] Update telegraf.conf

---
 etc/telegraf.conf | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 9022fac07..d455b10af 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -95,7 +95,8 @@
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 
-  ## Retention policy to write to. Empty string writes to the default rp.
+  ## Name of existing retention policy to write to.  Empty string writes to
+  ## the default retention policy.
   retention_policy = ""
   ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
   write_consistency = "any"
@@ -141,7 +142,7 @@
 #   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
 #   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, it's value will be used as the routing key
+#   ##  ie, if this tag exists, its value will be used as the routing key
 #   routing_tag = "host"
 #
 #   ## InfluxDB retention policy
@@ -335,6 +336,10 @@
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Optional SASL Config
+#   # sasl_username = "kafka"
+#   # sasl_password = "secret"
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -1325,6 +1330,18 @@
 #     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
 
 
+# # Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints
+# [[inputs.kapacitor]]
+#   ## Multiple URLs from which to read Kapacitor-formatted JSON
+#   ## Default is "http://localhost:9092/kapacitor/v1/debug/vars".
+#   urls = [
+#     "http://localhost:9092/kapacitor/v1/debug/vars"
+#   ]
+#
+#   ## Time limit for http requests
+#   timeout = "5s"
+
+
 # # Get kernel statistics from /proc/vmstat
 # [[inputs.kernel_vmstat]]
 #   # no configuration

From 6e76731b7e012acffe139e805ff376ec67c0722e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 28 Apr 2017 15:58:46 -0700
Subject: [PATCH 0238/1302] Don't log error creating database on connect
 (#2740)

closes #2739
---
 plugins/outputs/influxdb/influxdb.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index f0e138156..2dac7a00a 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -132,7 +132,9 @@ func (i *InfluxDB) Connect() error {
 
 			err = c.Query("CREATE DATABASE " + i.Database)
 			if err != nil {
-				log.Println("E! Database creation failed: " + err.Error())
+				if !strings.Contains(err.Error(), "Status Code [403]") {
+					log.Println("I! Database creation failed: " + err.Error())
+				}
 				continue
 			}
 		}

From 5c88965084176c95dd58f6bbbdac32a55feffb5d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Mon, 1 May 2017 18:55:48 -0700
Subject: [PATCH 0239/1302] Add initial documentation for rabbitmq input.
 (#2745)

---
 CHANGELOG.md                        |   1 +
 plugins/inputs/rabbitmq/README.md   | 121 ++++++++++++++++++++++++++++
 plugins/inputs/rabbitmq/rabbitmq.go |   7 +-
 3 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 plugins/inputs/rabbitmq/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d66ee661..30976def5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@ be deprecated eventually.
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
 - [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1
+- [#2712](https://github.com/influxdata/telegraf/issues/2712): Documentation for rabbitmq input plugin
 
 ### Bugfixes
 
diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
new file mode 100644
index 000000000..6216a2200
--- /dev/null
+++ b/plugins/inputs/rabbitmq/README.md
@@ -0,0 +1,121 @@
+# RabbitMQ Input Plugin
+
+Reads metrics from RabbitMQ servers via the [Management Plugin](https://www.rabbitmq.com/management.html).
+
+For additional details reference the [RabbitMQ Management HTTP Stats](https://cdn.rawgit.com/rabbitmq/rabbitmq-management/master/priv/www/doc/stats.html).
+
+### Configuration:
+
+```toml
+[[inputs.rabbitmq]]
+  ## Management Plugin url. (default: http://localhost:15672)
+  # url = "http://localhost:15672"
+  ## Tag added to rabbitmq_overview series; deprecated: use tags
+  # name = "rmq-server-1"
+  ## Credentials
+  # username = "guest"
+  # password = "guest"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Optional request timeouts
+  ##
+  ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
+  ## for a server's response headers after fully writing the request.
+  # header_timeout = "3s"
+  ##
+  ## client_timeout specifies a time limit for requests made by this client.
+  ## Includes connection time, any redirects, and reading the response body.
+  # client_timeout = "4s"
+
+  ## A list of nodes to pull metrics about. If not specified, metrics for
+  ## all nodes are gathered.
+  # nodes = ["rabbit@node1", "rabbit@node2"]
+```
+
+### Measurements & Fields:
+
+- rabbitmq_overview
+  - channels (int, channels)
+  - connections (int, connections)
+  - consumers (int, consumers)
+  - exchanges (int, exchanges)
+  - messages (int, messages)
+  - messages_acked (int, messages)
+  - messages_delivered (int, messages)
+  - messages_published (int, messages)
+  - messages_ready (int, messages)
+  - messages_unacked (int, messages)
+  - queues (int, queues)
+
+- rabbitmq_node
+  - disk_free (int, bytes)
+  - disk_free_limit (int, bytes)
+  - fd_total (int, file descriptors)
+  - fd_used (int, file descriptors)
+  - mem_limit (int, bytes)
+  - mem_used (int, bytes)
+  - proc_total (int, erlang processes)
+  - proc_used (int, erlang processes)
+  - run_queue (int, erlang processes)
+  - sockets_total (int, sockets)
+  - sockets_used (int, sockets)
+
+- rabbitmq_queue
+  - consumer_utilisation (float, percent)
+  - consumers (int, int)
+  - idle_since (string, time - e.g., "2006-01-02 15:04:05")
+  - memory (int, bytes)
+  - message_bytes (int, bytes)
+  - message_bytes_persist (int, bytes)
+  - message_bytes_ram (int, bytes)
+  - message_bytes_ready (int, bytes)
+  - message_bytes_unacked (int, bytes)
+  - messages (int, count)
+  - messages_ack (int, count)
+  - messages_ack_rate (float, messages per second)
+  - messages_deliver (int, count)
+  - messages_deliver_rate (float, messages per second)
+  - messages_deliver_get (int, count)
+  - messages_deliver_get_rate (float, messages per second)
+  - messages_publish (int, count)
+  - messages_publish_rate (float, messages per second)
+  - messages_ready (int, count)
+  - messages_redeliver (int, count)
+  - messages_redeliver_rate (float, messages per second)
+  - messages_unack (integer, count)
+
+### Tags:
+
+- All measurements have the following tags:
+  - url
+
+- rabbitmq_overview
+  - name
+
+- rabbitmq_node
+  - node
+
+- rabbitmq_queue
+  - url
+  - queue
+  - vhost
+  - node
+  - durable
+  - auto_delete
+
+### Sample Queries:
+
+
+### Example Output:
+
+```
+rabbitmq_queue,url=http://amqp.example.org:15672,queue=telegraf,vhost=influxdb,node=rabbit@amqp.example.org,durable=true,auto_delete=false,host=amqp.example.org messages_deliver_get=0i,messages_publish=329i,messages_publish_rate=0.2,messages_redeliver_rate=0,message_bytes_ready=0i,message_bytes_unacked=0i,messages_deliver=329i,messages_unack=0i,consumers=1i,idle_since="",messages=0i,messages_deliver_rate=0.2,messages_deliver_get_rate=0.2,messages_redeliver=0i,memory=43032i,message_bytes_ram=0i,messages_ack=329i,messages_ready=0i,messages_ack_rate=0.2,consumer_utilisation=1,message_bytes=0i,message_bytes_persist=0i 1493684035000000000
+rabbitmq_overview,url=http://amqp.example.org:15672,host=amqp.example.org channels=2i,consumers=1i,exchanges=17i,messages_acked=329i,messages=0i,messages_ready=0i,messages_unacked=0i,connections=2i,queues=1i,messages_delivered=329i,messages_published=329i 1493684035000000000
+rabbitmq_node,url=http://amqp.example.org:15672,node=rabbit@amqp.example.org,host=amqp.example.org fd_total=1024i,fd_used=32i,mem_limit=8363329126i,sockets_total=829i,disk_free=8175935488i,disk_free_limit=50000000i,mem_used=58771080i,proc_total=1048576i,proc_used=267i,run_queue=0i,sockets_used=2i 149368403500000000
+```
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index d8bf45913..1f13263c0 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -140,8 +140,11 @@ type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator)
 var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
 
 var sampleConfig = `
+  ## Management Plugin url. (default: http://localhost:15672)
   # url = "http://localhost:15672"
-  # name = "rmq-server-1" # optional tag
+  ## Tag added to rabbitmq_overview series; deprecated: use tags
+  # name = "rmq-server-1"
+  ## Credentials
   # username = "guest"
   # password = "guest"
 
@@ -174,7 +177,7 @@ func (r *RabbitMQ) SampleConfig() string {
 
 // Description ...
 func (r *RabbitMQ) Description() string {
-	return "Read metrics from one or many RabbitMQ servers via the management API"
+	return "Reads metrics from RabbitMQ servers via the Management Plugin"
 }
 
 // Gather ...

From 52c19af0ba3de7b369ac396fa2693116425ab5eb Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Tue, 2 May 2017 14:06:49 -0400
Subject: [PATCH 0240/1302] fix close on closed socket_writer (#2748)

---
 plugins/outputs/socket_writer/socket_writer.go      | 10 ++++++++++
 plugins/outputs/socket_writer/socket_writer_test.go |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 32baa40c4..503130c62 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -124,6 +124,16 @@ func (sw *SocketWriter) Write(metrics []telegraf.Metric) error {
 	return nil
 }
 
+// Close closes the connection. Noop if already closed.
+func (sw *SocketWriter) Close() error {
+	if sw.Conn == nil {
+		return nil
+	}
+	err := sw.Conn.Close()
+	sw.Conn = nil
+	return err
+}
+
 func newSocketWriter() *SocketWriter {
 	s, _ := serializers.NewInfluxSerializer()
 	return &SocketWriter{
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
index 6be2b0905..0c5747d31 100644
--- a/plugins/outputs/socket_writer/socket_writer_test.go
+++ b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -143,7 +143,7 @@ func TestSocketWriter_Write_err(t *testing.T) {
 
 	// close the socket to generate an error
 	lconn.Close()
-	sw.Close()
+	sw.Conn.Close()
 	err = sw.Write(metrics)
 	require.Error(t, err)
 	assert.Nil(t, sw.Conn)

From 188703e204d7f88080389a538f92046c27c49439 Mon Sep 17 00:00:00 2001
From: Alexander Blagoev <alexander.i.blagoev@gmail.com>
Date: Tue, 2 May 2017 21:43:07 +0300
Subject: [PATCH 0241/1302] Improve redis input documentation (#2708)

---
 CHANGELOG.md                   |   1 +
 plugins/inputs/redis/README.md | 133 ++++++++++++++++++++++++---------
 2 files changed, 98 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30976def5..50e7c6e45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@ be deprecated eventually.
 - [#1911](https://github.com/influxdata/telegraf/issues/1911): Sysstat plugin needs LANG=C or similar locale
 - [#2528](https://github.com/influxdata/telegraf/issues/2528): File output closes standard streams on reload.
 - [#2603](https://github.com/influxdata/telegraf/issues/2603): AMQP output disconnect blocks all outputs
+- [#2706](https://github.com/influxdata/telegraf/issues/2706): Improve documentation for redis input plugin
 
 ## v1.2.1 [2017-02-01]
 
diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 51b596aa0..5ec2a120a 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -18,47 +18,103 @@
 
 ### Measurements & Fields:
 
-- Measurement
-    - uptime_in_seconds
-    - connected_clients
-    - used_memory
-    - used_memory_rss
-    - used_memory_peak
-    - used_memory_lua
-    - rdb_changes_since_last_save
-    - total_connections_received
-    - total_commands_processed
-    - instantaneous_ops_per_sec
-    - instantaneous_input_kbps
-    - instantaneous_output_kbps
-    - sync_full
-    - sync_partial_ok
-    - sync_partial_err
-    - expired_keys
-    - evicted_keys
-    - keyspace_hits
-    - keyspace_misses
-    - pubsub_channels
-    - pubsub_patterns
-    - latest_fork_usec
-    - connected_slaves
-    - master_repl_offset
-    - master_last_io_seconds_ago
-    - repl_backlog_active
-    - repl_backlog_size
-    - repl_backlog_histlen
-    - mem_fragmentation_ratio
-    - used_cpu_sys
-    - used_cpu_user
-    - used_cpu_sys_children
-    - used_cpu_user_children
+The plugin gathers the results of the [INFO](https://redis.io/commands/info) redis command.
+There are two separate measurements: _redis_ and _redis\_keyspace_, the latter is used for gathering database related statistics.
+
+Additionally the plugin also calculates the hit/miss ratio (keyspace\_hitrate) and the elapsed time since the last rdb save (rdb\_last\_save\_time\_elapsed).
+
+- redis
+    - keyspace_hitrate(float, number)
+    - rdb_last_save_time_elapsed(int, seconds)
+
+    **Server**
+    - uptime(int, seconds)
+    - lru_clock(int, number)
+
+    **Clients**
+    - clients(int, number)
+    - client_longest_output_list(int, number)
+    - client_biggest_input_buf(int, number)
+    - blocked_clients(int, number)
+
+    **Memory**
+    - used_memory(int, bytes)
+    - used_memory_rss(int, bytes)
+    - used_memory_peak(int, bytes)
+    - total_system_memory(int, bytes)
+    - used_memory_lua(int, bytes)
+    - maxmemory(int, bytes)
+    - maxmemory_policy(string)
+    - mem_fragmentation_ratio(float, number)
+
+    **Persistance**
+    - loading(int,flag)
+    - rdb_changes_since_last_save(int, number)
+    - rdb_bgsave_in_progress(int, flag)
+    - rdb_last_save_time(int, seconds)
+    - rdb_last_bgsave_status(string)
+    - rdb_last_bgsave_time_sec(int, seconds)
+    - rdb_current_bgsave_time_sec(int, seconds)
+    - aof_enabled(int, flag)
+    - aof_rewrite_in_progress(int, flag)
+    - aof_rewrite_scheduled(int, flag)
+    - aof_last_rewrite_time_sec(int, seconds)
+    - aof_current_rewrite_time_sec(int, seconds)
+    - aof_last_bgrewrite_status(string)
+    - aof_last_write_status(string)
+
+    **Stats**
+    - total_connections_received(int, number)
+    - total_commands_processed(int, number)
+    - instantaneous_ops_per_sec(int, number)
+    - total_net_input_bytes(int, bytes)
+    - total_net_output_bytes(int, bytes)
+    - instantaneous_input_kbps(float, bytes)
+    - instantaneous_output_kbps(float, bytes)
+    - rejected_connections(int, number)
+    - sync_full(int, number)
+    - sync_partial_ok(int, number)
+    - sync_partial_err(int, number)
+    - expired_keys(int, number)
+    - evicted_keys(int, number)
+    - keyspace_hits(int, number)
+    - keyspace_misses(int, number)
+    - pubsub_channels(int, number)
+    - pubsub_patterns(int, number)
+    - latest_fork_usec(int, microseconds)
+    - migrate_cached_sockets(int, number)
+
+    **Replication**
+    - connected_slaves(int, number)
+    - master_repl_offset(int, number)
+    - repl_backlog_active(int, number)
+    - repl_backlog_size(int, bytes)
+    - repl_backlog_first_byte_offset(int, number)
+    - repl_backlog_histlen(int, bytes)
+
+    **CPU**
+    - used_cpu_sys(float, number)
+    - used_cpu_user(float, number)
+    - used_cpu_sys_children(float, number)
+    - used_cpu_user_children(float, number)
+
+    **Cluster**
+    - cluster_enabled(int, flag)
+
+- redis_keyspace
+    - keys(int, number)
+    - expires(int, number)
+    - avg_ttl(int, number)
 
 ### Tags:
 
 - All measurements have the following tags:
     - port
     - server
-    - replication role
+    - replication_role
+
+- The redis_keyspace measurement has an additional database tag:
+    - database
 
 ### Example Output:
 
@@ -84,5 +140,10 @@ When run with:
 It produces:
 ```
 * Plugin: redis, Collection 1
-> redis,port=6379,server=localhost clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i 1457052084987848383
+> redis,server=localhost,port=6379,replication_role=master,host=host keyspace_hitrate=1,clients=2i,blocked_clients=0i,instantaneous_input_kbps=0,sync_full=0i,pubsub_channels=0i,pubsub_patterns=0i,total_net_output_bytes=6659253i,used_memory=842448i,total_system_memory=8351916032i,aof_current_rewrite_time_sec=-1i,rdb_changes_since_last_save=0i,sync_partial_err=0i,latest_fork_usec=508i,instantaneous_output_kbps=0,expired_keys=0i,used_memory_peak=843416i,aof_rewrite_in_progress=0i,aof_last_bgrewrite_status="ok",migrate_cached_sockets=0i,connected_slaves=0i,maxmemory_policy="noeviction",aof_rewrite_scheduled=0i,total_net_input_bytes=3125i,used_memory_rss=9564160i,repl_backlog_histlen=0i,rdb_last_bgsave_status="ok",aof_last_rewrite_time_sec=-1i,keyspace_misses=0i,client_biggest_input_buf=5i,used_cpu_user=1.33,maxmemory=0i,rdb_current_bgsave_time_sec=-1i,total_commands_processed=271i,repl_backlog_size=1048576i,used_cpu_sys=3,uptime=2822i,lru_clock=16706281i,used_memory_lua=37888i,rejected_connections=0i,sync_partial_ok=0i,evicted_keys=0i,rdb_last_save_time_elapsed=1922i,rdb_last_save_time=1493099368i,instantaneous_ops_per_sec=0i,used_cpu_user_children=0,client_longest_output_list=0i,master_repl_offset=0i,repl_backlog_active=0i,keyspace_hits=2i,used_cpu_sys_children=0,cluster_enabled=0i,rdb_last_bgsave_time_sec=0i,aof_last_write_status="ok",total_connections_received=263i,aof_enabled=0i,repl_backlog_first_byte_offset=0i,mem_fragmentation_ratio=11.35,loading=0i,rdb_bgsave_in_progress=0i 1493101290000000000
+```
+
+redis_keyspace:
+```
+> redis_keyspace,database=db1,host=host,server=localhost,port=6379,replication_role=master keys=1i,expires=0i,avg_ttl=0i 1493101350000000000
 ```

From f7f1eaef656b76a9425669fec92111de75df4a64 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Tue, 2 May 2017 14:54:38 -0700
Subject: [PATCH 0242/1302] Return an error if no valid patterns. (#2753)

---
 plugins/inputs/logparser/grok/grok.go      | 11 +++++++++--
 plugins/inputs/logparser/logparser.go      |  7 +------
 plugins/inputs/logparser/logparser_test.go |  8 ++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index f684e9339..ae23e5f51 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -118,11 +118,18 @@ func (p *Parser) Compile() error {
 
 	// Give Patterns fake names so that they can be treated as named
 	// "custom patterns"
-	p.namedPatterns = make([]string, len(p.Patterns))
+	p.namedPatterns = make([]string, 0, len(p.Patterns))
 	for i, pattern := range p.Patterns {
+		if pattern == "" {
+			continue
+		}
 		name := fmt.Sprintf("GROK_INTERNAL_PATTERN_%d", i)
 		p.CustomPatterns += "\n" + name + " " + pattern + "\n"
-		p.namedPatterns[i] = "%{" + name + "}"
+		p.namedPatterns = append(p.namedPatterns, "%{"+name+"}")
+	}
+
+	if len(p.namedPatterns) == 0 {
+		return fmt.Errorf("pattern required")
 	}
 
 	// Combine user-supplied CustomPatterns with DEFAULT_PATTERNS and parse
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 0b5bcb811..b986aec7d 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -117,16 +117,11 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	}
 
 	// compile log parser patterns:
-	var haveError bool
 	for _, parser := range l.parsers {
 		if err := parser.Compile(); err != nil {
-			acc.AddError(err)
-			haveError = true
+			return err
 		}
 	}
-	if haveError {
-		return nil
-	}
 
 	l.wg.Add(1)
 	go l.parser()
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index 66802da4f..b706c62d7 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -38,12 +38,8 @@ func TestGrokParseLogFilesNonExistPattern(t *testing.T) {
 	}
 
 	acc := testutil.Accumulator{}
-	logparser.Start(&acc)
-	if assert.NotEmpty(t, acc.Errors) {
-		assert.Error(t, acc.Errors[0])
-	}
-
-	logparser.Stop()
+	err := logparser.Start(&acc)
+	assert.Error(t, err)
 }
 
 func TestGrokParseLogFiles(t *testing.T) {

From f5c890cc1d13182c97516304a075f7df6e0ea658 Mon Sep 17 00:00:00 2001
From: Damien Krotkine <dams@zarb.org>
Date: Wed, 3 May 2017 20:50:08 +0200
Subject: [PATCH 0243/1302] reflect zookeeper chroot config in readme (#2759)

---
 plugins/inputs/kafka_consumer/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index ae04c9515..04c168bc7 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -15,6 +15,8 @@ from the same topic in parallel.
   topics = ["telegraf"]
   ## an array of Zookeeper connection strings
   zookeeper_peers = ["localhost:2181"]
+  ## Zookeeper Chroot
+  zookeeper_chroot = ""
   ## the name of the consumer group
   consumer_group = "telegraf_metrics_consumers"
   ## Maximum number of metrics to buffer between collection intervals

From 613de8a80dbb12a2211a878b777771fc0af143bc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 3 May 2017 11:51:49 -0700
Subject: [PATCH 0244/1302] Remove documentation in kafka_consumer for
 metric_buffer

---
 plugins/inputs/kafka_consumer/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 04c168bc7..31976788b 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -19,13 +19,10 @@ from the same topic in parallel.
   zookeeper_chroot = ""
   ## the name of the consumer group
   consumer_group = "telegraf_metrics_consumers"
-  ## Maximum number of metrics to buffer between collection intervals
-  metric_buffer = 100000
   ## Offset (must be either "oldest" or "newest")
   offset = "oldest"
 
   ## Data format to consume.
-
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md

From 8cf0dc769b3e6d913fabcbf2901e0e0dccc0813c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 3 May 2017 17:29:34 -0700
Subject: [PATCH 0245/1302] Add 1.4 section to changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50e7c6e45..f8bddb379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.4 [unreleased]
+
+### Release Notes
+### Features
+### Bugfixes
+
 ## v1.3 [unreleased]
 
 ### Release Notes

From e2983383e4657ede489337fc1a38cf393020feee Mon Sep 17 00:00:00 2001
From: ceseuron <ceseuron@gmail.com>
Date: Thu, 4 May 2017 10:47:03 -0700
Subject: [PATCH 0246/1302] Fixed sqlserver input to work with case sensitive
 server collation. (#2749)

Fixed a problem with sqlserver input where database properties are not returned by Telegraf when SQL Server has been set up with a case sensitive server-level collation.

* Added bugfix entry to CHANGELOG.md for sqlserver collation input fix.
---
 CHANGELOG.md                          |  2 ++
 plugins/inputs/sqlserver/sqlserver.go | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8bddb379..abfd968b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 ### Features
 ### Bugfixes
 
+- [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
+
 ## v1.3 [unreleased]
 
 ### Release Notes
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 1e7f92dff..ed3216258 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -843,7 +843,7 @@ FROM (SELECT DISTINCT DatabaseName FROM #Databases) AS bl
 SET @DynamicPivotQuery = N'
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -856,7 +856,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -869,7 +869,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -883,7 +883,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -896,7 +896,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -909,7 +909,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -922,7 +922,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -935,7 +935,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -948,7 +948,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)
@@ -961,7 +961,7 @@ UNION ALL
 
 SELECT measurement = Measurement, servername = REPLACE(@@SERVERNAME, ''\'', '':'')
 , type = ''Database properties''
-, ' + @ColumnName + ', total FROM
+, ' + @ColumnName + ', Total FROM
 (
 SELECT Measurement, DatabaseName, Value
 , Total = (SELECT SUM(Value) FROM #Databases WHERE Measurement = d.Measurement)

From a8cfe03ba8f929cfcfd45d554786f4993264a5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien?= <sebastien.nahelou@gmail.com>
Date: Fri, 5 May 2017 23:04:33 +0200
Subject: [PATCH 0247/1302] fix systemd path in order to add compatibility with
 SuSe (#2499)

---
 scripts/post-install.sh | 8 ++++----
 scripts/post-remove.sh  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 2baabe69a..8942e3579 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -11,7 +11,7 @@ function install_init {
 }
 
 function install_systemd {
-    cp -f $SCRIPT_DIR/telegraf.service /lib/systemd/system/telegraf.service
+    cp -f $SCRIPT_DIR/telegraf.service $1
     systemctl enable telegraf || true
     systemctl daemon-reload || true
 }
@@ -56,10 +56,10 @@ if [[ ! -d /etc/telegraf/telegraf.d ]]; then
 fi
 
 # Distribution-specific logic
-if [[ -f /etc/redhat-release ]]; then
+if [[ -f /etc/redhat-release ]] || [[ -f /etc/SuSE-release ]]; then
     # RHEL-variant logic
     if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
-        install_systemd
+        install_systemd /usr/lib/systemd/system/telegraf.service
     else
         # Assuming SysVinit
         install_init
@@ -73,7 +73,7 @@ if [[ -f /etc/redhat-release ]]; then
 elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
     if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
-        install_systemd
+        install_systemd /lib/systemd/system/telegraf.service
         systemctl restart telegraf || echo "WARNING: systemd not running."
     else
 	    # Assuming SysVinit
diff --git a/scripts/post-remove.sh b/scripts/post-remove.sh
index b66a3aa9a..b4b6f18fb 100644
--- a/scripts/post-remove.sh
+++ b/scripts/post-remove.sh
@@ -2,7 +2,7 @@
 
 function disable_systemd {
     systemctl disable telegraf
-    rm -f /lib/systemd/system/telegraf.service
+    rm -f $1
 }
 
 function disable_update_rcd {
@@ -15,14 +15,14 @@ function disable_chkconfig {
     rm -f /etc/init.d/telegraf
 }
 
-if [[ -f /etc/redhat-release ]]; then
+if [[ -f /etc/redhat-release ]] || [[ -f /etc/SuSE-release ]]; then
     # RHEL-variant logic
     if [[ "$1" = "0" ]]; then
         # InfluxDB is no longer installed, remove from init system
         rm -f /etc/default/telegraf
 
         if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
-            disable_systemd
+            disable_systemd /usr/lib/systemd/system/telegraf.service
         else
             # Assuming sysv
             disable_chkconfig
@@ -35,7 +35,7 @@ elif [[ -f /etc/debian_version ]]; then
         rm -f /etc/default/telegraf
 
         if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
-            disable_systemd
+            disable_systemd /lib/systemd/system/telegraf.service
         else
             # Assuming sysv
             # Run update-rc.d or fallback to chkconfig if not available

From 67cd1669ccf2317b3afffbae4b053146409a758c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 5 May 2017 14:29:40 -0700
Subject: [PATCH 0248/1302] Add SLES11 support to rpm package (#2768)

---
 scripts/build.py        |  7 ++++---
 scripts/init.sh         |  4 +++-
 scripts/post-install.sh | 15 ++++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index aeaa04fd3..6db34e5ac 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -636,6 +636,10 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
                     elif package_type not in ['zip', 'tar'] and static or "static_" in arch:
                         logging.info("Skipping package type '{}' for static builds.".format(package_type))
                     else:
+                        if package_type == 'rpm' and release and '~' in package_version:
+                            package_version, suffix = package_version.split('~', 1)
+                            # The ~ indicatees that this is a prerelease so we give it a leading 0.
+                            package_iteration = "0.%s" % suffix
                         fpm_command = "fpm {} --name {} -a {} -t {} --version {} --iteration {} -C {} -p {} ".format(
                             fpm_common_args,
                             name,
@@ -664,9 +668,6 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
                                 if package_type == 'rpm':
                                     # rpm's convert any dashes to underscores
                                     package_version = package_version.replace("-", "_")
-                                new_outfile = outfile.replace("{}-{}".format(package_version, package_iteration), package_version)
-                                os.rename(outfile, new_outfile)
-                                outfile = new_outfile
                             outfiles.append(os.path.join(os.getcwd(), outfile))
         logging.debug("Produced package files: {}".format(outfiles))
         return outfiles
diff --git a/scripts/init.sh b/scripts/init.sh
index 1994deb39..e05fd79ee 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -135,7 +135,9 @@ case $1 in
         fi
 
         log_success_msg "Starting the process" "$name"
-        if which start-stop-daemon > /dev/null 2>&1; then
+        if command -v startproc >/dev/null; then
+            startproc -u "$USER" -g "$GROUP" -p "$pidfile" -q -- "$daemon" -pidfile "$pidfile" -config "$config" -config-directory "$confdir" $TELEGRAF_OPTS
+        elif which start-stop-daemon > /dev/null 2>&1; then
             start-stop-daemon --chuid $USER:$GROUP --start --quiet --pidfile $pidfile --exec $daemon -- -pidfile $pidfile -config $config -config-directory $confdir $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &
         else
             su -s /bin/sh -c "nohup $daemon -pidfile $pidfile -config $config -config-directory $confdir $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &" $USER
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 8942e3579..75e760fbf 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -24,12 +24,12 @@ function install_chkconfig {
     chkconfig --add telegraf
 }
 
+if ! grep "^telegraf:" /etc/group &>/dev/null; then
+    groupadd -r telegraf
+fi
+
 if ! id telegraf &>/dev/null; then
-    if ! grep "^telegraf:" /etc/group &>/dev/null; then
-        useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf
-    else
-        useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf -g telegraf
-    fi
+    useradd -r -M telegraf -s /bin/false -d /etc/telegraf -g telegraf
 fi
 
 test -d $LOG_DIR || mkdir -p $LOG_DIR
@@ -76,7 +76,7 @@ elif [[ -f /etc/debian_version ]]; then
         install_systemd /lib/systemd/system/telegraf.service
         systemctl restart telegraf || echo "WARNING: systemd not running."
     else
-	    # Assuming SysVinit
+        # Assuming SysVinit
         install_init
         # Run update-rc.d or fallback to chkconfig if not available
         if which update-rc.d &>/dev/null; then
@@ -89,7 +89,7 @@ elif [[ -f /etc/debian_version ]]; then
 elif [[ -f /etc/os-release ]]; then
     source /etc/os-release
     if [[ $ID = "amzn" ]]; then
-	    # Amazon Linux logic
+        # Amazon Linux logic
         install_init
         # Run update-rc.d or fallback to chkconfig if not available
         if which update-rc.d &>/dev/null; then
@@ -97,5 +97,6 @@ elif [[ -f /etc/os-release ]]; then
         else
             install_chkconfig
         fi
+        /etc/init.d/telegraf restart
     fi
 fi

From 4200018a0b25ed9942a282eac7ad11d54254bc7c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 5 May 2017 14:39:56 -0700
Subject: [PATCH 0249/1302] Enable s390x builds

closes #2766
---
 scripts/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.py b/scripts/build.py
index 6db34e5ac..7e6719aff 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -85,7 +85,7 @@ targets = {
 
 supported_builds = {
     "windows": [ "amd64", "i386" ],
-    "linux": [ "amd64", "i386", "armhf", "armel", "arm64", "static_amd64" ],
+    "linux": [ "amd64", "i386", "armhf", "armel", "arm64", "static_amd64", "s390x"],
     "freebsd": [ "amd64", "i386" ]
 }
 

From de3f52b9908f13d4f04d5cc7ea364636e6e9e057 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 May 2017 11:29:26 -0700
Subject: [PATCH 0250/1302] Update cloudwatch documentation

Mention that some metrics are available only at larger intervals than 5
minutes.  Update dead links to new locations and example config.

closes #1907
---
 plugins/inputs/cloudwatch/README.md     | 25 ++++++++++++++++++-------
 plugins/inputs/cloudwatch/cloudwatch.go |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 3a3c708a2..652d517e2 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -9,8 +9,8 @@ API endpoint. In the following order the plugin will attempt to authenticate.
 1. Assumed credentials via STS if `role_arn` attribute is specified (source credentials are evaluated from subsequent rules)
 2. Explicit credentials from `access_key`, `secret_key`, and `token` attributes
 3. Shared profile from `profile` attribute
-4. [Environment Variables](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#environment-variables)
-5. [Shared Credentials](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#shared-credentials-file)
+4. [Environment Variables](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#environment-variables)
+5. [Shared Credentials](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#shared-credentials-file)
 6. [EC2 Instance Profile](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
 
 ### Configuration:
@@ -20,9 +20,24 @@ API endpoint. In the following order the plugin will attempt to authenticate.
   ## Amazon Region (required)
   region = "us-east-1"
 
+  ## Amazon Credentials
+  ## Credentials are loaded in the following order
+  ## 1) Assumed credentials via STS if role_arn is specified
+  ## 2) explicit credentials from 'access_key' and 'secret_key'
+  ## 3) shared profile from 'profile'
+  ## 4) environment variables
+  ## 5) shared credentials file
+  ## 6) EC2 Instance Profile
+  #access_key = ""
+  #secret_key = ""
+  #token = ""
+  #role_arn = ""
+  #profile = ""
+  #shared_credential_file = ""
+
   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
   # metrics are made available to the 1 minute period. Some are collected at
-  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
   # Note that if a period is configured that is smaller than the minimum for a
   # particular metric, that metric will not be returned by the Cloudwatch API
   # and will not be collected by Telegraf.
@@ -57,10 +72,6 @@ API endpoint. In the following order the plugin will attempt to authenticate.
     [[inputs.cloudwatch.metrics.dimensions]]
       name = "LoadBalancerName"
       value = "p-example"
-
-    [[inputs.cloudwatch.metrics.dimensions]]
-      name = "AvailabilityZone"
-      value = "*"
 ```
 #### Requirements and Terminology
 
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index 2e8bee671..733a17640 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -81,7 +81,7 @@ func (c *CloudWatch) SampleConfig() string {
 
   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
   # metrics are made available to the 1 minute period. Some are collected at
-  # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+  # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
   # Note that if a period is configured that is smaller than the minimum for a
   # particular metric, that metric will not be returned by the Cloudwatch API
   # and will not be collected by Telegraf.

From 1ebd1aaa4186ebbce6c4bf009bc328baa3353c16 Mon Sep 17 00:00:00 2001
From: Sylvain Boily <sylvain.boily@gmail.com>
Date: Mon, 8 May 2017 14:48:29 -0400
Subject: [PATCH 0251/1302] Systemd does not see all shutdowns as failures
 (#2716)

---
 CHANGELOG.md             | 1 +
 scripts/telegraf.service | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abfd968b9..42658c5a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bugfixes
 
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
+- [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 
 ## v1.3 [unreleased]
 
diff --git a/scripts/telegraf.service b/scripts/telegraf.service
index 72a4a338e..cbbdc872d 100644
--- a/scripts/telegraf.service
+++ b/scripts/telegraf.service
@@ -9,6 +9,7 @@ User=telegraf
 ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS}
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
+RestartForceExitStatus=SIGPIPE
 KillMode=control-group
 
 [Install]

From 5af985ef5f0824220e04ac47c100f288e4ec54f1 Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Mon, 8 May 2017 15:20:24 -0700
Subject: [PATCH 0252/1302] Add support for self-signed certs to InfluxDB input
 plugin (#2773)

---
 CHANGELOG.md                        |  3 +++
 plugins/inputs/influxdb/README.md   | 10 ++++++++++
 plugins/inputs/influxdb/influxdb.go | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42658c5a7..55baaccef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ### Release Notes
 ### Features
+
+- [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
+
 ### Bugfixes
 
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
diff --git a/plugins/inputs/influxdb/README.md b/plugins/inputs/influxdb/README.md
index c983e9749..13c932ca9 100644
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -19,6 +19,16 @@ InfluxDB-formatted endpoints. See below for more information.
   urls = [
     "http://localhost:8086/debug/vars"
   ]
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## http request & header timeout
+  timeout = "5s"
 ```
 
 ### Measurements & Fields
diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go
index fc84d7c92..811f4ce56 100644
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -15,6 +15,14 @@ import (
 
 type InfluxDB struct {
 	URLs []string `toml:"urls"`
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
 
 	Timeout internal.Duration
 
@@ -37,6 +45,13 @@ func (*InfluxDB) SampleConfig() string {
     "http://localhost:8086/debug/vars"
   ]
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## http request & header timeout
   timeout = "5s"
 `
@@ -48,9 +63,15 @@ func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
 	}
 
 	if i.client == nil {
+		tlsCfg, err := internal.GetTLSConfig(
+			i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
+		if err != nil {
+			return err
+		}
 		i.client = &http.Client{
 			Transport: &http.Transport{
 				ResponseHeaderTimeout: i.Timeout.Duration,
+				TLSClientConfig:       tlsCfg,
 			},
 			Timeout: i.Timeout.Duration,
 		}

From 8124cfa3ed82f38c2ba123bf77ffd1e8268d9358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= <adrian.adek@gmail.com>
Date: Tue, 9 May 2017 21:58:43 +0200
Subject: [PATCH 0253/1302] Improve PostgreSQL plugin documentation (#2777)

---
 plugins/inputs/postgresql_extensible/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/postgresql_extensible/README.md b/plugins/inputs/postgresql_extensible/README.md
index ab5222955..d388843ce 100644
--- a/plugins/inputs/postgresql_extensible/README.md
+++ b/plugins/inputs/postgresql_extensible/README.md
@@ -130,9 +130,9 @@ create extension pg_proctab;
  - pg_stat_kcache is available on the postgresql.org yum repo
  - pg_proctab is available at : https://github.com/markwkm/pg_proctab
 
- ##Views
+ ## Views
  - Blocking sessions
-```
+```sql
 CREATE OR REPLACE VIEW public.blocking_procs AS
  SELECT a.datname AS db,
     kl.pid AS blocking_pid,
@@ -156,7 +156,7 @@ CREATE OR REPLACE VIEW public.blocking_procs AS
   ORDER BY a.query_start;
 ```
   - Sessions Statistics
-```
+```sql
 CREATE OR REPLACE VIEW public.sessions AS
  WITH proctab AS (
          SELECT pg_proctab.pid,

From cd0ec0185a9e466724b25d126d9bd302dacf5654 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 May 2017 13:44:34 -0700
Subject: [PATCH 0254/1302] Update contributing section

Hoping this will encourage more non-plugin contributions.
---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2dc6997d6..84d7b11ef 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,15 @@ For more information on Processor and Aggregator plugins please [read this](./do
 New plugins are designed to be easy to contribute,
 we'll eagerly accept pull
 requests and will manage the set of plugins that Telegraf supports.
-See the [contributing guide](CONTRIBUTING.md) for instructions on writing
-new plugins.
+
+## Contributing
+
+There are many ways to contribute:
+- Fix and [report bugs](https://github.com/influxdata/telegraf/issues/new)
+- [Improve documentation](https://github.com/influxdata/telegraf/issues?q=is%3Aopen+label%3Adocumentation)
+- [Review code and feature proposals](https://github.com/influxdata/telegraf/pulls)
+- Answer questions on github and on the [Community Site](https://community.influxdata.com/)
+- [Contribute plugins](CONTRIBUTING.md)
 
 ## Installation:
 
@@ -240,9 +247,3 @@ formats may be used with input plugins supporting the `data_format` option:
 * [socket_writer](./plugins/outputs/socket_writer)
 * [tcp](./plugins/outputs/socket_writer)
 * [udp](./plugins/outputs/socket_writer)
-
-## Contributing
-
-Please see the
-[contributing guide](CONTRIBUTING.md)
-for details on contributing a plugin to Telegraf.

From 018fd5ce5b82b8ea650825b3b143a25a9c1eb71f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 May 2017 13:45:27 -0700
Subject: [PATCH 0255/1302] Add missing plugins to README

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 84d7b11ef..2c7d40b28 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,7 @@ configuration options.
 * [couchbase](./plugins/inputs/couchbase)
 * [couchdb](./plugins/inputs/couchdb)
 * [disque](./plugins/inputs/disque)
+* [dmcache](./plugins/inputs/dmcache)
 * [dns query time](./plugins/inputs/dns_query)
 * [docker](./plugins/inputs/docker)
 * [dovecot](./plugins/inputs/dovecot)
@@ -134,6 +135,7 @@ configuration options.
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
 * [jolokia](./plugins/inputs/jolokia)
+* [kapacitor](./plugins/inputs/kapacitor)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
 * [lustre2](./plugins/inputs/lustre2)
@@ -202,6 +204,7 @@ Telegraf can also collect metrics via the following service plugins:
   * [github](./plugins/inputs/webhooks/github)
   * [mandrill](./plugins/inputs/webhooks/mandrill)
   * [rollbar](./plugins/inputs/webhooks/rollbar)
+  * [papertrail](./plugins/inputs/webhooks/papertrail)
 
 Telegraf is able to parse the following input data formats into metrics, these
 formats may be used with input plugins supporting the `data_format` option:

From e7ad2d04636ec3ab44b6ccf17fee3e67aaddd4a2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 May 2017 16:19:56 -0700
Subject: [PATCH 0256/1302] Fix apache input creation of transport on every
 gather.

---
 plugins/inputs/apache/apache.go | 45 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index b50860cfb..1cf223e24 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -29,6 +29,8 @@ type Apache struct {
 	SSLKey string `toml:"ssl_key"`
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
+
+	client *http.Client
 }
 
 var sampleConfig = `
@@ -66,6 +68,14 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 		n.ResponseTimeout.Duration = time.Second * 5
 	}
 
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
 	var wg sync.WaitGroup
 	wg.Add(len(n.Urls))
 	for _, u := range n.Urls {
@@ -85,31 +95,24 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
-
-	var tr *http.Transport
-
-	if addr.Scheme == "https" {
-		tlsCfg, err := internal.GetTLSConfig(
-			n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
-		if err != nil {
-			return err
-		}
-		tr = &http.Transport{
-			ResponseHeaderTimeout: time.Duration(3 * time.Second),
-			TLSClientConfig:       tlsCfg,
-		}
-	} else {
-		tr = &http.Transport{
-			ResponseHeaderTimeout: time.Duration(3 * time.Second),
-		}
+func (n *Apache) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
 	}
 
 	client := &http.Client{
-		Transport: tr,
-		Timeout:   n.ResponseTimeout.Duration,
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: n.ResponseTimeout.Duration,
 	}
 
+	return client, nil
+}
+
+func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 	req, err := http.NewRequest("GET", addr.String(), nil)
 	if err != nil {
 		return fmt.Errorf("error on new request to %s : %s\n", addr.String(), err)
@@ -119,7 +122,7 @@ func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 		req.SetBasicAuth(n.Username, n.Password)
 	}
 
-	resp, err := client.Do(req)
+	resp, err := n.client.Do(req)
 	if err != nil {
 		return fmt.Errorf("error on request to %s : %s\n", addr.String(), err)
 	}

From b88eb0f59d97d9786996494a3f94cc3b2aa22727 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 May 2017 16:20:43 -0700
Subject: [PATCH 0257/1302] Fix prometheus input creation of transport on every
 gather

---
 plugins/inputs/prometheus/prometheus.go | 48 +++++++++++++++----------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 2e613e2c0..73e202d7a 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"sync"
 	"time"
@@ -32,6 +31,8 @@ type Prometheus struct {
 	SSLKey string `toml:"ssl_key"`
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
+
+	client *http.Client
 }
 
 var sampleConfig = `
@@ -65,6 +66,14 @@ var ErrProtocolError = errors.New("prometheus protocol error")
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
 func (p *Prometheus) Gather(acc telegraf.Accumulator) error {
+	if p.client == nil {
+		client, err := p.createHttpClient()
+		if err != nil {
+			return err
+		}
+		p.client = client
+	}
+
 	var wg sync.WaitGroup
 
 	for _, serv := range p.Urls {
@@ -89,29 +98,30 @@ var client = &http.Client{
 	Timeout:   time.Duration(4 * time.Second),
 }
 
+func (p *Prometheus) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		p.SSLCert, p.SSLKey, p.SSLCA, p.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig:   tlsCfg,
+			DisableKeepAlives: true,
+		},
+		Timeout: p.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
 func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 	var req, err = http.NewRequest("GET", url, nil)
 	req.Header.Add("Accept", acceptHeader)
 	var token []byte
 	var resp *http.Response
 
-	tlsCfg, err := internal.GetTLSConfig(
-		p.SSLCert, p.SSLKey, p.SSLCA, p.InsecureSkipVerify)
-	if err != nil {
-		return err
-	}
-
-	var rt http.RoundTripper = &http.Transport{
-		Dial: (&net.Dialer{
-			Timeout:   5 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).Dial,
-		TLSHandshakeTimeout:   5 * time.Second,
-		TLSClientConfig:       tlsCfg,
-		ResponseHeaderTimeout: p.ResponseTimeout.Duration,
-		DisableKeepAlives:     true,
-	}
-
 	if p.BearerToken != "" {
 		token, err = ioutil.ReadFile(p.BearerToken)
 		if err != nil {
@@ -120,7 +130,7 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 		req.Header.Set("Authorization", "Bearer "+string(token))
 	}
 
-	resp, err = rt.RoundTrip(req)
+	resp, err = p.client.Do(req)
 	if err != nil {
 		return fmt.Errorf("error making HTTP request to %s: %s", url, err)
 	}

From 1931aac284e55d021465a21425165b88a68674f1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 May 2017 16:21:04 -0700
Subject: [PATCH 0258/1302] Fix http_response input creation of transport on
 every gather

---
 plugins/inputs/http_response/http_response.go |  34 ++--
 .../http_response/http_response_test.go       | 164 +++++++++++-------
 testutil/accumulator.go                       |  50 ++++++
 3 files changed, 166 insertions(+), 82 deletions(-)

diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 111e35518..7dd043043 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -25,7 +25,6 @@ type HTTPResponse struct {
 	Headers             map[string]string
 	FollowRedirects     bool
 	ResponseStringMatch string
-	compiledStringMatch *regexp.Regexp
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -35,6 +34,9 @@ type HTTPResponse struct {
 	SSLKey string `toml:"ssl_key"`
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
+
+	compiledStringMatch *regexp.Regexp
+	client              *http.Client
 }
 
 // Description returns the plugin Description
@@ -88,13 +90,11 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	tr := &http.Transport{
-		ResponseHeaderTimeout: h.ResponseTimeout.Duration,
-		TLSClientConfig:       tlsCfg,
-	}
 	client := &http.Client{
-		Transport: tr,
-		Timeout:   h.ResponseTimeout.Duration,
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: h.ResponseTimeout.Duration,
 	}
 
 	if h.FollowRedirects == false {
@@ -106,15 +106,10 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 }
 
 // HTTPGather gathers all fields and returns any errors it encounters
-func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
+func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 	// Prepare fields
 	fields := make(map[string]interface{})
 
-	client, err := h.createHttpClient()
-	if err != nil {
-		return nil, err
-	}
-
 	var body io.Reader
 	if h.Body != "" {
 		body = strings.NewReader(h.Body)
@@ -133,7 +128,7 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 
 	// Start Timer
 	start := time.Now()
-	resp, err := client.Do(request)
+	resp, err := h.client.Do(request)
 	if err != nil {
 		if h.FollowRedirects {
 			return nil, err
@@ -202,8 +197,17 @@ func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	// Prepare data
 	tags := map[string]string{"server": h.Address, "method": h.Method}
 	var fields map[string]interface{}
+
+	if h.client == nil {
+		client, err := h.createHttpClient()
+		if err != nil {
+			return err
+		}
+		h.client = client
+	}
+
 	// Gather data
-	fields, err = h.HTTPGather()
+	fields, err = h.httpGather()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index b65b1f954..babb23dab 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -73,13 +74,13 @@ func TestHeaders(t *testing.T) {
 			"Host":         "Hello",
 		},
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.NotNil(t, fields["response_time"])
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 }
 
 func TestFields(t *testing.T) {
@@ -97,13 +98,14 @@ func TestFields(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.NotNil(t, fields["response_time"])
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 }
 
 func TestRedirects(t *testing.T) {
@@ -121,12 +123,13 @@ func TestRedirects(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/badredirect",
@@ -138,8 +141,12 @@ func TestRedirects(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err = h.HTTPGather()
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
 	require.Error(t, err)
+
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.False(t, ok)
 }
 
 func TestMethod(t *testing.T) {
@@ -157,12 +164,13 @@ func TestMethod(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/mustbepostmethod",
@@ -174,12 +182,13 @@ func TestMethod(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err = h.HTTPGather()
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusMethodNotAllowed, fields["http_response_code"])
-	}
+
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusMethodNotAllowed, value)
 
 	//check that lowercase methods work correctly
 	h = &HTTPResponse{
@@ -192,12 +201,13 @@ func TestMethod(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err = h.HTTPGather()
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusMethodNotAllowed, fields["http_response_code"])
-	}
+
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusMethodNotAllowed, value)
 }
 
 func TestBody(t *testing.T) {
@@ -215,12 +225,13 @@ func TestBody(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/musthaveabody",
@@ -231,12 +242,13 @@ func TestBody(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err = h.HTTPGather()
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusBadRequest, fields["http_response_code"])
-	}
+
+	value, ok = acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusBadRequest, value)
 }
 
 func TestStringMatch(t *testing.T) {
@@ -255,15 +267,18 @@ func TestStringMatch(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.Equal(t, 1, fields["response_string_match"])
-	assert.NotNil(t, fields["response_time"])
 
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 1, value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }
 
 func TestStringMatchJson(t *testing.T) {
@@ -282,15 +297,18 @@ func TestStringMatchJson(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
 	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.Equal(t, 1, fields["response_string_match"])
-	assert.NotNil(t, fields["response_time"])
 
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 1, value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }
 
 func TestStringMatchFail(t *testing.T) {
@@ -309,18 +327,26 @@ func TestStringMatchFail(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	fields, err := h.HTTPGather()
-	require.NoError(t, err)
-	assert.NotEmpty(t, fields)
-	if assert.NotNil(t, fields["http_response_code"]) {
-		assert.Equal(t, http.StatusOK, fields["http_response_code"])
-	}
-	assert.Equal(t, 0, fields["response_string_match"])
-	assert.NotNil(t, fields["response_time"])
 
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
+	require.NoError(t, err)
+
+	value, ok := acc.IntField("http_response", "http_response_code")
+	require.True(t, ok)
+	require.Equal(t, http.StatusOK, value)
+	value, ok = acc.IntField("http_response", "response_string_match")
+	require.True(t, ok)
+	require.Equal(t, 0, value)
+	_, ok = acc.FloatField("http_response", "response_time")
+	require.True(t, ok)
 }
 
 func TestTimeout(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test with sleep in short mode.")
+	}
+
 	mux := setUpTestMux()
 	ts := httptest.NewServer(mux)
 	defer ts.Close()
@@ -335,6 +361,10 @@ func TestTimeout(t *testing.T) {
 		},
 		FollowRedirects: true,
 	}
-	_, err := h.HTTPGather()
-	require.Error(t, err)
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
+	require.NoError(t, err)
+
+	ok := acc.HasIntField("http_response", "http_response_code")
+	require.False(t, ok)
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 2ff5bc667..c0f2caf22 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -417,3 +417,53 @@ func (a *Accumulator) HasMeasurement(measurement string) bool {
 	}
 	return false
 }
+
+func (a *Accumulator) IntField(measurement string, field string) (int, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(int)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return 0, false
+}
+
+func (a *Accumulator) FloatField(measurement string, field string) (float64, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(float64)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return 0.0, false
+}
+
+func (a *Accumulator) StringField(measurement string, field string) (string, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(string)
+					return v, ok
+				}
+			}
+		}
+	}
+	return "", false
+}

From a1446a60f7da79ee3f4ccf05fbf56372f0a79744 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 10 May 2017 13:11:33 -0700
Subject: [PATCH 0259/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55baaccef..9184bf4d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
+- [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 
 ## v1.3 [unreleased]
 

From 17d883c60219031b869aa79057f613a9678f162f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 10 May 2017 14:40:55 -0700
Subject: [PATCH 0260/1302] Ensure keep-alive is not used in http_response
 input.

Using Keep-Alive would change the timing for already established
connections.  Previous to this commit, Keep-Alive worked only when using
a response_string_match due to failure to close the request body.
---
 plugins/inputs/http_response/http_response.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 7dd043043..cd3d735d2 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -92,7 +92,8 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	}
 	client := &http.Client{
 		Transport: &http.Transport{
-			TLSClientConfig: tlsCfg,
+			DisableKeepAlives: true,
+			TLSClientConfig:   tlsCfg,
 		},
 		Timeout: h.ResponseTimeout.Duration,
 	}
@@ -140,6 +141,11 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 			return nil, err
 		}
 	}
+	defer func() {
+		io.Copy(ioutil.Discard, resp.Body)
+		resp.Body.Close()
+	}()
+
 	fields["response_time"] = time.Since(start).Seconds()
 	fields["http_response_code"] = resp.StatusCode
 

From f74687dcc0ceb128027414c7099f7c70df86d1ad Mon Sep 17 00:00:00 2001
From: Sebastian Borza <sebito91@gmail.com>
Date: Fri, 12 May 2017 16:42:18 -0500
Subject: [PATCH 0261/1302] split metrics based on UDPPayload size (#2795)

---
 plugins/outputs/influxdb/client/udp.go | 10 +++++++---
 plugins/outputs/influxdb/influxdb.go   | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/plugins/outputs/influxdb/client/udp.go b/plugins/outputs/influxdb/client/udp.go
index d542ecf63..89d6894a1 100644
--- a/plugins/outputs/influxdb/client/udp.go
+++ b/plugins/outputs/influxdb/client/udp.go
@@ -25,6 +25,7 @@ type UDPConfig struct {
 	PayloadSize int
 }
 
+// NewUDP will return an instance of the telegraf UDP output plugin for influxdb
 func NewUDP(config UDPConfig) (Client, error) {
 	p, err := url.Parse(config.URL)
 	if err != nil {
@@ -55,20 +56,22 @@ type udpClient struct {
 	buffer []byte
 }
 
+// Query will send the provided query command to the client, returning an error if any issues arise
 func (c *udpClient) Query(command string) error {
 	return nil
 }
 
+// Write will send the byte stream to the given UDP client endpoint
 func (c *udpClient) Write(b []byte) (int, error) {
 	return c.WriteStream(bytes.NewReader(b), -1)
 }
 
-// write params are ignored by the UDP client
+// WriteWithParams are ignored by the UDP client, will forward to WriteStream
 func (c *udpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
 	return c.WriteStream(bytes.NewReader(b), -1)
 }
 
-// contentLength is ignored by the UDP client.
+// WriteStream will send the provided data through to the client, contentLength is ignored by the UDP client
 func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 	var totaln int
 	for {
@@ -88,12 +91,13 @@ func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 	return totaln, nil
 }
 
-// contentLength is ignored by the UDP client.
+// WriteStreamWithParams will forward the stream to the client backend, contentLength is ignored by the UDP client
 // write params are ignored by the UDP client
 func (c *udpClient) WriteStreamWithParams(r io.Reader, contentLength int, wp WriteParams) (int, error) {
 	return c.WriteStream(r, -1)
 }
 
+// Close will terminate the provided client connection
 func (c *udpClient) Close() error {
 	return c.conn.Close()
 }
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 2dac7a00a..d127d3fb4 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
 )
 
+// InfluxDB struct is the primary data structure for the plugin
 type InfluxDB struct {
 	// URL is only for backwards compatability
 	URL              string
@@ -79,11 +80,10 @@ var sampleConfig = `
   # insecure_skip_verify = false
 `
 
+// Connect initiates the primary connection to the range of provided URLs
 func (i *InfluxDB) Connect() error {
 	var urls []string
-	for _, u := range i.URLs {
-		urls = append(urls, u)
-	}
+	urls = append(urls, i.URLs...)
 
 	// Backward-compatability with single Influx URL config files
 	// This could eventually be removed in favor of specifying the urls as a list
@@ -144,26 +144,32 @@ func (i *InfluxDB) Connect() error {
 	return nil
 }
 
+// Close will terminate the session to the backend, returning error if an issue arises
 func (i *InfluxDB) Close() error {
 	return nil
 }
 
+// SampleConfig returns the formatted sample configuration for the plugin
 func (i *InfluxDB) SampleConfig() string {
 	return sampleConfig
 }
 
+// Description returns the human-readable function definition of the plugin
 func (i *InfluxDB) Description() string {
 	return "Configuration for influxdb server to send metrics to"
 }
 
-// Choose a random server in the cluster to write to until a successful write
+// Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	bufsize := 0
+	splitData := make([]telegraf.Metric, 0)
+
 	for _, m := range metrics {
 		bufsize += m.Len()
+		splitData = append(splitData, m.Split(i.UDPPayload)...)
 	}
-	r := metric.NewReader(metrics)
+	r := metric.NewReader(splitData)
 
 	// This will get set to nil if a successful write occurs
 	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")

From dd537b33826d70ca0c9f34bddaa3736f916a83be Mon Sep 17 00:00:00 2001
From: Zack Zatkin-Gold <zg@zk.gd>
Date: Fri, 12 May 2017 15:22:29 -0700
Subject: [PATCH 0262/1302] Fix telegraf example arguments (#2788)

Many of the examples provided within documentation are using a single
dash for the command line arguments, but the telegraf executable
explicitly has two dashes.

There are also some inconsistencies with the ordering of the command
line argument examples.  I've ordered them so that the examples will
show: config, config-directory, input-filter, test
---
 plugins/inputs/EXAMPLE_README.md              | 2 +-
 plugins/inputs/bcache/README.md               | 2 +-
 plugins/inputs/ceph/README.md                 | 2 +-
 plugins/inputs/chrony/README.md               | 2 +-
 plugins/inputs/cloudwatch/README.md           | 2 +-
 plugins/inputs/conntrack/README.md            | 2 +-
 plugins/inputs/consul/README.md               | 2 +-
 plugins/inputs/couchbase/README.md            | 2 +-
 plugins/inputs/couchdb/README.md              | 2 +-
 plugins/inputs/dns_query/README.md            | 2 +-
 plugins/inputs/docker/README.md               | 2 +-
 plugins/inputs/dovecot/README.md              | 4 ++--
 plugins/inputs/filestat/README.md             | 2 +-
 plugins/inputs/http_response/README.md        | 2 +-
 plugins/inputs/influxdb/README.md             | 2 +-
 plugins/inputs/interrupts/README.md           | 2 +-
 plugins/inputs/iptables/README.md             | 2 +-
 plugins/inputs/kapacitor/README.md            | 2 +-
 plugins/inputs/memcached/README.md            | 2 +-
 plugins/inputs/mesos/README.md                | 2 +-
 plugins/inputs/net_response/README.md         | 2 +-
 plugins/inputs/nginx/README.md                | 2 +-
 plugins/inputs/ntpq/README.md                 | 2 +-
 plugins/inputs/passenger/README.md            | 2 +-
 plugins/inputs/phpfpm/README.md               | 2 +-
 plugins/inputs/ping/README.md                 | 2 +-
 plugins/inputs/powerdns/README.md             | 2 +-
 plugins/inputs/prometheus/README.md           | 2 +-
 plugins/inputs/puppetagent/README.md          | 4 ++--
 plugins/inputs/raindrops/README.md            | 2 +-
 plugins/inputs/redis/README.md                | 2 +-
 plugins/inputs/riak/README.md                 | 2 +-
 plugins/inputs/sensors/README.md              | 2 +-
 plugins/inputs/sqlserver/README.md            | 2 +-
 plugins/inputs/sysstat/README.md              | 2 +-
 plugins/inputs/system/DISK_README.md          | 2 +-
 plugins/inputs/system/KERNEL_README.md        | 2 +-
 plugins/inputs/system/KERNEL_VMSTAT_README.md | 2 +-
 plugins/inputs/system/NET_README.md           | 4 ++--
 plugins/inputs/system/PROCESSES_README.md     | 2 +-
 plugins/inputs/system/SYSTEM_README.md        | 2 +-
 plugins/inputs/varnish/README.md              | 2 +-
 plugins/inputs/zfs/README.md                  | 2 +-
 43 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/plugins/inputs/EXAMPLE_README.md b/plugins/inputs/EXAMPLE_README.md
index 5d806f72d..04213cff7 100644
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -45,7 +45,7 @@ SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar A
 ### Example Output:
 
 ```
-$ telegraf -input-filter example -test
+$ telegraf --input-filter example --test
 measurement1,tag1=foo,tag2=bar field1=1i,field2=2.1 1453831884664956455
 measurement2,tag1=foo,tag2=bar,tag3=baz field3=1i 1453831884664956455
 ```
diff --git a/plugins/inputs/bcache/README.md b/plugins/inputs/bcache/README.md
index 98a841bf5..bda8b0257 100644
--- a/plugins/inputs/bcache/README.md
+++ b/plugins/inputs/bcache/README.md
@@ -70,7 +70,7 @@ Using this configuration:
 When run with:
 
 ```
-./telegraf -config telegraf.conf -input-filter bcache -test
+./telegraf --config telegraf.conf --input-filter bcache --test
 ```
 
 It produces:
diff --git a/plugins/inputs/ceph/README.md b/plugins/inputs/ceph/README.md
index 771ec665b..8d04c54b2 100644
--- a/plugins/inputs/ceph/README.md
+++ b/plugins/inputs/ceph/README.md
@@ -200,7 +200,7 @@ All measurements will have the following tags:
 *Admin Socket Stats*
 
 <pre>
-telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d  -input-filter ceph
+telegraf --config /etc/telegraf/telegraf.conf --config-directory /etc/telegraf/telegraf.d --input-filter ceph --test
 * Plugin: ceph, Collection 1
 > ceph,collection=paxos, id=node-2,role=openstack,type=mon accept_timeout=0,begin=14931264,begin_bytes.avgcount=14931264,begin_bytes.sum=180309683362,begin_keys.avgcount=0,begin_keys.sum=0,begin_latency.avgcount=14931264,begin_latency.sum=9293.29589,collect=1,collect_bytes.avgcount=1,collect_bytes.sum=24,collect_keys.avgcount=1,collect_keys.sum=1,collect_latency.avgcount=1,collect_latency.sum=0.00028,collect_timeout=0,collect_uncommitted=0,commit=14931264,commit_bytes.avgcount=0,commit_bytes.sum=0,commit_keys.avgcount=0,commit_keys.sum=0,commit_latency.avgcount=0,commit_latency.sum=0,lease_ack_timeout=0,lease_timeout=0,new_pn=0,new_pn_latency.avgcount=0,new_pn_latency.sum=0,refresh=14931264,refresh_latency.avgcount=14931264,refresh_latency.sum=8706.98498,restart=4,share_state=0,share_state_bytes.avgcount=0,share_state_bytes.sum=0,share_state_keys.avgcount=0,share_state_keys.sum=0,start_leader=0,start_peon=1,store_state=14931264,store_state_bytes.avgcount=14931264,store_state_bytes.sum=353119959211,store_state_keys.avgcount=14931264,store_state_keys.sum=289807523,store_state_latency.avgcount=14931264,store_state_latency.sum=10952.835724 1462821234814535148
 > ceph,collection=throttle-mon_client_bytes,id=node-2,type=mon get=1413017,get_or_fail_fail=0,get_or_fail_success=0,get_sum=71211705,max=104857600,put=1413013,put_sum=71211459,take=0,take_sum=0,val=246,wait.avgcount=0,wait.sum=0 1462821234814737219
diff --git a/plugins/inputs/chrony/README.md b/plugins/inputs/chrony/README.md
index 43eb77757..2a810f521 100644
--- a/plugins/inputs/chrony/README.md
+++ b/plugins/inputs/chrony/README.md
@@ -82,7 +82,7 @@ Delete second or Not synchronised.
 ### Example Output:
 
 ```
-$ telegraf -config telegraf.conf -input-filter chrony -test
+$ telegraf --config telegraf.conf --input-filter chrony --test
 * Plugin: chrony, Collection 1
 > chrony,leap_status=normal,reference_id=192.168.1.1,stratum=3 frequency=-35.657,last_offset=-0.000013616,residual_freq=-0,rms_offset=0.000027073,root_delay=0.000644,root_dispersion=0.003444,skew=0.001,update_interval=1031.2 1463750789687639161
 ```
diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 652d517e2..83b4b1de0 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -145,6 +145,6 @@ Tag Dimension names are represented in [snake case](https://en.wikipedia.org/wik
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter cloudwatch -test
+$ ./telegraf --config telegraf.conf --input-filter cloudwatch --test
 > cloudwatch_aws_elb,load_balancer_name=p-example,region=us-east-1,unit=seconds latency_average=0.004810798017284538,latency_maximum=0.1100282669067383,latency_minimum=0.0006084442138671875,latency_sample_count=4029,latency_sum=19.382705211639404 1459542420000000000
 ```
diff --git a/plugins/inputs/conntrack/README.md b/plugins/inputs/conntrack/README.md
index dff20337e..0eae4b3c3 100644
--- a/plugins/inputs/conntrack/README.md
+++ b/plugins/inputs/conntrack/README.md
@@ -51,6 +51,6 @@ This input does not use tags.
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter conntrack -test
+$ ./telegraf --config telegraf.conf --input-filter conntrack --test
 conntrack,host=myhost ip_conntrack_count=2,ip_conntrack_max=262144 1461620427667995735
 ```
diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index dbb576421..8241bae47 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -46,7 +46,7 @@ the health check at this sample.
 ## Example output
 
 ```
-$ telegraf --config ./telegraf.conf -input-filter consul -test
+$ telegraf --config ./telegraf.conf --input-filter consul --test
 * Plugin: consul, Collection 1
 > consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
 > consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
diff --git a/plugins/inputs/couchbase/README.md b/plugins/inputs/couchbase/README.md
index 6d654a0e2..ffe913f58 100644
--- a/plugins/inputs/couchbase/README.md
+++ b/plugins/inputs/couchbase/README.md
@@ -48,7 +48,7 @@ Fields:
 ## Example output
 
 ```
-$ telegraf -config telegraf.conf -input-filter couchbase -test
+$ telegraf --config telegraf.conf --input-filter couchbase --test
 * Plugin: couchbase, Collection 1
 > couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.10.187:8091 memory_free=22927384576,memory_total=64424656896 1458381183695864929
 > couchbase_node,cluster=https://couchbase-0.example.com/,hostname=172.16.10.65:8091 memory_free=23520161792,memory_total=64424656896 1458381183695972112
diff --git a/plugins/inputs/couchdb/README.md b/plugins/inputs/couchdb/README.md
index 313b57011..686914583 100644
--- a/plugins/inputs/couchdb/README.md
+++ b/plugins/inputs/couchdb/README.md
@@ -63,7 +63,7 @@ httpd statistics:
 ### Example output:
 
 ```
-➜  telegraf git:(master) ✗ ./telegraf -config ./config.conf  -input-filter couchdb -test
+➜  telegraf git:(master) ✗ ./telegraf --config ./config.conf  --input-filter couchdb --test
 * Plugin: couchdb,
  Collection 1
 > couchdb,server=http://localhost:5984/_stats couchdb_auth_cache_hits_current=0,
diff --git a/plugins/inputs/dns_query/README.md b/plugins/inputs/dns_query/README.md
index 34b285c37..033261441 100644
--- a/plugins/inputs/dns_query/README.md
+++ b/plugins/inputs/dns_query/README.md
@@ -46,6 +46,6 @@ For querying more than one record type make:
 ### Example output:
 
 ```
-./telegraf -config telegraf.conf -test -input-filter dns_query -test
+./telegraf --config telegraf.conf --input-filter dns_query --test
 > dns_query,domain=mjasion.pl,record_type=A,server=8.8.8.8 query_time_ms=67.189842 1456082743585760680
 ```
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 849450b33..c6b14bdc2 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -167,7 +167,7 @@ based on the availability of per-cpu stats on your system.
 ### Example Output:
 
 ```
-% ./telegraf -config ~/ws/telegraf.conf -input-filter docker -test
+% ./telegraf --config ~/ws/telegraf.conf --input-filter docker --test
 * Plugin: docker, Collection 1
 > docker n_cpus=8i 1456926671065383978
 > docker n_used_file_descriptors=15i 1456926671065383978
diff --git a/plugins/inputs/dovecot/README.md b/plugins/inputs/dovecot/README.md
index 865e24490..0611ce098 100644
--- a/plugins/inputs/dovecot/README.md
+++ b/plugins/inputs/dovecot/README.md
@@ -62,7 +62,7 @@ domains. You can read Dovecot's documentation
 ### Example Output:
 
 ```
-telegraf -config t.cfg -input-filter dovecot -test
+telegraf --config t.cfg --input-filter dovecot --test
 * Plugin: dovecot, Collection 1
 > dovecot,ip=192.168.0.1,server=dovecot-1.domain.test,type=ip clock_time=0,disk_input=0i,disk_output=0i,invol_cs=0i,last_update="2016-04-08 10:59:47.000208479 +0200 CEST",mail_cache_hits=0i,mail_lookup_attr=0i,mail_lookup_path=0i,mail_read_bytes=0i,mail_read_count=0i,maj_faults=0i,min_faults=0i,num_cmds=12i,num_connected_sessions=0i,num_logins=6i,read_bytes=0i,read_count=0i,reset_timestamp="2016-04-08 10:33:34 +0200 CEST",sys_cpu=0,user_cpu=0,vol_cs=0i,write_bytes=0i,write_count=0i 1460106251633824223
 * Plugin: dovecot, Collection 1
@@ -71,4 +71,4 @@ telegraf -config t.cfg -input-filter dovecot -test
 > dovecot,domain=domain.test,server=dovecot-1.domain.test,type=domain clock_time=100896189179847.7,disk_input=6467588263936i,disk_output=17933680439296i,invol_cs=1194808498i,last_update="2016-04-08 11:04:08.000377367 +0200 CEST",mail_cache_hits=46455781i,mail_lookup_attr=0i,mail_lookup_path=571490i,mail_read_bytes=79287033067i,mail_read_count=491243i,maj_faults=16992i,min_faults=1278442541i,num_cmds=606005i,num_connected_sessions=6597i,num_logins=166381i,read_bytes=30231409780721i,read_count=1624912080i,reset_timestamp="2016-04-08 10:28:45 +0200 CEST",sys_cpu=156440.372,user_cpu=216676.476,vol_cs=2749291157i,write_bytes=17097106707594i,write_count=944448998i 1460106261639672622
 * Plugin: dovecot, Collection 1
 > dovecot,server=dovecot-1.domain.test,type=global clock_time=101196971074203.94,disk_input=6493168218112i,disk_output=17978638815232i,invol_cs=1198855447i,last_update="2016-04-08 11:04:13.000379245 +0200 CEST",mail_cache_hits=68192209i,mail_lookup_attr=0i,mail_lookup_path=653861i,mail_read_bytes=86705151847i,mail_read_count=566125i,maj_faults=17208i,min_faults=1286179702i,num_cmds=917469i,num_connected_sessions=8896i,num_logins=174827i,read_bytes=30327690466186i,read_count=1772396430i,reset_timestamp="2016-04-08 10:28:45 +0200 CEST",sys_cpu=157965.692,user_cpu=219337.48,vol_cs=2827615787i,write_bytes=17150837661940i,write_count=992653220i 1460106266642153907
-```
\ No newline at end of file
+```
diff --git a/plugins/inputs/filestat/README.md b/plugins/inputs/filestat/README.md
index bfa51011c..2cb0136ec 100644
--- a/plugins/inputs/filestat/README.md
+++ b/plugins/inputs/filestat/README.md
@@ -30,7 +30,7 @@ The filestat plugin gathers metrics about file existence, size, and other stats.
 ### Example Output:
 
 ```
-$ telegraf -config /etc/telegraf/telegraf.conf -input-filter filestat -test
+$ telegraf --config /etc/telegraf/telegraf.conf --input-filter filestat --test
 * Plugin: filestat, Collection 1
 > filestat,file=/tmp/foo/bar,host=tyrion exists=0i 1461203374493128216
 > filestat,file=/Users/sparrc/ws/telegraf.conf,host=tyrion exists=1i,size=47894i 1461203374493199335
diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 01dd09536..3f4e62d94 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -51,6 +51,6 @@ This input plugin will test HTTP/HTTPS connections.
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter http_response -test
+$ ./telegraf --config telegraf.conf --input-filter http_response --test
 http_response,method=GET,server=http://www.github.com http_response_code=200i,response_time=6.223266528 1459419354977857955
 ```
diff --git a/plugins/inputs/influxdb/README.md b/plugins/inputs/influxdb/README.md
index 13c932ca9..29fd4dc04 100644
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -74,7 +74,7 @@ InfluxDB-formatted endpoints. See below for more information.
 ### Example Output:
 
 ```
-telegraf -config ~/ws/telegraf.conf -input-filter influxdb -test
+telegraf --config ~/ws/telegraf.conf --input-filter influxdb --test
 * Plugin: influxdb, Collection 1
 > influxdb_database,database=_internal,host=tyrion,url=http://localhost:8086/debug/vars numMeasurements=10,numSeries=29 1463590500247354636
 > influxdb_httpd,bind=:8086,host=tyrion,url=http://localhost:8086/debug/vars req=7,reqActive=1,reqDurationNs=14227734 1463590500247354636
diff --git a/plugins/inputs/interrupts/README.md b/plugins/inputs/interrupts/README.md
index f823aae07..eb1e3979d 100644
--- a/plugins/inputs/interrupts/README.md
+++ b/plugins/inputs/interrupts/README.md
@@ -26,7 +26,7 @@ There are two measurements reported by this plugin.
 
 ### Example Output
 ```
-./telegraf -config ~/interrupts_config.conf -test
+./telegraf --config ~/interrupts_config.conf --test
 * Plugin: inputs.interrupts, Collection 1
 > interrupts,irq=0,type=IO-APIC,device=2-edge\ timer,host=hostname CPU0=23i,total=23i 1489346531000000000
 > interrupts,irq=1,host=hostname,type=IO-APIC,device=1-edge\ i8042 CPU0=9i,total=9i 1489346531000000000
diff --git a/plugins/inputs/iptables/README.md b/plugins/inputs/iptables/README.md
index 2b226b9fe..527723f09 100644
--- a/plugins/inputs/iptables/README.md
+++ b/plugins/inputs/iptables/README.md
@@ -78,7 +78,7 @@ pkts bytes target     prot opt in     out     source               destination
 ```
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter iptables -test
+$ ./telegraf --config telegraf.conf --input-filter iptables --test
 iptables,table=filter,chain=INPUT,ruleid=ssh pkts=100i,bytes=1024i 1453831884664956455
 iptables,table=filter,chain=INPUT,ruleid=httpd pkts=42i,bytes=2048i 1453831884664956455
 ```
diff --git a/plugins/inputs/kapacitor/README.md b/plugins/inputs/kapacitor/README.md
index b1ae356b1..822aef1bf 100644
--- a/plugins/inputs/kapacitor/README.md
+++ b/plugins/inputs/kapacitor/README.md
@@ -77,7 +77,7 @@ these values.
 ### Example Output:
 
 ```
-$ telegraf -config /etc/telegraf.conf -input-filter kapacitor -test
+$ telegraf --config /etc/telegraf.conf --input-filter kapacitor --test
 * Plugin: inputs.kapacitor, Collection 1
 > kapacitor_memstats,host=hostname.local,kap_version=1.1.0~rc2,url=http://localhost:9092/kapacitor/v1/debug/vars alloc_bytes=6974808i,buck_hash_sys_bytes=1452609i,frees=207281i,gc_sys_bytes=802816i,gcc_pu_fraction=0.00004693548939673313,heap_alloc_bytes=6974808i,heap_idle_bytes=6742016i,heap_in_use_bytes=9183232i,heap_objects=23216i,heap_released_bytes=0i,heap_sys_bytes=15925248i,last_gc_ns=1478791460012676997i,lookups=88i,mallocs=230497i,mcache_in_use_bytes=9600i,mcache_sys_bytes=16384i,mspan_in_use_bytes=98560i,mspan_sys_bytes=131072i,next_gc_ns=11467528i,num_gc=8i,other_sys_bytes=2236087i,pause_total_ns=2994110i,stack_in_use_bytes=1900544i,stack_sys_bytes=1900544i,sys_bytes=22464760i,total_alloc_bytes=35023600i 1478791462000000000
 > kapacitor,host=hostname.local,kap_version=1.1.0~rc2,url=http://localhost:9092/kapacitor/v1/debug/vars num_enabled_tasks=5i,num_subscriptions=5i,num_tasks=5i 1478791462000000000
diff --git a/plugins/inputs/memcached/README.md b/plugins/inputs/memcached/README.md
index ed4ebe7ff..16a19973b 100644
--- a/plugins/inputs/memcached/README.md
+++ b/plugins/inputs/memcached/README.md
@@ -64,6 +64,6 @@ SELECT mean(get_hits) / mean(cmd_get) as get_ratio, mean(get_misses) / mean(cmd_
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter memcached -test
+$ ./telegraf --config telegraf.conf --input-filter memcached --test
 memcached,server=localhost:11211 get_hits=1,get_misses=2,evictions=0,limit_maxbytes=0,bytes=10,uptime=3600,curr_items=2,total_items=2,curr_connections=1,total_connections=2,connection_structures=1,cmd_get=2,cmd_set=1,delete_hits=0,delete_misses=0,incr_hits=0,incr_misses=0,decr_hits=0,decr_misses=0,cas_hits=0,cas_misses=0,bytes_read=10,bytes_written=10,threads=1,conn_yields=0 1453831884664956455
 ```
diff --git a/plugins/inputs/mesos/README.md b/plugins/inputs/mesos/README.md
index 575396585..67590c3ff 100644
--- a/plugins/inputs/mesos/README.md
+++ b/plugins/inputs/mesos/README.md
@@ -243,7 +243,7 @@ Mesos slave metric groups
 
 ### Example Output:
 ```
-$ telegraf -config ~/mesos.conf -input-filter mesos -test
+$ telegraf --config ~/mesos.conf --input-filter mesos --test
 * Plugin: mesos, Collection 1
 mesos,role=master,state=leader,host=172.17.8.102,server=172.17.8.101
 allocator/event_queue_dispatches=0,master/cpus_percent=0,
diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index e3836721c..16c73e8ee 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -71,7 +71,7 @@ It can also check response text.
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter net_response -test
+$ ./telegraf --config telegraf.conf --input-filter net_response --test
 net_response,server=192.168.2.2,port=22,protocol=tcp response_time=0.18070360500000002,string_found=true 1454785464182527094
 net_response,server=192.168.2.2,port=2222,protocol=tcp response_time=1.090124776,string_found=false 1454784433658942325
 
diff --git a/plugins/inputs/nginx/README.md b/plugins/inputs/nginx/README.md
index 918ee08ad..dab54329b 100644
--- a/plugins/inputs/nginx/README.md
+++ b/plugins/inputs/nginx/README.md
@@ -37,7 +37,7 @@ Using this configuration:
 
 When run with:
 ```
-./telegraf -config telegraf.conf -input-filter nginx -test
+./telegraf --config telegraf.conf --input-filter nginx --test
 ```
 
 It produces:
diff --git a/plugins/inputs/ntpq/README.md b/plugins/inputs/ntpq/README.md
index 80bf80f39..f6ee8e2af 100644
--- a/plugins/inputs/ntpq/README.md
+++ b/plugins/inputs/ntpq/README.md
@@ -54,7 +54,7 @@ server (RMS of difference of multiple time samples, milliseconds);
 ### Example Output:
 
 ```
-$ telegraf -config ~/ws/telegraf.conf -input-filter ntpq -test
+$ telegraf --config ~/ws/telegraf.conf --input-filter ntpq --test
 * Plugin: ntpq, Collection 1
 > ntpq,refid=.GPSs.,remote=*time.apple.com,stratum=1,type=u delay=91.797,jitter=3.735,offset=12.841,poll=64i,reach=377i,when=35i 1457960478909556134
 ```
diff --git a/plugins/inputs/passenger/README.md b/plugins/inputs/passenger/README.md
index 64e39729b..90c0a2d80 100644
--- a/plugins/inputs/passenger/README.md
+++ b/plugins/inputs/passenger/README.md
@@ -100,7 +100,7 @@ Using this configuration:
 When run with:
 
 ```
-./telegraf -config telegraf.conf -test -input-filter passenger
+./telegraf --config telegraf.conf --input-filter passenger --test
 ```
 
 It produces:
diff --git a/plugins/inputs/phpfpm/README.md b/plugins/inputs/phpfpm/README.md
index b853b7fd7..117d24298 100644
--- a/plugins/inputs/phpfpm/README.md
+++ b/plugins/inputs/phpfpm/README.md
@@ -47,7 +47,7 @@ Using this configuration:
 When run with:
 
 ```
-./telegraf -config telegraf.conf -input-filter phpfpm -test
+./telegraf --config telegraf.conf --input-filter phpfpm --test
 ```
 
 It produces:
diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index b02345e8e..bab7a976b 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -41,7 +41,7 @@ urls = ["www.google.com"] # required
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter ping -test
+$ ./telegraf --config telegraf.conf --input-filter ping --test
 * Plugin: ping, Collection 1
 ping,host=WIN-PBAPLP511R7,url=www.google.com average_response_ms=7i,maximum_response_ms=9i,minimum_response_ms=7i,packets_received=4i,packets_transmitted=4i,percent_packet_loss=0,percent_reply_loss=0,reply_received=4i 1469879119000000000
 ```
diff --git a/plugins/inputs/powerdns/README.md b/plugins/inputs/powerdns/README.md
index 73b9334cf..4b1732782 100644
--- a/plugins/inputs/powerdns/README.md
+++ b/plugins/inputs/powerdns/README.md
@@ -63,6 +63,6 @@ The powerdns plugin gathers metrics about PowerDNS using unix socket.
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter powerdns -test
+$ ./telegraf --config telegraf.conf --input-filter powerdns --test
 > powerdns,server=/var/run/pdns.controlsocket corrupt-packets=0i,deferred-cache-inserts=0i,deferred-cache-lookup=0i,dnsupdate-answers=0i,dnsupdate-changes=0i,dnsupdate-queries=0i,dnsupdate-refused=0i,key-cache-size=0i,latency=26i,meta-cache-size=0i,packetcache-hit=0i,packetcache-miss=1i,packetcache-size=0i,qsize-q=0i,query-cache-hit=0i,query-cache-miss=6i,rd-queries=1i,recursing-answers=0i,recursing-questions=0i,recursion-unanswered=0i,security-status=3i,servfail-packets=0i,signature-cache-size=0i,signatures=0i,sys-msec=4349i,tcp-answers=0i,tcp-queries=0i,timedout-packets=0i,udp-answers=1i,udp-answers-bytes=50i,udp-do-queries=0i,udp-queries=0i,udp4-answers=1i,udp4-queries=1i,udp6-answers=0i,udp6-queries=0i,uptime=166738i,user-msec=3036i 1454078624932715706
 ```
diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index e2b1b45ae..1a96f127e 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -100,7 +100,7 @@ go_goroutines 15
 Example of output with configuration given above:
 
 ```
-$ ./telegraf -config telegraf.conf  -test
+$ ./telegraf --config telegraf.conf --test
 k8s_go_goroutines,kubeservice=kube-apiserver,url=http://my-kube-apiserver:8080/metrics gauge=536 1456857329391929813
 k8s_go_gc_duration_seconds,kubeservice=kube-apiserver,url=http://my-kube-apiserver:8080/metrics 0=0.038002142,0.25=0.041732467,0.5=0.04336492,0.75=0.047271799,1=0.058295811,count=0,sum=208.334617406 1456857329391929813
 ```
diff --git a/plugins/inputs/puppetagent/README.md b/plugins/inputs/puppetagent/README.md
index f76ea16b4..480f7531d 100644
--- a/plugins/inputs/puppetagent/README.md
+++ b/plugins/inputs/puppetagent/README.md
@@ -46,7 +46,7 @@ cat /var/lib/puppet/state/last_run_summary.yaml
 ```
 
 ```
-jcross@pit-devops-02 ~ >sudo ./telegraf_linux_amd64 -filter puppetagent -config tele.conf -test
+jcross@pit-devops-02 ~ >sudo ./telegraf_linux_amd64 --input-filter puppetagent --config tele.conf --test
 * Plugin: puppetagent, Collection 1
 > [] puppetagent_events_failure value=0
 > [] puppetagent_events_total value=0
@@ -129,4 +129,4 @@ Meta:
 - tags: ``
 
 Measurement names:
- - puppetagent_version_puppet
\ No newline at end of file
+ - puppetagent_version_puppet
diff --git a/plugins/inputs/raindrops/README.md b/plugins/inputs/raindrops/README.md
index 6a73a085b..cdc13eec2 100644
--- a/plugins/inputs/raindrops/README.md
+++ b/plugins/inputs/raindrops/README.md
@@ -36,7 +36,7 @@ specified raindops [middleware](http://raindrops.bogomips.org/Raindrops/Middlewa
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter raindrops -test
+$ ./telegraf --config telegraf.conf --input-filter raindrops --test
 * Plugin: raindrops, Collection 1
 > raindrops,port=8080,server=localhost calling=0i,writing=0i 1455479896806238204
 > raindrops_listen,ip=0.0.0.0,port=8080 active=0i,queued=0i 1455479896806561938
diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 5ec2a120a..b9d216779 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -134,7 +134,7 @@ Using this configuration:
 
 When run with:
 ```
-./telegraf -config telegraf.conf -input-filter redis -test
+./telegraf --config telegraf.conf --input-filter redis --test
 ```
 
 It produces:
diff --git a/plugins/inputs/riak/README.md b/plugins/inputs/riak/README.md
index 7832feecf..c36624d27 100644
--- a/plugins/inputs/riak/README.md
+++ b/plugins/inputs/riak/README.md
@@ -73,6 +73,6 @@ All measurements have the following tags:
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter riak -test
+$ ./telegraf --config telegraf.conf --input-filter riak --test
 > riak,nodename=riak@127.0.0.1,server=localhost:8098 cpu_avg1=31i,cpu_avg15=69i,cpu_avg5=51i,memory_code=11563738i,memory_ets=5925872i,memory_processes=30236069i,memory_system=93074971i,memory_total=123311040i,node_get_fsm_objsize_100=0i,node_get_fsm_objsize_95=0i,node_get_fsm_objsize_99=0i,node_get_fsm_objsize_mean=0i,node_get_fsm_objsize_median=0i,node_get_fsm_siblings_100=0i,node_get_fsm_siblings_95=0i,node_get_fsm_siblings_99=0i,node_get_fsm_siblings_mean=0i,node_get_fsm_siblings_median=0i,node_get_fsm_time_100=0i,node_get_fsm_time_95=0i,node_get_fsm_time_99=0i,node_get_fsm_time_mean=0i,node_get_fsm_time_median=0i,node_gets=0i,node_gets_total=19i,node_put_fsm_time_100=0i,node_put_fsm_time_95=0i,node_put_fsm_time_99=0i,node_put_fsm_time_mean=0i,node_put_fsm_time_median=0i,node_puts=0i,node_puts_total=0i,pbc_active=0i,pbc_connects=0i,pbc_connects_total=20i,vnode_gets=0i,vnode_gets_total=57i,vnode_index_reads=0i,vnode_index_reads_total=0i,vnode_index_writes=0i,vnode_index_writes_total=0i,vnode_puts=0i,vnode_puts_total=0i,read_repair=0i,read_repairs_total=0i 1455913392622482332
 ```
diff --git a/plugins/inputs/sensors/README.md b/plugins/inputs/sensors/README.md
index 237a9b789..62497d074 100644
--- a/plugins/inputs/sensors/README.md
+++ b/plugins/inputs/sensors/README.md
@@ -27,7 +27,7 @@ Fields are created dynamicaly depending on the sensors. All fields are float.
 
 #### Default
 ```
-$ telegraf -config telegraf.conf -input-filter sensors -test
+$ telegraf --config telegraf.conf --input-filter sensors --test
 * Plugin: sensors, Collection 1
 > sensors,chip=power_meter-acpi-0,feature=power1 power_average=0,power_average_interval=300 1466751326000000000
 > sensors,chip=k10temp-pci-00c3,feature=temp1 temp_crit=70,temp_crit_hyst=65,temp_input=29,temp_max=70 1466751326000000000
diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index b5ce96da0..7ff0752c2 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -136,7 +136,7 @@ Full view
 ## Example Output:
 
 ``` 
-./telegraf -config telegraf.conf -test 
+./telegraf --config telegraf.conf --test 
 * Plugin: sqlserver, Collection 1
 > Memory\ breakdown\ (%),servername=WIN8-DEV,type=Memory\ clerk Buffer\ pool=27.20,Cache\ (objects)=6.50,Cache\ (sql\ plans)=31.50,Other=34.80 1453876411474582877
 > Memory\ breakdown\ (bytes),servername=WIN8-DEV,type=Memory\ clerk Buffer\ pool=100016128.00,Cache\ (objects)=23904256.00,Cache\ (sql\ plans)=115621888.00,Other=127942656.00 1453876411474655779
diff --git a/plugins/inputs/sysstat/README.md b/plugins/inputs/sysstat/README.md
index 593563aa4..d8e0e95d8 100644
--- a/plugins/inputs/sysstat/README.md
+++ b/plugins/inputs/sysstat/README.md
@@ -154,7 +154,7 @@ With the configuration below:
 
 you get the following output:
 ```
-$ telegraf -config telegraf.conf -input-filter sysstat -test
+$ telegraf --config telegraf.conf --input-filter sysstat --test
 * Plugin: sysstat, Collection 1
 > cpu_util,device=all pct_idle=98.85,pct_iowait=0,pct_nice=0.38,pct_steal=0,pct_system=0.64,pct_user=0.13 1459255626657883725
 > swap pswpin_per_s=0,pswpout_per_s=0 1459255626658387650
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index b79ca07b3..bf5f1d973 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -44,7 +44,7 @@ In this case, the host's root volume should be mounted into the container and th
 ### Example Output:
 
 ```
-% ./telegraf -config ~/ws/telegraf.conf -input-filter disk -test
+% ./telegraf --config ~/ws/telegraf.conf --input-filter disk --test
 * Plugin: disk, Collection 1
 > disk,fstype=hfs,path=/ free=398407520256i,inodes_free=97267461i,inodes_total=121847806i,inodes_used=24580345i,total=499088621568i,used=100418957312i,used_percent=20.131039916242397 1453832006274071563
 > disk,fstype=devfs,path=/dev free=0i,inodes_free=0i,inodes_total=628i,inodes_used=628i,total=185856i,used=185856i,used_percent=100 1453832006274137913
diff --git a/plugins/inputs/system/KERNEL_README.md b/plugins/inputs/system/KERNEL_README.md
index 3285e59ef..5ce2d21f8 100644
--- a/plugins/inputs/system/KERNEL_README.md
+++ b/plugins/inputs/system/KERNEL_README.md
@@ -58,7 +58,7 @@ None
 ### Example Output:
 
 ```
-$ telegraf -config ~/ws/telegraf.conf -input-filter kernel -test
+$ telegraf --config ~/ws/telegraf.conf --input-filter kernel --test
 * Plugin: kernel, Collection 1
 > kernel boot_time=1457505775i,context_switches=2626618i,disk_pages_in=5741i,disk_pages_out=1808i,interrupts=1472736i,processes_forked=10673i 1457613402960879816
 ```
diff --git a/plugins/inputs/system/KERNEL_VMSTAT_README.md b/plugins/inputs/system/KERNEL_VMSTAT_README.md
index 7235e2f2b..3ca6a097c 100644
--- a/plugins/inputs/system/KERNEL_VMSTAT_README.md
+++ b/plugins/inputs/system/KERNEL_VMSTAT_README.md
@@ -219,7 +219,7 @@ None
 ### Example Output:
 
 ```
-$ telegraf -config ~/ws/telegraf.conf -input-filter kernel_vmstat -test
+$ telegraf --config ~/ws/telegraf.conf --input-filter kernel_vmstat --test
 * Plugin: kernel_vmstat, Collection 1
 > kernel_vmstat allocstall=81496i,compact_blocks_moved=238196i,compact_fail=135220i,compact_pagemigrate_failed=0i,compact_pages_moved=6370588i,compact_stall=142092i,compact_success=6872i,htlb_buddy_alloc_fail=0i,htlb_buddy_alloc_success=0i,kswapd_high_wmark_hit_quickly=25439i,kswapd_inodesteal=29770874i,kswapd_low_wmark_hit_quickly=8756i,kswapd_skip_congestion_wait=0i,kswapd_steal=291534428i,nr_active_anon=2515657i,nr_active_file=2244914i,nr_anon_pages=1358675i,nr_anon_transparent_hugepages=2034i,nr_bounce=0i,nr_dirty=5690i,nr_file_pages=5153546i,nr_free_pages=78730i,nr_inactive_anon=426259i,nr_inactive_file=2366791i,nr_isolated_anon=0i,nr_isolated_file=0i,nr_kernel_stack=579i,nr_mapped=558821i,nr_mlock=0i,nr_page_table_pages=11115i,nr_shmem=541689i,nr_slab_reclaimable=459806i,nr_slab_unreclaimable=47859i,nr_unevictable=0i,nr_unstable=0i,nr_vmscan_write=6206i,nr_writeback=0i,nr_writeback_temp=0i,numa_foreign=0i,numa_hit=5113399878i,numa_interleave=35793i,numa_local=5113399878i,numa_miss=0i,numa_other=0i,pageoutrun=505006i,pgactivate=375664931i,pgalloc_dma=0i,pgalloc_dma32=122480220i,pgalloc_movable=0i,pgalloc_normal=5233176719i,pgdeactivate=122735906i,pgfault=8699921410i,pgfree=5359765021i,pginodesteal=9188431i,pgmajfault=122210i,pgpgin=219717626i,pgpgout=3495885510i,pgrefill_dma=0i,pgrefill_dma32=1180010i,pgrefill_movable=0i,pgrefill_normal=119866676i,pgrotated=60620i,pgscan_direct_dma=0i,pgscan_direct_dma32=12256i,pgscan_direct_movable=0i,pgscan_direct_normal=31501600i,pgscan_kswapd_dma=0i,pgscan_kswapd_dma32=4480608i,pgscan_kswapd_movable=0i,pgscan_kswapd_normal=287857984i,pgsteal_dma=0i,pgsteal_dma32=4466436i,pgsteal_movable=0i,pgsteal_normal=318463755i,pswpin=2092i,pswpout=6206i,slabs_scanned=93775616i,thp_collapse_alloc=24857i,thp_collapse_alloc_failed=102214i,thp_fault_alloc=346219i,thp_fault_fallback=895453i,thp_split=9817i,unevictable_pgs_cleared=0i,unevictable_pgs_culled=1531i,unevictable_pgs_mlocked=6988i,unevictable_pgs_mlockfreed=0i,unevictable_pgs_munlocked=6988i,unevictable_pgs_rescued=5426i,unevictable_pgs_scanned=0i,unevictable_pgs_stranded=0i,zone_reclaim_failed=0i 1459455200071462843 
 ```
diff --git a/plugins/inputs/system/NET_README.md b/plugins/inputs/system/NET_README.md
index d4984c0ee..de9e7d7a7 100644
--- a/plugins/inputs/system/NET_README.md
+++ b/plugins/inputs/system/NET_README.md
@@ -54,13 +54,13 @@ SELECT derivative(first(bytes_recv), 1s) as "download bytes/sec", derivative(fir
 
 ```
 # All platforms
-$ ./telegraf -config telegraf.conf -input-filter net -test
+$ ./telegraf --config telegraf.conf --input-filter net --test
 net,interface=eth0,host=HOST bytes_sent=451838509i,bytes_recv=3284081640i,packets_sent=2663590i,packets_recv=3585442i,err_in=0i,err_out=0i,drop_in=4i,drop_out=0i 1492834180000000000
 ```
 
 ```
 # Linux
-$ ./telegraf -config telegraf.conf -input-filter net -test
+$ ./telegraf --config telegraf.conf --input-filter net --test
 net,interface=eth0,host=HOST bytes_sent=451838509i,bytes_recv=3284081640i,packets_sent=2663590i,packets_recv=3585442i,err_in=0i,err_out=0i,drop_in=4i,drop_out=0i 1492834180000000000
 net,interface=all,host=HOST ip_reasmfails=0i,icmp_insrcquenchs=0i,icmp_outtimestamps=0i,ip_inhdrerrors=0i,ip_inunknownprotos=0i,icmp_intimeexcds=10i,icmp_outaddrmasks=0i,icmp_indestunreachs=11005i,icmpmsg_outtype0=6i,tcp_retranssegs=14669i,udplite_outdatagrams=0i,ip_reasmtimeout=0i,ip_outnoroutes=2577i,ip_inaddrerrors=186i,icmp_outaddrmaskreps=0i,tcp_incsumerrors=0i,tcp_activeopens=55965i,ip_reasmoks=0i,icmp_inechos=6i,icmp_outdestunreachs=9417i,ip_reasmreqds=0i,icmp_outtimestampreps=0i,tcp_rtoalgorithm=1i,icmpmsg_intype3=11005i,icmpmsg_outtype69=129i,tcp_outsegs=2777459i,udplite_rcvbuferrors=0i,ip_fragoks=0i,icmp_inmsgs=13398i,icmp_outerrors=0i,tcp_outrsts=14951i,udplite_noports=0i,icmp_outmsgs=11517i,icmp_outechoreps=6i,icmpmsg_intype11=10i,icmp_inparmprobs=0i,ip_forwdatagrams=0i,icmp_inechoreps=1909i,icmp_outredirects=0i,icmp_intimestampreps=0i,icmpmsg_intype5=468i,tcp_rtomax=120000i,tcp_maxconn=-1i,ip_fragcreates=0i,ip_fragfails=0i,icmp_inredirects=468i,icmp_outtimeexcds=0i,icmp_outechos=1965i,icmp_inaddrmasks=0i,tcp_inerrs=389i,tcp_rtomin=200i,ip_defaultttl=64i,ip_outrequests=3366408i,ip_forwarding=2i,udp_incsumerrors=0i,udp_indatagrams=522136i,udplite_incsumerrors=0i,ip_outdiscards=871i,icmp_inerrors=958i,icmp_outsrcquenchs=0i,icmpmsg_intype0=1909i,tcp_insegs=3580226i,udp_outdatagrams=577265i,udp_rcvbuferrors=0i,udplite_sndbuferrors=0i,icmp_incsumerrors=0i,icmp_outparmprobs=0i,icmpmsg_outtype3=9417i,tcp_attemptfails=2652i,udplite_inerrors=0i,udplite_indatagrams=0i,ip_inreceives=4172969i,icmpmsg_outtype8=1965i,tcp_currestab=59i,udp_noports=5961i,ip_indelivers=4099279i,ip_indiscards=0i,tcp_estabresets=5818i,udp_sndbuferrors=3i,icmp_intimestamps=0i,icmpmsg_intype8=6i,udp_inerrors=0i,icmp_inaddrmaskreps=0i,tcp_passiveopens=452i 1492831540000000000
 ``
diff --git a/plugins/inputs/system/PROCESSES_README.md b/plugins/inputs/system/PROCESSES_README.md
index aaeb279f8..431e280ff 100644
--- a/plugins/inputs/system/PROCESSES_README.md
+++ b/plugins/inputs/system/PROCESSES_README.md
@@ -54,7 +54,7 @@ None
 ### Example Output:
 
 ```
-$ telegraf -config ~/ws/telegraf.conf -input-filter processes -test
+$ telegraf --config ~/ws/telegraf.conf --input-filter processes --test
 * Plugin: processes, Collection 1
 > processes blocked=8i,running=1i,sleeping=265i,stopped=0i,total=274i,zombie=0i,dead=0i,paging=0i,total_threads=687i 1457478636980905042
 ```
diff --git a/plugins/inputs/system/SYSTEM_README.md b/plugins/inputs/system/SYSTEM_README.md
index 2fcde4e6b..2ade1947b 100644
--- a/plugins/inputs/system/SYSTEM_README.md
+++ b/plugins/inputs/system/SYSTEM_README.md
@@ -30,7 +30,7 @@ None
 ### Example Output:
 
 ```
-$ telegraf -config ~/ws/telegraf.conf -input-filter system -test
+$ telegraf --config ~/ws/telegraf.conf --input-filter system --test
 * Plugin: system, Collection 1
 * Plugin: inputs.system, Collection 1
 > system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
diff --git a/plugins/inputs/varnish/README.md b/plugins/inputs/varnish/README.md
index ad627bbe7..cba3506f5 100644
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -333,7 +333,7 @@ the following values:
 ### Example Output:
 
 ```
- telegraf -test -config etc/telegraf.conf  -input-filter varnish
+ telegraf --config etc/telegraf.conf --input-filter varnish --test
 * Plugin: varnish, Collection 1
 > varnish,host=rpercy-VirtualBox,section=MAIN cache_hit=0i,cache_miss=0i,uptime=8416i 1462765437090957980
 ```
diff --git a/plugins/inputs/zfs/README.md b/plugins/inputs/zfs/README.md
index c6abc0600..3215aaf3f 100644
--- a/plugins/inputs/zfs/README.md
+++ b/plugins/inputs/zfs/README.md
@@ -214,7 +214,7 @@ On FreeBSD:
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter zfs -test
+$ ./telegraf --config telegraf.conf --input-filter zfs --test
 * Plugin: zfs, Collection 1
 > zfs_pool,health=ONLINE,pool=zroot allocated=1578590208i,capacity=2i,dedupratio=1,fragmentation=1i,free=64456531968i,size=66035122176i 1464473103625653908
 > zfs,pools=zroot arcstats_allocated=4167764i,arcstats_anon_evictable_data=0i,arcstats_anon_evictable_metadata=0i,arcstats_anon_size=16896i,arcstats_arc_meta_limit=10485760i,arcstats_arc_meta_max=115269568i,arcstats_arc_meta_min=8388608i,arcstats_arc_meta_used=51977456i,arcstats_c=16777216i,arcstats_c_max=41943040i,arcstats_c_min=16777216i,arcstats_data_size=0i,arcstats_deleted=1699340i,arcstats_demand_data_hits=14836131i,arcstats_demand_data_misses=2842945i,arcstats_demand_hit_predictive_prefetch=0i,arcstats_demand_metadata_hits=1655006i,arcstats_demand_metadata_misses=830074i,arcstats_duplicate_buffers=0i,arcstats_duplicate_buffers_size=0i,arcstats_duplicate_reads=123i,arcstats_evict_l2_cached=0i,arcstats_evict_l2_eligible=332172623872i,arcstats_evict_l2_ineligible=6168576i,arcstats_evict_l2_skip=0i,arcstats_evict_not_enough=12189444i,arcstats_evict_skip=195190764i,arcstats_hash_chain_max=2i,arcstats_hash_chains=10i,arcstats_hash_collisions=43134i,arcstats_hash_elements=2268i,arcstats_hash_elements_max=6136i,arcstats_hdr_size=565632i,arcstats_hits=16515778i,arcstats_l2_abort_lowmem=0i,arcstats_l2_asize=0i,arcstats_l2_cdata_free_on_write=0i,arcstats_l2_cksum_bad=0i,arcstats_l2_compress_failures=0i,arcstats_l2_compress_successes=0i,arcstats_l2_compress_zeros=0i,arcstats_l2_evict_l1cached=0i,arcstats_l2_evict_lock_retry=0i,arcstats_l2_evict_reading=0i,arcstats_l2_feeds=0i,arcstats_l2_free_on_write=0i,arcstats_l2_hdr_size=0i,arcstats_l2_hits=0i,arcstats_l2_io_error=0i,arcstats_l2_misses=0i,arcstats_l2_read_bytes=0i,arcstats_l2_rw_clash=0i,arcstats_l2_size=0i,arcstats_l2_write_buffer_bytes_scanned=0i,arcstats_l2_write_buffer_iter=0i,arcstats_l2_write_buffer_list_iter=0i,arcstats_l2_write_buffer_list_null_iter=0i,arcstats_l2_write_bytes=0i,arcstats_l2_write_full=0i,arcstats_l2_write_in_l2=0i,arcstats_l2_write_io_in_progress=0i,arcstats_l2_write_not_cacheable=380i,arcstats_l2_write_passed_headroom=0i,arcstats_l2_write_pios=0i,arcstats_l2_write_spa_mismatch=0i,arcstats_l2_write_trylock_fail=0i,arcstats_l2_writes_done=0i,arcstats_l2_writes_error=0i,arcstats_l2_writes_lock_retry=0i,arcstats_l2_writes_sent=0i,arcstats_memory_throttle_count=0i,arcstats_metadata_size=17014784i,arcstats_mfu_evictable_data=0i,arcstats_mfu_evictable_metadata=16384i,arcstats_mfu_ghost_evictable_data=5723648i,arcstats_mfu_ghost_evictable_metadata=10709504i,arcstats_mfu_ghost_hits=1315619i,arcstats_mfu_ghost_size=16433152i,arcstats_mfu_hits=7646611i,arcstats_mfu_size=305152i,arcstats_misses=3676993i,arcstats_mru_evictable_data=0i,arcstats_mru_evictable_metadata=0i,arcstats_mru_ghost_evictable_data=0i,arcstats_mru_ghost_evictable_metadata=80896i,arcstats_mru_ghost_hits=324250i,arcstats_mru_ghost_size=80896i,arcstats_mru_hits=8844526i,arcstats_mru_size=16693248i,arcstats_mutex_miss=354023i,arcstats_other_size=34397040i,arcstats_p=4172800i,arcstats_prefetch_data_hits=0i,arcstats_prefetch_data_misses=0i,arcstats_prefetch_metadata_hits=24641i,arcstats_prefetch_metadata_misses=3974i,arcstats_size=51977456i,arcstats_sync_wait_for_async=0i,vdev_cache_stats_delegations=779i,vdev_cache_stats_hits=323123i,vdev_cache_stats_misses=59929i,zfetchstats_hits=0i,zfetchstats_max_streams=0i,zfetchstats_misses=0i 1464473103634124908

From da99777f6ff61d412a7645b868f8e84050319378 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <danielnelson@users.noreply.github.com>
Date: Fri, 12 May 2017 15:34:05 -0700
Subject: [PATCH 0263/1302] Only split metrics if there is an udp output
 (#2799)

---
 plugins/outputs/influxdb/influxdb.go | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index d127d3fb4..e44af7a79 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -2,6 +2,7 @@ package influxdb
 
 import (
 	"fmt"
+	"io"
 	"log"
 	"math/rand"
 	"strings"
@@ -41,7 +42,8 @@ type InfluxDB struct {
 	// Precision is only here for legacy support. It will be ignored.
 	Precision string
 
-	clients []client.Client
+	clients      []client.Client
+	splitPayload bool
 }
 
 var sampleConfig = `
@@ -109,6 +111,7 @@ func (i *InfluxDB) Connect() error {
 				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
 			}
 			i.clients = append(i.clients, c)
+			i.splitPayload = true
 		default:
 			// If URL doesn't start with "udp", assume HTTP client
 			config := client.HTTPConfig{
@@ -159,17 +162,26 @@ func (i *InfluxDB) Description() string {
 	return "Configuration for influxdb server to send metrics to"
 }
 
+func (i *InfluxDB) getReader(metrics []telegraf.Metric) io.Reader {
+	if !i.splitPayload {
+		return metric.NewReader(metrics)
+	}
+
+	splitData := make([]telegraf.Metric, 0)
+	for _, m := range metrics {
+		splitData = append(splitData, m.Split(i.UDPPayload)...)
+	}
+	return metric.NewReader(splitData)
+}
+
 // Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	bufsize := 0
-	splitData := make([]telegraf.Metric, 0)
-
 	for _, m := range metrics {
 		bufsize += m.Len()
-		splitData = append(splitData, m.Split(i.UDPPayload)...)
 	}
-	r := metric.NewReader(splitData)
+	r := i.getReader(metrics)
 
 	// This will get set to nil if a successful write occurs
 	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")

From b01ecdccff1892d65212b2d2b748ca11905fba7c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 15 May 2017 12:54:03 -0700
Subject: [PATCH 0264/1302] Add back the changelog entry for 2141

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9184bf4d2..c59c0abe7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@ be deprecated eventually.
 - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
 - [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1
 - [#2712](https://github.com/influxdata/telegraf/issues/2712): Documentation for rabbitmq input plugin
+- [#2141](https://github.com/influxdata/telegraf/pull/2141): Logparser handles newly-created files.
 
 ### Bugfixes
 

From bfeb3020a32b8bd965f65b1b44a91bb9363c8519 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 15 May 2017 19:52:35 -0700
Subject: [PATCH 0265/1302] Add release date for 1.3.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c59c0abe7..c6e6b0b59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 
-## v1.3 [unreleased]
+## v1.3 [2017-05-15]
 
 ### Release Notes
 

From ac5ac3161f2144f535c0fbd59494e9c2639a34bb Mon Sep 17 00:00:00 2001
From: Frederick Roth <f-roth@megaera.de>
Date: Wed, 17 May 2017 00:25:30 +0200
Subject: [PATCH 0266/1302] Fixed inconsistency between HasIntField and
 IntField (#2813)

---
 plugins/inputs/aerospike/aerospike_test.go    |  4 ++--
 .../http_response/http_response_test.go       |  4 ++--
 plugins/inputs/memcached/memcached_test.go    |  2 +-
 plugins/inputs/mongodb/mongodb_data_test.go   |  4 ++--
 plugins/inputs/mongodb/mongodb_server_test.go |  2 +-
 plugins/inputs/ping/ping_windows_test.go      | 22 +++++++++----------
 plugins/inputs/postgresql/postgresql_test.go  |  2 +-
 .../postgresql_extensible_test.go             |  2 +-
 plugins/inputs/powerdns/powerdns_test.go      |  2 +-
 plugins/inputs/rabbitmq/rabbitmq_test.go      |  4 ++--
 .../inputs/rethinkdb/rethinkdb_data_test.go   |  6 ++---
 plugins/inputs/system/processes_test.go       |  8 +++----
 plugins/inputs/zookeeper/zookeeper_test.go    |  2 +-
 testutil/accumulator.go                       | 18 +++++++++++++++
 14 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/plugins/inputs/aerospike/aerospike_test.go b/plugins/inputs/aerospike/aerospike_test.go
index 2055da3bb..ac8c90d2b 100644
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -24,7 +24,7 @@ func TestAerospikeStatistics(t *testing.T) {
 
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasIntField("aerospike_node", "batch_error"))
+	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
 }
 
 func TestAerospikeStatisticsPartialErr(t *testing.T) {
@@ -45,7 +45,7 @@ func TestAerospikeStatisticsPartialErr(t *testing.T) {
 
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
-	assert.True(t, acc.HasIntField("aerospike_node", "batch_error"))
+	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
 }
 
 func TestAerospikeParseValue(t *testing.T) {
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index babb23dab..ee2390d2d 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -355,7 +355,7 @@ func TestTimeout(t *testing.T) {
 		Address:         ts.URL + "/twosecondnap",
 		Body:            "{ 'test': 'data'}",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Millisecond},
+		ResponseTimeout: internal.Duration{Duration: time.Second},
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
@@ -363,7 +363,7 @@ func TestTimeout(t *testing.T) {
 	}
 	var acc testutil.Accumulator
 	err := h.Gather(&acc)
-	require.NoError(t, err)
+	require.Error(t, err)
 
 	ok := acc.HasIntField("http_response", "http_response_code")
 	require.False(t, ok)
diff --git a/plugins/inputs/memcached/memcached_test.go b/plugins/inputs/memcached/memcached_test.go
index aae59dbc8..3c8a239f0 100644
--- a/plugins/inputs/memcached/memcached_test.go
+++ b/plugins/inputs/memcached/memcached_test.go
@@ -32,7 +32,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 		"bytes_read", "bytes_written", "threads", "conn_yields"}
 
 	for _, metric := range intMetrics {
-		assert.True(t, acc.HasIntField("memcached", metric), metric)
+		assert.True(t, acc.HasInt64Field("memcached", metric), metric)
 	}
 }
 
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index a74d9ed65..e2ecac49b 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -42,7 +42,7 @@ func TestAddNonReplStats(t *testing.T) {
 	d.flush(&acc)
 
 	for key, _ := range DefaultStats {
-		assert.True(t, acc.HasIntField("mongodb", key))
+		assert.True(t, acc.HasInt64Field("mongodb", key))
 	}
 }
 
@@ -63,7 +63,7 @@ func TestAddReplStats(t *testing.T) {
 	d.flush(&acc)
 
 	for key, _ := range MmapStats {
-		assert.True(t, acc.HasIntField("mongodb", key))
+		assert.True(t, acc.HasInt64Field("mongodb", key))
 	}
 }
 
diff --git a/plugins/inputs/mongodb/mongodb_server_test.go b/plugins/inputs/mongodb/mongodb_server_test.go
index e9d1bae9e..c8ef5f240 100644
--- a/plugins/inputs/mongodb/mongodb_server_test.go
+++ b/plugins/inputs/mongodb/mongodb_server_test.go
@@ -36,6 +36,6 @@ func TestAddDefaultStats(t *testing.T) {
 	require.NoError(t, err)
 
 	for key, _ := range DefaultStats {
-		assert.True(t, acc.HasIntField("mongodb", key))
+		assert.True(t, acc.HasInt64Field("mongodb", key))
 	}
 }
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index 70ff78f75..cb90b1686 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -217,19 +217,19 @@ func TestFatalPingGather(t *testing.T) {
 	acc.GatherError(p.Gather)
 	assert.True(t, acc.HasFloatField("ping", "errors"),
 		"Fatal ping should have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "packets_transmitted"),
+	assert.False(t, acc.HasInt64Field("ping", "packets_transmitted"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "packets_received"),
+	assert.False(t, acc.HasInt64Field("ping", "packets_received"),
 		"Fatal ping should not have packet measurements")
 	assert.False(t, acc.HasFloatField("ping", "percent_packet_loss"),
 		"Fatal ping should not have packet measurements")
 	assert.False(t, acc.HasFloatField("ping", "percent_reply_loss"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "average_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "average_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "maximum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "maximum_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "minimum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "minimum_response_ms"),
 		"Fatal ping should not have packet measurements")
 }
 
@@ -273,11 +273,11 @@ func TestUnreachablePingGather(t *testing.T) {
 
 	assert.False(t, acc.HasFloatField("ping", "errors"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "average_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "average_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "maximum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "maximum_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "minimum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "minimum_response_ms"),
 		"Fatal ping should not have packet measurements")
 }
 
@@ -319,10 +319,10 @@ func TestTTLExpiredPingGather(t *testing.T) {
 
 	assert.False(t, acc.HasFloatField("ping", "errors"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "average_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "average_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "maximum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "maximum_response_ms"),
 		"Fatal ping should not have packet measurements")
-	assert.False(t, acc.HasIntField("ping", "minimum_response_ms"),
+	assert.False(t, acc.HasInt64Field("ping", "minimum_response_ms"),
 		"Fatal ping should not have packet measurements")
 }
diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go
index a0690961d..03c09936d 100644
--- a/plugins/inputs/postgresql/postgresql_test.go
+++ b/plugins/inputs/postgresql/postgresql_test.go
@@ -74,7 +74,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, metric := range intMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
-			assert.True(t, acc.HasIntField("postgresql", metric))
+			assert.True(t, acc.HasInt64Field("postgresql", metric))
 			metricsCounted++
 		}
 	}
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 0b2785cad..1c59bffaa 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -69,7 +69,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, metric := range intMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
-			assert.True(t, acc.HasIntField("postgresql", metric))
+			assert.True(t, acc.HasInt64Field("postgresql", metric))
 			metricsCounted++
 		}
 	}
diff --git a/plugins/inputs/powerdns/powerdns_test.go b/plugins/inputs/powerdns/powerdns_test.go
index c2d4413e2..df36440de 100644
--- a/plugins/inputs/powerdns/powerdns_test.go
+++ b/plugins/inputs/powerdns/powerdns_test.go
@@ -105,7 +105,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 		"meta-cache-size", "qsize-q", "signature-cache-size", "sys-msec", "uptime", "user-msec"}
 
 	for _, metric := range intMetrics {
-		assert.True(t, acc.HasIntField("powerdns", metric), metric)
+		assert.True(t, acc.HasInt64Field("powerdns", metric), metric)
 	}
 }
 
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index 7ff0a5d57..3be0259bc 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -419,7 +419,7 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	}
 
 	for _, metric := range intMetrics {
-		assert.True(t, acc.HasIntField("rabbitmq_overview", metric))
+		assert.True(t, acc.HasInt64Field("rabbitmq_overview", metric))
 	}
 
 	nodeIntMetrics := []string{
@@ -437,7 +437,7 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	}
 
 	for _, metric := range nodeIntMetrics {
-		assert.True(t, acc.HasIntField("rabbitmq_node", metric))
+		assert.True(t, acc.HasInt64Field("rabbitmq_node", metric))
 	}
 
 	assert.True(t, acc.HasMeasurement("rabbitmq_queue"))
diff --git a/plugins/inputs/rethinkdb/rethinkdb_data_test.go b/plugins/inputs/rethinkdb/rethinkdb_data_test.go
index 6159016c0..ce1d963b9 100644
--- a/plugins/inputs/rethinkdb/rethinkdb_data_test.go
+++ b/plugins/inputs/rethinkdb/rethinkdb_data_test.go
@@ -36,7 +36,7 @@ func TestAddEngineStats(t *testing.T) {
 	engine.AddEngineStats(keys, &acc, tags)
 
 	for _, metric := range keys {
-		assert.True(t, acc.HasIntField("rethinkdb_engine", metric))
+		assert.True(t, acc.HasInt64Field("rethinkdb_engine", metric))
 	}
 }
 
@@ -67,7 +67,7 @@ func TestAddEngineStatsPartial(t *testing.T) {
 	engine.AddEngineStats(keys, &acc, tags)
 
 	for _, metric := range missing_keys {
-		assert.False(t, acc.HasIntField("rethinkdb", metric))
+		assert.False(t, acc.HasInt64Field("rethinkdb", metric))
 	}
 }
 
@@ -107,6 +107,6 @@ func TestAddStorageStats(t *testing.T) {
 	storage.AddStats(&acc, tags)
 
 	for _, metric := range keys {
-		assert.True(t, acc.HasIntField("rethinkdb", metric))
+		assert.True(t, acc.HasInt64Field("rethinkdb", metric))
 	}
 }
diff --git a/plugins/inputs/system/processes_test.go b/plugins/inputs/system/processes_test.go
index eef52cd67..8a9b0fb6b 100644
--- a/plugins/inputs/system/processes_test.go
+++ b/plugins/inputs/system/processes_test.go
@@ -20,10 +20,10 @@ func TestProcesses(t *testing.T) {
 	err := processes.Gather(&acc)
 	require.NoError(t, err)
 
-	assert.True(t, acc.HasIntField("processes", "running"))
-	assert.True(t, acc.HasIntField("processes", "sleeping"))
-	assert.True(t, acc.HasIntField("processes", "stopped"))
-	assert.True(t, acc.HasIntField("processes", "total"))
+	assert.True(t, acc.HasInt64Field("processes", "running"))
+	assert.True(t, acc.HasInt64Field("processes", "sleeping"))
+	assert.True(t, acc.HasInt64Field("processes", "stopped"))
+	assert.True(t, acc.HasInt64Field("processes", "total"))
 	total, ok := acc.Get("processes")
 	require.True(t, ok)
 	assert.True(t, total.Fields["total"].(int64) > 0)
diff --git a/plugins/inputs/zookeeper/zookeeper_test.go b/plugins/inputs/zookeeper/zookeeper_test.go
index e8bcc11d5..37cabbada 100644
--- a/plugins/inputs/zookeeper/zookeeper_test.go
+++ b/plugins/inputs/zookeeper/zookeeper_test.go
@@ -37,6 +37,6 @@ func TestZookeeperGeneratesMetrics(t *testing.T) {
 	}
 
 	for _, metric := range intMetrics {
-		assert.True(t, acc.HasIntField("zookeeper", metric), metric)
+		assert.True(t, acc.HasInt64Field("zookeeper", metric), metric)
 	}
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index c0f2caf22..e46476a8b 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -317,6 +317,24 @@ func (a *Accumulator) HasField(measurement string, field string) bool {
 
 // HasIntField returns true if the measurement has an Int value
 func (a *Accumulator) HasIntField(measurement string, field string) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					_, ok := value.(int)
+					return ok
+				}
+			}
+		}
+	}
+
+	return false
+}
+
+// HasInt64Field returns true if the measurement has an Int64 value
+func (a *Accumulator) HasInt64Field(measurement string, field string) bool {
 	a.Lock()
 	defer a.Unlock()
 	for _, p := range a.Metrics {

From c53d9fa9b760d1db9558f3b9b458e41e467dde70 Mon Sep 17 00:00:00 2001
From: Timo Mihaljov <timo@mihaljov.info>
Date: Wed, 17 May 2017 03:33:35 +0300
Subject: [PATCH 0267/1302] Handle process termination during read from /proc
 (#2816)

Fixes #2815.
---
 plugins/inputs/system/processes.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index 202bdf058..09aa37afb 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"syscall"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -195,6 +196,13 @@ func readProcFile(filename string) ([]byte, error) {
 		if os.IsNotExist(err) {
 			return nil, nil
 		}
+
+		// Reading from /proc/<PID> fails with ESRCH if the process has
+		// been terminated between open() and read().
+		if perr, ok := err.(*os.PathError); ok && perr.Err == syscall.ESRCH {
+			return nil, nil
+		}
+
 		return nil, err
 	}
 

From 7155e90f662ec960a819e4c92fc54507e8985173 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 16 May 2017 17:37:51 -0700
Subject: [PATCH 0268/1302] Update changelog for #2815

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6e6b0b59..2c462fb8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
+- [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 
 ## v1.3 [2017-05-15]
 

From 501c22478e2744f40188d3b63dbb4b0ad498b8eb Mon Sep 17 00:00:00 2001
From: mced <cedric.menassa@railnova.eu>
Date: Thu, 18 May 2017 22:52:56 +0200
Subject: [PATCH 0269/1302] [enh] set db_version at 0 if query version fails
 (#2819)

---
 CHANGELOG.md                                                  | 1 +
 plugins/inputs/postgresql_extensible/postgresql_extensible.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c462fb8e..b54737e4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Bugfixes
 
+- [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 24326511e..1536f115c 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -141,7 +141,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	query = `select substring(setting from 1 for 3) as version from pg_settings where name='server_version_num'`
 	err = db.QueryRow(query).Scan(&db_version)
 	if err != nil {
-		return err
+		db_version = 0
 	}
 	// We loop in order to process each query
 	// Query is not run if Database version does not match the query version.

From 93e638d63ec7f8ec71d95261bd28e4393d6e8092 Mon Sep 17 00:00:00 2001
From: rsingh2411 <rsingh2411@users.noreply.github.com>
Date: Fri, 19 May 2017 05:28:34 +0530
Subject: [PATCH 0270/1302] Add Docker container environment variables as tags.
 Only whitelisted #2580 (#2581)

---
 CHANGELOG.md                         |  1 +
 plugins/inputs/docker/README.md      |  2 ++
 plugins/inputs/docker/docker.go      | 32 ++++++++++++++++++++++++++++
 plugins/inputs/docker/docker_test.go | 10 +++++++++
 plugins/inputs/docker/fake_client.go | 21 ++++++++++++++++++
 5 files changed, 66 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b54737e4c..f0485267f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Features
 
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
+- [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 
 ### Bugfixes
 
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index c6b14bdc2..12741d940 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -36,6 +36,8 @@ for the stat structure can be found
   docker_label_include = []
   docker_label_exclude = []
   
+  ## Which environment variables should we use as a tag
+  tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index a439af068..13ade3945 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -31,6 +31,7 @@ type Docker struct {
 	Timeout        internal.Duration
 	PerDevice      bool     `toml:"perdevice"`
 	Total          bool     `toml:"total"`
+	TagEnvironment []string `toml:"tag_env"`
 	LabelInclude   []string `toml:"docker_label_include"`
 	LabelExclude   []string `toml:"docker_label_exclude"`
 
@@ -79,6 +80,18 @@ func statsWrapper(
 	return fc.ContainerStats(ctx, containerID, stream)
 }
 
+func inspectWrapper(
+	c *client.Client,
+	ctx context.Context,
+	containerID string,
+) (types.ContainerJSON, error) {
+	if c != nil {
+		return c.ContainerInspect(ctx, containerID)
+	}
+	fc := FakeDockerClient{}
+	return fc.ContainerInspect(ctx, containerID)
+}
+
 // KB, MB, GB, TB, PB...human friendly
 const (
 	KB = 1000
@@ -107,6 +120,8 @@ var sampleConfig = `
   perdevice = true
   ## Whether to report for each container total blkio and network stats or not
   total = false
+  ## Which environment variables should we use as a tag
+  ##tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 
   ## docker labels to include and exclude as tags.  Globs accepted.
   ## Note that an empty array for both will include all labels as tags
@@ -321,6 +336,23 @@ func (d *Docker) gatherContainer(
 		}
 	}
 
+	// Add whitelisted environment variables to tags
+	if len(d.TagEnvironment) > 0 {
+		info, err := inspectWrapper(d.client, ctx, container.ID)
+		if err != nil {
+			return fmt.Errorf("Error inspecting docker container: %s", err.Error())
+		}
+		for _, envvar := range info.Config.Env {
+			for _, configvar := range d.TagEnvironment {
+				dock_env := strings.SplitN(envvar, "=", 2)
+				//check for presence of tag in whitelist
+				if len(dock_env) == 2 && len(strings.TrimSpace(dock_env[1])) != 0 && configvar == dock_env[0] {
+					tags[dock_env[0]] = dock_env[1]
+				}
+			}
+		}
+	}
+
 	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total)
 
 	return nil
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index cc385bd5d..025d482fe 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -300,6 +300,8 @@ func TestDockerGatherInfo(t *testing.T) {
 	d := Docker{
 		client:  nil,
 		testing: true,
+		TagEnvironment: []string{"ENVVAR1", "ENVVAR2", "ENVVAR3", "ENVVAR5",
+			"ENVVAR6", "ENVVAR7", "ENVVAR8", "ENVVAR9"},
 	}
 
 	err := acc.GatherError(d.Gather)
@@ -345,6 +347,10 @@ func TestDockerGatherInfo(t *testing.T) {
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
+			"ENVVAR1":           "loremipsum",
+			"ENVVAR2":           "dolorsitamet",
+			"ENVVAR3":           "=ubuntu:10.04",
+			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 		},
@@ -393,6 +399,10 @@ func TestDockerGatherInfo(t *testing.T) {
 			"container_name":    "etcd2",
 			"container_image":   "quay.io:4443/coreos/etcd",
 			"container_version": "v2.2.2",
+			"ENVVAR1":           "loremipsum",
+			"ENVVAR2":           "dolorsitamet",
+			"ENVVAR3":           "=ubuntu:10.04",
+			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 		},
diff --git a/plugins/inputs/docker/fake_client.go b/plugins/inputs/docker/fake_client.go
index dcca6f235..f53afe1b1 100644
--- a/plugins/inputs/docker/fake_client.go
+++ b/plugins/inputs/docker/fake_client.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/registry"
 )
 
@@ -149,3 +150,23 @@ func (d FakeDockerClient) ContainerStats(ctx context.Context, containerID string
 	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
 	return stat, nil
 }
+
+func (d FakeDockerClient) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+	json := types.ContainerJSON{
+		Config: &container.Config{
+			Env: []string{
+				"ENVVAR1=loremipsum",
+				"ENVVAR1FOO=loremipsum",
+				"ENVVAR2=dolorsitamet",
+				"ENVVAR3==ubuntu:10.04",
+				"ENVVAR4",
+				"ENVVAR5=",
+				"ENVVAR6= ",
+				"ENVVAR7=ENVVAR8=ENVVAR9",
+				"PATH=/bin:/sbin",
+			},
+		},
+	}
+
+	return json, nil
+}

From c61cd73eff462d6734b31da10352dca51a9f44dd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 18 May 2017 18:11:49 -0700
Subject: [PATCH 0271/1302] Update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0485267f..cba7924f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,14 @@
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 
+## v1.3.1 [unreleased]
+
+### Bugfixes
+
+- [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
+- [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
+- [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
+
 ## v1.3 [2017-05-15]
 
 ### Release Notes

From 91690b1d3efa37b20db48d9d8782f787cefb1ee7 Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Fri, 19 May 2017 11:37:31 -0700
Subject: [PATCH 0272/1302] Consul plugin README typo (#2829)

---
 plugins/inputs/consul/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index 8241bae47..29027805b 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -1,6 +1,6 @@
 # Telegraf Input Plugin: Consul
 
-This plugin will collect statistics about all helath checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
+This plugin will collect statistics about all health checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
 to query the data. It will not report the [telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can report those stats already using StatsD protocol if needed.
 
 ## Configuration:

From 8fdc2aec809cbdba06b09c47853b170b6dc3e16f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 19 May 2017 18:03:13 -0700
Subject: [PATCH 0273/1302] Update dependency license file

---
 docs/LICENSE_OF_DEPENDENCIES.md | 114 +++++++++++++++++++++++---------
 1 file changed, 81 insertions(+), 33 deletions(-)

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index a367aa7fb..3b4d0a34d 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -1,33 +1,81 @@
-# List
-- collectd.org [MIT LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE)
-- github.com/Shopify/sarama [MIT LICENSE](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
-- github.com/Sirupsen/logrus [MIT LICENSE](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
-- github.com/armon/go-metrics [MIT LICENSE](https://github.com/armon/go-metrics/blob/master/LICENSE)
-- github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)
-- github.com/cenkalti/backoff [MIT LICENSE](https://github.com/cenkalti/backoff/blob/master/LICENSE)
-- github.com/dancannon/gorethink [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
-- github.com/eapache/go-resiliency [MIT LICENSE](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
-- github.com/eapache/queue [MIT LICENSE](https://github.com/eapache/queue/blob/master/LICENSE)
-- github.com/fsouza/go-dockerclient [BSD LICENSE](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
-- github.com/go-sql-driver/mysql [MPL LICENSE](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
-- github.com/gogo/protobuf [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE)
-- github.com/golang/protobuf [BSD LICENSE](https://github.com/golang/protobuf/blob/master/LICENSE)
-- github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE)
-- github.com/hashicorp/go-msgpack [BSD LICENSE](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
-- github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE)
-- github.com/hashicorp/raft-boltdb [MPL LICENSE](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
-- github.com/kardianos/service [ZLIB LICENSE](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
-- github.com/kballard/go-shellquote [MIT LICENSE](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
-- github.com/lib/pq [MIT LICENSE](https://github.com/lib/pq/blob/master/LICENSE.md)
-- github.com/matttproud/golang_protobuf_extensions [APACHE LICENSE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
-- github.com/naoina/go-stringutil [MIT LICENSE](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
-- github.com/naoina/toml [MIT LICENSE](https://github.com/naoina/toml/blob/master/LICENSE)
-- github.com/prometheus/client_golang [APACHE LICENSE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
-- github.com/samuel/go-zookeeper [BSD LICENSE](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
-- github.com/stretchr/objx [MIT LICENSE](github.com/stretchr/objx)
-- github.com/stretchr/testify [MIT LICENSE](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
-- github.com/wvanbergen/kafka [MIT LICENSE](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
-- github.com/wvanbergen/kazoo-go [MIT LICENSE](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
-- gopkg.in/dancannon/gorethink.v1 [APACHE LICENSE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
-- gopkg.in/mgo.v2 [BSD LICENSE](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
-- golang.org/x/crypto/ [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
+# Licenses of dependencies
+
+When distributed in a binary form, Telegraf contains portions of the following
+works:
+
+- collectd.org [MIT](https://github.com/collectd/go-collectd/blob/master/LICENSE)
+- github.com/aerospike/aerospike-client-go [APACHE](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
+- github.com/amir/raidman [PUBLIC DOMAIN](https://github.com/amir/raidman/blob/master/UNLICENSE)
+- github.com/armon/go-metrics [MIT](https://github.com/armon/go-metrics/blob/master/LICENSE)
+- github.com/aws/aws-sdk-go [APACHE](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
+- github.com/beorn7/perks [MIT](https://github.com/beorn7/perks/blob/master/LICENSE)
+- github.com/boltdb/bolt [MIT](https://github.com/boltdb/bolt/blob/master/LICENSE)
+- github.com/cenkalti/backoff [MIT](https://github.com/cenkalti/backoff/blob/master/LICENSE)
+- github.com/couchbase/go-couchbase [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
+- github.com/couchbase/gomemcached [MIT](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
+- github.com/couchbase/goutils [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
+- github.com/dancannon/gorethink [APACHE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
+- github.com/davecgh/go-spew [ISC](https://github.com/davecgh/go-spew/blob/master/LICENSE)
+- github.com/docker/docker [APACHE](https://github.com/docker/docker/blob/master/LICENSE)
+- github.com/eapache/go-resiliency [MIT](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
+- github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
+- github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
+- github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
+- github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
+- github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
+- github.com/gogo/protobuf [BSD](https://github.com/gogo/protobuf/blob/master/LICENSE)
+- github.com/golang/protobuf [BSD](https://github.com/golang/protobuf/blob/master/LICENSE)
+- github.com/golang/snappy [BSD](https://github.com/golang/snappy/blob/master/LICENSE)
+- github.com/gorilla/mux [BSD](https://github.com/gorilla/mux/blob/master/LICENSE)
+- github.com/go-sql-driver/mysql [MPL](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
+- github.com/hailocab/go-hostpool [MIT](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
+- github.com/hashicorp/consul [MPL](https://github.com/hashicorp/consul/blob/master/LICENSE)
+- github.com/hashicorp/go-msgpack [BSD](https://github.com/hashicorp/go-msgpack/blob/master/LICENSE)
+- github.com/hashicorp/raft-boltdb [MPL](https://github.com/hashicorp/raft-boltdb/blob/master/LICENSE)
+- github.com/hashicorp/raft [MPL](https://github.com/hashicorp/raft/blob/master/LICENSE)
+- github.com/influxdata/tail [MIT](https://github.com/influxdata/tail/blob/master/LICENSE.txt)
+- github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
+- github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
+- github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
+- github.com/kardianos/osext [BSD](https://github.com/kardianos/osext/blob/master/LICENSE)
+- github.com/kardianos/service [ZLIB](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
+- github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
+- github.com/klauspost/crc32 [BSD](https://github.com/klauspost/crc32/blob/master/LICENSE)
+- github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
+- github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
+- github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
+- github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
+- github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
+- github.com/nats-io/go-nats [MIT](https://github.com/nats-io/go-nats/blob/master/LICENSE)
+- github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
+- github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
+- github.com/nsqio/go-nsq [MIT](https://github.com/nsqio/go-nsq/blob/master/LICENSE)
+- github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
+- github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
+- github.com/prometheus/client_golang [APACHE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
+- github.com/prometheus/client_model [APACHE](https://github.com/prometheus/client_model/blob/master/LICENSE)
+- github.com/prometheus/common [APACHE](https://github.com/prometheus/common/blob/master/LICENSE)
+- github.com/prometheus/procfs [APACHE](https://github.com/prometheus/procfs/blob/master/LICENSE)
+- github.com/rcrowley/go-metrics [BSD](https://github.com/rcrowley/go-metrics/blob/master/LICENSE)
+- github.com/samuel/go-zookeeper [BSD](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
+- github.com/satori/go.uuid [MIT](https://github.com/satori/go.uuid/blob/master/LICENSE)
+- github.com/shirou/gopsutil [BSD](https://github.com/shirou/gopsutil/blob/master/LICENSE)
+- github.com/Shopify/sarama [MIT](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
+- github.com/Sirupsen/logrus [MIT](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
+- github.com/soniah/gosnmp [BSD](https://github.com/soniah/gosnmp/blob/master/LICENSE)
+- github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
+- github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
+- github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
+- github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)
+- github.com/wvanbergen/kafka [MIT](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
+- github.com/wvanbergen/kazoo-go [MIT](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
+- github.com/yuin/gopher-lua [MIT](https://github.com/yuin/gopher-lua/blob/master/LICENSE)
+- github.com/zensqlmonitor/go-mssqldb [BSD](https://github.com/zensqlmonitor/go-mssqldb/blob/master/LICENSE.txt)
+- golang.org/x/crypto [BSD](https://github.com/golang/crypto/blob/master/LICENSE)
+- golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
+- golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
+- gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
+- gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
+- gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
+- gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
+- gopkg.in/yaml.v2 [APACHE](https://github.com/go-yaml/yaml/blob/v2/LICENSE)

From 9ab688d62cc2e8d95edcf272ae8522c23b1fad99 Mon Sep 17 00:00:00 2001
From: Steven Burgart <skburgart@gmail.com>
Date: Mon, 22 May 2017 14:58:00 -0400
Subject: [PATCH 0274/1302] Fix multiple plugin loading in win_perf_counters
 (#2800)

---
 .../win_perf_counters/win_perf_counters.go    | 74 ++++---------------
 1 file changed, 13 insertions(+), 61 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 3cc946669..2437e724a 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -65,18 +65,13 @@ var sampleConfig = `
     Measurement = "win_mem"
 `
 
-// Valid queries end up in this map.
-var gItemList = make(map[int]*item)
-
-var configParsed bool
-var testConfigParsed bool
-var testObject string
-
 type Win_PerfCounters struct {
 	PrintValid      bool
-	TestName        string
 	PreVistaSupport bool
 	Object          []perfobject
+
+	configParsed bool
+	itemCache    []*item
 }
 
 type perfobject struct {
@@ -89,12 +84,6 @@ type perfobject struct {
 	IncludeTotal  bool
 }
 
-// Parsed configuration ends up here after it has been validated for valid
-// Performance Counter paths
-type itemList struct {
-	items map[int]*item
-}
-
 type item struct {
 	query         string
 	objectName    string
@@ -109,7 +98,7 @@ type item struct {
 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")
 
-func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName string, counter string, instance string,
+func (m *Win_PerfCounters) AddItem(query string, objectName string, counter string, instance string,
 	measurement string, include_total bool) error {
 
 	var handle PDH_HQUERY
@@ -128,15 +117,10 @@ func (m *Win_PerfCounters) AddItem(metrics *itemList, query string, objectName s
 		return errors.New(PdhFormatError(ret))
 	}
 
-	temp := &item{query, objectName, counter, instance, measurement,
+	newItem := &item{query, objectName, counter, instance, measurement,
 		include_total, handle, counterHandle}
-	index := len(gItemList)
-	gItemList[index] = temp
+	m.itemCache = append(m.itemCache, newItem)
 
-	if metrics.items == nil {
-		metrics.items = make(map[int]*item)
-	}
-	metrics.items[index] = temp
 	return nil
 }
 
@@ -148,11 +132,9 @@ func (m *Win_PerfCounters) SampleConfig() string {
 	return sampleConfig
 }
 
-func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
+func (m *Win_PerfCounters) ParseConfig() error {
 	var query string
 
-	configParsed = true
-
 	if len(m.Object) > 0 {
 		for _, PerfObject := range m.Object {
 			for _, counter := range PerfObject.Counters {
@@ -165,7 +147,7 @@ func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
 						query = "\\" + objectname + "(" + instance + ")\\" + counter
 					}
 
-					err := m.AddItem(metrics, query, objectname, counter, instance,
+					err := m.AddItem(query, objectname, counter, instance,
 						PerfObject.Measurement, PerfObject.IncludeTotal)
 
 					if err == nil {
@@ -191,41 +173,11 @@ func (m *Win_PerfCounters) ParseConfig(metrics *itemList) error {
 	}
 }
 
-func (m *Win_PerfCounters) Cleanup(metrics *itemList) {
-	// Cleanup
-
-	for _, metric := range metrics.items {
-		ret := PdhCloseQuery(metric.handle)
-		_ = ret
-	}
-}
-
-func (m *Win_PerfCounters) CleanupTestMode() {
-	// Cleanup for the testmode.
-
-	for _, metric := range gItemList {
-		ret := PdhCloseQuery(metric.handle)
-		_ = ret
-	}
-}
-
 func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
-	metrics := itemList{}
-
-	// Both values are empty in normal use.
-	if m.TestName != testObject {
-		// Cleanup any handles before emptying the global variable containing valid queries.
-		m.CleanupTestMode()
-		gItemList = make(map[int]*item)
-		testObject = m.TestName
-		testConfigParsed = true
-		configParsed = false
-	}
-
-	// We only need to parse the config during the init, it uses the global variable after.
-	if configParsed == false {
-
-		err := m.ParseConfig(&metrics)
+	// Parse the config once
+	if !m.configParsed {
+		err := m.ParseConfig()
+		m.configParsed = true
 		if err != nil {
 			return err
 		}
@@ -237,7 +189,7 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
 
 	// For iterate over the known metrics and get the samples.
-	for _, metric := range gItemList {
+	for _, metric := range m.itemCache {
 		// collect
 		ret := PdhCollectQueryData(metric.handle)
 		if ret == ERROR_SUCCESS {

From b0bd4d55f5a1c9ff1eb8238fb374b76a78e0da60 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 22 May 2017 12:01:22 -0700
Subject: [PATCH 0275/1302] Update CHANGELOG with fixed issue #1137

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cba7924f0..2163a49f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
+- [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 
 ## v1.3.1 [unreleased]
 

From 1459fab4d678a6eb7fa9edc8500cb3c1a3f6706a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 22 May 2017 12:06:48 -0700
Subject: [PATCH 0276/1302] Remove changelog item from pull request template

Person who merges PR is now expected to update the CHANGELOG.
---
 .github/PULL_REQUEST_TEMPLATE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2e838a8e4..527555bdf 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 ### Required for all PRs:
 
-- [ ] CHANGELOG.md updated (we recommend not updating this until the PR has been approved by a maintainer)
-- [ ] Sign [CLA](https://influxdata.com/community/cla/) (if not already signed)
-- [ ] README.md updated (if adding a new plugin)
+- [ ] Signed [CLA](https://influxdata.com/community/cla/).
+- [ ] Associated README.md updated.
+- [ ] Has appropriate unit tests.

From 7d198f0a6830e594d963df32ea9cf6c0c20106b3 Mon Sep 17 00:00:00 2001
From: Matteo Cerutti <matteo.cerutti@hotmail.co.uk>
Date: Mon, 22 May 2017 21:41:34 +0100
Subject: [PATCH 0277/1302] Add timeout option to ipmi_sensor plugin - solves
 #2817 (#2818)

---
 CHANGELOG.md                            |  1 +
 plugins/inputs/ipmi_sensor/README.md    |  7 +++++++
 plugins/inputs/ipmi_sensor/ipmi.go      | 11 ++++++++++-
 plugins/inputs/ipmi_sensor/ipmi_test.go |  6 +++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2163a49f2..e95077d49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
+- [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
 
 ### Bugfixes
 
diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index 3a75d0c65..a1f6c8129 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -43,6 +43,13 @@ The `server` tag will be made available when retrieving stats from remote server
   ## if no servers are specified, local machine sensor stats will be queried
   ##
   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+
+  ## Recomended: use metric 'interval' that is a multiple of 'timeout' to avoid
+  ## gaps or overlap in pulled data
+  interval = "30s"
+
+  ## Timeout for the ipmitool command to complete. Default is 20 seconds.
+  timeout = "20s"
 ```
 
 ## Output
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index 73f22b393..3b03e62ad 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -19,6 +19,7 @@ var (
 type Ipmi struct {
 	Path    string
 	Servers []string
+	Timeout internal.Duration
 }
 
 var sampleConfig = `
@@ -33,6 +34,13 @@ var sampleConfig = `
   ## if no servers are specified, local machine sensor stats will be queried
   ##
   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+
+  ## Recomended: use metric 'interval' that is a multiple of 'timeout' to avoid
+  ## gaps or overlap in pulled data
+  interval = "30s"
+
+  ## Timeout for the ipmitool command to complete
+  timeout = "20s"
 `
 
 func (m *Ipmi) SampleConfig() string {
@@ -78,7 +86,7 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 
 	opts = append(opts, "sdr")
 	cmd := execCommand(m.Path, opts...)
-	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
+	out, err := internal.CombinedOutputTimeout(cmd, m.Timeout.Duration)
 	if err != nil {
 		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
 	}
@@ -152,6 +160,7 @@ func init() {
 	if len(path) > 0 {
 		m.Path = path
 	}
+	m.Timeout = internal.Duration{Duration: time.Second * 20}
 	inputs.Add("ipmi_sensor", func() telegraf.Input {
 		m := m
 		return &m
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index 9e846065e..a6f5148c1 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -5,7 +5,9 @@ import (
 	"os"
 	"os/exec"
 	"testing"
+	"time"
 
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -15,6 +17,7 @@ func TestGather(t *testing.T) {
 	i := &Ipmi{
 		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
 		Path:    "ipmitool",
+		Timeout: internal.Duration{Duration: time.Second * 5},
 	}
 	// overwriting exec commands with mock commands
 	execCommand = fakeExecCommand
@@ -118,7 +121,8 @@ func TestGather(t *testing.T) {
 	}
 
 	i = &Ipmi{
-		Path: "ipmitool",
+		Path:    "ipmitool",
+		Timeout: internal.Duration{Duration: time.Second * 5},
 	}
 
 	err = acc.GatherError(i.Gather)

From 9148871608b7fdd8b4e9799ec47481c7b9ecb3bf Mon Sep 17 00:00:00 2001
From: Sylvain Boily <sylvain.boily@gmail.com>
Date: Thu, 25 May 2017 16:06:27 -0400
Subject: [PATCH 0278/1302] Documentation privilege requirements for specific
 procstat metrics (#2787)

---
 plugins/inputs/procstat/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 7f3d468cc..13f7e86ab 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -50,14 +50,14 @@ Note: prefix can be set by the user, per process.
 Threads related measurement names:
 - procstat_[prefix_]num_threads value=5
 
-File descriptor related measurement names:
+File descriptor related measurement names (*telegraf* needs to run as **root**):
 - procstat_[prefix_]num_fds value=4
 
 Context switch related measurement names:
 - procstat_[prefix_]voluntary_context_switches value=250
 - procstat_[prefix_]involuntary_context_switches value=0
 
-I/O related measurement names:
+I/O related measurement names (*telegraf* needs to run as **root**):
 - procstat_[prefix_]read_count value=396
 - procstat_[prefix_]write_count value=1
 - procstat_[prefix_]read_bytes value=1019904

From a96f85c847a1bdfca6ac6a49bb73b6124619106b Mon Sep 17 00:00:00 2001
From: Olivier Lambert <olivier.lambert@vates.fr>
Date: Thu, 25 May 2017 22:07:49 +0200
Subject: [PATCH 0279/1302] Add documentation for fetching metrics on Caddy
 HTTP and Prometheus (#2853)

---
 README.md                           |  2 +-
 plugins/inputs/prometheus/README.md | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c7d40b28..6a3027e09 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ configuration options.
 * [postgresql_extensible](./plugins/inputs/postgresql_extensible)
 * [powerdns](./plugins/inputs/powerdns)
 * [procstat](./plugins/inputs/procstat)
-* [prometheus](./plugins/inputs/prometheus)
+* [prometheus](./plugins/inputs/prometheus) (can be used for [Caddy server](./plugins/inputs/prometheus/README.md#usage-for-caddy-http-server))
 * [puppetagent](./plugins/inputs/puppetagent)
 * [rabbitmq](./plugins/inputs/rabbitmq)
 * [raindrops](./plugins/inputs/raindrops)
diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index 1a96f127e..15e61bd65 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -61,6 +61,24 @@ to filter and some tags
   ssl_key = '/path/to/keyfile'
 ```
 
+### Usage for Caddy HTTP server
+
+If you want to monitor Caddy, you need to use Caddy with its Prometheus plugin:
+
+* Download Caddy+Prometheus plugin [here](https://caddyserver.com/download/linux/amd64?plugins=http.prometheus)
+* Add the `prometheus` directive in your `CaddyFile`
+* Restart Caddy
+* Configure Telegraf to fetch metrics on it:
+
+```
+[[inputs.prometheus]]
+#   ## An array of urls to scrape metrics from.
+  urls = ["http://localhost:9180/metrics"]
+```
+
+> This is the default URL where Caddy Prometheus plugin will send data.
+> For more details, please read the [Caddy Prometheus documentation](https://github.com/miekg/caddy-prometheus/blob/master/README.md).
+
 ### Measurements & Fields & Tags:
 
 Measurements and fields could be any thing.

From f47924ffc5a20146dbfa14803ddce4e1121bf3b8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 25 May 2017 13:25:52 -0700
Subject: [PATCH 0280/1302] Fix influxdb output database quoting (#2851)

---
 plugins/outputs/influxdb/client/http.go   |  1 -
 plugins/outputs/influxdb/influxdb.go      | 10 +++++--
 plugins/outputs/influxdb/influxdb_test.go | 35 +++++++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 62ca1315b..4acea2362 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -16,7 +16,6 @@ var (
 	defaultRequestTimeout = time.Second * 5
 )
 
-//
 func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
 	// validate required parameters:
 	if len(config.URL) == 0 {
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index e44af7a79..4a0becbbc 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -16,6 +16,11 @@ import (
 	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
 )
 
+var (
+	// Quote Ident replacer.
+	qiReplacer = strings.NewReplacer("\n", `\n`, `\`, `\\`, `"`, `\"`)
+)
+
 // InfluxDB struct is the primary data structure for the plugin
 type InfluxDB struct {
 	// URL is only for backwards compatability
@@ -133,7 +138,7 @@ func (i *InfluxDB) Connect() error {
 			}
 			i.clients = append(i.clients, c)
 
-			err = c.Query("CREATE DATABASE " + i.Database)
+			err = c.Query(fmt.Sprintf(`CREATE DATABASE "%s"`, qiReplacer.Replace(i.Database)))
 			if err != nil {
 				if !strings.Contains(err.Error(), "Status Code [403]") {
 					log.Println("I! Database creation failed: " + err.Error())
@@ -191,7 +196,8 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 		if _, e := i.clients[n].WriteStream(r, bufsize); e != nil {
 			// If the database was not found, try to recreate it:
 			if strings.Contains(e.Error(), "database not found") {
-				if errc := i.clients[n].Query("CREATE DATABASE  " + i.Database); errc != nil {
+				errc := i.clients[n].Query(fmt.Sprintf(`CREATE DATABASE "%s"`, qiReplacer.Replace(i.Database)))
+				if errc != nil {
 					log.Printf("E! Error: Database %s not found and failed to recreate\n",
 						i.Database)
 				}
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 0ece8a1c2..fa0abd460 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -8,9 +8,44 @@ import (
 
 	"github.com/influxdata/telegraf/testutil"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestIdentQuoting(t *testing.T) {
+	var testCases = []struct {
+		database string
+		expected string
+	}{
+		{"x-y", `CREATE DATABASE "x-y"`},
+		{`x"y`, `CREATE DATABASE "x\"y"`},
+		{"x\ny", `CREATE DATABASE "x\ny"`},
+		{`x\y`, `CREATE DATABASE "x\\y"`},
+	}
+
+	for _, tc := range testCases {
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			r.ParseForm()
+			q := r.Form.Get("q")
+			assert.Equal(t, tc.expected, q)
+
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		}))
+		defer ts.Close()
+
+		i := InfluxDB{
+			URLs:     []string{ts.URL},
+			Database: tc.database,
+		}
+
+		err := i.Connect()
+		require.NoError(t, err)
+		require.NoError(t, i.Close())
+	}
+}
+
 func TestUDPInflux(t *testing.T) {
 	i := InfluxDB{
 		URLs: []string{"udp://localhost:8089"},

From e1088b9eee006411879fb9858aed541b72a6ed98 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 25 May 2017 13:39:16 -0700
Subject: [PATCH 0281/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e95077d49..35f5c4024 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
+- [#2851](https://github.com/influxdata/telegraf/pull/2851): Fix InfluxDB output database quoting.
 
 ## v1.3 [2017-05-15]
 

From 03ca3975b584c85a62b3269cb86a35153818ac9d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 25 May 2017 16:11:49 -0700
Subject: [PATCH 0282/1302] Update gopsutil version

fixes #2856
---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index aa9ace1ab..da3ccdc35 100644
--- a/Godeps
+++ b/Godeps
@@ -46,7 +46,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 70693b6a3da51a8a686d31f1b346077bbc066062
+github.com/shirou/gopsutil 9a4a9167ad3b4355dbf1c2c7a0f5f0d3fb1e9ab9
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987

From 7d7206b3e2fb34d8e16c16bb019394ab0b10423a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 25 May 2017 16:20:29 -0700
Subject: [PATCH 0283/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f5c4024..80c1b5ffc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#2851](https://github.com/influxdata/telegraf/pull/2851): Fix InfluxDB output database quoting.
+- [#2856](https://github.com/influxdata/telegraf/issues/2856): Fix net input on older Linux kernels.
 
 ## v1.3 [2017-05-15]
 

From 02d168705c48668b72df7d1f3c2e26d18e421b91 Mon Sep 17 00:00:00 2001
From: Matteo Cerutti <matteo.cerutti@hotmail.co.uk>
Date: Fri, 26 May 2017 20:09:43 +0100
Subject: [PATCH 0284/1302] MySQL input: log and continue on field parse error
 (#2855)

---
 plugins/inputs/mysql/mysql.go | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index e3861c82f..77ca7e47e 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -858,42 +858,45 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 		case "Queries":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["queries"] = i
 			}
-
-			fields["queries"] = i
 		case "Questions":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["questions"] = i
 			}
-
-			fields["questions"] = i
 		case "Slow_queries":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["slow_queries"] = i
 			}
-
-			fields["slow_queries"] = i
 		case "Connections":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["connections"] = i
 			}
-			fields["connections"] = i
 		case "Syncs":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["syncs"] = i
 			}
-			fields["syncs"] = i
 		case "Uptime":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
-				return err
+				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
+			} else {
+				fields["uptime"] = i
 			}
-			fields["uptime"] = i
 		}
 	}
 	// Send any remaining fields

From 24ea9fdc4d8ae1b9a347ed36f3389465c77236bf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 26 May 2017 12:12:18 -0700
Subject: [PATCH 0285/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80c1b5ffc..ca79f75f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
+- [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 
 ## v1.3.1 [unreleased]
 

From e7f9db297eb309f722597023a73d175e5ff81431 Mon Sep 17 00:00:00 2001
From: Steve Nardone <snardone@gmail.com>
Date: Tue, 30 May 2017 14:02:26 -0400
Subject: [PATCH 0286/1302] Fix panic in mongo input (#2848)

---
 plugins/inputs/mongodb/mongostat.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index c5ccf5a86..bddd3fda9 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -564,7 +564,7 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		// BEGIN code modification
 		if newStat.Repl.IsMaster.(bool) {
 			returnVal.NodeType = "PRI"
-		} else if newStat.Repl.Secondary.(bool) {
+		} else if newStat.Repl.Secondary != nil && newStat.Repl.Secondary.(bool) {
 			returnVal.NodeType = "SEC"
 		} else if newStat.Repl.ArbiterOnly != nil && newStat.Repl.ArbiterOnly.(bool) {
 			returnVal.NodeType = "ARB"

From 04aa732e94cb0ac59211742a7dd25da719e8d163 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 May 2017 11:04:39 -0700
Subject: [PATCH 0287/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca79f75f9..7a3d885d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#2851](https://github.com/influxdata/telegraf/pull/2851): Fix InfluxDB output database quoting.
 - [#2856](https://github.com/influxdata/telegraf/issues/2856): Fix net input on older Linux kernels.
+- [#2848](https://github.com/influxdata/telegraf/pull/2848): Fix panic in mongo input.
 
 ## v1.3 [2017-05-15]
 

From be03abd464772716440b9faeac715c6d80675d4a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 30 May 2017 17:38:32 -0700
Subject: [PATCH 0288/1302] Fix length calculation of split metric buffer
 (#2869)

---
 plugins/outputs/influxdb/influxdb.go      | 16 +++---
 plugins/outputs/influxdb/influxdb_test.go | 65 +++++++++++++++++++++++
 2 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 4a0becbbc..df3b34226 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -2,7 +2,6 @@ package influxdb
 
 import (
 	"fmt"
-	"io"
 	"log"
 	"math/rand"
 	"strings"
@@ -167,26 +166,29 @@ func (i *InfluxDB) Description() string {
 	return "Configuration for influxdb server to send metrics to"
 }
 
-func (i *InfluxDB) getReader(metrics []telegraf.Metric) io.Reader {
+func (i *InfluxDB) split(metrics []telegraf.Metric) []telegraf.Metric {
 	if !i.splitPayload {
-		return metric.NewReader(metrics)
+		return metrics
 	}
 
-	splitData := make([]telegraf.Metric, 0)
+	split := make([]telegraf.Metric, 0)
 	for _, m := range metrics {
-		splitData = append(splitData, m.Split(i.UDPPayload)...)
+		split = append(split, m.Split(i.UDPPayload)...)
 	}
-	return metric.NewReader(splitData)
+	return split
 }
 
 // Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
+	metrics = i.split(metrics)
+
 	bufsize := 0
 	for _, m := range metrics {
 		bufsize += m.Len()
 	}
-	r := i.getReader(metrics)
+
+	r := metric.NewReader(metrics)
 
 	// This will get set to nil if a successful write occurs
 	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index fa0abd460..04019794f 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -2,10 +2,15 @@ package influxdb
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
@@ -58,6 +63,35 @@ func TestUDPInflux(t *testing.T) {
 	require.NoError(t, i.Close())
 }
 
+func TestBasicSplit(t *testing.T) {
+	c := &MockClient{}
+	i := InfluxDB{
+		clients:      []client.Client{c},
+		UDPPayload:   50,
+		splitPayload: true,
+	}
+
+	// Input metrics:
+	// test1,tag1=value1 value1=1 value2=2 1257894000000000000\n
+	//
+	// Split metrics:
+	// test1,tag1=value1 value1=1 1257894000000000000\n
+	// test1,tag1=value1 value2=2 1257894000000000000\n
+	m, err := metric.New("test1",
+		map[string]string{"tag1": "value1"},
+		map[string]interface{}{"value1": 1.0, "value2": 2.0},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	require.NoError(t, err)
+
+	metrics := []telegraf.Metric{m}
+	err = i.Write(metrics)
+	require.Equal(t, 1, c.writeStreamCalled)
+	require.Equal(t, 94, c.contentLength)
+
+	require.NoError(t, err)
+}
+
 func TestHTTPInflux(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
@@ -199,3 +233,34 @@ func TestHTTPError_FieldTypeConflict(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, i.Close())
 }
+
+type MockClient struct {
+	writeStreamCalled int
+	contentLength     int
+}
+
+func (m *MockClient) Query(command string) error {
+	panic("not implemented")
+}
+
+func (m *MockClient) Write(b []byte) (int, error) {
+	panic("not implemented")
+}
+
+func (m *MockClient) WriteWithParams(b []byte, params client.WriteParams) (int, error) {
+	panic("not implemented")
+}
+
+func (m *MockClient) WriteStream(b io.Reader, contentLength int) (int, error) {
+	m.writeStreamCalled++
+	m.contentLength = contentLength
+	return 0, nil
+}
+
+func (m *MockClient) WriteStreamWithParams(b io.Reader, contentLength int, params client.WriteParams) (int, error) {
+	panic("not implemented")
+}
+
+func (m *MockClient) Close() error {
+	panic("not implemented")
+}

From 9529199a44ede8b259d2b8eda7da97bb2575fad2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 May 2017 17:39:46 -0700
Subject: [PATCH 0289/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a3d885d8..9efdd2eb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - [#2851](https://github.com/influxdata/telegraf/pull/2851): Fix InfluxDB output database quoting.
 - [#2856](https://github.com/influxdata/telegraf/issues/2856): Fix net input on older Linux kernels.
 - [#2848](https://github.com/influxdata/telegraf/pull/2848): Fix panic in mongo input.
+- [#2869](https://github.com/influxdata/telegraf/pull/2869): Fix length calculation of split metric buffer.
 
 ## v1.3 [2017-05-15]
 

From 0b6db905ffbc1e54b4d9a421e0841c520a2b035d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 31 May 2017 12:29:39 -0700
Subject: [PATCH 0290/1302] Generate sha256 hashes when packaging

---
 scripts/build.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index 7e6719aff..d391ec2e1 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -499,13 +499,12 @@ def build(version=None,
         logging.info("Time taken: {}s".format((end_time - start_time).total_seconds()))
     return True
 
-def generate_md5_from_file(path):
-    """Generate MD5 signature based on the contents of the file at path.
+def generate_sha256_from_file(path):
+    """Generate SHA256 hash signature based on the contents of the file at path.
     """
-    m = hashlib.md5()
+    m = hashlib.sha256()
     with open(path, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b""):
-            m.update(chunk)
+        m.update(f.read())
     return m.hexdigest()
 
 def generate_sig_from_file(path):
@@ -790,9 +789,10 @@ def main(args):
             if not upload_packages(packages, bucket_name=args.bucket, overwrite=args.upload_overwrite):
                 return 1
         logging.info("Packages created:")
-        for p in packages:
-            logging.info("{} (MD5={})".format(p.split('/')[-1:][0],
-                                              generate_md5_from_file(p)))
+        for filename in packages:
+            logging.info("%s (SHA256=%s)",
+                         os.path.basename(filename),
+                         generate_sha256_from_file(filename))
     if orig_branch != get_current_branch():
         logging.info("Moving back to original git branch: {}".format(args.branch))
         run("git checkout {}".format(orig_branch))

From 37e01808b550ae94ac029b6d64ff3a064caf763a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 31 May 2017 15:00:31 -0700
Subject: [PATCH 0291/1302] Set 1.3.1 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9efdd2eb2..128da4e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 
-## v1.3.1 [unreleased]
+## v1.3.1 [2017-05-31]
 
 ### Bugfixes
 

From 5bab4616ff3cb01e2f8a65509d1bcf85031de615 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 5 Jun 2017 12:44:29 -0700
Subject: [PATCH 0292/1302] Fix udp metric splitting (#2880)

---
 metric/reader.go                            |  10 +-
 metric/reader_test.go                       | 150 +++++++++++++++++++-
 plugins/outputs/influxdb/client/udp.go      |  27 +++-
 plugins/outputs/influxdb/client/udp_test.go |  81 ++++-------
 plugins/outputs/influxdb/influxdb.go        |  17 +--
 plugins/outputs/influxdb/influxdb_test.go   |  32 -----
 6 files changed, 204 insertions(+), 113 deletions(-)

diff --git a/metric/reader.go b/metric/reader.go
index df0729963..ef9d2977d 100644
--- a/metric/reader.go
+++ b/metric/reader.go
@@ -57,7 +57,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			// this for-loop is the sunny-day scenario, where we are given a
 			// buffer that is large enough to hold at least a single metric.
 			// all of the cases below it are edge-cases.
-			if r.metrics[r.iM].Len() < len(p[i:]) {
+			if r.metrics[r.iM].Len() <= len(p[i:]) {
 				i += r.metrics[r.iM].SerializeTo(p[i:])
 			} else {
 				break
@@ -76,7 +76,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			if len(tmp) > 1 {
 				r.splitMetrics = tmp
 				r.state = split
-				if r.splitMetrics[0].Len() < len(p) {
+				if r.splitMetrics[0].Len() <= len(p) {
 					i += r.splitMetrics[0].SerializeTo(p)
 					r.iSM = 1
 				} else {
@@ -99,7 +99,7 @@ func (r *reader) Read(p []byte) (n int, err error) {
 		}
 
 	case split:
-		if r.splitMetrics[r.iSM].Len() < len(p) {
+		if r.splitMetrics[r.iSM].Len() <= len(p) {
 			// write the current split metric
 			i += r.splitMetrics[r.iSM].SerializeTo(p)
 			r.iSM++
@@ -131,6 +131,10 @@ func (r *reader) Read(p []byte) (n int, err error) {
 			r.iSM++
 			if r.iSM == len(r.splitMetrics) {
 				r.iM++
+				if r.iM == len(r.metrics) {
+					r.state = done
+					return i, io.EOF
+				}
 				r.state = normal
 			} else {
 				r.state = split
diff --git a/metric/reader_test.go b/metric/reader_test.go
index a1c864ad5..1537fc960 100644
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func BenchmarkMetricReader(b *testing.B) {
@@ -116,6 +116,140 @@ func TestMetricReader_OverflowMetric(t *testing.T) {
 	}
 }
 
+// Regression test for when a metric is the same size as the buffer.
+//
+// Previously EOF would not be set until the next call to Read.
+func TestMetricReader_MetricSizeEqualsBufferSize(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, m1.Len())
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regression test for when a metric requires to be split and one of the
+// split metrics is exactly the size of the buffer.
+//
+// Previously an empty string would be returned on the next Read without error,
+// and then next Read call would panic.
+func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1), "bb": int64(2)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	//  foo a=1i,bb=2i 1481032190000000000\n // len 35
+	//
+	// Requires this specific split order:
+	//  foo a=1i 1481032190000000000\n  // len 29
+	//  foo bb=2i 1481032190000000000\n // len 30
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regresssion test for when a metric requires to be split and one of the
+// split metrics is larger than the buffer.
+//
+// Previously the metric index would be set incorrectly causing a panic.
+func TestMetricReader_SplitOverflowOversized(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{
+			"a":   int64(1),
+			"bbb": int64(2),
+		}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 30)
+
+	// foo a=1i,bbb=2i 1481032190000000000\n // len 36
+	//
+	// foo a=1i 1481032190000000000\n  // len 29
+	// foo bbb=2i 1481032190000000000\n // len 31
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
+// Regresssion test for when a split metric exactly fits in the buffer.
+//
+// Previously the metric would be overflow split when not required.
+func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
+	ts := time.Unix(1481032190, 0)
+	m1, _ := New("foo", map[string]string{},
+		map[string]interface{}{"a": int64(1), "b": int64(2)}, ts)
+	metrics := []telegraf.Metric{m1}
+
+	r := NewReader(metrics)
+	buf := make([]byte, 29)
+
+	// foo a=1i,b=2i 1481032190000000000\n // len 34
+	//
+	// foo a=1i 1481032190000000000\n  // len 29
+	// foo b=2i 1481032190000000000\n // len 29
+
+	for {
+		n, err := r.Read(buf)
+		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
+		if n == 0 {
+			require.Equal(t, io.EOF, err)
+			break
+		}
+		// Lines should be terminated with a LF
+		if err == io.EOF {
+			require.Equal(t, uint8('\n'), buf[n-1])
+			break
+		}
+		require.NoError(t, err)
+	}
+}
+
 func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
 	ts := time.Unix(1481032190, 0)
 	m, _ := New("foo", map[string]string{},
@@ -485,3 +619,17 @@ func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
 		assert.Equal(t, test.err, err, test.expRegex)
 	}
 }
+
+func TestMetricRoundtrip(t *testing.T) {
+	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
+nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000
+`
+	metrics, err := Parse([]byte(lp))
+	require.NoError(t, err)
+	r := NewReader(metrics)
+	buf := make([]byte, 128)
+	_, err = r.Read(buf)
+	require.NoError(t, err)
+	metrics, err = Parse(buf)
+	require.NoError(t, err)
+}
diff --git a/plugins/outputs/influxdb/client/udp.go b/plugins/outputs/influxdb/client/udp.go
index 89d6894a1..1dd4d9936 100644
--- a/plugins/outputs/influxdb/client/udp.go
+++ b/plugins/outputs/influxdb/client/udp.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"log"
 	"net"
 	"net/url"
 )
@@ -82,10 +83,28 @@ func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 		if err != io.EOF && err != nil {
 			return totaln, err
 		}
-		nW, err := c.conn.Write(c.buffer[0:nR])
-		totaln += nW
-		if err != nil {
-			return totaln, err
+
+		if c.buffer[nR-1] == uint8('\n') {
+			nW, err := c.conn.Write(c.buffer[0:nR])
+			totaln += nW
+			if err != nil {
+				return totaln, err
+			}
+		} else {
+			log.Printf("E! Could not fit point into UDP payload; dropping")
+			// Scan forward until next line break to realign.
+			for {
+				nR, err := r.Read(c.buffer)
+				if nR == 0 {
+					break
+				}
+				if err != io.EOF && err != nil {
+					return totaln, err
+				}
+				if c.buffer[nR-1] == uint8('\n') {
+					break
+				}
+			}
 		}
 	}
 	return totaln, nil
diff --git a/plugins/outputs/influxdb/client/udp_test.go b/plugins/outputs/influxdb/client/udp_test.go
index 84efe0b22..9308144b5 100644
--- a/plugins/outputs/influxdb/client/udp_test.go
+++ b/plugins/outputs/influxdb/client/udp_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	"net"
 	"testing"
 	"time"
@@ -10,6 +9,7 @@ import (
 	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestUDPClient(t *testing.T) {
@@ -72,63 +72,7 @@ func TestUDPClient_Write(t *testing.T) {
 	pkt := <-packets
 	assert.Equal(t, "cpu value=99\n", pkt)
 
-	metrics := `cpu value=99
-cpu value=55
-cpu value=44
-cpu value=101
-cpu value=91
-cpu value=92
-`
-	// test sending packet with 6 metrics in a stream.
-	reader := bytes.NewReader([]byte(metrics))
-	// contentLength is ignored:
-	n, err = client.WriteStream(reader, 10)
-	assert.Equal(t, n, len(metrics))
-	assert.NoError(t, err)
-	pkt = <-packets
-	assert.Equal(t, "cpu value=99\ncpu value=55\ncpu value=44\ncpu value=101\ncpu value=91\ncpu value=92\n", pkt)
-
-	//
-	// Test that UDP packets get broken up properly:
-	config2 := UDPConfig{
-		URL:         "udp://localhost:8199",
-		PayloadSize: 25,
-	}
-	client2, err := NewUDP(config2)
-	assert.NoError(t, err)
-
 	wp := WriteParams{}
-
-	//
-	// Using Write():
-	buf := []byte(metrics)
-	n, err = client2.WriteWithParams(buf, wp)
-	assert.Equal(t, n, len(metrics))
-	assert.NoError(t, err)
-	pkt = <-packets
-	assert.Equal(t, "cpu value=99\ncpu value=55", pkt)
-	pkt = <-packets
-	assert.Equal(t, "\ncpu value=44\ncpu value=1", pkt)
-	pkt = <-packets
-	assert.Equal(t, "01\ncpu value=91\ncpu value", pkt)
-	pkt = <-packets
-	assert.Equal(t, "=92\n", pkt)
-
-	//
-	// Using WriteStream():
-	reader = bytes.NewReader([]byte(metrics))
-	n, err = client2.WriteStreamWithParams(reader, 10, wp)
-	assert.Equal(t, n, len(metrics))
-	assert.NoError(t, err)
-	pkt = <-packets
-	assert.Equal(t, "cpu value=99\ncpu value=55", pkt)
-	pkt = <-packets
-	assert.Equal(t, "\ncpu value=44\ncpu value=1", pkt)
-	pkt = <-packets
-	assert.Equal(t, "01\ncpu value=91\ncpu value", pkt)
-	pkt = <-packets
-	assert.Equal(t, "=92\n", pkt)
-
 	//
 	// Using WriteStream() & a metric.Reader:
 	config3 := UDPConfig{
@@ -159,4 +103,27 @@ cpu value=92
 	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
 
 	assert.NoError(t, client.Close())
+
+	config = UDPConfig{
+		URL:         "udp://localhost:8199",
+		PayloadSize: 40,
+	}
+	client4, err := NewUDP(config)
+	assert.NoError(t, err)
+
+	ts := time.Unix(1484142943, 0)
+	m1, _ = metric.New("test", map[string]string{},
+		map[string]interface{}{"this_is_a_very_long_field_name": 1.1}, ts)
+	m2, _ = metric.New("test", map[string]string{},
+		map[string]interface{}{"value": 1.1}, ts)
+	ms = []telegraf.Metric{m1, m2}
+	reader := metric.NewReader(ms)
+	n, err = client4.WriteStream(reader, 0)
+	assert.NoError(t, err)
+	require.Equal(t, 35, n)
+	assert.NoError(t, err)
+	pkt = <-packets
+	assert.Equal(t, "test value=1.1 1484142943000000000\n", pkt)
+
+	assert.NoError(t, client4.Close())
 }
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index df3b34226..fe1adc4bb 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -46,8 +46,7 @@ type InfluxDB struct {
 	// Precision is only here for legacy support. It will be ignored.
 	Precision string
 
-	clients      []client.Client
-	splitPayload bool
+	clients []client.Client
 }
 
 var sampleConfig = `
@@ -115,7 +114,6 @@ func (i *InfluxDB) Connect() error {
 				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
 			}
 			i.clients = append(i.clients, c)
-			i.splitPayload = true
 		default:
 			// If URL doesn't start with "udp", assume HTTP client
 			config := client.HTTPConfig{
@@ -166,22 +164,9 @@ func (i *InfluxDB) Description() string {
 	return "Configuration for influxdb server to send metrics to"
 }
 
-func (i *InfluxDB) split(metrics []telegraf.Metric) []telegraf.Metric {
-	if !i.splitPayload {
-		return metrics
-	}
-
-	split := make([]telegraf.Metric, 0)
-	for _, m := range metrics {
-		split = append(split, m.Split(i.UDPPayload)...)
-	}
-	return split
-}
-
 // Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
-	metrics = i.split(metrics)
 
 	bufsize := 0
 	for _, m := range metrics {
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 04019794f..5dfa63c66 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -6,10 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"time"
 
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
 	"github.com/influxdata/telegraf/testutil"
 
@@ -63,35 +60,6 @@ func TestUDPInflux(t *testing.T) {
 	require.NoError(t, i.Close())
 }
 
-func TestBasicSplit(t *testing.T) {
-	c := &MockClient{}
-	i := InfluxDB{
-		clients:      []client.Client{c},
-		UDPPayload:   50,
-		splitPayload: true,
-	}
-
-	// Input metrics:
-	// test1,tag1=value1 value1=1 value2=2 1257894000000000000\n
-	//
-	// Split metrics:
-	// test1,tag1=value1 value1=1 1257894000000000000\n
-	// test1,tag1=value1 value2=2 1257894000000000000\n
-	m, err := metric.New("test1",
-		map[string]string{"tag1": "value1"},
-		map[string]interface{}{"value1": 1.0, "value2": 2.0},
-		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
-	)
-	require.NoError(t, err)
-
-	metrics := []telegraf.Metric{m}
-	err = i.Write(metrics)
-	require.Equal(t, 1, c.writeStreamCalled)
-	require.Equal(t, 94, c.contentLength)
-
-	require.NoError(t, err)
-}
-
 func TestHTTPInflux(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {

From a47e6e6efe9e4aa4a886788eb484a25e9e34a7d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Jun 2017 12:46:50 -0700
Subject: [PATCH 0293/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128da4e44..4afdfb6d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,12 @@
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 
+## v1.3.2 [unreleased]
+
+### Bugfixes
+
+- [#2880](https://github.com/influxdata/telegraf/pull/2880): Fix InfluxDB UDP metric splitting.
+
 ## v1.3.1 [2017-05-31]
 
 ### Bugfixes

From 035905d65e13599c71f1c758e2e44e1184eef74d Mon Sep 17 00:00:00 2001
From: Sebastian Borza <sebito91@gmail.com>
Date: Mon, 5 Jun 2017 16:45:11 -0500
Subject: [PATCH 0294/1302] Add timezone support to logparser timestamps
 (#2882)

---
 plugins/inputs/logparser/README.md            |  26 ++-
 plugins/inputs/logparser/grok/grok.go         |  31 ++-
 plugins/inputs/logparser/grok/grok_test.go    | 186 +++++++++++++++++-
 .../inputs/logparser/grok/influx_patterns.go  |   2 +-
 plugins/inputs/logparser/logparser.go         |  26 ++-
 plugins/inputs/logparser/logparser_test.go    |   4 +-
 6 files changed, 259 insertions(+), 16 deletions(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 177d77a98..a2ed0a689 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -15,7 +15,10 @@ regex patterns.
   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
   ##   /var/log/apache.log -> only tail the apache log file
   files = ["/var/log/apache/access.log"]
-  ## Read file from beginning.
+  
+  ## Read files that currently exist from the beginning. Files that are created
+  ## while telegraf is running (and that match the "files" globs) will always
+  ## be read from the beginning.
   from_beginning = false
 
   ## Parse logstash-style "grok" patterns:
@@ -28,13 +31,27 @@ regex patterns.
     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
     patterns = ["%{COMBINED_LOG_FORMAT}"]
+
     ## Name of the outputted measurement name.
     measurement = "apache_access_log"
+    
     ## Full path(s) to custom pattern files.
     custom_pattern_files = []
+    
     ## Custom patterns can also be defined here. Put one pattern per line.
     custom_patterns = '''
     '''
+
+    ## Timezone allows you to provide an override for timestamps that 
+    ## don't already include an offset
+    ## e.g. 04/06/2016 12:41:45 data one two 5.43µs
+    ##
+    ## Default: "" which renders UTC
+    ## Options are as follows:
+    ##   1. Local             -- interpret based on machine localtime
+    ##   2. "Canada/Eastern"  -- Unix TZ values like those found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+    ##   3. UTC               -- or blank/unspecified, will return timestamp in UTC
+    timezone = "Canada/Eastern"
 ```
 
 ### Grok Parser
@@ -125,6 +142,13 @@ Wed Apr 12 13:10:34 PST 2017 value=42
     '''
 ```
 
+For cases where the timestamp itself is without offset, the `timezone` config var is available
+to denote an offset. By default (with `timezone` either omit, blank or set to `"UTC"`), the times
+are processed as if in the UTC timezone. If specified as `timezone = "Local"`, the timestamp
+will be processed based on the current machine timezone configuration. Lastly, if using a 
+timezone from the list of Unix [timezones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), the logparser grok will attempt to offset
+the timestamp accordingly. See test cases for more detailed examples.
+
 #### TOML Escaping
 
 When saving patterns to the configuration file, keep in mind the different TOML
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index ae23e5f51..0be18b54c 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -59,6 +59,7 @@ var (
 	patternOnlyRe = regexp.MustCompile(`%{(\w+)}`)
 )
 
+// Parser is the primary struct to handle and grok-patterns defined in the config toml
 type Parser struct {
 	Patterns []string
 	// namedPatterns is a list of internally-assigned names to the patterns
@@ -70,6 +71,16 @@ type Parser struct {
 	CustomPatternFiles []string
 	Measurement        string
 
+	// Timezone is an optional component to help render log dates to
+	// your chosen zone.
+	// Default: "" which renders UTC
+	// Options are as follows:
+	// 1. Local             -- interpret based on machine localtime
+	// 2. "America/Chicago" -- Unix TZ values like those found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+	// 3. UTC               -- or blank/unspecified, will return timestamp in UTC
+	Timezone string
+	loc      *time.Location
+
 	// typeMap is a map of patterns -> capture name -> modifier,
 	//   ie, {
 	//          "%{TESTLOG}":
@@ -105,6 +116,7 @@ type Parser struct {
 	tsModder *tsModder
 }
 
+// Compile is a bound method to Parser which will process the options for our parser
 func (p *Parser) Compile() error {
 	p.typeMap = make(map[string]map[string]string)
 	p.tsMap = make(map[string]map[string]string)
@@ -142,9 +154,9 @@ func (p *Parser) Compile() error {
 
 	// Parse any custom pattern files supplied.
 	for _, filename := range p.CustomPatternFiles {
-		file, err := os.Open(filename)
-		if err != nil {
-			return err
+		file, fileErr := os.Open(filename)
+		if fileErr != nil {
+			return fileErr
 		}
 
 		scanner := bufio.NewScanner(bufio.NewReader(file))
@@ -155,9 +167,16 @@ func (p *Parser) Compile() error {
 		p.Measurement = "logparser_grok"
 	}
 
+	p.loc, err = time.LoadLocation(p.Timezone)
+	if err != nil {
+		log.Printf("W! improper timezone supplied (%s), setting loc to UTC", p.Timezone)
+		p.loc, _ = time.LoadLocation("UTC")
+	}
+
 	return p.compileCustomPatterns()
 }
 
+// ParseLine is the primary function to process individual lines, returning the metrics
 func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	var err error
 	// values are the parsed fields from the log line
@@ -251,7 +270,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 			var foundTs bool
 			// first try timestamp layouts that we've already found
 			for _, layout := range p.foundTsLayouts {
-				ts, err := time.Parse(layout, v)
+				ts, err := time.ParseInLocation(layout, v, p.loc)
 				if err == nil {
 					timestamp = ts
 					foundTs = true
@@ -262,7 +281,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 			// layouts.
 			if !foundTs {
 				for _, layout := range timeLayouts {
-					ts, err := time.Parse(layout, v)
+					ts, err := time.ParseInLocation(layout, v, p.loc)
 					if err == nil {
 						timestamp = ts
 						foundTs = true
@@ -280,7 +299,7 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		case DROP:
 		// goodbye!
 		default:
-			ts, err := time.Parse(t, v)
+			ts, err := time.ParseInLocation(t, v, p.loc)
 			if err == nil {
 				timestamp = ts
 			} else {
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 64fb20c43..6d07b6eca 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -16,7 +16,7 @@ func Benchmark_ParseLine_CommonLogFormat(b *testing.B) {
 	p := &Parser{
 		Patterns: []string{"%{COMMON_LOG_FORMAT}"},
 	}
-	p.Compile()
+	_ = p.Compile()
 
 	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
@@ -29,7 +29,7 @@ func Benchmark_ParseLine_CombinedLogFormat(b *testing.B) {
 	p := &Parser{
 		Patterns: []string{"%{COMBINED_LOG_FORMAT}"},
 	}
-	p.Compile()
+	_ = p.Compile()
 
 	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
@@ -48,7 +48,7 @@ func Benchmark_ParseLine_CustomPattern(b *testing.B) {
 			TEST_LOG_A %{NUMBER:myfloat:float} %{RESPONSE_CODE} %{IPORHOST:clientip} %{RESPONSE_TIME}
 		`,
 	}
-	p.Compile()
+	_ = p.Compile()
 
 	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
@@ -707,3 +707,183 @@ func TestShortPatternRegression(t *testing.T) {
 		},
 		metric.Fields())
 }
+
+func TestTimezoneEmptyCompileFileAndParse(t *testing.T) {
+	p := &Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{"./testdata/test-patterns"},
+		Timezone:           "",
+	}
+	assert.NoError(t, p.Compile())
+
+	metricA, err := p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
+	require.NotNil(t, metricA)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		metricA.Fields())
+	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+
+	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
+	require.NotNil(t, metricB)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"myfloat":    1.25,
+			"mystring":   "mystring",
+			"nomodifier": "nomodifier",
+		},
+		metricB.Fields())
+	assert.Equal(t, map[string]string{}, metricB.Tags())
+	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
+}
+
+func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
+	p := &Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{"./testdata/test-patterns"},
+		Timezone:           "Something/Weird",
+	}
+	assert.NoError(t, p.Compile())
+
+	metricA, err := p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
+	require.NotNil(t, metricA)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		metricA.Fields())
+	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+
+	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
+	require.NotNil(t, metricB)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"myfloat":    1.25,
+			"mystring":   "mystring",
+			"nomodifier": "nomodifier",
+		},
+		metricB.Fields())
+	assert.Equal(t, map[string]string{}, metricB.Tags())
+	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
+}
+
+func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
+	p := &Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{"./testdata/test-patterns"},
+		Timezone:           "Europe/Berlin",
+	}
+	assert.NoError(t, p.Compile())
+
+	metricA, err := p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
+	require.NotNil(t, metricA)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		metricA.Fields())
+	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+
+	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
+	require.NotNil(t, metricB)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"myfloat":    1.25,
+			"mystring":   "mystring",
+			"nomodifier": "nomodifier",
+		},
+		metricB.Fields())
+	assert.Equal(t, map[string]string{}, metricB.Tags())
+	assert.Equal(t, int64(1465036905000000000), metricB.UnixNano())
+}
+
+func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
+	p := &Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{"./testdata/test-patterns"},
+		Timezone:           "Canada/Eastern",
+	}
+	assert.NoError(t, p.Compile())
+
+	metricA, err := p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
+	require.NotNil(t, metricA)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		metricA.Fields())
+	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+
+	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
+	require.NotNil(t, metricB)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"myfloat":    1.25,
+			"mystring":   "mystring",
+			"nomodifier": "nomodifier",
+		},
+		metricB.Fields())
+	assert.Equal(t, map[string]string{}, metricB.Tags())
+	assert.Equal(t, int64(1465058505000000000), metricB.UnixNano())
+}
+
+func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
+	p := &Parser{
+		Patterns:           []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"},
+		CustomPatternFiles: []string{"./testdata/test-patterns"},
+		Timezone:           "Local",
+	}
+	assert.NoError(t, p.Compile())
+
+	metricA, err := p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
+	require.NotNil(t, metricA)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"clientip":      "192.168.1.1",
+			"myfloat":       float64(1.25),
+			"response_time": int64(5432),
+			"myint":         int64(101),
+		},
+		metricA.Fields())
+	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
+	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+
+	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
+	require.NotNil(t, metricB)
+	assert.NoError(t, err)
+	assert.Equal(t,
+		map[string]interface{}{
+			"myfloat":    1.25,
+			"mystring":   "mystring",
+			"nomodifier": "nomodifier",
+		},
+		metricB.Fields())
+	assert.Equal(t, map[string]string{}, metricB.Tags())
+	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.UnixNano())
+}
diff --git a/plugins/inputs/logparser/grok/influx_patterns.go b/plugins/inputs/logparser/grok/influx_patterns.go
index 1b115dadd..6dc990622 100644
--- a/plugins/inputs/logparser/grok/influx_patterns.go
+++ b/plugins/inputs/logparser/grok/influx_patterns.go
@@ -1,6 +1,6 @@
 package grok
 
-// THIS SHOULD BE KEPT IN-SYNC WITH patterns/influx-patterns
+// DEFAULT_PATTERNS SHOULD BE KEPT IN-SYNC WITH patterns/influx-patterns
 const DEFAULT_PATTERNS = `
 # Captures are a slightly modified version of logstash "grok" patterns, with
 #  the format %{<capture syntax>[:<semantic name>][:<modifier>]}
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index b986aec7d..6fee34b61 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -16,11 +16,13 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/logparser/grok"
 )
 
+// LogParser in the primary interface for the plugin
 type LogParser interface {
 	ParseLine(line string) (telegraf.Metric, error)
 	Compile() error
 }
 
+// LogParserPlugin is the primary struct to implement the interface for logparser plugin
 type LogParserPlugin struct {
 	Files         []string
 	FromBeginning bool
@@ -45,6 +47,7 @@ const sampleConfig = `
   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
   ##   /var/log/apache.log -> only tail the apache log file
   files = ["/var/log/apache/access.log"]
+  
   ## Read files that currently exist from the beginning. Files that are created
   ## while telegraf is running (and that match the "files" globs) will always
   ## be read from the beginning.
@@ -60,23 +63,40 @@ const sampleConfig = `
     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
     patterns = ["%{COMBINED_LOG_FORMAT}"]
+    
     ## Name of the outputted measurement name.
     measurement = "apache_access_log"
+    
     ## Full path(s) to custom pattern files.
     custom_pattern_files = []
+    
     ## Custom patterns can also be defined here. Put one pattern per line.
     custom_patterns = '''
+    
+    ## Timezone allows you to provide an override for timestamps that 
+    ## don't already include an offset
+    ## e.g. 04/06/2016 12:41:45 data one two 5.43µs
+    ##
+    ## Default: "" which renders UTC
+    ## Options are as follows:
+    ##   1. Local             -- interpret based on machine localtime
+    ##   2. "Canada/Eastern"  -- Unix TZ values like those found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+    ##   3. UTC               -- or blank/unspecified, will return timestamp in UTC
+    timezone = "Canada/Eastern"
     '''
 `
 
+// SampleConfig returns the sample configuration for the plugin
 func (l *LogParserPlugin) SampleConfig() string {
 	return sampleConfig
 }
 
+// Description returns the human readable description for the plugin
 func (l *LogParserPlugin) Description() string {
 	return "Stream and parse log file(s)."
 }
 
+// Gather is the primary function to collect the metrics for the plugin
 func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 	l.Lock()
 	defer l.Unlock()
@@ -85,6 +105,7 @@ func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 	return l.tailNewfiles(true)
 }
 
+// Start kicks off collection of stats for the plugin
 func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	l.Lock()
 	defer l.Unlock()
@@ -113,7 +134,7 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	}
 
 	if len(l.parsers) == 0 {
-		return fmt.Errorf("ERROR: logparser input plugin: no parser defined.")
+		return fmt.Errorf("logparser input plugin: no parser defined")
 	}
 
 	// compile log parser patterns:
@@ -147,7 +168,7 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 		}
 		files := g.Match()
 
-		for file, _ := range files {
+		for file := range files {
 			if _, ok := l.tailers[file]; ok {
 				// we're already tailing this file
 				continue
@@ -225,6 +246,7 @@ func (l *LogParserPlugin) parser() {
 	}
 }
 
+// Stop will end the metrics collection process on file tailers
 func (l *LogParserPlugin) Stop() {
 	l.Lock()
 	defer l.Unlock()
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index b706c62d7..f2d93f265 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -102,9 +102,7 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 
 	assert.Equal(t, acc.NFields(), 0)
 
-	os.Symlink(
-		thisdir+"grok/testdata/test_a.log",
-		emptydir+"/test_a.log")
+	_ = os.Symlink(thisdir+"grok/testdata/test_a.log", emptydir+"/test_a.log")
 	assert.NoError(t, acc.GatherError(logparser.Gather))
 	acc.Wait(1)
 

From f9462d4fff7b382b54ce0f3eb888cce7b793119b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Jun 2017 14:47:34 -0700
Subject: [PATCH 0295/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4afdfb6d9..56cc00c80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
+- [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 
 ### Bugfixes
 

From 56a7ffe0e455711622a764b2e6c01597bd46fdf3 Mon Sep 17 00:00:00 2001
From: Mariusz Brzeski <marianob85@users.noreply.github.com>
Date: Tue, 6 Jun 2017 20:55:01 +0200
Subject: [PATCH 0296/1302] Fix timeout option in Windows ping input sample
 configuration (#2885)

---
 plugins/inputs/ping/ping_windows.go      | 4 ++--
 plugins/inputs/ping/ping_windows_test.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index b1212eaaa..fb7cde489 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -44,8 +44,8 @@ const sampleConfig = `
 	## number of pings to send per collection (ping -n <COUNT>)
 	count = 4 # required
 
-	## Ping timeout, in seconds. 0 means default timeout (ping -w <TIMEOUT>)
-	Timeout = 0
+	## Ping timeout, in seconds. 0.0 means default timeout (ping -w <TIMEOUT>)
+	#timeout = 0.0
 `
 
 func (s *Ping) SampleConfig() string {
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index cb90b1686..7709cbd65 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -163,9 +163,9 @@ func TestLossyPingGather(t *testing.T) {
 		"reply_received":      7,
 		"percent_packet_loss": 22.22222222222222,
 		"percent_reply_loss":  22.22222222222222,
-		"average_response_ms": 115,
-		"minimum_response_ms": 114,
-		"maximum_response_ms": 119,
+		"average_response_ms": 115.0,
+		"minimum_response_ms": 114.0,
+		"maximum_response_ms": 119.0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }

From 4e91b18bbe44c94f2b780799685143a7e1e30850 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 6 Jun 2017 11:56:19 -0700
Subject: [PATCH 0297/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56cc00c80..b94cac723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
+- [#2885](https://github.com/influxdata/telegraf/pull/2885): Fix timeout option in Windows ping input sample configuration.
 
 ## v1.3.2 [unreleased]
 

From 91f2764cd5214d1041d1d07b2c5cbd2da5e16df8 Mon Sep 17 00:00:00 2001
From: Frederick Roth <f-roth@megaera.de>
Date: Tue, 6 Jun 2017 22:39:07 +0200
Subject: [PATCH 0298/1302] Add result_type field for http_response input
 (#2814)

---
 plugins/inputs/http_response/README.md        |  1 +
 plugins/inputs/http_response/http_response.go | 19 +++++++++++---
 .../http_response/http_response_test.go       | 26 ++++++++++++++++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 3f4e62d94..866fcbb23 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -41,6 +41,7 @@ This input plugin will test HTTP/HTTPS connections.
 - http_response
     - response_time (float, seconds)
     - http_response_code (int) #The code received
+	- result_type (string) # success, timeout, response_string_mismatch, connection_failed
 
 ### Tags:
 
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index cd3d735d2..f3deaf9e3 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
+	"net"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -130,15 +131,21 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 	// Start Timer
 	start := time.Now()
 	resp, err := h.client.Do(request)
+
 	if err != nil {
+		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+			fields["result_type"] = "timeout"
+			return fields, nil
+		}
+		fields["result_type"] = "connection_failed"
 		if h.FollowRedirects {
-			return nil, err
+			return fields, nil
 		}
 		if urlError, ok := err.(*url.Error); ok &&
 			urlError.Err == ErrRedirectAttempted {
 			err = nil
 		} else {
-			return nil, err
+			return fields, nil
 		}
 	}
 	defer func() {
@@ -157,7 +164,7 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 			h.compiledStringMatch = regexp.MustCompile(h.ResponseStringMatch)
 			if err != nil {
 				log.Printf("E! Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
-				fields["response_string_match"] = 0
+				fields["result_type"] = "response_string_mismatch"
 				return fields, nil
 			}
 		}
@@ -165,16 +172,20 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 		bodyBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
 			log.Printf("E! Failed to read body of HTTP Response : %s", err)
+			fields["result_type"] = "response_string_mismatch"
 			fields["response_string_match"] = 0
 			return fields, nil
 		}
 
 		if h.compiledStringMatch.Match(bodyBytes) {
+			fields["result_type"] = "success"
 			fields["response_string_match"] = 1
 		} else {
+			fields["result_type"] = "response_string_mismatch"
 			fields["response_string_match"] = 0
 		}
-
+	} else {
+		fields["result_type"] = "success"
 	}
 
 	return fields, nil
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index ee2390d2d..484a06f2f 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -106,6 +106,9 @@ func TestFields(t *testing.T) {
 	value, ok := acc.IntField("http_response", "http_response_code")
 	require.True(t, ok)
 	require.Equal(t, http.StatusOK, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
 }
 
 func TestRedirects(t *testing.T) {
@@ -143,10 +146,13 @@ func TestRedirects(t *testing.T) {
 	}
 	acc = testutil.Accumulator{}
 	err = h.Gather(&acc)
-	require.Error(t, err)
+	require.NoError(t, err)
 
 	value, ok = acc.IntField("http_response", "http_response_code")
 	require.False(t, ok)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "connection_failed", response_value)
 }
 
 func TestMethod(t *testing.T) {
@@ -277,6 +283,9 @@ func TestStringMatch(t *testing.T) {
 	value, ok = acc.IntField("http_response", "response_string_match")
 	require.True(t, ok)
 	require.Equal(t, 1, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
 	_, ok = acc.FloatField("http_response", "response_time")
 	require.True(t, ok)
 }
@@ -307,6 +316,9 @@ func TestStringMatchJson(t *testing.T) {
 	value, ok = acc.IntField("http_response", "response_string_match")
 	require.True(t, ok)
 	require.Equal(t, 1, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "success", response_value)
 	_, ok = acc.FloatField("http_response", "response_time")
 	require.True(t, ok)
 }
@@ -338,6 +350,9 @@ func TestStringMatchFail(t *testing.T) {
 	value, ok = acc.IntField("http_response", "response_string_match")
 	require.True(t, ok)
 	require.Equal(t, 0, value)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "response_string_mismatch", response_value)
 	_, ok = acc.FloatField("http_response", "response_time")
 	require.True(t, ok)
 }
@@ -363,8 +378,13 @@ func TestTimeout(t *testing.T) {
 	}
 	var acc testutil.Accumulator
 	err := h.Gather(&acc)
-	require.Error(t, err)
+	require.NoError(t, err)
 
-	ok := acc.HasIntField("http_response", "http_response_code")
+	_, ok := acc.IntField("http_response", "http_response_code")
+	require.False(t, ok)
+	response_value, ok := acc.StringField("http_response", "result_type")
+	require.True(t, ok)
+	require.Equal(t, "timeout", response_value)
+	_, ok = acc.FloatField("http_response", "response_time")
 	require.False(t, ok)
 }

From de7fb2acfef0317e5fec1639dc7207df2e382396 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 6 Jun 2017 13:55:11 -0700
Subject: [PATCH 0299/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b94cac723..7f0784dc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
+- [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 
 ### Bugfixes
 

From a275e6792a0531ced8bb8be513d6f5a70df3c415 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 7 Jun 2017 13:37:54 -0700
Subject: [PATCH 0300/1302] Fix metric splitting edge cases (#2896)

Metrics needing one extra byte to fit the output buffer would not be split, so we would emit lines without a line ending. Metrics which overflowed by exactly one field length would be split one field too late, causing truncated fields.
---
 metric/metric.go      |  4 ++--
 metric/metric_test.go | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/metric/metric.go b/metric/metric.go
index edf3b7794..0dbc1fa85 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -218,7 +218,7 @@ func (m *metric) SerializeTo(dst []byte) int {
 }
 
 func (m *metric) Split(maxSize int) []telegraf.Metric {
-	if m.Len() < maxSize {
+	if m.Len() <= maxSize {
 		return []telegraf.Metric{m}
 	}
 	var out []telegraf.Metric
@@ -248,7 +248,7 @@ func (m *metric) Split(maxSize int) []telegraf.Metric {
 
 		// if true, then we need to create a metric _not_ including the currently
 		// selected field
-		if len(m.fields[i:j])+len(fields)+constant > maxSize {
+		if len(m.fields[i:j])+len(fields)+constant >= maxSize {
 			// if false, then we'll create a metric including the currently
 			// selected field anyways. This means that the given maxSize is too
 			// small for a single field to fit.
diff --git a/metric/metric_test.go b/metric/metric_test.go
index dd231f8c4..eccb60e63 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewMetric(t *testing.T) {
@@ -458,7 +459,7 @@ func TestSplitMetric(t *testing.T) {
 	assert.Len(t, split70, 3)
 
 	split60 := m.Split(60)
-	assert.Len(t, split60, 4)
+	assert.Len(t, split60, 5)
 }
 
 // test splitting metric into various max lengths
@@ -578,6 +579,42 @@ func TestSplitMetric_OneField(t *testing.T) {
 	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
 }
 
+func TestSplitMetric_ExactSize(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float":  float64(100001),
+		"int":    int64(100001),
+		"bool":   true,
+		"false":  false,
+		"string": "test",
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	actual := m.Split(m.Len())
+	// check that no copy was made
+	require.Equal(t, &m, &actual[0])
+}
+
+func TestSplitMetric_NoRoomForNewline(t *testing.T) {
+	now := time.Unix(0, 1480940990034083306)
+	tags := map[string]string{
+		"host": "localhost",
+	}
+	fields := map[string]interface{}{
+		"float": float64(100001),
+		"int":   int64(100001),
+		"bool":  true,
+		"false": false,
+	}
+	m, err := New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+	actual := m.Split(m.Len() - 1)
+	require.Equal(t, 2, len(actual))
+}
+
 func TestNewMetricAggregate(t *testing.T) {
 	now := time.Now()
 

From 84dbf8bb25004aff7fa27f8e326641dc07e6d6ea Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Jun 2017 13:46:06 -0700
Subject: [PATCH 0301/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f0784dc4..dcabd7d7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 
+
 ### Bugfixes
 
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
@@ -24,7 +25,7 @@
 
 ### Bugfixes
 
-- [#2880](https://github.com/influxdata/telegraf/pull/2880): Fix InfluxDB UDP metric splitting.
+- [#2862](https://github.com/influxdata/telegraf/issue/2862): Fix InfluxDB UDP metric splitting.
 
 ## v1.3.1 [2017-05-31]
 

From 1c73caba04c854933a96b0becd1d32ddf313ec14 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Wed, 7 Jun 2017 20:52:10 -0400
Subject: [PATCH 0302/1302] Add SSL/TLS support to nginx input plugin (#2883)

---
 CHANGELOG.md                   |  1 +
 plugins/inputs/nginx/README.md | 10 ++++++
 plugins/inputs/nginx/nginx.go  | 63 +++++++++++++++++++++++++++++-----
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcabd7d7d..2216e6a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
+- [#2883](https://github.com/influxdata/telegraf/pull/2883): Add support for an optional SSL/TLS configuration to nginx input plugin
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 
diff --git a/plugins/inputs/nginx/README.md b/plugins/inputs/nginx/README.md
index dab54329b..819501ea7 100644
--- a/plugins/inputs/nginx/README.md
+++ b/plugins/inputs/nginx/README.md
@@ -7,6 +7,16 @@
 [[inputs.nginx]]
   ## An array of Nginx stub_status URI to gather stats.
   urls = ["http://localhost/server_status"]
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## HTTP response timeout (default: 5s)
+  response_timeout = "5s"
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/nginx/nginx.go b/plugins/inputs/nginx/nginx.go
index f439c1eeb..d389997e2 100644
--- a/plugins/inputs/nginx/nginx.go
+++ b/plugins/inputs/nginx/nginx.go
@@ -12,16 +12,39 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Nginx struct {
+	// List of status URLs
 	Urls []string
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to client cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
+	// HTTP client
+	client *http.Client
+	// Response timeout
+	ResponseTimeout internal.Duration
 }
 
 var sampleConfig = `
-  ## An array of Nginx stub_status URI to gather stats.
-  urls = ["http://localhost/status"]
+  # An array of Nginx stub_status URI to gather stats.
+  urls = ["http://localhost/server_status"]
+
+  # TLS/SSL configuration
+  ssl_ca = "/etc/telegraf/ca.pem"
+  ssl_cert = "/etc/telegraf/cert.cer"
+  ssl_key = "/etc/telegraf/key.key"
+  insecure_skip_verify = false
+
+  # HTTP response timeout (default: 5s)
+  response_timeout = "5s"
 `
 
 func (n *Nginx) SampleConfig() string {
@@ -35,6 +58,16 @@ func (n *Nginx) Description() string {
 func (n *Nginx) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
+	// Create an HTTP client that is re-used for each
+	// collection interval
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
@@ -52,17 +85,29 @@ func (n *Nginx) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-var tr = &http.Transport{
-	ResponseHeaderTimeout: time.Duration(3 * time.Second),
-}
+func (n *Nginx) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
 
-var client = &http.Client{
-	Transport: tr,
-	Timeout:   time.Duration(4 * time.Second),
+	if n.ResponseTimeout.Duration < time.Second {
+		n.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: n.ResponseTimeout.Duration,
+	}
+
+	return client, nil
 }
 
 func (n *Nginx) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
-	resp, err := client.Get(addr.String())
+	resp, err := n.client.Get(addr.String())
 	if err != nil {
 		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
 	}

From 2092443cd7624bffd41f0ab551b72a71cf579ea6 Mon Sep 17 00:00:00 2001
From: Seuf <seuf76@gmail.com>
Date: Thu, 8 Jun 2017 03:22:28 +0200
Subject: [PATCH 0303/1302] Add Kafka 0.9+ consumer support (#2487)

---
 CHANGELOG.md                                  |   1 +
 Godeps                                        |   3 +-
 Makefile                                      |  28 ++-
 docs/LICENSE_OF_DEPENDENCIES.md               |   1 +
 etc/telegraf.conf                             |  35 +++-
 internal/config/testdata/telegraf-agent.toml  |  20 +-
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/kafka_consumer/README.md       |  19 +-
 .../inputs/kafka_consumer/kafka_consumer.go   | 105 +++++++---
 .../kafka_consumer_integration_test.go        |  11 +-
 .../kafka_consumer/kafka_consumer_test.go     |   2 +-
 .../inputs/kafka_consumer_legacy/README.md    |  39 ++++
 .../kafka_consumer_legacy.go                  | 183 ++++++++++++++++++
 .../kafka_consumer_legacy_integration_test.go |  96 +++++++++
 .../kafka_consumer_legacy_test.go             | 150 ++++++++++++++
 15 files changed, 637 insertions(+), 57 deletions(-)
 create mode 100644 plugins/inputs/kafka_consumer_legacy/README.md
 create mode 100644 plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy.go
 create mode 100644 plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
 create mode 100644 plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2216e6a8f..69a5fefee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Release Notes
 ### Features
 
+- [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
diff --git a/Godeps b/Godeps
index da3ccdc35..b53f71848 100644
--- a/Godeps
+++ b/Godeps
@@ -1,5 +1,5 @@
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/Shopify/sarama 574d3147eee384229bf96a5d12c207fe7b5234f3
+github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
@@ -52,6 +52,7 @@ github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
+github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
 github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
diff --git a/Makefile b/Makefile
index d2bad656d..1f4233ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,15 @@ prepare-windows:
 # Run all docker containers necessary for unit tests
 docker-run:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
+	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
 	docker run --name kafka \
-		-e ADVERTISED_HOST=localhost \
-		-e ADVERTISED_PORT=9092 \
-		-p "2181:2181" -p "9092:9092" \
-		-d spotify/kafka
+		--link zookeeper:zookeeper \
+		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e KAFKA_ADVERTISED_PORT=9092 \
+		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-e KAFKA_CREATE_TOPICS="test:1:1" \
+		-p "9092:9092" \
+		-d wurstmeister/kafka
 	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
 	docker run --name memcached -p "11211:11211" -d memcached
@@ -65,11 +69,15 @@ docker-run:
 # Run docker containers necessary for CircleCI unit tests
 docker-run-circle:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
+	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
 	docker run --name kafka \
-		-e ADVERTISED_HOST=localhost \
-		-e ADVERTISED_PORT=9092 \
-		-p "2181:2181" -p "9092:9092" \
-		-d spotify/kafka
+		--link zookeeper:zookeeper \
+		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
+		-e KAFKA_ADVERTISED_PORT=9092 \
+		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
+		-e KAFKA_CREATE_TOPICS="test:1:1" \
+		-p "9092:9092" \
+		-d wurstmeister/kafka
 	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
@@ -78,8 +86,8 @@ docker-run-circle:
 
 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats elasticsearch
-	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann nats elasticsearch
+	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch
+	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch
 
 # Run full unit tests using docker containers (includes setup and teardown)
 test: vet docker-kill docker-run
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 3b4d0a34d..c62c262c0 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -10,6 +10,7 @@ works:
 - github.com/aws/aws-sdk-go [APACHE](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
 - github.com/beorn7/perks [MIT](https://github.com/beorn7/perks/blob/master/LICENSE)
 - github.com/boltdb/bolt [MIT](https://github.com/boltdb/bolt/blob/master/LICENSE)
+- github.com/bsm/sarama-cluster [MIT](https://github.com/bsm/sarama-cluster/blob/master/LICENSE)
 - github.com/cenkalti/backoff [MIT](https://github.com/cenkalti/backoff/blob/master/LICENSE)
 - github.com/couchbase/go-couchbase [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/couchbase/gomemcached [MIT](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index d455b10af..5c105a30a 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2198,11 +2198,42 @@
 #   ## 0 means to use the default of 65536 bytes (64 kibibytes)
 #   max_line_size = 0
 
-
-# # Read metrics from Kafka topic(s)
+# # Read metrics from Kafka 0.9+ topic(s)
 # [[inputs.kafka_consumer]]
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
+#   ## kafka servers
+#   brokers = ["localhost:9092"]
+#   ## the name of the consumer group
+#   consumer_group = "telegraf_metrics_consumers"
+#   ## Offset (must be either "oldest" or "newest")
+#   offset = "oldest"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Optional SASL Config
+#   # sasl_username = "kafka"
+#   # sasl_password = "secret"
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+#
+#   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+#   ## larger messages are dropped
+#   max_message_len = 65536
+
+# # Read metrics from Kafka (0.8 or less) topic(s)
+# [[inputs.kafka_consumer_legacy]]
+#   ## topic(s) to consume
+#   topics = ["telegraf"]
 #   ## an array of Zookeeper connection strings
 #   zookeeper_peers = ["localhost:2181"]
 #   ## Zookeeper Chroot
diff --git a/internal/config/testdata/telegraf-agent.toml b/internal/config/testdata/telegraf-agent.toml
index 5cf82af76..9da79605f 100644
--- a/internal/config/testdata/telegraf-agent.toml
+++ b/internal/config/testdata/telegraf-agent.toml
@@ -143,19 +143,31 @@
 [[inputs.diskio]]
   # no configuration
 
-# read metrics from a Kafka topic
+# read metrics from a Kafka 0.9+ topic
 [[inputs.kafka_consumer]]
-  # topic(s) to consume
+  ## kafka brokers
+  brokers = ["localhost:9092"]
+  ## topic(s) to consume
+  topics = ["telegraf"]
+  ## the name of the consumer group
+  consumer_group = "telegraf_metrics_consumers"
+  ## Offset (must be either "oldest" or "newest")
+  offset = "oldest"
+
+# read metrics from a Kafka legacy topic
+[[inputs.kafka_consumer_legacy]]
+  ## topic(s) to consume
   topics = ["telegraf"]
   # an array of Zookeeper connection strings
   zookeeper_peers = ["localhost:2181"]
-  # the name of the consumer group
+  ## the name of the consumer group
   consumer_group = "telegraf_metrics_consumers"
   # Maximum number of points to buffer between collection intervals
   point_buffer = 100000
-  # Offset (must be either "oldest" or "newest")
+  ## Offset (must be either "oldest" or "newest")
   offset = "oldest"
 
+
 # Read metrics from a LeoFS Server via SNMP
 [[inputs.leofs]]
   # An array of URI to gather stats about LeoFS.
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 10af14864..456852ff2 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -35,6 +35,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 31976788b..695001274 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -6,6 +6,9 @@ line protocol. [Consumer Group](http://godoc.org/github.com/wvanbergen/kafka/con
 is used to talk to the Kafka cluster so multiple instances of telegraf can read
 from the same topic in parallel.
 
+For old kafka version (< 0.8), please use the kafka_consumer_legacy input plugin
+and use the old zookeeper connection method.
+
 ## Configuration
 
 ```toml
@@ -13,15 +16,23 @@ from the same topic in parallel.
 [[inputs.kafka_consumer]]
   ## topic(s) to consume
   topics = ["telegraf"]
-  ## an array of Zookeeper connection strings
-  zookeeper_peers = ["localhost:2181"]
-  ## Zookeeper Chroot
-  zookeeper_chroot = ""
+  brokers = ["localhost:9092"]
   ## the name of the consumer group
   consumer_group = "telegraf_metrics_consumers"
   ## Offset (must be either "oldest" or "newest")
   offset = "oldest"
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Optional SASL Config
+  # sasl_username = "kafka"
+  # sasl_password = "secret"
+
   ## Data format to consume.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index 2f6933db0..4e4715617 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -7,20 +7,35 @@ import (
 	"sync"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 
 	"github.com/Shopify/sarama"
-	"github.com/wvanbergen/kafka/consumergroup"
+	cluster "github.com/bsm/sarama-cluster"
 )
 
 type Kafka struct {
-	ConsumerGroup   string
-	Topics          []string
-	MaxMessageLen   int
-	ZookeeperPeers  []string
-	ZookeeperChroot string
-	Consumer        *consumergroup.ConsumerGroup
+	ConsumerGroup string
+	Topics        []string
+	Brokers       []string
+	MaxMessageLen int
+
+	Cluster *cluster.Consumer
+
+	// Verify Kafka SSL Certificate
+	InsecureSkipVerify bool
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+
+	// SASL Username
+	SASLUsername string `toml:"sasl_username"`
+	// SASL Password
+	SASLPassword string `toml:"sasl_password"`
 
 	// Legacy metric buffer support
 	MetricBuffer int
@@ -47,12 +62,22 @@ type Kafka struct {
 }
 
 var sampleConfig = `
+  ## kafka servers
+  brokers = ["localhost:9092"]
   ## topic(s) to consume
   topics = ["telegraf"]
-  ## an array of Zookeeper connection strings
-  zookeeper_peers = ["localhost:2181"]
-  ## Zookeeper Chroot
-  zookeeper_chroot = ""
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## Optional SASL Config
+  # sasl_username = "kafka"
+  # sasl_password = "secret"
+
   ## the name of the consumer group
   consumer_group = "telegraf_metrics_consumers"
   ## Offset (must be either "oldest" or "newest")
@@ -84,45 +109,67 @@ func (k *Kafka) SetParser(parser parsers.Parser) {
 func (k *Kafka) Start(acc telegraf.Accumulator) error {
 	k.Lock()
 	defer k.Unlock()
-	var consumerErr error
+	var clusterErr error
 
 	k.acc = acc
 
-	config := consumergroup.NewConfig()
-	config.Zookeeper.Chroot = k.ZookeeperChroot
+	config := cluster.NewConfig()
+	config.Consumer.Return.Errors = true
+
+	tlsConfig, err := internal.GetTLSConfig(
+		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	if err != nil {
+		return err
+	}
+
+	if tlsConfig != nil {
+		log.Printf("D! TLS Enabled")
+		config.Net.TLS.Config = tlsConfig
+		config.Net.TLS.Enable = true
+	}
+	if k.SASLUsername != "" && k.SASLPassword != "" {
+		log.Printf("D! Using SASL auth with username '%s',",
+			k.SASLUsername)
+		config.Net.SASL.User = k.SASLUsername
+		config.Net.SASL.Password = k.SASLPassword
+		config.Net.SASL.Enable = true
+	}
+
 	switch strings.ToLower(k.Offset) {
 	case "oldest", "":
-		config.Offsets.Initial = sarama.OffsetOldest
+		config.Consumer.Offsets.Initial = sarama.OffsetOldest
 	case "newest":
-		config.Offsets.Initial = sarama.OffsetNewest
+		config.Consumer.Offsets.Initial = sarama.OffsetNewest
 	default:
 		log.Printf("I! WARNING: Kafka consumer invalid offset '%s', using 'oldest'\n",
 			k.Offset)
-		config.Offsets.Initial = sarama.OffsetOldest
+		config.Consumer.Offsets.Initial = sarama.OffsetOldest
 	}
 
-	if k.Consumer == nil || k.Consumer.Closed() {
-		k.Consumer, consumerErr = consumergroup.JoinConsumerGroup(
+	if k.Cluster == nil {
+		k.Cluster, clusterErr = cluster.NewConsumer(
+			k.Brokers,
 			k.ConsumerGroup,
 			k.Topics,
-			k.ZookeeperPeers,
 			config,
 		)
-		if consumerErr != nil {
-			return consumerErr
+
+		if clusterErr != nil {
+			log.Printf("E! Error when creating Kafka Consumer, brokers: %v, topics: %v\n",
+				k.Brokers, k.Topics)
+			return clusterErr
 		}
 
 		// Setup message and error channels
-		k.in = k.Consumer.Messages()
-		k.errs = k.Consumer.Errors()
+		k.in = k.Cluster.Messages()
+		k.errs = k.Cluster.Errors()
 	}
 
 	k.done = make(chan struct{})
-
 	// Start the kafka message reader
 	go k.receiver()
-	log.Printf("I! Started the kafka consumer service, peers: %v, topics: %v\n",
-		k.ZookeeperPeers, k.Topics)
+	log.Printf("I! Started the kafka consumer service, brokers: %v, topics: %v\n",
+		k.Brokers, k.Topics)
 	return nil
 }
 
@@ -156,7 +203,7 @@ func (k *Kafka) receiver() {
 				// TODO(cam) this locking can be removed if this PR gets merged:
 				// https://github.com/wvanbergen/kafka/pull/84
 				k.Lock()
-				k.Consumer.CommitUpto(msg)
+				k.Cluster.MarkOffset(msg, "")
 				k.Unlock()
 			}
 		}
@@ -167,7 +214,7 @@ func (k *Kafka) Stop() {
 	k.Lock()
 	defer k.Unlock()
 	close(k.done)
-	if err := k.Consumer.Close(); err != nil {
+	if err := k.Cluster.Close(); err != nil {
 		k.acc.AddError(fmt.Errorf("Error closing consumer: %s\n", err.Error()))
 	}
 }
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
index 41ce10157..a145a938a 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
@@ -19,7 +19,6 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 	}
 
 	brokerPeers := []string{testutil.GetLocalHost() + ":9092"}
-	zkPeers := []string{testutil.GetLocalHost() + ":2181"}
 	testTopic := fmt.Sprintf("telegraf_test_topic_%d", time.Now().Unix())
 
 	// Send a Kafka message to the kafka host
@@ -36,11 +35,11 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 
 	// Start the Kafka Consumer
 	k := &Kafka{
-		ConsumerGroup:  "telegraf_test_consumers",
-		Topics:         []string{testTopic},
-		ZookeeperPeers: zkPeers,
-		PointBuffer:    100000,
-		Offset:         "oldest",
+		ConsumerGroup: "telegraf_test_consumers",
+		Topics:        []string{testTopic},
+		Brokers:       brokerPeers,
+		PointBuffer:   100000,
+		Offset:        "oldest",
 	}
 	p, _ := parsers.NewInfluxParser()
 	k.SetParser(p)
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 5519dd0d1..9a585d6ed 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -23,7 +23,7 @@ func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) {
 	k := Kafka{
 		ConsumerGroup:   "test",
 		Topics:          []string{"telegraf"},
-		ZookeeperPeers:  []string{"localhost:2181"},
+		Brokers:         []string{"localhost:9092"},
 		Offset:          "oldest",
 		in:              in,
 		doNotCommitMsgs: true,
diff --git a/plugins/inputs/kafka_consumer_legacy/README.md b/plugins/inputs/kafka_consumer_legacy/README.md
new file mode 100644
index 000000000..31976788b
--- /dev/null
+++ b/plugins/inputs/kafka_consumer_legacy/README.md
@@ -0,0 +1,39 @@
+# Kafka Consumer Input Plugin
+
+The [Kafka](http://kafka.apache.org/) consumer plugin polls a specified Kafka
+topic and adds messages to InfluxDB. The plugin assumes messages follow the
+line protocol. [Consumer Group](http://godoc.org/github.com/wvanbergen/kafka/consumergroup)
+is used to talk to the Kafka cluster so multiple instances of telegraf can read
+from the same topic in parallel.
+
+## Configuration
+
+```toml
+# Read metrics from Kafka topic(s)
+[[inputs.kafka_consumer]]
+  ## topic(s) to consume
+  topics = ["telegraf"]
+  ## an array of Zookeeper connection strings
+  zookeeper_peers = ["localhost:2181"]
+  ## Zookeeper Chroot
+  zookeeper_chroot = ""
+  ## the name of the consumer group
+  consumer_group = "telegraf_metrics_consumers"
+  ## Offset (must be either "oldest" or "newest")
+  offset = "oldest"
+
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  data_format = "influx"
+
+  ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+  ## larger messages are dropped
+  max_message_len = 65536
+```
+
+## Testing
+
+Running integration tests requires running Zookeeper & Kafka. See Makefile
+for kafka container command.
diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy.go
new file mode 100644
index 000000000..d9558d5bd
--- /dev/null
+++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy.go
@@ -0,0 +1,183 @@
+package kafka_consumer_legacy
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"sync"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+
+	"github.com/Shopify/sarama"
+	"github.com/wvanbergen/kafka/consumergroup"
+)
+
+type Kafka struct {
+	ConsumerGroup   string
+	Topics          []string
+	MaxMessageLen   int
+	ZookeeperPeers  []string
+	ZookeeperChroot string
+	Consumer        *consumergroup.ConsumerGroup
+
+	// Legacy metric buffer support
+	MetricBuffer int
+	// TODO remove PointBuffer, legacy support
+	PointBuffer int
+
+	Offset string
+	parser parsers.Parser
+
+	sync.Mutex
+
+	// channel for all incoming kafka messages
+	in <-chan *sarama.ConsumerMessage
+	// channel for all kafka consumer errors
+	errs <-chan error
+	done chan struct{}
+
+	// keep the accumulator internally:
+	acc telegraf.Accumulator
+
+	// doNotCommitMsgs tells the parser not to call CommitUpTo on the consumer
+	// this is mostly for test purposes, but there may be a use-case for it later.
+	doNotCommitMsgs bool
+}
+
+var sampleConfig = `
+  ## topic(s) to consume
+  topics = ["telegraf"]
+  ## an array of Zookeeper connection strings
+  zookeeper_peers = ["localhost:2181"]
+  ## Zookeeper Chroot
+  zookeeper_chroot = ""
+  ## the name of the consumer group
+  consumer_group = "telegraf_metrics_consumers"
+  ## Offset (must be either "oldest" or "newest")
+  offset = "oldest"
+
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  data_format = "influx"
+
+  ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+  ## larger messages are dropped
+  max_message_len = 65536
+`
+
+func (k *Kafka) SampleConfig() string {
+	return sampleConfig
+}
+
+func (k *Kafka) Description() string {
+	return "Read metrics from Kafka topic(s)"
+}
+
+func (k *Kafka) SetParser(parser parsers.Parser) {
+	k.parser = parser
+}
+
+func (k *Kafka) Start(acc telegraf.Accumulator) error {
+	k.Lock()
+	defer k.Unlock()
+	var consumerErr error
+
+	k.acc = acc
+
+	config := consumergroup.NewConfig()
+	config.Zookeeper.Chroot = k.ZookeeperChroot
+	switch strings.ToLower(k.Offset) {
+	case "oldest", "":
+		config.Offsets.Initial = sarama.OffsetOldest
+	case "newest":
+		config.Offsets.Initial = sarama.OffsetNewest
+	default:
+		log.Printf("I! WARNING: Kafka consumer invalid offset '%s', using 'oldest'\n",
+			k.Offset)
+		config.Offsets.Initial = sarama.OffsetOldest
+	}
+
+	if k.Consumer == nil || k.Consumer.Closed() {
+		k.Consumer, consumerErr = consumergroup.JoinConsumerGroup(
+			k.ConsumerGroup,
+			k.Topics,
+			k.ZookeeperPeers,
+			config,
+		)
+		if consumerErr != nil {
+			return consumerErr
+		}
+
+		// Setup message and error channels
+		k.in = k.Consumer.Messages()
+		k.errs = k.Consumer.Errors()
+	}
+
+	k.done = make(chan struct{})
+
+	// Start the kafka message reader
+	go k.receiver()
+	log.Printf("I! Started the kafka consumer service, peers: %v, topics: %v\n",
+		k.ZookeeperPeers, k.Topics)
+	return nil
+}
+
+// receiver() reads all incoming messages from the consumer, and parses them into
+// influxdb metric points.
+func (k *Kafka) receiver() {
+	for {
+		select {
+		case <-k.done:
+			return
+		case err := <-k.errs:
+			if err != nil {
+				k.acc.AddError(fmt.Errorf("Consumer Error: %s\n", err))
+			}
+		case msg := <-k.in:
+			if k.MaxMessageLen != 0 && len(msg.Value) > k.MaxMessageLen {
+				k.acc.AddError(fmt.Errorf("Message longer than max_message_len (%d > %d)",
+					len(msg.Value), k.MaxMessageLen))
+			} else {
+				metrics, err := k.parser.Parse(msg.Value)
+				if err != nil {
+					k.acc.AddError(fmt.Errorf("Message Parse Error\nmessage: %s\nerror: %s",
+						string(msg.Value), err.Error()))
+				}
+				for _, metric := range metrics {
+					k.acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
+				}
+			}
+
+			if !k.doNotCommitMsgs {
+				// TODO(cam) this locking can be removed if this PR gets merged:
+				// https://github.com/wvanbergen/kafka/pull/84
+				k.Lock()
+				k.Consumer.CommitUpto(msg)
+				k.Unlock()
+			}
+		}
+	}
+}
+
+func (k *Kafka) Stop() {
+	k.Lock()
+	defer k.Unlock()
+	close(k.done)
+	if err := k.Consumer.Close(); err != nil {
+		k.acc.AddError(fmt.Errorf("Error closing consumer: %s\n", err.Error()))
+	}
+}
+
+func (k *Kafka) Gather(acc telegraf.Accumulator) error {
+	return nil
+}
+
+func init() {
+	inputs.Add("kafka_consumer_legacy", func() telegraf.Input {
+		return &Kafka{}
+	})
+}
diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
new file mode 100644
index 000000000..3fe80c4a4
--- /dev/null
+++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
@@ -0,0 +1,96 @@
+package kafka_consumer_legacy
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/Shopify/sarama"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+func TestReadsMetricsFromKafka(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	brokerPeers := []string{testutil.GetLocalHost() + ":9092"}
+	zkPeers := []string{testutil.GetLocalHost() + ":2181"}
+	testTopic := fmt.Sprintf("telegraf_test_topic_legacy_%d", time.Now().Unix())
+
+	// Send a Kafka message to the kafka host
+	msg := "cpu_load_short,direction=in,host=server01,region=us-west value=23422.0 1422568543702900257\n"
+	producer, err := sarama.NewSyncProducer(brokerPeers, nil)
+	require.NoError(t, err)
+	_, _, err = producer.SendMessage(
+		&sarama.ProducerMessage{
+			Topic: testTopic,
+			Value: sarama.StringEncoder(msg),
+		})
+	require.NoError(t, err)
+	defer producer.Close()
+
+	// Start the Kafka Consumer
+	k := &Kafka{
+		ConsumerGroup:  "telegraf_test_consumers",
+		Topics:         []string{testTopic},
+		ZookeeperPeers: zkPeers,
+		PointBuffer:    100000,
+		Offset:         "oldest",
+	}
+	p, _ := parsers.NewInfluxParser()
+	k.SetParser(p)
+
+	// Verify that we can now gather the sent message
+	var acc testutil.Accumulator
+
+	// Sanity check
+	assert.Equal(t, 0, len(acc.Metrics), "There should not be any points")
+	if err := k.Start(&acc); err != nil {
+		t.Fatal(err.Error())
+	} else {
+		defer k.Stop()
+	}
+
+	waitForPoint(&acc, t)
+
+	// Gather points
+	err = acc.GatherError(k.Gather)
+	require.NoError(t, err)
+	if len(acc.Metrics) == 1 {
+		point := acc.Metrics[0]
+		assert.Equal(t, "cpu_load_short", point.Measurement)
+		assert.Equal(t, map[string]interface{}{"value": 23422.0}, point.Fields)
+		assert.Equal(t, map[string]string{
+			"host":      "server01",
+			"direction": "in",
+			"region":    "us-west",
+		}, point.Tags)
+		assert.Equal(t, time.Unix(0, 1422568543702900257).Unix(), point.Time.Unix())
+	} else {
+		t.Errorf("No points found in accumulator, expected 1")
+	}
+}
+
+// Waits for the metric that was sent to the kafka broker to arrive at the kafka
+// consumer
+func waitForPoint(acc *testutil.Accumulator, t *testing.T) {
+	// Give the kafka container up to 2 seconds to get the point to the consumer
+	ticker := time.NewTicker(5 * time.Millisecond)
+	counter := 0
+	for {
+		select {
+		case <-ticker.C:
+			counter++
+			if counter > 1000 {
+				t.Fatal("Waited for 5s, point never arrived to consumer")
+			} else if acc.NFields() == 1 {
+				return
+			}
+		}
+	}
+}
diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
new file mode 100644
index 000000000..630aca163
--- /dev/null
+++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
@@ -0,0 +1,150 @@
+package kafka_consumer_legacy
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/Shopify/sarama"
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	testMsg         = "cpu_load_short,host=server01 value=23422.0 1422568543702900257\n"
+	testMsgGraphite = "cpu.load.short.graphite 23422 1454780029"
+	testMsgJSON     = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
+	invalidMsg      = "cpu_load_short,host=server01 1422568543702900257\n"
+)
+
+func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) {
+	in := make(chan *sarama.ConsumerMessage, 1000)
+	k := Kafka{
+		ConsumerGroup:   "test",
+		Topics:          []string{"telegraf"},
+		ZookeeperPeers:  []string{"localhost:2181"},
+		Offset:          "oldest",
+		in:              in,
+		doNotCommitMsgs: true,
+		errs:            make(chan error, 1000),
+		done:            make(chan struct{}),
+	}
+	return &k, in
+}
+
+// Test that the parser parses kafka messages into points
+func TestRunParser(t *testing.T) {
+	k, in := newTestKafka()
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+
+	k.parser, _ = parsers.NewInfluxParser()
+	go k.receiver()
+	in <- saramaMsg(testMsg)
+	acc.Wait(1)
+
+	assert.Equal(t, acc.NFields(), 1)
+}
+
+// Test that the parser ignores invalid messages
+func TestRunParserInvalidMsg(t *testing.T) {
+	k, in := newTestKafka()
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+
+	k.parser, _ = parsers.NewInfluxParser()
+	go k.receiver()
+	in <- saramaMsg(invalidMsg)
+	acc.WaitError(1)
+
+	assert.Equal(t, acc.NFields(), 0)
+}
+
+// Test that overlong messages are dropped
+func TestDropOverlongMsg(t *testing.T) {
+	const maxMessageLen = 64 * 1024
+	k, in := newTestKafka()
+	k.MaxMessageLen = maxMessageLen
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+	overlongMsg := strings.Repeat("v", maxMessageLen+1)
+
+	go k.receiver()
+	in <- saramaMsg(overlongMsg)
+	acc.WaitError(1)
+
+	assert.Equal(t, acc.NFields(), 0)
+}
+
+// Test that the parser parses kafka messages into points
+func TestRunParserAndGather(t *testing.T) {
+	k, in := newTestKafka()
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+
+	k.parser, _ = parsers.NewInfluxParser()
+	go k.receiver()
+	in <- saramaMsg(testMsg)
+	acc.Wait(1)
+
+	acc.GatherError(k.Gather)
+
+	assert.Equal(t, acc.NFields(), 1)
+	acc.AssertContainsFields(t, "cpu_load_short",
+		map[string]interface{}{"value": float64(23422)})
+}
+
+// Test that the parser parses kafka messages into points
+func TestRunParserAndGatherGraphite(t *testing.T) {
+	k, in := newTestKafka()
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+
+	k.parser, _ = parsers.NewGraphiteParser("_", []string{}, nil)
+	go k.receiver()
+	in <- saramaMsg(testMsgGraphite)
+	acc.Wait(1)
+
+	acc.GatherError(k.Gather)
+
+	assert.Equal(t, acc.NFields(), 1)
+	acc.AssertContainsFields(t, "cpu_load_short_graphite",
+		map[string]interface{}{"value": float64(23422)})
+}
+
+// Test that the parser parses kafka messages into points
+func TestRunParserAndGatherJSON(t *testing.T) {
+	k, in := newTestKafka()
+	acc := testutil.Accumulator{}
+	k.acc = &acc
+	defer close(k.done)
+
+	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
+	go k.receiver()
+	in <- saramaMsg(testMsgJSON)
+	acc.Wait(1)
+
+	acc.GatherError(k.Gather)
+
+	assert.Equal(t, acc.NFields(), 2)
+	acc.AssertContainsFields(t, "kafka_json_test",
+		map[string]interface{}{
+			"a":   float64(5),
+			"b_c": float64(6),
+		})
+}
+
+func saramaMsg(val string) *sarama.ConsumerMessage {
+	return &sarama.ConsumerMessage{
+		Key:       nil,
+		Value:     []byte(val),
+		Offset:    0,
+		Partition: 0,
+	}
+}

From f9447d01d4f5cd300272b207a7e784ed7676c2cb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Jun 2017 18:27:12 -0700
Subject: [PATCH 0304/1302] Add release note to changelog regarding
 kafka_consumer

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a5fefee..ef206f91b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ## v1.4 [unreleased]
 
 ### Release Notes
+
+- The `kafka_consumer` input has been updated to support Kafka 0.9 and
+  above style consumer offset handling.  The previous version of this plugin
+  supporting Kafka 0.8 and below is available as the `kafka_consumer_legacy`
+  plugin.
+
 ### Features
 
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
@@ -11,7 +17,6 @@
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 
-
 ### Bugfixes
 
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails

From 4c534433aa018cbeed27f771d3fc4e5a8e8ede87 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Jun 2017 18:31:52 -0700
Subject: [PATCH 0305/1302] Skip kafka_consumer_integration_test due to issue
 on CircleCI

---
 plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
index a145a938a..11dfa63eb 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
@@ -17,6 +17,7 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
+	t.Skip("Skipping test due to circleci issue; ref #2487")
 
 	brokerPeers := []string{testutil.GetLocalHost() + ":9092"}
 	testTopic := fmt.Sprintf("telegraf_test_topic_%d", time.Now().Unix())

From 4b3b16ef1a4fd9f90a8d5e6858579b38c7eaccd8 Mon Sep 17 00:00:00 2001
From: Matteo Cerutti <matteo.cerutti@hotmail.co.uk>
Date: Thu, 8 Jun 2017 21:17:31 +0100
Subject: [PATCH 0306/1302] Add wildcard support for container
 inclusion/exclusion (#2793)

---
 plugins/inputs/docker/README.md      | 10 +++-
 plugins/inputs/docker/docker.go      | 74 +++++++++++++++++++++++-----
 plugins/inputs/docker/docker_test.go | 68 +++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 12741d940..19102631b 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -20,14 +20,22 @@ for the stat structure can be found
   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
-  ## Only collect metrics for these containers, collect all if empty
+
+  ## Only collect metrics for these containers. Values will be appended to container_name_include.
+  ## Deprecated (1.4.0), use container_name_include
   container_names = []
+
+  ## Containers to include and exclude. Collect all if empty. Globs accepted.
+  container_name_include = []
+  container_name_exclude = []
+
   ## Timeout for docker list, info, and stats commands
   timeout = "5s"
 
   ## Whether to report for each container per-device blkio (8:0, 8:1...) and
   ## network (eth0, eth1, ...) stats or not
   perdevice = true
+
   ## Whether to report for each container total blkio and network stats or not
   total = false
   
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 13ade3945..ca7b70f9f 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -24,24 +24,33 @@ type DockerLabelFilter struct {
 	labelExclude filter.Filter
 }
 
+type DockerContainerFilter struct {
+	containerInclude filter.Filter
+	containerExclude filter.Filter
+}
+
 // Docker object
 type Docker struct {
 	Endpoint       string
 	ContainerNames []string
+
 	Timeout        internal.Duration
 	PerDevice      bool     `toml:"perdevice"`
 	Total          bool     `toml:"total"`
 	TagEnvironment []string `toml:"tag_env"`
 	LabelInclude   []string `toml:"docker_label_include"`
 	LabelExclude   []string `toml:"docker_label_exclude"`
+	LabelFilter    DockerLabelFilter
 
-	LabelFilter DockerLabelFilter
+	ContainerInclude []string `toml:"container_name_include"`
+	ContainerExclude []string `toml:"container_name_exclude"`
+	ContainerFilter  DockerContainerFilter
 
 	client      *client.Client
 	engine_host string
 
-	testing             bool
-	labelFiltersCreated bool
+	testing        bool
+	filtersCreated bool
 }
 
 // infoWrapper wraps client.Client.List for testing.
@@ -110,8 +119,15 @@ var sampleConfig = `
   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
+
   ## Only collect metrics for these containers, collect all if empty
   container_names = []
+
+  ## Containers to include and exclude. Globs accepted.
+  ## Note that an empty array for both will include all containers
+  container_name_include = []
+  container_name_exclude = []
+
   ## Timeout for docker list, info, and stats commands
   timeout = "5s"
 
@@ -161,13 +177,18 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		}
 		d.client = c
 	}
+
 	// Create label filters if not already created
-	if !d.labelFiltersCreated {
+	if !d.filtersCreated {
 		err := d.createLabelFilters()
 		if err != nil {
 			return err
 		}
-		d.labelFiltersCreated = true
+		err = d.createContainerFilters()
+		if err != nil {
+			return err
+		}
+		d.filtersCreated = true
 	}
 
 	// Get daemon info
@@ -306,9 +327,12 @@ func (d *Docker) gatherContainer(
 		"container_image":   imageName,
 		"container_version": imageVersion,
 	}
-	if len(d.ContainerNames) > 0 {
-		if !sliceContains(cname, d.ContainerNames) {
-			return nil
+
+	if len(d.ContainerInclude) > 0 || len(d.ContainerExclude) > 0 {
+		if len(d.ContainerInclude) == 0 || !d.ContainerFilter.containerInclude.Match(cname) {
+			if len(d.ContainerExclude) == 0 || d.ContainerFilter.containerExclude.Match(cname) {
+				return nil
+			}
 		}
 	}
 
@@ -656,8 +680,32 @@ func parseSize(sizeStr string) (int64, error) {
 	return int64(size), nil
 }
 
+func (d *Docker) createContainerFilters() error {
+	if len(d.ContainerNames) > 0 {
+		d.ContainerInclude = append(d.ContainerInclude, d.ContainerNames...)
+	}
+
+	if len(d.ContainerInclude) != 0 {
+		var err error
+		d.ContainerFilter.containerInclude, err = filter.Compile(d.ContainerInclude)
+		if err != nil {
+			return err
+		}
+	}
+
+	if len(d.ContainerExclude) != 0 {
+		var err error
+		d.ContainerFilter.containerExclude, err = filter.Compile(d.ContainerExclude)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (d *Docker) createLabelFilters() error {
-	if len(d.LabelInclude) != 0 && d.LabelFilter.labelInclude == nil {
+	if len(d.LabelInclude) != 0 {
 		var err error
 		d.LabelFilter.labelInclude, err = filter.Compile(d.LabelInclude)
 		if err != nil {
@@ -665,7 +713,7 @@ func (d *Docker) createLabelFilters() error {
 		}
 	}
 
-	if len(d.LabelExclude) != 0 && d.LabelFilter.labelExclude == nil {
+	if len(d.LabelExclude) != 0 {
 		var err error
 		d.LabelFilter.labelExclude, err = filter.Compile(d.LabelExclude)
 		if err != nil {
@@ -679,9 +727,9 @@ func (d *Docker) createLabelFilters() error {
 func init() {
 	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
-			PerDevice:           true,
-			Timeout:             internal.Duration{Duration: time.Second * 5},
-			labelFiltersCreated: false,
+			PerDevice:      true,
+			Timeout:        internal.Duration{Duration: time.Second * 5},
+			filtersCreated: false,
 		}
 	})
 }
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 025d482fe..45797df5c 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -18,6 +18,7 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_name":  "redis",
 		"container_image": "redis/image",
 	}
+
 	gatherContainerStats(stats, &acc, tags, "123456789", true, true)
 
 	// test docker_container_net measurement
@@ -295,6 +296,73 @@ func TestDockerGatherLabels(t *testing.T) {
 	}
 }
 
+var gatherContainerNames = []struct {
+	include     []string
+	exclude     []string
+	expected    []string
+	notexpected []string
+}{
+	{[]string{}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+	{[]string{"*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+	{[]string{"etc*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+	{[]string{"etcd"}, []string{}, []string{"etcd"}, []string{"etcd2"}},
+	{[]string{"etcd2*"}, []string{}, []string{"etcd2"}, []string{"etcd"}},
+	{[]string{}, []string{"etc*"}, []string{}, []string{"etcd", "etcd2"}},
+	{[]string{}, []string{"etcd"}, []string{"etcd2"}, []string{"etcd"}},
+	{[]string{"*"}, []string{"*"}, []string{"etcd", "etcd2"}, []string{}},
+	{[]string{}, []string{"*"}, []string{""}, []string{"etcd", "etcd2"}},
+}
+
+func TestContainerNames(t *testing.T) {
+	for _, tt := range gatherContainerNames {
+		var acc testutil.Accumulator
+
+		d := Docker{
+			client:           nil,
+			testing:          true,
+			ContainerInclude: tt.include,
+			ContainerExclude: tt.exclude,
+		}
+
+		err := d.Gather(&acc)
+		require.NoError(t, err)
+
+		for _, metric := range acc.Metrics {
+			if metric.Measurement == "docker_container_cpu" {
+				if val, ok := metric.Tags["container_name"]; ok {
+					var found bool = false
+					for _, cname := range tt.expected {
+						if val == cname {
+							found = true
+							break
+						}
+					}
+					if !found {
+						t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
+					}
+				}
+			}
+		}
+
+		for _, metric := range acc.Metrics {
+			if metric.Measurement == "docker_container_cpu" {
+				if val, ok := metric.Tags["container_name"]; ok {
+					var found bool = false
+					for _, cname := range tt.notexpected {
+						if val == cname {
+							found = true
+							break
+						}
+					}
+					if found {
+						t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
+					}
+				}
+			}
+		}
+	}
+}
+
 func TestDockerGatherInfo(t *testing.T) {
 	var acc testutil.Accumulator
 	d := Docker{

From de4a312eba54e4aaa381ebd7a45a365d7ab9b20b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 8 Jun 2017 13:20:44 -0700
Subject: [PATCH 0307/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef206f91b..db924a8e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [#2883](https://github.com/influxdata/telegraf/pull/2883): Add support for an optional SSL/TLS configuration to nginx input plugin
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
+- [#2734](https://github.com/influxdata/telegraf/pull/2734): Add include/exclude filters for docker containers.
 
 ### Bugfixes
 

From b277e6e2d789716ff679cd8c70bdc0a39874c1dd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 8 Jun 2017 16:52:01 -0700
Subject: [PATCH 0308/1302] Fix support for mongodb/leofs urls without scheme
 (#2900)

This was broken by changes in go 1.8 to url.Parse.  This change allows
the string but prompts the user to move to the correct url string.
---
 plugins/inputs/leofs/leofs.go     | 32 ++++++++++++++++++---------
 plugins/inputs/mongodb/README.md  | 19 ++++++----------
 plugins/inputs/mongodb/mongodb.go | 36 +++++++++++++++++++------------
 3 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/plugins/inputs/leofs/leofs.go b/plugins/inputs/leofs/leofs.go
index e1daf7034..55a727ef8 100644
--- a/plugins/inputs/leofs/leofs.go
+++ b/plugins/inputs/leofs/leofs.go
@@ -3,6 +3,7 @@ package leofs
 import (
 	"bufio"
 	"fmt"
+	"log"
 	"net/url"
 	"os/exec"
 	"strconv"
@@ -18,7 +19,7 @@ import (
 const oid = ".1.3.6.1.4.1.35450"
 
 // For Manager Master
-const defaultEndpoint = "127.0.0.1:4020"
+const defaultEndpoint = "udp://127.0.0.1:4020"
 
 type ServerType int
 
@@ -135,9 +136,9 @@ var serverTypeMapping = map[string]ServerType{
 }
 
 var sampleConfig = `
-  ## An array of URI to gather stats about LeoFS.
-  ## Specify an ip or hostname with port. ie 127.0.0.1:4020
-  servers = ["127.0.0.1:4021"]
+  ## An array of URLs of the form:
+  ##   "udp://" host [ ":" port]
+  servers = ["udp://127.0.0.1:4020"]
 `
 
 func (l *LeoFS) SampleConfig() string {
@@ -154,17 +155,28 @@ func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
 		return nil
 	}
 	var wg sync.WaitGroup
-	for _, endpoint := range l.Servers {
-		_, err := url.Parse(endpoint)
+	for i, endpoint := range l.Servers {
+		if !strings.HasPrefix(endpoint, "udp://") {
+			// Preserve backwards compatibility for hostnames without a
+			// scheme, broken in go 1.8. Remove in Telegraf 2.0
+			endpoint = "udp://" + endpoint
+			log.Printf("W! [inputs.mongodb] Using %q as connection URL; please update your configuration to use an URL", endpoint)
+			l.Servers[i] = endpoint
+		}
+		u, err := url.Parse(endpoint)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse the address:%s, err:%s", endpoint, err))
+			acc.AddError(fmt.Errorf("Unable to parse address %q: %s", endpoint, err))
 			continue
 		}
-		port, err := retrieveTokenAfterColon(endpoint)
-		if err != nil {
-			acc.AddError(err)
+		if u.Host == "" {
+			acc.AddError(fmt.Errorf("Unable to parse address %q", endpoint))
 			continue
 		}
+
+		port := u.Port()
+		if port == "" {
+			port = "4020"
+		}
 		st, ok := serverTypeMapping[port]
 		if !ok {
 			st = ServerTypeStorage
diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 678fe0777..f09457821 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -4,12 +4,12 @@
 
 ```toml
 [[inputs.mongodb]]
-  ## An array of URI to gather stats about. Specify an ip or hostname
-  ## with optional port add password. ie,
+  ## An array of URLs of the form:
+  ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+  ## For example:
   ##   mongodb://user:auth_key@10.10.3.30:27017,
   ##   mongodb://10.10.3.33:18832,
-  ##   10.0.0.1:10000, etc.
-  servers = ["127.0.0.1:27017"]
+  servers = ["mongodb://127.0.0.1:27017"]
   gather_perdb_stats = false
 
   ## Optional SSL Config
@@ -19,15 +19,8 @@
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 ```
-
-For authenticated mongodb instances use `mongodb://` connection URI
-
-```toml
-[[inputs.mongodb]]
-  servers = ["mongodb://username:password@10.XX.XX.XX:27101/mydatabase?authSource=admin"]
-```
-This connection uri may be different based on your environement and mongodb
-setup. If the user doesn't have the required privilege to execute serverStatus 
+This connection uri may be different based on your environment and mongodb
+setup. If the user doesn't have the required privilege to execute serverStatus
 command the you will get this error on telegraf
 
 ```
diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index 510a313c1..8db9451b0 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -4,8 +4,10 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"log"
 	"net"
 	"net/url"
+	"strings"
 	"sync"
 	"time"
 
@@ -37,12 +39,12 @@ type Ssl struct {
 }
 
 var sampleConfig = `
-  ## An array of URI to gather stats about. Specify an ip or hostname
-  ## with optional port add password. ie,
+  ## An array of URLs of the form:
+  ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+  ## For example:
   ##   mongodb://user:auth_key@10.10.3.30:27017,
   ##   mongodb://10.10.3.33:18832,
-  ##   10.0.0.1:10000, etc.
-  servers = ["127.0.0.1:27017"]
+  servers = ["mongodb://127.0.0.1:27017"]
   gather_perdb_stats = false
 
   ## Optional SSL Config
@@ -61,7 +63,7 @@ func (*MongoDB) Description() string {
 	return "Read metrics from one or many MongoDB servers"
 }
 
-var localhost = &url.URL{Host: "127.0.0.1:27017"}
+var localhost = &url.URL{Host: "mongodb://127.0.0.1:27017"}
 
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
@@ -72,19 +74,25 @@ func (m *MongoDB) Gather(acc telegraf.Accumulator) error {
 	}
 
 	var wg sync.WaitGroup
-	for _, serv := range m.Servers {
+	for i, serv := range m.Servers {
+		if !strings.HasPrefix(serv, "mongodb://") {
+			// Preserve backwards compatibility for hostnames without a
+			// scheme, broken in go 1.8. Remove in Telegraf 2.0
+			serv = "mongodb://" + serv
+			log.Printf("W! [inputs.mongodb] Using %q as connection URL; please update your configuration to use an URL", serv)
+			m.Servers[i] = serv
+		}
+
 		u, err := url.Parse(serv)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
+			acc.AddError(fmt.Errorf("Unable to parse address %q: %s", serv, err))
 			continue
-		} else if u.Scheme == "" {
-			u.Scheme = "mongodb"
-			// fallback to simple string based address (i.e. "10.0.0.1:10000")
-			u.Host = serv
-			if u.Path == u.Host {
-				u.Path = ""
-			}
 		}
+		if u.Host == "" {
+			acc.AddError(fmt.Errorf("Unable to parse address %q", serv))
+			continue
+		}
+
 		wg.Add(1)
 		go func(srv *Server) {
 			defer wg.Done()

From 0c53de67004f780bacf3848b6d1750c8cf66f4ad Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 8 Jun 2017 16:55:27 -0700
Subject: [PATCH 0309/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db924a8e1..3c0049f80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 ### Bugfixes
 
 - [#2862](https://github.com/influxdata/telegraf/issue/2862): Fix InfluxDB UDP metric splitting.
+- [#2888](https://github.com/influxdata/telegraf/issue/2888): Fix mongodb/leofs urls without scheme.
 
 ## v1.3.1 [2017-05-31]
 

From 02b55fe77f2efcedd6f0cfb9c9fd99c9be35e1a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 12 Jun 2017 18:31:27 -0700
Subject: [PATCH 0310/1302] Update aws-sdk-go dependency to latest release.
 (#2912)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index b53f71848..7d00bb78c 100644
--- a/Godeps
+++ b/Godeps
@@ -3,7 +3,7 @@ github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/aws/aws-sdk-go 7524cb911daddd6e5c9195def8e59ae892bef8d9
+github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
 github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28

From 40d8e582eeec98173115587c56fbbc5d69639c47 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 12 Jun 2017 18:32:50 -0700
Subject: [PATCH 0311/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c0049f80..1d0ad0f43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - [#1137](https://github.com/influxdata/telegraf/issues/1137): Fix multiple plugin loading in win_perf_counters.
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 - [#2885](https://github.com/influxdata/telegraf/pull/2885): Fix timeout option in Windows ping input sample configuration.
+- [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 
 ## v1.3.2 [unreleased]
 

From f0cbfe4d67c1749c7f43b714e3fa73b42e2d116c Mon Sep 17 00:00:00 2001
From: Dheeraj Dwivedi <dhruv.x@gmail.com>
Date: Wed, 14 Jun 2017 02:12:11 +0530
Subject: [PATCH 0312/1302] Add secure connection support to graphite output
 (#2602)

---
 etc/telegraf.conf                    |  7 +++++
 plugins/outputs/graphite/README.md   | 25 +++++++++++++++++
 plugins/outputs/graphite/graphite.go | 42 +++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 5c105a30a..8aa9427c4 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -270,6 +270,13 @@
 #   template = "host.tags.measurement.field"
 #   ## timeout in seconds for the write connection to graphite
 #   timeout = 2
+#
+#   ## Optional SSL Config
+#   ssl_ca = "/etc/telegraf/ca.pem"
+#   ssl_cert = "/etc/telegraf/cert.pem"
+#   ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   insecure_skip_verify = false
 
 
 # # Send telegraf metrics to graylog(s)
diff --git a/plugins/outputs/graphite/README.md b/plugins/outputs/graphite/README.md
index 3e2369e21..1b173962f 100644
--- a/plugins/outputs/graphite/README.md
+++ b/plugins/outputs/graphite/README.md
@@ -19,6 +19,13 @@ via raw TCP.
   template = "host.tags.measurement.field"
   ## timeout in seconds for the write connection to graphite
   timeout = 2
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 Parameters:
@@ -28,9 +35,27 @@ Parameters:
     Timeout  int
     Template string
 
+    // Path to CA file
+    SSLCA string
+    // Path to host cert file
+    SSLCert string
+    // Path to cert key file
+    SSLKey string
+    // Skip SSL verification
+    InsecureSkipVerify bool
+
+### Required parameters:
+
 * `servers`: List of strings, ["mygraphiteserver:2003"].
 * `prefix`: String use to prefix all sent metrics.
 * `timeout`: Connection timeout in seconds.
 * `template`: Template for graphite output format, see
 https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 for more details.
+
+### Optional parameters:
+
+* `ssl_ca`: SSL CA
+* `ssl_cert`: SSL CERT
+* `ssl_key`: SSL key
+* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 8d4447cdd..180217214 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -1,6 +1,7 @@
 package graphite
 
 import (
+	"crypto/tls"
 	"errors"
 	"io"
 	"log"
@@ -9,6 +10,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -20,6 +22,18 @@ type Graphite struct {
 	Template string
 	Timeout  int
 	conns    []net.Conn
+
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Skip SSL verification
+	InsecureSkipVerify bool
+
+	// tls config
+	tlsConfig *tls.Config
 }
 
 var sampleConfig = `
@@ -34,6 +48,13 @@ var sampleConfig = `
   template = "host.tags.measurement.field"
   ## timeout in seconds for the write connection to graphite
   timeout = 2
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (g *Graphite) Connect() error {
@@ -44,10 +65,29 @@ func (g *Graphite) Connect() error {
 	if len(g.Servers) == 0 {
 		g.Servers = append(g.Servers, "localhost:2003")
 	}
+
+	// Set tls config
+	var err error
+	g.tlsConfig, err = internal.GetTLSConfig(
+		g.SSLCert, g.SSLKey, g.SSLCA, g.InsecureSkipVerify)
+	if err != nil {
+		return err
+	}
+
 	// Get Connections
 	var conns []net.Conn
 	for _, server := range g.Servers {
-		conn, err := net.DialTimeout("tcp", server, time.Duration(g.Timeout)*time.Second)
+		// Dialer with timeout
+		d := net.Dialer{Timeout: time.Duration(g.Timeout) * time.Second}
+
+		// Get secure connection if tls config is set
+		var conn net.Conn
+		if g.tlsConfig != nil {
+			conn, err = tls.DialWithDialer(&d, "tcp", server, g.tlsConfig)
+		} else {
+			conn, err = d.Dial("tcp", server)
+		}
+
 		if err == nil {
 			conns = append(conns, conn)
 		}

From e3ccd473d2d3a24a1b1b753c40504f4f4b82c433 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Jun 2017 13:44:07 -0700
Subject: [PATCH 0313/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d0ad0f43..9ea2ef532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 - [#2734](https://github.com/influxdata/telegraf/pull/2734): Add include/exclude filters for docker containers.
+- [#2602](https://github.com/influxdata/telegraf/pull/2602): Add secure connection support to graphite output.
 
 ### Bugfixes
 

From 5d1efdbfda66af982ba5438733b0516e51470040 Mon Sep 17 00:00:00 2001
From: Heston Kan <hestonk@users.noreply.github.com>
Date: Tue, 13 Jun 2017 17:09:17 -0400
Subject: [PATCH 0314/1302] Add min/max response time on linux/darwin to ping
 (#2908)

---
 plugins/inputs/ping/ping.go      | 22 +++++++++++++++-------
 plugins/inputs/ping/ping_test.go | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index de33ebee1..af671e49d 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -83,7 +83,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					strings.TrimSpace(out) + ", " + err.Error()))
 			}
 			tags := map[string]string{"url": u}
-			trans, rec, avg, stddev, err := processPingOutput(out)
+			trans, rec, min, avg, max, stddev, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
 				acc.AddError(err)
@@ -96,9 +96,15 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 				"packets_received":    rec,
 				"percent_packet_loss": loss,
 			}
+			if min > 0 {
+				fields["minimum_response_ms"] = min
+			}
 			if avg > 0 {
 				fields["average_response_ms"] = avg
 			}
+			if max > 0 {
+				fields["maximum_response_ms"] = max
+			}
 			if stddev > 0 {
 				fields["standard_deviation_ms"] = stddev
 			}
@@ -158,9 +164,9 @@ func (p *Ping) args(url string) []string {
 //     round-trip min/avg/max/stddev = 34.843/43.508/52.172/8.664 ms
 //
 // It returns (<transmitted packets>, <received packets>, <average response>)
-func processPingOutput(out string) (int, int, float64, float64, error) {
+func processPingOutput(out string) (int, int, float64, float64, float64, float64, error) {
 	var trans, recv int
-	var avg, stddev float64
+	var min, avg, max, stddev float64
 	// Set this error to nil if we find a 'transmitted' line
 	err := errors.New("Fatal error processing ping output")
 	lines := strings.Split(out, "\n")
@@ -172,23 +178,25 @@ func processPingOutput(out string) (int, int, float64, float64, error) {
 			// Transmitted packets
 			trans, err = strconv.Atoi(strings.Split(stats[0], " ")[0])
 			if err != nil {
-				return trans, recv, avg, stddev, err
+				return trans, recv, min, avg, max, stddev, err
 			}
 			// Received packets
 			recv, err = strconv.Atoi(strings.Split(stats[1], " ")[0])
 			if err != nil {
-				return trans, recv, avg, stddev, err
+				return trans, recv, min, avg, max, stddev, err
 			}
 		} else if strings.Contains(line, "min/avg/max") {
 			stats := strings.Split(line, " ")[3]
+			min, err = strconv.ParseFloat(strings.Split(stats, "/")[0], 64)
 			avg, err = strconv.ParseFloat(strings.Split(stats, "/")[1], 64)
+			max, err = strconv.ParseFloat(strings.Split(stats, "/")[2], 64)
 			stddev, err = strconv.ParseFloat(strings.Split(stats, "/")[3], 64)
 			if err != nil {
-				return trans, recv, avg, stddev, err
+				return trans, recv, min, avg, max, stddev, err
 			}
 		}
 	}
-	return trans, recv, avg, stddev, err
+	return trans, recv, min, avg, max, stddev, err
 }
 
 func init() {
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index 22dac4e65..e924d5175 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -48,25 +48,29 @@ ping: -i interval too short: Operation not permitted
 
 // Test that ping command output is processed properly
 func TestProcessPingOutput(t *testing.T) {
-	trans, rec, avg, stddev, err := processPingOutput(bsdPingOutput)
+	trans, rec, min, avg, max, stddev, err := processPingOutput(bsdPingOutput)
 	assert.NoError(t, err)
 	assert.Equal(t, 5, trans, "5 packets were transmitted")
 	assert.Equal(t, 5, rec, "5 packets were transmitted")
+	assert.InDelta(t, 15.087, min, 0.001)
 	assert.InDelta(t, 20.224, avg, 0.001)
+	assert.InDelta(t, 27.263, max, 0.001)
 	assert.InDelta(t, 4.076, stddev, 0.001)
 
-	trans, rec, avg, stddev, err = processPingOutput(linuxPingOutput)
+	trans, rec, min, avg, max, stddev, err = processPingOutput(linuxPingOutput)
 	assert.NoError(t, err)
 	assert.Equal(t, 5, trans, "5 packets were transmitted")
 	assert.Equal(t, 5, rec, "5 packets were transmitted")
+	assert.InDelta(t, 35.225, min, 0.001)
 	assert.InDelta(t, 43.628, avg, 0.001)
+	assert.InDelta(t, 51.806, max, 0.001)
 	assert.InDelta(t, 5.325, stddev, 0.001)
 }
 
 // Test that processPingOutput returns an error when 'ping' fails to run, such
 // as when an invalid argument is provided
 func TestErrorProcessPingOutput(t *testing.T) {
-	_, _, _, _, err := processPingOutput(fatalPingOutput)
+	_, _, _, _, _, _, err := processPingOutput(fatalPingOutput)
 	assert.Error(t, err, "Error was expected from processPingOutput")
 }
 
@@ -150,7 +154,9 @@ func TestPingGather(t *testing.T) {
 		"packets_transmitted":   5,
 		"packets_received":      5,
 		"percent_packet_loss":   0.0,
+		"minimum_response_ms":   35.225,
 		"average_response_ms":   43.628,
+		"maximum_response_ms":   51.806,
 		"standard_deviation_ms": 5.325,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
@@ -188,7 +194,9 @@ func TestLossyPingGather(t *testing.T) {
 		"packets_transmitted":   5,
 		"packets_received":      3,
 		"percent_packet_loss":   40.0,
+		"minimum_response_ms":   35.225,
 		"average_response_ms":   44.033,
+		"maximum_response_ms":   51.806,
 		"standard_deviation_ms": 5.325,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
@@ -244,6 +252,10 @@ func TestFatalPingGather(t *testing.T) {
 		"Fatal ping should not have packet measurements")
 	assert.False(t, acc.HasMeasurement("percent_packet_loss"),
 		"Fatal ping should not have packet measurements")
+	assert.False(t, acc.HasMeasurement("minimum_response_ms"),
+		"Fatal ping should not have packet measurements")
 	assert.False(t, acc.HasMeasurement("average_response_ms"),
 		"Fatal ping should not have packet measurements")
+	assert.False(t, acc.HasMeasurement("maximum_response_ms"),
+		"Fatal ping should not have packet measurements")
 }

From b0efc22140965b84024e8ae3909fdd52110e3d18 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Jun 2017 14:10:33 -0700
Subject: [PATCH 0315/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ea2ef532..ad4c1a635 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,12 +12,13 @@
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
-- [#2817](https://github.com/influxdata/telegraf/pull/2817): Added timeout option to IPMI sensor plugin
+- [#2817](https://github.com/influxdata/telegraf/pull/2817): Add timeout option to IPMI sensor plugin
 - [#2883](https://github.com/influxdata/telegraf/pull/2883): Add support for an optional SSL/TLS configuration to nginx input plugin
 - [#2882](https://github.com/influxdata/telegraf/pull/2882): Add timezone support for logparser timestamps.
 - [#2814](https://github.com/influxdata/telegraf/pull/2814): Add result_type field for http_response input.
 - [#2734](https://github.com/influxdata/telegraf/pull/2734): Add include/exclude filters for docker containers.
 - [#2602](https://github.com/influxdata/telegraf/pull/2602): Add secure connection support to graphite output.
+- [#2908](https://github.com/influxdata/telegraf/pull/2908): Add min/max response time on linux/darwin to ping.
 
 ### Bugfixes
 

From 619b5d4c141a8f1f46315517dd6b2cbc82a28823 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 13 Jun 2017 17:09:38 -0700
Subject: [PATCH 0316/1302] Change node_name to be a tag in aerospike input
 (#2918)

---
 plugins/inputs/aerospike/README.md         | 10 +++++-----
 plugins/inputs/aerospike/aerospike.go      | 10 ++++------
 plugins/inputs/aerospike/aerospike_test.go |  2 ++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/inputs/aerospike/README.md b/plugins/inputs/aerospike/README.md
index 60c470cd3..149c6aa2b 100644
--- a/plugins/inputs/aerospike/README.md
+++ b/plugins/inputs/aerospike/README.md
@@ -40,6 +40,7 @@ are available from the aerospike `namespace/<namespace_name>` command.
 All measurements have tags:
 
 - aerospike_host
+- node_name
 
 Namespace metrics have tags:
 
@@ -48,8 +49,7 @@ Namespace metrics have tags:
 ### Example Output:
 
 ```
-% telegraf --config ~/db/ws/telegraf.conf --input-filter aerospike --test
-* Plugin: aerospike, Collection 1
-> aerospike_node,aerospike_host=localhost:3000,host=tars batch_error=0i,batch_index_complete=0i,batch_index_created_buffers=0i,batch_index_destroyed_buffers=0i,batch_index_error=0i,batch_index_huge_buffers=0i,batch_index_initiate=0i,batch_index_queue="0:0,0:0,0:0,0:0",batch_index_timeout=0i,batch_index_unused_buffers=0i,batch_initiate=0i,batch_queue=0i,batch_timeout=0i,client_connections=6i,cluster_integrity=true,cluster_key="8AF422E05281249E",cluster_size=1i,delete_queue=0i,demarshal_error=0i,early_tsvc_batch_sub_error=0i,early_tsvc_client_error=0i,early_tsvc_udf_sub_error=0i,fabric_connections=16i,fabric_msgs_rcvd=0i,fabric_msgs_sent=0i,heartbeat_connections=0i,heartbeat_received_foreign=0i,heartbeat_received_self=0i,info_complete=47i,info_queue=0i,migrate_allowed=true,migrate_partitions_remaining=0i,migrate_progress_recv=0i,migrate_progress_send=0i,node_name="BB9020011AC4202",objects=0i,paxos_principal="BB9020011AC4202",proxy_in_progress=0i,proxy_retry=0i,query_long_running=0i,query_short_running=0i,reaped_fds=0i,record_refs=0i,rw_in_progress=0i,scans_active=0i,sindex_gc_activity_dur=0i,sindex_gc_garbage_cleaned=0i,sindex_gc_garbage_found=0i,sindex_gc_inactivity_dur=0i,sindex_gc_list_creation_time=0i,sindex_gc_list_deletion_time=0i,sindex_gc_locktimedout=0i,sindex_gc_objects_validated=0i,sindex_ucgarbage_found=0i,sub_objects=0i,system_free_mem_pct=92i,system_swapping=false,tsvc_queue=0i,uptime=1457i 1468923222000000000
-> aerospike_namespace,aerospike_host=localhost:3000,host=tars,namespace=test allow_nonxdr_writes=true,allow_xdr_writes=true,available_bin_names=32768i,batch_sub_proxy_complete=0i,batch_sub_proxy_error=0i,batch_sub_proxy_timeout=0i,batch_sub_read_error=0i,batch_sub_read_not_found=0i,batch_sub_read_success=0i,batch_sub_read_timeout=0i,batch_sub_tsvc_error=0i,batch_sub_tsvc_timeout=0i,client_delete_error=0i,client_delete_not_found=0i,client_delete_success=0i,client_delete_timeout=0i,client_lang_delete_success=0i,client_lang_error=0i,client_lang_read_success=0i,client_lang_write_success=0i,client_proxy_complete=0i,client_proxy_error=0i,client_proxy_timeout=0i,client_read_error=0i,client_read_not_found=0i,client_read_success=0i,client_read_timeout=0i,client_tsvc_error=0i,client_tsvc_timeout=0i,client_udf_complete=0i,client_udf_error=0i,client_udf_timeout=0i,client_write_error=0i,client_write_success=0i,client_write_timeout=0i,cold_start_evict_ttl=4294967295i,conflict_resolution_policy="generation",current_time=206619222i,data_in_index=false,default_ttl=432000i,device_available_pct=99i,device_free_pct=100i,device_total_bytes=4294967296i,device_used_bytes=0i,disallow_null_setname=false,enable_benchmarks_batch_sub=false,enable_benchmarks_read=false,enable_benchmarks_storage=false,enable_benchmarks_udf=false,enable_benchmarks_udf_sub=false,enable_benchmarks_write=false,enable_hist_proxy=false,enable_xdr=false,evict_hist_buckets=10000i,evict_tenths_pct=5i,evict_ttl=0i,evicted_objects=0i,expired_objects=0i,fail_generation=0i,fail_key_busy=0i,fail_record_too_big=0i,fail_xdr_forbidden=0i,geo2dsphere_within.earth_radius_meters=6371000i,geo2dsphere_within.level_mod=1i,geo2dsphere_within.max_cells=12i,geo2dsphere_within.max_level=30i,geo2dsphere_within.min_level=1i,geo2dsphere_within.strict=true,geo_region_query_cells=0i,geo_region_query_falsepos=0i,geo_region_query_points=0i,geo_region_query_reqs=0i,high_water_disk_pct=50i,high_water_memory_pct=60i,hwm_breached=false,ldt_enabled=false,ldt_gc_rate=0i,ldt_page_size=8192i,master_objects=0i,master_sub_objects=0i,max_ttl=315360000i,max_void_time=0i,memory_free_pct=100i,memory_size=1073741824i,memory_used_bytes=0i,memory_used_data_bytes=0i,memory_used_index_bytes=0i,memory_used_sindex_bytes=0i,migrate_order=5i,migrate_record_receives=0i,migrate_record_retransmits=0i,migrate_records_skipped=0i,migrate_records_transmitted=0i,migrate_rx_instances=0i,migrate_rx_partitions_active=0i,migrate_rx_partitions_initial=0i,migrate_rx_partitions_remaining=0i,migrate_sleep=1i,migrate_tx_instances=0i,migrate_tx_partitions_active=0i,migrate_tx_partitions_imbalance=0i,migrate_tx_partitions_initial=0i,migrate_tx_partitions_remaining=0i,node_name="BB9020011AC4202",non_expirable_objects=0i,ns_forward_xdr_writes=false,nsup_cycle_duration=0i,nsup_cycle_sleep_pct=0i,objects=0i,prole_objects=0i,prole_sub_objects=0i,query_agg=0i,query_agg_abort=0i,query_agg_avg_rec_count=0i,query_agg_error=0i,query_agg_success=0i,query_fail=0i,query_long_queue_full=0i,query_long_reqs=0i,query_lookup_abort=0i,query_lookup_avg_rec_count=0i,query_lookup_error=0i,query_lookup_success=0i,query_lookups=0i,query_reqs=0i,query_short_queue_full=0i,query_short_reqs=0i,query_udf_bg_failure=0i,query_udf_bg_success=0i,read_consistency_level_override="off",repl_factor=1i,scan_aggr_abort=0i,scan_aggr_complete=0i,scan_aggr_error=0i,scan_basic_abort=0i,scan_basic_complete=0i,scan_basic_error=0i,scan_udf_bg_abort=0i,scan_udf_bg_complete=0i,scan_udf_bg_error=0i,set_deleted_objects=0i,sets_enable_xdr=true,sindex.data_max_memory="ULONG_MAX",sindex.num_partitions=32i,single_bin=false,stop_writes=false,stop_writes_pct=90i,storage_engine="device",storage_engine.cold_start_empty=false,storage_engine.data_in_memory=true,storage_engine.defrag_lwm_pct=50i,storage_engine.defrag_queue_min=0i,storage_engine.defrag_sleep=1000i,storage_engine.defrag_startup_minimum=10i,storage_engine.disable_odirect=false,storage_engine.enable_osync=false,storage_engine.file="/opt/aerospike/data/test.dat",storage_engine.filesize=4294967296i,storage_engine.flush_max_ms=1000i,storage_engine.fsync_max_sec=0i,storage_engine.max_write_cache=67108864i,storage_engine.min_avail_pct=5i,storage_engine.post_write_queue=0i,storage_engine.scheduler_mode="null",storage_engine.write_block_size=1048576i,storage_engine.write_threads=1i,sub_objects=0i,udf_sub_lang_delete_success=0i,udf_sub_lang_error=0i,udf_sub_lang_read_success=0i,udf_sub_lang_write_success=0i,udf_sub_tsvc_error=0i,udf_sub_tsvc_timeout=0i,udf_sub_udf_complete=0i,udf_sub_udf_error=0i,udf_sub_udf_timeout=0i,write_commit_level_override="off",xdr_write_error=0i,xdr_write_success=0i,xdr_write_timeout=0i,{test}_query_hist_track_back=300i,{test}_query_hist_track_slice=10i,{test}_query_hist_track_thresholds="1,8,64",{test}_read_hist_track_back=300i,{test}_read_hist_track_slice=10i,{test}_read_hist_track_thresholds="1,8,64",{test}_udf_hist_track_back=300i,{test}_udf_hist_track_slice=10i,{test}_udf_hist_track_thresholds="1,8,64",{test}_write_hist_track_back=300i,{test}_write_hist_track_slice=10i,{test}_write_hist_track_thresholds="1,8,64" 1468923222000000000
-```
\ No newline at end of file
+% telegraf --input-filter aerospike --test
+> aerospike_node,aerospike_host=localhost:3000,node_name="BB9020011AC4202" batch_error=0i,batch_index_complete=0i,batch_index_created_buffers=0i,batch_index_destroyed_buffers=0i,batch_index_error=0i,batch_index_huge_buffers=0i,batch_index_initiate=0i,batch_index_queue="0:0,0:0,0:0,0:0",batch_index_timeout=0i,batch_index_unused_buffers=0i,batch_initiate=0i,batch_queue=0i,batch_timeout=0i,client_connections=6i,cluster_integrity=true,cluster_key="8AF422E05281249E",cluster_size=1i,delete_queue=0i,demarshal_error=0i,early_tsvc_batch_sub_error=0i,early_tsvc_client_error=0i,early_tsvc_udf_sub_error=0i,fabric_connections=16i,fabric_msgs_rcvd=0i,fabric_msgs_sent=0i,heartbeat_connections=0i,heartbeat_received_foreign=0i,heartbeat_received_self=0i,info_complete=47i,info_queue=0i,migrate_allowed=true,migrate_partitions_remaining=0i,migrate_progress_recv=0i,migrate_progress_send=0i,objects=0i,paxos_principal="BB9020011AC4202",proxy_in_progress=0i,proxy_retry=0i,query_long_running=0i,query_short_running=0i,reaped_fds=0i,record_refs=0i,rw_in_progress=0i,scans_active=0i,sindex_gc_activity_dur=0i,sindex_gc_garbage_cleaned=0i,sindex_gc_garbage_found=0i,sindex_gc_inactivity_dur=0i,sindex_gc_list_creation_time=0i,sindex_gc_list_deletion_time=0i,sindex_gc_locktimedout=0i,sindex_gc_objects_validated=0i,sindex_ucgarbage_found=0i,sub_objects=0i,system_free_mem_pct=92i,system_swapping=false,tsvc_queue=0i,uptime=1457i 1468923222000000000
+> aerospike_namespace,aerospike_host=localhost:3000,namespace=test,node_name="BB9020011AC4202" allow_nonxdr_writes=true,allow_xdr_writes=true,available_bin_names=32768i,batch_sub_proxy_complete=0i,batch_sub_proxy_error=0i,batch_sub_proxy_timeout=0i,batch_sub_read_error=0i,batch_sub_read_not_found=0i,batch_sub_read_success=0i,batch_sub_read_timeout=0i,batch_sub_tsvc_error=0i,batch_sub_tsvc_timeout=0i,client_delete_error=0i,client_delete_not_found=0i,client_delete_success=0i,client_delete_timeout=0i,client_lang_delete_success=0i,client_lang_error=0i,client_lang_read_success=0i,client_lang_write_success=0i,client_proxy_complete=0i,client_proxy_error=0i,client_proxy_timeout=0i,client_read_error=0i,client_read_not_found=0i,client_read_success=0i,client_read_timeout=0i,client_tsvc_error=0i,client_tsvc_timeout=0i,client_udf_complete=0i,client_udf_error=0i,client_udf_timeout=0i,client_write_error=0i,client_write_success=0i,client_write_timeout=0i,cold_start_evict_ttl=4294967295i,conflict_resolution_policy="generation",current_time=206619222i,data_in_index=false,default_ttl=432000i,device_available_pct=99i,device_free_pct=100i,device_total_bytes=4294967296i,device_used_bytes=0i,disallow_null_setname=false,enable_benchmarks_batch_sub=false,enable_benchmarks_read=false,enable_benchmarks_storage=false,enable_benchmarks_udf=false,enable_benchmarks_udf_sub=false,enable_benchmarks_write=false,enable_hist_proxy=false,enable_xdr=false,evict_hist_buckets=10000i,evict_tenths_pct=5i,evict_ttl=0i,evicted_objects=0i,expired_objects=0i,fail_generation=0i,fail_key_busy=0i,fail_record_too_big=0i,fail_xdr_forbidden=0i,geo2dsphere_within.earth_radius_meters=6371000i,geo2dsphere_within.level_mod=1i,geo2dsphere_within.max_cells=12i,geo2dsphere_within.max_level=30i,geo2dsphere_within.min_level=1i,geo2dsphere_within.strict=true,geo_region_query_cells=0i,geo_region_query_falsepos=0i,geo_region_query_points=0i,geo_region_query_reqs=0i,high_water_disk_pct=50i,high_water_memory_pct=60i,hwm_breached=false,ldt_enabled=false,ldt_gc_rate=0i,ldt_page_size=8192i,master_objects=0i,master_sub_objects=0i,max_ttl=315360000i,max_void_time=0i,memory_free_pct=100i,memory_size=1073741824i,memory_used_bytes=0i,memory_used_data_bytes=0i,memory_used_index_bytes=0i,memory_used_sindex_bytes=0i,migrate_order=5i,migrate_record_receives=0i,migrate_record_retransmits=0i,migrate_records_skipped=0i,migrate_records_transmitted=0i,migrate_rx_instances=0i,migrate_rx_partitions_active=0i,migrate_rx_partitions_initial=0i,migrate_rx_partitions_remaining=0i,migrate_sleep=1i,migrate_tx_instances=0i,migrate_tx_partitions_active=0i,migrate_tx_partitions_imbalance=0i,migrate_tx_partitions_initial=0i,migrate_tx_partitions_remaining=0i,non_expirable_objects=0i,ns_forward_xdr_writes=false,nsup_cycle_duration=0i,nsup_cycle_sleep_pct=0i,objects=0i,prole_objects=0i,prole_sub_objects=0i,query_agg=0i,query_agg_abort=0i,query_agg_avg_rec_count=0i,query_agg_error=0i,query_agg_success=0i,query_fail=0i,query_long_queue_full=0i,query_long_reqs=0i,query_lookup_abort=0i,query_lookup_avg_rec_count=0i,query_lookup_error=0i,query_lookup_success=0i,query_lookups=0i,query_reqs=0i,query_short_queue_full=0i,query_short_reqs=0i,query_udf_bg_failure=0i,query_udf_bg_success=0i,read_consistency_level_override="off",repl_factor=1i,scan_aggr_abort=0i,scan_aggr_complete=0i,scan_aggr_error=0i,scan_basic_abort=0i,scan_basic_complete=0i,scan_basic_error=0i,scan_udf_bg_abort=0i,scan_udf_bg_complete=0i,scan_udf_bg_error=0i,set_deleted_objects=0i,sets_enable_xdr=true,sindex.data_max_memory="ULONG_MAX",sindex.num_partitions=32i,single_bin=false,stop_writes=false,stop_writes_pct=90i,storage_engine="device",storage_engine.cold_start_empty=false,storage_engine.data_in_memory=true,storage_engine.defrag_lwm_pct=50i,storage_engine.defrag_queue_min=0i,storage_engine.defrag_sleep=1000i,storage_engine.defrag_startup_minimum=10i,storage_engine.disable_odirect=false,storage_engine.enable_osync=false,storage_engine.file="/opt/aerospike/data/test.dat",storage_engine.filesize=4294967296i,storage_engine.flush_max_ms=1000i,storage_engine.fsync_max_sec=0i,storage_engine.max_write_cache=67108864i,storage_engine.min_avail_pct=5i,storage_engine.post_write_queue=0i,storage_engine.scheduler_mode="null",storage_engine.write_block_size=1048576i,storage_engine.write_threads=1i,sub_objects=0i,udf_sub_lang_delete_success=0i,udf_sub_lang_error=0i,udf_sub_lang_read_success=0i,udf_sub_lang_write_success=0i,udf_sub_tsvc_error=0i,udf_sub_tsvc_timeout=0i,udf_sub_udf_complete=0i,udf_sub_udf_error=0i,udf_sub_udf_timeout=0i,write_commit_level_override="off",xdr_write_error=0i,xdr_write_success=0i,xdr_write_timeout=0i,{test}_query_hist_track_back=300i,{test}_query_hist_track_slice=10i,{test}_query_hist_track_thresholds="1,8,64",{test}_read_hist_track_back=300i,{test}_read_hist_track_slice=10i,{test}_read_hist_track_thresholds="1,8,64",{test}_udf_hist_track_back=300i,{test}_udf_hist_track_slice=10i,{test}_udf_hist_track_thresholds="1,8,64",{test}_write_hist_track_back=300i,{test}_write_hist_track_slice=10i,{test}_write_hist_track_thresholds="1,8,64" 1468923222000000000
+```
diff --git a/plugins/inputs/aerospike/aerospike.go b/plugins/inputs/aerospike/aerospike.go
index 10cccc689..bd4d9889d 100644
--- a/plugins/inputs/aerospike/aerospike.go
+++ b/plugins/inputs/aerospike/aerospike.go
@@ -73,10 +73,9 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 	for _, n := range nodes {
 		tags := map[string]string{
 			"aerospike_host": hostport,
+			"node_name":      n.GetName(),
 		}
-		fields := map[string]interface{}{
-			"node_name": n.GetName(),
-		}
+		fields := make(map[string]interface{})
 		stats, err := as.RequestNodeStats(n)
 		if err != nil {
 			return err
@@ -100,11 +99,10 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 		for _, namespace := range namespaces {
 			nTags := map[string]string{
 				"aerospike_host": hostport,
+				"node_name":      n.GetName(),
 			}
 			nTags["namespace"] = namespace
-			nFields := map[string]interface{}{
-				"node_name": n.GetName(),
-			}
+			nFields := make(map[string]interface{})
 			info, err := as.RequestNodeInfo(n, "namespace/"+namespace)
 			if err != nil {
 				continue
diff --git a/plugins/inputs/aerospike/aerospike_test.go b/plugins/inputs/aerospike/aerospike_test.go
index ac8c90d2b..078e148f5 100644
--- a/plugins/inputs/aerospike/aerospike_test.go
+++ b/plugins/inputs/aerospike/aerospike_test.go
@@ -23,7 +23,9 @@ func TestAerospikeStatistics(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.True(t, acc.HasMeasurement("aerospike_node"))
+	assert.True(t, acc.HasTag("aerospike_node", "node_name"))
 	assert.True(t, acc.HasMeasurement("aerospike_namespace"))
+	assert.True(t, acc.HasTag("aerospike_namespace", "node_name"))
 	assert.True(t, acc.HasInt64Field("aerospike_node", "batch_error"))
 }
 

From 246f342e6a842de91b30b29dd27f47b86a5f597d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Jun 2017 17:19:33 -0700
Subject: [PATCH 0317/1302] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad4c1a635..3185add4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
   supporting Kafka 0.8 and below is available as the `kafka_consumer_legacy`
   plugin.
 
+- In the `aerospike` input the `node_name` field has been changed to be a tag
+  for both the `aerospike_node` and `aerospike_namespace` measurements.
+
 ### Features
 
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
@@ -31,6 +34,7 @@
 - [#2855](https://github.com/influxdata/telegraf/pull/2855):  MySQL input: log and continue on field parse error.
 - [#2885](https://github.com/influxdata/telegraf/pull/2885): Fix timeout option in Windows ping input sample configuration.
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
+- [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 
 ## v1.3.2 [unreleased]
 

From 949072e8dc9f000f77db70bf1daed5408d33f035 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 13 Jun 2017 18:04:26 -0700
Subject: [PATCH 0318/1302] Ensure prometheus metrics have same set of labels
 (#2857)

---
 .../prometheus_client/prometheus_client.go    | 219 +++++++----
 .../prometheus_client_test.go                 | 369 +++++++++++++++---
 2 files changed, 457 insertions(+), 131 deletions(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 8c52b3358..137bf3095 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -6,6 +6,8 @@ import (
 	"log"
 	"net/http"
 	"regexp"
+	"sort"
+	"strings"
 	"sync"
 	"time"
 
@@ -17,19 +19,40 @@ import (
 
 var invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
 
-type MetricWithExpiration struct {
-	Metric     prometheus.Metric
+// SampleID uniquely identifies a Sample
+type SampleID string
+
+// Sample represents the current value of a series.
+type Sample struct {
+	// Labels are the Prometheus labels.
+	Labels map[string]string
+	// Value is the value in the Prometheus output.
+	Value float64
+	// Expiration is the deadline that this Sample is valid until.
 	Expiration time.Time
 }
 
+// MetricFamily contains the data required to build valid prometheus Metrics.
+type MetricFamily struct {
+	// Samples are the Sample belonging to this MetricFamily.
+	Samples map[SampleID]*Sample
+	// Type of the Value.
+	ValueType prometheus.ValueType
+	// LabelSet is the label counts for all Samples.
+	LabelSet map[string]int
+}
+
 type PrometheusClient struct {
 	Listen             string
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
-	server             *http.Server
 
-	metrics map[string]*MetricWithExpiration
+	server *http.Server
 
 	sync.Mutex
+	// fam is the non-expired MetricFamily by Prometheus metric name.
+	fam map[string]*MetricFamily
+	// now returns the current time.
+	now func() time.Time
 }
 
 var sampleConfig = `
@@ -41,7 +64,6 @@ var sampleConfig = `
 `
 
 func (p *PrometheusClient) Start() error {
-	p.metrics = make(map[string]*MetricWithExpiration)
 	prometheus.Register(p)
 
 	if p.Listen == "" {
@@ -88,96 +110,153 @@ func (p *PrometheusClient) Describe(ch chan<- *prometheus.Desc) {
 	prometheus.NewGauge(prometheus.GaugeOpts{Name: "Dummy", Help: "Dummy"}).Describe(ch)
 }
 
-// Implements prometheus.Collector
+// Expire removes Samples that have expired.
+func (p *PrometheusClient) Expire() {
+	now := p.now()
+	for name, family := range p.fam {
+		for key, sample := range family.Samples {
+			if p.ExpirationInterval.Duration != 0 && now.After(sample.Expiration) {
+				for k, _ := range sample.Labels {
+					family.LabelSet[k]--
+				}
+				delete(family.Samples, key)
+
+				if len(family.Samples) == 0 {
+					delete(p.fam, name)
+				}
+			}
+		}
+	}
+}
+
+// Collect implements prometheus.Collector
 func (p *PrometheusClient) Collect(ch chan<- prometheus.Metric) {
 	p.Lock()
 	defer p.Unlock()
 
-	for key, m := range p.metrics {
-		if p.ExpirationInterval.Duration != 0 && time.Now().After(m.Expiration) {
-			delete(p.metrics, key)
-		} else {
-			ch <- m.Metric
+	p.Expire()
+
+	for name, family := range p.fam {
+		// Get list of all labels on MetricFamily
+		var labelNames []string
+		for k, v := range family.LabelSet {
+			if v > 0 {
+				labelNames = append(labelNames, k)
+			}
+		}
+		desc := prometheus.NewDesc(name, "Telegraf collected metric", labelNames, nil)
+
+		for _, sample := range family.Samples {
+			// Get labels for this sample; unset labels will be set to the
+			// empty string
+			var labels []string
+			for _, label := range labelNames {
+				v := sample.Labels[label]
+				labels = append(labels, v)
+			}
+
+			metric, err := prometheus.NewConstMetric(desc, family.ValueType, sample.Value, labels...)
+			if err != nil {
+				log.Printf("E! Error creating prometheus metric, "+
+					"key: %s, labels: %v,\nerr: %s\n",
+					name, labels, err.Error())
+			}
+
+			ch <- metric
 		}
 	}
 }
 
+func sanitize(value string) string {
+	return invalidNameCharRE.ReplaceAllString(value, "_")
+}
+
+func valueType(tt telegraf.ValueType) prometheus.ValueType {
+	switch tt {
+	case telegraf.Counter:
+		return prometheus.CounterValue
+	case telegraf.Gauge:
+		return prometheus.GaugeValue
+	default:
+		return prometheus.UntypedValue
+	}
+}
+
+// CreateSampleID creates a SampleID based on the tags of a telegraf.Metric.
+func CreateSampleID(tags map[string]string) SampleID {
+	pairs := make([]string, 0, len(tags))
+	for k, v := range tags {
+		pairs = append(pairs, fmt.Sprintf("%s=%s", k, v))
+	}
+	sort.Strings(pairs)
+	return SampleID(strings.Join(pairs, ","))
+}
+
 func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 	p.Lock()
 	defer p.Unlock()
 
-	if len(metrics) == 0 {
-		return nil
-	}
+	now := p.now()
 
 	for _, point := range metrics {
-		key := point.Name()
-		key = invalidNameCharRE.ReplaceAllString(key, "_")
+		tags := point.Tags()
+		vt := valueType(point.Type())
+		sampleID := CreateSampleID(tags)
 
-		// convert tags into prometheus labels
-		var labels []string
-		l := prometheus.Labels{}
-		for k, v := range point.Tags() {
-			k = invalidNameCharRE.ReplaceAllString(k, "_")
-			if len(k) == 0 {
-				continue
-			}
-			labels = append(labels, k)
-			l[k] = v
+		labels := make(map[string]string)
+		for k, v := range tags {
+			labels[sanitize(k)] = sanitize(v)
 		}
 
-		// Get a type if it's available, defaulting to Untyped
-		var mType prometheus.ValueType
-		switch point.Type() {
-		case telegraf.Counter:
-			mType = prometheus.CounterValue
-		case telegraf.Gauge:
-			mType = prometheus.GaugeValue
-		default:
-			mType = prometheus.UntypedValue
-		}
-
-		for n, val := range point.Fields() {
+		for fn, fv := range point.Fields() {
 			// Ignore string and bool fields.
-			switch val.(type) {
-			case string:
-				continue
-			case bool:
-				continue
-			}
-
-			// sanitize the measurement name
-			n = invalidNameCharRE.ReplaceAllString(n, "_")
-			var mname string
-			if n == "value" {
-				mname = key
-			} else {
-				mname = fmt.Sprintf("%s_%s", key, n)
-			}
-
-			desc := prometheus.NewDesc(mname, "Telegraf collected metric", nil, l)
-			var metric prometheus.Metric
-			var err error
-
-			// switch for field type
-			switch val := val.(type) {
+			var value float64
+			switch fv := fv.(type) {
 			case int64:
-				metric, err = prometheus.NewConstMetric(desc, mType, float64(val))
+				value = float64(fv)
 			case float64:
-				metric, err = prometheus.NewConstMetric(desc, mType, val)
+				value = fv
 			default:
 				continue
 			}
-			if err != nil {
-				log.Printf("E! Error creating prometheus metric, "+
-					"key: %s, labels: %v,\nerr: %s\n",
-					mname, l, err.Error())
+
+			sample := &Sample{
+				Labels:     labels,
+				Value:      value,
+				Expiration: now.Add(p.ExpirationInterval.Duration),
 			}
 
-			p.metrics[desc.String()] = &MetricWithExpiration{
-				Metric:     metric,
-				Expiration: time.Now().Add(p.ExpirationInterval.Duration),
+			// Special handling of value field; supports passthrough from
+			// the prometheus input.
+			var mname string
+			if fn == "value" {
+				mname = sanitize(point.Name())
+			} else {
+				mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
 			}
+
+			var fam *MetricFamily
+			var ok bool
+			if fam, ok = p.fam[mname]; !ok {
+				fam = &MetricFamily{
+					Samples:   make(map[SampleID]*Sample),
+					ValueType: vt,
+					LabelSet:  make(map[string]int),
+				}
+				p.fam[mname] = fam
+			} else {
+				if fam.ValueType != vt {
+					// Don't return an error since this would be a permanent error
+					log.Printf("Mixed ValueType for measurement %q; dropping point", point.Name())
+					break
+				}
+			}
+
+			for k, _ := range sample.Labels {
+				fam.LabelSet[k]++
+			}
+
+			fam.Samples[sampleID] = sample
 		}
 	}
 	return nil
@@ -187,6 +266,8 @@ func init() {
 	outputs.Add("prometheus_client", func() telegraf.Output {
 		return &PrometheusClient{
 			ExpirationInterval: internal.Duration{Duration: time.Second * 60},
+			fam:                make(map[string]*MetricFamily),
+			now:                time.Now,
 		}
 	})
 }
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 0251de781..3ce211beb 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -4,16 +4,314 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/plugins/inputs/prometheus"
+	prometheus_input "github.com/influxdata/telegraf/plugins/inputs/prometheus"
 	"github.com/influxdata/telegraf/testutil"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/require"
 )
 
+func setUnixTime(client *PrometheusClient, sec int64) {
+	client.now = func() time.Time {
+		return time.Unix(sec, 0)
+	}
+}
+
+// NewClient initializes a PrometheusClient.
+func NewClient() *PrometheusClient {
+	return &PrometheusClient{
+		ExpirationInterval: internal.Duration{Duration: time.Second * 60},
+		fam:                make(map[string]*MetricFamily),
+		now:                time.Now,
+	}
+}
+
+func TestWrite_Basic(t *testing.T) {
+	now := time.Now()
+	pt1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 0.0},
+		now)
+	var metrics = []telegraf.Metric{
+		pt1,
+	}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, prometheus.UntypedValue, fam.ValueType)
+	require.Equal(t, map[string]int{}, fam.LabelSet)
+
+	sample, ok := fam.Samples[CreateSampleID(pt1.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, 0.0, sample.Value)
+	require.True(t, now.Before(sample.Expiration))
+}
+
+func TestWrite_IntField(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 42},
+		time.Now())
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	for _, v := range fam.Samples {
+		require.Equal(t, 42.0, v.Value)
+	}
+
+}
+
+func TestWrite_FieldNotValue(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"howdy": 0.0},
+		time.Now())
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo_howdy"]
+	require.True(t, ok)
+	for _, v := range fam.Samples {
+		require.Equal(t, 0.0, v.Value)
+	}
+}
+
+func TestWrite_SkipNonNumberField(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": "howdy"},
+		time.Now())
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	_, ok := client.fam["foo"]
+	require.False(t, ok)
+}
+
+func TestWrite_Counter(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 42},
+		time.Now(),
+		telegraf.Counter)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, prometheus.CounterValue, fam.ValueType)
+}
+
+func TestWrite_Sanitize(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo.bar",
+		map[string]string{"tag-with-dash": "localhost.local"},
+		map[string]interface{}{"field-with-dash": 42},
+		time.Now(),
+		telegraf.Counter)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo_bar_field_with_dash"]
+	require.True(t, ok)
+	require.Equal(t, map[string]int{"tag_with_dash": 1}, fam.LabelSet)
+
+	sample1, ok := fam.Samples[CreateSampleID(p1.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, map[string]string{
+		"tag_with_dash": "localhost_local"}, sample1.Labels)
+}
+
+func TestWrite_Gauge(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 42},
+		time.Now(),
+		telegraf.Gauge)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, prometheus.GaugeValue, fam.ValueType)
+}
+
+func TestWrite_MixedValueType(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0},
+		now,
+		telegraf.Counter)
+	p2, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 2.0},
+		now,
+		telegraf.Gauge)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 1, len(fam.Samples))
+}
+
+func TestWrite_Tags(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0},
+		now)
+	p2, err := metric.New(
+		"foo",
+		map[string]string{"host": "localhost"},
+		map[string]interface{}{"value": 2.0},
+		now)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, prometheus.UntypedValue, fam.ValueType)
+
+	require.Equal(t, map[string]int{"host": 1}, fam.LabelSet)
+
+	sample1, ok := fam.Samples[CreateSampleID(p1.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, 1.0, sample1.Value)
+	require.True(t, now.Before(sample1.Expiration))
+
+	sample2, ok := fam.Samples[CreateSampleID(p2.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, 2.0, sample2.Value)
+	require.True(t, now.Before(sample2.Expiration))
+}
+
+func TestExpire(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0},
+		time.Now())
+	setUnixTime(client, 0)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	p2, err := metric.New(
+		"bar",
+		make(map[string]string),
+		map[string]interface{}{"value": 2.0},
+		time.Now())
+	setUnixTime(client, 1)
+	err = client.Write([]telegraf.Metric{p2})
+
+	setUnixTime(client, 61)
+	require.Equal(t, 2, len(client.fam))
+	client.Expire()
+	require.Equal(t, 1, len(client.fam))
+}
+
+func TestExpire_TagsNoDecrement(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0},
+		time.Now())
+	setUnixTime(client, 0)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	p2, err := metric.New(
+		"foo",
+		map[string]string{"host": "localhost"},
+		map[string]interface{}{"value": 2.0},
+		time.Now())
+	setUnixTime(client, 1)
+	err = client.Write([]telegraf.Metric{p2})
+
+	setUnixTime(client, 61)
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 2, len(fam.Samples))
+	client.Expire()
+	require.Equal(t, 1, len(fam.Samples))
+
+	require.Equal(t, map[string]int{"host": 1}, fam.LabelSet)
+}
+
+func TestExpire_TagsWithDecrement(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		map[string]string{"host": "localhost"},
+		map[string]interface{}{"value": 1.0},
+		time.Now())
+	setUnixTime(client, 0)
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	p2, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 2.0},
+		time.Now())
+	setUnixTime(client, 1)
+	err = client.Write([]telegraf.Metric{p2})
+
+	setUnixTime(client, 61)
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 2, len(fam.Samples))
+	client.Expire()
+	require.Equal(t, 1, len(fam.Samples))
+
+	require.Equal(t, map[string]int{"host": 0}, fam.LabelSet)
+}
+
 var pTesting *PrometheusClient
 
 func TestPrometheusWritePointEmptyTag(t *testing.T) {
@@ -93,74 +391,21 @@ func TestPrometheusWritePointEmptyTag(t *testing.T) {
 	}
 }
 
-func TestPrometheusExpireOldMetrics(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	pClient, p, err := setupPrometheus()
-	pClient.ExpirationInterval = internal.Duration{Duration: time.Second * 10}
-	require.NoError(t, err)
-	defer pClient.Stop()
-
-	now := time.Now()
-	tags := make(map[string]string)
-	pt1, _ := metric.New(
-		"test_point_1",
-		tags,
-		map[string]interface{}{"value": 0.0},
-		now)
-	var metrics = []telegraf.Metric{pt1}
-	require.NoError(t, pClient.Write(metrics))
-
-	for _, m := range pClient.metrics {
-		m.Expiration = now.Add(time.Duration(-15) * time.Second)
-	}
-
-	pt2, _ := metric.New(
-		"test_point_2",
-		tags,
-		map[string]interface{}{"value": 1.0},
-		now)
-	var metrics2 = []telegraf.Metric{pt2}
-	require.NoError(t, pClient.Write(metrics2))
-
-	expected := []struct {
-		name  string
-		value float64
-		tags  map[string]string
-	}{
-		{"test_point_2", 1.0, tags},
-	}
-
-	var acc testutil.Accumulator
-
-	require.NoError(t, p.Gather(&acc))
-	for _, e := range expected {
-		acc.AssertContainsFields(t, e.name,
-			map[string]interface{}{"value": e.value})
-	}
-
-	acc.AssertDoesNotContainMeasurement(t, "test_point_1")
-
-	// Confirm that it's not in the PrometheusClient map anymore
-	assert.Equal(t, 1, len(pClient.metrics))
-}
-
-func setupPrometheus() (*PrometheusClient, *prometheus.Prometheus, error) {
+func setupPrometheus() (*PrometheusClient, *prometheus_input.Prometheus, error) {
 	if pTesting == nil {
-		pTesting = &PrometheusClient{Listen: "localhost:9127"}
+		pTesting = NewClient()
+		pTesting.Listen = "localhost:9127"
 		err := pTesting.Start()
 		if err != nil {
 			return nil, nil, err
 		}
 	} else {
-		pTesting.metrics = make(map[string]*MetricWithExpiration)
+		pTesting.fam = make(map[string]*MetricFamily)
 	}
 
 	time.Sleep(time.Millisecond * 200)
 
-	p := &prometheus.Prometheus{
+	p := &prometheus_input.Prometheus{
 		Urls: []string{"http://localhost:9127/metrics"},
 	}
 

From ea787b83bffa1d4d848c3d52e3e1af1719eb3278 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Jun 2017 18:07:12 -0700
Subject: [PATCH 0319/1302] Update changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3185add4c..fb54d9ef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,8 +40,9 @@
 
 ### Bugfixes
 
-- [#2862](https://github.com/influxdata/telegraf/issue/2862): Fix InfluxDB UDP metric splitting.
-- [#2888](https://github.com/influxdata/telegraf/issue/2888): Fix mongodb/leofs urls without scheme.
+- [#2862](https://github.com/influxdata/telegraf/issues/2862): Fix InfluxDB UDP metric splitting.
+- [#2888](https://github.com/influxdata/telegraf/issues/2888): Fix mongodb/leofs urls without scheme.
+- [#2822](https://github.com/influxdata/telegraf/issues/2822): Fix inconsistent label dimensions in prometheus output.
 
 ## v1.3.1 [2017-05-31]
 

From ca72df586889a16a6e4ebd3d32b9662ba370d198 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 14 Jun 2017 12:16:08 -0700
Subject: [PATCH 0320/1302] Update 1.3.2 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb54d9ef7..e6091661a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 
-## v1.3.2 [unreleased]
+## v1.3.2 [2017-06-14]
 
 ### Bugfixes
 

From 674c24f987f4fad214f92cd3742842ceb4cfaf03 Mon Sep 17 00:00:00 2001
From: Simone Rotondo <simone.rotondo@gmail.com>
Date: Fri, 16 Jun 2017 21:05:08 +0200
Subject: [PATCH 0321/1302] Add HTTP Proxy support to influxdb output (#2929)

---
 plugins/outputs/influxdb/README.md      |  4 ++++
 plugins/outputs/influxdb/client/http.go | 26 +++++++++++++++++++++----
 plugins/outputs/influxdb/influxdb.go    |  7 ++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 3cd029d8c..49fdc731c 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -40,6 +40,9 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
   # ssl_key = "/etc/telegraf/key.pem"
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
+
+  ## HTTP Proxy Config
+  # http_proxy = "http://corporate.proxy:3128"
 ```
 
 ### Required parameters:
@@ -63,3 +66,4 @@ to write to. Each URL should start with either `http://` or `udp://`
 * `ssl_cert`: SSL CERT
 * `ssl_key`: SSL key
 * `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
+* `http_proxy`: HTTP Proxy URI
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 4acea2362..6a757982d 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -39,15 +39,30 @@ func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
 		return nil, fmt.Errorf("config.URL scheme must be http(s), got %s", u.Scheme)
 	}
 
+	var transport http.Transport
+	if len(config.HTTPProxy) > 0 {
+		proxyURL, err := url.Parse(config.HTTPProxy)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing config.HTTPProxy: %s", err)
+		}
+
+		transport = http.Transport{
+			Proxy:           http.ProxyURL(proxyURL),
+			TLSClientConfig: config.TLSConfig,
+		}
+	} else {
+		transport = http.Transport{
+			TLSClientConfig: config.TLSConfig,
+		}
+	}
+
 	return &httpClient{
 		writeURL: writeURL(u, defaultWP),
 		config:   config,
 		url:      u,
 		client: &http.Client{
-			Timeout: config.Timeout,
-			Transport: &http.Transport{
-				TLSClientConfig: config.TLSConfig,
-			},
+			Timeout:   config.Timeout,
+			Transport: &transport,
 		},
 	}, nil
 }
@@ -76,6 +91,9 @@ type HTTPConfig struct {
 	// TLSConfig is the tls auth settings to use for each request.
 	TLSConfig *tls.Config
 
+	// Proxy URL should be of the form "http://host:port"
+	HTTPProxy string
+
 	// Gzip, if true, compresses each payload using gzip.
 	// TODO
 	// Gzip bool
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index fe1adc4bb..1028bc257 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -32,7 +32,8 @@ type InfluxDB struct {
 	RetentionPolicy  string
 	WriteConsistency string
 	Timeout          internal.Duration
-	UDPPayload       int `toml:"udp_payload"`
+	UDPPayload       int    `toml:"udp_payload"`
+	HTTPProxy        string `toml:"http_proxy"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -83,6 +84,9 @@ var sampleConfig = `
   # ssl_key = "/etc/telegraf/key.pem"
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
+
+  ## HTTP Proxy Config
+  # http_proxy = "http://corporate.proxy:3128"
 `
 
 // Connect initiates the primary connection to the range of provided URLs
@@ -123,6 +127,7 @@ func (i *InfluxDB) Connect() error {
 				UserAgent: i.UserAgent,
 				Username:  i.Username,
 				Password:  i.Password,
+				HTTPProxy: i.HTTPProxy,
 			}
 			wp := client.WriteParams{
 				Database:        i.Database,

From ea1888bd260a5aae333998f002d0d4e3b0de1564 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Jun 2017 12:06:40 -0700
Subject: [PATCH 0322/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6091661a..e3cdf651c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [#2734](https://github.com/influxdata/telegraf/pull/2734): Add include/exclude filters for docker containers.
 - [#2602](https://github.com/influxdata/telegraf/pull/2602): Add secure connection support to graphite output.
 - [#2908](https://github.com/influxdata/telegraf/pull/2908): Add min/max response time on linux/darwin to ping.
+- [#2929](https://github.com/influxdata/telegraf/pull/2929): Add HTTP Proxy support to influxdb output.
 
 ### Bugfixes
 

From 3ecfd32df5352da28c8a210bb99e05d9a97689bf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 16 Jun 2017 13:16:48 -0700
Subject: [PATCH 0323/1302] Allow dos line endings in tail and logparser
 (#2920)

Parsing dos line ending delimited line protocol is still illegal in most
cases.
---
 plugins/inputs/logparser/logparser.go | 18 +++++++++-------
 plugins/inputs/tail/tail.go           |  6 +++++-
 plugins/inputs/tail/tail_test.go      | 30 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 6fee34b61..ea1e5d641 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"strings"
 	"sync"
 
 	"github.com/influxdata/tail"
@@ -47,7 +48,7 @@ const sampleConfig = `
   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
   ##   /var/log/apache.log -> only tail the apache log file
   files = ["/var/log/apache/access.log"]
-  
+
   ## Read files that currently exist from the beginning. Files that are created
   ## while telegraf is running (and that match the "files" globs) will always
   ## be read from the beginning.
@@ -63,17 +64,17 @@ const sampleConfig = `
     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
     patterns = ["%{COMBINED_LOG_FORMAT}"]
-    
+
     ## Name of the outputted measurement name.
     measurement = "apache_access_log"
-    
+
     ## Full path(s) to custom pattern files.
     custom_pattern_files = []
-    
+
     ## Custom patterns can also be defined here. Put one pattern per line.
     custom_patterns = '''
-    
-    ## Timezone allows you to provide an override for timestamps that 
+
+    ## Timezone allows you to provide an override for timestamps that
     ## don't already include an offset
     ## e.g. 04/06/2016 12:41:45 data one two 5.43µs
     ##
@@ -207,9 +208,12 @@ func (l *LogParserPlugin) receiver(tailer *tail.Tail) {
 			continue
 		}
 
+		// Fix up files with Windows line endings.
+		text := strings.TrimRight(line.Text, "\r")
+
 		select {
 		case <-l.done:
-		case l.lines <- line.Text:
+		case l.lines <- text:
 		}
 	}
 }
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index e360dcb64..05a1c95af 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -2,6 +2,7 @@ package tail
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
 	"github.com/influxdata/tail"
@@ -123,7 +124,10 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 				tailer.Filename, err))
 			continue
 		}
-		m, err = t.parser.ParseLine(line.Text)
+		// Fix up files with Windows line endings.
+		text := strings.TrimRight(line.Text, "\r")
+
+		m, err = t.parser.ParseLine(text)
 		if err == nil {
 			t.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
 		} else {
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 9e3888a1d..34e2abce9 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -103,3 +103,33 @@ func TestTailBadLine(t *testing.T) {
 	acc.WaitError(1)
 	assert.Contains(t, acc.Errors[0].Error(), "E! Malformed log line")
 }
+
+func TestTailDosLineendings(t *testing.T) {
+	tmpfile, err := ioutil.TempFile("", "")
+	require.NoError(t, err)
+	defer os.Remove(tmpfile.Name())
+	_, err = tmpfile.WriteString("cpu usage_idle=100\r\ncpu2 usage_idle=200\r\n")
+	require.NoError(t, err)
+
+	tt := NewTail()
+	tt.FromBeginning = true
+	tt.Files = []string{tmpfile.Name()}
+	p, _ := parsers.NewInfluxParser()
+	tt.SetParser(p)
+	defer tt.Stop()
+	defer tmpfile.Close()
+
+	acc := testutil.Accumulator{}
+	require.NoError(t, tt.Start(&acc))
+	require.NoError(t, acc.GatherError(tt.Gather))
+
+	acc.Wait(2)
+	acc.AssertContainsFields(t, "cpu",
+		map[string]interface{}{
+			"usage_idle": float64(100),
+		})
+	acc.AssertContainsFields(t, "cpu2",
+		map[string]interface{}{
+			"usage_idle": float64(200),
+		})
+}

From a729a44284f9e67fb5e80e9a61a6c6558dafbdc8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Jun 2017 13:18:27 -0700
Subject: [PATCH 0324/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3cdf651c..c0d398f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,12 @@
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 
+## v1.3.3 [unreleased]
+
+### Bugfixes
+
+- [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
+
 ## v1.3.2 [2017-06-14]
 
 ### Bugfixes

From ba364988dec019cce1df16d0a90e75722e766215 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Jun 2017 13:32:04 -0700
Subject: [PATCH 0325/1302] Document that ping_interval is non-linux only

---
 plugins/inputs/ping/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index bab7a976b..2274f42c9 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -13,6 +13,7 @@ urls = ["www.google.com"] # required
 ## number of pings to send per collection (ping -c <COUNT>)
 # count = 1
 ## interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
+## Not available in Windows.
 # ping_interval = 1.0
 ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
 # timeout = 1.0

From 736322dfc98da1e85461a89e4e53629977664fa7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Jun 2017 13:39:55 -0700
Subject: [PATCH 0326/1302] Set default ping count in Windows

fixes #2934
---
 plugins/inputs/ping/ping_windows.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index fb7cde489..7a9c6b3fa 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -3,15 +3,16 @@ package ping
 
 import (
 	"errors"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // HostPinger is a function that runs the "ping" function using a list of
@@ -38,14 +39,14 @@ func (s *Ping) Description() string {
 }
 
 const sampleConfig = `
-	## urls to ping
-	urls = ["www.google.com"] # required
+	## List of urls to ping
+	urls = ["www.google.com"]
 
 	## number of pings to send per collection (ping -n <COUNT>)
-	count = 4 # required
+	# count = 1
 
 	## Ping timeout, in seconds. 0.0 means default timeout (ping -w <TIMEOUT>)
-	#timeout = 0.0
+	# timeout = 0.0
 `
 
 func (s *Ping) SampleConfig() string {
@@ -145,6 +146,9 @@ func (p *Ping) args(url string) []string {
 }
 
 func (p *Ping) Gather(acc telegraf.Accumulator) error {
+	if p.Count < 1 {
+		p.Count = 1
+	}
 	var wg sync.WaitGroup
 	errorChannel := make(chan error, len(p.Urls)*2)
 	var pendingError error = nil
@@ -218,6 +222,9 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("ping", func() telegraf.Input {
-		return &Ping{pingHost: hostPinger}
+		return &Ping{
+			pingHost: hostPinger,
+			Count:    1,
+		}
 	})
 }

From 00b37a7c0d3b0a44796d71ce5307e5748a05a36d Mon Sep 17 00:00:00 2001
From: trastle <trastle@users.noreply.github.com>
Date: Mon, 19 Jun 2017 19:04:08 +0100
Subject: [PATCH 0327/1302] Update README for Prometheus Client Output (#2452)

---
 plugins/outputs/prometheus_client/README.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index 6ccb98a70..b9177ed7f 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -1,6 +1,15 @@
 # Prometheus Client Service Output Plugin
 
-This plugin starts a Prometheus Client, listening on a port defined in the
-configuration file.
+This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all metrics on `/metrics` to be polled by a Prometheus server.
 
-It exposes all metrics on `/metrics` to be polled by a Prometheus server.
+## Configuration
+
+```
+# Publish all metrics to /metrics for Prometheus to scrape
+[[outputs.prometheus_client]]
+  # Address to listen on
+  listen = ":9126"
+
+  # Expiration interval for each metric. 0 == no expiration
+  expiration_interval = "60s"
+```

From 193e8fa5add85b9f0c644aa06ae6e05a93a25e65 Mon Sep 17 00:00:00 2001
From: Artem Kovardin <horechek@gmail.com>
Date: Mon, 19 Jun 2017 21:06:49 +0300
Subject: [PATCH 0328/1302] More explicit 404 error in cassandra input (#2936)

---
 CHANGELOG.md                          | 1 +
 plugins/inputs/cassandra/cassandra.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d398f1e..a96794044 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 
 ### Bugfixes
 
+- [#2607](https://github.com/influxdata/telegraf/issues/2607): Errors in log should be more explicit
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index 88bb3f577..7dabe3b1b 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -296,7 +296,7 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 				continue
 			}
 			if out["status"] != 200.0 {
-				acc.AddError(fmt.Errorf("URL returned with status %v\n", out["status"]))
+				acc.AddError(fmt.Errorf("URL returned with status %v - %s\n", out["status"], requestUrl))
 				continue
 			}
 			m.addTagsFields(out)

From cb5a12de3d45b034b409f64f5d3874cd2199c50b Mon Sep 17 00:00:00 2001
From: Eugene Shilin <e.shilin@paralect.com>
Date: Mon, 19 Jun 2017 21:42:43 +0300
Subject: [PATCH 0329/1302] Add standard SSL options to mysql input (#2933)

---
 etc/telegraf.conf              |  5 +++++
 plugins/inputs/mysql/README.md |  5 +++++
 plugins/inputs/mysql/mysql.go  | 21 ++++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 8aa9427c4..c7691666d 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1528,6 +1528,11 @@
 #   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
 #   interval_slow                   = "30m"
 
+#   ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
+#   ssl_ca = "/etc/telegraf/ca.pem"
+#   ssl_cert = "/etc/telegraf/cert.pem"
+#   ssl_key = "/etc/telegraf/key.pem"
+
 
 # # Read metrics about network interface usage
 # [[inputs.net]]
diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index f941207c9..fb9a18eab 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -81,6 +81,11 @@ This plugin gathers the statistic data from MySQL server
   #
   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
   interval_slow                             = "30m"
+  
+  ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
+  ssl_ca = "/etc/telegraf/ca.pem"
+  ssl_cert = "/etc/telegraf/cert.pem"
+  ssl_key = "/etc/telegraf/key.pem"
 ```
 
 ## Measurements & Fields
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 77ca7e47e..2e8c61c8b 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
 	"github.com/go-sql-driver/mysql"
@@ -36,11 +37,14 @@ type Mysql struct {
 	GatherFileEventsStats               bool     `toml:"gather_file_events_stats"`
 	GatherPerfEventsStatements          bool     `toml:"gather_perf_events_statements"`
 	IntervalSlow                        string   `toml:"interval_slow"`
+	SSLCA                               string   `toml:"ssl_ca"`
+	SSLCert                             string   `toml:"ssl_cert"`
+	SSLKey                              string   `toml:"ssl_key"`
 }
 
 var sampleConfig = `
   ## specify servers via a url matching:
-  ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
+  ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify|custom]]
   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
   ##  e.g.
   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
@@ -97,6 +101,11 @@ var sampleConfig = `
   #
   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
   interval_slow                   = "30m"
+
+  ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
+  ssl_ca = "/etc/telegraf/ca.pem"
+  ssl_cert = "/etc/telegraf/cert.pem"
+  ssl_key = "/etc/telegraf/key.pem"
 `
 
 var defaultTimeout = time.Second * time.Duration(5)
@@ -135,6 +144,16 @@ func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 	if !initDone {
 		m.InitMysql()
 	}
+
+	tlsConfig, err := internal.GetTLSConfig(m.SSLCert, m.SSLKey, m.SSLCA, false)
+	if err != nil {
+		log.Printf("E! MySQL Error registering TLS config: %s", err)
+	}
+
+	if tlsConfig != nil {
+		mysql.RegisterTLSConfig("custom", tlsConfig)
+	}
+
 	var wg sync.WaitGroup
 
 	// Loop through each server and collect metrics

From dcdcb70cb1c795e622f0b3f4f4866a3da57df52d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 19 Jun 2017 11:52:53 -0700
Subject: [PATCH 0330/1302] Update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96794044..862af09f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,10 +23,11 @@
 - [#2602](https://github.com/influxdata/telegraf/pull/2602): Add secure connection support to graphite output.
 - [#2908](https://github.com/influxdata/telegraf/pull/2908): Add min/max response time on linux/darwin to ping.
 - [#2929](https://github.com/influxdata/telegraf/pull/2929): Add HTTP Proxy support to influxdb output.
+- [#2933](https://github.com/influxdata/telegraf/pull/2933): Add standard SSL options to mysql input.
 
 ### Bugfixes
 
-- [#2607](https://github.com/influxdata/telegraf/issues/2607): Errors in log should be more explicit
+- [#2607](https://github.com/influxdata/telegraf/issues/2607): Improve logging of errors in Cassandra input.
 - [#2819](https://github.com/influxdata/telegraf/pull/2819): [enh] set db_version at 0 if query version fails
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
 - [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
@@ -37,6 +38,7 @@
 - [#2885](https://github.com/influxdata/telegraf/pull/2885): Fix timeout option in Windows ping input sample configuration.
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
+- [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
 
 ## v1.3.3 [unreleased]
 

From 929ba0a6378f6b584b4bdad577f29863111c2452 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 21 Jun 2017 12:36:29 -0700
Subject: [PATCH 0331/1302] Remove label value sanitization in prometheus
 output (#2939)

---
 plugins/outputs/prometheus_client/prometheus_client.go      | 2 +-
 plugins/outputs/prometheus_client/prometheus_client_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 137bf3095..b52dcff6d 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -205,7 +205,7 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 
 		labels := make(map[string]string)
 		for k, v := range tags {
-			labels[sanitize(k)] = sanitize(v)
+			labels[sanitize(k)] = v
 		}
 
 		for fn, fv := range point.Fields() {
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 3ce211beb..85b6dde5c 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -144,7 +144,7 @@ func TestWrite_Sanitize(t *testing.T) {
 	require.True(t, ok)
 
 	require.Equal(t, map[string]string{
-		"tag_with_dash": "localhost_local"}, sample1.Labels)
+		"tag_with_dash": "localhost.local"}, sample1.Labels)
 }
 
 func TestWrite_Gauge(t *testing.T) {

From 9211985c636396d0af6095aaa4eb8e0db324348f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 21 Jun 2017 12:39:09 -0700
Subject: [PATCH 0332/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 862af09f3..d5012a6b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 ### Bugfixes
 
 - [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
+- [#2937](https://github.com/influxdata/telegraf/issues/2937): Remove label value sanitization in prometheus output.
 
 ## v1.3.2 [2017-06-14]
 

From ca9cec2c84e7c8796c2e8a747d17d1ad86ce1ae6 Mon Sep 17 00:00:00 2001
From: grugrut <grugruglut+github@gmail.com>
Date: Thu, 22 Jun 2017 04:42:13 +0900
Subject: [PATCH 0333/1302] Add input plugin for Fail2ban (#2875)

---
 plugins/inputs/all/all.go                   |   1 +
 plugins/inputs/fail2ban/README.md           |  60 +++++++++
 plugins/inputs/fail2ban/fail2ban.go         | 135 ++++++++++++++++++++
 plugins/inputs/fail2ban/fail2ban_nolinux.go |   3 +
 plugins/inputs/fail2ban/fail2ban_test.go    | 125 ++++++++++++++++++
 5 files changed, 324 insertions(+)
 create mode 100644 plugins/inputs/fail2ban/README.md
 create mode 100644 plugins/inputs/fail2ban/fail2ban.go
 create mode 100644 plugins/inputs/fail2ban/fail2ban_nolinux.go
 create mode 100644 plugins/inputs/fail2ban/fail2ban_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 456852ff2..3bf98c9d9 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -21,6 +21,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/dovecot"
 	_ "github.com/influxdata/telegraf/plugins/inputs/elasticsearch"
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
+	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
 	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
diff --git a/plugins/inputs/fail2ban/README.md b/plugins/inputs/fail2ban/README.md
new file mode 100644
index 000000000..e785a0dd3
--- /dev/null
+++ b/plugins/inputs/fail2ban/README.md
@@ -0,0 +1,60 @@
+# Fail2ban Plugin
+
+The fail2ban plugin gathers counts of failed and banned ip addresses from fail2ban.
+
+This plugin run fail2ban-client command, and fail2ban-client require root access.
+You have to grant telegraf to run fail2ban-client:
+
+- Run telegraf as root. (deprecate)
+- Configure sudo to grant telegraf to fail2ban-client.
+
+### Using sudo
+
+You may edit your sudo configuration with the following:
+
+``` sudo
+telegraf ALL=(root) NOPASSWD: /usr/bin/fail2ban-client status *
+```
+
+### Configuration:
+
+``` toml
+# Read metrics from fail2ban.
+[[inputs.fail2ban]]
+  ## fail2ban-client require root access.
+  ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
+  ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
+  ## This plugin run only "fail2ban-client status".
+  use_sudo = false
+```
+
+### Measurements & Fields:
+
+- fail2ban
+  - failed (integer, count)
+  - banned (integer, count)
+
+### Tags:
+
+- All measurements have the following tags:
+  - jail
+  
+### Example Output:
+
+```
+# fail2ban-client status sshd
+Status for the jail: sshd
+|- Filter
+|  |- Currently failed: 5
+|  |- Total failed:     20
+|  `- File list:        /var/log/secure
+`- Actions
+   |- Currently banned: 2
+   |- Total banned:     10
+   `- Banned IP list:   192.168.0.1 192.168.0.2
+```
+
+```
+$ ./telegraf --config telegraf.conf --input-filter fail2ban --test
+fail2ban,jail=sshd failed=5i,banned=2i 1495868667000000000
+```
diff --git a/plugins/inputs/fail2ban/fail2ban.go b/plugins/inputs/fail2ban/fail2ban.go
new file mode 100644
index 000000000..8ecad3b52
--- /dev/null
+++ b/plugins/inputs/fail2ban/fail2ban.go
@@ -0,0 +1,135 @@
+// +build linux
+
+package fail2ban
+
+import (
+	"errors"
+	"fmt"
+	"os/exec"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"strconv"
+)
+
+var (
+	execCommand = exec.Command // execCommand is used to mock commands in tests.
+)
+
+type Fail2ban struct {
+	path    string
+	UseSudo bool
+}
+
+var sampleConfig = `
+  ## fail2ban-client require root access.
+  ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
+  ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
+  ## This plugin run only "fail2ban-client status".
+  use_sudo = false
+`
+
+var metricsTargets = []struct {
+	target string
+	field  string
+}{
+	{
+		target: "Currently failed:",
+		field:  "failed",
+	},
+	{
+		target: "Currently banned:",
+		field:  "banned",
+	},
+}
+
+func (f *Fail2ban) Description() string {
+	return "Read metrics from fail2ban."
+}
+
+func (f *Fail2ban) SampleConfig() string {
+	return sampleConfig
+}
+
+func (f *Fail2ban) Gather(acc telegraf.Accumulator) error {
+	if len(f.path) == 0 {
+		return errors.New("fail2ban-client not found: verify that fail2ban is installed and that fail2ban-client is in your PATH")
+	}
+
+	name := f.path
+	var arg []string
+
+	if f.UseSudo {
+		name = "sudo"
+		arg = append(arg, f.path)
+	}
+
+	args := append(arg, "status")
+
+	cmd := execCommand(name, args...)
+	out, err := cmd.Output()
+	if err != nil {
+		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
+	}
+	lines := strings.Split(string(out), "\n")
+	const targetString = "Jail list:"
+	var jails []string
+	for _, line := range lines {
+		idx := strings.LastIndex(line, targetString)
+		if idx < 0 {
+			// not target line, skip.
+			continue
+		}
+		jails = strings.Split(strings.TrimSpace(line[idx+len(targetString):]), ", ")
+		break
+	}
+
+	for _, jail := range jails {
+		fields := make(map[string]interface{})
+		args := append(arg, "status", jail)
+		cmd := execCommand(name, args...)
+		out, err := cmd.Output()
+		if err != nil {
+			return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
+		}
+
+		lines := strings.Split(string(out), "\n")
+		for _, line := range lines {
+			key, value := extractCount(line)
+			if key != "" {
+				fields[key] = value
+			}
+		}
+		acc.AddFields("fail2ban", fields, map[string]string{"jail": jail})
+	}
+	return nil
+}
+
+func extractCount(line string) (string, int) {
+	for _, metricsTarget := range metricsTargets {
+		idx := strings.LastIndex(line, metricsTarget.target)
+		if idx < 0 {
+			continue
+		}
+		ban := strings.TrimSpace(line[idx+len(metricsTarget.target):])
+		banCount, err := strconv.Atoi(ban)
+		if err != nil {
+			return "", -1
+		}
+		return metricsTarget.field, banCount
+	}
+	return "", -1
+}
+
+func init() {
+	f := Fail2ban{}
+	path, _ := exec.LookPath("fail2ban-client")
+	if len(path) > 0 {
+		f.path = path
+	}
+	inputs.Add("fail2ban", func() telegraf.Input {
+		f := f
+		return &f
+	})
+}
diff --git a/plugins/inputs/fail2ban/fail2ban_nolinux.go b/plugins/inputs/fail2ban/fail2ban_nolinux.go
new file mode 100644
index 000000000..e62efa5b1
--- /dev/null
+++ b/plugins/inputs/fail2ban/fail2ban_nolinux.go
@@ -0,0 +1,3 @@
+// +build !linux
+
+package fail2ban
diff --git a/plugins/inputs/fail2ban/fail2ban_test.go b/plugins/inputs/fail2ban/fail2ban_test.go
new file mode 100644
index 000000000..b28d824ee
--- /dev/null
+++ b/plugins/inputs/fail2ban/fail2ban_test.go
@@ -0,0 +1,125 @@
+package fail2ban
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+// By all rights, we should use `string literal`, but the string contains "`".
+var execStatusOutput = "Status\n" +
+	"|- Number of jail:\t3\n" +
+	"`- Jail list:\tdovecot, postfix, sshd"
+var execStatusDovecotOutput = "Status for the jail: dovecot\n" +
+	"|- Filter\n" +
+	"|  |- Currently failed:\t11\n" +
+	"|  |- Total failed:\t22\n" +
+	"|  `- File list:\t/var/log/maillog\n" +
+	"`- Actions\n" +
+	"   |- Currently banned:\t0\n" +
+	"   |- Total banned:\t100\n" +
+	"   `- Banned IP list:"
+var execStatusPostfixOutput = "Status for the jail: postfix\n" +
+	"|- Filter\n" +
+	"|  |- Currently failed:\t4\n" +
+	"|  |- Total failed:\t10\n" +
+	"|  `- File list:\t/var/log/maillog\n" +
+	"`- Actions\n" +
+	"   |- Currently banned:\t3\n" +
+	"   |- Total banned:\t60\n" +
+	"   `- Banned IP list:\t192.168.10.1 192.168.10.3"
+var execStatusSshdOutput = "Status for the jail: sshd\n" +
+	"|- Filter\n" +
+	"|  |- Currently failed:\t0\n" +
+	"|  |- Total failed:\t5\n" +
+	"|  `- File list:\t/var/log/secure\n" +
+	"`- Actions\n" +
+	"   |- Currently banned:\t2\n" +
+	"   |- Total banned:\t50\n" +
+	"   `- Banned IP list:\t192.168.0.1 192.168.1.1"
+
+func TestGather(t *testing.T) {
+	f := Fail2ban{
+		path: "/usr/bin/fail2ban-client",
+	}
+
+	execCommand = fakeExecCommand
+	defer func() { execCommand = exec.Command }()
+	var acc testutil.Accumulator
+	err := f.Gather(&acc)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fields1 := map[string]interface{}{
+		"banned": 2,
+		"failed": 0,
+	}
+	tags1 := map[string]string{
+		"jail": "sshd",
+	}
+
+	fields2 := map[string]interface{}{
+		"banned": 3,
+		"failed": 4,
+	}
+	tags2 := map[string]string{
+		"jail": "postfix",
+	}
+
+	fields3 := map[string]interface{}{
+		"banned": 0,
+		"failed": 11,
+	}
+	tags3 := map[string]string{
+		"jail": "dovecot",
+	}
+
+	acc.AssertContainsTaggedFields(t, "fail2ban", fields1, tags1)
+	acc.AssertContainsTaggedFields(t, "fail2ban", fields2, tags2)
+	acc.AssertContainsTaggedFields(t, "fail2ban", fields3, tags3)
+}
+
+func fakeExecCommand(command string, args ...string) *exec.Cmd {
+	cs := []string{"-test.run=TestHelperProcess", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+func TestHelperProcess(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+
+	args := os.Args
+	cmd, args := args[3], args[4:]
+
+	if !strings.HasSuffix(cmd, "fail2ban-client") {
+		fmt.Fprint(os.Stdout, "command not found")
+		os.Exit(1)
+	}
+
+	if len(args) == 1 && args[0] == "status" {
+		fmt.Fprint(os.Stdout, execStatusOutput)
+		os.Exit(0)
+	} else if len(args) == 2 && args[0] == "status" {
+		if args[1] == "sshd" {
+			fmt.Fprint(os.Stdout, execStatusSshdOutput)
+			os.Exit(0)
+		} else if args[1] == "postfix" {
+			fmt.Fprint(os.Stdout, execStatusPostfixOutput)
+			os.Exit(0)
+		} else if args[1] == "dovecot" {
+			fmt.Fprint(os.Stdout, execStatusDovecotOutput)
+			os.Exit(0)
+		}
+	}
+	fmt.Fprint(os.Stdout, "invalid argument")
+	os.Exit(1)
+}

From 364da9a83d015d11e05191d0d7c259886f37e6cb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 21 Jun 2017 12:46:57 -0700
Subject: [PATCH 0334/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 README.md    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5012a6b9..e147ab23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@
 - In the `aerospike` input the `node_name` field has been changed to be a tag
   for both the `aerospike_node` and `aerospike_namespace` measurements.
 
+### New Plugins
+
+- [fail2ban](./plugins/inputs/fail2ban/README.md)
+
 ### Features
 
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
@@ -24,6 +28,7 @@
 - [#2908](https://github.com/influxdata/telegraf/pull/2908): Add min/max response time on linux/darwin to ping.
 - [#2929](https://github.com/influxdata/telegraf/pull/2929): Add HTTP Proxy support to influxdb output.
 - [#2933](https://github.com/influxdata/telegraf/pull/2933): Add standard SSL options to mysql input.
+- [#2875](https://github.com/influxdata/telegraf/pull/2875): Add input plugin for fail2ban.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 6a3027e09..3c3a77f90 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,7 @@ configuration options.
 * [dovecot](./plugins/inputs/dovecot)
 * [elasticsearch](./plugins/inputs/elasticsearch)
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
+* [fail2ban](./plugins/inputs/fail2ban)
 * [filestat](./plugins/inputs/filestat)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)

From 82a04d904debdabfc569e8d5b704de81d9bdd5bb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 21 Jun 2017 16:24:23 -0700
Subject: [PATCH 0335/1302] Use strings.Join in statsd input (#2947)

---
 plugins/inputs/statsd/statsd.go      | 5 +++--
 plugins/inputs/statsd/statsd_test.go | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index d2c627b8a..144a3675f 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -475,10 +475,11 @@ func (s *Statsd) parseStatsdLine(line string) error {
 		// Make a unique key for the measurement name/tags
 		var tg []string
 		for k, v := range m.tags {
-			tg = append(tg, fmt.Sprintf("%s=%s", k, v))
+			tg = append(tg, k+"="+v)
 		}
 		sort.Strings(tg)
-		m.hash = fmt.Sprintf("%s%s", strings.Join(tg, ""), m.name)
+		tg = append(tg, m.name)
+		m.hash = strings.Join(tg, "")
 
 		s.aggregate(m)
 	}
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index ff3002d2c..486c6cece 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -929,7 +929,7 @@ func TestParse_MeasurementsWithMultipleValues(t *testing.T) {
 		// plus the last bit of value 1
 		// which adds up to 12 individual datapoints to be cached
 		if cachedtiming.fields[defaultFieldName].n != 12 {
-			t.Errorf("Expected 11 additions, got %d", cachedtiming.fields[defaultFieldName].n)
+			t.Errorf("Expected 12 additions, got %d", cachedtiming.fields[defaultFieldName].n)
 		}
 
 		if cachedtiming.fields[defaultFieldName].upper != 1 {

From 9276318faf2c1515967148da9acf5aaaf744a790 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 23 Jun 2017 10:59:04 -0700
Subject: [PATCH 0336/1302] Fix bug parsing default timestamps with modified
 precision (#2949)

---
 metric/parse.go      |  2 +-
 metric/parse_test.go | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/metric/parse.go b/metric/parse.go
index 92dc4918b..72057fb39 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -129,7 +129,7 @@ func parseMetric(buf []byte,
 	// apply precision multiplier
 	var nsec int64
 	multiplier := getPrecisionMultiplier(precision)
-	if multiplier > 1 {
+	if len(ts) > 0 && multiplier > 1 {
 		tsint, err := parseIntBytes(ts, 10, 64)
 		if err != nil {
 			return nil, err
diff --git a/metric/parse_test.go b/metric/parse_test.go
index 89ade9f56..27185224a 100644
--- a/metric/parse_test.go
+++ b/metric/parse_test.go
@@ -380,11 +380,25 @@ func TestParsePrecision(t *testing.T) {
 	} {
 		metrics, err := ParseWithDefaultTimePrecision(
 			[]byte(tt.line+"\n"), time.Now(), tt.precision)
-		assert.NoError(t, err, tt)
+		assert.NoError(t, err)
 		assert.Equal(t, tt.expected, metrics[0].UnixNano())
 	}
 }
 
+func TestParsePrecisionUnsetTime(t *testing.T) {
+	for _, tt := range []struct {
+		line      string
+		precision string
+	}{
+		{"test v=42", "s"},
+		{"test v=42", "ns"},
+	} {
+		_, err := ParseWithDefaultTimePrecision(
+			[]byte(tt.line+"\n"), time.Now(), tt.precision)
+		assert.NoError(t, err)
+	}
+}
+
 func TestParseMaxKeyLength(t *testing.T) {
 	key := ""
 	for {

From e028f10586bbe379abf3bf66b51aad3a3221824c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Jun 2017 11:04:13 -0700
Subject: [PATCH 0337/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e147ab23f..19c1bd8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
 
 - [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
 - [#2937](https://github.com/influxdata/telegraf/issues/2937): Remove label value sanitization in prometheus output.
+- [#2948](https://github.com/influxdata/telegraf/issues/2948): Fix bug parsing default timestamps with modified precision.
 
 ## v1.3.2 [2017-06-14]
 

From 6d5bb35f84aaa88c7771b6913d8b53c599d20bc9 Mon Sep 17 00:00:00 2001
From: MatthewCh <mcheung1@binghamton.edu>
Date: Fri, 23 Jun 2017 14:11:33 -0400
Subject: [PATCH 0338/1302] Support HOST_PROC in processes and linux_sysctl_fs
 inputs (#2924)

---
 plugins/inputs/system/PROCESSES_README.md |  5 +++++
 plugins/inputs/system/linux_sysctl_fs.go  |  4 +++-
 plugins/inputs/system/processes.go        | 13 +++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/system/PROCESSES_README.md b/plugins/inputs/system/PROCESSES_README.md
index 431e280ff..508e1fa81 100644
--- a/plugins/inputs/system/PROCESSES_README.md
+++ b/plugins/inputs/system/PROCESSES_README.md
@@ -14,6 +14,11 @@ it requires access to execute `ps`.
   # no configuration
 ```
 
+Another possible configuration is to define an alternative path for resolving the /proc location.
+Using the environment variable `HOST_PROC` the plugin will retrieve process information from the specified location.
+
+`docker run -v /proc:/rootfs/proc:ro -e HOST_PROC=/rootfs/proc`
+
 ### Measurements & Fields:
 
 - processes
diff --git a/plugins/inputs/system/linux_sysctl_fs.go b/plugins/inputs/system/linux_sysctl_fs.go
index 93e426e75..add17e9ae 100644
--- a/plugins/inputs/system/linux_sysctl_fs.go
+++ b/plugins/inputs/system/linux_sysctl_fs.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"path"
 )
 
 // https://www.kernel.org/doc/Documentation/sysctl/fs.txt
@@ -80,9 +81,10 @@ func (sfs *SysctlFS) Gather(acc telegraf.Accumulator) error {
 }
 
 func init() {
+
 	inputs.Add("linux_sysctl_fs", func() telegraf.Input {
 		return &SysctlFS{
-			path: "/proc/sys/fs",
+			path: path.Join(GetHostProc(), "/sys/fs"),
 		}
 	})
 }
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index 09aa37afb..68796fed6 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -20,6 +20,7 @@ import (
 
 type Processes struct {
 	execPS       func() ([]byte, error)
+	getHostProc  func() string
 	readProcFile func(filename string) ([]byte, error)
 
 	forcePS   bool
@@ -62,6 +63,14 @@ func (p *Processes) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func GetHostProc() string {
+	procPath := "/proc"
+	if os.Getenv("HOST_PROC") != "" {
+		procPath = os.Getenv("HOST_PROC")
+	}
+	return procPath
+}
+
 // Gets empty fields of metrics based on the OS
 func getEmptyFields() map[string]interface{} {
 	fields := map[string]interface{}{
@@ -132,14 +141,14 @@ func (p *Processes) gatherFromPS(fields map[string]interface{}) error {
 
 // get process states from /proc/(pid)/stat files
 func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
-	filenames, err := filepath.Glob("/proc/[0-9]*/stat")
+	filenames, err := filepath.Glob(GetHostProc() + "/[0-9]*/stat")
+
 	if err != nil {
 		return err
 	}
 
 	for _, filename := range filenames {
 		_, err := os.Stat(filename)
-
 		data, err := p.readProcFile(filename)
 		if err != nil {
 			return err

From d774c2a1707c93a47487f913f8a4069abf259996 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Jun 2017 11:13:00 -0700
Subject: [PATCH 0339/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19c1bd8d0..a05513a2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#2929](https://github.com/influxdata/telegraf/pull/2929): Add HTTP Proxy support to influxdb output.
 - [#2933](https://github.com/influxdata/telegraf/pull/2933): Add standard SSL options to mysql input.
 - [#2875](https://github.com/influxdata/telegraf/pull/2875): Add input plugin for fail2ban.
+- [#2924](https://github.com/influxdata/telegraf/pull/2924): Support HOST_PROC in processes and linux_sysctl_fs inputs.
 
 ### Bugfixes
 

From a726579d509726b49fd3053ff719bbaf30c957b8 Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdriepalmer@gmail.com>
Date: Fri, 23 Jun 2017 16:54:12 -0700
Subject: [PATCH 0340/1302] Add Minecraft input plugin (#2960)

---
 docs/LICENSE_OF_DEPENDENCIES.md               |   1 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/minecraft/README.md            |  66 +++++
 .../inputs/minecraft/internal/rcon/rcon.go    | 200 +++++++++++++++
 plugins/inputs/minecraft/minecraft.go         | 142 +++++++++++
 plugins/inputs/minecraft/minecraft_test.go    | 228 ++++++++++++++++++
 plugins/inputs/minecraft/rcon.go              |  88 +++++++
 plugins/inputs/minecraft/rcon_test.go         |  67 +++++
 8 files changed, 793 insertions(+)
 create mode 100644 plugins/inputs/minecraft/README.md
 create mode 100644 plugins/inputs/minecraft/internal/rcon/rcon.go
 create mode 100644 plugins/inputs/minecraft/minecraft.go
 create mode 100644 plugins/inputs/minecraft/minecraft_test.go
 create mode 100644 plugins/inputs/minecraft/rcon.go
 create mode 100644 plugins/inputs/minecraft/rcon_test.go

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index c62c262c0..dfd5fc251 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -12,6 +12,7 @@ works:
 - github.com/boltdb/bolt [MIT](https://github.com/boltdb/bolt/blob/master/LICENSE)
 - github.com/bsm/sarama-cluster [MIT](https://github.com/bsm/sarama-cluster/blob/master/LICENSE)
 - github.com/cenkalti/backoff [MIT](https://github.com/cenkalti/backoff/blob/master/LICENSE)
+- github.com/chuckpreslar/rcon [MIT](https://github.com/chuckpreslar/rcon#license)
 - github.com/couchbase/go-couchbase [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/couchbase/gomemcached [MIT](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
 - github.com/couchbase/goutils [MIT](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 3bf98c9d9..0796a8422 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -45,6 +45,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/mailchimp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mesos"
+	_ "github.com/influxdata/telegraf/plugins/inputs/minecraft"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mongodb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mqtt_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
diff --git a/plugins/inputs/minecraft/README.md b/plugins/inputs/minecraft/README.md
new file mode 100644
index 000000000..726f9a29e
--- /dev/null
+++ b/plugins/inputs/minecraft/README.md
@@ -0,0 +1,66 @@
+#  Minecraft Plugin
+
+This plugin uses the RCON protocol to collect [statistics](http://minecraft.gamepedia.com/Statistics) from a [scoreboard](http://minecraft.gamepedia.com/Scoreboard) on a
+Minecraft server.
+
+To enable [RCON](http://wiki.vg/RCON) on the minecraft server, add this to your server configuration in the `server.properties` file:
+
+```
+enable-rcon=true
+rcon.password=<your password>
+rcon.port=<1-65535>
+```
+
+To create a new scoreboard objective called `jump` on a minecraft server tracking the `stat.jump` criteria, run this command
+in the Minecraft console:
+
+`/scoreboard objectives add jump stat.jump`
+
+Stats are collected with the following RCON command, issued by the plugin:
+
+`/scoreboard players list *`
+
+### Configuration:
+```
+[[inputs.minecraft]]
+   # server address for minecraft
+   server = "localhost"
+   # port for RCON
+   port = "25575"
+   # password RCON for mincraft server
+   password = "replace_me"
+```
+
+### Measurements & Fields:
+
+*This plugin uses only one measurement, titled* `minecraft`
+
+- The field name is the scoreboard objective name.
+- The field value is the count of the scoreboard objective
+
+- `minecraft`
+    - `<objective_name>` (integer, count)
+
+### Tags:
+
+- The `minecraft` measurement:
+    - `server`: the Minecraft RCON server
+    - `player`: the Minecraft player
+
+
+### Sample Queries:
+
+Get the number of jumps per player in the last hour:
+```
+SELECT SPREAD("jump") FROM "minecraft" WHERE time > now() - 1h GROUP BY "player"
+```
+
+### Example Output:
+
+```
+$ telegraf --input-filter minecraft --test
+* Plugin: inputs.minecraft, Collection 1
+> minecraft,player=notch,server=127.0.0.1:25575 jumps=178i 1498261397000000000
+> minecraft,player=dinnerbone,server=127.0.0.1:25575 deaths=1i,jumps=1999i,cow_kills=1i 1498261397000000000
+> minecraft,player=jeb,server=127.0.0.1:25575 d_pickaxe=1i,damage_dealt=80i,d_sword=2i,hunger=20i,health=20i,kills=1i,level=33i,jumps=264i,armor=15i 1498261397000000000
+```
diff --git a/plugins/inputs/minecraft/internal/rcon/rcon.go b/plugins/inputs/minecraft/internal/rcon/rcon.go
new file mode 100644
index 000000000..f17163f8b
--- /dev/null
+++ b/plugins/inputs/minecraft/internal/rcon/rcon.go
@@ -0,0 +1,200 @@
+// Package rcon implements the communication protocol for communicating
+// with RCON servers. Tested and working with Valve game servers.
+package rcon
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"net"
+	"strings"
+)
+
+const (
+	PacketPaddingSize uint8 = 2 // Size of Packet's padding.
+	PacketHeaderSize  uint8 = 8 // Size of Packet's header.
+)
+
+const (
+	TerminationSequence = "\x00" // Null empty ASCII string suffix.
+)
+
+// Packet type constants.
+// https://developer.valvesoftware.com/wiki/Source_RCON_Protocol#Packet_Type
+const (
+	Exec          int32 = 2
+	Auth          int32 = 3
+	AuthResponse  int32 = 2
+	ResponseValue int32 = 0
+)
+
+// Rcon package errors.
+var (
+	ErrInvalidWrite        = errors.New("Failed to write the payload corretly to remote connection.")
+	ErrInvalidRead         = errors.New("Failed to read the response corretly from remote connection.")
+	ErrInvalidChallenge    = errors.New("Server failed to mirror request challenge.")
+	ErrUnauthorizedRequest = errors.New("Client not authorized to remote server.")
+	ErrFailedAuthorization = errors.New("Failed to authorize to the remote server.")
+)
+
+type Client struct {
+	Host       string   // The IP address of the remote server.
+	Port       int      // The Port the remote server's listening on.
+	Authorized bool     // Has the client been authorized by the server?
+	Connection net.Conn // The TCP connection to the server.
+}
+
+type Header struct {
+	Size      int32 // The size of the payload.
+	Challenge int32 // The challenge ths server should mirror.
+	Type      int32 // The type of request being sent.
+}
+
+type Packet struct {
+	Header Header // Packet header.
+	Body   string // Body of packet.
+}
+
+// Compile converts a packets header and body into its approriate
+// byte array payload, returning an error if the binary packages
+// Write method fails to write the header bytes in their little
+// endian byte order.
+func (p Packet) Compile() (payload []byte, err error) {
+	var size int32 = p.Header.Size
+	var buffer bytes.Buffer
+	var padding [PacketPaddingSize]byte
+
+	if err = binary.Write(&buffer, binary.LittleEndian, &size); nil != err {
+		return
+	} else if err = binary.Write(&buffer, binary.LittleEndian, &p.Header.Challenge); nil != err {
+		return
+	} else if err = binary.Write(&buffer, binary.LittleEndian, &p.Header.Type); nil != err {
+		return
+	}
+
+	buffer.WriteString(p.Body)
+	buffer.Write(padding[:])
+
+	return buffer.Bytes(), nil
+}
+
+// NewPacket returns a pointer to a new Packet type.
+func NewPacket(challenge, typ int32, body string) (packet *Packet) {
+	size := int32(len([]byte(body)) + int(PacketHeaderSize+PacketPaddingSize))
+	return &Packet{Header{size, challenge, typ}, body}
+}
+
+// Authorize calls Send with the appropriate command type and the provided
+// password.  The response packet is returned if authorization is successful
+// or a potential error.
+func (c *Client) Authorize(password string) (response *Packet, err error) {
+	if response, err = c.Send(Auth, password); nil == err {
+		if response.Header.Type == AuthResponse {
+			c.Authorized = true
+		} else {
+			err = ErrFailedAuthorization
+			response = nil
+			return
+		}
+	}
+
+	return
+}
+
+// Execute calls Send with the appropriate command type and the provided
+// command.  The response packet is returned if the command executed successfully
+// or a potential error.
+func (c *Client) Execute(command string) (response *Packet, err error) {
+	return c.Send(Exec, command)
+}
+
+// Sends accepts the commands type and its string to execute to the clients server,
+// creating a packet with a random challenge id for the server to mirror,
+// and compiling its payload bytes in the appropriate order. The resonse is
+// decompiled from its bytes into a Packet type for return. An error is returned
+// if send fails.
+func (c *Client) Send(typ int32, command string) (response *Packet, err error) {
+	if typ != Auth && !c.Authorized {
+		err = ErrUnauthorizedRequest
+		return
+	}
+
+	// Create a random challenge for the server to mirror in its response.
+	var challenge int32
+	binary.Read(rand.Reader, binary.LittleEndian, &challenge)
+
+	// Create the packet from the challenge, typ and command
+	// and compile it to its byte payload
+	packet := NewPacket(challenge, typ, command)
+	payload, err := packet.Compile()
+
+	var n int
+
+	if nil != err {
+		return
+	} else if n, err = c.Connection.Write(payload); nil != err {
+		return
+	} else if n != len(payload) {
+		err = ErrInvalidWrite
+		return
+	}
+
+	var header Header
+
+	if err = binary.Read(c.Connection, binary.LittleEndian, &header.Size); nil != err {
+		return
+	} else if err = binary.Read(c.Connection, binary.LittleEndian, &header.Challenge); nil != err {
+		return
+	} else if err = binary.Read(c.Connection, binary.LittleEndian, &header.Type); nil != err {
+		return
+	}
+
+	if packet.Header.Type == Auth && header.Type == ResponseValue {
+		// Discard, empty SERVERDATA_RESPOSE_VALUE from authorization.
+		c.Connection.Read(make([]byte, header.Size-int32(PacketHeaderSize)))
+
+		// Reread the packet header.
+		if err = binary.Read(c.Connection, binary.LittleEndian, &header.Size); nil != err {
+			return
+		} else if err = binary.Read(c.Connection, binary.LittleEndian, &header.Challenge); nil != err {
+			return
+		} else if err = binary.Read(c.Connection, binary.LittleEndian, &header.Type); nil != err {
+			return
+		}
+	}
+
+	if header.Challenge != packet.Header.Challenge {
+		err = ErrInvalidChallenge
+		return
+	}
+
+	body := make([]byte, header.Size-int32(PacketHeaderSize))
+
+	n, err = c.Connection.Read(body)
+
+	if nil != err {
+		return
+	} else if n != len(body) {
+		err = ErrInvalidRead
+		return
+	}
+
+	response = new(Packet)
+	response.Header = header
+	response.Body = strings.TrimRight(string(body), TerminationSequence)
+
+	return
+}
+
+// NewClient creates a new Client type, creating the connection
+// to the server specified by the host and port arguements. If
+// the connection fails, an error is returned.
+func NewClient(host string, port int) (client *Client, err error) {
+	client = new(Client)
+	client.Host = host
+	client.Port = port
+	client.Connection, err = net.Dial("tcp", fmt.Sprintf("%v:%v", client.Host, client.Port))
+	return
+}
diff --git a/plugins/inputs/minecraft/minecraft.go b/plugins/inputs/minecraft/minecraft.go
new file mode 100644
index 000000000..d88f4373d
--- /dev/null
+++ b/plugins/inputs/minecraft/minecraft.go
@@ -0,0 +1,142 @@
+package minecraft
+
+import (
+	"fmt"
+	"regexp"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const sampleConfig = `
+  ## server address for minecraft
+  # server = "localhost"
+  ## port for RCON
+  # port = "25575"
+  ## password RCON for mincraft server
+  # password = ""
+`
+
+var (
+	playerNameRegex = regexp.MustCompile(`for\s([^:]+):-`)
+	scoreboardRegex = regexp.MustCompile(`(?U):\s(\d+)\s\((.*)\)`)
+)
+
+// Client is an interface for a client which gathers data from a minecraft server
+type Client interface {
+	Gather() ([]string, error)
+}
+
+// Minecraft represents a connection to a minecraft server
+type Minecraft struct {
+	Server   string
+	Port     string
+	Password string
+	client   Client
+}
+
+// Description gives a brief description.
+func (s *Minecraft) Description() string {
+	return "Collects scores from a minecraft server's scoreboard using the RCON protocol"
+}
+
+// SampleConfig returns our sampleConfig.
+func (s *Minecraft) SampleConfig() string {
+	return sampleConfig
+}
+
+// Gather uses the RCON protocal to collect player and
+// scoreboard stats from a minecraft server.
+func (s *Minecraft) Gather(acc telegraf.Accumulator) error {
+	if s.client == nil {
+		var err error
+		s.client, err = NewRCON(s.Server, s.Port, s.Password)
+		if err != nil {
+			return err
+		}
+	}
+
+	scores, err := s.client.Gather()
+	if err != nil {
+		return err
+	}
+
+	for _, score := range scores {
+		player, err := ParsePlayerName(score)
+		if err != nil {
+			return err
+		}
+		tags := map[string]string{
+			"player": player,
+			"server": s.Server + ":" + s.Port,
+		}
+
+		stats, err := ParseScoreboard(score)
+		if err != nil {
+			return err
+		}
+		var fields = make(map[string]interface{}, len(stats))
+		for _, stat := range stats {
+			fields[stat.Name] = stat.Value
+		}
+
+		acc.AddFields("minecraft", fields, tags)
+	}
+
+	return nil
+}
+
+// ParsePlayerName takes an input string from rcon, to parse
+// the player.
+func ParsePlayerName(input string) (string, error) {
+	playerMatches := playerNameRegex.FindAllStringSubmatch(input, -1)
+	if playerMatches == nil {
+		return "", fmt.Errorf("no player was matched")
+	}
+	return playerMatches[0][1], nil
+}
+
+// Score is an individual tracked scoreboard stat.
+type Score struct {
+	Name  string
+	Value int
+}
+
+// ParseScoreboard takes an input string from rcon, to parse
+// scoreboard stats.
+func ParseScoreboard(input string) ([]Score, error) {
+	scoreMatches := scoreboardRegex.FindAllStringSubmatch(input, -1)
+	if scoreMatches == nil {
+		return nil, fmt.Errorf("No scores found")
+	}
+
+	var scores []Score
+
+	for _, match := range scoreMatches {
+		number := match[1]
+		name := match[2]
+		n, err := strconv.Atoi(number)
+		// Not necessary in current state, because regex can only match integers,
+		// maybe become necessary if regex is modified to match more types of
+		// numbers
+		if err != nil {
+			return nil, fmt.Errorf("Failed to parse score")
+		}
+		s := Score{
+			Name:  name,
+			Value: n,
+		}
+		scores = append(scores, s)
+	}
+	return scores, nil
+}
+
+func init() {
+	inputs.Add("minecraft", func() telegraf.Input {
+		return &Minecraft{
+			Server: "localhost",
+			Port:   "25575",
+		}
+	})
+}
diff --git a/plugins/inputs/minecraft/minecraft_test.go b/plugins/inputs/minecraft/minecraft_test.go
new file mode 100644
index 000000000..664ad4e81
--- /dev/null
+++ b/plugins/inputs/minecraft/minecraft_test.go
@@ -0,0 +1,228 @@
+package minecraft
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+// TestParsePlayerName tests different Minecraft RCON inputs for players
+func TestParsePlayerName(t *testing.T) {
+	// Test a valid input string to ensure player is extracted
+	input := "1 tracked objective(s) for divislight:- jumps: 178 (jumps)"
+	got, err := ParsePlayerName(input)
+	want := "divislight"
+	if err != nil {
+		t.Fatalf("player returned error. Error: %s\n", err)
+	}
+	if got != want {
+		t.Errorf("got %s\nwant %s\n", got, want)
+	}
+
+	// Test an invalid input string to ensure error is returned
+	input = ""
+	got, err = ParsePlayerName(input)
+	want = ""
+	if err == nil {
+		t.Fatal("Expected error when player not present. No error found.")
+	}
+	if got != want {
+		t.Errorf("got %s\n want %s\n", got, want)
+	}
+
+	// Test an invalid input string to ensure error is returned
+	input = "1 tracked objective(s) for 😂:- jumps: 178 (jumps)"
+	got, err = ParsePlayerName(input)
+	want = "😂"
+	if err != nil {
+		t.Fatalf("player returned error. Error: %s\n", err)
+	}
+	if got != want {
+		t.Errorf("got %s\n want %s\n", got, want)
+	}
+}
+
+// TestParseScoreboard tests different Minecraft RCON inputs for scoreboard stats.
+func TestParseScoreboard(t *testing.T) {
+	// test a valid input string to ensure stats are parsed correctly.
+	input := `1 tracked objective(s) for divislight:- jumps: 178 (jumps)- sword: 5 (sword)`
+	got, err := ParseScoreboard(input)
+	if err != nil {
+		t.Fatal("Unexpected error")
+	}
+
+	want := []Score{
+		{
+			Name:  "jumps",
+			Value: 178,
+		},
+		{
+			Name:  "sword",
+			Value: 5,
+		},
+	}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("Got: \n%#v\nWant: %#v", got, want)
+	}
+
+	// Tests a partial input string.
+	input = `1 tracked objective(s) for divislight:- jumps: (jumps)- sword: 5 (sword)`
+	got, err = ParseScoreboard(input)
+
+	if err != nil {
+		t.Fatal("Unexpected error")
+	}
+
+	want = []Score{
+		{
+			Name:  "sword",
+			Value: 5,
+		},
+	}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("Got: \n%#v\nWant:\n%#v", got, want)
+	}
+
+	// Tests an empty string.
+	input = ``
+	_, err = ParseScoreboard(input)
+	if err == nil {
+		t.Fatal("Expected input error, but error was nil")
+	}
+
+	// Tests when a number isn't an integer.
+	input = `1 tracked objective(s) for divislight:- jumps: 178.5 (jumps)- sword: 5 (sword)`
+	got, err = ParseScoreboard(input)
+	if err != nil {
+		t.Fatal("Unexpected error")
+	}
+
+	want = []Score{
+		{
+			Name:  "sword",
+			Value: 5,
+		},
+	}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("Got: \n%#v\nWant: %#v", got, want)
+	}
+
+	//Testing a real life data scenario with unicode characters
+	input = `7 tracked objective(s) for mauxlaim:- total_kills: 39 (total_kills)- "howdy doody": 37 (dalevel)- howdy: 37 (lvl)- jumps: 1290 (jumps)- iron_pickaxe: 284 (iron_pickaxe)- cow_kills: 1 (cow_kills)- "asdf": 37 (😂)`
+	got, err = ParseScoreboard(input)
+	if err != nil {
+		t.Fatal("Unexpected error")
+	}
+
+	want = []Score{
+		{
+			Name:  "total_kills",
+			Value: 39,
+		},
+		{
+			Name:  "dalevel",
+			Value: 37,
+		},
+		{
+			Name:  "lvl",
+			Value: 37,
+		},
+		{
+			Name:  "jumps",
+			Value: 1290,
+		},
+		{
+			Name:  "iron_pickaxe",
+			Value: 284,
+		},
+		{
+			Name:  "cow_kills",
+			Value: 1,
+		},
+		{
+			Name:  "😂",
+			Value: 37,
+		},
+	}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("Got: \n%#v\nWant: %#v", got, want)
+	}
+
+}
+
+type MockClient struct {
+	Result []string
+	Err    error
+}
+
+func (m *MockClient) Gather() ([]string, error) {
+	return m.Result, m.Err
+}
+
+func TestGather(t *testing.T) {
+	var acc testutil.Accumulator
+	testConfig := Minecraft{
+		Server: "biffsgang.net",
+		Port:   "25575",
+		client: &MockClient{
+			Result: []string{
+				`1 tracked objective(s) for divislight:- jumps: 178 (jumps)`,
+				`7 tracked objective(s) for mauxlaim:- total_kills: 39 (total_kills)- "howdy doody": 37 (dalevel)- howdy: 37 (lvl)- jumps: 1290 (jumps)- iron_pickaxe: 284 (iron_pickaxe)- cow_kills: 1 (cow_kills)- "asdf": 37 (😂)`,
+				`5 tracked objective(s) for torham:- total_kills: 29 (total_kills)- "howdy doody": 33 (dalevel)- howdy: 33 (lvl)- jumps: 263 (jumps)- "asdf": 33 (😂)`,
+			},
+			Err: nil,
+		},
+	}
+
+	err := testConfig.Gather(&acc)
+	if err != nil {
+		t.Fatalf("gather returned error. Error: %s\n", err)
+	}
+
+	tags := map[string]string{
+		"player": "divislight",
+		"server": "biffsgang.net:25575",
+	}
+
+	assertContainsTaggedStat(t, &acc, "minecraft", "jumps", 178, tags)
+	tags["player"] = "mauxlaim"
+	assertContainsTaggedStat(t, &acc, "minecraft", "cow_kills", 1, tags)
+	tags["player"] = "torham"
+	assertContainsTaggedStat(t, &acc, "minecraft", "total_kills", 29, tags)
+
+}
+
+func assertContainsTaggedStat(
+	t *testing.T,
+	acc *testutil.Accumulator,
+	measurement string,
+	field string,
+	expectedValue int,
+	tags map[string]string,
+) {
+	var actualValue int
+	for _, pt := range acc.Metrics {
+		if pt.Measurement == measurement && reflect.DeepEqual(pt.Tags, tags) {
+			for fieldname, value := range pt.Fields {
+				if fieldname == field {
+					actualValue = value.(int)
+					if value == expectedValue {
+						return
+					}
+					t.Errorf("Expected value %d\n got value %d\n", expectedValue, value)
+				}
+			}
+		}
+	}
+	msg := fmt.Sprintf(
+		"Could not find measurement \"%s\" with requested tags within %s, Actual: %d",
+		measurement, field, actualValue)
+	t.Fatal(msg)
+
+}
diff --git a/plugins/inputs/minecraft/rcon.go b/plugins/inputs/minecraft/rcon.go
new file mode 100644
index 000000000..6dbed47ad
--- /dev/null
+++ b/plugins/inputs/minecraft/rcon.go
@@ -0,0 +1,88 @@
+package minecraft
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/influxdata/telegraf/plugins/inputs/minecraft/internal/rcon"
+)
+
+const (
+	// NoMatches is a sentinel value returned when there are no statistics defined on the
+	//minecraft server
+	NoMatches = `All matches failed`
+	// ScoreboardPlayerList is the command to see all player statistics
+	ScoreboardPlayerList = `scoreboard players list *`
+)
+
+// RCONClient is a representation of RCON command authorizaiton and exectution
+type RCONClient interface {
+	Authorize(password string) (*rcon.Packet, error)
+	Execute(command string) (*rcon.Packet, error)
+}
+
+// RCON represents a RCON server connection
+type RCON struct {
+	Server   string
+	Port     string
+	Password string
+	client   RCONClient
+}
+
+// NewRCON creates a new RCON
+func NewRCON(server, port, password string) (*RCON, error) {
+	client, err := newClient(server, port)
+	if err != nil {
+		return nil, err
+	}
+
+	return &RCON{
+		Server:   server,
+		Port:     port,
+		Password: password,
+		client:   client,
+	}, nil
+}
+
+func newClient(server, port string) (*rcon.Client, error) {
+	p, err := strconv.Atoi(port)
+	if err != nil {
+		return nil, err
+	}
+
+	return rcon.NewClient(server, p)
+}
+
+// Gather recieves all player scoreboard information and returns it per player.
+func (r *RCON) Gather() ([]string, error) {
+	if r.client == nil {
+		var err error
+		r.client, err = newClient(r.Server, r.Port)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if _, err := r.client.Authorize(r.Password); err != nil {
+		// Potentially a network problem where the client will need to be
+		// re-initialized
+		r.client = nil
+		return nil, err
+	}
+
+	packet, err := r.client.Execute(ScoreboardPlayerList)
+	if err != nil {
+		// Potentially a network problem where the client will need to be
+		// re-initialized
+		r.client = nil
+		return nil, err
+	}
+
+	if !strings.Contains(packet.Body, NoMatches) {
+		players := strings.Split(packet.Body, "Showing")
+		if len(players) > 1 {
+			return players[1:], nil
+		}
+	}
+
+	return []string{}, nil
+}
diff --git a/plugins/inputs/minecraft/rcon_test.go b/plugins/inputs/minecraft/rcon_test.go
new file mode 100644
index 000000000..011939894
--- /dev/null
+++ b/plugins/inputs/minecraft/rcon_test.go
@@ -0,0 +1,67 @@
+package minecraft
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/inputs/minecraft/internal/rcon"
+)
+
+type MockRCONClient struct {
+	Result *rcon.Packet
+	Err    error
+}
+
+func (m *MockRCONClient) Authorize(password string) (*rcon.Packet, error) {
+	return m.Result, m.Err
+}
+func (m *MockRCONClient) Execute(command string) (*rcon.Packet, error) {
+	return m.Result, m.Err
+}
+
+// TestRCONGather test the RCON gather function
+func TestRCONGather(t *testing.T) {
+	mock := &MockRCONClient{
+		Result: &rcon.Packet{
+			Body: `Showing 1 tracked objective(s) for divislight:- jumps: 178 (jumps)Showing 7 tracked objective(s) for mauxlaim:- total_kills: 39 (total_kills)- "howdy doody": 37 (dalevel)- howdy: 37 (lvl)- jumps: 1290 (jumps)- iron_pickaxe: 284 (iron_pickaxe)- cow_kills: 1 (cow_kills)- "asdf": 37 (😂)Showing 5 tracked objective(s) for torham:- total_kills: 29 (total_kills)- "howdy doody": 33 (dalevel)- howdy: 33 (lvl)- jumps: 263 (jumps)- "asdf": 33 (😂)`,
+		},
+		Err: nil,
+	}
+
+	want := []string{
+		` 1 tracked objective(s) for divislight:- jumps: 178 (jumps)`,
+		` 7 tracked objective(s) for mauxlaim:- total_kills: 39 (total_kills)- "howdy doody": 37 (dalevel)- howdy: 37 (lvl)- jumps: 1290 (jumps)- iron_pickaxe: 284 (iron_pickaxe)- cow_kills: 1 (cow_kills)- "asdf": 37 (😂)`,
+		` 5 tracked objective(s) for torham:- total_kills: 29 (total_kills)- "howdy doody": 33 (dalevel)- howdy: 33 (lvl)- jumps: 263 (jumps)- "asdf": 33 (😂)`,
+	}
+
+	client := &RCON{
+		Server:   "craftstuff.com",
+		Port:     "2222",
+		Password: "pass",
+		client:   mock,
+	}
+
+	got, err := client.Gather()
+	if err != nil {
+		t.Fatalf("Gather returned an error. Error %s\n", err)
+	}
+	for i, s := range got {
+		if want[i] != s {
+			t.Fatalf("Got %s at index %d, want %s at index %d", s, i, want[i], i)
+		}
+	}
+
+	client.client = &MockRCONClient{
+		Result: &rcon.Packet{
+			Body: "",
+		},
+		Err: nil,
+	}
+
+	got, err = client.Gather()
+	if err != nil {
+		t.Fatalf("Gather returned an error. Error %s\n", err)
+	}
+	if len(got) != 0 {
+		t.Fatalf("Expected empty slice of length %d, got slice of length %d", 0, len(got))
+	}
+}

From 22fc130e97306e8d061893db64daa394467fce14 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Jun 2017 16:56:36 -0700
Subject: [PATCH 0341/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05513a2a..4bceebe38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### New Plugins
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md)
+- [minecraft](./plugins/inputs/minecraft/README.md)
 
 ### Features
 
@@ -30,6 +31,7 @@
 - [#2933](https://github.com/influxdata/telegraf/pull/2933): Add standard SSL options to mysql input.
 - [#2875](https://github.com/influxdata/telegraf/pull/2875): Add input plugin for fail2ban.
 - [#2924](https://github.com/influxdata/telegraf/pull/2924): Support HOST_PROC in processes and linux_sysctl_fs inputs.
+- [#2960](https://github.com/influxdata/telegraf/pull/2960): Add Minecraft input plugin.
 
 ### Bugfixes
 

From 1fdbfa47197d52aac3eed5e92269ca2f30186028 Mon Sep 17 00:00:00 2001
From: vodolaz095 <ostroumov095@gmail.com>
Date: Tue, 27 Jun 2017 00:29:48 +0300
Subject: [PATCH 0342/1302] Add support for RethinkDB 1.0 handshake protocol
 (#2963)

Allow rethinkdb input plugin to work with RethinkDB 2.3.5+ databases that requires username,password authorization and Handshake protocol v1.0

* remove top level header not required in sample config

* remove top level header not required in sample config
---
 Godeps                                       |  2 +-
 etc/telegraf.conf                            | 11 +++++++
 plugins/inputs/rethinkdb/rethinkdb.go        | 20 ++++++++++++-
 plugins/inputs/rethinkdb/rethinkdb_server.go |  2 +-
 plugins/inputs/rethinkdb/rethinkdb_test.go   | 30 ++++++++++++++------
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/Godeps b/Godeps
index 7d00bb78c..a9199e3ef 100644
--- a/Godeps
+++ b/Godeps
@@ -59,8 +59,8 @@ github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
 golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
-gopkg.in/dancannon/gorethink.v1 edc7a6a68e2d8015f5ffe1b2560eed989f8a45be
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
+gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
 gopkg.in/olivere/elastic.v5 ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index c7691666d..a02c6a12f 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1851,6 +1851,17 @@
 #   ##   rethinkdb://10.10.3.33:18832,
 #   ##   10.0.0.1:10000, etc.
 #   servers = ["127.0.0.1:28015"]
+#   ##
+#   ## If you use actual rethinkdb of > 2.3.0 with username/password authorization,
+#   ## protocol have to be named "rethinkdb2" - it will use 1_0 H.
+#   servers = ["rethinkdb2://username:password@127.0.0.1:28015"]
+#   ##
+#   ## If you use older versions of rethinkdb (<2.2) with auth_key, protocol
+#   ## have to be named "rethinkdb".
+#   servers = ["rethinkdb://username:auth_key@127.0.0.1:28015"]
+
+
+
 
 
 # # Read metrics one or many Riak servers
diff --git a/plugins/inputs/rethinkdb/rethinkdb.go b/plugins/inputs/rethinkdb/rethinkdb.go
index e32f79731..dc6b03620 100644
--- a/plugins/inputs/rethinkdb/rethinkdb.go
+++ b/plugins/inputs/rethinkdb/rethinkdb.go
@@ -8,7 +8,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
-	"gopkg.in/dancannon/gorethink.v1"
+	"gopkg.in/gorethink/gorethink.v3"
 )
 
 type RethinkDB struct {
@@ -22,6 +22,14 @@ var sampleConfig = `
   ##   rethinkdb://10.10.3.33:18832,
   ##   10.0.0.1:10000, etc.
   servers = ["127.0.0.1:28015"]
+  ##
+  ## If you use actual rethinkdb of > 2.3.0 with username/password authorization,
+  ## protocol have to be named "rethinkdb2" - it will use 1_0 H.
+  # servers = ["rethinkdb2://username:password@127.0.0.1:28015"]
+  ##
+  ## If you use older versions of rethinkdb (<2.2) with auth_key, protocol
+  ## have to be named "rethinkdb".
+  # servers = ["rethinkdb://username:auth_key@127.0.0.1:28015"]
 `
 
 func (r *RethinkDB) SampleConfig() string {
@@ -75,8 +83,18 @@ func (r *RethinkDB) gatherServer(server *Server, acc telegraf.Accumulator) error
 		pwd, set := server.Url.User.Password()
 		if set && pwd != "" {
 			connectOpts.AuthKey = pwd
+			connectOpts.HandshakeVersion = gorethink.HandshakeV0_4
 		}
 	}
+	if server.Url.Scheme == "rethinkdb2" && server.Url.User != nil {
+		pwd, set := server.Url.User.Password()
+		if set && pwd != "" {
+			connectOpts.Username = server.Url.User.Username()
+			connectOpts.Password = pwd
+			connectOpts.HandshakeVersion = gorethink.HandshakeV1_0
+		}
+	}
+
 	server.session, err = gorethink.Connect(connectOpts)
 	if err != nil {
 		return fmt.Errorf("Unable to connect to RethinkDB, %s\n", err.Error())
diff --git a/plugins/inputs/rethinkdb/rethinkdb_server.go b/plugins/inputs/rethinkdb/rethinkdb_server.go
index f172717d1..a04206d32 100644
--- a/plugins/inputs/rethinkdb/rethinkdb_server.go
+++ b/plugins/inputs/rethinkdb/rethinkdb_server.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 
-	"gopkg.in/dancannon/gorethink.v1"
+	"gopkg.in/gorethink/gorethink.v3"
 )
 
 type Server struct {
diff --git a/plugins/inputs/rethinkdb/rethinkdb_test.go b/plugins/inputs/rethinkdb/rethinkdb_test.go
index 85c747f42..fa2cc92f2 100644
--- a/plugins/inputs/rethinkdb/rethinkdb_test.go
+++ b/plugins/inputs/rethinkdb/rethinkdb_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/dancannon/gorethink.v1"
+	"gopkg.in/gorethink/gorethink.v3"
 )
 
-var connect_url, authKey string
+var connect_url, authKey, username, password string
 var server *Server
 
 func init() {
@@ -22,17 +22,31 @@ func init() {
 		connect_url = "127.0.0.1:28015"
 	}
 	authKey = os.Getenv("RETHINKDB_AUTHKEY")
-
+	username = os.Getenv("RETHINKDB_USERNAME")
+	password = os.Getenv("RETHINKDB_PASSWORD")
 }
 
 func testSetup(m *testing.M) {
 	var err error
 	server = &Server{Url: &url.URL{Host: connect_url}}
-	server.session, _ = gorethink.Connect(gorethink.ConnectOpts{
-		Address:       server.Url.Host,
-		AuthKey:       authKey,
-		DiscoverHosts: false,
-	})
+
+	if authKey {
+		server.session, _ = gorethink.Connect(gorethink.ConnectOpts{
+			Address:          server.Url.Host,
+			AuthKey:          authKey,
+			HandshakeVersion: gorethink.HandshakeV0_4,
+			DiscoverHosts:    false,
+		})
+	} else {
+		server.session, _ = gorethink.Connect(gorethink.ConnectOpts{
+			Address:          server.Url.Host,
+			Username:         username,
+			Password:         password,
+			HandshakeVersion: gorethink.HandshakeV1_0,
+			DiscoverHosts:    false,
+		})
+	}
+
 	if err != nil {
 		log.Fatalln(err.Error())
 	}

From 1a636abaaf272713d86413c1d23e2611036fcc3e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 26 Jun 2017 14:31:17 -0700
Subject: [PATCH 0343/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bceebe38..2c3fdf993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - [#2875](https://github.com/influxdata/telegraf/pull/2875): Add input plugin for fail2ban.
 - [#2924](https://github.com/influxdata/telegraf/pull/2924): Support HOST_PROC in processes and linux_sysctl_fs inputs.
 - [#2960](https://github.com/influxdata/telegraf/pull/2960): Add Minecraft input plugin.
+- [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
 
 ### Bugfixes
 

From d5b6f92f3f6811ec91e23491123458a575863398 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 26 Jun 2017 14:48:22 -0700
Subject: [PATCH 0344/1302] Log aerospike field value on error

---
 plugins/inputs/aerospike/aerospike.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/aerospike/aerospike.go b/plugins/inputs/aerospike/aerospike.go
index bd4d9889d..f77fdf10e 100644
--- a/plugins/inputs/aerospike/aerospike.go
+++ b/plugins/inputs/aerospike/aerospike.go
@@ -85,7 +85,7 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 			if err == nil {
 				fields[strings.Replace(k, "-", "_", -1)] = val
 			} else {
-				log.Printf("I! skipping aerospike field %v with int64 overflow", k)
+				log.Printf("I! skipping aerospike field %v with int64 overflow: %q", k, v)
 			}
 		}
 		acc.AddFields("aerospike_node", fields, tags, time.Now())
@@ -117,7 +117,7 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 				if err == nil {
 					nFields[strings.Replace(parts[0], "-", "_", -1)] = val
 				} else {
-					log.Printf("I! skipping aerospike field %v with int64 overflow", parts[0])
+					log.Printf("I! skipping aerospike field %v with int64 overflow: %q", parts[0], parts[1])
 				}
 			}
 			acc.AddFields("aerospike_namespace", nFields, nTags, time.Now())

From d217cdc1a62f8db926d787497211426fcfb09d85 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Mon, 26 Jun 2017 18:13:38 -0400
Subject: [PATCH 0345/1302] Add optional usage_active and time_active CPU
 metrics (#2943)

---
 plugins/inputs/system/CPU_README.md |  4 ++++
 plugins/inputs/system/cpu.go        | 18 ++++++++++++++++++
 plugins/inputs/system/cpu_test.go   |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/plugins/inputs/system/CPU_README.md b/plugins/inputs/system/CPU_README.md
index 01d57855b..dfb8561a2 100644
--- a/plugins/inputs/system/CPU_README.md
+++ b/plugins/inputs/system/CPU_README.md
@@ -14,6 +14,8 @@
   totalcpu = true
   ## If true, collect raw CPU time metrics.
   collect_cpu_time = false
+  ## If true, compute and report the sum of all non-idle CPU states.
+  report_active = false
 ```
 
 #### Description
@@ -68,6 +70,7 @@ Measurement names:
 - cpu_time_user
 - cpu_time_system
 - cpu_time_idle
+- cpu_time_active (must be explicitly enabled by setting `report_active = true`)
 - cpu_time_nice
 - cpu_time_iowait
 - cpu_time_irq
@@ -86,6 +89,7 @@ Measurement names:
 - cpu_usage_user
 - cpu_usage_system
 - cpu_usage_idle
+- cpu_usage_active (must be explicitly enabled by setting `report_active = true`)
 - cpu_usage_nice
 - cpu_usage_iowait
 - cpu_usage_irq
diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/system/cpu.go
index e6aa9f22d..f60cb20c9 100644
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/system/cpu.go
@@ -16,12 +16,14 @@ type CPUStats struct {
 	PerCPU         bool `toml:"percpu"`
 	TotalCPU       bool `toml:"totalcpu"`
 	CollectCPUTime bool `toml:"collect_cpu_time"`
+	ReportActive   bool `toml:"report_active"`
 }
 
 func NewCPUStats(ps PS) *CPUStats {
 	return &CPUStats{
 		ps:             ps,
 		CollectCPUTime: true,
+		ReportActive:   true,
 	}
 }
 
@@ -36,6 +38,8 @@ var sampleConfig = `
   totalcpu = true
   ## If true, collect raw CPU time metrics.
   collect_cpu_time = false
+  ## If true, compute and report the sum of all non-idle CPU states.
+  report_active = false
 `
 
 func (_ *CPUStats) SampleConfig() string {
@@ -55,6 +59,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		}
 
 		total := totalCpuTime(cts)
+		active := activeCpuTime(cts)
 
 		if s.CollectCPUTime {
 			// Add cpu time metrics
@@ -70,6 +75,9 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 				"time_guest":      cts.Guest,
 				"time_guest_nice": cts.GuestNice,
 			}
+			if s.ReportActive {
+				fieldsC["time_active"] = activeCpuTime(cts)
+			}
 			acc.AddCounter("cpu", fieldsC, tags, now)
 		}
 
@@ -80,6 +88,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		}
 		lastCts := s.lastStats[i]
 		lastTotal := totalCpuTime(lastCts)
+		lastActive := activeCpuTime(lastCts)
 		totalDelta := total - lastTotal
 
 		if totalDelta < 0 {
@@ -90,6 +99,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		if totalDelta == 0 {
 			continue
 		}
+
 		fieldsG := map[string]interface{}{
 			"usage_user":       100 * (cts.User - lastCts.User - (cts.Guest - lastCts.Guest)) / totalDelta,
 			"usage_system":     100 * (cts.System - lastCts.System) / totalDelta,
@@ -102,6 +112,9 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 			"usage_guest":      100 * (cts.Guest - lastCts.Guest) / totalDelta,
 			"usage_guest_nice": 100 * (cts.GuestNice - lastCts.GuestNice) / totalDelta,
 		}
+		if s.ReportActive {
+			fieldsG["usage_active"] = 100 * (active - lastActive) / totalDelta
+		}
 		acc.AddGauge("cpu", fieldsG, tags, now)
 	}
 
@@ -116,6 +129,11 @@ func totalCpuTime(t cpu.TimesStat) float64 {
 	return total
 }
 
+func activeCpuTime(t cpu.TimesStat) float64 {
+	active := totalCpuTime(t) - t.Idle
+	return active
+}
+
 func init() {
 	inputs.Add("cpu", func() telegraf.Input {
 		return &CPUStats{
diff --git a/plugins/inputs/system/cpu_test.go b/plugins/inputs/system/cpu_test.go
index e071f22c5..e9dc7dda9 100644
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/system/cpu_test.go
@@ -59,6 +59,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 8.8, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_system", 8.2, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 80.1, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_active", 19.9, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_nice", 1.3, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 0.8389, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_irq", 0.6, 0, cputags)
@@ -78,6 +79,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 24.9, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_system", 10.9, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 157.9798, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_active", 42.0202, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_nice", 3.5, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 0.929, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_irq", 1.2, 0, cputags)
@@ -89,6 +91,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_user", 7.8, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_system", 2.7, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_idle", 77.8798, 0.0005, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "usage_active", 22.1202, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_nice", 0, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_iowait", 0.0901, 0.0005, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "usage_irq", 0.6, 0.0005, cputags)

From a52f90122b84c9a82998ccd5a9d0b3ead56c4349 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 26 Jun 2017 15:15:31 -0700
Subject: [PATCH 0346/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c3fdf993..fa78b5a44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - [#2924](https://github.com/influxdata/telegraf/pull/2924): Support HOST_PROC in processes and linux_sysctl_fs inputs.
 - [#2960](https://github.com/influxdata/telegraf/pull/2960): Add Minecraft input plugin.
 - [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
+- [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
 
 ### Bugfixes
 

From a7595c918a0ef6022355672dfca1fba979580375 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Mon, 26 Jun 2017 18:23:53 -0400
Subject: [PATCH 0347/1302] Fix panic in elasticsearch input if cannot
 determine master (#2954)

---
 plugins/inputs/elasticsearch/elasticsearch.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index c11bfdd2f..5bf3d1c63 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -169,7 +169,10 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 			if e.ClusterStats {
 				// get cat/master information here so NodeStats can determine
 				// whether this node is the Master
-				e.setCatMaster(s + "/_cat/master")
+				if err := e.setCatMaster(s + "/_cat/master"); err != nil {
+					acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
+					return
+				}
 			}
 
 			// Always gather node states
@@ -353,7 +356,7 @@ func (e *Elasticsearch) setCatMaster(url string) error {
 		// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
 		// to let the underlying transport close the connection and re-establish a new one for
 		// future calls.
-		return fmt.Errorf("status-code %d, expected %d", r.StatusCode, http.StatusOK)
+		return fmt.Errorf("elasticsearch: Unable to retrieve master node information. API responded with status-code %d, expected %d", r.StatusCode, http.StatusOK)
 	}
 	response, err := ioutil.ReadAll(r.Body)
 

From f2bb4acd4afd3d02034c0184c65b9cfe58cb4dba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 26 Jun 2017 15:25:06 -0700
Subject: [PATCH 0348/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa78b5a44..7256b1de0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - [#2915](https://github.com/influxdata/telegraf/issues/2915): Allow dos line endings in tail and logparser.
 - [#2937](https://github.com/influxdata/telegraf/issues/2937): Remove label value sanitization in prometheus output.
 - [#2948](https://github.com/influxdata/telegraf/issues/2948): Fix bug parsing default timestamps with modified precision.
+- [#2954](https://github.com/influxdata/telegraf/issues/2954): Fix panic in elasticsearch input if cannot determine master.
 
 ## v1.3.2 [2017-06-14]
 

From cc3d420551f854b68c462ae9bd313af6bbe7205b Mon Sep 17 00:00:00 2001
From: Adam Perlin <adamperlin@seattleacademy.org>
Date: Tue, 27 Jun 2017 13:14:07 -0700
Subject: [PATCH 0349/1302] Fix several bugs in minecraft input (#2970)

---
 .../inputs/minecraft/internal/rcon/rcon.go    | 10 +++++-
 plugins/inputs/minecraft/minecraft.go         | 25 +++++++++----
 plugins/inputs/minecraft/minecraft_test.go    |  8 ++++-
 plugins/inputs/minecraft/rcon.go              | 30 ++++++++++++++--
 .../minecraft/rcon_disconnect_error_test.go   | 36 +++++++++++++++++++
 plugins/inputs/minecraft/rcon_test.go         |  5 +--
 6 files changed, 100 insertions(+), 14 deletions(-)
 create mode 100644 plugins/inputs/minecraft/rcon_disconnect_error_test.go

diff --git a/plugins/inputs/minecraft/internal/rcon/rcon.go b/plugins/inputs/minecraft/internal/rcon/rcon.go
index f17163f8b..118771242 100644
--- a/plugins/inputs/minecraft/internal/rcon/rcon.go
+++ b/plugins/inputs/minecraft/internal/rcon/rcon.go
@@ -171,9 +171,17 @@ func (c *Client) Send(typ int32, command string) (response *Packet, err error) {
 	}
 
 	body := make([]byte, header.Size-int32(PacketHeaderSize))
-
 	n, err = c.Connection.Read(body)
 
+	for n < len(body) {
+		var nBytes int
+		nBytes, err = c.Connection.Read(body[n:])
+		if err != nil {
+			return
+		}
+		n += nBytes
+	}
+
 	if nil != err {
 		return
 	} else if n != len(body) {
diff --git a/plugins/inputs/minecraft/minecraft.go b/plugins/inputs/minecraft/minecraft.go
index d88f4373d..04b3f4ad1 100644
--- a/plugins/inputs/minecraft/minecraft.go
+++ b/plugins/inputs/minecraft/minecraft.go
@@ -25,15 +25,16 @@ var (
 
 // Client is an interface for a client which gathers data from a minecraft server
 type Client interface {
-	Gather() ([]string, error)
+	Gather(producer RCONClientProducer) ([]string, error)
 }
 
 // Minecraft represents a connection to a minecraft server
 type Minecraft struct {
-	Server   string
-	Port     string
-	Password string
-	client   Client
+	Server    string
+	Port      string
+	Password  string
+	client    Client
+	clientSet bool
 }
 
 // Description gives a brief description.
@@ -48,16 +49,26 @@ func (s *Minecraft) SampleConfig() string {
 
 // Gather uses the RCON protocal to collect player and
 // scoreboard stats from a minecraft server.
+//var hasClient bool = false
 func (s *Minecraft) Gather(acc telegraf.Accumulator) error {
-	if s.client == nil {
+	// can't simply compare s.client to nil, because comparing an interface
+	// to nil often does not produce the desired result
+	if !s.clientSet {
 		var err error
 		s.client, err = NewRCON(s.Server, s.Port, s.Password)
 		if err != nil {
 			return err
 		}
+		s.clientSet = true
 	}
 
-	scores, err := s.client.Gather()
+	// (*RCON).Gather() takes an RCONClientProducer for testing purposes
+	d := defaultClientProducer{
+		Server: s.Server,
+		Port:   s.Port,
+	}
+
+	scores, err := s.client.Gather(d)
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/minecraft/minecraft_test.go b/plugins/inputs/minecraft/minecraft_test.go
index 664ad4e81..c0a9e6cf5 100644
--- a/plugins/inputs/minecraft/minecraft_test.go
+++ b/plugins/inputs/minecraft/minecraft_test.go
@@ -161,7 +161,7 @@ type MockClient struct {
 	Err    error
 }
 
-func (m *MockClient) Gather() ([]string, error) {
+func (m *MockClient) Gather(d RCONClientProducer) ([]string, error) {
 	return m.Result, m.Err
 }
 
@@ -178,13 +178,19 @@ func TestGather(t *testing.T) {
 			},
 			Err: nil,
 		},
+		clientSet: true,
 	}
 
 	err := testConfig.Gather(&acc)
+
 	if err != nil {
 		t.Fatalf("gather returned error. Error: %s\n", err)
 	}
 
+	if !testConfig.clientSet {
+		t.Fatalf("clientSet should be true, client should be set")
+	}
+
 	tags := map[string]string{
 		"player": "divislight",
 		"server": "biffsgang.net:25575",
diff --git a/plugins/inputs/minecraft/rcon.go b/plugins/inputs/minecraft/rcon.go
index 6dbed47ad..219a1d14f 100644
--- a/plugins/inputs/minecraft/rcon.go
+++ b/plugins/inputs/minecraft/rcon.go
@@ -29,6 +29,22 @@ type RCON struct {
 	client   RCONClient
 }
 
+// RCONClientProducer is an interface which defines how a new client will be
+// produced in the event of a network disconnect. It exists mainly for
+// testing purposes
+type RCONClientProducer interface {
+	newClient() (RCONClient, error)
+}
+
+type defaultClientProducer struct {
+	Server string
+	Port   string
+}
+
+func (d defaultClientProducer) newClient() (RCONClient, error) {
+	return newClient(d.Server, d.Port)
+}
+
 // NewRCON creates a new RCON
 func NewRCON(server, port, password string) (*RCON, error) {
 	client, err := newClient(server, port)
@@ -50,18 +66,26 @@ func newClient(server, port string) (*rcon.Client, error) {
 		return nil, err
 	}
 
-	return rcon.NewClient(server, p)
+	client, err := rcon.NewClient(server, p)
+
+	// If we've encountered any error, the contents of `client` could be corrupted,
+	// so we must return nil, err
+	if err != nil {
+		return nil, err
+	}
+	return client, nil
 }
 
 // Gather recieves all player scoreboard information and returns it per player.
-func (r *RCON) Gather() ([]string, error) {
+func (r *RCON) Gather(producer RCONClientProducer) ([]string, error) {
 	if r.client == nil {
 		var err error
-		r.client, err = newClient(r.Server, r.Port)
+		r.client, err = producer.newClient()
 		if err != nil {
 			return nil, err
 		}
 	}
+
 	if _, err := r.client.Authorize(r.Password); err != nil {
 		// Potentially a network problem where the client will need to be
 		// re-initialized
diff --git a/plugins/inputs/minecraft/rcon_disconnect_error_test.go b/plugins/inputs/minecraft/rcon_disconnect_error_test.go
new file mode 100644
index 000000000..c89308e06
--- /dev/null
+++ b/plugins/inputs/minecraft/rcon_disconnect_error_test.go
@@ -0,0 +1,36 @@
+package minecraft
+
+import (
+	"errors"
+	"testing"
+)
+
+type MockRCONProducer struct {
+	Err error
+}
+
+func (m *MockRCONProducer) newClient() (RCONClient, error) {
+	return nil, m.Err
+}
+
+func TestRCONErrorHandling(t *testing.T) {
+	m := &MockRCONProducer{
+		Err: errors.New("Error: failed connection"),
+	}
+	c := &RCON{
+		Server:   "craftstuff.com",
+		Port:     "2222",
+		Password: "pass",
+		//Force fetching of new client
+		client: nil,
+	}
+
+	_, err := c.Gather(m)
+	if err == nil {
+		t.Errorf("Error nil, unexpected result")
+	}
+
+	if c.client != nil {
+		t.Fatal("c.client should be nil, unexpected result")
+	}
+}
diff --git a/plugins/inputs/minecraft/rcon_test.go b/plugins/inputs/minecraft/rcon_test.go
index 011939894..1660b53f9 100644
--- a/plugins/inputs/minecraft/rcon_test.go
+++ b/plugins/inputs/minecraft/rcon_test.go
@@ -40,7 +40,8 @@ func TestRCONGather(t *testing.T) {
 		client:   mock,
 	}
 
-	got, err := client.Gather()
+	d := defaultClientProducer{}
+	got, err := client.Gather(d)
 	if err != nil {
 		t.Fatalf("Gather returned an error. Error %s\n", err)
 	}
@@ -57,7 +58,7 @@ func TestRCONGather(t *testing.T) {
 		Err: nil,
 	}
 
-	got, err = client.Gather()
+	got, err = client.Gather(defaultClientProducer{})
 	if err != nil {
 		t.Fatalf("Gather returned an error. Error %s\n", err)
 	}

From d40e44124047846a24202c2d0f2d0d155b398b28 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 27 Jun 2017 13:24:06 -0700
Subject: [PATCH 0350/1302] Use git sha1 as version if not tagged (#2969)

---
 Makefile                 | 23 ++++++++++++++---------
 cmd/telegraf/telegraf.go | 21 +++++++++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 1f4233ab0..a22d2bf1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
-VERSION := $(shell sh -c 'git describe --always --tags')
-BRANCH := $(shell sh -c 'git rev-parse --abbrev-ref HEAD')
-COMMIT := $(shell sh -c 'git rev-parse --short HEAD')
+VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
+BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+COMMIT := $(shell git rev-parse --short HEAD)
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 endif
 
+LDFLAGS := -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
+ifdef VERSION
+	LDFLAGS += -X main.version=$(VERSION)
+endif
+
+
 # Standard Telegraf build
 default: prepare build
 
@@ -15,17 +21,16 @@ windows: prepare-windows build-windows
 
 # Only run the build (no dependency grabbing)
 build:
-	go install -ldflags \
-		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" ./...
+	go install -ldflags "$(LDFLAGS)" ./...
 
 build-windows:
-	GOOS=windows GOARCH=amd64 go build -o telegraf.exe -ldflags \
-		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
+	GOOS=windows GOARCH=amd64 go build -o telegraf.exe \
+		 -ldflags "$(LDFLAGS)" \
 		./cmd/telegraf/telegraf.go
 
 build-for-docker:
-	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
-		"-s -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
+	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf \
+		 -ldflags "$(LDFLAGS)" \
 		./cmd/telegraf/telegraf.go
 
 # run package script
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index af11e6682..e341606df 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -57,10 +57,12 @@ var fService = flag.String("service", "",
 
 // Telegraf version, populated linker.
 //   ie, -ldflags "-X main.version=`git describe --always --tags`"
+
 var (
-	version string
-	commit  string
-	branch  string
+	nextVersion = "1.4.0"
+	version     string
+	commit      string
+	branch      string
 )
 
 func init() {
@@ -196,7 +198,7 @@ func reloadLoop(
 			}
 		}()
 
-		log.Printf("I! Starting Telegraf (version %s)\n", version)
+		log.Printf("I! Starting Telegraf %s\n", displayVersion())
 		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Loaded inputs: %s", strings.Join(c.InputNames(), " "))
 		log.Printf("I! Tags enabled: %s", c.ListTags())
@@ -254,6 +256,13 @@ func (p *program) Stop(s service.Service) error {
 	return nil
 }
 
+func displayVersion() string {
+	if version == "" {
+		return fmt.Sprintf("v%s~pre%s", nextVersion, commit)
+	}
+	return "v" + version
+}
+
 func main() {
 	flag.Usage = func() { usageExit(0) }
 	flag.Parse()
@@ -295,7 +304,7 @@ func main() {
 	if len(args) > 0 {
 		switch args[0] {
 		case "version":
-			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
+			fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
 			return
 		case "config":
 			config.PrintSampleConfig(
@@ -323,7 +332,7 @@ func main() {
 		}
 		return
 	case *fVersion:
-		fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
+		fmt.Printf("Telegraf %s (git: %s %s)\n", displayVersion(), branch, commit)
 		return
 	case *fSampleConfig:
 		config.PrintSampleConfig(

From 90909ae7085071ddc214c58aaf6ef89409004e5a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 27 Jun 2017 16:31:28 -0700
Subject: [PATCH 0351/1302] Fix build on Windows (#2972)

---
 plugins/inputs/system/linux_sysctl_fs.go | 12 +++++++++++-
 plugins/inputs/system/processes.go       |  9 ---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/system/linux_sysctl_fs.go b/plugins/inputs/system/linux_sysctl_fs.go
index add17e9ae..55ebcb668 100644
--- a/plugins/inputs/system/linux_sysctl_fs.go
+++ b/plugins/inputs/system/linux_sysctl_fs.go
@@ -3,11 +3,13 @@ package system
 import (
 	"bytes"
 	"io/ioutil"
+	"os"
 	"strconv"
 
+	"path"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"path"
 )
 
 // https://www.kernel.org/doc/Documentation/sysctl/fs.txt
@@ -80,6 +82,14 @@ func (sfs *SysctlFS) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func GetHostProc() string {
+	procPath := "/proc"
+	if os.Getenv("HOST_PROC") != "" {
+		procPath = os.Getenv("HOST_PROC")
+	}
+	return procPath
+}
+
 func init() {
 
 	inputs.Add("linux_sysctl_fs", func() telegraf.Input {
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index 68796fed6..1ceb4fb2d 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -20,7 +20,6 @@ import (
 
 type Processes struct {
 	execPS       func() ([]byte, error)
-	getHostProc  func() string
 	readProcFile func(filename string) ([]byte, error)
 
 	forcePS   bool
@@ -63,14 +62,6 @@ func (p *Processes) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func GetHostProc() string {
-	procPath := "/proc"
-	if os.Getenv("HOST_PROC") != "" {
-		procPath = os.Getenv("HOST_PROC")
-	}
-	return procPath
-}
-
 // Gets empty fields of metrics based on the OS
 func getEmptyFields() map[string]interface{} {
 	fields := map[string]interface{}{

From 75dbf2b0f82aff1046152113ece407fa75c890a9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 28 Jun 2017 13:05:06 -0700
Subject: [PATCH 0352/1302] Set release date for 1.3.3

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7256b1de0..551c1a544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,7 +50,7 @@
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 - [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
 
-## v1.3.3 [unreleased]
+## v1.3.3 [2017-06-28]
 
 ### Bugfixes
 

From a8a637809e3922248d5ed7814c9033a7970faa75 Mon Sep 17 00:00:00 2001
From: Aleksey Shirokih <freeseacher@gmail.com>
Date: Fri, 30 Jun 2017 00:03:42 +0300
Subject: [PATCH 0353/1302] Change default prometheus_client port (#2973)

---
 CHANGELOG.md                                           | 2 ++
 etc/telegraf.conf                                      | 2 +-
 plugins/outputs/prometheus_client/README.md            | 2 +-
 plugins/outputs/prometheus_client/prometheus_client.go | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551c1a544..c2b8ced28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 - In the `aerospike` input the `node_name` field has been changed to be a tag
   for both the `aerospike_node` and `aerospike_namespace` measurements.
 
+- **breaking change** Change default prometheus_client port to 9273. To play well with Prometheus [port-allocations](https://github.com/prometheus/prometheus/wiki/Default-port-allocations)
+
 ### New Plugins
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index a02c6a12f..b7999b3e0 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -505,7 +505,7 @@
 # # Configuration for the Prometheus client to spawn
 # [[outputs.prometheus_client]]
 #   ## Address to listen on
-#   # listen = ":9126"
+#   # listen = ":9273"
 #
 #   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
 #   # expiration_interval = "60s"
diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index b9177ed7f..4ec7eee3f 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -8,7 +8,7 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
 # Publish all metrics to /metrics for Prometheus to scrape
 [[outputs.prometheus_client]]
   # Address to listen on
-  listen = ":9126"
+  listen = ":9273"
 
   # Expiration interval for each metric. 0 == no expiration
   expiration_interval = "60s"
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index b52dcff6d..f16824c9e 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -57,7 +57,7 @@ type PrometheusClient struct {
 
 var sampleConfig = `
   ## Address to listen on
-  # listen = ":9126"
+  # listen = ":9273"
 
   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
   # expiration_interval = "60s"
@@ -67,7 +67,7 @@ func (p *PrometheusClient) Start() error {
 	prometheus.Register(p)
 
 	if p.Listen == "" {
-		p.Listen = "localhost:9126"
+		p.Listen = "localhost:9273"
 	}
 
 	mux := http.NewServeMux()

From 74a764d54914e7e180c4f6537ebb8f1f6be8076a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 29 Jun 2017 16:17:08 -0700
Subject: [PATCH 0354/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2b8ced28..0cddb7d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 - In the `aerospike` input the `node_name` field has been changed to be a tag
   for both the `aerospike_node` and `aerospike_namespace` measurements.
 
-- **breaking change** Change default prometheus_client port to 9273. To play well with Prometheus [port-allocations](https://github.com/prometheus/prometheus/wiki/Default-port-allocations)
+- The default prometheus_client port has been changed to 9273.
 
 ### New Plugins
 
@@ -36,6 +36,7 @@
 - [#2960](https://github.com/influxdata/telegraf/pull/2960): Add Minecraft input plugin.
 - [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
 - [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
+- [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
 
 ### Bugfixes
 

From 0f850400f2f954c2f39b7fed79f8782610459268 Mon Sep 17 00:00:00 2001
From: Song Wenhao <wenhao.sng@gmail.com>
Date: Thu, 6 Jul 2017 05:28:44 +0800
Subject: [PATCH 0355/1302] Display error message if prometheus output fails to
 listen (#2984)

---
 plugins/outputs/prometheus_client/prometheus_client.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index f16824c9e..f858c6350 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -78,7 +78,12 @@ func (p *PrometheusClient) Start() error {
 		Handler: mux,
 	}
 
-	go p.server.ListenAndServe()
+	go func() {
+		if err := p.server.ListenAndServe(); err != nil {
+			log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
+				err.Error())
+		}
+	}()
 	return nil
 }
 

From 2740a3ba44707735d027a2100241af7bd6263f97 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Jul 2017 14:29:59 -0700
Subject: [PATCH 0356/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cddb7d22..dbaec4c70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - [#2911](https://github.com/influxdata/telegraf/issues/2911): Fix Kinesis output plugin in govcloud.
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 - [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
+- [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 
 ## v1.3.3 [2017-06-28]
 

From ac8e28f43677faddb2d624b0a60616637423f46e Mon Sep 17 00:00:00 2001
From: Wesley Merkel <ooesili@gmail.com>
Date: Mon, 10 Jul 2017 13:22:37 -0500
Subject: [PATCH 0357/1302] Add link to Graylog input to README.md (#2995)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3c3a77f90..aca0b7c86 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ configuration options.
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
 * [filestat](./plugins/inputs/filestat)
+* [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
 * [http_response](./plugins/inputs/http_response)

From 739d97639a0104c7a1831c6652a546b74ed62622 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Jul 2017 11:38:26 -0700
Subject: [PATCH 0358/1302] Update dependencies

---
 Godeps                          | 3 +--
 docs/LICENSE_OF_DEPENDENCIES.md | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Godeps b/Godeps
index a9199e3ef..ada5479fa 100644
--- a/Godeps
+++ b/Godeps
@@ -5,6 +5,7 @@ github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
 github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
 github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
@@ -29,7 +30,6 @@ github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
-github.com/klauspost/crc32 cb6bfca970f6908083f26f39a79009d608efd5cd
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
 github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
@@ -52,7 +52,6 @@ github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
 github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index dfd5fc251..ad7a80ef3 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -42,7 +42,6 @@ works:
 - github.com/kardianos/osext [BSD](https://github.com/kardianos/osext/blob/master/LICENSE)
 - github.com/kardianos/service [ZLIB](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
 - github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
-- github.com/klauspost/crc32 [BSD](https://github.com/klauspost/crc32/blob/master/LICENSE)
 - github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)

From 79f8ed874ab3a3ffb9213d3ae562613b19ac9675 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 10 Jul 2017 12:18:56 -0700
Subject: [PATCH 0359/1302] Update elastic version to 5.0.41 (#2999)

---
 Godeps                          | 3 ++-
 docs/LICENSE_OF_DEPENDENCIES.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index ada5479fa..b538624ad 100644
--- a/Godeps
+++ b/Godeps
@@ -39,6 +39,7 @@ github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
 github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
 github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
 github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
+github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
 github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
@@ -61,5 +62,5 @@ golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
-gopkg.in/olivere/elastic.v5 ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e
+gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index ad7a80ef3..72663069f 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -53,6 +53,7 @@ works:
 - github.com/nsqio/go-nsq [MIT](https://github.com/nsqio/go-nsq/blob/master/LICENSE)
 - github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
 - github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
+- github.com/pkg/errors [BSD](https://github.com/pkg/errors/blob/master/LICENSE)
 - github.com/prometheus/client_golang [APACHE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
 - github.com/prometheus/client_model [APACHE](https://github.com/prometheus/client_model/blob/master/LICENSE)
 - github.com/prometheus/common [APACHE](https://github.com/prometheus/common/blob/master/LICENSE)

From 4209ebfa6e1032484e7346c2a6b5936ee7b7b808 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Jul 2017 12:22:53 -0700
Subject: [PATCH 0360/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbaec4c70..fda5187a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - [#2917](https://github.com/influxdata/telegraf/issues/2917): Fix Aerospike input adds all nodes to a single series.
 - [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
+- [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 
 ## v1.3.3 [2017-06-28]
 

From 945446b36f228ce9f4c416c93487132a2568acbc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 10 Jul 2017 19:05:18 -0700
Subject: [PATCH 0361/1302] Fix handling of escapes within fieldset (#3003)

Line protocol does not require or allow escaping of backslash, the only
requirement for a byte to be escaped is if it is an escapable char and
preceeded immediately by a slash.
---
 metric/metric.go      | 20 +-------------------
 metric/metric_test.go | 14 ++++++++------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/metric/metric.go b/metric/metric.go
index 0dbc1fa85..fdef072c3 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -98,7 +98,7 @@ func indexUnescapedByte(buf []byte, b byte) int {
 			break
 		}
 		keyi += i
-		if countBackslashes(buf, keyi-1)%2 == 0 {
+		if buf[keyi-1] != '\\' {
 			break
 		} else {
 			keyi++
@@ -107,24 +107,6 @@ func indexUnescapedByte(buf []byte, b byte) int {
 	return keyi
 }
 
-// countBackslashes counts the number of preceding backslashes starting at
-// the 'start' index.
-func countBackslashes(buf []byte, index int) int {
-	var count int
-	for {
-		if index < 0 {
-			return count
-		}
-		if buf[index] == '\\' {
-			count++
-			index--
-		} else {
-			break
-		}
-	}
-	return count
-}
-
 type metric struct {
 	name   []byte
 	tags   []byte
diff --git a/metric/metric_test.go b/metric/metric_test.go
index eccb60e63..c154549f3 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -250,11 +250,13 @@ func TestNewMetric_Fields(t *testing.T) {
 		"host": "localhost",
 	}
 	fields := map[string]interface{}{
-		"float":  float64(1),
-		"int":    int64(1),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
+		"float":                  float64(1),
+		"int":                    int64(1),
+		"bool":                   true,
+		"false":                  false,
+		"string":                 "test",
+		"quote_string":           `x"y`,
+		"backslash_quote_string": `x\"y`,
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
@@ -367,7 +369,7 @@ func TestIndexUnescapedByte(t *testing.T) {
 		{
 			in:       []byte(`foo\\bar`),
 			b:        'b',
-			expected: 5,
+			expected: -1,
 		},
 		{
 			in:       []byte(`foobar`),

From 885aa8e6e11dad926224fc5aec896ff769916be6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 10 Jul 2017 19:07:28 -0700
Subject: [PATCH 0362/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fda5187a0..c4f27a11d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,12 @@
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 
+## v1.3.4 [unreleased]
+
+### Bugfixes
+
+- [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
+
 ## v1.3.3 [2017-06-28]
 
 ### Bugfixes

From 9f244cf1acd503fcae244b6cbb2177bdbf5f6e2e Mon Sep 17 00:00:00 2001
From: JSH <jhensley@subfx.net>
Date: Tue, 11 Jul 2017 17:08:40 -0400
Subject: [PATCH 0363/1302] Fix chrony plugin does not track system time offset
 (#2989)

---
 plugins/inputs/chrony/README.md      | 3 ++-
 plugins/inputs/chrony/chrony.go      | 2 +-
 plugins/inputs/chrony/chrony_test.go | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/chrony/README.md b/plugins/inputs/chrony/README.md
index 2a810f521..aa4f84806 100644
--- a/plugins/inputs/chrony/README.md
+++ b/plugins/inputs/chrony/README.md
@@ -63,6 +63,7 @@ Delete second or Not synchronised.
 ### Measurements & Fields:
 
 - chrony
+    - system_time (float, seconds)
     - last_offset (float, seconds)
     - rms_offset (float, seconds)
     - frequency (float, ppm)
@@ -84,7 +85,7 @@ Delete second or Not synchronised.
 ```
 $ telegraf --config telegraf.conf --input-filter chrony --test
 * Plugin: chrony, Collection 1
-> chrony,leap_status=normal,reference_id=192.168.1.1,stratum=3 frequency=-35.657,last_offset=-0.000013616,residual_freq=-0,rms_offset=0.000027073,root_delay=0.000644,root_dispersion=0.003444,skew=0.001,update_interval=1031.2 1463750789687639161
+> chrony,leap_status=normal,reference_id=192.168.1.1,stratum=3 frequency=-35.657,system_time=0.000027073,last_offset=-0.000013616,residual_freq=-0,rms_offset=0.000027073,root_delay=0.000644,root_dispersion=0.003444,skew=0.001,update_interval=1031.2 1463750789687639161
 ```
 
 
diff --git a/plugins/inputs/chrony/chrony.go b/plugins/inputs/chrony/chrony.go
index f39108921..94285d249 100644
--- a/plugins/inputs/chrony/chrony.go
+++ b/plugins/inputs/chrony/chrony.go
@@ -92,7 +92,7 @@ func processChronycOutput(out string) (map[string]interface{}, map[string]string
 		}
 		name := strings.ToLower(strings.Replace(strings.TrimSpace(stats[0]), " ", "_", -1))
 		// ignore reference time
-		if strings.Contains(name, "time") {
+		if strings.Contains(name, "ref_time") {
 			continue
 		}
 		valueFields := strings.Fields(stats[1])
diff --git a/plugins/inputs/chrony/chrony_test.go b/plugins/inputs/chrony/chrony_test.go
index 496986c40..28633cd0c 100644
--- a/plugins/inputs/chrony/chrony_test.go
+++ b/plugins/inputs/chrony/chrony_test.go
@@ -31,6 +31,7 @@ func TestGather(t *testing.T) {
 		"stratum":      "3",
 	}
 	fields := map[string]interface{}{
+		"system_time":     0.000020390,
 		"last_offset":     0.000012651,
 		"rms_offset":      0.000025577,
 		"frequency":       -16.001,

From af318f4959e775372337389ef5331e2e80eaa5c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Jul 2017 14:10:09 -0700
Subject: [PATCH 0364/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f27a11d..75ee3de70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 ### Bugfixes
 
 - [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
+- [#2988](https://github.com/influxdata/telegraf/issues/2988): Fix chrony plugin does not track system time offset.
 
 ## v1.3.3 [2017-06-28]
 

From 1388e2cf921a8dbaab1d061853e7dd9aeea1ebd1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 11 Jul 2017 15:54:38 -0700
Subject: [PATCH 0365/1302] Do not allow metrics with trailing slashes (#3007)

It is not possible to encode a measurement, tag, or field whose last
character is a backslash due to it being an unescapable character.
Because the tight coupling between line protocol and the internal metric
model, prevent metrics like this from being created.

Measurements with a trailing slash are not allowed and the point will be
dropped.  Tags and fields with a trailing a slash will be dropped from
the point.
---
 internal/models/makemetric.go         |  29 ++++++
 internal/models/running_input_test.go | 123 ++++++++++++++++++++++++++
 metric/metric.go                      |  23 ++++-
 metric/metric_test.go                 |  52 +++++++++++
 4 files changed, 226 insertions(+), 1 deletion(-)

diff --git a/internal/models/makemetric.go b/internal/models/makemetric.go
index 4e398043a..b2c150546 100644
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -3,6 +3,7 @@ package models
 import (
 	"log"
 	"math"
+	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -77,7 +78,27 @@ func makemetric(
 		}
 	}
 
+	for k, v := range tags {
+		if strings.HasSuffix(k, `\`) {
+			log.Printf("D! Measurement [%s] tag [%s] "+
+				"ends with a backslash, skipping", measurement, k)
+			delete(tags, k)
+			continue
+		} else if strings.HasSuffix(v, `\`) {
+			log.Printf("D! Measurement [%s] tag [%s] has a value "+
+				"ending with a backslash, skipping", measurement, k)
+			delete(tags, k)
+			continue
+		}
+	}
+
 	for k, v := range fields {
+		if strings.HasSuffix(k, `\`) {
+			log.Printf("D! Measurement [%s] field [%s] "+
+				"ends with a backslash, skipping", measurement, k)
+			delete(fields, k)
+			continue
+		}
 		// Validate uint64 and float64 fields
 		// convert all int & uint types to int64
 		switch val := v.(type) {
@@ -128,6 +149,14 @@ func makemetric(
 				delete(fields, k)
 				continue
 			}
+		case string:
+			if strings.HasSuffix(val, `\`) {
+				log.Printf("D! Measurement [%s] field [%s] has a value "+
+					"ending with a backslash, skipping", measurement, k)
+				delete(fields, k)
+				continue
+			}
+			fields[k] = v
 		default:
 			fields[k] = v
 		}
diff --git a/internal/models/running_input_test.go b/internal/models/running_input_test.go
index 33c785c6e..1a6491e35 100644
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestMakeMetricNoFields(t *testing.T) {
@@ -332,6 +333,128 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 	)
 }
 
+func TestMakeMetric_TrailingSlash(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name                string
+		measurement         string
+		fields              map[string]interface{}
+		tags                map[string]string
+		expectedNil         bool
+		expectedMeasurement string
+		expectedFields      map[string]interface{}
+		expectedTags        map[string]string
+	}{
+		{
+			name:        "Measurement cannot have trailing slash",
+			measurement: `cpu\`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags:        map[string]string{},
+			expectedNil: true,
+		},
+		{
+			name:        "Field key with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+				`bad\`:  `xyzzy`,
+			},
+			tags:                map[string]string{},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{},
+		},
+		{
+			name:        "Field value with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+				"bad":   `xyzzy\`,
+			},
+			tags:                map[string]string{},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{},
+		},
+		{
+			name:        "Must have one field after dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"bad": `xyzzy\`,
+			},
+			tags:        map[string]string{},
+			expectedNil: true,
+		},
+		{
+			name:        "Tag key with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags: map[string]string{
+				`host\`: "localhost",
+				"a":     "x",
+			},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name:        "Tag value with trailing slash dropped",
+			measurement: `cpu`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			tags: map[string]string{
+				`host`: `localhost\`,
+				"a":    "x",
+			},
+			expectedMeasurement: `cpu`,
+			expectedFields: map[string]interface{}{
+				"value": int64(42),
+			},
+			expectedTags: map[string]string{
+				"a": "x",
+			},
+		},
+	}
+
+	ri := NewRunningInput(&testInput{}, &InputConfig{
+		Name: "TestRunningInput",
+	})
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			m := ri.MakeMetric(
+				tc.measurement,
+				tc.fields,
+				tc.tags,
+				telegraf.Untyped,
+				now)
+
+			if tc.expectedNil {
+				require.Nil(t, m)
+			} else {
+				require.NotNil(t, m)
+				require.Equal(t, tc.expectedMeasurement, m.Name())
+				require.Equal(t, tc.expectedFields, m.Fields())
+				require.Equal(t, tc.expectedTags, m.Tags())
+			}
+		})
+	}
+}
+
 type testInput struct{}
 
 func (t *testInput) Description() string                   { return "" }
diff --git a/metric/metric.go b/metric/metric.go
index fdef072c3..dd2d6cbc0 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -6,6 +6,7 @@ import (
 	"hash/fnv"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -26,6 +27,9 @@ func New(
 	if len(name) == 0 {
 		return nil, fmt.Errorf("Metric cannot be made with an empty name")
 	}
+	if strings.HasSuffix(name, `\`) {
+		return nil, fmt.Errorf("Metric cannot have measurement name ending with a backslash")
+	}
 
 	var thisType telegraf.ValueType
 	if len(mType) > 0 {
@@ -44,6 +48,13 @@ func New(
 	// pre-allocate exact size of the tags slice
 	taglen := 0
 	for k, v := range tags {
+		if strings.HasSuffix(k, `\`) {
+			return nil, fmt.Errorf("Metric cannot have tag key ending with a backslash")
+		}
+		if strings.HasSuffix(v, `\`) {
+			return nil, fmt.Errorf("Metric cannot have tag value ending with a backslash")
+		}
+
 		if len(k) == 0 || len(v) == 0 {
 			continue
 		}
@@ -66,7 +77,17 @@ func New(
 
 	// pre-allocate capacity of the fields slice
 	fieldlen := 0
-	for k, _ := range fields {
+	for k, v := range fields {
+		if strings.HasSuffix(k, `\`) {
+			return nil, fmt.Errorf("Metric cannot have field key ending with a backslash")
+		}
+		switch val := v.(type) {
+		case string:
+			if strings.HasSuffix(val, `\`) {
+				return nil, fmt.Errorf("Metric cannot have field value ending with a backslash")
+			}
+		}
+
 		// 10 bytes is completely arbitrary, but will at least prevent some
 		// amount of allocations. There's a small possibility this will create
 		// slightly more allocations for a metric that has many short fields.
diff --git a/metric/metric_test.go b/metric/metric_test.go
index c154549f3..e875a213f 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -687,3 +687,55 @@ func TestEmptyTagValueOrKey(t *testing.T) {
 	assert.NoError(t, err)
 
 }
+
+func TestNewMetric_TrailingSlash(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name   string
+		tags   map[string]string
+		fields map[string]interface{}
+	}{
+		{
+			name: `cpu\`,
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+		{
+			name: "cpu",
+			fields: map[string]interface{}{
+				`value\`: "x",
+			},
+		},
+		{
+			name: "cpu",
+			fields: map[string]interface{}{
+				"value": `x\`,
+			},
+		},
+		{
+			name: "cpu",
+			tags: map[string]string{
+				`host\`: "localhost",
+			},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+		{
+			name: "cpu",
+			tags: map[string]string{
+				"host": `localhost\`,
+			},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+		},
+	}
+
+	for _, tc := range tests {
+		_, err := New(tc.name, tc.tags, tc.fields, now)
+		assert.Error(t, err)
+	}
+}

From f68bab1667c709c0e4238fbaef4514e8cf348d81 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 11 Jul 2017 15:55:44 -0700
Subject: [PATCH 0366/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75ee3de70..40ce75b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 
 - [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
 - [#2988](https://github.com/influxdata/telegraf/issues/2988): Fix chrony plugin does not track system time offset.
+- [#3004](https://github.com/influxdata/telegraf/issues/3004): Do not allow metrics with trailing slashes.
 
 ## v1.3.3 [2017-06-28]
 

From 5d2c093105170f0ccf2ca72b6fc742b2d02b07a8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 12 Jul 2017 12:03:23 -0700
Subject: [PATCH 0367/1302] Prevent Write from being called concurrently
 (#3011)

---
 internal/models/running_output.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 61f26add1..335fb792f 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"log"
+	"sync"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -34,6 +35,9 @@ type RunningOutput struct {
 
 	metrics     *buffer.Buffer
 	failMetrics *buffer.Buffer
+
+	// Guards against concurrent calls to the Output as described in #3009
+	sync.Mutex
 }
 
 func NewRunningOutput(
@@ -169,6 +173,8 @@ func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 	if nMetrics == 0 {
 		return nil
 	}
+	ro.Lock()
+	defer ro.Unlock()
 	start := time.Now()
 	err := ro.Output.Write(metrics)
 	elapsed := time.Since(start)

From 2c10806fefc1c2a725879b1e37c2dab6754e7e90 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Jul 2017 12:04:43 -0700
Subject: [PATCH 0368/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ce75b72..6f85b55c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - [#3001](https://github.com/influxdata/telegraf/issues/3001): Fix handling of escape characters within fields.
 - [#2988](https://github.com/influxdata/telegraf/issues/2988): Fix chrony plugin does not track system time offset.
 - [#3004](https://github.com/influxdata/telegraf/issues/3004): Do not allow metrics with trailing slashes.
+- [#3011](https://github.com/influxdata/telegraf/issues/3011): Prevent Write from being called concurrently.
 
 ## v1.3.3 [2017-06-28]
 

From d9d1ca5a46d23862f510bc11e0280da703c3d99f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 12 Jul 2017 17:15:38 -0700
Subject: [PATCH 0369/1302] Add release date for 1.3.4

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f85b55c9..f9eaf2c88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,7 @@
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 
-## v1.3.4 [unreleased]
+## v1.3.4 [2017-07-12]
 
 ### Bugfixes
 

From b165ce4cd597da6cef5fec38e54bd94557b9e28a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 13 Jul 2017 15:34:21 -0700
Subject: [PATCH 0370/1302] Prevent possible deadlock when using aggregators
 (#3016)

Looping the metrics back through the same channel could result in a
deadlock, by using a new channel and locking the processor we can ensure
that all stages can make continual progress.
---
 agent/agent.go                       | 30 +++++++++++++++++++++++++---
 internal/models/running_processor.go |  9 ++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index e82caf148..b6db56c5b 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -247,7 +247,7 @@ func (a *Agent) flush() {
 }
 
 // flusher monitors the metrics input channel and flushes on the minimum interval
-func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) error {
+func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, aggC chan telegraf.Metric) error {
 	// Inelegant, but this sleep is to allow the Gather threads to run, so that
 	// the flusher will flush after metrics are collected.
 	time.Sleep(time.Millisecond * 300)
@@ -291,6 +291,29 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) er
 		}
 	}()
 
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		for {
+			select {
+			case <-shutdown:
+				if len(aggC) > 0 {
+					// keep going until aggC is flushed
+					continue
+				}
+				return
+			case metric := <-aggC:
+				metrics := []telegraf.Metric{metric}
+				for _, processor := range a.Config.Processors {
+					metrics = processor.Apply(metrics...)
+				}
+				for _, m := range metrics {
+					outMetricC <- m
+				}
+			}
+		}
+	}()
+
 	ticker := time.NewTicker(a.Config.Agent.FlushInterval.Duration)
 	semaphore := make(chan struct{}, 1)
 	for {
@@ -339,6 +362,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 
 	// channel shared between all input threads for accumulating metrics
 	metricC := make(chan telegraf.Metric, 100)
+	aggC := make(chan telegraf.Metric, 100)
 
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
@@ -367,7 +391,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		if err := a.flusher(shutdown, metricC); err != nil {
+		if err := a.flusher(shutdown, metricC, aggC); err != nil {
 			log.Printf("E! Flusher routine failed, exiting: %s\n", err.Error())
 			close(shutdown)
 		}
@@ -377,7 +401,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	for _, aggregator := range a.Config.Aggregators {
 		go func(agg *models.RunningAggregator) {
 			defer wg.Done()
-			acc := NewAccumulator(agg, metricC)
+			acc := NewAccumulator(agg, aggC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
 			agg.Run(acc, shutdown)
diff --git a/internal/models/running_processor.go b/internal/models/running_processor.go
index 600b61928..92d3d44d0 100644
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -1,11 +1,15 @@
 package models
 
 import (
+	"sync"
+
 	"github.com/influxdata/telegraf"
 )
 
 type RunningProcessor struct {
-	Name      string
+	Name string
+
+	sync.Mutex
 	Processor telegraf.Processor
 	Config    *ProcessorConfig
 }
@@ -24,6 +28,9 @@ type ProcessorConfig struct {
 }
 
 func (rp *RunningProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	rp.Lock()
+	defer rp.Unlock()
+
 	ret := []telegraf.Metric{}
 
 	for _, metric := range in {

From 785798611e859a8af85d80fc9b06daee043ad944 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 13 Jul 2017 15:39:45 -0700
Subject: [PATCH 0371/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9eaf2c88..cb23d751b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 - [#2452](https://github.com/influxdata/telegraf/pull/2452): Improve Prometheus Client output documentation.
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
+- [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
 
 ## v1.3.4 [2017-07-12]
 

From f4d67d8c3c5279b0b4c84c6cbdc8de99df917f97 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Thu, 13 Jul 2017 23:58:20 +0100
Subject: [PATCH 0372/1302] Add fluentd input plugin (#2661)

---
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/fluentd/README.md       |  64 +++++++++
 plugins/inputs/fluentd/fluentd.go      | 173 +++++++++++++++++++++++++
 plugins/inputs/fluentd/fluentd_test.go | 169 ++++++++++++++++++++++++
 4 files changed, 407 insertions(+)
 create mode 100644 plugins/inputs/fluentd/README.md
 create mode 100644 plugins/inputs/fluentd/fluentd.go
 create mode 100644 plugins/inputs/fluentd/fluentd_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 0796a8422..9bc7afaff 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -23,6 +23,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
 	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
+	_ "github.com/influxdata/telegraf/plugins/inputs/fluentd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/hddtemp"
diff --git a/plugins/inputs/fluentd/README.md b/plugins/inputs/fluentd/README.md
new file mode 100644
index 000000000..e316bddf2
--- /dev/null
+++ b/plugins/inputs/fluentd/README.md
@@ -0,0 +1,64 @@
+# Fluentd Input Plugin
+
+The fluentd plugin gathers metrics from plugin endpoint provided by [in_monitor plugin](http://docs.fluentd.org/v0.12/articles/monitoring).
+This plugin understands data provided by /api/plugin.json resource (/api/config.json is not covered).
+
+You might need to adjust your fluentd configuration, in order to reduce series cardinality in case whene your fluentd restarts frequently. Every time when fluentd starts, `plugin_id` value is given a new random value.
+According to [fluentd documentation](http://docs.fluentd.org/v0.12/articles/config-file), you are able to add `@id`  parameter for each plugin to avoid this behaviour and define custom `plugin_id`.
+
+example configuratio with `@id` parameter for http plugin:
+```
+<source>
+  @type http
+  @id http
+  port 8888
+</source>
+```
+
+### Configuration:
+
+```toml
+# Read metrics exposed by fluentd in_monitor plugin
+[[inputs.fluentd]]
+  ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
+  ##
+  ## Endpoint: 
+  ## - only one URI is allowed
+  ## - https is not supported
+  endpoint = "http://localhost:24220/api/plugins.json"
+  
+  ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
+  exclude = [
+	  "monitor_agent",
+	  "dummy",
+  ]
+```
+
+### Measurements & Fields:
+
+Fields may vary depends on type of the plugin
+
+- fluentd
+    - retry_count            (float, unit)
+    - buffer_queue_length     (float, unit)
+    - buffer_total_queued_size (float, unit)
+
+### Tags:
+
+- All measurements have the following tags:
+	- plugin_id        (unique plugin id)
+	- plugin_type      (type of the plugin e.g. s3)
+    - plugin_category  (plugin category e.g. output)
+
+### Example Output:
+
+```
+$ telegraf --config fluentd.conf --input-filter fluentd --test
+* Plugin: inputs.fluentd, Collection 1
+> fluentd,host=T440s,plugin_id=object:9f748c,plugin_category=input,plugin_type=dummy buffer_total_queued_size=0,buffer_queue_length=0,retry_count=0 1492006105000000000
+> fluentd,plugin_category=input,plugin_type=dummy,host=T440s,plugin_id=object:8da98c buffer_queue_length=0,retry_count=0,buffer_total_queued_size=0 1492006105000000000
+> fluentd,plugin_id=object:820190,plugin_category=input,plugin_type=monitor_agent,host=T440s retry_count=0,buffer_total_queued_size=0,buffer_queue_length=0 1492006105000000000
+> fluentd,plugin_id=object:c5e054,plugin_category=output,plugin_type=stdout,host=T440s buffer_queue_length=0,retry_count=0,buffer_total_queued_size=0 1492006105000000000
+> fluentd,plugin_type=s3,host=T440s,plugin_id=object:bd7a90,plugin_category=output buffer_queue_length=0,retry_count=0,buffer_total_queued_size=0 1492006105000000000
+
+```
diff --git a/plugins/inputs/fluentd/fluentd.go b/plugins/inputs/fluentd/fluentd.go
new file mode 100644
index 000000000..fdb6dbaa5
--- /dev/null
+++ b/plugins/inputs/fluentd/fluentd.go
@@ -0,0 +1,173 @@
+package fluentd
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const (
+	measurement  = "fluentd"
+	description  = "Read metrics exposed by fluentd in_monitor plugin"
+	sampleConfig = `
+  ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
+  ##
+  ## Endpoint: 
+  ## - only one URI is allowed
+  ## - https is not supported
+  endpoint = "http://localhost:24220/api/plugins.json"
+  	
+  ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
+  exclude = [
+	  "monitor_agent",
+	  "dummy",
+  ]
+`
+)
+
+// Fluentd - plugin main structure
+type Fluentd struct {
+	Endpoint string
+	Exclude  []string
+	client   *http.Client
+}
+
+type endpointInfo struct {
+	Payload []pluginData `json:"plugins"`
+}
+
+type pluginData struct {
+	PluginID              string   `json:"plugin_id"`
+	PluginType            string   `json:"type"`
+	PluginCategory        string   `json:"plugin_category"`
+	RetryCount            *float64 `json:"retry_count"`
+	BufferQueueLength     *float64 `json:"buffer_queue_length"`
+	BufferTotalQueuedSize *float64 `json:"buffer_total_queued_size"`
+}
+
+// parse JSON from fluentd Endpoint
+// Parameters:
+// 		data: unprocessed json recivied from endpoint
+//
+// Returns:
+//		pluginData:		slice that contains parsed plugins
+//		error:			error that may have occurred
+func parse(data []byte) (datapointArray []pluginData, err error) {
+	var endpointData endpointInfo
+
+	if err = json.Unmarshal(data, &endpointData); err != nil {
+		err = fmt.Errorf("Processing JSON structure")
+		return
+	}
+
+	for _, point := range endpointData.Payload {
+		datapointArray = append(datapointArray, point)
+	}
+
+	return
+}
+
+// Description - display description
+func (h *Fluentd) Description() string { return description }
+
+// SampleConfig - generate configuretion
+func (h *Fluentd) SampleConfig() string { return sampleConfig }
+
+// Gather - Main code responsible for gathering, processing and creating metrics
+func (h *Fluentd) Gather(acc telegraf.Accumulator) error {
+
+	_, err := url.Parse(h.Endpoint)
+	if err != nil {
+		return fmt.Errorf("Invalid URL \"%s\"", h.Endpoint)
+	}
+
+	if h.client == nil {
+
+		tr := &http.Transport{
+			ResponseHeaderTimeout: time.Duration(3 * time.Second),
+		}
+
+		client := &http.Client{
+			Transport: tr,
+			Timeout:   time.Duration(4 * time.Second),
+		}
+
+		h.client = client
+	}
+
+	resp, err := h.client.Get(h.Endpoint)
+
+	if err != nil {
+		return fmt.Errorf("Unable to perform HTTP client GET on \"%s\": %s", h.Endpoint, err)
+	}
+
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return fmt.Errorf("Unable to read the HTTP body \"%s\": %s", string(body), err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("http status ok not met")
+	}
+
+	dataPoints, err := parse(body)
+
+	if err != nil {
+		return fmt.Errorf("Problem with parsing")
+	}
+
+	// Go through all plugins one by one
+	for _, p := range dataPoints {
+
+		skip := false
+
+		// Check if this specific type was excluded in configuration
+		for _, exclude := range h.Exclude {
+			if exclude == p.PluginType {
+				skip = true
+			}
+		}
+
+		// If not, create new metric and add it to Accumulator
+		if !skip {
+			tmpFields := make(map[string]interface{})
+
+			tmpTags := map[string]string{
+				"plugin_id":       p.PluginID,
+				"plugin_category": p.PluginCategory,
+				"plugin_type":     p.PluginType,
+			}
+
+			if p.BufferQueueLength != nil {
+				tmpFields["buffer_queue_length"] = p.BufferQueueLength
+
+			}
+			if p.RetryCount != nil {
+				tmpFields["retry_count"] = p.RetryCount
+			}
+
+			if p.BufferTotalQueuedSize != nil {
+				tmpFields["buffer_total_queued_size"] = p.BufferTotalQueuedSize
+			}
+
+			if !((p.BufferQueueLength == nil) && (p.RetryCount == nil) && (p.BufferTotalQueuedSize == nil)) {
+				acc.AddFields(measurement, tmpFields, tmpTags)
+			}
+		}
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("fluentd", func() telegraf.Input { return &Fluentd{} })
+}
diff --git a/plugins/inputs/fluentd/fluentd_test.go b/plugins/inputs/fluentd/fluentd_test.go
new file mode 100644
index 000000000..62989b6d8
--- /dev/null
+++ b/plugins/inputs/fluentd/fluentd_test.go
@@ -0,0 +1,169 @@
+package fluentd
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+// sampleJSON from fluentd version '0.14.9'
+const sampleJSON = `
+{
+  "plugins": [
+    {
+      "plugin_id": "object:f48698",
+      "plugin_category": "input",
+      "type": "dummy",
+      "config": {
+        "@type": "dummy",
+        "@log_level": "info",
+        "tag": "stdout.page.node",
+        "rate": "",
+        "dummy": "{\"hello\":\"world_from_first_dummy\"}",
+        "auto_increment_key": "id1"
+      },
+      "output_plugin": false,
+      "retry_count": null
+    },
+    {
+      "plugin_id": "object:e27138",
+      "plugin_category": "input",
+      "type": "dummy",
+      "config": {
+        "@type": "dummy",
+        "@log_level": "info",
+        "tag": "stdout.superproject.supercontainer",
+        "rate": "",
+        "dummy": "{\"hello\":\"world_from_second_dummy\"}",
+        "auto_increment_key": "id1"
+      },
+      "output_plugin": false,
+      "retry_count": null
+    },
+    {
+      "plugin_id": "object:d74060",
+      "plugin_category": "input",
+      "type": "monitor_agent",
+      "config": {
+        "@type": "monitor_agent",
+        "@log_level": "error",
+        "bind": "0.0.0.0",
+        "port": "24220"
+      },
+      "output_plugin": false,
+      "retry_count": null
+    },
+    {
+      "plugin_id": "object:11a5e2c",
+      "plugin_category": "output",
+      "type": "stdout",
+      "config": {
+        "@type": "stdout"
+      },
+      "output_plugin": true,
+      "retry_count": 0
+    },
+    {
+      "plugin_id": "object:11237ec",
+      "plugin_category": "output",
+      "type": "s3",
+      "config": {
+        "@type": "s3",
+        "@log_level": "info",
+        "aws_key_id": "xxxxxx",
+        "aws_sec_key": "xxxxxx",
+        "s3_bucket": "bucket",
+        "s3_endpoint": "http://mock:4567",
+        "path": "logs/%Y%m%d_%H/${tag[1]}/",
+        "time_slice_format": "%M",
+        "s3_object_key_format": "%{path}%{time_slice}_%{hostname}_%{index}_%{hex_random}.%{file_extension}",
+        "store_as": "gzip"
+      },
+      "output_plugin": true,
+      "buffer_queue_length": 0,
+      "buffer_total_queued_size": 0,
+      "retry_count": 0
+    }
+  ]
+}
+`
+
+var (
+	zero           float64
+	err            error
+	pluginOutput   []pluginData
+	expectedOutput = []pluginData{
+		// 		{"object:f48698", "dummy", "input", nil, nil, nil},
+		// 		{"object:e27138", "dummy", "input", nil, nil, nil},
+		// 		{"object:d74060", "monitor_agent", "input", nil, nil, nil},
+		{"object:11a5e2c", "stdout", "output", (*float64)(&zero), nil, nil},
+		{"object:11237ec", "s3", "output", (*float64)(&zero), (*float64)(&zero), (*float64)(&zero)},
+	}
+	fluentdTest = &Fluentd{
+		Endpoint: "http://localhost:8081",
+	}
+)
+
+func Test_parse(t *testing.T) {
+
+	t.Log("Testing parser function")
+	_, err := parse([]byte(sampleJSON))
+
+	if err != nil {
+		t.Error(err)
+	}
+
+}
+
+func Test_Gather(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping Gather function test")
+	}
+
+	t.Log("Testing Gather function")
+
+	t.Logf("Start HTTP mock (%s) with sampleJSON", fluentdTest.Endpoint)
+
+	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		fmt.Fprintf(w, "%s", string(sampleJSON))
+	}))
+
+	requestURL, err := url.Parse(fluentdTest.Endpoint)
+
+	ts.Listener, _ = net.Listen("tcp", fmt.Sprintf("%s:%s", requestURL.Hostname(), requestURL.Port()))
+
+	ts.Start()
+
+	defer ts.Close()
+
+	var acc testutil.Accumulator
+	err = fluentdTest.Gather(&acc)
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !acc.HasMeasurement("fluentd") {
+		t.Errorf("acc.HasMeasurement: expected fluentd")
+	}
+
+	assert.Equal(t, expectedOutput[0].PluginID, acc.Metrics[0].Tags["plugin_id"])
+	assert.Equal(t, expectedOutput[0].PluginType, acc.Metrics[0].Tags["plugin_type"])
+	assert.Equal(t, expectedOutput[0].PluginCategory, acc.Metrics[0].Tags["plugin_category"])
+	assert.Equal(t, expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"])
+
+	assert.Equal(t, expectedOutput[1].PluginID, acc.Metrics[1].Tags["plugin_id"])
+	assert.Equal(t, expectedOutput[1].PluginType, acc.Metrics[1].Tags["plugin_type"])
+	assert.Equal(t, expectedOutput[1].PluginCategory, acc.Metrics[1].Tags["plugin_category"])
+	assert.Equal(t, expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"])
+	assert.Equal(t, expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"])
+	assert.Equal(t, expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"])
+
+}

From dc4a133b11e53b05ccc633d0b40052e846f31195 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 13 Jul 2017 16:00:09 -0700
Subject: [PATCH 0373/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb23d751b..e4ac6386b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md)
 - [minecraft](./plugins/inputs/minecraft/README.md)
+- [fluentd](./plugins/inputs/fluentd/README.md)
 
 ### Features
 
@@ -37,6 +38,7 @@
 - [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
 - [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
 - [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
+- [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index aca0b7c86..476d80dec 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ configuration options.
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
 * [filestat](./plugins/inputs/filestat)
+* [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)

From 27e47614c633e0a5cf3007c967c5ff580e03e619 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 13 Jul 2017 16:14:18 -0700
Subject: [PATCH 0374/1302] Add credits for new plugins to changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4ac6386b..b29952a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,9 @@
 
 ### New Plugins
 
-- [fail2ban](./plugins/inputs/fail2ban/README.md)
-- [minecraft](./plugins/inputs/minecraft/README.md)
-- [fluentd](./plugins/inputs/fluentd/README.md)
+- [fail2ban](./plugins/inputs/fail2ban/README.md) - Thanks to @grugrut
+- [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
 
 ### Features
 

From ef63908541b9c2facf14538b4188f20aad19d8fb Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Fri, 14 Jul 2017 13:43:36 -0400
Subject: [PATCH 0375/1302] Add result_type field to net_response input plugin
 (#2990)

---
 plugins/inputs/net_response/README.md         | 15 ++++---
 plugins/inputs/net_response/net_response.go   | 23 ++++++++---
 .../inputs/net_response/net_response_test.go  | 40 ++++++++++++++++---
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index 16c73e8ee..01c681b55 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -1,4 +1,4 @@
-# Example Input Plugin
+# Network Response Input Plugin
 
 The input plugin test UDP/TCP connections response time.
 It can also check response text.
@@ -59,7 +59,8 @@ It can also check response text.
 
 - net_response
     - response_time (float, seconds)
-    - string_found (bool) # Only if "expected: option is set
+    - result_type (string) # success, timeout, connection_failed, read_failed, string_mismatch
+    - [**DEPRECATED**] string_found (boolean)
 
 ### Tags:
 
@@ -72,7 +73,11 @@ It can also check response text.
 
 ```
 $ ./telegraf --config telegraf.conf --input-filter net_response --test
-net_response,server=192.168.2.2,port=22,protocol=tcp response_time=0.18070360500000002,string_found=true 1454785464182527094
-net_response,server=192.168.2.2,port=2222,protocol=tcp response_time=1.090124776,string_found=false 1454784433658942325
-
+net_response,server=influxdata.com,port=8080,protocol=tcp,host=localhost result_type="timeout" 1499310361000000000
+net_response,server=influxdata.com,port=443,protocol=tcp,host=localhost result_type="success",response_time=0.088703864 1499310361000000000
+net_response,protocol=tcp,host=localhost,server=this.domain.does.not.exist,port=443 result_type="connection_failed" 1499310361000000000
+net_response,protocol=udp,host=localhost,server=influxdata.com,port=8080 result_type="read_failed" 1499310362000000000
+net_response,port=31338,protocol=udp,host=localhost,server=localhost result_type="string_mismatch",string_found=false,response_time=0.00242682 1499310362000000000
+net_response,protocol=udp,host=localhost,server=localhost,port=31338 response_time=0.001128598,result_type="success",string_found=true 1499310362000000000
+net_response,server=this.domain.does.not.exist,port=443,protocol=udp,host=localhost result_type="connection_failed" 1499310362000000000
 ```
diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
index ad0de46c3..75d0a328a 100644
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -64,7 +64,12 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 	responseTime := time.Since(start).Seconds()
 	// Handle error
 	if err != nil {
-		return nil, err
+		if e, ok := err.(net.Error); ok && e.Timeout() {
+			fields["result_type"] = "timeout"
+		} else {
+			fields["result_type"] = "connection_failed"
+		}
+		return fields, nil
 	}
 	defer conn.Close()
 	// Send string if needed
@@ -88,17 +93,21 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 		// Handle error
 		if err != nil {
 			fields["string_found"] = false
+			fields["result_type"] = "read_failed"
 		} else {
 			// Looking for string in answer
 			RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 			find := RegEx.FindString(string(data))
 			if find != "" {
+				fields["result_type"] = "success"
 				fields["string_found"] = true
 			} else {
+				fields["result_type"] = "string_mismatch"
 				fields["string_found"] = false
 			}
 		}
-
+	} else {
+		fields["result_type"] = "success"
 	}
 	fields["response_time"] = responseTime
 	return fields, nil
@@ -114,11 +123,12 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 	LocalAddr, err := net.ResolveUDPAddr("udp", "127.0.0.1:0")
 	// Connecting
 	conn, err := net.DialUDP("udp", LocalAddr, udpAddr)
-	defer conn.Close()
 	// Handle error
 	if err != nil {
-		return nil, err
+		fields["result_type"] = "connection_failed"
+		return fields, nil
 	}
+	defer conn.Close()
 	// Send string
 	msg := []byte(n.Send)
 	conn.Write(msg)
@@ -132,14 +142,17 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 	responseTime := time.Since(start).Seconds()
 	// Handle error
 	if err != nil {
-		return nil, err
+		fields["result_type"] = "read_failed"
+		return fields, nil
 	} else {
 		// Looking for string in answer
 		RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 		find := RegEx.FindString(string(buf))
 		if find != "" {
+			fields["result_type"] = "success"
 			fields["string_found"] = true
 		} else {
+			fields["result_type"] = "string_mismatch"
 			fields["string_found"] = false
 		}
 	}
diff --git a/plugins/inputs/net_response/net_response_test.go b/plugins/inputs/net_response/net_response_test.go
index a005c06f5..c7bfb579a 100644
--- a/plugins/inputs/net_response/net_response_test.go
+++ b/plugins/inputs/net_response/net_response_test.go
@@ -2,7 +2,6 @@ package net_response
 
 import (
 	"net"
-	"regexp"
 	"sync"
 	"testing"
 	"time"
@@ -36,8 +35,18 @@ func TestTCPError(t *testing.T) {
 	}
 	// Error
 	err1 := c.Gather(&acc)
-	require.Error(t, err1)
-	assert.Contains(t, err1.Error(), "getsockopt: connection refused")
+	require.NoError(t, err1)
+	acc.AssertContainsTaggedFields(t,
+		"net_response",
+		map[string]interface{}{
+			"result_type": "connection_failed",
+		},
+		map[string]string{
+			"server":   "",
+			"port":     "9999",
+			"protocol": "tcp",
+		},
+	)
 }
 
 func TestTCPOK1(t *testing.T) {
@@ -68,6 +77,7 @@ func TestTCPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},
@@ -108,6 +118,7 @@ func TestTCPOK2(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_type":   "string_mismatch",
 			"string_found":  false,
 			"response_time": 1.0,
 		},
@@ -129,10 +140,26 @@ func TestUDPrror(t *testing.T) {
 		Expect:   "test",
 		Protocol: "udp",
 	}
-	// Error
+	// Gather
 	err1 := c.Gather(&acc)
-	require.Error(t, err1)
-	assert.Regexp(t, regexp.MustCompile(`read udp 127.0.0.1:[0-9]*->127.0.0.1:9999: recvfrom: connection refused`), err1.Error())
+	// Override response time
+	for _, p := range acc.Metrics {
+		p.Fields["response_time"] = 1.0
+	}
+	// Error
+	require.NoError(t, err1)
+	acc.AssertContainsTaggedFields(t,
+		"net_response",
+		map[string]interface{}{
+			"result_type":   "read_failed",
+			"response_time": 1.0,
+		},
+		map[string]string{
+			"server":   "",
+			"port":     "9999",
+			"protocol": "udp",
+		},
+	)
 }
 
 func TestUDPOK1(t *testing.T) {
@@ -163,6 +190,7 @@ func TestUDPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},

From dbe2f79019082c8afa014a94a637c16b45bd318e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 14 Jul 2017 10:45:32 -0700
Subject: [PATCH 0376/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b29952a64..a35bed0a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
 - [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
 - [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
+- [#2990](https://github.com/influxdata/telegraf/pull/2990): Add result_type field to net_response input plugin.
 
 ### Bugfixes
 

From d8f7b762531b7a7fd41273eda35899dd8e2cc93f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 17 Jul 2017 11:58:47 -0700
Subject: [PATCH 0377/1302] Prevent startup if intervals are 0

---
 cmd/telegraf/telegraf.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index e341606df..07cffe569 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -153,6 +153,16 @@ func reloadLoop(
 			log.Fatalf("E! Error: no inputs found, did you provide a valid config file?")
 		}
 
+		if int64(c.Agent.Interval.Duration) <= 0 {
+			log.Fatalf("E! Agent interval must be positive, found %s",
+				c.Agent.Interval.Duration)
+		}
+
+		if int64(c.Agent.FlushInterval.Duration) <= 0 {
+			log.Fatalf("E! Agent flush_interval must be positive; found %s",
+				c.Agent.Interval.Duration)
+		}
+
 		ag, err := agent.NewAgent(c)
 		if err != nil {
 			log.Fatal("E! " + err.Error())

From 731ab9773df78a054c16beefd9be0b9cde5ee73e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 17 Jul 2017 12:01:35 -0700
Subject: [PATCH 0378/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a35bed0a0..f380f19cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 - [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
+- [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
 
 ## v1.3.4 [2017-07-12]
 

From 1d416a421310fb53a4e119c0a0dd0cca21687fc6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 17 Jul 2017 15:08:17 -0700
Subject: [PATCH 0379/1302] Remove command in example output

---
 plugins/inputs/EXAMPLE_README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/EXAMPLE_README.md b/plugins/inputs/EXAMPLE_README.md
index 04213cff7..73e33850c 100644
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -45,7 +45,6 @@ SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar A
 ### Example Output:
 
 ```
-$ telegraf --input-filter example --test
 measurement1,tag1=foo,tag2=bar field1=1i,field2=2.1 1453831884664956455
 measurement2,tag1=foo,tag2=bar,tag3=baz field3=1i 1453831884664956455
 ```

From f5a8415c784fcd4277bc84a00a45c407686f9183 Mon Sep 17 00:00:00 2001
From: soldierkam <soldier.kam@gmail.com>
Date: Sat, 25 Mar 2017 00:12:57 +0100
Subject: [PATCH 0380/1302] Add read timeout to socket_listener

---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/socket_listener/README.md      |  5 +++++
 .../inputs/socket_listener/socket_listener.go | 20 +++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f380f19cf..fc36f594e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
 - [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
 - [#2990](https://github.com/influxdata/telegraf/pull/2990): Add result_type field to net_response input plugin.
+- [#2571](https://github.com/influxdata/telegraf/pull/2571): Add read timeout to socket_listener
 
 ### Bugfixes
 
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
index 7baa0bffc..698f3aeee 100644
--- a/plugins/inputs/socket_listener/README.md
+++ b/plugins/inputs/socket_listener/README.md
@@ -30,6 +30,11 @@ This is a sample configuration for the plugin.
   ## 0 (default) is unlimited.
   # max_connections = 1024
 
+  ## Read timeout.
+  ## Only applies to stream sockets (e.g. TCP).
+  ## 0 (default) is unlimited.
+  # read_timeout = "30s"
+
   ## Maximum socket buffer size in bytes.
   ## For stream sockets, once the buffer fills up, the sender will start backing up.
   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 839b28368..965a6a870 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -10,6 +10,8 @@ import (
 	"strings"
 	"sync"
 
+	"time"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -91,7 +93,13 @@ func (ssl *streamSocketListener) read(c net.Conn) {
 	defer c.Close()
 
 	scnr := bufio.NewScanner(c)
-	for scnr.Scan() {
+	for {
+		if ssl.ReadTimeout != nil && ssl.ReadTimeout.Duration > 0 {
+			c.SetReadDeadline(time.Now().Add(ssl.ReadTimeout.Duration))
+		}
+		if !scnr.Scan() {
+			break
+		}
 		metrics, err := ssl.Parse(scnr.Bytes())
 		if err != nil {
 			ssl.AddError(fmt.Errorf("unable to parse incoming line: %s", err))
@@ -104,7 +112,9 @@ func (ssl *streamSocketListener) read(c net.Conn) {
 	}
 
 	if err := scnr.Err(); err != nil {
-		if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+		if err, ok := err.(net.Error); ok && err.Timeout() {
+			log.Printf("D! Timeout in plugin [input.socket_listener]: %s", err)
+		} else if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
 			ssl.AddError(err)
 		}
 	}
@@ -142,6 +152,7 @@ type SocketListener struct {
 	ServiceAddress  string
 	MaxConnections  int
 	ReadBufferSize  int
+	ReadTimeout     *internal.Duration
 	KeepAlivePeriod *internal.Duration
 
 	parsers.Parser
@@ -172,6 +183,11 @@ func (sl *SocketListener) SampleConfig() string {
   ## 0 (default) is unlimited.
   # max_connections = 1024
 
+  ## Read timeout.
+  ## Only applies to stream sockets (e.g. TCP).
+  ## 0 (default) is unlimited.
+  # read_timeout = "30s"
+
   ## Maximum socket buffer size in bytes.
   ## For stream sockets, once the buffer fills up, the sender will start backing up.
   ## For datagram sockets, once the buffer fills up, metrics will start dropping.

From d2626f1da66557c3e85f264d97cefa5eb0494cdb Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Tue, 18 Jul 2017 19:01:08 +0100
Subject: [PATCH 0381/1302] Fix ntpq parse issue when using dns_lookup  (#3026)

---
 plugins/inputs/ntpq/ntpq.go      | 11 +++++++++++
 plugins/inputs/ntpq/ntpq_test.go | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go
index 8280e51c1..597db0bd1 100644
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"fmt"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -67,6 +68,14 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 
+	// Due to problems with a parsing, we have to use regexp expression in order
+	// to remove string that starts from '(' and ends with space
+	// see: https://github.com/influxdata/telegraf/issues/2386
+	reg, err := regexp.Compile("\\([\\S]*")
+	if err != nil {
+		return err
+	}
+
 	lineCounter := 0
 	scanner := bufio.NewScanner(bytes.NewReader(out))
 	for scanner.Scan() {
@@ -80,6 +89,8 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 			line = strings.TrimLeft(line, "*#o+x.-")
 		}
 
+		line = reg.ReplaceAllString(line, "")
+
 		fields := strings.Fields(line)
 		if len(fields) < 2 {
 			continue
diff --git a/plugins/inputs/ntpq/ntpq_test.go b/plugins/inputs/ntpq/ntpq_test.go
index 4b356e1f1..d8da845d1 100644
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -247,6 +247,21 @@ func TestBadWhenNTPQ(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
 
+// TestParserNTPQ - realated to:
+// https://github.com/influxdata/telegraf/issues/2386
+func TestParserNTPQ(t *testing.T) {
+	tt := tester{
+		ret: []byte(multiParserNTPQ),
+		err: nil,
+	}
+
+	n := &NTPQ{
+		runQ: tt.runqTest,
+	}
+	acc := testutil.Accumulator{}
+	assert.NoError(t, acc.GatherError(n.Gather))
+}
+
 func TestMultiNTPQ(t *testing.T) {
 	tt := tester{
 		ret: []byte(multiNTPQ),
@@ -463,3 +478,9 @@ var multiNTPQ = `     remote           refid      st t when poll reach   delay
  5.9.29.107      10.177.80.37     2 u  703 1024  377  205.704  160.406 449602.
  91.189.94.4     10.177.80.37     2 u  673 1024  377  143.047  274.726 449445.
 `
+var multiParserNTPQ = `     remote           refid      st t when poll reach   delay   offset  jitter
+==============================================================================
++37.58.57.238 (d 192.53.103.103			2 u   10 1024  377    1.748    0.373   0.101
++37.58.57.238 (domain) 192.53.103.103   2 u   10 1024  377    1.748    0.373   0.101
++37.58.57.238 ( 192.53.103.103			2 u   10 1024  377    1.748    0.373   0.101
+`

From 475a926d439444f751fd0618c3e0091029639b74 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Jul 2017 11:03:07 -0700
Subject: [PATCH 0382/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc36f594e..dda3f515d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 - [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
 - [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
+- [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
 
 ## v1.3.4 [2017-07-12]
 

From c740dce36d773cddddac32e43d9335368aff2b46 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Jul 2017 13:51:44 -0700
Subject: [PATCH 0383/1302] Update download information in readme

---
 README.md | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 476d80dec..819880c67 100644
--- a/README.md
+++ b/README.md
@@ -32,15 +32,8 @@ There are many ways to contribute:
 
 ## Installation:
 
-You can either download the binaries directly from the
-[downloads](https://www.influxdata.com/downloads) page.
-
-A few alternate installs are available here as well:
-
-### FreeBSD tarball:
-
-Latest:
-* https://dl.influxdata.com/telegraf/releases/telegraf-VERSION_freebsd_amd64.tar.gz
+You can download the binaries directly from the [downloads](https://www.influxdata.com/downloads) page
+or from the [releases](https://github.com/influxdata/telegraf/releases) section.
 
 ### Ansible Role:
 
@@ -81,7 +74,7 @@ telegraf --input-filter cpu --output-filter influxdb config
 #### Run a single telegraf collection, outputing metrics to stdout
 
 ```
-telegraf --config telegraf.conf -test
+telegraf --config telegraf.conf --test
 ```
 
 #### Run telegraf with all plugins defined in config file
@@ -93,7 +86,7 @@ telegraf --config telegraf.conf
 #### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
 
 ```
-telegraf --config telegraf.conf -input-filter cpu:mem -output-filter influxdb
+telegraf --config telegraf.conf -input-filter cpu:mem --output-filter influxdb
 ```
 
 

From 4dfe2312d03c64df90f2ba965883f3864649d38b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 18 Jul 2017 18:18:46 -0700
Subject: [PATCH 0384/1302] Switch skipped kafka test

---
 plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go | 1 -
 .../kafka_consumer_legacy_integration_test.go                    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
index 11dfa63eb..a145a938a 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
@@ -17,7 +17,6 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
-	t.Skip("Skipping test due to circleci issue; ref #2487")
 
 	brokerPeers := []string{testutil.GetLocalHost() + ":9092"}
 	testTopic := fmt.Sprintf("telegraf_test_topic_%d", time.Now().Unix())
diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
index 3fe80c4a4..60404cfac 100644
--- a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
+++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go
@@ -17,6 +17,7 @@ func TestReadsMetricsFromKafka(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
+	t.Skip("Skipping test due to circleci issue; ref #2487")
 
 	brokerPeers := []string{testutil.GetLocalHost() + ":9092"}
 	zkPeers := []string{testutil.GetLocalHost() + ":2181"}

From 34c042c7dc29b96b2fbdbf3ff352e2cd6519b015 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Wed, 19 Jul 2017 21:08:40 +0100
Subject: [PATCH 0385/1302] Fix combined tagdrop/tagpass filtering (#3031)

---
 internal/models/filter.go      | 17 +++++++++++--
 internal/models/filter_test.go | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/internal/models/filter.go b/internal/models/filter.go
index 8e080f4a8..445ce3434 100644
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -175,7 +175,8 @@ func (f *Filter) shouldFieldPass(key string) bool {
 // shouldTagsPass returns true if the metric should pass, false if should drop
 // based on the tagdrop/tagpass filter parameters
 func (f *Filter) shouldTagsPass(tags map[string]string) bool {
-	if f.TagPass != nil {
+
+	tagPass := func(f *Filter) bool {
 		for _, pat := range f.TagPass {
 			if pat.filter == nil {
 				continue
@@ -189,7 +190,7 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 		return false
 	}
 
-	if f.TagDrop != nil {
+	tagDrop := func(f *Filter) bool {
 		for _, pat := range f.TagDrop {
 			if pat.filter == nil {
 				continue
@@ -203,6 +204,18 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 		return true
 	}
 
+	// Add additional logic in case where both parameters are set.
+	// see: https://github.com/influxdata/telegraf/issues/2860
+	if f.TagPass != nil && f.TagDrop != nil {
+		// return true only in case when tag pass and won't be dropped (true, true).
+		// in case when the same tag should be passed and dropped it will be dropped (true, false).
+		return tagPass(f) && tagDrop(f)
+	} else if f.TagPass != nil {
+		return tagPass(f)
+	} else if f.TagDrop != nil {
+		return tagDrop(f)
+	}
+
 	return true
 }
 
diff --git a/internal/models/filter_test.go b/internal/models/filter_test.go
index 95b63e30a..5bbbc4a8f 100644
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -357,3 +357,48 @@ func TestFilter_FilterTagsMatches(t *testing.T) {
 		"mytag": "foobar",
 	}, pretags)
 }
+
+// TestFilter_FilterTagsPassAndDrop used for check case when
+// both parameters were defined
+// see: https://github.com/influxdata/telegraf/issues/2860
+func TestFilter_FilterTagsPassAndDrop(t *testing.T) {
+
+	inputData := []map[string]string{
+		{"tag1": "1", "tag2": "3"},
+		{"tag1": "1", "tag2": "2"},
+		{"tag1": "2", "tag2": "1"},
+		{"tag1": "4", "tag2": "1"},
+	}
+
+	expectedResult := []bool{false, true, false, false}
+
+	filterPass := []TagFilter{
+		TagFilter{
+			Name:   "tag1",
+			Filter: []string{"1", "4"},
+		},
+	}
+
+	filterDrop := []TagFilter{
+		TagFilter{
+			Name:   "tag1",
+			Filter: []string{"4"},
+		},
+		TagFilter{
+			Name:   "tag2",
+			Filter: []string{"3"},
+		},
+	}
+
+	f := Filter{
+		TagDrop: filterDrop,
+		TagPass: filterPass,
+	}
+
+	require.NoError(t, f.Compile())
+
+	for i, tag := range inputData {
+		assert.Equal(t, f.shouldTagsPass(tag), expectedResult[i])
+	}
+
+}

From a2d445326984b39ebb6f7c110384901448e101d9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 19 Jul 2017 13:09:49 -0700
Subject: [PATCH 0386/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dda3f515d..c3ffe94d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 - [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
 - [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
 - [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
+- [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
 
 ## v1.3.4 [2017-07-12]
 

From d903a9142d92bdb77b1f271e0203e28fbf1a47d8 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Fri, 21 Jul 2017 18:53:57 +0100
Subject: [PATCH 0387/1302] Fix filtering when both pass and drop match an item
 (#3036)

Adjust logic in functions responsible for passing metrics in order to be able
to process them correctly in case where pass and drop are defined together.
---
 docs/CONFIGURATION.md          |  4 ++--
 internal/models/filter.go      | 41 ++++++++++++++++++++++++++--------
 internal/models/filter_test.go | 40 +++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 45ef09338..7d375e829 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -134,8 +134,8 @@ is tested on points after they have passed the `namepass` test.
 An array of glob pattern strings.  Only fields whose field key matches a
 pattern in this list are emitted.  Not available for outputs.
 * **fielddrop**:
-The inverse of `fieldpass`. Fields with a field key matching one of the
-patterns will be discarded from the point.  Not available for outputs.
+The inverse of `fieldpass`.  Fields with a field key matching one of the
+patterns will be discarded from the point.  This is tested on points after they have passed the `fieldpass` test.  Not available for outputs.
 * **tagpass**:
 A table mapping tag keys to arrays of glob pattern strings.  Only points
 that contain a tag key in the table and a tag value matching one of its
diff --git a/internal/models/filter.go b/internal/models/filter.go
index 445ce3434..2848ccf09 100644
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -132,6 +132,7 @@ func (f *Filter) Apply(
 	return true
 }
 
+// IsActive checking if filter is active
 func (f *Filter) IsActive() bool {
 	return f.isActive
 }
@@ -139,36 +140,58 @@ func (f *Filter) IsActive() bool {
 // shouldNamePass returns true if the metric should pass, false if should drop
 // based on the drop/pass filter parameters
 func (f *Filter) shouldNamePass(key string) bool {
-	if f.namePass != nil {
+
+	pass := func(f *Filter) bool {
 		if f.namePass.Match(key) {
 			return true
 		}
 		return false
 	}
 
-	if f.nameDrop != nil {
+	drop := func(f *Filter) bool {
 		if f.nameDrop.Match(key) {
 			return false
 		}
+		return true
 	}
+
+	if f.namePass != nil && f.nameDrop != nil {
+		return pass(f) && drop(f)
+	} else if f.namePass != nil {
+		return pass(f)
+	} else if f.nameDrop != nil {
+		return drop(f)
+	}
+
 	return true
 }
 
 // shouldFieldPass returns true if the metric should pass, false if should drop
 // based on the drop/pass filter parameters
 func (f *Filter) shouldFieldPass(key string) bool {
-	if f.fieldPass != nil {
+
+	pass := func(f *Filter) bool {
 		if f.fieldPass.Match(key) {
 			return true
 		}
 		return false
 	}
 
-	if f.fieldDrop != nil {
+	drop := func(f *Filter) bool {
 		if f.fieldDrop.Match(key) {
 			return false
 		}
+		return true
 	}
+
+	if f.fieldPass != nil && f.fieldDrop != nil {
+		return pass(f) && drop(f)
+	} else if f.fieldPass != nil {
+		return pass(f)
+	} else if f.fieldDrop != nil {
+		return drop(f)
+	}
+
 	return true
 }
 
@@ -176,7 +199,7 @@ func (f *Filter) shouldFieldPass(key string) bool {
 // based on the tagdrop/tagpass filter parameters
 func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 
-	tagPass := func(f *Filter) bool {
+	pass := func(f *Filter) bool {
 		for _, pat := range f.TagPass {
 			if pat.filter == nil {
 				continue
@@ -190,7 +213,7 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 		return false
 	}
 
-	tagDrop := func(f *Filter) bool {
+	drop := func(f *Filter) bool {
 		for _, pat := range f.TagDrop {
 			if pat.filter == nil {
 				continue
@@ -209,11 +232,11 @@ func (f *Filter) shouldTagsPass(tags map[string]string) bool {
 	if f.TagPass != nil && f.TagDrop != nil {
 		// return true only in case when tag pass and won't be dropped (true, true).
 		// in case when the same tag should be passed and dropped it will be dropped (true, false).
-		return tagPass(f) && tagDrop(f)
+		return pass(f) && drop(f)
 	} else if f.TagPass != nil {
-		return tagPass(f)
+		return pass(f)
 	} else if f.TagDrop != nil {
-		return tagDrop(f)
+		return drop(f)
 	}
 
 	return true
diff --git a/internal/models/filter_test.go b/internal/models/filter_test.go
index 5bbbc4a8f..46f16e835 100644
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -358,6 +358,46 @@ func TestFilter_FilterTagsMatches(t *testing.T) {
 	}, pretags)
 }
 
+// TestFilter_FilterNamePassAndDrop used for check case when
+// both parameters were defined
+// see: https://github.com/influxdata/telegraf/issues/2860
+func TestFilter_FilterNamePassAndDrop(t *testing.T) {
+
+	inputData := []string{"name1", "name2", "name3", "name4"}
+	expectedResult := []bool{false, true, false, false}
+
+	f := Filter{
+		NamePass: []string{"name1", "name2"},
+		NameDrop: []string{"name1", "name3"},
+	}
+
+	require.NoError(t, f.Compile())
+
+	for i, name := range inputData {
+		assert.Equal(t, f.shouldNamePass(name), expectedResult[i])
+	}
+}
+
+// TestFilter_FilterFieldPassAndDrop used for check case when
+// both parameters were defined
+// see: https://github.com/influxdata/telegraf/issues/2860
+func TestFilter_FilterFieldPassAndDrop(t *testing.T) {
+
+	inputData := []string{"field1", "field2", "field3", "field4"}
+	expectedResult := []bool{false, true, false, false}
+
+	f := Filter{
+		FieldPass: []string{"field1", "field2"},
+		FieldDrop: []string{"field1", "field3"},
+	}
+
+	require.NoError(t, f.Compile())
+
+	for i, field := range inputData {
+		assert.Equal(t, f.shouldFieldPass(field), expectedResult[i])
+	}
+}
+
 // TestFilter_FilterTagsPassAndDrop used for check case when
 // both parameters were defined
 // see: https://github.com/influxdata/telegraf/issues/2860

From 3c204d409d88f2379c3d7401911c6f97ecfdb5c2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 10:57:12 -0700
Subject: [PATCH 0388/1302] Line wrap documentation

---
 docs/CONFIGURATION.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 7d375e829..e3abc8412 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -135,7 +135,8 @@ An array of glob pattern strings.  Only fields whose field key matches a
 pattern in this list are emitted.  Not available for outputs.
 * **fielddrop**:
 The inverse of `fieldpass`.  Fields with a field key matching one of the
-patterns will be discarded from the point.  This is tested on points after they have passed the `fieldpass` test.  Not available for outputs.
+patterns will be discarded from the point.  This is tested on points after
+they have passed the `fieldpass` test.  Not available for outputs.
 * **tagpass**:
 A table mapping tag keys to arrays of glob pattern strings.  Only points
 that contain a tag key in the table and a tag value matching one of its

From 16073e417212f4d4091cd9cebf86935d6bd8dcf5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 10:57:39 -0700
Subject: [PATCH 0389/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3ffe94d5..0f6652a69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
 - [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
 - [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
+- [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 
 ## v1.3.4 [2017-07-12]
 

From 4ee74ff54bf23c37b230b902bd7191cac3ea75c3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 11:15:00 -0700
Subject: [PATCH 0390/1302] Document GNU make requirement

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 819880c67..9f7485748 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,10 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 ### From Source:
 
-Telegraf manages dependencies via [gdm](https://github.com/sparrc/gdm),
-which gets installed via the Makefile
-if you don't have it already. You also must build with golang version 1.8+.
+Telegraf requires golang version 1.8+, the Makefile requires GNU make.
+
+Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
+which is installed by the Makefile if you don't have it already.
 
 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)

From 681d20083a302769f1c774041807af29ba3db521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9zard?= <eesprit@users.noreply.github.com>
Date: Fri, 21 Jul 2017 23:25:17 +0200
Subject: [PATCH 0391/1302] Only report cpu usage for online cpus in docker
 input (#3035)

---
 Godeps                               |  2 +-
 plugins/inputs/docker/docker.go      | 17 +++++++++++++++--
 plugins/inputs/docker/docker_test.go | 19 +++++++++++++++++--
 testutil/accumulator.go              | 22 ++++++++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/Godeps b/Godeps
index b538624ad..a4f2725a2 100644
--- a/Godeps
+++ b/Godeps
@@ -11,7 +11,7 @@ github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/docker/docker b89aff1afa1f61993ab2ba18fd62d9375a195f5d
+github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index ca7b70f9f..eeeefd2e6 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -446,7 +446,16 @@ func gatherContainerStats(
 	cputags["cpu"] = "cpu-total"
 	acc.AddFields("docker_container_cpu", cpufields, cputags, now)
 
-	for i, percpu := range stat.CPUStats.CPUUsage.PercpuUsage {
+	// If we have OnlineCPUs field, then use it to restrict stats gathering to only Online CPUs
+	// (https://github.com/moby/moby/commit/115f91d7575d6de6c7781a96a082f144fd17e400)
+	var percpuusage []uint64
+	if stat.CPUStats.OnlineCPUs > 0 {
+		percpuusage = stat.CPUStats.CPUUsage.PercpuUsage[:stat.CPUStats.OnlineCPUs]
+	} else {
+		percpuusage = stat.CPUStats.CPUUsage.PercpuUsage
+	}
+
+	for i, percpu := range percpuusage {
 		percputags := copyTags(tags)
 		percputags["cpu"] = fmt.Sprintf("cpu%d", i)
 		fields := map[string]interface{}{
@@ -527,7 +536,11 @@ func calculateCPUPercent(stat *types.StatsJSON) float64 {
 	systemDelta := float64(stat.CPUStats.SystemUsage) - float64(stat.PreCPUStats.SystemUsage)
 
 	if systemDelta > 0.0 && cpuDelta > 0.0 {
-		cpuPercent = (cpuDelta / systemDelta) * float64(len(stat.CPUStats.CPUUsage.PercpuUsage)) * 100.0
+		if stat.CPUStats.OnlineCPUs > 0 {
+			cpuPercent = (cpuDelta / systemDelta) * float64(stat.CPUStats.OnlineCPUs) * 100.0
+		} else {
+			cpuPercent = (cpuDelta / systemDelta) * float64(len(stat.CPUStats.CPUUsage.PercpuUsage)) * 100.0
+		}
 	}
 	return cpuPercent
 }
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 45797df5c..29b0af8c8 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -141,14 +141,29 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_id": "123456789",
 	}
 	acc.AssertContainsTaggedFields(t, "docker_container_cpu", cpu1fields, cputags)
+
+	// Those tagged filed should not be present because of offline CPUs
+	cputags["cpu"] = "cpu2"
+	cpu2fields := map[string]interface{}{
+		"usage_total":  uint64(0),
+		"container_id": "123456789",
+	}
+	acc.AssertDoesNotContainsTaggedFields(t, "docker_container_cpu", cpu2fields, cputags)
+
+	cputags["cpu"] = "cpu3"
+	cpu3fields := map[string]interface{}{
+		"usage_total":  uint64(0),
+		"container_id": "123456789",
+	}
+	acc.AssertDoesNotContainsTaggedFields(t, "docker_container_cpu", cpu3fields, cputags)
 }
 
 func testStats() *types.StatsJSON {
 	stats := &types.StatsJSON{}
 	stats.Read = time.Now()
 	stats.Networks = make(map[string]types.NetworkStats)
-
-	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002}
+	stats.CPUStats.OnlineCPUs = 2
+	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002, 0, 0}
 	stats.CPUStats.CPUUsage.UsageInUsermode = 100
 	stats.CPUStats.CPUUsage.TotalUsage = 500
 	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index e46476a8b..fdca47b07 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -258,6 +258,28 @@ func (a *Accumulator) AssertContainsTaggedFields(
 	assert.Fail(t, msg)
 }
 
+func (a *Accumulator) AssertDoesNotContainsTaggedFields(
+	t *testing.T,
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if !reflect.DeepEqual(tags, p.Tags) {
+			continue
+		}
+
+		if p.Measurement == measurement {
+			assert.Equal(t, fields, p.Fields)
+			msg := fmt.Sprintf("found measurement %s with tags %v which should not be there", measurement, tags)
+			assert.Fail(t, msg)
+		}
+	}
+	return
+}
+
 func (a *Accumulator) AssertContainsFields(
 	t *testing.T,
 	measurement string,

From 4d66db16034af3f04400ce4c91af0dd91d6e31f5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 14:26:39 -0700
Subject: [PATCH 0392/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f6652a69..bed061c8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
 - [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
+- [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
 
 ## v1.3.4 [2017-07-12]
 

From 31ce98fa91ff8a71474969133965ae6b3083d890 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 21 Jul 2017 14:28:14 -0700
Subject: [PATCH 0393/1302] Don't match pattern on any error (#3040)

This prevents a pattern with no wildcards from matching in case
permissions is denied.
---
 internal/globpath/globpath.go      |  4 ++--
 internal/globpath/globpath_test.go | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/internal/globpath/globpath.go b/internal/globpath/globpath.go
index 22ae92721..6067f65b2 100644
--- a/internal/globpath/globpath.go
+++ b/internal/globpath/globpath.go
@@ -45,7 +45,7 @@ func (g *GlobPath) Match() map[string]os.FileInfo {
 	if !g.hasMeta {
 		out := make(map[string]os.FileInfo)
 		info, err := os.Stat(g.path)
-		if !os.IsNotExist(err) {
+		if err == nil {
 			out[g.path] = info
 		}
 		return out
@@ -55,7 +55,7 @@ func (g *GlobPath) Match() map[string]os.FileInfo {
 		files, _ := filepath.Glob(g.path)
 		for _, file := range files {
 			info, err := os.Stat(file)
-			if !os.IsNotExist(err) {
+			if err == nil {
 				out[file] = info
 			}
 		}
diff --git a/internal/globpath/globpath_test.go b/internal/globpath/globpath_test.go
index 720572411..20bfbcbb9 100644
--- a/internal/globpath/globpath_test.go
+++ b/internal/globpath/globpath_test.go
@@ -1,6 +1,7 @@
 package globpath
 
 import (
+	"os"
 	"runtime"
 	"strings"
 	"testing"
@@ -70,3 +71,20 @@ func getTestdataDir() string {
 	_, filename, _, _ := runtime.Caller(1)
 	return strings.Replace(filename, "globpath_test.go", "testdata", 1)
 }
+
+func TestMatch_ErrPermission(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected map[string]os.FileInfo
+	}{
+		{"/root/foo", map[string]os.FileInfo{}},
+		{"/root/f*", map[string]os.FileInfo{}},
+	}
+
+	for _, test := range tests {
+		glob, err := Compile(test.input)
+		require.NoError(t, err)
+		actual := glob.Match()
+		require.Equal(t, test.expected, actual)
+	}
+}

From c82c0e596b65e06913f6055a8c91b60f1f073d1c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 14:31:25 -0700
Subject: [PATCH 0394/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bed061c8d..d6345d841 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
 - [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 - [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
+- [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
 
 ## v1.3.4 [2017-07-12]
 

From 1ff6e9219313f51b1d2a88100a6ee2cca022319a Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrewcobaugh@gmail.com>
Date: Mon, 3 Apr 2017 10:30:53 -0400
Subject: [PATCH 0395/1302] Add input plugin for OpenLDAP (#2612)

---
 Godeps                                   |   2 +
 Makefile                                 |  14 +-
 docs/LICENSE_OF_DEPENDENCIES.md          |   2 +
 plugins/inputs/all/all.go                |   1 +
 plugins/inputs/openldap/README.md        |  82 +++++++++++
 plugins/inputs/openldap/openldap.go      | 178 +++++++++++++++++++++++
 plugins/inputs/openldap/openldap_test.go | 150 +++++++++++++++++++
 7 files changed, 427 insertions(+), 2 deletions(-)
 create mode 100644 plugins/inputs/openldap/README.md
 create mode 100644 plugins/inputs/openldap/openldap.go
 create mode 100644 plugins/inputs/openldap/openldap_test.go

diff --git a/Godeps b/Godeps
index a4f2725a2..aa4a5b0e8 100644
--- a/Godeps
+++ b/Godeps
@@ -59,8 +59,10 @@ github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
 golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
+gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
+gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
 gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/Makefile b/Makefile
index a22d2bf1a..17a947f56 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,11 @@ docker-run:
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
 	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
+	docker run --name openldap \
+		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
+		-e SLAPD_CONFIG_ROOTPW="secret" \
+		-p "389:389" -p "636:636" \
+		-d cobaugh/openldap-alpine
 
 # Run docker containers necessary for CircleCI unit tests
 docker-run-circle:
@@ -88,11 +93,16 @@ docker-run-circle:
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
 	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
 	docker run --name nats -p "4222:4222" -d nats
+	docker run --name openldap \
+		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
+		-e SLAPD_CONFIG_ROOTPW="secret" \
+		-p "389:389" -p "636:636" \
+		-d cobaugh/openldap-alpine
 
 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch
-	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch
+	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch openldap
+	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch openldap
 
 # Run full unit tests using docker containers (includes setup and teardown)
 test: vet docker-kill docker-run
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 72663069f..da0312201 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -76,8 +76,10 @@ works:
 - golang.org/x/crypto [BSD](https://github.com/golang/crypto/blob/master/LICENSE)
 - golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
 - golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
+- gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
+- gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
 - gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
 - gopkg.in/yaml.v2 [APACHE](https://github.com/go-yaml/yaml/blob/v2/LICENSE)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 9bc7afaff..0a68235b8 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -57,6 +57,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
new file mode 100644
index 000000000..a57aabb84
--- /dev/null
+++ b/plugins/inputs/openldap/README.md
@@ -0,0 +1,82 @@
+# Openldap Input Plugin
+
+This plugin gathers metrics from OpenLDAP's cn=Monitor backend.
+
+### Configuration:
+
+```toml
+[[inputs.openldap]]
+  host = "localhost"
+  port = 389
+
+  # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
+  # note that port will likely need to be changed to 636 for ldaps
+  # valid options: "" | "starttls" | "ldaps"
+  ssl = ""
+
+  # skip peer certificate verification. Default is false.
+  insecure_skip_verify = false
+
+  # Path to PEM-encoded Root certificate to use to verify server certificate
+  ssl_ca = "/etc/ssl/certs.pem"
+
+  # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
+  bind_dn = ""
+  bind_password = ""
+```
+
+### Measurements & Fields:
+
+All **monitorCounter**, **monitorOpInitiated**, and **monitorOpCompleted** attributes are gathered based on this LDAP query:
+
+```(|(objectClass=monitorCounterObject)(objectClass=monitorOperation))```
+
+Metric names are based on their entry DN.
+
+Metrics for the **monitorOp*** attributes have **_initiated** and **_completed** added to the base name.
+
+An OpenLDAP 2.4 server will provide these metrics:
+
+- openldap
+	- max_file_descriptors_connections
+	- current_connections
+	- total_connections
+	- abandon_operations_completed
+	- abandon_operations_initiated
+	- add_operations_completed
+	- add_operations_initiated
+	- bind_operations_completed
+	- bind_operations_initiated
+	- compare_operations_completed
+	- compare_operations_initiated
+	- delete_operations_completed
+	- delete_operations_initiated
+	- extended_operations_completed
+	- extended_operations_initiated
+	- modify_operations_completed
+	- modify_operations_initiated
+	- modrdn_operations_completed
+	- modrdn_operations_initiated
+	- search_operations_completed
+	- search_operations_initiated
+	- unbind_operations_completed
+	- unbind_operations_initiated
+	- bytes_statistics
+	- entries_statistics
+	- pdu_statistics
+	- referrals_statistics
+	- read_waiters
+	- write_waiters
+
+### Tags:
+
+- server= # value from config
+- port= # value from config
+
+### Example Output:
+
+```
+$ telegraf -config telegraf.conf -input-filter openldap -test --debug
+* Plugin: inputs.openldap, Collection 1
+> openldap,server=localhost,port=389,host=zirzla search_operations_completed=2i,delete_operations_completed=0i,read_waiters=1i,total_connections=1004i,bind_operations_completed=3i,unbind_operations_completed=3i,referrals_statistics=0i,current_connections=1i,bind_operations_initiated=3i,compare_operations_completed=0i,add_operations_completed=2i,delete_operations_initiated=0i,unbind_operations_initiated=3i,search_operations_initiated=3i,add_operations_initiated=2i,max_file_descriptors_connections=4096i,abandon_operations_initiated=0i,write_waiters=0i,modrdn_operations_completed=0i,abandon_operations_completed=0i,pdu_statistics=23i,modify_operations_initiated=0i,bytes_statistics=1660i,entries_statistics=17i,compare_operations_initiated=0i,modrdn_operations_initiated=0i,extended_operations_completed=0i,modify_operations_completed=0i,extended_operations_initiated=0i 1499990455000000000
+```
diff --git a/plugins/inputs/openldap/openldap.go b/plugins/inputs/openldap/openldap.go
new file mode 100644
index 000000000..a70cfd13a
--- /dev/null
+++ b/plugins/inputs/openldap/openldap.go
@@ -0,0 +1,178 @@
+package openldap
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"gopkg.in/ldap.v2"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type Openldap struct {
+	Host               string
+	Port               int
+	Ssl                string
+	InsecureSkipVerify bool
+	SslCa              string
+	BindDn             string
+	BindPassword       string
+}
+
+const sampleConfig string = `
+  host = "localhost"
+  port = 389
+
+  # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
+  # note that port will likely need to be changed to 636 for ldaps
+  # valid options: "" | "starttls" | "ldaps"
+  ssl = ""
+
+  # skip peer certificate verification. Default is false.
+  insecure_skip_verify = false
+
+  # Path to PEM-encoded Root certificate to use to verify server certificate
+  ssl_ca = "/etc/ssl/certs.pem"
+
+  # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
+  bind_dn = ""
+  bind_password = ""
+`
+
+var searchBase = "cn=Monitor"
+var searchFilter = "(|(objectClass=monitorCounterObject)(objectClass=monitorOperation))"
+var searchAttrs = []string{"monitorCounter", "monitorOpInitiated", "monitorOpCompleted"}
+var attrTranslate = map[string]string{
+	"monitorCounter":     "",
+	"monitorOpInitiated": "_initiated",
+	"monitorOpCompleted": "_completed",
+}
+
+func (o *Openldap) SampleConfig() string {
+	return sampleConfig
+}
+
+func (o *Openldap) Description() string {
+	return "OpenLDAP cn=Monitor plugin"
+}
+
+// return an initialized Openldap
+func NewOpenldap() *Openldap {
+	return &Openldap{
+		Host:               "localhost",
+		Port:               389,
+		Ssl:                "",
+		InsecureSkipVerify: false,
+		SslCa:              "",
+		BindDn:             "",
+		BindPassword:       "",
+	}
+}
+
+// gather metrics
+func (o *Openldap) Gather(acc telegraf.Accumulator) error {
+	var err error
+	var l *ldap.Conn
+	if o.Ssl != "" {
+		// build tls config
+		tlsConfig, err := internal.GetTLSConfig("", "", o.SslCa, o.InsecureSkipVerify)
+		if err != nil {
+			acc.AddError(err)
+			return nil
+		}
+		if o.Ssl == "ldaps" {
+			l, err = ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port), tlsConfig)
+			if err != nil {
+				acc.AddError(err)
+				return nil
+			}
+		} else if o.Ssl == "starttls" {
+			l, err = ldap.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
+			if err != nil {
+				acc.AddError(err)
+				return nil
+			}
+			err = l.StartTLS(tlsConfig)
+		} else {
+			acc.AddError(fmt.Errorf("Invalid setting for ssl: %s", o.Ssl))
+			return nil
+		}
+	} else {
+		l, err = ldap.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
+	}
+
+	if err != nil {
+		acc.AddError(err)
+		return nil
+	}
+	defer l.Close()
+
+	// username/password bind
+	if o.BindDn != "" && o.BindPassword != "" {
+		err = l.Bind(o.BindDn, o.BindPassword)
+		if err != nil {
+			acc.AddError(err)
+			return nil
+		}
+	}
+
+	searchRequest := ldap.NewSearchRequest(
+		searchBase,
+		ldap.ScopeWholeSubtree,
+		ldap.NeverDerefAliases,
+		0,
+		0,
+		false,
+		searchFilter,
+		searchAttrs,
+		nil,
+	)
+
+	sr, err := l.Search(searchRequest)
+	if err != nil {
+		acc.AddError(err)
+		return nil
+	}
+
+	gatherSearchResult(sr, o, acc)
+
+	return nil
+}
+
+func gatherSearchResult(sr *ldap.SearchResult, o *Openldap, acc telegraf.Accumulator) {
+	fields := map[string]interface{}{}
+	tags := map[string]string{
+		"server": o.Host,
+		"port":   strconv.Itoa(o.Port),
+	}
+	for _, entry := range sr.Entries {
+		metricName := dnToMetric(entry.DN, searchBase)
+		for _, attr := range entry.Attributes {
+			if len(attr.Values[0]) >= 1 {
+				if v, err := strconv.ParseInt(attr.Values[0], 10, 64); err == nil {
+					fields[metricName+attrTranslate[attr.Name]] = v
+				}
+			}
+		}
+	}
+	acc.AddFields("openldap", fields, tags)
+	return
+}
+
+// Convert a DN to metric name, eg cn=Read,cn=Waiters,cn=Monitor to read_waiters
+func dnToMetric(dn, searchBase string) string {
+	metricName := strings.Trim(dn, " ")
+	metricName = strings.Replace(metricName, " ", "_", -1)
+	metricName = strings.ToLower(metricName)
+	metricName = strings.TrimPrefix(metricName, "cn=")
+	metricName = strings.Replace(metricName, strings.ToLower(searchBase), "", -1)
+	metricName = strings.Replace(metricName, "cn=", "_", -1)
+	return strings.Replace(metricName, ",", "", -1)
+}
+
+func init() {
+	inputs.Add("openldap", func() telegraf.Input { return NewOpenldap() })
+}
diff --git a/plugins/inputs/openldap/openldap_test.go b/plugins/inputs/openldap/openldap_test.go
new file mode 100644
index 000000000..489ef8636
--- /dev/null
+++ b/plugins/inputs/openldap/openldap_test.go
@@ -0,0 +1,150 @@
+package openldap
+
+import (
+	"gopkg.in/ldap.v2"
+	"strconv"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestOpenldapMockResult(t *testing.T) {
+	var acc testutil.Accumulator
+
+	mockSearchResult := ldap.SearchResult{
+		Entries: []*ldap.Entry{
+			{
+				DN:         "cn=Total,cn=Connections,cn=Monitor",
+				Attributes: []*ldap.EntryAttribute{{Name: "monitorCounter", Values: []string{"1"}}},
+			},
+		},
+		Referrals: []string{},
+		Controls:  []ldap.Control{},
+	}
+
+	o := &Openldap{
+		Host: "localhost",
+		Port: 389,
+	}
+
+	gatherSearchResult(&mockSearchResult, o, &acc)
+	commonTests(t, o, &acc)
+}
+
+func TestOpenldapNoConnection(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host: "nosuchhost",
+		Port: 389,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)        // test that we didn't return an error
+	assert.Zero(t, acc.NFields())  // test that we didn't return any fields
+	assert.NotEmpty(t, acc.Errors) // test that we set an error
+}
+
+func TestOpenldapGeneratesMetrics(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host: testutil.GetLocalHost(),
+		Port: 389,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)
+	commonTests(t, o, &acc)
+}
+
+func TestOpenldapStartTLS(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host:               testutil.GetLocalHost(),
+		Port:               389,
+		Ssl:                "starttls",
+		InsecureSkipVerify: true,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)
+	commonTests(t, o, &acc)
+}
+
+func TestOpenldapLDAPS(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host:               testutil.GetLocalHost(),
+		Port:               636,
+		Ssl:                "ldaps",
+		InsecureSkipVerify: true,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)
+	commonTests(t, o, &acc)
+}
+
+func TestOpenldapInvalidSSL(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host:               testutil.GetLocalHost(),
+		Port:               636,
+		Ssl:                "invalid",
+		InsecureSkipVerify: true,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)        // test that we didn't return an error
+	assert.Zero(t, acc.NFields())  // test that we didn't return any fields
+	assert.NotEmpty(t, acc.Errors) // test that we set an error
+}
+
+func TestOpenldapBind(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host:               testutil.GetLocalHost(),
+		Port:               389,
+		Ssl:                "",
+		InsecureSkipVerify: true,
+		BindDn:             "cn=manager,cn=config",
+		BindPassword:       "secret",
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)
+	commonTests(t, o, &acc)
+}
+
+func commonTests(t *testing.T, o *Openldap, acc *testutil.Accumulator) {
+	assert.Empty(t, acc.Errors, "accumulator had no errors")
+	assert.True(t, acc.HasMeasurement("openldap"), "Has a measurement called 'openldap'")
+	assert.Equal(t, o.Host, acc.TagValue("openldap", "server"), "Has a tag value of server=o.Host")
+	assert.Equal(t, strconv.Itoa(o.Port), acc.TagValue("openldap", "port"), "Has a tag value of port=o.Port")
+	assert.True(t, acc.HasInt64Field("openldap", "total_connections"), "Has an integer field called total_connections")
+}

From 1c267e9b16898c18f2708c0c2f1b0d0fddc6482c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 15:46:22 -0700
Subject: [PATCH 0396/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6345d841..adb5b29ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [fail2ban](./plugins/inputs/fail2ban/README.md) - Thanks to @grugrut
 - [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
+- [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 
 ### Features
 
@@ -41,6 +42,7 @@
 - [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
 - [#2990](https://github.com/influxdata/telegraf/pull/2990): Add result_type field to net_response input plugin.
 - [#2571](https://github.com/influxdata/telegraf/pull/2571): Add read timeout to socket_listener
+- [#2612](https://github.com/influxdata/telegraf/pull/2612): Add input plugin for OpenLDAP.
 
 ### Bugfixes
 

From 840d19db35365922cdb05bf1e8ef3938a9ac19de Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 21 Jul 2017 16:56:08 -0700
Subject: [PATCH 0397/1302] Add network option to dns_query (#3042)

---
 plugins/inputs/dns_query/README.md    | 24 +++++++++++---------
 plugins/inputs/dns_query/dns_query.go | 32 ++++++++++++++++++---------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/plugins/inputs/dns_query/README.md b/plugins/inputs/dns_query/README.md
index 033261441..6110f5a7d 100644
--- a/plugins/inputs/dns_query/README.md
+++ b/plugins/inputs/dns_query/README.md
@@ -8,19 +8,23 @@ The DNS plugin gathers dns query times in miliseconds - like [Dig](https://en.wi
 # Sample Config:
 [[inputs.dns_query]]
   ## servers to query
-  servers = ["8.8.8.8"] # required
+  servers = ["8.8.8.8"]
 
-  ## Domains or subdomains to query. "." (root) is default
-  domains = ["."] # optional
+  ## Network is the network protocol name.
+  # network = "udp"
 
-  ## Query record type. Posible values: A, AAAA, ANY, CNAME, MX,  NS, PTR, SOA, SPF, SRV, TXT. Default is "NS"
-  record_type = "A" # optional
+  ## Domains or subdomains to query.
+  # domains = ["."]
 
-  ## Dns server port. 53 is default
-  port = 53 # optional
+  ## Query record type.
+  ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
+  # record_type = "A"
 
-  ## Query timeout in seconds. Default is 2 seconds
-  timeout = 2 # optional
+  ## Dns server port.
+  # port = 53
+
+  ## Query timeout in seconds.
+  # timeout = 2
 ```
 
 For querying more than one record type make:
@@ -46,6 +50,6 @@ For querying more than one record type make:
 ### Example output:
 
 ```
-./telegraf --config telegraf.conf --input-filter dns_query --test
+telegraf --input-filter dns_query --test
 > dns_query,domain=mjasion.pl,record_type=A,server=8.8.8.8 query_time_ms=67.189842 1456082743585760680
 ```
diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go
index 2f1fc5482..98b3dce73 100644
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -3,11 +3,12 @@ package dns_query
 import (
 	"errors"
 	"fmt"
-	"github.com/miekg/dns"
 	"net"
 	"strconv"
 	"time"
 
+	"github.com/miekg/dns"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -16,6 +17,9 @@ type DnsQuery struct {
 	// Domains or subdomains to query
 	Domains []string
 
+	// Network protocl name
+	Network string
+
 	// Server to query
 	Servers []string
 
@@ -31,20 +35,23 @@ type DnsQuery struct {
 
 var sampleConfig = `
   ## servers to query
-  servers = ["8.8.8.8"] # required
+  servers = ["8.8.8.8"]
 
-  ## Domains or subdomains to query. "."(root) is default
-  domains = ["."] # optional
+  ## Network is the network protocol name.
+  # network = "udp"
 
-  ## Query record type. Default is "A"
+  ## Domains or subdomains to query.
+  # domains = ["."]
+
+  ## Query record type.
   ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
-  record_type = "A" # optional
+  # record_type = "A"
 
-  ## Dns server port. 53 is default
-  port = 53 # optional
+  ## Dns server port.
+  # port = 53
 
-  ## Query timeout in seconds. Default is 2 seconds
-  timeout = 2 # optional
+  ## Query timeout in seconds.
+  # timeout = 2
 `
 
 func (d *DnsQuery) SampleConfig() string {
@@ -76,6 +83,10 @@ func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 }
 
 func (d *DnsQuery) setDefaultValues() {
+	if d.Network == "" {
+		d.Network = "udp"
+	}
+
 	if len(d.RecordType) == 0 {
 		d.RecordType = "NS"
 	}
@@ -99,6 +110,7 @@ func (d *DnsQuery) getDnsQueryTime(domain string, server string) (float64, error
 
 	c := new(dns.Client)
 	c.ReadTimeout = time.Duration(d.Timeout) * time.Second
+	c.Net = d.Network
 
 	m := new(dns.Msg)
 	recordType, err := d.parseRecordType()

From 85aa2124678906098ea4aed7d5e4412ed3810954 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 21 Jul 2017 16:57:28 -0700
Subject: [PATCH 0398/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adb5b29ea..a22beb437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [#2990](https://github.com/influxdata/telegraf/pull/2990): Add result_type field to net_response input plugin.
 - [#2571](https://github.com/influxdata/telegraf/pull/2571): Add read timeout to socket_listener
 - [#2612](https://github.com/influxdata/telegraf/pull/2612): Add input plugin for OpenLDAP.
+- [#3042](https://github.com/influxdata/telegraf/pull/3042): Add network option to dns_query.
 
 ### Bugfixes
 

From ab5205f8c369f02da8ddf52b5eb666a5c91b19b0 Mon Sep 17 00:00:00 2001
From: Oskar <bullshit@users.noreply.github.com>
Date: Mon, 24 Jul 2017 21:36:33 +0200
Subject: [PATCH 0399/1302] Fix go vet under windows (#3046)

---
 plugins/inputs/ping/ping_windows.go      | 1 +
 plugins/inputs/ping/ping_windows_test.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 7a9c6b3fa..1c83ee84e 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -1,4 +1,5 @@
 // +build windows
+
 package ping
 
 import (
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index 7709cbd65..aa7bc064b 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -1,4 +1,5 @@
 // +build windows
+
 package ping
 
 import (

From 573bd4aa322ebcdbf6d3caf83fe4b4938e3eda27 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 24 Jul 2017 18:25:05 -0700
Subject: [PATCH 0400/1302] Start first aggregator period at startup time
 (#3050)

Fixes issue where metrics collected immediately after startup would not
be aggregated.
---
 agent/agent.go                             | 4 +++-
 internal/models/running_aggregator.go      | 2 +-
 internal/models/running_aggregator_test.go | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index b6db56c5b..a591bc8d1 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -364,6 +364,8 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)
 
+	now := time.Now()
+
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
 		input.SetDefaultTags(a.Config.Tags)
@@ -404,7 +406,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 			acc := NewAccumulator(agg, aggC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
-			agg.Run(acc, shutdown)
+			agg.Run(acc, now, shutdown)
 		}(aggregator)
 	}
 
diff --git a/internal/models/running_aggregator.go b/internal/models/running_aggregator.go
index 8189a6667..91e5334e8 100644
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -114,6 +114,7 @@ func (r *RunningAggregator) reset() {
 // for period ticks to tell it when to push and reset the aggregator.
 func (r *RunningAggregator) Run(
 	acc telegraf.Accumulator,
+	now time.Time,
 	shutdown chan struct{},
 ) {
 	// The start of the period is truncated to the nearest second.
@@ -132,7 +133,6 @@ func (r *RunningAggregator) Run(
 	// 2nd interval: 00:10 - 00:20.5
 	// etc.
 	//
-	now := time.Now()
 	r.periodStart = now.Truncate(time.Second)
 	truncation := now.Sub(r.periodStart)
 	r.periodEnd = r.periodStart.Add(r.Config.Period)
diff --git a/internal/models/running_aggregator_test.go b/internal/models/running_aggregator_test.go
index 30279f0ee..cb56dc4ef 100644
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -24,7 +24,7 @@ func TestAdd(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
+	go ra.Run(&acc, time.Now(), make(chan struct{}))
 
 	m := ra.MakeMetric(
 		"RITest",
@@ -55,7 +55,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, make(chan struct{}))
+	go ra.Run(&acc, time.Now(), make(chan struct{}))
 
 	// metric before current period
 	m := ra.MakeMetric(
@@ -113,7 +113,7 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		ra.Run(&acc, shutdown)
+		ra.Run(&acc, time.Now(), shutdown)
 	}()
 
 	m := ra.MakeMetric(

From 428455e03216140b8a752a24754f675f2450fd04 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 24 Jul 2017 18:26:29 -0700
Subject: [PATCH 0401/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a22beb437..cf4e78d85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 - [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
 - [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
+- [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
 
 ## v1.3.4 [2017-07-12]
 

From f3917ec5fff6fe9288eb5792aed5dbfcc2555c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Helleboid=20-=20chtitux?=
 <chtitux@gmail.com>
Date: Tue, 25 Jul 2017 19:39:14 +0200
Subject: [PATCH 0402/1302] Fix typo in postgresql_extensible/README.md (#3052)

---
 plugins/inputs/postgresql_extensible/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/postgresql_extensible/README.md b/plugins/inputs/postgresql_extensible/README.md
index d388843ce..50f745d41 100644
--- a/plugins/inputs/postgresql_extensible/README.md
+++ b/plugins/inputs/postgresql_extensible/README.md
@@ -41,7 +41,7 @@ The example below has two queries are specified, with the following parameters:
   # "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
   # because the databases variable was set to ['postgres', 'pgbench' ] and the
   # withdbname was true.
-  # Be careful that if the withdbname is set to false you d'ont have to define
+  # Be careful that if the withdbname is set to false you don't have to define
   # the where clause (aka with the dbname)
   # the tagvalue field is used to define custom tags (separated by comas)
   #

From 273d0b85b044a8e99fd9228475aa4564e7cc1269 Mon Sep 17 00:00:00 2001
From: xin053 <13207130066.cool@163.com>
Date: Wed, 26 Jul 2017 01:57:27 +0800
Subject: [PATCH 0403/1302] Correct spelling of toml field in mysql input
 (#3051)

---
 plugins/inputs/mysql/mysql.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 2e8c61c8b..d8ca153d0 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -21,7 +21,7 @@ type Mysql struct {
 	Servers                             []string `toml:"servers"`
 	PerfEventsStatementsDigestTextLimit int64    `toml:"perf_events_statements_digest_text_limit"`
 	PerfEventsStatementsLimit           int64    `toml:"perf_events_statements_limit"`
-	PerfEventsStatementsTimeLimit       int64    `toml:"perf_events_statemetns_time_limit"`
+	PerfEventsStatementsTimeLimit       int64    `toml:"perf_events_statements_time_limit"`
 	TableSchemaDatabases                []string `toml:"table_schema_databases"`
 	GatherProcessList                   bool     `toml:"gather_process_list"`
 	GatherUserStatistics                bool     `toml:"gather_user_statistics"`

From 82ea04f18805d2ce38e4dd198203bc32c2dd947a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 25 Jul 2017 15:41:18 -0700
Subject: [PATCH 0404/1302] Fix prometheus output cannot be reloaded (#3053)

---
 plugins/outputs/prometheus_client/prometheus_client.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index f858c6350..c72d93354 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -80,8 +80,10 @@ func (p *PrometheusClient) Start() error {
 
 	go func() {
 		if err := p.server.ListenAndServe(); err != nil {
-			log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
-				err.Error())
+			if err != http.ErrServerClosed {
+				log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
+					err.Error())
+			}
 		}
 	}()
 	return nil
@@ -99,7 +101,9 @@ func (p *PrometheusClient) Connect() error {
 func (p *PrometheusClient) Close() error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	return p.server.Shutdown(ctx)
+	err := p.server.Shutdown(ctx)
+	prometheus.Unregister(p)
+	return err
 }
 
 func (p *PrometheusClient) SampleConfig() string {

From 1658404cea9cd9eeb433e3c17ee240dba59cced6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 25 Jul 2017 15:43:13 -0700
Subject: [PATCH 0405/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4e78d85..26b609261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,12 @@
 - [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
 - [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
 
+## v1.3.5 [unreleased]
+
+### Bugfixes
+
+- [#3049](https://github.com/influxdata/telegraf/issues/3049): Fix prometheus output cannot be reloaded.
+
 ## v1.3.4 [2017-07-12]
 
 ### Bugfixes

From ffd1f25b759509f23f311cadb14ffcbb51e0ff83 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 25 Jul 2017 16:09:48 -0700
Subject: [PATCH 0406/1302] Update changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b609261..220ea5d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,12 +62,9 @@
 - [#2984](https://github.com/influxdata/telegraf/pull/2984): Display error message if prometheus output fails to listen.
 - [#2997](https://github.com/influxdata/telegraf/issues/2997): Fix elasticsearch output content type detection warning.
 - [#2914](https://github.com/influxdata/telegraf/issues/2914): Prevent possible deadlock when using aggregators.
-- [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
-- [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
 - [#2860](https://github.com/influxdata/telegraf/issues/2860): Fix combined tagdrop/tagpass filtering.
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 - [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
-- [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
 - [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
 
 ## v1.3.5 [unreleased]
@@ -75,6 +72,9 @@
 ### Bugfixes
 
 - [#3049](https://github.com/influxdata/telegraf/issues/3049): Fix prometheus output cannot be reloaded.
+- [#3037](https://github.com/influxdata/telegraf/issues/3037): Fix filestat reporting exists when cannot list directory.
+- [#2386](https://github.com/influxdata/telegraf/issues/2386): Fix ntpq parse issue when using dns_lookup.
+- [#2554](https://github.com/influxdata/telegraf/issues/2554): Fix panic when agent.interval = "0s".
 
 ## v1.3.4 [2017-07-12]
 

From 83f575fceac39f7acdafc1b1e653036a378d8a86 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 25 Jul 2017 17:07:43 -0700
Subject: [PATCH 0407/1302] Add redis_version field to redis input (#3054)

---
 plugins/inputs/redis/README.md     | 1 +
 plugins/inputs/redis/redis.go      | 2 +-
 plugins/inputs/redis/redis_test.go | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index b9d216779..263923d4a 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -30,6 +30,7 @@ Additionally the plugin also calculates the hit/miss ratio (keyspace\_hitrate) a
     **Server**
     - uptime(int, seconds)
     - lru_clock(int, number)
+    - redis_version(string)
 
     **Clients**
     - clients(int, number)
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index cb976cada..7f6143340 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -184,7 +184,7 @@ func gatherInfoOutput(
 		name := string(parts[0])
 
 		if section == "Server" {
-			if name != "lru_clock" && name != "uptime_in_seconds" {
+			if name != "lru_clock" && name != "uptime_in_seconds" && name != "redis_version" {
 				continue
 			}
 		}
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index 904a80d37..7d2fd1b51 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -91,6 +91,7 @@ func TestRedis_ParseMetrics(t *testing.T) {
 		"used_cpu_sys_children":          float64(0.00),
 		"used_cpu_user_children":         float64(0.00),
 		"keyspace_hitrate":               float64(0.50),
+		"redis_version":                  "2.8.9",
 	}
 
 	// We have to test rdb_last_save_time_offset manually because the value is based on the time when gathered

From a26fc52181cf38d93ca77753391562ef92a747ce Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 25 Jul 2017 17:08:03 -0700
Subject: [PATCH 0408/1302] Fix panic in logparser if file cannot be opened
 (#3055)

---
 plugins/inputs/logparser/logparser.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index ea1e5d641..0c495f409 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -182,7 +182,10 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Location:  &seek,
 					MustExist: true,
 				})
-			l.acc.AddError(err)
+			if err != nil {
+				l.acc.AddError(err)
+				continue
+			}
 
 			// create a goroutine for each "tailer"
 			l.wg.Add(1)

From 0ca936a12e96d1f4cff85b24804f8ba0a113d129 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 25 Jul 2017 17:08:32 -0700
Subject: [PATCH 0409/1302] Default to localhost if zookeeper has no servers
 set (#3056)

---
 plugins/inputs/zookeeper/zookeeper.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go
index 977a1f1ed..904ea7c15 100644
--- a/plugins/inputs/zookeeper/zookeeper.go
+++ b/plugins/inputs/zookeeper/zookeeper.go
@@ -43,7 +43,7 @@ func (z *Zookeeper) Description() string {
 // Gather reads stats from all configured servers accumulates stats
 func (z *Zookeeper) Gather(acc telegraf.Accumulator) error {
 	if len(z.Servers) == 0 {
-		return nil
+		z.Servers = []string{":2181"}
 	}
 
 	for _, serverAddress := range z.Servers {

From 2bd6c805067f9b776ae46a79b0444853f5516e5b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 25 Jul 2017 17:12:45 -0700
Subject: [PATCH 0410/1302] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220ea5d05..eb0e8b75f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [#2571](https://github.com/influxdata/telegraf/pull/2571): Add read timeout to socket_listener
 - [#2612](https://github.com/influxdata/telegraf/pull/2612): Add input plugin for OpenLDAP.
 - [#3042](https://github.com/influxdata/telegraf/pull/3042): Add network option to dns_query.
+- [#3054](https://github.com/influxdata/telegraf/pull/3054): Add redis_version field to redis input.
 
 ### Bugfixes
 
@@ -66,6 +67,8 @@
 - [#3036](https://github.com/influxdata/telegraf/pull/3036): Fix filtering when both pass and drop match an item.
 - [#2964](https://github.com/influxdata/telegraf/issues/2964): Only report cpu usage for online cpus in docker input.
 - [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
+- [#2906](https://github.com/influxdata/telegraf/issues/2906): Fix panic in logparser if file cannot be opened.
+- [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
 
 ## v1.3.5 [unreleased]
 

From 284ab79a3786a75a8d08f9dc03d89d5c2166ce14 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 26 Jul 2017 15:53:49 -0700
Subject: [PATCH 0411/1302] Set 1.3.5 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb0e8b75f..b181aa7df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,7 +70,7 @@
 - [#2906](https://github.com/influxdata/telegraf/issues/2906): Fix panic in logparser if file cannot be opened.
 - [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
 
-## v1.3.5 [unreleased]
+## v1.3.5 [2017-07-26]
 
 ### Bugfixes
 

From 5f88be022cdac732635509fbc1dc93efb4185e43 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 25 Jul 2017 16:58:25 -0700
Subject: [PATCH 0412/1302] Add circleci parameter to build packages

---
 scripts/circle-test.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 8f65a706b..662aa6c28 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -73,8 +73,8 @@ cat $GOPATH/bin/telegraf | gzip > $CIRCLE_ARTIFACTS/telegraf.gz
 go build -o telegraf-race -race -ldflags "-X main.version=${VERSION}-RACE" cmd/telegraf/telegraf.go
 cat telegraf-race | gzip > $CIRCLE_ARTIFACTS/telegraf-race.gz
 
-eval "git describe --exact-match HEAD"
-if [ $? -eq 0 ]; then
+
+if git describe --exact-match HEAD; then
     # install fpm (packaging dependency)
     exit_if_fail gem install fpm
     # install boto & rpm (packaging & AWS dependencies)
@@ -84,4 +84,12 @@ if [ $? -eq 0 ]; then
     echo $tag
     exit_if_fail ./scripts/build.py --release --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/releases
     mv build $CIRCLE_ARTIFACTS
+elif [ -n "${PACKAGE}" ]; then
+    # install fpm (packaging dependency)
+    exit_if_fail gem install fpm
+    # install boto & rpm (packaging & AWS dependencies)
+    exit_if_fail sudo apt-get install -y rpm python-boto
+    unset GOGC
+    exit_if_fail ./scripts/build.py --package --platform=all --arch=all
+    mv build $CIRCLE_ARTIFACTS
 fi

From d6cf9f4f30529777a4aba6f0b6b822034a53fb18 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 27 Jul 2017 15:12:29 -0700
Subject: [PATCH 0413/1302] Fix docker memory and cpu reporting in Windows
 (#3043)

---
 docs/LICENSE_OF_DEPENDENCIES.md          |   1 +
 plugins/inputs/docker/README.md          |  15 +-
 plugins/inputs/docker/client.go          |  53 +++
 plugins/inputs/docker/docker.go          | 211 ++++------
 plugins/inputs/docker/docker_test.go     | 470 ++++++++++-------------
 plugins/inputs/docker/docker_testdata.go | 406 ++++++++++++++++++++
 plugins/inputs/docker/fake_client.go     | 172 ---------
 plugins/inputs/docker/stats_helpers.go   |  55 +++
 8 files changed, 819 insertions(+), 564 deletions(-)
 create mode 100644 plugins/inputs/docker/client.go
 create mode 100644 plugins/inputs/docker/docker_testdata.go
 delete mode 100644 plugins/inputs/docker/fake_client.go
 create mode 100644 plugins/inputs/docker/stats_helpers.go

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index da0312201..aeaca0ded 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -19,6 +19,7 @@ works:
 - github.com/dancannon/gorethink [APACHE](https://github.com/dancannon/gorethink/blob/master/LICENSE)
 - github.com/davecgh/go-spew [ISC](https://github.com/davecgh/go-spew/blob/master/LICENSE)
 - github.com/docker/docker [APACHE](https://github.com/docker/docker/blob/master/LICENSE)
+- github.com/docker/cli [APACHE](https://github.com/docker/cli/blob/master/LICENSE)
 - github.com/eapache/go-resiliency [MIT](https://github.com/eapache/go-resiliency/blob/master/LICENSE)
 - github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
 - github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 19102631b..8fb0c3753 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -21,7 +21,8 @@ for the stat structure can be found
   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
 
-  ## Only collect metrics for these containers. Values will be appended to container_name_include.
+  ## Only collect metrics for these containers. Values will be appended to
+  ## container_name_include.
   ## Deprecated (1.4.0), use container_name_include
   container_names = []
 
@@ -38,7 +39,10 @@ for the stat structure can be found
 
   ## Whether to report for each container total blkio and network stats or not
   total = false
-  
+
+  ## Which environment variables should we use as a tag
+  tag_env = ["JAVA_HOME", "HEAP_SIZE"]
+
   ## docker labels to include and exclude as tags.  Globs accepted.
   ## Note that an empty array for both will include all labels as tags
   docker_label_include = []
@@ -46,6 +50,13 @@ for the stat structure can be found
   
   ## Which environment variables should we use as a tag
   tag_env = ["JAVA_HOME", "HEAP_SIZE"]
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go
new file mode 100644
index 000000000..b30a6666b
--- /dev/null
+++ b/plugins/inputs/docker/client.go
@@ -0,0 +1,53 @@
+package docker
+
+import (
+	"context"
+
+	"github.com/docker/docker/api/types"
+	docker "github.com/docker/docker/client"
+)
+
+var (
+	version        string
+	defaultHeaders = map[string]string{"User-Agent": "engine-api-cli-1.0"}
+)
+
+type Client interface {
+	Info(ctx context.Context) (types.Info, error)
+	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
+	ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
+	ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
+}
+
+func NewEnvClient() (Client, error) {
+	client, err := docker.NewEnvClient()
+	if err != nil {
+		return nil, err
+	}
+	return &SocketClient{client}, nil
+}
+
+func NewClient(host string) (Client, error) {
+	client, err := docker.NewClient(host, version, nil, defaultHeaders)
+	if err != nil {
+		return nil, err
+	}
+	return &SocketClient{client}, nil
+}
+
+type SocketClient struct {
+	client *docker.Client
+}
+
+func (c *SocketClient) Info(ctx context.Context) (types.Info, error) {
+	return c.client.Info(ctx)
+}
+func (c *SocketClient) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
+	return c.client.ContainerList(ctx, options)
+}
+func (c *SocketClient) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
+	return c.client.ContainerStats(ctx, containerID, stream)
+}
+func (c *SocketClient) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+	return c.client.ContainerInspect(ctx, containerID)
+}
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index eeeefd2e6..b0d0e4953 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/client"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
@@ -46,61 +45,14 @@ type Docker struct {
 	ContainerExclude []string `toml:"container_name_exclude"`
 	ContainerFilter  DockerContainerFilter
 
-	client      *client.Client
-	engine_host string
+	newEnvClient func() (Client, error)
+	newClient    func(host string) (Client, error)
 
-	testing        bool
+	client         Client
+	engine_host    string
 	filtersCreated bool
 }
 
-// infoWrapper wraps client.Client.List for testing.
-func infoWrapper(c *client.Client, ctx context.Context) (types.Info, error) {
-	if c != nil {
-		return c.Info(ctx)
-	}
-	fc := FakeDockerClient{}
-	return fc.Info(ctx)
-}
-
-// listWrapper wraps client.Client.ContainerList for testing.
-func listWrapper(
-	c *client.Client,
-	ctx context.Context,
-	options types.ContainerListOptions,
-) ([]types.Container, error) {
-	if c != nil {
-		return c.ContainerList(ctx, options)
-	}
-	fc := FakeDockerClient{}
-	return fc.ContainerList(ctx, options)
-}
-
-// statsWrapper wraps client.Client.ContainerStats for testing.
-func statsWrapper(
-	c *client.Client,
-	ctx context.Context,
-	containerID string,
-	stream bool,
-) (types.ContainerStats, error) {
-	if c != nil {
-		return c.ContainerStats(ctx, containerID, stream)
-	}
-	fc := FakeDockerClient{}
-	return fc.ContainerStats(ctx, containerID, stream)
-}
-
-func inspectWrapper(
-	c *client.Client,
-	ctx context.Context,
-	containerID string,
-) (types.ContainerJSON, error) {
-	if c != nil {
-		return c.ContainerInspect(ctx, containerID)
-	}
-	fc := FakeDockerClient{}
-	return fc.ContainerInspect(ctx, containerID)
-}
-
 // KB, MB, GB, TB, PB...human friendly
 const (
 	KB = 1000
@@ -145,32 +97,28 @@ var sampleConfig = `
   docker_label_exclude = []
 `
 
-// Description returns input description
 func (d *Docker) Description() string {
 	return "Read metrics about docker containers"
 }
 
-// SampleConfig prints sampleConfig
 func (d *Docker) SampleConfig() string { return sampleConfig }
 
-// Gather starts stats collection
 func (d *Docker) Gather(acc telegraf.Accumulator) error {
-	if d.client == nil && !d.testing {
-		var c *client.Client
+	if d.client == nil {
+		var c Client
 		var err error
-		defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"}
 		if d.Endpoint == "ENV" {
-			c, err = client.NewEnvClient()
+			c, err = d.newEnvClient()
 			if err != nil {
 				return err
 			}
 		} else if d.Endpoint == "" {
-			c, err = client.NewClient("unix:///var/run/docker.sock", "", nil, defaultHeaders)
+			c, err = d.newClient("unix:///var/run/docker.sock")
 			if err != nil {
 				return err
 			}
 		} else {
-			c, err = client.NewClient(d.Endpoint, "", nil, defaultHeaders)
+			c, err = d.newClient(d.Endpoint)
 			if err != nil {
 				return err
 			}
@@ -201,7 +149,7 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	opts := types.ContainerListOptions{}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	containers, err := listWrapper(d.client, ctx, opts)
+	containers, err := d.client.ContainerList(ctx, opts)
 	if err != nil {
 		return err
 	}
@@ -232,7 +180,7 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 	// Get info from docker daemon
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	info, err := infoWrapper(d.client, ctx)
+	info, err := d.client.Info(ctx)
 	if err != nil {
 		return err
 	}
@@ -338,7 +286,7 @@ func (d *Docker) gatherContainer(
 
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
-	r, err := statsWrapper(d.client, ctx, container.ID, false)
+	r, err := d.client.ContainerStats(ctx, container.ID, false)
 	if err != nil {
 		return fmt.Errorf("Error getting docker stats: %s", err.Error())
 	}
@@ -350,6 +298,7 @@ func (d *Docker) gatherContainer(
 		}
 		return fmt.Errorf("Error decoding: %s", err.Error())
 	}
+	daemonOSType := r.OSType
 
 	// Add labels to tags
 	for k, label := range container.Labels {
@@ -362,7 +311,7 @@ func (d *Docker) gatherContainer(
 
 	// Add whitelisted environment variables to tags
 	if len(d.TagEnvironment) > 0 {
-		info, err := inspectWrapper(d.client, ctx, container.ID)
+		info, err := d.client.ContainerInspect(ctx, container.ID)
 		if err != nil {
 			return fmt.Errorf("Error inspecting docker container: %s", err.Error())
 		}
@@ -377,7 +326,7 @@ func (d *Docker) gatherContainer(
 		}
 	}
 
-	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total)
+	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
 
 	return nil
 }
@@ -389,46 +338,68 @@ func gatherContainerStats(
 	id string,
 	perDevice bool,
 	total bool,
+	daemonOSType string,
 ) {
 	now := stat.Read
 
 	memfields := map[string]interface{}{
-		"max_usage":                 stat.MemoryStats.MaxUsage,
-		"usage":                     stat.MemoryStats.Usage,
-		"fail_count":                stat.MemoryStats.Failcnt,
-		"limit":                     stat.MemoryStats.Limit,
-		"total_pgmafault":           stat.MemoryStats.Stats["total_pgmajfault"],
-		"cache":                     stat.MemoryStats.Stats["cache"],
-		"mapped_file":               stat.MemoryStats.Stats["mapped_file"],
-		"total_inactive_file":       stat.MemoryStats.Stats["total_inactive_file"],
-		"pgpgout":                   stat.MemoryStats.Stats["pagpgout"],
-		"rss":                       stat.MemoryStats.Stats["rss"],
-		"total_mapped_file":         stat.MemoryStats.Stats["total_mapped_file"],
-		"writeback":                 stat.MemoryStats.Stats["writeback"],
-		"unevictable":               stat.MemoryStats.Stats["unevictable"],
-		"pgpgin":                    stat.MemoryStats.Stats["pgpgin"],
-		"total_unevictable":         stat.MemoryStats.Stats["total_unevictable"],
-		"pgmajfault":                stat.MemoryStats.Stats["pgmajfault"],
-		"total_rss":                 stat.MemoryStats.Stats["total_rss"],
-		"total_rss_huge":            stat.MemoryStats.Stats["total_rss_huge"],
-		"total_writeback":           stat.MemoryStats.Stats["total_write_back"],
-		"total_inactive_anon":       stat.MemoryStats.Stats["total_inactive_anon"],
-		"rss_huge":                  stat.MemoryStats.Stats["rss_huge"],
-		"hierarchical_memory_limit": stat.MemoryStats.Stats["hierarchical_memory_limit"],
-		"total_pgfault":             stat.MemoryStats.Stats["total_pgfault"],
-		"total_active_file":         stat.MemoryStats.Stats["total_active_file"],
-		"active_anon":               stat.MemoryStats.Stats["active_anon"],
-		"total_active_anon":         stat.MemoryStats.Stats["total_active_anon"],
-		"total_pgpgout":             stat.MemoryStats.Stats["total_pgpgout"],
-		"total_cache":               stat.MemoryStats.Stats["total_cache"],
-		"inactive_anon":             stat.MemoryStats.Stats["inactive_anon"],
-		"active_file":               stat.MemoryStats.Stats["active_file"],
-		"pgfault":                   stat.MemoryStats.Stats["pgfault"],
-		"inactive_file":             stat.MemoryStats.Stats["inactive_file"],
-		"total_pgpgin":              stat.MemoryStats.Stats["total_pgpgin"],
-		"usage_percent":             calculateMemPercent(stat),
-		"container_id":              id,
+		"container_id": id,
 	}
+
+	memstats := []string{
+		"active_anon",
+		"active_file",
+		"cache",
+		"hierarchical_memory_limit",
+		"inactive_anon",
+		"inactive_file",
+		"mapped_file",
+		"pgfault",
+		"pgmajfault",
+		"pgpgin",
+		"pgpgout",
+		"rss",
+		"rss_huge",
+		"total_active_anon",
+		"total_active_file",
+		"total_cache",
+		"total_inactive_anon",
+		"total_inactive_file",
+		"total_mapped_file",
+		"total_pgfault",
+		"total_pgmajfault",
+		"total_pgpgin",
+		"total_pgpgout",
+		"total_rss",
+		"total_rss_huge",
+		"total_unevictable",
+		"total_writeback",
+		"unevictable",
+		"writeback",
+	}
+	for _, field := range memstats {
+		if value, ok := stat.MemoryStats.Stats[field]; ok {
+			memfields[field] = value
+		}
+	}
+	if stat.MemoryStats.Failcnt != 0 {
+		memfields["fail_count"] = stat.MemoryStats.Failcnt
+	}
+
+	if daemonOSType != "windows" {
+		memfields["limit"] = stat.MemoryStats.Limit
+		memfields["usage"] = stat.MemoryStats.Usage
+		memfields["max_usage"] = stat.MemoryStats.MaxUsage
+
+		mem := calculateMemUsageUnixNoCache(stat.MemoryStats)
+		memLimit := float64(stat.MemoryStats.Limit)
+		memfields["usage_percent"] = calculateMemPercentUnixNoCache(memLimit, mem)
+	} else {
+		memfields["commit_bytes"] = stat.MemoryStats.Commit
+		memfields["commit_peak_bytes"] = stat.MemoryStats.CommitPeak
+		memfields["private_working_set"] = stat.MemoryStats.PrivateWorkingSet
+	}
+
 	acc.AddFields("docker_container_mem", memfields, tags, now)
 
 	cpufields := map[string]interface{}{
@@ -439,9 +410,19 @@ func gatherContainerStats(
 		"throttling_periods":           stat.CPUStats.ThrottlingData.Periods,
 		"throttling_throttled_periods": stat.CPUStats.ThrottlingData.ThrottledPeriods,
 		"throttling_throttled_time":    stat.CPUStats.ThrottlingData.ThrottledTime,
-		"usage_percent":                calculateCPUPercent(stat),
 		"container_id":                 id,
 	}
+
+	if daemonOSType != "windows" {
+		previousCPU := stat.PreCPUStats.CPUUsage.TotalUsage
+		previousSystem := stat.PreCPUStats.SystemUsage
+		cpuPercent := calculateCPUPercentUnix(previousCPU, previousSystem, stat)
+		cpufields["usage_percent"] = cpuPercent
+	} else {
+		cpuPercent := calculateCPUPercentWindows(stat)
+		cpufields["usage_percent"] = cpuPercent
+	}
+
 	cputags := copyTags(tags)
 	cputags["cpu"] = "cpu-total"
 	acc.AddFields("docker_container_cpu", cpufields, cputags, now)
@@ -521,30 +502,6 @@ func gatherContainerStats(
 	gatherBlockIOMetrics(stat, acc, tags, now, id, perDevice, total)
 }
 
-func calculateMemPercent(stat *types.StatsJSON) float64 {
-	var memPercent = 0.0
-	if stat.MemoryStats.Limit > 0 {
-		memPercent = float64(stat.MemoryStats.Usage) / float64(stat.MemoryStats.Limit) * 100.0
-	}
-	return memPercent
-}
-
-func calculateCPUPercent(stat *types.StatsJSON) float64 {
-	var cpuPercent = 0.0
-	// calculate the change for the cpu and system usage of the container in between readings
-	cpuDelta := float64(stat.CPUStats.CPUUsage.TotalUsage) - float64(stat.PreCPUStats.CPUUsage.TotalUsage)
-	systemDelta := float64(stat.CPUStats.SystemUsage) - float64(stat.PreCPUStats.SystemUsage)
-
-	if systemDelta > 0.0 && cpuDelta > 0.0 {
-		if stat.CPUStats.OnlineCPUs > 0 {
-			cpuPercent = (cpuDelta / systemDelta) * float64(stat.CPUStats.OnlineCPUs) * 100.0
-		} else {
-			cpuPercent = (cpuDelta / systemDelta) * float64(len(stat.CPUStats.CPUUsage.PercpuUsage)) * 100.0
-		}
-	}
-	return cpuPercent
-}
-
 func gatherBlockIOMetrics(
 	stat *types.StatsJSON,
 	acc telegraf.Accumulator,
@@ -742,6 +699,8 @@ func init() {
 		return &Docker{
 			PerDevice:      true,
 			Timeout:        internal.Duration{Duration: time.Second * 5},
+			newEnvClient:   NewEnvClient,
+			newClient:      NewClient,
 			filtersCreated: false,
 		}
 	})
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 29b0af8c8..b64eeb1ee 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -1,8 +1,8 @@
 package docker
 
 import (
+	"context"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 
@@ -10,6 +10,56 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+type MockClient struct {
+	InfoF             func(ctx context.Context) (types.Info, error)
+	ContainerListF    func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
+	ContainerStatsF   func(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
+	ContainerInspectF func(ctx context.Context, containerID string) (types.ContainerJSON, error)
+}
+
+func (c *MockClient) Info(ctx context.Context) (types.Info, error) {
+	return c.InfoF(ctx)
+}
+
+func (c *MockClient) ContainerList(
+	ctx context.Context,
+	options types.ContainerListOptions,
+) ([]types.Container, error) {
+	return c.ContainerListF(ctx, options)
+}
+
+func (c *MockClient) ContainerStats(
+	ctx context.Context,
+	containerID string,
+	stream bool,
+) (types.ContainerStats, error) {
+	return c.ContainerStatsF(ctx, containerID, stream)
+}
+
+func (c *MockClient) ContainerInspect(
+	ctx context.Context,
+	containerID string,
+) (types.ContainerJSON, error) {
+	return c.ContainerInspectF(ctx, containerID)
+}
+
+func newClient(host string) (Client, error) {
+	return &MockClient{
+		InfoF: func(context.Context) (types.Info, error) {
+			return info, nil
+		},
+		ContainerListF: func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
+			return containerList, nil
+		},
+		ContainerStatsF: func(context.Context, string, bool) (types.ContainerStats, error) {
+			return containerStats(), nil
+		},
+		ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
+			return containerInspect, nil
+		},
+	}, nil
+}
+
 func TestDockerGatherContainerStats(t *testing.T) {
 	var acc testutil.Accumulator
 	stats := testStats()
@@ -19,7 +69,7 @@ func TestDockerGatherContainerStats(t *testing.T) {
 		"container_image": "redis/image",
 	}
 
-	gatherContainerStats(stats, &acc, tags, "123456789", true, true)
+	gatherContainerStats(stats, &acc, tags, "123456789", true, true, "linux")
 
 	// test docker_container_net measurement
 	netfields := map[string]interface{}{
@@ -73,41 +123,41 @@ func TestDockerGatherContainerStats(t *testing.T) {
 
 	// test docker_container_mem measurement
 	memfields := map[string]interface{}{
-		"max_usage":                 uint64(1001),
-		"usage":                     uint64(1111),
-		"fail_count":                uint64(1),
-		"limit":                     uint64(2000),
-		"total_pgmafault":           uint64(0),
-		"cache":                     uint64(0),
-		"mapped_file":               uint64(0),
-		"total_inactive_file":       uint64(0),
-		"pgpgout":                   uint64(0),
-		"rss":                       uint64(0),
-		"total_mapped_file":         uint64(0),
-		"writeback":                 uint64(0),
-		"unevictable":               uint64(0),
-		"pgpgin":                    uint64(0),
-		"total_unevictable":         uint64(0),
-		"pgmajfault":                uint64(0),
-		"total_rss":                 uint64(44),
-		"total_rss_huge":            uint64(444),
-		"total_writeback":           uint64(55),
-		"total_inactive_anon":       uint64(0),
-		"rss_huge":                  uint64(0),
-		"hierarchical_memory_limit": uint64(0),
-		"total_pgfault":             uint64(0),
-		"total_active_file":         uint64(0),
 		"active_anon":               uint64(0),
-		"total_active_anon":         uint64(0),
-		"total_pgpgout":             uint64(0),
-		"total_cache":               uint64(0),
-		"inactive_anon":             uint64(0),
 		"active_file":               uint64(1),
-		"pgfault":                   uint64(2),
-		"inactive_file":             uint64(3),
-		"total_pgpgin":              uint64(4),
-		"usage_percent":             float64(55.55),
+		"cache":                     uint64(0),
 		"container_id":              "123456789",
+		"fail_count":                uint64(1),
+		"hierarchical_memory_limit": uint64(0),
+		"inactive_anon":             uint64(0),
+		"inactive_file":             uint64(3),
+		"limit":                     uint64(2000),
+		"mapped_file":               uint64(0),
+		"max_usage":                 uint64(1001),
+		"pgfault":                   uint64(2),
+		"pgmajfault":                uint64(0),
+		"pgpgin":                    uint64(0),
+		"pgpgout":                   uint64(0),
+		"rss_huge":                  uint64(0),
+		"rss":                       uint64(0),
+		"total_active_anon":         uint64(0),
+		"total_active_file":         uint64(0),
+		"total_cache":               uint64(0),
+		"total_inactive_anon":       uint64(0),
+		"total_inactive_file":       uint64(0),
+		"total_mapped_file":         uint64(0),
+		"total_pgfault":             uint64(0),
+		"total_pgmajfault":          uint64(0),
+		"total_pgpgin":              uint64(4),
+		"total_pgpgout":             uint64(0),
+		"total_rss_huge":            uint64(444),
+		"total_rss":                 uint64(44),
+		"total_unevictable":         uint64(0),
+		"total_writeback":           uint64(55),
+		"unevictable":               uint64(0),
+		"usage_percent":             float64(55.55),
+		"usage":                     uint64(1111),
+		"writeback":                 uint64(0),
 	}
 
 	acc.AssertContainsTaggedFields(t, "docker_container_mem", memfields, tags)
@@ -158,231 +208,155 @@ func TestDockerGatherContainerStats(t *testing.T) {
 	acc.AssertDoesNotContainsTaggedFields(t, "docker_container_cpu", cpu3fields, cputags)
 }
 
-func testStats() *types.StatsJSON {
-	stats := &types.StatsJSON{}
-	stats.Read = time.Now()
-	stats.Networks = make(map[string]types.NetworkStats)
-	stats.CPUStats.OnlineCPUs = 2
-	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002, 0, 0}
-	stats.CPUStats.CPUUsage.UsageInUsermode = 100
-	stats.CPUStats.CPUUsage.TotalUsage = 500
-	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
-	stats.CPUStats.SystemUsage = 100
-	stats.CPUStats.ThrottlingData.Periods = 1
+func TestDocker_WindowsMemoryContainerStats(t *testing.T) {
+	var acc testutil.Accumulator
 
-	stats.PreCPUStats.CPUUsage.TotalUsage = 400
-	stats.PreCPUStats.SystemUsage = 50
-
-	stats.MemoryStats.Stats = make(map[string]uint64)
-	stats.MemoryStats.Stats["total_pgmajfault"] = 0
-	stats.MemoryStats.Stats["cache"] = 0
-	stats.MemoryStats.Stats["mapped_file"] = 0
-	stats.MemoryStats.Stats["total_inactive_file"] = 0
-	stats.MemoryStats.Stats["pagpgout"] = 0
-	stats.MemoryStats.Stats["rss"] = 0
-	stats.MemoryStats.Stats["total_mapped_file"] = 0
-	stats.MemoryStats.Stats["writeback"] = 0
-	stats.MemoryStats.Stats["unevictable"] = 0
-	stats.MemoryStats.Stats["pgpgin"] = 0
-	stats.MemoryStats.Stats["total_unevictable"] = 0
-	stats.MemoryStats.Stats["pgmajfault"] = 0
-	stats.MemoryStats.Stats["total_rss"] = 44
-	stats.MemoryStats.Stats["total_rss_huge"] = 444
-	stats.MemoryStats.Stats["total_write_back"] = 55
-	stats.MemoryStats.Stats["total_inactive_anon"] = 0
-	stats.MemoryStats.Stats["rss_huge"] = 0
-	stats.MemoryStats.Stats["hierarchical_memory_limit"] = 0
-	stats.MemoryStats.Stats["total_pgfault"] = 0
-	stats.MemoryStats.Stats["total_active_file"] = 0
-	stats.MemoryStats.Stats["active_anon"] = 0
-	stats.MemoryStats.Stats["total_active_anon"] = 0
-	stats.MemoryStats.Stats["total_pgpgout"] = 0
-	stats.MemoryStats.Stats["total_cache"] = 0
-	stats.MemoryStats.Stats["inactive_anon"] = 0
-	stats.MemoryStats.Stats["active_file"] = 1
-	stats.MemoryStats.Stats["pgfault"] = 2
-	stats.MemoryStats.Stats["inactive_file"] = 3
-	stats.MemoryStats.Stats["total_pgpgin"] = 4
-
-	stats.MemoryStats.MaxUsage = 1001
-	stats.MemoryStats.Usage = 1111
-	stats.MemoryStats.Failcnt = 1
-	stats.MemoryStats.Limit = 2000
-
-	stats.Networks["eth0"] = types.NetworkStats{
-		RxDropped: 1,
-		RxBytes:   2,
-		RxErrors:  3,
-		TxPackets: 4,
-		TxDropped: 1,
-		RxPackets: 2,
-		TxErrors:  3,
-		TxBytes:   4,
+	d := Docker{
+		newClient: func(string) (Client, error) {
+			return &MockClient{
+				InfoF: func(ctx context.Context) (types.Info, error) {
+					return info, nil
+				},
+				ContainerListF: func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
+					return containerList, nil
+				},
+				ContainerStatsF: func(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
+					return containerStatsWindows(), nil
+				},
+				ContainerInspectF: func(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+					return containerInspect, nil
+				},
+			}, nil
+		},
 	}
-
-	stats.Networks["eth1"] = types.NetworkStats{
-		RxDropped: 5,
-		RxBytes:   6,
-		RxErrors:  7,
-		TxPackets: 8,
-		TxDropped: 5,
-		RxPackets: 6,
-		TxErrors:  7,
-		TxBytes:   8,
-	}
-
-	sbr := types.BlkioStatEntry{
-		Major: 6,
-		Minor: 0,
-		Op:    "read",
-		Value: 100,
-	}
-	sr := types.BlkioStatEntry{
-		Major: 6,
-		Minor: 0,
-		Op:    "write",
-		Value: 101,
-	}
-	sr2 := types.BlkioStatEntry{
-		Major: 6,
-		Minor: 1,
-		Op:    "write",
-		Value: 201,
-	}
-
-	stats.BlkioStats.IoServiceBytesRecursive = append(
-		stats.BlkioStats.IoServiceBytesRecursive, sbr)
-	stats.BlkioStats.IoServicedRecursive = append(
-		stats.BlkioStats.IoServicedRecursive, sr)
-	stats.BlkioStats.IoServicedRecursive = append(
-		stats.BlkioStats.IoServicedRecursive, sr2)
-
-	return stats
-}
-
-var gatherLabelsTests = []struct {
-	include     []string
-	exclude     []string
-	expected    []string
-	notexpected []string
-}{
-	{[]string{}, []string{}, []string{"label1", "label2"}, []string{}},
-	{[]string{"*"}, []string{}, []string{"label1", "label2"}, []string{}},
-	{[]string{"lab*"}, []string{}, []string{"label1", "label2"}, []string{}},
-	{[]string{"label1"}, []string{}, []string{"label1"}, []string{"label2"}},
-	{[]string{"label1*"}, []string{}, []string{"label1"}, []string{"label2"}},
-	{[]string{}, []string{"*"}, []string{}, []string{"label1", "label2"}},
-	{[]string{}, []string{"lab*"}, []string{}, []string{"label1", "label2"}},
-	{[]string{}, []string{"label1"}, []string{"label2"}, []string{"label1"}},
-	{[]string{"*"}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+	err := d.Gather(&acc)
+	require.NoError(t, err)
 }
 
 func TestDockerGatherLabels(t *testing.T) {
+	var gatherLabelsTests = []struct {
+		include     []string
+		exclude     []string
+		expected    []string
+		notexpected []string
+	}{
+		{[]string{}, []string{}, []string{"label1", "label2"}, []string{}},
+		{[]string{"*"}, []string{}, []string{"label1", "label2"}, []string{}},
+		{[]string{"lab*"}, []string{}, []string{"label1", "label2"}, []string{}},
+		{[]string{"label1"}, []string{}, []string{"label1"}, []string{"label2"}},
+		{[]string{"label1*"}, []string{}, []string{"label1"}, []string{"label2"}},
+		{[]string{}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+		{[]string{}, []string{"lab*"}, []string{}, []string{"label1", "label2"}},
+		{[]string{}, []string{"label1"}, []string{"label2"}, []string{"label1"}},
+		{[]string{"*"}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+	}
+
 	for _, tt := range gatherLabelsTests {
-		var acc testutil.Accumulator
-		d := Docker{
-			client:  nil,
-			testing: true,
-		}
-
-		for _, label := range tt.include {
-			d.LabelInclude = append(d.LabelInclude, label)
-		}
-		for _, label := range tt.exclude {
-			d.LabelExclude = append(d.LabelExclude, label)
-		}
-
-		err := d.Gather(&acc)
-		require.NoError(t, err)
-
-		for _, label := range tt.expected {
-			if !acc.HasTag("docker_container_cpu", label) {
-				t.Errorf("Didn't get expected label of %s.  Test was:  Include: %s  Exclude %s",
-					label, tt.include, tt.exclude)
+		t.Run("", func(t *testing.T) {
+			var acc testutil.Accumulator
+			d := Docker{
+				newClient: newClient,
 			}
-		}
 
-		for _, label := range tt.notexpected {
-			if acc.HasTag("docker_container_cpu", label) {
-				t.Errorf("Got unexpected label of %s.  Test was:  Include: %s  Exclude %s",
-					label, tt.include, tt.exclude)
+			for _, label := range tt.include {
+				d.LabelInclude = append(d.LabelInclude, label)
 			}
-		}
+			for _, label := range tt.exclude {
+				d.LabelExclude = append(d.LabelExclude, label)
+			}
+
+			err := d.Gather(&acc)
+			require.NoError(t, err)
+
+			for _, label := range tt.expected {
+				if !acc.HasTag("docker_container_cpu", label) {
+					t.Errorf("Didn't get expected label of %s.  Test was:  Include: %s  Exclude %s",
+						label, tt.include, tt.exclude)
+				}
+			}
+
+			for _, label := range tt.notexpected {
+				if acc.HasTag("docker_container_cpu", label) {
+					t.Errorf("Got unexpected label of %s.  Test was:  Include: %s  Exclude %s",
+						label, tt.include, tt.exclude)
+				}
+			}
+		})
 	}
 }
 
-var gatherContainerNames = []struct {
-	include     []string
-	exclude     []string
-	expected    []string
-	notexpected []string
-}{
-	{[]string{}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-	{[]string{"*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-	{[]string{"etc*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-	{[]string{"etcd"}, []string{}, []string{"etcd"}, []string{"etcd2"}},
-	{[]string{"etcd2*"}, []string{}, []string{"etcd2"}, []string{"etcd"}},
-	{[]string{}, []string{"etc*"}, []string{}, []string{"etcd", "etcd2"}},
-	{[]string{}, []string{"etcd"}, []string{"etcd2"}, []string{"etcd"}},
-	{[]string{"*"}, []string{"*"}, []string{"etcd", "etcd2"}, []string{}},
-	{[]string{}, []string{"*"}, []string{""}, []string{"etcd", "etcd2"}},
-}
-
 func TestContainerNames(t *testing.T) {
+	var gatherContainerNames = []struct {
+		include     []string
+		exclude     []string
+		expected    []string
+		notexpected []string
+	}{
+		{[]string{}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+		{[]string{"*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+		{[]string{"etc*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
+		{[]string{"etcd"}, []string{}, []string{"etcd"}, []string{"etcd2"}},
+		{[]string{"etcd2*"}, []string{}, []string{"etcd2"}, []string{"etcd"}},
+		{[]string{}, []string{"etc*"}, []string{}, []string{"etcd", "etcd2"}},
+		{[]string{}, []string{"etcd"}, []string{"etcd2"}, []string{"etcd"}},
+		{[]string{"*"}, []string{"*"}, []string{"etcd", "etcd2"}, []string{}},
+		{[]string{}, []string{"*"}, []string{""}, []string{"etcd", "etcd2"}},
+	}
+
 	for _, tt := range gatherContainerNames {
-		var acc testutil.Accumulator
+		t.Run("", func(t *testing.T) {
+			var acc testutil.Accumulator
 
-		d := Docker{
-			client:           nil,
-			testing:          true,
-			ContainerInclude: tt.include,
-			ContainerExclude: tt.exclude,
-		}
+			d := Docker{
+				newClient:        newClient,
+				ContainerInclude: tt.include,
+				ContainerExclude: tt.exclude,
+			}
 
-		err := d.Gather(&acc)
-		require.NoError(t, err)
+			err := d.Gather(&acc)
+			require.NoError(t, err)
 
-		for _, metric := range acc.Metrics {
-			if metric.Measurement == "docker_container_cpu" {
-				if val, ok := metric.Tags["container_name"]; ok {
-					var found bool = false
-					for _, cname := range tt.expected {
-						if val == cname {
-							found = true
-							break
+			for _, metric := range acc.Metrics {
+				if metric.Measurement == "docker_container_cpu" {
+					if val, ok := metric.Tags["container_name"]; ok {
+						var found bool = false
+						for _, cname := range tt.expected {
+							if val == cname {
+								found = true
+								break
+							}
+						}
+						if !found {
+							t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
 						}
-					}
-					if !found {
-						t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
 					}
 				}
 			}
-		}
 
-		for _, metric := range acc.Metrics {
-			if metric.Measurement == "docker_container_cpu" {
-				if val, ok := metric.Tags["container_name"]; ok {
-					var found bool = false
-					for _, cname := range tt.notexpected {
-						if val == cname {
-							found = true
-							break
+			for _, metric := range acc.Metrics {
+				if metric.Measurement == "docker_container_cpu" {
+					if val, ok := metric.Tags["container_name"]; ok {
+						var found bool = false
+						for _, cname := range tt.notexpected {
+							if val == cname {
+								found = true
+								break
+							}
+						}
+						if found {
+							t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
 						}
-					}
-					if found {
-						t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
 					}
 				}
 			}
-		}
+		})
 	}
 }
 
 func TestDockerGatherInfo(t *testing.T) {
 	var acc testutil.Accumulator
 	d := Docker{
-		client:  nil,
-		testing: true,
+		newClient: newClient,
 		TagEnvironment: []string{"ENVVAR1", "ENVVAR2", "ENVVAR3", "ENVVAR5",
 			"ENVVAR6", "ENVVAR7", "ENVVAR8", "ENVVAR9"},
 	}
@@ -441,41 +415,11 @@ func TestDockerGatherInfo(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"docker_container_mem",
 		map[string]interface{}{
-			"total_pgpgout":             uint64(0),
-			"usage_percent":             float64(0),
-			"rss":                       uint64(0),
-			"total_writeback":           uint64(0),
-			"active_anon":               uint64(0),
-			"total_pgmafault":           uint64(0),
-			"total_rss":                 uint64(0),
-			"total_unevictable":         uint64(0),
-			"active_file":               uint64(0),
-			"total_mapped_file":         uint64(0),
-			"pgpgin":                    uint64(0),
-			"total_active_file":         uint64(0),
-			"total_active_anon":         uint64(0),
-			"total_cache":               uint64(0),
-			"inactive_anon":             uint64(0),
-			"pgmajfault":                uint64(0),
-			"total_inactive_anon":       uint64(0),
-			"total_rss_huge":            uint64(0),
-			"rss_huge":                  uint64(0),
-			"hierarchical_memory_limit": uint64(0),
-			"pgpgout":                   uint64(0),
-			"unevictable":               uint64(0),
-			"total_inactive_file":       uint64(0),
-			"writeback":                 uint64(0),
-			"total_pgfault":             uint64(0),
-			"total_pgpgin":              uint64(0),
-			"cache":                     uint64(0),
-			"mapped_file":               uint64(0),
-			"inactive_file":             uint64(0),
-			"max_usage":                 uint64(0),
-			"fail_count":                uint64(0),
-			"pgfault":                   uint64(0),
-			"usage":                     uint64(0),
-			"limit":                     uint64(18935443456),
-			"container_id":              "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"container_id":  "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+			"limit":         uint64(18935443456),
+			"max_usage":     uint64(0),
+			"usage":         uint64(0),
+			"usage_percent": float64(0),
 		},
 		map[string]string{
 			"engine_host":       "absol",
@@ -490,6 +434,4 @@ func TestDockerGatherInfo(t *testing.T) {
 			"label2":            "test_value_2",
 		},
 	)
-
-	//fmt.Print(info)
 }
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
new file mode 100644
index 000000000..d16a3a728
--- /dev/null
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -0,0 +1,406 @@
+package docker
+
+import (
+	"io/ioutil"
+	"strings"
+	"time"
+
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/registry"
+)
+
+var info = types.Info{
+	Containers:         108,
+	ContainersRunning:  98,
+	ContainersStopped:  6,
+	ContainersPaused:   3,
+	OomKillDisable:     false,
+	SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
+	NEventsListener:    0,
+	ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
+	Debug:              false,
+	LoggingDriver:      "json-file",
+	KernelVersion:      "4.3.0-1-amd64",
+	IndexServerAddress: "https://index.docker.io/v1/",
+	MemTotal:           3840757760,
+	Images:             199,
+	CPUCfsQuota:        true,
+	Name:               "absol",
+	SwapLimit:          false,
+	IPv4Forwarding:     true,
+	ExperimentalBuild:  false,
+	CPUCfsPeriod:       true,
+	RegistryConfig: &registry.ServiceConfig{
+		IndexConfigs: map[string]*registry.IndexInfo{
+			"docker.io": {
+				Name:     "docker.io",
+				Mirrors:  []string{},
+				Official: true,
+				Secure:   true,
+			},
+		}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
+	OperatingSystem:   "Linux Mint LMDE (containerized)",
+	BridgeNfIptables:  true,
+	HTTPSProxy:        "",
+	Labels:            []string{},
+	MemoryLimit:       false,
+	DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
+	NFd:               19,
+	HTTPProxy:         "",
+	Driver:            "devicemapper",
+	NGoroutines:       39,
+	NCPU:              4,
+	DockerRootDir:     "/var/lib/docker",
+	NoProxy:           "",
+	BridgeNfIP6tables: true,
+}
+
+var containerList = []types.Container{
+	types.Container{
+		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
+		Names:   []string{"/etcd"},
+		Image:   "quay.io/coreos/etcd:v2.2.2",
+		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
+		Created: 1455941930,
+		Status:  "Up 4 hours",
+		Ports: []types.Port{
+			types.Port{
+				PrivatePort: 7001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 4001,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2380,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2379,
+				PublicPort:  2379,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		Labels: map[string]string{
+			"label1": "test_value_1",
+			"label2": "test_value_2",
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+	},
+	types.Container{
+		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
+		Names:   []string{"/etcd2"},
+		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
+		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
+		Created: 1455941933,
+		Status:  "Up 4 hours",
+		Ports: []types.Port{
+			types.Port{
+				PrivatePort: 7002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 4002,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2381,
+				PublicPort:  0,
+				Type:        "tcp",
+			},
+			types.Port{
+				PrivatePort: 2382,
+				PublicPort:  2382,
+				Type:        "tcp",
+				IP:          "0.0.0.0",
+			},
+		},
+		Labels: map[string]string{
+			"label1": "test_value_1",
+			"label2": "test_value_2",
+		},
+		SizeRw:     0,
+		SizeRootFs: 0,
+	},
+}
+
+func containerStats() types.ContainerStats {
+	var stat types.ContainerStats
+	jsonStat := `
+{
+    "blkio_stats": {
+        "io_service_bytes_recursive": [
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Read",
+                "value": 753664
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Write"
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Sync"
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Async",
+                "value": 753664
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Total",
+                "value": 753664
+            }
+        ],
+        "io_serviced_recursive": [
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Read",
+                "value": 26
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Write"
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Sync"
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Async",
+                "value": 26
+            },
+            {
+                "major": 252,
+                "minor": 1,
+                "op": "Total",
+                "value": 26
+            }
+        ]
+    },
+    "cpu_stats": {
+        "cpu_usage": {
+            "percpu_usage": [
+                17871,
+                4959158,
+                1646137,
+                1231652,
+                11829401,
+                244656,
+                369972,
+                0
+            ],
+            "total_usage": 20298847,
+            "usage_in_usermode": 10000000
+        },
+        "system_cpu_usage": 24052607520000000,
+        "throttling_data": {}
+    },
+    "memory_stats": {
+        "limit": 18935443456,
+        "stats": {}
+    },
+    "precpu_stats": {
+        "cpu_usage": {
+            "percpu_usage": [
+                17871,
+                4959158,
+                1646137,
+                1231652,
+                11829401,
+                244656,
+                369972,
+                0
+            ],
+            "total_usage": 20298847,
+            "usage_in_usermode": 10000000
+        },
+        "system_cpu_usage": 24052599550000000,
+        "throttling_data": {}
+    },
+    "read": "2016-02-24T11:42:27.472459608-05:00"
+}`
+	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
+	return stat
+}
+
+func testStats() *types.StatsJSON {
+	stats := &types.StatsJSON{}
+	stats.Read = time.Now()
+	stats.Networks = make(map[string]types.NetworkStats)
+	stats.CPUStats.OnlineCPUs = 2
+	stats.CPUStats.CPUUsage.PercpuUsage = []uint64{1, 1002, 0, 0}
+	stats.CPUStats.CPUUsage.UsageInUsermode = 100
+	stats.CPUStats.CPUUsage.TotalUsage = 500
+	stats.CPUStats.CPUUsage.UsageInKernelmode = 200
+	stats.CPUStats.SystemUsage = 100
+	stats.CPUStats.ThrottlingData.Periods = 1
+
+	stats.PreCPUStats.CPUUsage.TotalUsage = 400
+	stats.PreCPUStats.SystemUsage = 50
+
+	stats.MemoryStats.Stats = make(map[string]uint64)
+	stats.MemoryStats.Stats["active_anon"] = 0
+	stats.MemoryStats.Stats["active_file"] = 1
+	stats.MemoryStats.Stats["cache"] = 0
+	stats.MemoryStats.Stats["hierarchical_memory_limit"] = 0
+	stats.MemoryStats.Stats["inactive_anon"] = 0
+	stats.MemoryStats.Stats["inactive_file"] = 3
+	stats.MemoryStats.Stats["mapped_file"] = 0
+	stats.MemoryStats.Stats["pgfault"] = 2
+	stats.MemoryStats.Stats["pgmajfault"] = 0
+	stats.MemoryStats.Stats["pgpgin"] = 0
+	stats.MemoryStats.Stats["pgpgout"] = 0
+	stats.MemoryStats.Stats["rss"] = 0
+	stats.MemoryStats.Stats["rss_huge"] = 0
+	stats.MemoryStats.Stats["total_active_anon"] = 0
+	stats.MemoryStats.Stats["total_active_file"] = 0
+	stats.MemoryStats.Stats["total_cache"] = 0
+	stats.MemoryStats.Stats["total_inactive_anon"] = 0
+	stats.MemoryStats.Stats["total_inactive_file"] = 0
+	stats.MemoryStats.Stats["total_mapped_file"] = 0
+	stats.MemoryStats.Stats["total_pgfault"] = 0
+	stats.MemoryStats.Stats["total_pgmajfault"] = 0
+	stats.MemoryStats.Stats["total_pgpgin"] = 4
+	stats.MemoryStats.Stats["total_pgpgout"] = 0
+	stats.MemoryStats.Stats["total_rss"] = 44
+	stats.MemoryStats.Stats["total_rss_huge"] = 444
+	stats.MemoryStats.Stats["total_unevictable"] = 0
+	stats.MemoryStats.Stats["total_writeback"] = 55
+	stats.MemoryStats.Stats["unevictable"] = 0
+	stats.MemoryStats.Stats["writeback"] = 0
+
+	stats.MemoryStats.MaxUsage = 1001
+	stats.MemoryStats.Usage = 1111
+	stats.MemoryStats.Failcnt = 1
+	stats.MemoryStats.Limit = 2000
+
+	stats.Networks["eth0"] = types.NetworkStats{
+		RxDropped: 1,
+		RxBytes:   2,
+		RxErrors:  3,
+		TxPackets: 4,
+		TxDropped: 1,
+		RxPackets: 2,
+		TxErrors:  3,
+		TxBytes:   4,
+	}
+
+	stats.Networks["eth1"] = types.NetworkStats{
+		RxDropped: 5,
+		RxBytes:   6,
+		RxErrors:  7,
+		TxPackets: 8,
+		TxDropped: 5,
+		RxPackets: 6,
+		TxErrors:  7,
+		TxBytes:   8,
+	}
+
+	sbr := types.BlkioStatEntry{
+		Major: 6,
+		Minor: 0,
+		Op:    "read",
+		Value: 100,
+	}
+	sr := types.BlkioStatEntry{
+		Major: 6,
+		Minor: 0,
+		Op:    "write",
+		Value: 101,
+	}
+	sr2 := types.BlkioStatEntry{
+		Major: 6,
+		Minor: 1,
+		Op:    "write",
+		Value: 201,
+	}
+
+	stats.BlkioStats.IoServiceBytesRecursive = append(
+		stats.BlkioStats.IoServiceBytesRecursive, sbr)
+	stats.BlkioStats.IoServicedRecursive = append(
+		stats.BlkioStats.IoServicedRecursive, sr)
+	stats.BlkioStats.IoServicedRecursive = append(
+		stats.BlkioStats.IoServicedRecursive, sr2)
+
+	return stats
+}
+
+func containerStatsWindows() types.ContainerStats {
+	var stat types.ContainerStats
+	jsonStat := `
+{
+	"read":"2017-01-11T08:32:46.2413794Z",
+	"preread":"0001-01-01T00:00:00Z",
+	"num_procs":64,
+	"cpu_stats":{
+		"cpu_usage":{
+			"total_usage":536718750,
+			"usage_in_kernelmode":390468750,
+			"usage_in_usermode":390468750
+		},
+		"throttling_data":{
+			"periods":0,
+			"throttled_periods":0,
+			"throttled_time":0
+		}
+	},
+	"precpu_stats":{
+		"cpu_usage":{
+			"total_usage":0,
+			"usage_in_kernelmode":0,
+			"usage_in_usermode":0
+		},
+		"throttling_data":{
+			"periods":0,
+			"throttled_periods":0,
+			"throttled_time":0
+		}
+	},
+	"memory_stats":{
+		"commitbytes":77160448,
+		"commitpeakbytes":105000960,
+		"privateworkingset":59961344
+	},
+	"name":"/gt_test_iis",
+}`
+	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
+	return stat
+}
+
+var containerInspect = types.ContainerJSON{
+	Config: &container.Config{
+		Env: []string{
+			"ENVVAR1=loremipsum",
+			"ENVVAR1FOO=loremipsum",
+			"ENVVAR2=dolorsitamet",
+			"ENVVAR3==ubuntu:10.04",
+			"ENVVAR4",
+			"ENVVAR5=",
+			"ENVVAR6= ",
+			"ENVVAR7=ENVVAR8=ENVVAR9",
+			"PATH=/bin:/sbin",
+		},
+	},
+}
diff --git a/plugins/inputs/docker/fake_client.go b/plugins/inputs/docker/fake_client.go
deleted file mode 100644
index f53afe1b1..000000000
--- a/plugins/inputs/docker/fake_client.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package docker
-
-import (
-	"context"
-	"io/ioutil"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/registry"
-)
-
-type FakeDockerClient struct {
-}
-
-func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) {
-	env := types.Info{
-		Containers:         108,
-		ContainersRunning:  98,
-		ContainersStopped:  6,
-		ContainersPaused:   3,
-		OomKillDisable:     false,
-		SystemTime:         "2016-02-24T00:55:09.15073105-05:00",
-		NEventsListener:    0,
-		ID:                 "5WQQ:TFWR:FDNG:OKQ3:37Y4:FJWG:QIKK:623T:R3ME:QTKB:A7F7:OLHD",
-		Debug:              false,
-		LoggingDriver:      "json-file",
-		KernelVersion:      "4.3.0-1-amd64",
-		IndexServerAddress: "https://index.docker.io/v1/",
-		MemTotal:           3840757760,
-		Images:             199,
-		CPUCfsQuota:        true,
-		Name:               "absol",
-		SwapLimit:          false,
-		IPv4Forwarding:     true,
-		ExperimentalBuild:  false,
-		CPUCfsPeriod:       true,
-		RegistryConfig: &registry.ServiceConfig{
-			IndexConfigs: map[string]*registry.IndexInfo{
-				"docker.io": {
-					Name:     "docker.io",
-					Mirrors:  []string{},
-					Official: true,
-					Secure:   true,
-				},
-			}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: []string{}},
-		OperatingSystem:   "Linux Mint LMDE (containerized)",
-		BridgeNfIptables:  true,
-		HTTPSProxy:        "",
-		Labels:            []string{},
-		MemoryLimit:       false,
-		DriverStatus:      [][2]string{{"Pool Name", "docker-8:1-1182287-pool"}, {"Pool Blocksize", "65.54 kB"}, {"Backing Filesystem", "extfs"}, {"Data file", "/dev/loop0"}, {"Metadata file", "/dev/loop1"}, {"Data Space Used", "17.3 GB"}, {"Data Space Total", "107.4 GB"}, {"Data Space Available", "36.53 GB"}, {"Metadata Space Used", "20.97 MB"}, {"Metadata Space Total", "2.147 GB"}, {"Metadata Space Available", "2.127 GB"}, {"Udev Sync Supported", "true"}, {"Deferred Removal Enabled", "false"}, {"Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"}, {"Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"}, {"Library Version", "1.02.115 (2016-01-25)"}},
-		NFd:               19,
-		HTTPProxy:         "",
-		Driver:            "devicemapper",
-		NGoroutines:       39,
-		NCPU:              4,
-		DockerRootDir:     "/var/lib/docker",
-		NoProxy:           "",
-		BridgeNfIP6tables: true,
-	}
-	return env, nil
-}
-
-func (d FakeDockerClient) ContainerList(octx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-	container1 := types.Container{
-		ID:      "e2173b9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296b7dfb",
-		Names:   []string{"/etcd"},
-		Image:   "quay.io/coreos/etcd:v2.2.2",
-		Command: "/etcd -name etcd0 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
-		Created: 1455941930,
-		Status:  "Up 4 hours",
-		Ports: []types.Port{
-			types.Port{
-				PrivatePort: 7001,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 4001,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2380,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2379,
-				PublicPort:  2379,
-				Type:        "tcp",
-				IP:          "0.0.0.0",
-			},
-		},
-		Labels: map[string]string{
-			"label1": "test_value_1",
-			"label2": "test_value_2",
-		},
-		SizeRw:     0,
-		SizeRootFs: 0,
-	}
-	container2 := types.Container{
-		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
-		Names:   []string{"/etcd2"},
-		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
-		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
-		Created: 1455941933,
-		Status:  "Up 4 hours",
-		Ports: []types.Port{
-			types.Port{
-				PrivatePort: 7002,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 4002,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2381,
-				PublicPort:  0,
-				Type:        "tcp",
-			},
-			types.Port{
-				PrivatePort: 2382,
-				PublicPort:  2382,
-				Type:        "tcp",
-				IP:          "0.0.0.0",
-			},
-		},
-		Labels: map[string]string{
-			"label1": "test_value_1",
-			"label2": "test_value_2",
-		},
-		SizeRw:     0,
-		SizeRootFs: 0,
-	}
-
-	containers := []types.Container{container1, container2}
-	return containers, nil
-
-	//#{e6a96c84ca91a5258b7cb752579fb68826b68b49ff957487695cd4d13c343b44 titilambert/snmpsim /bin/sh -c 'snmpsimd --agent-udpv4-endpoint=0.0.0.0:31161 --process-user=root --process-group=user' 1455724831 Up 4 hours [{31161 31161 udp 0.0.0.0}] 0 0 [/snmp] map[]}]2016/02/24 01:05:01 Gathered metrics, (3s interval), from 1 inputs in 1.233836656s
-}
-
-func (d FakeDockerClient) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
-	var stat types.ContainerStats
-	jsonStat := `{"read":"2016-02-24T11:42:27.472459608-05:00","memory_stats":{"stats":{},"limit":18935443456},"blkio_stats":{"io_service_bytes_recursive":[{"major":252,"minor":1,"op":"Read","value":753664},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":753664},{"major":252,"minor":1,"op":"Total","value":753664}],"io_serviced_recursive":[{"major":252,"minor":1,"op":"Read","value":26},{"major":252,"minor":1,"op":"Write"},{"major":252,"minor":1,"op":"Sync"},{"major":252,"minor":1,"op":"Async","value":26},{"major":252,"minor":1,"op":"Total","value":26}]},"cpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052607520000000,"throttling_data":{}},"precpu_stats":{"cpu_usage":{"percpu_usage":[17871,4959158,1646137,1231652,11829401,244656,369972,0],"usage_in_usermode":10000000,"total_usage":20298847},"system_cpu_usage":24052599550000000,"throttling_data":{}}}`
-	stat.Body = ioutil.NopCloser(strings.NewReader(jsonStat))
-	return stat, nil
-}
-
-func (d FakeDockerClient) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
-	json := types.ContainerJSON{
-		Config: &container.Config{
-			Env: []string{
-				"ENVVAR1=loremipsum",
-				"ENVVAR1FOO=loremipsum",
-				"ENVVAR2=dolorsitamet",
-				"ENVVAR3==ubuntu:10.04",
-				"ENVVAR4",
-				"ENVVAR5=",
-				"ENVVAR6= ",
-				"ENVVAR7=ENVVAR8=ENVVAR9",
-				"PATH=/bin:/sbin",
-			},
-		},
-	}
-
-	return json, nil
-}
diff --git a/plugins/inputs/docker/stats_helpers.go b/plugins/inputs/docker/stats_helpers.go
new file mode 100644
index 000000000..b4c91e2fc
--- /dev/null
+++ b/plugins/inputs/docker/stats_helpers.go
@@ -0,0 +1,55 @@
+// Helper functions copied from
+// https://github.com/docker/cli/blob/master/cli/command/container/stats_helpers.go
+package docker
+
+import "github.com/docker/docker/api/types"
+
+func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJSON) float64 {
+	var (
+		cpuPercent = 0.0
+		// calculate the change for the cpu usage of the container in between readings
+		cpuDelta = float64(v.CPUStats.CPUUsage.TotalUsage) - float64(previousCPU)
+		// calculate the change for the entire system between readings
+		systemDelta = float64(v.CPUStats.SystemUsage) - float64(previousSystem)
+		onlineCPUs  = float64(v.CPUStats.OnlineCPUs)
+	)
+
+	if onlineCPUs == 0.0 {
+		onlineCPUs = float64(len(v.CPUStats.CPUUsage.PercpuUsage))
+	}
+	if systemDelta > 0.0 && cpuDelta > 0.0 {
+		cpuPercent = (cpuDelta / systemDelta) * onlineCPUs * 100.0
+	}
+	return cpuPercent
+}
+
+func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
+	// Max number of 100ns intervals between the previous time read and now
+	possIntervals := uint64(v.Read.Sub(v.PreRead).Nanoseconds()) // Start with number of ns intervals
+	possIntervals /= 100                                         // Convert to number of 100ns intervals
+	possIntervals *= uint64(v.NumProcs)                          // Multiple by the number of processors
+
+	// Intervals used
+	intervalsUsed := v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage
+
+	// Percentage avoiding divide-by-zero
+	if possIntervals > 0 {
+		return float64(intervalsUsed) / float64(possIntervals) * 100.0
+	}
+	return 0.00
+}
+
+// calculateMemUsageUnixNoCache calculate memory usage of the container.
+// Page cache is intentionally excluded to avoid misinterpretation of the output.
+func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 {
+	return float64(mem.Usage - mem.Stats["cache"])
+}
+
+func calculateMemPercentUnixNoCache(limit float64, usedNoCache float64) float64 {
+	// MemoryStats.Limit will never be 0 unless the container is not running and we haven't
+	// got any data from cgroup
+	if limit != 0 {
+		return usedNoCache / limit * 100.0
+	}
+	return 0
+}

From 0d4c954e012df3bd13797c79d4caf0e2733b0226 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Jul 2017 15:15:11 -0700
Subject: [PATCH 0414/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b181aa7df..e30314f0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
 - [#3050](https://github.com/influxdata/telegraf/pull/3050): Start first aggregator period at startup time.
 - [#2906](https://github.com/influxdata/telegraf/issues/2906): Fix panic in logparser if file cannot be opened.
 - [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
+- [#2457](https://github.com/influxdata/telegraf/issues/2457): Fix docker memory and cpu reporting in Windows.
 
 ## v1.3.5 [2017-07-26]
 

From c4297f40ad7c31cf8a59537e59f0c47bf61a8c4e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 27 Jul 2017 15:21:06 -0700
Subject: [PATCH 0415/1302] Allow iptable entries with trailing text (#3060)

---
 plugins/inputs/iptables/iptables.go      | 35 ++++++++++++++++++------
 plugins/inputs/iptables/iptables_test.go | 30 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index af3941718..b552b4657 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -95,7 +95,7 @@ const measurement = "iptables"
 var errParse = errors.New("Cannot parse iptables list information")
 var chainNameRe = regexp.MustCompile(`^Chain\s+(\S+)`)
 var fieldsHeaderRe = regexp.MustCompile(`^\s*pkts\s+bytes\s+`)
-var valuesRe = regexp.MustCompile(`^\s*([0-9]+)\s+([0-9]+)\s+.*?(/\*\s(.*)\s\*/)?$`)
+var commentRe = regexp.MustCompile(`\s*/\*\s*(.+?)\s*\*/\s*`)
 
 func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error {
 	lines := strings.Split(data, "\n")
@@ -110,17 +110,34 @@ func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error
 		return errParse
 	}
 	for _, line := range lines[2:] {
-		mv := valuesRe.FindAllStringSubmatch(line, -1)
-		// best effort : if line does not match or rule is not commented forget about it
-		if len(mv) == 0 || len(mv[0]) != 5 || mv[0][4] == "" {
+		tokens := strings.Fields(line)
+		if len(tokens) < 10 {
 			continue
 		}
-		tags := map[string]string{"table": ipt.Table, "chain": mchain[1], "ruleid": mv[0][4]}
+
+		pkts := tokens[0]
+		bytes := tokens[1]
+		end := strings.Join(tokens[9:], " ")
+
+		matches := commentRe.FindStringSubmatch(end)
+		if matches == nil {
+			continue
+		}
+
+		comment := matches[1]
+
+		tags := map[string]string{"table": ipt.Table, "chain": mchain[1], "ruleid": comment}
 		fields := make(map[string]interface{})
-		// since parse error is already catched by the regexp,
-		// we never enter ther error case here => no error check (but still need a test to cover the case)
-		fields["pkts"], _ = strconv.ParseUint(mv[0][1], 10, 64)
-		fields["bytes"], _ = strconv.ParseUint(mv[0][2], 10, 64)
+
+		var err error
+		fields["pkts"], err = strconv.ParseUint(pkts, 10, 64)
+		if err != nil {
+			continue
+		}
+		fields["bytes"], err = strconv.ParseUint(bytes, 10, 64)
+		if err != nil {
+			continue
+		}
 		acc.AddFields(measurement, fields, tags)
 	}
 	return nil
diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go
index 96190713f..cc53ecc99 100644
--- a/plugins/inputs/iptables/iptables_test.go
+++ b/plugins/inputs/iptables/iptables_test.go
@@ -124,6 +124,36 @@ func TestIptables_Gather(t *testing.T) {
 				{map[string]interface{}{"pkts": uint64(57), "bytes": uint64(4520)}},
 			},
 		},
+		{ // 10 - allow trailing text
+			table:  "mangle",
+			chains: []string{"SHAPER"},
+			values: []string{
+				`Chain SHAPER (policy ACCEPT 58 packets, 5096 bytes)
+		                pkts      bytes target     prot opt in     out     source               destination
+						0 0 ACCEPT all -- * * 1.3.5.7 0.0.0.0/0 /* test */
+						0 0 CLASSIFY all -- * * 1.3.5.7 0.0.0.0/0 /* test2 */ CLASSIFY set 1:4
+						`},
+			tags: []map[string]string{
+				map[string]string{"table": "mangle", "chain": "SHAPER", "ruleid": "test"},
+				map[string]string{"table": "mangle", "chain": "SHAPER", "ruleid": "test2"},
+			},
+			fields: [][]map[string]interface{}{
+				{map[string]interface{}{"pkts": uint64(0), "bytes": uint64(0)}},
+				{map[string]interface{}{"pkts": uint64(0), "bytes": uint64(0)}},
+			},
+		},
+		{ // 11 - invalid pkts/bytes
+			table:  "mangle",
+			chains: []string{"SHAPER"},
+			values: []string{
+				`Chain SHAPER (policy ACCEPT 58 packets, 5096 bytes)
+		                pkts      bytes target     prot opt in     out     source               destination
+						a a ACCEPT all -- * * 1.3.5.7 0.0.0.0/0 /* test */
+						a a CLASSIFY all -- * * 1.3.5.7 0.0.0.0/0 /* test2 */ CLASSIFY set 1:4
+						`},
+			tags:   []map[string]string{},
+			fields: [][]map[string]interface{}{},
+		},
 	}
 
 	for i, tt := range tests {

From 7179290dea793f3f059c900c1a9e32082a36096c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Jul 2017 15:21:52 -0700
Subject: [PATCH 0416/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e30314f0c..cc1127d2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - [#2906](https://github.com/influxdata/telegraf/issues/2906): Fix panic in logparser if file cannot be opened.
 - [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
 - [#2457](https://github.com/influxdata/telegraf/issues/2457): Fix docker memory and cpu reporting in Windows.
+- [#3058](https://github.com/influxdata/telegraf/issues/3058): Allow iptable entries with trailing text.
 
 ## v1.3.5 [2017-07-26]
 

From f0bd69d904f3ffdc9a959463442210b7a459f2cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 27 Jul 2017 17:18:44 -0700
Subject: [PATCH 0417/1302] Add tls options to docker input (#3063)

---
 Godeps                               |  2 ++
 plugins/inputs/docker/README.md      | 21 ++++++++--------
 plugins/inputs/docker/client.go      | 18 ++++++++++++--
 plugins/inputs/docker/docker.go      | 36 ++++++++++++++++++++--------
 plugins/inputs/docker/docker_test.go |  5 ++--
 5 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/Godeps b/Godeps
index aa4a5b0e8..b021911e8 100644
--- a/Godeps
+++ b/Godeps
@@ -12,6 +12,7 @@ github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
 github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
+github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
@@ -37,6 +38,7 @@ github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
 github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
+github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
 github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
 github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
 github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 8fb0c3753..06847bae9 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -1,15 +1,11 @@
 # Docker Input Plugin
 
-The docker plugin uses the docker remote API to gather metrics on running
-docker containers. You can read Docker's documentation for their remote API
-[here](https://docs.docker.com/engine/reference/api/docker_remote_api_v1.20/#get-container-stats-based-on-resource-usage)
+The docker plugin uses the Docker Engine API to gather metrics on running
+docker containers.
 
-The docker plugin uses the excellent
-[docker engine-api](https://github.com/docker/engine-api) library to
-gather stats. Documentation for the library can be found
-[here](https://godoc.org/github.com/docker/engine-api) and documentation
-for the stat structure can be found
-[here](https://godoc.org/github.com/docker/engine-api/types#Stats)
+The docker plugin uses the [Official Docker Client](https://github.com/moby/moby/tree/master/client)
+to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/).
+[Library Documentation](https://godoc.org/github.com/moby/moby/client)
 
 ### Configuration:
 
@@ -47,7 +43,7 @@ for the stat structure can be found
   ## Note that an empty array for both will include all labels as tags
   docker_label_include = []
   docker_label_exclude = []
-  
+
   ## Which environment variables should we use as a tag
   tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 
@@ -59,6 +55,11 @@ for the stat structure can be found
   # insecure_skip_verify = false
 ```
 
+#### Environment Configuration
+
+When using the `"ENV"` endpoint, the connection is configured using the
+[cli Docker environment variables](https://godoc.org/github.com/moby/moby/client#NewEnvClient).
+
 ### Measurements & Fields:
 
 Every effort was made to preserve the names based on the JSON response from the
diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go
index b30a6666b..e918231a0 100644
--- a/plugins/inputs/docker/client.go
+++ b/plugins/inputs/docker/client.go
@@ -2,9 +2,12 @@ package docker
 
 import (
 	"context"
+	"crypto/tls"
+	"net/http"
 
 	"github.com/docker/docker/api/types"
 	docker "github.com/docker/docker/client"
+	"github.com/docker/go-connections/sockets"
 )
 
 var (
@@ -27,8 +30,19 @@ func NewEnvClient() (Client, error) {
 	return &SocketClient{client}, nil
 }
 
-func NewClient(host string) (Client, error) {
-	client, err := docker.NewClient(host, version, nil, defaultHeaders)
+func NewClient(host string, tlsConfig *tls.Config) (Client, error) {
+	proto, addr, _, err := docker.ParseHost(host)
+	if err != nil {
+		return nil, err
+	}
+
+	transport := &http.Transport{
+		TLSClientConfig: tlsConfig,
+	}
+	sockets.ConfigureTransport(transport, proto, addr)
+	httpClient := &http.Client{Transport: transport}
+
+	client, err := docker.NewClient(host, version, httpClient, defaultHeaders)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index b0d0e4953..3634e596f 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -2,9 +2,11 @@ package docker
 
 import (
 	"context"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
+	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
@@ -45,10 +47,16 @@ type Docker struct {
 	ContainerExclude []string `toml:"container_name_exclude"`
 	ContainerFilter  DockerContainerFilter
 
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool
+
 	newEnvClient func() (Client, error)
-	newClient    func(host string) (Client, error)
+	newClient    func(string, *tls.Config) (Client, error)
 
 	client         Client
+	httpClient     *http.Client
 	engine_host    string
 	filtersCreated bool
 }
@@ -60,6 +68,8 @@ const (
 	GB = 1000 * MB
 	TB = 1000 * GB
 	PB = 1000 * TB
+
+	defaultEndpoint = "unix:///var/run/docker.sock"
 )
 
 var (
@@ -95,6 +105,13 @@ var sampleConfig = `
   ## Note that an empty array for both will include all labels as tags
   docker_label_include = []
   docker_label_exclude = []
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (d *Docker) Description() string {
@@ -109,19 +126,17 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		var err error
 		if d.Endpoint == "ENV" {
 			c, err = d.newEnvClient()
-			if err != nil {
-				return err
-			}
-		} else if d.Endpoint == "" {
-			c, err = d.newClient("unix:///var/run/docker.sock")
-			if err != nil {
-				return err
-			}
 		} else {
-			c, err = d.newClient(d.Endpoint)
+			tlsConfig, err := internal.GetTLSConfig(
+				d.SSLCert, d.SSLKey, d.SSLCA, d.InsecureSkipVerify)
 			if err != nil {
 				return err
 			}
+
+			c, err = d.newClient(d.Endpoint, tlsConfig)
+		}
+		if err != nil {
+			return err
 		}
 		d.client = c
 	}
@@ -699,6 +714,7 @@ func init() {
 		return &Docker{
 			PerDevice:      true,
 			Timeout:        internal.Duration{Duration: time.Second * 5},
+			Endpoint:       defaultEndpoint,
 			newEnvClient:   NewEnvClient,
 			newClient:      NewClient,
 			filtersCreated: false,
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index b64eeb1ee..95adfcf8e 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -2,6 +2,7 @@ package docker
 
 import (
 	"context"
+	"crypto/tls"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
@@ -43,7 +44,7 @@ func (c *MockClient) ContainerInspect(
 	return c.ContainerInspectF(ctx, containerID)
 }
 
-func newClient(host string) (Client, error) {
+func newClient(host string, tlsConfig *tls.Config) (Client, error) {
 	return &MockClient{
 		InfoF: func(context.Context) (types.Info, error) {
 			return info, nil
@@ -212,7 +213,7 @@ func TestDocker_WindowsMemoryContainerStats(t *testing.T) {
 	var acc testutil.Accumulator
 
 	d := Docker{
-		newClient: func(string) (Client, error) {
+		newClient: func(string, *tls.Config) (Client, error) {
 			return &MockClient{
 				InfoF: func(ctx context.Context) (types.Info, error) {
 					return info, nil

From 9143670d6ec374374ca370523d0f1977d1252f4a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 27 Jul 2017 17:19:33 -0700
Subject: [PATCH 0418/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc1127d2b..a45f96125 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - [#2612](https://github.com/influxdata/telegraf/pull/2612): Add input plugin for OpenLDAP.
 - [#3042](https://github.com/influxdata/telegraf/pull/3042): Add network option to dns_query.
 - [#3054](https://github.com/influxdata/telegraf/pull/3054): Add redis_version field to redis input.
+- [#3063](https://github.com/influxdata/telegraf/pull/3063): Add tls options to docker input.
 
 ### Bugfixes
 

From f8c84302a451f875a07d1075ea23278fc1c1954a Mon Sep 17 00:00:00 2001
From: Oscar Sironi <o.sironi@gmail.com>
Date: Mon, 31 Jul 2017 19:58:12 +0200
Subject: [PATCH 0419/1302] Add config file path troubleshooting advice for
 Windows (#3071)

---
 docs/WINDOWS_SERVICE.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/WINDOWS_SERVICE.md b/docs/WINDOWS_SERVICE.md
index 66046cdbb..c50a10785 100644
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -37,3 +37,9 @@ Telegraf can manage its own service through the --service flag:
 | `telegraf.exe --service start`     | Start the telegraf service    |
 | `telegraf.exe --service stop`      | Stop the telegraf service     |
 
+
+Trobleshooting  common error #1067
+
+When installing as service in Windows, always double check to specify full path of the config file, otherwise windows service will fail to start
+
+ --config C:\"Program Files"\Telegraf\telegraf.conf

From c31e7d0b91b0277e122e7f3de10029364da1be93 Mon Sep 17 00:00:00 2001
From: Jeff Ashton <JeffAshton@users.noreply.github.com>
Date: Mon, 31 Jul 2017 14:03:26 -0400
Subject: [PATCH 0420/1302] Fix win_perf_counters tests (#3068)

---
 Makefile                                      |   5 +
 .../win_perf_counters/win_perf_counters.go    |   4 +
 .../win_perf_counters_test.go                 | 132 +++++++++---------
 3 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/Makefile b/Makefile
index 17a947f56..092715237 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,11 @@ test: vet docker-kill docker-run
 test-short: vet
 	go test -short ./...
 
+# Run windows specific tests
+test-windows: vet
+	go test ./plugins/inputs/ping/...
+	go test ./plugins/inputs/win_perf_counters/...
+
 vet:
 	go vet ./...
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 2437e724a..5f1c1a11b 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -173,6 +173,10 @@ func (m *Win_PerfCounters) ParseConfig() error {
 	}
 }
 
+func (m *Win_PerfCounters) GetParsedItemsForTesting() []*item {
+	return m.itemCache
+}
+
 func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	// Parse the config once
 	if !m.configParsed {
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
index 0a38153dd..a24cedae5 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -12,7 +12,6 @@ import (
 )
 
 func TestWinPerfcountersConfigGet1(t *testing.T) {
-	validmetrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -39,14 +38,13 @@ func TestWinPerfcountersConfigGet1(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet1", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&validmetrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 }
 
 func TestWinPerfcountersConfigGet2(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -73,26 +71,27 @@ func TestWinPerfcountersConfigGet2(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet2", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 
-	if len(metrics.items) == 1 {
+	var parsedItems = m.GetParsedItemsForTesting()
+
+	if len(parsedItems) == 1 {
 		require.NoError(t, nil)
-	} else if len(metrics.items) == 0 {
-		var errorstring1 string = "No results returned from the query: " + string(len(metrics.items))
+	} else if len(parsedItems) == 0 {
+		var errorstring1 string = "No results returned from the query: " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
-	} else if len(metrics.items) > 1 {
-		var errorstring1 string = "Too many results returned from the query: " + string(len(metrics.items))
+	} else if len(parsedItems) > 1 {
+		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
 	}
 }
 
 func TestWinPerfcountersConfigGet3(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 2)
@@ -120,28 +119,29 @@ func TestWinPerfcountersConfigGet3(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet3", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 
-	if len(metrics.items) == 2 {
-		require.NoError(t, nil)
-	} else if len(metrics.items) < 2 {
+	var parsedItems = m.GetParsedItemsForTesting()
 
-		var errorstring1 string = "Too few results returned from the query. " + string(len(metrics.items))
+	if len(parsedItems) == 2 {
+		require.NoError(t, nil)
+	} else if len(parsedItems) < 2 {
+
+		var errorstring1 string = "Too few results returned from the query. " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
-	} else if len(metrics.items) > 2 {
+	} else if len(parsedItems) > 2 {
 
-		var errorstring1 string = "Too many results returned from the query: " + string(len(metrics.items))
+		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
 	}
 }
 
 func TestWinPerfcountersConfigGet4(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 2)
 	var counters = make([]string, 1)
@@ -149,7 +149,7 @@ func TestWinPerfcountersConfigGet4(t *testing.T) {
 
 	objectname := "Processor Information"
 	instances[0] = "_Total"
-	instances[1] = "0"
+	instances[1] = "0,1"
 	counters[0] = "% Processor Time"
 
 	var measurement string = "test"
@@ -169,28 +169,29 @@ func TestWinPerfcountersConfigGet4(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet4", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 
-	if len(metrics.items) == 2 {
-		require.NoError(t, nil)
-	} else if len(metrics.items) < 2 {
+	var parsedItems = m.GetParsedItemsForTesting()
 
-		var errorstring1 string = "Too few results returned from the query: " + string(len(metrics.items))
+	if len(parsedItems) == 2 {
+		require.NoError(t, nil)
+	} else if len(parsedItems) < 2 {
+
+		var errorstring1 string = "Too few results returned from the query: " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
-	} else if len(metrics.items) > 2 {
+	} else if len(parsedItems) > 2 {
 
-		var errorstring1 string = "Too many results returned from the query: " + string(len(metrics.items))
+		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
 	}
 }
 
 func TestWinPerfcountersConfigGet5(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 2)
 	var counters = make([]string, 2)
@@ -198,7 +199,7 @@ func TestWinPerfcountersConfigGet5(t *testing.T) {
 
 	objectname := "Processor Information"
 	instances[0] = "_Total"
-	instances[1] = "0"
+	instances[1] = "0,1"
 	counters[0] = "% Processor Time"
 	counters[1] = "% Idle Time"
 
@@ -219,28 +220,29 @@ func TestWinPerfcountersConfigGet5(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet5", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 
-	if len(metrics.items) == 4 {
+	var parsedItems = m.GetParsedItemsForTesting()
+
+	if len(parsedItems) == 4 {
 		require.NoError(t, nil)
-	} else if len(metrics.items) < 4 {
+	} else if len(parsedItems) < 4 {
 		var errorstring1 string = "Too few results returned from the query: " +
-			string(len(metrics.items))
+			string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
-	} else if len(metrics.items) > 4 {
+	} else if len(parsedItems) > 4 {
 		var errorstring1 string = "Too many results returned from the query: " +
-			string(len(metrics.items))
+			string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
 	}
 }
 
 func TestWinPerfcountersConfigGet6(t *testing.T) {
-	validmetrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -267,14 +269,13 @@ func TestWinPerfcountersConfigGet6(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet6", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&validmetrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 }
 
 func TestWinPerfcountersConfigGet7(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 3)
@@ -303,28 +304,29 @@ func TestWinPerfcountersConfigGet7(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigGet7", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.NoError(t, err)
 
-	if len(metrics.items) == 2 {
+	var parsedItems = m.GetParsedItemsForTesting()
+
+	if len(parsedItems) == 2 {
 		require.NoError(t, nil)
-	} else if len(metrics.items) < 2 {
+	} else if len(parsedItems) < 2 {
 		var errorstring1 string = "Too few results returned from the query: " +
-			string(len(metrics.items))
+			string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
-	} else if len(metrics.items) > 2 {
+	} else if len(parsedItems) > 2 {
 		var errorstring1 string = "Too many results returned from the query: " +
-			string(len(metrics.items))
+			string(len(parsedItems))
 		err2 := errors.New(errorstring1)
 		require.NoError(t, err2)
 	}
 }
 
 func TestWinPerfcountersConfigError1(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -351,14 +353,13 @@ func TestWinPerfcountersConfigError1(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigError1", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.Error(t, err)
 }
 
 func TestWinPerfcountersConfigError2(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -385,14 +386,13 @@ func TestWinPerfcountersConfigError2(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigError2", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.Error(t, err)
 }
 
 func TestWinPerfcountersConfigError3(t *testing.T) {
-	metrics := itemList{}
 
 	var instances = make([]string, 1)
 	var counters = make([]string, 1)
@@ -419,9 +419,9 @@ func TestWinPerfcountersConfigError3(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "ConfigError3", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 
-	err := m.ParseConfig(&metrics)
+	err := m.ParseConfig()
 	require.Error(t, err)
 }
 
@@ -435,6 +435,8 @@ func TestWinPerfcountersCollect1(t *testing.T) {
 	instances[0] = "_Total"
 	counters[0] = "Parking Status"
 
+	var expectedCounter string = "Parking_Status"
+
 	var measurement string = "test"
 	var warnonmissing bool = false
 	var failonmissing bool = true
@@ -452,7 +454,7 @@ func TestWinPerfcountersCollect1(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "Collect1", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 	var acc testutil.Accumulator
 	err := m.Gather(&acc)
 	require.NoError(t, err)
@@ -465,7 +467,7 @@ func TestWinPerfcountersCollect1(t *testing.T) {
 		"objectname": objectname,
 	}
 	fields := map[string]interface{}{
-		counters[0]: float32(0),
+		expectedCounter: float32(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
 
@@ -481,6 +483,8 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 	instances[1] = "0,0"
 	counters[0] = "Performance Limit Flags"
 
+	var expectedCounter string = "Performance_Limit_Flags"
+
 	var measurement string = "test"
 	var warnonmissing bool = false
 	var failonmissing bool = true
@@ -498,7 +502,7 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, TestName: "Collect2", Object: perfobjects}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
 	var acc testutil.Accumulator
 	err := m.Gather(&acc)
 	require.NoError(t, err)
@@ -511,7 +515,7 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 		"objectname": objectname,
 	}
 	fields := map[string]interface{}{
-		counters[0]: float32(0),
+		expectedCounter: float32(0),
 	}
 
 	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
@@ -520,7 +524,7 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 		"objectname": objectname,
 	}
 	fields = map[string]interface{}{
-		counters[0]: float32(0),
+		expectedCounter: float32(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
 

From 5e95367f6cd728b89b45a1341375496ae3572e43 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Mon, 31 Jul 2017 19:29:14 +0100
Subject: [PATCH 0421/1302] Sanitize password from couchbase metric (#3033)

---
 plugins/inputs/couchbase/README.md         |  2 +-
 plugins/inputs/couchbase/couchbase.go      | 12 ++++++++---
 plugins/inputs/couchbase/couchbase_test.go | 24 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/couchbase/README.md b/plugins/inputs/couchbase/README.md
index ffe913f58..91e197b43 100644
--- a/plugins/inputs/couchbase/README.md
+++ b/plugins/inputs/couchbase/README.md
@@ -22,7 +22,7 @@
 ### couchbase_node
 
 Tags:
-- cluster: whatever you called it in `servers` in the configuration, e.g.: `http://couchbase-0.example.com/`
+- cluster: sanitized string from `servers` configuration field e.g.: `http://user:password@couchbase-0.example.com:8091/endpoint` -> `http://couchbase-0.example.com:8091/endpoint`
 - hostname: Couchbase's name for the node and port, e.g., `172.16.10.187:8091`
 
 Fields:
diff --git a/plugins/inputs/couchbase/couchbase.go b/plugins/inputs/couchbase/couchbase.go
index 3c3bb3671..35751b727 100644
--- a/plugins/inputs/couchbase/couchbase.go
+++ b/plugins/inputs/couchbase/couchbase.go
@@ -1,10 +1,12 @@
 package couchbase
 
 import (
+	"regexp"
+	"sync"
+
 	couchbase "github.com/couchbase/go-couchbase"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"sync"
 )
 
 type Couchbase struct {
@@ -24,6 +26,8 @@ var sampleConfig = `
   servers = ["http://localhost:8091"]
 `
 
+var regexpURI = regexp.MustCompile(`(\S+://)?(\S+\:\S+@)`)
+
 func (r *Couchbase) SampleConfig() string {
 	return sampleConfig
 }
@@ -71,15 +75,17 @@ func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *co
 		}
 		pool = &p
 	}
+
 	for i := 0; i < len(pool.Nodes); i++ {
 		node := pool.Nodes[i]
-		tags := map[string]string{"cluster": addr, "hostname": node.Hostname}
+		tags := map[string]string{"cluster": regexpURI.ReplaceAllString(addr, "${1}"), "hostname": node.Hostname}
 		fields := make(map[string]interface{})
 		fields["memory_free"] = node.MemoryFree
 		fields["memory_total"] = node.MemoryTotal
 		acc.AddFields("couchbase_node", fields, tags)
 	}
-	for bucketName, _ := range pool.BucketMap {
+
+	for bucketName := range pool.BucketMap {
 		tags := map[string]string{"cluster": addr, "bucket": bucketName}
 		bs := pool.BucketMap[bucketName].BasicStats
 		fields := make(map[string]interface{})
diff --git a/plugins/inputs/couchbase/couchbase_test.go b/plugins/inputs/couchbase/couchbase_test.go
index 222ecbf4e..df7f1b4c1 100644
--- a/plugins/inputs/couchbase/couchbase_test.go
+++ b/plugins/inputs/couchbase/couchbase_test.go
@@ -40,6 +40,30 @@ func TestGatherServer(t *testing.T) {
 		map[string]string{"cluster": "mycluster", "bucket": "blastro-df"})
 }
 
+func TestSanitizeURI(t *testing.T) {
+
+	var sanitizeTest = []struct {
+		input    string
+		expected string
+	}{
+		{"http://user:password@localhost:121", "http://localhost:121"},
+		{"user:password@localhost:12/endpoint", "localhost:12/endpoint"},
+		{"https://mail@address.com:password@localhost", "https://localhost"},
+		{"localhost", "localhost"},
+		{"user:password@localhost:2321", "localhost:2321"},
+		{"http://user:password@couchbase-0.example.com:8091/endpoint", "http://couchbase-0.example.com:8091/endpoint"},
+		{" ", " "},
+	}
+
+	for _, test := range sanitizeTest {
+		result := regexpURI.ReplaceAllString(test.input, "${1}")
+
+		if result != test.expected {
+			t.Errorf("TestSanitizeAddress: input %s, expected %s, actual %s", test.input, test.expected, result)
+		}
+	}
+}
+
 // From `/pools/default` on a real cluster
 const poolsDefaultResponse string = `{"storageTotals":{"ram":{"total":450972598272,"quotaTotal":360777252864,"quotaUsed":360777252864,"used":446826622976,"usedByData":255061495696,"quotaUsedPerNode":51539607552,"quotaTotalPerNode":51539607552},"hdd":{"total":1108766539776,"quotaTotal":1108766539776,"used":559135126484,"usedByData":515767865143,"free":498944942902}},"serverGroupsUri":"/pools/default/serverGroups?v=98656394","name":"default","alerts":["Metadata overhead warning. Over  63% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.8.148\" is taken up by keys and metadata.","Metadata overhead warning. Over  65% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.10.65\" is taken up by keys and metadata.","Metadata overhead warning. Over  64% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.13.173\" is taken up by keys and metadata.","Metadata overhead warning. Over  65% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.15.75\" is taken up by keys and metadata.","Metadata overhead warning. Over  65% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.13.105\" is taken up by keys and metadata.","Metadata overhead warning. Over  64% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.8.127\" is taken up by keys and metadata.","Metadata overhead warning. Over  63% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.15.120\" is taken up by keys and metadata.","Metadata overhead warning. Over  66% of RAM allocated to bucket  \"blastro-df\" on node \"172.16.10.187\" is taken up by keys and metadata."],"alertsSilenceURL":"/controller/resetAlerts?token=2814&uuid=2bec87861652b990cf6aa5c7ee58c253","nodes":[{"systemStats":{"cpu_utilization_rate":35.43307086614173,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23181365248},"interestingStats":{"cmd_get":17.98201798201798,"couch_docs_actual_disk_size":68506048063,"couch_docs_data_size":38718796110,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":140158886,"curr_items_tot":279374646,"ep_bg_fetched":0.999000999000999,"get_hits":10.98901098901099,"mem_used":36497390640,"ops":829.1708291708292,"vb_replica_curr_items":139215760},"uptime":"341236","memoryTotal":64424656896,"memoryFree":23181365248,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.10.187:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.10.187","thisNode":true,"hostname":"172.16.10.187:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":47.38255033557047,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23665811456},"interestingStats":{"cmd_get":172.8271728271728,"couch_docs_actual_disk_size":79360565405,"couch_docs_data_size":38736382876,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":140174377,"curr_items_tot":279383025,"ep_bg_fetched":0.999000999000999,"get_hits":167.8321678321678,"mem_used":36650059656,"ops":1685.314685314685,"vb_replica_curr_items":139208648},"uptime":"341210","memoryTotal":64424656896,"memoryFree":23665811456,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.10.65:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.10.65","hostname":"172.16.10.65:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":25.5586592178771,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23726600192},"interestingStats":{"cmd_get":63.06306306306306,"couch_docs_actual_disk_size":79345105217,"couch_docs_data_size":38728086130,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":139195268,"curr_items_tot":279349113,"ep_bg_fetched":0,"get_hits":53.05305305305306,"mem_used":36476665576,"ops":1878.878878878879,"vb_replica_curr_items":140153845},"uptime":"341210","memoryTotal":64424656896,"memoryFree":23726600192,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.13.105:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.13.105","hostname":"172.16.13.105:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":26.45803698435277,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23854841856},"interestingStats":{"cmd_get":51.05105105105105,"couch_docs_actual_disk_size":74465931949,"couch_docs_data_size":38723830730,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":139209869,"curr_items_tot":279380019,"ep_bg_fetched":0,"get_hits":47.04704704704704,"mem_used":36471784896,"ops":1831.831831831832,"vb_replica_curr_items":140170150},"uptime":"340526","memoryTotal":64424656896,"memoryFree":23854841856,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.13.173:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.13.173","hostname":"172.16.13.173:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":47.31034482758621,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23773573120},"interestingStats":{"cmd_get":77.07707707707708,"couch_docs_actual_disk_size":74743093945,"couch_docs_data_size":38594660087,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":139215932,"curr_items_tot":278427644,"ep_bg_fetched":0,"get_hits":53.05305305305305,"mem_used":36306500344,"ops":1981.981981981982,"vb_replica_curr_items":139211712},"uptime":"340495","memoryTotal":64424656896,"memoryFree":23773573120,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.15.120:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.15.120","hostname":"172.16.15.120:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":17.60660247592847,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":23662190592},"interestingStats":{"cmd_get":146.8531468531468,"couch_docs_actual_disk_size":72932847344,"couch_docs_data_size":38581771457,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":139226879,"curr_items_tot":278436540,"ep_bg_fetched":0,"get_hits":144.8551448551448,"mem_used":36421860496,"ops":1495.504495504495,"vb_replica_curr_items":139209661},"uptime":"337174","memoryTotal":64424656896,"memoryFree":23662190592,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.8.127:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.8.127","hostname":"172.16.8.127:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}},{"systemStats":{"cpu_utilization_rate":21.68831168831169,"swap_total":0,"swap_used":0,"mem_total":64424656896,"mem_free":24049729536},"interestingStats":{"cmd_get":11.98801198801199,"couch_docs_actual_disk_size":66414273220,"couch_docs_data_size":38587642702,"couch_views_actual_disk_size":0,"couch_views_data_size":0,"curr_items":139193759,"curr_items_tot":278398926,"ep_bg_fetched":0,"get_hits":9.990009990009991,"mem_used":36237234088,"ops":883.1168831168832,"vb_replica_curr_items":139205167},"uptime":"341228","memoryTotal":64424656896,"memoryFree":24049729536,"mcdMemoryReserved":49152,"mcdMemoryAllocated":49152,"couchApiBase":"http://172.16.8.148:8092/","clusterMembership":"active","recoveryType":"none","status":"healthy","otpNode":"ns_1@172.16.8.148","hostname":"172.16.8.148:8091","clusterCompatibility":196608,"version":"3.0.1-1444-rel-community","os":"x86_64-unknown-linux-gnu","ports":{"proxy":11211,"direct":11210}}],"buckets":{"uri":"/pools/default/buckets?v=74117050&uuid=2bec87861652b990cf6aa5c7ee58c253","terseBucketsBase":"/pools/default/b/","terseStreamingBucketsBase":"/pools/default/bs/"},"remoteClusters":{"uri":"/pools/default/remoteClusters?uuid=2bec87861652b990cf6aa5c7ee58c253","validateURI":"/pools/default/remoteClusters?just_validate=1"},"controllers":{"addNode":{"uri":"/controller/addNode?uuid=2bec87861652b990cf6aa5c7ee58c253"},"rebalance":{"uri":"/controller/rebalance?uuid=2bec87861652b990cf6aa5c7ee58c253"},"failOver":{"uri":"/controller/failOver?uuid=2bec87861652b990cf6aa5c7ee58c253"},"startGracefulFailover":{"uri":"/controller/startGracefulFailover?uuid=2bec87861652b990cf6aa5c7ee58c253"},"reAddNode":{"uri":"/controller/reAddNode?uuid=2bec87861652b990cf6aa5c7ee58c253"},"reFailOver":{"uri":"/controller/reFailOver?uuid=2bec87861652b990cf6aa5c7ee58c253"},"ejectNode":{"uri":"/controller/ejectNode?uuid=2bec87861652b990cf6aa5c7ee58c253"},"setRecoveryType":{"uri":"/controller/setRecoveryType?uuid=2bec87861652b990cf6aa5c7ee58c253"},"setAutoCompaction":{"uri":"/controller/setAutoCompaction?uuid=2bec87861652b990cf6aa5c7ee58c253","validateURI":"/controller/setAutoCompaction?just_validate=1"},"clusterLogsCollection":{"startURI":"/controller/startLogsCollection?uuid=2bec87861652b990cf6aa5c7ee58c253","cancelURI":"/controller/cancelLogsCollection?uuid=2bec87861652b990cf6aa5c7ee58c253"},"replication":{"createURI":"/controller/createReplication?uuid=2bec87861652b990cf6aa5c7ee58c253","validateURI":"/controller/createReplication?just_validate=1"},"setFastWarmup":{"uri":"/controller/setFastWarmup?uuid=2bec87861652b990cf6aa5c7ee58c253","validateURI":"/controller/setFastWarmup?just_validate=1"}},"rebalanceStatus":"none","rebalanceProgressUri":"/pools/default/rebalanceProgress","stopRebalanceUri":"/controller/stopRebalance?uuid=2bec87861652b990cf6aa5c7ee58c253","nodeStatusesUri":"/nodeStatuses","maxBucketCount":10,"autoCompactionSettings":{"parallelDBAndViewCompaction":false,"databaseFragmentationThreshold":{"percentage":50,"size":"undefined"},"viewFragmentationThreshold":{"percentage":50,"size":"undefined"}},"fastWarmupSettings":{"fastWarmupEnabled":true,"minMemoryThreshold":10,"minItemsThreshold":10},"tasks":{"uri":"/pools/default/tasks?v=97479372"},"visualSettingsUri":"/internalSettings/visual?v=7111573","counters":{"rebalance_success":4,"rebalance_start":6,"rebalance_stop":2}}`
 

From 3bd14ed2292de492bdb098a5134fc9f56a3f3f66 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 31 Jul 2017 11:30:27 -0700
Subject: [PATCH 0422/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a45f96125..8f57a6f18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
 - [#2886](https://github.com/influxdata/telegraf/issues/2886): Default to localhost if zookeeper has no servers set.
 - [#2457](https://github.com/influxdata/telegraf/issues/2457): Fix docker memory and cpu reporting in Windows.
 - [#3058](https://github.com/influxdata/telegraf/issues/3058): Allow iptable entries with trailing text.
+- [#1680](https://github.com/influxdata/telegraf/issues/1680): Sanitize password from couchbase metric.
 
 ## v1.3.5 [2017-07-26]
 

From 9c0aadf4455d788e0b29182828eaf364031796dd Mon Sep 17 00:00:00 2001
From: Vladislav Mugultyanov <vlamug@gmail.com>
Date: Mon, 31 Jul 2017 21:33:51 +0300
Subject: [PATCH 0423/1302] Add histogram aggregator plugin (#2387)

---
 etc/telegraf.conf                             |  26 ++
 plugins/aggregators/all/all.go                |   1 +
 plugins/aggregators/histogram/README.md       | 128 +++++++
 plugins/aggregators/histogram/histogram.go    | 315 ++++++++++++++++++
 .../aggregators/histogram/histogram_test.go   | 210 ++++++++++++
 5 files changed, 680 insertions(+)
 create mode 100644 plugins/aggregators/histogram/README.md
 create mode 100644 plugins/aggregators/histogram/histogram.go
 create mode 100644 plugins/aggregators/histogram/histogram_test.go

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index b7999b3e0..3e1395c02 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -606,6 +606,32 @@
 #   drop_original = false
 
 
+# # Configuration for aggregate histogram metrics
+# [[aggregators.histogram]]
+#   ## General Aggregator Arguments:
+#   ## The period on which to flush & clear the aggregator.
+#   period = "30s"
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = false
+#
+#   ## The example of config to aggregate histogram for all fields of specified metric.
+#   [[aggregators.histogram.config]]
+#     ## The set of buckets.
+#     buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+#     ## The name of metric.
+#     metric_name = "cpu"
+#
+#   ## The example of config to aggregate for specified fields of metric.
+#   [[aggregators.histogram.config]]
+#     ## The set of buckets.
+#     buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+#     ## The name of metric.
+#     metric_name = "diskio"
+#     ## The concrete fields of metric
+#     metric_fields = ["io_time", "read_time", "write_time"]
+
+
 
 ###############################################################################
 #                            INPUT PLUGINS                                    #
diff --git a/plugins/aggregators/all/all.go b/plugins/aggregators/all/all.go
index 1041a0c9c..c4d430cc9 100644
--- a/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -1,5 +1,6 @@
 package all
 
 import (
+	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
 )
diff --git a/plugins/aggregators/histogram/README.md b/plugins/aggregators/histogram/README.md
new file mode 100644
index 000000000..29b7a6dc0
--- /dev/null
+++ b/plugins/aggregators/histogram/README.md
@@ -0,0 +1,128 @@
+# Histogram Aggregator Plugin
+
+#### Goal
+
+This plugin was added for ability to build histograms.
+
+#### Description
+
+The histogram aggregator plugin aggregates values of specified metric's
+fields. The metric is emitted every `period` seconds. All you need to do
+is to specify borders of histogram buckets and fields, for which you want
+to aggregate histogram.
+
+#### How it works
+
+The each metric is passed to the aggregator and this aggregator searches
+histogram buckets for those fields, which have been specified in the
+config. If buckets are found, the aggregator will put +1 to appropriate
+bucket. Otherwise, nothing will happen. Every `period` seconds these data
+will be pushed to output.
+
+Note, that the all hits of current bucket will be also added to all next
+buckets in final result of distribution. Why does it work this way? In
+configuration you define right borders for each bucket in a ascending
+sequence. Internally buckets are presented as ranges with borders
+(0..bucketBorder]: 0..1, 0..10, 0..50, …, 0..+Inf. So the value "+1" will be
+put into those buckets, in which the metric value fell with such ranges of
+buckets.
+
+This plugin creates cumulative histograms. It means, that the hits in the 
+buckets will always increase from the moment of telegraf start. But if you
+restart telegraf, all hits in the buckets will be reset to 0.
+
+Also, the algorithm of hit counting to buckets was implemented on the base
+of the algorithm, which is implemented in the Prometheus
+[client](https://github.com/prometheus/client_golang/blob/master/prometheus/histogram.go).
+
+### Configuration
+
+```toml
+# Configuration for aggregate histogram metrics
+[[aggregators.histogram]]
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+
+  ## The example of config to aggregate histogram for all fields of specified metric.
+  [[aggregators.histogram.config]]
+    ## The set of buckets.
+    buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+    ## The name of metric.
+    metric_name = "cpu"
+
+  ## The example of config to aggregate histogram for concrete fields of specified metric.
+  [[aggregators.histogram.config]]
+    ## The set of buckets.
+    buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+    ## The name of metric.
+    metric_name = "diskio"
+    ## The concrete fields of metric.
+    metric_fields = ["io_time", "read_time", "write_time"]
+```
+
+#### Explanation
+
+The field `metric_fields` is the list of metric fields. For example, the
+metric `cpu` has the following fields: usage_user, usage_system,
+usage_idle, usage_nice, usage_iowait, usage_irq, usage_softirq, usage_steal,
+usage_guest, usage_guest_nice.
+
+Note that histogram metrics will be pushed every `period` seconds. 
+As you know telegraf calls aggregator `Reset()` func each `period` seconds.
+Histogram aggregator ignores `Reset()` and continues to count hits. 
+
+#### Use cases
+
+You can specify fields using two cases:
+
+ 1. The specifying only metric name. In this case all fields of metric
+    will be aggregated.
+ 2. The specifying metric name and concrete field.
+ 
+#### Some rules
+ 
+ - The setting of each histogram must be in separate section with title
+   `aggregators.histogram.config`.
+
+ - The each value of bucket must be float value.
+ 
+ - Don\`t include the border bucket `+Inf`. It will be done automatically.
+ 
+### Measurements & Fields:
+
+The postfix `bucket` will be added to each field.
+
+- measurement1
+    - field1_bucket
+    - field2_bucket
+
+### Tags:
+
+All measurements have tag `le`. This tag has the border value of bucket. It
+means that the metric value is less or equal to the value of this tag. For
+example, let assume that we have the metric value 10 and the following
+buckets: [5, 10, 30, 70, 100]. Then the tag `le` will have the value 10,
+because the metrics value is passed into bucket with right border value `10`.
+
+### Example Output:
+
+The following output will return to the Prometheus client.
+
+```
+cpu,cpu=cpu1,host=localhost,le=0.0 usage_idle_bucket=0i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=10.0 usage_idle_bucket=0i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=20.0 usage_idle_bucket=1i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=30.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=40.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=50.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=60.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=70.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=80.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=90.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=100.0 usage_idle_bucket=2i 1486998330000000000
+cpu,cpu=cpu1,host=localhost,le=+Inf usage_idle_bucket=2i 1486998330000000000
+```
diff --git a/plugins/aggregators/histogram/histogram.go b/plugins/aggregators/histogram/histogram.go
new file mode 100644
index 000000000..491955339
--- /dev/null
+++ b/plugins/aggregators/histogram/histogram.go
@@ -0,0 +1,315 @@
+package histogram
+
+import (
+	"sort"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/aggregators"
+)
+
+// bucketTag is the tag, which contains right bucket border
+const bucketTag = "le"
+
+// bucketInf is the right bucket border for infinite values
+const bucketInf = "+Inf"
+
+// HistogramAggregator is aggregator with histogram configs and particular histograms for defined metrics
+type HistogramAggregator struct {
+	Configs []config `toml:"config"`
+
+	buckets bucketsByMetrics
+	cache   map[uint64]metricHistogramCollection
+}
+
+// config is the config, which contains name, field of metric and histogram buckets.
+type config struct {
+	Metric  string   `toml:"metric_name"`
+	Fields  []string `toml:"metric_fields"`
+	Buckets buckets  `toml:"buckets"`
+}
+
+// bucketsByMetrics contains the buckets grouped by metric and field name
+type bucketsByMetrics map[string]bucketsByFields
+
+// bucketsByFields contains the buckets grouped by field name
+type bucketsByFields map[string]buckets
+
+// buckets contains the right borders buckets
+type buckets []float64
+
+// metricHistogramCollection aggregates the histogram data
+type metricHistogramCollection struct {
+	histogramCollection map[string]counts
+	name                string
+	tags                map[string]string
+}
+
+// counts is the number of hits in the bucket
+type counts []int64
+
+// groupedByCountFields contains grouped fields by their count and fields values
+type groupedByCountFields struct {
+	name            string
+	tags            map[string]string
+	fieldsWithCount map[string]int64
+}
+
+// NewHistogramAggregator creates new histogram aggregator
+func NewHistogramAggregator() telegraf.Aggregator {
+	h := &HistogramAggregator{}
+	h.buckets = make(bucketsByMetrics)
+	h.resetCache()
+
+	return h
+}
+
+var sampleConfig = `
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+
+  ## The example of config to aggregate histogram for all fields of specified metric.
+  [[aggregators.histogram.config]]
+  ## The set of buckets.
+  buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+  ## The name of metric.
+  metric_name = "cpu"
+
+  ## The example of config to aggregate for specified fields of metric.
+  [[aggregators.histogram.config]]
+  ## The set of buckets.
+  buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+  ## The name of metric.
+  metric_name = "diskio"
+  ## The concrete fields of metric
+  metric_fields = ["io_time", "read_time", "write_time"]
+`
+
+// SampleConfig returns sample of config
+func (h *HistogramAggregator) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns description of aggregator plugin
+func (h *HistogramAggregator) Description() string {
+	return "Keep the aggregate histogram of each metric passing through."
+}
+
+// Add adds new hit to the buckets
+func (h *HistogramAggregator) Add(in telegraf.Metric) {
+	bucketsByField := make(map[string][]float64)
+	for field := range in.Fields() {
+		buckets := h.getBuckets(in.Name(), field)
+		if buckets != nil {
+			bucketsByField[field] = buckets
+		}
+	}
+
+	if len(bucketsByField) == 0 {
+		return
+	}
+
+	id := in.HashID()
+	agr, ok := h.cache[id]
+	if !ok {
+		agr = metricHistogramCollection{
+			name:                in.Name(),
+			tags:                in.Tags(),
+			histogramCollection: make(map[string]counts),
+		}
+	}
+
+	for field, value := range in.Fields() {
+		if buckets, ok := bucketsByField[field]; ok {
+			if agr.histogramCollection[field] == nil {
+				agr.histogramCollection[field] = make(counts, len(buckets)+1)
+			}
+
+			if value, ok := convert(value); ok {
+				index := sort.SearchFloat64s(buckets, value)
+				agr.histogramCollection[field][index]++
+			}
+		}
+	}
+
+	h.cache[id] = agr
+}
+
+// Push returns histogram values for metrics
+func (h *HistogramAggregator) Push(acc telegraf.Accumulator) {
+	metricsWithGroupedFields := []groupedByCountFields{}
+
+	for _, aggregate := range h.cache {
+		for field, counts := range aggregate.histogramCollection {
+			h.groupFieldsByBuckets(&metricsWithGroupedFields, aggregate.name, field, copyTags(aggregate.tags), counts)
+		}
+	}
+
+	for _, metric := range metricsWithGroupedFields {
+		acc.AddFields(metric.name, makeFieldsWithCount(metric.fieldsWithCount), metric.tags)
+	}
+}
+
+// groupFieldsByBuckets groups fields by metric buckets which are represented as tags
+func (h *HistogramAggregator) groupFieldsByBuckets(
+	metricsWithGroupedFields *[]groupedByCountFields,
+	name string,
+	field string,
+	tags map[string]string,
+	counts []int64,
+) {
+	count := int64(0)
+	for index, bucket := range h.getBuckets(name, field) {
+		count += counts[index]
+
+		tags[bucketTag] = strconv.FormatFloat(bucket, 'f', -1, 64)
+		h.groupField(metricsWithGroupedFields, name, field, count, copyTags(tags))
+	}
+
+	count += counts[len(counts)-1]
+	tags[bucketTag] = bucketInf
+
+	h.groupField(metricsWithGroupedFields, name, field, count, tags)
+}
+
+// groupField groups field by count value
+func (h *HistogramAggregator) groupField(
+	metricsWithGroupedFields *[]groupedByCountFields,
+	name string,
+	field string,
+	count int64,
+	tags map[string]string,
+) {
+	for key, metric := range *metricsWithGroupedFields {
+		if name == metric.name && isTagsIdentical(tags, metric.tags) {
+			(*metricsWithGroupedFields)[key].fieldsWithCount[field] = count
+			return
+		}
+	}
+
+	fieldsWithCount := map[string]int64{
+		field: count,
+	}
+
+	*metricsWithGroupedFields = append(
+		*metricsWithGroupedFields,
+		groupedByCountFields{name: name, tags: tags, fieldsWithCount: fieldsWithCount},
+	)
+}
+
+// Reset does nothing, because we need to collect counts for a long time, otherwise if config parameter 'reset' has
+// small value, we will get a histogram with a small amount of the distribution.
+func (h *HistogramAggregator) Reset() {}
+
+// resetCache resets cached counts(hits) in the buckets
+func (h *HistogramAggregator) resetCache() {
+	h.cache = make(map[uint64]metricHistogramCollection)
+}
+
+// getBuckets finds buckets and returns them
+func (h *HistogramAggregator) getBuckets(metric string, field string) []float64 {
+	if buckets, ok := h.buckets[metric][field]; ok {
+		return buckets
+	}
+
+	for _, config := range h.Configs {
+		if config.Metric == metric {
+			if !isBucketExists(field, config) {
+				continue
+			}
+
+			if _, ok := h.buckets[metric]; !ok {
+				h.buckets[metric] = make(bucketsByFields)
+			}
+
+			h.buckets[metric][field] = sortBuckets(config.Buckets)
+		}
+	}
+
+	return h.buckets[metric][field]
+}
+
+// isBucketExists checks if buckets exists for the passed field
+func isBucketExists(field string, cfg config) bool {
+	if len(cfg.Fields) == 0 {
+		return true
+	}
+
+	for _, fl := range cfg.Fields {
+		if fl == field {
+			return true
+		}
+	}
+
+	return false
+}
+
+// sortBuckets sorts the buckets if it is needed
+func sortBuckets(buckets []float64) []float64 {
+	for i, bucket := range buckets {
+		if i < len(buckets)-1 && bucket >= buckets[i+1] {
+			sort.Float64s(buckets)
+			break
+		}
+	}
+
+	return buckets
+}
+
+// convert converts interface to concrete type
+func convert(in interface{}) (float64, bool) {
+	switch v := in.(type) {
+	case float64:
+		return v, true
+	case int64:
+		return float64(v), true
+	default:
+		return 0, false
+	}
+}
+
+// copyTags copies tags
+func copyTags(tags map[string]string) map[string]string {
+	copiedTags := map[string]string{}
+	for key, val := range tags {
+		copiedTags[key] = val
+	}
+
+	return copiedTags
+}
+
+// isTagsIdentical checks the identity of two list of tags
+func isTagsIdentical(originalTags, checkedTags map[string]string) bool {
+	if len(originalTags) != len(checkedTags) {
+		return false
+	}
+
+	for tagName, tagValue := range originalTags {
+		if tagValue != checkedTags[tagName] {
+			return false
+		}
+	}
+
+	return true
+}
+
+// makeFieldsWithCount assigns count value to all metric fields
+func makeFieldsWithCount(fieldsWithCountIn map[string]int64) map[string]interface{} {
+	fieldsWithCountOut := map[string]interface{}{}
+	for field, count := range fieldsWithCountIn {
+		fieldsWithCountOut[field+"_bucket"] = count
+	}
+
+	return fieldsWithCountOut
+}
+
+// init initializes histogram aggregator plugin
+func init() {
+	aggregators.Add("histogram", func() telegraf.Aggregator {
+		return NewHistogramAggregator()
+	})
+}
diff --git a/plugins/aggregators/histogram/histogram_test.go b/plugins/aggregators/histogram/histogram_test.go
new file mode 100644
index 000000000..8c4a2b9d3
--- /dev/null
+++ b/plugins/aggregators/histogram/histogram_test.go
@@ -0,0 +1,210 @@
+package histogram
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+// NewTestHistogram creates new test histogram aggregation with specified config
+func NewTestHistogram(cfg []config) telegraf.Aggregator {
+	htm := &HistogramAggregator{Configs: cfg}
+	htm.buckets = make(bucketsByMetrics)
+	htm.resetCache()
+
+	return htm
+}
+
+// firstMetric1 is the first test metric
+var firstMetric1, _ = metric.New(
+	"first_metric_name",
+	map[string]string{"tag_name": "tag_value"},
+	map[string]interface{}{
+		"a": float64(15.3),
+		"b": float64(40),
+	},
+	time.Now(),
+)
+
+// firstMetric1 is the first test metric with other value
+var firstMetric2, _ = metric.New(
+	"first_metric_name",
+	map[string]string{"tag_name": "tag_value"},
+	map[string]interface{}{
+		"a": float64(15.9),
+		"c": float64(40),
+	},
+	time.Now(),
+)
+
+// secondMetric is the second metric
+var secondMetric, _ = metric.New(
+	"second_metric_name",
+	map[string]string{"tag_name": "tag_value"},
+	map[string]interface{}{
+		"a":        float64(105),
+		"ignoreme": "string",
+		"andme":    true,
+	},
+	time.Now(),
+)
+
+// BenchmarkApply runs benchmarks
+func BenchmarkApply(b *testing.B) {
+	histogram := NewHistogramAggregator()
+
+	for n := 0; n < b.N; n++ {
+		histogram.Add(firstMetric1)
+		histogram.Add(firstMetric2)
+		histogram.Add(secondMetric)
+	}
+}
+
+// TestHistogramWithPeriodAndOneField tests metrics for one period and for one field
+func TestHistogramWithPeriodAndOneField(t *testing.T) {
+	var cfg []config
+	cfg = append(cfg, config{Metric: "first_metric_name", Fields: []string{"a"}, Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
+	histogram := NewTestHistogram(cfg)
+
+	acc := &testutil.Accumulator{}
+
+	histogram.Add(firstMetric1)
+	histogram.Add(firstMetric2)
+	histogram.Push(acc)
+
+	if len(acc.Metrics) != 6 {
+		assert.Fail(t, "Incorrect number of metrics")
+	}
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "0")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0)}, "10")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "20")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "30")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, "40")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2)}, bucketInf)
+}
+
+// TestHistogramWithPeriodAndAllFields tests two metrics for one period and for all fields
+func TestHistogramWithPeriodAndAllFields(t *testing.T) {
+	var cfg []config
+	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 15.5, 20.0, 30.0, 40.0}})
+	cfg = append(cfg, config{Metric: "second_metric_name", Buckets: []float64{0.0, 4.0, 10.0, 23.0, 30.0}})
+	histogram := NewTestHistogram(cfg)
+
+	acc := &testutil.Accumulator{}
+
+	histogram.Add(firstMetric1)
+	histogram.Add(firstMetric2)
+	histogram.Add(secondMetric)
+	histogram.Push(acc)
+
+	if len(acc.Metrics) != 12 {
+		assert.Fail(t, "Incorrect number of metrics")
+	}
+
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0), "c_bucket": int64(0)}, "15.5")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
+
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "0")
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "4")
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "10")
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "23")
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(0), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, "30")
+	assertContainsTaggedField(t, acc, "second_metric_name", map[string]interface{}{"a_bucket": int64(1), "ignoreme_bucket": int64(0), "andme_bucket": int64(0)}, bucketInf)
+}
+
+// TestHistogramDifferentPeriodsAndAllFields tests two metrics getting added with a push/reset in between (simulates
+// getting added in different periods) for all fields
+func TestHistogramDifferentPeriodsAndAllFields(t *testing.T) {
+
+	var cfg []config
+	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}})
+	histogram := NewTestHistogram(cfg)
+
+	acc := &testutil.Accumulator{}
+	histogram.Add(firstMetric1)
+	histogram.Push(acc)
+
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "0")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0)}, "10")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "20")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(0)}, "30")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, "40")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(1), "b_bucket": int64(1)}, bucketInf)
+
+	acc.ClearMetrics()
+	histogram.Add(firstMetric2)
+	histogram.Push(acc)
+
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "0")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(0), "b_bucket": int64(0), "c_bucket": int64(0)}, "10")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "20")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(0), "c_bucket": int64(0)}, "30")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, "40")
+	assertContainsTaggedField(t, acc, "first_metric_name", map[string]interface{}{"a_bucket": int64(2), "b_bucket": int64(1), "c_bucket": int64(1)}, bucketInf)
+}
+
+// TestWrongBucketsOrder tests the calling panic with incorrect order of buckets
+func TestWrongBucketsOrder(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			assert.Equal(
+				t,
+				"histogram buckets must be in increasing order: 90.00 >= 20.00, metrics: first_metric_name, field: a",
+				fmt.Sprint(r),
+			)
+		}
+	}()
+
+	var cfg []config
+	cfg = append(cfg, config{Metric: "first_metric_name", Buckets: []float64{0.0, 90.0, 20.0, 30.0, 40.0}})
+	histogram := NewTestHistogram(cfg)
+	histogram.Add(firstMetric2)
+}
+
+// assertContainsTaggedField is help functions to test histogram data
+func assertContainsTaggedField(t *testing.T, acc *testutil.Accumulator, metricName string, fields map[string]interface{}, le string) {
+	acc.Lock()
+	defer acc.Unlock()
+
+	for _, checkedMetric := range acc.Metrics {
+		// check metric name
+		if checkedMetric.Measurement != metricName {
+			continue
+		}
+
+		// check "le" tag
+		if checkedMetric.Tags[bucketTag] != le {
+			continue
+		}
+
+		// check fields
+		isFieldsIdentical := true
+		for field := range fields {
+			if _, ok := checkedMetric.Fields[field]; !ok {
+				isFieldsIdentical = false
+				break
+			}
+		}
+		if !isFieldsIdentical {
+			continue
+		}
+
+		// check fields with their counts
+		if assert.Equal(t, fields, checkedMetric.Fields) {
+			return
+		}
+
+		assert.Fail(t, fmt.Sprintf("incorrect fields %v of metric %s", fields, metricName))
+	}
+
+	assert.Fail(t, fmt.Sprintf("unknown measurement '%s' with tags: %v, fields: %v", metricName, map[string]string{"le": le}, fields))
+}

From 6666e6a5a7d5dd075237bc46dc25bb64c32eda01 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 31 Jul 2017 11:37:32 -0700
Subject: [PATCH 0424/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f57a6f18..f5beb3f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
 - [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
+- [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
 
 ### Features
 
@@ -46,6 +47,7 @@
 - [#3042](https://github.com/influxdata/telegraf/pull/3042): Add network option to dns_query.
 - [#3054](https://github.com/influxdata/telegraf/pull/3054): Add redis_version field to redis input.
 - [#3063](https://github.com/influxdata/telegraf/pull/3063): Add tls options to docker input.
+- [#2387](https://github.com/influxdata/telegraf/pull/2387): Add histogram aggregator plugin.
 
 ### Bugfixes
 

From d82c5062b8703fa78bc989f35c597fa976d35983 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 31 Jul 2017 16:12:09 -0700
Subject: [PATCH 0425/1302] Add Appveyor continuous integration (#3074)

---
 appveyor.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..736c0dc7b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,32 @@
+version: "{build}"
+
+cache:
+ - C:\Cache
+
+clone_folder: C:\gopath\src\github.com\influxdata\telegraf
+
+environment:
+  GOPATH: C:\gopath
+
+platform: x64
+
+install:
+  - IF NOT EXIST "C:\Cache" mkdir C:\Cache
+  - IF NOT EXIST "C:\Cache\go1.8.1.msi" curl -o "C:\Cache\go1.8.1.msi" https://storage.googleapis.com/golang/go1.8.1.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
+  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
+  - IF EXIST "C:\Go" rmdir /S /Q C:\Go
+  - msiexec.exe /i "C:\Cache\go1.8.1.msi" /quiet
+  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
+  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
+  - go version
+  - go env
+
+build_script:
+  - cmd: C:\GnuWin32\bin\make windows
+
+test_script:
+  - cmd: C:\GnuWin32\bin\make test-windows
+
+artifacts:
+  - path: telegraf.exe

From ce12913bc2defc36a0721c0dd6caab986c13b716 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 1 Aug 2017 15:01:54 -0700
Subject: [PATCH 0426/1302] Update precision documentation and examples

Precision is no longer used by the InfluxDB output.

closes #3079
---
 docs/CONFIGURATION.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index e3abc8412..364fb216c 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -66,10 +66,13 @@ interval. Maximum flush_interval will be flush_interval + flush_jitter
 This is primarily to avoid
 large write spikes for users running a large number of telegraf instances.
 ie, a jitter of 5s and flush_interval 10s means flushes will happen every 10-15s.
-* **precision**: By default, precision will be set to the same timestamp order
-as the collection interval, with the maximum being 1s. Precision will NOT
-be used for service inputs, such as logparser and statsd. Valid values are
-"ns", "us" (or "µs"), "ms", "s".
+* **precision**:
+   By default or when set to "0s", precision will be set to the same
+   timestamp order as the collection interval, with the maximum being 1s.
+   Precision will NOT be used for service inputs. It is up to each individual
+   service input to set the timestamp at the appropriate precision.
+   Valid time units are "ns", "us" (or "µs"), "ms", "s".
+
 * **logfile**: Specify the log file name. The empty string means to log to stderr.
 * **debug**: Run telegraf in debug mode.
 * **quiet**: Run telegraf in quiet mode (error messages only).
@@ -178,7 +181,6 @@ fields which begin with `time_`.
 [[outputs.influxdb]]
   url = "http://192.168.59.103:8086" # required.
   database = "telegraf" # required.
-  precision = "s"
 
 # INPUTS
 [[inputs.cpu]]
@@ -317,21 +319,18 @@ to avoid measurement collisions:
 [[outputs.influxdb]]
   urls = [ "http://localhost:8086" ]
   database = "telegraf"
-  precision = "s"
   # Drop all measurements that start with "aerospike"
   namedrop = ["aerospike*"]
 
 [[outputs.influxdb]]
   urls = [ "http://localhost:8086" ]
   database = "telegraf-aerospike-data"
-  precision = "s"
   # Only accept aerospike data:
   namepass = ["aerospike*"]
 
 [[outputs.influxdb]]
   urls = [ "http://localhost:8086" ]
   database = "telegraf-cpu0-data"
-  precision = "s"
   # Only store measurements where the tag "cpu" matches the value "cpu0"
   [outputs.influxdb.tagpass]
     cpu = ["cpu0"]

From 137b312fa9ebfbe8ec8f25e88b1b79cf35ef9975 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 2 Aug 2017 17:58:26 -0700
Subject: [PATCH 0427/1302] Add Zipkin input plugin (#3080)

---
 Godeps                                        |   7 +
 docs/LICENSE_OF_DEPENDENCIES.md               |   5 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/zipkin/README.md               | 164 ++++++
 .../stress_test_write/stress_test_write.go    |  75 +++
 .../cmd/thrift_serialize/thrift_serialize.go  | 153 +++++
 plugins/inputs/zipkin/convert.go              | 249 ++++++++
 plugins/inputs/zipkin/convert_test.go         | 544 ++++++++++++++++++
 plugins/inputs/zipkin/handler.go              | 135 +++++
 plugins/inputs/zipkin/handler_test.go         | 136 +++++
 .../zipkin/testdata/cli_microservice.dat      | Bin 0 -> 3937 bytes
 .../testdata/distributed_trace_sample.dat     | Bin 0 -> 191 bytes
 .../testdata/json/cli_microservice.json       | 407 +++++++++++++
 .../json/distributed_trace_sample.json        |  30 +
 .../zipkin/testdata/json/threespans.json      |  92 +++
 plugins/inputs/zipkin/testdata/threespans.dat | Bin 0 -> 616 bytes
 plugins/inputs/zipkin/zipkin.go               | 182 ++++++
 plugins/inputs/zipkin/zipkin_test.go          | 289 ++++++++++
 18 files changed, 2469 insertions(+)
 create mode 100644 plugins/inputs/zipkin/README.md
 create mode 100644 plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
 create mode 100644 plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
 create mode 100644 plugins/inputs/zipkin/convert.go
 create mode 100644 plugins/inputs/zipkin/convert_test.go
 create mode 100644 plugins/inputs/zipkin/handler.go
 create mode 100644 plugins/inputs/zipkin/handler_test.go
 create mode 100644 plugins/inputs/zipkin/testdata/cli_microservice.dat
 create mode 100644 plugins/inputs/zipkin/testdata/distributed_trace_sample.dat
 create mode 100644 plugins/inputs/zipkin/testdata/json/cli_microservice.json
 create mode 100644 plugins/inputs/zipkin/testdata/json/distributed_trace_sample.json
 create mode 100644 plugins/inputs/zipkin/testdata/json/threespans.json
 create mode 100644 plugins/inputs/zipkin/testdata/threespans.dat
 create mode 100644 plugins/inputs/zipkin/zipkin.go
 create mode 100644 plugins/inputs/zipkin/zipkin_test.go

diff --git a/Godeps b/Godeps
index b021911e8..45da5486d 100644
--- a/Godeps
+++ b/Godeps
@@ -3,6 +3,7 @@ github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
+github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
@@ -17,10 +18,13 @@ github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
 github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
+github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
+github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
 github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
 github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
+github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
@@ -39,6 +43,9 @@ github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
 github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
 github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
+github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
+github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
+github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
 github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
 github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
 github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index aeaca0ded..44fce6cda 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -26,9 +26,11 @@ works:
 - github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
+- github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)
 - github.com/gogo/protobuf [BSD](https://github.com/gogo/protobuf/blob/master/LICENSE)
 - github.com/golang/protobuf [BSD](https://github.com/golang/protobuf/blob/master/LICENSE)
 - github.com/golang/snappy [BSD](https://github.com/golang/snappy/blob/master/LICENSE)
+- github.com/go-logfmt/logfmt [MIT](https://github.com/go-logfmt/logfmt/blob/master/LICENSE)
 - github.com/gorilla/mux [BSD](https://github.com/gorilla/mux/blob/master/LICENSE)
 - github.com/go-sql-driver/mysql [MPL](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
 - github.com/hailocab/go-hostpool [MIT](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
@@ -52,6 +54,9 @@ works:
 - github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
 - github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
 - github.com/nsqio/go-nsq [MIT](https://github.com/nsqio/go-nsq/blob/master/LICENSE)
+- github.com/opentracing-contrib/go-observer [APACHE](https://github.com/opentracing-contrib/go-observer/blob/master/LICENSE)
+- github.com/opentracing/opentracing-go [MIT](https://github.com/opentracing/opentracing-go/blob/master/LICENSE)
+- github.com/openzipkin/zipkin-go-opentracing [MIT](https://github.com/openzipkin/zipkin-go-opentracing/blob/master/LICENSE)
 - github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
 - github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
 - github.com/pkg/errors [BSD](https://github.com/pkg/errors/blob/master/LICENSE)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 0a68235b8..84c320fed 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -89,5 +89,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/zipkin"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
 )
diff --git a/plugins/inputs/zipkin/README.md b/plugins/inputs/zipkin/README.md
new file mode 100644
index 000000000..af5ea6117
--- /dev/null
+++ b/plugins/inputs/zipkin/README.md
@@ -0,0 +1,164 @@
+# Zipkin Plugin
+
+This plugin implements the Zipkin http server to gather trace and timing data needed to troubleshoot latency problems in microservice architectures.
+
+*Please Note: This plugin is experimental; Its data schema may be subject to change
+based on its main usage cases and the evolution of the OpenTracing standard.*
+
+## Configuration:
+```toml
+[[inputs.zipkin]]
+    path = "/api/v1/spans" # URL path for span data
+    port = 9411 # Port on which Telegraf listens
+```
+
+## Tracing:
+
+This plugin uses Annotations tags and fields to track data from spans
+
+- __TRACE:__ is a set of spans that share a single root span.
+Traces are built by collecting all Spans that share a traceId.
+
+- __SPAN:__ is a set of Annotations and BinaryAnnotations that correspond to a particular RPC.
+
+- __Annotations:__ for each annotation & binary annotation of a span a metric is output. *Records an occurrence in time at the beginning and end of a request.*
+
+  Annotations may have the following values:
+
+    - __CS (client start):__ beginning of span, request is made.
+    - __SR (server receive):__ server receives request and will start processing it
+      network latency & clock jitters differ it from cs
+    - __SS (server send):__ server is done processing and sends request back to client
+      amount of time it took to process request will differ it from sr
+    - __CR (client receive):__ end of span, client receives response from server
+      RPC is considered complete with this annotation
+
+### Tags
+* __"id":__               The 64 bit ID of the span.
+* __"parent_id":__        An ID associated with a particular child span.  If there is no child span, the parent ID is set to ID.
+* __"trace_id":__        The 64 or 128-bit ID of a particular trace. Every span in a trace shares this ID. Concatenation of high and low and converted to hexadecimal.
+* __"name":__             Defines a span
+
+##### Annotations have these additional tags:
+
+* __"service_name":__     Defines a service
+* __"annotation":__       The value of an annotation
+* __"endpoint_host":__    Listening port concat with IPV4, if port is not present it will not be concatenated
+
+##### Binary Annotations have these additional tag:
+
+  * __"service_name":__     Defines a service
+  * __"annotation":__       The value of an annotation
+  * __"endpoint_host":__    Listening port concat with IPV4, if port is not present it will not be concatenated
+  * __"annotation_key":__ label describing the annotation
+
+
+### Fields:
+  * __"duration_ns":__ The time in nanoseconds between the end and beginning of a span.
+
+
+
+### Sample Queries:
+
+__Get All Span Names for Service__ `my_web_server`
+```sql
+SHOW TAG VALUES FROM "zipkin" with key="name" WHERE "service_name" = 'my_web_server'
+```
+  - __Description:__  returns a list containing the names of the spans which have annotations with the given `service_name` of `my_web_server`.
+
+__Get All Service Names__
+```sql
+SHOW TAG VALUES FROM "zipkin" WITH KEY = "service_name"
+```
+  - __Description:__  returns a list of all `distinct` endpoint service names.
+
+__Find spans with longest duration__
+```sql
+SELECT max("duration_ns") FROM "zipkin" WHERE "service_name" = 'my_service' AND "name" = 'my_span_name' AND time > now() - 20m GROUP BY "trace_id",time(30s) LIMIT 5
+```
+  - __Description:__  In the last 20 minutes find the top 5 longest span durations for service `my_server` and span name `my_span_name`
+
+
+### Recommended InfluxDB setup
+
+This test will create high cardinality data so we reccomend using the [tsi influxDB engine](https://www.influxdata.com/path-1-billion-time-series-influxdb-high-cardinality-indexing-ready-testing/).
+#### How To Set Up InfluxDB For Work With Zipkin
+
+  ##### Steps
+  1. ___Update___ InfluxDB to >= 1.3, in order to use the new tsi engine.
+
+  2. ___Generate___ a config file with the following command:
+```sh
+influxd config > /path/for/config/file
+```
+  3. ___Add___ the following to your config file, under the `[data]` tab:
+```toml
+[data]
+  index-version = "tsi1"
+```
+
+  4. ___Start___ `influxd` with your new config file:
+```sh
+influxd -config=/path/to/your/config/file
+```
+
+  5. ___Update___ your retention policy:
+```sql
+ALTER RETENTION POLICY "autogen" ON "telegraf" DURATION 1d SHARD DURATION 30m
+```
+
+### Example Input Trace:
+
+- [Cli microservice with two services Test](https://github.com/openzipkin/zipkin-go-opentracing/tree/master/examples/cli_with_2_services)
+- [Test data from distributed trace repo sample json](https://github.com/mattkanwisher/distributedtrace/blob/master/testclient/sample.json)
+#### [Trace Example from Zipkin model](http://zipkin.io/pages/data_model.html)
+```json
+{
+  "traceId": "bd7a977555f6b982",
+  "name": "query",
+  "id": "be2d01e33cc78d97",
+  "parentId": "ebf33e1a81dc6f71",
+  "timestamp": 1458702548786000,
+  "duration": 13000,
+  "annotations": [
+    {
+      "endpoint": {
+        "serviceName": "zipkin-query",
+        "ipv4": "192.168.1.2",
+        "port": 9411
+      },
+      "timestamp": 1458702548786000,
+      "value": "cs"
+    },
+    {
+      "endpoint": {
+        "serviceName": "zipkin-query",
+        "ipv4": "192.168.1.2",
+        "port": 9411
+      },
+      "timestamp": 1458702548799000,
+      "value": "cr"
+    }
+  ],
+  "binaryAnnotations": [
+    {
+      "key": "jdbc.query",
+      "value": "select distinct `zipkin_spans`.`trace_id` from `zipkin_spans` join `zipkin_annotations` on (`zipkin_spans`.`trace_id` = `zipkin_annotations`.`trace_id` and `zipkin_spans`.`id` = `zipkin_annotations`.`span_id`) where (`zipkin_annotations`.`endpoint_service_name` = ? and `zipkin_spans`.`start_ts` between ? and ?) order by `zipkin_spans`.`start_ts` desc limit ?",
+      "endpoint": {
+        "serviceName": "zipkin-query",
+        "ipv4": "192.168.1.2",
+        "port": 9411
+      }
+    },
+    {
+      "key": "sa",
+      "value": true,
+      "endpoint": {
+        "serviceName": "spanstore-jdbc",
+        "ipv4": "127.0.0.1",
+        "port": 3306
+      }
+    }
+  ]
+}
+```
diff --git a/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
new file mode 100644
index 000000000..f4bc134f9
--- /dev/null
+++ b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
@@ -0,0 +1,75 @@
+/*
+This is a development testing cli tool meant to stress the zipkin telegraf plugin.
+It writes a specified number of zipkin spans to the plugin endpoint, with other
+parameters which dictate batch size and flush timeout.
+
+Usage as follows:
+
+`./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>`
+
+Or with a timer:
+
+`time ./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>`
+
+However, the flag defaults work just fine for a good write stress test (and are what
+this tool has mainly been tested with), so there shouldn't be much need to
+manually tweak the parameters.
+*/
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"time"
+
+	zipkin "github.com/openzipkin/zipkin-go-opentracing"
+)
+
+var (
+	BatchSize         int
+	MaxBackLog        int
+	BatchTimeInterval int
+	SpanCount         int
+	ZipkinServerHost  string
+)
+
+const usage = `./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>`
+
+func init() {
+	flag.IntVar(&BatchSize, "batch_size", 10000, usage)
+	flag.IntVar(&MaxBackLog, "max_backlog", 100000, usage)
+	flag.IntVar(&BatchTimeInterval, "batch_interval", 1, usage)
+	flag.IntVar(&SpanCount, "span_count", 100000, usage)
+	flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", usage)
+}
+
+func main() {
+	flag.Parse()
+	var hostname = fmt.Sprintf("http://%s:9411/api/v1/spans", ZipkinServerHost)
+	collector, err := zipkin.NewHTTPCollector(
+		hostname,
+		zipkin.HTTPBatchSize(BatchSize),
+		zipkin.HTTPMaxBacklog(MaxBackLog),
+		zipkin.HTTPBatchInterval(time.Duration(BatchTimeInterval)*time.Second))
+	defer collector.Close()
+	if err != nil {
+		log.Fatalf("Error intializing zipkin http collector: %v\n", err)
+	}
+
+	tracer, err := zipkin.NewTracer(
+		zipkin.NewRecorder(collector, false, "127.0.0.1:0", "trivial"))
+
+	if err != nil {
+		log.Fatalf("Error: %v\n", err)
+	}
+
+	log.Printf("Writing %d spans to zipkin server at %s\n", SpanCount, hostname)
+	for i := 0; i < SpanCount; i++ {
+		parent := tracer.StartSpan("Parent")
+		parent.LogEvent(fmt.Sprintf("Trace%d", i))
+		parent.Finish()
+	}
+	log.Println("Done. Flushing remaining spans...")
+}
diff --git a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
new file mode 100644
index 000000000..5a65384d4
--- /dev/null
+++ b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
@@ -0,0 +1,153 @@
+/*
+A small cli utility meant to convert json to zipkin thrift binary format, and
+vice versa.
+
+To convert from json to thrift,
+the json is unmarshalled, converted to zipkincore.Span structures, and
+marshalled into thrift binary protocol. The json must be in an array format (even if it only has one object),
+because the tool automatically tries to unmarshall the json into an array of structs.
+
+To convert from thrift to json,
+the opposite process must happen. The thrift binary data must be read into an array of
+zipkin span structures, and those spans must be marshalled into json.
+
+Usage:
+
+./thrift_serialize -input <input-file> -output <output-file> -deserialize<true|false>
+
+If `deserialize` is set to true (false by default), the tool will interpret the input file as
+thrift, and write it as json to the output file.
+Otherwise, the input file will be interpreted as json, and the output will be encoded as thrift.
+
+
+*/
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+
+	"github.com/apache/thrift/lib/go/thrift"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+var (
+	filename    string
+	outFileName string
+	inputType   string
+)
+
+const usage = `./json_serialize -input <input> -output output -input-type<json|thrift>`
+
+func init() {
+	flag.StringVar(&filename, "input", "", usage)
+	flag.StringVar(&outFileName, "output", "", usage)
+	flag.StringVar(&inputType, "input-type", "thrift", usage)
+}
+
+func main() {
+	flag.Parse()
+	contents, err := ioutil.ReadFile(filename)
+	if err != nil {
+		log.Fatalf("Error reading file: %v\n", err)
+	}
+
+	switch inputType {
+	case "json":
+		raw, err := jsonToZipkinThrift(contents)
+		if err != nil {
+			log.Fatalf("%v\n", err)
+		}
+		ioutil.WriteFile(outFileName, raw, 0644)
+	case "thrift":
+		raw, err := thriftToJSONSpans(contents)
+		if err != nil {
+			log.Fatalf("%v\n", err)
+		}
+		ioutil.WriteFile(outFileName, raw, 0644)
+	default:
+		log.Fatalf("Unsupported input type")
+	}
+}
+
+func jsonToZipkinThrift(jsonRaw []byte) ([]byte, error) {
+	if len(jsonRaw) == 0 {
+		return nil, errors.New("no data")
+	}
+
+	if string(jsonRaw)[0] != '[' {
+		return nil, errors.New("cannot unmarshal non array type")
+	}
+
+	var spans []*zipkincore.Span
+	err := json.Unmarshal(jsonRaw, &spans)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshalling: %v", err)
+	}
+
+	var zspans []*zipkincore.Span
+	if err != nil {
+		return nil, err
+	}
+	zspans = append(zspans, spans...)
+
+	fmt.Println(spans)
+
+	buf := thrift.NewTMemoryBuffer()
+	transport := thrift.NewTBinaryProtocolTransport(buf)
+
+	if err = transport.WriteListBegin(thrift.STRUCT, len(spans)); err != nil {
+		return nil, fmt.Errorf("error in beginning thrift write: %v", err)
+	}
+
+	for _, span := range zspans {
+		err = span.Write(transport)
+		if err != nil {
+			return nil, fmt.Errorf("error converting zipkin struct to thrift: %v", err)
+		}
+	}
+
+	if err = transport.WriteListEnd(); err != nil {
+		return nil, fmt.Errorf("error finishing thrift write: %v", err)
+	}
+
+	return buf.Bytes(), nil
+}
+
+func thriftToJSONSpans(thriftData []byte) ([]byte, error) {
+	buffer := thrift.NewTMemoryBuffer()
+	if _, err := buffer.Write(thriftData); err != nil {
+		err = fmt.Errorf("error in buffer write: %v", err)
+		return nil, err
+	}
+
+	transport := thrift.NewTBinaryProtocolTransport(buffer)
+	_, size, err := transport.ReadListBegin()
+	if err != nil {
+		err = fmt.Errorf("error in ReadListBegin: %v", err)
+		return nil, err
+	}
+
+	var spans []*zipkincore.Span
+	for i := 0; i < size; i++ {
+		zs := &zipkincore.Span{}
+		if err = zs.Read(transport); err != nil {
+			err = fmt.Errorf("Error reading into zipkin struct: %v", err)
+			return nil, err
+		}
+		spans = append(spans, zs)
+	}
+
+	err = transport.ReadListEnd()
+	if err != nil {
+		err = fmt.Errorf("error ending thrift read: %v", err)
+		return nil, err
+	}
+
+	out, _ := json.MarshalIndent(spans, "", "    ")
+	return out, nil
+}
diff --git a/plugins/inputs/zipkin/convert.go b/plugins/inputs/zipkin/convert.go
new file mode 100644
index 000000000..dad099771
--- /dev/null
+++ b/plugins/inputs/zipkin/convert.go
@@ -0,0 +1,249 @@
+package zipkin
+
+import (
+	"encoding/binary"
+	"fmt"
+	"net"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+// DefaultServiceName when the span does not have any serviceName
+const DefaultServiceName = "unknown"
+
+//now is a moackable time for now
+var now = time.Now
+
+// LineProtocolConverter implements the Recorder interface; it is a
+// type meant to encapsulate the storage of zipkin tracing data in
+// telegraf as line protocol.
+type LineProtocolConverter struct {
+	acc telegraf.Accumulator
+}
+
+// NewLineProtocolConverter returns an instance of LineProtocolConverter that
+// will add to the given telegraf.Accumulator
+func NewLineProtocolConverter(acc telegraf.Accumulator) *LineProtocolConverter {
+	return &LineProtocolConverter{
+		acc: acc,
+	}
+}
+
+// Record is LineProtocolConverter's implementation of the Record method of
+// the Recorder interface; it takes a trace as input, and adds it to an internal
+// telegraf.Accumulator.
+func (l *LineProtocolConverter) Record(t Trace) error {
+	for _, s := range t {
+		fields := map[string]interface{}{
+			"duration_ns": s.Duration.Nanoseconds(),
+		}
+		tags := map[string]string{
+			"id":           s.ID,
+			"parent_id":    s.ParentID,
+			"trace_id":     s.TraceID,
+			"name":         s.Name,
+			"service_name": s.ServiceName,
+		}
+		l.acc.AddFields("zipkin", fields, tags, s.Timestamp)
+
+		for _, a := range s.Annotations {
+			tags := map[string]string{
+				"id":            s.ID,
+				"parent_id":     s.ParentID,
+				"trace_id":      s.TraceID,
+				"name":          s.Name,
+				"service_name":  a.ServiceName,
+				"annotation":    a.Value,
+				"endpoint_host": a.Host,
+			}
+			l.acc.AddFields("zipkin", fields, tags, s.Timestamp)
+		}
+
+		for _, b := range s.BinaryAnnotations {
+			tags := map[string]string{
+				"id":             s.ID,
+				"parent_id":      s.ParentID,
+				"trace_id":       s.TraceID,
+				"name":           s.Name,
+				"service_name":   b.ServiceName,
+				"annotation":     b.Value,
+				"endpoint_host":  b.Host,
+				"annotation_key": b.Key,
+			}
+			l.acc.AddFields("zipkin", fields, tags, s.Timestamp)
+		}
+	}
+
+	return nil
+}
+
+func (l *LineProtocolConverter) Error(err error) {
+	l.acc.AddError(err)
+}
+
+// NewTrace converts a slice of []*zipkincore.Spans into a new Trace
+func NewTrace(spans []*zipkincore.Span) Trace {
+	trace := make(Trace, len(spans))
+	for i, span := range spans {
+		endpoint := serviceEndpoint(span.GetAnnotations(), span.GetBinaryAnnotations())
+		trace[i] = Span{
+			ID:                formatID(span.GetID()),
+			TraceID:           formatTraceID(span.GetTraceIDHigh(), span.GetTraceID()),
+			Name:              span.GetName(),
+			Timestamp:         guessTimestamp(span),
+			Duration:          convertDuration(span),
+			ParentID:          parentID(span),
+			ServiceName:       serviceName(endpoint),
+			Annotations:       NewAnnotations(span.GetAnnotations(), endpoint),
+			BinaryAnnotations: NewBinaryAnnotations(span.GetBinaryAnnotations(), endpoint),
+		}
+	}
+	return trace
+}
+
+// NewAnnotations converts a slice of *zipkincore.Annotation into a slice
+// of new Annotations
+func NewAnnotations(annotations []*zipkincore.Annotation, endpoint *zipkincore.Endpoint) []Annotation {
+	formatted := make([]Annotation, len(annotations))
+	for i, annotation := range annotations {
+		formatted[i] = Annotation{
+			Host:        host(endpoint),
+			ServiceName: serviceName(endpoint),
+			Timestamp:   microToTime(annotation.GetTimestamp()),
+			Value:       annotation.GetValue(),
+		}
+	}
+
+	return formatted
+}
+
+// NewBinaryAnnotations is very similar to NewAnnotations, but it
+// converts zipkincore.BinaryAnnotations instead of the normal zipkincore.Annotation
+func NewBinaryAnnotations(annotations []*zipkincore.BinaryAnnotation, endpoint *zipkincore.Endpoint) []BinaryAnnotation {
+	formatted := make([]BinaryAnnotation, len(annotations))
+	for i, annotation := range annotations {
+		formatted[i] = BinaryAnnotation{
+			Host:        host(endpoint),
+			ServiceName: serviceName(endpoint),
+			Key:         annotation.GetKey(),
+			Value:       string(annotation.GetValue()),
+			Type:        annotation.GetAnnotationType().String(),
+		}
+	}
+	return formatted
+}
+
+func microToTime(micro int64) time.Time {
+	return time.Unix(0, micro*int64(time.Microsecond)).UTC()
+}
+
+func formatID(id int64) string {
+	return strconv.FormatInt(id, 10)
+}
+
+func formatTraceID(high, low int64) string {
+	if high == 0 {
+		return fmt.Sprintf("%x", low)
+	}
+	return fmt.Sprintf("%x%016x", high, low)
+}
+
+func minMax(span *zipkincore.Span) (time.Time, time.Time) {
+	min := now().UTC()
+	max := time.Time{}.UTC()
+	for _, annotation := range span.Annotations {
+		ts := microToTime(annotation.GetTimestamp())
+		if !ts.IsZero() && ts.Before(min) {
+			min = ts
+		}
+		if !ts.IsZero() && ts.After(max) {
+			max = ts
+		}
+	}
+	if max.IsZero() {
+		max = min
+	}
+	return min, max
+}
+
+func guessTimestamp(span *zipkincore.Span) time.Time {
+	if span.GetTimestamp() != 0 {
+		return microToTime(span.GetTimestamp())
+	}
+	min, _ := minMax(span)
+	return min
+}
+
+func convertDuration(span *zipkincore.Span) time.Duration {
+	duration := time.Duration(span.GetDuration()) * time.Microsecond
+	if duration != 0 {
+		return duration
+	}
+	min, max := minMax(span)
+	return max.Sub(min)
+}
+
+func parentID(span *zipkincore.Span) string {
+	// A parent ID of 0 means that this is a parent span. In this case,
+	// we set the parent ID of the span to be its own id, so it points to
+	// itself.
+	id := span.GetParentID()
+	if id != 0 {
+		return formatID(id)
+	}
+	return formatID(span.ID)
+}
+
+func ipv4(addr int32) string {
+	buf := make([]byte, 4)
+	binary.BigEndian.PutUint32(buf, uint32(addr))
+	return net.IP(buf).String()
+}
+
+func host(h *zipkincore.Endpoint) string {
+	if h == nil {
+		return ipv4(int32(0))
+	}
+	if h.GetPort() == 0 {
+		return ipv4(h.GetIpv4())
+	}
+	// Zipkin uses a signed int16 for the port, but, warns us that they actually treat it
+	// as an unsigned int16. So, we convert from int16 to int32 followed by taking & 0xffff
+	// to convert from signed to unsigned
+	// https://github.com/openzipkin/zipkin/blob/57dc2ec9c65fe6144e401c0c933b4400463a69df/zipkin/src/main/java/zipkin/Endpoint.java#L44
+	return ipv4(h.GetIpv4()) + ":" + strconv.FormatInt(int64(int(h.GetPort())&0xffff), 10)
+}
+
+func serviceName(h *zipkincore.Endpoint) string {
+	if h == nil {
+		return DefaultServiceName
+	}
+	return h.GetServiceName()
+}
+
+func serviceEndpoint(ann []*zipkincore.Annotation, bann []*zipkincore.BinaryAnnotation) *zipkincore.Endpoint {
+	for _, a := range ann {
+		switch a.Value {
+		case zipkincore.SERVER_RECV, zipkincore.SERVER_SEND, zipkincore.CLIENT_RECV, zipkincore.CLIENT_SEND:
+			if a.Host != nil && a.Host.ServiceName != "" {
+				return a.Host
+			}
+		}
+	}
+
+	for _, a := range bann {
+		if a.Key == zipkincore.LOCAL_COMPONENT && a.Host != nil && a.Host.ServiceName != "" {
+			return a.Host
+		}
+	}
+	// Unable to find any "standard" endpoint host, so, use any that exist in the regular annotations
+	for _, a := range ann {
+		if a.Host != nil && a.Host.ServiceName != "" {
+			return a.Host
+		}
+	}
+	return nil
+}
diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go
new file mode 100644
index 000000000..b5c543073
--- /dev/null
+++ b/plugins/inputs/zipkin/convert_test.go
@@ -0,0 +1,544 @@
+package zipkin
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+func TestLineProtocolConverter_Record(t *testing.T) {
+	mockAcc := testutil.Accumulator{}
+	type fields struct {
+		acc telegraf.Accumulator
+	}
+	type args struct {
+		t Trace
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantErr bool
+		want    []testutil.Metric
+	}{
+		{
+			name: "threespan",
+			fields: fields{
+				acc: &mockAcc,
+			},
+			args: args{
+				t: Trace{
+					Span{
+						ID:          "8090652509916334619",
+						TraceID:     "2505404965370368069",
+						Name:        "Child",
+						ParentID:    "22964302721410078",
+						Timestamp:   time.Unix(0, 1498688360851331000).UTC(),
+						Duration:    time.Duration(53106) * time.Microsecond,
+						ServiceName: "trivial",
+						Annotations: []Annotation{},
+						BinaryAnnotations: []BinaryAnnotation{
+							BinaryAnnotation{
+								Key:         "lc",
+								Value:       "dHJpdmlhbA==",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+								Type:        "STRING",
+							},
+						},
+					},
+					Span{
+						ID:          "103618986556047333",
+						TraceID:     "2505404965370368069",
+						Name:        "Child",
+						ParentID:    "22964302721410078",
+						Timestamp:   time.Unix(0, 1498688360904552000).UTC(),
+						Duration:    time.Duration(50410) * time.Microsecond,
+						ServiceName: "trivial",
+						Annotations: []Annotation{},
+						BinaryAnnotations: []BinaryAnnotation{
+							BinaryAnnotation{
+								Key:         "lc",
+								Value:       "dHJpdmlhbA==",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+								Type:        "STRING",
+							},
+						},
+					},
+					Span{
+						ID:          "22964302721410078",
+						TraceID:     "2505404965370368069",
+						Name:        "Parent",
+						ParentID:    "22964302721410078",
+						Timestamp:   time.Unix(0, 1498688360851318000).UTC(),
+						Duration:    time.Duration(103680) * time.Microsecond,
+						ServiceName: "trivial",
+						Annotations: []Annotation{
+							Annotation{
+								Timestamp:   time.Unix(0, 1498688360851325000).UTC(),
+								Value:       "Starting child #0",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+							},
+							Annotation{
+								Timestamp:   time.Unix(0, 1498688360904545000).UTC(),
+								Value:       "Starting child #1",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+							},
+							Annotation{
+								Timestamp:   time.Unix(0, 1498688360954992000).UTC(),
+								Value:       "A Log",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+							},
+						},
+						BinaryAnnotations: []BinaryAnnotation{
+							BinaryAnnotation{
+								Key:         "lc",
+								Value:       "dHJpdmlhbA==",
+								Host:        "2130706433:0",
+								ServiceName: "trivial",
+								Type:        "STRING",
+							},
+						},
+					},
+				},
+			},
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "8090652509916334619",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "2505404965370368069",
+						"service_name": "trivial",
+						"name":         "Child",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851331000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":             "8090652509916334619",
+						"parent_id":      "22964302721410078",
+						"trace_id":       "2505404965370368069",
+						"name":           "Child",
+						"service_name":   "trivial",
+						"annotation":     "dHJpdmlhbA==",
+						"endpoint_host":  "2130706433:0",
+						"annotation_key": "lc",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851331000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "103618986556047333",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "2505404965370368069",
+						"service_name": "trivial",
+						"name":         "Child",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360904552000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":             "103618986556047333",
+						"parent_id":      "22964302721410078",
+						"trace_id":       "2505404965370368069",
+						"name":           "Child",
+						"service_name":   "trivial",
+						"annotation":     "dHJpdmlhbA==",
+						"endpoint_host":  "2130706433:0",
+						"annotation_key": "lc",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360904552000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "22964302721410078",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "2505404965370368069",
+						"service_name": "trivial",
+						"name":         "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"service_name":  "trivial",
+						"annotation":    "Starting child #0",
+						"endpoint_host": "2130706433:0",
+						"id":            "22964302721410078",
+						"parent_id":     "22964302721410078",
+						"trace_id":      "2505404965370368069",
+						"name":          "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"service_name":  "trivial",
+						"annotation":    "Starting child #1",
+						"endpoint_host": "2130706433:0",
+						"id":            "22964302721410078",
+						"parent_id":     "22964302721410078",
+						"trace_id":      "2505404965370368069",
+						"name":          "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"parent_id":     "22964302721410078",
+						"trace_id":      "2505404965370368069",
+						"name":          "Parent",
+						"service_name":  "trivial",
+						"annotation":    "A Log",
+						"endpoint_host": "2130706433:0",
+						"id":            "22964302721410078",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"trace_id":       "2505404965370368069",
+						"service_name":   "trivial",
+						"annotation":     "dHJpdmlhbA==",
+						"annotation_key": "lc",
+						"id":             "22964302721410078",
+						"parent_id":      "22964302721410078",
+						"name":           "Parent",
+						"endpoint_host":  "2130706433:0",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+			},
+			wantErr: false,
+		},
+
+		//// Test data from distributed trace repo sample json
+		// https://github.com/mattkanwisher/distributedtrace/blob/master/testclient/sample.json
+		{
+			name: "distributed_trace_sample",
+			fields: fields{
+				acc: &mockAcc,
+			},
+			args: args{
+				t: Trace{
+					Span{
+						ID:          "6802735349851856000",
+						TraceID:     "0:6802735349851856000",
+						Name:        "main.dud",
+						ParentID:    "6802735349851856000",
+						Timestamp:   time.Unix(1, 0).UTC(),
+						Duration:    1,
+						ServiceName: "trivial",
+						Annotations: []Annotation{
+							Annotation{
+								Timestamp:   time.Unix(0, 1433330263415871000).UTC(),
+								Value:       "cs",
+								Host:        "0:9410",
+								ServiceName: "go-zipkin-testclient",
+							},
+						},
+						BinaryAnnotations: []BinaryAnnotation{},
+					},
+				},
+			},
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "6802735349851856000",
+						"parent_id":    "6802735349851856000",
+						"trace_id":     "0:6802735349851856000",
+						"name":         "main.dud",
+						"service_name": "trivial",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(1) * time.Nanosecond).Nanoseconds(),
+					},
+					Time: time.Unix(1, 0).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "cs",
+						"endpoint_host": "0:9410",
+						"id":            "6802735349851856000",
+						"parent_id":     "6802735349851856000",
+						"trace_id":      "0:6802735349851856000",
+						"name":          "main.dud",
+						"service_name":  "go-zipkin-testclient",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(1) * time.Nanosecond).Nanoseconds(),
+					},
+					Time: time.Unix(1, 0).UTC(),
+				},
+			},
+		},
+	}
+	for i, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mockAcc.ClearMetrics()
+			l := &LineProtocolConverter{
+				acc: tt.fields.acc,
+			}
+			if err := l.Record(tt.args.t); (err != nil) != tt.wantErr {
+				t.Errorf("LineProtocolConverter.Record() error = %v, wantErr %v", err, tt.wantErr)
+			}
+			got := []testutil.Metric{}
+			for _, metric := range mockAcc.Metrics {
+				got = append(got, *metric)
+			}
+			if !cmp.Equal(got, tt.want) {
+				t.Errorf("LineProtocolConverter.Record()/%s/%d error = %s ", tt.name, i, cmp.Diff(got, tt.want))
+			}
+		})
+	}
+}
+
+func Test_microToTime(t *testing.T) {
+	type args struct {
+		micro int64
+	}
+	tests := []struct {
+		name string
+		args args
+		want time.Time
+	}{
+		{
+			name: "given zero micro seconds expected unix time zero",
+			args: args{
+				micro: 0,
+			},
+			want: time.Unix(0, 0).UTC(),
+		},
+		{
+			name: "given a million micro seconds expected unix time one",
+			args: args{
+				micro: 1000000,
+			},
+			want: time.Unix(1, 0).UTC(),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := microToTime(tt.args.micro); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("microToTime() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func newAnnotation(micro int64) *zipkincore.Annotation {
+	return &zipkincore.Annotation{
+		Timestamp: micro,
+	}
+}
+
+func Test_minMax(t *testing.T) {
+	type args struct {
+		span *zipkincore.Span
+	}
+	tests := []struct {
+		name    string
+		args    args
+		now     func() time.Time
+		wantMin time.Time
+		wantMax time.Time
+	}{
+		{
+			name: "Single annotation",
+			args: args{
+				span: &zipkincore.Span{
+					Annotations: []*zipkincore.Annotation{
+						newAnnotation(1000000),
+					},
+				},
+			},
+			wantMin: time.Unix(1, 0).UTC(),
+			wantMax: time.Unix(1, 0).UTC(),
+		},
+		{
+			name: "Three annotations",
+			args: args{
+				span: &zipkincore.Span{
+					Annotations: []*zipkincore.Annotation{
+						newAnnotation(1000000),
+						newAnnotation(2000000),
+						newAnnotation(3000000),
+					},
+				},
+			},
+			wantMin: time.Unix(1, 0).UTC(),
+			wantMax: time.Unix(3, 0).UTC(),
+		},
+		{
+			name: "Annotations are in the future",
+			args: args{
+				span: &zipkincore.Span{
+					Annotations: []*zipkincore.Annotation{
+						newAnnotation(3000000),
+					},
+				},
+			},
+			wantMin: time.Unix(2, 0).UTC(),
+			wantMax: time.Unix(3, 0).UTC(),
+			now: func() time.Time {
+				return time.Unix(2, 0).UTC()
+			},
+		},
+		{
+			name: "No Annotations",
+			args: args{
+				span: &zipkincore.Span{
+					Annotations: []*zipkincore.Annotation{},
+				},
+			},
+			wantMin: time.Unix(2, 0).UTC(),
+			wantMax: time.Unix(2, 0).UTC(),
+			now: func() time.Time {
+				return time.Unix(2, 0).UTC()
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.now != nil {
+				now = tt.now
+			}
+			got, got1 := minMax(tt.args.span)
+			if !reflect.DeepEqual(got, tt.wantMin) {
+				t.Errorf("minMax() got = %v, want %v", got, tt.wantMin)
+			}
+			if !reflect.DeepEqual(got1, tt.wantMax) {
+				t.Errorf("minMax() got1 = %v, want %v", got1, tt.wantMax)
+			}
+			now = time.Now
+		})
+	}
+}
+
+func Test_host(t *testing.T) {
+	type args struct {
+		h *zipkincore.Endpoint
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Host Found",
+			args: args{
+				h: &zipkincore.Endpoint{
+					Ipv4: 1234,
+					Port: 8888,
+				},
+			},
+			want: "0.0.4.210:8888",
+		},
+		{
+			name: "No Host",
+			args: args{
+				h: nil,
+			},
+			want: "0.0.0.0",
+		},
+		{
+			name: "int overflow zipkin uses an int16 type as an unsigned int 16.",
+			args: args{
+				h: &zipkincore.Endpoint{
+					Ipv4: 1234,
+					Port: -1,
+				},
+			},
+			want: "0.0.4.210:65535",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := host(tt.args.h); got != tt.want {
+				t.Errorf("host() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_serviceName(t *testing.T) {
+	type args struct {
+		h *zipkincore.Endpoint
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Found ServiceName",
+			args: args{
+				h: &zipkincore.Endpoint{
+					ServiceName: "zipkin",
+				},
+			},
+			want: "zipkin",
+		},
+		{
+			name: "No ServiceName",
+			args: args{
+				h: nil,
+			},
+			want: "unknown",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := serviceName(tt.args.h); got != tt.want {
+				t.Errorf("serviceName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/plugins/inputs/zipkin/handler.go b/plugins/inputs/zipkin/handler.go
new file mode 100644
index 000000000..d9bd07828
--- /dev/null
+++ b/plugins/inputs/zipkin/handler.go
@@ -0,0 +1,135 @@
+package zipkin
+
+import (
+	"compress/gzip"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"sync"
+
+	"github.com/apache/thrift/lib/go/thrift"
+	"github.com/gorilla/mux"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+// SpanHandler is an implementation of a Handler which accepts zipkin thrift
+// span data and sends it to the recorder
+type SpanHandler struct {
+	Path      string
+	recorder  Recorder
+	waitGroup *sync.WaitGroup
+}
+
+// NewSpanHandler returns a new server instance given path to handle
+func NewSpanHandler(path string) *SpanHandler {
+	return &SpanHandler{
+		Path: path,
+	}
+}
+
+func cors(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if origin := r.Header.Get("Origin"); origin != "" {
+			w.Header().Set(`Access-Control-Allow-Origin`, origin)
+			w.Header().Set(`Access-Control-Allow-Methods`, strings.Join([]string{
+				`OPTIONS`,
+				`POST`,
+			}, ", "))
+
+			w.Header().Set(`Access-Control-Allow-Headers`, strings.Join([]string{
+				`Accept`,
+				`Accept-Encoding`,
+				`Content-Length`,
+				`Content-Type`,
+			}, ", "))
+
+			w.Header().Set(`Access-Control-Expose-Headers`, strings.Join([]string{
+				`Date`,
+			}, ", "))
+		}
+
+		if r.Method == "OPTIONS" {
+			return
+		}
+
+		next.ServeHTTP(w, r)
+	}
+}
+
+// Register implements the Service interface. Register accepts zipkin thrift data
+// POSTed to the path of the mux router
+func (s *SpanHandler) Register(router *mux.Router, recorder Recorder) error {
+	handler := cors(http.HandlerFunc(s.Spans))
+	router.Handle(s.Path, handler).Methods("POST", "OPTIONS")
+	s.recorder = recorder
+	return nil
+}
+
+// Spans handles zipkin thrift spans
+func (s *SpanHandler) Spans(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	body := r.Body
+	var err error
+	// Handle gzip decoding of the body
+	if r.Header.Get("Content-Encoding") == "gzip" {
+		body, err = gzip.NewReader(r.Body)
+		if err != nil {
+			s.recorder.Error(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		defer body.Close()
+	}
+
+	octets, err := ioutil.ReadAll(body)
+	if err != nil {
+		s.recorder.Error(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	spans, err := unmarshalThrift(octets)
+	if err != nil {
+		s.recorder.Error(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	trace := NewTrace(spans)
+
+	if err = s.recorder.Record(trace); err != nil {
+		s.recorder.Error(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}
+
+func unmarshalThrift(body []byte) ([]*zipkincore.Span, error) {
+	buffer := thrift.NewTMemoryBuffer()
+	if _, err := buffer.Write(body); err != nil {
+		return nil, err
+	}
+
+	transport := thrift.NewTBinaryProtocolTransport(buffer)
+	_, size, err := transport.ReadListBegin()
+	if err != nil {
+		return nil, err
+	}
+
+	spans := make([]*zipkincore.Span, size)
+	for i := 0; i < size; i++ {
+		zs := &zipkincore.Span{}
+		if err = zs.Read(transport); err != nil {
+			return nil, err
+		}
+		spans[i] = zs
+	}
+
+	if err = transport.ReadListEnd(); err != nil {
+		return nil, err
+	}
+
+	return spans, nil
+}
diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go
new file mode 100644
index 000000000..0946d982f
--- /dev/null
+++ b/plugins/inputs/zipkin/handler_test.go
@@ -0,0 +1,136 @@
+package zipkin
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+type MockRecorder struct {
+	Data Trace
+	Err  error
+}
+
+func (m *MockRecorder) Record(t Trace) error {
+	m.Data = t
+	return nil
+}
+
+func (m *MockRecorder) Error(err error) {
+	m.Err = err
+}
+
+func TestSpanHandler(t *testing.T) {
+	dat, err := ioutil.ReadFile("testdata/threespans.dat")
+	if err != nil {
+		t.Fatalf("Could not find file %s\n", "testdata/threespans.dat")
+	}
+
+	w := httptest.NewRecorder()
+	r := httptest.NewRequest(
+		"POST",
+		"http://server.local/api/v1/spans",
+		ioutil.NopCloser(
+			bytes.NewReader(dat)))
+
+	handler := NewSpanHandler("/api/v1/spans")
+	mockRecorder := &MockRecorder{}
+	handler.recorder = mockRecorder
+
+	handler.Spans(w, r)
+	if w.Code != http.StatusNoContent {
+		t.Errorf("MainHandler did not return StatusNoContent %d", w.Code)
+	}
+
+	got := mockRecorder.Data
+
+	parentID := strconv.FormatInt(22964302721410078, 10)
+	want := Trace{
+		Span{
+			Name:        "Child",
+			ID:          "8090652509916334619",
+			TraceID:     "22c4fc8ab3669045",
+			ParentID:    parentID,
+			Timestamp:   time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(),
+			Duration:    time.Duration(53106) * time.Microsecond,
+			ServiceName: "trivial",
+			Annotations: []Annotation{},
+			BinaryAnnotations: []BinaryAnnotation{
+				BinaryAnnotation{
+					Key:         "lc",
+					Value:       "trivial",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+					Type:        "STRING",
+				},
+			},
+		},
+		Span{
+			Name:        "Child",
+			ID:          "103618986556047333",
+			TraceID:     "22c4fc8ab3669045",
+			ParentID:    parentID,
+			Timestamp:   time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(),
+			Duration:    time.Duration(50410) * time.Microsecond,
+			ServiceName: "trivial",
+			Annotations: []Annotation{},
+			BinaryAnnotations: []BinaryAnnotation{
+				BinaryAnnotation{
+					Key:         "lc",
+					Value:       "trivial",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+					Type:        "STRING",
+				},
+			},
+		},
+		Span{
+			Name:        "Parent",
+			ID:          "22964302721410078",
+			TraceID:     "22c4fc8ab3669045",
+			ParentID:    "22964302721410078",
+			Timestamp:   time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(),
+			Duration:    time.Duration(103680) * time.Microsecond,
+			ServiceName: "trivial",
+			Annotations: []Annotation{
+				Annotation{
+					Timestamp:   time.Unix(0, 1498688360851325*int64(time.Microsecond)).UTC(),
+					Value:       "Starting child #0",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+				},
+				Annotation{
+					Timestamp:   time.Unix(0, 1498688360904545*int64(time.Microsecond)).UTC(),
+					Value:       "Starting child #1",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+				},
+				Annotation{
+					Timestamp:   time.Unix(0, 1498688360954992*int64(time.Microsecond)).UTC(),
+					Value:       "A Log",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+				},
+			},
+			BinaryAnnotations: []BinaryAnnotation{
+				BinaryAnnotation{
+					Key:         "lc",
+					Value:       "trivial",
+					Host:        "127.0.0.1",
+					ServiceName: "trivial",
+					Type:        "STRING",
+				},
+			},
+		},
+	}
+
+	if !cmp.Equal(got, want) {
+		t.Fatalf("Got != Want\n %s", cmp.Diff(got, want))
+	}
+}
diff --git a/plugins/inputs/zipkin/testdata/cli_microservice.dat b/plugins/inputs/zipkin/testdata/cli_microservice.dat
new file mode 100644
index 0000000000000000000000000000000000000000..585d6b111c420b397af9c2a9fa694c89116cbbf2
GIT binary patch
literal 3937
zcmdT{&1=(O7=PEaUHUPn$XHd79F(D8yB3*aGG&y`O*VAvWEa0;`eH-VBumn6_2S8!
zNB;qD%I@<js2~V#Cl5P#5f6gM4k`$OzRB|@ZMrl|wu4w`q2YO+_xbq!e(#esLWoJC
zKIZO^fm<I+=TnFwPvS*I7I-6xqS@~^W`93@wv$A$%MVs2zizyHJc#0HViO@=D7JL;
z$#nWp3PsE(f}TbUOCFmc%tsK75hM{I$2>D*n`=JigNQXxiKnb^iK=0!S(P`c;LGL&
zE5jTM`KD2{*SQdYwE{FW3H(o*e<yM|NfCIds_4eVSblUgA2#ZMim{e8{bjz6A#}ot
z88o+quJUrWCdw6v5GVb@vJuohWtCRPMpdB!m@B2Fpx)3~vjjMN&`BR!vUi*$87;*@
zl1$wCq-K&Rt-aQFPJi4io1=H*izzqi1YG4e&yW9{Umo)VSB6e3Ah@=Mp^S(S0$l%h
z|GgO!%ju2!e(7<d2R*`sJSaCDSY;#!Rxj55VYS$h39Nbx)h_@?s>n+c2O8%iL2bpd
zRmbup*!6Luy443$iAVw*X=-2?Dt&Qkes#OEW?OmPd^%Kb6_vUw;kAVZ)>@<o7Za76
zqqY7bq1Niw*qQj*a&(t&SGR4hP~CorP#@9lZ&yLLqk2;)bO`s`N47oXmbblIxg$Cc
zUdii3WA1CXyfEi#1PwAY4u^J_rBIZJ$zf0w=a<|r(A(IGSt|seESKg=#U)O|f~aDh
zn_j#&&k2fByGOp<@=R&5#2Jbz3fv?&vZ`oOg{vraQRWR%kw?7p>1qNcS(j3<8rGGD
zCg8vk($<ZkW34F)^up+<IB=K{<nkU8t;fnnRWvI8q~Am1kOTu)s<*ep&FZ#;(>r@`
z6C~dTBf+Ju{uGzy76SLkv2}_w-4|z${rgk4eJ~tf`ULhz=3AvExoD?kSurdm0I$7k
zrm&8ABOz{%6l;M8m<0Q>SfMD0R<RZwM*S`XSwszdbhL(BdFVjA$x98K59L|_SC$ac
zT>4NTxU_cxQ@{?oa1L+S1MdRJY+JbU9l|yI(zfpch})h{I1+xs?l|BdV#03sPPy;3
zIrXMddo9oG(5mgV+{ShHag=tOBeuP7SKaa+WOwyG7rGQ+dG&MOV|y)lBHLX*owl_^
zw_h+k)+fI_x?V55_ou?{mCP^ZJ~ZB4nWNGf^7=*>^NkBZ;AKm*?_&PhCY3K-9F^Xj
fvh9PAkom_XgyUINQ`TDN3<Xl}t+U;YZ|mJ(ar|qu

literal 0
HcmV?d00001

diff --git a/plugins/inputs/zipkin/testdata/distributed_trace_sample.dat b/plugins/inputs/zipkin/testdata/distributed_trace_sample.dat
new file mode 100644
index 0000000000000000000000000000000000000000..9ce376f11738e8b9ee3a27b08246aa0ea86601a8
GIT binary patch
literal 191
zcmd;KU|?Y6VqlER&^{#da!vy`12a&BBR4TKPcNl3g^Pg&Cd1Fb#sidM0xD);6`yTt
z6l2fLzyuOWF6Loi<^T!<0UHC8${~m$BI)_MRhb3ZnR&V;sl_G9Ihm<>B@7G*{SGkw
SMWpEGXW#(2186lTBLe__wj%KW

literal 0
HcmV?d00001

diff --git a/plugins/inputs/zipkin/testdata/json/cli_microservice.json b/plugins/inputs/zipkin/testdata/json/cli_microservice.json
new file mode 100644
index 000000000..af9446b4a
--- /dev/null
+++ b/plugins/inputs/zipkin/testdata/json/cli_microservice.json
@@ -0,0 +1,407 @@
+[
+    {
+        "trace_id": 243463817635710260,
+        "name": "Concat",
+        "id": 3383422996321511664,
+        "parent_id": 4574092882326506380,
+        "annotations": [
+            {
+                "timestamp": 1499817952283903,
+                "value": "cs",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "timestamp": 1499817952286792,
+                "value": "cr",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "http.path",
+                "value": "L2NvbmNhdC8=",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.url",
+                "value": "aHR0cDovL2xvY2FsaG9zdDo2MTAwMS9jb25jYXQv",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "peer.hostname",
+                "value": "bG9jYWxob3N0",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "span.kind",
+                "value": "Y2xpZW50",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.method",
+                "value": "R0VU",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.host",
+                "value": "bG9jYWxob3N0OjYxMDAx",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "timestamp": 1499817952283903,
+        "duration": 2888,
+        "trace_id_high": 8269862291023777619
+    },
+    {
+        "trace_id": 243463817635710260,
+        "name": "Sum",
+        "id": 6036416808826525494,
+        "parent_id": 4574092882326506380,
+        "annotations": [
+            {
+                "timestamp": 1499817952286828,
+                "value": "cs",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "timestamp": 1499817952333847,
+                "value": "cr",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "span.kind",
+                "value": "Y2xpZW50",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.method",
+                "value": "R0VU",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.host",
+                "value": "bG9jYWxob3N0OjYxMDAx",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.path",
+                "value": "L3N1bS8=",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "http.url",
+                "value": "aHR0cDovL2xvY2FsaG9zdDo2MTAwMS9zdW0v",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "key": "peer.hostname",
+                "value": "bG9jYWxob3N0",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "timestamp": 1499817952286828,
+        "duration": 47019,
+        "trace_id_high": 8269862291023777619
+    },
+    {
+        "trace_id": 243463817635710260,
+        "name": "Run",
+        "id": 4574092882326506380,
+        "annotations": [
+            {
+                "timestamp": 1499817952283897,
+                "value": "Call Concat",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            },
+            {
+                "timestamp": 1499817952286824,
+                "value": "Call Sum",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "lc",
+                "value": "Y2xp",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 0,
+                    "port": 0,
+                    "service_name": "cli"
+                }
+            }
+        ],
+        "timestamp": 1499817952283881,
+        "duration": 50014,
+        "trace_id_high": 8269862291023777619
+    }
+]
+
+[
+    {
+        "trace_id": 243463817635710260,
+        "name": "myComplexQuery",
+        "id": 4254041670140233539,
+        "parent_id": 8633460035494236932,
+        "annotations": [
+            {
+                "timestamp": 1499817952307418,
+                "value": "cs",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "timestamp": 1499817952331909,
+                "value": "cr",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "sa",
+                "value": "UG9zdGdyZVNRTA==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 5432,
+                    "service_name": "PostgreSQL",
+                    "ipv6": "AAAAAAAAAAAAAAAAAAAAAQ=="
+                }
+            },
+            {
+                "key": "query",
+                "value": "U0VMRUNUIHJlY2lwZXMgRlJPTSBjb29rYm9vayBXSEVSRSB0b3BpYyA9ICd3b3JsZCBkb21pbmF0aW9uJw==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "span.kind",
+                "value": "cmVzb3VyY2U=",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "peer.service",
+                "value": "UG9zdGdyZVNRTA==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "peer.hostname",
+                "value": "bG9jYWxob3N0",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "peer.port",
+                "value": "AAAVOA==",
+                "annotation_type": "I32",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            }
+        ],
+        "timestamp": 1499817952307418,
+        "duration": 24491,
+        "trace_id_high": 8269862291023777619
+    },
+    {
+        "trace_id": 243463817635710260,
+        "name": "Sum",
+        "id": 8633460035494236932,
+        "parent_id": 6036416808826525494,
+        "annotations": [
+            {
+                "timestamp": 1499817952287147,
+                "value": "sr",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "timestamp": 1499817952333348,
+                "value": "ss",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "timestamp": 1499817952296675,
+                "value": "MyEventAnnotation",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "span.kind",
+                "value": "c2VydmVy",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "serverSide",
+                "value": "aGVyZQ==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "service",
+                "value": "c3ZjMg==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "key1",
+                "value": "dmFsdWUx",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            },
+            {
+                "key": "key2",
+                "value": "AAAAAgAAAAA=",
+                "annotation_type": "I32",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": -4534,
+                    "service_name": "svc2"
+                }
+            }
+        ],
+        "trace_id_high": 8269862291023777619
+    }
+]
diff --git a/plugins/inputs/zipkin/testdata/json/distributed_trace_sample.json b/plugins/inputs/zipkin/testdata/json/distributed_trace_sample.json
new file mode 100644
index 000000000..b41eaccf4
--- /dev/null
+++ b/plugins/inputs/zipkin/testdata/json/distributed_trace_sample.json
@@ -0,0 +1,30 @@
+[{
+  "trace_id": 6802735349851856000,
+  "name": "main.dud",
+  "id": 6802735349851856000,
+  "parent_id": null,
+  "annotations": [
+    {
+      "timestamp": 1433330263415871,
+      "value": "cs",
+      "host": {
+        "ipv4": 0,
+        "port": 9410,
+        "service_name": "go-zipkin-testclient"
+      },
+      "duration": null
+    },
+    {
+      "timestamp": 1433330263415872,
+      "value": "cr",
+      "host": {
+        "ipv4": 0,
+        "port": 9410,
+        "service_name": "go-zipkin-testclient"
+      },
+      "duration": null
+    }
+  ],
+  "binary_annotations": [],
+  "debug": true
+}]
diff --git a/plugins/inputs/zipkin/testdata/json/threespans.json b/plugins/inputs/zipkin/testdata/json/threespans.json
new file mode 100644
index 000000000..5809977df
--- /dev/null
+++ b/plugins/inputs/zipkin/testdata/json/threespans.json
@@ -0,0 +1,92 @@
+[
+    {
+        "trace_id": 2505404965370368069,
+        "name": "Child",
+        "id": 8090652509916334619,
+        "parent_id": 22964302721410078,
+        "annotations": [],
+        "binary_annotations": [
+            {
+                "key": "lc",
+                "value": "dHJpdmlhbA==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            }
+        ],
+        "timestamp": 1498688360851331,
+        "duration": 53106
+    },
+    {
+        "trace_id": 2505404965370368069,
+        "name": "Child",
+        "id": 103618986556047333,
+        "parent_id": 22964302721410078,
+        "annotations": [],
+        "binary_annotations": [
+            {
+                "key": "lc",
+                "value": "dHJpdmlhbA==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            }
+        ],
+        "timestamp": 1498688360904552,
+        "duration": 50410
+    },
+    {
+        "trace_id": 2505404965370368069,
+        "name": "Parent",
+        "id": 22964302721410078,
+        "annotations": [
+            {
+                "timestamp": 1498688360851325,
+                "value": "Starting child #0",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            },
+            {
+                "timestamp": 1498688360904545,
+                "value": "Starting child #1",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            },
+            {
+                "timestamp": 1498688360954992,
+                "value": "A Log",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            }
+        ],
+        "binary_annotations": [
+            {
+                "key": "lc",
+                "value": "dHJpdmlhbA==",
+                "annotation_type": "STRING",
+                "host": {
+                    "ipv4": 2130706433,
+                    "port": 0,
+                    "service_name": "trivial"
+                }
+            }
+        ],
+        "timestamp": 1498688360851318,
+        "duration": 103680
+    }
+]
diff --git a/plugins/inputs/zipkin/testdata/threespans.dat b/plugins/inputs/zipkin/testdata/threespans.dat
new file mode 100644
index 0000000000000000000000000000000000000000..3fe5fb2ef0714d1968157cc3639fbf754ed5d788
GIT binary patch
literal 616
zcmd;KU|?Y8VqjD{@~3Na+5}f_24<iLt8+$XP6`(TOM&~*>1FG?q`4Sa83L!iOtMUo
z<7Z&w0V-kOXW#(QjNA;2K#D0RnVW$L$Y3ui$}G!F%;5kV1XRkx!N6D#RL2IAh8Pc1
z!@$4=gsj0llM|LVa{(p6;CvBK5SN1(3lv_5uGs&S)(%Q6&wxAV$SX_-u>~X+rRJ3Y
zg9t5LK!FMMQY|Dz1cOTwi%K%{(iM_Hp{k&4z{9|dKTsehB$g-QFu{;W6OwESASSRn
VD){856VOHF7%hVZAmda91^{IfXEFc)

literal 0
HcmV?d00001

diff --git a/plugins/inputs/zipkin/zipkin.go b/plugins/inputs/zipkin/zipkin.go
new file mode 100644
index 000000000..597ae0b27
--- /dev/null
+++ b/plugins/inputs/zipkin/zipkin.go
@@ -0,0 +1,182 @@
+package zipkin
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"strconv"
+	"sync"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const (
+	// DefaultPort is the default port zipkin listens on, which zipkin implementations
+	// expect.
+	DefaultPort = 9411
+
+	// DefaultRoute is the default route zipkin uses, and zipkin implementations
+	// expect.
+	DefaultRoute = "/api/v1/spans"
+
+	// DefaultShutdownTimeout is the max amount of time telegraf will wait
+	// for the plugin to shutdown
+	DefaultShutdownTimeout = 5
+)
+
+// Recorder represents a type which can record zipkin trace data as well as
+// any accompanying errors, and process that data.
+type Recorder interface {
+	Record(Trace) error
+	Error(error)
+}
+
+// Handler represents a type which can register itself with a router for
+// http routing, and a Recorder for trace data collection.
+type Handler interface {
+	Register(router *mux.Router, recorder Recorder) error
+}
+
+// BinaryAnnotation represents a zipkin binary annotation. It contains
+// all of the same fields as might be found in its zipkin counterpart.
+type BinaryAnnotation struct {
+	Key         string
+	Value       string
+	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
+	ServiceName string
+	Type        string
+}
+
+// Annotation represents an ordinary zipkin annotation. It contains the data fields
+// which will become fields/tags in influxdb
+type Annotation struct {
+	Timestamp   time.Time
+	Value       string
+	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
+	ServiceName string
+}
+
+//Span represents a specific zipkin span. It holds the majority of the same
+// data as a zipkin span sent via the thrift protocol, but is presented in a
+// format which is more straightforward for storage purposes.
+type Span struct {
+	ID                string
+	TraceID           string // zipkin traceid high concat with traceid
+	Name              string
+	ParentID          string
+	ServiceName       string
+	Timestamp         time.Time // If zipkin input is nil then time.Now()
+	Duration          time.Duration
+	Annotations       []Annotation
+	BinaryAnnotations []BinaryAnnotation
+}
+
+// Trace is an array (or a series) of spans
+type Trace []Span
+
+const sampleConfig = `
+  # path = "/api/v1/spans" # URL path for span data
+  # port = 9411            # Port on which Telegraf listens
+`
+
+// Zipkin is a telegraf configuration structure for the zipkin input plugin,
+// but it also contains fields for the management of a separate, concurrent
+// zipkin http server
+type Zipkin struct {
+	ServiceAddress string
+	Port           int
+	Path           string
+
+	address   string
+	handler   Handler
+	server    *http.Server
+	waitGroup *sync.WaitGroup
+}
+
+// Description is a necessary method implementation from telegraf.ServiceInput
+func (z Zipkin) Description() string {
+	return "This plugin implements the Zipkin http server to gather trace and timing data needed to troubleshoot latency problems in microservice architectures."
+}
+
+// SampleConfig is a  necessary  method implementation from telegraf.ServiceInput
+func (z Zipkin) SampleConfig() string {
+	return sampleConfig
+}
+
+// Gather is empty for the zipkin plugin; all gathering is done through
+// the separate goroutine launched in (*Zipkin).Start()
+func (z *Zipkin) Gather(acc telegraf.Accumulator) error { return nil }
+
+// Start launches a separate goroutine for collecting zipkin client http requests,
+// passing in a telegraf.Accumulator such that data can be collected.
+func (z *Zipkin) Start(acc telegraf.Accumulator) error {
+	z.handler = NewSpanHandler(z.Path)
+
+	var wg sync.WaitGroup
+	z.waitGroup = &wg
+
+	router := mux.NewRouter()
+	converter := NewLineProtocolConverter(acc)
+	z.handler.Register(router, converter)
+
+	z.server = &http.Server{
+		Handler: router,
+	}
+
+	addr := ":" + strconv.Itoa(z.Port)
+	ln, err := net.Listen("tcp", addr)
+	if err != nil {
+		return err
+	}
+
+	z.address = ln.Addr().String()
+	log.Printf("I! Started the zipkin listener on %s", z.address)
+
+	go func() {
+		wg.Add(1)
+		defer wg.Done()
+
+		z.Listen(ln, acc)
+	}()
+
+	return nil
+}
+
+// Stop shuts the internal http server down with via context.Context
+func (z *Zipkin) Stop() {
+	ctx, cancel := context.WithTimeout(context.Background(), DefaultShutdownTimeout)
+
+	defer z.waitGroup.Wait()
+	defer cancel()
+
+	z.server.Shutdown(ctx)
+}
+
+// Listen creates an http server on the zipkin instance it is called with, and
+// serves http until it is stopped by Zipkin's (*Zipkin).Stop()  method.
+func (z *Zipkin) Listen(ln net.Listener, acc telegraf.Accumulator) {
+	if err := z.server.Serve(ln); err != nil {
+		// Because of the clean shutdown in `(*Zipkin).Stop()`
+		// We're expecting a server closed error at some point
+		// So we don't want to display it as an error.
+		// This interferes with telegraf's internal data collection,
+		// by making it appear as if a serious error occurred.
+		if err != http.ErrServerClosed {
+			acc.AddError(fmt.Errorf("E! Error listening: %v", err))
+		}
+	}
+}
+
+func init() {
+	inputs.Add("zipkin", func() telegraf.Input {
+		return &Zipkin{
+			Path: DefaultRoute,
+			Port: DefaultPort,
+		}
+	})
+}
diff --git a/plugins/inputs/zipkin/zipkin_test.go b/plugins/inputs/zipkin/zipkin_test.go
new file mode 100644
index 000000000..9447e67d4
--- /dev/null
+++ b/plugins/inputs/zipkin/zipkin_test.go
@@ -0,0 +1,289 @@
+package zipkin
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestZipkinPlugin(t *testing.T) {
+	mockAcc := testutil.Accumulator{}
+
+	tests := []struct {
+		name           string
+		thriftDataFile string //path name to a binary thrift data file which contains test data
+		wantErr        bool
+		want           []testutil.Metric
+	}{
+		{
+			name:           "threespan",
+			thriftDataFile: "testdata/threespans.dat",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "8090652509916334619",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "22c4fc8ab3669045",
+						"service_name": "trivial",
+						"name":         "Child",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851331000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":             "8090652509916334619",
+						"parent_id":      "22964302721410078",
+						"trace_id":       "22c4fc8ab3669045",
+						"name":           "Child",
+						"service_name":   "trivial",
+						"annotation":     "trivial", //base64: dHJpdmlhbA==
+						"endpoint_host":  "127.0.0.1",
+						"annotation_key": "lc",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851331000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "103618986556047333",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "22c4fc8ab3669045",
+						"service_name": "trivial",
+						"name":         "Child",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360904552000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":             "103618986556047333",
+						"parent_id":      "22964302721410078",
+						"trace_id":       "22c4fc8ab3669045",
+						"name":           "Child",
+						"service_name":   "trivial",
+						"annotation":     "trivial", //base64: dHJpdmlhbA==
+						"endpoint_host":  "127.0.0.1",
+						"annotation_key": "lc",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360904552000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "22964302721410078",
+						"parent_id":    "22964302721410078",
+						"trace_id":     "22c4fc8ab3669045",
+						"service_name": "trivial",
+						"name":         "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"service_name":  "trivial",
+						"annotation":    "Starting child #0",
+						"endpoint_host": "127.0.0.1",
+						"id":            "22964302721410078",
+						"parent_id":     "22964302721410078",
+						"trace_id":      "22c4fc8ab3669045",
+						"name":          "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"service_name":  "trivial",
+						"annotation":    "Starting child #1",
+						"endpoint_host": "127.0.0.1",
+						"id":            "22964302721410078",
+						"parent_id":     "22964302721410078",
+						"trace_id":      "22c4fc8ab3669045",
+						"name":          "Parent",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"parent_id":     "22964302721410078",
+						"trace_id":      "22c4fc8ab3669045",
+						"name":          "Parent",
+						"service_name":  "trivial",
+						"annotation":    "A Log",
+						"endpoint_host": "127.0.0.1",
+						"id":            "22964302721410078",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"trace_id":       "22c4fc8ab3669045",
+						"service_name":   "trivial",
+						"annotation":     "trivial", //base64: dHJpdmlhbA==
+						"annotation_key": "lc",
+						"id":             "22964302721410078",
+						"parent_id":      "22964302721410078",
+						"name":           "Parent",
+						"endpoint_host":  "127.0.0.1",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1498688360851318000).UTC(),
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:           "distributed_trace_sample",
+			thriftDataFile: "testdata/distributed_trace_sample.dat",
+			want: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "6802735349851856000",
+						"parent_id":    "6802735349851856000",
+						"trace_id":     "5e682bc21ce99c80",
+						"service_name": "go-zipkin-testclient",
+						"name":         "main.dud",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(1) * time.Microsecond).Nanoseconds(),
+					},
+					//Time: time.Unix(1, 0).UTC(),
+					Time: time.Unix(0, 1433330263415871*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "cs",
+						"endpoint_host": "0.0.0.0:9410",
+						"id":            "6802735349851856000",
+						"parent_id":     "6802735349851856000",
+						"trace_id":      "5e682bc21ce99c80",
+						"name":          "main.dud",
+						"service_name":  "go-zipkin-testclient",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(1) * time.Microsecond).Nanoseconds(),
+					},
+					//Time: time.Unix(1, 0).UTC(),
+					Time: time.Unix(0, 1433330263415871*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "cr",
+						"endpoint_host": "0.0.0.0:9410",
+						"id":            "6802735349851856000",
+						"parent_id":     "6802735349851856000",
+						"trace_id":      "5e682bc21ce99c80",
+						"name":          "main.dud",
+						"service_name":  "go-zipkin-testclient",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": (time.Duration(1) * time.Microsecond).Nanoseconds(),
+					},
+					Time: time.Unix(0, 1433330263415871*int64(time.Microsecond)).UTC(),
+				},
+			},
+		},
+	}
+
+	z := &Zipkin{
+		Path: "/api/v1/spans",
+		Port: 0,
+	}
+
+	err := z.Start(&mockAcc)
+	if err != nil {
+		t.Fatal("Failed to start zipkin server")
+	}
+
+	defer z.Stop()
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mockAcc.ClearMetrics()
+			if err := postThriftData(tt.thriftDataFile, z.address); err != nil {
+				t.Fatalf("Posting data to http endpoint /api/v1/spans failed. Error: %s\n", err)
+			}
+			mockAcc.Wait(len(tt.want)) //Since the server is running concurrently, we need to wait for the number of data points we want to test to be added to the Accumulator.
+			if len(mockAcc.Errors) > 0 != tt.wantErr {
+				t.Fatalf("Got unexpected errors. want error = %v, errors = %v\n", tt.wantErr, mockAcc.Errors)
+			}
+
+			var got []testutil.Metric
+			for _, m := range mockAcc.Metrics {
+				got = append(got, *m)
+			}
+
+			if !cmp.Equal(tt.want, got) {
+				t.Fatalf("Got != Want\n %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+	mockAcc.ClearMetrics()
+	z.Stop()
+	// Make sure there is no erroneous error on shutdown
+	if len(mockAcc.Errors) != 0 {
+		t.Fatal("Expected no errors on shutdown")
+	}
+}
+
+func postThriftData(datafile, address string) error {
+	dat, err := ioutil.ReadFile(datafile)
+	if err != nil {
+		return fmt.Errorf("could not read from data file %s", datafile)
+	}
+
+	req, err := http.NewRequest("POST", fmt.Sprintf("http://%s/api/v1/spans", address), bytes.NewReader(dat))
+
+	if err != nil {
+		return fmt.Errorf("HTTP request creation failed")
+	}
+
+	req.Header.Set("Content-Type", "application/x-thrift")
+	client := &http.Client{}
+	_, err = client.Do(req)
+	if err != nil {
+		return fmt.Errorf("HTTP POST request to zipkin endpoint %s failed %v", address, err)
+	}
+
+	return nil
+}

From 360d03e301a05fc9a733cb0ebb96c206b6e968f7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 2 Aug 2017 18:02:41 -0700
Subject: [PATCH 0428/1302] Update changelog and readme

---
 CHANGELOG.md | 2 ++
 README.md    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5beb3f76..dc469d3b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
 - [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
+- [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
 
 ### Features
 
@@ -48,6 +49,7 @@
 - [#3054](https://github.com/influxdata/telegraf/pull/3054): Add redis_version field to redis input.
 - [#3063](https://github.com/influxdata/telegraf/pull/3063): Add tls options to docker input.
 - [#2387](https://github.com/influxdata/telegraf/pull/2387): Add histogram aggregator plugin.
+- [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9f7485748..eb4473e77 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,7 @@ configuration options.
 * [mailchimp](./plugins/inputs/mailchimp)
 * [memcached](./plugins/inputs/memcached)
 * [mesos](./plugins/inputs/mesos)
+* [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
 * [mysql](./plugins/inputs/mysql)
 * [net_response](./plugins/inputs/net_response)
@@ -146,6 +147,7 @@ configuration options.
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
+* [openldap](./plugins/inputs/openldap)
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
@@ -202,6 +204,7 @@ Telegraf can also collect metrics via the following service plugins:
   * [mandrill](./plugins/inputs/webhooks/mandrill)
   * [rollbar](./plugins/inputs/webhooks/rollbar)
   * [papertrail](./plugins/inputs/webhooks/papertrail)
+* [zipkin](./plugins/inputs/zipkin)
 
 Telegraf is able to parse the following input data formats into metrics, these
 formats may be used with input plugins supporting the `data_format` option:
@@ -220,6 +223,7 @@ formats may be used with input plugins supporting the `data_format` option:
 ## Aggregator Plugins
 
 * [minmax](./plugins/aggregators/minmax)
+* [histogram](./plugins/aggregators/histogram)
 
 ## Output Plugins
 

From 795f02ab88d9a4b044471d090e236a9c0505f7c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 3 Aug 2017 11:54:05 -0700
Subject: [PATCH 0429/1302] Cleanup Makefile (#3089)

---
 Godeps                          | 16 +++++-
 Godeps_windows                  | 11 ----
 Makefile                        | 90 ++++++++++++++-------------------
 README.md                       | 22 ++++----
 appveyor.yml                    |  2 +-
 docs/LICENSE_OF_DEPENDENCIES.md | 15 +++++-
 scripts/circle-test.sh          | 11 ++--
 7 files changed, 82 insertions(+), 85 deletions(-)
 delete mode 100644 Godeps_windows

diff --git a/Godeps b/Godeps
index 45da5486d..0fb97bc8a 100644
--- a/Godeps
+++ b/Godeps
@@ -1,6 +1,4 @@
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
-github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
@@ -21,21 +19,26 @@ github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
 github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
+github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
 github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
 github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
 github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
+github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
+github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8
+github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
+github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
@@ -49,6 +52,7 @@ github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0
 github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
 github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
 github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
+github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
 github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
@@ -57,8 +61,13 @@ github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
 github.com/shirou/gopsutil 9a4a9167ad3b4355dbf1c2c7a0f5f0d3fb1e9ab9
+github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
+github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
+github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
+github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
+github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
@@ -67,11 +76,14 @@ github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
 golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
+golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
+gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
 gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
+gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
 gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/Godeps_windows b/Godeps_windows
deleted file mode 100644
index 129fce1a2..000000000
--- a/Godeps_windows
+++ /dev/null
@@ -1,11 +0,0 @@
-github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
-github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
-golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
-github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
-github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
-github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
-gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
diff --git a/Makefile b/Makefile
index 092715237..6e9a2b28b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+PREFIX := /usr/local
 VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
@@ -7,48 +8,51 @@ else
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 endif
 
+TELEGRAF := telegraf$(shell go tool dist env | grep -q 'GOOS=.windows.' && echo .exe)
+
 LDFLAGS := -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
 ifdef VERSION
 	LDFLAGS += -X main.version=$(VERSION)
 endif
 
 
-# Standard Telegraf build
-default: prepare build
+all: | deps telegraf
 
-# Windows build
-windows: prepare-windows build-windows
+deps:
+	go get github.com/sparrc/gdm
+	gdm restore
 
-# Only run the build (no dependency grabbing)
-build:
-	go install -ldflags "$(LDFLAGS)" ./...
+telegraf:
+	go build -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
 
-build-windows:
-	GOOS=windows GOARCH=amd64 go build -o telegraf.exe \
-		 -ldflags "$(LDFLAGS)" \
-		./cmd/telegraf/telegraf.go
+go-install:
+	go install -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
-build-for-docker:
-	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf \
-		 -ldflags "$(LDFLAGS)" \
-		./cmd/telegraf/telegraf.go
+install: telegraf
+	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+	cp $(TELEGRAF) $(DESTDIR)$(PREFIX)/bin/
+
+test:
+	go test -short ./...
+
+test-windows:
+	go test ./plugins/inputs/ping/...
+	go test ./plugins/inputs/win_perf_counters/...
+
+lint:
+	go vet ./...
+
+test-all: lint
+	go test ./...
 
-# run package script
 package:
 	./scripts/build.py --package --version="$(VERSION)" --platform=linux --arch=all --upload
 
-# Get dependencies and use gdm to checkout changesets
-prepare:
-	go get github.com/sparrc/gdm
-	gdm restore
+clean:
+	-rm -f telegraf
+	-rm -f telegraf.exe
 
-# Use the windows godeps file to prepare dependencies
-prepare-windows:
-	go get github.com/sparrc/gdm
-	gdm restore
-	gdm restore -f Godeps_windows
-
-# Run all docker containers necessary for unit tests
+# Run all docker containers necessary for integration tests
 docker-run:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
 	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
@@ -76,7 +80,8 @@ docker-run:
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
 
-# Run docker containers necessary for CircleCI unit tests
+# Run docker containers necessary for integration tests; skipping services provided
+# by CircleCI
 docker-run-circle:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
 	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
@@ -99,28 +104,11 @@ docker-run-circle:
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
 
-# Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch openldap
-	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql zookeeper kafka mqtt riemann nats elasticsearch openldap
+	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
+		openldap postgres rabbitmq redis riemann zookeeper
+	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
+		openldap postgres rabbitmq redis riemann zookeeper
 
-# Run full unit tests using docker containers (includes setup and teardown)
-test: vet docker-kill docker-run
-	# Sleeping for kafka leadership election, TSDB setup, etc.
-	sleep 60
-	# SUCCESS, running tests
-	go test -race ./...
-
-# Run "short" unit tests
-test-short: vet
-	go test -short ./...
-
-# Run windows specific tests
-test-windows: vet
-	go test ./plugins/inputs/ping/...
-	go test ./plugins/inputs/win_perf_counters/...
-
-vet:
-	go vet ./...
-
-.PHONY: test test-short vet build default
+.PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
+	package clean docker-run docker-run-circle docker-kill
diff --git a/README.md b/README.md
index eb4473e77..9e72a8f52 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ which is installed by the Makefile if you don't have it already.
 
 1. [Install Go](https://golang.org/doc/install)
 2. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH)
-3. Run `go get github.com/influxdata/telegraf`
+3. Run `go get -d github.com/influxdata/telegraf`
 4. Run `cd $GOPATH/src/github.com/influxdata/telegraf`
 5. Run `make`
 
@@ -57,37 +57,37 @@ which is installed by the Makefile if you don't have it already.
 See usage with:
 
 ```
-telegraf --help
+./telegraf --help
 ```
 
 #### Generate a telegraf config file:
 
 ```
-telegraf config > telegraf.conf
+./telegraf config > telegraf.conf
 ```
 
-#### Generate config with only cpu input & influxdb output plugins defined
+#### Generate config with only cpu input & influxdb output plugins defined:
 
 ```
-telegraf --input-filter cpu --output-filter influxdb config
+./telegraf --input-filter cpu --output-filter influxdb config
 ```
 
-#### Run a single telegraf collection, outputing metrics to stdout
+#### Run a single telegraf collection, outputing metrics to stdout:
 
 ```
-telegraf --config telegraf.conf --test
+./telegraf --config telegraf.conf --test
 ```
 
-#### Run telegraf with all plugins defined in config file
+#### Run telegraf with all plugins defined in config file:
 
 ```
-telegraf --config telegraf.conf
+./telegraf --config telegraf.conf
 ```
 
-#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins
+#### Run telegraf, enabling the cpu & memory input, and influxdb output plugins:
 
 ```
-telegraf --config telegraf.conf -input-filter cpu:mem --output-filter influxdb
+./telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
 ```
 
 
diff --git a/appveyor.yml b/appveyor.yml
index 736c0dc7b..430b3563f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ install:
   - go env
 
 build_script:
-  - cmd: C:\GnuWin32\bin\make windows
+  - cmd: C:\GnuWin32\bin\make
 
 test_script:
   - cmd: C:\GnuWin32\bin\make test-windows
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 44fce6cda..3774d34ce 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -1,7 +1,7 @@
 # Licenses of dependencies
 
-When distributed in a binary form, Telegraf contains portions of the following
-works:
+When distributed in a binary form, Telegraf may contain portions of the
+following works:
 
 - collectd.org [MIT](https://github.com/collectd/go-collectd/blob/master/LICENSE)
 - github.com/aerospike/aerospike-client-go [APACHE](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
@@ -32,6 +32,8 @@ works:
 - github.com/golang/snappy [BSD](https://github.com/golang/snappy/blob/master/LICENSE)
 - github.com/go-logfmt/logfmt [MIT](https://github.com/go-logfmt/logfmt/blob/master/LICENSE)
 - github.com/gorilla/mux [BSD](https://github.com/gorilla/mux/blob/master/LICENSE)
+- github.com/go-ini/ini [APACHE](https://github.com/go-ini/ini/blob/master/LICENSE)
+- github.com/go-ole/go-ole [MPL](http://mattn.mit-license.org/2013)
 - github.com/go-sql-driver/mysql [MPL](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
 - github.com/hailocab/go-hostpool [MIT](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
 - github.com/hashicorp/consul [MPL](https://github.com/hashicorp/consul/blob/master/LICENSE)
@@ -42,11 +44,13 @@ works:
 - github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
 - github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
 - github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
+- github.com/jmespath/go-jmespath [APACHE](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)
 - github.com/kardianos/osext [BSD](https://github.com/kardianos/osext/blob/master/LICENSE)
 - github.com/kardianos/service [ZLIB](https://github.com/kardianos/service/blob/master/LICENSE) (License not named but matches word for word with ZLib)
 - github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
 - github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
+- github.com/Microsoft/go-winio [MIT](https://github.com/Microsoft/go-winio/blob/master/LICENSE)
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
 - github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
@@ -60,6 +64,7 @@ works:
 - github.com/pierrec/lz4 [BSD](https://github.com/pierrec/lz4/blob/master/LICENSE)
 - github.com/pierrec/xxHash [BSD](https://github.com/pierrec/xxHash/blob/master/LICENSE)
 - github.com/pkg/errors [BSD](https://github.com/pkg/errors/blob/master/LICENSE)
+- github.com/pmezard/go-difflib [BSD](https://github.com/pmezard/go-difflib/blob/master/LICENSE)
 - github.com/prometheus/client_golang [APACHE](https://github.com/prometheus/client_golang/blob/master/LICENSE)
 - github.com/prometheus/client_model [APACHE](https://github.com/prometheus/client_model/blob/master/LICENSE)
 - github.com/prometheus/common [APACHE](https://github.com/prometheus/common/blob/master/LICENSE)
@@ -68,8 +73,11 @@ works:
 - github.com/samuel/go-zookeeper [BSD](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
 - github.com/satori/go.uuid [MIT](https://github.com/satori/go.uuid/blob/master/LICENSE)
 - github.com/shirou/gopsutil [BSD](https://github.com/shirou/gopsutil/blob/master/LICENSE)
+- github.com/shirou/w32 [BSD](https://github.com/shirou/w32/blob/master/LICENSE)
 - github.com/Shopify/sarama [MIT](https://github.com/Shopify/sarama/blob/master/MIT-LICENSE)
 - github.com/Sirupsen/logrus [MIT](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
+- github.com/StackExchange/wmi [MIT](https://github.com/StackExchange/wmi/blob/master/LICENSE)
+- github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/soniah/gosnmp [BSD](https://github.com/soniah/gosnmp/blob/master/LICENSE)
 - github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
@@ -82,10 +90,13 @@ works:
 - golang.org/x/crypto [BSD](https://github.com/golang/crypto/blob/master/LICENSE)
 - golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
 - golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
+- golang.org/x/sys [BSD](https://go.googlesource.com/sys/+/master/LICENSE)
 - gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
+- gopkg.in/fsnotify.v1 [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
 - gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
 - gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)
+- gopkg.in/tomb.v1 [BSD](https://github.com/go-tomb/tomb/blob/v1/LICENSE)
 - gopkg.in/yaml.v2 [APACHE](https://github.com/go-yaml/yaml/blob/v2/LICENSE)
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 662aa6c28..459a03ecf 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -62,17 +62,14 @@ exit_if_fail go test -race ./...
 
 # Simple Integration Tests
 #   check that version was properly set
-exit_if_fail "telegraf -version | grep $VERSION"
+exit_if_fail "./telegraf -version | grep $VERSION"
 #   check that one test cpu & mem output work
 tmpdir=$(mktemp -d)
-telegraf -sample-config > $tmpdir/config.toml
-exit_if_fail telegraf -config $tmpdir/config.toml \
+./telegraf -sample-config > $tmpdir/config.toml
+exit_if_fail ./telegraf -config $tmpdir/config.toml \
     -test -input-filter cpu:mem
 
-cat $GOPATH/bin/telegraf | gzip > $CIRCLE_ARTIFACTS/telegraf.gz
-go build -o telegraf-race -race -ldflags "-X main.version=${VERSION}-RACE" cmd/telegraf/telegraf.go
-cat telegraf-race | gzip > $CIRCLE_ARTIFACTS/telegraf-race.gz
-
+gzip telegraf -c "$CIRCLE_ARTIFACTS/telegraf.gz"
 
 if git describe --exact-match HEAD; then
     # install fpm (packaging dependency)

From e21f2de8b83452608d847da47b09a2b22fedec98 Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Mon, 7 Aug 2017 23:36:15 +0200
Subject: [PATCH 0430/1302] Add Windows Services input plugin (#3023)

---
 Godeps                                        |   2 +-
 Makefile                                      |   1 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/win_services/README.md         |  68 +++++++
 plugins/inputs/win_services/win_services.go   | 183 ++++++++++++++++++
 .../win_services_integration_test.go          | 115 +++++++++++
 .../win_services/win_services_notwindows.go   |   3 +
 .../inputs/win_services/win_services_test.go  | 179 +++++++++++++++++
 8 files changed, 551 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/win_services/README.md
 create mode 100644 plugins/inputs/win_services/win_services.go
 create mode 100644 plugins/inputs/win_services/win_services_integration_test.go
 create mode 100644 plugins/inputs/win_services/win_services_notwindows.go
 create mode 100644 plugins/inputs/win_services/win_services_test.go

diff --git a/Godeps b/Godeps
index 0fb97bc8a..48f9138e8 100644
--- a/Godeps
+++ b/Godeps
@@ -76,7 +76,7 @@ github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
 golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
-golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
+golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
diff --git a/Makefile b/Makefile
index 6e9a2b28b..9e92de04e 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ test:
 test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
+	go test ./plugins/inputs/win_services/...
 
 lint:
 	go vet ./...
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 84c320fed..dd3c178d9 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -88,6 +88,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/varnish"
 	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
+	_ "github.com/influxdata/telegraf/plugins/inputs/win_services"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zipkin"
 	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
diff --git a/plugins/inputs/win_services/README.md b/plugins/inputs/win_services/README.md
new file mode 100644
index 000000000..4aa9e6b86
--- /dev/null
+++ b/plugins/inputs/win_services/README.md
@@ -0,0 +1,68 @@
+# Telegraf Plugin: win_services
+Input plugin to report Windows services info.
+
+It requires that Telegraf must be running under the administrator privileges.
+### Configuration:
+
+```toml
+[[inputs.win_services]]
+  ## Names of the services to monitor. Leave empty to monitor all the available services on the host
+  service_names = [
+    "LanmanServer",
+    "TermService",
+  ]
+```
+
+### Measurements & Fields:
+
+- win_services
+    - state : integer
+    - startup_mode : integer
+
+The `state` field can have the following values:
+- 1 - stopped
+- 2 - start pending
+- 3 - stop pending
+- 4 - running
+- 5 - continue pending
+- 6 - pause pending 
+- 7 - paused
+
+The `startup_mode` field can have the following values:
+- 0 - boot start
+- 1 - system start
+- 2 - auto start
+- 3 - demand start
+- 4 - disabled   
+
+### Tags:
+
+- All measurements have the following tags:
+    - service_name
+    - display_name
+
+### Example Output:
+```
+* Plugin: inputs.win_services, Collection 1
+> win_services,host=WIN2008R2H401,display_name=Server,service_name=LanmanServer state=4i,startup_mode=2i 1500040669000000000
+> win_services,display_name=Remote\ Desktop\ Services,service_name=TermService,host=WIN2008R2H401 state=1i,startup_mode=3i 1500040669000000000
+```
+### TICK Scripts
+
+A sample TICK script for a notification about a not running service.
+It sends a notification whenever any service changes its state to be not _running_ and when it changes that state back to _running_. 
+The notification is sent via an HTTP POST call.
+
+```
+stream
+    |from()
+        .database('telegraf')
+        .retentionPolicy('autogen')
+        .measurement('win_services')
+        .groupBy('host','service_name')
+    |alert()
+        .crit(lambda: "state" != 4)
+        .stateChangesOnly()
+        .message('Service {{ index .Tags "service_name" }} on Host {{ index .Tags "host" }} is in state {{ index .Fields "state" }} ')
+        .post('http://localhost:666/alert/service')
+```
diff --git a/plugins/inputs/win_services/win_services.go b/plugins/inputs/win_services/win_services.go
new file mode 100644
index 000000000..8e56a96d0
--- /dev/null
+++ b/plugins/inputs/win_services/win_services.go
@@ -0,0 +1,183 @@
+// +build windows
+
+package win_services
+
+import (
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+//WinService provides interface for svc.Service
+type WinService interface {
+	Close() error
+	Config() (mgr.Config, error)
+	Query() (svc.Status, error)
+}
+
+//WinServiceManagerProvider sets interface for acquiring manager instance, like mgr.Mgr
+type WinServiceManagerProvider interface {
+	Connect() (WinServiceManager, error)
+}
+
+//WinServiceManager provides interface for mgr.Mgr
+type WinServiceManager interface {
+	Disconnect() error
+	OpenService(name string) (WinService, error)
+	ListServices() ([]string, error)
+}
+
+//WinSvcMgr is wrapper for mgr.Mgr implementing WinServiceManager interface
+type WinSvcMgr struct {
+	realMgr *mgr.Mgr
+}
+
+func (m *WinSvcMgr) Disconnect() error {
+	return m.realMgr.Disconnect()
+}
+
+func (m *WinSvcMgr) OpenService(name string) (WinService, error) {
+	return m.realMgr.OpenService(name)
+}
+func (m *WinSvcMgr) ListServices() ([]string, error) {
+	return m.realMgr.ListServices()
+}
+
+//MgProvider is an implementation of WinServiceManagerProvider interface returning WinSvcMgr
+type MgProvider struct {
+}
+
+func (rmr *MgProvider) Connect() (WinServiceManager, error) {
+	scmgr, err := mgr.Connect()
+	if err != nil {
+		return nil, err
+	} else {
+		return &WinSvcMgr{scmgr}, nil
+	}
+}
+
+var sampleConfig = `
+  ## Names of the services to monitor. Leave empty to monitor all the available services on the host
+  service_names = [
+    "LanmanServer",
+    "TermService",
+  ]
+`
+
+var description = "Input plugin to report Windows services info."
+
+//WinServices is an implementation if telegraf.Input interface, providing info about Windows Services
+type WinServices struct {
+	ServiceNames []string `toml:"service_names"`
+	mgrProvider  WinServiceManagerProvider
+}
+
+type ServiceInfo struct {
+	ServiceName string
+	DisplayName string
+	State       int
+	StartUpMode int
+	Error       error
+}
+
+func (m *WinServices) Description() string {
+	return description
+}
+
+func (m *WinServices) SampleConfig() string {
+	return sampleConfig
+}
+
+func (m *WinServices) Gather(acc telegraf.Accumulator) error {
+
+	serviceInfos, err := listServices(m.mgrProvider, m.ServiceNames)
+
+	if err != nil {
+		return err
+	}
+
+	for _, service := range serviceInfos {
+		if service.Error == nil {
+			fields := make(map[string]interface{})
+			tags := make(map[string]string)
+
+			//display name could be empty, but still valid service
+			if len(service.DisplayName) > 0 {
+				tags["display_name"] = service.DisplayName
+			}
+			tags["service_name"] = service.ServiceName
+
+			fields["state"] = service.State
+			fields["startup_mode"] = service.StartUpMode
+
+			acc.AddFields("win_services", fields, tags)
+		} else {
+			acc.AddError(service.Error)
+		}
+	}
+
+	return nil
+}
+
+//listServices gathers info about given services. If userServices is empty, it return info about all services on current Windows host.  Any a critical error is returned.
+func listServices(mgrProv WinServiceManagerProvider, userServices []string) ([]ServiceInfo, error) {
+	scmgr, err := mgrProv.Connect()
+	if err != nil {
+		return nil, fmt.Errorf("Could not open service manager: %s", err)
+	}
+	defer scmgr.Disconnect()
+
+	var serviceNames []string
+	if len(userServices) == 0 {
+		//Listing service names from system
+		serviceNames, err = scmgr.ListServices()
+		if err != nil {
+			return nil, fmt.Errorf("Could not list services: %s", err)
+		}
+	} else {
+		serviceNames = userServices
+	}
+	serviceInfos := make([]ServiceInfo, len(serviceNames))
+
+	for i, srvName := range serviceNames {
+		serviceInfos[i] = collectServiceInfo(scmgr, srvName)
+	}
+
+	return serviceInfos, nil
+}
+
+//collectServiceInfo gathers info about a  service from WindowsAPI
+func collectServiceInfo(scmgr WinServiceManager, serviceName string) (serviceInfo ServiceInfo) {
+
+	serviceInfo.ServiceName = serviceName
+	srv, err := scmgr.OpenService(serviceName)
+	if err != nil {
+		serviceInfo.Error = fmt.Errorf("Could not open service '%s': %s", serviceName, err)
+		return
+	}
+	defer srv.Close()
+
+	srvStatus, err := srv.Query()
+	if err == nil {
+		serviceInfo.State = int(srvStatus.State)
+	} else {
+		serviceInfo.Error = fmt.Errorf("Could not query service '%s': %s", serviceName, err)
+		//finish collecting info on first found error
+		return
+	}
+
+	srvCfg, err := srv.Config()
+	if err == nil {
+		serviceInfo.DisplayName = srvCfg.DisplayName
+		serviceInfo.StartUpMode = int(srvCfg.StartType)
+	} else {
+		serviceInfo.Error = fmt.Errorf("Could not get config of service '%s': %s", serviceName, err)
+	}
+	return
+}
+
+func init() {
+	inputs.Add("win_services", func() telegraf.Input { return &WinServices{mgrProvider: &MgProvider{}} })
+}
diff --git a/plugins/inputs/win_services/win_services_integration_test.go b/plugins/inputs/win_services/win_services_integration_test.go
new file mode 100644
index 000000000..201746514
--- /dev/null
+++ b/plugins/inputs/win_services/win_services_integration_test.go
@@ -0,0 +1,115 @@
+// +build windows
+
+//these tests must be run under administrator account
+package win_services
+
+import (
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/sys/windows/svc/mgr"
+	"testing"
+)
+
+var InvalidServices = []string{"XYZ1@", "ZYZ@", "SDF_@#"}
+var KnownServices = []string{"LanmanServer", "TermService"}
+
+func TestList(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	services, err := listServices(&MgProvider{}, KnownServices)
+	require.NoError(t, err)
+	assert.Len(t, services, 2, "Different number of services")
+	assert.Equal(t, services[0].ServiceName, KnownServices[0])
+	assert.Nil(t, services[0].Error)
+	assert.Equal(t, services[1].ServiceName, KnownServices[1])
+	assert.Nil(t, services[1].Error)
+}
+
+func TestEmptyList(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	services, err := listServices(&MgProvider{}, []string{})
+	require.NoError(t, err)
+	assert.Condition(t, func() bool { return len(services) > 20 }, "Too few service")
+}
+
+func TestListEr(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	services, err := listServices(&MgProvider{}, InvalidServices)
+	require.NoError(t, err)
+	assert.Len(t, services, 3, "Different number of services")
+	for i := 0; i < 3; i++ {
+		assert.Equal(t, services[i].ServiceName, InvalidServices[i])
+		assert.NotNil(t, services[i].Error)
+	}
+}
+
+func TestGather(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	ws := &WinServices{KnownServices, &MgProvider{}}
+	assert.Len(t, ws.ServiceNames, 2, "Different number of services")
+	var acc testutil.Accumulator
+	require.NoError(t, ws.Gather(&acc))
+	assert.Len(t, acc.Errors, 0, "There should be no errors after gather")
+
+	for i := 0; i < 2; i++ {
+		fields := make(map[string]interface{})
+		tags := make(map[string]string)
+		si := getServiceInfo(KnownServices[i])
+		fields["state"] = int(si.State)
+		fields["startup_mode"] = int(si.StartUpMode)
+		tags["service_name"] = si.ServiceName
+		tags["display_name"] = si.DisplayName
+		acc.AssertContainsTaggedFields(t, "win_services", fields, tags)
+	}
+}
+
+func TestGatherErrors(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	ws := &WinServices{InvalidServices, &MgProvider{}}
+	assert.Len(t, ws.ServiceNames, 3, "Different number of services")
+	var acc testutil.Accumulator
+	require.NoError(t, ws.Gather(&acc))
+	assert.Len(t, acc.Errors, 3, "There should be 3 errors after gather")
+}
+
+func getServiceInfo(srvName string) *ServiceInfo {
+
+	scmgr, err := mgr.Connect()
+	if err != nil {
+		return nil
+	}
+	defer scmgr.Disconnect()
+
+	srv, err := scmgr.OpenService(srvName)
+	if err != nil {
+		return nil
+	}
+	var si ServiceInfo
+	si.ServiceName = srvName
+	srvStatus, err := srv.Query()
+	if err == nil {
+		si.State = int(srvStatus.State)
+	} else {
+		si.Error = err
+	}
+
+	srvCfg, err := srv.Config()
+	if err == nil {
+		si.DisplayName = srvCfg.DisplayName
+		si.StartUpMode = int(srvCfg.StartType)
+	} else {
+		si.Error = err
+	}
+	srv.Close()
+	return &si
+}
diff --git a/plugins/inputs/win_services/win_services_notwindows.go b/plugins/inputs/win_services/win_services_notwindows.go
new file mode 100644
index 000000000..062c11cfc
--- /dev/null
+++ b/plugins/inputs/win_services/win_services_notwindows.go
@@ -0,0 +1,3 @@
+// +build !windows
+
+package win_services
diff --git a/plugins/inputs/win_services/win_services_test.go b/plugins/inputs/win_services/win_services_test.go
new file mode 100644
index 000000000..3c05e85c5
--- /dev/null
+++ b/plugins/inputs/win_services/win_services_test.go
@@ -0,0 +1,179 @@
+// +build windows
+
+package win_services
+
+import (
+	"errors"
+	"fmt"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
+	"testing"
+)
+
+//testData is DD wrapper for unit testing of WinServices
+type testData struct {
+	//collection that will be returned in ListServices if service array passed into WinServices constructor is empty
+	queryServiceList     []string
+	mgrConnectError      error
+	mgrListServicesError error
+	services             []serviceTestInfo
+}
+
+type serviceTestInfo struct {
+	serviceOpenError   error
+	serviceQueryError  error
+	serviceConfigError error
+	serviceName        string
+	displayName        string
+	state              int
+	startUpMode        int
+}
+
+type FakeSvcMgr struct {
+	testData testData
+}
+
+func (m *FakeSvcMgr) Disconnect() error {
+	return nil
+}
+
+func (m *FakeSvcMgr) OpenService(name string) (WinService, error) {
+	for _, s := range m.testData.services {
+		if s.serviceName == name {
+			if s.serviceOpenError != nil {
+				return nil, s.serviceOpenError
+			} else {
+				return &FakeWinSvc{s}, nil
+			}
+		}
+	}
+	return nil, fmt.Errorf("Cannot find service %s", name)
+}
+
+func (m *FakeSvcMgr) ListServices() ([]string, error) {
+	if m.testData.mgrListServicesError != nil {
+		return nil, m.testData.mgrListServicesError
+	} else {
+		return m.testData.queryServiceList, nil
+	}
+}
+
+type FakeMgProvider struct {
+	testData testData
+}
+
+func (m *FakeMgProvider) Connect() (WinServiceManager, error) {
+	if m.testData.mgrConnectError != nil {
+		return nil, m.testData.mgrConnectError
+	} else {
+		return &FakeSvcMgr{m.testData}, nil
+	}
+}
+
+type FakeWinSvc struct {
+	testData serviceTestInfo
+}
+
+func (m *FakeWinSvc) Close() error {
+	return nil
+}
+func (m *FakeWinSvc) Config() (mgr.Config, error) {
+	if m.testData.serviceConfigError != nil {
+		return mgr.Config{}, m.testData.serviceConfigError
+	} else {
+		return mgr.Config{0, uint32(m.testData.startUpMode), 0, "", "", 0, nil, m.testData.serviceName, m.testData.displayName, "", ""}, nil
+	}
+}
+func (m *FakeWinSvc) Query() (svc.Status, error) {
+	if m.testData.serviceQueryError != nil {
+		return svc.Status{}, m.testData.serviceQueryError
+	} else {
+		return svc.Status{svc.State(m.testData.state), 0, 0, 0}, nil
+	}
+}
+
+var testErrors = []testData{
+	{nil, errors.New("Fake mgr connect error"), nil, nil},
+	{nil, nil, errors.New("Fake mgr list services error"), nil},
+	{[]string{"Fake service 1", "Fake service 2", "Fake service 3"}, nil, nil, []serviceTestInfo{
+		{errors.New("Fake srv open error"), nil, nil, "Fake service 1", "", 0, 0},
+		{nil, errors.New("Fake srv query error"), nil, "Fake service 2", "", 0, 0},
+		{nil, nil, errors.New("Fake srv config error"), "Fake service 3", "", 0, 0},
+	}},
+	{nil, nil, nil, []serviceTestInfo{
+		{errors.New("Fake srv open error"), nil, nil, "Fake service 1", "", 0, 0},
+	}},
+}
+
+func TestBasicInfo(t *testing.T) {
+
+	winServices := &WinServices{nil, &FakeMgProvider{testErrors[0]}}
+	assert.NotEmpty(t, winServices.SampleConfig())
+	assert.NotEmpty(t, winServices.Description())
+}
+
+func TestMgrErrors(t *testing.T) {
+	//mgr.connect error
+	winServices := &WinServices{nil, &FakeMgProvider{testErrors[0]}}
+	var acc1 testutil.Accumulator
+	err := winServices.Gather(&acc1)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), testErrors[0].mgrConnectError.Error())
+
+	////mgr.listServices error
+	winServices = &WinServices{nil, &FakeMgProvider{testErrors[1]}}
+	var acc2 testutil.Accumulator
+	err = winServices.Gather(&acc2)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), testErrors[1].mgrListServicesError.Error())
+
+	////mgr.listServices error 2
+	winServices = &WinServices{[]string{"Fake service 1"}, &FakeMgProvider{testErrors[3]}}
+	var acc3 testutil.Accumulator
+	err = winServices.Gather(&acc3)
+	require.NoError(t, err)
+	assert.Len(t, acc3.Errors, 1)
+
+}
+
+func TestServiceErrors(t *testing.T) {
+	winServices := &WinServices{nil, &FakeMgProvider{testErrors[2]}}
+	var acc1 testutil.Accumulator
+	require.NoError(t, winServices.Gather(&acc1))
+	assert.Len(t, acc1.Errors, 3)
+	//open service error
+	assert.Contains(t, acc1.Errors[0].Error(), testErrors[2].services[0].serviceOpenError.Error())
+	//query service error
+	assert.Contains(t, acc1.Errors[1].Error(), testErrors[2].services[1].serviceQueryError.Error())
+	//config service error
+	assert.Contains(t, acc1.Errors[2].Error(), testErrors[2].services[2].serviceConfigError.Error())
+
+}
+
+var testSimpleData = []testData{
+	{[]string{"Service 1", "Service 2"}, nil, nil, []serviceTestInfo{
+		{nil, nil, nil, "Service 1", "Fake service 1", 1, 2},
+		{nil, nil, nil, "Service 2", "Fake service 2", 1, 2},
+	}},
+}
+
+func TestGather2(t *testing.T) {
+	winServices := &WinServices{nil, &FakeMgProvider{testSimpleData[0]}}
+	var acc1 testutil.Accumulator
+	require.NoError(t, winServices.Gather(&acc1))
+	assert.Len(t, acc1.Errors, 0, "There should be no errors after gather")
+
+	for _, s := range testSimpleData[0].services {
+		fields := make(map[string]interface{})
+		tags := make(map[string]string)
+		fields["state"] = int(s.state)
+		fields["startup_mode"] = int(s.startUpMode)
+		tags["service_name"] = s.serviceName
+		tags["display_name"] = s.displayName
+		acc1.AssertContainsTaggedFields(t, "win_services", fields, tags)
+	}
+
+}

From 75e6ebcf93fa7b05b802a0bfe8fdb40245381a5d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 14:39:22 -0700
Subject: [PATCH 0431/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc469d3b9..9eb216136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
 - [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [win_services](./plugins/inputs/win_services/README.md) - Thanks to @vlastahajek
 
 ### Features
 
@@ -50,6 +51,7 @@
 - [#3063](https://github.com/influxdata/telegraf/pull/3063): Add tls options to docker input.
 - [#2387](https://github.com/influxdata/telegraf/pull/2387): Add histogram aggregator plugin.
 - [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
+- [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
 
 ### Bugfixes
 

From 1fb53739627b718c6ae6138b0616b01da09de52e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 15:47:20 -0700
Subject: [PATCH 0432/1302] Build releases with -w -s ldflags

---
 Makefile         |  2 +-
 scripts/build.py | 23 ++++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 9e92de04e..4e73f8c36 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ telegraf:
 	go build -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
 
 go-install:
-	go install -ldflags "$(LDFLAGS)" ./cmd/telegraf
+	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
 
 install: telegraf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
diff --git a/scripts/build.py b/scripts/build.py
index d391ec2e1..3fa171c5a 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -470,26 +470,11 @@ def build(version=None,
             build_command += "-race "
         if len(tags) > 0:
             build_command += "-tags {} ".format(','.join(tags))
-        if "1.4" in get_go_version():
-            if static:
-                build_command += "-ldflags=\"-s -X main.version {} -X main.branch {} -X main.commit {}\" ".format(version,
-                                                                                                                  get_current_branch(),
-                                                                                                                  get_current_commit())
-            else:
-                build_command += "-ldflags=\"-X main.version {} -X main.branch {} -X main.commit {}\" ".format(version,
-                                                                                                               get_current_branch(),
-                                                                                                               get_current_commit())
 
-        else:
-            # Starting with Go 1.5, the linker flag arguments changed to 'name=value' from 'name value'
-            if static:
-                build_command += "-ldflags=\"-s -X main.version={} -X main.branch={} -X main.commit={}\" ".format(version,
-                                                                                                                  get_current_branch(),
-                                                                                                                  get_current_commit())
-            else:
-                build_command += "-ldflags=\"-X main.version={} -X main.branch={} -X main.commit={}\" ".format(version,
-                                                                                                               get_current_branch(),
-                                                                                                               get_current_commit())
+        build_command += "-ldflags=\"-w -s -X main.version={} -X main.branch={} -X main.commit={}\" ".format(
+                version,
+                get_current_branch(),
+                get_current_commit())
         if static:
             build_command += "-a -installsuffix cgo "
         build_command += path

From 3e27134872ace0e272292d4f82c33c9fad548667 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 7 Aug 2017 16:16:31 -0700
Subject: [PATCH 0433/1302] Add path tag to logparser containing path of
 logfile (#3098)

---
 plugins/inputs/logparser/logparser.go      | 29 +++++++++++++++-------
 plugins/inputs/logparser/logparser_test.go | 19 +++++++++++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 0c495f409..27441c0ba 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -23,13 +23,18 @@ type LogParser interface {
 	Compile() error
 }
 
+type logEntry struct {
+	path string
+	line string
+}
+
 // LogParserPlugin is the primary struct to implement the interface for logparser plugin
 type LogParserPlugin struct {
 	Files         []string
 	FromBeginning bool
 
 	tailers map[string]*tail.Tail
-	lines   chan string
+	lines   chan logEntry
 	done    chan struct{}
 	wg      sync.WaitGroup
 	acc     telegraf.Accumulator
@@ -112,7 +117,7 @@ func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	defer l.Unlock()
 
 	l.acc = acc
-	l.lines = make(chan string, 1000)
+	l.lines = make(chan logEntry, 1000)
 	l.done = make(chan struct{})
 	l.tailers = make(map[string]*tail.Tail)
 
@@ -214,9 +219,14 @@ func (l *LogParserPlugin) receiver(tailer *tail.Tail) {
 		// Fix up files with Windows line endings.
 		text := strings.TrimRight(line.Text, "\r")
 
+		entry := logEntry{
+			path: tailer.Filename,
+			line: text,
+		}
+
 		select {
 		case <-l.done:
-		case l.lines <- text:
+		case l.lines <- entry:
 		}
 	}
 }
@@ -229,22 +239,23 @@ func (l *LogParserPlugin) parser() {
 
 	var m telegraf.Metric
 	var err error
-	var line string
+	var entry logEntry
 	for {
 		select {
 		case <-l.done:
 			return
-		case line = <-l.lines:
-			if line == "" || line == "\n" {
+		case entry = <-l.lines:
+			if entry.line == "" || entry.line == "\n" {
 				continue
 			}
 		}
-
 		for _, parser := range l.parsers {
-			m, err = parser.ParseLine(line)
+			m, err = parser.ParseLine(entry.line)
 			if err == nil {
+				tags := m.Tags()
+				tags["path"] = entry.path
 				if m != nil {
-					l.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+					l.acc.AddFields(m.Name(), m.Fields(), tags, m.Time())
 				}
 			} else {
 				log.Println("E! Error parsing log line: " + err.Error())
diff --git a/plugins/inputs/logparser/logparser_test.go b/plugins/inputs/logparser/logparser_test.go
index f2d93f265..98567b4c2 100644
--- a/plugins/inputs/logparser/logparser_test.go
+++ b/plugins/inputs/logparser/logparser_test.go
@@ -69,7 +69,10 @@ func TestGrokParseLogFiles(t *testing.T) {
 			"response_time": int64(5432),
 			"myint":         int64(101),
 		},
-		map[string]string{"response_code": "200"})
+		map[string]string{
+			"response_code": "200",
+			"path":          thisdir + "grok/testdata/test_a.log",
+		})
 
 	acc.AssertContainsTaggedFields(t, "logparser_grok",
 		map[string]interface{}{
@@ -77,7 +80,9 @@ func TestGrokParseLogFiles(t *testing.T) {
 			"mystring":   "mystring",
 			"nomodifier": "nomodifier",
 		},
-		map[string]string{})
+		map[string]string{
+			"path": thisdir + "grok/testdata/test_b.log",
+		})
 }
 
 func TestGrokParseLogFilesAppearLater(t *testing.T) {
@@ -115,7 +120,10 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 			"response_time": int64(5432),
 			"myint":         int64(101),
 		},
-		map[string]string{"response_code": "200"})
+		map[string]string{
+			"response_code": "200",
+			"path":          emptydir + "/test_a.log",
+		})
 }
 
 // Test that test_a.log line gets parsed even though we don't have the correct
@@ -148,7 +156,10 @@ func TestGrokParseLogFilesOneBad(t *testing.T) {
 			"response_time": int64(5432),
 			"myint":         int64(101),
 		},
-		map[string]string{"response_code": "200"})
+		map[string]string{
+			"response_code": "200",
+			"path":          thisdir + "grok/testdata/test_a.log",
+		})
 }
 
 func getCurrentDir() string {

From 828c5817f9b8590e5edac0c75f5842396959ed24 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 16:18:01 -0700
Subject: [PATCH 0434/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eb216136..7456e2345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - [#2387](https://github.com/influxdata/telegraf/pull/2387): Add histogram aggregator plugin.
 - [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
 - [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
+- [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
 
 ### Bugfixes
 

From a1e7a5f4749952a61f006a4f6549a5e1a1e04db0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 17:16:34 -0700
Subject: [PATCH 0435/1302] Upload as nightly builds if PACKAGE set

---
 scripts/circle-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 459a03ecf..4c3788e76 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -87,6 +87,6 @@ elif [ -n "${PACKAGE}" ]; then
     # install boto & rpm (packaging & AWS dependencies)
     exit_if_fail sudo apt-get install -y rpm python-boto
     unset GOGC
-    exit_if_fail ./scripts/build.py --package --platform=all --arch=all
+    exit_if_fail ./scripts/build.py --nightly --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/nightlies
     mv build $CIRCLE_ARTIFACTS
 fi

From 5e73f3e81676921b257b7b5833fdcf66a57a82b2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 17:24:35 -0700
Subject: [PATCH 0436/1302] Only upload nightly if on master branch

---
 scripts/circle-test.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 4c3788e76..bf5b44eab 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -87,6 +87,11 @@ elif [ -n "${PACKAGE}" ]; then
     # install boto & rpm (packaging & AWS dependencies)
     exit_if_fail sudo apt-get install -y rpm python-boto
     unset GOGC
-    exit_if_fail ./scripts/build.py --nightly --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/nightlies
+    if [ "$(git rev-parse --abbrev-ref HEAD)" = master ]
+    then
+        exit_if_fail ./scripts/build.py --nightly --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/nightlies
+    else
+        exit_if_fail ./scripts/build.py --package --platform=all --arch=all
+    fi
     mv build $CIRCLE_ARTIFACTS
 fi

From 40aacd9046f4d14ccf5750d52f0423f00f62b38c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 17:41:52 -0700
Subject: [PATCH 0437/1302] Fix artifact redirection

---
 scripts/circle-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index bf5b44eab..8391a308f 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -69,7 +69,7 @@ tmpdir=$(mktemp -d)
 exit_if_fail ./telegraf -config $tmpdir/config.toml \
     -test -input-filter cpu:mem
 
-gzip telegraf -c "$CIRCLE_ARTIFACTS/telegraf.gz"
+gzip telegraf -c > "$CIRCLE_ARTIFACTS/telegraf.gz"
 
 if git describe --exact-match HEAD; then
     # install fpm (packaging dependency)

From f9573ad969c1bf9a813c84d39d00d512e1c0dc4d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 Aug 2017 17:43:06 -0700
Subject: [PATCH 0438/1302] Remove Godeps_windows from build.py

---
 scripts/build.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/build.py b/scripts/build.py
index 3fa171c5a..40b849ebc 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -158,7 +158,6 @@ def go_get(branch, update=False, no_uncommitted=False):
         get_command = "go get github.com/sparrc/gdm"
         run(get_command)
     logging.info("Retrieving dependencies with `gdm`...")
-    run("{}/bin/gdm restore -v -f Godeps_windows".format(os.environ.get("GOPATH")))
     run("{}/bin/gdm restore -v".format(os.environ.get("GOPATH")))
     return True
 

From f3435f1c59aa5e9eac99459a99233e4d02019f43 Mon Sep 17 00:00:00 2001
From: Slawomir Skowron <szibis@gmail.com>
Date: Tue, 8 Aug 2017 20:41:26 +0200
Subject: [PATCH 0439/1302] Add TCP listener for statsd input (#2293)

---
 CHANGELOG.md                         |   1 +
 etc/telegraf.conf                    |   4 +
 plugins/inputs/statsd/README.md      |   9 ++
 plugins/inputs/statsd/statsd.go      | 213 ++++++++++++++++++++++++++-
 plugins/inputs/statsd/statsd_test.go | 131 ++++++++++++++++
 5 files changed, 350 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7456e2345..429f934ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 
 - [#2487](https://github.com/influxdata/telegraf/pull/2487): Add Kafka 0.9+ consumer support
 - [#2773](https://github.com/influxdata/telegraf/pull/2773): Add support for self-signed certs to InfluxDB input plugin
+- [#2293](https://github.com/influxdata/telegraf/pull/2293): Add TCP listener for statsd input
 - [#2581](https://github.com/influxdata/telegraf/pull/2581): Add Docker container environment variables as tags. Only whitelisted
 - [#2817](https://github.com/influxdata/telegraf/pull/2817): Add timeout option to IPMI sensor plugin
 - [#2883](https://github.com/influxdata/telegraf/pull/2883): Add support for an optional SSL/TLS configuration to nginx input plugin
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 3e1395c02..7d1f25626 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2452,6 +2452,10 @@
 
 # # Statsd Server
 # [[inputs.statsd]]
+#   ## Protocol, must be "tcp" or "udp"
+#   protocol = "udp"
+#   ## Maximum number of concurrent TCP connections to allow
+#   max_tcp_connections = 250
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
 #
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 91070419a..17f960b20 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -5,6 +5,12 @@
 ```toml
 # Statsd Server
 [[inputs.statsd]]
+  ## Protocol, must be "tcp" or "udp" (default=udp)
+  protocol = "udp"
+
+  ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
+  max_tcp_connections = 250
+
   ## Address and port to host UDP listener on
   service_address = ":8125"
 
@@ -146,6 +152,9 @@ metric type:
 
 ### Plugin arguments
 
+- **protocol** string: Protocol used in listener - tcp or udp options
+- **max_tcp_connections** []int: Maximum number of concurrent TCP connections
+to allow. Used when protocol is set to tcp.
 - **service_address** string: Address to listen for statsd UDP packets on
 - **delete_gauges** boolean: Delete gauges on every collection interval
 - **delete_counters** boolean: Delete counters on every collection interval
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 144a3675f..16233a6c9 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -1,6 +1,7 @@
 package statsd
 
 import (
+	"bufio"
 	"errors"
 	"fmt"
 	"log"
@@ -14,7 +15,9 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/selfstat"
 )
 
 const (
@@ -24,15 +27,24 @@ const (
 
 	defaultFieldName = "value"
 
+	defaultProtocol = "udp"
+
 	defaultSeparator           = "_"
 	defaultAllowPendingMessage = 10000
+	MaxTCPConnections          = 250
 )
 
 var dropwarn = "E! Error: statsd message queue full. " +
 	"We have dropped %d messages so far. " +
 	"You may want to increase allowed_pending_messages in the config\n"
 
+var malformedwarn = "E! Statsd over TCP has received %d malformed packets" +
+	" thus far."
+
 type Statsd struct {
+	// Protocol used on listener - udp or tcp
+	Protocol string `toml:"protocol"`
+
 	// Address & Port to serve from
 	ServiceAddress string
 
@@ -64,9 +76,17 @@ type Statsd struct {
 	UDPPacketSize int `toml:"udp_packet_size"`
 
 	sync.Mutex
-	wg sync.WaitGroup
+	// Lock for preventing a data race during resource cleanup
+	cleanup sync.Mutex
+	wg      sync.WaitGroup
+	// accept channel tracks how many active connections there are, if there
+	// is an available bool in accept, then we are below the maximum and can
+	// accept the connection
+	accept chan bool
 	// drops tracks the number of dropped metrics.
 	drops int
+	// malformed tracks the number of malformed packets
+	malformed int
 
 	// Channel for all incoming statsd packets
 	in   chan []byte
@@ -83,9 +103,24 @@ type Statsd struct {
 	// bucket -> influx templates
 	Templates []string
 
-	listener *net.UDPConn
+	// Protocol listeners
+	UDPlistener *net.UDPConn
+	TCPlistener *net.TCPListener
+
+	// track current connections so we can close them in Stop()
+	conns map[string]*net.TCPConn
+
+	MaxTCPConnections int `toml:"max_tcp_connections"`
 
 	graphiteParser *graphite.GraphiteParser
+
+	acc telegraf.Accumulator
+
+	MaxConnections     selfstat.Stat
+	CurrentConnections selfstat.Stat
+	TotalConnections   selfstat.Stat
+	PacketsRecv        selfstat.Stat
+	BytesRecv          selfstat.Stat
 }
 
 // One statsd metric, form is <bucket>:<value>|<mtype>|@<samplerate>
@@ -128,10 +163,16 @@ type cachedtimings struct {
 }
 
 func (_ *Statsd) Description() string {
-	return "Statsd Server"
+	return "Statsd UDP/TCP Server"
 }
 
 const sampleConfig = `
+  ## Protocol, must be "tcp" or "udp" (default=udp)
+  protocol = "udp"
+
+  ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
+  max_tcp_connections = 250
+
   ## Address and port to host UDP listener on
   service_address = ":8125"
 
@@ -247,6 +288,27 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 	s.sets = make(map[string]cachedset)
 	s.timings = make(map[string]cachedtimings)
 
+	s.Lock()
+	defer s.Unlock()
+	//
+	tags := map[string]string{
+		"address": s.ServiceAddress,
+	}
+	s.MaxConnections = selfstat.Register("statsd", "tcp_max_connections", tags)
+	s.MaxConnections.Set(int64(s.MaxTCPConnections))
+	s.CurrentConnections = selfstat.Register("statsd", "tcp_current_connections", tags)
+	s.TotalConnections = selfstat.Register("statsd", "tcp_total_connections", tags)
+	s.PacketsRecv = selfstat.Register("statsd", "tcp_packets_received", tags)
+	s.BytesRecv = selfstat.Register("statsd", "tcp_bytes_received", tags)
+
+	s.in = make(chan []byte, s.AllowedPendingMessages)
+	s.done = make(chan struct{})
+	s.accept = make(chan bool, s.MaxTCPConnections)
+	s.conns = make(map[string]*net.TCPConn)
+	for i := 0; i < s.MaxTCPConnections; i++ {
+		s.accept <- true
+	}
+
 	if s.ConvertNames {
 		log.Printf("I! WARNING statsd: convert_names config option is deprecated," +
 			" please use metric_separator instead")
@@ -258,23 +320,67 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 
 	s.wg.Add(2)
 	// Start the UDP listener
-	go s.udpListen()
+	switch s.Protocol {
+	case "udp":
+		go s.udpListen()
+	case "tcp":
+		go s.tcpListen()
+	}
 	// Start the line parser
 	go s.parser()
 	log.Printf("I! Started the statsd service on %s\n", s.ServiceAddress)
 	return nil
 }
 
+// tcpListen() starts listening for udp packets on the configured port.
+func (s *Statsd) tcpListen() error {
+	defer s.wg.Done()
+	// Start listener
+	var err error
+	address, _ := net.ResolveTCPAddr("tcp", s.ServiceAddress)
+	s.TCPlistener, err = net.ListenTCP("tcp", address)
+	if err != nil {
+		log.Fatalf("ERROR: ListenTCP - %s", err)
+		return err
+	}
+	log.Println("I! TCP Statsd listening on: ", s.TCPlistener.Addr().String())
+	for {
+		select {
+		case <-s.done:
+			return nil
+		default:
+			// Accept connection:
+			conn, err := s.TCPlistener.AcceptTCP()
+			if err != nil {
+				return err
+			}
+
+			select {
+			case <-s.accept:
+				// not over connection limit, handle the connection properly.
+				s.wg.Add(1)
+				// generate a random id for this TCPConn
+				id := internal.RandomString(6)
+				s.remember(id, conn)
+				go s.handler(conn, id)
+			default:
+				// We are over the connection limit, refuse & close.
+				s.refuser(conn)
+			}
+		}
+	}
+}
+
 // udpListen starts listening for udp packets on the configured port.
 func (s *Statsd) udpListen() error {
 	defer s.wg.Done()
 	var err error
 	address, _ := net.ResolveUDPAddr("udp", s.ServiceAddress)
-	s.listener, err = net.ListenUDP("udp", address)
+	s.UDPlistener, err = net.ListenUDP("udp", address)
 	if err != nil {
 		log.Fatalf("ERROR: ListenUDP - %s", err)
 	}
-	log.Println("I! Statsd listener listening on: ", s.listener.LocalAddr().String())
+	log.Println("I! Statsd UDP listener listening on: ", s.UDPlistener.LocalAddr().String())
 
 	buf := make([]byte, UDP_MAX_PACKET_SIZE)
 	for {
@@ -282,7 +388,7 @@ func (s *Statsd) udpListen() error {
 		case <-s.done:
 			return nil
 		default:
-			n, _, err := s.listener.ReadFromUDP(buf)
+			n, _, err := s.UDPlistener.ReadFromUDP(buf)
 			if err != nil && !strings.Contains(err.Error(), "closed network") {
 				log.Printf("E! Error READ: %s\n", err.Error())
 				continue
@@ -637,20 +743,111 @@ func (s *Statsd) aggregate(m metric) {
 	}
 }
 
+// handler handles a single TCP Connection
+func (s *Statsd) handler(conn *net.TCPConn, id string) {
+	s.CurrentConnections.Incr(1)
+	s.TotalConnections.Incr(1)
+	// connection cleanup function
+	defer func() {
+		s.wg.Done()
+		conn.Close()
+		// Add one connection potential back to channel when this one closes
+		s.accept <- true
+		s.forget(id)
+		s.CurrentConnections.Incr(-1)
+	}()
+
+	var n int
+	scanner := bufio.NewScanner(conn)
+	for {
+		select {
+		case <-s.done:
+			return
+		default:
+			if !scanner.Scan() {
+				return
+			}
+			n = len(scanner.Bytes())
+			if n == 0 {
+				continue
+			}
+			s.BytesRecv.Incr(int64(n))
+			s.PacketsRecv.Incr(1)
+			bufCopy := make([]byte, n+1)
+			copy(bufCopy, scanner.Bytes())
+			bufCopy[n] = '\n'
+
+			select {
+			case s.in <- bufCopy:
+			default:
+				s.drops++
+				if s.drops == 1 || s.drops%s.AllowedPendingMessages == 0 {
+					log.Printf(dropwarn, s.drops)
+				}
+			}
+		}
+	}
+}
+
+// refuser refuses a TCP connection
+func (s *Statsd) refuser(conn *net.TCPConn) {
+	conn.Close()
+	log.Printf("I! Refused TCP Connection from %s", conn.RemoteAddr())
+	log.Printf("I! WARNING: Maximum TCP Connections reached, you may want to" +
+		" adjust max_tcp_connections")
+}
+
+// forget a TCP connection
+func (s *Statsd) forget(id string) {
+	s.cleanup.Lock()
+	defer s.cleanup.Unlock()
+	delete(s.conns, id)
+}
+
+// remember a TCP connection
+func (s *Statsd) remember(id string, conn *net.TCPConn) {
+	s.cleanup.Lock()
+	defer s.cleanup.Unlock()
+	s.conns[id] = conn
+}
+
 func (s *Statsd) Stop() {
 	s.Lock()
 	defer s.Unlock()
 	log.Println("I! Stopping the statsd service")
 	close(s.done)
-	s.listener.Close()
+	switch s.Protocol {
+	case "udp":
+		s.UDPlistener.Close()
+	case "tcp":
+		s.TCPlistener.Close()
+		// Close all open TCP connections
+		//  - get all conns from the s.conns map and put into slice
+		//  - this is so the forget() function doesnt conflict with looping
+		//    over the s.conns map
+		var conns []*net.TCPConn
+		s.cleanup.Lock()
+		for _, conn := range s.conns {
+			conns = append(conns, conn)
+		}
+		s.cleanup.Unlock()
+		for _, conn := range conns {
+			conn.Close()
+		}
+	default:
+		s.UDPlistener.Close()
+	}
 	s.wg.Wait()
 	close(s.in)
+	log.Println("I! Stopped Statsd listener service on ", s.ServiceAddress)
 }
 
 func init() {
 	inputs.Add("statsd", func() telegraf.Input {
 		return &Statsd{
+			Protocol:               defaultProtocol,
 			ServiceAddress:         ":8125",
+			MaxTCPConnections:      250,
 			MetricSeparator:        "_",
 			AllowedPendingMessages: defaultAllowPendingMessage,
 			DeleteCounters:         true,
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index 486c6cece..c8164d4f7 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -3,11 +3,32 @@ package statsd
 import (
 	"errors"
 	"fmt"
+	"net"
 	"testing"
+	"time"
 
 	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
+const (
+	testMsg = "test.tcp.msg:100|c"
+)
+
+func newTestTcpListener() (*Statsd, chan []byte) {
+	in := make(chan []byte, 1500)
+	listener := &Statsd{
+		Protocol:               "tcp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 10000,
+		MaxTCPConnections:      250,
+		in:                     in,
+		done:                   make(chan struct{}),
+	}
+	return listener, in
+}
+
 func NewTestStatsd() *Statsd {
 	s := Statsd{}
 
@@ -24,6 +45,116 @@ func NewTestStatsd() *Statsd {
 	return &s
 }
 
+// Test that MaxTCPConections is respected
+func TestConcurrentConns(t *testing.T) {
+	listener := Statsd{
+		Protocol:               "tcp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 10000,
+		MaxTCPConnections:      2,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+	_, err := net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	_, err = net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+
+	// Connection over the limit:
+	conn, err := net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	_, err = conn.Write([]byte(testMsg))
+	assert.NoError(t, err)
+	time.Sleep(time.Millisecond * 10)
+	assert.Zero(t, acc.NFields())
+}
+
+// Test that MaxTCPConections is respected when max==1
+func TestConcurrentConns1(t *testing.T) {
+	listener := Statsd{
+		Protocol:               "tcp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 10000,
+		MaxTCPConnections:      1,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	time.Sleep(time.Millisecond * 25)
+	_, err := net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+
+	// Connection over the limit:
+	conn, err := net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	_, err = conn.Write([]byte(testMsg))
+	assert.NoError(t, err)
+	time.Sleep(time.Millisecond * 10)
+	assert.Zero(t, acc.NFields())
+}
+
+// Test that MaxTCPConections is respected
+func TestCloseConcurrentConns(t *testing.T) {
+	listener := Statsd{
+		Protocol:               "tcp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 10000,
+		MaxTCPConnections:      2,
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+
+	time.Sleep(time.Millisecond * 25)
+	_, err := net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+	_, err = net.Dial("tcp", "127.0.0.1:8125")
+	assert.NoError(t, err)
+
+	listener.Stop()
+}
+
+// benchmark how long it takes to accept & process 100,000 metrics:
+func BenchmarkTCP(b *testing.B) {
+	listener := Statsd{
+		Protocol:               "tcp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 250000,
+		MaxTCPConnections:      250,
+	}
+	acc := &testutil.Accumulator{Discard: true}
+
+	// send multiple messages to socket
+	for n := 0; n < b.N; n++ {
+		err := listener.Start(acc)
+		if err != nil {
+			panic(err)
+		}
+
+		time.Sleep(time.Millisecond * 25)
+		conn, err := net.Dial("tcp", "127.0.0.1:8125")
+		if err != nil {
+			panic(err)
+		}
+		for i := 0; i < 250000; i++ {
+			fmt.Fprintf(conn, testMsg)
+		}
+		// wait for 250,000 metrics to get added to accumulator
+		time.Sleep(time.Millisecond)
+		listener.Stop()
+	}
+}
+
 // Valid lines should be parsed and their values should be cached
 func TestParse_ValidLines(t *testing.T) {
 	s := NewTestStatsd()

From d9deb266df4ba10e2ee4d93c984c32ffccb0d736 Mon Sep 17 00:00:00 2001
From: Rodolphe Blancho <rodolphe.blancho@gmail.com>
Date: Wed, 9 Aug 2017 04:48:01 +1000
Subject: [PATCH 0440/1302] Add salesforce input plugin (#3075)

---
 plugins/inputs/all/all.go                    |   1 +
 plugins/inputs/salesforce/README.md          |  48 ++
 plugins/inputs/salesforce/salesforce.go      | 245 +++++++++
 plugins/inputs/salesforce/salesforce_test.go | 515 +++++++++++++++++++
 4 files changed, 809 insertions(+)
 create mode 100644 plugins/inputs/salesforce/README.md
 create mode 100644 plugins/inputs/salesforce/salesforce.go
 create mode 100644 plugins/inputs/salesforce/salesforce_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index dd3c178d9..8b99b1906 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -72,6 +72,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/redis"
 	_ "github.com/influxdata/telegraf/plugins/inputs/rethinkdb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/riak"
+	_ "github.com/influxdata/telegraf/plugins/inputs/salesforce"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
diff --git a/plugins/inputs/salesforce/README.md b/plugins/inputs/salesforce/README.md
new file mode 100644
index 000000000..5ee0f6a3d
--- /dev/null
+++ b/plugins/inputs/salesforce/README.md
@@ -0,0 +1,48 @@
+# Salesforce Input Plugin
+
+The Salesforce plugin gathers metrics about the limits in your Salesforce organization and the remaining usage.
+It fetches its data from the [limits endpoint](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_limits.htm) of Salesforce's REST API.
+
+### Configuration:
+
+```toml
+# Gather Metrics about Salesforce limits and remaining usage
+[[inputs.salesforce]]
+  username = "your_username"
+  password = "your_password"
+  ## (Optional) security tokjen
+  security_token = "your_security_token"
+  ## (Optional) environment type (sandbox or production)
+  ## default is: production
+  # environment = "production"
+  ## (Optional) API version (default: "39.0")
+  # version = "39.0"
+```
+
+### Measurements & Fields:
+
+Salesforce provide one measurment named "salesforce".
+Each entry is converted to snake\_case and 2 fields are created.
+
+- \<key\>_max represents the limit threshold
+- \<key\>_remaining represents the usage remaining before hitting the limit threshold
+
+- salesforce
+    - \<key\>_max (int)
+    - \<key\>_remaining (int)
+    - (...)
+
+### Tags:
+
+- All measurements have the following tags:
+    - host
+    - organization_id (t18 char organisation ID)
+
+
+### Example Output:
+
+```
+$./telegraf --config telegraf.conf --input-filter salesforce --test
+
+salesforce,organization_id=XXXXXXXXXXXXXXXXXX,host=xxxxx.salesforce.com daily_workflow_emails_max=546000i,hourly_time_based_workflow_max=50i,daily_async_apex_executions_remaining=250000i,daily_durable_streaming_api_events_remaining=1000000i,streaming_api_concurrent_clients_remaining=2000i,daily_bulk_api_requests_remaining=10000i,hourly_sync_report_runs_remaining=500i,daily_api_requests_max=5000000i,data_storage_mb_remaining=1073i,file_storage_mb_remaining=1069i,daily_generic_streaming_api_events_remaining=10000i,hourly_async_report_runs_remaining=1200i,hourly_time_based_workflow_remaining=50i,daily_streaming_api_events_remaining=1000000i,single_email_max=5000i,hourly_dashboard_refreshes_remaining=200i,streaming_api_concurrent_clients_max=2000i,daily_durable_generic_streaming_api_events_remaining=1000000i,daily_api_requests_remaining=4999998i,hourly_dashboard_results_max=5000i,hourly_async_report_runs_max=1200i,daily_durable_generic_streaming_api_events_max=1000000i,hourly_dashboard_results_remaining=5000i,concurrent_sync_report_runs_max=20i,durable_streaming_api_concurrent_clients_remaining=2000i,daily_workflow_emails_remaining=546000i,hourly_dashboard_refreshes_max=200i,daily_streaming_api_events_max=1000000i,hourly_sync_report_runs_max=500i,hourly_o_data_callout_max=10000i,mass_email_max=5000i,mass_email_remaining=5000i,single_email_remaining=5000i,hourly_dashboard_statuses_max=999999999i,concurrent_async_get_report_instances_max=200i,daily_durable_streaming_api_events_max=1000000i,daily_generic_streaming_api_events_max=10000i,hourly_o_data_callout_remaining=10000i,concurrent_sync_report_runs_remaining=20i,daily_bulk_api_requests_max=10000i,data_storage_mb_max=1073i,hourly_dashboard_statuses_remaining=999999999i,concurrent_async_get_report_instances_remaining=200i,daily_async_apex_executions_max=250000i,durable_streaming_api_concurrent_clients_max=2000i,file_storage_mb_max=1073i 1501565661000000000
+```
diff --git a/plugins/inputs/salesforce/salesforce.go b/plugins/inputs/salesforce/salesforce.go
new file mode 100644
index 000000000..096550db5
--- /dev/null
+++ b/plugins/inputs/salesforce/salesforce.go
@@ -0,0 +1,245 @@
+package salesforce
+
+import (
+	"encoding/json"
+	"encoding/xml"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+var sampleConfig = `
+  ## specify your credentials
+  ##
+  username = "your_username"
+  password = "your_password"
+  ##
+  ## (optional) security token
+  # security_token = "your_security_token"
+  ##
+  ## (optional) environment type (sandbox or production)
+  ## default is: production
+  ##
+  # environment = "production"
+  ##
+  ## (optional) API version (default: "39.0")
+  ##
+  # version = "39.0"
+`
+
+type limit struct {
+	Max       int
+	Remaining int
+}
+
+type limits map[string]limit
+
+type Salesforce struct {
+	Username       string
+	Password       string
+	SecurityToken  string
+	Environment    string
+	SessionID      string
+	ServerURL      *url.URL
+	OrganizationID string
+	Version        string
+
+	client *http.Client
+}
+
+const defaultVersion = "39.0"
+const defaultEnvironment = "production"
+
+// returns a new Salesforce plugin instance
+func NewSalesforce() *Salesforce {
+	tr := &http.Transport{
+		ResponseHeaderTimeout: time.Duration(5 * time.Second),
+	}
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   time.Duration(10 * time.Second),
+	}
+	return &Salesforce{
+		client:      client,
+		Version:     defaultVersion,
+		Environment: defaultEnvironment}
+}
+
+func (s *Salesforce) SampleConfig() string {
+	return sampleConfig
+}
+
+func (s *Salesforce) Description() string {
+	return "Read API usage and limits for a Salesforce organisation"
+}
+
+// Reads limits values from Salesforce API
+func (s *Salesforce) Gather(acc telegraf.Accumulator) error {
+	limits, err := s.fetchLimits()
+	if err != nil {
+		return err
+	}
+
+	tags := map[string]string{
+		"organization_id": s.OrganizationID,
+		"host":            s.ServerURL.Host,
+	}
+
+	fields := make(map[string]interface{})
+	for k, v := range limits {
+		key := internal.SnakeCase(k)
+		fields[key+"_max"] = v.Max
+		fields[key+"_remaining"] = v.Remaining
+	}
+
+	acc.AddFields("salesforce", fields, tags)
+	return nil
+}
+
+// query the limits endpoint
+func (s *Salesforce) queryLimits() (*http.Response, error) {
+	endpoint := fmt.Sprintf("%s://%s/services/data/v%s/limits", s.ServerURL.Scheme, s.ServerURL.Host, s.Version)
+	req, err := http.NewRequest(http.MethodGet, endpoint, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Accept", "encoding/json")
+	req.Header.Add("Authorization", "Bearer "+s.SessionID)
+	return s.client.Do(req)
+}
+
+func (s *Salesforce) isAuthenticated() bool {
+	return s.SessionID != ""
+}
+
+func (s *Salesforce) fetchLimits() (limits, error) {
+	var l limits
+	if !s.isAuthenticated() {
+		if err := s.login(); err != nil {
+			return l, err
+		}
+	}
+
+	resp, err := s.queryLimits()
+	if err != nil {
+		return l, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusUnauthorized {
+		if err = s.login(); err != nil {
+			return l, err
+		}
+		resp, err = s.queryLimits()
+		if err != nil {
+			return l, err
+		}
+		defer resp.Body.Close()
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return l, fmt.Errorf("Salesforce responded with unexpected status code %d", resp.StatusCode)
+	}
+
+	l = limits{}
+	err = json.NewDecoder(resp.Body).Decode(&l)
+	return l, err
+}
+
+func (s *Salesforce) getLoginEndpoint() (string, error) {
+	switch s.Environment {
+	case "sandbox":
+		return fmt.Sprintf("https://test.salesforce.com/services/Soap/c/%s/", s.Version), nil
+	case "production":
+		return fmt.Sprintf("https://login.salesforce.com/services/Soap/c/%s/", s.Version), nil
+	default:
+		return "", fmt.Errorf("unknown environment type: %s", s.Environment)
+	}
+}
+
+// Authenticate with Salesfroce
+func (s *Salesforce) login() error {
+	if s.Username == "" || s.Password == "" {
+		return errors.New("missing username or password")
+	}
+
+	body := fmt.Sprintf(`<?xml version="1.0" encoding="utf-8"?>
+		<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		  xmlns:urn="urn:enterprise.soap.sforce.com">
+		  <soapenv:Body>
+			<urn:login>
+			  <urn:username>%s</urn:username>
+			  <urn:password>%s%s</urn:password>
+			</urn:login>
+		  </soapenv:Body>
+		</soapenv:Envelope>`,
+		s.Username, s.Password, s.SecurityToken)
+
+	loginEndpoint, err := s.getLoginEndpoint()
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest(http.MethodPost, loginEndpoint, strings.NewReader(body))
+	if err != nil {
+		return err
+	}
+	req.Header.Add("Content-Type", "text/xml")
+	req.Header.Add("SOAPAction", "login")
+
+	resp, err := s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	soapFault := struct {
+		Code    string `xml:"Body>Fault>faultcode"`
+		Message string `xml:"Body>Fault>faultstring"`
+	}{}
+
+	err = xml.Unmarshal(respBody, &soapFault)
+	if err != nil {
+		return err
+	}
+
+	if soapFault.Code != "" {
+		return fmt.Errorf("login failed: %s", soapFault.Message)
+	}
+
+	loginResult := struct {
+		ServerURL      string `xml:"Body>loginResponse>result>serverUrl"`
+		SessionID      string `xml:"Body>loginResponse>result>sessionId"`
+		OrganizationID string `xml:"Body>loginResponse>result>userInfo>organizationId"`
+	}{}
+
+	err = xml.Unmarshal(respBody, &loginResult)
+	if err != nil {
+		return err
+	}
+
+	s.SessionID = loginResult.SessionID
+	s.OrganizationID = loginResult.OrganizationID
+	s.ServerURL, err = url.Parse(loginResult.ServerURL)
+
+	return err
+}
+
+func init() {
+	inputs.Add("salesforce", func() telegraf.Input {
+		return NewSalesforce()
+	})
+}
diff --git a/plugins/inputs/salesforce/salesforce_test.go b/plugins/inputs/salesforce/salesforce_test.go
new file mode 100644
index 000000000..288cc0f40
--- /dev/null
+++ b/plugins/inputs/salesforce/salesforce_test.go
@@ -0,0 +1,515 @@
+package salesforce_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/plugins/inputs/salesforce"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Gather(t *testing.T) {
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Add("Content-Type", "application/json")
+		_, _ = w.Write([]byte(testJson))
+	}))
+	defer fakeServer.Close()
+
+	plugin := salesforce.NewSalesforce()
+	plugin.SessionID = "test_session"
+	u, err := url.Parse(fakeServer.URL)
+	if err != nil {
+		t.Error(err)
+	}
+	plugin.ServerURL = u
+
+	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(plugin.Gather))
+
+	require.Len(t, acc.Metrics, 1)
+	m := acc.Metrics[0]
+	require.Len(t, m.Fields, 46)
+	require.Len(t, m.Tags, 2)
+}
+
+var testJson = `{
+  "ConcurrentAsyncGetReportInstances" : {
+    "Max" : 200,
+    "Remaining" : 200
+  },
+  "ConcurrentSyncReportRuns" : {
+    "Max" : 20,
+    "Remaining" : 20
+  },
+  "DailyApiRequests" : {
+    "Max" : 25000,
+    "Remaining" : 24926,
+    "AgilePoint" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Ant Migration Tool" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Axsy Server Integration" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Desktop" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Mobile for BlackBerry" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Bulk" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Partner" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "EAHelperBot" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Force.com IDE" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce (QA)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "MyU App" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SMS Magic Interact" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Chatter" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Files" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Mobile Dashboards" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Social Customer Service (SCS)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Touch" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce for Outlook" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for Android" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for iOS" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceA" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceIQ" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Workbench" : {
+      "Max" : 0,
+      "Remaining" : 0
+    }
+  },
+  "DailyAsyncApexExecutions" : {
+    "Max" : 250000,
+    "Remaining" : 250000
+  },
+  "DailyBulkApiRequests" : {
+    "Max" : 10000,
+    "Remaining" : 10000,
+    "AgilePoint" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Ant Migration Tool" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Axsy Server Integration" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Desktop" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Mobile for BlackBerry" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Bulk" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Partner" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "EAHelperBot" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Force.com IDE" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce (QA)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "MyU App" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SMS Magic Interact" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Chatter" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Files" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Mobile Dashboards" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Social Customer Service (SCS)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Touch" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce for Outlook" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for Android" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for iOS" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceA" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceIQ" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Workbench" : {
+      "Max" : 0,
+      "Remaining" : 0
+    }
+  },
+  "DailyDurableGenericStreamingApiEvents" : {
+    "Max" : 10000,
+    "Remaining" : 10000
+  },
+  "DailyDurableStreamingApiEvents" : {
+    "Max" : 10000,
+    "Remaining" : 10000
+  },
+  "DailyGenericStreamingApiEvents" : {
+    "Max" : 10000,
+    "Remaining" : 10000,
+    "AgilePoint" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Ant Migration Tool" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Axsy Server Integration" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Desktop" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Mobile for BlackBerry" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Bulk" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Partner" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "EAHelperBot" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Force.com IDE" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce (QA)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "MyU App" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SMS Magic Interact" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Chatter" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Files" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Mobile Dashboards" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Social Customer Service (SCS)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Touch" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce for Outlook" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for Android" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for iOS" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceA" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceIQ" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Workbench" : {
+      "Max" : 0,
+      "Remaining" : 0
+    }
+  },
+  "DailyStreamingApiEvents" : {
+    "Max" : 20000,
+    "Remaining" : 20000,
+    "AgilePoint" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Ant Migration Tool" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Axsy Server Integration" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Desktop" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Chatter Mobile for BlackBerry" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Bulk" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Dataloader Partner" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "EAHelperBot" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Force.com IDE" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "LiveText for Salesforce (QA)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "MyU App" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SMS Magic Interact" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Chatter" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Files" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Mobile Dashboards" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Social Customer Service (SCS)" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce Touch" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce for Outlook" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for Android" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Salesforce1 for iOS" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceA" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "SalesforceIQ" : {
+      "Max" : 0,
+      "Remaining" : 0
+    },
+    "Workbench" : {
+      "Max" : 0,
+      "Remaining" : 0
+    }
+  },
+  "DailyWorkflowEmails" : {
+    "Max" : 20000,
+    "Remaining" : 20000
+  },
+  "DataStorageMB" : {
+    "Max" : 209,
+    "Remaining" : 207
+  },
+  "DurableStreamingApiConcurrentClients" : {
+    "Max" : 20,
+    "Remaining" : 20
+  },
+  "FileStorageMB" : {
+    "Max" : 209,
+    "Remaining" : 206
+  },
+  "HourlyAsyncReportRuns" : {
+    "Max" : 1200,
+    "Remaining" : 1200
+  },
+  "HourlyDashboardRefreshes" : {
+    "Max" : 200,
+    "Remaining" : 200
+  },
+  "HourlyDashboardResults" : {
+    "Max" : 5000,
+    "Remaining" : 5000
+  },
+  "HourlyDashboardStatuses" : {
+    "Max" : 999999999,
+    "Remaining" : 999999999
+  },
+  "HourlyODataCallout" : {
+    "Max" : 20000,
+    "Remaining" : 19998
+  },
+  "HourlySyncReportRuns" : {
+    "Max" : 500,
+    "Remaining" : 500
+  },
+  "HourlyTimeBasedWorkflow" : {
+    "Max" : 50,
+    "Remaining" : 50
+  },
+  "MassEmail" : {
+    "Max" : 5000,
+    "Remaining" : 5000
+  },
+  "SingleEmail" : {
+    "Max" : 5000,
+    "Remaining" : 5000
+  },
+  "StreamingApiConcurrentClients" : {
+    "Max" : 20,
+    "Remaining" : 20
+  }
+}`

From bceb020d7285566f39603341ae767290d90b65dc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 8 Aug 2017 11:50:16 -0700
Subject: [PATCH 0441/1302] Update changelog and readme

---
 CHANGELOG.md | 8 +++++---
 README.md    | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429f934ca..6911e0c35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,12 +15,13 @@
 ### New Plugins
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md) - Thanks to @grugrut
-- [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
-- [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
-- [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
+- [salesforce](./plugins/inputs/salesforce/README.md) - Thanks to @rody
 - [win_services](./plugins/inputs/win_services/README.md) - Thanks to @vlastahajek
+- [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
 
 ### Features
 
@@ -54,6 +55,7 @@
 - [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
 - [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
 - [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
+- [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9e72a8f52..875960cb4 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,7 @@ configuration options.
 * [redis](./plugins/inputs/redis)
 * [rethinkdb](./plugins/inputs/rethinkdb)
 * [riak](./plugins/inputs/riak)
+* [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)

From 92af42a847c9384ae2da503c1526fd60aba358e1 Mon Sep 17 00:00:00 2001
From: Seva Poliakov <vsevolod.poliakov@datarobot.com>
Date: Wed, 9 Aug 2017 20:21:22 +0300
Subject: [PATCH 0442/1302] Remove tag_env duplicate from docker README (#3109)

---
 plugins/inputs/docker/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 06847bae9..b482ef3fb 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -36,9 +36,6 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/)
   ## Whether to report for each container total blkio and network stats or not
   total = false
 
-  ## Which environment variables should we use as a tag
-  tag_env = ["JAVA_HOME", "HEAP_SIZE"]
-
   ## docker labels to include and exclude as tags.  Globs accepted.
   ## Note that an empty array for both will include all labels as tags
   docker_label_include = []

From cb04fa1e9c73d89106fa5d753ceb075c396f9736 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 9 Aug 2017 11:28:27 -0700
Subject: [PATCH 0443/1302] Add diskio %util sample query

---
 plugins/inputs/system/DISK_README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index bf5f1d973..a05a9f7a2 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -92,6 +92,13 @@ Data collection is based on github.com/shirou/gopsutil. This package handles pla
 - If configured to use serial numbers (default: disabled):
     - serial (device serial number)
 
+### Sample Queries:
+
+Calculate percent IO utilization per disk and host:
+```
+SELECT derivative(last("io_time"),1ms) FROM "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
+```
+
 ### Example Output:
 
 ```

From 8a2373e8c89bb493ebb9217856a4c038c36d5105 Mon Sep 17 00:00:00 2001
From: Benjamin Stromski <benjamin.stromski@gmail.com>
Date: Wed, 9 Aug 2017 13:38:54 -0500
Subject: [PATCH 0444/1302] Add option to run varnish under sudo (#3097)

---
 plugins/inputs/varnish/README.md       | 60 ++++++++++++++++++++++++++
 plugins/inputs/varnish/varnish.go      | 29 +++++++++----
 plugins/inputs/varnish/varnish_test.go | 12 +++---
 3 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/varnish/README.md b/plugins/inputs/varnish/README.md
index cba3506f5..1866ca188 100644
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -7,6 +7,9 @@ This plugin gathers stats from [Varnish HTTP Cache](https://varnish-cache.org/)
 ```toml
  # A plugin to collect stats from Varnish HTTP Cache
  [[inputs.varnish]]
+   ## If running as a restricted user you can prepend sudo for additional access:
+   #use_sudo = false
+
    ## The default location of the varnishstat binary can be overridden with:
    binary = "/usr/bin/varnishstat"
 
@@ -330,6 +333,63 @@ the following values:
   - LCK
   
   
+
+### Permissions:
+
+It's important to note that this plugin references varnishstat, which may require additional permissions to execute successfully.
+Depending on the user/group permissions of the telegraf user executing this plugin, you may need to alter the group membership, set facls, or use sudo.
+
+**Group membership (Recommended)**:
+```bash
+$ groups telegraf
+telegraf : telegraf
+
+$ usermod -a -G varnish telegraf
+
+$ groups telegraf
+telegraf : telegraf varnish
+```
+
+**Extended filesystem ACL's**:
+```bash
+$ getfacl /var/lib/varnish/<hostname>/_.vsm
+# file: var/lib/varnish/<hostname>/_.vsm
+# owner: root
+# group: root
+user::rw-
+group::r--
+other::---
+
+$ setfacl -m u:telegraf:r /var/lib/varnish/<hostname>/_.vsm
+
+$ getfacl /var/lib/varnish/<hostname>/_.vsm
+# file: var/lib/varnish/<hostname>/_.vsm
+# owner: root
+# group: root
+user::rw-
+user:telegraf:r--
+group::r--
+mask::r--
+other::---
+```
+
+**Sudo privileges**:
+```bash
+# If you use this method, you will need the following in your telegraf config:
+[[inputs.varnish]]
+  use_sudo = true
+
+$ visudo
+
+# Add the following line:
+telegraf ALL=(ALL) NOPASSWD: /usr/bin/varnishstat
+
+$ grep varnish /etc/sudoers
+telegraf ALL = NOPASSWD: /usr/bin/varnishstat
+```
+
+Please use the solution you see as most appropriate.
+
 ### Example Output:
 
 ```
diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
index 896215aa0..08c885e61 100644
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -17,12 +17,13 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string) (*bytes.Buffer, error)
+type runner func(cmdName string, UseSudo bool) (*bytes.Buffer, error)
 
 // Varnish is used to store configuration values
 type Varnish struct {
-	Stats  []string
-	Binary string
+	Stats   []string
+	Binary  string
+	UseSudo bool
 
 	filter filter.Filter
 	run    runner
@@ -32,6 +33,9 @@ var defaultStats = []string{"MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"}
 var defaultBinary = "/usr/bin/varnishstat"
 
 var sampleConfig = `
+  ## If running as a restricted user you can prepend sudo for additional access:
+  #use_sudo = false
+
   ## The default location of the varnishstat binary can be overridden with:
   binary = "/usr/bin/varnishstat"
 
@@ -52,10 +56,16 @@ func (s *Varnish) SampleConfig() string {
 }
 
 // Shell out to varnish_stat and return the output
-func varnishRunner(cmdName string) (*bytes.Buffer, error) {
+func varnishRunner(cmdName string, UseSudo bool) (*bytes.Buffer, error) {
 	cmdArgs := []string{"-1"}
-
 	cmd := exec.Command(cmdName, cmdArgs...)
+
+	if UseSudo {
+		cmdArgs = append([]string{cmdName}, cmdArgs...)
+		cmdArgs = append([]string{"-n"}, cmdArgs...)
+		cmd = exec.Command("sudo", cmdArgs...)
+	}
+
 	var out bytes.Buffer
 	cmd.Stdout = &out
 	err := internal.RunTimeout(cmd, time.Millisecond*200)
@@ -89,7 +99,7 @@ func (s *Varnish) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	out, err := s.run(s.Binary)
+	out, err := s.run(s.Binary, s.UseSudo)
 	if err != nil {
 		return fmt.Errorf("error gathering metrics: %s", err)
 	}
@@ -145,9 +155,10 @@ func (s *Varnish) Gather(acc telegraf.Accumulator) error {
 func init() {
 	inputs.Add("varnish", func() telegraf.Input {
 		return &Varnish{
-			run:    varnishRunner,
-			Stats:  defaultStats,
-			Binary: defaultBinary,
+			run:     varnishRunner,
+			Stats:   defaultStats,
+			Binary:  defaultBinary,
+			UseSudo: false,
 		}
 	})
 }
diff --git a/plugins/inputs/varnish/varnish_test.go b/plugins/inputs/varnish/varnish_test.go
index e3f848093..a2b388a0b 100644
--- a/plugins/inputs/varnish/varnish_test.go
+++ b/plugins/inputs/varnish/varnish_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 )
 
-func fakeVarnishStat(output string) func(string) (*bytes.Buffer, error) {
-	return func(string) (*bytes.Buffer, error) {
+func fakeVarnishStat(output string, useSudo bool) func(string, bool) (*bytes.Buffer, error) {
+	return func(string, bool) (*bytes.Buffer, error) {
 		return bytes.NewBuffer([]byte(output)), nil
 	}
 }
@@ -20,7 +20,7 @@ func fakeVarnishStat(output string) func(string) (*bytes.Buffer, error) {
 func TestGather(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(smOutput),
+		run:   fakeVarnishStat(smOutput, false),
 		Stats: []string{"*"},
 	}
 	v.Gather(acc)
@@ -36,7 +36,7 @@ func TestGather(t *testing.T) {
 func TestParseFullOutput(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(fullOutput),
+		run:   fakeVarnishStat(fullOutput, true),
 		Stats: []string{"*"},
 	}
 	err := v.Gather(acc)
@@ -51,7 +51,7 @@ func TestParseFullOutput(t *testing.T) {
 func TestFilterSomeStats(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(fullOutput),
+		run:   fakeVarnishStat(fullOutput, false),
 		Stats: []string{"MGT.*", "VBE.*"},
 	}
 	err := v.Gather(acc)
@@ -74,7 +74,7 @@ func TestFieldConfig(t *testing.T) {
 	for fieldCfg, expected := range expect {
 		acc := &testutil.Accumulator{}
 		v := &Varnish{
-			run:   fakeVarnishStat(fullOutput),
+			run:   fakeVarnishStat(fullOutput, true),
 			Stats: strings.Split(fieldCfg, ","),
 		}
 		err := v.Gather(acc)

From 3c14b46f6fc4d5cf2e7a28b04d8310f53e10af5d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 9 Aug 2017 11:47:55 -0700
Subject: [PATCH 0445/1302] Fix ordering of all target

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4e73f8c36..8055f82ed 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ ifdef VERSION
 endif
 
 
-all: | deps telegraf
+all:
+	$(MAKE) deps
+	$(MAKE) telegraf
 
 deps:
 	go get github.com/sparrc/gdm

From 84ce9629a8479e5f88cb5501a850f0c91acf84fb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 9 Aug 2017 11:48:12 -0700
Subject: [PATCH 0446/1302] Tweak formatting of varnish README

---
 plugins/inputs/varnish/README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/varnish/README.md b/plugins/inputs/varnish/README.md
index 1866ca188..215852d23 100644
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -374,18 +374,17 @@ other::---
 ```
 
 **Sudo privileges**:
-```bash
-# If you use this method, you will need the following in your telegraf config:
+If you use this method, you will need the following in your telegraf config:
+```toml
 [[inputs.varnish]]
   use_sudo = true
+```
 
+You will also need to update your sudoers file:
+```bash
 $ visudo
-
 # Add the following line:
 telegraf ALL=(ALL) NOPASSWD: /usr/bin/varnishstat
-
-$ grep varnish /etc/sudoers
-telegraf ALL = NOPASSWD: /usr/bin/varnishstat
 ```
 
 Please use the solution you see as most appropriate.

From 83c003e59430cbe94894204ed3971611c20bff83 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 9 Aug 2017 11:48:36 -0700
Subject: [PATCH 0447/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6911e0c35..b9dd59066 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
 - [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
 - [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
+- [#3097](https://github.com/influxdata/telegraf/pull/3097): Add option to run varnish under sudo.
 
 ### Bugfixes
 

From 1e2d594af0caba44110dc325b1867e2565950276 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 10 Aug 2017 10:19:28 -0700
Subject: [PATCH 0448/1302] Converge to typed value in prometheus output
 (#3104)

---
 .../prometheus_client/prometheus_client.go    | 12 ++++-
 .../prometheus_client_test.go                 | 50 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index c72d93354..c068a5fe7 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -254,7 +254,17 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 				}
 				p.fam[mname] = fam
 			} else {
-				if fam.ValueType != vt {
+				// Metrics can be untyped even though the corresponding plugin
+				// creates them with a type.  This happens when the metric was
+				// transferred over the network in a format that does not
+				// preserve value type and received using an input such as a
+				// queue consumer.  To avoid issues we automatically upgrade
+				// value type from untyped to a typed metric.
+				if fam.ValueType == prometheus.UntypedValue {
+					fam.ValueType = vt
+				}
+
+				if vt != prometheus.UntypedValue && fam.ValueType != vt {
 					// Don't return an error since this would be a permanent error
 					log.Printf("Mixed ValueType for measurement %q; dropping point", point.Name())
 					break
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 85b6dde5c..5be29a241 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -189,6 +189,56 @@ func TestWrite_MixedValueType(t *testing.T) {
 	require.Equal(t, 1, len(fam.Samples))
 }
 
+func TestWrite_MixedValueTypeUpgrade(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		map[string]string{"a": "x"},
+		map[string]interface{}{"value": 1.0},
+		now,
+		telegraf.Untyped)
+	p2, err := metric.New(
+		"foo",
+		map[string]string{"a": "y"},
+		map[string]interface{}{"value": 2.0},
+		now,
+		telegraf.Gauge)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 2, len(fam.Samples))
+}
+
+func TestWrite_MixedValueTypeDowngrade(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		map[string]string{"a": "x"},
+		map[string]interface{}{"value": 1.0},
+		now,
+		telegraf.Gauge)
+	p2, err := metric.New(
+		"foo",
+		map[string]string{"a": "y"},
+		map[string]interface{}{"value": 2.0},
+		now,
+		telegraf.Untyped)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 2, len(fam.Samples))
+}
+
 func TestWrite_Tags(t *testing.T) {
 	now := time.Now()
 	p1, err := metric.New(

From 73897d1f1cc38029abe68f315bb289f9a74bca66 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 10 Aug 2017 10:22:11 -0700
Subject: [PATCH 0449/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9dd59066..52008247c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@
 - [#2457](https://github.com/influxdata/telegraf/issues/2457): Fix docker memory and cpu reporting in Windows.
 - [#3058](https://github.com/influxdata/telegraf/issues/3058): Allow iptable entries with trailing text.
 - [#1680](https://github.com/influxdata/telegraf/issues/1680): Sanitize password from couchbase metric.
+- [#3104](https://github.com/influxdata/telegraf/issues/3104): Converge to typed value in prometheus output.
 
 ## v1.3.5 [2017-07-26]
 

From 287a44de5e197ed48deb3650978a875cc493604e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 10 Aug 2017 12:36:11 -0700
Subject: [PATCH 0450/1302] Skip compilcation of logparser and tail on solaris
 (#3113)

Allows compilation for solaris
---
 plugins/inputs/logparser/logparser.go         | 2 ++
 plugins/inputs/logparser/logparser_solaris.go | 3 +++
 plugins/inputs/tail/tail.go                   | 2 ++
 plugins/inputs/tail/tail_solaris.go           | 5 +++++
 4 files changed, 12 insertions(+)
 create mode 100644 plugins/inputs/logparser/logparser_solaris.go
 create mode 100644 plugins/inputs/tail/tail_solaris.go

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 27441c0ba..40870799d 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -1,3 +1,5 @@
+// +build !solaris
+
 package logparser
 
 import (
diff --git a/plugins/inputs/logparser/logparser_solaris.go b/plugins/inputs/logparser/logparser_solaris.go
new file mode 100644
index 000000000..28afe2677
--- /dev/null
+++ b/plugins/inputs/logparser/logparser_solaris.go
@@ -0,0 +1,3 @@
+// +build solaris
+
+package logparser
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 05a1c95af..5b3c864c0 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -1,3 +1,5 @@
+// +build !solaris
+
 package tail
 
 import (
diff --git a/plugins/inputs/tail/tail_solaris.go b/plugins/inputs/tail/tail_solaris.go
new file mode 100644
index 000000000..802088da2
--- /dev/null
+++ b/plugins/inputs/tail/tail_solaris.go
@@ -0,0 +1,5 @@
+// Skipping plugin on Solaris due to fsnotify support
+//
+// +build solaris
+
+package tail

From 257b460f615875d3d051d2198db04d9ed477770b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 10 Aug 2017 12:41:09 -0700
Subject: [PATCH 0451/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52008247c..a81ca6557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@
 - [#3058](https://github.com/influxdata/telegraf/issues/3058): Allow iptable entries with trailing text.
 - [#1680](https://github.com/influxdata/telegraf/issues/1680): Sanitize password from couchbase metric.
 - [#3104](https://github.com/influxdata/telegraf/issues/3104): Converge to typed value in prometheus output.
+- [#2899](https://github.com/influxdata/telegraf/issues/2899): Skip compilcation of logparser and tail on solaris.
 
 ## v1.3.5 [2017-07-26]
 

From b0109b35502620692d9357d36326be1c589494c0 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 11 Aug 2017 14:49:42 -0400
Subject: [PATCH 0452/1302] Add weighted_io_time to diskio input (#3119)

---
 CHANGELOG.md                         |  1 +
 plugins/inputs/system/DISK_README.md | 73 ++++++++++++++++++++++------
 plugins/inputs/system/disk.go        |  1 +
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a81ca6557..9a6796ef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
 - [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
 - [#3097](https://github.com/influxdata/telegraf/pull/3097): Add option to run varnish under sudo.
+- [#3119](https://github.com/influxdata/telegraf/pull/3119): Add weighted_io_time to diskio input.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index a05a9f7a2..30e54f29c 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -72,18 +72,55 @@ The diskio input plugin gathers metrics about disk traffic and timing.
 
 Data collection is based on github.com/shirou/gopsutil. This package handles platform dependencies and converts all timing information to milliseconds.
 
-
 ### Measurements & Fields:
 
 - diskio
     - reads (integer, counter)
     - writes (integer, counter)
-    - read_bytes (integer, bytes)
-    - write_bytes (integer, bytes)
-    - read_time (integer, milliseconds)
-    - write_time (integer, milliseconds)
-    - io_time (integer, milliseconds)
-    - iops_in_progress (integer, counter) (since #2037, not yet in STABLE)
+    - read_bytes (integer, counter, bytes)
+    - write_bytes (integer, counter, bytes)
+    - read_time (integer, counter, milliseconds)
+    - write_time (integer, counter, milliseconds)
+    - io_time (integer, counter, milliseconds)
+    - weighted_io_time (integer, counter, milliseconds)
+    - iops_in_progress (integer, gauge)
+
+On linux these values correspond to the values in [`/proc/diskstats`](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) and [`/sys/block/<dev>/stat`](https://www.kernel.org/doc/Documentation/block/stat.txt).
+
+#### `reads` & `writes`:
+
+These values increment when an I/O request completes.
+
+#### `read_bytes` & `write_bytes`:
+
+These values count the number of bytes read from or written to this
+block device.
+
+#### `read_time` & `write_time`:
+
+These values count the number of milliseconds that I/O requests have
+waited on this block device.  If there are multiple I/O requests waiting,
+these values will increase at a rate greater than 1000/second; for
+example, if 60 read requests wait for an average of 30 ms, the read_time
+field will increase by 60*30 = 1800.
+
+#### `io_time`:
+
+This value counts the number of milliseconds during which the device has
+had I/O requests queued.
+
+#### `weighted_io_time`:
+
+This value counts the number of milliseconds that I/O requests have waited
+on this block device.  If there are multiple I/O requests waiting, this
+value will increase as the product of the number of milliseconds times the
+number of requests waiting (see `read_time` above for an example).
+
+#### `iops_in_progress`:
+
+This value counts the number of I/O requests that have been issued to
+the device driver but have not yet completed.  It does not include I/O
+requests that are in the queue but not yet issued to the device driver.
 
 ### Tags:
 
@@ -94,21 +131,27 @@ Data collection is based on github.com/shirou/gopsutil. This package handles pla
 
 ### Sample Queries:
 
-Calculate percent IO utilization per disk and host:
+#### Calculate percent IO utilization per disk and host:
 ```
 SELECT derivative(last("io_time"),1ms) FROM "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
 ```
 
+#### Calculate average queue depth:
+`iops_in_progress` will give you an instantaneous value. This will give you the average between polling intervals.
+```
+SELECT derivative(last("weighted_io_time",1ms))/1000 from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
+```
+
 ### Example Output:
 
 ```
 % telegraf -config ~/.telegraf/telegraf.conf -input-filter diskio -test
 * Plugin: inputs.diskio, Collection 1
-> diskio,name=mmcblk1p2 io_time=244i,read_bytes=966656i,read_time=276i,reads=128i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
-> diskio,name=mmcblk1boot1 io_time=264i,read_bytes=90112i,read_time=264i,reads=22i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
-> diskio,name=mmcblk1boot0 io_time=212i,read_bytes=90112i,read_time=212i,reads=22i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
-> diskio,name=mmcblk0 io_time=1855380i,read_bytes=135861248i,read_time=58484i,reads=4081i,write_bytes=364068864i,write_time=7128792i,writes=18019i 1484916036000000000
-> diskio,name=mmcblk0p1 io_time=1855256i,read_bytes=134915072i,read_time=58256i,reads=3958i,write_bytes=364068864i,write_time=7128792i,writes=18019i 1484916036000000000
-> diskio,name=mmcblk1 io_time=384i,read_bytes=2633728i,read_time=728i,reads=323i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
-> diskio,name=mmcblk1p1 io_time=216i,read_bytes=860160i,read_time=288i,reads=106i,write_bytes=0i,write_time=0i,writes=0i 1484916036000000000
+> diskio,name=sda weighted_io_time=8411917i,read_time=7446444i,write_time=971489i,io_time=866197i,write_bytes=5397686272i,iops_in_progress=0i,reads=2970519i,writes=361139i,read_bytes=119528903168i 1502467254359000000
+> diskio,name=sda1 reads=2149i,read_bytes=10753536i,write_bytes=20697088i,write_time=346i,weighted_io_time=505i,writes=2110i,read_time=161i,io_time=208i,iops_in_progress=0i 1502467254359000000
+> diskio,name=sda2 reads=2968279i,writes=359029i,write_bytes=5376989184i,iops_in_progress=0i,weighted_io_time=8411250i,read_bytes=119517334528i,read_time=7446249i,write_time=971143i,io_time=866010i 1502467254359000000
+> diskio,name=sdb writes=99391856i,write_time=466700894i,io_time=630259874i,weighted_io_time=4245949844i,reads=2750773828i,read_bytes=80667939499008i,write_bytes=6329347096576i,read_time=3783042534i,iops_in_progress=2i 1502467254359000000
+> diskio,name=centos/root read_time=7472461i,write_time=950014i,iops_in_progress=0i,weighted_io_time=8424447i,writes=298543i,read_bytes=119510105088i,io_time=837421i,reads=2971769i,write_bytes=5192795648i 1502467254359000000
+> diskio,name=centos/var_log reads=1065i,writes=69711i,read_time=1083i,write_time=35376i,read_bytes=6828032i,write_bytes=184193536i,io_time=29699i,iops_in_progress=0i,weighted_io_time=36460i 1502467254359000000
+> diskio,name=postgresql/pgsql write_time=478267417i,io_time=631098730i,iops_in_progress=2i,weighted_io_time=4263637564i,reads=2750777151i,writes=110044361i,read_bytes=80667939288064i,write_bytes=6329347096576i,read_time=3784499336i 1502467254359000000
 ```
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 46f2219a7..f2d484273 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -152,6 +152,7 @@ func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
 			"read_time":        io.ReadTime,
 			"write_time":       io.WriteTime,
 			"io_time":          io.IoTime,
+			"weighted_io_time": io.WeightedIO,
 			"iops_in_progress": io.IopsInProgress,
 		}
 		acc.AddCounter("diskio", fields, tags)

From 1b50f14d55613fc986188e280abb1c8fcf056144 Mon Sep 17 00:00:00 2001
From: G-Research <opensourcedev@gresearch.co.uk>
Date: Fri, 11 Aug 2017 21:36:25 +0100
Subject: [PATCH 0453/1302] Build NTPQ input on Windows (#3117)

---
 plugins/inputs/ntpq/ntpq.go         | 2 --
 plugins/inputs/ntpq/ntpq_windows.go | 3 ---
 2 files changed, 5 deletions(-)
 delete mode 100644 plugins/inputs/ntpq/ntpq_windows.go

diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go
index 597db0bd1..692e1bc5d 100644
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 package ntpq
 
 import (
diff --git a/plugins/inputs/ntpq/ntpq_windows.go b/plugins/inputs/ntpq/ntpq_windows.go
deleted file mode 100644
index a1f1a55fa..000000000
--- a/plugins/inputs/ntpq/ntpq_windows.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build windows
-
-package ntpq

From 5003809e97bba1b0dfe79d556dca9fef7dbfd725 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 10 Aug 2017 16:33:31 -0700
Subject: [PATCH 0454/1302] Merge LDFLAGS from env into build

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8055f82ed..a82048b6b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 
 TELEGRAF := telegraf$(shell go tool dist env | grep -q 'GOOS=.windows.' && echo .exe)
 
-LDFLAGS := -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
+LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
 ifdef VERSION
 	LDFLAGS += -X main.version=$(VERSION)
 endif

From 54be037911c771897cbf4979c63511ac9b36a86d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 11 Aug 2017 16:26:00 -0700
Subject: [PATCH 0455/1302] Use double hyphen in cli examples

---
 cmd/telegraf/telegraf.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 07cffe569..f0ff6e66a 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -51,7 +51,7 @@ var fAggregatorFilters = flag.String("aggregator-filter", "",
 var fProcessorFilters = flag.String("processor-filter", "",
 	"filter the processors to enable, separator is :")
 var fUsage = flag.String("usage", "",
-	"print usage for a plugin, ie, 'telegraf -usage mysql'")
+	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
 	"operate on the service")
 
@@ -83,8 +83,8 @@ Usage:
 
 The commands & flags are:
 
-  config             print out full sample configuration to stdout
-  version            print the version to stdout
+  config              print out full sample configuration to stdout
+  version             print the version to stdout
 
   --config <file>     configuration file to load
   --test              gather metrics once, print them to stdout, and exit
@@ -105,7 +105,7 @@ Examples:
   telegraf --input-filter cpu --output-filter influxdb config
 
   # run a single telegraf collection, outputing metrics to stdout
-  telegraf --config telegraf.conf -test
+  telegraf --config telegraf.conf --test
 
   # run telegraf with all plugins defined in config file
   telegraf --config telegraf.conf

From 7d5dae5a08b1eb896965401682aaef19736829d3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 11 Aug 2017 17:50:51 -0700
Subject: [PATCH 0456/1302] Improve apache input docs (#3120)

---
 plugins/inputs/apache/README.md | 119 ++++++++++++++++++++------------
 plugins/inputs/apache/apache.go |  14 ++--
 2 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/plugins/inputs/apache/README.md b/plugins/inputs/apache/README.md
index ffebbcbf8..634abd11a 100644
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -1,55 +1,84 @@
-# Telegraf plugin: Apache
+# Apache Input Plugin
 
-#### Plugin arguments:
-- **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
-- **username** string: Username for HTTP basic authentication
-- **password** string: Password for HTTP basic authentication
-- **timeout** duration: time that the HTTP connection will remain waiting for response. Default 4 seconds ("4s")
+The Apache plugin collects server performance information using the [`mod_status`](https://httpd.apache.org/docs/2.4/mod/mod_status.html) module of the [Apache HTTP Server](https://httpd.apache.org/).
 
-##### Optional SSL Config
+Typically, the `mod_status` module is configured to expose a page at the `/server-status?auto` location of the Apache server.  The [ExtendedStatus](https://httpd.apache.org/docs/2.4/mod/core.html#extendedstatus) option must be enabled in order to collect all available fields.  For information about how to configure your server reference the [module documenation](https://httpd.apache.org/docs/2.4/mod/mod_status.html#enable).
 
-- **ssl_ca** string: the full path for the SSL CA certicate
-- **ssl_cert** string: the full path for the SSL certificate
-- **ssl_key** string: the full path for the key file
-- **insecure_skip_verify** bool: if true HTTP client will skip all SSL verifications related to peer and host. Default to false
+### Configuration:
 
-#### Description
+```toml
+# Read Apache status information (mod_status)
+[[inputs.apache]]
+  ## An array of URLs to gather from, must be directed at the machine
+  ## readable version of the mod_status page including the auto query string.
+  ## Default is "http://localhost/server-status?auto".
+  urls = ["http://localhost/server-status?auto"]
 
-The Apache plugin collects from the /server-status?auto URL. See
-[apache.org/server-status?auto](http://www.apache.org/server-status?auto) for an
-example. And
-[here](http://httpd.apache.org/docs/2.2/mod/mod_status.html) for the apache
-mod_status documentation.
+  ## Credentials for basic HTTP authentication.
+  # username = "myuser"
+  # password = "mypassword"
 
-# Measurements:
+  ## Maximum time to receive response.
+  # response_timeout = "5s"
 
-Meta:
-- tags: `port=<port>`, `server=url`
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+```
 
-- apache_TotalAccesses
-- apache_TotalkBytes
-- apache_CPULoad
-- apache_Uptime
-- apache_ReqPerSec
-- apache_BytesPerSec
-- apache_BytesPerReq
-- apache_BusyWorkers
-- apache_IdleWorkers
-- apache_ConnsTotal
-- apache_ConnsAsyncWriting
-- apache_ConnsAsyncKeepAlive
-- apache_ConnsAsyncClosing
+### Measurements & Fields:
 
-### Scoreboard measurements
+- apache
+  - BusyWorkers (float)
+  - BytesPerReq (float)
+  - BytesPerSec (float)
+  - ConnsAsyncClosing (float)
+  - ConnsAsyncKeepAlive (float)
+  - ConnsAsyncWriting (float)
+  - ConnsTotal (float)
+  - CPUChildrenSystem (float)
+  - CPUChildrenUser (float)
+  - CPULoad (float)
+  - CPUSystem (float)
+  - CPUUser (float)
+  - IdleWorkers (float)
+  - Load1 (float)
+  - Load5 (float)
+  - Load15 (float)
+  - ParentServerConfigGeneration (float)
+  - ParentServerMPMGeneration (float)
+  - ReqPerSec (float)
+  - ServerUptimeSeconds (float)
+  - TotalAccesses (float)
+  - TotalkBytes (float)
+  - Uptime (float)
 
-- apache_scboard_waiting
-- apache_scboard_starting
-- apache_scboard_reading
-- apache_scboard_sending
-- apache_scboard_keepalive
-- apache_scboard_dnslookup
-- apache_scboard_closing
-- apache_scboard_logging
-- apache_scboard_finishing
-- apache_scboard_idle_cleanup
-- apache_scboard_open
+The following fields are collected from the `Scoreboard`, and represent the number of requests in the given state:
+
+- apache
+  - scboard_closing (float)
+  - scboard_dnslookup (float)
+  - scboard_finishing (float)
+  - scboard_idle_cleanup (float)
+  - scboard_keepalive (float)
+  - scboard_logging (float)
+  - scboard_open (float)
+  - scboard_reading (float)
+  - scboard_sending (float)
+  - scboard_starting (float)
+  - scboard_waiting (float)
+
+### Tags:
+
+- All measurements have the following tags:
+    - port
+    - server
+
+### Example Output:
+
+```
+apache,port=80,server=debian-stretch-apache BusyWorkers=1,BytesPerReq=0,BytesPerSec=0,CPUChildrenSystem=0,CPUChildrenUser=0,CPULoad=0.00995025,CPUSystem=0.01,CPUUser=0.01,ConnsAsyncClosing=0,ConnsAsyncKeepAlive=0,ConnsAsyncWriting=0,ConnsTotal=0,IdleWorkers=49,Load1=0.01,Load15=0,Load5=0,ParentServerConfigGeneration=3,ParentServerMPMGeneration=2,ReqPerSec=0.00497512,ServerUptimeSeconds=201,TotalAccesses=1,TotalkBytes=0,Uptime=201,scboard_closing=0,scboard_dnslookup=0,scboard_finishing=0,scboard_idle_cleanup=0,scboard_keepalive=0,scboard_logging=0,scboard_open=100,scboard_reading=0,scboard_sending=1,scboard_starting=0,scboard_waiting=49 1502489900000000000
+```
diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index 1cf223e24..a3df105bb 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -34,15 +34,17 @@ type Apache struct {
 }
 
 var sampleConfig = `
-  ## An array of Apache status URI to gather stats.
+  ## An array of URLs to gather from, must be directed at the machine
+  ## readable version of the mod_status page including the auto query string.
   ## Default is "http://localhost/server-status?auto".
   urls = ["http://localhost/server-status?auto"]
-  ## user credentials for basic HTTP authentication
-  username = "myuser"
-  password = "mypassword"
 
-  ## Timeout to the complete conection and reponse time in seconds
-  response_timeout = "25s" ## default to 5 seconds
+  ## Credentials for basic HTTP authentication.
+  # username = "myuser"
+  # password = "mypassword"
+
+  ## Maximum time to receive response.
+  # response_timeout = "5s"
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"

From 5fbdd09aafb7033ddd4df6e4851cb7ec7dd88f6d Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Mon, 14 Aug 2017 17:50:15 -0400
Subject: [PATCH 0457/1302] Add gzip content-encoding support to influxdb
 output (#2978)

---
 plugins/outputs/influxdb/README.md           |  4 ++
 plugins/outputs/influxdb/client/http.go      | 40 +++++++++++++++-----
 plugins/outputs/influxdb/client/http_test.go | 22 +++++++++++
 plugins/outputs/influxdb/influxdb.go         | 19 ++++++----
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 49fdc731c..36d64c219 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -43,6 +43,9 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
 
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
+
+  ## Compress each HTTP request payload using GZIP.
+  # content_encoding = "gzip"
 ```
 
 ### Required parameters:
@@ -67,3 +70,4 @@ to write to. Each URL should start with either `http://` or `udp://`
 * `ssl_key`: SSL key
 * `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
 * `http_proxy`: HTTP Proxy URI
+* `content_encoding`: Compress each HTTP request payload using gzip if set to: "gzip"
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 6a757982d..957c490ed 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"bytes"
+	"compress/gzip"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -94,9 +95,8 @@ type HTTPConfig struct {
 	// Proxy URL should be of the form "http://host:port"
 	HTTPProxy string
 
-	// Gzip, if true, compresses each payload using gzip.
-	// TODO
-	// Gzip bool
+	// The content encoding mechanism to use for each request.
+	ContentEncoding string
 }
 
 // Response represents a list of statement results.
@@ -232,16 +232,24 @@ func (c *httpClient) makeWriteRequest(
 	if err != nil {
 		return nil, err
 	}
-	req.Header.Set("Content-Length", fmt.Sprint(contentLength))
-	// TODO
-	// if gzip {
-	// 	req.Header.Set("Content-Encoding", "gzip")
-	// }
+	if c.config.ContentEncoding == "gzip" {
+		req.Header.Set("Content-Encoding", "gzip")
+	} else {
+		req.Header.Set("Content-Length", fmt.Sprint(contentLength))
+	}
 	return req, nil
 }
 
 func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, error) {
-	req, err := http.NewRequest("POST", uri, body)
+	var req *http.Request
+	var err error
+	if c.config.ContentEncoding == "gzip" {
+		body, err = compressWithGzip(body)
+		if err != nil {
+			return nil, err
+		}
+	}
+	req, err = http.NewRequest("POST", uri, body)
 	if err != nil {
 		return nil, err
 	}
@@ -253,6 +261,20 @@ func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, err
 	return req, nil
 }
 
+func compressWithGzip(data io.Reader) (io.Reader, error) {
+	pr, pw := io.Pipe()
+	gw := gzip.NewWriter(pw)
+	var err error
+
+	go func() {
+		_, err = io.Copy(gw, data)
+		gw.Close()
+		pw.Close()
+	}()
+
+	return pr, err
+}
+
 func (c *httpClient) Close() error {
 	// Nothing to do.
 	return nil
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
index 8fa02dd22..7f3bd7e34 100644
--- a/plugins/outputs/influxdb/client/http_test.go
+++ b/plugins/outputs/influxdb/client/http_test.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"bytes"
+	"compress/gzip"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -341,3 +342,24 @@ func TestHTTPClient_Query_JSONDecodeError(t *testing.T) {
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "json")
 }
+
+func TestGzipCompression(t *testing.T) {
+	influxLine := "cpu value=99\n"
+
+	// Compress the payload using GZIP.
+	payload := bytes.NewReader([]byte(influxLine))
+	compressed, err := compressWithGzip(payload)
+	assert.Nil(t, err)
+
+	// Decompress the compressed payload and make sure
+	// that its original value has not changed.
+	gr, err := gzip.NewReader(compressed)
+	assert.Nil(t, err)
+	gr.Close()
+
+	var uncompressed bytes.Buffer
+	_, err = uncompressed.ReadFrom(gr)
+	assert.Nil(t, err)
+
+	assert.Equal(t, []byte(influxLine), uncompressed.Bytes())
+}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 1028bc257..23f567820 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -34,6 +34,7 @@ type InfluxDB struct {
 	Timeout          internal.Duration
 	UDPPayload       int    `toml:"udp_payload"`
 	HTTPProxy        string `toml:"http_proxy"`
+	ContentEncoding  string `toml:"content_encoding"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -87,6 +88,9 @@ var sampleConfig = `
 
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
+  
+  ## Compress each HTTP request payload using GZIP.
+  # content_encoding = "gzip"
 `
 
 // Connect initiates the primary connection to the range of provided URLs
@@ -121,13 +125,14 @@ func (i *InfluxDB) Connect() error {
 		default:
 			// If URL doesn't start with "udp", assume HTTP client
 			config := client.HTTPConfig{
-				URL:       u,
-				Timeout:   i.Timeout.Duration,
-				TLSConfig: tlsConfig,
-				UserAgent: i.UserAgent,
-				Username:  i.Username,
-				Password:  i.Password,
-				HTTPProxy: i.HTTPProxy,
+				URL:             u,
+				Timeout:         i.Timeout.Duration,
+				TLSConfig:       tlsConfig,
+				UserAgent:       i.UserAgent,
+				Username:        i.Username,
+				Password:        i.Password,
+				HTTPProxy:       i.HTTPProxy,
+				ContentEncoding: i.ContentEncoding,
 			}
 			wp := client.WriteParams{
 				Database:        i.Database,

From 032348c7a50344fe46baf5b3d543bc3d4a46188a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 14 Aug 2017 14:51:28 -0700
Subject: [PATCH 0458/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a6796ef9..99ac60add 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
 - [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
 - [#3097](https://github.com/influxdata/telegraf/pull/3097): Add option to run varnish under sudo.
 - [#3119](https://github.com/influxdata/telegraf/pull/3119): Add weighted_io_time to diskio input.
+- [#2978](https://github.com/influxdata/telegraf/pull/2978): Add gzip content-encoding support to influxdb output.
 
 ### Bugfixes
 

From 9bc13f143e6dc384b8eec2660a59cbbccdb5d6a1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 15 Aug 2017 11:41:58 -0700
Subject: [PATCH 0459/1302] Test for nil metric before reading tags in
 logparser

---
 plugins/inputs/logparser/logparser.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 40870799d..b6640cdc9 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -254,9 +254,9 @@ func (l *LogParserPlugin) parser() {
 		for _, parser := range l.parsers {
 			m, err = parser.ParseLine(entry.line)
 			if err == nil {
-				tags := m.Tags()
-				tags["path"] = entry.path
 				if m != nil {
+					tags := m.Tags()
+					tags["path"] = entry.path
 					l.acc.AddFields(m.Name(), m.Fields(), tags, m.Time())
 				}
 			} else {

From 09153c815cecec68508018e1b3828fc016a5b9c8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 15 Aug 2017 11:50:08 -0700
Subject: [PATCH 0460/1302] Move http_response headers to end of configuration.

If the subtable comes before other options, they will be placed in the
subtable.
---
 plugins/inputs/http_response/README.md        | 26 +++++++++++--------
 plugins/inputs/http_response/http_response.go | 25 +++++++++++-------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 866fcbb23..924d35384 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -8,25 +8,26 @@ This input plugin will test HTTP/HTTPS connections.
 # HTTP/HTTPS request given an address a method and a timeout
 [[inputs.http_response]]
   ## Server address (default http://localhost)
-  address = "http://github.com"
+  # address = "http://localhost"
+
   ## Set response_timeout (default 5 seconds)
-  response_timeout = "5s"
+  # response_timeout = "5s"
+
   ## HTTP Request Method
-  method = "GET"
+  # method = "GET"
+
   ## Whether to follow redirects from the server (defaults to false)
-  follow_redirects = true
-  ## HTTP Request Headers (all values must be strings)
-  # [inputs.http_response.headers]
-  #   Host = "github.com"
+  # follow_redirects = false
+
   ## Optional HTTP Request Body
   # body = '''
   # {'fake':'data'}
   # '''
 
   ## Optional substring or regex match in body of the response
-  ## response_string_match = "\"service_status\": \"up\""
-  ## response_string_match = "ok"
-  ## response_string_match = "\".*_status\".?:.?\"up\""
+  # response_string_match = "\"service_status\": \"up\""
+  # response_string_match = "ok"
+  # response_string_match = "\".*_status\".?:.?\"up\""
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -34,6 +35,10 @@ This input plugin will test HTTP/HTTPS connections.
   # ssl_key = "/etc/telegraf/key.pem"
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
+
+  ## HTTP Request Headers (all values must be strings)
+  # [inputs.http_response.headers]
+  #   Host = "github.com"
 ```
 
 ### Measurements & Fields:
@@ -52,6 +57,5 @@ This input plugin will test HTTP/HTTPS connections.
 ### Example Output:
 
 ```
-$ ./telegraf --config telegraf.conf --input-filter http_response --test
 http_response,method=GET,server=http://www.github.com http_response_code=200i,response_time=6.223266528 1459419354977857955
 ```
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index f3deaf9e3..62d6e9ec1 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -47,25 +47,26 @@ func (h *HTTPResponse) Description() string {
 
 var sampleConfig = `
   ## Server address (default http://localhost)
-  address = "http://github.com"
+  # address = "http://localhost"
+
   ## Set response_timeout (default 5 seconds)
-  response_timeout = "5s"
+  # response_timeout = "5s"
+
   ## HTTP Request Method
-  method = "GET"
+  # method = "GET"
+
   ## Whether to follow redirects from the server (defaults to false)
-  follow_redirects = true
-  ## HTTP Request Headers (all values must be strings)
-  # [inputs.http_response.headers]
-  #   Host = "github.com"
+  # follow_redirects = false
+
   ## Optional HTTP Request Body
   # body = '''
   # {'fake':'data'}
   # '''
 
   ## Optional substring or regex match in body of the response
-  ## response_string_match = "\"service_status\": \"up\""
-  ## response_string_match = "ok"
-  ## response_string_match = "\".*_status\".?:.?\"up\""
+  # response_string_match = "\"service_status\": \"up\""
+  # response_string_match = "ok"
+  # response_string_match = "\".*_status\".?:.?\"up\""
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -73,6 +74,10 @@ var sampleConfig = `
   # ssl_key = "/etc/telegraf/key.pem"
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
+
+  ## HTTP Request Headers (all values must be strings)
+  # [inputs.http_response.headers]
+  #   Host = "github.com"
 `
 
 // SampleConfig returns the plugin SampleConfig

From eb0215c38210e095e8ac27c11357f5a372ac76d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 16 Aug 2017 11:59:41 -0700
Subject: [PATCH 0461/1302] Remove log message on ping timeout (#3126)

---
 plugins/inputs/ping/ping.go      | 29 +++++++++++++++++++++++++----
 plugins/inputs/ping/ping_test.go |  3 ++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index af671e49d..dffa88751 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -4,11 +4,13 @@ package ping
 
 import (
 	"errors"
+	"fmt"
 	"os/exec"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -76,17 +78,36 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			defer wg.Done()
 			args := p.args(u)
 			totalTimeout := float64(p.Count)*p.Timeout + float64(p.Count-1)*p.PingInterval
+
 			out, err := p.pingHost(totalTimeout, args...)
 			if err != nil {
-				// Combine go err + stderr output
-				acc.AddError(errors.New(
-					strings.TrimSpace(out) + ", " + err.Error()))
+				// Some implementations of ping return a 1 exit code on
+				// timeout, if this occurs we will not exit and try to parse
+				// the output.
+				status := -1
+				if exitError, ok := err.(*exec.ExitError); ok {
+					if ws, ok := exitError.Sys().(syscall.WaitStatus); ok {
+						status = ws.ExitStatus()
+					}
+				}
+
+				if status != 1 {
+					// Combine go err + stderr output
+					out = strings.TrimSpace(out)
+					if len(out) > 0 {
+						acc.AddError(fmt.Errorf("%s, %s", out, err))
+					} else {
+						acc.AddError(err)
+					}
+					return
+				}
 			}
+
 			tags := map[string]string{"url": u}
 			trans, rec, min, avg, max, stddev, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
-				acc.AddError(err)
+				acc.AddError(fmt.Errorf("%s: %s", err, u))
 				return
 			}
 			// Calculate packet loss percentage
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index e924d5175..8d422d4b2 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -211,7 +211,8 @@ Request timeout for icmp_seq 0
 `
 
 func mockErrorHostPinger(timeout float64, args ...string) (string, error) {
-	return errorPingOutput, errors.New("No packets received")
+	// This error will not trigger correct error paths
+	return errorPingOutput, nil
 }
 
 // Test that Gather works on a ping with no transmitted packets, even though the

From 38196075119b55b5510e22ac6365022645fea410 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 16 Aug 2017 12:05:46 -0700
Subject: [PATCH 0462/1302] Allow using system plugin in Windows (#3127)

---
 plugins/inputs/system/system.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/system/system.go b/plugins/inputs/system/system.go
index 1a61f11bf..32c391f78 100644
--- a/plugins/inputs/system/system.go
+++ b/plugins/inputs/system/system.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"runtime"
+	"strings"
 
 	"github.com/shirou/gopsutil/host"
 	"github.com/shirou/gopsutil/load"
@@ -23,7 +24,7 @@ func (_ *SystemStats) SampleConfig() string { return "" }
 
 func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
 	loadavg, err := load.Avg()
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "not implemented") {
 		return err
 	}
 

From ca394fcfb2fe25c7fa2226c7af83ba9c28ac924c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 16 Aug 2017 12:06:07 -0700
Subject: [PATCH 0463/1302] Discard logging from tail library (#3128)

---
 plugins/inputs/logparser/logparser.go | 1 +
 plugins/inputs/tail/tail.go           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index b6640cdc9..33b12fcc7 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -188,6 +188,7 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Follow:    true,
 					Location:  &seek,
 					MustExist: true,
+					Logger:    tail.DiscardingLogger,
 				})
 			if err != nil {
 				l.acc.AddError(err)
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 5b3c864c0..7812cf8c1 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -97,6 +97,7 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 					Location:  seek,
 					MustExist: true,
 					Pipe:      t.Pipe,
+					Logger:    tail.DiscardingLogger,
 				})
 			if err != nil {
 				acc.AddError(err)

From fd3a9bf46a25def228b1ad0f30564ff1df620080 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 16 Aug 2017 12:26:00 -0700
Subject: [PATCH 0464/1302] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99ac60add..d6149ecb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - [#3097](https://github.com/influxdata/telegraf/pull/3097): Add option to run varnish under sudo.
 - [#3119](https://github.com/influxdata/telegraf/pull/3119): Add weighted_io_time to diskio input.
 - [#2978](https://github.com/influxdata/telegraf/pull/2978): Add gzip content-encoding support to influxdb output.
+- [#3127](https://github.com/influxdata/telegraf/pull/3127): Allow using system plugin in Windows.
 
 ### Bugfixes
 
@@ -88,6 +89,8 @@
 - [#1680](https://github.com/influxdata/telegraf/issues/1680): Sanitize password from couchbase metric.
 - [#3104](https://github.com/influxdata/telegraf/issues/3104): Converge to typed value in prometheus output.
 - [#2899](https://github.com/influxdata/telegraf/issues/2899): Skip compilcation of logparser and tail on solaris.
+- [#2951](https://github.com/influxdata/telegraf/issues/2951): Discard logging from tail library.
+- [#3126](https://github.com/influxdata/telegraf/pull/3126): Remove log message on ping timeout.
 
 ## v1.3.5 [2017-07-26]
 

From a91457e001f38ca8b5c4b8435c8eae2987eb8e05 Mon Sep 17 00:00:00 2001
From: mlindes <mlindes@hushmail.com>
Date: Wed, 16 Aug 2017 18:33:20 -0400
Subject: [PATCH 0465/1302] Add tomcat input plugin (#3112)

---
 plugins/inputs/tomcat/README.md      |  73 +++++++++++
 plugins/inputs/tomcat/tomcat.go      | 176 +++++++++++++++++++++++++++
 plugins/inputs/tomcat/tomcat_test.go |  95 +++++++++++++++
 3 files changed, 344 insertions(+)
 create mode 100644 plugins/inputs/tomcat/README.md
 create mode 100644 plugins/inputs/tomcat/tomcat.go
 create mode 100644 plugins/inputs/tomcat/tomcat_test.go

diff --git a/plugins/inputs/tomcat/README.md b/plugins/inputs/tomcat/README.md
new file mode 100644
index 000000000..d2fa2e729
--- /dev/null
+++ b/plugins/inputs/tomcat/README.md
@@ -0,0 +1,73 @@
+# Tomcat Input Plugin
+
+The Tomcat plugin collects statistics available from the tomcat manager status page from the `http://<host>/manager/status/all?XML=true URL.`
+(`XML=true` will return only xml data). See the [Tomcat documentation](https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html#Server_Status) for details of these statistics.
+
+### Configuration:
+
+```toml
+# A Telegraf plugin to collect tomcat metrics.
+[[inputs.tomcat]]
+  # A Tomcat status URI to gather stats.
+  # Default is "http://127.0.0.1:8080/manager/status/all?XML=true".
+  url = "http://127.0.0.1:8080/manager/status/all?XML=true"
+  # Credentials for status URI.
+  # Default is tomcat/s3cret.
+  username = "tomcat"
+  password = "s3cret"
+```
+
+### Measurements & Fields:
+
+- tomcat\_jvm\_memory
+    - free
+    - total
+    - max
+- tomcat\_jvm\_memorypool
+  - max\_threads
+  - current\_thread\_count
+  - current\_threads\_busy
+  - max\_time
+  - processing\_time
+  - request\_count
+  - error\_count
+  - bytes\_received
+  - bytes\_sent
+- tomcat\_connector
+  - max\_threads
+  - current\_thread\_count
+  - current\_thread\_busy
+  - max\_time
+  - processing\_time
+  - request\_count
+  - error\_count
+  - bytes\_received
+  - bytes\_sent
+
+### Tags:
+
+- tomcat\_jvm\_memorypool has the following tags:
+  - name
+  - type
+- tomcat\_connector
+  - name
+
+### Sample Queries:
+
+TODO
+
+### Example Output:
+
+```
+$ ./telegraf -config telegraf.conf -input-filter tomcat -test
+* Plugin: tomcat, Collection 1
+> tomcat_jvm_memory,host=N8-MBP free=20014352i,max=127729664i,total=41459712i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Eden\ Space,type=Heap\ memory committed=11534336i,init=2228224i,max=35258368i,used=1941200i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Survivor\ Space,type=Heap\ memory committed=1376256i,init=262144i,max=4390912i,used=1376248i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Tenured\ Gen,type=Heap\ memory committed=28549120i,init=5636096i,max=88080384i,used=18127912i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Code\ Cache,type=Non-heap\ memory committed=6946816i,init=2555904i,max=251658240i,used=6406528i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Compressed\ Class\ Space,type=Non-heap\ memory committed=1966080i,init=0i,max=1073741824i,used=1816120i 1474663361000000000
+> tomcat_jvm_memorypool,host=N8-MBP,name=Metaspace,type=Non-heap\ memory committed=18219008i,init=0i,max=-1i,used=17559376i 1474663361000000000
+> tomcat_connector,host=N8-MBP,name=ajp-bio-8009 bytes_received=0i,bytes_sent=0i,current_thread_count=0i,current_threads_busy=0i,error_count=0i,max_threads=200i,max_time=0i,processing_time=0i,request_count=0i 1474663361000000000
+> tomcat_connector,host=N8-MBP,name=http-bio-8080 bytes_received=0i,bytes_sent=86435i,current_thread_count=10i,current_threads_busy=1i,error_count=2i,max_threads=200i,max_time=167i,processing_time=245i,request_count=15i 1474663361000000000
+```
diff --git a/plugins/inputs/tomcat/tomcat.go b/plugins/inputs/tomcat/tomcat.go
new file mode 100644
index 000000000..dfde52ca2
--- /dev/null
+++ b/plugins/inputs/tomcat/tomcat.go
@@ -0,0 +1,176 @@
+package tomcat
+
+import (
+	"encoding/xml"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type TomcatStatus struct {
+	TomcatJvm        TomcatJvm         `xml:"jvm"`
+	TomcatConnectors []TomcatConnector `xml:"connector"`
+}
+
+type TomcatJvm struct {
+	JvmMemory      JvmMemoryStat       `xml:"memory"`
+	JvmMemoryPools []JvmMemoryPoolStat `xml:"memorypool"`
+}
+
+type JvmMemoryStat struct {
+	Free  int64 `xml:"free,attr"`
+	Total int64 `xml:"total,attr"`
+	Max   int64 `xml:"max,attr"`
+}
+
+type JvmMemoryPoolStat struct {
+	Name           string `xml:"name,attr"`
+	Type           string `xml:"type,attr"`
+	UsageInit      int64  `xml:"usageInit,attr"`
+	UsageCommitted int64  `xml:"usageCommitted,attr"`
+	UsageMax       int64  `xml:"usageMax,attr"`
+	UsageUsed      int64  `xml:"usageUsed,attr"`
+}
+
+type TomcatConnector struct {
+	Name        string      `xml:"name,attr"`
+	ThreadInfo  ThreadInfo  `xml:"threadInfo"`
+	RequestInfo RequestInfo `xml:"requestInfo"`
+}
+
+type ThreadInfo struct {
+	MaxThreads         int64 `xml:"maxThreads,attr"`
+	CurrentThreadCount int64 `xml:"currentThreadCount,attr"`
+	CurrentThreadsBusy int64 `xml:"currentThreadsBusy,attr"`
+}
+type RequestInfo struct {
+	MaxTime        int   `xml:"maxTime,attr"`
+	ProcessingTime int   `xml:"processingTime,attr"`
+	RequestCount   int   `xml:"requestCount,attr"`
+	ErrorCount     int   `xml:"errorCount,attr"`
+	BytesReceived  int64 `xml:"bytesReceived,attr"`
+	BytesSent      int64 `xml:"bytesSent,attr"`
+}
+
+type Tomcat struct {
+	URL      string
+	Username string
+	Password string
+}
+
+var sampleconfig = `
+  ## A Tomcat status URI to gather stats.
+  ## Default is "http://127.0.0.1:8080/manager/status/all?XML=true".
+  url = "http://127.0.0.1:8080/manager/status/all?XML=true"
+  ## Credentials for status URI.
+  ## Default is tomcat/s3cret.
+  username = "tomcat"
+  password = "s3cret"
+`
+
+func (s *Tomcat) Description() string {
+	return "A Telegraf plugin to collect tomcat metrics."
+}
+
+func (s *Tomcat) SampleConfig() string {
+	return sampleconfig
+}
+
+func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
+
+	if s.URL == "" {
+		s.URL = "http://127.0.0.1:8080/manager/status/all?XML=true"
+	}
+
+	if s.Username == "" {
+		s.Username = "tomcat"
+	}
+
+	if s.Password == "" {
+		s.Password = "s3cret"
+	}
+
+	_, err := url.Parse(s.URL)
+	if err != nil {
+		return fmt.Errorf("Unable to parse address '%s': %s", s.URL, err)
+	}
+
+	req, err := http.NewRequest("GET", s.URL, nil)
+	req.SetBasicAuth(s.Username, s.Password)
+	cli := &http.Client{}
+	resp, err := cli.Do(req)
+	if err != nil {
+		return fmt.Errorf("Unable to call URL '%s': %s", s.URL, err)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+
+	var status TomcatStatus
+	xml.Unmarshal(body, &status)
+
+	// add tomcat_jvm_memory measurements
+	tcm := map[string]interface{}{
+		"free":  status.TomcatJvm.JvmMemory.Free,
+		"total": status.TomcatJvm.JvmMemory.Total,
+		"max":   status.TomcatJvm.JvmMemory.Max,
+	}
+	acc.AddFields("tomcat_jvm_memory", tcm, nil)
+
+	// add tomcat_jvm_memorypool measurements
+	for _, mp := range status.TomcatJvm.JvmMemoryPools {
+
+		tcmpTags := map[string]string{
+			"name": mp.Name,
+			"type": mp.Type,
+		}
+
+		tcmpFields := map[string]interface{}{
+			"init":      mp.UsageInit,
+			"committed": mp.UsageCommitted,
+			"max":       mp.UsageMax,
+			"used":      mp.UsageUsed,
+		}
+
+		acc.AddFields("tomcat_jvm_memorypool", tcmpFields, tcmpTags)
+
+	}
+
+	// add tomcat_connector measurements
+	for _, c := range status.TomcatConnectors {
+
+		name, err := strconv.Unquote(c.Name)
+		if err != nil {
+			return fmt.Errorf("Unable to unquote name '%s': %s", c.Name, err)
+		}
+
+		tccTags := map[string]string{
+			"name": name,
+		}
+
+		tccFields := map[string]interface{}{
+			"max_threads":          c.ThreadInfo.MaxThreads,
+			"current_thread_count": c.ThreadInfo.CurrentThreadCount,
+			"current_threads_busy": c.ThreadInfo.CurrentThreadsBusy,
+			"max_time":             c.RequestInfo.MaxTime,
+			"processing_time":      c.RequestInfo.ProcessingTime,
+			"request_count":        c.RequestInfo.RequestCount,
+			"error_count":          c.RequestInfo.ErrorCount,
+			"bytes_received":       c.RequestInfo.BytesReceived,
+			"bytes_sent":           c.RequestInfo.BytesSent,
+		}
+
+		acc.AddFields("tomcat_connector", tccFields, tccTags)
+
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("tomcat", func() telegraf.Input { return &Tomcat{} })
+}
diff --git a/plugins/inputs/tomcat/tomcat_test.go b/plugins/inputs/tomcat/tomcat_test.go
new file mode 100644
index 000000000..8bdddd6d0
--- /dev/null
+++ b/plugins/inputs/tomcat/tomcat_test.go
@@ -0,0 +1,95 @@
+package tomcat
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+
+	"github.com/stretchr/testify/require"
+)
+
+var tomcatStatus = `<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/manager/xform.xsl" ?>
+<status>
+  <jvm>
+    <memory free='17909336' total='58195968' max='620756992'/>
+    <memorypool name='PS Eden Space' type='Heap memory' usageInit='8912896' usageCommitted='35651584' usageMax='230686720' usageUsed='25591384'/>
+    <memorypool name='PS Old Gen' type='Heap memory' usageInit='21495808' usageCommitted='21495808' usageMax='465567744' usageUsed='13663040'/>
+    <memorypool name='PS Survivor Space' type='Heap memory' usageInit='1048576' usageCommitted='1048576' usageMax='1048576' usageUsed='1032208'/>
+    <memorypool name='Code Cache' type='Non-heap memory' usageInit='2555904' usageCommitted='2555904' usageMax='50331648' usageUsed='1220096'/>
+    <memorypool name='PS Perm Gen' type='Non-heap memory' usageInit='22020096' usageCommitted='22020096' usageMax='174063616' usageUsed='17533952'/>
+  </jvm>
+  <connector name='"ajp-apr-8009"'>
+    <threadInfo maxThreads="200" currentThreadCount="0" currentThreadsBusy="0"/>
+    <requestInfo maxTime="0" processingTime="0" requestCount="0" errorCount="0" bytesReceived="0" bytesSent="0"/>
+    <workers>
+    </workers>
+  </connector>
+  <connector name='"http-apr-8080"'>
+    <threadInfo maxThreads="200" currentThreadCount="5" currentThreadsBusy="1"/>
+    <requestInfo maxTime="68" processingTime="88" requestCount="2" errorCount="1" bytesReceived="0" bytesSent="9286"/>
+    <workers>
+      <worker stage="S" requestProcessingTime="4" requestBytesSent="0" requestBytesReceived="0" remoteAddr="127.0.0.1" virtualHost="127.0.0.1" method="GET" currentUri="/manager/status/all" currentQueryString="XML=true" protocol="HTTP/1.1"/>
+    </workers>
+  </connector>
+</status>`
+
+func TestHTTPTomcat(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprintln(w, tomcatStatus)
+	}))
+	defer ts.Close()
+
+	tc := Tomcat{
+		URL:      ts.URL,
+		Username: "tomcat",
+		Password: "s3cret",
+	}
+
+	var acc testutil.Accumulator
+	err := tc.Gather(&acc)
+	require.NoError(t, err)
+
+	// tomcat_jvm_memory
+	jvmMemoryFields := map[string]interface{}{
+		"free":  int64(17909336),
+		"total": int64(58195968),
+		"max":   int64(620756992),
+	}
+	acc.AssertContainsFields(t, "tomcat_jvm_memory", jvmMemoryFields)
+
+	// tomcat_jvm_memorypool
+	jvmMemoryPoolFields := map[string]interface{}{
+		"init":      int64(22020096),
+		"committed": int64(22020096),
+		"max":       int64(174063616),
+		"used":      int64(17533952),
+	}
+	jvmMemoryPoolTags := map[string]string{
+		"name": "PS Perm Gen",
+		"type": "Non-heap memory",
+	}
+	acc.AssertContainsTaggedFields(t, "tomcat_jvm_memorypool", jvmMemoryPoolFields, jvmMemoryPoolTags)
+
+	// tomcat_connector
+	connectorFields := map[string]interface{}{
+		"max_threads":          int64(200),
+		"current_thread_count": int64(5),
+		"current_threads_busy": int64(1),
+		"max_time":             int(68),
+		"processing_time":      int(88),
+		"request_count":        int(2),
+		"error_count":          int(1),
+		"bytes_received":       int64(0),
+		"bytes_sent":           int64(9286),
+	}
+	connectorTags := map[string]string{
+		"name": "http-apr-8080",
+	}
+	acc.AssertContainsTaggedFields(t, "tomcat_connector", connectorFields, connectorTags)
+
+}

From 1e9d7cd6e972d1be46137f7bf6648dd8e8bd4df9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 16 Aug 2017 15:33:47 -0700
Subject: [PATCH 0466/1302] Add error status handle to tomcat input

---
 plugins/inputs/all/all.go       |   1 +
 plugins/inputs/tomcat/README.md | 106 +++++++++++++++--------------
 plugins/inputs/tomcat/tomcat.go | 115 ++++++++++++++++++++++----------
 3 files changed, 135 insertions(+), 87 deletions(-)

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 8b99b1906..955c3a2c0 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -83,6 +83,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
+	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
diff --git a/plugins/inputs/tomcat/README.md b/plugins/inputs/tomcat/README.md
index d2fa2e729..3baf68556 100644
--- a/plugins/inputs/tomcat/README.md
+++ b/plugins/inputs/tomcat/README.md
@@ -1,73 +1,77 @@
 # Tomcat Input Plugin
 
-The Tomcat plugin collects statistics available from the tomcat manager status page from the `http://<host>/manager/status/all?XML=true URL.`
-(`XML=true` will return only xml data). See the [Tomcat documentation](https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html#Server_Status) for details of these statistics.
+The Tomcat plugin collects statistics available from the tomcat manager status page from the `http://<host>/manager/status/all?XML=true URL.` (`XML=true` will return only xml data).
+
+See the [Tomcat documentation](https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html#Server_Status) for details of these statistics.
 
 ### Configuration:
 
 ```toml
-# A Telegraf plugin to collect tomcat metrics.
+# Gather metrics from the Tomcat server status page.
 [[inputs.tomcat]]
-  # A Tomcat status URI to gather stats.
-  # Default is "http://127.0.0.1:8080/manager/status/all?XML=true".
-  url = "http://127.0.0.1:8080/manager/status/all?XML=true"
-  # Credentials for status URI.
-  # Default is tomcat/s3cret.
-  username = "tomcat"
-  password = "s3cret"
+  ## URL of the Tomcat server status
+  # url = "http://127.0.0.1:8080/manager/status/all?XML=true"
+
+  ## HTTP Basic Auth Credentials
+  # username = "tomcat"
+  # password = "s3cret"
+
+  ## Request timeout
+  # timeout = "5s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 ### Measurements & Fields:
 
-- tomcat\_jvm\_memory
-    - free
-    - total
-    - max
-- tomcat\_jvm\_memorypool
-  - max\_threads
-  - current\_thread\_count
-  - current\_threads\_busy
-  - max\_time
-  - processing\_time
-  - request\_count
-  - error\_count
-  - bytes\_received
-  - bytes\_sent
-- tomcat\_connector
-  - max\_threads
-  - current\_thread\_count
-  - current\_thread\_busy
-  - max\_time
-  - processing\_time
-  - request\_count
-  - error\_count
-  - bytes\_received
-  - bytes\_sent
+- tomcat_jvm_memory
+  - free
+  - total
+  - max
+- tomcat_jvm_memorypool
+  - max_threads
+  - current_thread_count
+  - current_threads_busy
+  - max_time
+  - processing_time
+  - request_count
+  - error_count
+  - bytes_received
+  - bytes_sent
+- tomcat_connector
+  - max_threads
+  - current_thread_count
+  - current_thread_busy
+  - max_time
+  - processing_time
+  - request_count
+  - error_count
+  - bytes_received
+  - bytes_sent
 
 ### Tags:
 
-- tomcat\_jvm\_memorypool has the following tags:
+- tomcat_jvm_memorypool has the following tags:
   - name
   - type
-- tomcat\_connector
+- tomcat_connector
   - name
 
-### Sample Queries:
-
-TODO
-
 ### Example Output:
 
 ```
-$ ./telegraf -config telegraf.conf -input-filter tomcat -test
-* Plugin: tomcat, Collection 1
-> tomcat_jvm_memory,host=N8-MBP free=20014352i,max=127729664i,total=41459712i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Eden\ Space,type=Heap\ memory committed=11534336i,init=2228224i,max=35258368i,used=1941200i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Survivor\ Space,type=Heap\ memory committed=1376256i,init=262144i,max=4390912i,used=1376248i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Tenured\ Gen,type=Heap\ memory committed=28549120i,init=5636096i,max=88080384i,used=18127912i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Code\ Cache,type=Non-heap\ memory committed=6946816i,init=2555904i,max=251658240i,used=6406528i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Compressed\ Class\ Space,type=Non-heap\ memory committed=1966080i,init=0i,max=1073741824i,used=1816120i 1474663361000000000
-> tomcat_jvm_memorypool,host=N8-MBP,name=Metaspace,type=Non-heap\ memory committed=18219008i,init=0i,max=-1i,used=17559376i 1474663361000000000
-> tomcat_connector,host=N8-MBP,name=ajp-bio-8009 bytes_received=0i,bytes_sent=0i,current_thread_count=0i,current_threads_busy=0i,error_count=0i,max_threads=200i,max_time=0i,processing_time=0i,request_count=0i 1474663361000000000
-> tomcat_connector,host=N8-MBP,name=http-bio-8080 bytes_received=0i,bytes_sent=86435i,current_thread_count=10i,current_threads_busy=1i,error_count=2i,max_threads=200i,max_time=167i,processing_time=245i,request_count=15i 1474663361000000000
+tomcat_jvm_memory,host=N8-MBP free=20014352i,max=127729664i,total=41459712i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Eden\ Space,type=Heap\ memory committed=11534336i,init=2228224i,max=35258368i,used=1941200i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Survivor\ Space,type=Heap\ memory committed=1376256i,init=262144i,max=4390912i,used=1376248i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Tenured\ Gen,type=Heap\ memory committed=28549120i,init=5636096i,max=88080384i,used=18127912i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Code\ Cache,type=Non-heap\ memory committed=6946816i,init=2555904i,max=251658240i,used=6406528i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Compressed\ Class\ Space,type=Non-heap\ memory committed=1966080i,init=0i,max=1073741824i,used=1816120i 1474663361000000000
+tomcat_jvm_memorypool,host=N8-MBP,name=Metaspace,type=Non-heap\ memory committed=18219008i,init=0i,max=-1i,used=17559376i 1474663361000000000
+tomcat_connector,host=N8-MBP,name=ajp-bio-8009 bytes_received=0i,bytes_sent=0i,current_thread_count=0i,current_threads_busy=0i,error_count=0i,max_threads=200i,max_time=0i,processing_time=0i,request_count=0i 1474663361000000000
+tomcat_connector,host=N8-MBP,name=http-bio-8080 bytes_received=0i,bytes_sent=86435i,current_thread_count=10i,current_threads_busy=1i,error_count=2i,max_threads=200i,max_time=167i,processing_time=245i,request_count=15i 1474663361000000000
 ```
diff --git a/plugins/inputs/tomcat/tomcat.go b/plugins/inputs/tomcat/tomcat.go
index dfde52ca2..b9dcc731d 100644
--- a/plugins/inputs/tomcat/tomcat.go
+++ b/plugins/inputs/tomcat/tomcat.go
@@ -3,12 +3,13 @@ package tomcat
 import (
 	"encoding/xml"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
+	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -61,20 +62,38 @@ type Tomcat struct {
 	URL      string
 	Username string
 	Password string
+	Timeout  internal.Duration
+
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool
+
+	client  *http.Client
+	request *http.Request
 }
 
 var sampleconfig = `
-  ## A Tomcat status URI to gather stats.
-  ## Default is "http://127.0.0.1:8080/manager/status/all?XML=true".
-  url = "http://127.0.0.1:8080/manager/status/all?XML=true"
-  ## Credentials for status URI.
-  ## Default is tomcat/s3cret.
-  username = "tomcat"
-  password = "s3cret"
+  ## URL of the Tomcat server status
+  # url = "http://127.0.0.1:8080/manager/status/all?XML=true"
+
+  ## HTTP Basic Auth Credentials
+  # username = "tomcat"
+  # password = "s3cret"
+
+  ## Request timeout
+  # timeout = "5s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (s *Tomcat) Description() string {
-	return "A Telegraf plugin to collect tomcat metrics."
+	return "Gather metrics from the Tomcat server status page."
 }
 
 func (s *Tomcat) SampleConfig() string {
@@ -82,36 +101,40 @@ func (s *Tomcat) SampleConfig() string {
 }
 
 func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
-
-	if s.URL == "" {
-		s.URL = "http://127.0.0.1:8080/manager/status/all?XML=true"
+	if s.client == nil {
+		client, err := s.createHttpClient()
+		if err != nil {
+			return err
+		}
+		s.client = client
 	}
 
-	if s.Username == "" {
-		s.Username = "tomcat"
+	if s.request == nil {
+		_, err := url.Parse(s.URL)
+		if err != nil {
+			return err
+		}
+		request, err := http.NewRequest("GET", s.URL, nil)
+		if err != nil {
+			return err
+		}
+		request.SetBasicAuth(s.Username, s.Password)
+		s.request = request
 	}
 
-	if s.Password == "" {
-		s.Password = "s3cret"
-	}
-
-	_, err := url.Parse(s.URL)
+	resp, err := s.client.Do(s.request)
 	if err != nil {
-		return fmt.Errorf("Unable to parse address '%s': %s", s.URL, err)
-	}
-
-	req, err := http.NewRequest("GET", s.URL, nil)
-	req.SetBasicAuth(s.Username, s.Password)
-	cli := &http.Client{}
-	resp, err := cli.Do(req)
-	if err != nil {
-		return fmt.Errorf("Unable to call URL '%s': %s", s.URL, err)
+		return err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("received HTTP status code %d from %q; expected 200",
+			resp.StatusCode, s.URL)
+	}
 
 	var status TomcatStatus
-	xml.Unmarshal(body, &status)
+	xml.NewDecoder(resp.Body).Decode(&status)
 
 	// add tomcat_jvm_memory measurements
 	tcm := map[string]interface{}{
@@ -123,7 +146,6 @@ func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
 
 	// add tomcat_jvm_memorypool measurements
 	for _, mp := range status.TomcatJvm.JvmMemoryPools {
-
 		tcmpTags := map[string]string{
 			"name": mp.Name,
 			"type": mp.Type,
@@ -137,12 +159,10 @@ func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
 		}
 
 		acc.AddFields("tomcat_jvm_memorypool", tcmpFields, tcmpTags)
-
 	}
 
 	// add tomcat_connector measurements
 	for _, c := range status.TomcatConnectors {
-
 		name, err := strconv.Unquote(c.Name)
 		if err != nil {
 			return fmt.Errorf("Unable to unquote name '%s': %s", c.Name, err)
@@ -165,12 +185,35 @@ func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
 		}
 
 		acc.AddFields("tomcat_connector", tccFields, tccTags)
-
 	}
 
 	return nil
 }
 
-func init() {
-	inputs.Add("tomcat", func() telegraf.Input { return &Tomcat{} })
+func (s *Tomcat) createHttpClient() (*http.Client, error) {
+	tlsConfig, err := internal.GetTLSConfig(
+		s.SSLCert, s.SSLKey, s.SSLCA, s.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsConfig,
+		},
+		Timeout: s.Timeout.Duration,
+	}
+
+	return client, nil
+}
+
+func init() {
+	inputs.Add("tomcat", func() telegraf.Input {
+		return &Tomcat{
+			URL:      "http://127.0.0.1:8080/manager/status/all?XML=true",
+			Username: "tomcat",
+			Password: "s3cret",
+			Timeout:  internal.Duration{Duration: 5 * time.Second},
+		}
+	})
 }

From 7608251633fa9389b60a5060e9f0ea00a6d0c5b0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 16 Aug 2017 15:36:56 -0700
Subject: [PATCH 0467/1302] Add tomcat input to changelog and readme

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6149ecb8..735b48e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [salesforce](./plugins/inputs/salesforce/README.md) - Thanks to @rody
+- [tomcat](./plugins/inputs/tomcat/README.md) - Thanks to @mlindes
 - [win_services](./plugins/inputs/win_services/README.md) - Thanks to @vlastahajek
 - [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
 
@@ -60,6 +61,7 @@
 - [#3119](https://github.com/influxdata/telegraf/pull/3119): Add weighted_io_time to diskio input.
 - [#2978](https://github.com/influxdata/telegraf/pull/2978): Add gzip content-encoding support to influxdb output.
 - [#3127](https://github.com/influxdata/telegraf/pull/3127): Allow using system plugin in Windows.
+- [#3112](https://github.com/influxdata/telegraf/pull/3112): Add tomcat input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 875960cb4..e63271d31 100644
--- a/README.md
+++ b/README.md
@@ -167,6 +167,7 @@ configuration options.
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)

From 8b588ea37fba68fec33ef9175be9e78ea14c5fa1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 16 Aug 2017 16:46:40 -0700
Subject: [PATCH 0468/1302] Update sample config

---
 etc/telegraf.conf | 347 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 267 insertions(+), 80 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 7d1f25626..03c996f4a 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -118,6 +118,12 @@
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## HTTP Proxy Config
+  # http_proxy = "http://corporate.proxy:3128"
+
+  ## Compress each HTTP request payload using GZIP.
+  # content_encoding = "gzip"
+
 
 # # Configuration for Amon Server to send metrics to.
 # [[outputs.amon]]
@@ -272,11 +278,11 @@
 #   timeout = 2
 #
 #   ## Optional SSL Config
-#   ssl_ca = "/etc/telegraf/ca.pem"
-#   ssl_cert = "/etc/telegraf/cert.pem"
-#   ssl_key = "/etc/telegraf/key.pem"
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
-#   insecure_skip_verify = false
+#   # insecure_skip_verify = false
 
 
 # # Send telegraf metrics to graylog(s)
@@ -596,17 +602,7 @@
 #                            AGGREGATOR PLUGINS                               #
 ###############################################################################
 
-# # Keep the aggregate min/max of each metric passing through.
-# [[aggregators.minmax]]
-#   ## General Aggregator Arguments:
-#   ## The period on which to flush & clear the aggregator.
-#   period = "30s"
-#   ## If true, the original metric will be dropped by the
-#   ## aggregator and will not get sent to the output plugins.
-#   drop_original = false
-
-
-# # Configuration for aggregate histogram metrics
+# # Keep the aggregate histogram of each metric passing through.
 # [[aggregators.histogram]]
 #   ## General Aggregator Arguments:
 #   ## The period on which to flush & clear the aggregator.
@@ -617,19 +613,29 @@
 #
 #   ## The example of config to aggregate histogram for all fields of specified metric.
 #   [[aggregators.histogram.config]]
-#     ## The set of buckets.
-#     buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-#     ## The name of metric.
-#     metric_name = "cpu"
+#   ## The set of buckets.
+#   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+#   ## The name of metric.
+#   metric_name = "cpu"
 #
 #   ## The example of config to aggregate for specified fields of metric.
 #   [[aggregators.histogram.config]]
-#     ## The set of buckets.
-#     buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-#     ## The name of metric.
-#     metric_name = "diskio"
-#     ## The concrete fields of metric
-#     metric_fields = ["io_time", "read_time", "write_time"]
+#   ## The set of buckets.
+#   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+#   ## The name of metric.
+#   metric_name = "diskio"
+#   ## The concrete fields of metric
+#   metric_fields = ["io_time", "read_time", "write_time"]
+
+
+# # Keep the aggregate min/max of each metric passing through.
+# [[aggregators.minmax]]
+#   ## General Aggregator Arguments:
+#   ## The period on which to flush & clear the aggregator.
+#   period = "30s"
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = false
 
 
 
@@ -645,6 +651,8 @@
   totalcpu = true
   ## If true, collect raw CPU time metrics.
   collect_cpu_time = false
+  ## If true, compute and report the sum of all non-idle CPU states.
+  report_active = false
 
 
 # Read metrics about disk usage by mount point
@@ -720,15 +728,17 @@
 
 # # Read Apache status information (mod_status)
 # [[inputs.apache]]
-#   ## An array of Apache status URI to gather stats.
+#   ## An array of URLs to gather from, must be directed at the machine
+#   ## readable version of the mod_status page including the auto query string.
 #   ## Default is "http://localhost/server-status?auto".
 #   urls = ["http://localhost/server-status?auto"]
-#   ## user credentials for basic HTTP authentication
-#   username = "myuser"
-#   password = "mypassword"
 #
-#   ## Timeout to the complete conection and reponse time in seconds
-#   response_timeout = "25s" ## default to 5 seconds
+#   ## Credentials for basic HTTP authentication.
+#   # username = "myuser"
+#   # password = "mypassword"
+#
+#   ## Maximum time to receive response.
+#   # response_timeout = "5s"
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -846,7 +856,7 @@
 #
 #   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
 #   # metrics are made available to the 1 minute period. Some are collected at
-#   # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+#   # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
 #   # Note that if a period is configured that is smaller than the minimum for a
 #   # particular metric, that metric will not be returned by the Cloudwatch API
 #   # and will not be collected by Telegraf.
@@ -958,20 +968,23 @@
 # # Query given DNS server and gives statistics
 # [[inputs.dns_query]]
 #   ## servers to query
-#   servers = ["8.8.8.8"] # required
+#   servers = ["8.8.8.8"]
 #
-#   ## Domains or subdomains to query. "."(root) is default
-#   domains = ["."] # optional
+#   ## Network is the network protocol name.
+#   # network = "udp"
 #
-#   ## Query record type. Default is "A"
+#   ## Domains or subdomains to query.
+#   # domains = ["."]
+#
+#   ## Query record type.
 #   ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
-#   record_type = "A" # optional
+#   # record_type = "A"
 #
-#   ## Dns server port. 53 is default
-#   port = 53 # optional
+#   ## Dns server port.
+#   # port = 53
 #
-#   ## Query timeout in seconds. Default is 2 seconds
-#   timeout = 2 # optional
+#   ## Query timeout in seconds.
+#   # timeout = 2
 
 
 # # Read metrics about docker containers
@@ -980,8 +993,15 @@
 #   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
 #   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
 #   endpoint = "unix:///var/run/docker.sock"
+#
 #   ## Only collect metrics for these containers, collect all if empty
 #   container_names = []
+#
+#   ## Containers to include and exclude. Globs accepted.
+#   ## Note that an empty array for both will include all containers
+#   container_name_include = []
+#   container_name_exclude = []
+#
 #   ## Timeout for docker list, info, and stats commands
 #   timeout = "5s"
 #
@@ -990,11 +1010,20 @@
 #   perdevice = true
 #   ## Whether to report for each container total blkio and network stats or not
 #   total = false
+#   ## Which environment variables should we use as a tag
+#   ##tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 #
 #   ## docker labels to include and exclude as tags.  Globs accepted.
 #   ## Note that an empty array for both will include all labels as tags
 #   docker_label_include = []
 #   docker_label_exclude = []
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Read statistics from one or many dovecot servers
@@ -1064,6 +1093,15 @@
 #   data_format = "influx"
 
 
+# # Read metrics from fail2ban.
+# [[inputs.fail2ban]]
+#   ## fail2ban-client require root access.
+#   ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
+#   ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
+#   ## This plugin run only "fail2ban-client status".
+#   use_sudo = false
+
+
 # # Read stats about given file(s)
 # [[inputs.filestat]]
 #   ## Files to gather stats about.
@@ -1080,6 +1118,22 @@
 #   md5 = false
 
 
+# # Read metrics exposed by fluentd in_monitor plugin
+# [[inputs.fluentd]]
+#   ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
+#   ##
+#   ## Endpoint:
+#   ## - only one URI is allowed
+#   ## - https is not supported
+#   endpoint = "http://localhost:24220/api/plugins.json"
+#   	
+#   ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
+#   exclude = [
+# 	  "monitor_agent",
+# 	  "dummy",
+#   ]
+
+
 # # Read flattened metrics from one or more GrayLog HTTP endpoints
 # [[inputs.graylog]]
 #   ## API endpoint, currently supported API:
@@ -1161,25 +1215,26 @@
 # # HTTP/HTTPS request given an address a method and a timeout
 # [[inputs.http_response]]
 #   ## Server address (default http://localhost)
-#   address = "http://github.com"
+#   # address = "http://localhost"
+#
 #   ## Set response_timeout (default 5 seconds)
-#   response_timeout = "5s"
+#   # response_timeout = "5s"
+#
 #   ## HTTP Request Method
-#   method = "GET"
+#   # method = "GET"
+#
 #   ## Whether to follow redirects from the server (defaults to false)
-#   follow_redirects = true
-#   ## HTTP Request Headers (all values must be strings)
-#   # [inputs.http_response.headers]
-#   #   Host = "github.com"
+#   # follow_redirects = false
+#
 #   ## Optional HTTP Request Body
 #   # body = '''
 #   # {'fake':'data'}
 #   # '''
 #
 #   ## Optional substring or regex match in body of the response
-#   ## response_string_match = "\"service_status\": \"up\""
-#   ## response_string_match = "ok"
-#   ## response_string_match = "\".*_status\".?:.?\"up\""
+#   # response_string_match = "\"service_status\": \"up\""
+#   # response_string_match = "ok"
+#   # response_string_match = "\".*_status\".?:.?\"up\""
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -1187,6 +1242,10 @@
 #   # ssl_key = "/etc/telegraf/key.pem"
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
+#
+#   ## HTTP Request Headers (all values must be strings)
+#   # [inputs.http_response.headers]
+#   #   Host = "github.com"
 
 
 # # Read flattened metrics from one or more JSON HTTP endpoints
@@ -1249,6 +1308,13 @@
 #     "http://localhost:8086/debug/vars"
 #   ]
 #
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
 #   ## http request & header timeout
 #   timeout = "5s"
 
@@ -1279,6 +1345,13 @@
 #   ## if no servers are specified, local machine sensor stats will be queried
 #   ##
 #   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+#
+#   ## Recomended: use metric 'interval' that is a multiple of 'timeout' to avoid
+#   ## gaps or overlap in pulled data
+#   interval = "30s"
+#
+#   ## Timeout for the ipmitool command to complete
+#   timeout = "20s"
 
 
 # # Gather packets and bytes throughput from iptables
@@ -1398,9 +1471,9 @@
 
 # # Read metrics from a LeoFS Server via SNMP
 # [[inputs.leofs]]
-#   ## An array of URI to gather stats about LeoFS.
-#   ## Specify an ip or hostname with port. ie 127.0.0.1:4020
-#   servers = ["127.0.0.1:4021"]
+#   ## An array of URLs of the form:
+#   ##   "udp://" host [ ":" port]
+#   servers = ["udp://127.0.0.1:4020"]
 
 
 # # Provides Linux sysctl fs metrics
@@ -1475,14 +1548,24 @@
 #   # ]
 
 
+# # Collects scores from a minecraft server's scoreboard using the RCON protocol
+# [[inputs.minecraft]]
+#   ## server address for minecraft
+#   # server = "localhost"
+#   ## port for RCON
+#   # port = "25575"
+#   ## password RCON for mincraft server
+#   # password = ""
+
+
 # # Read metrics from one or many MongoDB servers
 # [[inputs.mongodb]]
-#   ## An array of URI to gather stats about. Specify an ip or hostname
-#   ## with optional port add password. ie,
+#   ## An array of URLs of the form:
+#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+#   ## For example:
 #   ##   mongodb://user:auth_key@10.10.3.30:27017,
 #   ##   mongodb://10.10.3.33:18832,
-#   ##   10.0.0.1:10000, etc.
-#   servers = ["127.0.0.1:27017"]
+#   servers = ["mongodb://127.0.0.1:27017"]
 #   gather_perdb_stats = false
 #
 #   ## Optional SSL Config
@@ -1496,7 +1579,7 @@
 # # Read metrics from one or many mysql servers
 # [[inputs.mysql]]
 #   ## specify servers via a url matching:
-#   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
+#   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify|custom]]
 #   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
 #   ##  e.g.
 #   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
@@ -1553,7 +1636,7 @@
 #   #
 #   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
 #   interval_slow                   = "30m"
-
+#
 #   ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
 #   ssl_ca = "/etc/telegraf/ca.pem"
 #   ssl_cert = "/etc/telegraf/cert.pem"
@@ -1599,8 +1682,17 @@
 
 # # Read Nginx's basic status information (ngx_http_stub_status_module)
 # [[inputs.nginx]]
-#   ## An array of Nginx stub_status URI to gather stats.
-#   urls = ["http://localhost/status"]
+#   # An array of Nginx stub_status URI to gather stats.
+#   urls = ["http://localhost/server_status"]
+#
+#   # TLS/SSL configuration
+#   ssl_ca = "/etc/telegraf/ca.pem"
+#   ssl_cert = "/etc/telegraf/cert.cer"
+#   ssl_key = "/etc/telegraf/key.key"
+#   insecure_skip_verify = false
+#
+#   # HTTP response timeout (default: 5s)
+#   response_timeout = "5s"
 
 
 # # Read NSQ topic and channel statistics.
@@ -1627,6 +1719,27 @@
 #   dns_lookup = true
 
 
+# # OpenLDAP cn=Monitor plugin
+# [[inputs.openldap]]
+#   host = "localhost"
+#   port = 389
+#
+#   # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
+#   # note that port will likely need to be changed to 636 for ldaps
+#   # valid options: "" | "starttls" | "ldaps"
+#   ssl = ""
+#
+#   # skip peer certificate verification. Default is false.
+#   insecure_skip_verify = false
+#
+#   # Path to PEM-encoded Root certificate to use to verify server certificate
+#   ssl_ca = "/etc/ssl/certs.pem"
+#
+#   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
+#   bind_dn = ""
+#   bind_password = ""
+
+
 # # Read metrics of passenger using passenger-status
 # [[inputs.passenger]]
 #   ## Path of passenger-status.
@@ -1820,10 +1933,13 @@
 #   location = "/var/lib/puppet/state/last_run_summary.yaml"
 
 
-# # Read metrics from one or many RabbitMQ servers via the management API
+# # Reads metrics from RabbitMQ servers via the Management Plugin
 # [[inputs.rabbitmq]]
+#   ## Management Plugin url. (default: http://localhost:15672)
 #   # url = "http://localhost:15672"
-#   # name = "rmq-server-1" # optional tag
+#   ## Tag added to rabbitmq_overview series; deprecated: use tags
+#   # name = "rmq-server-1"
+#   ## Credentials
 #   # username = "guest"
 #   # password = "guest"
 #
@@ -1880,14 +1996,11 @@
 #   ##
 #   ## If you use actual rethinkdb of > 2.3.0 with username/password authorization,
 #   ## protocol have to be named "rethinkdb2" - it will use 1_0 H.
-#   servers = ["rethinkdb2://username:password@127.0.0.1:28015"]
+#   # servers = ["rethinkdb2://username:password@127.0.0.1:28015"]
 #   ##
 #   ## If you use older versions of rethinkdb (<2.2) with auth_key, protocol
 #   ## have to be named "rethinkdb".
-#   servers = ["rethinkdb://username:auth_key@127.0.0.1:28015"]
-
-
-
+#   # servers = ["rethinkdb://username:auth_key@127.0.0.1:28015"]
 
 
 # # Read metrics one or many Riak servers
@@ -1896,6 +2009,26 @@
 #   servers = ["http://localhost:8098"]
 
 
+# # Read API usage and limits for a Salesforce organisation
+# [[inputs.salesforce]]
+#   ## specify your credentials
+#   ##
+#   username = "your_username"
+#   password = "your_password"
+#   ##
+#   ## (optional) security token
+#   # security_token = "your_security_token"
+#   ##
+#   ## (optional) environment type (sandbox or production)
+#   ## default is: production
+#   ##
+#   # environment = "production"
+#   ##
+#   ## (optional) API version (default: "39.0")
+#   ##
+#   # version = "39.0"
+
+
 # # Monitor sensors, requires lm-sensors package
 # [[inputs.sensors]]
 #   ## Remove numbers from field names.
@@ -2141,6 +2274,26 @@
 #   #  vg = "rootvg"
 
 
+# # Gather metrics from the Tomcat server status page.
+# [[inputs.tomcat]]
+#   ## URL of the Tomcat server status
+#   # url = "http://127.0.0.1:8080/manager/status/all?XML=true"
+#
+#   ## HTTP Basic Auth Credentials
+#   # username = "tomcat"
+#   # password = "s3cret"
+#
+#   ## Request timeout
+#   # timeout = "5s"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
 # # Inserts sine and cosine waves for demonstration purposes
 # [[inputs.trig]]
 #   ## Set the amplitude
@@ -2157,6 +2310,9 @@
 
 # # A plugin to collect stats from Varnish HTTP Cache
 # [[inputs.varnish]]
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   #use_sudo = false
+#
 #   ## The default location of the varnishstat binary can be overridden with:
 #   binary = "/usr/bin/varnishstat"
 #
@@ -2247,16 +2403,13 @@
 #   ## 0 means to use the default of 65536 bytes (64 kibibytes)
 #   max_line_size = 0
 
-# # Read metrics from Kafka 0.9+ topic(s)
+
+# # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer]]
-#   ## topic(s) to consume
-#   topics = ["telegraf"]
 #   ## kafka servers
 #   brokers = ["localhost:9092"]
-#   ## the name of the consumer group
-#   consumer_group = "telegraf_metrics_consumers"
-#   ## Offset (must be either "oldest" or "newest")
-#   offset = "oldest"
+#   ## topic(s) to consume
+#   topics = ["telegraf"]
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -2269,6 +2422,11 @@
 #   # sasl_username = "kafka"
 #   # sasl_password = "secret"
 #
+#   ## the name of the consumer group
+#   consumer_group = "telegraf_metrics_consumers"
+#   ## Offset (must be either "oldest" or "newest")
+#   offset = "oldest"
+#
 #   ## Data format to consume.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -2279,7 +2437,8 @@
 #   ## larger messages are dropped
 #   max_message_len = 65536
 
-# # Read metrics from Kafka (0.8 or less) topic(s)
+
+# # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer_legacy]]
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
@@ -2312,6 +2471,7 @@
 #   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
 #   ##   /var/log/apache.log -> only tail the apache log file
 #   files = ["/var/log/apache/access.log"]
+#
 #   ## Read files that currently exist from the beginning. Files that are created
 #   ## while telegraf is running (and that match the "files" globs) will always
 #   ## be read from the beginning.
@@ -2327,12 +2487,26 @@
 #     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
 #     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
 #     patterns = ["%{COMBINED_LOG_FORMAT}"]
+#
 #     ## Name of the outputted measurement name.
 #     measurement = "apache_access_log"
+#
 #     ## Full path(s) to custom pattern files.
 #     custom_pattern_files = []
+#
 #     ## Custom patterns can also be defined here. Put one pattern per line.
 #     custom_patterns = '''
+#
+#     ## Timezone allows you to provide an override for timestamps that
+#     ## don't already include an offset
+#     ## e.g. 04/06/2016 12:41:45 data one two 5.43µs
+#     ##
+#     ## Default: "" which renders UTC
+#     ## Options are as follows:
+#     ##   1. Local             -- interpret based on machine localtime
+#     ##   2. "Canada/Eastern"  -- Unix TZ values like those found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+#     ##   3. UTC               -- or blank/unspecified, will return timestamp in UTC
+#     timezone = "Canada/Eastern"
 #     '''
 
 
@@ -2431,6 +2605,11 @@
 #   ## 0 (default) is unlimited.
 #   # max_connections = 1024
 #
+#   ## Read timeout.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   ## 0 (default) is unlimited.
+#   # read_timeout = "30s"
+#
 #   ## Maximum socket buffer size in bytes.
 #   ## For stream sockets, once the buffer fills up, the sender will start backing up.
 #   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
@@ -2450,12 +2629,14 @@
 #   # data_format = "influx"
 
 
-# # Statsd Server
+# # Statsd UDP/TCP Server
 # [[inputs.statsd]]
-#   ## Protocol, must be "tcp" or "udp"
+#   ## Protocol, must be "tcp" or "udp" (default=udp)
 #   protocol = "udp"
-#   ## Maximum number of concurrent TCP connections to allow
+#
+#   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
 #   max_tcp_connections = 250
+#
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
 #
@@ -2556,3 +2737,9 @@
 #   [inputs.webhooks.papertrail]
 #     path = "/papertrail"
 
+
+# # This plugin implements the Zipkin http server to gather trace and timing data needed to troubleshoot latency problems in microservice architectures.
+# [[inputs.zipkin]]
+#   # path = "/api/v1/spans" # URL path for span data
+#   # port = 9411            # Port on which Telegraf listens
+

From 3006ccbf2f85b1eff51c37136037706206d1a517 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 16 Aug 2017 16:54:15 -0700
Subject: [PATCH 0469/1302] Update master for 1.5 development

---
 CHANGELOG.md             | 2 ++
 cmd/telegraf/telegraf.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 735b48e44..f6771077d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## v1.5 [unreleased]
+
 ## v1.4 [unreleased]
 
 ### Release Notes
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index f0ff6e66a..6301ea8ff 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -59,7 +59,7 @@ var fService = flag.String("service", "",
 //   ie, -ldflags "-X main.version=`git describe --always --tags`"
 
 var (
-	nextVersion = "1.4.0"
+	nextVersion = "1.5.0"
 	version     string
 	commit      string
 	branch      string

From e31d91f0f9ef2959f8db3567b70a6b3a86930f13 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 17 Aug 2017 18:52:27 -0700
Subject: [PATCH 0470/1302] Add queues to rabbitmq documentation (#3135)

---
 plugins/inputs/rabbitmq/README.md   | 8 ++++++--
 plugins/inputs/rabbitmq/rabbitmq.go | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 6216a2200..8f9a77aad 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -33,9 +33,13 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
-  ## A list of nodes to pull metrics about. If not specified, metrics for
-  ## all nodes are gathered.
+  ## A list of nodes to gather as the rabbitmq_node measurement. If not
+  ## specified, metrics for all nodes are gathered.
   # nodes = ["rabbit@node1", "rabbit@node2"]
+
+  ## A list of queues to gather as the rabbitmq_queue measurement. If not
+  ## specified, metrics for all queues are gathered.
+  # queues = ["telegraf"]
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 1f13263c0..f51cb123e 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -48,7 +48,6 @@ type RabbitMQ struct {
 	ResponseHeaderTimeout internal.Duration `toml:"header_timeout"`
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
 
-	// InsecureSkipVerify bool
 	Nodes  []string
 	Queues []string
 
@@ -165,9 +164,13 @@ var sampleConfig = `
   ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
-  ## A list of nodes to pull metrics about. If not specified, metrics for
-  ## all nodes are gathered.
+  ## A list of nodes to gather as the rabbitmq_node measurement. If not
+  ## specified, metrics for all nodes are gathered.
   # nodes = ["rabbit@node1", "rabbit@node2"]
+
+  ## A list of queues to gather as the rabbitmq_queue measurement. If not
+  ## specified, metrics for all queues are gathered.
+  # queues = ["telegraf"]
 `
 
 // SampleConfig ...

From 36c2c88fd2ceacb21c3d06cb8bd938fa7ab8eb83 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 17 Aug 2017 18:54:06 -0700
Subject: [PATCH 0471/1302] Update example config

---
 etc/telegraf.conf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 03c996f4a..dcb2f158a 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1960,9 +1960,13 @@
 #   ## Includes connection time, any redirects, and reading the response body.
 #   # client_timeout = "4s"
 #
-#   ## A list of nodes to pull metrics about. If not specified, metrics for
-#   ## all nodes are gathered.
+#   ## A list of nodes to gather as the rabbitmq_node measurement. If not
+#   ## specified, metrics for all nodes are gathered.
 #   # nodes = ["rabbit@node1", "rabbit@node2"]
+#
+#   ## A list of queues to gather as the rabbitmq_queue measurement. If not
+#   ## specified, metrics for all queues are gathered.
+#   # queues = ["telegraf"]
 
 
 # # Read raindrops stats (raindrops - real-time stats for preforking Rack servers)

From 4de264ffc80d9d4aff7bd313a293cf50d7900a8c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 18 Aug 2017 11:08:48 -0700
Subject: [PATCH 0472/1302] Remove version test

---
 scripts/circle-test.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 8391a308f..b05fa7420 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -61,8 +61,6 @@ exit_if_fail sleep 60
 exit_if_fail go test -race ./...
 
 # Simple Integration Tests
-#   check that version was properly set
-exit_if_fail "./telegraf -version | grep $VERSION"
 #   check that one test cpu & mem output work
 tmpdir=$(mktemp -d)
 ./telegraf -sample-config > $tmpdir/config.toml

From 70c2b83f0001718de8ce9e9484ad8846142b0af1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 18 Aug 2017 13:24:05 -0700
Subject: [PATCH 0473/1302] Update histogram aggregator documentation (#3133)

---
 etc/telegraf.conf                          |  34 +++---
 plugins/aggregators/histogram/README.md    | 121 ++++++++-------------
 plugins/aggregators/histogram/histogram.go |  38 +++----
 3 files changed, 81 insertions(+), 112 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index dcb2f158a..ee0c00be0 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -602,30 +602,30 @@
 #                            AGGREGATOR PLUGINS                               #
 ###############################################################################
 
-# # Keep the aggregate histogram of each metric passing through.
+# # Create aggregate histograms.
 # [[aggregators.histogram]]
-#   ## General Aggregator Arguments:
-#   ## The period on which to flush & clear the aggregator.
+#   ## The period in which to flush the aggregator.
 #   period = "30s"
+#
 #   ## If true, the original metric will be dropped by the
 #   ## aggregator and will not get sent to the output plugins.
 #   drop_original = false
 #
-#   ## The example of config to aggregate histogram for all fields of specified metric.
-#   [[aggregators.histogram.config]]
-#   ## The set of buckets.
-#   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-#   ## The name of metric.
-#   metric_name = "cpu"
+#   ## Example config that aggregates all fields of the metric.
+#   # [[aggregators.histogram.config]]
+#   #   ## The set of buckets.
+#   #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+#   #   ## The name of metric.
+#   #   measurement_name = "cpu"
 #
-#   ## The example of config to aggregate for specified fields of metric.
-#   [[aggregators.histogram.config]]
-#   ## The set of buckets.
-#   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-#   ## The name of metric.
-#   metric_name = "diskio"
-#   ## The concrete fields of metric
-#   metric_fields = ["io_time", "read_time", "write_time"]
+#   ## Example config that aggregates only specific fields of the metric.
+#   # [[aggregators.histogram.config]]
+#   #   ## The set of buckets.
+#   #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+#   #   ## The name of metric.
+#   #   measurement_name = "diskio"
+#   #   ## The concrete fields of metric
+#   #   fields = ["io_time", "read_time", "write_time"]
 
 
 # # Keep the aggregate min/max of each metric passing through.
diff --git a/plugins/aggregators/histogram/README.md b/plugins/aggregators/histogram/README.md
index 29b7a6dc0..b4525681e 100644
--- a/plugins/aggregators/histogram/README.md
+++ b/plugins/aggregators/histogram/README.md
@@ -1,38 +1,25 @@
 # Histogram Aggregator Plugin
 
-#### Goal
+The histogram aggregator plugin creates histograms containing the counts of
+field values within a range.
 
-This plugin was added for ability to build histograms.
+Values added to a bucket are also added to the larger buckets in the
+distribution.  This creates a [cumulative histogram](https://en.wikipedia.org/wiki/Histogram#/media/File:Cumulative_vs_normal_histogram.svg).
 
-#### Description
+Like other Telegraf aggregators, the metric is emitted every `period` seconds.
+Bucket counts however are not reset between periods and will be non-strictly
+increasing while Telegraf is running.
 
-The histogram aggregator plugin aggregates values of specified metric's
-fields. The metric is emitted every `period` seconds. All you need to do
-is to specify borders of histogram buckets and fields, for which you want
-to aggregate histogram.
+#### Design
 
-#### How it works
-
-The each metric is passed to the aggregator and this aggregator searches
+Each metric is passed to the aggregator and this aggregator searches
 histogram buckets for those fields, which have been specified in the
-config. If buckets are found, the aggregator will put +1 to appropriate
-bucket. Otherwise, nothing will happen. Every `period` seconds these data
-will be pushed to output.
+config. If buckets are found, the aggregator will increment +1 to the appropriate
+bucket otherwise it will be added to the `+Inf` bucket.  Every `period`
+seconds this data will be forwarded to the outputs.
 
-Note, that the all hits of current bucket will be also added to all next
-buckets in final result of distribution. Why does it work this way? In
-configuration you define right borders for each bucket in a ascending
-sequence. Internally buckets are presented as ranges with borders
-(0..bucketBorder]: 0..1, 0..10, 0..50, …, 0..+Inf. So the value "+1" will be
-put into those buckets, in which the metric value fell with such ranges of
-buckets.
-
-This plugin creates cumulative histograms. It means, that the hits in the 
-buckets will always increase from the moment of telegraf start. But if you
-restart telegraf, all hits in the buckets will be reset to 0.
-
-Also, the algorithm of hit counting to buckets was implemented on the base
-of the algorithm, which is implemented in the Prometheus
+The algorithm of hit counting to buckets was implemented on the base
+of the algorithm which is implemented in the Prometheus
 [client](https://github.com/prometheus/client_golang/blob/master/prometheus/histogram.go).
 
 ### Configuration
@@ -40,61 +27,44 @@ of the algorithm, which is implemented in the Prometheus
 ```toml
 # Configuration for aggregate histogram metrics
 [[aggregators.histogram]]
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
+  ## The period in which to flush the aggregator.
   period = "30s"
+
   ## If true, the original metric will be dropped by the
   ## aggregator and will not get sent to the output plugins.
   drop_original = false
 
-  ## The example of config to aggregate histogram for all fields of specified metric.
-  [[aggregators.histogram.config]]
-    ## The set of buckets.
-    buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-    ## The name of metric.
-    metric_name = "cpu"
+  ## Example config that aggregates all fields of the metric.
+  # [[aggregators.histogram.config]]
+  #   ## The set of buckets.
+  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+  #   ## The name of metric.
+  #   measurement_name = "cpu"
 
-  ## The example of config to aggregate histogram for concrete fields of specified metric.
-  [[aggregators.histogram.config]]
-    ## The set of buckets.
-    buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-    ## The name of metric.
-    metric_name = "diskio"
-    ## The concrete fields of metric.
-    metric_fields = ["io_time", "read_time", "write_time"]
+  ## Example config that aggregates only specific fields of the metric.
+  # [[aggregators.histogram.config]]
+  #   ## The set of buckets.
+  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+  #   ## The name of metric.
+  #   measurement_name = "diskio"
+  #   ## The concrete fields of metric
+  #   fields = ["io_time", "read_time", "write_time"]
 ```
 
-#### Explanation
+The user is responsible for defining the bounds of the histogram bucket as
+well as the measurement name and fields to aggregate.
 
-The field `metric_fields` is the list of metric fields. For example, the
-metric `cpu` has the following fields: usage_user, usage_system,
-usage_idle, usage_nice, usage_iowait, usage_irq, usage_softirq, usage_steal,
-usage_guest, usage_guest_nice.
+Each histogram config section must contain a `buckets` and `measurement_name`
+option.  Optionally, if `fields` is set only the fields listed will be
+aggregated.  If `fields` is not set all fields are aggregated.
 
-Note that histogram metrics will be pushed every `period` seconds. 
-As you know telegraf calls aggregator `Reset()` func each `period` seconds.
-Histogram aggregator ignores `Reset()` and continues to count hits. 
+The `buckets` option contains a list of floats which specify the bucket
+boundaries.  Each float value defines the inclusive upper bound of the bucket.
+The `+Inf` bucket is added automatically and does not need to be defined.
 
-#### Use cases
-
-You can specify fields using two cases:
-
- 1. The specifying only metric name. In this case all fields of metric
-    will be aggregated.
- 2. The specifying metric name and concrete field.
- 
-#### Some rules
- 
- - The setting of each histogram must be in separate section with title
-   `aggregators.histogram.config`.
-
- - The each value of bucket must be float value.
- 
- - Don\`t include the border bucket `+Inf`. It will be done automatically.
- 
 ### Measurements & Fields:
 
-The postfix `bucket` will be added to each field.
+The postfix `bucket` will be added to each field key.
 
 - measurement1
     - field1_bucket
@@ -102,16 +72,15 @@ The postfix `bucket` will be added to each field.
 
 ### Tags:
 
-All measurements have tag `le`. This tag has the border value of bucket. It
-means that the metric value is less or equal to the value of this tag. For
-example, let assume that we have the metric value 10 and the following
-buckets: [5, 10, 30, 70, 100]. Then the tag `le` will have the value 10,
-because the metrics value is passed into bucket with right border value `10`.
+All measurements are given the tag `le`. This tag has the border value of
+bucket. It means that the metric value is less than or equal to the value of
+this tag.  For example, let assume that we have the metric value 10 and the
+following buckets: [5, 10, 30, 70, 100]. Then the tag `le` will have the value
+10, because the metrics value is passed into bucket with right border value
+`10`.
 
 ### Example Output:
 
-The following output will return to the Prometheus client.
-
 ```
 cpu,cpu=cpu1,host=localhost,le=0.0 usage_idle_bucket=0i 1486998330000000000
 cpu,cpu=cpu1,host=localhost,le=10.0 usage_idle_bucket=0i 1486998330000000000
diff --git a/plugins/aggregators/histogram/histogram.go b/plugins/aggregators/histogram/histogram.go
index 491955339..a60cede3d 100644
--- a/plugins/aggregators/histogram/histogram.go
+++ b/plugins/aggregators/histogram/histogram.go
@@ -24,8 +24,8 @@ type HistogramAggregator struct {
 
 // config is the config, which contains name, field of metric and histogram buckets.
 type config struct {
-	Metric  string   `toml:"metric_name"`
-	Fields  []string `toml:"metric_fields"`
+	Metric  string   `toml:"measurement_name"`
+	Fields  []string `toml:"fields"`
 	Buckets buckets  `toml:"buckets"`
 }
 
@@ -65,28 +65,28 @@ func NewHistogramAggregator() telegraf.Aggregator {
 }
 
 var sampleConfig = `
-  ## General Aggregator Arguments:
-  ## The period on which to flush & clear the aggregator.
+  ## The period in which to flush the aggregator.
   period = "30s"
+
   ## If true, the original metric will be dropped by the
   ## aggregator and will not get sent to the output plugins.
   drop_original = false
 
-  ## The example of config to aggregate histogram for all fields of specified metric.
-  [[aggregators.histogram.config]]
-  ## The set of buckets.
-  buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
-  ## The name of metric.
-  metric_name = "cpu"
+  ## Example config that aggregates all fields of the metric.
+  # [[aggregators.histogram.config]]
+  #   ## The set of buckets.
+  #   buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0]
+  #   ## The name of metric.
+  #   measurement_name = "cpu"
 
-  ## The example of config to aggregate for specified fields of metric.
-  [[aggregators.histogram.config]]
-  ## The set of buckets.
-  buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
-  ## The name of metric.
-  metric_name = "diskio"
-  ## The concrete fields of metric
-  metric_fields = ["io_time", "read_time", "write_time"]
+  ## Example config that aggregates only specific fields of the metric.
+  # [[aggregators.histogram.config]]
+  #   ## The set of buckets.
+  #   buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0]
+  #   ## The name of metric.
+  #   measurement_name = "diskio"
+  #   ## The concrete fields of metric
+  #   fields = ["io_time", "read_time", "write_time"]
 `
 
 // SampleConfig returns sample of config
@@ -96,7 +96,7 @@ func (h *HistogramAggregator) SampleConfig() string {
 
 // Description returns description of aggregator plugin
 func (h *HistogramAggregator) Description() string {
-	return "Keep the aggregate histogram of each metric passing through."
+	return "Create aggregate histograms."
 }
 
 // Add adds new hit to the buckets

From 1f1e9cc49fa2c14e2112eee4090bd9c5003676bd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 18 Aug 2017 17:57:30 -0700
Subject: [PATCH 0474/1302] Add win_services to the readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e63271d31..1d2ac478d 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,8 @@ configuration options.
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)
 * [zookeeper](./plugins/inputs/zookeeper)
-* [win_perf_counters ](./plugins/inputs/win_perf_counters) (windows performance counters)
+* [win_perf_counters](./plugins/inputs/win_perf_counters) (windows performance counters)
+* [win_services](./plugins/inputs/win_services)
 * [sysstat](./plugins/inputs/sysstat)
 * [system](./plugins/inputs/system)
     * cpu

From 13a6b917c3dc61dc3aeae2b3750658e9535a6319 Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Mon, 21 Aug 2017 19:24:54 -0500
Subject: [PATCH 0475/1302] Add JSON input support to zipkin plugin (#3150)

---
 plugins/inputs/zipkin/README.md               |   3 +
 .../cmd/thrift_serialize/thrift_serialize.go  |   8 +-
 plugins/inputs/zipkin/codec/codec.go          | 210 ++++
 plugins/inputs/zipkin/codec/codec_test.go     | 636 ++++++++++++
 plugins/inputs/zipkin/codec/jsonV1/jsonV1.go  | 252 +++++
 .../inputs/zipkin/codec/jsonV1/jsonV1_test.go | 920 ++++++++++++++++++
 plugins/inputs/zipkin/codec/thrift/thrift.go  | 203 ++++
 .../inputs/zipkin/codec/thrift/thrift_test.go | 211 ++++
 plugins/inputs/zipkin/convert.go              | 180 +---
 plugins/inputs/zipkin/convert_test.go         | 253 +----
 plugins/inputs/zipkin/handler.go              |  69 +-
 plugins/inputs/zipkin/handler_test.go         |  41 +-
 .../testdata/json/brave-tracer-example.json   | 188 ++++
 plugins/inputs/zipkin/trace/trace.go          |  41 +
 plugins/inputs/zipkin/zipkin.go               |  45 +-
 plugins/inputs/zipkin/zipkin_test.go          | 360 ++++++-
 16 files changed, 3103 insertions(+), 517 deletions(-)
 create mode 100644 plugins/inputs/zipkin/codec/codec.go
 create mode 100644 plugins/inputs/zipkin/codec/codec_test.go
 create mode 100644 plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
 create mode 100644 plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
 create mode 100644 plugins/inputs/zipkin/codec/thrift/thrift.go
 create mode 100644 plugins/inputs/zipkin/codec/thrift/thrift_test.go
 create mode 100644 plugins/inputs/zipkin/testdata/json/brave-tracer-example.json
 create mode 100644 plugins/inputs/zipkin/trace/trace.go

diff --git a/plugins/inputs/zipkin/README.md b/plugins/inputs/zipkin/README.md
index af5ea6117..af95542b3 100644
--- a/plugins/inputs/zipkin/README.md
+++ b/plugins/inputs/zipkin/README.md
@@ -12,6 +12,9 @@ based on its main usage cases and the evolution of the OpenTracing standard.*
     port = 9411 # Port on which Telegraf listens
 ```
 
+The plugin accepts spans in `JSON` or `thrift` if the `Content-Type` is `application/json` or `application/x-thrift`, respectively.
+If `Content-Type` is not set, then the plugin assumes it is `JSON` format.
+
 ## Tracing:
 
 This plugin uses Annotations tags and fields to track data from spans
diff --git a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
index 5a65384d4..0d792f926 100644
--- a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
+++ b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
@@ -62,13 +62,17 @@ func main() {
 		if err != nil {
 			log.Fatalf("%v\n", err)
 		}
-		ioutil.WriteFile(outFileName, raw, 0644)
+		if err := ioutil.WriteFile(outFileName, raw, 0644); err != nil {
+			log.Fatalf("%v", err)
+		}
 	case "thrift":
 		raw, err := thriftToJSONSpans(contents)
 		if err != nil {
 			log.Fatalf("%v\n", err)
 		}
-		ioutil.WriteFile(outFileName, raw, 0644)
+		if err := ioutil.WriteFile(outFileName, raw, 0644); err != nil {
+			log.Fatalf("%v", err)
+		}
 	default:
 		log.Fatalf("Unsupported input type")
 	}
diff --git a/plugins/inputs/zipkin/codec/codec.go b/plugins/inputs/zipkin/codec/codec.go
new file mode 100644
index 000000000..781aad72a
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/codec.go
@@ -0,0 +1,210 @@
+package codec
+
+import (
+	"time"
+
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+//now is a mockable time for now
+var now = time.Now
+
+// DefaultServiceName when the span does not have any serviceName
+const DefaultServiceName = "unknown"
+
+// Decoder decodes the bytes and returns a trace
+type Decoder interface {
+	Decode(octets []byte) ([]Span, error)
+}
+
+// Span are created by instrumentation in RPC clients or servers
+type Span interface {
+	Trace() (string, error)
+	SpanID() (string, error)
+	Parent() (string, error)
+	Name() string
+	Annotations() []Annotation
+	BinaryAnnotations() ([]BinaryAnnotation, error)
+	Timestamp() time.Time
+	Duration() time.Duration
+}
+
+// Annotation represents an event that explains latency with a timestamp.
+type Annotation interface {
+	Timestamp() time.Time
+	Value() string
+	Host() Endpoint
+}
+
+// BinaryAnnotation represent tags applied to a Span to give it context
+type BinaryAnnotation interface {
+	Key() string
+	Value() string
+	Host() Endpoint
+}
+
+// Endpoint represents the network context of a service recording an annotation
+type Endpoint interface {
+	Host() string
+	Name() string
+}
+
+// DefaultEndpoint is used if the annotations have no endpoints
+type DefaultEndpoint struct{}
+
+// Host returns 0.0.0.0; used when the host is unknown
+func (d *DefaultEndpoint) Host() string { return "0.0.0.0" }
+
+// Name returns "unknown" when an endpoint doesn't exist
+func (d *DefaultEndpoint) Name() string { return DefaultServiceName }
+
+// MicroToTime converts zipkin's native time of microseconds into time.Time
+func MicroToTime(micro int64) time.Time {
+	return time.Unix(0, micro*int64(time.Microsecond)).UTC()
+}
+
+// NewTrace converts a slice of []Span into a new Trace
+func NewTrace(spans []Span) (trace.Trace, error) {
+	tr := make(trace.Trace, len(spans))
+	for i, span := range spans {
+		bin, err := span.BinaryAnnotations()
+		if err != nil {
+			return nil, err
+		}
+		endpoint := serviceEndpoint(span.Annotations(), bin)
+		id, err := span.SpanID()
+		if err != nil {
+			return nil, err
+		}
+
+		tid, err := span.Trace()
+		if err != nil {
+			return nil, err
+		}
+
+		pid, err := parentID(span)
+		if err != nil {
+			return nil, err
+		}
+
+		tr[i] = trace.Span{
+			ID:                id,
+			TraceID:           tid,
+			Name:              span.Name(),
+			Timestamp:         guessTimestamp(span),
+			Duration:          convertDuration(span),
+			ParentID:          pid,
+			ServiceName:       endpoint.Name(),
+			Annotations:       NewAnnotations(span.Annotations(), endpoint),
+			BinaryAnnotations: NewBinaryAnnotations(bin, endpoint),
+		}
+	}
+	return tr, nil
+}
+
+// NewAnnotations converts a slice of Annotation into a slice of new Annotations
+func NewAnnotations(annotations []Annotation, endpoint Endpoint) []trace.Annotation {
+	formatted := make([]trace.Annotation, len(annotations))
+	for i, annotation := range annotations {
+		formatted[i] = trace.Annotation{
+			Host:        endpoint.Host(),
+			ServiceName: endpoint.Name(),
+			Timestamp:   annotation.Timestamp(),
+			Value:       annotation.Value(),
+		}
+	}
+
+	return formatted
+}
+
+// NewBinaryAnnotations is very similar to NewAnnotations, but it
+// converts BinaryAnnotations instead of the normal Annotation
+func NewBinaryAnnotations(annotations []BinaryAnnotation, endpoint Endpoint) []trace.BinaryAnnotation {
+	formatted := make([]trace.BinaryAnnotation, len(annotations))
+	for i, annotation := range annotations {
+		formatted[i] = trace.BinaryAnnotation{
+			Host:        endpoint.Host(),
+			ServiceName: endpoint.Name(),
+			Key:         annotation.Key(),
+			Value:       annotation.Value(),
+		}
+	}
+	return formatted
+}
+
+func minMax(span Span) (time.Time, time.Time) {
+	min := now().UTC()
+	max := time.Time{}.UTC()
+	for _, annotation := range span.Annotations() {
+		ts := annotation.Timestamp()
+		if !ts.IsZero() && ts.Before(min) {
+			min = ts
+		}
+		if !ts.IsZero() && ts.After(max) {
+			max = ts
+		}
+	}
+	if max.IsZero() {
+		max = min
+	}
+	return min, max
+}
+
+func guessTimestamp(span Span) time.Time {
+	ts := span.Timestamp()
+	if !ts.IsZero() {
+		return ts
+	}
+
+	min, _ := minMax(span)
+	return min
+}
+
+func convertDuration(span Span) time.Duration {
+	duration := span.Duration()
+	if duration != 0 {
+		return duration
+	}
+	min, max := minMax(span)
+	return max.Sub(min)
+}
+
+func parentID(span Span) (string, error) {
+	// A parent ID of "" means that this is a parent span. In this case,
+	// we set the parent ID of the span to be its own id, so it points to
+	// itself.
+	id, err := span.Parent()
+	if err != nil {
+		return "", err
+	}
+
+	if id != "" {
+		return id, nil
+	}
+	return span.SpanID()
+}
+
+func serviceEndpoint(ann []Annotation, bann []BinaryAnnotation) Endpoint {
+	for _, a := range ann {
+		switch a.Value() {
+		case zipkincore.SERVER_RECV, zipkincore.SERVER_SEND, zipkincore.CLIENT_RECV, zipkincore.CLIENT_SEND:
+			if a.Host() != nil && a.Host().Name() != "" {
+				return a.Host()
+			}
+		}
+	}
+
+	for _, a := range bann {
+		if a.Key() == zipkincore.LOCAL_COMPONENT && a.Host() != nil && a.Host().Name() != "" {
+			return a.Host()
+		}
+	}
+	// Unable to find any "standard" endpoint host, so, use any that exist in the regular annotations
+	for _, a := range ann {
+		if a.Host() != nil && a.Host().Name() != "" {
+			return a.Host()
+		}
+	}
+	return &DefaultEndpoint{}
+}
diff --git a/plugins/inputs/zipkin/codec/codec_test.go b/plugins/inputs/zipkin/codec/codec_test.go
new file mode 100644
index 000000000..c3a9fbd73
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/codec_test.go
@@ -0,0 +1,636 @@
+package codec
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
+)
+
+func Test_MicroToTime(t *testing.T) {
+	type args struct {
+		micro int64
+	}
+	tests := []struct {
+		name  string
+		micro int64
+		want  time.Time
+	}{
+		{
+			name:  "given zero micro seconds expected unix time zero",
+			micro: 0,
+			want:  time.Unix(0, 0).UTC(),
+		},
+		{
+			name:  "given a million micro seconds expected unix time one",
+			micro: 1000000,
+			want:  time.Unix(1, 0).UTC(),
+		},
+		{
+			name:  "given a million micro seconds expected unix time one",
+			micro: 1503031538791000,
+			want:  time.Unix(0, 1503031538791000000).UTC(),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := MicroToTime(tt.micro); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("microToTime() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_minMax(t *testing.T) {
+	tests := []struct {
+		name    string
+		span    *MockSpan
+		now     func() time.Time
+		wantMin time.Time
+		wantMax time.Time
+	}{
+		{
+			name: "Single annotation",
+			span: &MockSpan{
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(time.Second),
+					},
+				},
+			},
+			wantMin: time.Unix(1, 0).UTC(),
+			wantMax: time.Unix(1, 0).UTC(),
+		},
+		{
+			name: "Three annotations",
+			span: &MockSpan{
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(1 * time.Second),
+					},
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(2 * time.Second),
+					},
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(3 * time.Second),
+					},
+				},
+			},
+			wantMin: time.Unix(1, 0).UTC(),
+			wantMax: time.Unix(3, 0).UTC(),
+		},
+		{
+			name: "Annotations are in the future",
+			span: &MockSpan{
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(3 * time.Second),
+					},
+				},
+			},
+			wantMin: time.Unix(2, 0).UTC(),
+			wantMax: time.Unix(3, 0).UTC(),
+			now: func() time.Time {
+				return time.Unix(2, 0).UTC()
+			},
+		},
+		{
+			name: "No Annotations",
+			span: &MockSpan{
+				Anno: []Annotation{},
+			},
+			wantMin: time.Unix(2, 0).UTC(),
+			wantMax: time.Unix(2, 0).UTC(),
+			now: func() time.Time {
+				return time.Unix(2, 0).UTC()
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.now != nil {
+				now = tt.now
+			}
+			got, got1 := minMax(tt.span)
+			if !reflect.DeepEqual(got, tt.wantMin) {
+				t.Errorf("minMax() got = %v, want %v", got, tt.wantMin)
+			}
+			if !reflect.DeepEqual(got1, tt.wantMax) {
+				t.Errorf("minMax() got1 = %v, want %v", got1, tt.wantMax)
+			}
+			now = time.Now
+		})
+	}
+}
+
+func Test_guessTimestamp(t *testing.T) {
+	tests := []struct {
+		name string
+		span Span
+		now  func() time.Time
+		want time.Time
+	}{
+		{
+			name: "simple timestamp",
+			span: &MockSpan{
+				Time: time.Unix(2, 0).UTC(),
+			},
+			want: time.Unix(2, 0).UTC(),
+		},
+		{
+			name: "zero timestamp",
+			span: &MockSpan{
+				Time: time.Time{},
+			},
+			now: func() time.Time {
+				return time.Unix(2, 0).UTC()
+			},
+			want: time.Unix(2, 0).UTC(),
+		},
+		{
+			name: "zero timestamp with single annotation",
+			span: &MockSpan{
+				Time: time.Time{},
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC(),
+					},
+				},
+			},
+			want: time.Unix(0, 0).UTC(),
+		},
+		{
+			name: "zero timestamp with two annotations",
+			span: &MockSpan{
+				Time: time.Time{},
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC(),
+					},
+					&MockAnnotation{
+						Time: time.Unix(2, 0).UTC(),
+					},
+				},
+			},
+			want: time.Unix(0, 0).UTC(),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.now != nil {
+				now = tt.now
+			}
+			if got := guessTimestamp(tt.span); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("guessTimestamp() = %v, want %v", got, tt.want)
+			}
+			now = time.Now
+		})
+	}
+}
+
+func Test_convertDuration(t *testing.T) {
+	tests := []struct {
+		name string
+		span Span
+		want time.Duration
+	}{
+		{
+			name: "simple duration",
+			span: &MockSpan{
+				Dur: time.Hour,
+			},
+			want: time.Hour,
+		},
+		{
+			name: "no timestamp, but, 2 seconds between annotations",
+			span: &MockSpan{
+				Anno: []Annotation{
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(1 * time.Second),
+					},
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(2 * time.Second),
+					},
+					&MockAnnotation{
+						Time: time.Unix(0, 0).UTC().Add(3 * time.Second),
+					},
+				},
+			},
+			want: 2 * time.Second,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := convertDuration(tt.span); got != tt.want {
+				t.Errorf("convertDuration() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_parentID(t *testing.T) {
+	tests := []struct {
+		name    string
+		span    Span
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "has parent id",
+			span: &MockSpan{
+				ParentID: "6b221d5bc9e6496c",
+			},
+			want: "6b221d5bc9e6496c",
+		},
+		{
+			name: "no parent, so use id",
+			span: &MockSpan{
+				ID: "abceasyas123",
+			},
+			want: "abceasyas123",
+		},
+		{
+			name: "bad parent value",
+			span: &MockSpan{
+				Error: fmt.Errorf("Mommie Dearest"),
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := parentID(tt.span)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("parentID() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("parentID() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_serviceEndpoint(t *testing.T) {
+	tests := []struct {
+		name string
+		ann  []Annotation
+		bann []BinaryAnnotation
+		want Endpoint
+	}{
+		{
+			name: "Annotation with server receive",
+			ann: []Annotation{
+				&MockAnnotation{
+					Val: "battery",
+					H: &MockEndpoint{
+						name: "aa",
+					},
+				},
+				&MockAnnotation{
+					Val: "sr",
+					H: &MockEndpoint{
+						name: "me",
+					},
+				},
+			},
+			want: &MockEndpoint{
+				name: "me",
+			},
+		},
+		{
+			name: "Annotation with no standard values",
+			ann: []Annotation{
+				&MockAnnotation{
+					Val: "noop",
+				},
+				&MockAnnotation{
+					Val: "aa",
+					H: &MockEndpoint{
+						name: "battery",
+					},
+				},
+			},
+			want: &MockEndpoint{
+				name: "battery",
+			},
+		},
+		{
+			name: "Annotation with no endpoints",
+			ann: []Annotation{
+				&MockAnnotation{
+					Val: "noop",
+				},
+			},
+			want: &DefaultEndpoint{},
+		},
+		{
+			name: "Binary annotation with local component",
+			bann: []BinaryAnnotation{
+				&MockBinaryAnnotation{
+					K: "noop",
+					H: &MockEndpoint{
+						name: "aa",
+					},
+				},
+				&MockBinaryAnnotation{
+					K: "lc",
+					H: &MockEndpoint{
+						name: "me",
+					},
+				},
+			},
+			want: &MockEndpoint{
+				name: "me",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := serviceEndpoint(tt.ann, tt.bann); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("serviceEndpoint() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestNewBinaryAnnotations(t *testing.T) {
+	tests := []struct {
+		name        string
+		annotations []BinaryAnnotation
+		endpoint    Endpoint
+		want        []trace.BinaryAnnotation
+	}{
+		{
+			name: "Should override annotation with endpoint",
+			annotations: []BinaryAnnotation{
+				&MockBinaryAnnotation{
+					K: "mykey",
+					V: "myvalue",
+					H: &MockEndpoint{
+						host: "noop",
+						name: "noop",
+					},
+				},
+			},
+			endpoint: &MockEndpoint{
+				host: "myhost",
+				name: "myservice",
+			},
+			want: []trace.BinaryAnnotation{
+				trace.BinaryAnnotation{
+					Host:        "myhost",
+					ServiceName: "myservice",
+					Key:         "mykey",
+					Value:       "myvalue",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := NewBinaryAnnotations(tt.annotations, tt.endpoint); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewBinaryAnnotations() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestNewAnnotations(t *testing.T) {
+	tests := []struct {
+		name        string
+		annotations []Annotation
+		endpoint    Endpoint
+		want        []trace.Annotation
+	}{
+		{
+			name: "Should override annotation with endpoint",
+			annotations: []Annotation{
+				&MockAnnotation{
+					Time: time.Unix(0, 0).UTC(),
+					Val:  "myvalue",
+					H: &MockEndpoint{
+						host: "noop",
+						name: "noop",
+					},
+				},
+			},
+			endpoint: &MockEndpoint{
+				host: "myhost",
+				name: "myservice",
+			},
+			want: []trace.Annotation{
+				trace.Annotation{
+					Host:        "myhost",
+					ServiceName: "myservice",
+					Timestamp:   time.Unix(0, 0).UTC(),
+					Value:       "myvalue",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := NewAnnotations(tt.annotations, tt.endpoint); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewAnnotations() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestNewTrace(t *testing.T) {
+	tests := []struct {
+		name    string
+		spans   []Span
+		now     func() time.Time
+		want    trace.Trace
+		wantErr bool
+	}{
+		{
+			name: "empty span",
+			spans: []Span{
+				&MockSpan{},
+			},
+			now: func() time.Time {
+				return time.Unix(0, 0).UTC()
+			},
+			want: trace.Trace{
+				trace.Span{
+					ServiceName:       "unknown",
+					Timestamp:         time.Unix(0, 0).UTC(),
+					Annotations:       []trace.Annotation{},
+					BinaryAnnotations: []trace.BinaryAnnotation{},
+				},
+			},
+		},
+		{
+			name: "span has no id",
+			spans: []Span{
+				&MockSpan{
+					Error: fmt.Errorf("Span has no id"),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "complete span",
+			spans: []Span{
+				&MockSpan{
+					TraceID:     "tid",
+					ID:          "id",
+					ParentID:    "",
+					ServiceName: "me",
+					Anno: []Annotation{
+						&MockAnnotation{
+							Time: time.Unix(1, 0).UTC(),
+							Val:  "myval",
+							H: &MockEndpoint{
+								host: "myhost",
+								name: "myname",
+							},
+						},
+					},
+					Time: time.Unix(0, 0).UTC(),
+					Dur:  2 * time.Second,
+				},
+			},
+			now: func() time.Time {
+				return time.Unix(0, 0).UTC()
+			},
+			want: trace.Trace{
+				trace.Span{
+					ID:          "id",
+					ParentID:    "id",
+					TraceID:     "tid",
+					Name:        "me",
+					ServiceName: "myname",
+					Timestamp:   time.Unix(0, 0).UTC(),
+					Duration:    2 * time.Second,
+					Annotations: []trace.Annotation{
+						{
+							Timestamp:   time.Unix(1, 0).UTC(),
+							Value:       "myval",
+							Host:        "myhost",
+							ServiceName: "myname",
+						},
+					},
+					BinaryAnnotations: []trace.BinaryAnnotation{},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.now != nil {
+				now = tt.now
+			}
+			got, err := NewTrace(tt.spans)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewTrace() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("NewTrace() = %s", cmp.Diff(tt.want, got))
+			}
+			now = time.Now
+		})
+	}
+}
+
+type MockSpan struct {
+	TraceID     string
+	ID          string
+	ParentID    string
+	ServiceName string
+	Anno        []Annotation
+	BinAnno     []BinaryAnnotation
+	Time        time.Time
+	Dur         time.Duration
+	Error       error
+}
+
+func (m *MockSpan) Trace() (string, error) {
+	return m.TraceID, m.Error
+}
+
+func (m *MockSpan) SpanID() (string, error) {
+	return m.ID, m.Error
+}
+
+func (m *MockSpan) Parent() (string, error) {
+	return m.ParentID, m.Error
+}
+
+func (m *MockSpan) Name() string {
+	return m.ServiceName
+}
+
+func (m *MockSpan) Annotations() []Annotation {
+	return m.Anno
+}
+
+func (m *MockSpan) BinaryAnnotations() ([]BinaryAnnotation, error) {
+	return m.BinAnno, m.Error
+}
+
+func (m *MockSpan) Timestamp() time.Time {
+	return m.Time
+}
+
+func (m *MockSpan) Duration() time.Duration {
+	return m.Dur
+}
+
+type MockAnnotation struct {
+	Time time.Time
+	Val  string
+	H    Endpoint
+}
+
+func (m *MockAnnotation) Timestamp() time.Time {
+	return m.Time
+}
+
+func (m *MockAnnotation) Value() string {
+	return m.Val
+}
+
+func (m *MockAnnotation) Host() Endpoint {
+	return m.H
+}
+
+type MockEndpoint struct {
+	host string
+	name string
+}
+
+func (e *MockEndpoint) Host() string {
+	return e.host
+}
+
+func (e *MockEndpoint) Name() string {
+	return e.name
+}
+
+type MockBinaryAnnotation struct {
+	Time time.Time
+	K    string
+	V    string
+	H    Endpoint
+}
+
+func (b *MockBinaryAnnotation) Key() string {
+	return b.K
+}
+
+func (b *MockBinaryAnnotation) Value() string {
+	return b.V
+}
+
+func (b *MockBinaryAnnotation) Host() Endpoint {
+	return b.H
+}
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
new file mode 100644
index 000000000..53670dd29
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
@@ -0,0 +1,252 @@
+package jsonV1
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+// JSON decodes spans from  bodies `POST`ed to the spans endpoint
+type JSON struct{}
+
+// Decode unmarshals and validates the JSON body
+func (j *JSON) Decode(octets []byte) ([]codec.Span, error) {
+	var spans []span
+	err := json.Unmarshal(octets, &spans)
+	if err != nil {
+		return nil, err
+	}
+
+	res := make([]codec.Span, len(spans))
+	for i := range spans {
+		if err := spans[i].Validate(); err != nil {
+			return nil, err
+		}
+		res[i] = &spans[i]
+	}
+	return res, nil
+}
+
+type span struct {
+	TraceID  string             `json:"traceId"`
+	SpanName string             `json:"name"`
+	ParentID string             `json:"parentId,omitempty"`
+	ID       string             `json:"id"`
+	Time     *int64             `json:"timestamp,omitempty"`
+	Dur      *int64             `json:"duration,omitempty"`
+	Debug    bool               `json:"debug,omitempty"`
+	Anno     []annotation       `json:"annotations"`
+	BAnno    []binaryAnnotation `json:"binaryAnnotations"`
+}
+
+func (s *span) Validate() error {
+	var err error
+	check := func(f func() (string, error)) {
+		if err != nil {
+			return
+		}
+		_, err = f()
+	}
+
+	check(s.Trace)
+	check(s.SpanID)
+	check(s.Parent)
+	if err != nil {
+		return err
+	}
+
+	_, err = s.BinaryAnnotations()
+	return err
+}
+
+func (s *span) Trace() (string, error) {
+	if s.TraceID == "" {
+		return "", fmt.Errorf("Trace ID cannot be null")
+	}
+	return TraceIDFromString(s.TraceID)
+}
+
+func (s *span) SpanID() (string, error) {
+	if s.ID == "" {
+		return "", fmt.Errorf("Span ID cannot be null")
+	}
+	return IDFromString(s.ID)
+}
+
+func (s *span) Parent() (string, error) {
+	if s.ParentID == "" {
+		return "", nil
+	}
+	return IDFromString(s.ParentID)
+}
+
+func (s *span) Name() string {
+	return s.SpanName
+}
+
+func (s *span) Annotations() []codec.Annotation {
+	res := make([]codec.Annotation, len(s.Anno))
+	for i := range s.Anno {
+		res[i] = &s.Anno[i]
+	}
+	return res
+}
+
+func (s *span) BinaryAnnotations() ([]codec.BinaryAnnotation, error) {
+	res := make([]codec.BinaryAnnotation, len(s.BAnno))
+	for i, a := range s.BAnno {
+		if a.Key() != "" && a.Value() == "" {
+			return nil, fmt.Errorf("No value for key %s at binaryAnnotations[%d]", a.K, i)
+		}
+		if a.Value() != "" && a.Key() == "" {
+			return nil, fmt.Errorf("No key at binaryAnnotations[%d]", i)
+		}
+		res[i] = &s.BAnno[i]
+	}
+	return res, nil
+}
+
+func (s *span) Timestamp() time.Time {
+	if s.Time == nil {
+		return time.Time{}
+	}
+	return codec.MicroToTime(*s.Time)
+}
+
+func (s *span) Duration() time.Duration {
+	if s.Dur == nil {
+		return 0
+	}
+	return time.Duration(*s.Dur) * time.Microsecond
+}
+
+type annotation struct {
+	Endpoint *endpoint `json:"endpoint,omitempty"`
+	Time     int64     `json:"timestamp"`
+	Val      string    `json:"value,omitempty"`
+}
+
+func (a *annotation) Timestamp() time.Time {
+	return codec.MicroToTime(a.Time)
+}
+
+func (a *annotation) Value() string {
+	return a.Val
+}
+
+func (a *annotation) Host() codec.Endpoint {
+	return a.Endpoint
+}
+
+type binaryAnnotation struct {
+	K        string          `json:"key"`
+	V        json.RawMessage `json:"value"`
+	Type     string          `json:"type"`
+	Endpoint *endpoint       `json:"endpoint,omitempty"`
+}
+
+func (b *binaryAnnotation) Key() string {
+	return b.K
+}
+
+func (b *binaryAnnotation) Value() string {
+	t, err := zipkincore.AnnotationTypeFromString(b.Type)
+	// Assume this is a string if we cannot tell the type
+	if err != nil {
+		t = zipkincore.AnnotationType_STRING
+	}
+
+	switch t {
+	case zipkincore.AnnotationType_BOOL:
+		var v bool
+		err := json.Unmarshal(b.V, &v)
+		if err == nil {
+			return strconv.FormatBool(v)
+		}
+	case zipkincore.AnnotationType_BYTES:
+		return string(b.V)
+	case zipkincore.AnnotationType_I16, zipkincore.AnnotationType_I32, zipkincore.AnnotationType_I64:
+		var v int64
+		err := json.Unmarshal(b.V, &v)
+		if err == nil {
+			return strconv.FormatInt(v, 10)
+		}
+	case zipkincore.AnnotationType_DOUBLE:
+		var v float64
+		err := json.Unmarshal(b.V, &v)
+		if err == nil {
+			return strconv.FormatFloat(v, 'f', -1, 64)
+		}
+	case zipkincore.AnnotationType_STRING:
+		var v string
+		err := json.Unmarshal(b.V, &v)
+		if err == nil {
+			return v
+		}
+	}
+
+	return ""
+}
+
+func (b *binaryAnnotation) Host() codec.Endpoint {
+	return b.Endpoint
+}
+
+type endpoint struct {
+	ServiceName string `json:"serviceName"`
+	Ipv4        string `json:"ipv4"`
+	Ipv6        string `json:"ipv6,omitempty"`
+	Port        int    `json:"port"`
+}
+
+func (e *endpoint) Host() string {
+	if e.Port != 0 {
+		return fmt.Sprintf("%s:%d", e.Ipv4, e.Port)
+	}
+	return e.Ipv4
+}
+
+func (e *endpoint) Name() string {
+	return e.ServiceName
+}
+
+// TraceIDFromString creates a TraceID from a hexadecimal string
+func TraceIDFromString(s string) (string, error) {
+	var hi, lo uint64
+	var err error
+	if len(s) > 32 {
+		return "", fmt.Errorf("TraceID cannot be longer than 32 hex characters: %s", s)
+	} else if len(s) > 16 {
+		hiLen := len(s) - 16
+		if hi, err = strconv.ParseUint(s[0:hiLen], 16, 64); err != nil {
+			return "", err
+		}
+		if lo, err = strconv.ParseUint(s[hiLen:], 16, 64); err != nil {
+			return "", err
+		}
+	} else {
+		if lo, err = strconv.ParseUint(s, 16, 64); err != nil {
+			return "", err
+		}
+	}
+	if hi == 0 {
+		return fmt.Sprintf("%x", lo), nil
+	}
+	return fmt.Sprintf("%x%016x", hi, lo), nil
+}
+
+// IDFromString creates a decimal id from a hexadecimal string
+func IDFromString(s string) (string, error) {
+	if len(s) > 16 {
+		return "", fmt.Errorf("ID cannot be longer than 16 hex characters: %s", s)
+	}
+	id, err := strconv.ParseUint(s, 16, 64)
+	if err != nil {
+		return "", err
+	}
+	return strconv.FormatUint(id, 10), nil
+}
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
new file mode 100644
index 000000000..fa0d7c2ad
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
@@ -0,0 +1,920 @@
+package jsonV1
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
+)
+
+func TestJSON_Decode(t *testing.T) {
+	addr := func(i int64) *int64 { return &i }
+	tests := []struct {
+		name    string
+		octets  []byte
+		want    []codec.Span
+		wantErr bool
+	}{
+		{
+			name: "bad json is error",
+			octets: []byte(`
+			[
+				{
+			]`),
+			wantErr: true,
+		},
+		{
+			name: "Decodes simple trace",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "6b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c"
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "6b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+			},
+		},
+		{
+			name: "Decodes two spans",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "6b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c"
+				},
+				{
+					"traceId": "6b221d5bc9e6496c",
+					"name": "get-traces",
+					"id": "c6946e9cb5d122b6",
+					"parentId": "6b221d5bc9e6496c",
+					"duration": 10000
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "6b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+				&span{
+					TraceID:  "6b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "c6946e9cb5d122b6",
+					ParentID: "6b221d5bc9e6496c",
+					Dur:      addr(10000),
+				},
+			},
+		},
+		{
+			name: "Decodes trace with timestamp",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "6b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "timestamp": 1503031538791000
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "6b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					Time:     addr(1503031538791000),
+				},
+			},
+		},
+		{
+			name: "Decodes simple trace with high and low trace id",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c"
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+			},
+		},
+		{
+			name: "Error when trace id is null",
+			octets: []byte(`
+			[
+				{
+				  "traceId": null,
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c"
+				}
+			]`),
+			wantErr: true,
+		},
+		{
+			name: "ignore null parentId",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "parentId": null
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+			},
+		},
+		{
+			name: "ignore null timestamp",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "timestamp": null
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+			},
+		},
+		{
+			name: "ignore null duration",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "duration": null
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+				},
+			},
+		},
+		{
+			name: "ignore null annotation endpoint",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "annotations": [
+						{
+							"timestamp": 1461750491274000,
+							"value": "cs",
+							"endpoint": null
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					Anno: []annotation{
+						{
+							Time: 1461750491274000,
+							Val:  "cs",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "ignore null binary annotation endpoint",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "lc",
+							"value": "JDBCSpanStore",
+							"endpoint": null
+						}
+				  ]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K: "lc",
+							V: json.RawMessage(`"JDBCSpanStore"`),
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "Error when binary annotation has no key",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"value": "JDBCSpanStore",
+							"endpoint": null
+						}
+				  ]
+				}
+			]`),
+			wantErr: true,
+		},
+		{
+			name: "Error when binary annotation has no value",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "lc",
+							"endpoint": null
+						}
+				  ]
+				}
+			]`),
+			wantErr: true,
+		},
+		{
+			name: "binary annotation with endpoint",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "lc",
+							"value": "JDBCSpanStore",
+							"endpoint": {
+								"serviceName": "service",
+								"port": 65535
+							}
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K: "lc",
+							V: json.RawMessage(`"JDBCSpanStore"`),
+							Endpoint: &endpoint{
+								ServiceName: "service",
+								Port:        65535,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "binary annotation with double value",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "num",
+							"value": 1.23456789,
+							"type": "DOUBLE"
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K:    "num",
+							V:    json.RawMessage{0x31, 0x2e, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39},
+							Type: "DOUBLE",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "binary annotation with integer value",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "num",
+							"value": 1,
+							"type": "I16"
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K:    "num",
+							V:    json.RawMessage{0x31},
+							Type: "I16",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "binary annotation with bool value",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "num",
+							"value": true,
+							"type": "BOOL"
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K:    "num",
+							V:    json.RawMessage(`true`),
+							Type: "BOOL",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "binary annotation with bytes value",
+			octets: []byte(`
+			[
+				{
+				  "traceId": "48485a3953bb61246b221d5bc9e6496c",
+				  "name": "get-traces",
+				  "id": "6b221d5bc9e6496c",
+				  "binaryAnnotations": [
+						{
+							"key": "num",
+							"value": "1",
+							"type": "BYTES"
+						}
+					]
+				}
+			]`),
+			want: []codec.Span{
+				&span{
+					TraceID:  "48485a3953bb61246b221d5bc9e6496c",
+					SpanName: "get-traces",
+					ID:       "6b221d5bc9e6496c",
+					BAnno: []binaryAnnotation{
+						{
+							K:    "num",
+							V:    json.RawMessage(`"1"`),
+							Type: "BYTES",
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			j := &JSON{}
+			got, err := j.Decode(tt.octets)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("JSON.Decode() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("JSON.Decode() = got(-)/want(+) %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
+
+func Test_span_Trace(t *testing.T) {
+	tests := []struct {
+		name    string
+		TraceID string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:    "Trace IDs cannot be null",
+			TraceID: "",
+			wantErr: true,
+		},
+		{
+			name:    "converts hex string correctly",
+			TraceID: "deadbeef",
+			want:    "deadbeef",
+		},
+		{
+			name:    "converts high and low trace id correctly",
+			TraceID: "48485a3953bb61246b221d5bc9e6496c",
+			want:    "48485a3953bb61246b221d5bc9e6496c",
+		},
+		{
+			name:    "errors when string isn't hex",
+			TraceID: "oxdeadbeef",
+			wantErr: true,
+		},
+		{
+			name:    "errors when id is too long",
+			TraceID: "1234567890abcdef1234567890abcdef1",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &span{
+				TraceID: tt.TraceID,
+			}
+			got, err := s.Trace()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("span.Trace() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("span.Trace() = got(-)/want(+) %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
+
+func Test_span_SpanID(t *testing.T) {
+	tests := []struct {
+		name    string
+		ID      string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:    "Span IDs cannot be null",
+			ID:      "",
+			wantErr: true,
+		},
+		{
+			name: "converts known id correctly",
+			ID:   "b26412d1ac16767d",
+			want: "12854419928166856317",
+		},
+		{
+			name: "converts hex string correctly",
+			ID:   "deadbeef",
+			want: "3735928559",
+		},
+		{
+			name:    "errors when string isn't hex",
+			ID:      "oxdeadbeef",
+			wantErr: true,
+		},
+		{
+			name:    "errors when id is too long",
+			ID:      "1234567890abcdef1",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &span{
+				ID: tt.ID,
+			}
+			got, err := s.SpanID()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("span.SpanID() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("span.SpanID() = got(-)/want(+) %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
+
+func Test_span_Parent(t *testing.T) {
+	tests := []struct {
+		name     string
+		ParentID string
+		want     string
+		wantErr  bool
+	}{
+		{
+			name:     "when there is no parent return empty string",
+			ParentID: "",
+			want:     "",
+		},
+		{
+			name:     "converts hex string correctly",
+			ParentID: "deadbeef",
+			want:     "3735928559",
+		},
+		{
+			name:     "errors when string isn't hex",
+			ParentID: "oxdeadbeef",
+			wantErr:  true,
+		},
+		{
+			name:     "errors when parent id is too long",
+			ParentID: "1234567890abcdef1",
+			wantErr:  true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &span{
+				ParentID: tt.ParentID,
+			}
+			got, err := s.Parent()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("span.Parent() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("span.Parent() = got(-)/want(+) %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
+
+func Test_span_Timestamp(t *testing.T) {
+	tests := []struct {
+		name string
+		Time *int64
+		want time.Time
+	}{
+		{
+			name: "converts to microseconds",
+			Time: func(i int64) *int64 { return &i }(3000000),
+			want: time.Unix(3, 0).UTC(),
+		},
+		{
+			name: "nil time should be zero time",
+			Time: nil,
+			want: time.Time{},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &span{
+				Time: tt.Time,
+			}
+			if got := s.Timestamp(); !cmp.Equal(tt.want, got) {
+				t.Errorf("span.Timestamp() = got(-)/want(+) %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
+
+func Test_span_Duration(t *testing.T) {
+	tests := []struct {
+		name string
+		dur  *int64
+		want time.Duration
+	}{
+		{
+			name: "converts from 3 microseconds",
+			dur:  func(i int64) *int64 { return &i }(3000000),
+			want: 3 * time.Second,
+		},
+		{
+			name: "nil time should be zero duration",
+			dur:  nil,
+			want: 0,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &span{
+				Dur: tt.dur,
+			}
+			if got := s.Duration(); got != tt.want {
+				t.Errorf("span.Duration() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_annotation(t *testing.T) {
+	type fields struct {
+		Endpoint *endpoint
+		Time     int64
+		Val      string
+	}
+	tests := []struct {
+		name     string
+		fields   fields
+		tm       time.Time
+		val      string
+		endpoint *endpoint
+	}{
+		{
+			name: "returns all fields",
+			fields: fields{
+				Time: 3000000,
+				Val:  "myvalue",
+				Endpoint: &endpoint{
+					ServiceName: "myservice",
+					Ipv4:        "127.0.0.1",
+					Port:        443,
+				},
+			},
+			tm:  time.Unix(3, 0).UTC(),
+			val: "myvalue",
+			endpoint: &endpoint{
+				ServiceName: "myservice",
+				Ipv4:        "127.0.0.1",
+				Port:        443,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			an := annotation(tt.fields)
+			a := &an
+			if got := a.Timestamp(); got != tt.tm {
+				t.Errorf("annotation.Timestamp() = %v, want %v", got, tt.tm)
+			}
+			if got := a.Value(); got != tt.val {
+				t.Errorf("annotation.Value() = %v, want %v", got, tt.val)
+			}
+			if got := a.Host(); !cmp.Equal(tt.endpoint, got) {
+				t.Errorf("annotation.Endpoint() = %v, want %v", got, tt.endpoint)
+			}
+		})
+	}
+}
+
+func Test_binaryAnnotation(t *testing.T) {
+	type fields struct {
+		K        string
+		V        json.RawMessage
+		Type     string
+		Endpoint *endpoint
+	}
+	tests := []struct {
+		name     string
+		fields   fields
+		key      string
+		value    string
+		endpoint *endpoint
+	}{
+		{
+			name: "returns all fields",
+			fields: fields{
+				K: "key",
+				V: json.RawMessage(`"value"`),
+				Endpoint: &endpoint{
+					ServiceName: "myservice",
+					Ipv4:        "127.0.0.1",
+					Port:        443,
+				},
+			},
+			key:   "key",
+			value: "value",
+			endpoint: &endpoint{
+				ServiceName: "myservice",
+				Ipv4:        "127.0.0.1",
+				Port:        443,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			bin := binaryAnnotation(tt.fields)
+			b := &bin
+			if got := b.Key(); got != tt.key {
+				t.Errorf("binaryAnnotation.Key() = %v, want %v", got, tt.key)
+			}
+			if got := b.Value(); got != tt.value {
+				t.Errorf("binaryAnnotation.Value() = %v, want %v", got, tt.value)
+			}
+			if got := b.Host(); !cmp.Equal(tt.endpoint, got) {
+				t.Errorf("binaryAnnotation.Endpoint() = %v, want %v", got, tt.endpoint)
+			}
+		})
+	}
+}
+
+func Test_endpoint_Host(t *testing.T) {
+	type fields struct {
+		Ipv4 string
+		Port int
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   string
+	}{
+		{
+			name: "with port",
+			fields: fields{
+				Ipv4: "127.0.0.1",
+				Port: 443,
+			},
+			want: "127.0.0.1:443",
+		},
+		{
+			name: "no port",
+			fields: fields{
+				Ipv4: "127.0.0.1",
+			},
+			want: "127.0.0.1",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := &endpoint{
+				Ipv4: tt.fields.Ipv4,
+				Port: tt.fields.Port,
+			}
+			if got := e.Host(); got != tt.want {
+				t.Errorf("endpoint.Host() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_endpoint_Name(t *testing.T) {
+	tests := []struct {
+		name        string
+		ServiceName string
+		want        string
+	}{
+		{
+			name:        "has service name",
+			ServiceName: "myservicename",
+			want:        "myservicename",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := &endpoint{
+				ServiceName: tt.ServiceName,
+			}
+			if got := e.Name(); got != tt.want {
+				t.Errorf("endpoint.Name() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestTraceIDFromString(t *testing.T) {
+	tests := []struct {
+		name    string
+		s       string
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "Convert hex string id",
+			s:    "6b221d5bc9e6496c",
+			want: "6b221d5bc9e6496c",
+		},
+		{
+			name:    "error : id too long",
+			s:       "1234567890abcdef1234567890abcdef1",
+			wantErr: true,
+		},
+		{
+			name:    "error : not parsable",
+			s:       "howdyhowdyhowdy",
+			wantErr: true,
+		},
+		{
+			name: "Convert hex string with high/low",
+			s:    "48485a3953bb61246b221d5bc9e6496c",
+			want: "48485a3953bb61246b221d5bc9e6496c",
+		},
+		{
+			name:    "errors in high",
+			s:       "ERR85a3953bb61246b221d5bc9e6496c",
+			wantErr: true,
+		},
+		{
+			name:    "errors in low",
+			s:       "48485a3953bb61246b221d5bc9e64ERR",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := TraceIDFromString(tt.s)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("TraceIDFromString() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("TraceIDFromString() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestIDFromString(t *testing.T) {
+	tests := []struct {
+		name    string
+		s       string
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "Convert hex string id",
+			s:    "6b221d5bc9e6496c",
+			want: "7719764991332993388",
+		},
+		{
+			name:    "error : id too long",
+			s:       "1234567890abcdef1",
+			wantErr: true,
+		},
+		{
+			name:    "error : not parsable",
+			s:       "howdyhowdyhowdy",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := IDFromString(tt.s)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("IDFromString() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("IDFromString() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift.go b/plugins/inputs/zipkin/codec/thrift/thrift.go
new file mode 100644
index 000000000..c2170e87a
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/thrift/thrift.go
@@ -0,0 +1,203 @@
+package thrift
+
+import (
+	"encoding/binary"
+	"fmt"
+	"net"
+	"strconv"
+	"time"
+
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
+
+	"github.com/apache/thrift/lib/go/thrift"
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+// UnmarshalThrift converts raw bytes in thrift format to a slice of spans
+func UnmarshalThrift(body []byte) ([]*zipkincore.Span, error) {
+	buffer := thrift.NewTMemoryBuffer()
+	if _, err := buffer.Write(body); err != nil {
+		return nil, err
+	}
+
+	transport := thrift.NewTBinaryProtocolTransport(buffer)
+	_, size, err := transport.ReadListBegin()
+	if err != nil {
+		return nil, err
+	}
+
+	spans := make([]*zipkincore.Span, size)
+	for i := 0; i < size; i++ {
+		zs := &zipkincore.Span{}
+		if err = zs.Read(transport); err != nil {
+			return nil, err
+		}
+		spans[i] = zs
+	}
+
+	if err = transport.ReadListEnd(); err != nil {
+		return nil, err
+	}
+	return spans, nil
+}
+
+// Thrift decodes binary data to create a Trace
+type Thrift struct{}
+
+// Decode unmarshals and validates bytes in thrift format
+func (t *Thrift) Decode(octets []byte) ([]codec.Span, error) {
+	spans, err := UnmarshalThrift(octets)
+	if err != nil {
+		return nil, err
+	}
+
+	res := make([]codec.Span, len(spans))
+	for i, s := range spans {
+		res[i] = &span{s}
+	}
+	return res, nil
+}
+
+var _ codec.Endpoint = &endpoint{}
+
+type endpoint struct {
+	*zipkincore.Endpoint
+}
+
+func (e *endpoint) Host() string {
+	ipv4 := func(addr int32) string {
+		buf := make([]byte, 4)
+		binary.BigEndian.PutUint32(buf, uint32(addr))
+		return net.IP(buf).String()
+	}
+
+	if e.Endpoint == nil {
+		return ipv4(int32(0))
+	}
+	if e.Endpoint.GetPort() == 0 {
+		return ipv4(e.Endpoint.GetIpv4())
+	}
+	// Zipkin uses a signed int16 for the port, but, warns us that they actually treat it
+	// as an unsigned int16. So, we convert from int16 to int32 followed by taking & 0xffff
+	// to convert from signed to unsigned
+	// https://github.com/openzipkin/zipkin/blob/57dc2ec9c65fe6144e401c0c933b4400463a69df/zipkin/src/main/java/zipkin/Endpoint.java#L44
+	return ipv4(e.Endpoint.GetIpv4()) + ":" + strconv.FormatInt(int64(int(e.Endpoint.GetPort())&0xffff), 10)
+}
+
+func (e *endpoint) Name() string {
+	if e.Endpoint == nil {
+		return codec.DefaultServiceName
+	}
+	return e.Endpoint.GetServiceName()
+}
+
+var _ codec.BinaryAnnotation = &binaryAnnotation{}
+
+type binaryAnnotation struct {
+	*zipkincore.BinaryAnnotation
+}
+
+func (b *binaryAnnotation) Key() string {
+	return b.BinaryAnnotation.GetKey()
+}
+
+func (b *binaryAnnotation) Value() string {
+	return string(b.BinaryAnnotation.GetValue())
+}
+
+func (b *binaryAnnotation) Host() codec.Endpoint {
+	if b.BinaryAnnotation.Host == nil {
+		return nil
+	}
+	return &endpoint{b.BinaryAnnotation.Host}
+}
+
+var _ codec.Annotation = &annotation{}
+
+type annotation struct {
+	*zipkincore.Annotation
+}
+
+func (a *annotation) Timestamp() time.Time {
+	ts := a.Annotation.GetTimestamp()
+	if ts == 0 {
+		return time.Time{}
+	}
+	return codec.MicroToTime(ts)
+}
+
+func (a *annotation) Value() string {
+	return a.Annotation.GetValue()
+}
+
+func (a *annotation) Host() codec.Endpoint {
+	if a.Annotation.Host == nil {
+		return nil
+	}
+	return &endpoint{a.Annotation.Host}
+}
+
+var _ codec.Span = &span{}
+
+type span struct {
+	*zipkincore.Span
+}
+
+func (s *span) Trace() (string, error) {
+	if s.Span.GetTraceIDHigh() == 0 && s.Span.GetTraceID() == 0 {
+		return "", fmt.Errorf("Span does not have a trace ID")
+	}
+
+	if s.Span.GetTraceIDHigh() == 0 {
+		return fmt.Sprintf("%x", s.Span.GetTraceID()), nil
+	}
+	return fmt.Sprintf("%x%016x", s.Span.GetTraceIDHigh(), s.Span.GetTraceID()), nil
+}
+
+func (s *span) SpanID() (string, error) {
+	return formatID(s.Span.GetID()), nil
+}
+
+func (s *span) Parent() (string, error) {
+	id := s.Span.GetParentID()
+	if id != 0 {
+		return formatID(id), nil
+	}
+	return "", nil
+}
+
+func (s *span) Name() string {
+	return s.Span.GetName()
+}
+
+func (s *span) Annotations() []codec.Annotation {
+	res := make([]codec.Annotation, len(s.Span.Annotations))
+	for i := range s.Span.Annotations {
+		res[i] = &annotation{s.Span.Annotations[i]}
+	}
+	return res
+}
+
+func (s *span) BinaryAnnotations() ([]codec.BinaryAnnotation, error) {
+	res := make([]codec.BinaryAnnotation, len(s.Span.BinaryAnnotations))
+	for i := range s.Span.BinaryAnnotations {
+		res[i] = &binaryAnnotation{s.Span.BinaryAnnotations[i]}
+	}
+	return res, nil
+}
+
+func (s *span) Timestamp() time.Time {
+	ts := s.Span.GetTimestamp()
+	if ts == 0 {
+		return time.Time{}
+	}
+	return codec.MicroToTime(ts)
+}
+
+func (s *span) Duration() time.Duration {
+	return time.Duration(s.Span.GetDuration()) * time.Microsecond
+}
+
+func formatID(id int64) string {
+	return strconv.FormatInt(id, 10)
+}
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift_test.go b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
new file mode 100644
index 000000000..4b239fdb3
--- /dev/null
+++ b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
@@ -0,0 +1,211 @@
+package thrift
+
+import (
+	"io/ioutil"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+
+	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+)
+
+func Test_endpointHost(t *testing.T) {
+	type args struct {
+		h *zipkincore.Endpoint
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Host Found",
+			args: args{
+				h: &zipkincore.Endpoint{
+					Ipv4: 1234,
+					Port: 8888,
+				},
+			},
+			want: "0.0.4.210:8888",
+		},
+		{
+			name: "No Host",
+			args: args{
+				h: nil,
+			},
+			want: "0.0.0.0",
+		},
+		{
+			name: "int overflow zipkin uses an int16 type as an unsigned int 16.",
+			args: args{
+				h: &zipkincore.Endpoint{
+					Ipv4: 1234,
+					Port: -1,
+				},
+			},
+			want: "0.0.4.210:65535",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := endpoint{tt.args.h}
+			if got := e.Host(); got != tt.want {
+				t.Errorf("host() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_endpointName(t *testing.T) {
+	type args struct {
+		h *zipkincore.Endpoint
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Found ServiceName",
+			args: args{
+				h: &zipkincore.Endpoint{
+					ServiceName: "zipkin",
+				},
+			},
+			want: "zipkin",
+		},
+		{
+			name: "No ServiceName",
+			args: args{
+				h: nil,
+			},
+			want: "unknown",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := endpoint{tt.args.h}
+			if got := e.Name(); got != tt.want {
+				t.Errorf("serviceName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestUnmarshalThrift(t *testing.T) {
+	addr := func(i int64) *int64 { return &i }
+	tests := []struct {
+		name     string
+		filename string
+		want     []*zipkincore.Span
+		wantErr  bool
+	}{
+		{
+			name:     "threespans",
+			filename: "../../testdata/threespans.dat",
+			want: []*zipkincore.Span{
+				{
+					TraceID:     2505404965370368069,
+					Name:        "Child",
+					ID:          8090652509916334619,
+					ParentID:    addr(22964302721410078),
+					Timestamp:   addr(1498688360851331),
+					Duration:    addr(53106),
+					Annotations: []*zipkincore.Annotation{},
+					BinaryAnnotations: []*zipkincore.BinaryAnnotation{
+						&zipkincore.BinaryAnnotation{
+							Key:            "lc",
+							AnnotationType: zipkincore.AnnotationType_STRING,
+							Value:          []byte("trivial"),
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+					},
+				},
+				{
+					TraceID:     2505404965370368069,
+					Name:        "Child",
+					ID:          103618986556047333,
+					ParentID:    addr(22964302721410078),
+					Timestamp:   addr(1498688360904552),
+					Duration:    addr(50410),
+					Annotations: []*zipkincore.Annotation{},
+					BinaryAnnotations: []*zipkincore.BinaryAnnotation{
+						&zipkincore.BinaryAnnotation{
+							Key:            "lc",
+							AnnotationType: zipkincore.AnnotationType_STRING,
+							Value:          []byte("trivial"),
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+					},
+				},
+				{
+					TraceID:   2505404965370368069,
+					Name:      "Parent",
+					ID:        22964302721410078,
+					Timestamp: addr(1498688360851318),
+					Duration:  addr(103680),
+					Annotations: []*zipkincore.Annotation{
+						&zipkincore.Annotation{
+							Timestamp: 1498688360851325,
+							Value:     "Starting child #0",
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+						&zipkincore.Annotation{
+							Timestamp: 1498688360904545,
+							Value:     "Starting child #1",
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+						&zipkincore.Annotation{
+							Timestamp: 1498688360954992,
+							Value:     "A Log",
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+					},
+					BinaryAnnotations: []*zipkincore.BinaryAnnotation{
+						&zipkincore.BinaryAnnotation{
+							Key:            "lc",
+							AnnotationType: zipkincore.AnnotationType_STRING,
+							Value:          []byte("trivial"),
+							Host: &zipkincore.Endpoint{
+								Ipv4:        2130706433,
+								ServiceName: "trivial",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dat, err := ioutil.ReadFile(tt.filename)
+			if err != nil {
+				t.Fatalf("Could not find file %s\n", tt.filename)
+			}
+
+			got, err := UnmarshalThrift(dat)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UnmarshalThrift() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !cmp.Equal(tt.want, got) {
+				t.Errorf("UnmarshalThrift() got(-)/want(+): %s", cmp.Diff(tt.want, got))
+			}
+		})
+	}
+}
diff --git a/plugins/inputs/zipkin/convert.go b/plugins/inputs/zipkin/convert.go
index dad099771..940c16a38 100644
--- a/plugins/inputs/zipkin/convert.go
+++ b/plugins/inputs/zipkin/convert.go
@@ -1,22 +1,10 @@
 package zipkin
 
 import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"strconv"
-	"time"
-
 	"github.com/influxdata/telegraf"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 )
 
-// DefaultServiceName when the span does not have any serviceName
-const DefaultServiceName = "unknown"
-
-//now is a moackable time for now
-var now = time.Now
-
 // LineProtocolConverter implements the Recorder interface; it is a
 // type meant to encapsulate the storage of zipkin tracing data in
 // telegraf as line protocol.
@@ -35,7 +23,7 @@ func NewLineProtocolConverter(acc telegraf.Accumulator) *LineProtocolConverter {
 // Record is LineProtocolConverter's implementation of the Record method of
 // the Recorder interface; it takes a trace as input, and adds it to an internal
 // telegraf.Accumulator.
-func (l *LineProtocolConverter) Record(t Trace) error {
+func (l *LineProtocolConverter) Record(t trace.Trace) error {
 	for _, s := range t {
 		fields := map[string]interface{}{
 			"duration_ns": s.Duration.Nanoseconds(),
@@ -83,167 +71,3 @@ func (l *LineProtocolConverter) Record(t Trace) error {
 func (l *LineProtocolConverter) Error(err error) {
 	l.acc.AddError(err)
 }
-
-// NewTrace converts a slice of []*zipkincore.Spans into a new Trace
-func NewTrace(spans []*zipkincore.Span) Trace {
-	trace := make(Trace, len(spans))
-	for i, span := range spans {
-		endpoint := serviceEndpoint(span.GetAnnotations(), span.GetBinaryAnnotations())
-		trace[i] = Span{
-			ID:                formatID(span.GetID()),
-			TraceID:           formatTraceID(span.GetTraceIDHigh(), span.GetTraceID()),
-			Name:              span.GetName(),
-			Timestamp:         guessTimestamp(span),
-			Duration:          convertDuration(span),
-			ParentID:          parentID(span),
-			ServiceName:       serviceName(endpoint),
-			Annotations:       NewAnnotations(span.GetAnnotations(), endpoint),
-			BinaryAnnotations: NewBinaryAnnotations(span.GetBinaryAnnotations(), endpoint),
-		}
-	}
-	return trace
-}
-
-// NewAnnotations converts a slice of *zipkincore.Annotation into a slice
-// of new Annotations
-func NewAnnotations(annotations []*zipkincore.Annotation, endpoint *zipkincore.Endpoint) []Annotation {
-	formatted := make([]Annotation, len(annotations))
-	for i, annotation := range annotations {
-		formatted[i] = Annotation{
-			Host:        host(endpoint),
-			ServiceName: serviceName(endpoint),
-			Timestamp:   microToTime(annotation.GetTimestamp()),
-			Value:       annotation.GetValue(),
-		}
-	}
-
-	return formatted
-}
-
-// NewBinaryAnnotations is very similar to NewAnnotations, but it
-// converts zipkincore.BinaryAnnotations instead of the normal zipkincore.Annotation
-func NewBinaryAnnotations(annotations []*zipkincore.BinaryAnnotation, endpoint *zipkincore.Endpoint) []BinaryAnnotation {
-	formatted := make([]BinaryAnnotation, len(annotations))
-	for i, annotation := range annotations {
-		formatted[i] = BinaryAnnotation{
-			Host:        host(endpoint),
-			ServiceName: serviceName(endpoint),
-			Key:         annotation.GetKey(),
-			Value:       string(annotation.GetValue()),
-			Type:        annotation.GetAnnotationType().String(),
-		}
-	}
-	return formatted
-}
-
-func microToTime(micro int64) time.Time {
-	return time.Unix(0, micro*int64(time.Microsecond)).UTC()
-}
-
-func formatID(id int64) string {
-	return strconv.FormatInt(id, 10)
-}
-
-func formatTraceID(high, low int64) string {
-	if high == 0 {
-		return fmt.Sprintf("%x", low)
-	}
-	return fmt.Sprintf("%x%016x", high, low)
-}
-
-func minMax(span *zipkincore.Span) (time.Time, time.Time) {
-	min := now().UTC()
-	max := time.Time{}.UTC()
-	for _, annotation := range span.Annotations {
-		ts := microToTime(annotation.GetTimestamp())
-		if !ts.IsZero() && ts.Before(min) {
-			min = ts
-		}
-		if !ts.IsZero() && ts.After(max) {
-			max = ts
-		}
-	}
-	if max.IsZero() {
-		max = min
-	}
-	return min, max
-}
-
-func guessTimestamp(span *zipkincore.Span) time.Time {
-	if span.GetTimestamp() != 0 {
-		return microToTime(span.GetTimestamp())
-	}
-	min, _ := minMax(span)
-	return min
-}
-
-func convertDuration(span *zipkincore.Span) time.Duration {
-	duration := time.Duration(span.GetDuration()) * time.Microsecond
-	if duration != 0 {
-		return duration
-	}
-	min, max := minMax(span)
-	return max.Sub(min)
-}
-
-func parentID(span *zipkincore.Span) string {
-	// A parent ID of 0 means that this is a parent span. In this case,
-	// we set the parent ID of the span to be its own id, so it points to
-	// itself.
-	id := span.GetParentID()
-	if id != 0 {
-		return formatID(id)
-	}
-	return formatID(span.ID)
-}
-
-func ipv4(addr int32) string {
-	buf := make([]byte, 4)
-	binary.BigEndian.PutUint32(buf, uint32(addr))
-	return net.IP(buf).String()
-}
-
-func host(h *zipkincore.Endpoint) string {
-	if h == nil {
-		return ipv4(int32(0))
-	}
-	if h.GetPort() == 0 {
-		return ipv4(h.GetIpv4())
-	}
-	// Zipkin uses a signed int16 for the port, but, warns us that they actually treat it
-	// as an unsigned int16. So, we convert from int16 to int32 followed by taking & 0xffff
-	// to convert from signed to unsigned
-	// https://github.com/openzipkin/zipkin/blob/57dc2ec9c65fe6144e401c0c933b4400463a69df/zipkin/src/main/java/zipkin/Endpoint.java#L44
-	return ipv4(h.GetIpv4()) + ":" + strconv.FormatInt(int64(int(h.GetPort())&0xffff), 10)
-}
-
-func serviceName(h *zipkincore.Endpoint) string {
-	if h == nil {
-		return DefaultServiceName
-	}
-	return h.GetServiceName()
-}
-
-func serviceEndpoint(ann []*zipkincore.Annotation, bann []*zipkincore.BinaryAnnotation) *zipkincore.Endpoint {
-	for _, a := range ann {
-		switch a.Value {
-		case zipkincore.SERVER_RECV, zipkincore.SERVER_SEND, zipkincore.CLIENT_RECV, zipkincore.CLIENT_SEND:
-			if a.Host != nil && a.Host.ServiceName != "" {
-				return a.Host
-			}
-		}
-	}
-
-	for _, a := range bann {
-		if a.Key == zipkincore.LOCAL_COMPONENT && a.Host != nil && a.Host.ServiceName != "" {
-			return a.Host
-		}
-	}
-	// Unable to find any "standard" endpoint host, so, use any that exist in the regular annotations
-	for _, a := range ann {
-		if a.Host != nil && a.Host.ServiceName != "" {
-			return a.Host
-		}
-	}
-	return nil
-}
diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go
index b5c543073..959012589 100644
--- a/plugins/inputs/zipkin/convert_test.go
+++ b/plugins/inputs/zipkin/convert_test.go
@@ -1,14 +1,13 @@
 package zipkin
 
 import (
-	"reflect"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
 )
 
 func TestLineProtocolConverter_Record(t *testing.T) {
@@ -17,7 +16,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 		acc telegraf.Accumulator
 	}
 	type args struct {
-		t Trace
+		t trace.Trace
 	}
 	tests := []struct {
 		name    string
@@ -32,8 +31,8 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 				acc: &mockAcc,
 			},
 			args: args{
-				t: Trace{
-					Span{
+				t: trace.Trace{
+					{
 						ID:          "8090652509916334619",
 						TraceID:     "2505404965370368069",
 						Name:        "Child",
@@ -41,18 +40,17 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						Timestamp:   time.Unix(0, 1498688360851331000).UTC(),
 						Duration:    time.Duration(53106) * time.Microsecond,
 						ServiceName: "trivial",
-						Annotations: []Annotation{},
-						BinaryAnnotations: []BinaryAnnotation{
-							BinaryAnnotation{
+						Annotations: []trace.Annotation{},
+						BinaryAnnotations: []trace.BinaryAnnotation{
+							{
 								Key:         "lc",
 								Value:       "dHJpdmlhbA==",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
-								Type:        "STRING",
 							},
 						},
 					},
-					Span{
+					{
 						ID:          "103618986556047333",
 						TraceID:     "2505404965370368069",
 						Name:        "Child",
@@ -60,18 +58,17 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						Timestamp:   time.Unix(0, 1498688360904552000).UTC(),
 						Duration:    time.Duration(50410) * time.Microsecond,
 						ServiceName: "trivial",
-						Annotations: []Annotation{},
-						BinaryAnnotations: []BinaryAnnotation{
-							BinaryAnnotation{
+						Annotations: []trace.Annotation{},
+						BinaryAnnotations: []trace.BinaryAnnotation{
+							{
 								Key:         "lc",
 								Value:       "dHJpdmlhbA==",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
-								Type:        "STRING",
 							},
 						},
 					},
-					Span{
+					{
 						ID:          "22964302721410078",
 						TraceID:     "2505404965370368069",
 						Name:        "Parent",
@@ -79,33 +76,32 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						Timestamp:   time.Unix(0, 1498688360851318000).UTC(),
 						Duration:    time.Duration(103680) * time.Microsecond,
 						ServiceName: "trivial",
-						Annotations: []Annotation{
-							Annotation{
+						Annotations: []trace.Annotation{
+							{
 								Timestamp:   time.Unix(0, 1498688360851325000).UTC(),
 								Value:       "Starting child #0",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
 							},
-							Annotation{
+							{
 								Timestamp:   time.Unix(0, 1498688360904545000).UTC(),
 								Value:       "Starting child #1",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
 							},
-							Annotation{
+							{
 								Timestamp:   time.Unix(0, 1498688360954992000).UTC(),
 								Value:       "A Log",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
 							},
 						},
-						BinaryAnnotations: []BinaryAnnotation{
-							BinaryAnnotation{
+						BinaryAnnotations: []trace.BinaryAnnotation{
+							{
 								Key:         "lc",
 								Value:       "dHJpdmlhbA==",
 								Host:        "2130706433:0",
 								ServiceName: "trivial",
-								Type:        "STRING",
 							},
 						},
 					},
@@ -265,8 +261,8 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 				acc: &mockAcc,
 			},
 			args: args{
-				t: Trace{
-					Span{
+				t: trace.Trace{
+					{
 						ID:          "6802735349851856000",
 						TraceID:     "0:6802735349851856000",
 						Name:        "main.dud",
@@ -274,15 +270,15 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						Timestamp:   time.Unix(1, 0).UTC(),
 						Duration:    1,
 						ServiceName: "trivial",
-						Annotations: []Annotation{
-							Annotation{
+						Annotations: []trace.Annotation{
+							{
 								Timestamp:   time.Unix(0, 1433330263415871000).UTC(),
 								Value:       "cs",
 								Host:        "0:9410",
 								ServiceName: "go-zipkin-testclient",
 							},
 						},
-						BinaryAnnotations: []BinaryAnnotation{},
+						BinaryAnnotations: []trace.BinaryAnnotation{},
 					},
 				},
 			},
@@ -339,206 +335,3 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 		})
 	}
 }
-
-func Test_microToTime(t *testing.T) {
-	type args struct {
-		micro int64
-	}
-	tests := []struct {
-		name string
-		args args
-		want time.Time
-	}{
-		{
-			name: "given zero micro seconds expected unix time zero",
-			args: args{
-				micro: 0,
-			},
-			want: time.Unix(0, 0).UTC(),
-		},
-		{
-			name: "given a million micro seconds expected unix time one",
-			args: args{
-				micro: 1000000,
-			},
-			want: time.Unix(1, 0).UTC(),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := microToTime(tt.args.micro); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("microToTime() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func newAnnotation(micro int64) *zipkincore.Annotation {
-	return &zipkincore.Annotation{
-		Timestamp: micro,
-	}
-}
-
-func Test_minMax(t *testing.T) {
-	type args struct {
-		span *zipkincore.Span
-	}
-	tests := []struct {
-		name    string
-		args    args
-		now     func() time.Time
-		wantMin time.Time
-		wantMax time.Time
-	}{
-		{
-			name: "Single annotation",
-			args: args{
-				span: &zipkincore.Span{
-					Annotations: []*zipkincore.Annotation{
-						newAnnotation(1000000),
-					},
-				},
-			},
-			wantMin: time.Unix(1, 0).UTC(),
-			wantMax: time.Unix(1, 0).UTC(),
-		},
-		{
-			name: "Three annotations",
-			args: args{
-				span: &zipkincore.Span{
-					Annotations: []*zipkincore.Annotation{
-						newAnnotation(1000000),
-						newAnnotation(2000000),
-						newAnnotation(3000000),
-					},
-				},
-			},
-			wantMin: time.Unix(1, 0).UTC(),
-			wantMax: time.Unix(3, 0).UTC(),
-		},
-		{
-			name: "Annotations are in the future",
-			args: args{
-				span: &zipkincore.Span{
-					Annotations: []*zipkincore.Annotation{
-						newAnnotation(3000000),
-					},
-				},
-			},
-			wantMin: time.Unix(2, 0).UTC(),
-			wantMax: time.Unix(3, 0).UTC(),
-			now: func() time.Time {
-				return time.Unix(2, 0).UTC()
-			},
-		},
-		{
-			name: "No Annotations",
-			args: args{
-				span: &zipkincore.Span{
-					Annotations: []*zipkincore.Annotation{},
-				},
-			},
-			wantMin: time.Unix(2, 0).UTC(),
-			wantMax: time.Unix(2, 0).UTC(),
-			now: func() time.Time {
-				return time.Unix(2, 0).UTC()
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.now != nil {
-				now = tt.now
-			}
-			got, got1 := minMax(tt.args.span)
-			if !reflect.DeepEqual(got, tt.wantMin) {
-				t.Errorf("minMax() got = %v, want %v", got, tt.wantMin)
-			}
-			if !reflect.DeepEqual(got1, tt.wantMax) {
-				t.Errorf("minMax() got1 = %v, want %v", got1, tt.wantMax)
-			}
-			now = time.Now
-		})
-	}
-}
-
-func Test_host(t *testing.T) {
-	type args struct {
-		h *zipkincore.Endpoint
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "Host Found",
-			args: args{
-				h: &zipkincore.Endpoint{
-					Ipv4: 1234,
-					Port: 8888,
-				},
-			},
-			want: "0.0.4.210:8888",
-		},
-		{
-			name: "No Host",
-			args: args{
-				h: nil,
-			},
-			want: "0.0.0.0",
-		},
-		{
-			name: "int overflow zipkin uses an int16 type as an unsigned int 16.",
-			args: args{
-				h: &zipkincore.Endpoint{
-					Ipv4: 1234,
-					Port: -1,
-				},
-			},
-			want: "0.0.4.210:65535",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := host(tt.args.h); got != tt.want {
-				t.Errorf("host() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_serviceName(t *testing.T) {
-	type args struct {
-		h *zipkincore.Endpoint
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "Found ServiceName",
-			args: args{
-				h: &zipkincore.Endpoint{
-					ServiceName: "zipkin",
-				},
-			},
-			want: "zipkin",
-		},
-		{
-			name: "No ServiceName",
-			args: args{
-				h: nil,
-			},
-			want: "unknown",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := serviceName(tt.args.h); got != tt.want {
-				t.Errorf("serviceName() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/plugins/inputs/zipkin/handler.go b/plugins/inputs/zipkin/handler.go
index d9bd07828..24e7ac12f 100644
--- a/plugins/inputs/zipkin/handler.go
+++ b/plugins/inputs/zipkin/handler.go
@@ -2,22 +2,23 @@ package zipkin
 
 import (
 	"compress/gzip"
+	"fmt"
 	"io/ioutil"
+	"mime"
 	"net/http"
 	"strings"
-	"sync"
 
-	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/gorilla/mux"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec/jsonV1"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec/thrift"
 )
 
 // SpanHandler is an implementation of a Handler which accepts zipkin thrift
 // span data and sends it to the recorder
 type SpanHandler struct {
-	Path      string
-	recorder  Recorder
-	waitGroup *sync.WaitGroup
+	Path     string
+	recorder Recorder
 }
 
 // NewSpanHandler returns a new server instance given path to handle
@@ -81,6 +82,12 @@ func (s *SpanHandler) Spans(w http.ResponseWriter, r *http.Request) {
 		defer body.Close()
 	}
 
+	decoder, err := ContentDecoder(r)
+	if err != nil {
+		s.recorder.Error(err)
+		w.WriteHeader(http.StatusUnsupportedMediaType)
+	}
+
 	octets, err := ioutil.ReadAll(body)
 	if err != nil {
 		s.recorder.Error(err)
@@ -88,14 +95,19 @@ func (s *SpanHandler) Spans(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	spans, err := unmarshalThrift(octets)
+	spans, err := decoder.Decode(octets)
 	if err != nil {
 		s.recorder.Error(err)
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	trace := NewTrace(spans)
+	trace, err := codec.NewTrace(spans)
+	if err != nil {
+		s.recorder.Error(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
 
 	if err = s.recorder.Record(trace); err != nil {
 		s.recorder.Error(err)
@@ -106,30 +118,25 @@ func (s *SpanHandler) Spans(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusNoContent)
 }
 
-func unmarshalThrift(body []byte) ([]*zipkincore.Span, error) {
-	buffer := thrift.NewTMemoryBuffer()
-	if _, err := buffer.Write(body); err != nil {
-		return nil, err
+// ContentDecoer returns a Decoder that is able to produce Traces from bytes.
+// Failure should yield an HTTP 415 (`http.StatusUnsupportedMediaType`)
+// If a Content-Type is not set, zipkin assumes application/json
+func ContentDecoder(r *http.Request) (codec.Decoder, error) {
+	contentType := r.Header.Get("Content-Type")
+	if contentType == "" {
+		return &jsonV1.JSON{}, nil
 	}
 
-	transport := thrift.NewTBinaryProtocolTransport(buffer)
-	_, size, err := transport.ReadListBegin()
-	if err != nil {
-		return nil, err
-	}
-
-	spans := make([]*zipkincore.Span, size)
-	for i := 0; i < size; i++ {
-		zs := &zipkincore.Span{}
-		if err = zs.Read(transport); err != nil {
-			return nil, err
+	for _, v := range strings.Split(contentType, ",") {
+		t, _, err := mime.ParseMediaType(v)
+		if err != nil {
+			break
+		}
+		if t == "application/json" {
+			return &jsonV1.JSON{}, nil
+		} else if t == "application/x-thrift" {
+			return &thrift.Thrift{}, nil
 		}
-		spans[i] = zs
 	}
-
-	if err = transport.ReadListEnd(); err != nil {
-		return nil, err
-	}
-
-	return spans, nil
+	return nil, fmt.Errorf("Unknown Content-Type: %s", contentType)
 }
diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go
index 0946d982f..606a8da97 100644
--- a/plugins/inputs/zipkin/handler_test.go
+++ b/plugins/inputs/zipkin/handler_test.go
@@ -10,14 +10,15 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 )
 
 type MockRecorder struct {
-	Data Trace
+	Data trace.Trace
 	Err  error
 }
 
-func (m *MockRecorder) Record(t Trace) error {
+func (m *MockRecorder) Record(t trace.Trace) error {
 	m.Data = t
 	return nil
 }
@@ -39,6 +40,7 @@ func TestSpanHandler(t *testing.T) {
 		ioutil.NopCloser(
 			bytes.NewReader(dat)))
 
+	r.Header.Set("Content-Type", "application/x-thrift")
 	handler := NewSpanHandler("/api/v1/spans")
 	mockRecorder := &MockRecorder{}
 	handler.recorder = mockRecorder
@@ -51,8 +53,8 @@ func TestSpanHandler(t *testing.T) {
 	got := mockRecorder.Data
 
 	parentID := strconv.FormatInt(22964302721410078, 10)
-	want := Trace{
-		Span{
+	want := trace.Trace{
+		{
 			Name:        "Child",
 			ID:          "8090652509916334619",
 			TraceID:     "22c4fc8ab3669045",
@@ -60,18 +62,17 @@ func TestSpanHandler(t *testing.T) {
 			Timestamp:   time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(),
 			Duration:    time.Duration(53106) * time.Microsecond,
 			ServiceName: "trivial",
-			Annotations: []Annotation{},
-			BinaryAnnotations: []BinaryAnnotation{
-				BinaryAnnotation{
+			Annotations: []trace.Annotation{},
+			BinaryAnnotations: []trace.BinaryAnnotation{
+				{
 					Key:         "lc",
 					Value:       "trivial",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
-					Type:        "STRING",
 				},
 			},
 		},
-		Span{
+		{
 			Name:        "Child",
 			ID:          "103618986556047333",
 			TraceID:     "22c4fc8ab3669045",
@@ -79,18 +80,17 @@ func TestSpanHandler(t *testing.T) {
 			Timestamp:   time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(),
 			Duration:    time.Duration(50410) * time.Microsecond,
 			ServiceName: "trivial",
-			Annotations: []Annotation{},
-			BinaryAnnotations: []BinaryAnnotation{
-				BinaryAnnotation{
+			Annotations: []trace.Annotation{},
+			BinaryAnnotations: []trace.BinaryAnnotation{
+				{
 					Key:         "lc",
 					Value:       "trivial",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
-					Type:        "STRING",
 				},
 			},
 		},
-		Span{
+		{
 			Name:        "Parent",
 			ID:          "22964302721410078",
 			TraceID:     "22c4fc8ab3669045",
@@ -98,33 +98,32 @@ func TestSpanHandler(t *testing.T) {
 			Timestamp:   time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(),
 			Duration:    time.Duration(103680) * time.Microsecond,
 			ServiceName: "trivial",
-			Annotations: []Annotation{
-				Annotation{
+			Annotations: []trace.Annotation{
+				{
 					Timestamp:   time.Unix(0, 1498688360851325*int64(time.Microsecond)).UTC(),
 					Value:       "Starting child #0",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
 				},
-				Annotation{
+				{
 					Timestamp:   time.Unix(0, 1498688360904545*int64(time.Microsecond)).UTC(),
 					Value:       "Starting child #1",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
 				},
-				Annotation{
+				{
 					Timestamp:   time.Unix(0, 1498688360954992*int64(time.Microsecond)).UTC(),
 					Value:       "A Log",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
 				},
 			},
-			BinaryAnnotations: []BinaryAnnotation{
-				BinaryAnnotation{
+			BinaryAnnotations: []trace.BinaryAnnotation{
+				{
 					Key:         "lc",
 					Value:       "trivial",
 					Host:        "127.0.0.1",
 					ServiceName: "trivial",
-					Type:        "STRING",
 				},
 			},
 		},
diff --git a/plugins/inputs/zipkin/testdata/json/brave-tracer-example.json b/plugins/inputs/zipkin/testdata/json/brave-tracer-example.json
new file mode 100644
index 000000000..58eb10c17
--- /dev/null
+++ b/plugins/inputs/zipkin/testdata/json/brave-tracer-example.json
@@ -0,0 +1,188 @@
+[
+  {
+    "traceId": "7312f822d43d0fd8",
+    "id": "b26412d1ac16767d",
+    "name": "http:/hi2",
+    "parentId": "7312f822d43d0fd8",
+    "annotations": [
+      {
+        "timestamp": 1503031538791000,
+        "value": "sr",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "timestamp": 1503031538794000,
+        "value": "ss",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ],
+    "binaryAnnotations": [
+      {
+        "key": "mvc.controller.class",
+        "value": "Demo2Application",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "mvc.controller.method",
+        "value": "hi2",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "spring.instance_id",
+        "value": "192.168.0.8:test:8010",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ]
+  },
+  {
+    "traceId": "7312f822d43d0fd8",
+    "id": "b26412d1ac16767d",
+    "name": "http:/hi2",
+    "parentId": "7312f822d43d0fd8",
+    "timestamp": 1503031538786000,
+    "duration": 10000,
+    "annotations": [
+      {
+        "timestamp": 1503031538786000,
+        "value": "cs",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "timestamp": 1503031538796000,
+        "value": "cr",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ],
+    "binaryAnnotations": [
+      {
+        "key": "http.host",
+        "value": "localhost",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "http.method",
+        "value": "GET",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "http.path",
+        "value": "/hi2",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "http.url",
+        "value": "http://localhost:8010/hi2",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "spring.instance_id",
+        "value": "192.168.0.8:test:8010",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ]
+  },
+  {
+    "traceId": "7312f822d43d0fd8",
+    "id": "7312f822d43d0fd8",
+    "name": "http:/hi",
+    "timestamp": 1503031538778000,
+    "duration": 23393,
+    "annotations": [
+      {
+        "timestamp": 1503031538778000,
+        "value": "sr",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "timestamp": 1503031538801000,
+        "value": "ss",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ],
+    "binaryAnnotations": [
+      {
+        "key": "mvc.controller.class",
+        "value": "Demo2Application",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "mvc.controller.method",
+        "value": "hi",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      },
+      {
+        "key": "spring.instance_id",
+        "value": "192.168.0.8:test:8010",
+        "endpoint": {
+          "serviceName": "test",
+          "ipv4": "192.168.0.8",
+          "port": 8010
+        }
+      }
+    ]
+  }
+]
diff --git a/plugins/inputs/zipkin/trace/trace.go b/plugins/inputs/zipkin/trace/trace.go
new file mode 100644
index 000000000..2a3ec2eb1
--- /dev/null
+++ b/plugins/inputs/zipkin/trace/trace.go
@@ -0,0 +1,41 @@
+package trace
+
+import (
+	"time"
+)
+
+// Trace is an array (or a series) of spans
+type Trace []Span
+
+//Span represents a specific zipkin span. It holds the majority of the same
+// data as a zipkin span sent via the thrift protocol, but is presented in a
+// format which is more straightforward for storage purposes.
+type Span struct {
+	ID                string
+	TraceID           string // zipkin traceid high concat with traceid
+	Name              string
+	ParentID          string
+	ServiceName       string
+	Timestamp         time.Time // If zipkin input is nil then time.Now()
+	Duration          time.Duration
+	Annotations       []Annotation
+	BinaryAnnotations []BinaryAnnotation
+}
+
+// BinaryAnnotation represents a zipkin binary annotation. It contains
+// all of the same fields as might be found in its zipkin counterpart.
+type BinaryAnnotation struct {
+	Key         string
+	Value       string
+	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
+	ServiceName string
+}
+
+// Annotation represents an ordinary zipkin annotation. It contains the data fields
+// which will become fields/tags in influxdb
+type Annotation struct {
+	Timestamp   time.Time
+	Value       string
+	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
+	ServiceName string
+}
diff --git a/plugins/inputs/zipkin/zipkin.go b/plugins/inputs/zipkin/zipkin.go
index 597ae0b27..02d82fac0 100644
--- a/plugins/inputs/zipkin/zipkin.go
+++ b/plugins/inputs/zipkin/zipkin.go
@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"strconv"
 	"sync"
-	"time"
 
 	"github.com/gorilla/mux"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 )
 
 const (
@@ -32,7 +32,7 @@ const (
 // Recorder represents a type which can record zipkin trace data as well as
 // any accompanying errors, and process that data.
 type Recorder interface {
-	Record(Trace) error
+	Record(trace.Trace) error
 	Error(error)
 }
 
@@ -42,43 +42,6 @@ type Handler interface {
 	Register(router *mux.Router, recorder Recorder) error
 }
 
-// BinaryAnnotation represents a zipkin binary annotation. It contains
-// all of the same fields as might be found in its zipkin counterpart.
-type BinaryAnnotation struct {
-	Key         string
-	Value       string
-	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
-	ServiceName string
-	Type        string
-}
-
-// Annotation represents an ordinary zipkin annotation. It contains the data fields
-// which will become fields/tags in influxdb
-type Annotation struct {
-	Timestamp   time.Time
-	Value       string
-	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
-	ServiceName string
-}
-
-//Span represents a specific zipkin span. It holds the majority of the same
-// data as a zipkin span sent via the thrift protocol, but is presented in a
-// format which is more straightforward for storage purposes.
-type Span struct {
-	ID                string
-	TraceID           string // zipkin traceid high concat with traceid
-	Name              string
-	ParentID          string
-	ServiceName       string
-	Timestamp         time.Time // If zipkin input is nil then time.Now()
-	Duration          time.Duration
-	Annotations       []Annotation
-	BinaryAnnotations []BinaryAnnotation
-}
-
-// Trace is an array (or a series) of spans
-type Trace []Span
-
 const sampleConfig = `
   # path = "/api/v1/spans" # URL path for span data
   # port = 9411            # Port on which Telegraf listens
@@ -122,7 +85,9 @@ func (z *Zipkin) Start(acc telegraf.Accumulator) error {
 
 	router := mux.NewRouter()
 	converter := NewLineProtocolConverter(acc)
-	z.handler.Register(router, converter)
+	if err := z.handler.Register(router, converter); err != nil {
+		return err
+	}
 
 	z.server = &http.Server{
 		Handler: router,
diff --git a/plugins/inputs/zipkin/zipkin_test.go b/plugins/inputs/zipkin/zipkin_test.go
index 9447e67d4..e07eca0cf 100644
--- a/plugins/inputs/zipkin/zipkin_test.go
+++ b/plugins/inputs/zipkin/zipkin_test.go
@@ -16,14 +16,16 @@ func TestZipkinPlugin(t *testing.T) {
 	mockAcc := testutil.Accumulator{}
 
 	tests := []struct {
-		name           string
-		thriftDataFile string //path name to a binary thrift data file which contains test data
-		wantErr        bool
-		want           []testutil.Metric
+		name        string
+		datafile    string // data file which contains test data
+		contentType string
+		wantErr     bool
+		want        []testutil.Metric
 	}{
 		{
-			name:           "threespan",
-			thriftDataFile: "testdata/threespans.dat",
+			name:        "threespan",
+			datafile:    "testdata/threespans.dat",
+			contentType: "application/x-thrift",
 			want: []testutil.Metric{
 				testutil.Metric{
 					Measurement: "zipkin",
@@ -170,8 +172,9 @@ func TestZipkinPlugin(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name:           "distributed_trace_sample",
-			thriftDataFile: "testdata/distributed_trace_sample.dat",
+			name:        "distributed_trace_sample",
+			datafile:    "testdata/distributed_trace_sample.dat",
+			contentType: "application/x-thrift",
 			want: []testutil.Metric{
 				testutil.Metric{
 					Measurement: "zipkin",
@@ -185,7 +188,6 @@ func TestZipkinPlugin(t *testing.T) {
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(1) * time.Microsecond).Nanoseconds(),
 					},
-					//Time: time.Unix(1, 0).UTC(),
 					Time: time.Unix(0, 1433330263415871*int64(time.Microsecond)).UTC(),
 				},
 				testutil.Metric{
@@ -202,7 +204,6 @@ func TestZipkinPlugin(t *testing.T) {
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(1) * time.Microsecond).Nanoseconds(),
 					},
-					//Time: time.Unix(1, 0).UTC(),
 					Time: time.Unix(0, 1433330263415871*int64(time.Microsecond)).UTC(),
 				},
 				testutil.Metric{
@@ -223,6 +224,337 @@ func TestZipkinPlugin(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:        "JSON rather than thrift",
+			datafile:    "testdata/json/brave-tracer-example.json",
+			contentType: "application/json",
+			want: []testutil.Metric{
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "12854419928166856317",
+						"name":         "http:/hi2",
+						"parent_id":    "8291962692415852504",
+						"service_name": "test",
+						"trace_id":     "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					}, Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "sr",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "12854419928166856317",
+						"name":          "http:/hi2",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					},
+					Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "ss",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "12854419928166856317",
+						"name":          "http:/hi2",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					},
+					Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "Demo2Application",
+						"annotation_key": "mvc.controller.class",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					},
+					Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "hi2",
+						"annotation_key": "mvc.controller.method",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					},
+					Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "192.168.0.8:test:8010",
+						"annotation_key": "spring.instance_id",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(3000000),
+					},
+					Time: time.Unix(0, 1503031538791000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "12854419928166856317",
+						"name":         "http:/hi2",
+						"parent_id":    "8291962692415852504",
+						"service_name": "test",
+						"trace_id":     "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "cs",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "12854419928166856317",
+						"name":          "http:/hi2",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "cr",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "12854419928166856317",
+						"name":          "http:/hi2",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "localhost",
+						"annotation_key": "http.host",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "GET",
+						"annotation_key": "http.method",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "/hi2",
+						"annotation_key": "http.path",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "http://localhost:8010/hi2",
+						"annotation_key": "http.url",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "192.168.0.8:test:8010",
+						"annotation_key": "spring.instance_id",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "12854419928166856317",
+						"name":           "http:/hi2",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(10000000),
+					},
+					Time: time.Unix(0, 1503031538786000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"id":           "8291962692415852504",
+						"name":         "http:/hi",
+						"parent_id":    "8291962692415852504",
+						"service_name": "test",
+						"trace_id":     "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+				{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "sr",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "8291962692415852504",
+						"name":          "http:/hi",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":    "ss",
+						"endpoint_host": "192.168.0.8:8010",
+						"id":            "8291962692415852504",
+						"name":          "http:/hi",
+						"parent_id":     "8291962692415852504",
+						"service_name":  "test",
+						"trace_id":      "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "Demo2Application",
+						"annotation_key": "mvc.controller.class",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "8291962692415852504",
+						"name":           "http:/hi",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "hi",
+						"annotation_key": "mvc.controller.method",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "8291962692415852504",
+						"name":           "http:/hi",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+				testutil.Metric{
+					Measurement: "zipkin",
+					Tags: map[string]string{
+						"annotation":     "192.168.0.8:test:8010",
+						"annotation_key": "spring.instance_id",
+						"endpoint_host":  "192.168.0.8:8010",
+						"id":             "8291962692415852504",
+						"name":           "http:/hi",
+						"parent_id":      "8291962692415852504",
+						"service_name":   "test",
+						"trace_id":       "7312f822d43d0fd8",
+					},
+					Fields: map[string]interface{}{
+						"duration_ns": int64(23393000),
+					},
+					Time: time.Unix(0, 1503031538778000*int64(time.Microsecond)).UTC(),
+				},
+			},
+		},
 	}
 
 	z := &Zipkin{
@@ -240,7 +572,7 @@ func TestZipkinPlugin(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockAcc.ClearMetrics()
-			if err := postThriftData(tt.thriftDataFile, z.address); err != nil {
+			if err := postThriftData(tt.datafile, z.address, tt.contentType); err != nil {
 				t.Fatalf("Posting data to http endpoint /api/v1/spans failed. Error: %s\n", err)
 			}
 			mockAcc.Wait(len(tt.want)) //Since the server is running concurrently, we need to wait for the number of data points we want to test to be added to the Accumulator.
@@ -252,7 +584,6 @@ func TestZipkinPlugin(t *testing.T) {
 			for _, m := range mockAcc.Metrics {
 				got = append(got, *m)
 			}
-
 			if !cmp.Equal(tt.want, got) {
 				t.Fatalf("Got != Want\n %s", cmp.Diff(tt.want, got))
 			}
@@ -266,19 +597,18 @@ func TestZipkinPlugin(t *testing.T) {
 	}
 }
 
-func postThriftData(datafile, address string) error {
+func postThriftData(datafile, address, contentType string) error {
 	dat, err := ioutil.ReadFile(datafile)
 	if err != nil {
 		return fmt.Errorf("could not read from data file %s", datafile)
 	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf("http://%s/api/v1/spans", address), bytes.NewReader(dat))
-
 	if err != nil {
 		return fmt.Errorf("HTTP request creation failed")
 	}
 
-	req.Header.Set("Content-Type", "application/x-thrift")
+	req.Header.Set("Content-Type", contentType)
 	client := &http.Client{}
 	_, err = client.Do(req)
 	if err != nil {

From ccf17a9f932820aceb57c82770cf4fb67a37a7bb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 Aug 2017 14:44:53 -0700
Subject: [PATCH 0476/1302] Cache intermediate objects during build

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a82048b6b..bf4c8dfec 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ deps:
 	gdm restore
 
 telegraf:
-	go build -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
+	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
 
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf

From b48002233075f4c86ca420ca46c60b1575209e15 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 Aug 2017 11:31:07 -0700
Subject: [PATCH 0477/1302] Update config directory documentation

---
 docs/CONFIGURATION.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 364fb216c..d2cffbe07 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -27,8 +27,11 @@ for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
 ## Configuration file locations
 
 The location of the configuration file can be set via the `--config` command
-line flag. Telegraf will also pick up all files matching the pattern `*.conf` if
-the `-config-directory` command line flag is used.
+line flag.
+
+When the `--config-directory` command line flag is used files ending with
+`.conf` in the specified directory will also be included in the Telegraf
+configuration.
 
 On most systems, the default locations are `/etc/telegraf/telegraf.conf` for
 the main configuration file and `/etc/telegraf/telegraf.d` for the directory of

From 53c5d3a290ba02a6caa659d99073c4de3c7007bf Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Tue, 22 Aug 2017 20:49:51 +0200
Subject: [PATCH 0478/1302] Enable chrony for all platforms (#3152)

---
 plugins/inputs/chrony/chrony.go          | 2 --
 plugins/inputs/chrony/chrony_notlinux.go | 3 ---
 plugins/inputs/chrony/chrony_test.go     | 2 --
 3 files changed, 7 deletions(-)
 delete mode 100644 plugins/inputs/chrony/chrony_notlinux.go

diff --git a/plugins/inputs/chrony/chrony.go b/plugins/inputs/chrony/chrony.go
index 94285d249..6173357cf 100644
--- a/plugins/inputs/chrony/chrony.go
+++ b/plugins/inputs/chrony/chrony.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package chrony
 
 import (
diff --git a/plugins/inputs/chrony/chrony_notlinux.go b/plugins/inputs/chrony/chrony_notlinux.go
deleted file mode 100644
index 5a29cc858..000000000
--- a/plugins/inputs/chrony/chrony_notlinux.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package chrony
diff --git a/plugins/inputs/chrony/chrony_test.go b/plugins/inputs/chrony/chrony_test.go
index 28633cd0c..a5fd9dd02 100644
--- a/plugins/inputs/chrony/chrony_test.go
+++ b/plugins/inputs/chrony/chrony_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package chrony
 
 import (

From 371638ce56965f43c83590b632cd0ac7c80aa045 Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Tue, 22 Aug 2017 21:58:00 +0200
Subject: [PATCH 0479/1302] Enable fail2ban on all platforms (#3151)

---
 plugins/inputs/fail2ban/fail2ban.go         | 2 --
 plugins/inputs/fail2ban/fail2ban_nolinux.go | 3 ---
 2 files changed, 5 deletions(-)
 delete mode 100644 plugins/inputs/fail2ban/fail2ban_nolinux.go

diff --git a/plugins/inputs/fail2ban/fail2ban.go b/plugins/inputs/fail2ban/fail2ban.go
index 8ecad3b52..54655357f 100644
--- a/plugins/inputs/fail2ban/fail2ban.go
+++ b/plugins/inputs/fail2ban/fail2ban.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fail2ban
 
 import (
diff --git a/plugins/inputs/fail2ban/fail2ban_nolinux.go b/plugins/inputs/fail2ban/fail2ban_nolinux.go
deleted file mode 100644
index e62efa5b1..000000000
--- a/plugins/inputs/fail2ban/fail2ban_nolinux.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package fail2ban

From 5224b526f4a97fff1ad7964ae179754c1fb7b88b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 Aug 2017 13:32:52 -0700
Subject: [PATCH 0480/1302] Hide output of git describe

---
 scripts/circle-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index b05fa7420..eb2df00e3 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -69,7 +69,7 @@ exit_if_fail ./telegraf -config $tmpdir/config.toml \
 
 gzip telegraf -c > "$CIRCLE_ARTIFACTS/telegraf.gz"
 
-if git describe --exact-match HEAD; then
+if git describe --exact-match HEAD 2>&1 >/dev/null; then
     # install fpm (packaging dependency)
     exit_if_fail gem install fpm
     # install boto & rpm (packaging & AWS dependencies)

From 1f4a997164a29dae2932a0f38f88dceb7ab000f3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 22 Aug 2017 16:52:26 -0700
Subject: [PATCH 0481/1302] Don't retry points beyond retention policy (#3155)

---
 plugins/outputs/influxdb/influxdb.go      |  28 ++++-
 plugins/outputs/influxdb/influxdb_test.go | 119 ++++++++++++++++++----
 2 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 23f567820..b4567af99 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -88,7 +88,7 @@ var sampleConfig = `
 
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
-  
+
   ## Compress each HTTP request payload using GZIP.
   # content_encoding = "gzip"
 `
@@ -199,6 +199,7 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 						i.Database)
 				}
 			}
+
 			if strings.Contains(e.Error(), "field type conflict") {
 				log.Printf("E! Field type conflict, dropping conflicted points: %s", e)
 				// setting err to nil, otherwise we will keep retrying and points
@@ -206,6 +207,31 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 				err = nil
 				break
 			}
+
+			if strings.Contains(e.Error(), "points beyond retention policy") {
+				log.Printf("W! Points beyond retention policy: %s", e)
+				// This error is indicates the point is older than the
+				// retention policy permits, and is probably not a cause for
+				// concern.  Retrying will not help unless the retention
+				// policy is modified.
+				err = nil
+				break
+			}
+
+			if strings.Contains(e.Error(), "unable to parse") {
+				log.Printf("E! Parse error; dropping points: %s", e)
+				// This error indicates a bug in Telegraf or InfluxDB parsing
+				// of line protocol.  Retries will not be successful.
+				err = nil
+				break
+			}
+
+			if strings.Contains(e.Error(), "hinted handoff queue not empty") {
+				// This is an informational message
+				err = nil
+				break
+			}
+
 			// Log write failure
 			log.Printf("E! InfluxDB Output Error: %s", e)
 		} else {
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 5dfa63c66..50c86125d 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -178,28 +178,107 @@ func TestHTTPError_DatabaseNotFound(t *testing.T) {
 	require.NoError(t, i.Close())
 }
 
-// field type conflict does not return an error, instead we
-func TestHTTPError_FieldTypeConflict(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusNotFound)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}],"error":"field type conflict: input field \"value\" on measurement \"test\" is type integer, already exists as type float dropped=1"}`)
-		}
-	}))
-	defer ts.Close()
-
-	i := InfluxDB{
-		URLs:     []string{ts.URL},
-		Database: "test",
+func TestHTTPError_WriteErrors(t *testing.T) {
+	var testCases = []struct {
+		name        string
+		status      int
+		contentType string
+		body        string
+		err         error
+	}{
+		{
+			// HTTP/1.1 400 Bad Request
+			// Content-Type: application/json
+			// X-Influxdb-Version: 1.3.3
+			//
+			// {
+			//     "error": "partial write: points beyond retention policy dropped=1"
+			// }
+			name:        "beyond retention policy is not an error",
+			status:      http.StatusBadRequest,
+			contentType: "application/json",
+			body:        `{"error":"partial write: points beyond retention policy dropped=1"}`,
+			err:         nil,
+		},
+		{
+			// HTTP/1.1 400 Bad Request
+			// Content-Type: application/json
+			// X-Influxdb-Version: 1.3.3
+			//
+			// {
+			//     "error": "unable to parse 'foo bar=': missing field value"
+			// }
+			name:        "unable to parse is not an error",
+			status:      http.StatusBadRequest,
+			contentType: "application/json",
+			body:        `{"error":"unable to parse 'foo bar=': missing field value"}`,
+			err:         nil,
+		},
+		{
+			// HTTP/1.1 400 Bad Request
+			// Content-Type: application/json
+			// X-Influxdb-Version: 1.3.3
+			//
+			// {
+			//     "error": "partial write: field type conflict: input field \"bar\" on measurement \"foo\" is type float, already exists as type integer dropped=1"
+			// }
+			name:        "field type conflict is not an error",
+			status:      http.StatusBadRequest,
+			contentType: "application/json",
+			body:        `{"error": "partial write: field type conflict: input field \"bar\" on measurement \"foo\" is type float, already exists as type integer dropped=1"}`,
+			err:         nil,
+		},
+		{
+			// HTTP/1.1 500 Internal Server Error
+			// Content-Type: application/json
+			// X-Influxdb-Version: 1.3.3-c1.3.3
+			//
+			// {
+			//     "error": "write failed: hinted handoff queue not empty"
+			// }
+			name:        "hinted handoff queue not empty is not an error",
+			status:      http.StatusInternalServerError,
+			contentType: "application/json",
+			body:        `{"error":"write failed: hinted handoff queue not empty"}`,
+			err:         nil,
+		},
+		{
+			// HTTP/1.1 500 Internal Server Error
+			// Content-Type: application/json
+			// X-Influxdb-Version: 1.3.3-c1.3.3
+			//
+			// {
+			//     "error": "partial write"
+			// }
+			name:        "plain partial write is an error",
+			status:      http.StatusInternalServerError,
+			contentType: "application/json",
+			body:        `{"error":"partial write"}`,
+			err:         fmt.Errorf("Could not write to any InfluxDB server in cluster"),
+		},
 	}
 
-	err := i.Connect()
-	require.NoError(t, err)
-	err = i.Write(testutil.MockMetrics())
-	require.NoError(t, err)
-	require.NoError(t, i.Close())
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+				rw.WriteHeader(tt.status)
+				rw.Header().Set("Content-Type", tt.contentType)
+				fmt.Fprintln(rw, tt.body)
+			}))
+			defer ts.Close()
+
+			influx := InfluxDB{
+				URLs:     []string{ts.URL},
+				Database: "test",
+			}
+
+			err := influx.Connect()
+			require.NoError(t, err)
+			err = influx.Write(testutil.MockMetrics())
+			require.Equal(t, tt.err, err)
+			require.NoError(t, influx.Close())
+		})
+	}
 }
 
 type MockClient struct {

From 6597b554776e974c7d239877cbda57a3c417c081 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 Aug 2017 16:55:15 -0700
Subject: [PATCH 0482/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6771077d..e07024f6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,7 @@
 - [#2899](https://github.com/influxdata/telegraf/issues/2899): Skip compilcation of logparser and tail on solaris.
 - [#2951](https://github.com/influxdata/telegraf/issues/2951): Discard logging from tail library.
 - [#3126](https://github.com/influxdata/telegraf/pull/3126): Remove log message on ping timeout.
+- [#3144](https://github.com/influxdata/telegraf/issues/3144): Don't retry points beyond retention policy.
 
 ## v1.3.5 [2017-07-26]
 

From 9fc7220c2eac03635096003e7b4e3aa08fc114ea Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 22 Aug 2017 17:01:59 -0700
Subject: [PATCH 0483/1302] Don't start Telegraf on install in Amazon Linux
 (#3156)

---
 scripts/post-install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 75e760fbf..9dc231a30 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -97,6 +97,5 @@ elif [[ -f /etc/os-release ]]; then
         else
             install_chkconfig
         fi
-        /etc/init.d/telegraf restart
     fi
 fi

From 8c68bd9ddbc2a7495796f44048b013c5098065f8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 Aug 2017 17:03:00 -0700
Subject: [PATCH 0484/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e07024f6c..23e6a066b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@
 - [#2951](https://github.com/influxdata/telegraf/issues/2951): Discard logging from tail library.
 - [#3126](https://github.com/influxdata/telegraf/pull/3126): Remove log message on ping timeout.
 - [#3144](https://github.com/influxdata/telegraf/issues/3144): Don't retry points beyond retention policy.
+- [#3015](https://github.com/influxdata/telegraf/issues/3015): Don't start Telegraf on install in Amazon Linux.
 
 ## v1.3.5 [2017-07-26]
 

From f0db4fd9013bd8ff8b7c2e8e09f1b66deae81613 Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Thu, 24 Aug 2017 00:14:32 +0200
Subject: [PATCH 0485/1302] Enable hddtemp on all platforms (#3153)

Also disables dmcache tests on non-linux.
---
 .../inputs/dmcache/{dmcache_test.go => dmcache_linux_test.go}  | 2 ++
 plugins/inputs/hddtemp/hddtemp.go                              | 2 --
 plugins/inputs/hddtemp/hddtemp_nocompile.go                    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename plugins/inputs/dmcache/{dmcache_test.go => dmcache_linux_test.go} (99%)
 delete mode 100644 plugins/inputs/hddtemp/hddtemp_nocompile.go

diff --git a/plugins/inputs/dmcache/dmcache_test.go b/plugins/inputs/dmcache/dmcache_linux_test.go
similarity index 99%
rename from plugins/inputs/dmcache/dmcache_test.go
rename to plugins/inputs/dmcache/dmcache_linux_test.go
index c5989c413..bf3e38ca1 100644
--- a/plugins/inputs/dmcache/dmcache_test.go
+++ b/plugins/inputs/dmcache/dmcache_linux_test.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package dmcache
 
 import (
diff --git a/plugins/inputs/hddtemp/hddtemp.go b/plugins/inputs/hddtemp/hddtemp.go
index ac11218dd..dd4622df4 100644
--- a/plugins/inputs/hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/hddtemp.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package hddtemp
 
 import (
diff --git a/plugins/inputs/hddtemp/hddtemp_nocompile.go b/plugins/inputs/hddtemp/hddtemp_nocompile.go
deleted file mode 100644
index 0c5801670..000000000
--- a/plugins/inputs/hddtemp/hddtemp_nocompile.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package hddtemp

From f25362323160e983e023bec3eaef49aa04ac8342 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 Aug 2017 15:16:04 -0700
Subject: [PATCH 0486/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e6a066b..c6eca65a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
 - [#3126](https://github.com/influxdata/telegraf/pull/3126): Remove log message on ping timeout.
 - [#3144](https://github.com/influxdata/telegraf/issues/3144): Don't retry points beyond retention policy.
 - [#3015](https://github.com/influxdata/telegraf/issues/3015): Don't start Telegraf on install in Amazon Linux.
+- [#3153](https://github.com/influxdata/telegraf/issues/3053): Enable hddtemp input on all platforms.
 
 ## v1.3.5 [2017-07-26]
 

From ae24a0754bd4c250c268fe67de9510860e66ef0e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 23 Aug 2017 15:17:26 -0700
Subject: [PATCH 0487/1302] Escape backslash within string fields (#3161)

---
 metric/escape.go      | 10 ++++--
 metric/metric.go      |  8 +----
 metric/metric_test.go |  7 +---
 metric/reader_test.go | 78 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/metric/escape.go b/metric/escape.go
index a717f514d..cb040b7f2 100644
--- a/metric/escape.go
+++ b/metric/escape.go
@@ -20,8 +20,14 @@ var (
 
 	// stringFieldEscaper is for escaping string field values only.
 	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	stringFieldEscaper   = strings.NewReplacer(`"`, `\"`)
-	stringFieldUnEscaper = strings.NewReplacer(`\"`, `"`)
+	stringFieldEscaper = strings.NewReplacer(
+		`"`, `\"`,
+		`\`, `\\`,
+	)
+	stringFieldUnEscaper = strings.NewReplacer(
+		`\"`, `"`,
+		`\\`, `\`,
+	)
 )
 
 func escape(s string, t string) string {
diff --git a/metric/metric.go b/metric/metric.go
index dd2d6cbc0..63e609290 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -77,16 +77,10 @@ func New(
 
 	// pre-allocate capacity of the fields slice
 	fieldlen := 0
-	for k, v := range fields {
+	for k, _ := range fields {
 		if strings.HasSuffix(k, `\`) {
 			return nil, fmt.Errorf("Metric cannot have field key ending with a backslash")
 		}
-		switch val := v.(type) {
-		case string:
-			if strings.HasSuffix(val, `\`) {
-				return nil, fmt.Errorf("Metric cannot have field value ending with a backslash")
-			}
-		}
 
 		// 10 bytes is completely arbitrary, but will at least prevent some
 		// amount of allocations. There's a small possibility this will create
diff --git a/metric/metric_test.go b/metric/metric_test.go
index e875a213f..b1a23e6df 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -257,6 +257,7 @@ func TestNewMetric_Fields(t *testing.T) {
 		"string":                 "test",
 		"quote_string":           `x"y`,
 		"backslash_quote_string": `x\"y`,
+		"backslash":              `x\y`,
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
@@ -708,12 +709,6 @@ func TestNewMetric_TrailingSlash(t *testing.T) {
 				`value\`: "x",
 			},
 		},
-		{
-			name: "cpu",
-			fields: map[string]interface{}{
-				"value": `x\`,
-			},
-		},
 		{
 			name: "cpu",
 			tags: map[string]string{
diff --git a/metric/reader_test.go b/metric/reader_test.go
index 1537fc960..645b618eb 100644
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -4,6 +4,7 @@ import (
 	"io"
 	"io/ioutil"
 	"regexp"
+	"strings"
 	"testing"
 	"time"
 
@@ -620,6 +621,83 @@ func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
 	}
 }
 
+func TestReader_Read(t *testing.T) {
+	epoch := time.Unix(0, 0)
+
+	type args struct {
+		name   string
+		tags   map[string]string
+		fields map[string]interface{}
+		t      time.Time
+		mType  []telegraf.ValueType
+	}
+	tests := []struct {
+		name     string
+		args     args
+		expected []byte
+	}{
+		{
+			name: "escape backslashes in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\" 0`),
+		},
+		{
+			name: "escape quote in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test"`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\"" 0`),
+		},
+		{
+			name: "escape quote and backslash in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\"`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\\"" 0`),
+		},
+		{
+			name: "escape multiple backslash in string field",
+			args: args{
+				name:   "cpu",
+				tags:   map[string]string{},
+				fields: map[string]interface{}{"value": `test\\`},
+				t:      epoch,
+			},
+			expected: []byte(`cpu value="test\\\\" 0`),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			buf := make([]byte, 512)
+			m, err := New(tt.args.name, tt.args.tags, tt.args.fields, tt.args.t, tt.args.mType...)
+			require.NoError(t, err)
+
+			r := NewReader([]telegraf.Metric{m})
+			num, err := r.Read(buf)
+			if err != io.EOF {
+				require.NoError(t, err)
+			}
+			line := string(buf[:num])
+			// This is done so that we can use raw strings in the test spec
+			noeol := strings.TrimRight(line, "\n")
+			require.Equal(t, string(tt.expected), noeol)
+			require.Equal(t, len(tt.expected)+1, num)
+		})
+	}
+}
+
 func TestMetricRoundtrip(t *testing.T) {
 	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
 nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000

From f95c239a3ffc2e8ec0f900a1ae93c423cbd45853 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 Aug 2017 15:21:48 -0700
Subject: [PATCH 0488/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6eca65a4..ea8a85ca8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@
 - [#3144](https://github.com/influxdata/telegraf/issues/3144): Don't retry points beyond retention policy.
 - [#3015](https://github.com/influxdata/telegraf/issues/3015): Don't start Telegraf on install in Amazon Linux.
 - [#3153](https://github.com/influxdata/telegraf/issues/3053): Enable hddtemp input on all platforms.
+- [#3142](https://github.com/influxdata/telegraf/issues/3142): Escape backslash within string fields.
 
 ## v1.3.5 [2017-07-26]
 

From 485e273187ef2729998ff48b99a4c5f6c915d481 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 Aug 2017 15:42:25 -0700
Subject: [PATCH 0489/1302] Add links to nightly builds

---
 README.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/README.md b/README.md
index 1d2ac478d..178d2a4d3 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,33 @@ which is installed by the Makefile if you don't have it already.
 4. Run `cd $GOPATH/src/github.com/influxdata/telegraf`
 5. Run `make`
 
+### Nightly Builds
+
+These builds are generated from the master branch:
+- [telegraf_nightly_amd64.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_amd64.deb)
+- [telegraf_nightly_arm64.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_arm64.deb)
+- [telegraf-nightly.arm64.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.arm64.rpm)
+- [telegraf_nightly_armel.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_armel.deb)
+- [telegraf-nightly.armel.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.armel.rpm)
+- [telegraf_nightly_armhf.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_armhf.deb)
+- [telegraf-nightly.armv6hl.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.armv6hl.rpm)
+- [telegraf-nightly_freebsd_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_freebsd_amd64.tar.gz)
+- [telegraf-nightly_freebsd_i386.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_freebsd_i386.tar.gz)
+- [telegraf_nightly_i386.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_i386.deb)
+- [telegraf-nightly.i386.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.i386.rpm)
+- [telegraf-nightly_linux_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_amd64.tar.gz)
+- [telegraf-nightly_linux_arm64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_arm64.tar.gz)
+- [telegraf-nightly_linux_armel.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_armel.tar.gz)
+- [telegraf-nightly_linux_armhf.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_armhf.tar.gz)
+- [telegraf-nightly_linux_i386.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_i386.tar.gz)
+- [telegraf-nightly_linux_s390x.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_linux_s390x.tar.gz)
+- [telegraf_nightly_s390x.deb](https://dl.influxdata.com/telegraf/nightlies/telegraf_nightly_s390x.deb)
+- [telegraf-nightly.s390x.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.s390x.rpm)
+- [telegraf-nightly_windows_amd64.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_amd64.zip)
+- [telegraf-nightly_windows_i386.zip](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly_windows_i386.zip)
+- [telegraf-nightly.x86_64.rpm](https://dl.influxdata.com/telegraf/nightlies/telegraf-nightly.x86_64.rpm)
+- [telegraf-static-nightly_linux_amd64.tar.gz](https://dl.influxdata.com/telegraf/nightlies/telegraf-static-nightly_linux_amd64.tar.gz)
+
 ## How to use it:
 
 See usage with:

From 656ce31d9883e3488717e881afce9c440c7e2982 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 24 Aug 2017 13:17:29 -0700
Subject: [PATCH 0490/1302] Fix amqp_consumer data_format documentation

closes #3164
---
 plugins/inputs/amqp_consumer/README.md        | 4 ++--
 plugins/inputs/amqp_consumer/amqp_consumer.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index 2bc06686e..11084bedc 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -39,9 +39,9 @@ The following defaults are known to work with RabbitMQ:
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## Data format to output.
+  ## Data format to consume.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
 ```
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 7f7dfb11d..ee1b9aee1 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -85,10 +85,10 @@ func (a *AMQPConsumer) SampleConfig() string {
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## Data format to output.
+  ## Data format to consume.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
 `
 }

From 58751fa4df5e090b4499a9328ad1dc18912db582 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 Aug 2017 11:42:07 -0700
Subject: [PATCH 0491/1302] Update fail2ban documentation

---
 plugins/inputs/fail2ban/README.md   | 22 +++++++++-------------
 plugins/inputs/fail2ban/fail2ban.go |  8 +++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/plugins/inputs/fail2ban/README.md b/plugins/inputs/fail2ban/README.md
index e785a0dd3..b0f6666bb 100644
--- a/plugins/inputs/fail2ban/README.md
+++ b/plugins/inputs/fail2ban/README.md
@@ -1,19 +1,19 @@
-# Fail2ban Plugin
+# Fail2ban Input Plugin
 
-The fail2ban plugin gathers counts of failed and banned ip addresses from fail2ban.
+The fail2ban plugin gathers the count of failed and banned ip addresses using [fail2ban](https://www.fail2ban.org).
 
-This plugin run fail2ban-client command, and fail2ban-client require root access.
-You have to grant telegraf to run fail2ban-client:
+This plugin runs the `fail2ban-client` command which generally requires root access.
+Acquiring the required permissions can be done using several methods:
 
-- Run telegraf as root. (deprecate)
-- Configure sudo to grant telegraf to fail2ban-client.
+- Use sudo run fail2ban-client.
+- Run telegraf as root. (not recommended)
 
 ### Using sudo
 
 You may edit your sudo configuration with the following:
 
 ``` sudo
-telegraf ALL=(root) NOPASSWD: /usr/bin/fail2ban-client status *
+telegraf ALL=(root) NOEXEC: NOPASSWD: /usr/bin/fail2ban-client status, /usr/bin/fail2ban-client status *
 ```
 
 ### Configuration:
@@ -21,10 +21,7 @@ telegraf ALL=(root) NOPASSWD: /usr/bin/fail2ban-client status *
 ``` toml
 # Read metrics from fail2ban.
 [[inputs.fail2ban]]
-  ## fail2ban-client require root access.
-  ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
-  ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
-  ## This plugin run only "fail2ban-client status".
+  ## Use sudo to run fail2ban-client
   use_sudo = false
 ```
 
@@ -38,7 +35,7 @@ telegraf ALL=(root) NOPASSWD: /usr/bin/fail2ban-client status *
 
 - All measurements have the following tags:
   - jail
-  
+
 ### Example Output:
 
 ```
@@ -55,6 +52,5 @@ Status for the jail: sshd
 ```
 
 ```
-$ ./telegraf --config telegraf.conf --input-filter fail2ban --test
 fail2ban,jail=sshd failed=5i,banned=2i 1495868667000000000
 ```
diff --git a/plugins/inputs/fail2ban/fail2ban.go b/plugins/inputs/fail2ban/fail2ban.go
index 54655357f..37afb87b6 100644
--- a/plugins/inputs/fail2ban/fail2ban.go
+++ b/plugins/inputs/fail2ban/fail2ban.go
@@ -6,9 +6,10 @@ import (
 	"os/exec"
 	"strings"
 
+	"strconv"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"strconv"
 )
 
 var (
@@ -21,10 +22,7 @@ type Fail2ban struct {
 }
 
 var sampleConfig = `
-  ## fail2ban-client require root access.
-  ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
-  ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
-  ## This plugin run only "fail2ban-client status".
+  ## Use sudo to run fail2ban-client
   use_sudo = false
 `
 

From d449833de919fd33fa12b0b978e1ffc92201ea7b Mon Sep 17 00:00:00 2001
From: Jan Willem Janssen <j.w.janssen@lxtreme.nl>
Date: Fri, 25 Aug 2017 20:54:06 +0200
Subject: [PATCH 0492/1302] Fix parsing of SHM remotes in ntpq input (#3163)

---
 plugins/inputs/ntpq/ntpq.go      |  2 +-
 plugins/inputs/ntpq/ntpq_test.go | 53 ++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go
index 692e1bc5d..ce7bb96d7 100644
--- a/plugins/inputs/ntpq/ntpq.go
+++ b/plugins/inputs/ntpq/ntpq.go
@@ -69,7 +69,7 @@ func (n *NTPQ) Gather(acc telegraf.Accumulator) error {
 	// Due to problems with a parsing, we have to use regexp expression in order
 	// to remove string that starts from '(' and ends with space
 	// see: https://github.com/influxdata/telegraf/issues/2386
-	reg, err := regexp.Compile("\\([\\S]*")
+	reg, err := regexp.Compile("\\s+\\([\\S]*")
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/ntpq/ntpq_test.go b/plugins/inputs/ntpq/ntpq_test.go
index d8da845d1..33277221d 100644
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -260,6 +260,57 @@ func TestParserNTPQ(t *testing.T) {
 	}
 	acc := testutil.Accumulator{}
 	assert.NoError(t, acc.GatherError(n.Gather))
+
+	fields := map[string]interface{}{
+		"poll":   int64(64),
+		"when":   int64(60),
+		"reach":  int64(377),
+		"delay":  float64(0.0),
+		"offset": float64(0.045),
+		"jitter": float64(1.012),
+	}
+	tags := map[string]string{
+		"remote":       "SHM(0)",
+		"state_prefix": "*",
+		"refid":        ".PPS.",
+		"stratum":      "1",
+		"type":         "u",
+	}
+	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
+
+	fields = map[string]interface{}{
+		"poll":   int64(128),
+		"when":   int64(121),
+		"reach":  int64(377),
+		"delay":  float64(0.0),
+		"offset": float64(10.105),
+		"jitter": float64(2.012),
+	}
+	tags = map[string]string{
+		"remote":       "SHM(1)",
+		"state_prefix": "-",
+		"refid":        ".GPS.",
+		"stratum":      "1",
+		"type":         "u",
+	}
+	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
+
+	fields = map[string]interface{}{
+		"poll":   int64(1024),
+		"when":   int64(10),
+		"reach":  int64(377),
+		"delay":  float64(1.748),
+		"offset": float64(0.373),
+		"jitter": float64(0.101),
+	}
+	tags = map[string]string{
+		"remote":       "37.58.57.238",
+		"state_prefix": "+",
+		"refid":        "192.53.103.103",
+		"stratum":      "2",
+		"type":         "u",
+	}
+	acc.AssertContainsTaggedFields(t, "ntpq", fields, tags)
 }
 
 func TestMultiNTPQ(t *testing.T) {
@@ -480,7 +531,9 @@ var multiNTPQ = `     remote           refid      st t when poll reach   delay
 `
 var multiParserNTPQ = `     remote           refid      st t when poll reach   delay   offset  jitter
 ==============================================================================
+*SHM(0)          .PPS.                          1 u   60  64   377    0.000    0.045   1.012
 +37.58.57.238 (d 192.53.103.103			2 u   10 1024  377    1.748    0.373   0.101
 +37.58.57.238 (domain) 192.53.103.103   2 u   10 1024  377    1.748    0.373   0.101
 +37.58.57.238 ( 192.53.103.103			2 u   10 1024  377    1.748    0.373   0.101
+-SHM(1)          .GPS.                          1 u   121 128  377    0.000   10.105   2.012
 `

From e400fcf5da5b31d14087f403e6436b6249da0c49 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 Aug 2017 11:55:59 -0700
Subject: [PATCH 0493/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea8a85ca8..ddc262df1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
 - [#3015](https://github.com/influxdata/telegraf/issues/3015): Don't start Telegraf on install in Amazon Linux.
 - [#3153](https://github.com/influxdata/telegraf/issues/3053): Enable hddtemp input on all platforms.
 - [#3142](https://github.com/influxdata/telegraf/issues/3142): Escape backslash within string fields.
+- [#3162](https://github.com/influxdata/telegraf/issues/3162): Fix parsing of SHM remotes in ntpq input
 
 ## v1.3.5 [2017-07-26]
 

From 0502b6531603226ac0d4abf4a48a20a0dc0c48a8 Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Fri, 25 Aug 2017 21:57:35 +0200
Subject: [PATCH 0494/1302] Don't fail parsing of zpool stats if pool health is
 UNAVAIL on FreeBSD (#3149)

---
 plugins/inputs/zfs/zfs_freebsd.go      | 65 ++++++++++++++------------
 plugins/inputs/zfs/zfs_freebsd_test.go | 50 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go
index 7ee72a140..63bbdd6e6 100644
--- a/plugins/inputs/zfs/zfs_freebsd.go
+++ b/plugins/inputs/zfs/zfs_freebsd.go
@@ -33,41 +33,48 @@ func (z *Zfs) gatherPoolStats(acc telegraf.Accumulator) (string, error) {
 			tags := map[string]string{"pool": col[0], "health": col[8]}
 			fields := map[string]interface{}{}
 
-			size, err := strconv.ParseInt(col[1], 10, 64)
-			if err != nil {
-				return "", fmt.Errorf("Error parsing size: %s", err)
-			}
-			fields["size"] = size
+			if tags["health"] == "UNAVAIL" {
 
-			alloc, err := strconv.ParseInt(col[2], 10, 64)
-			if err != nil {
-				return "", fmt.Errorf("Error parsing allocation: %s", err)
-			}
-			fields["allocated"] = alloc
+				fields["size"] = int64(0)
 
-			free, err := strconv.ParseInt(col[3], 10, 64)
-			if err != nil {
-				return "", fmt.Errorf("Error parsing free: %s", err)
-			}
-			fields["free"] = free
+			} else {
 
-			frag, err := strconv.ParseInt(strings.TrimSuffix(col[5], "%"), 10, 0)
-			if err != nil { // This might be - for RO devs
-				frag = 0
-			}
-			fields["fragmentation"] = frag
+				size, err := strconv.ParseInt(col[1], 10, 64)
+				if err != nil {
+					return "", fmt.Errorf("Error parsing size: %s", err)
+				}
+				fields["size"] = size
 
-			capval, err := strconv.ParseInt(col[6], 10, 0)
-			if err != nil {
-				return "", fmt.Errorf("Error parsing capacity: %s", err)
-			}
-			fields["capacity"] = capval
+				alloc, err := strconv.ParseInt(col[2], 10, 64)
+				if err != nil {
+					return "", fmt.Errorf("Error parsing allocation: %s", err)
+				}
+				fields["allocated"] = alloc
 
-			dedup, err := strconv.ParseFloat(strings.TrimSuffix(col[7], "x"), 32)
-			if err != nil {
-				return "", fmt.Errorf("Error parsing dedupratio: %s", err)
+				free, err := strconv.ParseInt(col[3], 10, 64)
+				if err != nil {
+					return "", fmt.Errorf("Error parsing free: %s", err)
+				}
+				fields["free"] = free
+
+				frag, err := strconv.ParseInt(strings.TrimSuffix(col[5], "%"), 10, 0)
+				if err != nil { // This might be - for RO devs
+					frag = 0
+				}
+				fields["fragmentation"] = frag
+
+				capval, err := strconv.ParseInt(col[6], 10, 0)
+				if err != nil {
+					return "", fmt.Errorf("Error parsing capacity: %s", err)
+				}
+				fields["capacity"] = capval
+
+				dedup, err := strconv.ParseFloat(strings.TrimSuffix(col[7], "x"), 32)
+				if err != nil {
+					return "", fmt.Errorf("Error parsing dedupratio: %s", err)
+				}
+				fields["dedupratio"] = dedup
 			}
-			fields["dedupratio"] = dedup
 
 			acc.AddFields("zfs_pool", fields, tags)
 		}
diff --git a/plugins/inputs/zfs/zfs_freebsd_test.go b/plugins/inputs/zfs/zfs_freebsd_test.go
index 193c2816f..60b95a39d 100644
--- a/plugins/inputs/zfs/zfs_freebsd_test.go
+++ b/plugins/inputs/zfs/zfs_freebsd_test.go
@@ -22,6 +22,15 @@ func mock_zpool() ([]string, error) {
 	return zpool_output, nil
 }
 
+// $ zpool list -Hp
+var zpool_output_unavail = []string{
+	"temp2	-	-	-	-	-	-	-	UNAVAIL	-",
+}
+
+func mock_zpool_unavail() ([]string, error) {
+	return zpool_output_unavail, nil
+}
+
 // sysctl -q kstat.zfs.misc.arcstats
 
 // sysctl -q kstat.zfs.misc.vdev_cache_stats
@@ -82,6 +91,41 @@ func TestZfsPoolMetrics(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "zfs_pool", poolMetrics, tags)
 }
 
+func TestZfsPoolMetrics_unavail(t *testing.T) {
+
+	var acc testutil.Accumulator
+
+	z := &Zfs{
+		KstatMetrics: []string{"vdev_cache_stats"},
+		sysctl:       mock_sysctl,
+		zpool:        mock_zpool_unavail,
+	}
+	err := z.Gather(&acc)
+	require.NoError(t, err)
+
+	require.False(t, acc.HasMeasurement("zfs_pool"))
+	acc.Metrics = nil
+
+	z = &Zfs{
+		KstatMetrics: []string{"vdev_cache_stats"},
+		PoolMetrics:  true,
+		sysctl:       mock_sysctl,
+		zpool:        mock_zpool_unavail,
+	}
+	err = z.Gather(&acc)
+	require.NoError(t, err)
+
+	//one pool, UNAVAIL
+	tags := map[string]string{
+		"pool":   "temp2",
+		"health": "UNAVAIL",
+	}
+
+	poolMetrics := getTemp2PoolMetrics()
+
+	acc.AssertContainsTaggedFields(t, "zfs_pool", poolMetrics, tags)
+}
+
 func TestZfsGeneratesMetrics(t *testing.T) {
 	var acc testutil.Accumulator
 
@@ -128,6 +172,12 @@ func getFreeNasBootPoolMetrics() map[string]interface{} {
 	}
 }
 
+func getTemp2PoolMetrics() map[string]interface{} {
+	return map[string]interface{}{
+		"size": int64(0),
+	}
+}
+
 func getKstatMetricsVdevOnly() map[string]interface{} {
 	return map[string]interface{}{
 		"vdev_cache_stats_misses":      int64(87789),

From 6abecd0ac7ee5a7b418316314c83935ab6e06e92 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 Aug 2017 12:59:19 -0700
Subject: [PATCH 0495/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddc262df1..06d69cc10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
 - [#3153](https://github.com/influxdata/telegraf/issues/3053): Enable hddtemp input on all platforms.
 - [#3142](https://github.com/influxdata/telegraf/issues/3142): Escape backslash within string fields.
 - [#3162](https://github.com/influxdata/telegraf/issues/3162): Fix parsing of SHM remotes in ntpq input
+- [#3149](https://github.com/influxdata/telegraf/issues/3149): Don't fail parsing zpool stats if pool health is UNAVAIL on FreeBSD.
 
 ## v1.3.5 [2017-07-26]
 

From 8ecc58639a15b6f3ecec85d0e7197c6102c143c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 Aug 2017 13:58:45 -0700
Subject: [PATCH 0496/1302] Close response bodies in http_listener test

---
 plugins/inputs/http_listener/http_listener_test.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 654f2f83d..90de15853 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -58,6 +58,7 @@ func TestWriteHTTP(t *testing.T) {
 	// post single message to listener
 	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 
 	acc.Wait(1)
@@ -69,6 +70,7 @@ func TestWriteHTTP(t *testing.T) {
 	// post multiple message to listener
 	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 
 	acc.Wait(2)
@@ -84,6 +86,7 @@ func TestWriteHTTP(t *testing.T) {
 	// Post a gigantic metric to the listener and verify that an error is returned:
 	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
 
 	acc.Wait(3)
@@ -104,6 +107,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 	// post single message to listener
 	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 
 	acc.Wait(1)
@@ -126,6 +130,7 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	// Post a gigantic metric to the listener and verify that it writes OK this time:
 	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
@@ -141,6 +146,7 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 
 	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 413, resp.StatusCode)
 }
 
@@ -156,6 +162,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 
 	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 
 	hostTags := []string{"server02", "server03",
@@ -181,6 +188,7 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 
 	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
 
 	hostTags := []string{"server02", "server03",
@@ -242,6 +250,7 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 			for i := 0; i < 500; i++ {
 				resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 				require.NoError(t, err)
+				resp.Body.Close()
 				require.EqualValues(t, 204, resp.StatusCode)
 			}
 		}(&wg)
@@ -264,6 +273,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 	// post single message to listener
 	resp, err := http.Post(createURL(listener, "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 404, resp.StatusCode)
 }
 
@@ -277,6 +287,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
 	// post single message to listener
 	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
 }
 
@@ -290,6 +301,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
 	// post single message to listener
 	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
@@ -309,6 +321,7 @@ func TestQueryAndPingHTTP(t *testing.T) {
 	// post ping to listener
 	resp, err = http.Post(createURL(listener, "/ping", ""), "", nil)
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
@@ -323,6 +336,7 @@ func TestWriteWithPrecision(t *testing.T) {
 	resp, err := http.Post(
 		createURL(listener, "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg)))
 	require.NoError(t, err)
+	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 
 	acc.Wait(1)

From 0a6541dfa8fc9ffec6b332f49a92e1e67767bef1 Mon Sep 17 00:00:00 2001
From: Ashton Kinslow <Ashtonian@users.noreply.github.com>
Date: Fri, 25 Aug 2017 20:06:48 -0500
Subject: [PATCH 0497/1302] Fix NSQ input plugin when used with version
 1.0.0-compat

---
 plugins/inputs/nsq/nsq.go      |  35 +++--
 plugins/inputs/nsq/nsq_test.go | 263 ++++++++++++++++++++++++++++++++-
 2 files changed, 286 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/nsq/nsq.go b/plugins/inputs/nsq/nsq.go
index b59420c26..1ef47ef05 100644
--- a/plugins/inputs/nsq/nsq.go
+++ b/plugins/inputs/nsq/nsq.go
@@ -25,6 +25,7 @@ package nsq
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -101,28 +102,42 @@ func (n *NSQ) gatherEndpoint(e string, acc telegraf.Accumulator) error {
 		return fmt.Errorf("%s returned HTTP status %s", u.String(), r.Status)
 	}
 
-	s := &NSQStats{}
-	err = json.NewDecoder(r.Body).Decode(s)
+	body, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		return fmt.Errorf(`Error reading body: %s`, err)
+	}
+
+	data := &NSQStatsData{}
+	err = json.Unmarshal(body, data)
 	if err != nil {
 		return fmt.Errorf(`Error parsing response: %s`, err)
 	}
+	// Data was not parsed correctly attempt to use old format.
+	if len(data.Version) < 1 {
+		wrapper := &NSQStats{}
+		err = json.Unmarshal(body, wrapper)
+		if err != nil {
+			return fmt.Errorf(`Error parsing response: %s`, err)
+		}
+		data = &wrapper.Data
+	}
 
 	tags := map[string]string{
 		`server_host`:    u.Host,
-		`server_version`: s.Data.Version,
+		`server_version`: data.Version,
 	}
 
 	fields := make(map[string]interface{})
-	if s.Data.Health == `OK` {
+	if data.Health == `OK` {
 		fields["server_count"] = int64(1)
 	} else {
 		fields["server_count"] = int64(0)
 	}
-	fields["topic_count"] = int64(len(s.Data.Topics))
+	fields["topic_count"] = int64(len(data.Topics))
 
 	acc.AddFields("nsq_server", fields, tags)
-	for _, t := range s.Data.Topics {
-		topicStats(t, acc, u.Host, s.Data.Version)
+	for _, t := range data.Topics {
+		topicStats(t, acc, u.Host, data.Version)
 	}
 
 	return nil
@@ -189,7 +204,6 @@ func clientStats(c ClientStats, acc telegraf.Accumulator, host, version, topic,
 		"server_version":    version,
 		"topic":             topic,
 		"channel":           channel,
-		"client_name":       c.Name,
 		"client_id":         c.ID,
 		"client_hostname":   c.Hostname,
 		"client_version":    c.Version,
@@ -199,6 +213,9 @@ func clientStats(c ClientStats, acc telegraf.Accumulator, host, version, topic,
 		"client_snappy":     strconv.FormatBool(c.Snappy),
 		"client_deflate":    strconv.FormatBool(c.Deflate),
 	}
+	if len(c.Name) > 0 {
+		tags["client_name"] = c.Name
+	}
 
 	fields := map[string]interface{}{
 		"ready_count":    c.ReadyCount,
@@ -248,7 +265,7 @@ type ChannelStats struct {
 }
 
 type ClientStats struct {
-	Name                          string `json:"name"`
+	Name                          string `json:"name"` // DEPRECATED 1.x+, still here as the structs are currently being shared for parsing v3.x and 1.x
 	ID                            string `json:"client_id"`
 	Hostname                      string `json:"hostname"`
 	Version                       string `json:"version"`
diff --git a/plugins/inputs/nsq/nsq_test.go b/plugins/inputs/nsq/nsq_test.go
index 926f99638..f3e9ce868 100644
--- a/plugins/inputs/nsq/nsq_test.go
+++ b/plugins/inputs/nsq/nsq_test.go
@@ -12,10 +12,267 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestNSQStats(t *testing.T) {
+func TestNSQStatsV1(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintln(w, response)
+		fmt.Fprintln(w, responseV1)
+	}))
+	defer ts.Close()
+
+	n := &NSQ{
+		Endpoints: []string{ts.URL},
+	}
+
+	var acc testutil.Accumulator
+	err := acc.GatherError(n.Gather)
+	require.NoError(t, err)
+
+	u, err := url.Parse(ts.URL)
+	require.NoError(t, err)
+	host := u.Host
+
+	// actually validate the tests
+	tests := []struct {
+		m string
+		f map[string]interface{}
+		g map[string]string
+	}{
+		{
+			"nsq_server",
+			map[string]interface{}{
+				"server_count": int64(1),
+				"topic_count":  int64(2),
+			},
+			map[string]string{
+				"server_host":    host,
+				"server_version": "1.0.0-compat",
+			},
+		},
+		{
+			"nsq_topic",
+			map[string]interface{}{
+				"depth":         int64(12),
+				"backend_depth": int64(13),
+				"message_count": int64(14),
+				"channel_count": int64(1),
+			},
+			map[string]string{
+				"server_host":    host,
+				"server_version": "1.0.0-compat",
+				"topic":          "t1"},
+		},
+		{
+			"nsq_channel",
+			map[string]interface{}{
+				"depth":          int64(0),
+				"backend_depth":  int64(1),
+				"inflight_count": int64(2),
+				"deferred_count": int64(3),
+				"message_count":  int64(4),
+				"requeue_count":  int64(5),
+				"timeout_count":  int64(6),
+				"client_count":   int64(1),
+			},
+			map[string]string{
+				"server_host":    host,
+				"server_version": "1.0.0-compat",
+				"topic":          "t1",
+				"channel":        "c1",
+			},
+		},
+		{
+			"nsq_client",
+			map[string]interface{}{
+				"ready_count":    int64(200),
+				"inflight_count": int64(7),
+				"message_count":  int64(8),
+				"finish_count":   int64(9),
+				"requeue_count":  int64(10),
+			},
+			map[string]string{"server_host": host, "server_version": "1.0.0-compat",
+				"topic": "t1", "channel": "c1",
+				"client_id": "373a715cd990", "client_hostname": "373a715cd990",
+				"client_version": "V2", "client_address": "172.17.0.11:35560",
+				"client_tls": "false", "client_snappy": "false",
+				"client_deflate":    "false",
+				"client_user_agent": "nsq_to_nsq/0.3.6 go-nsq/1.0.5"},
+		},
+		{
+			"nsq_topic",
+			map[string]interface{}{
+				"depth":         int64(28),
+				"backend_depth": int64(29),
+				"message_count": int64(30),
+				"channel_count": int64(1),
+			},
+			map[string]string{
+				"server_host":    host,
+				"server_version": "1.0.0-compat",
+				"topic":          "t2"},
+		},
+		{
+			"nsq_channel",
+			map[string]interface{}{
+				"depth":          int64(15),
+				"backend_depth":  int64(16),
+				"inflight_count": int64(17),
+				"deferred_count": int64(18),
+				"message_count":  int64(19),
+				"requeue_count":  int64(20),
+				"timeout_count":  int64(21),
+				"client_count":   int64(1),
+			},
+			map[string]string{
+				"server_host":    host,
+				"server_version": "1.0.0-compat",
+				"topic":          "t2",
+				"channel":        "c2",
+			},
+		},
+		{
+			"nsq_client",
+			map[string]interface{}{
+				"ready_count":    int64(22),
+				"inflight_count": int64(23),
+				"message_count":  int64(24),
+				"finish_count":   int64(25),
+				"requeue_count":  int64(26),
+			},
+			map[string]string{"server_host": host, "server_version": "1.0.0-compat",
+				"topic": "t2", "channel": "c2",
+				"client_id": "377569bd462b", "client_hostname": "377569bd462b",
+				"client_version": "V2", "client_address": "172.17.0.8:48145",
+				"client_user_agent": "go-nsq/1.0.5", "client_tls": "true",
+				"client_snappy": "true", "client_deflate": "true"},
+		},
+	}
+
+	for _, test := range tests {
+		acc.AssertContainsTaggedFields(t, test.m, test.f, test.g)
+	}
+}
+
+// v1 version of localhost/stats?format=json reesponse body
+var responseV1 = `
+{
+    "version": "1.0.0-compat",
+    "health": "OK",
+    "start_time": 1452021674,
+    "topics": [
+      {
+        "topic_name": "t1",
+        "channels": [
+          {
+            "channel_name": "c1",
+            "depth": 0,
+            "backend_depth": 1,
+            "in_flight_count": 2,
+            "deferred_count": 3,
+            "message_count": 4,
+            "requeue_count": 5,
+            "timeout_count": 6,
+            "clients": [
+              {
+                "client_id": "373a715cd990",
+                "hostname": "373a715cd990",
+                "version": "V2",
+                "remote_address": "172.17.0.11:35560",
+                "state": 3,
+                "ready_count": 200,
+                "in_flight_count": 7,
+                "message_count": 8,
+                "finish_count": 9,
+                "requeue_count": 10,
+                "connect_ts": 1452021675,
+                "sample_rate": 11,
+                "deflate": false,
+                "snappy": false,
+                "user_agent": "nsq_to_nsq\/0.3.6 go-nsq\/1.0.5",
+                "tls": false,
+                "tls_cipher_suite": "",
+                "tls_version": "",
+                "tls_negotiated_protocol": "",
+                "tls_negotiated_protocol_is_mutual": false
+              }
+            ],
+            "paused": false,
+            "e2e_processing_latency": {
+              "count": 0,
+              "percentiles": null
+            }
+          }
+        ],
+        "depth": 12,
+        "backend_depth": 13,
+        "message_count": 14,
+        "paused": false,
+        "e2e_processing_latency": {
+          "count": 0,
+          "percentiles": null
+        }
+      },
+      {
+        "topic_name": "t2",
+        "channels": [
+          {
+            "channel_name": "c2",
+            "depth": 15,
+            "backend_depth": 16,
+            "in_flight_count": 17,
+            "deferred_count": 18,
+            "message_count": 19,
+            "requeue_count": 20,
+            "timeout_count": 21,
+            "clients": [
+              {
+                "client_id": "377569bd462b",
+                "hostname": "377569bd462b",
+                "version": "V2",
+                "remote_address": "172.17.0.8:48145",
+                "state": 3,
+                "ready_count": 22,
+                "in_flight_count": 23,
+                "message_count": 24,
+                "finish_count": 25,
+                "requeue_count": 26,
+                "connect_ts": 1452021678,
+                "sample_rate": 27,
+                "deflate": true,
+                "snappy": true,
+                "user_agent": "go-nsq\/1.0.5",
+                "tls": true,
+                "tls_cipher_suite": "",
+                "tls_version": "",
+                "tls_negotiated_protocol": "",
+                "tls_negotiated_protocol_is_mutual": false
+              }
+            ],
+            "paused": false,
+            "e2e_processing_latency": {
+              "count": 0,
+              "percentiles": null
+            }
+          }
+        ],
+        "depth": 28,
+        "backend_depth": 29,
+        "message_count": 30,
+        "paused": false,
+        "e2e_processing_latency": {
+          "count": 0,
+          "percentiles": null
+        }
+      }
+    ]
+  }
+
+`
+
+// TestNSQStatsPreV1 is for backwards compatibility with nsq versions < 1.0
+func TestNSQStatsPreV1(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprintln(w, responsePreV1)
 	}))
 	defer ts.Close()
 
@@ -152,7 +409,7 @@ func TestNSQStats(t *testing.T) {
 	}
 }
 
-var response = `
+var responsePreV1 = `
 {
   "status_code": 200,
   "status_txt": "OK",

From a98496591a3183445c9a83eb6bfb580b816899e8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 Aug 2017 18:08:33 -0700
Subject: [PATCH 0498/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06d69cc10..b4dff98fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@
 - [#3142](https://github.com/influxdata/telegraf/issues/3142): Escape backslash within string fields.
 - [#3162](https://github.com/influxdata/telegraf/issues/3162): Fix parsing of SHM remotes in ntpq input
 - [#3149](https://github.com/influxdata/telegraf/issues/3149): Don't fail parsing zpool stats if pool health is UNAVAIL on FreeBSD.
+- [#2672](https://github.com/influxdata/telegraf/issues/2672): Fix NSQ input plugin when used with version 1.0.0-compat.
 
 ## v1.3.5 [2017-07-26]
 

From a9a40cbf87fa83553dc313f5f628bbce08613bb3 Mon Sep 17 00:00:00 2001
From: Dylan Meissner <dylanmei@gmail.com>
Date: Mon, 28 Aug 2017 16:08:50 -0700
Subject: [PATCH 0499/1302] HTTP headers can be added to InfluxDB output
 (#3182)

---
 plugins/outputs/influxdb/README.md           |  4 ++++
 plugins/outputs/influxdb/client/http.go      | 10 ++++++++++
 plugins/outputs/influxdb/client/http_test.go | 10 ++++++++++
 plugins/outputs/influxdb/influxdb.go         | 14 +++++++++++---
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 36d64c219..31326c918 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -44,6 +44,9 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
 
+  ## Optional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
   ## Compress each HTTP request payload using GZIP.
   # content_encoding = "gzip"
 ```
@@ -70,4 +73,5 @@ to write to. Each URL should start with either `http://` or `udp://`
 * `ssl_key`: SSL key
 * `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
 * `http_proxy`: HTTP Proxy URI
+* `http_headers`: HTTP headers to add to each HTTP request
 * `content_encoding`: Compress each HTTP request payload using gzip if set to: "gzip"
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 957c490ed..2587b2da5 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -68,6 +68,8 @@ func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
 	}, nil
 }
 
+type HTTPHeaders map[string]string
+
 type HTTPConfig struct {
 	// URL should be of the form "http://host:port" (REQUIRED)
 	URL string
@@ -95,6 +97,9 @@ type HTTPConfig struct {
 	// Proxy URL should be of the form "http://host:port"
 	HTTPProxy string
 
+	// HTTP headers to append to HTTP requests.
+	HTTPHeaders HTTPHeaders
+
 	// The content encoding mechanism to use for each request.
 	ContentEncoding string
 }
@@ -253,6 +258,11 @@ func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, err
 	if err != nil {
 		return nil, err
 	}
+
+	for header, value := range c.config.HTTPHeaders {
+		req.Header.Set(header, value)
+	}
+
 	req.Header.Set("Content-Type", "text/plain")
 	req.Header.Set("User-Agent", c.config.UserAgent)
 	if c.config.Username != "" && c.config.Password != "" {
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
index 7f3bd7e34..d094078ea 100644
--- a/plugins/outputs/influxdb/client/http_test.go
+++ b/plugins/outputs/influxdb/client/http_test.go
@@ -55,6 +55,13 @@ func TestHTTPClient_Write(t *testing.T) {
 				fmt.Fprintln(w, `{"results":[{}],"error":"basic auth incorrect"}`)
 			}
 
+			// test that user-specified http header is set properly
+			if r.Header.Get("X-Test-Header") != "Test-Value" {
+				w.WriteHeader(http.StatusTeapot)
+				w.Header().Set("Content-Type", "application/json")
+				fmt.Fprintln(w, `{"results":[{}],"error":"wrong http header value"}`)
+			}
+
 			// Validate Content-Length Header
 			if r.ContentLength != 13 {
 				w.WriteHeader(http.StatusTeapot)
@@ -90,6 +97,9 @@ func TestHTTPClient_Write(t *testing.T) {
 		UserAgent: "test-agent",
 		Username:  "test-user",
 		Password:  "test-password",
+		HTTPHeaders: HTTPHeaders{
+			"X-Test-Header": "Test-Value",
+		},
 	}
 	wp := WriteParams{
 		Database:        "test",
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index b4567af99..f2f946513 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -32,9 +32,10 @@ type InfluxDB struct {
 	RetentionPolicy  string
 	WriteConsistency string
 	Timeout          internal.Duration
-	UDPPayload       int    `toml:"udp_payload"`
-	HTTPProxy        string `toml:"http_proxy"`
-	ContentEncoding  string `toml:"content_encoding"`
+	UDPPayload       int               `toml:"udp_payload"`
+	HTTPProxy        string            `toml:"http_proxy"`
+	HTTPHeaders      map[string]string `toml:"http_headers"`
+	ContentEncoding  string            `toml:"content_encoding"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -89,6 +90,9 @@ var sampleConfig = `
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
 
+  ## Optional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
   ## Compress each HTTP request payload using GZIP.
   # content_encoding = "gzip"
 `
@@ -132,8 +136,12 @@ func (i *InfluxDB) Connect() error {
 				Username:        i.Username,
 				Password:        i.Password,
 				HTTPProxy:       i.HTTPProxy,
+				HTTPHeaders:     client.HTTPHeaders{},
 				ContentEncoding: i.ContentEncoding,
 			}
+			for header, value := range i.HTTPHeaders {
+				config.HTTPHeaders[header] = value
+			}
 			wp := client.WriteParams{
 				Database:        i.Database,
 				RetentionPolicy: i.RetentionPolicy,

From 02f7b0d030b29a363d3f714682c3cad44263db07 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 28 Aug 2017 16:11:00 -0700
Subject: [PATCH 0500/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4dff98fc..554e19076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## v1.5 [unreleased]
 
+### Features
+
+- [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
+
+### Bugfixes
+
 ## v1.4 [unreleased]
 
 ### Release Notes

From 95fe0e43f5514bbc1f485cd6e746eb8f84fe0b92 Mon Sep 17 00:00:00 2001
From: Nevins <nevins-b@users.noreply.github.com>
Date: Mon, 28 Aug 2017 19:24:38 -0400
Subject: [PATCH 0501/1302] Add support for sharding based on metric name
 (#3170)

---
 plugins/outputs/kinesis/README.md       |  28 ++++++-
 plugins/outputs/kinesis/kinesis.go      | 103 ++++++++++++++++++------
 plugins/outputs/kinesis/kinesis_test.go |  77 ++++++++++++++++++
 3 files changed, 181 insertions(+), 27 deletions(-)
 create mode 100644 plugins/outputs/kinesis/kinesis_test.go

diff --git a/plugins/outputs/kinesis/README.md b/plugins/outputs/kinesis/README.md
index 52b80208a..809bb7790 100644
--- a/plugins/outputs/kinesis/README.md
+++ b/plugins/outputs/kinesis/README.md
@@ -27,7 +27,6 @@ For this output plugin to function correctly the following variables must be con
 
 * region
 * streamname
-* partitionkey
 
 ### region
 
@@ -44,17 +43,40 @@ The streamname is used by the plugin to ensure that data is sent to the correct
 note that the stream *MUST* be pre-configured for this plugin to function correctly. If the stream does not exist the
 plugin will result in telegraf exiting with an exit code of 1.
 
-### partitionkey
+### partitionkey [DEPRECATED]
 
 This is used to group data within a stream. Currently this plugin only supports a single partitionkey.
 Manually configuring different hosts, or groups of hosts with manually selected partitionkeys might be a workable
 solution to scale out.
 
-### use_random_partitionkey
+### use_random_partitionkey [DEPRECATED]
 
 When true a random UUID will be generated and used as the partitionkey when sending data to Kinesis. This allows data to evenly spread across multiple shards in the stream. Due to using a random paritionKey there can be no guarantee of ordering when consuming the data off the shards.
 If true then the partitionkey option will be ignored.
 
+### partition
+
+This is used to group data within a stream. Currently four methods are supported: random, static, tag or measurement
+
+#### random
+
+This will generate a UUIDv4 for each metric to spread them across shards.
+Any guarantee of ordering is lost with this method
+
+#### static
+
+This uses a static string as a partitionkey.
+All metrics will be mapped to the same shard which may limit throughput.
+
+#### tag
+
+This will take the value of the specified tag from each metric as the paritionKey.
+If the tag is not found an empty string will be used.
+
+#### measurement
+
+This will use the measurement's name as the partitionKey.
+
 ### format
 
 The format configuration value has been designated to allow people to change the format of the Point as written to
diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index 8c807ceed..d77ff08a5 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -15,23 +15,31 @@ import (
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
 
-type KinesisOutput struct {
-	Region    string `toml:"region"`
-	AccessKey string `toml:"access_key"`
-	SecretKey string `toml:"secret_key"`
-	RoleARN   string `toml:"role_arn"`
-	Profile   string `toml:"profile"`
-	Filename  string `toml:"shared_credential_file"`
-	Token     string `toml:"token"`
+type (
+	KinesisOutput struct {
+		Region    string `toml:"region"`
+		AccessKey string `toml:"access_key"`
+		SecretKey string `toml:"secret_key"`
+		RoleARN   string `toml:"role_arn"`
+		Profile   string `toml:"profile"`
+		Filename  string `toml:"shared_credential_file"`
+		Token     string `toml:"token"`
 
-	StreamName         string `toml:"streamname"`
-	PartitionKey       string `toml:"partitionkey"`
-	RandomPartitionKey bool   `toml:"use_random_partitionkey"`
-	Debug              bool   `toml:"debug"`
-	svc                *kinesis.Kinesis
+		StreamName         string     `toml:"streamname"`
+		PartitionKey       string     `toml:"partitionkey"`
+		RandomPartitionKey bool       `toml:"use_random_partitionkey"`
+		Partition          *Partition `toml:"partition"`
+		Debug              bool       `toml:"debug"`
+		svc                *kinesis.Kinesis
 
-	serializer serializers.Serializer
-}
+		serializer serializers.Serializer
+	}
+
+	Partition struct {
+		Method string `toml:"method"`
+		Key    string `toml:"key"`
+	}
+)
 
 var sampleConfig = `
   ## Amazon REGION of kinesis endpoint.
@@ -54,12 +62,32 @@ var sampleConfig = `
 
   ## Kinesis StreamName must exist prior to starting telegraf.
   streamname = "StreamName"
-  ## PartitionKey as used for sharding data.
+  ## DEPRECATED: PartitionKey as used for sharding data.
   partitionkey = "PartitionKey"
-  ## If set the paritionKey will be a random UUID on every put.
+  ## DEPRECATED: If set the paritionKey will be a random UUID on every put.
   ## This allows for scaling across multiple shards in a stream.
   ## This will cause issues with ordering.
   use_random_partitionkey = false
+  ## The partition key can be calculated using one of several methods:
+  ##
+  ## Use a static value for all writes:
+  #  [outputs.kinesis.partition]
+  #    method = "static"
+  #    key = "howdy"
+  #
+  ## Use a random partition key on each write:
+  #  [outputs.kinesis.partition]
+  #    method = "random"
+  #
+  ## Use the measurement name as the partition key:
+  #  [outputs.kinesis.partition]
+  #    method = "measurement"
+  #
+  ## Use the value of a tag for all writes, if the tag is not set the empty
+  ## string will be used:
+  #  [outputs.kinesis.partition]
+  #    method = "tag"
+  #    key = "host"
 
 
   ## Data format to output.
@@ -129,6 +157,9 @@ func (k *KinesisOutput) Connect() error {
 		log.Printf("E! kinesis : You have configured a StreamName %+v which does not exist. exiting.", k.StreamName)
 		os.Exit(1)
 	}
+	if k.Partition == nil {
+		log.Print("E! kinesis : Deprecated paritionkey configuration in use, please consider using outputs.kinesis.partition")
+	}
 	return err
 }
 
@@ -163,6 +194,32 @@ func writekinesis(k *KinesisOutput, r []*kinesis.PutRecordsRequestEntry) time.Du
 	return time.Since(start)
 }
 
+func (k *KinesisOutput) getPartitionKey(metric telegraf.Metric) string {
+	if k.Partition != nil {
+		switch k.Partition.Method {
+		case "static":
+			return k.Partition.Key
+		case "random":
+			u := uuid.NewV4()
+			return u.String()
+		case "measurement":
+			return metric.Name()
+		case "tag":
+			if metric.HasTag(k.Partition.Key) {
+				return metric.Tags()[k.Partition.Key]
+			}
+			log.Printf("E! kinesis : You have configured a Partition using tag %+v which does not exist.", k.Partition.Key)
+		default:
+			log.Printf("E! kinesis : You have configured a Partition method of %+v which is not supported", k.Partition.Method)
+		}
+	}
+	if k.RandomPartitionKey {
+		u := uuid.NewV4()
+		return u.String()
+	}
+	return k.PartitionKey
+}
+
 func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 	var sz uint32
 
@@ -180,11 +237,7 @@ func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 			return err
 		}
 
-		partitionKey := k.PartitionKey
-		if k.RandomPartitionKey {
-			u := uuid.NewV4()
-			partitionKey = u.String()
-		}
+		partitionKey := k.getPartitionKey(metric)
 
 		d := kinesis.PutRecordsRequestEntry{
 			Data:         values,
@@ -202,8 +255,10 @@ func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 		}
 
 	}
-
-	writekinesis(k, r)
+	if sz > 0 {
+		elapsed := writekinesis(k, r)
+		log.Printf("E! Wrote a %+v point batch to Kinesis in %+v.\n", sz, elapsed)
+	}
 
 	return nil
 }
diff --git a/plugins/outputs/kinesis/kinesis_test.go b/plugins/outputs/kinesis/kinesis_test.go
new file mode 100644
index 000000000..281dbecb5
--- /dev/null
+++ b/plugins/outputs/kinesis/kinesis_test.go
@@ -0,0 +1,77 @@
+package kinesis
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	uuid "github.com/satori/go.uuid"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPartitionKey(t *testing.T) {
+
+	assert := assert.New(t)
+	testPoint := testutil.TestMetric(1)
+
+	k := KinesisOutput{
+		Partition: &Partition{
+			Method: "static",
+			Key:    "-",
+		},
+	}
+	assert.Equal("-", k.getPartitionKey(testPoint), "PartitionKey should be '-'")
+
+	k = KinesisOutput{
+		Partition: &Partition{
+			Method: "tag",
+			Key:    "tag1",
+		},
+	}
+	assert.Equal(testPoint.Tags()["tag1"], k.getPartitionKey(testPoint), "PartitionKey should be value of 'tag1'")
+
+	k = KinesisOutput{
+		Partition: &Partition{
+			Method: "tag",
+			Key:    "doesnotexist",
+		},
+	}
+	assert.Equal("", k.getPartitionKey(testPoint), "PartitionKey should be value of ''")
+
+	k = KinesisOutput{
+		Partition: &Partition{
+			Method: "not supported",
+		},
+	}
+	assert.Equal("", k.getPartitionKey(testPoint), "PartitionKey should be value of ''")
+
+	k = KinesisOutput{
+		Partition: &Partition{
+			Method: "measurement",
+		},
+	}
+	assert.Equal(testPoint.Name(), k.getPartitionKey(testPoint), "PartitionKey should be value of measurement name")
+
+	k = KinesisOutput{
+		Partition: &Partition{
+			Method: "random",
+		},
+	}
+	partitionKey := k.getPartitionKey(testPoint)
+	u, err := uuid.FromString(partitionKey)
+	assert.Nil(err, "Issue parsing UUID")
+	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
+
+	k = KinesisOutput{
+		PartitionKey: "-",
+	}
+	assert.Equal("-", k.getPartitionKey(testPoint), "PartitionKey should be '-'")
+
+	k = KinesisOutput{
+		RandomPartitionKey: true,
+	}
+	partitionKey = k.getPartitionKey(testPoint)
+	u, err = uuid.FromString(partitionKey)
+	assert.Nil(err, "Issue parsing UUID")
+	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
+
+}

From 73d57c8a0233b36e918ae988c646a207286bf0c7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 28 Aug 2017 16:30:51 -0700
Subject: [PATCH 0502/1302] Update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 554e19076..aca7cf75d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
 ## v1.5 [unreleased]
 
+### Release Notes
+
+- In the `kinesis` output, use of the `partition_key` and
+  `use_random_partitionkey` options has been deprecated in favor of the
+  `partition` subtable.  This allows for more flexible methods to set the
+  partition key such as by metric name or by tag.
+
 ### Features
 
 - [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
+- [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
 
 ### Bugfixes
 

From ac1fa05672a3eb9342b23534f22cb5538576e759 Mon Sep 17 00:00:00 2001
From: Jeff Nickoloff <jeff.nickoloff@gmail.com>
Date: Mon, 28 Aug 2017 16:56:03 -0700
Subject: [PATCH 0503/1302] Added CloudWatch metric constraint validation
 (#3183)

---
 plugins/outputs/cloudwatch/cloudwatch.go      | 19 +++++++++++++
 plugins/outputs/cloudwatch/cloudwatch_test.go | 27 ++++++++++++++-----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 4eb2706a3..a04e86cde 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -193,6 +193,25 @@ func BuildMetricDatum(point telegraf.Metric) []*cloudwatch.MetricDatum {
 			continue
 		}
 
+		// Do CloudWatch boundary checking
+		// Constraints at: http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html
+		if math.IsNaN(value) {
+			datums = datums[:len(datums)-1]
+			continue
+		}
+		if math.IsInf(value, 0) {
+			datums = datums[:len(datums)-1]
+			continue
+		}
+		if value > 0 && value < float64(8.515920e-109) {
+			datums = datums[:len(datums)-1]
+			continue
+		}
+		if value > float64(1.174271e+108) {
+			datums = datums[:len(datums)-1]
+			continue
+		}
+
 		datums[i] = &cloudwatch.MetricDatum{
 			MetricName: aws.String(strings.Join([]string{point.Name(), k}, "_")),
 			Value:      aws.Float64(value),
diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go
index 06b41fa21..8ab60de2f 100644
--- a/plugins/outputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/outputs/cloudwatch/cloudwatch_test.go
@@ -1,6 +1,8 @@
 package cloudwatch
 
 import (
+	"fmt"
+	"math"
 	"sort"
 	"testing"
 
@@ -51,22 +53,32 @@ func TestBuildDimensions(t *testing.T) {
 func TestBuildMetricDatums(t *testing.T) {
 	assert := assert.New(t)
 
+	zero := 0.0
 	validMetrics := []telegraf.Metric{
 		testutil.TestMetric(1),
 		testutil.TestMetric(int32(1)),
 		testutil.TestMetric(int64(1)),
 		testutil.TestMetric(float64(1)),
+		testutil.TestMetric(float64(0)),
+		testutil.TestMetric(math.Copysign(zero, -1)), // the CW documentation does not call out -0 as rejected
+		testutil.TestMetric(float64(8.515920e-109)),
+		testutil.TestMetric(float64(1.174271e+108)), // largest should be 1.174271e+108
 		testutil.TestMetric(true),
 	}
-
+	invalidMetrics := []telegraf.Metric{
+		testutil.TestMetric("Foo"),
+		testutil.TestMetric(math.Log(-1.0)),
+		testutil.TestMetric(float64(8.515919e-109)), // smallest should be 8.515920e-109
+		testutil.TestMetric(float64(1.174272e+108)), // largest should be 1.174271e+108
+	}
 	for _, point := range validMetrics {
 		datums := BuildMetricDatum(point)
-		assert.Equal(1, len(datums), "Valid type should create a Datum")
+		assert.Equal(1, len(datums), fmt.Sprintf("Valid point should create a Datum {value: %v}", point))
+	}
+	for _, point := range invalidMetrics {
+		datums := BuildMetricDatum(point)
+		assert.Equal(0, len(datums), fmt.Sprintf("Valid point should not create a Datum {value: %v}", point))
 	}
-
-	nonValidPoint := testutil.TestMetric("Foo")
-
-	assert.Equal(0, len(BuildMetricDatum(nonValidPoint)), "Invalid type should not create a Datum")
 }
 
 func TestPartitionDatums(t *testing.T) {
@@ -78,10 +90,13 @@ func TestPartitionDatums(t *testing.T) {
 		Value:      aws.Float64(1),
 	}
 
+	zeroDatum := []*cloudwatch.MetricDatum{}
 	oneDatum := []*cloudwatch.MetricDatum{&testDatum}
 	twoDatum := []*cloudwatch.MetricDatum{&testDatum, &testDatum}
 	threeDatum := []*cloudwatch.MetricDatum{&testDatum, &testDatum, &testDatum}
 
+	assert.Equal([][]*cloudwatch.MetricDatum{}, PartitionDatums(2, zeroDatum))
+	assert.Equal([][]*cloudwatch.MetricDatum{oneDatum}, PartitionDatums(2, oneDatum))
 	assert.Equal([][]*cloudwatch.MetricDatum{oneDatum}, PartitionDatums(2, oneDatum))
 	assert.Equal([][]*cloudwatch.MetricDatum{twoDatum}, PartitionDatums(2, twoDatum))
 	assert.Equal([][]*cloudwatch.MetricDatum{twoDatum, oneDatum}, PartitionDatums(2, threeDatum))

From 5fd8ab36d3d9263f2e8be9a15bd2149ff079b075 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 28 Aug 2017 17:08:44 -0700
Subject: [PATCH 0504/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aca7cf75d..98ffbcedd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,7 @@
 - [#3162](https://github.com/influxdata/telegraf/issues/3162): Fix parsing of SHM remotes in ntpq input
 - [#3149](https://github.com/influxdata/telegraf/issues/3149): Don't fail parsing zpool stats if pool health is UNAVAIL on FreeBSD.
 - [#2672](https://github.com/influxdata/telegraf/issues/2672): Fix NSQ input plugin when used with version 1.0.0-compat.
+- [#2523](https://github.com/influxdata/telegraf/issues/2523): Added CloudWatch metric constraint validation.
 
 ## v1.3.5 [2017-07-26]
 

From ef8876b70bd6fd8c005777163dae5cba0b9ecf3b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 28 Aug 2017 17:17:03 -0700
Subject: [PATCH 0505/1302] Move changelog item to 1.4

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ffbcedd..dbcc0a560 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@
 
 ### Features
 
-- [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
 
 ### Bugfixes
@@ -78,6 +77,7 @@
 - [#2978](https://github.com/influxdata/telegraf/pull/2978): Add gzip content-encoding support to influxdb output.
 - [#3127](https://github.com/influxdata/telegraf/pull/3127): Allow using system plugin in Windows.
 - [#3112](https://github.com/influxdata/telegraf/pull/3112): Add tomcat input plugin.
+- [#3182](https://github.com/influxdata/telegraf/pull/3182): HTTP headers can be added to InfluxDB output.
 
 ### Bugfixes
 

From 3806424aab203c1a4fdb5503913b00317976a585 Mon Sep 17 00:00:00 2001
From: Seua Polyakov <ctrlok@gmail.com>
Date: Wed, 30 Aug 2017 01:59:38 +0300
Subject: [PATCH 0506/1302] Skip non-numerical values in graphite format
 (#3179)

---
 docs/DATA_FORMATS_OUTPUT.md                   |  2 ++
 plugins/serializers/graphite/graphite.go      | 13 ++++++-----
 plugins/serializers/graphite/graphite_test.go | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 2ede82305..15a4e39eb 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -96,6 +96,8 @@ tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690
 tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 ```
 
+Fields with non-numeric values will be skipped.
+
 ### Graphite Configuration:
 
 ```toml
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index 57ddea76f..7cebff4e6 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -32,13 +32,16 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	}
 
 	for fieldName, value := range metric.Fields() {
-		// Convert value to string
-		valueS := fmt.Sprintf("%#v", value)
-		point := []byte(fmt.Sprintf("%s %s %d\n",
+		switch value.(type) {
+		case string:
+			continue
+		}
+		metricString := fmt.Sprintf("%s %#v %d\n",
 			// insert "field" section of template
 			sanitizedChars.Replace(InsertField(bucket, fieldName)),
-			sanitizedChars.Replace(valueS),
-			timestamp))
+			value,
+			timestamp)
+		point := []byte(metricString)
 		out = append(out, point...)
 	}
 	return out, nil
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index 9f9ff3ca8..da622732f 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -165,6 +165,28 @@ func TestSerializeValueField2(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeValueString(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"value": "asdasd",
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		Template: "host.field.tags.measurement",
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+	assert.Equal(t, "", mS[0])
+}
+
 // test that fields with spaces get fixed.
 func TestSerializeFieldWithSpaces(t *testing.T) {
 	now := time.Now()

From 8225bd0173e38263cdf47c4841add0fc2810b7f8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 29 Aug 2017 16:22:03 -0700
Subject: [PATCH 0507/1302] Convert bool fields to int in graphite serializer

---
 docs/DATA_FORMATS_OUTPUT.md                   |  3 +-
 plugins/serializers/graphite/graphite.go      |  8 +++++-
 plugins/serializers/graphite/graphite_test.go | 28 +++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 15a4e39eb..136780381 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -96,7 +96,8 @@ tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690
 tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 ```
 
-Fields with non-numeric values will be skipped.
+Fields with string values will be skipped.  Boolean fields will be converted
+to 1 (true) or 0 (false).
 
 ### Graphite Configuration:
 
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index 7cebff4e6..084ba54e7 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -32,9 +32,15 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	}
 
 	for fieldName, value := range metric.Fields() {
-		switch value.(type) {
+		switch v := value.(type) {
 		case string:
 			continue
+		case bool:
+			if v {
+				value = 1
+			} else {
+				value = 0
+			}
 		}
 		metricString := fmt.Sprintf("%s %#v %d\n",
 			// insert "field" section of template
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index da622732f..62d0f2a24 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -187,6 +187,34 @@ func TestSerializeValueString(t *testing.T) {
 	assert.Equal(t, "", mS[0])
 }
 
+func TestSerializeValueBoolean(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"enabled":  true,
+		"disabled": false,
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		Template: "host.field.tags.measurement",
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("localhost.enabled.cpu0.us-west-2.cpu 1 %d", now.Unix()),
+		fmt.Sprintf("localhost.disabled.cpu0.us-west-2.cpu 0 %d", now.Unix()),
+	}
+	assert.Equal(t, expS, mS)
+}
+
 // test that fields with spaces get fixed.
 func TestSerializeFieldWithSpaces(t *testing.T) {
 	now := time.Now()

From 19f326407392c369414e49ce7da9f4f7252c5bee Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 29 Aug 2017 16:27:02 -0700
Subject: [PATCH 0508/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbcc0a560..d68d05508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,6 +117,7 @@
 - [#3149](https://github.com/influxdata/telegraf/issues/3149): Don't fail parsing zpool stats if pool health is UNAVAIL on FreeBSD.
 - [#2672](https://github.com/influxdata/telegraf/issues/2672): Fix NSQ input plugin when used with version 1.0.0-compat.
 - [#2523](https://github.com/influxdata/telegraf/issues/2523): Added CloudWatch metric constraint validation.
+- [#3179](https://github.com/influxdata/telegraf/issues/3179): Skip non-numerical values in graphite format.
 
 ## v1.3.5 [2017-07-26]
 

From 28d16188b3c2b4da1e40d960ee92a48d599d12a2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 30 Aug 2017 21:16:37 -0700
Subject: [PATCH 0509/1302] Fix panic when handling string fields with escapes
 (#3188)

---
 internal/models/makemetric.go         |  6 ---
 internal/models/running_input_test.go |  7 +--
 metric/metric.go                      | 61 ++++++++++++++++++++++-----
 metric/metric_test.go                 |  1 +
 4 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/internal/models/makemetric.go b/internal/models/makemetric.go
index b2c150546..19d10f589 100644
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -150,12 +150,6 @@ func makemetric(
 				continue
 			}
 		case string:
-			if strings.HasSuffix(val, `\`) {
-				log.Printf("D! Measurement [%s] field [%s] has a value "+
-					"ending with a backslash, skipping", measurement, k)
-				delete(fields, k)
-				continue
-			}
 			fields[k] = v
 		default:
 			fields[k] = v
diff --git a/internal/models/running_input_test.go b/internal/models/running_input_test.go
index 1a6491e35..c653090e8 100644
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -370,16 +370,17 @@ func TestMakeMetric_TrailingSlash(t *testing.T) {
 			expectedTags: map[string]string{},
 		},
 		{
-			name:        "Field value with trailing slash dropped",
+			name:        "Field value with trailing slash okay",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
 				"value": int64(42),
-				"bad":   `xyzzy\`,
+				"ok":    `xyzzy\`,
 			},
 			tags:                map[string]string{},
 			expectedMeasurement: `cpu`,
 			expectedFields: map[string]interface{}{
 				"value": int64(42),
+				"ok":    `xyzzy\`,
 			},
 			expectedTags: map[string]string{},
 		},
@@ -387,7 +388,7 @@ func TestMakeMetric_TrailingSlash(t *testing.T) {
 			name:        "Must have one field after dropped",
 			measurement: `cpu`,
 			fields: map[string]interface{}{
-				"bad": `xyzzy\`,
+				"bad": math.NaN(),
 			},
 			tags:        map[string]string{},
 			expectedNil: true,
diff --git a/metric/metric.go b/metric/metric.go
index 63e609290..e46cfd189 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -21,14 +21,14 @@ func New(
 	t time.Time,
 	mType ...telegraf.ValueType,
 ) (telegraf.Metric, error) {
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("Metric cannot be made without any fields")
-	}
 	if len(name) == 0 {
-		return nil, fmt.Errorf("Metric cannot be made with an empty name")
+		return nil, fmt.Errorf("missing measurement name")
+	}
+	if len(fields) == 0 {
+		return nil, fmt.Errorf("%s: must have one or more fields", name)
 	}
 	if strings.HasSuffix(name, `\`) {
-		return nil, fmt.Errorf("Metric cannot have measurement name ending with a backslash")
+		return nil, fmt.Errorf("%s: measurement name cannot end with a backslash", name)
 	}
 
 	var thisType telegraf.ValueType
@@ -49,10 +49,10 @@ func New(
 	taglen := 0
 	for k, v := range tags {
 		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("Metric cannot have tag key ending with a backslash")
+			return nil, fmt.Errorf("%s: tag key cannot end with a backslash: %s", name, k)
 		}
 		if strings.HasSuffix(v, `\`) {
-			return nil, fmt.Errorf("Metric cannot have tag value ending with a backslash")
+			return nil, fmt.Errorf("%s: tag value cannot end with a backslash: %s", name, v)
 		}
 
 		if len(k) == 0 || len(v) == 0 {
@@ -79,7 +79,7 @@ func New(
 	fieldlen := 0
 	for k, _ := range fields {
 		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("Metric cannot have field key ending with a backslash")
+			return nil, fmt.Errorf("%s: field key cannot end with a backslash: %s", name, k)
 		}
 
 		// 10 bytes is completely arbitrary, but will at least prevent some
@@ -102,7 +102,8 @@ func New(
 }
 
 // indexUnescapedByte finds the index of the first byte equal to b in buf that
-// is not escaped. Returns -1 if not found.
+// is not escaped.  Does not allow the escape char to be escaped. Returns -1 if
+// not found.
 func indexUnescapedByte(buf []byte, b byte) int {
 	var keyi int
 	for {
@@ -122,6 +123,46 @@ func indexUnescapedByte(buf []byte, b byte) int {
 	return keyi
 }
 
+// indexUnescapedByteBackslashEscaping finds the index of the first byte equal
+// to b in buf that is not escaped.  Allows for the escape char `\` to be
+// escaped.  Returns -1 if not found.
+func indexUnescapedByteBackslashEscaping(buf []byte, b byte) int {
+	var keyi int
+	for {
+		i := bytes.IndexByte(buf[keyi:], b)
+		if i == -1 {
+			return -1
+		} else if i == 0 {
+			break
+		}
+		keyi += i
+		if countBackslashes(buf, keyi-1)%2 == 0 {
+			break
+		} else {
+			keyi++
+		}
+	}
+	return keyi
+}
+
+// countBackslashes counts the number of preceding backslashes starting at
+// the 'start' index.
+func countBackslashes(buf []byte, index int) int {
+	var count int
+	for {
+		if index < 0 {
+			return count
+		}
+		if buf[index] == '\\' {
+			count++
+			index--
+		} else {
+			break
+		}
+	}
+	return count
+}
+
 type metric struct {
 	name   []byte
 	tags   []byte
@@ -283,7 +324,7 @@ func (m *metric) Fields() map[string]interface{} {
 		// end index of field value
 		var i3 int
 		if m.fields[i:][i2] == '"' {
-			i3 = indexUnescapedByte(m.fields[i:][i2+1:], '"')
+			i3 = indexUnescapedByteBackslashEscaping(m.fields[i:][i2+1:], '"')
 			if i3 == -1 {
 				i3 = len(m.fields[i:])
 			}
diff --git a/metric/metric_test.go b/metric/metric_test.go
index b1a23e6df..db71bf92a 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -258,6 +258,7 @@ func TestNewMetric_Fields(t *testing.T) {
 		"quote_string":           `x"y`,
 		"backslash_quote_string": `x\"y`,
 		"backslash":              `x\y`,
+		"ends_with_backslash":    `x\`,
 	}
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)

From f43af72785cd2be017a37f41dfb067c8af5e3fbc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 31 Aug 2017 13:43:47 -0700
Subject: [PATCH 0510/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d68d05508..5e5c1e135 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
 - [#2672](https://github.com/influxdata/telegraf/issues/2672): Fix NSQ input plugin when used with version 1.0.0-compat.
 - [#2523](https://github.com/influxdata/telegraf/issues/2523): Added CloudWatch metric constraint validation.
 - [#3179](https://github.com/influxdata/telegraf/issues/3179): Skip non-numerical values in graphite format.
+- [#3187](https://github.com/influxdata/telegraf/issues/3187): Fix panic when handling string fields with escapes.
 
 ## v1.3.5 [2017-07-26]
 

From 16d6011ca1e01e188ebec5a25a81079e6471e800 Mon Sep 17 00:00:00 2001
From: rdxmb <30314040+rdxmb@users.noreply.github.com>
Date: Tue, 5 Sep 2017 20:44:51 +0200
Subject: [PATCH 0511/1302] Fix docker image name in docs (#3193)

---
 plugins/inputs/system/DISK_README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index 30e54f29c..bbb78961d 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -22,7 +22,7 @@ The prefix is stripped from the reported `path` in the measurement.
 This settings is useful when running `telegraf` inside a docker container to report host machine metrics.
 In this case, the host's root volume should be mounted into the container and the `HOST_MOUNT_PREFIX` and `HOST_ETC` environment variables set.
 
-`docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_ETC=/hostfs/etc telegraf-docker`
+`docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_ETC=/hostfs/etc telegraf`
 
 ### Measurements & Fields:
 

From 98e784faf3b7933d48fe27f25a185ed9e7afaaba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Sep 2017 12:50:01 -0700
Subject: [PATCH 0512/1302] Sort metrics before comparing in graphite test

---
 plugins/serializers/graphite/graphite_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index 62d0f2a24..a6dd1aaa9 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -212,6 +212,8 @@ func TestSerializeValueBoolean(t *testing.T) {
 		fmt.Sprintf("localhost.enabled.cpu0.us-west-2.cpu 1 %d", now.Unix()),
 		fmt.Sprintf("localhost.disabled.cpu0.us-west-2.cpu 0 %d", now.Unix()),
 	}
+	sort.Strings(mS)
+	sort.Strings(expS)
 	assert.Equal(t, expS, mS)
 }
 

From 9796d3c99d49cf0d031cc2c803bd369efb7f3426 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Sep 2017 12:55:21 -0700
Subject: [PATCH 0513/1302] Use ip address for default InfluxDB ip in config

Helps with initial setup if localhost cannot be resolved due to the pure
go resolver.
---
 etc/telegraf.conf                    | 42 ++++++++++++++++++++--------
 etc/telegraf_windows.conf            |  4 +--
 plugins/inputs/fluentd/README.md     |  4 +--
 plugins/inputs/fluentd/fluentd.go    |  4 +--
 plugins/outputs/influxdb/README.md   |  4 +--
 plugins/outputs/influxdb/influxdb.go |  4 +--
 6 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index ee0c00be0..4831f934b 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -90,8 +90,8 @@
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
+  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
+  urls = ["http://127.0.0.1:8086"] # required
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 
@@ -121,6 +121,9 @@
   ## HTTP Proxy Config
   # http_proxy = "http://corporate.proxy:3128"
 
+  ## Optional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
   ## Compress each HTTP request payload using GZIP.
   # content_encoding = "gzip"
 
@@ -382,12 +385,32 @@
 #
 #   ## Kinesis StreamName must exist prior to starting telegraf.
 #   streamname = "StreamName"
-#   ## PartitionKey as used for sharding data.
+#   ## DEPRECATED: PartitionKey as used for sharding data.
 #   partitionkey = "PartitionKey"
-#   ## If set the paritionKey will be a random UUID on every put.
+#   ## DEPRECATED: If set the paritionKey will be a random UUID on every put.
 #   ## This allows for scaling across multiple shards in a stream.
 #   ## This will cause issues with ordering.
 #   use_random_partitionkey = false
+#   ## The partition key can be calculated using one of several methods:
+#   ##
+#   ## Use a static value for all writes:
+#   #  [outputs.kinesis.partition]
+#   #    method = "static"
+#   #    key = "howdy"
+#   #
+#   ## Use a random partition key on each write:
+#   #  [outputs.kinesis.partition]
+#   #    method = "random"
+#   #
+#   ## Use the measurement name as the partition key:
+#   #  [outputs.kinesis.partition]
+#   #    method = "measurement"
+#   #
+#   ## Use the value of a tag for all writes, if the tag is not set the empty
+#   ## string will be used:
+#   #  [outputs.kinesis.partition]
+#   #    method = "tag"
+#   #    key = "host"
 #
 #
 #   ## Data format to output.
@@ -1095,10 +1118,7 @@
 
 # # Read metrics from fail2ban.
 # [[inputs.fail2ban]]
-#   ## fail2ban-client require root access.
-#   ## Setting 'use_sudo' to true will make use of sudo to run fail2ban-client.
-#   ## Users must configure sudo to allow telegraf user to run fail2ban-client with no password.
-#   ## This plugin run only "fail2ban-client status".
+#   ## Use sudo to run fail2ban-client
 #   use_sudo = false
 
 
@@ -1126,7 +1146,7 @@
 #   ## - only one URI is allowed
 #   ## - https is not supported
 #   endpoint = "http://localhost:24220/api/plugins.json"
-#   	
+#
 #   ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
 #   exclude = [
 # 	  "monitor_agent",
@@ -2382,10 +2402,10 @@
 #   ## Use SSL but skip chain & host verification
 #   # insecure_skip_verify = false
 #
-#   ## Data format to output.
+#   ## Data format to consume.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
 
 
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 535b0f414..ed5ce1fba 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -63,8 +63,8 @@
   # The full HTTP or UDP endpoint URL for your InfluxDB instance.
   # Multiple urls can be specified but it is assumed that they are part of the same
   # cluster, this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
+  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
+  urls = ["http://127.0.0.1:8086"] # required
   # The target database for metrics (telegraf will create it if not exists)
   database = "telegraf" # required
   # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h".
diff --git a/plugins/inputs/fluentd/README.md b/plugins/inputs/fluentd/README.md
index e316bddf2..e46428417 100644
--- a/plugins/inputs/fluentd/README.md
+++ b/plugins/inputs/fluentd/README.md
@@ -22,11 +22,11 @@ example configuratio with `@id` parameter for http plugin:
 [[inputs.fluentd]]
   ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
   ##
-  ## Endpoint: 
+  ## Endpoint:
   ## - only one URI is allowed
   ## - https is not supported
   endpoint = "http://localhost:24220/api/plugins.json"
-  
+
   ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
   exclude = [
 	  "monitor_agent",
diff --git a/plugins/inputs/fluentd/fluentd.go b/plugins/inputs/fluentd/fluentd.go
index fdb6dbaa5..ba8dba802 100644
--- a/plugins/inputs/fluentd/fluentd.go
+++ b/plugins/inputs/fluentd/fluentd.go
@@ -18,11 +18,11 @@ const (
 	sampleConfig = `
   ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
   ##
-  ## Endpoint: 
+  ## Endpoint:
   ## - only one URI is allowed
   ## - https is not supported
   endpoint = "http://localhost:24220/api/plugins.json"
-  	
+
   ## Define which plugins have to be excluded (based on "type" field - e.g. monitor_agent)
   exclude = [
 	  "monitor_agent",
diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 31326c918..c6ddf3586 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -13,8 +13,8 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
+  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
+  urls = ["http://127.0.0.1:8086"] # required
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index f2f946513..5780cb72c 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -59,8 +59,8 @@ var sampleConfig = `
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
+  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
+  urls = ["http://127.0.0.1:8086"] # required
   ## The target database for metrics (telegraf will create it if not exists).
   database = "telegraf" # required
 

From 4fb1c3a2bc9062a207ab1f92ac65d567ba38d346 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Sep 2017 13:12:11 -0700
Subject: [PATCH 0514/1302] Add FAQ doc with dns resolver information

---
 docs/FAQ.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 docs/FAQ.md

diff --git a/docs/FAQ.md b/docs/FAQ.md
new file mode 100644
index 000000000..1a03d9368
--- /dev/null
+++ b/docs/FAQ.md
@@ -0,0 +1,21 @@
+# Frequently Asked Questions
+
+### Q: Telegraf cannot resolve hostnames that are resolvable via `dig`, `host`, `nslookup`, etc.
+
+Go uses a pure Go resolver by default for [name resolution](https://golang.org/pkg/net/#hdr-Name_Resolution).
+This resolver behaves differently than the C library functions but is more
+efficient when used with the Go runtime.
+
+If you encounter problems or want to use more advanced name resolution methods
+that are unsupported by the pure Go resolver, you can switch to the cgo
+resolver.
+
+If running manually set:
+```
+export GODEBUG=netdns=cgo
+```
+
+If running as a service add the environment variable to `/etc/default/telegraf`:
+```
+GODEBUG=netdns=cgo
+```

From 864ea1efaf167eef10f6a5a7d6bdfa88a092ecf8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Sep 2017 17:12:36 -0700
Subject: [PATCH 0515/1302] Improve question title in FAQ

---
 docs/FAQ.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 1a03d9368..d756bb2f3 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,6 +1,7 @@
 # Frequently Asked Questions
 
-### Q: Telegraf cannot resolve hostnames that are resolvable via `dig`, `host`, `nslookup`, etc.
+### Q: Why do I get a "no such host" error resolving hostnames that other
+programs can resolve?
 
 Go uses a pure Go resolver by default for [name resolution](https://golang.org/pkg/net/#hdr-Name_Resolution).
 This resolver behaves differently than the C library functions but is more

From ab1c11b06d7b1a0542d1d8b2106e6af825b866cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Sep 2017 17:14:11 -0700
Subject: [PATCH 0516/1302] Add 1.4.0 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e5c1e135..df939b323 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 
 ### Bugfixes
 
-## v1.4 [unreleased]
+## v1.4 [2017-09-05]
 
 ### Release Notes
 

From 5d4eec606fec50f149ddb19e13513705e6cdd8ae Mon Sep 17 00:00:00 2001
From: Pavel Gurkov <true.neu@gmail.com>
Date: Wed, 6 Sep 2017 23:18:26 +0200
Subject: [PATCH 0517/1302] Add Kafka output plugin topic_suffix option (#3196)

---
 plugins/outputs/kafka/README.md     |  33 +++++-
 plugins/outputs/kafka/kafka.go      | 164 +++++++++++++++++++++-------
 plugins/outputs/kafka/kafka_test.go |  67 ++++++++++++
 3 files changed, 220 insertions(+), 44 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index abd9c4921..b112c09cd 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -8,6 +8,34 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   brokers = ["localhost:9092"]
   ## Kafka topic for producer messages
   topic = "telegraf"
+
+  ## Optional topic suffix configuration.
+  ## If the section is omitted, no suffix is used.
+  ## Following topic suffix methods are supported:
+  ##   measurement - suffix equals to separator + measurement's name
+  ##   tags        - suffix equals to separator + specified tags' values
+  ##                 interleaved with separator
+
+  ## Suffix equals to "_" + measurement's name
+  # [outputs.kafka.topic_suffix]
+  #   method = "measurement"
+  #   separator = "_"
+
+  ## Suffix equals to "__" + measurement's "foo" tag value.
+  ##   If there's no such a tag, suffix equals to an empty string
+  # [outputs.kafka.topic_suffix]
+  #   method = "tags"
+  #   keys = ["foo"]
+  #   separator = "__"
+
+  ## Suffix equals to "_" + measurement's "foo" and "bar"
+  ##   tag values, separated by "_". If there is no such tags,
+  ##   their values treated as empty strings.
+  # [outputs.kafka.topic_suffix]
+  #   method = "tags"
+  #   keys = ["foo", "bar"]
+  #   separator = "_"
+
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
@@ -57,10 +85,9 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
 * `brokers`: List of strings, this is for speaking to a cluster of `kafka` brokers. On each flush interval, Telegraf will randomly choose one of the urls to write to. Each URL should just include host and port e.g. -> `["{host}:{port}","{host2}:{port2}"]`
 * `topic`: The `kafka` topic to publish to.
 
-
 ### Optional parameters:
 
-* `routing_tag`:  if this tag exists, its value will be used as the routing key
+* `routing_tag`: If this tag exists, its value will be used as the routing key
 * `compression_codec`: What level of compression to use: `0` -> no compression, `1` -> gzip compression, `2` -> snappy compression
 * `required_acks`: a setting for how may `acks` required from the `kafka` broker cluster.
 * `max_retry`: Max number of times to retry failed write
@@ -69,3 +96,5 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
 * `ssl_key`: SSL key
 * `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
 * `data_format`: [About Telegraf data formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md)
+* `topic_suffix`: Which, if any, method of calculating `kafka` topic suffix to use.
+For examples, please refer to sample configuration.
\ No newline at end of file
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 421b5c2a1..c2f2e4460 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -3,6 +3,7 @@ package kafka
 import (
 	"crypto/tls"
 	"fmt"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
@@ -12,54 +13,97 @@ import (
 	"github.com/Shopify/sarama"
 )
 
-type Kafka struct {
-	// Kafka brokers to send metrics to
-	Brokers []string
-	// Kafka topic
-	Topic string
-	// Routing Key Tag
-	RoutingTag string `toml:"routing_tag"`
-	// Compression Codec Tag
-	CompressionCodec int
-	// RequiredAcks Tag
-	RequiredAcks int
-	// MaxRetry Tag
-	MaxRetry int
-
-	// Legacy SSL config options
-	// TLS client certificate
-	Certificate string
-	// TLS client key
-	Key string
-	// TLS certificate authority
-	CA string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-
-	// Skip SSL verification
-	InsecureSkipVerify bool
-
-	// SASL Username
-	SASLUsername string `toml:"sasl_username"`
-	// SASL Password
-	SASLPassword string `toml:"sasl_password"`
-
-	tlsConfig tls.Config
-	producer  sarama.SyncProducer
-
-	serializer serializers.Serializer
+var ValidTopicSuffixMethods = []string{
+	"",
+	"measurement",
+	"tags",
 }
 
+type (
+	Kafka struct {
+		// Kafka brokers to send metrics to
+		Brokers []string
+		// Kafka topic
+		Topic string
+		// Kafka topic suffix option
+		TopicSuffix TopicSuffix `toml:"topic_suffix"`
+		// Routing Key Tag
+		RoutingTag string `toml:"routing_tag"`
+		// Compression Codec Tag
+		CompressionCodec int
+		// RequiredAcks Tag
+		RequiredAcks int
+		// MaxRetry Tag
+		MaxRetry int
+
+		// Legacy SSL config options
+		// TLS client certificate
+		Certificate string
+		// TLS client key
+		Key string
+		// TLS certificate authority
+		CA string
+
+		// Path to CA file
+		SSLCA string `toml:"ssl_ca"`
+		// Path to host cert file
+		SSLCert string `toml:"ssl_cert"`
+		// Path to cert key file
+		SSLKey string `toml:"ssl_key"`
+
+		// Skip SSL verification
+		InsecureSkipVerify bool
+
+		// SASL Username
+		SASLUsername string `toml:"sasl_username"`
+		// SASL Password
+		SASLPassword string `toml:"sasl_password"`
+
+		tlsConfig tls.Config
+		producer  sarama.SyncProducer
+
+		serializer serializers.Serializer
+	}
+	TopicSuffix struct {
+		Method    string   `toml:"method"`
+		Keys      []string `toml:"keys"`
+		Separator string   `toml:"separator"`
+	}
+)
+
 var sampleConfig = `
   ## URLs of kafka brokers
   brokers = ["localhost:9092"]
   ## Kafka topic for producer messages
   topic = "telegraf"
+
+  ## Optional topic suffix configuration.
+  ## If the section is omitted, no suffix is used.
+  ## Following topic suffix methods are supported:
+  ##   measurement - suffix equals to separator + measurement's name
+  ##   tags        - suffix equals to separator + specified tags' values
+  ##                 interleaved with separator
+
+  ## Suffix equals to "_" + measurement name
+  # [outputs.kafka.topic_suffix]
+  #   method = "measurement"
+  #   separator = "_"
+
+  ## Suffix equals to "__" + measurement's "foo" tag value.
+  ##   If there's no such a tag, suffix equals to an empty string
+  # [outputs.kafka.topic_suffix]
+  #   method = "tags"
+  #   keys = ["foo"]
+  #   separator = "__"
+
+  ## Suffix equals to "_" + measurement's "foo" and "bar"
+  ##   tag values, separated by "_". If there is no such tags,
+  ##   their values treated as empty strings.
+  # [outputs.kafka.topic_suffix]
+  #   method = "tags"
+  #   keys = ["foo", "bar"]
+  #   separator = "_"
+
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
@@ -108,11 +152,45 @@ var sampleConfig = `
   data_format = "influx"
 `
 
+func ValidateTopicSuffixMethod(method string) error {
+	for _, validMethod := range ValidTopicSuffixMethods {
+		if method == validMethod {
+			return nil
+		}
+	}
+	return fmt.Errorf("Unkown topic suffix method provided: %s", method)
+}
+
+func (k *Kafka) GetTopicName(metric telegraf.Metric) string {
+	var topicName string
+	switch k.TopicSuffix.Method {
+	case "measurement":
+		topicName = k.Topic + k.TopicSuffix.Separator + metric.Name()
+	case "tags":
+		var topicNameComponents []string
+		topicNameComponents = append(topicNameComponents, k.Topic)
+		for _, tag := range k.TopicSuffix.Keys {
+			tagValue := metric.Tags()[tag]
+			if tagValue != "" {
+				topicNameComponents = append(topicNameComponents, tagValue)
+			}
+		}
+		topicName = strings.Join(topicNameComponents, k.TopicSuffix.Separator)
+	default:
+		topicName = k.Topic
+	}
+	return topicName
+}
+
 func (k *Kafka) SetSerializer(serializer serializers.Serializer) {
 	k.serializer = serializer
 }
 
 func (k *Kafka) Connect() error {
+	err := ValidateTopicSuffixMethod(k.TopicSuffix.Method)
+	if err != nil {
+		return err
+	}
 	config := sarama.NewConfig()
 
 	config.Producer.RequiredAcks = sarama.RequiredAcks(k.RequiredAcks)
@@ -175,8 +253,10 @@ func (k *Kafka) Write(metrics []telegraf.Metric) error {
 			return err
 		}
 
+		topicName := k.GetTopicName(metric)
+
 		m := &sarama.ProducerMessage{
-			Topic: k.Topic,
+			Topic: topicName,
 			Value: sarama.ByteEncoder(buf),
 		}
 		if h, ok := metric.Tags()[k.RoutingTag]; ok {
diff --git a/plugins/outputs/kafka/kafka_test.go b/plugins/outputs/kafka/kafka_test.go
index f99e0ecea..b18d9f15d 100644
--- a/plugins/outputs/kafka/kafka_test.go
+++ b/plugins/outputs/kafka/kafka_test.go
@@ -8,6 +8,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+type topicSuffixTestpair struct {
+	topicSuffix   TopicSuffix
+	expectedTopic string
+}
+
 func TestConnectAndWrite(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
@@ -28,4 +33,66 @@ func TestConnectAndWrite(t *testing.T) {
 	// Verify that we can successfully write data to the kafka broker
 	err = k.Write(testutil.MockMetrics())
 	require.NoError(t, err)
+	k.Close()
+}
+
+func TestTopicSuffixes(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	topic := "Test"
+
+	metric := testutil.TestMetric(1)
+	metricTagName := "tag1"
+	metricTagValue := metric.Tags()[metricTagName]
+	metricName := metric.Name()
+
+	var testcases = []topicSuffixTestpair{
+		// This ensures empty separator is okay
+		{TopicSuffix{Method: "measurement"},
+			topic + metricName},
+		{TopicSuffix{Method: "measurement", Separator: "sep"},
+			topic + "sep" + metricName},
+		{TopicSuffix{Method: "tags", Keys: []string{metricTagName}, Separator: "_"},
+			topic + "_" + metricTagValue},
+		{TopicSuffix{Method: "tags", Keys: []string{metricTagName, metricTagName, metricTagName}, Separator: "___"},
+			topic + "___" + metricTagValue + "___" + metricTagValue + "___" + metricTagValue},
+		{TopicSuffix{Method: "tags", Keys: []string{metricTagName, metricTagName, metricTagName}},
+			topic + metricTagValue + metricTagValue + metricTagValue},
+		// This ensures non-existing tags are ignored
+		{TopicSuffix{Method: "tags", Keys: []string{"non_existing_tag", "non_existing_tag"}, Separator: "___"},
+			topic},
+		{TopicSuffix{Method: "tags", Keys: []string{metricTagName, "non_existing_tag"}, Separator: "___"},
+			topic + "___" + metricTagValue},
+		// This ensures backward compatibility
+		{TopicSuffix{},
+			topic},
+	}
+
+	for _, testcase := range testcases {
+		topicSuffix := testcase.topicSuffix
+		expectedTopic := testcase.expectedTopic
+		k := &Kafka{
+			Topic:       topic,
+			TopicSuffix: topicSuffix,
+		}
+
+		topic := k.GetTopicName(metric)
+		require.Equal(t, expectedTopic, topic)
+	}
+}
+
+func TestValidateTopicSuffixMethod(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	err := ValidateTopicSuffixMethod("invalid_topic_suffix_method")
+	require.Error(t, err, "Topic suffix method used should be invalid.")
+
+	for _, method := range ValidTopicSuffixMethods {
+		err := ValidateTopicSuffixMethod(method)
+		require.NoError(t, err, "Topic suffix method used should be valid.")
+	}
 }

From 402a0f16e1e7c854685cccff453176e3427a8784 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 6 Sep 2017 14:19:42 -0700
Subject: [PATCH 0518/1302] Fix typo

---
 plugins/outputs/kafka/kafka.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index c2f2e4460..ce88d0a48 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -158,7 +158,7 @@ func ValidateTopicSuffixMethod(method string) error {
 			return nil
 		}
 	}
-	return fmt.Errorf("Unkown topic suffix method provided: %s", method)
+	return fmt.Errorf("Unknown topic suffix method provided: %s", method)
 }
 
 func (k *Kafka) GetTopicName(metric telegraf.Metric) string {

From 144862354a4a68599f9f2d7441d945a81fefbcd8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 6 Sep 2017 14:20:38 -0700
Subject: [PATCH 0519/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df939b323..f7bf92969 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Features
 
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
+- [#3196](https://github.com/influxdata/telegraf/pull/3196): Add Kafka output plugin topic_suffix option.
 
 ### Bugfixes
 

From 99dfc69fbb3df518fed02c2b580d44ce9d5d1130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Benencia?= <rul@kalgan.cc>
Date: Wed, 6 Sep 2017 18:28:11 -0300
Subject: [PATCH 0520/1302] Include mount mode option in disk metrics (#3027)

---
 plugins/inputs/system/DISK_README.md |  9 +++++----
 plugins/inputs/system/disk.go        | 27 +++++++++++++++++++++++++++
 plugins/inputs/system/disk_test.go   | 14 +++++++++-----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index bbb78961d..b3b6a52fa 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -40,16 +40,17 @@ In this case, the host's root volume should be mounted into the container and th
 - All measurements have the following tags:
     - fstype (filesystem type)
     - path (mount point path)
+    - mode (whether the mount is rw or ro)
 
 ### Example Output:
 
 ```
 % ./telegraf --config ~/ws/telegraf.conf --input-filter disk --test
 * Plugin: disk, Collection 1
-> disk,fstype=hfs,path=/ free=398407520256i,inodes_free=97267461i,inodes_total=121847806i,inodes_used=24580345i,total=499088621568i,used=100418957312i,used_percent=20.131039916242397 1453832006274071563
-> disk,fstype=devfs,path=/dev free=0i,inodes_free=0i,inodes_total=628i,inodes_used=628i,total=185856i,used=185856i,used_percent=100 1453832006274137913
-> disk,fstype=autofs,path=/net free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274157077
-> disk,fstype=autofs,path=/home free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274169688
+> disk,fstype=hfs,mode=ro,path=/ free=398407520256i,inodes_free=97267461i,inodes_total=121847806i,inodes_used=24580345i,total=499088621568i,used=100418957312i,used_percent=20.131039916242397 1453832006274071563
+> disk,fstype=devfs,mode=rw,path=/dev free=0i,inodes_free=0i,inodes_total=628i,inodes_used=628i,total=185856i,used=185856i,used_percent=100 1453832006274137913
+> disk,fstype=autofs,mode=rw,path=/net free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274157077
+> disk,fstype=autofs,mode=rw,path=/home free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274169688
 ```
 
 
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index f2d484273..ddacbab46 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -53,10 +53,12 @@ func (s *DiskStats) Gather(acc telegraf.Accumulator) error {
 			// Skip dummy filesystem (procfs, cgroupfs, ...)
 			continue
 		}
+		mountOpts := parseOptions(partitions[i].Opts)
 		tags := map[string]string{
 			"path":   du.Path,
 			"device": strings.Replace(partitions[i].Device, "/dev/", "", -1),
 			"fstype": du.Fstype,
+			"mode":   mountOpts.Mode(),
 		}
 		var used_percent float64
 		if du.Used+du.Free > 0 {
@@ -219,6 +221,31 @@ func (s *DiskIOStats) diskTags(devName string) map[string]string {
 	return tags
 }
 
+type MountOptions []string
+
+func (opts MountOptions) Mode() string {
+	if opts.exists("rw") {
+		return "rw"
+	} else if opts.exists("ro") {
+		return "ro"
+	} else {
+		return "unknown"
+	}
+}
+
+func (opts MountOptions) exists(opt string) bool {
+	for _, o := range opts {
+		if o == opt {
+			return true
+		}
+	}
+	return false
+}
+
+func parseOptions(opts string) MountOptions {
+	return strings.Split(opts, ",")
+}
+
 func init() {
 	ps := newSystemPS()
 	inputs.Add("disk", func() telegraf.Input {
diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/system/disk_test.go
index 5ba4d041f..28a433fe9 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -28,13 +28,13 @@ func TestDiskUsage(t *testing.T) {
 			Device:     "/dev/sda",
 			Mountpoint: "/",
 			Fstype:     "ext4",
-			Opts:       "",
+			Opts:       "ro,noatime,nodiratime",
 		},
 		{
 			Device:     "/dev/sdb",
 			Mountpoint: "/home",
 			Fstype:     "ext4",
-			Opts:       "",
+			Opts:       "rw,noatime,nodiratime,errors=remount-ro",
 		},
 	}
 	duAll := []disk.UsageStat{
@@ -78,11 +78,13 @@ func TestDiskUsage(t *testing.T) {
 		"path":   "/",
 		"fstype": "ext4",
 		"device": "sda",
+		"mode":   "ro",
 	}
 	tags2 := map[string]string{
 		"path":   "/home",
 		"fstype": "ext4",
 		"device": "sdb",
+		"mode":   "rw",
 	}
 
 	fields1 := map[string]interface{}{
@@ -163,13 +165,13 @@ func TestDiskStats(t *testing.T) {
 			Device:     "/dev/sda",
 			Mountpoint: "/",
 			Fstype:     "ext4",
-			Opts:       "",
+			Opts:       "ro,noatime,nodiratime",
 		},
 		{
 			Device:     "/dev/sdb",
 			Mountpoint: "/home",
 			Fstype:     "ext4",
-			Opts:       "",
+			Opts:       "rw,noatime,nodiratime,errors=remount-ro",
 		},
 	}
 
@@ -178,7 +180,7 @@ func TestDiskStats(t *testing.T) {
 			Device:     "/dev/sda",
 			Mountpoint: "/",
 			Fstype:     "ext4",
-			Opts:       "",
+			Opts:       "ro,noatime,nodiratime",
 		},
 	}
 
@@ -197,11 +199,13 @@ func TestDiskStats(t *testing.T) {
 		"path":   "/",
 		"fstype": "ext4",
 		"device": "sda",
+		"mode":   "ro",
 	}
 	tags2 := map[string]string{
 		"path":   "/home",
 		"fstype": "ext4",
 		"device": "sdb",
+		"mode":   "rw",
 	}
 
 	fields1 := map[string]interface{}{

From 98ca22597d3bbaecfe4c043fd26fc96aec2366b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 6 Sep 2017 14:29:03 -0700
Subject: [PATCH 0521/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7bf92969..6461943e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
 - [#3196](https://github.com/influxdata/telegraf/pull/3196): Add Kafka output plugin topic_suffix option.
+- [#3027](https://github.com/influxdata/telegraf/pull/3027): Include mount mode option in disk metrics.
 
 ### Bugfixes
 

From d0b690f0409c6b9a0c6e53f66e3193474391f152 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 8 Sep 2017 13:03:37 -0700
Subject: [PATCH 0522/1302] Fix short tests on darwin (#3099)

---
 internal/internal_test.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/internal/internal_test.go b/internal/internal_test.go
index aafc1929a..5be5b08d2 100644
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -40,6 +40,7 @@ func TestSnakeCase(t *testing.T) {
 var (
 	sleepbin, _ = exec.LookPath("sleep")
 	echobin, _  = exec.LookPath("echo")
+	shell, _    = exec.LookPath("sh")
 )
 
 func TestRunTimeout(t *testing.T) {
@@ -84,13 +85,13 @@ func TestCombinedOutput(t *testing.T) {
 // test that CombinedOutputTimeout and exec.Cmd.CombinedOutput return
 // the same output from a failed command.
 func TestCombinedOutputError(t *testing.T) {
-	if sleepbin == "" {
-		t.Skip("'sleep' binary not available on OS, skipping.")
+	if shell == "" {
+		t.Skip("'sh' binary not available on OS, skipping.")
 	}
-	cmd := exec.Command(sleepbin, "foo")
+	cmd := exec.Command(shell, "-c", "false")
 	expected, err := cmd.CombinedOutput()
 
-	cmd2 := exec.Command(sleepbin, "foo")
+	cmd2 := exec.Command(shell, "-c", "false")
 	actual, err := CombinedOutputTimeout(cmd2, time.Second)
 
 	assert.Error(t, err)
@@ -98,10 +99,10 @@ func TestCombinedOutputError(t *testing.T) {
 }
 
 func TestRunError(t *testing.T) {
-	if sleepbin == "" {
-		t.Skip("'sleep' binary not available on OS, skipping.")
+	if shell == "" {
+		t.Skip("'sh' binary not available on OS, skipping.")
 	}
-	cmd := exec.Command(sleepbin, "foo")
+	cmd := exec.Command(shell, "-c", "false")
 	err := RunTimeout(cmd, time.Second)
 
 	assert.Error(t, err)

From 7b08f9d09951bc01524554ae64195b49862bdb2d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 8 Sep 2017 15:35:20 -0700
Subject: [PATCH 0523/1302] Add support for standard proxy env vars in outputs.
 (#3212)

---
 plugins/outputs/amon/amon.go            | 3 +++
 plugins/outputs/datadog/datadog.go      | 4 ++++
 plugins/outputs/influxdb/client/http.go | 1 +
 plugins/outputs/librato/librato.go      | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/plugins/outputs/amon/amon.go b/plugins/outputs/amon/amon.go
index a113f2616..10298173f 100644
--- a/plugins/outputs/amon/amon.go
+++ b/plugins/outputs/amon/amon.go
@@ -48,6 +48,9 @@ func (a *Amon) Connect() error {
 		return fmt.Errorf("serverkey and amon_instance are required fields for amon output")
 	}
 	a.client = &http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
 		Timeout: a.Timeout.Duration,
 	}
 	return nil
diff --git a/plugins/outputs/datadog/datadog.go b/plugins/outputs/datadog/datadog.go
index cf54de725..6d7531eb5 100644
--- a/plugins/outputs/datadog/datadog.go
+++ b/plugins/outputs/datadog/datadog.go
@@ -55,7 +55,11 @@ func (d *Datadog) Connect() error {
 	if d.Apikey == "" {
 		return fmt.Errorf("apikey is a required field for datadog output")
 	}
+
 	d.client = &http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
 		Timeout: d.Timeout.Duration,
 	}
 	return nil
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 2587b2da5..d8c1951f5 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -53,6 +53,7 @@ func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
 		}
 	} else {
 		transport = http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
 			TLSClientConfig: config.TLSConfig,
 		}
 	}
diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go
index ed020d54f..abd3b055f 100644
--- a/plugins/outputs/librato/librato.go
+++ b/plugins/outputs/librato/librato.go
@@ -80,6 +80,9 @@ func (l *Librato) Connect() error {
 			"api_user and api_token are required fields for librato output")
 	}
 	l.client = &http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
 		Timeout: l.Timeout.Duration,
 	}
 	return nil

From 247c2e71fd46c32affa4b8a6667d20104239874d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 8 Sep 2017 15:36:26 -0700
Subject: [PATCH 0524/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6461943e5..46e18d3cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
 - [#3196](https://github.com/influxdata/telegraf/pull/3196): Add Kafka output plugin topic_suffix option.
 - [#3027](https://github.com/influxdata/telegraf/pull/3027): Include mount mode option in disk metrics.
+- [#3212](https://github.com/influxdata/telegraf/pull/3212): Add support for standard proxy env vars in outputs.
 
 ### Bugfixes
 

From c809debfd4477f1a3b3e8abc790afa046454a32a Mon Sep 17 00:00:00 2001
From: Jeff Nickoloff <jeff.nickoloff@gmail.com>
Date: Fri, 8 Sep 2017 16:01:16 -0700
Subject: [PATCH 0525/1302] TLS and MTLS enhancements to HTTPListener input
 plugin (#3191)

---
 plugins/inputs/http_listener/README.md        |  11 +
 plugins/inputs/http_listener/http_listener.go |  95 ++++--
 .../http_listener/http_listener_test.go       | 292 ++++++++++++++++--
 3 files changed, 357 insertions(+), 41 deletions(-)

diff --git a/plugins/inputs/http_listener/README.md b/plugins/inputs/http_listener/README.md
index 994df654a..65fef036e 100644
--- a/plugins/inputs/http_listener/README.md
+++ b/plugins/inputs/http_listener/README.md
@@ -8,6 +8,10 @@ The `/write` endpoint supports the `precision` query parameter and can be set to
 
 When chaining Telegraf instances using this plugin, CREATE DATABASE requests receive a 200 OK response with message body `{"results":[]}` but they are not relayed. The output configuration of the Telegraf instance which ultimately submits data to InfluxDB determines the destination database.
 
+Enable TLS by specifying the file names of a service TLS certificate and key.
+
+Enable mutually authenticated TLS and authorize client connections by signing certificate authority by including a list of allowed CA certificate file names in ````tls_allowed_cacerts````.
+
 See: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx).
 
 **Example:**
@@ -28,4 +32,11 @@ This is a sample configuration for the plugin.
   ## timeouts
   read_timeout = "10s"
   write_timeout = "10s"
+
+  ## HTTPS
+  tls_cert= "/etc/telegraf/cert.pem"
+  tls_key = "/etc/telegraf/key.pem"
+
+  ## MTLS
+  tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
 ```
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 5ef260304..c1153b149 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -3,7 +3,10 @@ package http_listener
 import (
 	"bytes"
 	"compress/gzip"
+	"crypto/tls"
+	"crypto/x509"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -37,6 +40,10 @@ type HTTPListener struct {
 	MaxLineSize    int
 	Port           int
 
+	TlsAllowedCacerts []string
+	TlsCert           string
+	TlsKey            string
+
 	mu sync.Mutex
 	wg sync.WaitGroup
 
@@ -75,6 +82,14 @@ const sampleConfig = `
   ## Maximum line size allowed to be sent in bytes.
   ## 0 means to use the default of 65536 bytes (64 kibibytes)
   max_line_size = 0
+
+  ## Set one or more allowed client CA certificate file names to 
+  ## enable mutually authenticated TLS connections
+  tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+
+  ## Add service certificate and key
+  tls_cert = "/etc/telegraf/cert.pem"
+  tls_key = "/etc/telegraf/key.pem"
 `
 
 func (h *HTTPListener) SampleConfig() string {
@@ -117,10 +132,33 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 		h.MaxLineSize = DEFAULT_MAX_LINE_SIZE
 	}
 
+	if h.ReadTimeout.Duration < time.Second {
+		h.ReadTimeout.Duration = time.Second * 10
+	}
+	if h.WriteTimeout.Duration < time.Second {
+		h.WriteTimeout.Duration = time.Second * 10
+	}
+
 	h.acc = acc
 	h.pool = NewPool(200, h.MaxLineSize)
 
-	var listener, err = net.Listen("tcp", h.ServiceAddress)
+	tlsConf := h.getTLSConfig()
+
+	server := &http.Server{
+		Addr:         h.ServiceAddress,
+		Handler:      h,
+		ReadTimeout:  h.ReadTimeout.Duration,
+		WriteTimeout: h.WriteTimeout.Duration,
+		TLSConfig:    tlsConf,
+	}
+
+	var err error
+	var listener net.Listener
+	if tlsConf != nil {
+		listener, err = tls.Listen("tcp", h.ServiceAddress, tlsConf)
+	} else {
+		listener, err = net.Listen("tcp", h.ServiceAddress)
+	}
 	if err != nil {
 		return err
 	}
@@ -130,7 +168,7 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.wg.Add(1)
 	go func() {
 		defer h.wg.Done()
-		h.httpListen()
+		server.Serve(h.listener)
 	}()
 
 	log.Printf("I! Started HTTP listener service on %s\n", h.ServiceAddress)
@@ -149,27 +187,6 @@ func (h *HTTPListener) Stop() {
 	log.Println("I! Stopped HTTP listener service on ", h.ServiceAddress)
 }
 
-// httpListen sets up an http.Server and calls server.Serve.
-// like server.Serve, httpListen will always return a non-nil error, for this
-// reason, the error returned should probably be ignored.
-// see https://golang.org/pkg/net/http/#Server.Serve
-func (h *HTTPListener) httpListen() error {
-	if h.ReadTimeout.Duration < time.Second {
-		h.ReadTimeout.Duration = time.Second * 10
-	}
-	if h.WriteTimeout.Duration < time.Second {
-		h.WriteTimeout.Duration = time.Second * 10
-	}
-
-	var server = http.Server{
-		Handler:      h,
-		ReadTimeout:  h.ReadTimeout.Duration,
-		WriteTimeout: h.WriteTimeout.Duration,
-	}
-
-	return server.Serve(h.listener)
-}
-
 func (h *HTTPListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	h.RequestsRecv.Incr(1)
 	defer h.RequestsServed.Incr(1)
@@ -327,6 +344,38 @@ func badRequest(res http.ResponseWriter) {
 	res.Write([]byte(`{"error":"http: bad request"}`))
 }
 
+func (h *HTTPListener) getTLSConfig() *tls.Config {
+	tlsConf := &tls.Config{
+		InsecureSkipVerify: false,
+		Renegotiation:      tls.RenegotiateNever,
+	}
+
+	if len(h.TlsCert) == 0 || len(h.TlsKey) == 0 {
+		return nil
+	}
+
+	cert, err := tls.LoadX509KeyPair(h.TlsCert, h.TlsKey)
+	if err != nil {
+		return nil
+	}
+	tlsConf.Certificates = []tls.Certificate{cert}
+
+	if h.TlsAllowedCacerts != nil {
+		tlsConf.ClientAuth = tls.RequireAndVerifyClientCert
+		clientPool := x509.NewCertPool()
+		for _, ca := range h.TlsAllowedCacerts {
+			c, err := ioutil.ReadFile(ca)
+			if err != nil {
+				continue
+			}
+			clientPool.AppendCertsFromPEM(c)
+		}
+		tlsConf.ClientCAs = clientPool
+	}
+
+	return tlsConf
+}
+
 func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 90de15853..97c36978a 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -2,6 +2,9 @@ package http_listener
 
 import (
 	"bytes"
+	"crypto/tls"
+	"crypto/x509"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -29,6 +32,150 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 	badMsg = "blahblahblah: 42\n"
 
 	emptyMsg = ""
+
+	serviceRootPEM = `-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIUenakcvMDj2URxBvUHBe0Mfhac0cwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTE5NDNa
+Fw0yNzA4MjkwNTIwMTNaMBsxGTAXBgNVBAMTEHRlbGVncmFmLXRlc3QtY2EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxpDlUEC6LNXQMhvTtlWKUekwa
+xh2OaiR16WvO8iA+sYmjlpFXOe+V6YWT+daOGujCqlGdrfDjj3C3pqFPJ6Q4VXaA
+xQyd0Ena7kRtuQ/IUSpTWxyrpSIzKL3dAoV0NYpjFWznjVMP3Rq4l+4cHqviZSvK
+bWUK5n0vBGpEw3A22V9urhlSNkSbECvzn9EFHyIeJX603zaKXYw5wiDwCp1swbXW
+2WS2h45JeI5xrpKcFmLaqRNe0swi6bkGnmefyCv7nsbOLeKyEW9AExDSd6nSLdu9
+TGzhAfnfodcajSmKiQ+7YL9JY1bQ9hlfXk1ULg4riSEMKF+trZFZUanaXeeBAgMB
+AAGjgYAwfjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUiPkCD8gEsSgIiV8jzACMoUZcHaIwHwYDVR0jBBgwFoAUiPkCD8gEsSgIiV8j
+zACMoUZcHaIwGwYDVR0RBBQwEoIQdGVsZWdyYWYtdGVzdC1jYTANBgkqhkiG9w0B
+AQsFAAOCAQEAXeadR7ZVkb2C0F8OEd2CQxVt2/JOqM4G2N2O8uTwf+hIn+qm+jbb
+Q6JokGhr5Ybhvtv3U9JnI6RVI+TOYNkDzs5e2DtntFQmcKb2c+y5Z+OpvWd13ObK
+GMCs4bho6O7h1qo1Z+Ftd6sYQ7JL0MuTGWCNbXv2c1iC4zPT54n1vGZC5so08RO0
+r7bqLLEnkSawabvSAeTxtweCXJUw3D576e0sb8oU0AP/Hn/2IC9E1vFZdjDswEfs
+ARE4Oc5XnN6sqjtp0q5CqPpW6tYFwxdtZFk0VYPXyRnETVgry7Dc/iX6mktIYUx+
+qWSyPEDKALyxx6yUyVDqgcY2VUm0rM/1Iw==
+-----END CERTIFICATE-----`
+	serviceCertPEM = `-----BEGIN CERTIFICATE-----
+MIIDKjCCAhKgAwIBAgIUVYjQKruuFavlMZvV7X6RRF4OyBowDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTM3MjRa
+Fw0xNzA5MzAwNTM3NTRaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANojLHm+4ttLfl8xo4orZ436/o36wdQ30sWz
+xE8eGejhARvCSNIR1Tau41Towq/MQVQQejQJRgqBSz7UEfzJNJGKKKc560j6fmTM
+FHpFNZcTrNrTb0r3blUWF1oswhTgg313OXbVsz+E9tHkT1p/s9uURy3TJ3O/CFHq
+2vTiTQMTq31v0FEN1E/d6uzMhnGy5+QuRu/0A2iPpgXgPopYZwG5t4hN1KklM//l
+j2gMlX6mAYalctFOkDbhIe4/4dQcfT0sWA49KInZmUeB1RdyiNfCoXnDRZHocPIj
+ltYAK/Igda0fdlMisoqh2ZMrCt8yhws7ycc12cFi7ZMv8zvi5p8CAwEAAaNtMGsw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFCdE87Nz7vPpgRmj++6J8rQR
+0F/TMB8GA1UdIwQYMBaAFIj5Ag/IBLEoCIlfI8wAjKFGXB2iMBQGA1UdEQQNMAuC
+CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAIPhMYCsCPvOcvLLkahaZVn2g
+ZbzPDplFhEsH1cpc7vd3GCV2EYjNTbBTDs5NlovSbJLf1DFB+gwsfEjhlFVZB3UQ
+6GtuA5CQh/Skv8ngCDiLP50BbKF0CLa4Ia0xrSTAyRsg2rt9APphbej0yKqJ7j8U
+1KK6rjOSnuzrKseex26VVovjPFq0FgkghWRm0xrAeizGTBCSEStZEPhk3pBo2x95
+a32VPpmhlQMDyiV6m1cc9/MfxMisnyeLqJl8E9nziNa4/BgwwN9DcOp63D9OOa6A
+brtLz8OXqvV+7gKlq+nASFDimXwFKRyqRH6ECyHNTE2K14KZb7+JTa0AUm6Nlw==
+-----END CERTIFICATE-----`
+	serviceKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA2iMseb7i20t+XzGjiitnjfr+jfrB1DfSxbPETx4Z6OEBG8JI
+0hHVNq7jVOjCr8xBVBB6NAlGCoFLPtQR/Mk0kYoopznrSPp+ZMwUekU1lxOs2tNv
+SvduVRYXWizCFOCDfXc5dtWzP4T20eRPWn+z25RHLdMnc78IUera9OJNAxOrfW/Q
+UQ3UT93q7MyGcbLn5C5G7/QDaI+mBeA+ilhnAbm3iE3UqSUz/+WPaAyVfqYBhqVy
+0U6QNuEh7j/h1Bx9PSxYDj0oidmZR4HVF3KI18KhecNFkehw8iOW1gAr8iB1rR92
+UyKyiqHZkysK3zKHCzvJxzXZwWLtky/zO+LmnwIDAQABAoIBABD8MidcrK9kpndl
+FxXYIV0V0SJfBx6uJhRM1hlO/7d5ZauyqhbpWo/CeGMRKK+lmOShz9Ijcre4r5I5
+0xi61gQLHPVAdkidcKAKoAGRSAX2ezwiwIS21Xl8md7ko0wa20I2uVu+chGdGdbo
+DyG91dRgLFauHWFO26f9QIVW5aY6ifyjg1fyxR/9n2YZfkqbjvASW4Mmfv5GR1aT
+mffajgsquy78PKs86f879iG+cfCzPYdoK+h7fsm4EEqDwK8JCsUIY1qN+Tuj5RQY
+zuIuD34+wywe7Jd1vwjQ40Cyilgtnu8Q8s8J05bXrD3mqer5nrqIGOX0vKgs+EXx
+1hV+6ZECgYEA+950L2u8oPzNXu9BAL8Y5Tl384qj1+Cj/g28MuZFoPf/KU0HRN6l
+PBlXKaGP9iX+749tdiNPk5keIwOL8xCVXOpMLOA/jOlGODydG9rX67WCL/R1RcJR
++Pip8dxO1ZNpOKHud06XLMuuVz9qNq0Xwb1VCzNTOxnEDwtXNyDm6OkCgYEA3bcW
+hMeDNn85UA4n0ljcdCmEu12WS7L//jaAOWuPPfM3GgKEIic6hqrPWEuZlZtQnybx
+L6qQgaWyCfl/8z0+5WynQqkVPz1j1dSrSKnemxyeySrmUcOH5UJfAKaG5PUd7H3t
+oPTCxkbW3Bi2QLlgd4nb7+OEk6w0V9Zzv4AFHkcCgYBL/aD2Ub4WoE9iLjNhg0aC
+mmUrcI/gaSFxXDmE7d7iIxC0KE5iI/6cdFTM9bbWoD4bjx2KgDrZIGBsVfyaeE1o
+PDSBcaMa46LRAtCv/8YXkqrVxx6+zlMnF/dGRp7uZ0xeztSA4JBR7p4KKtLj7jN1
+u6b1+yVIdoylsVk+A8pHSQKBgQCUcsn5DTyleHl/SHsRM74naMUeToMbHDaalxMz
+XvkBmZ8DIzwlQe7FzAgYLkYfDWblqMVEDQfERpT2aL9qtU8vfZhf4aYAObJmsYYd
+mN8bLAaE2txrUmfi8JV7cgRPuG7YsVgxtK/U4glqRIGCxJv6bat86vERjvNc/JFz
+XtwOcQKBgF83Ov+EA9pL0AFs+BMiO+0SX/OqLX0TDMSqUKg3jjVfgl+BSBEZIsOu
+g5jqHBx3Om/UyrXdn+lnMhyEgCuNkeC6057B5iGcWucTlnINeejXk/pnbvMtGjD1
+OGWmdXhgLtKg6Edqm+9fnH0UJN6DRxRRCUfzMfbY8TRmLzZG2W34
+-----END RSA PRIVATE KEY-----`
+	clientRootPEM = `-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIUenakcvMDj2URxBvUHBe0Mfhac0cwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTE5NDNa
+Fw0yNzA4MjkwNTIwMTNaMBsxGTAXBgNVBAMTEHRlbGVncmFmLXRlc3QtY2EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxpDlUEC6LNXQMhvTtlWKUekwa
+xh2OaiR16WvO8iA+sYmjlpFXOe+V6YWT+daOGujCqlGdrfDjj3C3pqFPJ6Q4VXaA
+xQyd0Ena7kRtuQ/IUSpTWxyrpSIzKL3dAoV0NYpjFWznjVMP3Rq4l+4cHqviZSvK
+bWUK5n0vBGpEw3A22V9urhlSNkSbECvzn9EFHyIeJX603zaKXYw5wiDwCp1swbXW
+2WS2h45JeI5xrpKcFmLaqRNe0swi6bkGnmefyCv7nsbOLeKyEW9AExDSd6nSLdu9
+TGzhAfnfodcajSmKiQ+7YL9JY1bQ9hlfXk1ULg4riSEMKF+trZFZUanaXeeBAgMB
+AAGjgYAwfjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUiPkCD8gEsSgIiV8jzACMoUZcHaIwHwYDVR0jBBgwFoAUiPkCD8gEsSgIiV8j
+zACMoUZcHaIwGwYDVR0RBBQwEoIQdGVsZWdyYWYtdGVzdC1jYTANBgkqhkiG9w0B
+AQsFAAOCAQEAXeadR7ZVkb2C0F8OEd2CQxVt2/JOqM4G2N2O8uTwf+hIn+qm+jbb
+Q6JokGhr5Ybhvtv3U9JnI6RVI+TOYNkDzs5e2DtntFQmcKb2c+y5Z+OpvWd13ObK
+GMCs4bho6O7h1qo1Z+Ftd6sYQ7JL0MuTGWCNbXv2c1iC4zPT54n1vGZC5so08RO0
+r7bqLLEnkSawabvSAeTxtweCXJUw3D576e0sb8oU0AP/Hn/2IC9E1vFZdjDswEfs
+ARE4Oc5XnN6sqjtp0q5CqPpW6tYFwxdtZFk0VYPXyRnETVgry7Dc/iX6mktIYUx+
+qWSyPEDKALyxx6yUyVDqgcY2VUm0rM/1Iw==
+-----END CERTIFICATE-----`
+	clientCertPEM = `-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgIUIVOF5g2zH6+J/dbGdu4q18aSJoMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTQ1MzJa
+Fw0yNzA4MjUwMTQ2MDJaMBcxFTATBgNVBAMTDGR1bW15LWNsaWVudDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKok1HJ40buyjrS+DG9ORLzrWIJad2y/
+6X2Bg9MSENfpEUgaS7nK2ML3m1e2poHqBSR+V8VECNs+MDCLSOeQ4FC1TdBKMLfw
+NxW88y5Gj6rTRcAXl092ba7stwbqJPBAZu1Eh1jXIp5nrFKh8Jq7kRxmMB5vC70V
+fOSPS0RZtEd7D+QZ6jgkFJWsZzn4gJr8nc/kmLcntLw+g/tz9/8lfaV306tLlhMH
+dv3Ka6Nt86j6/muOwvoeAkAnCEFAgDcXg4F37PFAiEHRw9DyTeWDuZqvnMZ3gosL
+kl15QhnP0yG2QCjSb1gaLcKB42cyxDnPc31WsVuuzQnajazcVf3lJW0CAwEAAaNw
+MG4wEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFCemMO+Qlj+YCLQ3ScAQ
+8XYJJJ5ZMB8GA1UdIwQYMBaAFIj5Ag/IBLEoCIlfI8wAjKFGXB2iMBcGA1UdEQQQ
+MA6CDGR1bW15LWNsaWVudDANBgkqhkiG9w0BAQsFAAOCAQEARThbApKvvGDp7uSc
+mINaqDOHe69F9PepV0/3+B5+X1b3yd2sbzZL/ZoHl27kajSHVrUF+09gcTosfuY3
+omnIPw+NseqTJG+qTMRb3AarLNO46EJZLOowAEhnJyVmhK5uU0YqhV1X9eN+g4/o
+BuyOPvHj6UJWviZFy6fDIj2N+ygN/CNP5X3iLDBUoyCEHAehLiQr0aRgsqe4JLlS
+P+0l0btTUpcqUhsQy+sD2lv3MO1tZ/P4zhzu0J0LUeLBDdOPf/FIvTgkCNxN9GGy
+SLmeBeCzsKmWbzE3Yuahw3h4IblVyyGc7ZDGIobDrZgFqshcZylU8wrsjUnjNSPA
+G+LOWQ==
+-----END CERTIFICATE-----`
+	clientKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAqiTUcnjRu7KOtL4Mb05EvOtYglp3bL/pfYGD0xIQ1+kRSBpL
+ucrYwvebV7amgeoFJH5XxUQI2z4wMItI55DgULVN0Eowt/A3FbzzLkaPqtNFwBeX
+T3Ztruy3Buok8EBm7USHWNcinmesUqHwmruRHGYwHm8LvRV85I9LRFm0R3sP5Bnq
+OCQUlaxnOfiAmvydz+SYtye0vD6D+3P3/yV9pXfTq0uWEwd2/cpro23zqPr+a47C
++h4CQCcIQUCANxeDgXfs8UCIQdHD0PJN5YO5mq+cxneCiwuSXXlCGc/TIbZAKNJv
+WBotwoHjZzLEOc9zfVaxW67NCdqNrNxV/eUlbQIDAQABAoIBAAXZYEhTKPqn58oE
+4o6NBUXtXUyV6ZcefdtnsW13KIcTpxlwdfv8IjmJo5h/WfgLYIPhqAjLDvbii2uP
+zkDPtTZxFSy88DHSm0IvDbkgid3Yh4RUC0qbCqhB0QT21bBAtokfmvuN4c3KSJ1K
+nefj3Ng6Fxtku+WTMIj2+CJwZwcyAH47ZUngYs/77gA0hAJcbdL/bj8Bpmd+lH6C
+Ci22T2hrw+cpWMN6qwa3wxWIneCaqxkylSgpUzSNE0QO3mXkX+NYtL2BQ0w+wPqq
+lww3QJOFAX1qRLflglL9K+ruTQofm49vxv6apsoqdkrxEBoPzkljlqiPRmzUxau4
+cvbApQECgYEAy5m5O3mQt6DBrDRJWSwpZh6DRNd5USEqXOIFtp+Qze2Jx1pYQfZt
+NOXOrwy04o0+6yLzc4O4W5ta2KfTlALFzCa6Na3Ca4ZUAeteWprrdh8b1b2w/wUH
+E3uQFkvH0zFdPsA3pTTZ0k/ydmHnu4zZqBnSeh0dIW8xFYgZZCgQusECgYEA1e7O
+ujCUa8y49sY42D/Y/c8B96xVfJZO5hhY7eLgkzqUlmFl31Ld7AjlJcXpbMeW1vaa
+0Mxbfx2qAVaZEkvdnXq3V8spe6qOGBdlKzey4DMEfmEXLFp5DRYCSwpXiqDZcGqc
+jwI58wuzKoDgydN9bLdF8XYGtQXnHIE9WyTYMa0CgYBKYSBgb+rEir/2LyvUneOJ
+4P/HuIgjcWBOimvX6bc2495/q6uufV4sAwBcxuGWGk+wCxaxTp+dJ8YqfDU5T0H/
+cO56Cb6LFYm/IcNYilwWzQqYLTJqF+Yb4fojiw+3QcN01zf87K/eu0IyqVXFGJGz
+bauM3PH1cu+VlCDijBiAgQKBgDOQ9YmRriTx2t+41fjiIvbC0BGYG58FSA1UbxMg
+LcuvQiOhZIHZIp8DYeCh/Or4jRZRqO2NZLyWNOVPr2Pmn4uXCdyCnwQtD0UlVoB9
+U4ORKJMh6gkJ4cXSuUjHPGSw8tiTChu6iKdZ+ZzUJdrgPIpY/uX98g3uV0/aoyR2
+FBqdAoGAQIrcOsTpCe6l3ZDtQyNIeAj1s7sZyW8MBy95RXw3y/yzVEOAu4yWNobj
+RReeHQEsrQq+sJ/cols8HfoOpGpL3U0IGDi5vr1JlOXmBhFX2xuFrfh3jvgXlUqb
+fqxPcT3d7I/UEi0ueDh3osyTn46mDfRfF7HBLBNeyQbIFWBDDus=
+-----END RSA PRIVATE KEY-----`
+)
+
+var (
+	initClient           sync.Once
+	client               *http.Client
+	initServiceCertFiles sync.Once
+	allowedCAFiles       []string
+	serviceCAFiles       []string
+	serviceCertFile      string
+	serviceKeyFile       string
 )
 
 func newTestHTTPListener() *HTTPListener {
@@ -38,9 +185,79 @@ func newTestHTTPListener() *HTTPListener {
 	return listener
 }
 
-func createURL(listener *HTTPListener, path string, rawquery string) string {
+func newTestHTTPSListener() *HTTPListener {
+	initServiceCertFiles.Do(func() {
+		acaf, err := ioutil.TempFile("", "allowedCAFile.crt")
+		if err != nil {
+			panic(err)
+		}
+		defer acaf.Close()
+		_, err = io.Copy(acaf, bytes.NewReader([]byte(clientRootPEM)))
+		allowedCAFiles = []string{acaf.Name()}
+
+		scaf, err := ioutil.TempFile("", "serviceCAFile.crt")
+		if err != nil {
+			panic(err)
+		}
+		defer scaf.Close()
+		_, err = io.Copy(scaf, bytes.NewReader([]byte(serviceRootPEM)))
+		serviceCAFiles = []string{scaf.Name()}
+
+		scf, err := ioutil.TempFile("", "serviceCertFile.crt")
+		if err != nil {
+			panic(err)
+		}
+		defer scf.Close()
+		_, err = io.Copy(scf, bytes.NewReader([]byte(serviceCertPEM)))
+		serviceCertFile = scf.Name()
+
+		skf, err := ioutil.TempFile("", "serviceKeyFile.crt")
+		if err != nil {
+			panic(err)
+		}
+		defer skf.Close()
+		_, err = io.Copy(skf, bytes.NewReader([]byte(serviceKeyPEM)))
+		serviceKeyFile = skf.Name()
+	})
+
+	listener := &HTTPListener{
+		ServiceAddress:    ":0",
+		TlsAllowedCacerts: allowedCAFiles,
+		TlsCert:           serviceCertFile,
+		TlsKey:            serviceKeyFile,
+	}
+
+	return listener
+}
+
+func getHTTPSClient() *http.Client {
+	initClient.Do(func() {
+		cas := x509.NewCertPool()
+		cas.AppendCertsFromPEM([]byte(serviceRootPEM))
+		clientCert, err := tls.X509KeyPair([]byte(clientCertPEM), []byte(clientKeyPEM))
+		if err != nil {
+			panic(err)
+		}
+		client = &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					RootCAs:            cas,
+					Certificates:       []tls.Certificate{clientCert},
+					MinVersion:         tls.VersionTLS12,
+					MaxVersion:         tls.VersionTLS12,
+					CipherSuites:       []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
+					Renegotiation:      tls.RenegotiateNever,
+					InsecureSkipVerify: false,
+				},
+			},
+		}
+	})
+	return client
+}
+
+func createURL(listener *HTTPListener, scheme string, path string, rawquery string) string {
 	u := url.URL{
-		Scheme:   "http",
+		Scheme:   scheme,
 		Host:     "localhost:" + strconv.Itoa(listener.Port),
 		Path:     path,
 		RawQuery: rawquery,
@@ -48,6 +265,45 @@ func createURL(listener *HTTPListener, path string, rawquery string) string {
 	return u.String()
 }
 
+func TestWriteHTTPSNoClientAuth(t *testing.T) {
+	listener := newTestHTTPSListener()
+	listener.TlsAllowedCacerts = nil
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	cas := x509.NewCertPool()
+	cas.AppendCertsFromPEM([]byte(serviceRootPEM))
+	noClientAuthClient := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				RootCAs: cas,
+			},
+		},
+	}
+
+	// post single message to listener
+	resp, err := noClientAuthClient.Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
+	require.NoError(t, err)
+	resp.Body.Close()
+	require.EqualValues(t, 204, resp.StatusCode)
+}
+
+func TestWriteHTTPSWithClientAuth(t *testing.T) {
+	listener := newTestHTTPSListener()
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	// post single message to listener
+	resp, err := getHTTPSClient().Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
+	require.NoError(t, err)
+	resp.Body.Close()
+	require.EqualValues(t, 204, resp.StatusCode)
+}
+
 func TestWriteHTTP(t *testing.T) {
 	listener := newTestHTTPListener()
 
@@ -56,7 +312,7 @@ func TestWriteHTTP(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
+	resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -68,7 +324,7 @@ func TestWriteHTTP(t *testing.T) {
 	)
 
 	// post multiple message to listener
-	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
+	resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -84,7 +340,7 @@ func TestWriteHTTP(t *testing.T) {
 	}
 
 	// Post a gigantic metric to the listener and verify that an error is returned:
-	resp, err = http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
@@ -105,7 +361,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline)))
+	resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -128,7 +384,7 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	defer listener.Stop()
 
 	// Post a gigantic metric to the listener and verify that it writes OK this time:
-	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -144,7 +400,7 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric)))
+	resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 413, resp.StatusCode)
@@ -160,7 +416,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(testMsgs)))
+	resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(testMsgs)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -186,7 +442,7 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	resp, err := http.Post(createURL(listener, "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
+	resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(hugeMetric+testMsgs)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
@@ -213,7 +469,7 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 	data, err := ioutil.ReadFile("./testdata/testmsgs.gz")
 	require.NoError(t, err)
 
-	req, err := http.NewRequest("POST", createURL(listener, "/write", ""), bytes.NewBuffer(data))
+	req, err := http.NewRequest("POST", createURL(listener, "http", "/write", ""), bytes.NewBuffer(data))
 	require.NoError(t, err)
 	req.Header.Set("Content-Encoding", "gzip")
 
@@ -248,7 +504,7 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
 		go func(innerwg *sync.WaitGroup) {
 			defer innerwg.Done()
 			for i := 0; i < 500; i++ {
-				resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
+				resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs)))
 				require.NoError(t, err)
 				resp.Body.Close()
 				require.EqualValues(t, 204, resp.StatusCode)
@@ -271,7 +527,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post(createURL(listener, "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg)))
+	resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 404, resp.StatusCode)
@@ -285,7 +541,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg)))
+	resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 400, resp.StatusCode)
@@ -299,7 +555,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
 	defer listener.Stop()
 
 	// post single message to listener
-	resp, err := http.Post(createURL(listener, "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg)))
+	resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -314,12 +570,12 @@ func TestQueryAndPingHTTP(t *testing.T) {
 
 	// post query to listener
 	resp, err := http.Post(
-		createURL(listener, "/query", "db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22"), "", nil)
+		createURL(listener, "http", "/query", "db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22"), "", nil)
 	require.NoError(t, err)
 	require.EqualValues(t, 200, resp.StatusCode)
 
 	// post ping to listener
-	resp, err = http.Post(createURL(listener, "/ping", ""), "", nil)
+	resp, err = http.Post(createURL(listener, "http", "/ping", ""), "", nil)
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
@@ -334,7 +590,7 @@ func TestWriteWithPrecision(t *testing.T) {
 
 	msg := "xyzzy value=42 1422568543\n"
 	resp, err := http.Post(
-		createURL(listener, "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg)))
+		createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg)))
 	require.NoError(t, err)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)

From be83c8c8f095bec07ecb607d5f3ff6184da26230 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 8 Sep 2017 16:02:15 -0700
Subject: [PATCH 0526/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46e18d3cc..e9198cafc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#3196](https://github.com/influxdata/telegraf/pull/3196): Add Kafka output plugin topic_suffix option.
 - [#3027](https://github.com/influxdata/telegraf/pull/3027): Include mount mode option in disk metrics.
 - [#3212](https://github.com/influxdata/telegraf/pull/3212): Add support for standard proxy env vars in outputs.
+- [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
 
 ### Bugfixes
 

From f62e54300312c11512aa28308f49f20a89901697 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Mon, 11 Sep 2017 19:51:45 +0100
Subject: [PATCH 0527/1302] Fix address already in use with webhooks input
 during reload  (#3206)

---
 plugins/inputs/webhooks/webhooks.go | 42 +++++++++++++++++++----------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 9a86b7eff..698cde159 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -3,6 +3,7 @@ package webhooks
 import (
 	"fmt"
 	"log"
+	"net"
 	"net/http"
 	"reflect"
 
@@ -33,6 +34,8 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
+
+	srv *http.Server
 }
 
 func NewWebhooks() *Webhooks {
@@ -70,19 +73,6 @@ func (wb *Webhooks) Gather(_ telegraf.Accumulator) error {
 	return nil
 }
 
-func (wb *Webhooks) Listen(acc telegraf.Accumulator) {
-	r := mux.NewRouter()
-
-	for _, webhook := range wb.AvailableWebhooks() {
-		webhook.Register(r, acc)
-	}
-
-	err := http.ListenAndServe(fmt.Sprintf("%s", wb.ServiceAddress), r)
-	if err != nil {
-		acc.AddError(fmt.Errorf("E! Error starting server: %v", err))
-	}
-}
-
 // Looks for fields which implement Webhook interface
 func (wb *Webhooks) AvailableWebhooks() []Webhook {
 	webhooks := make([]Webhook, 0)
@@ -105,11 +95,35 @@ func (wb *Webhooks) AvailableWebhooks() []Webhook {
 }
 
 func (wb *Webhooks) Start(acc telegraf.Accumulator) error {
-	go wb.Listen(acc)
+	r := mux.NewRouter()
+
+	for _, webhook := range wb.AvailableWebhooks() {
+		webhook.Register(r, acc)
+	}
+
+	wb.srv = &http.Server{Handler: r}
+
+	ln, err := net.Listen("tcp", fmt.Sprintf("%s", wb.ServiceAddress))
+	if err != nil {
+		log.Fatalf("E! Error starting server: %v", err)
+		return err
+
+	}
+
+	go func() {
+		if err := wb.srv.Serve(ln); err != nil {
+			if err != http.ErrServerClosed {
+				acc.AddError(fmt.Errorf("E! Error listening: %v", err))
+			}
+		}
+	}()
+
 	log.Printf("I! Started the webhooks service on %s\n", wb.ServiceAddress)
+
 	return nil
 }
 
 func (rb *Webhooks) Stop() {
+	rb.srv.Close()
 	log.Println("I! Stopping the Webhooks service")
 }

From c720200883f8908a785ec58f57514b23b15350b2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Sep 2017 11:54:18 -0700
Subject: [PATCH 0528/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9198cafc..c8a567584 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@
 
 ### Bugfixes
 
+- [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
+
 ## v1.4 [2017-09-05]
 
 ### Release Notes

From 32f313a6a6b219f09cc90e9c11d0a72bdd709762 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 11 Sep 2017 11:56:04 -0700
Subject: [PATCH 0529/1302] Add polling method to logparser and tail inputs
 (#3213)

---
 plugins/inputs/logparser/README.md    | 13 ++++++++-----
 plugins/inputs/logparser/logparser.go | 18 +++++++++++++++++-
 plugins/inputs/tail/README.md         |  3 +++
 plugins/inputs/tail/tail.go           | 14 ++++++++++++++
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index a2ed0a689..f823cfe68 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -15,12 +15,15 @@ regex patterns.
   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
   ##   /var/log/apache.log -> only tail the apache log file
   files = ["/var/log/apache/access.log"]
-  
+
   ## Read files that currently exist from the beginning. Files that are created
   ## while telegraf is running (and that match the "files" globs) will always
   ## be read from the beginning.
   from_beginning = false
 
+  ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+  # watch_method = "inotify"
+
   ## Parse logstash-style "grok" patterns:
   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
   [inputs.logparser.grok]
@@ -34,15 +37,15 @@ regex patterns.
 
     ## Name of the outputted measurement name.
     measurement = "apache_access_log"
-    
+
     ## Full path(s) to custom pattern files.
     custom_pattern_files = []
-    
+
     ## Custom patterns can also be defined here. Put one pattern per line.
     custom_patterns = '''
     '''
 
-    ## Timezone allows you to provide an override for timestamps that 
+    ## Timezone allows you to provide an override for timestamps that
     ## don't already include an offset
     ## e.g. 04/06/2016 12:41:45 data one two 5.43µs
     ##
@@ -145,7 +148,7 @@ Wed Apr 12 13:10:34 PST 2017 value=42
 For cases where the timestamp itself is without offset, the `timezone` config var is available
 to denote an offset. By default (with `timezone` either omit, blank or set to `"UTC"`), the times
 are processed as if in the UTC timezone. If specified as `timezone = "Local"`, the timestamp
-will be processed based on the current machine timezone configuration. Lastly, if using a 
+will be processed based on the current machine timezone configuration. Lastly, if using a
 timezone from the list of Unix [timezones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), the logparser grok will attempt to offset
 the timestamp accordingly. See test cases for more detailed examples.
 
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 33b12fcc7..fd5a41f7f 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -19,6 +19,10 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/logparser/grok"
 )
 
+const (
+	defaultWatchMethod = "inotify"
+)
+
 // LogParser in the primary interface for the plugin
 type LogParser interface {
 	ParseLine(line string) (telegraf.Metric, error)
@@ -34,6 +38,7 @@ type logEntry struct {
 type LogParserPlugin struct {
 	Files         []string
 	FromBeginning bool
+	WatchMethod   string
 
 	tailers map[string]*tail.Tail
 	lines   chan logEntry
@@ -61,6 +66,9 @@ const sampleConfig = `
   ## be read from the beginning.
   from_beginning = false
 
+  ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+  # watch_method = "inotify"
+
   ## Parse logstash-style "grok" patterns:
   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
   [inputs.logparser.grok]
@@ -167,6 +175,11 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 		seek.Offset = 0
 	}
 
+	var poll bool
+	if l.WatchMethod == "poll" {
+		poll = true
+	}
+
 	// Create a "tailer" for each file
 	for _, filepath := range l.Files {
 		g, err := globpath.Compile(filepath)
@@ -188,6 +201,7 @@ func (l *LogParserPlugin) tailNewfiles(fromBeginning bool) error {
 					Follow:    true,
 					Location:  &seek,
 					MustExist: true,
+					Poll:      poll,
 					Logger:    tail.DiscardingLogger,
 				})
 			if err != nil {
@@ -285,6 +299,8 @@ func (l *LogParserPlugin) Stop() {
 
 func init() {
 	inputs.Add("logparser", func() telegraf.Input {
-		return &LogParserPlugin{}
+		return &LogParserPlugin{
+			WatchMethod: defaultWatchMethod,
+		}
 	})
 }
diff --git a/plugins/inputs/tail/README.md b/plugins/inputs/tail/README.md
index 38f124174..5d7253649 100644
--- a/plugins/inputs/tail/README.md
+++ b/plugins/inputs/tail/README.md
@@ -39,6 +39,9 @@ The plugin expects messages in one of the
   ## Whether file is a named pipe
   pipe = false
 
+  ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+  # watch_method = "inotify"
+
   ## Data format to consume.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 7812cf8c1..86534da5f 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -15,10 +15,15 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
 
+const (
+	defaultWatchMethod = "inotify"
+)
+
 type Tail struct {
 	Files         []string
 	FromBeginning bool
 	Pipe          bool
+	WatchMethod   string
 
 	tailers []*tail.Tail
 	parser  parsers.Parser
@@ -50,6 +55,9 @@ const sampleConfig = `
   ## Whether file is a named pipe
   pipe = false
 
+  ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+  # watch_method = "inotify"
+
   ## Data format to consume.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
@@ -83,6 +91,11 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 		}
 	}
 
+	var poll bool
+	if t.WatchMethod == "poll" {
+		poll = true
+	}
+
 	// Create a "tailer" for each file
 	for _, filepath := range t.Files {
 		g, err := globpath.Compile(filepath)
@@ -96,6 +109,7 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
 					Follow:    true,
 					Location:  seek,
 					MustExist: true,
+					Poll:      poll,
 					Pipe:      t.Pipe,
 					Logger:    tail.DiscardingLogger,
 				})

From 14a4b108b49d229caca0c5df586ed9326f4fb373 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Sep 2017 11:57:18 -0700
Subject: [PATCH 0530/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8a567584..79b29e689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#3027](https://github.com/influxdata/telegraf/pull/3027): Include mount mode option in disk metrics.
 - [#3212](https://github.com/influxdata/telegraf/pull/3212): Add support for standard proxy env vars in outputs.
 - [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
+- [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
 
 ### Bugfixes
 

From 5488f4b3ac3998878274d360f846f4b2c87566e8 Mon Sep 17 00:00:00 2001
From: DanKans <DanKans@users.noreply.github.com>
Date: Mon, 11 Sep 2017 20:24:51 +0100
Subject: [PATCH 0531/1302] Fix MQTT input exits if Broker is not available on
 startup  (#3202)

---
 plugins/inputs/mqtt_consumer/README.md        |  2 +
 plugins/inputs/mqtt_consumer/mqtt_consumer.go | 59 ++++++++++++++-----
 .../mqtt_consumer/mqtt_consumer_test.go       | 11 ++--
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md
index 0e8d540f3..c61545e8e 100644
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -13,6 +13,8 @@ The plugin expects messages in the
   servers = ["localhost:1883"]
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
+  ## Connection timeout for initial connection in seconds
+  connection_timeout = 30
 
   ## Topics to subscribe to
   topics = [
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index 1c75aaf65..3cd98baea 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -16,11 +16,12 @@ import (
 )
 
 type MQTTConsumer struct {
-	Servers  []string
-	Topics   []string
-	Username string
-	Password string
-	QoS      int `toml:"qos"`
+	Servers           []string
+	Topics            []string
+	Username          string
+	Password          string
+	QoS               int               `toml:"qos"`
+	ConnectionTimeout internal.Duration `toml:"connection_timeout"`
 
 	parser parsers.Parser
 
@@ -48,13 +49,15 @@ type MQTTConsumer struct {
 	// keep the accumulator internally:
 	acc telegraf.Accumulator
 
-	started bool
+	connected bool
 }
 
 var sampleConfig = `
   servers = ["localhost:1883"]
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
+  ## Connection timeout for initial connection in seconds
+  connection_timeout = 30
 
   ## Topics to subscribe to
   topics = [
@@ -103,7 +106,7 @@ func (m *MQTTConsumer) SetParser(parser parsers.Parser) {
 func (m *MQTTConsumer) Start(acc telegraf.Accumulator) error {
 	m.Lock()
 	defer m.Unlock()
-	m.started = false
+	m.connected = false
 
 	if m.PersistentSession && m.ClientID == "" {
 		return fmt.Errorf("ERROR MQTT Consumer: When using persistent_session" +
@@ -115,26 +118,40 @@ func (m *MQTTConsumer) Start(acc telegraf.Accumulator) error {
 		return fmt.Errorf("MQTT Consumer, invalid QoS value: %d", m.QoS)
 	}
 
+	if int(m.ConnectionTimeout.Duration) <= 0 {
+		return fmt.Errorf("MQTT Consumer, invalid connection_timeout value: %d", m.ConnectionTimeout)
+	}
+
 	opts, err := m.createOpts()
 	if err != nil {
 		return err
 	}
 
 	m.client = mqtt.NewClient(opts)
-	if token := m.client.Connect(); token.Wait() && token.Error() != nil {
-		return token.Error()
-	}
-
 	m.in = make(chan mqtt.Message, 1000)
 	m.done = make(chan struct{})
 
+	m.connect()
+
+	return nil
+}
+
+func (m *MQTTConsumer) connect() error {
+	if token := m.client.Connect(); token.Wait() && token.Error() != nil {
+		err := token.Error()
+		log.Printf("D! MQTT Consumer, connection error - %v", err)
+
+		return err
+	}
+
 	go m.receiver()
 
 	return nil
 }
+
 func (m *MQTTConsumer) onConnect(c mqtt.Client) {
 	log.Printf("I! MQTT Client Connected")
-	if !m.PersistentSession || !m.started {
+	if !m.PersistentSession || !m.connected {
 		topics := make(map[string]byte)
 		for _, topic := range m.Topics {
 			topics[topic] = byte(m.QoS)
@@ -145,7 +162,7 @@ func (m *MQTTConsumer) onConnect(c mqtt.Client) {
 			m.acc.AddError(fmt.Errorf("E! MQTT Subscribe Error\ntopics: %s\nerror: %s",
 				strings.Join(m.Topics[:], ","), subscribeToken.Error()))
 		}
-		m.started = true
+		m.connected = true
 	}
 	return
 }
@@ -186,18 +203,27 @@ func (m *MQTTConsumer) recvMessage(_ mqtt.Client, msg mqtt.Message) {
 func (m *MQTTConsumer) Stop() {
 	m.Lock()
 	defer m.Unlock()
-	close(m.done)
-	m.client.Disconnect(200)
-	m.started = false
+
+	if m.connected {
+		close(m.done)
+		m.client.Disconnect(200)
+		m.connected = false
+	}
 }
 
 func (m *MQTTConsumer) Gather(acc telegraf.Accumulator) error {
+	if !m.connected {
+		m.connect()
+	}
+
 	return nil
 }
 
 func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 	opts := mqtt.NewClientOptions()
 
+	opts.ConnectTimeout = m.ConnectionTimeout.Duration
+
 	if m.ClientID == "" {
 		opts.SetClientID("Telegraf-Consumer-" + internal.RandomString(5))
 	} else {
@@ -238,6 +264,7 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 	opts.SetCleanSession(!m.PersistentSession)
 	opts.SetOnConnectHandler(m.onConnect)
 	opts.SetConnectionLostHandler(m.onConnectionLost)
+
 	return opts, nil
 }
 
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
index 027e4818b..eb5e3048c 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
@@ -22,11 +22,13 @@ const (
 func newTestMQTTConsumer() (*MQTTConsumer, chan mqtt.Message) {
 	in := make(chan mqtt.Message, 100)
 	n := &MQTTConsumer{
-		Topics:  []string{"telegraf"},
-		Servers: []string{"localhost:1883"},
-		in:      in,
-		done:    make(chan struct{}),
+		Topics:    []string{"telegraf"},
+		Servers:   []string{"localhost:1883"},
+		in:        in,
+		done:      make(chan struct{}),
+		connected: true,
 	}
+
 	return n, in
 }
 
@@ -131,6 +133,7 @@ func TestRunParserAndGather(t *testing.T) {
 	n, in := newTestMQTTConsumer()
 	acc := testutil.Accumulator{}
 	n.acc = &acc
+
 	defer close(n.done)
 
 	n.parser, _ = parsers.NewInfluxParser()

From cc63b3b6677f7163a9e71b823178a42b8cd87ab7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Sep 2017 12:27:39 -0700
Subject: [PATCH 0532/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79b29e689..93b981c0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,12 @@
 
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 
+## v1.4.1 [unreleased]
+
+### Bugfixes
+
+- [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
+
 ## v1.4 [2017-09-05]
 
 ### Release Notes

From 8a68e7424c48e8f28034855a239265ab52ba536d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Sep 2017 17:15:19 -0700
Subject: [PATCH 0533/1302] Fix optional field types in fluentd input

---
 plugins/inputs/fluentd/fluentd.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/fluentd/fluentd.go b/plugins/inputs/fluentd/fluentd.go
index ba8dba802..c99960740 100644
--- a/plugins/inputs/fluentd/fluentd.go
+++ b/plugins/inputs/fluentd/fluentd.go
@@ -148,15 +148,15 @@ func (h *Fluentd) Gather(acc telegraf.Accumulator) error {
 			}
 
 			if p.BufferQueueLength != nil {
-				tmpFields["buffer_queue_length"] = p.BufferQueueLength
+				tmpFields["buffer_queue_length"] = *p.BufferQueueLength
 
 			}
 			if p.RetryCount != nil {
-				tmpFields["retry_count"] = p.RetryCount
+				tmpFields["retry_count"] = *p.RetryCount
 			}
 
 			if p.BufferTotalQueuedSize != nil {
-				tmpFields["buffer_total_queued_size"] = p.BufferTotalQueuedSize
+				tmpFields["buffer_total_queued_size"] = *p.BufferTotalQueuedSize
 			}
 
 			if !((p.BufferQueueLength == nil) && (p.RetryCount == nil) && (p.BufferTotalQueuedSize == nil)) {

From c5cfde667a7462cf6488f39dc0a46e889154909e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Sep 2017 17:17:41 -0700
Subject: [PATCH 0534/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b981c0c..6c03db2cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 ### Bugfixes
 
 - [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
+- [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
 
 ## v1.4 [2017-09-05]
 

From 216398187266cd7ad2958cb0890fbf13372829fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20L=C3=B3pez?= <adrianlzt+github@gmail.com>
Date: Wed, 13 Sep 2017 02:22:15 +0200
Subject: [PATCH 0535/1302] Add timeout option for kubernetes (#3211)

---
 plugins/inputs/kubernetes/kubernetes.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/kubernetes/kubernetes.go b/plugins/inputs/kubernetes/kubernetes.go
index 87d08aa94..e65f540bf 100644
--- a/plugins/inputs/kubernetes/kubernetes.go
+++ b/plugins/inputs/kubernetes/kubernetes.go
@@ -30,6 +30,9 @@ type Kubernetes struct {
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 
+	// HTTP Timeout specified as a string - 3s, 1m, 1h
+	ResponseTimeout internal.Duration
+
 	RoundTripper http.RoundTripper
 }
 
@@ -40,6 +43,9 @@ var sampleConfig = `
   ## Use bearer token for authorization
   # bearer_token = /path/to/bearer/token
 
+  ## Set response_timeout (default 5 seconds)
+  # response_timeout = "5s"
+
   ## Optional SSL Config
   # ssl_ca = /path/to/cafile
   # ssl_cert = /path/to/certfile
@@ -101,10 +107,17 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) err
 	}
 
 	if k.RoundTripper == nil {
+		// Set default values
+		if k.ResponseTimeout.Duration < time.Second {
+			k.ResponseTimeout.Duration = time.Second * 5
+		}
+		if err != nil {
+			return err
+		}
 		k.RoundTripper = &http.Transport{
 			TLSHandshakeTimeout:   5 * time.Second,
 			TLSClientConfig:       tlsCfg,
-			ResponseHeaderTimeout: time.Duration(3 * time.Second),
+			ResponseHeaderTimeout: k.ResponseTimeout.Duration,
 		}
 	}
 

From 4e53464fe2b2f081bb8ad9c5b64428755cb7399b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Sep 2017 17:24:57 -0700
Subject: [PATCH 0536/1302] Remove unneeded error check

---
 plugins/inputs/kubernetes/kubernetes.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/inputs/kubernetes/kubernetes.go b/plugins/inputs/kubernetes/kubernetes.go
index e65f540bf..9d07d6a42 100644
--- a/plugins/inputs/kubernetes/kubernetes.go
+++ b/plugins/inputs/kubernetes/kubernetes.go
@@ -111,9 +111,6 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) err
 		if k.ResponseTimeout.Duration < time.Second {
 			k.ResponseTimeout.Duration = time.Second * 5
 		}
-		if err != nil {
-			return err
-		}
 		k.RoundTripper = &http.Transport{
 			TLSHandshakeTimeout:   5 * time.Second,
 			TLSClientConfig:       tlsCfg,

From ee85f9275e941ea18aa6cf942dbcd63dd5064c13 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Sep 2017 17:27:50 -0700
Subject: [PATCH 0537/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c03db2cf..f83817add 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#3212](https://github.com/influxdata/telegraf/pull/3212): Add support for standard proxy env vars in outputs.
 - [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
 - [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
+- [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
 
 ### Bugfixes
 

From eebee9759f4d105d76a90207cf97a72653158d6f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Sep 2017 17:57:55 -0700
Subject: [PATCH 0538/1302] Fix fluentd test

---
 plugins/inputs/fluentd/fluentd_test.go | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/fluentd/fluentd_test.go b/plugins/inputs/fluentd/fluentd_test.go
index 62989b6d8..c7699c338 100644
--- a/plugins/inputs/fluentd/fluentd_test.go
+++ b/plugins/inputs/fluentd/fluentd_test.go
@@ -122,12 +122,6 @@ func Test_parse(t *testing.T) {
 }
 
 func Test_Gather(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping Gather function test")
-	}
-
-	t.Log("Testing Gather function")
-
 	t.Logf("Start HTTP mock (%s) with sampleJSON", fluentdTest.Endpoint)
 
 	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -157,13 +151,13 @@ func Test_Gather(t *testing.T) {
 	assert.Equal(t, expectedOutput[0].PluginID, acc.Metrics[0].Tags["plugin_id"])
 	assert.Equal(t, expectedOutput[0].PluginType, acc.Metrics[0].Tags["plugin_type"])
 	assert.Equal(t, expectedOutput[0].PluginCategory, acc.Metrics[0].Tags["plugin_category"])
-	assert.Equal(t, expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"])
+	assert.Equal(t, *expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"])
 
 	assert.Equal(t, expectedOutput[1].PluginID, acc.Metrics[1].Tags["plugin_id"])
 	assert.Equal(t, expectedOutput[1].PluginType, acc.Metrics[1].Tags["plugin_type"])
 	assert.Equal(t, expectedOutput[1].PluginCategory, acc.Metrics[1].Tags["plugin_category"])
-	assert.Equal(t, expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"])
-	assert.Equal(t, expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"])
-	assert.Equal(t, expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"])
+	assert.Equal(t, *expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"])
+	assert.Equal(t, *expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"])
+	assert.Equal(t, *expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"])
 
 }

From 9c8f4afa372e1008204dcc6a1e74f2a628d5a61e Mon Sep 17 00:00:00 2001
From: Dimitris Rozakis <dimrozakis@gmail.com>
Date: Thu, 14 Sep 2017 03:27:01 +0300
Subject: [PATCH 0539/1302] Respect path prefix in influx output uri (#3224)

---
 etc/telegraf.conf                            |  4 +--
 plugins/outputs/influxdb/README.md           |  4 +--
 plugins/outputs/influxdb/client/http.go      | 15 +++++---
 plugins/outputs/influxdb/client/http_test.go | 36 ++++++++++++++++++++
 plugins/outputs/influxdb/influxdb.go         |  4 +--
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 4831f934b..c636efe56 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -84,9 +84,7 @@
 
 # Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
-  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
-  ## of the form:
-  ##   scheme "://" host [ ":" port]
+  ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index c6ddf3586..35f896523 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -7,9 +7,7 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
 ```toml
 # Configuration for influxdb server to send metrics to
 [[outputs.influxdb]]
-  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
-  ## of the form:
-  ##   scheme "://" host [ ":" port]
+  ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index d8c1951f5..8f0a6ac24 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"path"
 	"time"
 )
 
@@ -305,8 +306,11 @@ func writeURL(u *url.URL, wp WriteParams) string {
 	}
 
 	u.RawQuery = params.Encode()
-	u.Path = "write"
-	return u.String()
+	p := u.Path
+	u.Path = path.Join(p, "write")
+	s := u.String()
+	u.Path = p
+	return s
 }
 
 func queryURL(u *url.URL, command string) string {
@@ -314,6 +318,9 @@ func queryURL(u *url.URL, command string) string {
 	params.Set("q", command)
 
 	u.RawQuery = params.Encode()
-	u.Path = "query"
-	return u.String()
+	p := u.Path
+	u.Path = path.Join(p, "query")
+	s := u.String()
+	u.Path = p
+	return s
 }
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
index d094078ea..ba08918af 100644
--- a/plugins/outputs/influxdb/client/http_test.go
+++ b/plugins/outputs/influxdb/client/http_test.go
@@ -373,3 +373,39 @@ func TestGzipCompression(t *testing.T) {
 
 	assert.Equal(t, []byte(influxLine), uncompressed.Bytes())
 }
+
+func TestHTTPClient_PathPrefix(t *testing.T) {
+	prefix := "/some/random/prefix"
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case prefix + "/write":
+			w.WriteHeader(http.StatusNoContent)
+			w.Header().Set("Content-Type", "application/json")
+		case prefix + "/query":
+			w.WriteHeader(http.StatusOK)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintln(w, `{"results":[{}]}`)
+		default:
+			w.WriteHeader(http.StatusNotFound)
+			msg := fmt.Sprintf("Path not found: %s", r.URL.Path)
+			fmt.Fprintln(w, msg)
+		}
+	}))
+	defer ts.Close()
+
+	config := HTTPConfig{
+		URL: ts.URL + prefix,
+	}
+	wp := WriteParams{
+		Database: "test",
+	}
+	client, err := NewHTTP(config, wp)
+	defer client.Close()
+	assert.NoError(t, err)
+	err = client.Query("CREATE DATABASE test")
+	assert.NoError(t, err)
+	_, err = client.Write([]byte("cpu value=99\n"))
+	assert.NoError(t, err)
+	_, err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")), 13)
+	assert.NoError(t, err)
+}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 5780cb72c..ac5faf455 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -53,9 +53,7 @@ type InfluxDB struct {
 }
 
 var sampleConfig = `
-  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
-  ## of the form:
-  ##   scheme "://" host [ ":" port]
+  ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.

From 9197a59cdb63fe1214164b43fe63c06fcee3ffd9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 13 Sep 2017 17:28:33 -0700
Subject: [PATCH 0540/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f83817add..a2919b154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
 - [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
 - [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
+- [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 
 ### Bugfixes
 

From 0a8c2e0b3ba775e1272d687e43587e3697cafc55 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 13 Sep 2017 17:30:52 -0700
Subject: [PATCH 0541/1302] Whitelist allowed char classes for opentsdb output.
 (#3227)

---
 plugins/outputs/opentsdb/opentsdb.go      | 28 +++++++++---
 plugins/outputs/opentsdb/opentsdb_test.go | 56 +++++++++++++++++++++--
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index ac4d1224e..b7523c7d8 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"net"
 	"net/url"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -13,6 +14,16 @@ import (
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
+var (
+	allowedChars = regexp.MustCompile(`[^a-zA-Z0-9-_./\p{L}]`)
+	hypenChars   = strings.NewReplacer(
+		"@", "-",
+		"*", "-",
+		`%`, "-",
+		"#", "-",
+		"$", "-")
+)
+
 type OpenTSDB struct {
 	Prefix string
 
@@ -24,9 +35,6 @@ type OpenTSDB struct {
 	Debug bool
 }
 
-var sanitizedChars = strings.NewReplacer("@", "-", "*", "-", " ", "_",
-	`%`, "-", "#", "-", "$", "-", ":", "_")
-
 var sampleConfig = `
   ## prefix for metrics keys
   prefix = "my.specific.prefix."
@@ -125,8 +133,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 			}
 
 			metric := &HttpMetric{
-				Metric: sanitizedChars.Replace(fmt.Sprintf("%s%s_%s",
-					o.Prefix, m.Name(), fieldName)),
+				Metric:    sanitize(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
 				Tags:      tags,
 				Timestamp: now,
 				Value:     value,
@@ -176,7 +183,7 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 			}
 
 			messageLine := fmt.Sprintf("put %s %v %s %s\n",
-				sanitizedChars.Replace(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
+				sanitize(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
 				now, metricValue, tags)
 
 			_, err := connection.Write([]byte(messageLine))
@@ -192,7 +199,7 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 func cleanTags(tags map[string]string) map[string]string {
 	tagSet := make(map[string]string, len(tags))
 	for k, v := range tags {
-		tagSet[sanitizedChars.Replace(k)] = sanitizedChars.Replace(v)
+		tagSet[sanitize(k)] = sanitize(v)
 	}
 	return tagSet
 }
@@ -236,6 +243,13 @@ func (o *OpenTSDB) Close() error {
 	return nil
 }
 
+func sanitize(value string) string {
+	// Apply special hypenation rules to preserve backwards compatibility
+	value = hypenChars.Replace(value)
+	// Replace any remaining illegal chars
+	return allowedChars.ReplaceAllLiteralString(value, "_")
+}
+
 func init() {
 	outputs.Add("opentsdb", func() telegraf.Output {
 		return &OpenTSDB{}
diff --git a/plugins/outputs/opentsdb/opentsdb_test.go b/plugins/outputs/opentsdb/opentsdb_test.go
index 669ab5303..83a659216 100644
--- a/plugins/outputs/opentsdb/opentsdb_test.go
+++ b/plugins/outputs/opentsdb/opentsdb_test.go
@@ -10,9 +10,10 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
-	//"github.com/stretchr/testify/require"
 )
 
 func TestCleanTags(t *testing.T) {
@@ -29,8 +30,16 @@ func TestCleanTags(t *testing.T) {
 			map[string]string{"aaa": "bbb"},
 		},
 		{
-			map[string]string{"Sp%ci@l Chars": "g$t repl#ced"},
-			map[string]string{"Sp-ci-l_Chars": "g-t_repl-ced"},
+			map[string]string{"Sp%ci@l Chars[": "g$t repl#ce)d"},
+			map[string]string{"Sp-ci-l_Chars_": "g-t_repl-ce_d"},
+		},
+		{
+			map[string]string{"μnicodε_letters": "okαy"},
+			map[string]string{"μnicodε_letters": "okαy"},
+		},
+		{
+			map[string]string{"n☺": "emojies☠"},
+			map[string]string{"n_": "emojies_"},
 		},
 		{
 			map[string]string{},
@@ -75,6 +84,47 @@ func TestBuildTagsTelnet(t *testing.T) {
 	}
 }
 
+func TestSanitize(t *testing.T) {
+	tests := []struct {
+		name     string
+		value    string
+		expected string
+	}{
+		{
+			name:     "Ascii letters and numbers allowed",
+			value:    "ascii 123",
+			expected: "ascii_123",
+		},
+		{
+			name:     "Allowed punct",
+			value:    "-_./",
+			expected: "-_./",
+		},
+		{
+			name:     "Special conversions to hyphen",
+			value:    "@*%#$!",
+			expected: "-----_",
+		},
+		{
+			name:     "Unicode Letters allowed",
+			value:    "μnicodε_letters",
+			expected: "μnicodε_letters",
+		},
+		{
+			name:     "Other Unicode not allowed",
+			value:    "“☢”",
+			expected: "___",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			actual := sanitize(tt.value)
+			require.Equal(t, tt.expected, actual)
+		})
+	}
+}
+
 func BenchmarkHttpSend(b *testing.B) {
 	const BatchSize = 50
 	const MetricsCount = 4 * BatchSize

From cdf63c5776dad650dcafe838c584c4293438a326 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 13 Sep 2017 17:31:39 -0700
Subject: [PATCH 0542/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2919b154..a7e372278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 
 - [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
 - [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
+- [#3227](https://github.com/influxdata/telegraf/issues/3227): Whitelist allowed char classes for opentsdb output.
 
 ## v1.4 [2017-09-05]
 

From fa1982323a9aaf593e52c75a88ba48cbb11bf598 Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Thu, 14 Sep 2017 16:05:37 -0400
Subject: [PATCH 0543/1302] Fix counter and gauge metric types. (#3232)

---
 plugins/inputs/statsd/statsd.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 16233a6c9..960d88c1d 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -251,14 +251,14 @@ func (s *Statsd) Gather(acc telegraf.Accumulator) error {
 	}
 
 	for _, metric := range s.gauges {
-		acc.AddFields(metric.name, metric.fields, metric.tags, now)
+		acc.AddGauge(metric.name, metric.fields, metric.tags, now)
 	}
 	if s.DeleteGauges {
 		s.gauges = make(map[string]cachedgauge)
 	}
 
 	for _, metric := range s.counters {
-		acc.AddFields(metric.name, metric.fields, metric.tags, now)
+		acc.AddCounter(metric.name, metric.fields, metric.tags, now)
 	}
 	if s.DeleteCounters {
 		s.counters = make(map[string]cachedcounter)

From 7a41d2c586dcb0e822a72c9e2f197700fed3e542 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 13:06:58 -0700
Subject: [PATCH 0544/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7e372278..a7ea150a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#3167](https://github.com/influxdata/telegraf/issues/3167): Fix MQTT input exits if Broker is not available on startup.
 - [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
 - [#3227](https://github.com/influxdata/telegraf/issues/3227): Whitelist allowed char classes for opentsdb output.
+- [#3232](https://github.com/influxdata/telegraf/issues/3232): Fix counter and gauge metric types.
 
 ## v1.4 [2017-09-05]
 

From d5f48e3e96f8a265047ef995f8acb610d2b6f58b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 14 Sep 2017 14:59:28 -0700
Subject: [PATCH 0545/1302] Fix skipped line with empty target in iptables
 (#3235)

---
 plugins/inputs/iptables/iptables.go      |  19 ++--
 plugins/inputs/iptables/iptables_test.go | 125 +++++++++++++----------
 2 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index b552b4657..01041fcc1 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -95,7 +95,7 @@ const measurement = "iptables"
 var errParse = errors.New("Cannot parse iptables list information")
 var chainNameRe = regexp.MustCompile(`^Chain\s+(\S+)`)
 var fieldsHeaderRe = regexp.MustCompile(`^\s*pkts\s+bytes\s+`)
-var commentRe = regexp.MustCompile(`\s*/\*\s*(.+?)\s*\*/\s*`)
+var valuesRe = regexp.MustCompile(`^\s*(\d+)\s+(\d+)\s+.*?/\*\s*(.+?)\s*\*/\s*`)
 
 func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error {
 	lines := strings.Split(data, "\n")
@@ -110,21 +110,14 @@ func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error
 		return errParse
 	}
 	for _, line := range lines[2:] {
-		tokens := strings.Fields(line)
-		if len(tokens) < 10 {
+		matches := valuesRe.FindStringSubmatch(line)
+		if len(matches) != 4 {
 			continue
 		}
 
-		pkts := tokens[0]
-		bytes := tokens[1]
-		end := strings.Join(tokens[9:], " ")
-
-		matches := commentRe.FindStringSubmatch(end)
-		if matches == nil {
-			continue
-		}
-
-		comment := matches[1]
+		pkts := matches[1]
+		bytes := matches[2]
+		comment := matches[3]
 
 		tags := map[string]string{"table": ipt.Table, "chain": mchain[1], "ruleid": comment}
 		fields := make(map[string]interface{})
diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go
index cc53ecc99..cf2f9f913 100644
--- a/plugins/inputs/iptables/iptables_test.go
+++ b/plugins/inputs/iptables/iptables_test.go
@@ -154,68 +154,85 @@ func TestIptables_Gather(t *testing.T) {
 			tags:   []map[string]string{},
 			fields: [][]map[string]interface{}{},
 		},
+		{ // 11 - all target and ports
+			table:  "all_recv",
+			chains: []string{"accountfwd"},
+			values: []string{
+				`Chain accountfwd (1 references)
+						pkts bytes target prot opt in   out source    destination
+						 123   456        all  --  eth0 *   0.0.0.0/0 0.0.0.0/0   /* all_recv */
+		               `},
+			tags: []map[string]string{
+				map[string]string{"table": "all_recv", "chain": "accountfwd", "ruleid": "all_recv"},
+			},
+			fields: [][]map[string]interface{}{
+				{map[string]interface{}{"pkts": uint64(123), "bytes": uint64(456)}},
+			},
+		},
 	}
 
 	for i, tt := range tests {
-		i++
-		ipt := &Iptables{
-			Table:  tt.table,
-			Chains: tt.chains,
-			lister: func(table, chain string) (string, error) {
-				if len(tt.values) > 0 {
-					v := tt.values[0]
-					tt.values = tt.values[1:]
-					return v, nil
-				}
-				return "", nil
-			},
-		}
-		acc := new(testutil.Accumulator)
-		err := acc.GatherError(ipt.Gather)
-		if !reflect.DeepEqual(tt.err, err) {
-			t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
-		}
-		if tt.table == "" {
-			n := acc.NFields()
-			if n != 0 {
-				t.Errorf("%d: expected 0 fields if empty table got %d", i, n)
+		t.Run(tt.table, func(t *testing.T) {
+			i++
+			ipt := &Iptables{
+				Table:  tt.table,
+				Chains: tt.chains,
+				lister: func(table, chain string) (string, error) {
+					if len(tt.values) > 0 {
+						v := tt.values[0]
+						tt.values = tt.values[1:]
+						return v, nil
+					}
+					return "", nil
+				},
 			}
-			continue
-		}
-		if len(tt.chains) == 0 {
-			n := acc.NFields()
-			if n != 0 {
-				t.Errorf("%d: expected 0 fields if empty chains got %d", i, n)
+			acc := new(testutil.Accumulator)
+			err := acc.GatherError(ipt.Gather)
+			if !reflect.DeepEqual(tt.err, err) {
+				t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
 			}
-			continue
-		}
-		if len(tt.tags) == 0 {
-			n := acc.NFields()
-			if n != 0 {
-				t.Errorf("%d: expected 0 values got %d", i, n)
+			if tt.table == "" {
+				n := acc.NFields()
+				if n != 0 {
+					t.Errorf("%d: expected 0 fields if empty table got %d", i, n)
+				}
+				return
 			}
-			continue
-		}
-		n := 0
-		for j, tags := range tt.tags {
-			for k, fields := range tt.fields[j] {
-				if len(acc.Metrics) < n+1 {
-					t.Errorf("%d: expected at least %d values got %d", i, n+1, len(acc.Metrics))
-					break
+			if len(tt.chains) == 0 {
+				n := acc.NFields()
+				if n != 0 {
+					t.Errorf("%d: expected 0 fields if empty chains got %d", i, n)
 				}
-				m := acc.Metrics[n]
-				if !reflect.DeepEqual(m.Measurement, measurement) {
-					t.Errorf("%d %d %d: expected measurement '%#v' got '%#v'\n", i, j, k, measurement, m.Measurement)
-				}
-				if !reflect.DeepEqual(m.Tags, tags) {
-					t.Errorf("%d %d %d: expected tags\n%#v got\n%#v\n", i, j, k, tags, m.Tags)
-				}
-				if !reflect.DeepEqual(m.Fields, fields) {
-					t.Errorf("%d %d %d: expected fields\n%#v got\n%#v\n", i, j, k, fields, m.Fields)
-				}
-				n++
+				return
 			}
-		}
+			if len(tt.tags) == 0 {
+				n := acc.NFields()
+				if n != 0 {
+					t.Errorf("%d: expected 0 values got %d", i, n)
+				}
+				return
+			}
+			n := 0
+			for j, tags := range tt.tags {
+				for k, fields := range tt.fields[j] {
+					if len(acc.Metrics) < n+1 {
+						t.Errorf("%d: expected at least %d values got %d", i, n+1, len(acc.Metrics))
+						break
+					}
+					m := acc.Metrics[n]
+					if !reflect.DeepEqual(m.Measurement, measurement) {
+						t.Errorf("%d %d %d: expected measurement '%#v' got '%#v'\n", i, j, k, measurement, m.Measurement)
+					}
+					if !reflect.DeepEqual(m.Tags, tags) {
+						t.Errorf("%d %d %d: expected tags\n%#v got\n%#v\n", i, j, k, tags, m.Tags)
+					}
+					if !reflect.DeepEqual(m.Fields, fields) {
+						t.Errorf("%d %d %d: expected fields\n%#v got\n%#v\n", i, j, k, fields, m.Fields)
+					}
+					n++
+				}
+			}
+		})
 	}
 }
 

From 103d24bfbaeb3406e515acb2a2f43ca7e5dc454f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 15:00:55 -0700
Subject: [PATCH 0546/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7ea150a2..9d5b301ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#3217](https://github.com/influxdata/telegraf/issues/3217): Fix optional field value conversions in fluentd input.
 - [#3227](https://github.com/influxdata/telegraf/issues/3227): Whitelist allowed char classes for opentsdb output.
 - [#3232](https://github.com/influxdata/telegraf/issues/3232): Fix counter and gauge metric types.
+- [#3235](https://github.com/influxdata/telegraf/issues/3235): Fix skipped line with empty target in iptables.
 
 ## v1.4 [2017-09-05]
 

From 1c5ebd4be3673a8d5f14642d5efc81b5da08dcc3 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Thu, 14 Sep 2017 18:04:13 -0400
Subject: [PATCH 0547/1302] Fix duplicate keys in perf counters sqlserver query
 (#3175)

---
 plugins/inputs/sqlserver/sqlserver.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index ed3216258..2bc33a54a 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -1022,7 +1022,7 @@ CREATE TABLE #PCounters
 	Primary Key(object_name, counter_name, instance_name)
 );
 INSERT #PCounters
-SELECT RTrim(spi.object_name) object_name
+SELECT DISTINCT RTrim(spi.object_name) object_name
 , RTrim(spi.counter_name) counter_name
 , RTrim(spi.instance_name) instance_name
 , spi.cntr_value
@@ -1044,7 +1044,7 @@ CREATE TABLE #CCounters
 	Primary Key(object_name, counter_name, instance_name)
 );
 INSERT #CCounters
-SELECT RTrim(spi.object_name) object_name
+SELECT DISTINCT RTrim(spi.object_name) object_name
 , RTrim(spi.counter_name) counter_name
 , RTrim(spi.instance_name) instance_name
 , spi.cntr_value

From 875ab3c4b7a3233dbf8b3011779f900da9f8cb0a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 15:05:03 -0700
Subject: [PATCH 0548/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5b301ac..3eef00490 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - [#3227](https://github.com/influxdata/telegraf/issues/3227): Whitelist allowed char classes for opentsdb output.
 - [#3232](https://github.com/influxdata/telegraf/issues/3232): Fix counter and gauge metric types.
 - [#3235](https://github.com/influxdata/telegraf/issues/3235): Fix skipped line with empty target in iptables.
+- [#3175](https://github.com/influxdata/telegraf/issues/3175): Fix duplicate keys in perf counters sqlserver query.
 
 ## v1.4 [2017-09-05]
 

From 171332c579c52fa120c17990decfe25fdf454d6d Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Thu, 14 Sep 2017 18:21:54 -0400
Subject: [PATCH 0549/1302] Add support for timing sums in statsd input (#3234)

---
 plugins/inputs/statsd/README.md        |  2 ++
 plugins/inputs/statsd/running_stats.go | 11 ++++++++++-
 plugins/inputs/statsd/statsd.go        |  1 +
 plugins/inputs/statsd/statsd_test.go   |  5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 17f960b20..69d77580d 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -143,6 +143,8 @@ metric type:
         for that stat during that interval.
         - `statsd_<name>_stddev`: The stddev is the sample standard deviation
         of all values statsd saw for that stat during that interval.
+        - `statsd_<name>_sum`: The sum is the sample sum of all values statsd saw
+        for that stat during that interval.
         - `statsd_<name>_count`: The count is the number of timings statsd saw
         for that stat during that interval. It is not averaged.
         - `statsd_<name>_percentile_<P>` The `Pth` percentile is a value x such
diff --git a/plugins/inputs/statsd/running_stats.go b/plugins/inputs/statsd/running_stats.go
index fd467dfb6..3ce03a877 100644
--- a/plugins/inputs/statsd/running_stats.go
+++ b/plugins/inputs/statsd/running_stats.go
@@ -24,8 +24,10 @@ type RunningStats struct {
 	perc      []float64
 	PercLimit int
 
-	upper float64
+	sum float64
+
 	lower float64
+	upper float64
 
 	// cache if we have sorted the list so that we never re-sort a sorted list,
 	// which can have very bad performance.
@@ -51,6 +53,9 @@ func (rs *RunningStats) AddValue(v float64) {
 	rs.ex += v - rs.k
 	rs.ex2 += (v - rs.k) * (v - rs.k)
 
+	// add to running sum
+	rs.sum += v
+
 	// track upper and lower bounds
 	if v > rs.upper {
 		rs.upper = v
@@ -78,6 +83,10 @@ func (rs *RunningStats) Stddev() float64 {
 	return math.Sqrt(rs.Variance())
 }
 
+func (rs *RunningStats) Sum() float64 {
+	return rs.sum
+}
+
 func (rs *RunningStats) Upper() float64 {
 	return rs.upper
 }
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 960d88c1d..a905c2092 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -235,6 +235,7 @@ func (s *Statsd) Gather(acc telegraf.Accumulator) error {
 			}
 			fields[prefix+"mean"] = stats.Mean()
 			fields[prefix+"stddev"] = stats.Stddev()
+			fields[prefix+"sum"] = stats.Sum()
 			fields[prefix+"upper"] = stats.Upper()
 			fields[prefix+"lower"] = stats.Lower()
 			fields[prefix+"count"] = stats.Count()
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index c8164d4f7..5c6b2065a 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -407,6 +407,7 @@ func TestParse_Timings(t *testing.T) {
 		"lower":         float64(1),
 		"mean":          float64(3),
 		"stddev":        float64(4),
+		"sum":           float64(15),
 		"upper":         float64(11),
 	}
 
@@ -1154,6 +1155,7 @@ func TestParse_Timings_MultipleFieldsWithTemplate(t *testing.T) {
 		"success_lower":         float64(1),
 		"success_mean":          float64(3),
 		"success_stddev":        float64(4),
+		"success_sum":           float64(15),
 		"success_upper":         float64(11),
 
 		"error_90_percentile": float64(22),
@@ -1161,6 +1163,7 @@ func TestParse_Timings_MultipleFieldsWithTemplate(t *testing.T) {
 		"error_lower":         float64(2),
 		"error_mean":          float64(6),
 		"error_stddev":        float64(8),
+		"error_sum":           float64(30),
 		"error_upper":         float64(22),
 	}
 
@@ -1203,6 +1206,7 @@ func TestParse_Timings_MultipleFieldsWithoutTemplate(t *testing.T) {
 		"lower":         float64(1),
 		"mean":          float64(3),
 		"stddev":        float64(4),
+		"sum":           float64(15),
 		"upper":         float64(11),
 	}
 	expectedError := map[string]interface{}{
@@ -1211,6 +1215,7 @@ func TestParse_Timings_MultipleFieldsWithoutTemplate(t *testing.T) {
 		"lower":         float64(2),
 		"mean":          float64(6),
 		"stddev":        float64(8),
+		"sum":           float64(30),
 		"upper":         float64(22),
 	}
 

From 103ae3b710b486f1bd52d000e30d5f3c3994ed0b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 15:22:46 -0700
Subject: [PATCH 0550/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eef00490..e913c345e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
 - [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
+- [#3234](https://github.com/influxdata/telegraf/pull/3234): Add support for timing sums in statsd input.
 
 ### Bugfixes
 

From 73372872c2262bc3dc0f97f7476e71c1947e8cac Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Thu, 14 Sep 2017 18:27:42 -0400
Subject: [PATCH 0551/1302] Fix panic in statsd p100 calculation (#3230)

---
 plugins/inputs/statsd/running_stats.go      | 15 +++++++++++----
 plugins/inputs/statsd/running_stats_test.go | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/statsd/running_stats.go b/plugins/inputs/statsd/running_stats.go
index 3ce03a877..2395ab143 100644
--- a/plugins/inputs/statsd/running_stats.go
+++ b/plugins/inputs/statsd/running_stats.go
@@ -110,8 +110,15 @@ func (rs *RunningStats) Percentile(n int) float64 {
 	}
 
 	i := int(float64(len(rs.perc)) * float64(n) / float64(100))
-	if i < 0 {
-		i = 0
-	}
-	return rs.perc[i]
+	return rs.perc[clamp(i, 0, len(rs.perc)-1)]
+}
+
+func clamp(i int, min int, max int) int {
+	if i < min {
+		return min
+	}
+	if i > max {
+		return max
+	}
+	return i
 }
diff --git a/plugins/inputs/statsd/running_stats_test.go b/plugins/inputs/statsd/running_stats_test.go
index 614de9cec..4571f76d7 100644
--- a/plugins/inputs/statsd/running_stats_test.go
+++ b/plugins/inputs/statsd/running_stats_test.go
@@ -23,12 +23,18 @@ func TestRunningStats_Single(t *testing.T) {
 	if rs.Lower() != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Lower())
 	}
+	if rs.Percentile(100) != 10.1 {
+		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(100))
+	}
 	if rs.Percentile(90) != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(90))
 	}
 	if rs.Percentile(50) != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(50))
 	}
+	if rs.Percentile(0) != 10.1 {
+		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(0))
+	}
 	if rs.Count() != 1 {
 		t.Errorf("Expected %v, got %v", 1, rs.Count())
 	}
@@ -58,12 +64,18 @@ func TestRunningStats_Duplicate(t *testing.T) {
 	if rs.Lower() != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Lower())
 	}
+	if rs.Percentile(100) != 10.1 {
+		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(100))
+	}
 	if rs.Percentile(90) != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(90))
 	}
 	if rs.Percentile(50) != 10.1 {
 		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(50))
 	}
+	if rs.Percentile(0) != 10.1 {
+		t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(0))
+	}
 	if rs.Count() != 4 {
 		t.Errorf("Expected %v, got %v", 4, rs.Count())
 	}
@@ -93,12 +105,18 @@ func TestRunningStats(t *testing.T) {
 	if rs.Lower() != 5 {
 		t.Errorf("Expected %v, got %v", 5, rs.Lower())
 	}
+	if rs.Percentile(100) != 45 {
+		t.Errorf("Expected %v, got %v", 45, rs.Percentile(100))
+	}
 	if rs.Percentile(90) != 32 {
 		t.Errorf("Expected %v, got %v", 32, rs.Percentile(90))
 	}
 	if rs.Percentile(50) != 11 {
 		t.Errorf("Expected %v, got %v", 11, rs.Percentile(50))
 	}
+	if rs.Percentile(0) != 5 {
+		t.Errorf("Expected %v, got %v", 5, rs.Percentile(0))
+	}
 	if rs.Count() != 16 {
 		t.Errorf("Expected %v, got %v", 4, rs.Count())
 	}

From b94cda6b462daae995ca4187a9957199605846d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 15:28:47 -0700
Subject: [PATCH 0552/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e913c345e..dbdb9cc60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - [#3232](https://github.com/influxdata/telegraf/issues/3232): Fix counter and gauge metric types.
 - [#3235](https://github.com/influxdata/telegraf/issues/3235): Fix skipped line with empty target in iptables.
 - [#3175](https://github.com/influxdata/telegraf/issues/3175): Fix duplicate keys in perf counters sqlserver query.
+- [#3230](https://github.com/influxdata/telegraf/issues/3230): Fix panic in statsd p100 calculation.
 
 ## v1.4 [2017-09-05]
 

From 575a07c985d62ab17308609ddaec618218a4e8ff Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Sep 2017 15:50:55 -0700
Subject: [PATCH 0553/1302] Update input plugin example readme.

---
 plugins/inputs/EXAMPLE_README.md | 33 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/plugins/inputs/EXAMPLE_README.md b/plugins/inputs/EXAMPLE_README.md
index 73e33850c..4ebedda87 100644
--- a/plugins/inputs/EXAMPLE_README.md
+++ b/plugins/inputs/EXAMPLE_README.md
@@ -6,30 +6,37 @@ additional information can be found.
 
 ### Configuration:
 
+This section contains the default TOML to configure the plugin.  You can
+generate it using `telegraf --usage <plugin-name>`.
+
 ```toml
 # Description
 [[inputs.example]]
-  # SampleConfig
+  example_option = "example_value"
 ```
 
-### Measurements & Fields:
+### Metrics:
 
 Here you should add an optional description and links to where the user can
 get more information about the measurements.
 
+If the output is determined dynamically based on the input source, or there
+are more metrics than can reasonably be listed, describe how the input is
+mapped to the output.
+
 - measurement1
-    - field1 (type, unit)
-    - field2 (float, percent)
-- measurement2
-    - field3 (integer, bytes)
-
-### Tags:
-
-- All measurements have the following tags:
+  - tags:
     - tag1 (optional description)
     - tag2
-- measurement2 has the following tags:
+  - fields:
+    - field1 (type, unit)
+    - field2 (float, percent)
+
+- measurement2
+  - tags:
     - tag3
+  - fields:
+    - field3 (integer, bytes)
 
 ### Sample Queries:
 
@@ -44,6 +51,10 @@ SELECT max(field1), mean(field1), min(field1) FROM measurement1 WHERE tag1=bar A
 
 ### Example Output:
 
+This section shows example output in Line Protocol format.  You can often use
+`telegraf --input-filter <plugin-name> --test` or use the `file` output to get
+this information.
+
 ```
 measurement1,tag1=foo,tag2=bar field1=1i,field2=2.1 1453831884664956455
 measurement2,tag1=foo,tag2=bar,tag3=baz field3=1i 1453831884664956455

From 0339dc7faf57a5e74aeffc50efb2b5f62452795f Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 15 Sep 2017 14:16:44 -0400
Subject: [PATCH 0554/1302] Add process resource limits to procstat input
 (#3231)

---
 CHANGELOG.md                             |  1 +
 Godeps                                   |  2 +-
 plugins/inputs/procstat/README.md        | 63 +++++++++++++++++++-----
 plugins/inputs/procstat/process.go       |  1 +
 plugins/inputs/procstat/procstat.go      | 43 ++++++++++++++++
 plugins/inputs/procstat/procstat_test.go |  4 ++
 6 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbdb9cc60..c24594ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3234](https://github.com/influxdata/telegraf/pull/3234): Add support for timing sums in statsd input.
+- [#2617](https://github.com/influxdata/telegraf/issues/2617): Add resource limit monitoring to procstat.
 
 ### Bugfixes
 
diff --git a/Godeps b/Godeps
index 48f9138e8..654a345eb 100644
--- a/Godeps
+++ b/Godeps
@@ -60,7 +60,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 9a4a9167ad3b4355dbf1c2c7a0f5f0d3fb1e9ab9
+github.com/shirou/gopsutil a452de7c734a0fa0f16d2e5725b0fa5934d9fbec
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 13f7e86ab..57ede8391 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -39,8 +39,8 @@ Example:
 The above configuration would result in output like:
 
 ```
-> procstat,pidfile=/var/run/lxc/dnsmasq.pid,process_name=dnsmasq,pid=44979 cpu_user=0.14,cpu_system=0.07
-> procstat,exe=influxd,process_name=influxd,pid=34337 influxd_cpu_user=25.43,influxd_cpu_system=21.82
+> procstat,pidfile=/var/run/lxc/dnsmasq.pid,process_name=dnsmasq rlimit_file_locks_soft=2147483647i,rlimit_signals_pending_hard=1758i,voluntary_context_switches=478i,read_bytes=307200i,cpu_time_user=0.01,cpu_time_guest=0,memory_swap=0i,memory_locked=0i,rlimit_num_fds_hard=4096i,rlimit_nice_priority_hard=0i,num_fds=11i,involuntary_context_switches=20i,read_count=23i,memory_rss=1388544i,rlimit_memory_rss_soft=2147483647i,rlimit_memory_rss_hard=2147483647i,nice_priority=20i,rlimit_cpu_time_hard=2147483647i,cpu_time=0i,write_bytes=0i,cpu_time_idle=0,cpu_time_nice=0,memory_data=229376i,memory_stack=135168i,rlimit_cpu_time_soft=2147483647i,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_hard=65536i,rlimit_signals_pending_soft=1758i,write_count=11i,cpu_time_iowait=0,cpu_time_steal=0,cpu_time_stolen=0,rlimit_memory_stack_soft=8388608i,cpu_time_system=0.02,cpu_time_guest_nice=0,rlimit_memory_locked_soft=65536i,rlimit_memory_vms_soft=2147483647i,rlimit_file_locks_hard=2147483647i,rlimit_realtime_priority_hard=0i,pid=828i,num_threads=1i,cpu_time_soft_irq=0,rlimit_memory_vms_hard=2147483647i,rlimit_realtime_priority_soft=0i,memory_vms=15884288i,rlimit_memory_stack_hard=2147483647i,cpu_time_irq=0,rlimit_memory_data_soft=2147483647i,rlimit_num_fds_soft=1024i,signals_pending=0i,rlimit_nice_priority_soft=0i,realtime_priority=0i
+> procstat,exe=influxd,process_name=influxd rlimit_num_fds_hard=16384i,rlimit_signals_pending_hard=1758i,realtime_priority=0i,rlimit_memory_vms_hard=2147483647i,rlimit_signals_pending_soft=1758i,cpu_time_stolen=0,rlimit_memory_stack_hard=2147483647i,rlimit_realtime_priority_hard=0i,cpu_time=0i,pid=500i,voluntary_context_switches=975i,cpu_time_idle=0,memory_rss=3072000i,memory_locked=0i,rlimit_nice_priority_soft=0i,signals_pending=0i,nice_priority=20i,read_bytes=823296i,cpu_time_soft_irq=0,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_soft=65536i,write_count=8i,cpu_time_irq=0,memory_vms=33501184i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,rlimit_memory_vms_soft=2147483647i,rlimit_nice_priority_hard=0i,num_fds=29i,memory_data=229376i,rlimit_cpu_time_soft=2147483647i,rlimit_file_locks_soft=2147483647i,num_threads=1i,write_bytes=0i,cpu_time_steal=0,rlimit_memory_rss_hard=2147483647i,cpu_time_guest=0,cpu_time_guest_nice=0,cpu_usage=0,rlimit_memory_locked_hard=65536i,rlimit_file_locks_hard=2147483647i,involuntary_context_switches=38i,read_count=16851i,memory_swap=0i,rlimit_memory_data_soft=2147483647i,cpu_time_user=0.11,rlimit_cpu_time_hard=2147483647i,rlimit_num_fds_soft=16384i,rlimit_realtime_priority_soft=0i,cpu_time_system=0.27,cpu_time_nice=0,memory_stack=135168i,rlimit_memory_rss_soft=2147483647i
 ```
 
 # Measurements
@@ -53,6 +53,13 @@ Threads related measurement names:
 File descriptor related measurement names (*telegraf* needs to run as **root**):
 - procstat_[prefix_]num_fds value=4
 
+Priority related measurement names:
+- procstat_[prefix_]realtime_priority value=0
+- procstat_[prefix_]nice_priority value=20
+
+Signals related measurement names:
+- procstat_[prefix_]signals_pending value=0
+
 Context switch related measurement names:
 - procstat_[prefix_]voluntary_context_switches value=250
 - procstat_[prefix_]involuntary_context_switches value=0
@@ -64,19 +71,49 @@ I/O related measurement names (*telegraf* needs to run as **root**):
 - procstat_[prefix_]write_bytes value=1
 
 CPU related measurement names:
-- procstat_[prefix_]cpu_user value=0
-- procstat_[prefix_]cpu_system value=0.01
-- procstat_[prefix_]cpu_idle value=0
-- procstat_[prefix_]cpu_nice value=0
-- procstat_[prefix_]cpu_iowait value=0
-- procstat_[prefix_]cpu_irq value=0
-- procstat_[prefix_]cpu_soft_irq value=0
-- procstat_[prefix_]cpu_soft_steal value=0
-- procstat_[prefix_]cpu_soft_stolen value=0
-- procstat_[prefix_]cpu_soft_guest value=0
-- procstat_[prefix_]cpu_soft_guest_nice value=0
+- procstat_[prefix_]cpu_time value=0.01
+- procstat_[prefix_]cpu_time_user value=0
+- procstat_[prefix_]cpu_time_system value=0.01
+- procstat_[prefix_]cpu_time_idle value=0
+- procstat_[prefix_]cpu_time_nice value=0
+- procstat_[prefix_]cpu_time_iowait value=0
+- procstat_[prefix_]cpu_time_irq value=0
+- procstat_[prefix_]cpu_time_soft_irq value=0
+- procstat_[prefix_]cpu_time_steal value=0
+- procstat_[prefix_]cpu_time_stolen value=0
+- procstat_[prefix_]cpu_time_guest value=0
+- procstat_[prefix_]cpu_time_guest_nice value=0
 
 Memory related measurement names:
 - procstat_[prefix_]memory_rss value=1777664
 - procstat_[prefix_]memory_vms value=24227840
 - procstat_[prefix_]memory_swap value=282624
+- procstat_[prefix_]memory_data value=229376
+- procstat_[prefix_]memory_stack value=135168
+- procstat_[prefix_]memory_locked value=0
+
+Resource limits:
+- procstat_[prefix_]rlimit_cpu_time_hard value=2147483647
+- procstat_[prefix_]rlimit_cpu_time_soft value=2147483647
+- procstat_[prefix_]rlimit_file_locks_hard value=2147483647
+- procstat_[prefix_]rlimit_file_locks_soft value=2147483647
+- procstat_[prefix_]rlimit_memory_data_hard value=2147483647
+- procstat_[prefix_]rlimit_memory_data_soft value=2147483647
+- procstat_[prefix_]rlimit_memory_locked_hard value=65536
+- procstat_[prefix_]rlimit_memory_locked_soft value=65536
+- procstat_[prefix_]rlimit_memory_rss_hard value=2147483647
+- procstat_[prefix_]rlimit_memory_rss_soft value=2147483647
+- procstat_[prefix_]rlimit_memory_stack_hard value=2147483647
+- procstat_[prefix_]rlimit_memory_stack_soft value=8388608
+- procstat_[prefix_]rlimit_memory_vms_hard value=2147483647
+- procstat_[prefix_]rlimit_memory_vms_soft value=2147483647
+- procstat_[prefix_]rlimit_nice_priority_hard value=0
+- procstat_[prefix_]rlimit_nice_priority_soft value=0
+- procstat_[prefix_]rlimit_num_fds_hard value=16384
+- procstat_[prefix_]rlimit_num_fds_soft value=16384
+- procstat_[prefix_]rlimit_realtime_priority_hard value=0
+- procstat_[prefix_]rlimit_realtime_priority_soft value=0
+- procstat_[prefix_]rlimit_signals_pending_hard value=1758
+- procstat_[prefix_]rlimit_signals_pending_soft value=1758
+
+*NOTE: Due to a limitation in an underlying library Telegraf uses, any resource limit > 2147483647 will be misreported as 2147483647.*
diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
index ec2363f6e..3470a8a94 100644
--- a/plugins/inputs/procstat/process.go
+++ b/plugins/inputs/procstat/process.go
@@ -20,6 +20,7 @@ type Process interface {
 	NumThreads() (int32, error)
 	Percent(interval time.Duration) (float64, error)
 	Times() (*cpu.TimesStat, error)
+	RlimitUsage(bool) ([]process.RlimitStat, error)
 }
 
 type Proc struct {
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 3715d390b..a216e0e38 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/shirou/gopsutil/process"
 )
 
 var (
@@ -154,6 +155,48 @@ func (p *Procstat) addMetrics(proc Process, acc telegraf.Accumulator) {
 		fields[prefix+"memory_rss"] = mem.RSS
 		fields[prefix+"memory_vms"] = mem.VMS
 		fields[prefix+"memory_swap"] = mem.Swap
+		fields[prefix+"memory_data"] = mem.Data
+		fields[prefix+"memory_stack"] = mem.Stack
+		fields[prefix+"memory_locked"] = mem.Locked
+	}
+
+	rlims, err := proc.RlimitUsage(true)
+	if err == nil {
+		for _, rlim := range rlims {
+			var name string
+			switch rlim.Resource {
+			case process.RLIMIT_CPU:
+				name = "cpu_time"
+			case process.RLIMIT_DATA:
+				name = "memory_data"
+			case process.RLIMIT_STACK:
+				name = "memory_stack"
+			case process.RLIMIT_RSS:
+				name = "memory_rss"
+			case process.RLIMIT_NOFILE:
+				name = "num_fds"
+			case process.RLIMIT_MEMLOCK:
+				name = "memory_locked"
+			case process.RLIMIT_AS:
+				name = "memory_vms"
+			case process.RLIMIT_LOCKS:
+				name = "file_locks"
+			case process.RLIMIT_SIGPENDING:
+				name = "signals_pending"
+			case process.RLIMIT_NICE:
+				name = "nice_priority"
+			case process.RLIMIT_RTPRIO:
+				name = "realtime_priority"
+			default:
+				continue
+			}
+
+			fields[prefix+"rlimit_"+name+"_soft"] = rlim.Soft
+			fields[prefix+"rlimit_"+name+"_hard"] = rlim.Hard
+			if name != "file_locks" { // gopsutil doesn't currently track the used file locks count
+				fields[prefix+name] = rlim.Used
+			}
+		}
 	}
 
 	acc.AddFields("procstat", fields, proc.Tags())
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index 97cf34582..bc052939f 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -95,6 +95,10 @@ func (p *testProc) Times() (*cpu.TimesStat, error) {
 	return &cpu.TimesStat{}, nil
 }
 
+func (p *testProc) RlimitUsage(gatherUsage bool) ([]process.RlimitStat, error) {
+	return []process.RlimitStat{}, nil
+}
+
 var pid PID = PID(42)
 var exe string = "foo"
 

From b8e134cd37fc8d05597e6f080c3269857909ab6a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 18 Sep 2017 14:22:54 -0700
Subject: [PATCH 0555/1302] Fix arm64 packages contain 32-bit executable
 (#3246)

---
 scripts/build.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/build.py b/scripts/build.py
index 40b849ebc..9b70e961e 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -274,6 +274,8 @@ def get_system_arch():
         arch = "amd64"
     elif arch == "386":
         arch = "i386"
+    elif "arm64" in arch:
+        arch = "arm64"
     elif 'arm' in arch:
         # Prevent uname from reporting full ARM arch (eg 'armv7l')
         arch = "arm"
@@ -446,6 +448,8 @@ def build(version=None,
         # Handle variations in architecture output
         if arch == "i386" or arch == "i686":
             arch = "386"
+        elif "arm64" in arch:
+            arch = "arm64"
         elif "arm" in arch:
             arch = "arm"
         build_command += "GOOS={} GOARCH={} ".format(platform, arch)

From 0048bf21202fb0bbf8100c4cac19b2e1b02fd2bc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Sep 2017 14:25:17 -0700
Subject: [PATCH 0556/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c24594ed4..611d6a29e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - [#3235](https://github.com/influxdata/telegraf/issues/3235): Fix skipped line with empty target in iptables.
 - [#3175](https://github.com/influxdata/telegraf/issues/3175): Fix duplicate keys in perf counters sqlserver query.
 - [#3230](https://github.com/influxdata/telegraf/issues/3230): Fix panic in statsd p100 calculation.
+- [#3242](https://github.com/influxdata/telegraf/issues/3242): Fix arm64 packages contain 32-bit executable.
 
 ## v1.4 [2017-09-05]
 

From 292c5229bf01ddfe3e96e493c897badbc7e45e4d Mon Sep 17 00:00:00 2001
From: Christian Meilke <christian.meilke@googlemail.com>
Date: Tue, 19 Sep 2017 00:06:11 +0200
Subject: [PATCH 0557/1302] Add support for k8s service DNS discovery to
 prometheus input  (#3236)

---
 plugins/inputs/prometheus/README.md          | 20 ++++-
 plugins/inputs/prometheus/prometheus.go      | 84 +++++++++++++++++---
 plugins/inputs/prometheus/prometheus_test.go | 53 +++++++++++-
 3 files changed, 142 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index 15e61bd65..e99f5b787 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -5,9 +5,9 @@ exposing metrics with Prometheus format
 
 ### Configuration:
 
-Example for Kubernetes apiserver
+Example for Kubernetes API server
 ```toml
-# Get all metrics from Kube-apiserver
+# Get all metrics from Kubernetes API server
 [[inputs.prometheus]]
   # An array of urls to scrape metrics from.
   urls = ["http://my-kube-apiserver:8080/metrics"]
@@ -15,7 +15,7 @@ Example for Kubernetes apiserver
 
 Specify a 10 second timeout for slower/over-loaded clients
 ```toml
-# Get all metrics from Kube-apiserver
+# Get all metrics from Kubernetes API server
 [[inputs.prometheus]]
   # An array of urls to scrape metrics from.
   urls = ["http://my-kube-apiserver:8080/metrics"]
@@ -28,7 +28,7 @@ You can use more complex configuration
 to filter and some tags
 
 ```toml
-# Get all metrics from Kube-apiserver
+# Get all metrics from Kubernetes API server
 [[inputs.prometheus]]
   # An array of urls to scrape metrics from.
   urls = ["http://my-kube-apiserver:8080/metrics"]
@@ -61,6 +61,18 @@ to filter and some tags
   ssl_key = '/path/to/keyfile'
 ```
 
+```toml
+# Use with [Kubernetes headless services](https://kubernetes.io/docs/concepts/services-networking/service/#headless-services)
+[[inputs.prometheus]]
+  # An array of urls to scrape metrics from.
+  urls = ["https://my-kube-apiserver:8080/metrics"]
+
+  # An array of Kubernetes services to scrape metrics from.
+  # The IP addresses of all pods behind these services will be resolved and
+  # then scraped
+  kubernetes_services = ["https://my-headless-service.my-namespace:8080/metrics"]
+```
+
 ### Usage for Caddy HTTP server
 
 If you want to monitor Caddy, you need to use Caddy with its Prometheus plugin:
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 73e202d7a..e2687d472 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -4,7 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"log"
+	"net"
 	"net/http"
+	"net/url"
 	"sync"
 	"time"
 
@@ -16,8 +19,12 @@ import (
 const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited;q=0.7,text/plain;version=0.0.4;q=0.3`
 
 type Prometheus struct {
+	// An array of urls to scrape metrics from.
 	Urls []string
 
+	// An array of Kubernetes services to scrape metrics from.
+	KubernetesServices []string
+
 	// Bearer Token authorization file path
 	BearerToken string `toml:"bearer_token"`
 
@@ -39,6 +46,9 @@ var sampleConfig = `
   ## An array of urls to scrape metrics from.
   urls = ["http://localhost:9100/metrics"]
 
+  ## An array of Kubernetes services to scrape metrics from.
+  kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
+
   ## Use bearer token for authorization
   # bearer_token = /path/to/bearer/token
 
@@ -63,6 +73,53 @@ func (p *Prometheus) Description() string {
 
 var ErrProtocolError = errors.New("prometheus protocol error")
 
+func (p *Prometheus) AddressToURL(u *url.URL, address string) string {
+	host := address
+	if u.Port() != "" {
+		host = address + ":" + u.Port()
+	}
+	reconstructedUrl := url.URL{
+		Scheme:     u.Scheme,
+		Opaque:     u.Opaque,
+		User:       u.User,
+		Path:       u.Path,
+		RawPath:    u.RawPath,
+		ForceQuery: u.ForceQuery,
+		RawQuery:   u.RawQuery,
+		Fragment:   u.Fragment,
+		Host:       host,
+	}
+	return reconstructedUrl.String()
+}
+
+type UrlAndAddress struct {
+	Url     string
+	Address string
+}
+
+func (p *Prometheus) GetAllURLs() ([]UrlAndAddress, error) {
+	allUrls := make([]UrlAndAddress, 0)
+	for _, url := range p.Urls {
+		allUrls = append(allUrls, UrlAndAddress{Url: url})
+	}
+	for _, service := range p.KubernetesServices {
+		u, err := url.Parse(service)
+		if err != nil {
+			return nil, err
+		}
+		resolvedAddresses, err := net.LookupHost(u.Hostname())
+		if err != nil {
+			log.Printf("prometheus: Could not resolve %s, skipping it. Error: %s", u.Host, err)
+			continue
+		}
+		for _, resolved := range resolvedAddresses {
+			serviceUrl := p.AddressToURL(u, resolved)
+			allUrls = append(allUrls, UrlAndAddress{Url: serviceUrl, Address: resolved})
+		}
+	}
+	return allUrls, nil
+}
+
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
 func (p *Prometheus) Gather(acc telegraf.Accumulator) error {
@@ -76,12 +133,16 @@ func (p *Prometheus) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	for _, serv := range p.Urls {
+	allUrls, err := p.GetAllURLs()
+	if err != nil {
+		return err
+	}
+	for _, url := range allUrls {
 		wg.Add(1)
-		go func(serv string) {
+		go func(serviceUrl UrlAndAddress) {
 			defer wg.Done()
-			acc.AddError(p.gatherURL(serv, acc))
-		}(serv)
+			acc.AddError(p.gatherURL(serviceUrl, acc))
+		}(url)
 	}
 
 	wg.Wait()
@@ -116,8 +177,8 @@ func (p *Prometheus) createHttpClient() (*http.Client, error) {
 	return client, nil
 }
 
-func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
-	var req, err = http.NewRequest("GET", url, nil)
+func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) error {
+	var req, err = http.NewRequest("GET", url.Url, nil)
 	req.Header.Add("Accept", acceptHeader)
 	var token []byte
 	var resp *http.Response
@@ -132,11 +193,11 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 
 	resp, err = p.client.Do(req)
 	if err != nil {
-		return fmt.Errorf("error making HTTP request to %s: %s", url, err)
+		return fmt.Errorf("error making HTTP request to %s: %s", url.Url, err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%s returned HTTP status %s", url, resp.Status)
+		return fmt.Errorf("%s returned HTTP status %s", url.Url, resp.Status)
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
@@ -147,12 +208,15 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
 	metrics, err := Parse(body, resp.Header)
 	if err != nil {
 		return fmt.Errorf("error reading metrics for %s: %s",
-			url, err)
+			url.Url, err)
 	}
 	// Add (or not) collected metrics
 	for _, metric := range metrics {
 		tags := metric.Tags()
-		tags["url"] = url
+		tags["url"] = url.Url
+		if url.Address != "" {
+			tags["address"] = url.Address
+		}
 		acc.AddFields(metric.Name(), metric.Fields(), tags, metric.Time())
 	}
 
diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
index 64959b2e2..3cb931270 100644
--- a/plugins/inputs/prometheus/prometheus_test.go
+++ b/plugins/inputs/prometheus/prometheus_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 	"time"
 
@@ -48,5 +49,55 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
 	assert.True(t, acc.HasFloatField("go_goroutines", "gauge"))
 	assert.True(t, acc.HasFloatField("test_metric", "value"))
 	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
-
+	assert.False(t, acc.HasTag("test_metric", "address"))
+}
+
+func TestPrometheusGeneratesMetricsWithHostNameTag(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintln(w, sampleTextFormat)
+	}))
+	defer ts.Close()
+
+	p := &Prometheus{
+		KubernetesServices: []string{ts.URL},
+	}
+	u, _ := url.Parse(ts.URL)
+	tsAddress := u.Hostname()
+
+	var acc testutil.Accumulator
+
+	err := acc.GatherError(p.Gather)
+	require.NoError(t, err)
+
+	assert.True(t, acc.HasFloatField("go_gc_duration_seconds", "count"))
+	assert.True(t, acc.HasFloatField("go_goroutines", "gauge"))
+	assert.True(t, acc.HasFloatField("test_metric", "value"))
+	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
+	assert.True(t, acc.TagValue("test_metric", "address") == tsAddress)
+}
+
+func TestPrometheusGeneratesMetricsAlthoughFirstDNSFails(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintln(w, sampleTextFormat)
+	}))
+	defer ts.Close()
+
+	p := &Prometheus{
+		Urls:               []string{ts.URL},
+		KubernetesServices: []string{"http://random.telegraf.local:88/metrics"},
+	}
+
+	var acc testutil.Accumulator
+
+	err := acc.GatherError(p.Gather)
+	require.NoError(t, err)
+
+	assert.True(t, acc.HasFloatField("go_gc_duration_seconds", "count"))
+	assert.True(t, acc.HasFloatField("go_goroutines", "gauge"))
+	assert.True(t, acc.HasFloatField("test_metric", "value"))
+	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
 }

From dea8bf7ac0723d6e3b8b009d1d468079b8a24c61 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Sep 2017 15:07:18 -0700
Subject: [PATCH 0558/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 611d6a29e..427ffde4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3234](https://github.com/influxdata/telegraf/pull/3234): Add support for timing sums in statsd input.
 - [#2617](https://github.com/influxdata/telegraf/issues/2617): Add resource limit monitoring to procstat.
+- [#3236](https://github.com/influxdata/telegraf/pull/3236): Add support for k8s service DNS discovery to prometheus input.
 
 ### Bugfixes
 

From daee48c861ec65b7dd27b716e554733dcd49f002 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Sep 2017 16:21:45 -0700
Subject: [PATCH 0559/1302] Update prometheus input documentation

---
 plugins/inputs/prometheus/README.md     | 161 ++++++++++--------------
 plugins/inputs/prometheus/parser.go     |   2 +-
 plugins/inputs/prometheus/prometheus.go |   2 +-
 3 files changed, 67 insertions(+), 98 deletions(-)

diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index e99f5b787..d2d19520c 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -1,77 +1,47 @@
 # Prometheus Input Plugin
 
-The prometheus input plugin gathers metrics from any webpage
-exposing metrics with Prometheus format
+The prometheus input plugin gathers metrics from HTTP servers exposing metrics
+in Prometheus format.
 
 ### Configuration:
 
-Example for Kubernetes API server
 ```toml
-# Get all metrics from Kubernetes API server
+# Read metrics from one or many prometheus clients
 [[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["http://my-kube-apiserver:8080/metrics"]
+  ## An array of urls to scrape metrics from.
+  urls = ["http://localhost:9100/metrics"]
+
+  ## An array of Kubernetes services to scrape metrics from.
+  # kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
+
+  ## Use bearer token for authorization
+  # bearer_token = /path/to/bearer/token
+
+  ## Specify timeout duration for slower prometheus clients (default is 3s)
+  # response_timeout = "3s"
+
+  ## Optional SSL Config
+  # ssl_ca = /path/to/cafile
+  # ssl_cert = /path/to/certfile
+  # ssl_key = /path/to/keyfile
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
-Specify a 10 second timeout for slower/over-loaded clients
-```toml
-# Get all metrics from Kubernetes API server
-[[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["http://my-kube-apiserver:8080/metrics"]
+#### Kubernetes Service Discovery
 
-  # Specify timeout duration for slower prometheus clients (default is 3s)
-  response_timeout = "10s"
-```
+URLs listed in the `kubernetes_services` parameter will be expanded
+by looking up all A records assigned to the hostname as described in
+[Kubernetes DNS service discovery](https://kubernetes.io/docs/concepts/services-networking/service/#dns).
 
-You can use more complex configuration
-to filter and some tags
+This method can be used to locate all
+[Kubernetes headless services](https://kubernetes.io/docs/concepts/services-networking/service/#headless-services).
 
-```toml
-# Get all metrics from Kubernetes API server
-[[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["http://my-kube-apiserver:8080/metrics"]
-  # Get only metrics with "apiserver_" string is in metric name
-  namepass = ["apiserver_*"]
-  # Add a metric name prefix
-  name_prefix = "k8s_"
-  # Add tags to be able to make beautiful dashboards
-  [inputs.prometheus.tags]
-    kubeservice = "kube-apiserver"
-```
+#### Bearer Token
 
-```toml
-# Authorize with a bearer token skipping cert verification
-[[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["http://my-kube-apiserver:8080/metrics"]
-  bearer_token = '/path/to/bearer/token'
-  insecure_skip_verify = true
-```
-
-```toml
-# Authorize using x509 certs
-[[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["https://my-kube-apiserver:8080/metrics"]
-
-  ssl_ca = '/path/to/cafile'
-  ssl_cert = '/path/to/certfile'
-  ssl_key = '/path/to/keyfile'
-```
-
-```toml
-# Use with [Kubernetes headless services](https://kubernetes.io/docs/concepts/services-networking/service/#headless-services)
-[[inputs.prometheus]]
-  # An array of urls to scrape metrics from.
-  urls = ["https://my-kube-apiserver:8080/metrics"]
-
-  # An array of Kubernetes services to scrape metrics from.
-  # The IP addresses of all pods behind these services will be resolved and
-  # then scraped
-  kubernetes_services = ["https://my-headless-service.my-namespace:8080/metrics"]
-```
+If set, the file specified by the `bearer_token` parameter will be read on
+each interval and its contents will be appended to the Bearer string in the
+Authorization header.
 
 ### Usage for Caddy HTTP server
 
@@ -91,46 +61,45 @@ If you want to monitor Caddy, you need to use Caddy with its Prometheus plugin:
 > This is the default URL where Caddy Prometheus plugin will send data.
 > For more details, please read the [Caddy Prometheus documentation](https://github.com/miekg/caddy-prometheus/blob/master/README.md).
 
-### Measurements & Fields & Tags:
+### Metrics:
 
-Measurements and fields could be any thing.
-It just depends of what you're quering.
+Measurement names are based on the Metric Family and tags are created for each
+label.  The value is added to a field named based on the metric type.
 
-Example:
-
-```
-# HELP go_gc_duration_seconds A summary of the GC invocation durations.
-# TYPE go_gc_duration_seconds summary
-go_gc_duration_seconds{quantile="0"} 0.00010425500000000001
-go_gc_duration_seconds{quantile="0.25"} 0.000139108
-go_gc_duration_seconds{quantile="0.5"} 0.00015749400000000002
-go_gc_duration_seconds{quantile="0.75"} 0.000331463
-go_gc_duration_seconds{quantile="1"} 0.000667154
-go_gc_duration_seconds_sum 0.0018183950000000002
-go_gc_duration_seconds_count 7
-# HELP go_goroutines Number of goroutines that currently exist.
-# TYPE go_goroutines gauge
-go_goroutines 15
-```
-
-- go_goroutines,
-    - gauge (integer, unit)
-- go_gc_duration_seconds
-    - field3 (integer, bytes)
-
-- All measurements have the following tags:
-    - url=http://my-kube-apiserver:8080/metrics
-- go_goroutines has the following tags:
-    - kubeservice=kube-apiserver
-- go_gc_duration_seconds has the following tags:
-    - kubeservice=kube-apiserver
+All metrics receive the `url` tag indicating the related URL specified in the
+Telegraf configuration.  If using Kubernetes service discovery the `address`
+tag is also added indicating the discovered ip address.
 
 ### Example Output:
 
-Example of output with configuration given above:
+**Source**
+```
+# HELP go_gc_duration_seconds A summary of the GC invocation durations.
+# TYPE go_gc_duration_seconds summary
+go_gc_duration_seconds{quantile="0"} 7.4545e-05
+go_gc_duration_seconds{quantile="0.25"} 7.6999e-05
+go_gc_duration_seconds{quantile="0.5"} 0.000277935
+go_gc_duration_seconds{quantile="0.75"} 0.000706591
+go_gc_duration_seconds{quantile="1"} 0.000706591
+go_gc_duration_seconds_sum 0.00113607
+go_gc_duration_seconds_count 4
+# HELP go_goroutines Number of goroutines that currently exist.
+# TYPE go_goroutines gauge
+go_goroutines 15
+# HELP cpu_usage_user Telegraf collected metric
+# TYPE cpu_usage_user gauge
+cpu_usage_user{cpu="cpu0"} 1.4112903225816156
+cpu_usage_user{cpu="cpu1"} 0.702106318955865
+cpu_usage_user{cpu="cpu2"} 2.0161290322588776
+cpu_usage_user{cpu="cpu3"} 1.5045135406226022
+```
 
+**Output**
 ```
-$ ./telegraf --config telegraf.conf --test
-k8s_go_goroutines,kubeservice=kube-apiserver,url=http://my-kube-apiserver:8080/metrics gauge=536 1456857329391929813
-k8s_go_gc_duration_seconds,kubeservice=kube-apiserver,url=http://my-kube-apiserver:8080/metrics 0=0.038002142,0.25=0.041732467,0.5=0.04336492,0.75=0.047271799,1=0.058295811,count=0,sum=208.334617406 1456857329391929813
+go_gc_duration_seconds,url=http://example.org:9273/metrics 1=0.001336611,count=14,sum=0.004527551,0=0.000057965,0.25=0.000083812,0.5=0.000286537,0.75=0.000365303 1505776733000000000
+go_goroutines,url=http://example.org:9273/metrics gauge=21 1505776695000000000
+cpu_usage_user,cpu=cpu0,url=http://example.org:9273/metrics gauge=1.513622603430151 1505776751000000000
+cpu_usage_user,cpu=cpu1,url=http://example.org:9273/metrics gauge=5.829145728641773 1505776751000000000
+cpu_usage_user,cpu=cpu2,url=http://example.org:9273/metrics gauge=2.119071644805144 1505776751000000000
+cpu_usage_user,cpu=cpu3,url=http://example.org:9273/metrics gauge=1.5228426395944945 1505776751000000000
 ```
diff --git a/plugins/inputs/prometheus/parser.go b/plugins/inputs/prometheus/parser.go
index 975da27bf..ac5c608f6 100644
--- a/plugins/inputs/prometheus/parser.go
+++ b/plugins/inputs/prometheus/parser.go
@@ -69,7 +69,7 @@ func Parse(buf []byte, header http.Header) ([]telegraf.Metric, error) {
 				fields["count"] = float64(m.GetSummary().GetSampleCount())
 				fields["sum"] = float64(m.GetSummary().GetSampleSum())
 			} else if mf.GetType() == dto.MetricType_HISTOGRAM {
-				// historgram metric
+				// histogram metric
 				fields = makeBuckets(m)
 				fields["count"] = float64(m.GetHistogram().GetSampleCount())
 				fields["sum"] = float64(m.GetHistogram().GetSampleSum())
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index e2687d472..a4f17e898 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -47,7 +47,7 @@ var sampleConfig = `
   urls = ["http://localhost:9100/metrics"]
 
   ## An array of Kubernetes services to scrape metrics from.
-  kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
+  # kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
 
   ## Use bearer token for authorization
   # bearer_token = /path/to/bearer/token

From a63f80e017721c3ca77b5e8e553d401224227d98 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Sep 2017 16:30:09 -0700
Subject: [PATCH 0560/1302] Build with go 1.9 on circleci

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 3982c1036..40908e568 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   go:
-    version: 1.8.1
+    version: 1.9.0
   services:
     - docker
     - memcached

From decb09e7607d0eff825c6f67e0a9e09bd0ff3b9f Mon Sep 17 00:00:00 2001
From: Paulo Cabido <paulo.cabido@gmail.com>
Date: Tue, 19 Sep 2017 11:27:11 -0700
Subject: [PATCH 0561/1302] Add configurable metrics endpoint to prometheus
 output (#3245)

---
 plugins/outputs/prometheus_client/README.md                | 5 ++++-
 plugins/outputs/prometheus_client/prometheus_client.go     | 7 ++++++-
 .../outputs/prometheus_client/prometheus_client_test.go    | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index 4ec7eee3f..13cd80412 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -1,6 +1,6 @@
 # Prometheus Client Service Output Plugin
 
-This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all metrics on `/metrics` to be polled by a Prometheus server.
+This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all metrics on `/metrics` (default) to be polled by a Prometheus server.
 
 ## Configuration
 
@@ -10,6 +10,9 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
   # Address to listen on
   listen = ":9273"
 
+  # Path to publish the metrics on, defaults to /metrics
+  path = "/metrics"   
+
   # Expiration interval for each metric. 0 == no expiration
   expiration_interval = "60s"
 ```
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index c068a5fe7..92addf9c0 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -45,6 +45,7 @@ type MetricFamily struct {
 type PrometheusClient struct {
 	Listen             string
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
+	Path               string            `toml:"path"`
 
 	server *http.Server
 
@@ -70,8 +71,12 @@ func (p *PrometheusClient) Start() error {
 		p.Listen = "localhost:9273"
 	}
 
+	if p.Path == "" {
+		p.Path = "/metrics"
+	}
+
 	mux := http.NewServeMux()
-	mux.Handle("/metrics", prometheus.Handler())
+	mux.Handle(p.Path, prometheus.Handler())
 
 	p.server = &http.Server{
 		Addr:    p.Listen,
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 5be29a241..767f9a878 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -445,6 +445,7 @@ func setupPrometheus() (*PrometheusClient, *prometheus_input.Prometheus, error)
 	if pTesting == nil {
 		pTesting = NewClient()
 		pTesting.Listen = "localhost:9127"
+		pTesting.Path = "/metrics"
 		err := pTesting.Start()
 		if err != nil {
 			return nil, nil, err

From c0a4bd99a1dbb4571781ffd8c30c854f776c46a0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 19 Sep 2017 11:27:57 -0700
Subject: [PATCH 0562/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 427ffde4e..eaa9f44f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#3234](https://github.com/influxdata/telegraf/pull/3234): Add support for timing sums in statsd input.
 - [#2617](https://github.com/influxdata/telegraf/issues/2617): Add resource limit monitoring to procstat.
 - [#3236](https://github.com/influxdata/telegraf/pull/3236): Add support for k8s service DNS discovery to prometheus input.
+- [#3245](https://github.com/influxdata/telegraf/pull/3245): Add configurable metrics endpoint to prometheus output.
 
 ### Bugfixes
 

From 6e6ed075dc63593b0b48a4c4913f9d983d2724d5 Mon Sep 17 00:00:00 2001
From: Patrick O'Brien <poblahblahblah@users.noreply.github.com>
Date: Tue, 19 Sep 2017 11:46:01 -0700
Subject: [PATCH 0563/1302] Add new nginx_plus input plugin (#3214)

---
 plugins/inputs/all/all.go                    |   1 +
 plugins/inputs/nginx_plus/README.md          | 124 ++++
 plugins/inputs/nginx_plus/nginx_plus.go      | 568 +++++++++++++++++++
 plugins/inputs/nginx_plus/nginx_plus_test.go | 413 ++++++++++++++
 4 files changed, 1106 insertions(+)
 create mode 100644 plugins/inputs/nginx_plus/README.md
 create mode 100644 plugins/inputs/nginx_plus/nginx_plus.go
 create mode 100644 plugins/inputs/nginx_plus/nginx_plus_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 955c3a2c0..7281f5b7a 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -53,6 +53,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/nats_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nginx_plus"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
diff --git a/plugins/inputs/nginx_plus/README.md b/plugins/inputs/nginx_plus/README.md
new file mode 100644
index 000000000..bfa9593c4
--- /dev/null
+++ b/plugins/inputs/nginx_plus/README.md
@@ -0,0 +1,124 @@
+# Telegraf Plugin: nginx_plus
+
+Nginx Plus is a commercial version of the open source web server Nginx. The use this plugin you will need a license. For more information about the differences between Nginx (F/OSS) and Nginx Plus, [click here](https://www.nginx.com/blog/whats-difference-nginx-foss-nginx-plus/).
+
+Structures for Nginx Plus have been built based on history of
+[status module documentation](http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+### Configuration:
+
+```
+# Read Nginx Plus' advanced status information
+[[inputs.nginx_plus]]
+  ## An array of Nginx status URIs to gather stats.
+  urls = ["http://localhost/status"]
+```
+
+### Measurements & Fields:
+
+- nginx_plus_processes
+  - respawned
+- nginx_plus_connections
+  - accepted
+  - dropped
+  - active
+  - idle
+- nginx_plus_ssl
+  - handshakes
+  - handshakes_failed
+  - session_reuses
+- nginx_plus_requests
+  - total
+  - current
+- nginx_plus_upstream, nginx_plus_stream_upstream
+  - keepalive
+  - zombies
+- nginx_plus_upstream_peer, nginx_plus_stream_upstream_peer
+  - requests
+  - unavail
+  - healthchecks_checks
+  - header_time
+  - response_time
+  - state
+  - active
+  - downstart
+  - healthchecks_last_passed
+  - weight
+  - responses_1xx
+  - responses_2xx
+  - responses_3xx
+  - responses_4xx
+  - responses_5xx
+  - received
+  - selected
+  - healthchecks_fails
+  - healthchecks_unhealthy
+  - backup
+  - responses_total
+  - sent
+  - fails
+  - downtime
+
+
+### Tags:
+
+- nginx_plus_processes, nginx_plus_connections, nginx_plus_ssl, nginx_plus_requests
+  - server
+  - port
+
+- nginx_plus_upstream, nginx_plus_stream_upstream
+  - upstream
+  - server
+  - port
+
+- nginx_plus_upstream_peer, nginx_plus_stream_upstream_peer
+  - id
+  - upstream
+  - server
+  - port
+  - upstream_address
+
+### Example Output:
+
+Using this configuration:
+```
+[[inputs.nginx_plus]]
+  ## An array of Nginx Plus status URIs to gather stats.
+  urls = ["http://localhost/status"]
+```
+
+When run with:
+```
+./telegraf -config telegraf.conf -input-filter nginx_plus -test
+```
+
+It produces:
+```
+* Plugin: inputs.nginx_plus, Collection 1
+> nginx_plus_processes,server=localhost,port=12021,host=word.local respawned=0i 1505782513000000000
+> nginx_plus_connections,server=localhost,port=12021,host=word.local accepted=5535735212i,dropped=10140186i,active=9541i,idle=67540i 1505782513000000000
+> nginx_plus_ssl,server=localhost,port=12021,host=word.local handshakes=0i,handshakes_failed=0i,session_reuses=0i 1505782513000000000
+> nginx_plus_requests,server=localhost,port=12021,host=word.local total=186780541173i,current=9037i 1505782513000000000
+> nginx_plus_upstream,port=12021,host=word.local,upstream=dataserver80,server=localhost keepalive=0i,zombies=0i 1505782513000000000
+> nginx_plus_upstream_peer,upstream=dataserver80,upstream_address=10.10.102.181:80,id=0,server=localhost,port=12021,host=word.local sent=53806910399i,received=7516943964i,fails=207i,downtime=2325979i,selected=1505782512000i,backup=false,active=6i,responses_4xx=6935i,header_time=80i,response_time=80i,healthchecks_last_passed=true,responses_1xx=0i,responses_2xx=36299890i,responses_5xx=360450i,responses_total=36667275i,unavail=154i,downstart=0i,state="up",requests=36673741i,responses_3xx=0i,healthchecks_unhealthy=5i,weight=1i,healthchecks_checks=177209i,healthchecks_fails=29i 1505782513000000000
+> nginx_plus_stream_upstream,server=localhost,port=12021,host=word.local,upstream=dataserver443 zombies=0i 1505782513000000000
+> nginx_plus_stream_upstream_peer,server=localhost,upstream_address=10.10.102.181:443,id=0,port=12021,host=word.local,upstream=dataserver443 active=1i,healthchecks_unhealthy=1i,weight=1i,unavail=0i,connect_time=24i,first_byte_time=78i,healthchecks_last_passed=true,state="up",sent=4457713140i,received=698065272i,fails=0i,healthchecks_checks=178421i,downstart=0i,selected=1505782512000i,response_time=5156i,backup=false,connections=56251i,healthchecks_fails=20i,downtime=391017i 1505782513000000000
+```
+
+### Reference material
+
+Subsequent versions of status response structure available here:
+
+- [version 1](http://web.archive.org/web/20130805111222/http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+- [version 2](http://web.archive.org/web/20131218101504/http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+- version 3 - not available
+
+- [version 4](http://web.archive.org/web/20141218170938/http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+- [version 5](http://web.archive.org/web/20150414043916/http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+- [version 6](http://web.archive.org/web/20150918163811/http://nginx.org/en/docs/http/ngx_http_status_module.html)
+
+- [version 7](http://web.archive.org/web/20161107221028/http://nginx.org/en/docs/http/ngx_http_status_module.html)
diff --git a/plugins/inputs/nginx_plus/nginx_plus.go b/plugins/inputs/nginx_plus/nginx_plus.go
new file mode 100644
index 000000000..60fe55a56
--- /dev/null
+++ b/plugins/inputs/nginx_plus/nginx_plus.go
@@ -0,0 +1,568 @@
+package nginx_plus
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type NginxPlus struct {
+	Urls []string
+
+	client *http.Client
+
+	ResponseTimeout internal.Duration
+}
+
+var sampleConfig = `
+  ## An array of ngx_http_status_module or status URI to gather stats.
+  urls = ["http://localhost/status"]
+
+  # HTTP response timeout (default: 5s)
+  response_timeout = "5s"
+`
+
+func (n *NginxPlus) SampleConfig() string {
+	return sampleConfig
+}
+
+func (n *NginxPlus) Description() string {
+	return "Read Nginx Plus' full status information (ngx_http_status_module)"
+}
+
+func (n *NginxPlus) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	// Create an HTTP client that is re-used for each
+	// collection interval
+
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
+	for _, u := range n.Urls {
+		addr, err := url.Parse(u)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+		}
+
+		wg.Add(1)
+		go func(addr *url.URL) {
+			defer wg.Done()
+			acc.AddError(n.gatherUrl(addr, acc))
+		}(addr)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (n *NginxPlus) createHttpClient() (*http.Client, error) {
+
+	if n.ResponseTimeout.Duration < time.Second {
+		n.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{},
+		Timeout:   n.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+func (n *NginxPlus) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
+	resp, err := n.client.Get(addr.String())
+
+	if err != nil {
+		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
+	}
+	contentType := strings.Split(resp.Header.Get("Content-Type"), ";")[0]
+	switch contentType {
+	case "application/json":
+		return gatherStatusUrl(bufio.NewReader(resp.Body), getTags(addr), acc)
+	default:
+		return fmt.Errorf("%s returned unexpected content type %s", addr.String(), contentType)
+	}
+}
+
+func getTags(addr *url.URL) map[string]string {
+	h := addr.Host
+	host, port, err := net.SplitHostPort(h)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	return map[string]string{"server": host, "port": port}
+}
+
+type ResponseStats struct {
+	Responses1xx int64 `json:"1xx"`
+	Responses2xx int64 `json:"2xx"`
+	Responses3xx int64 `json:"3xx"`
+	Responses4xx int64 `json:"4xx"`
+	Responses5xx int64 `json:"5xx"`
+	Total        int64 `json:"total"`
+}
+
+type BasicHitStats struct {
+	Responses int64 `json:"responses"`
+	Bytes     int64 `json:"bytes"`
+}
+
+type ExtendedHitStats struct {
+	BasicHitStats
+	ResponsesWritten int64 `json:"responses_written"`
+	BytesWritten     int64 `json:"bytes_written"`
+}
+
+type HealthCheckStats struct {
+	Checks     int64 `json:"checks"`
+	Fails      int64 `json:"fails"`
+	Unhealthy  int64 `json:"unhealthy"`
+	LastPassed *bool `json:"last_passed"`
+}
+
+type Status struct {
+	Version       int    `json:"version"`
+	NginxVersion  string `json:"nginx_version"`
+	Address       string `json:"address"`
+	Generation    *int   `json:"generation"`     // added in version 5
+	LoadTimestamp *int64 `json:"load_timestamp"` // added in version 2
+	Timestamp     int64  `json:"timestamp"`
+	Pid           *int   `json:"pid"` // added in version 6
+
+	Processes *struct { // added in version 5
+		Respawned *int `json:"respawned"`
+	} `json:"processes"`
+
+	Connections struct {
+		Accepted int `json:"accepted"`
+		Dropped  int `json:"dropped"`
+		Active   int `json:"active"`
+		Idle     int `json:"idle"`
+	} `json:"connections"`
+
+	Ssl *struct { // added in version 6
+		Handshakes       int64 `json:"handshakes"`
+		HandshakesFailed int64 `json:"handshakes_failed"`
+		SessionReuses    int64 `json:"session_reuses"`
+	} `json:"ssl"`
+
+	Requests struct {
+		Total   int64 `json:"total"`
+		Current int   `json:"current"`
+	} `json:"requests"`
+
+	ServerZones map[string]struct { // added in version 2
+		Processing int           `json:"processing"`
+		Requests   int64         `json:"requests"`
+		Responses  ResponseStats `json:"responses"`
+		Discarded  *int64        `json:"discarded"` // added in version 6
+		Received   int64         `json:"received"`
+		Sent       int64         `json:"sent"`
+	} `json:"server_zones"`
+
+	Upstreams map[string]struct {
+		Peers []struct {
+			ID           *int             `json:"id"` // added in version 3
+			Server       string           `json:"server"`
+			Backup       bool             `json:"backup"`
+			Weight       int              `json:"weight"`
+			State        string           `json:"state"`
+			Active       int              `json:"active"`
+			Keepalive    *int             `json:"keepalive"` // removed in version 5
+			MaxConns     *int             `json:"max_conns"` // added in version 3
+			Requests     int64            `json:"requests"`
+			Responses    ResponseStats    `json:"responses"`
+			Sent         int64            `json:"sent"`
+			Received     int64            `json:"received"`
+			Fails        int64            `json:"fails"`
+			Unavail      int64            `json:"unavail"`
+			HealthChecks HealthCheckStats `json:"health_checks"`
+			Downtime     int64            `json:"downtime"`
+			Downstart    int64            `json:"downstart"`
+			Selected     *int64           `json:"selected"`      // added in version 4
+			HeaderTime   *int64           `json:"header_time"`   // added in version 5
+			ResponseTime *int64           `json:"response_time"` // added in version 5
+		} `json:"peers"`
+		Keepalive int       `json:"keepalive"`
+		Zombies   int       `json:"zombies"` // added in version 6
+		Queue     *struct { // added in version 6
+			Size      int   `json:"size"`
+			MaxSize   int   `json:"max_size"`
+			Overflows int64 `json:"overflows"`
+		} `json:"queue"`
+	} `json:"upstreams"`
+
+	Caches map[string]struct { // added in version 2
+		Size        int64            `json:"size"`
+		MaxSize     int64            `json:"max_size"`
+		Cold        bool             `json:"cold"`
+		Hit         BasicHitStats    `json:"hit"`
+		Stale       BasicHitStats    `json:"stale"`
+		Updating    BasicHitStats    `json:"updating"`
+		Revalidated *BasicHitStats   `json:"revalidated"` // added in version 3
+		Miss        ExtendedHitStats `json:"miss"`
+		Expired     ExtendedHitStats `json:"expired"`
+		Bypass      ExtendedHitStats `json:"bypass"`
+	} `json:"caches"`
+
+	Stream struct {
+		ServerZones map[string]struct {
+			Processing  int            `json:"processing"`
+			Connections int            `json:"connections"`
+			Sessions    *ResponseStats `json:"sessions"`
+			Discarded   *int64         `json:"discarded"` // added in version 7
+			Received    int64          `json:"received"`
+			Sent        int64          `json:"sent"`
+		} `json:"server_zones"`
+		Upstreams map[string]struct {
+			Peers []struct {
+				ID            int              `json:"id"`
+				Server        string           `json:"server"`
+				Backup        bool             `json:"backup"`
+				Weight        int              `json:"weight"`
+				State         string           `json:"state"`
+				Active        int              `json:"active"`
+				Connections   int64            `json:"connections"`
+				ConnectTime   *int             `json:"connect_time"`
+				FirstByteTime *int             `json:"first_byte_time"`
+				ResponseTime  *int             `json:"response_time"`
+				Sent          int64            `json:"sent"`
+				Received      int64            `json:"received"`
+				Fails         int64            `json:"fails"`
+				Unavail       int64            `json:"unavail"`
+				HealthChecks  HealthCheckStats `json:"health_checks"`
+				Downtime      int64            `json:"downtime"`
+				Downstart     int64            `json:"downstart"`
+				Selected      int64            `json:"selected"`
+			} `json:"peers"`
+			Zombies int `json:"zombies"`
+		} `json:"upstreams"`
+	} `json:"stream"`
+}
+
+func gatherStatusUrl(r *bufio.Reader, tags map[string]string, acc telegraf.Accumulator) error {
+	dec := json.NewDecoder(r)
+	status := &Status{}
+	if err := dec.Decode(status); err != nil {
+		return fmt.Errorf("Error while decoding JSON response")
+	}
+	status.Gather(tags, acc)
+	return nil
+}
+
+func (s *Status) Gather(tags map[string]string, acc telegraf.Accumulator) {
+	s.gatherProcessesMetrics(tags, acc)
+	s.gatherConnectionsMetrics(tags, acc)
+	s.gatherSslMetrics(tags, acc)
+	s.gatherRequestMetrics(tags, acc)
+	s.gatherZoneMetrics(tags, acc)
+	s.gatherUpstreamMetrics(tags, acc)
+	s.gatherCacheMetrics(tags, acc)
+	s.gatherStreamMetrics(tags, acc)
+}
+
+func (s *Status) gatherProcessesMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	var respawned int
+
+	if s.Processes.Respawned != nil {
+		respawned = *s.Processes.Respawned
+	}
+
+	acc.AddFields(
+		"nginx_plus_processes",
+		map[string]interface{}{
+			"respawned": respawned,
+		},
+		tags,
+	)
+
+}
+
+func (s *Status) gatherConnectionsMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	acc.AddFields(
+		"nginx_plus_connections",
+		map[string]interface{}{
+			"accepted": s.Connections.Accepted,
+			"dropped":  s.Connections.Dropped,
+			"active":   s.Connections.Active,
+			"idle":     s.Connections.Idle,
+		},
+		tags,
+	)
+}
+
+func (s *Status) gatherSslMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	acc.AddFields(
+		"nginx_plus_ssl",
+		map[string]interface{}{
+			"handshakes":        s.Ssl.Handshakes,
+			"handshakes_failed": s.Ssl.HandshakesFailed,
+			"session_reuses":    s.Ssl.SessionReuses,
+		},
+		tags,
+	)
+}
+
+func (s *Status) gatherRequestMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	acc.AddFields(
+		"nginx_plus_requests",
+		map[string]interface{}{
+			"total":   s.Requests.Total,
+			"current": s.Requests.Current,
+		},
+		tags,
+	)
+}
+
+func (s *Status) gatherZoneMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	for zoneName, zone := range s.ServerZones {
+		zoneTags := map[string]string{}
+		for k, v := range tags {
+			zoneTags[k] = v
+		}
+		zoneTags["zone"] = zoneName
+		acc.AddFields(
+			"nginx_plus_zone",
+			func() map[string]interface{} {
+				result := map[string]interface{}{
+					"processing":      zone.Processing,
+					"requests":        zone.Requests,
+					"responses_1xx":   zone.Responses.Responses1xx,
+					"responses_2xx":   zone.Responses.Responses2xx,
+					"responses_3xx":   zone.Responses.Responses3xx,
+					"responses_4xx":   zone.Responses.Responses4xx,
+					"responses_5xx":   zone.Responses.Responses5xx,
+					"responses_total": zone.Responses.Total,
+					"received":        zone.Received,
+					"sent":            zone.Sent,
+				}
+				if zone.Discarded != nil {
+					result["discarded"] = *zone.Discarded
+				}
+				return result
+			}(),
+			zoneTags,
+		)
+	}
+}
+
+func (s *Status) gatherUpstreamMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	for upstreamName, upstream := range s.Upstreams {
+		upstreamTags := map[string]string{}
+		for k, v := range tags {
+			upstreamTags[k] = v
+		}
+		upstreamTags["upstream"] = upstreamName
+		upstreamFields := map[string]interface{}{
+			"keepalive": upstream.Keepalive,
+			"zombies":   upstream.Zombies,
+		}
+		if upstream.Queue != nil {
+			upstreamFields["queue_size"] = upstream.Queue.Size
+			upstreamFields["queue_max_size"] = upstream.Queue.MaxSize
+			upstreamFields["queue_overflows"] = upstream.Queue.Overflows
+		}
+		acc.AddFields(
+			"nginx_plus_upstream",
+			upstreamFields,
+			upstreamTags,
+		)
+		for _, peer := range upstream.Peers {
+			var selected int64
+
+			if peer.Selected != nil {
+				selected = *peer.Selected
+			}
+
+			peerFields := map[string]interface{}{
+				"backup":                 peer.Backup,
+				"weight":                 peer.Weight,
+				"state":                  peer.State,
+				"active":                 peer.Active,
+				"requests":               peer.Requests,
+				"responses_1xx":          peer.Responses.Responses1xx,
+				"responses_2xx":          peer.Responses.Responses2xx,
+				"responses_3xx":          peer.Responses.Responses3xx,
+				"responses_4xx":          peer.Responses.Responses4xx,
+				"responses_5xx":          peer.Responses.Responses5xx,
+				"responses_total":        peer.Responses.Total,
+				"sent":                   peer.Sent,
+				"received":               peer.Received,
+				"fails":                  peer.Fails,
+				"unavail":                peer.Unavail,
+				"healthchecks_checks":    peer.HealthChecks.Checks,
+				"healthchecks_fails":     peer.HealthChecks.Fails,
+				"healthchecks_unhealthy": peer.HealthChecks.Unhealthy,
+				"downtime":               peer.Downtime,
+				"downstart":              peer.Downstart,
+				"selected":               selected,
+			}
+			if peer.HealthChecks.LastPassed != nil {
+				peerFields["healthchecks_last_passed"] = *peer.HealthChecks.LastPassed
+			}
+			if peer.HeaderTime != nil {
+				peerFields["header_time"] = *peer.HeaderTime
+			}
+			if peer.ResponseTime != nil {
+				peerFields["response_time"] = *peer.ResponseTime
+			}
+			if peer.MaxConns != nil {
+				peerFields["max_conns"] = *peer.MaxConns
+			}
+			peerTags := map[string]string{}
+			for k, v := range upstreamTags {
+				peerTags[k] = v
+			}
+			peerTags["upstream_address"] = peer.Server
+			if peer.ID != nil {
+				peerTags["id"] = strconv.Itoa(*peer.ID)
+			}
+			acc.AddFields("nginx_plus_upstream_peer", peerFields, peerTags)
+		}
+	}
+}
+
+func (s *Status) gatherCacheMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	for cacheName, cache := range s.Caches {
+		cacheTags := map[string]string{}
+		for k, v := range tags {
+			cacheTags[k] = v
+		}
+		cacheTags["cache"] = cacheName
+		acc.AddFields(
+			"nginx_plus_cache",
+			map[string]interface{}{
+				"size":                      cache.Size,
+				"max_size":                  cache.MaxSize,
+				"cold":                      cache.Cold,
+				"hit_responses":             cache.Hit.Responses,
+				"hit_bytes":                 cache.Hit.Bytes,
+				"stale_responses":           cache.Stale.Responses,
+				"stale_bytes":               cache.Stale.Bytes,
+				"updating_responses":        cache.Updating.Responses,
+				"updating_bytes":            cache.Updating.Bytes,
+				"revalidated_responses":     cache.Revalidated.Responses,
+				"revalidated_bytes":         cache.Revalidated.Bytes,
+				"miss_responses":            cache.Miss.Responses,
+				"miss_bytes":                cache.Miss.Bytes,
+				"miss_responses_written":    cache.Miss.ResponsesWritten,
+				"miss_bytes_written":        cache.Miss.BytesWritten,
+				"expired_responses":         cache.Expired.Responses,
+				"expired_bytes":             cache.Expired.Bytes,
+				"expired_responses_written": cache.Expired.ResponsesWritten,
+				"expired_bytes_written":     cache.Expired.BytesWritten,
+				"bypass_responses":          cache.Bypass.Responses,
+				"bypass_bytes":              cache.Bypass.Bytes,
+				"bypass_responses_written":  cache.Bypass.ResponsesWritten,
+				"bypass_bytes_written":      cache.Bypass.BytesWritten,
+			},
+			cacheTags,
+		)
+	}
+}
+
+func (s *Status) gatherStreamMetrics(tags map[string]string, acc telegraf.Accumulator) {
+	for zoneName, zone := range s.Stream.ServerZones {
+		zoneTags := map[string]string{}
+		for k, v := range tags {
+			zoneTags[k] = v
+		}
+		zoneTags["zone"] = zoneName
+		acc.AddFields(
+			"nginx.stream.zone",
+			map[string]interface{}{
+				"processing":  zone.Processing,
+				"connections": zone.Connections,
+				"received":    zone.Received,
+				"sent":        zone.Sent,
+			},
+			zoneTags,
+		)
+	}
+	for upstreamName, upstream := range s.Stream.Upstreams {
+		upstreamTags := map[string]string{}
+		for k, v := range tags {
+			upstreamTags[k] = v
+		}
+		upstreamTags["upstream"] = upstreamName
+		acc.AddFields(
+			"nginx_plus_stream_upstream",
+			map[string]interface{}{
+				"zombies": upstream.Zombies,
+			},
+			upstreamTags,
+		)
+		for _, peer := range upstream.Peers {
+			peerFields := map[string]interface{}{
+				"backup":                 peer.Backup,
+				"weight":                 peer.Weight,
+				"state":                  peer.State,
+				"active":                 peer.Active,
+				"connections":            peer.Connections,
+				"sent":                   peer.Sent,
+				"received":               peer.Received,
+				"fails":                  peer.Fails,
+				"unavail":                peer.Unavail,
+				"healthchecks_checks":    peer.HealthChecks.Checks,
+				"healthchecks_fails":     peer.HealthChecks.Fails,
+				"healthchecks_unhealthy": peer.HealthChecks.Unhealthy,
+				"downtime":               peer.Downtime,
+				"downstart":              peer.Downstart,
+				"selected":               peer.Selected,
+			}
+			if peer.HealthChecks.LastPassed != nil {
+				peerFields["healthchecks_last_passed"] = *peer.HealthChecks.LastPassed
+			}
+			if peer.ConnectTime != nil {
+				peerFields["connect_time"] = *peer.ConnectTime
+			}
+			if peer.FirstByteTime != nil {
+				peerFields["first_byte_time"] = *peer.FirstByteTime
+			}
+			if peer.ResponseTime != nil {
+				peerFields["response_time"] = *peer.ResponseTime
+			}
+			peerTags := map[string]string{}
+			for k, v := range upstreamTags {
+				peerTags[k] = v
+			}
+			peerTags["upstream_address"] = peer.Server
+			peerTags["id"] = strconv.Itoa(peer.ID)
+			acc.AddFields("nginx_plus_stream_upstream_peer", peerFields, peerTags)
+		}
+	}
+}
+
+func init() {
+	inputs.Add("nginx_plus", func() telegraf.Input {
+		return &NginxPlus{}
+	})
+}
diff --git a/plugins/inputs/nginx_plus/nginx_plus_test.go b/plugins/inputs/nginx_plus/nginx_plus_test.go
new file mode 100644
index 000000000..3357e1d06
--- /dev/null
+++ b/plugins/inputs/nginx_plus/nginx_plus_test.go
@@ -0,0 +1,413 @@
+package nginx_plus
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	//"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const sampleStatusResponse = `
+{
+    "version": 6,
+    "nginx_version":  "1.22.333",
+    "address":        "1.2.3.4",
+    "generation":     88,
+    "load_timestamp": 1451606400000,
+    "timestamp":      1451606400000,
+    "pid":            9999,
+    "processes": {
+        "respawned": 9999
+     },
+    "connections": { 
+        "accepted": 1234567890000,
+        "dropped":  2345678900000,
+        "active":   345,
+        "idle":     567
+    },
+    "ssl": {
+        "handshakes":        1234567800000,
+        "handshakes_failed": 5432100000000,
+        "session_reuses":    6543210000000
+    },
+    "requests": {
+        "total":   9876543210000,
+        "current": 98
+    },
+    "server_zones": {
+        "zone.a_80": {
+            "processing": 12,
+            "requests": 34,
+            "responses": {
+                "1xx": 111,
+                "2xx": 222,
+                "3xx": 333,
+                "4xx": 444,
+                "5xx": 555,
+                "total": 999
+            },
+            "discarded": 11,
+            "received": 22,
+            "sent": 33
+        },
+        "zone.a_443": {
+            "processing": 45,
+            "requests": 67,
+            "responses": {
+                "1xx": 1111,
+                "2xx": 2222,
+                "3xx": 3333,
+                "4xx": 4444,
+                "5xx": 5555,
+                "total": 999
+            },
+            "discarded": 44,
+            "received": 55,
+            "sent": 66
+        }
+    },
+    "upstreams": {
+        "first_upstream": {
+            "peers": [
+                {
+                    "id": 0,
+                    "server": "1.2.3.123:80",
+                    "backup": false,
+                    "weight": 1,
+                    "state": "up",
+                    "active": 0,
+                    "requests": 9876,
+                    "responses": {
+                        "1xx": 1111,
+                        "2xx": 2222,
+                        "3xx": 3333,
+                        "4xx": 4444,
+                        "5xx": 5555,
+                        "total": 987654
+                    },
+                    "sent": 987654321,
+                    "received": 87654321,
+                    "fails": 98,
+                    "unavail": 65,
+                    "health_checks": {
+                        "checks": 54,
+                        "fails": 32,
+                        "unhealthy": 21
+                    },
+                    "downtime": 5432,
+                    "downstart": 4321,
+                    "selected": 1451606400000
+                },
+                {
+                    "id": 1,
+                    "server": "1.2.3.123:80",
+                    "backup": true,
+                    "weight": 1,
+                    "state": "up",
+                    "active": 0,
+                    "requests": 8765,
+                    "responses": {
+                        "1xx": 1112,
+                        "2xx": 2223,
+                        "3xx": 3334,
+                        "4xx": 4445,
+                        "5xx": 5556,
+                        "total": 987655
+                    },
+                    "sent": 987654322,
+                    "received": 87654322,
+                    "fails": 99,
+                    "unavail": 88,
+                    "health_checks": {
+                        "checks": 77,
+                        "fails": 66,
+                        "unhealthy": 55
+                    },
+                    "downtime": 5433,
+                    "downstart": 4322,
+                    "selected": 1451606400000
+                }
+            ],
+            "keepalive": 1,
+            "zombies": 2
+        }
+    },
+    "caches": {
+        "cache_01": {
+            "size": 12,
+            "max_size": 23,
+            "cold": false,
+            "hit": {
+                "responses": 34,
+                "bytes": 45
+            },
+            "stale": {
+                "responses": 56,
+                "bytes": 67
+            },
+            "updating": {
+                "responses": 78,
+                "bytes": 89
+            },
+            "revalidated": {
+                "responses": 90,
+                "bytes": 98
+            },
+            "miss": {
+                "responses": 87,
+                "bytes": 76,
+                "responses_written": 65,
+                "bytes_written": 54
+            },
+            "expired": {
+                "responses": 43,
+                "bytes": 32,
+                "responses_written": 21,
+                "bytes_written": 10
+            },
+            "bypass": {
+                "responses": 13,
+                "bytes": 35,
+                "responses_written": 57,
+                "bytes_written": 79
+            }
+        }
+    },
+    "stream": {
+        "server_zones": {
+            "stream.zone.01": {
+                "processing": 24,
+                "connections": 46,
+                "received": 68,
+                "sent": 80
+            },
+            "stream.zone.02": {
+                "processing": 96,
+                "connections": 63,
+                "received": 31,
+                "sent": 25
+            }
+        },
+        "upstreams": {
+            "upstream.01": {
+                "peers": [
+                    {
+                        "id": 0,
+                        "server": "4.3.2.1:2345",
+                        "backup": false,
+                        "weight": 1,
+                        "state": "up",
+                        "active": 0,
+                        "connections": 0,
+                        "sent": 0,
+                        "received": 0,
+                        "fails": 0,
+                        "unavail": 0,
+                        "health_checks": {
+                            "checks": 40848,
+                            "fails": 0,
+                            "unhealthy": 0,
+                            "last_passed": true
+                        },
+                        "downtime": 0,
+                        "downstart": 0,
+                        "selected": 0
+                    },
+                    {
+                        "id": 1,
+                        "server": "5.4.3.2:2345",
+                        "backup": false,
+                        "weight": 1,
+                        "state": "up",
+                        "active": 0,
+                        "connections": 0,
+                        "sent": 0,
+                        "received": 0,
+                        "fails": 0,
+                        "unavail": 0,
+                        "health_checks": {
+                            "checks": 40851,
+                            "fails": 0,
+                            "unhealthy": 0,
+                            "last_passed": true
+                        },
+                        "downtime": 0,
+                        "downstart": 0,
+                        "selected": 0
+                    }
+                ],
+                "zombies": 0
+            }
+        }
+    }
+}
+`
+
+func TestNginxPlusGeneratesMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rsp string
+
+		if r.URL.Path == "/status" {
+			rsp = sampleStatusResponse
+			w.Header()["Content-Type"] = []string{"application/json"}
+		} else {
+			panic("Cannot handle request")
+		}
+
+		fmt.Fprintln(w, rsp)
+	}))
+	defer ts.Close()
+
+	n := &NginxPlus{
+		Urls: []string{fmt.Sprintf("%s/status", ts.URL)},
+	}
+
+	var acc testutil.Accumulator
+
+	err_nginx := n.Gather(&acc)
+
+	require.NoError(t, err_nginx)
+
+	addr, err := url.Parse(ts.URL)
+	if err != nil {
+		panic(err)
+	}
+
+	host, port, err := net.SplitHostPort(addr.Host)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_processes",
+		map[string]interface{}{
+			"respawned": int(9999),
+		},
+		map[string]string{
+			"server": host,
+			"port":   port,
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_connections",
+		map[string]interface{}{
+			"accepted": int(1234567890000),
+			"dropped":  int(2345678900000),
+			"active":   int(345),
+			"idle":     int(567),
+		},
+		map[string]string{
+			"server": host,
+			"port":   port,
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_ssl",
+		map[string]interface{}{
+			"handshakes":        int64(1234567800000),
+			"handshakes_failed": int64(5432100000000),
+			"session_reuses":    int64(6543210000000),
+		},
+		map[string]string{
+			"server": host,
+			"port":   port,
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_requests",
+		map[string]interface{}{
+			"total":   int64(9876543210000),
+			"current": int(98),
+		},
+		map[string]string{
+			"server": host,
+			"port":   port,
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_zone",
+		map[string]interface{}{
+			"processing":      int(12),
+			"requests":        int64(34),
+			"responses_1xx":   int64(111),
+			"responses_2xx":   int64(222),
+			"responses_3xx":   int64(333),
+			"responses_4xx":   int64(444),
+			"responses_5xx":   int64(555),
+			"responses_total": int64(999),
+			"discarded":       int64(11),
+			"received":        int64(22),
+			"sent":            int64(33),
+		},
+		map[string]string{
+			"server": host,
+			"port":   port,
+			"zone":   "zone.a_80",
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_upstream",
+		map[string]interface{}{
+			"keepalive": int(1),
+			"zombies":   int(2),
+		},
+		map[string]string{
+			"server":   host,
+			"port":     port,
+			"upstream": "first_upstream",
+		})
+
+	acc.AssertContainsTaggedFields(
+		t,
+		"nginx_plus_upstream_peer",
+		map[string]interface{}{
+			"backup":                 false,
+			"weight":                 int(1),
+			"state":                  "up",
+			"active":                 int(0),
+			"requests":               int64(9876),
+			"responses_1xx":          int64(1111),
+			"responses_2xx":          int64(2222),
+			"responses_3xx":          int64(3333),
+			"responses_4xx":          int64(4444),
+			"responses_5xx":          int64(5555),
+			"responses_total":        int64(987654),
+			"sent":                   int64(987654321),
+			"received":               int64(87654321),
+			"fails":                  int64(98),
+			"unavail":                int64(65),
+			"healthchecks_checks":    int64(54),
+			"healthchecks_fails":     int64(32),
+			"healthchecks_unhealthy": int64(21),
+			"downtime":               int64(5432),
+			"downstart":              int64(4321),
+			"selected":               int64(1451606400000),
+		},
+		map[string]string{
+			"server":           host,
+			"port":             port,
+			"upstream":         "first_upstream",
+			"upstream_address": "1.2.3.123:80",
+			"id":               "0",
+		})
+
+}

From ce29ca78e34e4b29b7f8728525bb5d95e99716ac Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 19 Sep 2017 11:49:55 -0700
Subject: [PATCH 0564/1302] Add nginx_plus to changelog and readme

---
 CHANGELOG.md | 4 ++++
 README.md    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eaa9f44f8..10f33bdcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## v1.5 [unreleased]
 
+### New Plugins
+- [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+
 ### Release Notes
 
 - In the `kinesis` output, use of the `partition_key` and
@@ -21,6 +24,7 @@
 - [#2617](https://github.com/influxdata/telegraf/issues/2617): Add resource limit monitoring to procstat.
 - [#3236](https://github.com/influxdata/telegraf/pull/3236): Add support for k8s service DNS discovery to prometheus input.
 - [#3245](https://github.com/influxdata/telegraf/pull/3245): Add configurable metrics endpoint to prometheus output.
+- [#3214](https://github.com/influxdata/telegraf/pull/3214): Add new nginx_plus input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 178d2a4d3..76ccf7977 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ configuration options.
 * [mysql](./plugins/inputs/mysql)
 * [net_response](./plugins/inputs/net_response)
 * [nginx](./plugins/inputs/nginx)
+* [nginx_plus](./plugins/inputs/nginx_plus)
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)

From 52393582d2b0b5700fcebb9433748351aefc3d6a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 22 Sep 2017 11:45:45 -0700
Subject: [PATCH 0565/1302] Unlock Statsd when stopping to prevent deadlock
 (#3258)

---
 plugins/inputs/statsd/statsd.go      |  6 +++++-
 plugins/inputs/statsd/statsd_test.go | 30 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index a905c2092..76dd25054 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -814,7 +814,6 @@ func (s *Statsd) remember(id string, conn *net.TCPConn) {
 
 func (s *Statsd) Stop() {
 	s.Lock()
-	defer s.Unlock()
 	log.Println("I! Stopping the statsd service")
 	close(s.done)
 	switch s.Protocol {
@@ -838,9 +837,14 @@ func (s *Statsd) Stop() {
 	default:
 		s.UDPlistener.Close()
 	}
+	s.Unlock()
+
 	s.wg.Wait()
+
+	s.Lock()
 	close(s.in)
 	log.Println("I! Stopped Statsd listener service on ", s.ServiceAddress)
+	s.Unlock()
 }
 
 func init() {
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index 5c6b2065a..91af51d67 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -124,6 +124,36 @@ func TestCloseConcurrentConns(t *testing.T) {
 	listener.Stop()
 }
 
+// benchmark how long it takes to accept & process 100,000 metrics:
+func BenchmarkUDP(b *testing.B) {
+	listener := Statsd{
+		Protocol:               "udp",
+		ServiceAddress:         ":8125",
+		AllowedPendingMessages: 250000,
+	}
+	acc := &testutil.Accumulator{Discard: true}
+
+	// send multiple messages to socket
+	for n := 0; n < b.N; n++ {
+		err := listener.Start(acc)
+		if err != nil {
+			panic(err)
+		}
+
+		time.Sleep(time.Millisecond * 25)
+		conn, err := net.Dial("udp", "127.0.0.1:8125")
+		if err != nil {
+			panic(err)
+		}
+		for i := 0; i < 250000; i++ {
+			fmt.Fprintf(conn, testMsg)
+		}
+		// wait for 250,000 metrics to get added to accumulator
+		time.Sleep(time.Millisecond)
+		listener.Stop()
+	}
+}
+
 // benchmark how long it takes to accept & process 100,000 metrics:
 func BenchmarkTCP(b *testing.B) {
 	listener := Statsd{

From c3bea59f3b88b4589e6716659de675f906b454b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 11:46:47 -0700
Subject: [PATCH 0566/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10f33bdcb..113633ce9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@
 ### Bugfixes
 
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
+- [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
+
 
 ## v1.4.1 [unreleased]
 

From 73df179bd653bdde1ae26b392c1b387a29d7ded0 Mon Sep 17 00:00:00 2001
From: Christian Meilke <christian.meilke@googlemail.com>
Date: Sat, 23 Sep 2017 02:26:19 +0200
Subject: [PATCH 0567/1302] Tag original URL for k8s services in prometheus
 input  (#3257)

---
 plugins/inputs/prometheus/prometheus.go      | 11 ++++++-----
 plugins/inputs/prometheus/prometheus_test.go |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index a4f17e898..7c3943bd0 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -93,14 +93,15 @@ func (p *Prometheus) AddressToURL(u *url.URL, address string) string {
 }
 
 type UrlAndAddress struct {
-	Url     string
-	Address string
+	OriginalUrl string
+	Url         string
+	Address     string
 }
 
 func (p *Prometheus) GetAllURLs() ([]UrlAndAddress, error) {
 	allUrls := make([]UrlAndAddress, 0)
 	for _, url := range p.Urls {
-		allUrls = append(allUrls, UrlAndAddress{Url: url})
+		allUrls = append(allUrls, UrlAndAddress{Url: url, OriginalUrl: url})
 	}
 	for _, service := range p.KubernetesServices {
 		u, err := url.Parse(service)
@@ -114,7 +115,7 @@ func (p *Prometheus) GetAllURLs() ([]UrlAndAddress, error) {
 		}
 		for _, resolved := range resolvedAddresses {
 			serviceUrl := p.AddressToURL(u, resolved)
-			allUrls = append(allUrls, UrlAndAddress{Url: serviceUrl, Address: resolved})
+			allUrls = append(allUrls, UrlAndAddress{Url: serviceUrl, Address: resolved, OriginalUrl: service})
 		}
 	}
 	return allUrls, nil
@@ -213,7 +214,7 @@ func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) erro
 	// Add (or not) collected metrics
 	for _, metric := range metrics {
 		tags := metric.Tags()
-		tags["url"] = url.Url
+		tags["url"] = url.OriginalUrl
 		if url.Address != "" {
 			tags["address"] = url.Address
 		}
diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
index 3cb931270..5bf07eb3f 100644
--- a/plugins/inputs/prometheus/prometheus_test.go
+++ b/plugins/inputs/prometheus/prometheus_test.go
@@ -50,6 +50,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
 	assert.True(t, acc.HasFloatField("test_metric", "value"))
 	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
 	assert.False(t, acc.HasTag("test_metric", "address"))
+	assert.True(t, acc.TagValue("test_metric", "url") == ts.URL)
 }
 
 func TestPrometheusGeneratesMetricsWithHostNameTag(t *testing.T) {
@@ -74,6 +75,7 @@ func TestPrometheusGeneratesMetricsWithHostNameTag(t *testing.T) {
 	assert.True(t, acc.HasFloatField("test_metric", "value"))
 	assert.True(t, acc.HasTimestamp("test_metric", time.Unix(1490802350, 0)))
 	assert.True(t, acc.TagValue("test_metric", "address") == tsAddress)
+	assert.True(t, acc.TagValue("test_metric", "url") == ts.URL)
 }
 
 func TestPrometheusGeneratesMetricsAlthoughFirstDNSFails(t *testing.T) {

From cafb22d14567ecf08b46b546a048ac3d72224eda Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 17:18:25 -0700
Subject: [PATCH 0568/1302] Fix unittest for golang 1.9

---
 metric/metric_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metric/metric_test.go b/metric/metric_test.go
index db71bf92a..062399d6e 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -31,7 +31,7 @@ func TestNewMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now, m.Time())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
 
@@ -414,7 +414,7 @@ func TestNewGaugeMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now, m.Time())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
 
@@ -436,7 +436,7 @@ func TestNewCounterMetric(t *testing.T) {
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now, m.Time())
+	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
 	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
 

From 08c197f73acc602bd7a154474c3f19bb68e3f656 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 12:48:33 -0700
Subject: [PATCH 0569/1302] Fix golang version

---
 circle.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 40908e568..117d03ad3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,14 @@
 machine:
-  go:
-    version: 1.9.0
   services:
     - docker
     - memcached
     - redis
     - rabbitmq-server
+  post:
+    - sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz
+    - go version
 
 dependencies:
   override:

From c010fb1c3cfd8b72c82cb97583441641fc1a7657 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 16:49:28 -0700
Subject: [PATCH 0570/1302] Fix build versioning; add dev.docker file

---
 Makefile                 | 10 +++++++---
 cmd/telegraf/telegraf.go |  2 +-
 scripts/build.py         | 31 ++++++++++++++++++++-----------
 scripts/dev.docker       |  8 ++++++++
 4 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 scripts/dev.docker

diff --git a/Makefile b/Makefile
index bf4c8dfec..3908be1d1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,12 +49,16 @@ test-all: lint
 	go test ./...
 
 package:
-	./scripts/build.py --package --version="$(VERSION)" --platform=linux --arch=all --upload
-
+	./scripts/build.py --package --platform=all --arch=all
 clean:
 	-rm -f telegraf
 	-rm -f telegraf.exe
 
+docker-image:
+	./scripts/build.py --package --platform=linux --arch=amd64
+	cp build/telegraf*$(COMMIT)*.deb .
+	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .
+
 # Run all docker containers necessary for integration tests
 docker-run:
 	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
@@ -114,4 +118,4 @@ docker-kill:
 		openldap postgres rabbitmq redis riemann zookeeper
 
 .PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
-	package clean docker-run docker-run-circle docker-kill
+	package clean docker-run docker-run-circle docker-kill docker-image
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 6301ea8ff..42fd6cf2f 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -268,7 +268,7 @@ func (p *program) Stop(s service.Service) error {
 
 func displayVersion() string {
 	if version == "" {
-		return fmt.Sprintf("v%s~pre%s", nextVersion, commit)
+		return fmt.Sprintf("v%s~%s", nextVersion, commit)
 	}
 	return "v" + version
 }
diff --git a/scripts/build.py b/scripts/build.py
index 9b70e961e..cc0709e0a 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -95,6 +95,8 @@ supported_packages = {
     "freebsd": [ "tar" ]
 }
 
+next_version = '1.5.0'
+
 ################
 #### Telegraf Functions
 ################
@@ -158,7 +160,8 @@ def go_get(branch, update=False, no_uncommitted=False):
         get_command = "go get github.com/sparrc/gdm"
         run(get_command)
     logging.info("Retrieving dependencies with `gdm`...")
-    run("{}/bin/gdm restore -v".format(os.environ.get("GOPATH")))
+    run("{}/bin/gdm restore -v".format(os.environ.get("GOPATH",
+        os.path.expanduser("~/go"))))
     return True
 
 def run_tests(race, parallel, timeout, no_vet):
@@ -223,13 +226,16 @@ def increment_minor_version(version):
 def get_current_version_tag():
     """Retrieve the raw git version tag.
     """
-    version = run("git describe --always --tags --abbrev=0")
+    version = run("git describe --exact-match --tags 2>/dev/null",
+            allow_failure=True, shell=True)
     return version
 
 def get_current_version():
     """Parse version information from git tag output.
     """
     version_tag = get_current_version_tag()
+    if not version_tag:
+        return None
     # Remove leading 'v'
     if version_tag[0] == 'v':
         version_tag = version_tag[1:]
@@ -474,12 +480,17 @@ def build(version=None,
         if len(tags) > 0:
             build_command += "-tags {} ".format(','.join(tags))
 
-        build_command += "-ldflags=\"-w -s -X main.version={} -X main.branch={} -X main.commit={}\" ".format(
-                version,
-                get_current_branch(),
-                get_current_commit())
+        ldflags = [
+                '-w', '-s',
+                '-X', 'main.branch={}'.format(get_current_branch()),
+                '-X', 'main.commit={}'.format(get_current_commit(short=True))]
+        if version:
+            ldflags.append('-X')
+            ldflags.append('main.version={}'.format(version))
+        build_command += ' -ldflags="{}" '.format(' '.join(ldflags))
+
         if static:
-            build_command += "-a -installsuffix cgo "
+            build_command += " -a -installsuffix cgo "
         build_command += path
         start_time = datetime.utcnow()
         run(build_command, shell=True)
@@ -575,10 +586,8 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
                         package_arch = 'armv6hl'
                     else:
                         package_arch = arch
-                    if not release and not nightly:
-                        # For non-release builds, just use the commit hash as the version
-                        package_version = "{}~{}".format(version,
-                                                         get_current_commit(short=True))
+                    if not version:
+                        package_version = "{}~{}".format(next_version, get_current_commit(short=True))
                         package_iteration = "0"
                     package_build_root = build_root
                     current_location = build_output[platform][arch]
diff --git a/scripts/dev.docker b/scripts/dev.docker
new file mode 100644
index 000000000..902c7f9aa
--- /dev/null
+++ b/scripts/dev.docker
@@ -0,0 +1,8 @@
+FROM debian:stretch
+ARG package
+ADD ${package} ${package}
+RUN dpkg -i ${package}
+
+EXPOSE 8125/udp 8092/udp 8094
+
+CMD ["telegraf"]

From 366bda45c37d8391b420ef4d413b6f089214b3cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 17:23:13 -0700
Subject: [PATCH 0571/1302] Remove out of date Vagrantfile

---
 scripts/Vagrantfile | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 scripts/Vagrantfile

diff --git a/scripts/Vagrantfile b/scripts/Vagrantfile
deleted file mode 100644
index a04450d6d..000000000
--- a/scripts/Vagrantfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.synced_folder "..", "/home/vagrant/go/src/github.com/influxdata/telegraf",
-    type: "rsync",
-    rsync__args: ["--verbose", "--archive", "--delete", "-z", "--safe-links"],
-    rsync__exclude: ["./telegraf", ".vagrant/"]
-
-  config.vm.provision "shell", name: "sudo", inline: <<-SHELL
-    chown -R vagrant:vagrant /home/vagrant/go
-    apt-get install bison git tig --yes
-    echo -n                                >  /etc/profile.d/gopath.sh
-    echo 'export GOPATH=/home/vagrant/go'  >> /etc/profile.d/gopath.sh
-  SHELL
-
-  config.vm.provision "shell", privileged: false, name: "user", inline: <<-SHELL
-    bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
-    source "$HOME/.gvm/scripts/gvm"
-    gvm install go1.4.2 --prefer-binary
-    gvm use go1.4.2 --default
-    echo "export PATH=$PATH:$GOPATH/bin"   >> "$HOME/.bashrc"
-    echo 'export GOPATH=/home/vagrant/go'  >> "$HOME/.bashrc"
-    cd "$HOME/go/src/github.com/influxdata/telegraf" &&\
-      rm -rf Godeps/_workspace/pkg &&\
-      GOPATH="$HOME/go" make
-  SHELL
-
-  config.vm.provider "virtualbox" do |vb|
-    vb.customize ["modifyvm", :id, "--memory", "1024"]
-  end
-end

From b24663b0bd836fcf9f79e21172a9b4935031dc53 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 22 Sep 2017 18:07:08 -0700
Subject: [PATCH 0572/1302] Remove nightly versioning scheme

---
 scripts/build.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index cc0709e0a..12a8a6b22 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -679,9 +679,6 @@ def main(args):
         return 1
 
     if args.nightly:
-        args.version = increment_minor_version(args.version)
-        args.version = "{}~n{}".format(args.version,
-                                       datetime.utcnow().strftime("%Y%m%d%H%M"))
         args.iteration = 0
 
     # Pre-build checks

From 063f3f68df5ee488ac392007a51d94750b267f7c Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Mon, 25 Sep 2017 23:25:02 +0530
Subject: [PATCH 0573/1302] Improve statsd plugin perf by using a byte buffer
 pool (#3254)

---
 plugins/inputs/statsd/statsd.go      | 39 +++++++++++++++++-----------
 plugins/inputs/statsd/statsd_test.go |  7 ++---
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 76dd25054..67ce29cd8 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -2,6 +2,7 @@ package statsd
 
 import (
 	"bufio"
+	"bytes"
 	"errors"
 	"fmt"
 	"log"
@@ -89,7 +90,7 @@ type Statsd struct {
 	malformed int
 
 	// Channel for all incoming statsd packets
-	in   chan []byte
+	in   chan *bytes.Buffer
 	done chan struct{}
 
 	// Cache gauges, counters & sets so they can be aggregated as they arrive
@@ -121,6 +122,9 @@ type Statsd struct {
 	TotalConnections   selfstat.Stat
 	PacketsRecv        selfstat.Stat
 	BytesRecv          selfstat.Stat
+
+	// A pool of byte slices to handle parsing
+	bufPool sync.Pool
 }
 
 // One statsd metric, form is <bucket>:<value>|<mtype>|@<samplerate>
@@ -281,9 +285,6 @@ func (s *Statsd) Gather(acc telegraf.Accumulator) error {
 
 func (s *Statsd) Start(_ telegraf.Accumulator) error {
 	// Make data structures
-	s.done = make(chan struct{})
-	s.in = make(chan []byte, s.AllowedPendingMessages)
-
 	s.gauges = make(map[string]cachedgauge)
 	s.counters = make(map[string]cachedcounter)
 	s.sets = make(map[string]cachedset)
@@ -302,10 +303,15 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 	s.PacketsRecv = selfstat.Register("statsd", "tcp_packets_received", tags)
 	s.BytesRecv = selfstat.Register("statsd", "tcp_bytes_received", tags)
 
-	s.in = make(chan []byte, s.AllowedPendingMessages)
+	s.in = make(chan *bytes.Buffer, s.AllowedPendingMessages)
 	s.done = make(chan struct{})
 	s.accept = make(chan bool, s.MaxTCPConnections)
 	s.conns = make(map[string]*net.TCPConn)
+	s.bufPool = sync.Pool{
+		New: func() interface{} {
+			return new(bytes.Buffer)
+		},
+	}
 	for i := 0; i < s.MaxTCPConnections; i++ {
 		s.accept <- true
 	}
@@ -394,11 +400,12 @@ func (s *Statsd) udpListen() error {
 				log.Printf("E! Error READ: %s\n", err.Error())
 				continue
 			}
-			bufCopy := make([]byte, n)
-			copy(bufCopy, buf[:n])
+			b := s.bufPool.Get().(*bytes.Buffer)
+			b.Reset()
+			b.Write(buf[:n])
 
 			select {
-			case s.in <- bufCopy:
+			case s.in <- b:
 			default:
 				s.drops++
 				if s.drops == 1 || s.AllowedPendingMessages == 0 || s.drops%s.AllowedPendingMessages == 0 {
@@ -414,19 +421,19 @@ func (s *Statsd) udpListen() error {
 // single statsd metric into a struct.
 func (s *Statsd) parser() error {
 	defer s.wg.Done()
-	var packet []byte
 	for {
 		select {
 		case <-s.done:
 			return nil
-		case packet = <-s.in:
-			lines := strings.Split(string(packet), "\n")
+		case buf := <-s.in:
+			lines := strings.Split(buf.String(), "\n")
 			for _, line := range lines {
 				line = strings.TrimSpace(line)
 				if line != "" {
 					s.parseStatsdLine(line)
 				}
 			}
+			s.bufPool.Put(buf)
 		}
 	}
 }
@@ -774,12 +781,14 @@ func (s *Statsd) handler(conn *net.TCPConn, id string) {
 			}
 			s.BytesRecv.Incr(int64(n))
 			s.PacketsRecv.Incr(1)
-			bufCopy := make([]byte, n+1)
-			copy(bufCopy, scanner.Bytes())
-			bufCopy[n] = '\n'
+
+			b := s.bufPool.Get().(*bytes.Buffer)
+			b.Reset()
+			b.Write(scanner.Bytes())
+			b.WriteByte('\n')
 
 			select {
-			case s.in <- bufCopy:
+			case s.in <- b:
 			default:
 				s.drops++
 				if s.drops == 1 || s.drops%s.AllowedPendingMessages == 0 {
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index 91af51d67..1331e1f4b 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -1,6 +1,7 @@
 package statsd
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"net"
@@ -16,8 +17,8 @@ const (
 	testMsg = "test.tcp.msg:100|c"
 )
 
-func newTestTcpListener() (*Statsd, chan []byte) {
-	in := make(chan []byte, 1500)
+func newTestTcpListener() (*Statsd, chan *bytes.Buffer) {
+	in := make(chan *bytes.Buffer, 1500)
 	listener := &Statsd{
 		Protocol:               "tcp",
 		ServiceAddress:         ":8125",
@@ -34,7 +35,7 @@ func NewTestStatsd() *Statsd {
 
 	// Make data structures
 	s.done = make(chan struct{})
-	s.in = make(chan []byte, s.AllowedPendingMessages)
+	s.in = make(chan *bytes.Buffer, s.AllowedPendingMessages)
 	s.gauges = make(map[string]cachedgauge)
 	s.counters = make(map[string]cachedcounter)
 	s.sets = make(map[string]cachedset)

From 837e6b1a32cbad7c5d2c34341a0578eff8baa707 Mon Sep 17 00:00:00 2001
From: James <james-lawrence@users.noreply.github.com>
Date: Mon, 25 Sep 2017 13:58:10 -0400
Subject: [PATCH 0574/1302] Add additional numeric type handling tests for
 postgresql_extensible (#3066)

---
 .../postgresql_extensible.go                  |  25 +--
 .../postgresql_extensible_test.go             | 143 +++++++++++++++---
 testutil/accumulator.go                       |  61 +++++++-
 3 files changed, 199 insertions(+), 30 deletions(-)

diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 1536f115c..07a782f89 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -231,8 +231,12 @@ func (p *Postgresql) SanitizedAddress() (_ string, err error) {
 }
 
 func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumulator) error {
-	var columnVars []interface{}
-	var dbname bytes.Buffer
+	var (
+		err        error
+		columnVars []interface{}
+		dbname     bytes.Buffer
+		tagAddress string
+	)
 
 	// this is where we'll store the column name with its *interface{}
 	columnMap := make(map[string]*interface{})
@@ -247,11 +251,10 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 	}
 
 	// deconstruct array of variables and send to Scan
-	err := row.Scan(columnVars...)
-
-	if err != nil {
+	if err = row.Scan(columnVars...); err != nil {
 		return err
 	}
+
 	if columnMap["datname"] != nil {
 		// extract the database name from the column map
 		dbname.WriteString((*columnMap["datname"]).(string))
@@ -259,17 +262,16 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 		dbname.WriteString("postgres")
 	}
 
-	var tagAddress string
-	tagAddress, err = p.SanitizedAddress()
-	if err != nil {
+	if tagAddress, err = p.SanitizedAddress(); err != nil {
 		return err
 	}
 
 	// Process the additional tags
+	tags := map[string]string{
+		"server": tagAddress,
+		"db":     dbname.String(),
+	}
 
-	tags := map[string]string{}
-	tags["server"] = tagAddress
-	tags["db"] = dbname.String()
 	fields := make(map[string]interface{})
 COLUMN:
 	for col, val := range columnMap {
@@ -295,6 +297,7 @@ COLUMN:
 			}
 			continue COLUMN
 		}
+
 		if v, ok := (*val).([]byte); ok {
 			fields[col] = string(v)
 		} else {
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 1c59bffaa..466cdfd98 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -9,25 +9,30 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func queryRunner(t *testing.T, q query) (*Postgresql, *testutil.Accumulator) {
+	p := &Postgresql{
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
+		Databases: []string{"postgres"},
+		Query:     q,
+	}
+	var acc testutil.Accumulator
+
+	require.NoError(t, acc.GatherError(p.Gather))
+	return p, &acc
+}
+
 func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
-		Databases: []string{"postgres"},
-		Query: query{
-			{Sqlquery: "select * from pg_stat_database",
-				Version:    901,
-				Withdbname: false,
-				Tagvalue:   ""},
-		},
-	}
-	var acc testutil.Accumulator
-	err := acc.GatherError(p.Gather)
-	require.NoError(t, err)
+	p, acc := queryRunner(t, query{{
+		Sqlquery:   "select * from pg_stat_database",
+		Version:    901,
+		Withdbname: false,
+		Tagvalue:   "",
+	}})
 
 	availableColumns := make(map[string]bool)
 	for _, col := range p.AllColumns {
@@ -102,6 +107,111 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
 }
 
+func TestPostgresqlQueryOutputTests(t *testing.T) {
+	const measurement = "postgresql"
+
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	examples := map[string]func(*testutil.Accumulator){
+		"SELECT 10.0::float AS myvalue": func(acc *testutil.Accumulator) {
+			v, found := acc.FloatField(measurement, "myvalue")
+			assert.True(t, found)
+			assert.Equal(t, 10.0, v)
+		},
+		"SELECT 10.0 AS myvalue": func(acc *testutil.Accumulator) {
+			v, found := acc.StringField(measurement, "myvalue")
+			assert.True(t, found)
+			assert.Equal(t, "10.0", v)
+		},
+		"SELECT 'hello world' AS myvalue": func(acc *testutil.Accumulator) {
+			v, found := acc.StringField(measurement, "myvalue")
+			assert.True(t, found)
+			assert.Equal(t, "hello world", v)
+		},
+		"SELECT true AS myvalue": func(acc *testutil.Accumulator) {
+			v, found := acc.BoolField(measurement, "myvalue")
+			assert.True(t, found)
+			assert.Equal(t, true, v)
+		},
+	}
+
+	for q, assertions := range examples {
+		_, acc := queryRunner(t, query{{
+			Sqlquery:   q,
+			Version:    901,
+			Withdbname: false,
+			Tagvalue:   "",
+		}})
+		assertions(acc)
+	}
+}
+
+func TestPostgresqlFieldOutput(t *testing.T) {
+	const measurement = "postgresql"
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	_, acc := queryRunner(t, query{{
+		Sqlquery:   "select * from pg_stat_database",
+		Version:    901,
+		Withdbname: false,
+		Tagvalue:   "",
+	}})
+
+	intMetrics := []string{
+		"xact_commit",
+		"xact_rollback",
+		"blks_read",
+		"blks_hit",
+		"tup_returned",
+		"tup_fetched",
+		"tup_inserted",
+		"tup_updated",
+		"tup_deleted",
+		"conflicts",
+		"temp_files",
+		"temp_bytes",
+		"deadlocks",
+	}
+
+	int32Metrics := []string{
+		"numbackends",
+	}
+
+	floatMetrics := []string{
+		"blk_read_time",
+		"blk_write_time",
+	}
+
+	stringMetrics := []string{
+		"datname",
+		"datid",
+	}
+
+	for _, field := range intMetrics {
+		_, found := acc.Int64Field(measurement, field)
+		assert.True(t, found, fmt.Sprintf("expected %s to be an integer", field))
+	}
+
+	for _, field := range int32Metrics {
+		_, found := acc.Int32Field(measurement, field)
+		assert.True(t, found, fmt.Sprintf("expected %s to be an int32", field))
+	}
+
+	for _, field := range floatMetrics {
+		_, found := acc.FloatField(measurement, field)
+		assert.True(t, found, fmt.Sprintf("expected %s to be a float64", field))
+	}
+
+	for _, field := range stringMetrics {
+		_, found := acc.StringField(measurement, field)
+		assert.True(t, found, fmt.Sprintf("expected %s to be a str", field))
+	}
+}
+
 func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
@@ -113,10 +223,9 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(p.Gather))
 
-	err := acc.GatherError(p.Gather)
-	require.NoError(t, err)
-
+	assert.NotEmpty(t, p.IgnoredColumns())
 	for col := range p.IgnoredColumns() {
 		assert.False(t, acc.HasMeasurement(col))
 	}
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index fdca47b07..9a8eef9e3 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -409,7 +409,7 @@ func (a *Accumulator) HasStringField(measurement string, field string) bool {
 	return false
 }
 
-// HasUIntValue returns true if the measurement has a UInt value
+// HasUIntField returns true if the measurement has a UInt value
 func (a *Accumulator) HasUIntField(measurement string, field string) bool {
 	a.Lock()
 	defer a.Unlock()
@@ -427,7 +427,7 @@ func (a *Accumulator) HasUIntField(measurement string, field string) bool {
 	return false
 }
 
-// HasFloatValue returns true if the given measurement has a float value
+// HasFloatField returns true if the given measurement has a float value
 func (a *Accumulator) HasFloatField(measurement string, field string) bool {
 	a.Lock()
 	defer a.Unlock()
@@ -458,6 +458,7 @@ func (a *Accumulator) HasMeasurement(measurement string) bool {
 	return false
 }
 
+// IntField returns the int value of the given measurement and field or false.
 func (a *Accumulator) IntField(measurement string, field string) (int, bool) {
 	a.Lock()
 	defer a.Unlock()
@@ -475,6 +476,43 @@ func (a *Accumulator) IntField(measurement string, field string) (int, bool) {
 	return 0, false
 }
 
+// Int64Field returns the int64 value of the given measurement and field or false.
+func (a *Accumulator) Int64Field(measurement string, field string) (int64, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(int64)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return 0, false
+}
+
+// Int32Field returns the int32 value of the given measurement and field or false.
+func (a *Accumulator) Int32Field(measurement string, field string) (int32, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(int32)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return 0, false
+}
+
+// FloatField returns the float64 value of the given measurement and field or false.
 func (a *Accumulator) FloatField(measurement string, field string) (float64, bool) {
 	a.Lock()
 	defer a.Unlock()
@@ -492,6 +530,7 @@ func (a *Accumulator) FloatField(measurement string, field string) (float64, boo
 	return 0.0, false
 }
 
+// StringField returns the string value of the given measurement and field or false.
 func (a *Accumulator) StringField(measurement string, field string) (string, bool) {
 	a.Lock()
 	defer a.Unlock()
@@ -507,3 +546,21 @@ func (a *Accumulator) StringField(measurement string, field string) (string, boo
 	}
 	return "", false
 }
+
+// BoolField returns the bool value of the given measurement and field or false.
+func (a *Accumulator) BoolField(measurement string, field string) (bool, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(bool)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return false, false
+}

From a4b8805f7ffd153c7acb8afe4923c3ed6bc25afb Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Mon, 25 Sep 2017 16:33:05 -0700
Subject: [PATCH 0575/1302] Add support for NSQLookupd to nsq_consumer (#3215)

---
 Godeps                                         |  2 +-
 etc/telegraf.conf                              |  9 ++++++---
 plugins/inputs/nsq_consumer/README.md          | 10 +++++++---
 plugins/inputs/nsq_consumer/nsq_consumer.go    | 18 ++++++++++++++----
 .../inputs/nsq_consumer/nsq_consumer_test.go   |  1 +
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Godeps b/Godeps
index 654a345eb..0802675ba 100644
--- a/Godeps
+++ b/Godeps
@@ -44,7 +44,7 @@ github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
-github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953
+github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f
 github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
 github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
 github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index c636efe56..f89d54b96 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2595,8 +2595,12 @@
 
 # # Read NSQ topic for metrics.
 # [[inputs.nsq_consumer]]
-#   ## An string representing the NSQD TCP Endpoint
-#   server = "localhost:4150"
+#   ## Server option still works but is deprecated, we just prepend it to the nsqd array.
+#   # server = "localhost:4150"
+#   ## An array representing the NSQD TCP HTTP Endpoints
+#   nsqd = ["localhost:4150"]
+#   ## An array representing the NSQLookupd HTTP Endpoints
+#   nsqlookupd = ["localhost:4161"]
 #   topic = "telegraf"
 #   channel = "consumer"
 #   max_in_flight = 100
@@ -2764,4 +2768,3 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
-
diff --git a/plugins/inputs/nsq_consumer/README.md b/plugins/inputs/nsq_consumer/README.md
index d207d8de1..5ac156eec 100644
--- a/plugins/inputs/nsq_consumer/README.md
+++ b/plugins/inputs/nsq_consumer/README.md
@@ -1,15 +1,19 @@
 # NSQ Consumer Input Plugin
 
 The [NSQ](http://nsq.io/) consumer plugin polls a specified NSQD
-topic and adds messages to InfluxDB. This plugin allows a message to be in any of the supported `data_format` types. 
+topic and adds messages to InfluxDB. This plugin allows a message to be in any of the supported `data_format` types.
 
 ## Configuration
 
 ```toml
 # Read metrics from NSQD topic(s)
 [[inputs.nsq_consumer]]
-  ## An array of NSQD HTTP API endpoints
-  server = "localhost:4150"
+  ## Server option still works but is deprecated, we just prepend it to the nsqd array.
+  # server = "localhost:4150"
+  ## An array representing the NSQD TCP HTTP Endpoints
+  nsqd = ["localhost:4150"]
+  ## An array representing the NSQLookupd HTTP Endpoints
+  nsqlookupd = ["localhost:4161"]
   topic = "telegraf"
   channel = "consumer"
   max_in_flight = 100
diff --git a/plugins/inputs/nsq_consumer/nsq_consumer.go b/plugins/inputs/nsq_consumer/nsq_consumer.go
index b93c4c68e..0823b3ac9 100644
--- a/plugins/inputs/nsq_consumer/nsq_consumer.go
+++ b/plugins/inputs/nsq_consumer/nsq_consumer.go
@@ -6,12 +6,14 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
-	"github.com/nsqio/go-nsq"
+	nsq "github.com/nsqio/go-nsq"
 )
 
 //NSQConsumer represents the configuration of the plugin
 type NSQConsumer struct {
 	Server      string
+	Nsqd        []string
+	Nsqlookupd  []string
 	Topic       string
 	Channel     string
 	MaxInFlight int
@@ -21,8 +23,12 @@ type NSQConsumer struct {
 }
 
 var sampleConfig = `
-  ## An string representing the NSQD TCP Endpoint
-  server = "localhost:4150"
+  ## Server option still works but is deprecated, we just prepend it to the nsqd array.
+  # server = "localhost:4150"
+  ## An array representing the NSQD TCP HTTP Endpoints
+  nsqd = ["localhost:4150"]
+  ## An array representing the NSQLookupd HTTP Endpoints
+  nsqlookupd = ["localhost:4161"]
   topic = "telegraf"
   channel = "consumer"
   max_in_flight = 100
@@ -71,7 +77,11 @@ func (n *NSQConsumer) Start(acc telegraf.Accumulator) error {
 		message.Finish()
 		return nil
 	}), n.MaxInFlight)
-	n.consumer.ConnectToNSQD(n.Server)
+
+	if len(n.Nsqlookupd) > 0 {
+		n.consumer.ConnectToNSQLookupds(n.Nsqlookupd)
+	}
+	n.consumer.ConnectToNSQDs(append(n.Nsqd, n.Server))
 	return nil
 }
 
diff --git a/plugins/inputs/nsq_consumer/nsq_consumer_test.go b/plugins/inputs/nsq_consumer/nsq_consumer_test.go
index 9342e13ac..a6d8c27e5 100644
--- a/plugins/inputs/nsq_consumer/nsq_consumer_test.go
+++ b/plugins/inputs/nsq_consumer/nsq_consumer_test.go
@@ -40,6 +40,7 @@ func TestReadsMetricsFromNSQ(t *testing.T) {
 		Topic:       "telegraf",
 		Channel:     "consume",
 		MaxInFlight: 1,
+		Nsqd:        []string{"127.0.0.1:4155"},
 	}
 
 	p, _ := parsers.NewInfluxParser()

From 50024c1860e6f1c7d5110e31b7158e846bc8e7d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 16:34:04 -0700
Subject: [PATCH 0576/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113633ce9..a7807b192 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - [#3236](https://github.com/influxdata/telegraf/pull/3236): Add support for k8s service DNS discovery to prometheus input.
 - [#3245](https://github.com/influxdata/telegraf/pull/3245): Add configurable metrics endpoint to prometheus output.
 - [#3214](https://github.com/influxdata/telegraf/pull/3214): Add new nginx_plus input plugin.
+- [#3215](https://github.com/influxdata/telegraf/pull/3215): Add support for NSQLookupd to nsq_consumer.
 
 ### Bugfixes
 

From fd702e6bb8e50e863355c20dbb87be05f46e9090 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 26 Sep 2017 14:19:02 -0700
Subject: [PATCH 0577/1302] Set 1.4.1 release date in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7807b192..4b371660f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 
 
-## v1.4.1 [unreleased]
+## v1.4.1 [2017-09-26]
 
 ### Bugfixes
 

From f823fc73f6ebb37e2a37183bf3fe49c2b0540cad Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 14:51:13 -0700
Subject: [PATCH 0578/1302] Allow 64bit integers in kernel_vmstat

---
 plugins/inputs/system/kernel_vmstat.go      | 2 +-
 plugins/inputs/system/kernel_vmstat_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/system/kernel_vmstat.go b/plugins/inputs/system/kernel_vmstat.go
index 93c822789..197d81185 100644
--- a/plugins/inputs/system/kernel_vmstat.go
+++ b/plugins/inputs/system/kernel_vmstat.go
@@ -41,7 +41,7 @@ func (k *KernelVmstat) Gather(acc telegraf.Accumulator) error {
 		// We only want the even number index as that contain the stat name.
 		if i%2 == 0 {
 			// Convert the stat value into an integer.
-			m, err := strconv.Atoi(string(dataFields[i+1]))
+			m, err := strconv.ParseInt(string(dataFields[i+1]), 10, 64)
 			if err != nil {
 				return err
 			}
diff --git a/plugins/inputs/system/kernel_vmstat_test.go b/plugins/inputs/system/kernel_vmstat_test.go
index 963cf7f4a..ed0c03e28 100644
--- a/plugins/inputs/system/kernel_vmstat_test.go
+++ b/plugins/inputs/system/kernel_vmstat_test.go
@@ -48,7 +48,7 @@ func TestFullVmStatProcFile(t *testing.T) {
 		"nr_isolated_anon":              int64(0),
 		"nr_isolated_file":              int64(0),
 		"nr_shmem":                      int64(541689),
-		"numa_hit":                      int64(5113399878),
+		"numa_hit":                      int64(6690743595),
 		"numa_miss":                     int64(0),
 		"numa_foreign":                  int64(0),
 		"numa_interleave":               int64(35793),
@@ -200,7 +200,7 @@ nr_writeback_temp 0
 nr_isolated_anon 0
 nr_isolated_file 0
 nr_shmem 541689
-numa_hit 5113399878
+numa_hit 6690743595
 numa_miss 0
 numa_foreign 0
 numa_interleave 35793

From 5dff5932fdd019f70603b0a03cc3f1906f29da38 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 15:48:09 -0700
Subject: [PATCH 0579/1302] Fix nginx_plus tests with 32bit int

---
 plugins/inputs/nginx_plus/nginx_plus.go      |  8 ++++----
 plugins/inputs/nginx_plus/nginx_plus_test.go | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/nginx_plus/nginx_plus.go b/plugins/inputs/nginx_plus/nginx_plus.go
index 60fe55a56..5a761071e 100644
--- a/plugins/inputs/nginx_plus/nginx_plus.go
+++ b/plugins/inputs/nginx_plus/nginx_plus.go
@@ -162,10 +162,10 @@ type Status struct {
 	} `json:"processes"`
 
 	Connections struct {
-		Accepted int `json:"accepted"`
-		Dropped  int `json:"dropped"`
-		Active   int `json:"active"`
-		Idle     int `json:"idle"`
+		Accepted int64 `json:"accepted"`
+		Dropped  int64 `json:"dropped"`
+		Active   int64 `json:"active"`
+		Idle     int64 `json:"idle"`
 	} `json:"connections"`
 
 	Ssl *struct { // added in version 6
diff --git a/plugins/inputs/nginx_plus/nginx_plus_test.go b/plugins/inputs/nginx_plus/nginx_plus_test.go
index 3357e1d06..6e9a8c4d9 100644
--- a/plugins/inputs/nginx_plus/nginx_plus_test.go
+++ b/plugins/inputs/nginx_plus/nginx_plus_test.go
@@ -25,7 +25,7 @@ const sampleStatusResponse = `
     "processes": {
         "respawned": 9999
      },
-    "connections": { 
+    "connections": {
         "accepted": 1234567890000,
         "dropped":  2345678900000,
         "active":   345,
@@ -306,10 +306,10 @@ func TestNginxPlusGeneratesMetrics(t *testing.T) {
 		t,
 		"nginx_plus_connections",
 		map[string]interface{}{
-			"accepted": int(1234567890000),
-			"dropped":  int(2345678900000),
-			"active":   int(345),
-			"idle":     int(567),
+			"accepted": int64(1234567890000),
+			"dropped":  int64(2345678900000),
+			"active":   int64(345),
+			"idle":     int64(567),
 		},
 		map[string]string{
 			"server": host,

From bb665cf013525a88d59a6a631975ce5a8087a3d8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 15:49:01 -0700
Subject: [PATCH 0580/1302] Fix ceph tests with 32bit int

---
 plugins/inputs/ceph/ceph_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/ceph/ceph_test.go b/plugins/inputs/ceph/ceph_test.go
index 4a75acd15..f4a3ebb83 100644
--- a/plugins/inputs/ceph/ceph_test.go
+++ b/plugins/inputs/ceph/ceph_test.go
@@ -26,7 +26,7 @@ func TestParseSockId(t *testing.T) {
 func TestParseMonDump(t *testing.T) {
 	dump, err := parseDump(monPerfDump)
 	assert.NoError(t, err)
-	assert.InEpsilon(t, 5678670180, dump["cluster"]["osd_kb_used"], epsilon)
+	assert.InEpsilon(t, int64(5678670180), dump["cluster"]["osd_kb_used"], epsilon)
 	assert.InEpsilon(t, 6866.540527000, dump["paxos"]["store_state_latency.sum"], epsilon)
 }
 

From c013cc149760e4b4e96cd2d42bbe528bcfde6438 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 15:49:23 -0700
Subject: [PATCH 0581/1302] Fix cgroup tests with 32bit int

---
 plugins/inputs/cgroup/cgroup_linux.go |  2 +-
 plugins/inputs/cgroup/cgroup_test.go  | 38 +++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/plugins/inputs/cgroup/cgroup_linux.go b/plugins/inputs/cgroup/cgroup_linux.go
index f43b58975..0765416af 100644
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -225,7 +225,7 @@ var fileFormats = [...]fileFormat{
 }
 
 func numberOrString(s string) interface{} {
-	i, err := strconv.Atoi(s)
+	i, err := strconv.ParseInt(s, 10, 64)
 	if err == nil {
 		return i
 	}
diff --git a/plugins/inputs/cgroup/cgroup_test.go b/plugins/inputs/cgroup/cgroup_test.go
index 0ad3a5b24..b3094baef 100644
--- a/plugins/inputs/cgroup/cgroup_test.go
+++ b/plugins/inputs/cgroup/cgroup_test.go
@@ -31,17 +31,17 @@ func TestCgroupStatistics_1(t *testing.T) {
 		"path": "testdata/memory",
 	}
 	fields := map[string]interface{}{
-		"memory.stat.cache":           1739362304123123123,
-		"memory.stat.rss":             1775325184,
-		"memory.stat.rss_huge":        778043392,
-		"memory.stat.mapped_file":     421036032,
-		"memory.stat.dirty":           -307200,
-		"memory.max_usage_in_bytes.0": 0,
-		"memory.max_usage_in_bytes.1": -1,
-		"memory.max_usage_in_bytes.2": 2,
-		"memory.limit_in_bytes":       223372036854771712,
+		"memory.stat.cache":           int64(1739362304123123123),
+		"memory.stat.rss":             int64(1775325184),
+		"memory.stat.rss_huge":        int64(778043392),
+		"memory.stat.mapped_file":     int64(421036032),
+		"memory.stat.dirty":           int64(-307200),
+		"memory.max_usage_in_bytes.0": int64(0),
+		"memory.max_usage_in_bytes.1": int64(-1),
+		"memory.max_usage_in_bytes.2": int64(2),
+		"memory.limit_in_bytes":       int64(223372036854771712),
 		"memory.use_hierarchy":        "12-781",
-		"notify_on_release":           0,
+		"notify_on_release":           int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
@@ -63,10 +63,10 @@ func TestCgroupStatistics_2(t *testing.T) {
 		"path": "testdata/cpu",
 	}
 	fields := map[string]interface{}{
-		"cpuacct.usage_percpu.0": -1452543795404,
-		"cpuacct.usage_percpu.1": 1376681271659,
-		"cpuacct.usage_percpu.2": 1450950799997,
-		"cpuacct.usage_percpu.3": -1473113374257,
+		"cpuacct.usage_percpu.0": int64(-1452543795404),
+		"cpuacct.usage_percpu.1": int64(1376681271659),
+		"cpuacct.usage_percpu.2": int64(1450950799997),
+		"cpuacct.usage_percpu.3": int64(-1473113374257),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }
@@ -88,7 +88,7 @@ func TestCgroupStatistics_3(t *testing.T) {
 		"path": "testdata/memory/group_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
+		"memory.limit_in_bytes": int64(223372036854771712),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 
@@ -115,7 +115,7 @@ func TestCgroupStatistics_4(t *testing.T) {
 		"path": "testdata/memory/group_1/group_1_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
+		"memory.limit_in_bytes": int64(223372036854771712),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 
@@ -147,7 +147,7 @@ func TestCgroupStatistics_5(t *testing.T) {
 		"path": "testdata/memory/group_1/group_1_1",
 	}
 	fields := map[string]interface{}{
-		"memory.limit_in_bytes": 223372036854771712,
+		"memory.limit_in_bytes": int64(223372036854771712),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 
@@ -174,9 +174,9 @@ func TestCgroupStatistics_6(t *testing.T) {
 		"path": "testdata/memory",
 	}
 	fields := map[string]interface{}{
-		"memory.usage_in_bytes":      3513667584,
+		"memory.usage_in_bytes":      int64(3513667584),
 		"memory.use_hierarchy":       "12-781",
-		"memory.kmem.limit_in_bytes": 9223372036854771712,
+		"memory.kmem.limit_in_bytes": int64(9223372036854771712),
 	}
 	acc.AssertContainsTaggedFields(t, "cgroup", fields, tags)
 }

From ef5c12bd8688d2497bb3bd546b13501566c7f697 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 25 Sep 2017 15:49:36 -0700
Subject: [PATCH 0582/1302] Fix dmcache tests with 32bit int

---
 plugins/inputs/dmcache/dmcache_linux.go      |  56 +++++-----
 plugins/inputs/dmcache/dmcache_linux_test.go | 112 +++++++++----------
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/plugins/inputs/dmcache/dmcache_linux.go b/plugins/inputs/dmcache/dmcache_linux.go
index 7ac1c96ca..8e8d7de91 100644
--- a/plugins/inputs/dmcache/dmcache_linux.go
+++ b/plugins/inputs/dmcache/dmcache_linux.go
@@ -16,21 +16,21 @@ const metricName = "dmcache"
 
 type cacheStatus struct {
 	device            string
-	length            int
+	length            int64
 	target            string
-	metadataBlocksize int
-	metadataUsed      int
-	metadataTotal     int
-	cacheBlocksize    int
-	cacheUsed         int
-	cacheTotal        int
-	readHits          int
-	readMisses        int
-	writeHits         int
-	writeMisses       int
-	demotions         int
-	promotions        int
-	dirty             int
+	metadataBlocksize int64
+	metadataUsed      int64
+	metadataTotal     int64
+	cacheBlocksize    int64
+	cacheUsed         int64
+	cacheTotal        int64
+	readHits          int64
+	readMisses        int64
+	writeHits         int64
+	writeMisses       int64
+	demotions         int64
+	promotions        int64
+	dirty             int64
 }
 
 func (c *DMCache) Gather(acc telegraf.Accumulator) error {
@@ -69,12 +69,12 @@ func parseDMSetupStatus(line string) (cacheStatus, error) {
 	}
 
 	status.device = strings.TrimRight(values[0], ":")
-	status.length, err = strconv.Atoi(values[2])
+	status.length, err = strconv.ParseInt(values[2], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
 	status.target = values[3]
-	status.metadataBlocksize, err = strconv.Atoi(values[4])
+	status.metadataBlocksize, err = strconv.ParseInt(values[4], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
@@ -82,15 +82,15 @@ func parseDMSetupStatus(line string) (cacheStatus, error) {
 	if len(metadata) != 2 {
 		return cacheStatus{}, parseError
 	}
-	status.metadataUsed, err = strconv.Atoi(metadata[0])
+	status.metadataUsed, err = strconv.ParseInt(metadata[0], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.metadataTotal, err = strconv.Atoi(metadata[1])
+	status.metadataTotal, err = strconv.ParseInt(metadata[1], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.cacheBlocksize, err = strconv.Atoi(values[6])
+	status.cacheBlocksize, err = strconv.ParseInt(values[6], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
@@ -98,39 +98,39 @@ func parseDMSetupStatus(line string) (cacheStatus, error) {
 	if len(cache) != 2 {
 		return cacheStatus{}, parseError
 	}
-	status.cacheUsed, err = strconv.Atoi(cache[0])
+	status.cacheUsed, err = strconv.ParseInt(cache[0], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.cacheTotal, err = strconv.Atoi(cache[1])
+	status.cacheTotal, err = strconv.ParseInt(cache[1], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.readHits, err = strconv.Atoi(values[8])
+	status.readHits, err = strconv.ParseInt(values[8], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.readMisses, err = strconv.Atoi(values[9])
+	status.readMisses, err = strconv.ParseInt(values[9], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.writeHits, err = strconv.Atoi(values[10])
+	status.writeHits, err = strconv.ParseInt(values[10], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.writeMisses, err = strconv.Atoi(values[11])
+	status.writeMisses, err = strconv.ParseInt(values[11], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.demotions, err = strconv.Atoi(values[12])
+	status.demotions, err = strconv.ParseInt(values[12], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.promotions, err = strconv.Atoi(values[13])
+	status.promotions, err = strconv.ParseInt(values[13], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
-	status.dirty, err = strconv.Atoi(values[14])
+	status.dirty, err = strconv.ParseInt(values[14], 10, 64)
 	if err != nil {
 		return cacheStatus{}, err
 	}
diff --git a/plugins/inputs/dmcache/dmcache_linux_test.go b/plugins/inputs/dmcache/dmcache_linux_test.go
index bf3e38ca1..30e32b1e8 100644
--- a/plugins/inputs/dmcache/dmcache_linux_test.go
+++ b/plugins/inputs/dmcache/dmcache_linux_test.go
@@ -35,20 +35,20 @@ func TestPerDeviceGoodOutput(t *testing.T) {
 		"device": "cs-1",
 	}
 	fields1 := map[string]interface{}{
-		"length":             4883791872,
-		"metadata_blocksize": 8,
-		"metadata_used":      1018,
-		"metadata_total":     1501122,
-		"cache_blocksize":    512,
-		"cache_used":         7,
-		"cache_total":        464962,
-		"read_hits":          139,
-		"read_misses":        352643,
-		"write_hits":         15,
-		"write_misses":       46,
-		"demotions":          0,
-		"promotions":         7,
-		"dirty":              0,
+		"length":             int64(4883791872),
+		"metadata_blocksize": int64(8),
+		"metadata_used":      int64(1018),
+		"metadata_total":     int64(1501122),
+		"cache_blocksize":    int64(512),
+		"cache_used":         int64(7),
+		"cache_total":        int64(464962),
+		"read_hits":          int64(139),
+		"read_misses":        int64(352643),
+		"write_hits":         int64(15),
+		"write_misses":       int64(46),
+		"demotions":          int64(0),
+		"promotions":         int64(7),
+		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields1, tags1)
 
@@ -56,20 +56,20 @@ func TestPerDeviceGoodOutput(t *testing.T) {
 		"device": "cs-2",
 	}
 	fields2 := map[string]interface{}{
-		"length":             4294967296,
-		"metadata_blocksize": 8,
-		"metadata_used":      72352,
-		"metadata_total":     1310720,
-		"cache_blocksize":    128,
-		"cache_used":         26,
-		"cache_total":        24327168,
-		"read_hits":          2409,
-		"read_misses":        286,
-		"write_hits":         265,
-		"write_misses":       524682,
-		"demotions":          0,
-		"promotions":         0,
-		"dirty":              0,
+		"length":             int64(4294967296),
+		"metadata_blocksize": int64(8),
+		"metadata_used":      int64(72352),
+		"metadata_total":     int64(1310720),
+		"cache_blocksize":    int64(128),
+		"cache_used":         int64(26),
+		"cache_total":        int64(24327168),
+		"read_hits":          int64(2409),
+		"read_misses":        int64(286),
+		"write_hits":         int64(265),
+		"write_misses":       int64(524682),
+		"demotions":          int64(0),
+		"promotions":         int64(0),
+		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields2, tags2)
 
@@ -78,20 +78,20 @@ func TestPerDeviceGoodOutput(t *testing.T) {
 	}
 
 	fields3 := map[string]interface{}{
-		"length":             9178759168,
-		"metadata_blocksize": 16,
-		"metadata_used":      73370,
-		"metadata_total":     2811842,
-		"cache_blocksize":    640,
-		"cache_used":         33,
-		"cache_total":        24792130,
-		"read_hits":          2548,
-		"read_misses":        352929,
-		"write_hits":         280,
-		"write_misses":       524728,
-		"demotions":          0,
-		"promotions":         7,
-		"dirty":              0,
+		"length":             int64(9178759168),
+		"metadata_blocksize": int64(16),
+		"metadata_used":      int64(73370),
+		"metadata_total":     int64(2811842),
+		"cache_blocksize":    int64(640),
+		"cache_used":         int64(33),
+		"cache_total":        int64(24792130),
+		"read_hits":          int64(2548),
+		"read_misses":        int64(352929),
+		"write_hits":         int64(280),
+		"write_misses":       int64(524728),
+		"demotions":          int64(0),
+		"promotions":         int64(7),
+		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields3, tags3)
 }
@@ -113,20 +113,20 @@ func TestNotPerDeviceGoodOutput(t *testing.T) {
 	}
 
 	fields := map[string]interface{}{
-		"length":             9178759168,
-		"metadata_blocksize": 16,
-		"metadata_used":      73370,
-		"metadata_total":     2811842,
-		"cache_blocksize":    640,
-		"cache_used":         33,
-		"cache_total":        24792130,
-		"read_hits":          2548,
-		"read_misses":        352929,
-		"write_hits":         280,
-		"write_misses":       524728,
-		"demotions":          0,
-		"promotions":         7,
-		"dirty":              0,
+		"length":             int64(9178759168),
+		"metadata_blocksize": int64(16),
+		"metadata_used":      int64(73370),
+		"metadata_total":     int64(2811842),
+		"cache_blocksize":    int64(640),
+		"cache_used":         int64(33),
+		"cache_total":        int64(24792130),
+		"read_hits":          int64(2548),
+		"read_misses":        int64(352929),
+		"write_hits":         int64(280),
+		"write_misses":       int64(524728),
+		"demotions":          int64(0),
+		"promotions":         int64(7),
+		"dirty":              int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
 }

From f23d1eb0782a13809fd4dd12d68937fed456a4eb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 26 Sep 2017 15:27:41 -0700
Subject: [PATCH 0583/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b371660f..585aea8da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,11 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 
+## v1.4.2 [unreleased]
+
+### Bugfixes
+
+- [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat #3266
 
 ## v1.4.1 [2017-09-26]
 

From 8614445235a4fb5cd9a56b895221cbdac3d1a59a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 26 Sep 2017 15:36:00 -0700
Subject: [PATCH 0584/1302] Fix parsing of JSON with a UTF8 BOM in httpjson
 (#3267)

---
 plugins/inputs/httpjson/httpjson.go      |  7 ++++++-
 plugins/inputs/httpjson/httpjson_test.go | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index ba5d7734d..f3edc57ba 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -1,6 +1,7 @@
 package httpjson
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -15,6 +16,10 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
 
+var (
+	utf8BOM = []byte("\xef\xbb\xbf")
+)
+
 // HttpJson struct
 type HttpJson struct {
 	Name            string
@@ -170,7 +175,6 @@ func (h *HttpJson) gatherServer(
 	serverURL string,
 ) error {
 	resp, responseTime, err := h.sendRequest(serverURL)
-
 	if err != nil {
 		return err
 	}
@@ -266,6 +270,7 @@ func (h *HttpJson) sendRequest(serverURL string) (string, float64, error) {
 	if err != nil {
 		return string(body), responseTime, err
 	}
+	body = bytes.TrimPrefix(body, utf8BOM)
 
 	// Process response
 	if resp.StatusCode != http.StatusOK {
diff --git a/plugins/inputs/httpjson/httpjson_test.go b/plugins/inputs/httpjson/httpjson_test.go
index 629da8b5f..60ee88b49 100644
--- a/plugins/inputs/httpjson/httpjson_test.go
+++ b/plugins/inputs/httpjson/httpjson_test.go
@@ -560,3 +560,18 @@ func TestHttpJsonArray200Tags(t *testing.T) {
 		}
 	}
 }
+
+var jsonBOM = []byte("\xef\xbb\xbf[{\"value\":17}]")
+
+// TestHttpJsonBOM tests that UTF-8 JSON with a BOM can be parsed
+func TestHttpJsonBOM(t *testing.T) {
+	httpjson := genMockHttpJson(string(jsonBOM), 200)
+
+	for _, service := range httpjson {
+		if service.Name == "other_webapp" {
+			var acc testutil.Accumulator
+			err := acc.GatherError(service.Gather)
+			require.NoError(t, err)
+		}
+	}
+}

From 2e1457a49610a25694f4a548d7424ea9b02d9ce2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 26 Sep 2017 15:38:22 -0700
Subject: [PATCH 0585/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 585aea8da..57328e6d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,8 @@
 
 ### Bugfixes
 
-- [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat #3266
+- [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat.
+- [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
 
 ## v1.4.1 [2017-09-26]
 

From 22a9ffbb9d9b29754aa8f3a38c86ece64d95a9be Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 26 Sep 2017 15:58:33 -0700
Subject: [PATCH 0586/1302] Allow JSON data format to contain zero metrics
 (#3268)

---
 plugins/inputs/httpjson/httpjson_test.go |  6 ++----
 plugins/parsers/json/parser.go           |  4 ++++
 plugins/parsers/json/parser_test.go      | 10 ++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/httpjson/httpjson_test.go b/plugins/inputs/httpjson/httpjson_test.go
index 60ee88b49..7134ffb46 100644
--- a/plugins/inputs/httpjson/httpjson_test.go
+++ b/plugins/inputs/httpjson/httpjson_test.go
@@ -477,15 +477,13 @@ func TestHttpJsonBadJson(t *testing.T) {
 	assert.Equal(t, 0, acc.NFields())
 }
 
-// Test response to empty string as response objectgT
+// Test response to empty string as response object
 func TestHttpJsonEmptyResponse(t *testing.T) {
 	httpjson := genMockHttpJson(empty, 200)
 
 	var acc testutil.Accumulator
 	err := acc.GatherError(httpjson[0].Gather)
-
-	assert.Error(t, err)
-	assert.Equal(t, 0, acc.NFields())
+	assert.NoError(t, err)
 }
 
 // Test that the proper values are ignored or collected
diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index a8743558d..50b3d3682 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -67,6 +67,10 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 }
 
 func (p *JSONParser) Parse(buf []byte) ([]telegraf.Metric, error) {
+	buf = bytes.TrimSpace(buf)
+	if len(buf) == 0 {
+		return make([]telegraf.Metric, 0), nil
+	}
 
 	if !isarray(buf) {
 		metrics := make([]telegraf.Metric, 0)
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
index c8e2be1ad..f21961787 100644
--- a/plugins/parsers/json/parser_test.go
+++ b/plugins/parsers/json/parser_test.go
@@ -84,6 +84,16 @@ func TestParseValidJSON(t *testing.T) {
 		"b_c": float64(6),
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{}, metrics[0].Tags())
+
+	// Test that whitespace only will parse as an empty list of metrics
+	metrics, err = parser.Parse([]byte("\n\t"))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 0)
+
+	// Test that an empty string will parse as an empty list of metrics
+	metrics, err = parser.Parse([]byte(""))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 0)
 }
 
 func TestParseLineValidJSON(t *testing.T) {

From cadafa64058b116c7a58a44326995c9bb7237aff Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 26 Sep 2017 16:03:04 -0700
Subject: [PATCH 0587/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57328e6d6..6cfdfca7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 
 - [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat.
 - [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
+- [#2887](https://github.com/influxdata/telegraf/issues/2887): Allow JSON data format to contain zero metrics.
 
 ## v1.4.1 [2017-09-26]
 

From ee26191eb556d62aaacce93cdfc17b7157207188 Mon Sep 17 00:00:00 2001
From: Dylan Meissner <dylanmei@gmail.com>
Date: Tue, 26 Sep 2017 17:34:46 -0700
Subject: [PATCH 0588/1302] Add redesigned Jolokia input plugin (#2278)

---
 plugins/inputs/all/all.go                   |   1 +
 plugins/inputs/jolokia2/README.md           | 169 +++++
 plugins/inputs/jolokia2/client.go           | 271 ++++++++
 plugins/inputs/jolokia2/client_test.go      | 129 ++++
 plugins/inputs/jolokia2/examples/java.conf  |  40 ++
 plugins/inputs/jolokia2/examples/kafka.conf |  55 ++
 plugins/inputs/jolokia2/gatherer.go         | 277 ++++++++
 plugins/inputs/jolokia2/gatherer_test.go    | 104 +++
 plugins/inputs/jolokia2/jolokia.go          |  21 +
 plugins/inputs/jolokia2/jolokia_agent.go    | 112 ++++
 plugins/inputs/jolokia2/jolokia_proxy.go    | 129 ++++
 plugins/inputs/jolokia2/jolokia_test.go     | 673 ++++++++++++++++++++
 plugins/inputs/jolokia2/metric.go           |  61 ++
 plugins/inputs/jolokia2/point_builder.go    | 271 ++++++++
 14 files changed, 2313 insertions(+)
 create mode 100644 plugins/inputs/jolokia2/README.md
 create mode 100644 plugins/inputs/jolokia2/client.go
 create mode 100644 plugins/inputs/jolokia2/client_test.go
 create mode 100644 plugins/inputs/jolokia2/examples/java.conf
 create mode 100644 plugins/inputs/jolokia2/examples/kafka.conf
 create mode 100644 plugins/inputs/jolokia2/gatherer.go
 create mode 100644 plugins/inputs/jolokia2/gatherer_test.go
 create mode 100644 plugins/inputs/jolokia2/jolokia.go
 create mode 100644 plugins/inputs/jolokia2/jolokia_agent.go
 create mode 100644 plugins/inputs/jolokia2/jolokia_proxy.go
 create mode 100644 plugins/inputs/jolokia2/jolokia_test.go
 create mode 100644 plugins/inputs/jolokia2/metric.go
 create mode 100644 plugins/inputs/jolokia2/point_builder.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 7281f5b7a..45d040503 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -36,6 +36,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
+	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia2"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
new file mode 100644
index 000000000..0ab985e5b
--- /dev/null
+++ b/plugins/inputs/jolokia2/README.md
@@ -0,0 +1,169 @@
+# Jolokia2 Input Plugins
+
+The [Jolokia](http://jolokia.org) _agent_ and _proxy_ input plugins collect JMX metrics from an HTTP endpoint using Jolokia's [JSON-over-HTTP protocol](https://jolokia.org/reference/html/protocol.html).
+
+## Jolokia Agent Configuration
+
+The `jolokia2_agent` input plugin reads JMX metrics from one or more [Jolokia agent](https://jolokia.org/agent/jvm.html) REST endpoints.
+
+```toml
+[[inputs.jolokia2_agent]]
+  urls = ["http://agent:8080/jolokia"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+```
+
+Optionally, specify SSL options for communicating with agents:
+
+```toml
+[[inputs.jolokia2_agent]]
+  urls = ["https://agent:8080/jolokia"]
+  ssl_ca   = "/var/private/ca.pem"
+  ssl_cert = "/var/private/client.pem"
+  ssl_key  = "/var/private/client-key.pem"
+  #insecure_skip_verify = false
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+```
+
+## Jolokia Proxy Configuration
+
+The `jolokia2_proxy` input plugin reads JMX metrics from one or more _targets_ by interacting with a [Jolokia proxy](https://jolokia.org/features/proxy.html) REST endpoint.
+
+```toml
+[[inputs.jolokia2_proxy]]
+  url = "http://proxy:8080/jolokia"
+
+  #default_target_username = ""
+  #default_target_password = ""
+  [[inputs.jolokia2_proxy.target]]
+    url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
+    # username = ""
+    # password = ""
+
+  [[inputs.jolokia2_proxy.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+```
+
+Optionally, specify SSL options for communicating with proxies:
+
+```toml
+[[inputs.jolokia2_proxy]]
+  url = "https://proxy:8080/jolokia"
+
+  ssl_ca   = "/var/private/ca.pem"
+  ssl_cert = "/var/private/client.pem"
+  ssl_key  = "/var/private/client-key.pem"
+  #insecure_skip_verify = false
+
+  #default_target_username = ""
+  #default_target_password = ""
+  [[inputs.jolokia2_proxy.target]]
+    url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
+    # username = ""
+    # password = ""
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+```
+
+## Jolokia Metric Configuration
+
+Each `metric` declaration generates a Jolokia request to fetch telemetry from a JMX MBean.
+
+| Key            | Required | Description |
+|----------------|----------|-------------|
+| `mbean`        | yes      | The object name of a JMX MBean. MBean property-key values can contain a wildcard `*`, allowing you to fetch multiple MBeans with one declaration. |
+| `paths`        | no       | A list of MBean attributes to read. |
+| `tag_keys`     | no       | A list of MBean property-key names to convert into tags. The property-key name becomes the tag name, while the property-key value becomes the tag value. |
+| `tag_prefix`   | no       | A string to prepend to the tag names produced by this `metric` declaration. |
+| `field_name`   | no       | A string to set as the name of the field produced by this metric; can contain substitutions. |
+| `field_prefix` | no       | A string to prepend to the field names produced by this `metric` declaration; can contain substitutions. |
+
+Use `paths` to refine which fields to collect.
+
+```toml
+[[inputs.jolokia2_agent.metric]]
+  name  = "jvm_memory"
+  mbean = "java.lang:type=Memory"
+  paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+```
+
+The preceeding `jvm_memory` `metric` declaration produces the following output:
+
+```
+jvm_memory HeapMemoryUsage.committed=4294967296,HeapMemoryUsage.init=4294967296,HeapMemoryUsage.max=4294967296,HeapMemoryUsage.used=1750658992,NonHeapMemoryUsage.committed=67350528,NonHeapMemoryUsage.init=2555904,NonHeapMemoryUsage.max=-1,NonHeapMemoryUsage.used=65821352,ObjectPendingFinalizationCount=0 1503762436000000000
+```
+
+Use `*` wildcards against `mbean` property-key values to create distinct series by capturing values into `tag_keys`.
+
+```toml
+[[inputs.jolokia2_agent.metric]]
+  name     = "jvm_garbage_collector"
+  mbean    = "java.lang:name=*,type=GarbageCollector"
+  paths    = ["CollectionTime", "CollectionCount"]
+  tag_keys = ["name"]
+```
+
+Since `name=*` matches both `G1 Old Generation` and `G1 Young Generation`, and `name` is used as a tag, the preceeding `jvm_garbage_collector` `metric` declaration produces two metrics.
+
+```
+jvm_garbage_collector,name=G1\ Old\ Generation CollectionCount=0,CollectionTime=0 1503762520000000000
+jvm_garbage_collector,name=G1\ Young\ Generation CollectionTime=32,CollectionCount=2 1503762520000000000
+```
+
+Use `tag_prefix` along with `tag_keys` to add detail to tag names.
+
+```toml
+[[inputs.jolokia2_agent.metric]]
+  name       = "jvm_memory_pool"
+  mbean      = "java.lang:name=*,type=MemoryPool"
+  paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+  tag_keys   = ["name"]
+  tag_prefix = "pool_"
+```
+
+The preceeding `jvm_memory_pool` `metric` declaration produces six metrics, each with a distinct `pool_name` tag.
+
+```
+jvm_memory_pool,pool_name=Compressed\ Class\ Space PeakUsage.max=1073741824,PeakUsage.committed=3145728,PeakUsage.init=0,Usage.committed=3145728,Usage.init=0,PeakUsage.used=3017976,Usage.max=1073741824,Usage.used=3017976 1503764025000000000
+jvm_memory_pool,pool_name=Code\ Cache PeakUsage.init=2555904,PeakUsage.committed=6291456,Usage.committed=6291456,PeakUsage.used=6202752,PeakUsage.max=251658240,Usage.used=6210368,Usage.max=251658240,Usage.init=2555904 1503764025000000000
+jvm_memory_pool,pool_name=G1\ Eden\ Space CollectionUsage.max=-1,PeakUsage.committed=56623104,PeakUsage.init=56623104,PeakUsage.used=53477376,Usage.max=-1,Usage.committed=49283072,Usage.used=19922944,CollectionUsage.committed=49283072,CollectionUsage.init=56623104,CollectionUsage.used=0,PeakUsage.max=-1,Usage.init=56623104 1503764025000000000
+jvm_memory_pool,pool_name=G1\ Old\ Gen CollectionUsage.max=1073741824,CollectionUsage.committed=0,PeakUsage.max=1073741824,PeakUsage.committed=1017118720,PeakUsage.init=1017118720,PeakUsage.used=137032208,Usage.max=1073741824,CollectionUsage.init=1017118720,Usage.committed=1017118720,Usage.init=1017118720,Usage.used=134708752,CollectionUsage.used=0 1503764025000000000
+jvm_memory_pool,pool_name=G1\ Survivor\ Space Usage.max=-1,Usage.init=0,CollectionUsage.max=-1,CollectionUsage.committed=7340032,CollectionUsage.used=7340032,PeakUsage.committed=7340032,Usage.committed=7340032,Usage.used=7340032,CollectionUsage.init=0,PeakUsage.max=-1,PeakUsage.init=0,PeakUsage.used=7340032 1503764025000000000
+jvm_memory_pool,pool_name=Metaspace PeakUsage.init=0,PeakUsage.used=21852224,PeakUsage.max=-1,Usage.max=-1,Usage.committed=22282240,Usage.init=0,Usage.used=21852224,PeakUsage.committed=22282240 1503764025000000000
+```
+
+Use substitutions to create fields and field prefixes with MBean property-keys captured by wildcards. In the following example, `$1` represents the value of the property-key `name`, and `$2` represents the value of the property-key `topic`.
+
+```toml
+[[inputs.jolokia2_agent.metric]]
+  name         = "kafka_topic"
+  mbean        = "kafka.server:name=*,topic=*,type=BrokerTopicMetrics"
+  field_prefix = "$1"
+  tag_keys     = ["topic"]
+```
+
+The preceeding `kafka_topic` `metric` declaration produces a metric per Kafka topic. The `name` Mbean property-key is used as a field prefix to aid in gathering fields together into the single metric.
+
+```
+kafka_topic,topic=my-topic BytesOutPerSec.MeanRate=0,FailedProduceRequestsPerSec.MeanRate=0,BytesOutPerSec.EventType="bytes",BytesRejectedPerSec.Count=0,FailedProduceRequestsPerSec.RateUnit="SECONDS",FailedProduceRequestsPerSec.EventType="requests",MessagesInPerSec.RateUnit="SECONDS",BytesInPerSec.EventType="bytes",BytesOutPerSec.RateUnit="SECONDS",BytesInPerSec.OneMinuteRate=0,FailedFetchRequestsPerSec.EventType="requests",TotalFetchRequestsPerSec.MeanRate=146.301533938701,BytesOutPerSec.FifteenMinuteRate=0,TotalProduceRequestsPerSec.MeanRate=0,BytesRejectedPerSec.FifteenMinuteRate=0,MessagesInPerSec.FiveMinuteRate=0,BytesInPerSec.Count=0,BytesRejectedPerSec.MeanRate=0,FailedFetchRequestsPerSec.MeanRate=0,FailedFetchRequestsPerSec.FiveMinuteRate=0,FailedFetchRequestsPerSec.FifteenMinuteRate=0,FailedProduceRequestsPerSec.Count=0,TotalFetchRequestsPerSec.FifteenMinuteRate=128.59314292334466,TotalFetchRequestsPerSec.OneMinuteRate=126.71551273850747,TotalFetchRequestsPerSec.Count=1353483,TotalProduceRequestsPerSec.FifteenMinuteRate=0,FailedFetchRequestsPerSec.OneMinuteRate=0,FailedFetchRequestsPerSec.Count=0,FailedProduceRequestsPerSec.FifteenMinuteRate=0,TotalFetchRequestsPerSec.FiveMinuteRate=130.8516148751592,TotalFetchRequestsPerSec.RateUnit="SECONDS",BytesRejectedPerSec.RateUnit="SECONDS",BytesInPerSec.MeanRate=0,FailedFetchRequestsPerSec.RateUnit="SECONDS",BytesRejectedPerSec.OneMinuteRate=0,BytesOutPerSec.Count=0,BytesOutPerSec.OneMinuteRate=0,MessagesInPerSec.FifteenMinuteRate=0,MessagesInPerSec.MeanRate=0,BytesInPerSec.FiveMinuteRate=0,TotalProduceRequestsPerSec.RateUnit="SECONDS",FailedProduceRequestsPerSec.OneMinuteRate=0,TotalProduceRequestsPerSec.EventType="requests",BytesRejectedPerSec.FiveMinuteRate=0,BytesRejectedPerSec.EventType="bytes",BytesOutPerSec.FiveMinuteRate=0,FailedProduceRequestsPerSec.FiveMinuteRate=0,MessagesInPerSec.Count=0,TotalProduceRequestsPerSec.FiveMinuteRate=0,TotalProduceRequestsPerSec.OneMinuteRate=0,MessagesInPerSec.EventType="messages",MessagesInPerSec.OneMinuteRate=0,TotalFetchRequestsPerSec.EventType="requests",BytesInPerSec.RateUnit="SECONDS",BytesInPerSec.FifteenMinuteRate=0,TotalProduceRequestsPerSec.Count=0 1503767532000000000
+```
+
+Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configurations that apply to every `metric` declaration.
+
+| Key                       | Default Value | Description |
+|---------------------------|---------------|-------------|
+| `default_field_separator` | `.`           | A character to use to join Mbean attributes when creating fields. |
+| `default_field_prefix`    | _None_        | A string to prepend to the field names produced by all `metric` declarations. |
+| `default_tag_prefix`      | _None_        | A string to prepend to the tag names produced by all `metric` declarations. |
diff --git a/plugins/inputs/jolokia2/client.go b/plugins/inputs/jolokia2/client.go
new file mode 100644
index 000000000..aa9a8f87b
--- /dev/null
+++ b/plugins/inputs/jolokia2/client.go
@@ -0,0 +1,271 @@
+package jolokia2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"path"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+)
+
+type Client struct {
+	URL    string
+	client *http.Client
+	config *ClientConfig
+}
+
+type ClientConfig struct {
+	ResponseTimeout    time.Duration
+	Username           string
+	Password           string
+	SSLCA              string
+	SSLCert            string
+	SSLKey             string
+	InsecureSkipVerify bool
+
+	ProxyConfig *ProxyConfig
+}
+
+type ProxyConfig struct {
+	DefaultTargetUsername string
+	DefaultTargetPassword string
+	Targets               []ProxyTargetConfig
+}
+
+type ProxyTargetConfig struct {
+	Username string
+	Password string
+	URL      string
+}
+
+type ReadRequest struct {
+	Mbean      string
+	Attributes []string
+	Path       string
+}
+
+type ReadResponse struct {
+	Status            int
+	Value             interface{}
+	RequestMbean      string
+	RequestAttributes []string
+	RequestPath       string
+	RequestTarget     string
+}
+
+// Jolokia JSON request object. Example: {
+//   "type": "read",
+//   "mbean: "java.lang:type="Runtime",
+//   "attribute": "Uptime",
+//   "target": {
+//     "url: "service:jmx:rmi:///jndi/rmi://target:9010/jmxrmi"
+//   }
+// }
+type jolokiaRequest struct {
+	Type      string         `json:"type"`
+	Mbean     string         `json:"mbean"`
+	Attribute interface{}    `json:"attribute,omitempty"`
+	Path      string         `json:"path,omitempty"`
+	Target    *jolokiaTarget `json:"target,omitempty"`
+}
+
+type jolokiaTarget struct {
+	URL      string `json:"url"`
+	User     string `json:"user,omitempty"`
+	Password string `json:"password,omitempty"`
+}
+
+// Jolokia JSON response object. Example: {
+//   "request": {
+//     "type": "read"
+//     "mbean": "java.lang:type=Runtime",
+//     "attribute": "Uptime",
+//     "target": {
+//       "url": "service:jmx:rmi:///jndi/rmi://target:9010/jmxrmi"
+//     }
+//   },
+//   "value": 1214083,
+//   "timestamp": 1488059309,
+//   "status": 200
+// }
+type jolokiaResponse struct {
+	Request jolokiaRequest `json:"request"`
+	Value   interface{}    `json:"value"`
+	Status  int            `json:"status"`
+}
+
+func NewClient(url string, config *ClientConfig) (*Client, error) {
+	tlsConfig, err := internal.GetTLSConfig(
+		config.SSLCert, config.SSLKey, config.SSLCA, config.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	transport := &http.Transport{
+		ResponseHeaderTimeout: config.ResponseTimeout,
+		TLSClientConfig:       tlsConfig,
+	}
+
+	client := &http.Client{
+		Transport: transport,
+		Timeout:   config.ResponseTimeout,
+	}
+
+	return &Client{
+		URL:    url,
+		config: config,
+		client: client,
+	}, nil
+}
+
+func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
+	jrequests := makeJolokiaRequests(requests, c.config.ProxyConfig)
+	requestBody, err := json.Marshal(jrequests)
+	if err != nil {
+		return nil, err
+	}
+
+	requestUrl, err := formatReadUrl(c.URL, c.config.Username, c.config.Password)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", requestUrl, bytes.NewBuffer(requestBody))
+	req.Header.Add("Content-type", "application/json")
+
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
+			c.URL, resp.StatusCode, http.StatusText(resp.StatusCode), http.StatusOK, http.StatusText(http.StatusOK))
+	}
+
+	responseBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	var jresponses []jolokiaResponse
+	if err = json.Unmarshal([]byte(responseBody), &jresponses); err != nil {
+		return nil, fmt.Errorf("Error decoding JSON response: %s: %s", err, responseBody)
+	}
+
+	return makeReadResponses(jresponses), nil
+}
+
+func makeJolokiaRequests(rrequests []ReadRequest, proxyConfig *ProxyConfig) []jolokiaRequest {
+	jrequests := make([]jolokiaRequest, 0)
+	if proxyConfig == nil {
+		for _, rr := range rrequests {
+			jrequests = append(jrequests, makeJolokiaRequest(rr, nil))
+		}
+	} else {
+		for _, t := range proxyConfig.Targets {
+			if t.Username == "" {
+				t.Username = proxyConfig.DefaultTargetUsername
+			}
+			if t.Password == "" {
+				t.Password = proxyConfig.DefaultTargetPassword
+			}
+
+			for _, rr := range rrequests {
+				jtarget := &jolokiaTarget{
+					URL:      t.URL,
+					User:     t.Username,
+					Password: t.Password,
+				}
+
+				jrequests = append(jrequests, makeJolokiaRequest(rr, jtarget))
+			}
+		}
+	}
+
+	return jrequests
+}
+
+func makeJolokiaRequest(rrequest ReadRequest, jtarget *jolokiaTarget) jolokiaRequest {
+	jrequest := jolokiaRequest{
+		Type:   "read",
+		Mbean:  rrequest.Mbean,
+		Path:   rrequest.Path,
+		Target: jtarget,
+	}
+
+	if len(rrequest.Attributes) == 1 {
+		jrequest.Attribute = rrequest.Attributes[0]
+	}
+	if len(rrequest.Attributes) > 1 {
+		jrequest.Attribute = rrequest.Attributes
+	}
+
+	return jrequest
+}
+
+func makeReadResponses(jresponses []jolokiaResponse) []ReadResponse {
+	rresponses := make([]ReadResponse, 0)
+
+	for _, jr := range jresponses {
+		rrequest := ReadRequest{
+			Mbean:      jr.Request.Mbean,
+			Path:       jr.Request.Path,
+			Attributes: []string{},
+		}
+
+		attrValue := jr.Request.Attribute
+		if attrValue != nil {
+			attribute, ok := attrValue.(string)
+			if ok {
+				rrequest.Attributes = []string{attribute}
+			} else {
+				attributes, _ := attrValue.([]interface{})
+				rrequest.Attributes = make([]string, len(attributes))
+				for i, attr := range attributes {
+					rrequest.Attributes[i] = attr.(string)
+				}
+			}
+		}
+		rresponse := ReadResponse{
+			Value:             jr.Value,
+			Status:            jr.Status,
+			RequestMbean:      rrequest.Mbean,
+			RequestAttributes: rrequest.Attributes,
+			RequestPath:       rrequest.Path,
+		}
+		if jtarget := jr.Request.Target; jtarget != nil {
+			rresponse.RequestTarget = jtarget.URL
+		}
+
+		rresponses = append(rresponses, rresponse)
+	}
+
+	return rresponses
+}
+
+func formatReadUrl(configUrl, username, password string) (string, error) {
+	parsedUrl, err := url.Parse(configUrl)
+	if err != nil {
+		return "", err
+	}
+
+	readUrl := url.URL{
+		Host:   parsedUrl.Host,
+		Scheme: parsedUrl.Scheme,
+	}
+
+	if username != "" || password != "" {
+		readUrl.User = url.UserPassword(username, password)
+	}
+
+	readUrl.Path = path.Join(parsedUrl.Path, "read")
+	readUrl.Query().Add("ignoreErrors", "true")
+	return readUrl.String(), nil
+}
diff --git a/plugins/inputs/jolokia2/client_test.go b/plugins/inputs/jolokia2/client_test.go
new file mode 100644
index 000000000..0c7cd4c01
--- /dev/null
+++ b/plugins/inputs/jolokia2/client_test.go
@@ -0,0 +1,129 @@
+package jolokia2
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestJolokia2_ClientAuthRequest(t *testing.T) {
+	var username string
+	var password string
+	var requests []map[string]interface{}
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		username, password, _ = r.BasicAuth()
+
+		body, _ := ioutil.ReadAll(r.Body)
+		err := json.Unmarshal(body, &requests)
+		if err != nil {
+			t.Error(err)
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	plugin := setupPlugin(t, fmt.Sprintf(`
+		[jolokia2_agent]
+			urls = ["%s/jolokia"]
+			username = "sally"
+			password = "seashore"
+		[[jolokia2_agent.metric]]
+			name  = "hello"
+			mbean = "hello:foo=bar"
+	`, server.URL))
+
+	var acc testutil.Accumulator
+	plugin.Gather(&acc)
+
+	if username != "sally" {
+		t.Errorf("Expected to post with username %s, but was %s", "sally", username)
+	}
+	if password != "seashore" {
+		t.Errorf("Expected to post with password %s, but was %s", "seashore", password)
+	}
+	if len(requests) == 0 {
+		t.Fatal("Expected to post a request body, but was empty.")
+	}
+
+	request := requests[0]
+	if expect := "hello:foo=bar"; request["mbean"] != expect {
+		t.Errorf("Expected to query mbean %s, but was %s", expect, request["mbean"])
+	}
+}
+
+func TestJolokia2_ClientProxyAuthRequest(t *testing.T) {
+	var requests []map[string]interface{}
+
+	var username string
+	var password string
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		username, password, _ = r.BasicAuth()
+
+		body, _ := ioutil.ReadAll(r.Body)
+		err := json.Unmarshal(body, &requests)
+		if err != nil {
+			t.Error(err)
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	plugin := setupPlugin(t, fmt.Sprintf(`
+		[jolokia2_proxy]
+			url = "%s/jolokia"
+			username = "sally"
+			password = "seashore"
+
+		[[jolokia2_proxy.target]]
+			url = "service:jmx:rmi:///jndi/rmi://target:9010/jmxrmi"
+			username = "jack"
+			password = "benimble"
+
+		[[jolokia2_proxy.metric]]
+			name  = "hello"
+			mbean = "hello:foo=bar"
+	`, server.URL))
+
+	var acc testutil.Accumulator
+	plugin.Gather(&acc)
+
+	if username != "sally" {
+		t.Errorf("Expected to post with username %s, but was %s", "sally", username)
+	}
+	if password != "seashore" {
+		t.Errorf("Expected to post with password %s, but was %s", "seashore", password)
+	}
+	if len(requests) == 0 {
+		t.Fatal("Expected to post a request body, but was empty.")
+	}
+
+	request := requests[0]
+	if expect := "hello:foo=bar"; request["mbean"] != expect {
+		t.Errorf("Expected to query mbean %s, but was %s", expect, request["mbean"])
+	}
+
+	target, ok := request["target"].(map[string]interface{})
+	if !ok {
+		t.Fatal("Expected a proxy target, but was empty.")
+	}
+
+	if expect := "service:jmx:rmi:///jndi/rmi://target:9010/jmxrmi"; target["url"] != expect {
+		t.Errorf("Expected proxy target url %s, but was %s", expect, target["url"])
+	}
+
+	if expect := "jack"; target["user"] != expect {
+		t.Errorf("Expected proxy target username %s, but was %s", expect, target["user"])
+	}
+
+	if expect := "benimble"; target["password"] != expect {
+		t.Errorf("Expected proxy target password %s, but was %s", expect, target["password"])
+	}
+}
diff --git a/plugins/inputs/jolokia2/examples/java.conf b/plugins/inputs/jolokia2/examples/java.conf
new file mode 100644
index 000000000..361bce1d2
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/java.conf
@@ -0,0 +1,40 @@
+
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "java_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "java_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "java_garbage_collector"
+    mbean    = "java.lang:name=G1*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "java_last_garbage_collection"
+    mbean = "java.lang:name=G1 Young Generation,type=GarbageCollector"
+    paths = ["LastGcInfo/duration", "LastGcInfo/GcThreadCount", "LastGcInfo/memoryUsageAfterGc"]
+
+  [[inputs.jolokia2_agent.metrics]]
+    name  = "java_threading"
+    mbean = "java.lang:type=Threading"
+    paths = ["TotalStartedThreadCount", "ThreadCount", "DaemonThreadCount", "PeakThreadCount"]
+
+  [[inputs.jolokia2_agent.metrics]]
+    name  = "java_class_loading"
+    mbean = "java.lang:type=ClassLoading"
+    paths = ["LoadedClassCount", "UnloadedClassCount", "TotalLoadedClassCount"]
+
+  [[inputs.jolokia2_agent.metrics]]
+    name     = "java_memory_pool"
+    mbean    = "java.lang:name=*,type=MemoryPool"
+    paths    = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys = ["name"]
diff --git a/plugins/inputs/jolokia2/examples/kafka.conf b/plugins/inputs/jolokia2/examples/kafka.conf
new file mode 100644
index 000000000..ae34831fc
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/kafka.conf
@@ -0,0 +1,55 @@
+
+[[inputs.jolokia2_agent]]
+  name_prefix = "kafka_"
+
+  urls = ["http://localhost:8080/jolokia"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "controller"
+    mbean        = "kafka.controller:name=*,type=*"
+    field_prefix = "$1."
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "replica_manager"
+    mbean        = "kafka.server:name=*,type=ReplicaManager"
+    field_prefix = "$1."
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "purgatory"
+    mbean        = "kafka.server:delayedOperation=*,name=*,type=DelayedOperationPurgatory"
+    field_prefix = "$1."
+    field_name   = "$2"
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "client"
+    mbean    = "kafka.server:client-id=*,type=*"
+    tag_keys = ["client-id", "type"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "request"
+    mbean        = "kafka.network:name=*,request=*,type=RequestMetrics"
+    field_prefix = "$1."
+    tag_keys     = ["request"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "topics"
+    mbean        = "kafka.server:name=*,type=BrokerTopicMetrics"
+    field_prefix = "$1."
+
+  [[inputs.jolokia2_agent.metric]]
+    name         = "topic"
+    mbean        = "kafka.server:name=*,topic=*,type=BrokerTopicMetrics"
+    field_prefix = "$1."
+    tag_keys     = ["topic"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "partition"
+    mbean      = "kafka.log:name=*,partition=*,topic=*,type=Log"
+    field_name = "$1"
+    tag_keys   = ["topic", "partition"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "partition"
+    mbean      = "kafka.cluster:name=UnderReplicated,partition=*,topic=*,type=Partition"
+    field_name = "UnderReplicatedPartitions"
+    tag_keys   = ["topic", "partition"]
diff --git a/plugins/inputs/jolokia2/gatherer.go b/plugins/inputs/jolokia2/gatherer.go
new file mode 100644
index 000000000..3cc2e1217
--- /dev/null
+++ b/plugins/inputs/jolokia2/gatherer.go
@@ -0,0 +1,277 @@
+package jolokia2
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+)
+
+const defaultFieldName = "value"
+
+type Gatherer struct {
+	metrics  []Metric
+	requests []ReadRequest
+}
+
+func NewGatherer(metrics []Metric) *Gatherer {
+	return &Gatherer{
+		metrics:  metrics,
+		requests: makeReadRequests(metrics),
+	}
+}
+
+// Gather adds points to an accumulator from responses returned
+// by a Jolokia agent.
+func (g *Gatherer) Gather(client *Client, acc telegraf.Accumulator) error {
+	var tags map[string]string
+
+	if client.config.ProxyConfig != nil {
+		tags = map[string]string{"jolokia_proxy_url": client.URL}
+	} else {
+		tags = map[string]string{"jolokia_agent_url": client.URL}
+	}
+
+	requests := makeReadRequests(g.metrics)
+	responses, err := client.read(requests)
+	if err != nil {
+		return err
+	}
+
+	g.gatherResponses(responses, tags, acc)
+	return nil
+}
+
+// gatherReponses adds points to an accumulator from the ReadResponse objects
+// returned by a Jolokia agent.
+func (g *Gatherer) gatherResponses(responses []ReadResponse, tags map[string]string, acc telegraf.Accumulator) {
+	series := make(map[string][]point, 0)
+
+	for _, metric := range g.metrics {
+		points, ok := series[metric.Name]
+		if !ok {
+			points = make([]point, 0)
+		}
+
+		responsePoints, responseErrors := g.generatePoints(metric, responses)
+
+		for _, responsePoint := range responsePoints {
+			points = append(points, responsePoint)
+		}
+
+		for _, err := range responseErrors {
+			acc.AddError(err)
+		}
+
+		series[metric.Name] = points
+	}
+
+	for measurement, points := range series {
+		for _, point := range compactPoints(points) {
+			acc.AddFields(measurement,
+				point.Fields, mergeTags(point.Tags, tags))
+		}
+	}
+}
+
+// generatePoints creates points for the supplied metric from the ReadResponse
+// objects returned by the Jolokia client.
+func (g *Gatherer) generatePoints(metric Metric, responses []ReadResponse) ([]point, []error) {
+	points := make([]point, 0)
+	errors := make([]error, 0)
+
+	for _, response := range responses {
+		switch response.Status {
+		case 200:
+			break
+		case 404:
+			continue
+		default:
+			errors = append(errors, fmt.Errorf("Unexpected status in response from target %s: %d",
+				response.RequestTarget, response.Status))
+			continue
+		}
+
+		if !metricMatchesResponse(metric, response) {
+			continue
+		}
+
+		pb := newPointBuilder(metric, response.RequestAttributes, response.RequestPath)
+		for _, point := range pb.Build(metric.Mbean, response.Value) {
+			if response.RequestTarget != "" {
+				point.Tags["jolokia_agent_url"] = response.RequestTarget
+			}
+
+			points = append(points, point)
+		}
+	}
+
+	return points, errors
+}
+
+// mergeTags combines two tag sets into a single tag set.
+func mergeTags(metricTags, outerTags map[string]string) map[string]string {
+	tags := make(map[string]string)
+	for k, v := range outerTags {
+		tags[k] = v
+	}
+	for k, v := range metricTags {
+		tags[k] = v
+	}
+
+	return tags
+}
+
+// metricMatchesResponse returns true when the name, attributes, and path
+// of a Metric match the corresponding elements in a ReadResponse object
+// returned by a Jolokia agent.
+func metricMatchesResponse(metric Metric, response ReadResponse) bool {
+
+	if metric.Mbean != response.RequestMbean {
+		return false
+	}
+
+	if len(metric.Paths) == 0 {
+		return len(response.RequestAttributes) == 0
+	}
+
+	for _, fullPath := range metric.Paths {
+		segments := strings.SplitN(fullPath, "/", 2)
+		attribute := segments[0]
+
+		var path string
+		if len(segments) == 2 {
+			path = segments[1]
+		}
+
+		for _, rattr := range response.RequestAttributes {
+			if attribute == rattr && path == response.RequestPath {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+// compactPoints attepts to remove points by compacting points
+// with matching tag sets. When a match is found, the fields from
+// one point are moved to another, and the empty point is removed.
+func compactPoints(points []point) []point {
+	compactedPoints := make([]point, 0)
+
+	for _, sourcePoint := range points {
+		keepPoint := true
+
+		for _, compactPoint := range compactedPoints {
+			if !tagSetsMatch(sourcePoint.Tags, compactPoint.Tags) {
+				continue
+			}
+
+			keepPoint = false
+			for key, val := range sourcePoint.Fields {
+				compactPoint.Fields[key] = val
+			}
+		}
+
+		if keepPoint {
+			compactedPoints = append(compactedPoints, sourcePoint)
+		}
+	}
+
+	return compactedPoints
+}
+
+// tagSetsMatch returns true if two maps are equivalent.
+func tagSetsMatch(a, b map[string]string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	for ak, av := range a {
+		bv, ok := b[ak]
+		if !ok {
+			return false
+		}
+		if av != bv {
+			return false
+		}
+	}
+
+	return true
+}
+
+// makeReadRequests creates ReadRequest objects from metrics definitions.
+func makeReadRequests(metrics []Metric) []ReadRequest {
+	var requests []ReadRequest
+	for _, metric := range metrics {
+
+		if len(metric.Paths) == 0 {
+			requests = append(requests, ReadRequest{
+				Mbean:      metric.Mbean,
+				Attributes: []string{},
+			})
+		} else {
+			attributes := make(map[string][]string)
+
+			for _, path := range metric.Paths {
+				segments := strings.Split(path, "/")
+				attribute := segments[0]
+
+				if _, ok := attributes[attribute]; !ok {
+					attributes[attribute] = make([]string, 0)
+				}
+
+				if len(segments) > 1 {
+					paths := attributes[attribute]
+					attributes[attribute] = append(paths, strings.Join(segments[1:], "/"))
+				}
+			}
+
+			rootAttributes := findRequestAttributesWithoutPaths(attributes)
+			if len(rootAttributes) > 0 {
+				requests = append(requests, ReadRequest{
+					Mbean:      metric.Mbean,
+					Attributes: rootAttributes,
+				})
+			}
+
+			for _, deepAttribute := range findRequestAttributesWithPaths(attributes) {
+				for _, path := range attributes[deepAttribute] {
+					requests = append(requests, ReadRequest{
+						Mbean:      metric.Mbean,
+						Attributes: []string{deepAttribute},
+						Path:       path,
+					})
+				}
+			}
+		}
+	}
+
+	return requests
+}
+
+func findRequestAttributesWithoutPaths(attributes map[string][]string) []string {
+	results := make([]string, 0)
+	for attr, paths := range attributes {
+		if len(paths) == 0 {
+			results = append(results, attr)
+		}
+	}
+
+	sort.Strings(results)
+	return results
+}
+
+func findRequestAttributesWithPaths(attributes map[string][]string) []string {
+	results := make([]string, 0)
+	for attr, paths := range attributes {
+		if len(paths) != 0 {
+			results = append(results, attr)
+		}
+	}
+
+	sort.Strings(results)
+	return results
+}
diff --git a/plugins/inputs/jolokia2/gatherer_test.go b/plugins/inputs/jolokia2/gatherer_test.go
new file mode 100644
index 000000000..ca83cf0ac
--- /dev/null
+++ b/plugins/inputs/jolokia2/gatherer_test.go
@@ -0,0 +1,104 @@
+package jolokia2
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestJolokia2_makeReadRequests(t *testing.T) {
+	cases := []struct {
+		metric   Metric
+		expected []ReadRequest
+	}{
+		{
+			metric: Metric{
+				Name:  "object",
+				Mbean: "test:foo=bar",
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{},
+				},
+			},
+		}, {
+			metric: Metric{
+				Name:  "object_with_an_attribute",
+				Mbean: "test:foo=bar",
+				Paths: []string{"biz"},
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"biz"},
+				},
+			},
+		}, {
+			metric: Metric{
+				Name:  "object_with_attributes",
+				Mbean: "test:foo=bar",
+				Paths: []string{"baz", "biz"},
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"baz", "biz"},
+				},
+			},
+		}, {
+			metric: Metric{
+				Name:  "object_with_an_attribute_and_path",
+				Mbean: "test:foo=bar",
+				Paths: []string{"biz/baz"},
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"biz"},
+					Path:       "baz",
+				},
+			},
+		}, {
+			metric: Metric{
+				Name:  "object_with_an_attribute_and_a_deep_path",
+				Mbean: "test:foo=bar",
+				Paths: []string{"biz/baz/fiz/faz"},
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"biz"},
+					Path:       "baz/fiz/faz",
+				},
+			},
+		}, {
+			metric: Metric{
+				Name:  "object_with_attributes_and_paths",
+				Mbean: "test:foo=bar",
+				Paths: []string{"baz/biz", "faz/fiz"},
+			},
+			expected: []ReadRequest{
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"baz"},
+					Path:       "biz",
+				},
+				ReadRequest{
+					Mbean:      "test:foo=bar",
+					Attributes: []string{"faz"},
+					Path:       "fiz",
+				},
+			},
+		},
+	}
+
+	for _, c := range cases {
+		payload := makeReadRequests([]Metric{c.metric})
+
+		assert.Equal(t, len(c.expected), len(payload), "Failing case: "+c.metric.Name)
+		for _, actual := range payload {
+			assert.Contains(t, c.expected, actual, "Failing case: "+c.metric.Name)
+		}
+	}
+}
diff --git a/plugins/inputs/jolokia2/jolokia.go b/plugins/inputs/jolokia2/jolokia.go
new file mode 100644
index 000000000..430f58741
--- /dev/null
+++ b/plugins/inputs/jolokia2/jolokia.go
@@ -0,0 +1,21 @@
+package jolokia2
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+func init() {
+	inputs.Add("jolokia2_agent", func() telegraf.Input {
+		return &JolokiaAgent{
+			Metrics:               []MetricConfig{},
+			DefaultFieldSeparator: ".",
+		}
+	})
+	inputs.Add("jolokia2_proxy", func() telegraf.Input {
+		return &JolokiaProxy{
+			Metrics:               []MetricConfig{},
+			DefaultFieldSeparator: ".",
+		}
+	})
+}
diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
new file mode 100644
index 000000000..ff37fdaf6
--- /dev/null
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -0,0 +1,112 @@
+package jolokia2
+
+import (
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+type JolokiaAgent struct {
+	DefaultFieldPrefix    string
+	DefaultFieldSeparator string
+	DefaultTagPrefix      string
+
+	URLs            []string `toml:"urls"`
+	Username        string
+	Password        string
+	ResponseTimeout time.Duration `toml:"response_timeout"`
+
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool
+
+	Metrics  []MetricConfig `toml:"metric"`
+	gatherer *Gatherer
+}
+
+func (ja *JolokiaAgent) SampleConfig() string {
+	return `
+  # default_tag_prefix      = ""
+  # default_field_prefix    = ""
+  # default_field_separator = "."
+
+  # Add agents URLs to query
+  urls = ["http://localhost:8080/jolokia"]
+  # username = ""
+  # password = ""
+  # response_timeout = "5s"
+
+  ## Optional SSL config
+  # ssl_ca   = "/var/private/ca.pem"
+  # ssl_cert = "/var/private/client.pem"
+  # ssl_key  = "/var/private/client-key.pem"
+  # insecure_skip_verify = false
+
+  ## Add metrics to read
+  [[inputs.jolokia2.metric]]
+    name  = "java_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+`
+}
+
+func (ja *JolokiaAgent) Description() string {
+	return "Read JMX metrics from a Jolokia REST agent endpoint"
+}
+
+func (ja *JolokiaAgent) Gather(acc telegraf.Accumulator) error {
+	if ja.gatherer == nil {
+		ja.gatherer = NewGatherer(ja.createMetrics())
+	}
+
+	var wg sync.WaitGroup
+
+	for _, url := range ja.URLs {
+		client, err := ja.createClient(url)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Unable to create client for %s: %v", url, err))
+			continue
+		}
+
+		wg.Add(1)
+		go func(client *Client) {
+			defer wg.Done()
+
+			err = ja.gatherer.Gather(client, acc)
+			if err != nil {
+				acc.AddError(fmt.Errorf("Unable to gather metrics for %s: %v", client.URL, err))
+			}
+
+		}(client)
+	}
+
+	wg.Wait()
+
+	return nil
+}
+
+func (ja *JolokiaAgent) createMetrics() []Metric {
+	var metrics []Metric
+
+	for _, config := range ja.Metrics {
+		metrics = append(metrics, NewMetric(config,
+			ja.DefaultFieldPrefix, ja.DefaultFieldSeparator, ja.DefaultTagPrefix))
+	}
+
+	return metrics
+}
+
+func (ja *JolokiaAgent) createClient(url string) (*Client, error) {
+	return NewClient(url, &ClientConfig{
+		Username:           ja.Username,
+		Password:           ja.Password,
+		ResponseTimeout:    ja.ResponseTimeout,
+		SSLCA:              ja.SSLCA,
+		SSLCert:            ja.SSLCert,
+		SSLKey:             ja.SSLKey,
+		InsecureSkipVerify: ja.InsecureSkipVerify,
+	})
+}
diff --git a/plugins/inputs/jolokia2/jolokia_proxy.go b/plugins/inputs/jolokia2/jolokia_proxy.go
new file mode 100644
index 000000000..f19a74e84
--- /dev/null
+++ b/plugins/inputs/jolokia2/jolokia_proxy.go
@@ -0,0 +1,129 @@
+package jolokia2
+
+import (
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+type JolokiaProxy struct {
+	DefaultFieldPrefix    string
+	DefaultFieldSeparator string
+	DefaultTagPrefix      string
+
+	URL                   string `toml:"url"`
+	DefaultTargetPassword string
+	DefaultTargetUsername string
+	Targets               []JolokiaProxyTargetConfig `toml:"target"`
+
+	Username           string
+	Password           string
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool
+	ResponseTimeout    time.Duration `toml:"response_timeout"`
+
+	Metrics  []MetricConfig `toml:"metric"`
+	client   *Client
+	gatherer *Gatherer
+}
+
+type JolokiaProxyTargetConfig struct {
+	URL      string `toml:"url"`
+	Username string
+	Password string
+}
+
+func (jp *JolokiaProxy) SampleConfig() string {
+	return `
+  # default_tag_prefix      = ""
+  # default_field_prefix    = ""
+  # default_field_separator = "."
+
+  ## Proxy agent
+  url = "http://localhost:8080/jolokia"
+  # username = ""
+  # password = ""
+  # response_timeout = "5s"
+
+  ## Optional SSL config
+  # ssl_ca   = "/var/private/ca.pem"
+  # ssl_cert = "/var/private/client.pem"
+  # ssl_key  = "/var/private/client-key.pem"
+  # insecure_skip_verify = false
+
+  ## Add proxy targets to query
+  # default_target_username = ""
+  # default_target_password = ""
+  [[inputs.jolokia_proxy.target]]
+    url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
+	# username = ""
+	# password = ""
+
+  ## Add metrics to read
+  [[inputs.jolokia_proxy.metric]]
+    name  = "java_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+`
+}
+
+func (jp *JolokiaProxy) Description() string {
+	return "Read JMX metrics from a Jolokia REST proxy endpoint"
+}
+
+func (jp *JolokiaProxy) Gather(acc telegraf.Accumulator) error {
+	if jp.gatherer == nil {
+		jp.gatherer = NewGatherer(jp.createMetrics())
+	}
+
+	if jp.client == nil {
+		client, err := jp.createClient()
+
+		if err != nil {
+			return err
+		}
+
+		jp.client = client
+	}
+
+	return jp.gatherer.Gather(jp.client, acc)
+}
+
+func (jp *JolokiaProxy) createMetrics() []Metric {
+	var metrics []Metric
+
+	for _, config := range jp.Metrics {
+		metrics = append(metrics, NewMetric(config,
+			jp.DefaultFieldPrefix, jp.DefaultFieldSeparator, jp.DefaultTagPrefix))
+	}
+
+	return metrics
+}
+
+func (jp *JolokiaProxy) createClient() (*Client, error) {
+	proxyConfig := &ProxyConfig{
+		DefaultTargetUsername: jp.DefaultTargetUsername,
+		DefaultTargetPassword: jp.DefaultTargetPassword,
+	}
+
+	for _, target := range jp.Targets {
+		proxyConfig.Targets = append(proxyConfig.Targets, ProxyTargetConfig{
+			URL:      target.URL,
+			Username: target.Username,
+			Password: target.Password,
+		})
+	}
+
+	return NewClient(jp.URL, &ClientConfig{
+		Username:           jp.Username,
+		Password:           jp.Password,
+		ResponseTimeout:    jp.ResponseTimeout,
+		SSLCA:              jp.SSLCA,
+		SSLCert:            jp.SSLCert,
+		SSLKey:             jp.SSLKey,
+		InsecureSkipVerify: jp.InsecureSkipVerify,
+		ProxyConfig:        proxyConfig,
+	})
+}
diff --git a/plugins/inputs/jolokia2/jolokia_test.go b/plugins/inputs/jolokia2/jolokia_test.go
new file mode 100644
index 000000000..dfdc4bef9
--- /dev/null
+++ b/plugins/inputs/jolokia2/jolokia_test.go
@@ -0,0 +1,673 @@
+package jolokia2
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/influxdata/toml"
+	"github.com/influxdata/toml/ast"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestJolokia2_ScalarValues(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name  = "scalar_without_attribute"
+		mbean = "scalar_without_attribute"
+
+	[[jolokia2_agent.metric]]
+		name  = "scalar_with_attribute"
+		mbean = "scalar_with_attribute"
+		paths = ["biz"]
+
+	[[jolokia2_agent.metric]]
+		name  = "scalar_with_attribute_and_path"
+		mbean = "scalar_with_attribute_and_path"
+		paths = ["biz/baz"]
+
+	# This should return multiple series with different test tags.
+	[[jolokia2_agent.metric]]
+		name     = "scalar_with_key_pattern"
+		mbean    = "scalar_with_key_pattern:test=*"
+		tag_keys = ["test"]`
+
+	response := `[{
+		"request": {
+			"mbean": "scalar_without_attribute",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	  }, {
+		"request": {
+			"mbean": "scalar_with_attribute",
+			"attribute": "biz",
+			"type": "read"
+		},
+		"value": 456,
+		"status": 200
+	  }, {
+		"request": {
+			"mbean": "scalar_with_attribute_and_path",
+			"attribute": "biz",
+			"path": "baz",
+			"type": "read"
+		},
+		"value": 789,
+		"status": 200
+	  }, {
+		"request": {
+			"mbean": "scalar_with_key_pattern:test=*",
+			"type": "read"
+		},
+		"value": {
+			"scalar_with_key_pattern:test=foo": 123,
+			"scalar_with_key_pattern:test=bar": 456
+		},
+		"status": 200
+	  }]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "scalar_without_attribute", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "scalar_with_attribute", map[string]interface{}{
+		"biz": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "scalar_with_attribute_and_path", map[string]interface{}{
+		"biz.baz": 789.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "scalar_with_key_pattern", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+		"test":              "foo",
+	})
+	acc.AssertContainsTaggedFields(t, "scalar_with_key_pattern", map[string]interface{}{
+		"value": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+		"test":              "bar",
+	})
+}
+
+func TestJolokia2_ObjectValues(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name     = "object_without_attribute"
+		mbean    = "object_without_attribute"
+		tag_keys = ["foo"]
+
+	[[jolokia2_agent.metric]]
+		name  = "object_with_attribute"
+		mbean = "object_with_attribute"
+		paths = ["biz"]
+
+	[[jolokia2_agent.metric]]
+		name  = "object_with_attribute_and_path"
+		mbean = "object_with_attribute_and_path"
+		paths = ["biz/baz"]
+
+	# This will generate two separate request objects.
+	[[jolokia2_agent.metric]]
+		name  = "object_with_branching_paths"
+		mbean = "object_with_branching_paths"
+		paths = ["foo/fiz", "foo/faz"]
+
+	# This should return multiple series with different test tags.
+	[[jolokia2_agent.metric]]
+		name     = "object_with_key_pattern"
+		mbean    = "object_with_key_pattern:test=*"
+		tag_keys = ["test"]`
+
+	response := `[{
+		"request": {
+			"mbean": "object_without_attribute",
+			"type": "read"
+		},
+		"value": {
+			"biz": 123,
+			"baz": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_with_attribute",
+			"attribute": "biz",
+			"type": "read"
+		},
+		"value": {
+			"fiz": 123,
+			"faz": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_with_branching_paths",
+			"attribute": "foo",
+			"path": "fiz",
+			"type": "read"
+		},
+		"value": {
+			"bing": 123
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_with_branching_paths",
+			"attribute": "foo",
+			"path": "faz",
+			"type": "read"
+		},
+		"value": {
+			"bang": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_with_attribute_and_path",
+			"attribute": "biz",
+			"path": "baz",
+			"type": "read"
+		},
+		"value": {
+			"bing": 123,
+			"bang": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_with_key_pattern:test=*",
+			"type": "read"
+		},
+		"value": {
+			"object_with_key_pattern:test=foo": {
+				"fiz": 123
+			},
+			"object_with_key_pattern:test=bar": {
+				"biz": 456
+			}
+		},
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "object_without_attribute", map[string]interface{}{
+		"biz": 123.0,
+		"baz": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "object_with_attribute", map[string]interface{}{
+		"biz.fiz": 123.0,
+		"biz.faz": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "object_with_attribute_and_path", map[string]interface{}{
+		"biz.baz.bing": 123.0,
+		"biz.baz.bang": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "object_with_branching_paths", map[string]interface{}{
+		"foo.fiz.bing": 123.0,
+		"foo.faz.bang": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "object_with_key_pattern", map[string]interface{}{
+		"fiz": 123.0,
+	}, map[string]string{
+		"test":              "foo",
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "object_with_key_pattern", map[string]interface{}{
+		"biz": 456.0,
+	}, map[string]string{
+		"test":              "bar",
+		"jolokia_agent_url": server.URL,
+	})
+}
+
+func TestJolokia2_StatusCodes(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name     = "ok"
+		mbean    = "ok"
+
+	[[jolokia2_agent.metric]]
+		name       = "not_found"
+		mbean      = "not_found"
+
+	[[jolokia2_agent.metric]]
+		name       = "unknown"
+		mbean      = "unknown"`
+
+	response := `[{
+		"request": {
+			"mbean": "ok",
+			"type": "read"
+		},
+		"value": 1,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "not_found",
+			"type": "read"
+		},
+		"status": 404
+	}, {
+		"request": {
+			"mbean": "unknown",
+			"type": "read"
+		},
+		"status": 500
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "ok", map[string]interface{}{
+		"value": 1.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertDoesNotContainMeasurement(t, "not_found")
+	acc.AssertDoesNotContainMeasurement(t, "unknown")
+}
+
+func TestJolokia2_TagRenaming(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		default_tag_prefix = "DEFAULT_PREFIX_"
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name     = "default_tag_prefix"
+		mbean    = "default_tag_prefix:biz=baz,fiz=faz"
+		tag_keys = ["biz", "fiz"]
+
+	[[jolokia2_agent.metric]]
+		name       = "custom_tag_prefix"
+		mbean      = "custom_tag_prefix:biz=baz,fiz=faz"
+		tag_keys   = ["biz", "fiz"]
+		tag_prefix = "CUSTOM_PREFIX_"`
+
+	response := `[{
+		"request": {
+			"mbean": "default_tag_prefix:biz=baz,fiz=faz",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "custom_tag_prefix:biz=baz,fiz=faz",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "default_tag_prefix", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"DEFAULT_PREFIX_biz": "baz",
+		"DEFAULT_PREFIX_fiz": "faz",
+		"jolokia_agent_url":  server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "custom_tag_prefix", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"CUSTOM_PREFIX_biz": "baz",
+		"CUSTOM_PREFIX_fiz": "faz",
+		"jolokia_agent_url": server.URL,
+	})
+}
+
+func TestJolokia2_FieldRenaming(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		default_field_prefix    = "DEFAULT_PREFIX_"
+		default_field_separator = "_DEFAULT_SEPARATOR_"
+
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name  = "default_field_modifiers"
+		mbean = "default_field_modifiers"
+
+	[[jolokia2_agent.metric]]
+		name            = "custom_field_modifiers"
+		mbean           = "custom_field_modifiers"
+		field_prefix    = "CUSTOM_PREFIX_"
+		field_separator = "_CUSTOM_SEPARATOR_"
+
+	[[jolokia2_agent.metric]]
+		name            = "field_prefix_substitution"
+		mbean           = "field_prefix_substitution:foo=*"
+		field_prefix    = "$1_"
+
+	[[jolokia2_agent.metric]]
+		name         = "field_name_substitution"
+		mbean        = "field_name_substitution:foo=*"
+		field_prefix = ""
+		field_name   = "$1"`
+
+	response := `[{
+		"request": {
+			"mbean": "default_field_modifiers",
+			"type": "read"
+		},
+		"value": {
+			"hello": { "world": 123 }
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "custom_field_modifiers",
+			"type": "read"
+		},
+		"value": {
+			"hello": { "world": 123 }
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "field_prefix_substitution:foo=*",
+			"type": "read"
+		},
+		"value": {
+			"field_prefix_substitution:foo=biz": 123,
+			"field_prefix_substitution:foo=baz": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "field_name_substitution:foo=*",
+			"type": "read"
+		},
+		"value": {
+			"field_name_substitution:foo=biz": 123,
+			"field_name_substitution:foo=baz": 456
+		},
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "default_field_modifiers", map[string]interface{}{
+		"DEFAULT_PREFIX_hello_DEFAULT_SEPARATOR_world": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "custom_field_modifiers", map[string]interface{}{
+		"CUSTOM_PREFIX_hello_CUSTOM_SEPARATOR_world": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "field_prefix_substitution", map[string]interface{}{
+		"biz_value": 123.0,
+		"baz_value": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "field_name_substitution", map[string]interface{}{
+		"biz": 123.0,
+		"baz": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+}
+
+func TestJolokia2_MetricCompaction(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name     = "compact_metric"
+		mbean    = "scalar_value:flavor=chocolate"
+		tag_keys = ["flavor"]
+
+	[[jolokia2_agent.metric]]
+		name     = "compact_metric"
+		mbean    = "scalar_value:flavor=vanilla"
+		tag_keys = ["flavor"]
+
+	[[jolokia2_agent.metric]]
+		name     = "compact_metric"
+		mbean    = "object_value1:flavor=chocolate"
+		tag_keys = ["flavor"]
+
+	[[jolokia2_agent.metric]]
+		name     = "compact_metric"
+		mbean    = "object_value2:flavor=chocolate"
+		tag_keys = ["flavor"]`
+
+	response := `[{
+		"request": {
+			"mbean": "scalar_value:flavor=chocolate",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "scalar_value:flavor=vanilla",
+			"type": "read"
+		},
+		"value": 999,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_value1:flavor=chocolate",
+			"type": "read"
+		},
+		"value": {
+			"foo": 456
+		},
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "object_value2:flavor=chocolate",
+			"type": "read"
+		},
+		"value": {
+			"bar": 789
+		},
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "compact_metric", map[string]interface{}{
+		"value": 123.0,
+		"foo":   456.0,
+		"bar":   789.0,
+	}, map[string]string{
+		"flavor":            "chocolate",
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "compact_metric", map[string]interface{}{
+		"value": 999.0,
+	}, map[string]string{
+		"flavor":            "vanilla",
+		"jolokia_agent_url": server.URL,
+	})
+}
+
+func TestJolokia2_ProxyTargets(t *testing.T) {
+	config := `
+	[jolokia2_proxy]
+		url = "%s"
+
+	[[jolokia2_proxy.target]]
+		url = "service:jmx:rmi:///jndi/rmi://target1:9010/jmxrmi"
+
+	[[jolokia2_proxy.target]]
+		url = "service:jmx:rmi:///jndi/rmi://target2:9010/jmxrmi"
+
+	[[jolokia2_proxy.metric]]
+		name  = "hello"
+		mbean = "hello:foo=bar"`
+
+	response := `[{
+		"request": {
+			"type": "read",
+			"mbean": "hello:foo=bar",
+			"target": {
+				"url": "service:jmx:rmi:///jndi/rmi://target1:9010/jmxrmi"
+			}
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"type": "read",
+			"mbean": "hello:foo=bar",
+			"target": {
+				"url": "service:jmx:rmi:///jndi/rmi://target2:9010/jmxrmi"
+			}
+		},
+		"value": 456,
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "hello", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"jolokia_proxy_url": server.URL,
+		"jolokia_agent_url": "service:jmx:rmi:///jndi/rmi://target1:9010/jmxrmi",
+	})
+	acc.AssertContainsTaggedFields(t, "hello", map[string]interface{}{
+		"value": 456.0,
+	}, map[string]string{
+		"jolokia_proxy_url": server.URL,
+		"jolokia_agent_url": "service:jmx:rmi:///jndi/rmi://target2:9010/jmxrmi",
+	})
+}
+
+func setupServer(status int, resp string) *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		//body, err := ioutil.ReadAll(r.Body)
+		//if err == nil {
+		//	fmt.Println(string(body))
+		//}
+
+		fmt.Fprintln(w, resp)
+	}))
+}
+
+func setupPlugin(t *testing.T, conf string) telegraf.Input {
+	table, err := toml.Parse([]byte(conf))
+	if err != nil {
+		t.Fatalf("Unable to parse config! %v", err)
+	}
+
+	for name, _ := range table.Fields {
+		object := table.Fields[name]
+		switch name {
+		case "jolokia2_agent":
+			plugin := JolokiaAgent{
+				Metrics:               []MetricConfig{},
+				DefaultFieldSeparator: ".",
+			}
+
+			if err := toml.UnmarshalTable(object.(*ast.Table), &plugin); err != nil {
+				t.Fatalf("Unable to parse jolokia_agent plugin config! %v", err)
+			}
+
+			return &plugin
+
+		case "jolokia2_proxy":
+			plugin := JolokiaProxy{
+				Metrics:               []MetricConfig{},
+				DefaultFieldSeparator: ".",
+			}
+
+			if err := toml.UnmarshalTable(object.(*ast.Table), &plugin); err != nil {
+				t.Fatalf("Unable to parse jolokia_proxy plugin config! %v", err)
+			}
+
+			return &plugin
+		}
+	}
+
+	return nil
+}
diff --git a/plugins/inputs/jolokia2/metric.go b/plugins/inputs/jolokia2/metric.go
new file mode 100644
index 000000000..03baea124
--- /dev/null
+++ b/plugins/inputs/jolokia2/metric.go
@@ -0,0 +1,61 @@
+package jolokia2
+
+// A MetricConfig represents a TOML form of
+// a Metric with some optional fields.
+type MetricConfig struct {
+	Name           string
+	Mbean          string
+	Paths          []string
+	FieldName      *string
+	FieldPrefix    *string
+	FieldSeparator *string
+	TagPrefix      *string
+	TagKeys        []string
+}
+
+// A Metric represents a specification for a
+// Jolokia read request, and the transformations
+// to apply to points generated from the responses.
+type Metric struct {
+	Name           string
+	Mbean          string
+	Paths          []string
+	FieldName      string
+	FieldPrefix    string
+	FieldSeparator string
+	TagPrefix      string
+	TagKeys        []string
+}
+
+func NewMetric(config MetricConfig, defaultFieldPrefix, defaultFieldSeparator, defaultTagPrefix string) Metric {
+	metric := Metric{
+		Name:    config.Name,
+		Mbean:   config.Mbean,
+		Paths:   config.Paths,
+		TagKeys: config.TagKeys,
+	}
+
+	if config.FieldName != nil {
+		metric.FieldName = *config.FieldName
+	}
+
+	if config.FieldPrefix == nil {
+		metric.FieldPrefix = defaultFieldPrefix
+	} else {
+		metric.FieldPrefix = *config.FieldPrefix
+	}
+
+	if config.FieldSeparator == nil {
+		metric.FieldSeparator = defaultFieldSeparator
+	} else {
+		metric.FieldSeparator = *config.FieldSeparator
+	}
+
+	if config.TagPrefix == nil {
+		metric.TagPrefix = defaultTagPrefix
+	} else {
+		metric.TagPrefix = *config.TagPrefix
+	}
+
+	return metric
+}
diff --git a/plugins/inputs/jolokia2/point_builder.go b/plugins/inputs/jolokia2/point_builder.go
new file mode 100644
index 000000000..02877ea70
--- /dev/null
+++ b/plugins/inputs/jolokia2/point_builder.go
@@ -0,0 +1,271 @@
+package jolokia2
+
+import (
+	"fmt"
+	"strings"
+)
+
+type point struct {
+	Tags   map[string]string
+	Fields map[string]interface{}
+}
+
+type pointBuilder struct {
+	metric           Metric
+	objectAttributes []string
+	objectPath       string
+	substitutions    []string
+}
+
+func newPointBuilder(metric Metric, attributes []string, path string) *pointBuilder {
+	return &pointBuilder{
+		metric:           metric,
+		objectAttributes: attributes,
+		objectPath:       path,
+		substitutions:    makeSubstitutionList(metric.Mbean),
+	}
+}
+
+// Build generates a point for a given mbean name/pattern and value object.
+func (pb *pointBuilder) Build(mbean string, value interface{}) []point {
+	hasPattern := strings.Contains(mbean, "*")
+	if !hasPattern {
+		value = map[string]interface{}{mbean: value}
+	}
+
+	valueMap, ok := value.(map[string]interface{})
+	if !ok { // FIXME: log it and move on.
+		panic(fmt.Sprintf("There should be a map here for %s!\n", mbean))
+	}
+
+	points := make([]point, 0)
+	for mbean, value := range valueMap {
+
+		points = append(points, point{
+			Tags:   pb.extractTags(mbean),
+			Fields: pb.extractFields(mbean, value),
+		})
+	}
+
+	return compactPoints(points)
+}
+
+// extractTags generates the map of tags for a given mbean name/pattern.
+func (pb *pointBuilder) extractTags(mbean string) map[string]string {
+	propertyMap := makePropertyMap(mbean)
+	tagMap := make(map[string]string)
+
+	for key, value := range propertyMap {
+		if pb.includeTag(key) {
+			tagName := pb.formatTagName(key)
+			tagMap[tagName] = value
+		}
+	}
+
+	return tagMap
+}
+
+func (pb *pointBuilder) includeTag(tagName string) bool {
+	for _, t := range pb.metric.TagKeys {
+		if tagName == t {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (pb *pointBuilder) formatTagName(tagName string) string {
+	if tagName == "" {
+		return ""
+	}
+
+	if tagPrefix := pb.metric.TagPrefix; tagPrefix != "" {
+		return tagPrefix + tagName
+	}
+
+	return tagName
+}
+
+// extractFields generates the map of fields for a given mbean name
+// and value object.
+func (pb *pointBuilder) extractFields(mbean string, value interface{}) map[string]interface{} {
+	fieldMap := make(map[string]interface{})
+	valueMap, ok := value.(map[string]interface{})
+
+	if ok {
+		// complex value
+		if len(pb.objectAttributes) == 0 {
+			// if there were no attributes requested,
+			// then the keys are attributes
+			pb.fillFields("", valueMap, fieldMap)
+
+		} else if len(pb.objectAttributes) == 1 {
+			// if there was a single attribute requested,
+			// then the keys are the attribute's properties
+			fieldName := pb.formatFieldName(pb.objectAttributes[0], pb.objectPath)
+			pb.fillFields(fieldName, valueMap, fieldMap)
+
+		} else {
+			// if there were multiple attributes requested,
+			// then the keys are the attribute names
+			for _, attribute := range pb.objectAttributes {
+				fieldName := pb.formatFieldName(attribute, pb.objectPath)
+				pb.fillFields(fieldName, valueMap[attribute], fieldMap)
+			}
+		}
+	} else {
+		// scalar value
+		var fieldName string
+		if len(pb.objectAttributes) == 0 {
+			fieldName = pb.formatFieldName(defaultFieldName, pb.objectPath)
+		} else {
+			fieldName = pb.formatFieldName(pb.objectAttributes[0], pb.objectPath)
+		}
+
+		pb.fillFields(fieldName, value, fieldMap)
+	}
+
+	if len(pb.substitutions) > 1 {
+		pb.applySubstitutions(mbean, fieldMap)
+	}
+
+	return fieldMap
+}
+
+// formatFieldName generates a field name from the supplied attribute and
+// path. The return value has the configured FieldPrefix and FieldSuffix
+// instructions applied.
+func (pb *pointBuilder) formatFieldName(attribute, path string) string {
+	fieldName := attribute
+	fieldPrefix := pb.metric.FieldPrefix
+	fieldSeparator := pb.metric.FieldSeparator
+
+	if fieldPrefix != "" {
+		fieldName = fieldPrefix + fieldName
+	}
+
+	if path != "" {
+		fieldName = fieldName + fieldSeparator + strings.Replace(path, "/", fieldSeparator, -1)
+	}
+
+	return fieldName
+}
+
+// fillFields recurses into the supplied value object, generating a named field
+// for every value it discovers.
+func (pb *pointBuilder) fillFields(name string, value interface{}, fieldMap map[string]interface{}) {
+	if valueMap, ok := value.(map[string]interface{}); ok {
+		// keep going until we get to something that is not a map
+		for key, innerValue := range valueMap {
+			var innerName string
+
+			if name == "" {
+				innerName = pb.metric.FieldPrefix + key
+			} else {
+				innerName = name + pb.metric.FieldSeparator + key
+			}
+
+			pb.fillFields(innerName, innerValue, fieldMap)
+		}
+
+		return
+	}
+
+	if pb.metric.FieldName != "" {
+		name = pb.metric.FieldName
+		if prefix := pb.metric.FieldPrefix; prefix != "" {
+			name = prefix + name
+		}
+	}
+
+	if name == "" {
+		name = defaultFieldName
+	}
+
+	fieldMap[name] = value
+}
+
+// applySubstitutions updates all the keys in the supplied map
+// of fields to account for $1-style substitution instructions.
+func (pb *pointBuilder) applySubstitutions(mbean string, fieldMap map[string]interface{}) {
+	properties := makePropertyMap(mbean)
+
+	for i, subKey := range pb.substitutions[1:] {
+
+		symbol := fmt.Sprintf("$%d", i+1)
+		substitution := properties[subKey]
+
+		for fieldName, fieldValue := range fieldMap {
+			newFieldName := strings.Replace(fieldName, symbol, substitution, -1)
+			if fieldName != newFieldName {
+				fieldMap[newFieldName] = fieldValue
+				delete(fieldMap, fieldName)
+			}
+		}
+	}
+}
+
+// makePropertyMap returns a the mbean property-key list as
+// a dictionary. foo:x=y becomes map[string]string { "x": "y" }
+func makePropertyMap(mbean string) map[string]string {
+	props := make(map[string]string)
+	object := strings.SplitN(mbean, ":", 2)
+	domain := object[0]
+
+	if domain != "" && len(object) == 2 {
+		list := object[1]
+
+		for _, keyProperty := range strings.Split(list, ",") {
+			pair := strings.SplitN(keyProperty, "=", 2)
+
+			if len(pair) != 2 {
+				continue
+			}
+
+			if key := pair[0]; key != "" {
+				props[key] = pair[1]
+			}
+		}
+	}
+
+	return props
+}
+
+// makeSubstitutionList returns an array of values to
+// use as substitutions when renaming fields
+// with the $1..$N syntax. The first item in the list
+// is always the mbean domain.
+func makeSubstitutionList(mbean string) []string {
+	subs := make([]string, 0)
+
+	object := strings.SplitN(mbean, ":", 2)
+	domain := object[0]
+
+	if domain != "" && len(object) == 2 {
+		subs = append(subs, domain)
+		list := object[1]
+
+		for _, keyProperty := range strings.Split(list, ",") {
+			pair := strings.SplitN(keyProperty, "=", 2)
+
+			if len(pair) != 2 {
+				continue
+			}
+
+			key := pair[0]
+			if key == "" {
+				continue
+			}
+
+			property := pair[1]
+			if !strings.Contains(property, "*") {
+				continue
+			}
+
+			subs = append(subs, key)
+		}
+	}
+
+	return subs
+}

From b8a0b8461a9c5f060bd9365d5cb70964eaed29fb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 26 Sep 2017 17:42:38 -0700
Subject: [PATCH 0589/1302] Update changelog and readme for jolokia2 plugin

---
 CHANGELOG.md | 6 ++++++
 README.md    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cfdfca7e..48eea3a96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### New Plugins
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+- [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 
 ### Release Notes
 
@@ -10,6 +11,10 @@
   `partition` subtable.  This allows for more flexible methods to set the
   partition key such as by metric name or by tag.
 
+- With the release of the new improved `jolokia2` input, the legacy `jolokia`
+  plugin is deprecated and will be removed in a future release.  Users of this
+  plugin are encouraged to update to the new `jolokia2` plugin.
+
 ### Features
 
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
@@ -26,6 +31,7 @@
 - [#3245](https://github.com/influxdata/telegraf/pull/3245): Add configurable metrics endpoint to prometheus output.
 - [#3214](https://github.com/influxdata/telegraf/pull/3214): Add new nginx_plus input plugin.
 - [#3215](https://github.com/influxdata/telegraf/pull/3215): Add support for NSQLookupd to nsq_consumer.
+- [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 76ccf7977..49c0446f6 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,8 @@ configuration options.
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
-* [jolokia](./plugins/inputs/jolokia)
+* [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
+* [jolokia2](./plugins/inputs/jolokia2)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)

From 9bddd50a6421f5715d645e87428aebcacf933f30 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 27 Sep 2017 10:52:10 -0700
Subject: [PATCH 0590/1302] Add deprecation notice to jolokia plugin

---
 plugins/inputs/jolokia/README.md  | 2 ++
 plugins/inputs/jolokia/jolokia.go | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/plugins/inputs/jolokia/README.md b/plugins/inputs/jolokia/README.md
index 9d33c8a2b..2622d83bc 100644
--- a/plugins/inputs/jolokia/README.md
+++ b/plugins/inputs/jolokia/README.md
@@ -1,5 +1,7 @@
 # Telegraf plugin: Jolokia
 
+**Deprecated in version 1.5:** Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin.
+
 #### Configuration
 
 ```toml
diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index 0a9122b87..a538d8191 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
 	"time"
@@ -254,6 +255,10 @@ func (j *Jolokia) extractValues(measurement string, value interface{}, fields ma
 func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 
 	if j.jClient == nil {
+		log.Println("W! DEPRECATED: the jolokia plugin has been deprecated " +
+			"in favor of the jolokia2 plugin " +
+			"(https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2)")
+
 		tr := &http.Transport{ResponseHeaderTimeout: j.ResponseHeaderTimeout.Duration}
 		j.jClient = &JolokiaClientImpl{&http.Client{
 			Transport: tr,

From f85db907802d93997a7a4cb12c342ee6f1b6b556 Mon Sep 17 00:00:00 2001
From: owlet123 <lenocka369@gmail.com>
Date: Wed, 27 Sep 2017 20:29:40 +0200
Subject: [PATCH 0591/1302] Add configurable separator for metrics and fields
 in opentsdb output (#3106)

---
 plugins/outputs/opentsdb/opentsdb.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index b7523c7d8..2e8cb746d 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -33,6 +33,8 @@ type OpenTSDB struct {
 	HttpBatchSize int
 
 	Debug bool
+
+	Separator string
 }
 
 var sampleConfig = `
@@ -53,6 +55,9 @@ var sampleConfig = `
 
   ## Debug true - Prints OpenTSDB communication
   debug = false
+
+  ## Separator separates measurements
+  separator = "."
 `
 
 func ToLineFormat(tags map[string]string) string {
@@ -133,7 +138,8 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 			}
 
 			metric := &HttpMetric{
-				Metric:    sanitize(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
+				Metric: sanitize(fmt.Sprintf("%s%s%s%s",
+					o.Prefix, m.Name(), o.Separator, fieldName)),
 				Tags:      tags,
 				Timestamp: now,
 				Value:     value,
@@ -183,7 +189,7 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 			}
 
 			messageLine := fmt.Sprintf("put %s %v %s %s\n",
-				sanitize(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
+				sanitize(fmt.Sprintf("%s%s%s%s", o.Prefix, m.Name(), o.Separator, fieldName)),
 				now, metricValue, tags)
 
 			_, err := connection.Write([]byte(messageLine))

From 402460f038d3d6896ef92bbd636e7d02b8fb4907 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 27 Sep 2017 11:36:41 -0700
Subject: [PATCH 0592/1302] Use underscore as default opentsdb seperator

Preserves backwards compatibility
---
 plugins/outputs/opentsdb/opentsdb.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 2e8cb746d..51d20117b 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -22,6 +22,7 @@ var (
 		`%`, "-",
 		"#", "-",
 		"$", "-")
+	defaultSeperator = "_"
 )
 
 type OpenTSDB struct {
@@ -56,8 +57,8 @@ var sampleConfig = `
   ## Debug true - Prints OpenTSDB communication
   debug = false
 
-  ## Separator separates measurements
-  separator = "."
+  ## Separator separates measurement name from field
+  separator = "_"
 `
 
 func ToLineFormat(tags map[string]string) string {
@@ -258,6 +259,8 @@ func sanitize(value string) string {
 
 func init() {
 	outputs.Add("opentsdb", func() telegraf.Output {
-		return &OpenTSDB{}
+		return &OpenTSDB{
+			Separator: defaultSeperator,
+		}
 	})
 }

From cd1791494ae82c6c77255795a6bbf3e6d9d3802f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 27 Sep 2017 11:38:43 -0700
Subject: [PATCH 0593/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eea3a96..140a85ee2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - [#3214](https://github.com/influxdata/telegraf/pull/3214): Add new nginx_plus input plugin.
 - [#3215](https://github.com/influxdata/telegraf/pull/3215): Add support for NSQLookupd to nsq_consumer.
 - [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin.
+- [#3106](https://github.com/influxdata/telegraf/pull/3106): Add configurable separator for metrics and fields in opentsdb output.
 
 ### Bugfixes
 

From c3b11f9cfbfb6f2141cff9c6a4bae9fe50eab43d Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 29 Sep 2017 12:45:06 -0400
Subject: [PATCH 0594/1302] New Particle.io Plugin for Telegraf

Only the tests need to be fixed.
---
 plugins/inputs/webhooks/particle/README.md    |   27 +
 .../webhooks/particle/particle_webhooks.go    |   46 +
 .../particle/particle_webhooks_events.go      |   21 +
 .../particle_webhooks_events_json_test.go     |   38 +
 .../particle/particle_webhooks_test.go        |   48 +
 plugins/inputs/webhooks/webhooks.go           |    5 +
 telegraf.config                               | 2352 +++++++++++++++++
 7 files changed, 2537 insertions(+)
 create mode 100644 plugins/inputs/webhooks/particle/README.md
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go
 create mode 100644 telegraf.config

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
new file mode 100644
index 000000000..43b7e6968
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -0,0 +1,27 @@
+# particle webhooks
+
+You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
+
+## Events
+
+Your Particle device should publish an event that contains a JSON in the form of:
+```
+String data = String::format("{ \"tags\" : {
+	    \"tag_name\": \"tag_value\", 
+	    \"other_tag\": \"other_value\"
+    }, 
+	\"values\": {
+	    \"value_name\": %f, 
+		\"other_value\": %f, 
+    }
+    }",  value_value, other_value
+	);
+    Particle.publish("event_name", data, PRIVATE);
+```
+Escaping the "" is required in the source file.
+The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
+
+You will need to enable JSON messages in the Webhooks setup of Particle.io
+
+See [webhook doc](https://docs.particle.io/reference/webhooks/)
+
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
new file mode 100644
index 000000000..b4a2470a5
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -0,0 +1,46 @@
+package particle
+
+import (
+	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"io/ioutil"
+	"log"
+	"net/http"
+)
+
+type ParticleWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
+	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
+	rb.acc = acc
+}
+
+func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	dummy := &DummyData{}
+	if err := json.Unmarshal(data, dummy); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pd := &ParticleData{}
+	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pTime, err := dummy.Time()
+	if err != nil {
+		log.Printf("Time Conversion Error")
+	}
+	rb.acc.AddFields("particle_webhooks", pd.Fields, pd.Tags, pTime)
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
new file mode 100644
index 000000000..93055285c
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
@@ -0,0 +1,21 @@
+package particle
+
+import (
+	"time"
+)
+
+type DummyData struct {
+	Event       string `json:"event"`
+	Data        string `json:"data"`
+	Ttl         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+}
+type ParticleData struct {
+	Event  string                 `json:"event"`
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func (d *DummyData) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
new file mode 100644
index 000000000..fbb84ac55
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
@@ -0,0 +1,38 @@
+package particle
+
+func NewItemJSON() string {
+	return `
+	{ 
+	  "event": "temperature",
+	  "data": "{ 
+		  "tags": {
+			  "id": "230035001147343438323536", 
+			  "location\": \"TravelingWilbury"
+		  }, 
+		  "values": {
+			  "temp_c": 26.680000, 
+			  "temp_f": 80.024001, 
+			  "humidity": 44.937500, 
+			  "pressure": 998.998901, 
+			  "altitude": 119.331436, 
+			  "broadband": 1266, 
+			  "infrared": 528, 
+			  "lux": 0
+		  }
+	  }",
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor"
+  }`
+}
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
new file mode 100644
index 000000000..9b016aaf8
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -0,0 +1,48 @@
+package particle
+
+import (
+	"github.com/influxdata/telegraf/testutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	log.Printf("eventBody: %s\n", eventBody)
+	w := httptest.NewRecorder()
+	w.Code = 500
+
+	rb.eventHandler(w, req)
+
+	return w
+}
+
+func TestNewItem(t *testing.T) {
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, NewItemJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"temp_c": 26.680000,
+	}
+
+	tags := map[string]string{
+		"id":       "230035001147343438323536",
+		"location": "TravelingWilbury",
+	}
+
+	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
+}
+func TestUnknowItem(t *testing.T) {
+	rb := &ParticleWebhook{Path: "/particle"}
+	resp := postWebhooks(rb, UnknowJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 698cde159..4420c5ab9 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,6 +35,7 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
+	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -62,6 +64,9 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
+    
+  [inputs.webhooks.particle]
+      path = "/particle"
  `
 }
 
diff --git a/telegraf.config b/telegraf.config
new file mode 100644
index 000000000..669b6de21
--- /dev/null
+++ b/telegraf.config
@@ -0,0 +1,2352 @@
+# Telegraf Configuration
+#
+# Telegraf is entirely plugin driven. All metrics are gathered from the
+# declared inputs, and sent to the declared outputs.
+#
+# Plugins must be declared in here to be active.
+# To deactivate a plugin, comment out the name and any variables.
+#
+# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
+# file would generate.
+#
+# Environment variables can be used anywhere in this config file, simply prepend
+# them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
+# for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
+
+
+# Global tags can be specified here in key="value" format.
+[global_tags]
+  # dc = "us-east-1" # will tag all metrics with dc=us-east-1
+  # rack = "1a"
+  ## Environment variables can be used as tags, and throughout the config file
+  # user = "$USER"
+
+
+# Configuration for telegraf agent
+[agent]
+  ## Default data collection interval for all inputs
+  interval = "10s"
+  ## Rounds collection interval to 'interval'
+  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
+  round_interval = true
+
+  ## Telegraf will send metrics to outputs in batches of at most
+  ## metric_batch_size metrics.
+  ## This controls the size of writes that Telegraf sends to output plugins.
+  metric_batch_size = 1000
+
+  ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
+  ## output, and will flush this buffer on a successful write. Oldest metrics
+  ## are dropped first when this buffer fills.
+  ## This buffer only fills when writes fail to output plugin(s).
+  metric_buffer_limit = 10000
+
+  ## Collection jitter is used to jitter the collection by a random amount.
+  ## Each plugin will sleep for a random time within jitter before collecting.
+  ## This can be used to avoid many plugins querying things like sysfs at the
+  ## same time, which can have a measurable effect on the system.
+  collection_jitter = "0s"
+
+  ## Default flushing interval for all outputs. You shouldn't set this below
+  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
+  flush_interval = "10s"
+  ## Jitter the flush interval by a random amount. This is primarily to avoid
+  ## large write spikes for users running a large number of telegraf instances.
+  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
+  flush_jitter = "0s"
+
+  ## By default or when set to "0s", precision will be set to the same
+  ## timestamp order as the collection interval, with the maximum being 1s.
+  ##   ie, when interval = "10s", precision will be "1s"
+  ##       when interval = "250ms", precision will be "1ms"
+  ## Precision will NOT be used for service inputs. It is up to each individual
+  ## service input to set the timestamp at the appropriate precision.
+  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
+  precision = ""
+
+  ## Logging configuration:
+  ## Run telegraf with debug log messages.
+  debug = false
+  ## Run telegraf in quiet mode (error log messages only).
+  quiet = false
+  ## Specify the log file name. The empty string means to log to stderr.
+  logfile = ""
+
+  ## Override default hostname, if empty use os.Hostname()
+  hostname = ""
+  ## If set to true, do no set the "host" tag in the telegraf agent.
+  omit_hostname = false
+
+
+###############################################################################
+#                            OUTPUT PLUGINS                                   #
+###############################################################################
+
+# Configuration for influxdb server to send metrics to
+[[outputs.influxdb]]
+  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
+  ## of the form:
+  ##   scheme "://" host [ ":" port]
+  ##
+  ## Multiple urls can be specified as part of the same cluster,
+  ## this means that only ONE of the urls will be written to each interval.
+  # urls = ["udp://localhost:8089"] # UDP endpoint example
+  urls = ["http://localhost:8086"] # required
+  ## The target database for metrics (telegraf will create it if not exists).
+  database = "telegraf" # required
+
+  ## Name of existing retention policy to write to.  Empty string writes to
+  ## the default retention policy.
+  retention_policy = ""
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  write_consistency = "any"
+
+  ## Write timeout (for the InfluxDB client), formatted as a string.
+  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
+  timeout = "5s"
+  # username = "telegraf"
+  # password = "metricsmetricsmetricsmetrics"
+  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
+  # user_agent = "telegraf"
+  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+  # udp_payload = 512
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+
+# # Configuration for Amon Server to send metrics to.
+# [[outputs.amon]]
+#   ## Amon Server Key
+#   server_key = "my-server-key" # required.
+#
+#   ## Amon Instance URL
+#   amon_instance = "https://youramoninstance" # required
+#
+#   ## Connection timeout.
+#   # timeout = "5s"
+
+
+# # Configuration for the AMQP server to send metrics to
+# [[outputs.amqp]]
+#   ## AMQP url
+#   url = "amqp://localhost:5672/influxdb"
+#   ## AMQP exchange
+#   exchange = "telegraf"
+#   ## Auth method. PLAIN and EXTERNAL are supported
+#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+#   ## described here: https://www.rabbitmq.com/plugins.html
+#   # auth_method = "PLAIN"
+#   ## Telegraf tag to use as a routing key
+#   ##  ie, if this tag exists, its value will be used as the routing key
+#   routing_tag = "host"
+#
+#   ## InfluxDB retention policy
+#   # retention_policy = "default"
+#   ## InfluxDB database
+#   # database = "telegraf"
+#
+#   ## Write timeout, formatted as a string.  If not provided, will default
+#   ## to 5s. 0s means no timeout (not recommended).
+#   # timeout = "5s"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Configuration for AWS CloudWatch output.
+# [[outputs.cloudwatch]]
+#   ## Amazon REGION
+#   region = "us-east-1"
+#
+#   ## Amazon Credentials
+#   ## Credentials are loaded in the following order
+#   ## 1) Assumed credentials via STS if role_arn is specified
+#   ## 2) explicit credentials from 'access_key' and 'secret_key'
+#   ## 3) shared profile from 'profile'
+#   ## 4) environment variables
+#   ## 5) shared credentials file
+#   ## 6) EC2 Instance Profile
+#   #access_key = ""
+#   #secret_key = ""
+#   #token = ""
+#   #role_arn = ""
+#   #profile = ""
+#   #shared_credential_file = ""
+#
+#   ## Namespace for the CloudWatch MetricDatums
+#   namespace = "InfluxData/Telegraf"
+
+
+# # Configuration for DataDog API to send metrics to.
+# [[outputs.datadog]]
+#   ## Datadog API key
+#   apikey = "my-secret-key" # required.
+#
+#   ## Connection timeout.
+#   # timeout = "5s"
+
+
+# # Send metrics to nowhere at all
+# [[outputs.discard]]
+#   # no configuration
+
+
+# # Configuration for Elasticsearch to send metrics to.
+# [[outputs.elasticsearch]]
+#   ## The full HTTP endpoint URL for your Elasticsearch instance
+#   ## Multiple urls can be specified as part of the same cluster,
+#   ## this means that only ONE of the urls will be written to each interval.
+#   urls = [ "http://node1.es.example.com:9200" ] # required.
+#   ## Elasticsearch client timeout, defaults to "5s" if not set.
+#   timeout = "5s"
+#   ## Set to true to ask Elasticsearch a list of all cluster nodes,
+#   ## thus it is not necessary to list all nodes in the urls config option.
+#   enable_sniffer = false
+#   ## Set the interval to check if the Elasticsearch nodes are available
+#   ## Setting to "0s" will disable the health check (not recommended in production)
+#   health_check_interval = "10s"
+#   ## HTTP basic authentication details (eg. when using Shield)
+#   # username = "telegraf"
+#   # password = "mypassword"
+#
+#   ## Index Config
+#   ## The target index for metrics (Elasticsearch will create if it not exists).
+#   ## You can use the date specifiers below to create indexes per time frame.
+#   ## The metric timestamp will be used to decide the destination index name
+#   # %Y - year (2016)
+#   # %y - last two digits of year (00..99)
+#   # %m - month (01..12)
+#   # %d - day of month (e.g., 01)
+#   # %H - hour (00..23)
+#   index_name = "telegraf-%Y.%m.%d" # required.
+#
+#   ## Template Config
+#   ## Set to true if you want telegraf to manage its index template.
+#   ## If enabled it will create a recommended index template for telegraf indexes
+#   manage_template = true
+#   ## The template name used for telegraf indexes
+#   template_name = "telegraf"
+#   ## Set to true if you want telegraf to overwrite an existing template
+#   overwrite_template = false
+
+
+# # Send telegraf metrics to file(s)
+# [[outputs.file]]
+#   ## Files to write to, "stdout" is a specially handled file.
+#   files = ["stdout", "/tmp/metrics.out"]
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Configuration for Graphite server to send metrics to
+# [[outputs.graphite]]
+#   ## TCP endpoint for your graphite instance.
+#   ## If multiple endpoints are configured, output will be load balanced.
+#   ## Only one of the endpoints will be written to with each iteration.
+#   servers = ["localhost:2003"]
+#   ## Prefix metrics name
+#   prefix = ""
+#   ## Graphite output template
+#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   template = "host.tags.measurement.field"
+#   ## timeout in seconds for the write connection to graphite
+#   timeout = 2
+
+
+# # Send telegraf metrics to graylog(s)
+# [[outputs.graylog]]
+#   ## UDP endpoint for your graylog instance.
+#   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
+
+
+# # Configuration for sending metrics to an Instrumental project
+# [[outputs.instrumental]]
+#   ## Project API Token (required)
+#   api_token = "API Token" # required
+#   ## Prefix the metrics with a given name
+#   prefix = ""
+#   ## Stats output template (Graphite formatting)
+#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
+#   template = "host.tags.measurement.field"
+#   ## Timeout in seconds to connect
+#   timeout = "2s"
+#   ## Display Communcation to Instrumental
+#   debug = false
+
+
+# # Configuration for the Kafka server to send metrics to
+# [[outputs.kafka]]
+#   ## URLs of kafka brokers
+#   brokers = ["localhost:9092"]
+#   ## Kafka topic for producer messages
+#   topic = "telegraf"
+#   ## Telegraf tag to use as a routing key
+#   ##  ie, if this tag exists, its value will be used as the routing key
+#   routing_tag = "host"
+#
+#   ## CompressionCodec represents the various compression codecs recognized by
+#   ## Kafka in messages.
+#   ##  0 : No compression
+#   ##  1 : Gzip compression
+#   ##  2 : Snappy compression
+#   compression_codec = 0
+#
+#   ##  RequiredAcks is used in Produce Requests to tell the broker how many
+#   ##  replica acknowledgements it must see before responding
+#   ##   0 : the producer never waits for an acknowledgement from the broker.
+#   ##       This option provides the lowest latency but the weakest durability
+#   ##       guarantees (some data will be lost when a server fails).
+#   ##   1 : the producer gets an acknowledgement after the leader replica has
+#   ##       received the data. This option provides better durability as the
+#   ##       client waits until the server acknowledges the request as successful
+#   ##       (only messages that were written to the now-dead leader but not yet
+#   ##       replicated will be lost).
+#   ##   -1: the producer gets an acknowledgement after all in-sync replicas have
+#   ##       received the data. This option provides the best durability, we
+#   ##       guarantee that no messages will be lost as long as at least one in
+#   ##       sync replica remains.
+#   required_acks = -1
+#
+#   ##  The total number of times to retry sending a message
+#   max_retry = 3
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Optional SASL Config
+#   # sasl_username = "kafka"
+#   # sasl_password = "secret"
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Configuration for the AWS Kinesis output.
+# [[outputs.kinesis]]
+#   ## Amazon REGION of kinesis endpoint.
+#   region = "ap-southeast-2"
+#
+#   ## Amazon Credentials
+#   ## Credentials are loaded in the following order
+#   ## 1) Assumed credentials via STS if role_arn is specified
+#   ## 2) explicit credentials from 'access_key' and 'secret_key'
+#   ## 3) shared profile from 'profile'
+#   ## 4) environment variables
+#   ## 5) shared credentials file
+#   ## 6) EC2 Instance Profile
+#   #access_key = ""
+#   #secret_key = ""
+#   #token = ""
+#   #role_arn = ""
+#   #profile = ""
+#   #shared_credential_file = ""
+#
+#   ## Kinesis StreamName must exist prior to starting telegraf.
+#   streamname = "StreamName"
+#   ## PartitionKey as used for sharding data.
+#   partitionkey = "PartitionKey"
+#   ## If set the paritionKey will be a random UUID on every put.
+#   ## This allows for scaling across multiple shards in a stream.
+#   ## This will cause issues with ordering.
+#   use_random_partitionkey = false
+#
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+#
+#   ## debug will show upstream aws messages.
+#   debug = false
+
+
+# # Configuration for Librato API to send metrics to.
+# [[outputs.librato]]
+#   ## Librator API Docs
+#   ## http://dev.librato.com/v1/metrics-authentication
+#   ## Librato API user
+#   api_user = "telegraf@influxdb.com" # required.
+#   ## Librato API token
+#   api_token = "my-secret-token" # required.
+#   ## Debug
+#   # debug = false
+#   ## Connection timeout.
+#   # timeout = "5s"
+#   ## Output source Template (same as graphite buckets)
+#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
+#   ## This template is used in librato's source (not metric's name)
+#   template = "host"
+#
+
+
+# # Configuration for MQTT server to send metrics to
+# [[outputs.mqtt]]
+#   servers = ["localhost:1883"] # required.
+#
+#   ## MQTT outputs send metrics to this topic format
+#   ##    "<topic_prefix>/<hostname>/<pluginname>/"
+#   ##   ex: prefix/web01.example.com/mem
+#   topic_prefix = "telegraf"
+#
+#   ## username and password to connect MQTT server.
+#   # username = "telegraf"
+#   # password = "metricsmetricsmetricsmetrics"
+#
+#   ## client ID, if not set a random ID is generated
+#   # client_id = ""
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Send telegraf measurements to NATS
+# [[outputs.nats]]
+#   ## URLs of NATS servers
+#   servers = ["nats://localhost:4222"]
+#   ## Optional credentials
+#   # username = ""
+#   # password = ""
+#   ## NATS subject for producer messages
+#   subject = "telegraf"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Send telegraf measurements to NSQD
+# [[outputs.nsq]]
+#   ## Location of nsqd instance listening on TCP
+#   server = "localhost:4150"
+#   ## NSQ topic for producer messages
+#   topic = "telegraf"
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Configuration for OpenTSDB server to send metrics to
+# [[outputs.opentsdb]]
+#   ## prefix for metrics keys
+#   prefix = "my.specific.prefix."
+#
+#   ## DNS name of the OpenTSDB server
+#   ## Using "opentsdb.example.com" or "tcp://opentsdb.example.com" will use the
+#   ## telnet API. "http://opentsdb.example.com" will use the Http API.
+#   host = "opentsdb.example.com"
+#
+#   ## Port of the OpenTSDB server
+#   port = 4242
+#
+#   ## Number of data points to send to OpenTSDB in Http requests.
+#   ## Not used with telnet API.
+#   httpBatchSize = 50
+#
+#   ## Debug true - Prints OpenTSDB communication
+#   debug = false
+
+
+# # Configuration for the Prometheus client to spawn
+# [[outputs.prometheus_client]]
+#   ## Address to listen on
+#   # listen = ":9126"
+#
+#   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
+#   # expiration_interval = "60s"
+
+
+# # Configuration for the Riemann server to send metrics to
+# [[outputs.riemann]]
+#   ## The full TCP or UDP URL of the Riemann server
+#   url = "tcp://localhost:5555"
+#
+#   ## Riemann event TTL, floating-point time in seconds.
+#   ## Defines how long that an event is considered valid for in Riemann
+#   # ttl = 30.0
+#
+#   ## Separator to use between measurement and field name in Riemann service name
+#   ## This does not have any effect if 'measurement_as_attribute' is set to 'true'
+#   separator = "/"
+#
+#   ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name
+#   # measurement_as_attribute = false
+#
+#   ## Send string metrics as Riemann event states.
+#   ## Unless enabled all string metrics will be ignored
+#   # string_as_state = false
+#
+#   ## A list of tag keys whose values get sent as Riemann tags.
+#   ## If empty, all Telegraf tag values will be sent as tags
+#   # tag_keys = ["telegraf","custom_tag"]
+#
+#   ## Additional Riemann tags to send.
+#   # tags = ["telegraf-output"]
+#
+#   ## Description for Riemann event
+#   # description_text = "metrics collected from telegraf"
+#
+#   ## Riemann client write timeout, defaults to "5s" if not set.
+#   # timeout = "5s"
+
+
+# # Configuration for the Riemann server to send metrics to
+# [[outputs.riemann_legacy]]
+#   ## URL of server
+#   url = "localhost:5555"
+#   ## transport protocol to use either tcp or udp
+#   transport = "tcp"
+#   ## separator to use between input name and field name in Riemann service name
+#   separator = " "
+
+
+# # Generic socket writer capable of handling multiple socket types.
+# [[outputs.socket_writer]]
+#   ## URL to connect to
+#   # address = "tcp://127.0.0.1:8094"
+#   # address = "tcp://example.com:http"
+#   # address = "tcp4://127.0.0.1:8094"
+#   # address = "tcp6://127.0.0.1:8094"
+#   # address = "tcp6://[2001:db8::1]:8094"
+#   # address = "udp://127.0.0.1:8094"
+#   # address = "udp4://127.0.0.1:8094"
+#   # address = "udp6://127.0.0.1:8094"
+#   # address = "unix:///tmp/telegraf.sock"
+#   # address = "unixgram:///tmp/telegraf.sock"
+#
+#   ## Period between keep alive probes.
+#   ## Only applies to TCP sockets.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   # keep_alive_period = "5m"
+#
+#   ## Data format to generate.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   # data_format = "influx"
+
+
+
+###############################################################################
+#                            PROCESSOR PLUGINS                                #
+###############################################################################
+
+# # Print all metrics that pass through this filter.
+# [[processors.printer]]
+
+
+
+###############################################################################
+#                            AGGREGATOR PLUGINS                               #
+###############################################################################
+
+# # Keep the aggregate min/max of each metric passing through.
+# [[aggregators.minmax]]
+#   ## General Aggregator Arguments:
+#   ## The period on which to flush & clear the aggregator.
+#   period = "30s"
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = false
+
+
+
+###############################################################################
+#                            INPUT PLUGINS                                    #
+###############################################################################
+
+# Read metrics about cpu usage
+[[inputs.cpu]]
+  ## Whether to report per-cpu stats or not
+  percpu = true
+  ## Whether to report total system cpu stats or not
+  totalcpu = true
+  ## If true, collect raw CPU time metrics.
+  collect_cpu_time = false
+
+
+# Read metrics about disk usage by mount point
+[[inputs.disk]]
+  ## By default, telegraf gather stats for all mountpoints.
+  ## Setting mountpoints will restrict the stats to the specified mountpoints.
+  # mount_points = ["/"]
+
+  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
+  ## present on /run, /var/run, /dev/shm or /dev).
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+
+
+# Read metrics about disk IO by device
+[[inputs.diskio]]
+  ## By default, telegraf will gather stats for all devices including
+  ## disk partitions.
+  ## Setting devices will restrict the stats to the specified devices.
+  # devices = ["sda", "sdb"]
+  ## Uncomment the following line if you need disk serial numbers.
+  # skip_serial_number = false
+  #
+  ## On systems which support it, device metadata can be added in the form of
+  ## tags.
+  ## Currently only Linux is supported via udev properties. You can view
+  ## available properties for a device by running:
+  ## 'udevadm info -q property -n /dev/sda'
+  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+  #
+  ## Using the same metadata source as device_tags, you can also customize the
+  ## name of the device via templates.
+  ## The 'name_templates' parameter is a list of templates to try and apply to
+  ## the device. The template may contain variables in the form of '$PROPERTY' or
+  ## '${PROPERTY}'. The first template which does not contain any variables not
+  ## present for the device is used as the device name tag.
+  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+  ## the near-meaningless DM-0 name.
+  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
+
+
+# Get kernel statistics from /proc/stat
+[[inputs.kernel]]
+  # no configuration
+
+
+# Read metrics about memory usage
+[[inputs.mem]]
+  # no configuration
+
+
+# Get the number of processes and group them by status
+[[inputs.processes]]
+  # no configuration
+
+
+# Read metrics about swap memory usage
+[[inputs.swap]]
+  # no configuration
+
+
+# Read metrics about system load & uptime
+[[inputs.system]]
+  # no configuration
+
+
+# # Read stats from aerospike server(s)
+# [[inputs.aerospike]]
+#   ## Aerospike servers to connect to (with port)
+#   ## This plugin will query all namespaces the aerospike
+#   ## server has configured and get stats for them.
+#   servers = ["localhost:3000"]
+
+
+# # Read Apache status information (mod_status)
+# [[inputs.apache]]
+#   ## An array of Apache status URI to gather stats.
+#   ## Default is "http://localhost/server-status?auto".
+#   urls = ["http://localhost/server-status?auto"]
+#   ## user credentials for basic HTTP authentication
+#   username = "myuser"
+#   password = "mypassword"
+#
+#   ## Timeout to the complete conection and reponse time in seconds
+#   response_timeout = "25s" ## default to 5 seconds
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read metrics of bcache from stats_total and dirty_data
+# [[inputs.bcache]]
+#   ## Bcache sets path
+#   ## If not specified, then default is:
+#   bcachePath = "/sys/fs/bcache"
+#
+#   ## By default, telegraf gather stats for all bcache devices
+#   ## Setting devices will restrict the stats to the specified
+#   ## bcache devices.
+#   bcacheDevs = ["bcache0"]
+
+
+# # Read Cassandra metrics through Jolokia
+# [[inputs.cassandra]]
+#   # This is the context root used to compose the jolokia url
+#   context = "/jolokia/read"
+#   ## List of cassandra servers exposing jolokia read service
+#   servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
+#   ## List of metrics collected on above servers
+#   ## Each metric consists of a jmx path.
+#   ## This will collect all heap memory usage metrics from the jvm and
+#   ## ReadLatency metrics for all keyspaces and tables.
+#   ## "type=Table" in the query works with Cassandra3.0. Older versions might
+#   ## need to use "type=ColumnFamily"
+#   metrics  = [
+#     "/java.lang:type=Memory/HeapMemoryUsage",
+#     "/org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"
+#   ]
+
+
+# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
+# [[inputs.ceph]]
+#   ## This is the recommended interval to poll.  Too frequent and you will lose
+#   ## data points due to timeouts during rebalancing and recovery
+#   interval = '1m'
+#
+#   ## All configuration values are optional, defaults are shown below
+#
+#   ## location of ceph binary
+#   ceph_binary = "/usr/bin/ceph"
+#
+#   ## directory in which to look for socket files
+#   socket_dir = "/var/run/ceph"
+#
+#   ## prefix of MON and OSD socket files, used to determine socket type
+#   mon_prefix = "ceph-mon"
+#   osd_prefix = "ceph-osd"
+#
+#   ## suffix used to identify socket files
+#   socket_suffix = "asok"
+#
+#   ## Ceph user to authenticate as
+#   ceph_user = "client.admin"
+#
+#   ## Ceph configuration to use to locate the cluster
+#   ceph_config = "/etc/ceph/ceph.conf"
+#
+#   ## Whether to gather statistics via the admin socket
+#   gather_admin_socket_stats = true
+#
+#   ## Whether to gather statistics via ceph commands
+#   gather_cluster_stats = false
+
+
+# # Read specific statistics per cgroup
+# [[inputs.cgroup]]
+#   ## Directories in which to look for files, globs are supported.
+#   ## Consider restricting paths to the set of cgroups you really
+#   ## want to monitor if you have a large number of cgroups, to avoid
+#   ## any cardinality issues.
+#   # paths = [
+#   #   "/cgroup/memory",
+#   #   "/cgroup/memory/child1",
+#   #   "/cgroup/memory/child2/*",
+#   # ]
+#   ## cgroup stat fields, as file names, globs are supported.
+#   ## these file names are appended to each path from above.
+#   # files = ["memory.*usage*", "memory.limit_in_bytes"]
+
+
+# # Pull Metric Statistics from Amazon CloudWatch
+# [[inputs.cloudwatch]]
+#   ## Amazon Region
+#   region = "us-east-1"
+#
+#   ## Amazon Credentials
+#   ## Credentials are loaded in the following order
+#   ## 1) Assumed credentials via STS if role_arn is specified
+#   ## 2) explicit credentials from 'access_key' and 'secret_key'
+#   ## 3) shared profile from 'profile'
+#   ## 4) environment variables
+#   ## 5) shared credentials file
+#   ## 6) EC2 Instance Profile
+#   #access_key = ""
+#   #secret_key = ""
+#   #token = ""
+#   #role_arn = ""
+#   #profile = ""
+#   #shared_credential_file = ""
+#
+#   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
+#   # metrics are made available to the 1 minute period. Some are collected at
+#   # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
+#   # Note that if a period is configured that is smaller than the minimum for a
+#   # particular metric, that metric will not be returned by the Cloudwatch API
+#   # and will not be collected by Telegraf.
+#   #
+#   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
+#   period = "5m"
+#
+#   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
+#   delay = "5m"
+#
+#   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
+#   ## gaps or overlap in pulled data
+#   interval = "5m"
+#
+#   ## Configure the TTL for the internal cache of metrics.
+#   ## Defaults to 1 hr if not specified
+#   #cache_ttl = "10m"
+#
+#   ## Metric Statistic Namespace (required)
+#   namespace = "AWS/ELB"
+#
+#   ## Maximum requests per second. Note that the global default AWS rate limit is
+#   ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
+#   ## maximum of 400. Optional - default value is 200.
+#   ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
+#   ratelimit = 200
+#
+#   ## Metrics to Pull (optional)
+#   ## Defaults to all Metrics in Namespace if nothing is provided
+#   ## Refreshes Namespace available metrics every 1h
+#   #[[inputs.cloudwatch.metrics]]
+#   #  names = ["Latency", "RequestCount"]
+#   #
+#   #  ## Dimension filters for Metric (optional)
+#   #  [[inputs.cloudwatch.metrics.dimensions]]
+#   #    name = "LoadBalancerName"
+#   #    value = "p-example"
+
+
+# # Gather health check statuses from services registered in Consul
+# [[inputs.consul]]
+#   ## Most of these values defaults to the one configured on a Consul's agent level.
+#   ## Optional Consul server address (default: "localhost")
+#   # address = "localhost"
+#   ## Optional URI scheme for the Consul server (default: "http")
+#   # scheme = "http"
+#   ## Optional ACL token used in every request (default: "")
+#   # token = ""
+#   ## Optional username used for request HTTP Basic Authentication (default: "")
+#   # username = ""
+#   ## Optional password used for HTTP Basic Authentication (default: "")
+#   # password = ""
+#   ## Optional data centre to query the health checks from (default: "")
+#   # datacentre = ""
+
+
+# # Read metrics from one or many couchbase clusters
+# [[inputs.couchbase]]
+#   ## specify servers via a url matching:
+#   ##  [protocol://][:password]@address[:port]
+#   ##  e.g.
+#   ##    http://couchbase-0.example.com/
+#   ##    http://admin:secret@couchbase-0.example.com:8091/
+#   ##
+#   ## If no servers are specified, then localhost is used as the host.
+#   ## If no protocol is specifed, HTTP is used.
+#   ## If no port is specified, 8091 is used.
+#   servers = ["http://localhost:8091"]
+
+
+# # Read CouchDB Stats from one or more servers
+# [[inputs.couchdb]]
+#   ## Works with CouchDB stats endpoints out of the box
+#   ## Multiple HOSTs from which to read CouchDB stats:
+#   hosts = ["http://localhost:8086/_stats"]
+
+
+# # Read metrics from one or many disque servers
+# [[inputs.disque]]
+#   ## An array of URI to gather stats about. Specify an ip or hostname
+#   ## with optional port and password.
+#   ## ie disque://localhost, disque://10.10.3.33:18832, 10.0.0.1:10000, etc.
+#   ## If no servers are specified, then localhost is used as the host.
+#   servers = ["localhost"]
+
+
+# # Provide a native collection for dmsetup based statistics for dm-cache
+# [[inputs.dmcache]]
+#   ## Whether to report per-device stats or not
+#   per_device = true
+
+
+# # Query given DNS server and gives statistics
+# [[inputs.dns_query]]
+#   ## servers to query
+#   servers = ["8.8.8.8"] # required
+#
+#   ## Domains or subdomains to query. "."(root) is default
+#   domains = ["."] # optional
+#
+#   ## Query record type. Default is "A"
+#   ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
+#   record_type = "A" # optional
+#
+#   ## Dns server port. 53 is default
+#   port = 53 # optional
+#
+#   ## Query timeout in seconds. Default is 2 seconds
+#   timeout = 2 # optional
+
+
+# # Read metrics about docker containers
+# [[inputs.docker]]
+#   ## Docker Endpoint
+#   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
+#   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
+#   endpoint = "unix:///var/run/docker.sock"
+#   ## Only collect metrics for these containers, collect all if empty
+#   container_names = []
+#   ## Timeout for docker list, info, and stats commands
+#   timeout = "5s"
+#
+#   ## Whether to report for each container per-device blkio (8:0, 8:1...) and
+#   ## network (eth0, eth1, ...) stats or not
+#   perdevice = true
+#   ## Whether to report for each container total blkio and network stats or not
+#   total = false
+#
+#   ## docker labels to include and exclude as tags.  Globs accepted.
+#   ## Note that an empty array for both will include all labels as tags
+#   docker_label_include = []
+#   docker_label_exclude = []
+
+
+# # Read statistics from one or many dovecot servers
+# [[inputs.dovecot]]
+#   ## specify dovecot servers via an address:port list
+#   ##  e.g.
+#   ##    localhost:24242
+#   ##
+#   ## If no servers are specified, then localhost is used as the host.
+#   servers = ["localhost:24242"]
+#   ## Type is one of "user", "domain", "ip", or "global"
+#   type = "global"
+#   ## Wildcard matches like "*.com". An empty string "" is same as "*"
+#   ## If type = "ip" filters should be <IP/network>
+#   filters = [""]
+
+
+# # Read stats from one or more Elasticsearch servers or clusters
+# [[inputs.elasticsearch]]
+#   ## specify a list of one or more Elasticsearch servers
+#   # you can add username and password to your url to use basic authentication:
+#   # servers = ["http://user:pass@localhost:9200"]
+#   servers = ["http://localhost:9200"]
+#
+#   ## Timeout for HTTP requests to the elastic search server(s)
+#   http_timeout = "5s"
+#
+#   ## When local is true (the default), the node will read only its own stats.
+#   ## Set local to false when you want to read the node stats from all nodes
+#   ## of the cluster.
+#   local = true
+#
+#   ## Set cluster_health to true when you want to also obtain cluster health stats
+#   cluster_health = false
+#
+#   ## Set cluster_stats to true when you want to also obtain cluster stats from the
+#   ## Master node.
+#   cluster_stats = false
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read metrics from one or more commands that can output to stdout
+# [[inputs.exec]]
+#   ## Commands array
+#   commands = [
+#     "/tmp/test.sh",
+#     "/usr/bin/mycollector --foo=bar",
+#     "/tmp/collect_*.sh"
+#   ]
+#
+#   ## Timeout for each command to complete.
+#   timeout = "5s"
+#
+#   ## measurement name suffix (for separating different commands)
+#   name_suffix = "_mycollector"
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+
+
+# # Read stats about given file(s)
+# [[inputs.filestat]]
+#   ## Files to gather stats about.
+#   ## These accept standard unix glob matching rules, but with the addition of
+#   ## ** as a "super asterisk". ie:
+#   ##   "/var/log/**.log"  -> recursively find all .log files in /var/log
+#   ##   "/var/log/*/*.log" -> find all .log files with a parent dir in /var/log
+#   ##   "/var/log/apache.log" -> just tail the apache log file
+#   ##
+#   ## See https://github.com/gobwas/glob for more examples
+#   ##
+#   files = ["/var/log/**.log"]
+#   ## If true, read the entire file and calculate an md5 checksum.
+#   md5 = false
+
+
+# # Read flattened metrics from one or more GrayLog HTTP endpoints
+# [[inputs.graylog]]
+#   ## API endpoint, currently supported API:
+#   ##
+#   ##   - multiple  (Ex http://<host>:12900/system/metrics/multiple)
+#   ##   - namespace (Ex http://<host>:12900/system/metrics/namespace/{namespace})
+#   ##
+#   ## For namespace endpoint, the metrics array will be ignored for that call.
+#   ## Endpoint can contain namespace and multiple type calls.
+#   ##
+#   ## Please check http://[graylog-server-ip]:12900/api-browser for full list
+#   ## of endpoints
+#   servers = [
+#     "http://[graylog-server-ip]:12900/system/metrics/multiple",
+#   ]
+#
+#   ## Metrics list
+#   ## List of metrics can be found on Graylog webservice documentation.
+#   ## Or by hitting the the web service api at:
+#   ##   http://[graylog-host]:12900/system/metrics
+#   metrics = [
+#     "jvm.cl.loaded",
+#     "jvm.memory.pools.Metaspace.committed"
+#   ]
+#
+#   ## Username and password
+#   username = ""
+#   password = ""
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read metrics of haproxy, via socket or csv stats page
+# [[inputs.haproxy]]
+#   ## An array of address to gather stats about. Specify an ip on hostname
+#   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
+#   ## Make sure you specify the complete path to the stats endpoint
+#   ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
+#
+#   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
+#   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
+#
+#   ## You can also use local socket with standard wildcard globbing.
+#   ## Server address not starting with 'http' will be treated as a possible
+#   ## socket, so both examples below are valid.
+#   # servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
+#
+#   ## By default, some of the fields are renamed from what haproxy calls them.
+#   ## Setting this option to true results in the plugin keeping the original
+#   ## field names.
+#   # keep_field_names = true
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # HTTP/HTTPS request given an address a method and a timeout
+# [[inputs.http_response]]
+#   ## Server address (default http://localhost)
+#   address = "http://github.com"
+#   ## Set response_timeout (default 5 seconds)
+#   response_timeout = "5s"
+#   ## HTTP Request Method
+#   method = "GET"
+#   ## Whether to follow redirects from the server (defaults to false)
+#   follow_redirects = true
+#   ## HTTP Request Headers (all values must be strings)
+#   # [inputs.http_response.headers]
+#   #   Host = "github.com"
+#   ## Optional HTTP Request Body
+#   # body = '''
+#   # {'fake':'data'}
+#   # '''
+#
+#   ## Optional substring or regex match in body of the response
+#   ## response_string_match = "\"service_status\": \"up\""
+#   ## response_string_match = "ok"
+#   ## response_string_match = "\".*_status\".?:.?\"up\""
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read flattened metrics from one or more JSON HTTP endpoints
+# [[inputs.httpjson]]
+#   ## NOTE This plugin only reads numerical measurements, strings and booleans
+#   ## will be ignored.
+#
+#   ## Name for the service being polled.  Will be appended to the name of the
+#   ## measurement e.g. httpjson_webserver_stats
+#   ##
+#   ## Deprecated (1.3.0): Use name_override, name_suffix, name_prefix instead.
+#   name = "webserver_stats"
+#
+#   ## URL of each server in the service's cluster
+#   servers = [
+#     "http://localhost:9999/stats/",
+#     "http://localhost:9998/stats/",
+#   ]
+#   ## Set response_timeout (default 5 seconds)
+#   response_timeout = "5s"
+#
+#   ## HTTP method to use: GET or POST (case-sensitive)
+#   method = "GET"
+#
+#   ## List of tag names to extract from top-level of JSON server response
+#   # tag_keys = [
+#   #   "my_tag_1",
+#   #   "my_tag_2"
+#   # ]
+#
+#   ## HTTP parameters (all values must be strings).  For "GET" requests, data
+#   ## will be included in the query.  For "POST" requests, data will be included
+#   ## in the request body as "x-www-form-urlencoded".
+#   # [inputs.httpjson.parameters]
+#   #   event_type = "cpu_spike"
+#   #   threshold = "0.75"
+#
+#   ## HTTP Headers (all values must be strings)
+#   # [inputs.httpjson.headers]
+#   #   X-Auth-Token = "my-xauth-token"
+#   #   apiVersion = "v1"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read InfluxDB-formatted JSON metrics from one or more HTTP endpoints
+# [[inputs.influxdb]]
+#   ## Works with InfluxDB debug endpoints out of the box,
+#   ## but other services can use this format too.
+#   ## See the influxdb plugin's README for more details.
+#
+#   ## Multiple URLs from which to read InfluxDB-formatted JSON
+#   ## Default is "http://localhost:8086/debug/vars".
+#   urls = [
+#     "http://localhost:8086/debug/vars"
+#   ]
+#
+#   ## http request & header timeout
+#   timeout = "5s"
+
+
+# # Collect statistics about itself
+# [[inputs.internal]]
+#   ## If true, collect telegraf memory stats.
+#   # collect_memstats = true
+
+
+# # This plugin gathers interrupts data from /proc/interrupts and /proc/softirqs.
+# [[inputs.interrupts]]
+#   ## To filter which IRQs to collect, make use of tagpass / tagdrop, i.e.
+#   # [inputs.interrupts.tagdrop]
+#     # irq = [ "NET_RX", "TASKLET" ]
+
+
+# # Read metrics from the bare metal servers via IPMI
+# [[inputs.ipmi_sensor]]
+#   ## optionally specify the path to the ipmitool executable
+#   # path = "/usr/bin/ipmitool"
+#   #
+#   ## optionally specify one or more servers via a url matching
+#   ##  [username[:password]@][protocol[(address)]]
+#   ##  e.g.
+#   ##    root:passwd@lan(127.0.0.1)
+#   ##
+#   ## if no servers are specified, local machine sensor stats will be queried
+#   ##
+#   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
+
+
+# # Read JMX metrics through Jolokia
+# [[inputs.jolokia]]
+#   ## This is the context root used to compose the jolokia url
+#   ## NOTE that Jolokia requires a trailing slash at the end of the context root
+#   ## NOTE that your jolokia security policy must allow for POST requests.
+#   context = "/jolokia/"
+#
+#   ## This specifies the mode used
+#   # mode = "proxy"
+#   #
+#   ## When in proxy mode this section is used to specify further
+#   ## proxy address configurations.
+#   ## Remember to change host address to fit your environment.
+#   # [inputs.jolokia.proxy]
+#   #   host = "127.0.0.1"
+#   #   port = "8080"
+#
+#   ## Optional http timeouts
+#   ##
+#   ## response_header_timeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # response_header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
+#
+#   ## Attribute delimiter
+#   ##
+#   ## When multiple attributes are returned for a single
+#   ## [inputs.jolokia.metrics], the field name is a concatenation of the metric
+#   ## name, and the attribute name, separated by the given delimiter.
+#   # delimiter = "_"
+#
+#   ## List of servers exposing jolokia read service
+#   [[inputs.jolokia.servers]]
+#     name = "as-server-01"
+#     host = "127.0.0.1"
+#     port = "8080"
+#     # username = "myuser"
+#     # password = "mypassword"
+#
+#   ## List of metrics collected on above servers
+#   ## Each metric consists in a name, a jmx path and either
+#   ## a pass or drop slice attribute.
+#   ## This collect all heap memory usage metrics.
+#   [[inputs.jolokia.metrics]]
+#     name = "heap_memory_usage"
+#     mbean  = "java.lang:type=Memory"
+#     attribute = "HeapMemoryUsage"
+#
+#   ## This collect thread counts metrics.
+#   [[inputs.jolokia.metrics]]
+#     name = "thread_count"
+#     mbean  = "java.lang:type=Threading"
+#     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
+#
+#   ## This collect number of class loaded/unloaded counts metrics.
+#   [[inputs.jolokia.metrics]]
+#     name = "class_count"
+#     mbean  = "java.lang:type=ClassLoading"
+#     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
+
+
+# # Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints
+# [[inputs.kapacitor]]
+#   ## Multiple URLs from which to read Kapacitor-formatted JSON
+#   ## Default is "http://localhost:9092/kapacitor/v1/debug/vars".
+#   urls = [
+#     "http://localhost:9092/kapacitor/v1/debug/vars"
+#   ]
+#
+#   ## Time limit for http requests
+#   timeout = "5s"
+
+
+# # Read metrics from the kubernetes kubelet api
+# [[inputs.kubernetes]]
+#   ## URL for the kubelet
+#   url = "http://1.1.1.1:10255"
+#
+#   ## Use bearer token for authorization
+#   # bearer_token = /path/to/bearer/token
+#
+#   ## Optional SSL Config
+#   # ssl_ca = /path/to/cafile
+#   # ssl_cert = /path/to/certfile
+#   # ssl_key = /path/to/keyfile
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read metrics from a LeoFS Server via SNMP
+# [[inputs.leofs]]
+#   ## An array of URLs of the form:
+#   ##   "udp://" host [ ":" port]
+#   servers = ["udp://127.0.0.1:4020"]
+
+
+# # Provides Linux sysctl fs metrics
+# [[inputs.linux_sysctl_fs]]
+#   # no configuration
+
+
+# # Read metrics from local Lustre service on OST, MDS
+# [[inputs.lustre2]]
+#   ## An array of /proc globs to search for Lustre stats
+#   ## If not specified, the default will work on Lustre 2.5.x
+#   ##
+#   # ost_procfiles = [
+#   #   "/proc/fs/lustre/obdfilter/*/stats",
+#   #   "/proc/fs/lustre/osd-ldiskfs/*/stats",
+#   #   "/proc/fs/lustre/obdfilter/*/job_stats",
+#   # ]
+#   # mds_procfiles = [
+#   #   "/proc/fs/lustre/mdt/*/md_stats",
+#   #   "/proc/fs/lustre/mdt/*/job_stats",
+#   # ]
+
+
+# # Gathers metrics from the /3.0/reports MailChimp API
+# [[inputs.mailchimp]]
+#   ## MailChimp API key
+#   ## get from https://admin.mailchimp.com/account/api/
+#   api_key = "" # required
+#   ## Reports for campaigns sent more than days_old ago will not be collected.
+#   ## 0 means collect all.
+#   days_old = 0
+#   ## Campaign ID to get, if empty gets all campaigns, this option overrides days_old
+#   # campaign_id = ""
+
+
+# # Read metrics from one or many memcached servers
+# [[inputs.memcached]]
+#   ## An array of address to gather stats about. Specify an ip on hostname
+#   ## with optional port. ie localhost, 10.0.0.1:11211, etc.
+#   servers = ["localhost:11211"]
+#   # unix_sockets = ["/var/run/memcached.sock"]
+
+
+# # Telegraf plugin for gathering metrics from N Mesos masters
+# [[inputs.mesos]]
+#   ## Timeout, in ms.
+#   timeout = 100
+#   ## A list of Mesos masters.
+#   masters = ["localhost:5050"]
+#   ## Master metrics groups to be collected, by default, all enabled.
+#   master_collections = [
+#     "resources",
+#     "master",
+#     "system",
+#     "agents",
+#     "frameworks",
+#     "tasks",
+#     "messages",
+#     "evqueue",
+#     "registrar",
+#   ]
+#   ## A list of Mesos slaves, default is []
+#   # slaves = []
+#   ## Slave metrics groups to be collected, by default, all enabled.
+#   # slave_collections = [
+#   #   "resources",
+#   #   "agent",
+#   #   "system",
+#   #   "executors",
+#   #   "tasks",
+#   #   "messages",
+#   # ]
+
+
+# # Read metrics from one or many MongoDB servers
+# [[inputs.mongodb]]
+#   ## An array of URLs of the form:
+#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+#   ## For example:
+#   ##   mongodb://user:auth_key@10.10.3.30:27017,
+#   ##   mongodb://10.10.3.33:18832,
+#   servers = ["mongodb://127.0.0.1:27017"]
+#   gather_perdb_stats = false
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Read metrics from one or many mysql servers
+# [[inputs.mysql]]
+#   ## specify servers via a url matching:
+#   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
+#   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
+#   ##  e.g.
+#   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
+#   ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
+#   #
+#   ## If no servers are specified, then localhost is used as the host.
+#   servers = ["tcp(127.0.0.1:3306)/"]
+#   ## the limits for metrics form perf_events_statements
+#   perf_events_statements_digest_text_limit  = 120
+#   perf_events_statements_limit              = 250
+#   perf_events_statements_time_limit         = 86400
+#   #
+#   ## if the list is empty, then metrics are gathered from all databasee tables
+#   table_schema_databases                    = []
+#   #
+#   ## gather metrics from INFORMATION_SCHEMA.TABLES for databases provided above list
+#   gather_table_schema                       = false
+#   #
+#   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
+#   gather_process_list                       = true
+#   #
+#   ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
+#   gather_user_statistics                    = true
+#   #
+#   ## gather auto_increment columns and max values from information schema
+#   gather_info_schema_auto_inc               = true
+#   #
+#   ## gather metrics from INFORMATION_SCHEMA.INNODB_METRICS
+#   gather_innodb_metrics                     = true
+#   #
+#   ## gather metrics from SHOW SLAVE STATUS command output
+#   gather_slave_status                       = true
+#   #
+#   ## gather metrics from SHOW BINARY LOGS command output
+#   gather_binary_logs                        = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
+#   gather_table_io_waits                     = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_LOCK_WAITS
+#   gather_table_lock_waits                   = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_INDEX_USAGE
+#   gather_index_io_waits                     = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.EVENT_WAITS
+#   gather_event_waits                        = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.FILE_SUMMARY_BY_EVENT_NAME
+#   gather_file_events_stats                  = false
+#   #
+#   ## gather metrics from PERFORMANCE_SCHEMA.EVENTS_STATEMENTS_SUMMARY_BY_DIGEST
+#   gather_perf_events_statements             = false
+#   #
+#   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
+#   interval_slow                   = "30m"
+
+
+# # Read metrics about network interface usage
+[[inputs.net]]
+#   ## By default, telegraf gathers stats from any up interface (excluding loopback)
+#   ## Setting interfaces will tell it to gather these explicit interfaces,
+#   ## regardless of status.
+#   ##
+#   # interfaces = ["eth0"]
+interfaces = ["en0"]
+
+# # TCP or UDP 'ping' given url and collect response time in seconds
+# [[inputs.net_response]]
+#   ## Protocol, must be "tcp" or "udp"
+#   ## NOTE: because the "udp" protocol does not respond to requests, it requires
+#   ## a send/expect string pair (see below).
+#   protocol = "tcp"
+#   ## Server address (default localhost)
+#   address = "localhost:80"
+#   ## Set timeout
+#   timeout = "1s"
+#
+#   ## Set read timeout (only used if expecting a response)
+#   read_timeout = "1s"
+#
+#   ## The following options are required for UDP checks. For TCP, they are
+#   ## optional. The plugin will send the given string to the server and then
+#   ## expect to receive the given 'expect' string back.
+#   ## string sent to the server
+#   # send = "ssh"
+#   ## expected string in answer
+#   # expect = "ssh"
+
+
+# # Read TCP metrics such as established, time wait and sockets counts.
+# [[inputs.netstat]]
+#   # no configuration
+
+
+# # Read Nginx's basic status information (ngx_http_stub_status_module)
+# [[inputs.nginx]]
+#   ## An array of Nginx stub_status URI to gather stats.
+#   urls = ["http://localhost/status"]
+
+
+# # Read NSQ topic and channel statistics.
+# [[inputs.nsq]]
+#   ## An array of NSQD HTTP API endpoints
+#   endpoints = ["http://localhost:4151"]
+
+
+# # Collect kernel snmp counters and network interface statistics
+# [[inputs.nstat]]
+#   ## file paths for proc files. If empty default paths will be used:
+#   ##    /proc/net/netstat, /proc/net/snmp, /proc/net/snmp6
+#   ## These can also be overridden with env variables, see README.
+#   proc_net_netstat = "/proc/net/netstat"
+#   proc_net_snmp = "/proc/net/snmp"
+#   proc_net_snmp6 = "/proc/net/snmp6"
+#   ## dump metrics with 0 values too
+#   dump_zeros       = true
+
+
+# # Get standard NTP query metrics, requires ntpq executable.
+# [[inputs.ntpq]]
+#   ## If false, set the -n ntpq flag. Can reduce metric gather time.
+#   dns_lookup = true
+
+
+# # Read metrics of passenger using passenger-status
+# [[inputs.passenger]]
+#   ## Path of passenger-status.
+#   ##
+#   ## Plugin gather metric via parsing XML output of passenger-status
+#   ## More information about the tool:
+#   ##   https://www.phusionpassenger.com/library/admin/apache/overall_status_report.html
+#   ##
+#   ## If no path is specified, then the plugin simply execute passenger-status
+#   ## hopefully it can be found in your PATH
+#   command = "passenger-status -v --show=xml"
+
+
+# # Read metrics of phpfpm, via HTTP status page or socket
+# [[inputs.phpfpm]]
+#   ## An array of addresses to gather stats about. Specify an ip or hostname
+#   ## with optional port and path
+#   ##
+#   ## Plugin can be configured in three modes (either can be used):
+#   ##   - http: the URL must start with http:// or https://, ie:
+#   ##       "http://localhost/status"
+#   ##       "http://192.168.130.1/status?full"
+#   ##
+#   ##   - unixsocket: path to fpm socket, ie:
+#   ##       "/var/run/php5-fpm.sock"
+#   ##      or using a custom fpm status path:
+#   ##       "/var/run/php5-fpm.sock:fpm-custom-status-path"
+#   ##
+#   ##   - fcgi: the URL must start with fcgi:// or cgi://, and port must be present, ie:
+#   ##       "fcgi://10.0.0.12:9000/status"
+#   ##       "cgi://10.0.10.12:9001/status"
+#   ##
+#   ## Example of multiple gathering from local socket and remove host
+#   ## urls = ["http://192.168.1.20/status", "/tmp/fpm.sock"]
+#   urls = ["http://localhost/status"]
+
+
+# # Ping given url(s) and return statistics
+# [[inputs.ping]]
+#   ## NOTE: this plugin forks the ping command. You may need to set capabilities
+#   ## via setcap cap_net_raw+p /bin/ping
+#   #
+#   ## List of urls to ping
+#   urls = ["www.google.com"] # required
+#   ## number of pings to send per collection (ping -c <COUNT>)
+#   # count = 1
+#   ## interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
+#   # ping_interval = 1.0
+#   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
+#   # timeout = 1.0
+#   ## interface to send ping from (ping -I <INTERFACE>)
+#   # interface = ""
+
+
+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   ##
+#   ## All connection parameters are optional.
+#   ##
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   ##
+#   address = "host=localhost user=postgres sslmode=disable"
+#
+#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'databases' option.
+#   # ignored_databases = ["postgres", "template0", "template1"]
+#
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
+#   # databases = ["app_production", "testing"]
+
+
+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql_extensible]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   #
+#   ## All connection parameters are optional.  #
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   #
+#   address = "host=localhost user=postgres sslmode=disable"
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.
+#   ## databases = ["app_production", "testing"]
+#   #
+#   # outputaddress = "db01"
+#   ## A custom name for the database that will be used as the "server" tag in the
+#   ## measurement output. If not specified, a default one generated from
+#   ## the connection address is used.
+#   #
+#   ## Define the toml config where the sql queries are stored
+#   ## New queries can be added, if the withdbname is set to true and there is no
+#   ## databases defined in the 'databases field', the sql query is ended by a
+#   ## 'is not null' in order to make the query succeed.
+#   ## Example :
+#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
+#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
+#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
+#   ## withdbname was true. Be careful that if the withdbname is set to false you
+#   ## don't have to define the where clause (aka with the dbname) the tagvalue
+#   ## field is used to define custom tags (separated by commas)
+#   ## The optional "measurement" value can be used to override the default
+#   ## output measurement name ("postgresql").
+#   #
+#   ## Structure :
+#   ## [[inputs.postgresql_extensible.query]]
+#   ##   sqlquery string
+#   ##   version string
+#   ##   withdbname boolean
+#   ##   tagvalue string (comma separated)
+#   ##   measurement string
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_database"
+#     version=901
+#     withdbname=false
+#     tagvalue=""
+#     measurement=""
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_bgwriter"
+#     version=901
+#     withdbname=false
+#     tagvalue="postgresql.stats"
+
+
+# # Read metrics from one or many PowerDNS servers
+# [[inputs.powerdns]]
+#   ## An array of sockets to gather stats about.
+#   ## Specify a path to unix socket.
+#   unix_sockets = ["/var/run/pdns.controlsocket"]
+
+
+# # Monitor process cpu and memory usage
+# [[inputs.procstat]]
+#   ## Must specify one of: pid_file, exe, or pattern
+#   ## PID file to monitor process
+#   pid_file = "/var/run/nginx.pid"
+#   ## executable name (ie, pgrep <exe>)
+#   # exe = "nginx"
+#   ## pattern as argument for pgrep (ie, pgrep -f <pattern>)
+#   # pattern = "nginx"
+#   ## user as argument for pgrep (ie, pgrep -u <user>)
+#   # user = "nginx"
+#
+#   ## override for process_name
+#   ## This is optional; default is sourced from /proc/<pid>/status
+#   # process_name = "bar"
+#   ## Field name prefix
+#   prefix = ""
+#   ## comment this out if you want raw cpu_time stats
+#   fielddrop = ["cpu_time_*"]
+#   ## This is optional; moves pid into a tag instead of a field
+#   pid_tag = false
+
+
+# # Read metrics from one or many prometheus clients
+# [[inputs.prometheus]]
+#   ## An array of urls to scrape metrics from.
+#   urls = ["http://localhost:9100/metrics"]
+#
+#   ## Use bearer token for authorization
+#   # bearer_token = /path/to/bearer/token
+#
+#   ## Specify timeout duration for slower prometheus clients (default is 3s)
+#   # response_timeout = "3s"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = /path/to/cafile
+#   # ssl_cert = /path/to/certfile
+#   # ssl_key = /path/to/keyfile
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
+# # Reads last_run_summary.yaml file and converts to measurments
+# [[inputs.puppetagent]]
+#   ## Location of puppet last run summary file
+#   location = "/var/lib/puppet/state/last_run_summary.yaml"
+
+
+# # Reads metrics from RabbitMQ servers via the Management Plugin
+# [[inputs.rabbitmq]]
+#   ## Management Plugin url. (default: http://localhost:15672)
+#   # url = "http://localhost:15672"
+#   ## Tag added to rabbitmq_overview series; deprecated: use tags
+#   # name = "rmq-server-1"
+#   ## Credentials
+#   # username = "guest"
+#   # password = "guest"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Optional request timeouts
+#   ##
+#   ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request.
+#   # header_timeout = "3s"
+#   ##
+#   ## client_timeout specifies a time limit for requests made by this client.
+#   ## Includes connection time, any redirects, and reading the response body.
+#   # client_timeout = "4s"
+#
+#   ## A list of nodes to pull metrics about. If not specified, metrics for
+#   ## all nodes are gathered.
+#   # nodes = ["rabbit@node1", "rabbit@node2"]
+
+
+# # Read raindrops stats (raindrops - real-time stats for preforking Rack servers)
+# [[inputs.raindrops]]
+#   ## An array of raindrops middleware URI to gather stats.
+#   urls = ["http://localhost:8080/_raindrops"]
+
+
+# # Read metrics from one or many redis servers
+# [[inputs.redis]]
+#   ## specify servers via a url matching:
+#   ##  [protocol://][:password]@address[:port]
+#   ##  e.g.
+#   ##    tcp://localhost:6379
+#   ##    tcp://:password@192.168.99.100
+#   ##    unix:///var/run/redis.sock
+#   ##
+#   ## If no servers are specified, then localhost is used as the host.
+#   ## If no port is specified, 6379 is used
+#   servers = ["tcp://localhost:6379"]
+
+
+# # Read metrics from one or many RethinkDB servers
+# [[inputs.rethinkdb]]
+#   ## An array of URI to gather stats about. Specify an ip or hostname
+#   ## with optional port add password. ie,
+#   ##   rethinkdb://user:auth_key@10.10.3.30:28105,
+#   ##   rethinkdb://10.10.3.33:18832,
+#   ##   10.0.0.1:10000, etc.
+#   servers = ["127.0.0.1:28015"]
+
+
+# # Read metrics one or many Riak servers
+# [[inputs.riak]]
+#   # Specify a list of one or more riak http servers
+#   servers = ["http://localhost:8098"]
+
+
+# # Retrieves SNMP values from remote agents
+# [[inputs.snmp]]
+#   agents = [ "127.0.0.1:161" ]
+#   ## Timeout for each SNMP query.
+#   timeout = "5s"
+#   ## Number of retries to attempt within timeout.
+#   retries = 3
+#   ## SNMP version, values can be 1, 2, or 3
+#   version = 2
+#
+#   ## SNMP community string.
+#   community = "public"
+#
+#   ## The GETBULK max-repetitions parameter
+#   max_repetitions = 10
+#
+#   ## SNMPv3 auth parameters
+#   #sec_name = "myuser"
+#   #auth_protocol = "md5"      # Values: "MD5", "SHA", ""
+#   #auth_password = "pass"
+#   #sec_level = "authNoPriv"   # Values: "noAuthNoPriv", "authNoPriv", "authPriv"
+#   #context_name = ""
+#   #priv_protocol = ""         # Values: "DES", "AES", ""
+#   #priv_password = ""
+#
+#   ## measurement name
+#   name = "system"
+#   [[inputs.snmp.field]]
+#     name = "hostname"
+#     oid = ".1.0.0.1.1"
+#   [[inputs.snmp.field]]
+#     name = "uptime"
+#     oid = ".1.0.0.1.2"
+#   [[inputs.snmp.field]]
+#     name = "load"
+#     oid = ".1.0.0.1.3"
+#   [[inputs.snmp.field]]
+#     oid = "HOST-RESOURCES-MIB::hrMemorySize"
+#
+#   [[inputs.snmp.table]]
+#     ## measurement name
+#     name = "remote_servers"
+#     inherit_tags = [ "hostname" ]
+#     [[inputs.snmp.table.field]]
+#       name = "server"
+#       oid = ".1.0.0.0.1.0"
+#       is_tag = true
+#     [[inputs.snmp.table.field]]
+#       name = "connections"
+#       oid = ".1.0.0.0.1.1"
+#     [[inputs.snmp.table.field]]
+#       name = "latency"
+#       oid = ".1.0.0.0.1.2"
+#
+#   [[inputs.snmp.table]]
+#     ## auto populate table's fields using the MIB
+#     oid = "HOST-RESOURCES-MIB::hrNetworkTable"
+
+
+# # DEPRECATED! PLEASE USE inputs.snmp INSTEAD.
+# [[inputs.snmp_legacy]]
+#   ## Use 'oids.txt' file to translate oids to names
+#   ## To generate 'oids.txt' you need to run:
+#   ##   snmptranslate -m all -Tz -On | sed -e 's/"//g' > /tmp/oids.txt
+#   ## Or if you have an other MIB folder with custom MIBs
+#   ##   snmptranslate -M /mycustommibfolder -Tz -On -m all | sed -e 's/"//g' > oids.txt
+#   snmptranslate_file = "/tmp/oids.txt"
+#   [[inputs.snmp.host]]
+#     address = "192.168.2.2:161"
+#     # SNMP community
+#     community = "public" # default public
+#     # SNMP version (1, 2 or 3)
+#     # Version 3 not supported yet
+#     version = 2 # default 2
+#     # SNMP response timeout
+#     timeout = 2.0 # default 2.0
+#     # SNMP request retries
+#     retries = 2 # default 2
+#     # Which get/bulk do you want to collect for this host
+#     collect = ["mybulk", "sysservices", "sysdescr"]
+#     # Simple list of OIDs to get, in addition to "collect"
+#     get_oids = []
+#
+#   [[inputs.snmp.host]]
+#     address = "192.168.2.3:161"
+#     community = "public"
+#     version = 2
+#     timeout = 2.0
+#     retries = 2
+#     collect = ["mybulk"]
+#     get_oids = [
+#         "ifNumber",
+#         ".1.3.6.1.2.1.1.3.0",
+#     ]
+#
+#   [[inputs.snmp.get]]
+#     name = "ifnumber"
+#     oid = "ifNumber"
+#
+#   [[inputs.snmp.get]]
+#     name = "interface_speed"
+#     oid = "ifSpeed"
+#     instance = "0"
+#
+#   [[inputs.snmp.get]]
+#     name = "sysuptime"
+#     oid = ".1.3.6.1.2.1.1.3.0"
+#     unit = "second"
+#
+#   [[inputs.snmp.bulk]]
+#     name = "mybulk"
+#     max_repetition = 127
+#     oid = ".1.3.6.1.2.1.1"
+#
+#   [[inputs.snmp.bulk]]
+#     name = "ifoutoctets"
+#     max_repetition = 127
+#     oid = "ifOutOctets"
+#
+#   [[inputs.snmp.host]]
+#     address = "192.168.2.13:161"
+#     #address = "127.0.0.1:161"
+#     community = "public"
+#     version = 2
+#     timeout = 2.0
+#     retries = 2
+#     #collect = ["mybulk", "sysservices", "sysdescr", "systype"]
+#     collect = ["sysuptime" ]
+#     [[inputs.snmp.host.table]]
+#       name = "iftable3"
+#       include_instances = ["enp5s0", "eth1"]
+#
+#   # SNMP TABLEs
+#   # table without mapping neither subtables
+#   [[inputs.snmp.table]]
+#     name = "iftable1"
+#     oid = ".1.3.6.1.2.1.31.1.1.1"
+#
+#   # table without mapping but with subtables
+#   [[inputs.snmp.table]]
+#     name = "iftable2"
+#     oid = ".1.3.6.1.2.1.31.1.1.1"
+#     sub_tables = [".1.3.6.1.2.1.2.2.1.13"]
+#
+#   # table with mapping but without subtables
+#   [[inputs.snmp.table]]
+#     name = "iftable3"
+#     oid = ".1.3.6.1.2.1.31.1.1.1"
+#     # if empty. get all instances
+#     mapping_table = ".1.3.6.1.2.1.31.1.1.1.1"
+#     # if empty, get all subtables
+#
+#   # table with both mapping and subtables
+#   [[inputs.snmp.table]]
+#     name = "iftable4"
+#     oid = ".1.3.6.1.2.1.31.1.1.1"
+#     # if empty get all instances
+#     mapping_table = ".1.3.6.1.2.1.31.1.1.1.1"
+#     # if empty get all subtables
+#     # sub_tables could be not "real subtables"
+#     sub_tables=[".1.3.6.1.2.1.2.2.1.13", "bytes_recv", "bytes_send"]
+
+
+# # Read metrics from Microsoft SQL Server
+# [[inputs.sqlserver]]
+#   ## Specify instances to monitor with a list of connection strings.
+#   ## All connection parameters are optional.
+#   ## By default, the host is localhost, listening on default port, TCP 1433.
+#   ##   for Windows, the user is the currently running AD user (SSO).
+#   ##   See https://github.com/denisenkom/go-mssqldb for detailed connection
+#   ##   parameters.
+#   # servers = [
+#   #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
+#   # ]
+
+
+# # Inserts sine and cosine waves for demonstration purposes
+# [[inputs.trig]]
+#   ## Set the amplitude
+#   amplitude = 10.0
+
+
+# # Read Twemproxy stats data
+# [[inputs.twemproxy]]
+#   ## Twemproxy stats address and port (no scheme)
+#   addr = "localhost:22222"
+#   ## Monitor pool name
+#   pools = ["redis_pool", "mc_pool"]
+
+
+# # A plugin to collect stats from Varnish HTTP Cache
+# [[inputs.varnish]]
+#   ## The default location of the varnishstat binary can be overridden with:
+#   binary = "/usr/bin/varnishstat"
+#
+#   ## By default, telegraf gather stats for 3 metric points.
+#   ## Setting stats will override the defaults shown below.
+#   ## Glob matching can be used, ie, stats = ["MAIN.*"]
+#   ## stats may also be set to ["*"], which will collect all stats
+#   stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
+
+
+# # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
+# [[inputs.zfs]]
+#   ## ZFS kstat path. Ignored on FreeBSD
+#   ## If not specified, then default is:
+#   # kstatPath = "/proc/spl/kstat/zfs"
+#
+#   ## By default, telegraf gather all zfs stats
+#   ## If not specified, then default is:
+#   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
+#
+#   ## By default, don't gather zpool stats
+#   # poolMetrics = false
+
+
+# # Reads 'mntr' stats from one or many zookeeper servers
+# [[inputs.zookeeper]]
+#   ## An array of address to gather stats about. Specify an ip or hostname
+#   ## with port. ie localhost:2181, 10.0.0.1:2181, etc.
+#
+#   ## If no servers are specified, then localhost is used as the host.
+#   ## If no port is specified, 2181 is used
+#   servers = [":2181"]
+
+
+
+###############################################################################
+#                            SERVICE INPUT PLUGINS                            #
+###############################################################################
+
+# # AMQP consumer plugin
+# [[inputs.amqp_consumer]]
+#   ## AMQP url
+#   url = "amqp://localhost:5672/influxdb"
+#   ## AMQP exchange
+#   exchange = "telegraf"
+#   ## AMQP queue name
+#   queue = "telegraf"
+#   ## Binding Key
+#   binding_key = "#"
+#
+#   ## Maximum number of messages server should give to the worker.
+#   prefetch_count = 50
+#
+#   ## Auth method. PLAIN and EXTERNAL are supported
+#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
+#   ## described here: https://www.rabbitmq.com/plugins.html
+#   # auth_method = "PLAIN"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   data_format = "influx"
+
+
+# # Influx HTTP write listener
+# [[inputs.http_listener]]
+#   ## Address and port to host HTTP listener on
+#   service_address = ":8186"
+#
+#   ## maximum duration before timing out read of the request
+#   read_timeout = "10s"
+#   ## maximum duration before timing out write of the response
+#   write_timeout = "10s"
+#
+#   ## Maximum allowed http request body size in bytes.
+#   ## 0 means to use the default of 536,870,912 bytes (500 mebibytes)
+#   max_body_size = 0
+#
+#   ## Maximum line size allowed to be sent in bytes.
+#   ## 0 means to use the default of 65536 bytes (64 kibibytes)
+#   max_line_size = 0
+
+
+# # Read metrics from Kafka topic(s)
+# [[inputs.kafka_consumer]]
+#   ## topic(s) to consume
+#   topics = ["telegraf"]
+#   ## an array of Zookeeper connection strings
+#   zookeeper_peers = ["localhost:2181"]
+#   ## Zookeeper Chroot
+#   zookeeper_chroot = ""
+#   ## the name of the consumer group
+#   consumer_group = "telegraf_metrics_consumers"
+#   ## Offset (must be either "oldest" or "newest")
+#   offset = "oldest"
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+#
+#   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
+#   ## larger messages are dropped
+#   max_message_len = 65536
+
+
+# # Stream and parse log file(s).
+# [[inputs.logparser]]
+#   ## Log files to parse.
+#   ## These accept standard unix glob matching rules, but with the addition of
+#   ## ** as a "super asterisk". ie:
+#   ##   /var/log/**.log     -> recursively find all .log files in /var/log
+#   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
+#   ##   /var/log/apache.log -> only tail the apache log file
+#   files = ["/var/log/apache/access.log"]
+#
+#   ## Read files that currently exist from the beginning. Files that are created
+#   ## while telegraf is running (and that match the "files" globs) will always
+#   ## be read from the beginning.
+#   from_beginning = false
+#
+#   ## Parse logstash-style "grok" patterns:
+#   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
+#   [inputs.logparser.grok]
+#     ## This is a list of patterns to check the given log file(s) for.
+#     ## Note that adding patterns here increases processing time. The most
+#     ## efficient configuration is to have one pattern per logparser.
+#     ## Other common built-in patterns are:
+#     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
+#     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
+#     patterns = ["%{COMBINED_LOG_FORMAT}"]
+#     ## Name of the outputted measurement name.
+#     measurement = "apache_access_log"
+#     ## Full path(s) to custom pattern files.
+#     custom_pattern_files = []
+#     ## Custom patterns can also be defined here. Put one pattern per line.
+#     custom_patterns = '''
+#     '''
+
+
+# # Read metrics from MQTT topic(s)
+# [[inputs.mqtt_consumer]]
+#   servers = ["localhost:1883"]
+#   ## MQTT QoS, must be 0, 1, or 2
+#   qos = 0
+#
+#   ## Topics to subscribe to
+#   topics = [
+#     "telegraf/host01/cpu",
+#     "telegraf/+/mem",
+#     "sensors/#",
+#   ]
+#
+#   # if true, messages that can't be delivered while the subscriber is offline
+#   # will be delivered when it comes back (such as on service restart).
+#   # NOTE: if true, client_id MUST be set
+#   persistent_session = false
+#   # If empty, a random client ID will be generated.
+#   client_id = ""
+#
+#   ## username and password to connect MQTT server.
+#   # username = "telegraf"
+#   # password = "metricsmetricsmetricsmetrics"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+
+
+# # Read metrics from NATS subject(s)
+# [[inputs.nats_consumer]]
+#   ## urls of NATS servers
+#   # servers = ["nats://localhost:4222"]
+#   ## Use Transport Layer Security
+#   # secure = false
+#   ## subject(s) to consume
+#   # subjects = ["telegraf"]
+#   ## name a queue group
+#   # queue_group = "telegraf_consumers"
+#
+#   ## Sets the limits for pending msgs and bytes for each subscription
+#   ## These shouldn't need to be adjusted except in very high throughput scenarios
+#   # pending_message_limit = 65536
+#   # pending_bytes_limit = 67108864
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+
+
+# # Read NSQ topic for metrics.
+# [[inputs.nsq_consumer]]
+#   ## An string representing the NSQD TCP Endpoint
+#   server = "localhost:4150"
+#   topic = "telegraf"
+#   channel = "consumer"
+#   max_in_flight = 100
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+
+
+# # Generic socket listener capable of handling multiple socket types.
+# [[inputs.socket_listener]]
+#   ## URL to listen on
+#   # service_address = "tcp://:8094"
+#   # service_address = "tcp://127.0.0.1:http"
+#   # service_address = "tcp4://:8094"
+#   # service_address = "tcp6://:8094"
+#   # service_address = "tcp6://[2001:db8::1]:8094"
+#   # service_address = "udp://:8094"
+#   # service_address = "udp4://:8094"
+#   # service_address = "udp6://:8094"
+#   # service_address = "unix:///tmp/telegraf.sock"
+#   # service_address = "unixgram:///tmp/telegraf.sock"
+#
+#   ## Maximum number of concurrent connections.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   ## 0 (default) is unlimited.
+#   # max_connections = 1024
+#
+#   ## Maximum socket buffer size in bytes.
+#   ## For stream sockets, once the buffer fills up, the sender will start backing up.
+#   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
+#   ## Defaults to the OS default.
+#   # read_buffer_size = 65535
+#
+#   ## Period between keep alive probes.
+#   ## Only applies to TCP sockets.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   # keep_alive_period = "5m"
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   # data_format = "influx"
+
+
+# # Statsd Server
+# [[inputs.statsd]]
+#   ## Address and port to host UDP listener on
+#   service_address = ":8125"
+#
+#   ## The following configuration options control when telegraf clears it's cache
+#   ## of previous values. If set to false, then telegraf will only clear it's
+#   ## cache when the daemon is restarted.
+#   ## Reset gauges every interval (default=true)
+#   delete_gauges = true
+#   ## Reset counters every interval (default=true)
+#   delete_counters = true
+#   ## Reset sets every interval (default=true)
+#   delete_sets = true
+#   ## Reset timings & histograms every interval (default=true)
+#   delete_timings = true
+#
+#   ## Percentiles to calculate for timing & histogram stats
+#   percentiles = [90]
+#
+#   ## separator to use between elements of a statsd metric
+#   metric_separator = "_"
+#
+#   ## Parses tags in the datadog statsd format
+#   ## http://docs.datadoghq.com/guides/dogstatsd/
+#   parse_data_dog_tags = false
+#
+#   ## Statsd data translation templates, more info can be read here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite
+#   # templates = [
+#   #     "cpu.* measurement*"
+#   # ]
+#
+#   ## Number of UDP messages allowed to queue up, once filled,
+#   ## the statsd server will start dropping packets
+#   allowed_pending_messages = 10000
+#
+#   ## Number of timing/histogram values to track per-measurement in the
+#   ## calculation of percentiles. Raising this limit increases the accuracy
+#   ## of percentiles but also increases the memory usage and cpu time.
+#   percentile_limit = 1000
+
+
+# # Stream a log file, like the tail -f command
+# [[inputs.tail]]
+#   ## files to tail.
+#   ## These accept standard unix glob matching rules, but with the addition of
+#   ## ** as a "super asterisk". ie:
+#   ##   "/var/log/**.log"  -> recursively find all .log files in /var/log
+#   ##   "/var/log/*/*.log" -> find all .log files with a parent dir in /var/log
+#   ##   "/var/log/apache.log" -> just tail the apache log file
+#   ##
+#   ## See https://github.com/gobwas/glob for more examples
+#   ##
+#   files = ["/var/mymetrics.out"]
+#   ## Read file from beginning.
+#   from_beginning = false
+#   ## Whether file is a named pipe
+#   pipe = false
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   data_format = "influx"
+
+
+# # Generic TCP listener
+# [[inputs.tcp_listener]]
+#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+#   # socket_listener plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
+
+
+# # Generic UDP listener
+# [[inputs.udp_listener]]
+#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
+#   # socket_listener plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
+
+
+# # A Webhooks Event collector
+[[inputs.webhooks]]
+#   ## Address and port to host Webhook listener on
+   service_address = ":1619"
+#
+#   [inputs.webhooks.filestack]
+#     path = "/filestack"
+#
+#   [inputs.webhooks.github]
+#     path = "/github"
+#     # secret = ""
+#
+#   [inputs.webhooks.mandrill]
+#     path = "/mandrill"
+#
+#   [inputs.webhooks.rollbar]
+#     path = "/rollbar"
+#
+#   [inputs.webhooks.papertrail]
+#     path = "/papertrail"
+    [inputs.webhooks.particle]
+      path = "/particle"

From b2453e3ec319314d819a414b28c7ac124f4f6e1b Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 29 Sep 2017 12:57:13 -0400
Subject: [PATCH 0595/1302] Revert "New Particle.io Plugin for Telegraf"

This reverts commit c3b11f9cfbfb6f2141cff9c6a4bae9fe50eab43d.
Accidentally pushed to master, instead of my fork. Backing it out.
---
 plugins/inputs/webhooks/particle/README.md    |   27 -
 .../webhooks/particle/particle_webhooks.go    |   46 -
 .../particle/particle_webhooks_events.go      |   21 -
 .../particle_webhooks_events_json_test.go     |   38 -
 .../particle/particle_webhooks_test.go        |   48 -
 plugins/inputs/webhooks/webhooks.go           |    5 -
 telegraf.config                               | 2352 -----------------
 7 files changed, 2537 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/README.md
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go
 delete mode 100644 telegraf.config

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
deleted file mode 100644
index 43b7e6968..000000000
--- a/plugins/inputs/webhooks/particle/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# particle webhooks
-
-You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
-
-## Events
-
-Your Particle device should publish an event that contains a JSON in the form of:
-```
-String data = String::format("{ \"tags\" : {
-	    \"tag_name\": \"tag_value\", 
-	    \"other_tag\": \"other_value\"
-    }, 
-	\"values\": {
-	    \"value_name\": %f, 
-		\"other_value\": %f, 
-    }
-    }",  value_value, other_value
-	);
-    Particle.publish("event_name", data, PRIVATE);
-```
-Escaping the "" is required in the source file.
-The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
-
-You will need to enable JSON messages in the Webhooks setup of Particle.io
-
-See [webhook doc](https://docs.particle.io/reference/webhooks/)
-
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
deleted file mode 100644
index b4a2470a5..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package particle
-
-import (
-	"encoding/json"
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-	"io/ioutil"
-	"log"
-	"net/http"
-)
-
-type ParticleWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
-}
-
-func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
-	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
-	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
-	rb.acc = acc
-}
-
-func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	dummy := &DummyData{}
-	if err := json.Unmarshal(data, dummy); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pd := &ParticleData{}
-	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pTime, err := dummy.Time()
-	if err != nil {
-		log.Printf("Time Conversion Error")
-	}
-	rb.acc.AddFields("particle_webhooks", pd.Fields, pd.Tags, pTime)
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
deleted file mode 100644
index 93055285c..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package particle
-
-import (
-	"time"
-)
-
-type DummyData struct {
-	Event       string `json:"event"`
-	Data        string `json:"data"`
-	Ttl         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-}
-type ParticleData struct {
-	Event  string                 `json:"event"`
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func (d *DummyData) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
deleted file mode 100644
index fbb84ac55..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package particle
-
-func NewItemJSON() string {
-	return `
-	{ 
-	  "event": "temperature",
-	  "data": "{ 
-		  "tags": {
-			  "id": "230035001147343438323536", 
-			  "location\": \"TravelingWilbury"
-		  }, 
-		  "values": {
-			  "temp_c": 26.680000, 
-			  "temp_f": 80.024001, 
-			  "humidity": 44.937500, 
-			  "pressure": 998.998901, 
-			  "altitude": 119.331436, 
-			  "broadband": 1266, 
-			  "infrared": 528, 
-			  "lux": 0
-		  }
-	  }",
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor"
-  }`
-}
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
deleted file mode 100644
index 9b016aaf8..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package particle
-
-import (
-	"github.com/influxdata/telegraf/testutil"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-)
-
-func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	log.Printf("eventBody: %s\n", eventBody)
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, NewItemJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-
-	fields := map[string]interface{}{
-		"temp_c": 26.680000,
-	}
-
-	tags := map[string]string{
-		"id":       "230035001147343438323536",
-		"location": "TravelingWilbury",
-	}
-
-	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
-}
-func TestUnknowItem(t *testing.T) {
-	rb := &ParticleWebhook{Path: "/particle"}
-	resp := postWebhooks(rb, UnknowJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 4420c5ab9..698cde159 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,7 +15,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
-	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -35,7 +34,6 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
-	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -64,9 +62,6 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
-    
-  [inputs.webhooks.particle]
-      path = "/particle"
  `
 }
 
diff --git a/telegraf.config b/telegraf.config
deleted file mode 100644
index 669b6de21..000000000
--- a/telegraf.config
+++ /dev/null
@@ -1,2352 +0,0 @@
-# Telegraf Configuration
-#
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-#
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-#
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-#
-# Environment variables can be used anywhere in this config file, simply prepend
-# them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
-# for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
-
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
-  # dc = "us-east-1" # will tag all metrics with dc=us-east-1
-  # rack = "1a"
-  ## Environment variables can be used as tags, and throughout the config file
-  # user = "$USER"
-
-
-# Configuration for telegraf agent
-[agent]
-  ## Default data collection interval for all inputs
-  interval = "10s"
-  ## Rounds collection interval to 'interval'
-  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
-  round_interval = true
-
-  ## Telegraf will send metrics to outputs in batches of at most
-  ## metric_batch_size metrics.
-  ## This controls the size of writes that Telegraf sends to output plugins.
-  metric_batch_size = 1000
-
-  ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
-  ## output, and will flush this buffer on a successful write. Oldest metrics
-  ## are dropped first when this buffer fills.
-  ## This buffer only fills when writes fail to output plugin(s).
-  metric_buffer_limit = 10000
-
-  ## Collection jitter is used to jitter the collection by a random amount.
-  ## Each plugin will sleep for a random time within jitter before collecting.
-  ## This can be used to avoid many plugins querying things like sysfs at the
-  ## same time, which can have a measurable effect on the system.
-  collection_jitter = "0s"
-
-  ## Default flushing interval for all outputs. You shouldn't set this below
-  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
-  flush_interval = "10s"
-  ## Jitter the flush interval by a random amount. This is primarily to avoid
-  ## large write spikes for users running a large number of telegraf instances.
-  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
-  flush_jitter = "0s"
-
-  ## By default or when set to "0s", precision will be set to the same
-  ## timestamp order as the collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
-  ##       when interval = "250ms", precision will be "1ms"
-  ## Precision will NOT be used for service inputs. It is up to each individual
-  ## service input to set the timestamp at the appropriate precision.
-  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = ""
-
-  ## Logging configuration:
-  ## Run telegraf with debug log messages.
-  debug = false
-  ## Run telegraf in quiet mode (error log messages only).
-  quiet = false
-  ## Specify the log file name. The empty string means to log to stderr.
-  logfile = ""
-
-  ## Override default hostname, if empty use os.Hostname()
-  hostname = ""
-  ## If set to true, do no set the "host" tag in the telegraf agent.
-  omit_hostname = false
-
-
-###############################################################################
-#                            OUTPUT PLUGINS                                   #
-###############################################################################
-
-# Configuration for influxdb server to send metrics to
-[[outputs.influxdb]]
-  ## The HTTP or UDP URL for your InfluxDB instance.  Each item should be
-  ## of the form:
-  ##   scheme "://" host [ ":" port]
-  ##
-  ## Multiple urls can be specified as part of the same cluster,
-  ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = ["http://localhost:8086"] # required
-  ## The target database for metrics (telegraf will create it if not exists).
-  database = "telegraf" # required
-
-  ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.
-  retention_policy = ""
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
-  write_consistency = "any"
-
-  ## Write timeout (for the InfluxDB client), formatted as a string.
-  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
-  timeout = "5s"
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
-  # user_agent = "telegraf"
-  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
-  # udp_payload = 512
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
-
-
-# # Configuration for Amon Server to send metrics to.
-# [[outputs.amon]]
-#   ## Amon Server Key
-#   server_key = "my-server-key" # required.
-#
-#   ## Amon Instance URL
-#   amon_instance = "https://youramoninstance" # required
-#
-#   ## Connection timeout.
-#   # timeout = "5s"
-
-
-# # Configuration for the AMQP server to send metrics to
-# [[outputs.amqp]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
-#   exchange = "telegraf"
-#   ## Auth method. PLAIN and EXTERNAL are supported
-#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
-#   ## described here: https://www.rabbitmq.com/plugins.html
-#   # auth_method = "PLAIN"
-#   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, its value will be used as the routing key
-#   routing_tag = "host"
-#
-#   ## InfluxDB retention policy
-#   # retention_policy = "default"
-#   ## InfluxDB database
-#   # database = "telegraf"
-#
-#   ## Write timeout, formatted as a string.  If not provided, will default
-#   ## to 5s. 0s means no timeout (not recommended).
-#   # timeout = "5s"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Configuration for AWS CloudWatch output.
-# [[outputs.cloudwatch]]
-#   ## Amazon REGION
-#   region = "us-east-1"
-#
-#   ## Amazon Credentials
-#   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
-#   #access_key = ""
-#   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
-#   ## Namespace for the CloudWatch MetricDatums
-#   namespace = "InfluxData/Telegraf"
-
-
-# # Configuration for DataDog API to send metrics to.
-# [[outputs.datadog]]
-#   ## Datadog API key
-#   apikey = "my-secret-key" # required.
-#
-#   ## Connection timeout.
-#   # timeout = "5s"
-
-
-# # Send metrics to nowhere at all
-# [[outputs.discard]]
-#   # no configuration
-
-
-# # Configuration for Elasticsearch to send metrics to.
-# [[outputs.elasticsearch]]
-#   ## The full HTTP endpoint URL for your Elasticsearch instance
-#   ## Multiple urls can be specified as part of the same cluster,
-#   ## this means that only ONE of the urls will be written to each interval.
-#   urls = [ "http://node1.es.example.com:9200" ] # required.
-#   ## Elasticsearch client timeout, defaults to "5s" if not set.
-#   timeout = "5s"
-#   ## Set to true to ask Elasticsearch a list of all cluster nodes,
-#   ## thus it is not necessary to list all nodes in the urls config option.
-#   enable_sniffer = false
-#   ## Set the interval to check if the Elasticsearch nodes are available
-#   ## Setting to "0s" will disable the health check (not recommended in production)
-#   health_check_interval = "10s"
-#   ## HTTP basic authentication details (eg. when using Shield)
-#   # username = "telegraf"
-#   # password = "mypassword"
-#
-#   ## Index Config
-#   ## The target index for metrics (Elasticsearch will create if it not exists).
-#   ## You can use the date specifiers below to create indexes per time frame.
-#   ## The metric timestamp will be used to decide the destination index name
-#   # %Y - year (2016)
-#   # %y - last two digits of year (00..99)
-#   # %m - month (01..12)
-#   # %d - day of month (e.g., 01)
-#   # %H - hour (00..23)
-#   index_name = "telegraf-%Y.%m.%d" # required.
-#
-#   ## Template Config
-#   ## Set to true if you want telegraf to manage its index template.
-#   ## If enabled it will create a recommended index template for telegraf indexes
-#   manage_template = true
-#   ## The template name used for telegraf indexes
-#   template_name = "telegraf"
-#   ## Set to true if you want telegraf to overwrite an existing template
-#   overwrite_template = false
-
-
-# # Send telegraf metrics to file(s)
-# [[outputs.file]]
-#   ## Files to write to, "stdout" is a specially handled file.
-#   files = ["stdout", "/tmp/metrics.out"]
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Configuration for Graphite server to send metrics to
-# [[outputs.graphite]]
-#   ## TCP endpoint for your graphite instance.
-#   ## If multiple endpoints are configured, output will be load balanced.
-#   ## Only one of the endpoints will be written to with each iteration.
-#   servers = ["localhost:2003"]
-#   ## Prefix metrics name
-#   prefix = ""
-#   ## Graphite output template
-#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   template = "host.tags.measurement.field"
-#   ## timeout in seconds for the write connection to graphite
-#   timeout = 2
-
-
-# # Send telegraf metrics to graylog(s)
-# [[outputs.graylog]]
-#   ## UDP endpoint for your graylog instance.
-#   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
-
-
-# # Configuration for sending metrics to an Instrumental project
-# [[outputs.instrumental]]
-#   ## Project API Token (required)
-#   api_token = "API Token" # required
-#   ## Prefix the metrics with a given name
-#   prefix = ""
-#   ## Stats output template (Graphite formatting)
-#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
-#   template = "host.tags.measurement.field"
-#   ## Timeout in seconds to connect
-#   timeout = "2s"
-#   ## Display Communcation to Instrumental
-#   debug = false
-
-
-# # Configuration for the Kafka server to send metrics to
-# [[outputs.kafka]]
-#   ## URLs of kafka brokers
-#   brokers = ["localhost:9092"]
-#   ## Kafka topic for producer messages
-#   topic = "telegraf"
-#   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, its value will be used as the routing key
-#   routing_tag = "host"
-#
-#   ## CompressionCodec represents the various compression codecs recognized by
-#   ## Kafka in messages.
-#   ##  0 : No compression
-#   ##  1 : Gzip compression
-#   ##  2 : Snappy compression
-#   compression_codec = 0
-#
-#   ##  RequiredAcks is used in Produce Requests to tell the broker how many
-#   ##  replica acknowledgements it must see before responding
-#   ##   0 : the producer never waits for an acknowledgement from the broker.
-#   ##       This option provides the lowest latency but the weakest durability
-#   ##       guarantees (some data will be lost when a server fails).
-#   ##   1 : the producer gets an acknowledgement after the leader replica has
-#   ##       received the data. This option provides better durability as the
-#   ##       client waits until the server acknowledges the request as successful
-#   ##       (only messages that were written to the now-dead leader but not yet
-#   ##       replicated will be lost).
-#   ##   -1: the producer gets an acknowledgement after all in-sync replicas have
-#   ##       received the data. This option provides the best durability, we
-#   ##       guarantee that no messages will be lost as long as at least one in
-#   ##       sync replica remains.
-#   required_acks = -1
-#
-#   ##  The total number of times to retry sending a message
-#   max_retry = 3
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Optional SASL Config
-#   # sasl_username = "kafka"
-#   # sasl_password = "secret"
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Configuration for the AWS Kinesis output.
-# [[outputs.kinesis]]
-#   ## Amazon REGION of kinesis endpoint.
-#   region = "ap-southeast-2"
-#
-#   ## Amazon Credentials
-#   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
-#   #access_key = ""
-#   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
-#   ## Kinesis StreamName must exist prior to starting telegraf.
-#   streamname = "StreamName"
-#   ## PartitionKey as used for sharding data.
-#   partitionkey = "PartitionKey"
-#   ## If set the paritionKey will be a random UUID on every put.
-#   ## This allows for scaling across multiple shards in a stream.
-#   ## This will cause issues with ordering.
-#   use_random_partitionkey = false
-#
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-#
-#   ## debug will show upstream aws messages.
-#   debug = false
-
-
-# # Configuration for Librato API to send metrics to.
-# [[outputs.librato]]
-#   ## Librator API Docs
-#   ## http://dev.librato.com/v1/metrics-authentication
-#   ## Librato API user
-#   api_user = "telegraf@influxdb.com" # required.
-#   ## Librato API token
-#   api_token = "my-secret-token" # required.
-#   ## Debug
-#   # debug = false
-#   ## Connection timeout.
-#   # timeout = "5s"
-#   ## Output source Template (same as graphite buckets)
-#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
-#   ## This template is used in librato's source (not metric's name)
-#   template = "host"
-#
-
-
-# # Configuration for MQTT server to send metrics to
-# [[outputs.mqtt]]
-#   servers = ["localhost:1883"] # required.
-#
-#   ## MQTT outputs send metrics to this topic format
-#   ##    "<topic_prefix>/<hostname>/<pluginname>/"
-#   ##   ex: prefix/web01.example.com/mem
-#   topic_prefix = "telegraf"
-#
-#   ## username and password to connect MQTT server.
-#   # username = "telegraf"
-#   # password = "metricsmetricsmetricsmetrics"
-#
-#   ## client ID, if not set a random ID is generated
-#   # client_id = ""
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Send telegraf measurements to NATS
-# [[outputs.nats]]
-#   ## URLs of NATS servers
-#   servers = ["nats://localhost:4222"]
-#   ## Optional credentials
-#   # username = ""
-#   # password = ""
-#   ## NATS subject for producer messages
-#   subject = "telegraf"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Send telegraf measurements to NSQD
-# [[outputs.nsq]]
-#   ## Location of nsqd instance listening on TCP
-#   server = "localhost:4150"
-#   ## NSQ topic for producer messages
-#   topic = "telegraf"
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Configuration for OpenTSDB server to send metrics to
-# [[outputs.opentsdb]]
-#   ## prefix for metrics keys
-#   prefix = "my.specific.prefix."
-#
-#   ## DNS name of the OpenTSDB server
-#   ## Using "opentsdb.example.com" or "tcp://opentsdb.example.com" will use the
-#   ## telnet API. "http://opentsdb.example.com" will use the Http API.
-#   host = "opentsdb.example.com"
-#
-#   ## Port of the OpenTSDB server
-#   port = 4242
-#
-#   ## Number of data points to send to OpenTSDB in Http requests.
-#   ## Not used with telnet API.
-#   httpBatchSize = 50
-#
-#   ## Debug true - Prints OpenTSDB communication
-#   debug = false
-
-
-# # Configuration for the Prometheus client to spawn
-# [[outputs.prometheus_client]]
-#   ## Address to listen on
-#   # listen = ":9126"
-#
-#   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
-#   # expiration_interval = "60s"
-
-
-# # Configuration for the Riemann server to send metrics to
-# [[outputs.riemann]]
-#   ## The full TCP or UDP URL of the Riemann server
-#   url = "tcp://localhost:5555"
-#
-#   ## Riemann event TTL, floating-point time in seconds.
-#   ## Defines how long that an event is considered valid for in Riemann
-#   # ttl = 30.0
-#
-#   ## Separator to use between measurement and field name in Riemann service name
-#   ## This does not have any effect if 'measurement_as_attribute' is set to 'true'
-#   separator = "/"
-#
-#   ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name
-#   # measurement_as_attribute = false
-#
-#   ## Send string metrics as Riemann event states.
-#   ## Unless enabled all string metrics will be ignored
-#   # string_as_state = false
-#
-#   ## A list of tag keys whose values get sent as Riemann tags.
-#   ## If empty, all Telegraf tag values will be sent as tags
-#   # tag_keys = ["telegraf","custom_tag"]
-#
-#   ## Additional Riemann tags to send.
-#   # tags = ["telegraf-output"]
-#
-#   ## Description for Riemann event
-#   # description_text = "metrics collected from telegraf"
-#
-#   ## Riemann client write timeout, defaults to "5s" if not set.
-#   # timeout = "5s"
-
-
-# # Configuration for the Riemann server to send metrics to
-# [[outputs.riemann_legacy]]
-#   ## URL of server
-#   url = "localhost:5555"
-#   ## transport protocol to use either tcp or udp
-#   transport = "tcp"
-#   ## separator to use between input name and field name in Riemann service name
-#   separator = " "
-
-
-# # Generic socket writer capable of handling multiple socket types.
-# [[outputs.socket_writer]]
-#   ## URL to connect to
-#   # address = "tcp://127.0.0.1:8094"
-#   # address = "tcp://example.com:http"
-#   # address = "tcp4://127.0.0.1:8094"
-#   # address = "tcp6://127.0.0.1:8094"
-#   # address = "tcp6://[2001:db8::1]:8094"
-#   # address = "udp://127.0.0.1:8094"
-#   # address = "udp4://127.0.0.1:8094"
-#   # address = "udp6://127.0.0.1:8094"
-#   # address = "unix:///tmp/telegraf.sock"
-#   # address = "unixgram:///tmp/telegraf.sock"
-#
-#   ## Period between keep alive probes.
-#   ## Only applies to TCP sockets.
-#   ## 0 disables keep alive probes.
-#   ## Defaults to the OS configuration.
-#   # keep_alive_period = "5m"
-#
-#   ## Data format to generate.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   # data_format = "influx"
-
-
-
-###############################################################################
-#                            PROCESSOR PLUGINS                                #
-###############################################################################
-
-# # Print all metrics that pass through this filter.
-# [[processors.printer]]
-
-
-
-###############################################################################
-#                            AGGREGATOR PLUGINS                               #
-###############################################################################
-
-# # Keep the aggregate min/max of each metric passing through.
-# [[aggregators.minmax]]
-#   ## General Aggregator Arguments:
-#   ## The period on which to flush & clear the aggregator.
-#   period = "30s"
-#   ## If true, the original metric will be dropped by the
-#   ## aggregator and will not get sent to the output plugins.
-#   drop_original = false
-
-
-
-###############################################################################
-#                            INPUT PLUGINS                                    #
-###############################################################################
-
-# Read metrics about cpu usage
-[[inputs.cpu]]
-  ## Whether to report per-cpu stats or not
-  percpu = true
-  ## Whether to report total system cpu stats or not
-  totalcpu = true
-  ## If true, collect raw CPU time metrics.
-  collect_cpu_time = false
-
-
-# Read metrics about disk usage by mount point
-[[inputs.disk]]
-  ## By default, telegraf gather stats for all mountpoints.
-  ## Setting mountpoints will restrict the stats to the specified mountpoints.
-  # mount_points = ["/"]
-
-  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
-  ## present on /run, /var/run, /dev/shm or /dev).
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
-
-
-# Read metrics about disk IO by device
-[[inputs.diskio]]
-  ## By default, telegraf will gather stats for all devices including
-  ## disk partitions.
-  ## Setting devices will restrict the stats to the specified devices.
-  # devices = ["sda", "sdb"]
-  ## Uncomment the following line if you need disk serial numbers.
-  # skip_serial_number = false
-  #
-  ## On systems which support it, device metadata can be added in the form of
-  ## tags.
-  ## Currently only Linux is supported via udev properties. You can view
-  ## available properties for a device by running:
-  ## 'udevadm info -q property -n /dev/sda'
-  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
-  #
-  ## Using the same metadata source as device_tags, you can also customize the
-  ## name of the device via templates.
-  ## The 'name_templates' parameter is a list of templates to try and apply to
-  ## the device. The template may contain variables in the form of '$PROPERTY' or
-  ## '${PROPERTY}'. The first template which does not contain any variables not
-  ## present for the device is used as the device name tag.
-  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
-  ## the near-meaningless DM-0 name.
-  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
-
-
-# Get kernel statistics from /proc/stat
-[[inputs.kernel]]
-  # no configuration
-
-
-# Read metrics about memory usage
-[[inputs.mem]]
-  # no configuration
-
-
-# Get the number of processes and group them by status
-[[inputs.processes]]
-  # no configuration
-
-
-# Read metrics about swap memory usage
-[[inputs.swap]]
-  # no configuration
-
-
-# Read metrics about system load & uptime
-[[inputs.system]]
-  # no configuration
-
-
-# # Read stats from aerospike server(s)
-# [[inputs.aerospike]]
-#   ## Aerospike servers to connect to (with port)
-#   ## This plugin will query all namespaces the aerospike
-#   ## server has configured and get stats for them.
-#   servers = ["localhost:3000"]
-
-
-# # Read Apache status information (mod_status)
-# [[inputs.apache]]
-#   ## An array of Apache status URI to gather stats.
-#   ## Default is "http://localhost/server-status?auto".
-#   urls = ["http://localhost/server-status?auto"]
-#   ## user credentials for basic HTTP authentication
-#   username = "myuser"
-#   password = "mypassword"
-#
-#   ## Timeout to the complete conection and reponse time in seconds
-#   response_timeout = "25s" ## default to 5 seconds
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read metrics of bcache from stats_total and dirty_data
-# [[inputs.bcache]]
-#   ## Bcache sets path
-#   ## If not specified, then default is:
-#   bcachePath = "/sys/fs/bcache"
-#
-#   ## By default, telegraf gather stats for all bcache devices
-#   ## Setting devices will restrict the stats to the specified
-#   ## bcache devices.
-#   bcacheDevs = ["bcache0"]
-
-
-# # Read Cassandra metrics through Jolokia
-# [[inputs.cassandra]]
-#   # This is the context root used to compose the jolokia url
-#   context = "/jolokia/read"
-#   ## List of cassandra servers exposing jolokia read service
-#   servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
-#   ## List of metrics collected on above servers
-#   ## Each metric consists of a jmx path.
-#   ## This will collect all heap memory usage metrics from the jvm and
-#   ## ReadLatency metrics for all keyspaces and tables.
-#   ## "type=Table" in the query works with Cassandra3.0. Older versions might
-#   ## need to use "type=ColumnFamily"
-#   metrics  = [
-#     "/java.lang:type=Memory/HeapMemoryUsage",
-#     "/org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"
-#   ]
-
-
-# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
-# [[inputs.ceph]]
-#   ## This is the recommended interval to poll.  Too frequent and you will lose
-#   ## data points due to timeouts during rebalancing and recovery
-#   interval = '1m'
-#
-#   ## All configuration values are optional, defaults are shown below
-#
-#   ## location of ceph binary
-#   ceph_binary = "/usr/bin/ceph"
-#
-#   ## directory in which to look for socket files
-#   socket_dir = "/var/run/ceph"
-#
-#   ## prefix of MON and OSD socket files, used to determine socket type
-#   mon_prefix = "ceph-mon"
-#   osd_prefix = "ceph-osd"
-#
-#   ## suffix used to identify socket files
-#   socket_suffix = "asok"
-#
-#   ## Ceph user to authenticate as
-#   ceph_user = "client.admin"
-#
-#   ## Ceph configuration to use to locate the cluster
-#   ceph_config = "/etc/ceph/ceph.conf"
-#
-#   ## Whether to gather statistics via the admin socket
-#   gather_admin_socket_stats = true
-#
-#   ## Whether to gather statistics via ceph commands
-#   gather_cluster_stats = false
-
-
-# # Read specific statistics per cgroup
-# [[inputs.cgroup]]
-#   ## Directories in which to look for files, globs are supported.
-#   ## Consider restricting paths to the set of cgroups you really
-#   ## want to monitor if you have a large number of cgroups, to avoid
-#   ## any cardinality issues.
-#   # paths = [
-#   #   "/cgroup/memory",
-#   #   "/cgroup/memory/child1",
-#   #   "/cgroup/memory/child2/*",
-#   # ]
-#   ## cgroup stat fields, as file names, globs are supported.
-#   ## these file names are appended to each path from above.
-#   # files = ["memory.*usage*", "memory.limit_in_bytes"]
-
-
-# # Pull Metric Statistics from Amazon CloudWatch
-# [[inputs.cloudwatch]]
-#   ## Amazon Region
-#   region = "us-east-1"
-#
-#   ## Amazon Credentials
-#   ## Credentials are loaded in the following order
-#   ## 1) Assumed credentials via STS if role_arn is specified
-#   ## 2) explicit credentials from 'access_key' and 'secret_key'
-#   ## 3) shared profile from 'profile'
-#   ## 4) environment variables
-#   ## 5) shared credentials file
-#   ## 6) EC2 Instance Profile
-#   #access_key = ""
-#   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
-#
-#   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
-#   # metrics are made available to the 1 minute period. Some are collected at
-#   # 3 minute and 5 minutes intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
-#   # Note that if a period is configured that is smaller than the minimum for a
-#   # particular metric, that metric will not be returned by the Cloudwatch API
-#   # and will not be collected by Telegraf.
-#   #
-#   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
-#   period = "5m"
-#
-#   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
-#   delay = "5m"
-#
-#   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
-#   ## gaps or overlap in pulled data
-#   interval = "5m"
-#
-#   ## Configure the TTL for the internal cache of metrics.
-#   ## Defaults to 1 hr if not specified
-#   #cache_ttl = "10m"
-#
-#   ## Metric Statistic Namespace (required)
-#   namespace = "AWS/ELB"
-#
-#   ## Maximum requests per second. Note that the global default AWS rate limit is
-#   ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
-#   ## maximum of 400. Optional - default value is 200.
-#   ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
-#   ratelimit = 200
-#
-#   ## Metrics to Pull (optional)
-#   ## Defaults to all Metrics in Namespace if nothing is provided
-#   ## Refreshes Namespace available metrics every 1h
-#   #[[inputs.cloudwatch.metrics]]
-#   #  names = ["Latency", "RequestCount"]
-#   #
-#   #  ## Dimension filters for Metric (optional)
-#   #  [[inputs.cloudwatch.metrics.dimensions]]
-#   #    name = "LoadBalancerName"
-#   #    value = "p-example"
-
-
-# # Gather health check statuses from services registered in Consul
-# [[inputs.consul]]
-#   ## Most of these values defaults to the one configured on a Consul's agent level.
-#   ## Optional Consul server address (default: "localhost")
-#   # address = "localhost"
-#   ## Optional URI scheme for the Consul server (default: "http")
-#   # scheme = "http"
-#   ## Optional ACL token used in every request (default: "")
-#   # token = ""
-#   ## Optional username used for request HTTP Basic Authentication (default: "")
-#   # username = ""
-#   ## Optional password used for HTTP Basic Authentication (default: "")
-#   # password = ""
-#   ## Optional data centre to query the health checks from (default: "")
-#   # datacentre = ""
-
-
-# # Read metrics from one or many couchbase clusters
-# [[inputs.couchbase]]
-#   ## specify servers via a url matching:
-#   ##  [protocol://][:password]@address[:port]
-#   ##  e.g.
-#   ##    http://couchbase-0.example.com/
-#   ##    http://admin:secret@couchbase-0.example.com:8091/
-#   ##
-#   ## If no servers are specified, then localhost is used as the host.
-#   ## If no protocol is specifed, HTTP is used.
-#   ## If no port is specified, 8091 is used.
-#   servers = ["http://localhost:8091"]
-
-
-# # Read CouchDB Stats from one or more servers
-# [[inputs.couchdb]]
-#   ## Works with CouchDB stats endpoints out of the box
-#   ## Multiple HOSTs from which to read CouchDB stats:
-#   hosts = ["http://localhost:8086/_stats"]
-
-
-# # Read metrics from one or many disque servers
-# [[inputs.disque]]
-#   ## An array of URI to gather stats about. Specify an ip or hostname
-#   ## with optional port and password.
-#   ## ie disque://localhost, disque://10.10.3.33:18832, 10.0.0.1:10000, etc.
-#   ## If no servers are specified, then localhost is used as the host.
-#   servers = ["localhost"]
-
-
-# # Provide a native collection for dmsetup based statistics for dm-cache
-# [[inputs.dmcache]]
-#   ## Whether to report per-device stats or not
-#   per_device = true
-
-
-# # Query given DNS server and gives statistics
-# [[inputs.dns_query]]
-#   ## servers to query
-#   servers = ["8.8.8.8"] # required
-#
-#   ## Domains or subdomains to query. "."(root) is default
-#   domains = ["."] # optional
-#
-#   ## Query record type. Default is "A"
-#   ## Posible values: A, AAAA, CNAME, MX, NS, PTR, TXT, SOA, SPF, SRV.
-#   record_type = "A" # optional
-#
-#   ## Dns server port. 53 is default
-#   port = 53 # optional
-#
-#   ## Query timeout in seconds. Default is 2 seconds
-#   timeout = 2 # optional
-
-
-# # Read metrics about docker containers
-# [[inputs.docker]]
-#   ## Docker Endpoint
-#   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
-#   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
-#   endpoint = "unix:///var/run/docker.sock"
-#   ## Only collect metrics for these containers, collect all if empty
-#   container_names = []
-#   ## Timeout for docker list, info, and stats commands
-#   timeout = "5s"
-#
-#   ## Whether to report for each container per-device blkio (8:0, 8:1...) and
-#   ## network (eth0, eth1, ...) stats or not
-#   perdevice = true
-#   ## Whether to report for each container total blkio and network stats or not
-#   total = false
-#
-#   ## docker labels to include and exclude as tags.  Globs accepted.
-#   ## Note that an empty array for both will include all labels as tags
-#   docker_label_include = []
-#   docker_label_exclude = []
-
-
-# # Read statistics from one or many dovecot servers
-# [[inputs.dovecot]]
-#   ## specify dovecot servers via an address:port list
-#   ##  e.g.
-#   ##    localhost:24242
-#   ##
-#   ## If no servers are specified, then localhost is used as the host.
-#   servers = ["localhost:24242"]
-#   ## Type is one of "user", "domain", "ip", or "global"
-#   type = "global"
-#   ## Wildcard matches like "*.com". An empty string "" is same as "*"
-#   ## If type = "ip" filters should be <IP/network>
-#   filters = [""]
-
-
-# # Read stats from one or more Elasticsearch servers or clusters
-# [[inputs.elasticsearch]]
-#   ## specify a list of one or more Elasticsearch servers
-#   # you can add username and password to your url to use basic authentication:
-#   # servers = ["http://user:pass@localhost:9200"]
-#   servers = ["http://localhost:9200"]
-#
-#   ## Timeout for HTTP requests to the elastic search server(s)
-#   http_timeout = "5s"
-#
-#   ## When local is true (the default), the node will read only its own stats.
-#   ## Set local to false when you want to read the node stats from all nodes
-#   ## of the cluster.
-#   local = true
-#
-#   ## Set cluster_health to true when you want to also obtain cluster health stats
-#   cluster_health = false
-#
-#   ## Set cluster_stats to true when you want to also obtain cluster stats from the
-#   ## Master node.
-#   cluster_stats = false
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read metrics from one or more commands that can output to stdout
-# [[inputs.exec]]
-#   ## Commands array
-#   commands = [
-#     "/tmp/test.sh",
-#     "/usr/bin/mycollector --foo=bar",
-#     "/tmp/collect_*.sh"
-#   ]
-#
-#   ## Timeout for each command to complete.
-#   timeout = "5s"
-#
-#   ## measurement name suffix (for separating different commands)
-#   name_suffix = "_mycollector"
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-
-
-# # Read stats about given file(s)
-# [[inputs.filestat]]
-#   ## Files to gather stats about.
-#   ## These accept standard unix glob matching rules, but with the addition of
-#   ## ** as a "super asterisk". ie:
-#   ##   "/var/log/**.log"  -> recursively find all .log files in /var/log
-#   ##   "/var/log/*/*.log" -> find all .log files with a parent dir in /var/log
-#   ##   "/var/log/apache.log" -> just tail the apache log file
-#   ##
-#   ## See https://github.com/gobwas/glob for more examples
-#   ##
-#   files = ["/var/log/**.log"]
-#   ## If true, read the entire file and calculate an md5 checksum.
-#   md5 = false
-
-
-# # Read flattened metrics from one or more GrayLog HTTP endpoints
-# [[inputs.graylog]]
-#   ## API endpoint, currently supported API:
-#   ##
-#   ##   - multiple  (Ex http://<host>:12900/system/metrics/multiple)
-#   ##   - namespace (Ex http://<host>:12900/system/metrics/namespace/{namespace})
-#   ##
-#   ## For namespace endpoint, the metrics array will be ignored for that call.
-#   ## Endpoint can contain namespace and multiple type calls.
-#   ##
-#   ## Please check http://[graylog-server-ip]:12900/api-browser for full list
-#   ## of endpoints
-#   servers = [
-#     "http://[graylog-server-ip]:12900/system/metrics/multiple",
-#   ]
-#
-#   ## Metrics list
-#   ## List of metrics can be found on Graylog webservice documentation.
-#   ## Or by hitting the the web service api at:
-#   ##   http://[graylog-host]:12900/system/metrics
-#   metrics = [
-#     "jvm.cl.loaded",
-#     "jvm.memory.pools.Metaspace.committed"
-#   ]
-#
-#   ## Username and password
-#   username = ""
-#   password = ""
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read metrics of haproxy, via socket or csv stats page
-# [[inputs.haproxy]]
-#   ## An array of address to gather stats about. Specify an ip on hostname
-#   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
-#   ## Make sure you specify the complete path to the stats endpoint
-#   ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
-#
-#   ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
-#   servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-#
-#   ## You can also use local socket with standard wildcard globbing.
-#   ## Server address not starting with 'http' will be treated as a possible
-#   ## socket, so both examples below are valid.
-#   # servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
-#
-#   ## By default, some of the fields are renamed from what haproxy calls them.
-#   ## Setting this option to true results in the plugin keeping the original
-#   ## field names.
-#   # keep_field_names = true
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # HTTP/HTTPS request given an address a method and a timeout
-# [[inputs.http_response]]
-#   ## Server address (default http://localhost)
-#   address = "http://github.com"
-#   ## Set response_timeout (default 5 seconds)
-#   response_timeout = "5s"
-#   ## HTTP Request Method
-#   method = "GET"
-#   ## Whether to follow redirects from the server (defaults to false)
-#   follow_redirects = true
-#   ## HTTP Request Headers (all values must be strings)
-#   # [inputs.http_response.headers]
-#   #   Host = "github.com"
-#   ## Optional HTTP Request Body
-#   # body = '''
-#   # {'fake':'data'}
-#   # '''
-#
-#   ## Optional substring or regex match in body of the response
-#   ## response_string_match = "\"service_status\": \"up\""
-#   ## response_string_match = "ok"
-#   ## response_string_match = "\".*_status\".?:.?\"up\""
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read flattened metrics from one or more JSON HTTP endpoints
-# [[inputs.httpjson]]
-#   ## NOTE This plugin only reads numerical measurements, strings and booleans
-#   ## will be ignored.
-#
-#   ## Name for the service being polled.  Will be appended to the name of the
-#   ## measurement e.g. httpjson_webserver_stats
-#   ##
-#   ## Deprecated (1.3.0): Use name_override, name_suffix, name_prefix instead.
-#   name = "webserver_stats"
-#
-#   ## URL of each server in the service's cluster
-#   servers = [
-#     "http://localhost:9999/stats/",
-#     "http://localhost:9998/stats/",
-#   ]
-#   ## Set response_timeout (default 5 seconds)
-#   response_timeout = "5s"
-#
-#   ## HTTP method to use: GET or POST (case-sensitive)
-#   method = "GET"
-#
-#   ## List of tag names to extract from top-level of JSON server response
-#   # tag_keys = [
-#   #   "my_tag_1",
-#   #   "my_tag_2"
-#   # ]
-#
-#   ## HTTP parameters (all values must be strings).  For "GET" requests, data
-#   ## will be included in the query.  For "POST" requests, data will be included
-#   ## in the request body as "x-www-form-urlencoded".
-#   # [inputs.httpjson.parameters]
-#   #   event_type = "cpu_spike"
-#   #   threshold = "0.75"
-#
-#   ## HTTP Headers (all values must be strings)
-#   # [inputs.httpjson.headers]
-#   #   X-Auth-Token = "my-xauth-token"
-#   #   apiVersion = "v1"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read InfluxDB-formatted JSON metrics from one or more HTTP endpoints
-# [[inputs.influxdb]]
-#   ## Works with InfluxDB debug endpoints out of the box,
-#   ## but other services can use this format too.
-#   ## See the influxdb plugin's README for more details.
-#
-#   ## Multiple URLs from which to read InfluxDB-formatted JSON
-#   ## Default is "http://localhost:8086/debug/vars".
-#   urls = [
-#     "http://localhost:8086/debug/vars"
-#   ]
-#
-#   ## http request & header timeout
-#   timeout = "5s"
-
-
-# # Collect statistics about itself
-# [[inputs.internal]]
-#   ## If true, collect telegraf memory stats.
-#   # collect_memstats = true
-
-
-# # This plugin gathers interrupts data from /proc/interrupts and /proc/softirqs.
-# [[inputs.interrupts]]
-#   ## To filter which IRQs to collect, make use of tagpass / tagdrop, i.e.
-#   # [inputs.interrupts.tagdrop]
-#     # irq = [ "NET_RX", "TASKLET" ]
-
-
-# # Read metrics from the bare metal servers via IPMI
-# [[inputs.ipmi_sensor]]
-#   ## optionally specify the path to the ipmitool executable
-#   # path = "/usr/bin/ipmitool"
-#   #
-#   ## optionally specify one or more servers via a url matching
-#   ##  [username[:password]@][protocol[(address)]]
-#   ##  e.g.
-#   ##    root:passwd@lan(127.0.0.1)
-#   ##
-#   ## if no servers are specified, local machine sensor stats will be queried
-#   ##
-#   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
-
-
-# # Read JMX metrics through Jolokia
-# [[inputs.jolokia]]
-#   ## This is the context root used to compose the jolokia url
-#   ## NOTE that Jolokia requires a trailing slash at the end of the context root
-#   ## NOTE that your jolokia security policy must allow for POST requests.
-#   context = "/jolokia/"
-#
-#   ## This specifies the mode used
-#   # mode = "proxy"
-#   #
-#   ## When in proxy mode this section is used to specify further
-#   ## proxy address configurations.
-#   ## Remember to change host address to fit your environment.
-#   # [inputs.jolokia.proxy]
-#   #   host = "127.0.0.1"
-#   #   port = "8080"
-#
-#   ## Optional http timeouts
-#   ##
-#   ## response_header_timeout, if non-zero, specifies the amount of time to wait
-#   ## for a server's response headers after fully writing the request.
-#   # response_header_timeout = "3s"
-#   ##
-#   ## client_timeout specifies a time limit for requests made by this client.
-#   ## Includes connection time, any redirects, and reading the response body.
-#   # client_timeout = "4s"
-#
-#   ## Attribute delimiter
-#   ##
-#   ## When multiple attributes are returned for a single
-#   ## [inputs.jolokia.metrics], the field name is a concatenation of the metric
-#   ## name, and the attribute name, separated by the given delimiter.
-#   # delimiter = "_"
-#
-#   ## List of servers exposing jolokia read service
-#   [[inputs.jolokia.servers]]
-#     name = "as-server-01"
-#     host = "127.0.0.1"
-#     port = "8080"
-#     # username = "myuser"
-#     # password = "mypassword"
-#
-#   ## List of metrics collected on above servers
-#   ## Each metric consists in a name, a jmx path and either
-#   ## a pass or drop slice attribute.
-#   ## This collect all heap memory usage metrics.
-#   [[inputs.jolokia.metrics]]
-#     name = "heap_memory_usage"
-#     mbean  = "java.lang:type=Memory"
-#     attribute = "HeapMemoryUsage"
-#
-#   ## This collect thread counts metrics.
-#   [[inputs.jolokia.metrics]]
-#     name = "thread_count"
-#     mbean  = "java.lang:type=Threading"
-#     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
-#
-#   ## This collect number of class loaded/unloaded counts metrics.
-#   [[inputs.jolokia.metrics]]
-#     name = "class_count"
-#     mbean  = "java.lang:type=ClassLoading"
-#     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
-
-
-# # Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints
-# [[inputs.kapacitor]]
-#   ## Multiple URLs from which to read Kapacitor-formatted JSON
-#   ## Default is "http://localhost:9092/kapacitor/v1/debug/vars".
-#   urls = [
-#     "http://localhost:9092/kapacitor/v1/debug/vars"
-#   ]
-#
-#   ## Time limit for http requests
-#   timeout = "5s"
-
-
-# # Read metrics from the kubernetes kubelet api
-# [[inputs.kubernetes]]
-#   ## URL for the kubelet
-#   url = "http://1.1.1.1:10255"
-#
-#   ## Use bearer token for authorization
-#   # bearer_token = /path/to/bearer/token
-#
-#   ## Optional SSL Config
-#   # ssl_ca = /path/to/cafile
-#   # ssl_cert = /path/to/certfile
-#   # ssl_key = /path/to/keyfile
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read metrics from a LeoFS Server via SNMP
-# [[inputs.leofs]]
-#   ## An array of URLs of the form:
-#   ##   "udp://" host [ ":" port]
-#   servers = ["udp://127.0.0.1:4020"]
-
-
-# # Provides Linux sysctl fs metrics
-# [[inputs.linux_sysctl_fs]]
-#   # no configuration
-
-
-# # Read metrics from local Lustre service on OST, MDS
-# [[inputs.lustre2]]
-#   ## An array of /proc globs to search for Lustre stats
-#   ## If not specified, the default will work on Lustre 2.5.x
-#   ##
-#   # ost_procfiles = [
-#   #   "/proc/fs/lustre/obdfilter/*/stats",
-#   #   "/proc/fs/lustre/osd-ldiskfs/*/stats",
-#   #   "/proc/fs/lustre/obdfilter/*/job_stats",
-#   # ]
-#   # mds_procfiles = [
-#   #   "/proc/fs/lustre/mdt/*/md_stats",
-#   #   "/proc/fs/lustre/mdt/*/job_stats",
-#   # ]
-
-
-# # Gathers metrics from the /3.0/reports MailChimp API
-# [[inputs.mailchimp]]
-#   ## MailChimp API key
-#   ## get from https://admin.mailchimp.com/account/api/
-#   api_key = "" # required
-#   ## Reports for campaigns sent more than days_old ago will not be collected.
-#   ## 0 means collect all.
-#   days_old = 0
-#   ## Campaign ID to get, if empty gets all campaigns, this option overrides days_old
-#   # campaign_id = ""
-
-
-# # Read metrics from one or many memcached servers
-# [[inputs.memcached]]
-#   ## An array of address to gather stats about. Specify an ip on hostname
-#   ## with optional port. ie localhost, 10.0.0.1:11211, etc.
-#   servers = ["localhost:11211"]
-#   # unix_sockets = ["/var/run/memcached.sock"]
-
-
-# # Telegraf plugin for gathering metrics from N Mesos masters
-# [[inputs.mesos]]
-#   ## Timeout, in ms.
-#   timeout = 100
-#   ## A list of Mesos masters.
-#   masters = ["localhost:5050"]
-#   ## Master metrics groups to be collected, by default, all enabled.
-#   master_collections = [
-#     "resources",
-#     "master",
-#     "system",
-#     "agents",
-#     "frameworks",
-#     "tasks",
-#     "messages",
-#     "evqueue",
-#     "registrar",
-#   ]
-#   ## A list of Mesos slaves, default is []
-#   # slaves = []
-#   ## Slave metrics groups to be collected, by default, all enabled.
-#   # slave_collections = [
-#   #   "resources",
-#   #   "agent",
-#   #   "system",
-#   #   "executors",
-#   #   "tasks",
-#   #   "messages",
-#   # ]
-
-
-# # Read metrics from one or many MongoDB servers
-# [[inputs.mongodb]]
-#   ## An array of URLs of the form:
-#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
-#   ## For example:
-#   ##   mongodb://user:auth_key@10.10.3.30:27017,
-#   ##   mongodb://10.10.3.33:18832,
-#   servers = ["mongodb://127.0.0.1:27017"]
-#   gather_perdb_stats = false
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Read metrics from one or many mysql servers
-# [[inputs.mysql]]
-#   ## specify servers via a url matching:
-#   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
-#   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
-#   ##  e.g.
-#   ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
-#   ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
-#   #
-#   ## If no servers are specified, then localhost is used as the host.
-#   servers = ["tcp(127.0.0.1:3306)/"]
-#   ## the limits for metrics form perf_events_statements
-#   perf_events_statements_digest_text_limit  = 120
-#   perf_events_statements_limit              = 250
-#   perf_events_statements_time_limit         = 86400
-#   #
-#   ## if the list is empty, then metrics are gathered from all databasee tables
-#   table_schema_databases                    = []
-#   #
-#   ## gather metrics from INFORMATION_SCHEMA.TABLES for databases provided above list
-#   gather_table_schema                       = false
-#   #
-#   ## gather thread state counts from INFORMATION_SCHEMA.PROCESSLIST
-#   gather_process_list                       = true
-#   #
-#   ## gather thread state counts from INFORMATION_SCHEMA.USER_STATISTICS
-#   gather_user_statistics                    = true
-#   #
-#   ## gather auto_increment columns and max values from information schema
-#   gather_info_schema_auto_inc               = true
-#   #
-#   ## gather metrics from INFORMATION_SCHEMA.INNODB_METRICS
-#   gather_innodb_metrics                     = true
-#   #
-#   ## gather metrics from SHOW SLAVE STATUS command output
-#   gather_slave_status                       = true
-#   #
-#   ## gather metrics from SHOW BINARY LOGS command output
-#   gather_binary_logs                        = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
-#   gather_table_io_waits                     = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_LOCK_WAITS
-#   gather_table_lock_waits                   = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_INDEX_USAGE
-#   gather_index_io_waits                     = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.EVENT_WAITS
-#   gather_event_waits                        = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.FILE_SUMMARY_BY_EVENT_NAME
-#   gather_file_events_stats                  = false
-#   #
-#   ## gather metrics from PERFORMANCE_SCHEMA.EVENTS_STATEMENTS_SUMMARY_BY_DIGEST
-#   gather_perf_events_statements             = false
-#   #
-#   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
-#   interval_slow                   = "30m"
-
-
-# # Read metrics about network interface usage
-[[inputs.net]]
-#   ## By default, telegraf gathers stats from any up interface (excluding loopback)
-#   ## Setting interfaces will tell it to gather these explicit interfaces,
-#   ## regardless of status.
-#   ##
-#   # interfaces = ["eth0"]
-interfaces = ["en0"]
-
-# # TCP or UDP 'ping' given url and collect response time in seconds
-# [[inputs.net_response]]
-#   ## Protocol, must be "tcp" or "udp"
-#   ## NOTE: because the "udp" protocol does not respond to requests, it requires
-#   ## a send/expect string pair (see below).
-#   protocol = "tcp"
-#   ## Server address (default localhost)
-#   address = "localhost:80"
-#   ## Set timeout
-#   timeout = "1s"
-#
-#   ## Set read timeout (only used if expecting a response)
-#   read_timeout = "1s"
-#
-#   ## The following options are required for UDP checks. For TCP, they are
-#   ## optional. The plugin will send the given string to the server and then
-#   ## expect to receive the given 'expect' string back.
-#   ## string sent to the server
-#   # send = "ssh"
-#   ## expected string in answer
-#   # expect = "ssh"
-
-
-# # Read TCP metrics such as established, time wait and sockets counts.
-# [[inputs.netstat]]
-#   # no configuration
-
-
-# # Read Nginx's basic status information (ngx_http_stub_status_module)
-# [[inputs.nginx]]
-#   ## An array of Nginx stub_status URI to gather stats.
-#   urls = ["http://localhost/status"]
-
-
-# # Read NSQ topic and channel statistics.
-# [[inputs.nsq]]
-#   ## An array of NSQD HTTP API endpoints
-#   endpoints = ["http://localhost:4151"]
-
-
-# # Collect kernel snmp counters and network interface statistics
-# [[inputs.nstat]]
-#   ## file paths for proc files. If empty default paths will be used:
-#   ##    /proc/net/netstat, /proc/net/snmp, /proc/net/snmp6
-#   ## These can also be overridden with env variables, see README.
-#   proc_net_netstat = "/proc/net/netstat"
-#   proc_net_snmp = "/proc/net/snmp"
-#   proc_net_snmp6 = "/proc/net/snmp6"
-#   ## dump metrics with 0 values too
-#   dump_zeros       = true
-
-
-# # Get standard NTP query metrics, requires ntpq executable.
-# [[inputs.ntpq]]
-#   ## If false, set the -n ntpq flag. Can reduce metric gather time.
-#   dns_lookup = true
-
-
-# # Read metrics of passenger using passenger-status
-# [[inputs.passenger]]
-#   ## Path of passenger-status.
-#   ##
-#   ## Plugin gather metric via parsing XML output of passenger-status
-#   ## More information about the tool:
-#   ##   https://www.phusionpassenger.com/library/admin/apache/overall_status_report.html
-#   ##
-#   ## If no path is specified, then the plugin simply execute passenger-status
-#   ## hopefully it can be found in your PATH
-#   command = "passenger-status -v --show=xml"
-
-
-# # Read metrics of phpfpm, via HTTP status page or socket
-# [[inputs.phpfpm]]
-#   ## An array of addresses to gather stats about. Specify an ip or hostname
-#   ## with optional port and path
-#   ##
-#   ## Plugin can be configured in three modes (either can be used):
-#   ##   - http: the URL must start with http:// or https://, ie:
-#   ##       "http://localhost/status"
-#   ##       "http://192.168.130.1/status?full"
-#   ##
-#   ##   - unixsocket: path to fpm socket, ie:
-#   ##       "/var/run/php5-fpm.sock"
-#   ##      or using a custom fpm status path:
-#   ##       "/var/run/php5-fpm.sock:fpm-custom-status-path"
-#   ##
-#   ##   - fcgi: the URL must start with fcgi:// or cgi://, and port must be present, ie:
-#   ##       "fcgi://10.0.0.12:9000/status"
-#   ##       "cgi://10.0.10.12:9001/status"
-#   ##
-#   ## Example of multiple gathering from local socket and remove host
-#   ## urls = ["http://192.168.1.20/status", "/tmp/fpm.sock"]
-#   urls = ["http://localhost/status"]
-
-
-# # Ping given url(s) and return statistics
-# [[inputs.ping]]
-#   ## NOTE: this plugin forks the ping command. You may need to set capabilities
-#   ## via setcap cap_net_raw+p /bin/ping
-#   #
-#   ## List of urls to ping
-#   urls = ["www.google.com"] # required
-#   ## number of pings to send per collection (ping -c <COUNT>)
-#   # count = 1
-#   ## interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
-#   # ping_interval = 1.0
-#   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
-#   # timeout = 1.0
-#   ## interface to send ping from (ping -I <INTERFACE>)
-#   # interface = ""
-
-
-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   ##
-#   ## All connection parameters are optional.
-#   ##
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   ##
-#   address = "host=localhost user=postgres sslmode=disable"
-#
-#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'databases' option.
-#   # ignored_databases = ["postgres", "template0", "template1"]
-#
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
-#   # databases = ["app_production", "testing"]
-
-
-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql_extensible]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   #
-#   ## All connection parameters are optional.  #
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   #
-#   address = "host=localhost user=postgres sslmode=disable"
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.
-#   ## databases = ["app_production", "testing"]
-#   #
-#   # outputaddress = "db01"
-#   ## A custom name for the database that will be used as the "server" tag in the
-#   ## measurement output. If not specified, a default one generated from
-#   ## the connection address is used.
-#   #
-#   ## Define the toml config where the sql queries are stored
-#   ## New queries can be added, if the withdbname is set to true and there is no
-#   ## databases defined in the 'databases field', the sql query is ended by a
-#   ## 'is not null' in order to make the query succeed.
-#   ## Example :
-#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
-#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
-#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
-#   ## withdbname was true. Be careful that if the withdbname is set to false you
-#   ## don't have to define the where clause (aka with the dbname) the tagvalue
-#   ## field is used to define custom tags (separated by commas)
-#   ## The optional "measurement" value can be used to override the default
-#   ## output measurement name ("postgresql").
-#   #
-#   ## Structure :
-#   ## [[inputs.postgresql_extensible.query]]
-#   ##   sqlquery string
-#   ##   version string
-#   ##   withdbname boolean
-#   ##   tagvalue string (comma separated)
-#   ##   measurement string
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_database"
-#     version=901
-#     withdbname=false
-#     tagvalue=""
-#     measurement=""
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_bgwriter"
-#     version=901
-#     withdbname=false
-#     tagvalue="postgresql.stats"
-
-
-# # Read metrics from one or many PowerDNS servers
-# [[inputs.powerdns]]
-#   ## An array of sockets to gather stats about.
-#   ## Specify a path to unix socket.
-#   unix_sockets = ["/var/run/pdns.controlsocket"]
-
-
-# # Monitor process cpu and memory usage
-# [[inputs.procstat]]
-#   ## Must specify one of: pid_file, exe, or pattern
-#   ## PID file to monitor process
-#   pid_file = "/var/run/nginx.pid"
-#   ## executable name (ie, pgrep <exe>)
-#   # exe = "nginx"
-#   ## pattern as argument for pgrep (ie, pgrep -f <pattern>)
-#   # pattern = "nginx"
-#   ## user as argument for pgrep (ie, pgrep -u <user>)
-#   # user = "nginx"
-#
-#   ## override for process_name
-#   ## This is optional; default is sourced from /proc/<pid>/status
-#   # process_name = "bar"
-#   ## Field name prefix
-#   prefix = ""
-#   ## comment this out if you want raw cpu_time stats
-#   fielddrop = ["cpu_time_*"]
-#   ## This is optional; moves pid into a tag instead of a field
-#   pid_tag = false
-
-
-# # Read metrics from one or many prometheus clients
-# [[inputs.prometheus]]
-#   ## An array of urls to scrape metrics from.
-#   urls = ["http://localhost:9100/metrics"]
-#
-#   ## Use bearer token for authorization
-#   # bearer_token = /path/to/bearer/token
-#
-#   ## Specify timeout duration for slower prometheus clients (default is 3s)
-#   # response_timeout = "3s"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = /path/to/cafile
-#   # ssl_cert = /path/to/certfile
-#   # ssl_key = /path/to/keyfile
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-
-
-# # Reads last_run_summary.yaml file and converts to measurments
-# [[inputs.puppetagent]]
-#   ## Location of puppet last run summary file
-#   location = "/var/lib/puppet/state/last_run_summary.yaml"
-
-
-# # Reads metrics from RabbitMQ servers via the Management Plugin
-# [[inputs.rabbitmq]]
-#   ## Management Plugin url. (default: http://localhost:15672)
-#   # url = "http://localhost:15672"
-#   ## Tag added to rabbitmq_overview series; deprecated: use tags
-#   # name = "rmq-server-1"
-#   ## Credentials
-#   # username = "guest"
-#   # password = "guest"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Optional request timeouts
-#   ##
-#   ## ResponseHeaderTimeout, if non-zero, specifies the amount of time to wait
-#   ## for a server's response headers after fully writing the request.
-#   # header_timeout = "3s"
-#   ##
-#   ## client_timeout specifies a time limit for requests made by this client.
-#   ## Includes connection time, any redirects, and reading the response body.
-#   # client_timeout = "4s"
-#
-#   ## A list of nodes to pull metrics about. If not specified, metrics for
-#   ## all nodes are gathered.
-#   # nodes = ["rabbit@node1", "rabbit@node2"]
-
-
-# # Read raindrops stats (raindrops - real-time stats for preforking Rack servers)
-# [[inputs.raindrops]]
-#   ## An array of raindrops middleware URI to gather stats.
-#   urls = ["http://localhost:8080/_raindrops"]
-
-
-# # Read metrics from one or many redis servers
-# [[inputs.redis]]
-#   ## specify servers via a url matching:
-#   ##  [protocol://][:password]@address[:port]
-#   ##  e.g.
-#   ##    tcp://localhost:6379
-#   ##    tcp://:password@192.168.99.100
-#   ##    unix:///var/run/redis.sock
-#   ##
-#   ## If no servers are specified, then localhost is used as the host.
-#   ## If no port is specified, 6379 is used
-#   servers = ["tcp://localhost:6379"]
-
-
-# # Read metrics from one or many RethinkDB servers
-# [[inputs.rethinkdb]]
-#   ## An array of URI to gather stats about. Specify an ip or hostname
-#   ## with optional port add password. ie,
-#   ##   rethinkdb://user:auth_key@10.10.3.30:28105,
-#   ##   rethinkdb://10.10.3.33:18832,
-#   ##   10.0.0.1:10000, etc.
-#   servers = ["127.0.0.1:28015"]
-
-
-# # Read metrics one or many Riak servers
-# [[inputs.riak]]
-#   # Specify a list of one or more riak http servers
-#   servers = ["http://localhost:8098"]
-
-
-# # Retrieves SNMP values from remote agents
-# [[inputs.snmp]]
-#   agents = [ "127.0.0.1:161" ]
-#   ## Timeout for each SNMP query.
-#   timeout = "5s"
-#   ## Number of retries to attempt within timeout.
-#   retries = 3
-#   ## SNMP version, values can be 1, 2, or 3
-#   version = 2
-#
-#   ## SNMP community string.
-#   community = "public"
-#
-#   ## The GETBULK max-repetitions parameter
-#   max_repetitions = 10
-#
-#   ## SNMPv3 auth parameters
-#   #sec_name = "myuser"
-#   #auth_protocol = "md5"      # Values: "MD5", "SHA", ""
-#   #auth_password = "pass"
-#   #sec_level = "authNoPriv"   # Values: "noAuthNoPriv", "authNoPriv", "authPriv"
-#   #context_name = ""
-#   #priv_protocol = ""         # Values: "DES", "AES", ""
-#   #priv_password = ""
-#
-#   ## measurement name
-#   name = "system"
-#   [[inputs.snmp.field]]
-#     name = "hostname"
-#     oid = ".1.0.0.1.1"
-#   [[inputs.snmp.field]]
-#     name = "uptime"
-#     oid = ".1.0.0.1.2"
-#   [[inputs.snmp.field]]
-#     name = "load"
-#     oid = ".1.0.0.1.3"
-#   [[inputs.snmp.field]]
-#     oid = "HOST-RESOURCES-MIB::hrMemorySize"
-#
-#   [[inputs.snmp.table]]
-#     ## measurement name
-#     name = "remote_servers"
-#     inherit_tags = [ "hostname" ]
-#     [[inputs.snmp.table.field]]
-#       name = "server"
-#       oid = ".1.0.0.0.1.0"
-#       is_tag = true
-#     [[inputs.snmp.table.field]]
-#       name = "connections"
-#       oid = ".1.0.0.0.1.1"
-#     [[inputs.snmp.table.field]]
-#       name = "latency"
-#       oid = ".1.0.0.0.1.2"
-#
-#   [[inputs.snmp.table]]
-#     ## auto populate table's fields using the MIB
-#     oid = "HOST-RESOURCES-MIB::hrNetworkTable"
-
-
-# # DEPRECATED! PLEASE USE inputs.snmp INSTEAD.
-# [[inputs.snmp_legacy]]
-#   ## Use 'oids.txt' file to translate oids to names
-#   ## To generate 'oids.txt' you need to run:
-#   ##   snmptranslate -m all -Tz -On | sed -e 's/"//g' > /tmp/oids.txt
-#   ## Or if you have an other MIB folder with custom MIBs
-#   ##   snmptranslate -M /mycustommibfolder -Tz -On -m all | sed -e 's/"//g' > oids.txt
-#   snmptranslate_file = "/tmp/oids.txt"
-#   [[inputs.snmp.host]]
-#     address = "192.168.2.2:161"
-#     # SNMP community
-#     community = "public" # default public
-#     # SNMP version (1, 2 or 3)
-#     # Version 3 not supported yet
-#     version = 2 # default 2
-#     # SNMP response timeout
-#     timeout = 2.0 # default 2.0
-#     # SNMP request retries
-#     retries = 2 # default 2
-#     # Which get/bulk do you want to collect for this host
-#     collect = ["mybulk", "sysservices", "sysdescr"]
-#     # Simple list of OIDs to get, in addition to "collect"
-#     get_oids = []
-#
-#   [[inputs.snmp.host]]
-#     address = "192.168.2.3:161"
-#     community = "public"
-#     version = 2
-#     timeout = 2.0
-#     retries = 2
-#     collect = ["mybulk"]
-#     get_oids = [
-#         "ifNumber",
-#         ".1.3.6.1.2.1.1.3.0",
-#     ]
-#
-#   [[inputs.snmp.get]]
-#     name = "ifnumber"
-#     oid = "ifNumber"
-#
-#   [[inputs.snmp.get]]
-#     name = "interface_speed"
-#     oid = "ifSpeed"
-#     instance = "0"
-#
-#   [[inputs.snmp.get]]
-#     name = "sysuptime"
-#     oid = ".1.3.6.1.2.1.1.3.0"
-#     unit = "second"
-#
-#   [[inputs.snmp.bulk]]
-#     name = "mybulk"
-#     max_repetition = 127
-#     oid = ".1.3.6.1.2.1.1"
-#
-#   [[inputs.snmp.bulk]]
-#     name = "ifoutoctets"
-#     max_repetition = 127
-#     oid = "ifOutOctets"
-#
-#   [[inputs.snmp.host]]
-#     address = "192.168.2.13:161"
-#     #address = "127.0.0.1:161"
-#     community = "public"
-#     version = 2
-#     timeout = 2.0
-#     retries = 2
-#     #collect = ["mybulk", "sysservices", "sysdescr", "systype"]
-#     collect = ["sysuptime" ]
-#     [[inputs.snmp.host.table]]
-#       name = "iftable3"
-#       include_instances = ["enp5s0", "eth1"]
-#
-#   # SNMP TABLEs
-#   # table without mapping neither subtables
-#   [[inputs.snmp.table]]
-#     name = "iftable1"
-#     oid = ".1.3.6.1.2.1.31.1.1.1"
-#
-#   # table without mapping but with subtables
-#   [[inputs.snmp.table]]
-#     name = "iftable2"
-#     oid = ".1.3.6.1.2.1.31.1.1.1"
-#     sub_tables = [".1.3.6.1.2.1.2.2.1.13"]
-#
-#   # table with mapping but without subtables
-#   [[inputs.snmp.table]]
-#     name = "iftable3"
-#     oid = ".1.3.6.1.2.1.31.1.1.1"
-#     # if empty. get all instances
-#     mapping_table = ".1.3.6.1.2.1.31.1.1.1.1"
-#     # if empty, get all subtables
-#
-#   # table with both mapping and subtables
-#   [[inputs.snmp.table]]
-#     name = "iftable4"
-#     oid = ".1.3.6.1.2.1.31.1.1.1"
-#     # if empty get all instances
-#     mapping_table = ".1.3.6.1.2.1.31.1.1.1.1"
-#     # if empty get all subtables
-#     # sub_tables could be not "real subtables"
-#     sub_tables=[".1.3.6.1.2.1.2.2.1.13", "bytes_recv", "bytes_send"]
-
-
-# # Read metrics from Microsoft SQL Server
-# [[inputs.sqlserver]]
-#   ## Specify instances to monitor with a list of connection strings.
-#   ## All connection parameters are optional.
-#   ## By default, the host is localhost, listening on default port, TCP 1433.
-#   ##   for Windows, the user is the currently running AD user (SSO).
-#   ##   See https://github.com/denisenkom/go-mssqldb for detailed connection
-#   ##   parameters.
-#   # servers = [
-#   #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
-#   # ]
-
-
-# # Inserts sine and cosine waves for demonstration purposes
-# [[inputs.trig]]
-#   ## Set the amplitude
-#   amplitude = 10.0
-
-
-# # Read Twemproxy stats data
-# [[inputs.twemproxy]]
-#   ## Twemproxy stats address and port (no scheme)
-#   addr = "localhost:22222"
-#   ## Monitor pool name
-#   pools = ["redis_pool", "mc_pool"]
-
-
-# # A plugin to collect stats from Varnish HTTP Cache
-# [[inputs.varnish]]
-#   ## The default location of the varnishstat binary can be overridden with:
-#   binary = "/usr/bin/varnishstat"
-#
-#   ## By default, telegraf gather stats for 3 metric points.
-#   ## Setting stats will override the defaults shown below.
-#   ## Glob matching can be used, ie, stats = ["MAIN.*"]
-#   ## stats may also be set to ["*"], which will collect all stats
-#   stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
-
-
-# # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
-# [[inputs.zfs]]
-#   ## ZFS kstat path. Ignored on FreeBSD
-#   ## If not specified, then default is:
-#   # kstatPath = "/proc/spl/kstat/zfs"
-#
-#   ## By default, telegraf gather all zfs stats
-#   ## If not specified, then default is:
-#   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
-#
-#   ## By default, don't gather zpool stats
-#   # poolMetrics = false
-
-
-# # Reads 'mntr' stats from one or many zookeeper servers
-# [[inputs.zookeeper]]
-#   ## An array of address to gather stats about. Specify an ip or hostname
-#   ## with port. ie localhost:2181, 10.0.0.1:2181, etc.
-#
-#   ## If no servers are specified, then localhost is used as the host.
-#   ## If no port is specified, 2181 is used
-#   servers = [":2181"]
-
-
-
-###############################################################################
-#                            SERVICE INPUT PLUGINS                            #
-###############################################################################
-
-# # AMQP consumer plugin
-# [[inputs.amqp_consumer]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
-#   exchange = "telegraf"
-#   ## AMQP queue name
-#   queue = "telegraf"
-#   ## Binding Key
-#   binding_key = "#"
-#
-#   ## Maximum number of messages server should give to the worker.
-#   prefetch_count = 50
-#
-#   ## Auth method. PLAIN and EXTERNAL are supported
-#   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
-#   ## described here: https://www.rabbitmq.com/plugins.html
-#   # auth_method = "PLAIN"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Data format to output.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
-
-
-# # Influx HTTP write listener
-# [[inputs.http_listener]]
-#   ## Address and port to host HTTP listener on
-#   service_address = ":8186"
-#
-#   ## maximum duration before timing out read of the request
-#   read_timeout = "10s"
-#   ## maximum duration before timing out write of the response
-#   write_timeout = "10s"
-#
-#   ## Maximum allowed http request body size in bytes.
-#   ## 0 means to use the default of 536,870,912 bytes (500 mebibytes)
-#   max_body_size = 0
-#
-#   ## Maximum line size allowed to be sent in bytes.
-#   ## 0 means to use the default of 65536 bytes (64 kibibytes)
-#   max_line_size = 0
-
-
-# # Read metrics from Kafka topic(s)
-# [[inputs.kafka_consumer]]
-#   ## topic(s) to consume
-#   topics = ["telegraf"]
-#   ## an array of Zookeeper connection strings
-#   zookeeper_peers = ["localhost:2181"]
-#   ## Zookeeper Chroot
-#   zookeeper_chroot = ""
-#   ## the name of the consumer group
-#   consumer_group = "telegraf_metrics_consumers"
-#   ## Offset (must be either "oldest" or "newest")
-#   offset = "oldest"
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-#
-#   ## Maximum length of a message to consume, in bytes (default 0/unlimited);
-#   ## larger messages are dropped
-#   max_message_len = 65536
-
-
-# # Stream and parse log file(s).
-# [[inputs.logparser]]
-#   ## Log files to parse.
-#   ## These accept standard unix glob matching rules, but with the addition of
-#   ## ** as a "super asterisk". ie:
-#   ##   /var/log/**.log     -> recursively find all .log files in /var/log
-#   ##   /var/log/*/*.log    -> find all .log files with a parent dir in /var/log
-#   ##   /var/log/apache.log -> only tail the apache log file
-#   files = ["/var/log/apache/access.log"]
-#
-#   ## Read files that currently exist from the beginning. Files that are created
-#   ## while telegraf is running (and that match the "files" globs) will always
-#   ## be read from the beginning.
-#   from_beginning = false
-#
-#   ## Parse logstash-style "grok" patterns:
-#   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
-#   [inputs.logparser.grok]
-#     ## This is a list of patterns to check the given log file(s) for.
-#     ## Note that adding patterns here increases processing time. The most
-#     ## efficient configuration is to have one pattern per logparser.
-#     ## Other common built-in patterns are:
-#     ##   %{COMMON_LOG_FORMAT}   (plain apache & nginx access logs)
-#     ##   %{COMBINED_LOG_FORMAT} (access logs + referrer & agent)
-#     patterns = ["%{COMBINED_LOG_FORMAT}"]
-#     ## Name of the outputted measurement name.
-#     measurement = "apache_access_log"
-#     ## Full path(s) to custom pattern files.
-#     custom_pattern_files = []
-#     ## Custom patterns can also be defined here. Put one pattern per line.
-#     custom_patterns = '''
-#     '''
-
-
-# # Read metrics from MQTT topic(s)
-# [[inputs.mqtt_consumer]]
-#   servers = ["localhost:1883"]
-#   ## MQTT QoS, must be 0, 1, or 2
-#   qos = 0
-#
-#   ## Topics to subscribe to
-#   topics = [
-#     "telegraf/host01/cpu",
-#     "telegraf/+/mem",
-#     "sensors/#",
-#   ]
-#
-#   # if true, messages that can't be delivered while the subscriber is offline
-#   # will be delivered when it comes back (such as on service restart).
-#   # NOTE: if true, client_id MUST be set
-#   persistent_session = false
-#   # If empty, a random client ID will be generated.
-#   client_id = ""
-#
-#   ## username and password to connect MQTT server.
-#   # username = "telegraf"
-#   # password = "metricsmetricsmetricsmetrics"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-
-
-# # Read metrics from NATS subject(s)
-# [[inputs.nats_consumer]]
-#   ## urls of NATS servers
-#   # servers = ["nats://localhost:4222"]
-#   ## Use Transport Layer Security
-#   # secure = false
-#   ## subject(s) to consume
-#   # subjects = ["telegraf"]
-#   ## name a queue group
-#   # queue_group = "telegraf_consumers"
-#
-#   ## Sets the limits for pending msgs and bytes for each subscription
-#   ## These shouldn't need to be adjusted except in very high throughput scenarios
-#   # pending_message_limit = 65536
-#   # pending_bytes_limit = 67108864
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-
-
-# # Read NSQ topic for metrics.
-# [[inputs.nsq_consumer]]
-#   ## An string representing the NSQD TCP Endpoint
-#   server = "localhost:4150"
-#   topic = "telegraf"
-#   channel = "consumer"
-#   max_in_flight = 100
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-
-
-# # Generic socket listener capable of handling multiple socket types.
-# [[inputs.socket_listener]]
-#   ## URL to listen on
-#   # service_address = "tcp://:8094"
-#   # service_address = "tcp://127.0.0.1:http"
-#   # service_address = "tcp4://:8094"
-#   # service_address = "tcp6://:8094"
-#   # service_address = "tcp6://[2001:db8::1]:8094"
-#   # service_address = "udp://:8094"
-#   # service_address = "udp4://:8094"
-#   # service_address = "udp6://:8094"
-#   # service_address = "unix:///tmp/telegraf.sock"
-#   # service_address = "unixgram:///tmp/telegraf.sock"
-#
-#   ## Maximum number of concurrent connections.
-#   ## Only applies to stream sockets (e.g. TCP).
-#   ## 0 (default) is unlimited.
-#   # max_connections = 1024
-#
-#   ## Maximum socket buffer size in bytes.
-#   ## For stream sockets, once the buffer fills up, the sender will start backing up.
-#   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
-#   ## Defaults to the OS default.
-#   # read_buffer_size = 65535
-#
-#   ## Period between keep alive probes.
-#   ## Only applies to TCP sockets.
-#   ## 0 disables keep alive probes.
-#   ## Defaults to the OS configuration.
-#   # keep_alive_period = "5m"
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   # data_format = "influx"
-
-
-# # Statsd Server
-# [[inputs.statsd]]
-#   ## Address and port to host UDP listener on
-#   service_address = ":8125"
-#
-#   ## The following configuration options control when telegraf clears it's cache
-#   ## of previous values. If set to false, then telegraf will only clear it's
-#   ## cache when the daemon is restarted.
-#   ## Reset gauges every interval (default=true)
-#   delete_gauges = true
-#   ## Reset counters every interval (default=true)
-#   delete_counters = true
-#   ## Reset sets every interval (default=true)
-#   delete_sets = true
-#   ## Reset timings & histograms every interval (default=true)
-#   delete_timings = true
-#
-#   ## Percentiles to calculate for timing & histogram stats
-#   percentiles = [90]
-#
-#   ## separator to use between elements of a statsd metric
-#   metric_separator = "_"
-#
-#   ## Parses tags in the datadog statsd format
-#   ## http://docs.datadoghq.com/guides/dogstatsd/
-#   parse_data_dog_tags = false
-#
-#   ## Statsd data translation templates, more info can be read here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite
-#   # templates = [
-#   #     "cpu.* measurement*"
-#   # ]
-#
-#   ## Number of UDP messages allowed to queue up, once filled,
-#   ## the statsd server will start dropping packets
-#   allowed_pending_messages = 10000
-#
-#   ## Number of timing/histogram values to track per-measurement in the
-#   ## calculation of percentiles. Raising this limit increases the accuracy
-#   ## of percentiles but also increases the memory usage and cpu time.
-#   percentile_limit = 1000
-
-
-# # Stream a log file, like the tail -f command
-# [[inputs.tail]]
-#   ## files to tail.
-#   ## These accept standard unix glob matching rules, but with the addition of
-#   ## ** as a "super asterisk". ie:
-#   ##   "/var/log/**.log"  -> recursively find all .log files in /var/log
-#   ##   "/var/log/*/*.log" -> find all .log files with a parent dir in /var/log
-#   ##   "/var/log/apache.log" -> just tail the apache log file
-#   ##
-#   ## See https://github.com/gobwas/glob for more examples
-#   ##
-#   files = ["/var/mymetrics.out"]
-#   ## Read file from beginning.
-#   from_beginning = false
-#   ## Whether file is a named pipe
-#   pipe = false
-#
-#   ## Data format to consume.
-#   ## Each data format has its own unique set of configuration options, read
-#   ## more about them here:
-#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-#   data_format = "influx"
-
-
-# # Generic TCP listener
-# [[inputs.tcp_listener]]
-#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
-#   # socket_listener plugin
-#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
-
-
-# # Generic UDP listener
-# [[inputs.udp_listener]]
-#   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
-#   # socket_listener plugin
-#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
-
-
-# # A Webhooks Event collector
-[[inputs.webhooks]]
-#   ## Address and port to host Webhook listener on
-   service_address = ":1619"
-#
-#   [inputs.webhooks.filestack]
-#     path = "/filestack"
-#
-#   [inputs.webhooks.github]
-#     path = "/github"
-#     # secret = ""
-#
-#   [inputs.webhooks.mandrill]
-#     path = "/mandrill"
-#
-#   [inputs.webhooks.rollbar]
-#     path = "/rollbar"
-#
-#   [inputs.webhooks.papertrail]
-#     path = "/papertrail"
-    [inputs.webhooks.particle]
-      path = "/particle"

From c3d15f0affc7c9f658242de8ce6310283d4bbbe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Fri, 29 Sep 2017 20:49:22 +0200
Subject: [PATCH 0596/1302] Add support for the rollbar occurrence webhook
 event. (#1692)

---
 plugins/inputs/webhooks/rollbar/README.md     | 12 ++++
 .../webhooks/rollbar/rollbar_webhooks.go      |  2 +
 .../rollbar/rollbar_webhooks_events.go        | 37 +++++++++++
 .../rollbar_webhooks_events_json_test.go      | 64 +++++++++++++++++++
 .../webhooks/rollbar/rollbar_webhooks_test.go | 23 +++++++
 5 files changed, 138 insertions(+)

diff --git a/plugins/inputs/webhooks/rollbar/README.md b/plugins/inputs/webhooks/rollbar/README.md
index f6c871a07..b3f1bfeaa 100644
--- a/plugins/inputs/webhooks/rollbar/README.md
+++ b/plugins/inputs/webhooks/rollbar/README.md
@@ -27,6 +27,18 @@ See [webhook doc](https://rollbar.com/docs/webhooks/)
 **Fields:**
 * 'id' = `event.data.item.id` int
 
+#### `occurrence` event
+
+**Tags:**
+* 'event' = `event.event_name` string
+* 'environment' = `event.data.item.environment` string
+* 'project_id = `event.data.item.project_id` int
+* 'language' = `event.data.occurrence.language` string
+* 'level' = `event.data.occurrence.level` string
+
+**Fields:**
+* 'id' = `event.data.item.id` int
+
 #### `deploy` event
 
 **Tags:**
diff --git a/plugins/inputs/webhooks/rollbar/rollbar_webhooks.go b/plugins/inputs/webhooks/rollbar/rollbar_webhooks.go
index 6b6f0965c..55ff7eb2f 100644
--- a/plugins/inputs/webhooks/rollbar/rollbar_webhooks.go
+++ b/plugins/inputs/webhooks/rollbar/rollbar_webhooks.go
@@ -61,6 +61,8 @@ func NewEvent(dummyEvent *DummyEvent, data []byte) (Event, error) {
 	switch dummyEvent.EventName {
 	case "new_item":
 		return generateEvent(&NewItem{}, data)
+	case "occurrence":
+		return generateEvent(&Occurrence{}, data)
 	case "deploy":
 		return generateEvent(&Deploy{}, data)
 	default:
diff --git a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events.go b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events.go
index e40e95858..b9a3a0713 100644
--- a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events.go
+++ b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events.go
@@ -48,6 +48,43 @@ func (ni *NewItem) Fields() map[string]interface{} {
 	}
 }
 
+type OccurrenceDataOccurrence struct {
+	Language string `json:"language"`
+	Level    string `json:"level"`
+}
+
+type OccurrenceDataItem struct {
+	Id          int    `json:"id"`
+	Environment string `json:"environment"`
+	ProjectId   int    `json:"project_id"`
+}
+
+type OccurrenceData struct {
+	Item       OccurrenceDataItem       `json:"item"`
+	Occurrence OccurrenceDataOccurrence `json:"occurrence"`
+}
+
+type Occurrence struct {
+	EventName string         `json:"event_name"`
+	Data      OccurrenceData `json:"data"`
+}
+
+func (o *Occurrence) Tags() map[string]string {
+	return map[string]string{
+		"event":       o.EventName,
+		"environment": o.Data.Item.Environment,
+		"project_id":  strconv.Itoa(o.Data.Item.ProjectId),
+		"language":    o.Data.Occurrence.Language,
+		"level":       o.Data.Occurrence.Level,
+	}
+}
+
+func (o *Occurrence) Fields() map[string]interface{} {
+	return map[string]interface{}{
+		"id": o.Data.Item.Id,
+	}
+}
+
 type DeployDataDeploy struct {
 	Id          int    `json:"id"`
 	Environment string `json:"environment"`
diff --git a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events_json_test.go b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events_json_test.go
index 5244a9d2f..19857fa3b 100644
--- a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events_json_test.go
+++ b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_events_json_test.go
@@ -68,6 +68,70 @@ func NewItemJSON() string {
 	}`
 }
 
+func OccurrenceJSON() string {
+	return `
+	{
+	  "event_name": "occurrence",
+	  "data": {
+		"item": {
+		  "public_item_id": null,
+		  "integrations_data": {},
+		  "level_lock": 0,
+		  "last_activated_timestamp": 1471624512,
+		  "assigned_user_id": null,
+		  "hash": "188fc37fa6e641a4d4a3d0198938a1937d31ddbe",
+		  "id": 402860571,
+		  "environment": "production",
+		  "title": "Exception: test exception",
+		  "last_occurrence_id": 16298872829,
+		  "last_occurrence_timestamp": 1472226345,
+		  "platform": 0,
+		  "first_occurrence_timestamp": 1471624512,
+		  "project_id": 78234,
+		  "resolved_in_version": null,
+		  "status": 1,
+		  "unique_occurrences": null,
+		  "title_lock": 0,
+		  "framework": 6,
+		  "total_occurrences": 8,
+		  "level": 40,
+		  "counter": 2,
+		  "last_modified_by": 8247,
+		  "first_occurrence_id": 16103102935,
+		  "activating_occurrence_id": 16103102935
+                },
+		"occurrence": {
+		  "body": {
+		    "trace": {
+		    "frames": [{"method": "<main>", "lineno": 27, "filename": "/Users/rebeccastandig/Desktop/Dev/php-rollbar-app/index.php"}], "exception": {
+		    "message": "test 2",
+		    "class": "Exception"}
+		    }
+		  },
+		  "uuid": "84d4eccd-b24d-47ae-a42b-1a2f9a82fb82",
+		  "language": "php",
+		  "level": "error",
+		  "timestamp": 1472226345,
+		  "php_context": "cli",
+		  "environment": "production",
+		  "framework": "php",
+		  "person": null,
+		  "server": {
+		    "host": "Rebeccas-MacBook-Pro.local",
+		    "argv": ["index.php"]
+		  },
+		  "notifier": {
+		    "version": "0.18.2",
+		    "name": "rollbar-php"
+		  },
+		  "metadata": {
+		    "customer_timestamp": 1472226359
+		  }
+		}
+	  }
+	}`
+}
+
 func DeployJSON() string {
 	return `
     {
diff --git a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_test.go b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_test.go
index 9b54a8281..5cea32e26 100644
--- a/plugins/inputs/webhooks/rollbar/rollbar_webhooks_test.go
+++ b/plugins/inputs/webhooks/rollbar/rollbar_webhooks_test.go
@@ -42,6 +42,29 @@ func TestNewItem(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "rollbar_webhooks", fields, tags)
 }
 
+func TestOccurrence(t *testing.T) {
+	var acc testutil.Accumulator
+	rb := &RollbarWebhook{Path: "/rollbar", acc: &acc}
+	resp := postWebhooks(rb, OccurrenceJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST occurrence returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"id": 402860571,
+	}
+
+	tags := map[string]string{
+		"event":       "occurrence",
+		"environment": "production",
+		"project_id":  "78234",
+		"language":    "php",
+		"level":       "error",
+	}
+
+	acc.AssertContainsTaggedFields(t, "rollbar_webhooks", fields, tags)
+}
+
 func TestDeploy(t *testing.T) {
 	var acc testutil.Accumulator
 	rb := &RollbarWebhook{Path: "/rollbar", acc: &acc}

From f2cb1da7cf667976a68c7084cb2f32cbe8141bf1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 11:50:15 -0700
Subject: [PATCH 0597/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 140a85ee2..48a181fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - [#3215](https://github.com/influxdata/telegraf/pull/3215): Add support for NSQLookupd to nsq_consumer.
 - [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin.
 - [#3106](https://github.com/influxdata/telegraf/pull/3106): Add configurable separator for metrics and fields in opentsdb output.
+- [#1692](https://github.com/influxdata/telegraf/pull/1692): Add support for the rollbar occurrence webhook event.
 
 ### Bugfixes
 

From ad4a5aa7a0409a528782cbfeb6b0038b629efeb1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 14:07:19 -0700
Subject: [PATCH 0598/1302] Document how to exclude kubernetes annotation

---
 plugins/inputs/docker/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index b482ef3fb..158ed7bcc 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -57,6 +57,15 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/)
 When using the `"ENV"` endpoint, the connection is configured using the
 [cli Docker environment variables](https://godoc.org/github.com/moby/moby/client#NewEnvClient).
 
+#### Kubernetes Labels
+
+Kubernetes may add many labels to your containers, if they are not needed you
+may prefer to exclude them:
+```
+  docker_label_exclude = ["annotation.kubernetes*"]
+```
+
+
 ### Measurements & Fields:
 
 Every effort was made to preserve the names based on the JSON response from the

From 3d62e045affb58ff57b09c6a47872824de1fdc87 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 29 Sep 2017 15:58:38 -0700
Subject: [PATCH 0599/1302] Fix format of connection_timeout in mqtt_consumer
 (#3286)

---
 plugins/inputs/mqtt_consumer/README.md        | 2 +-
 plugins/inputs/mqtt_consumer/mqtt_consumer.go | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md
index c61545e8e..52990ef76 100644
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -14,7 +14,7 @@ The plugin expects messages in the
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
   ## Connection timeout for initial connection in seconds
-  connection_timeout = 30
+  connection_timeout = "30s"
 
   ## Topics to subscribe to
   topics = [
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index 3cd98baea..e0d668879 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -15,6 +15,9 @@ import (
 	"github.com/eclipse/paho.mqtt.golang"
 )
 
+// 30 Seconds is the default used by paho.mqtt.golang
+var defaultConnectionTimeout = internal.Duration{Duration: 30 * time.Second}
+
 type MQTTConsumer struct {
 	Servers           []string
 	Topics            []string
@@ -57,7 +60,7 @@ var sampleConfig = `
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
   ## Connection timeout for initial connection in seconds
-  connection_timeout = 30
+  connection_timeout = "30s"
 
   ## Topics to subscribe to
   topics = [
@@ -270,6 +273,8 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 
 func init() {
 	inputs.Add("mqtt_consumer", func() telegraf.Input {
-		return &MQTTConsumer{}
+		return &MQTTConsumer{
+			ConnectionTimeout: defaultConnectionTimeout,
+		}
 	})
 }

From 29b6f4168c9cf03135bae69e81d539aa30da94ec Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 15:59:56 -0700
Subject: [PATCH 0600/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48a181fba..2d475ebac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - [#3259](https://github.com/influxdata/telegraf/issues/3259): Fix error if int larger than 32-bit in /proc/vmstat.
 - [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
 - [#2887](https://github.com/influxdata/telegraf/issues/2887): Allow JSON data format to contain zero metrics.
+- [#3284](https://github.com/influxdata/telegraf/issues/3284): Fix format of connection_timeout in mqtt_consumer.
 
 ## v1.4.1 [2017-09-26]
 

From e1bf655ef9643782c9ea5f8a488fdf0f05ac9776 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 16:08:31 -0700
Subject: [PATCH 0601/1302] Add deprecation notice to jolokia sample config

---
 plugins/inputs/jolokia/jolokia.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go
index a538d8191..a9eb0b24b 100644
--- a/plugins/inputs/jolokia/jolokia.go
+++ b/plugins/inputs/jolokia/jolokia.go
@@ -60,6 +60,10 @@ type Jolokia struct {
 }
 
 const sampleConfig = `
+  # DEPRECATED: the jolokia plugin has been deprecated in favor of the
+  # jolokia2 plugin
+  # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
+
   ## This is the context root used to compose the jolokia url
   ## NOTE that Jolokia requires a trailing slash at the end of the context root
   ## NOTE that your jolokia security policy must allow for POST requests.

From e4f5547d37d282859c5e0f12e9c4862b6279eb29 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 16:09:31 -0700
Subject: [PATCH 0602/1302] Update example config

---
 etc/telegraf.conf | 125 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index f89d54b96..2c23864cf 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -313,6 +313,34 @@
 #   brokers = ["localhost:9092"]
 #   ## Kafka topic for producer messages
 #   topic = "telegraf"
+#
+#   ## Optional topic suffix configuration.
+#   ## If the section is omitted, no suffix is used.
+#   ## Following topic suffix methods are supported:
+#   ##   measurement - suffix equals to separator + measurement's name
+#   ##   tags        - suffix equals to separator + specified tags' values
+#   ##                 interleaved with separator
+#
+#   ## Suffix equals to "_" + measurement name
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "measurement"
+#   #   separator = "_"
+#
+#   ## Suffix equals to "__" + measurement's "foo" tag value.
+#   ##   If there's no such a tag, suffix equals to an empty string
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "tags"
+#   #   keys = ["foo"]
+#   #   separator = "__"
+#
+#   ## Suffix equals to "_" + measurement's "foo" and "bar"
+#   ##   tag values, separated by "_". If there is no such tags,
+#   ##   their values treated as empty strings.
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "tags"
+#   #   keys = ["foo", "bar"]
+#   #   separator = "_"
+#
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, its value will be used as the routing key
 #   routing_tag = "host"
@@ -527,6 +555,9 @@
 #
 #   ## Debug true - Prints OpenTSDB communication
 #   debug = false
+#
+#   ## Separator separates measurement name from field
+#   separator = "_"
 
 
 # # Configuration for the Prometheus client to spawn
@@ -1392,6 +1423,10 @@
 
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
+#   # DEPRECATED: the jolokia plugin has been deprecated in favor of the
+#   # jolokia2 plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
+#
 #   ## This is the context root used to compose the jolokia url
 #   ## NOTE that Jolokia requires a trailing slash at the end of the context root
 #   ## NOTE that your jolokia security policy must allow for POST requests.
@@ -1454,6 +1489,64 @@
 #     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
 
 
+# # Read JMX metrics from a Jolokia REST agent endpoint
+# [[inputs.jolokia2_agent]]
+#   # default_tag_prefix      = ""
+#   # default_field_prefix    = ""
+#   # default_field_separator = "."
+#
+#   # Add agents URLs to query
+#   urls = ["http://localhost:8080/jolokia"]
+#   # username = ""
+#   # password = ""
+#   # response_timeout = "5s"
+#
+#   ## Optional SSL config
+#   # ssl_ca   = "/var/private/ca.pem"
+#   # ssl_cert = "/var/private/client.pem"
+#   # ssl_key  = "/var/private/client-key.pem"
+#   # insecure_skip_verify = false
+#
+#   ## Add metrics to read
+#   [[inputs.jolokia2.metric]]
+#     name  = "java_runtime"
+#     mbean = "java.lang:type=Runtime"
+#     paths = ["Uptime"]
+
+
+# # Read JMX metrics from a Jolokia REST proxy endpoint
+# [[inputs.jolokia2_proxy]]
+#   # default_tag_prefix      = ""
+#   # default_field_prefix    = ""
+#   # default_field_separator = "."
+#
+#   ## Proxy agent
+#   url = "http://localhost:8080/jolokia"
+#   # username = ""
+#   # password = ""
+#   # response_timeout = "5s"
+#
+#   ## Optional SSL config
+#   # ssl_ca   = "/var/private/ca.pem"
+#   # ssl_cert = "/var/private/client.pem"
+#   # ssl_key  = "/var/private/client-key.pem"
+#   # insecure_skip_verify = false
+#
+#   ## Add proxy targets to query
+#   # default_target_username = ""
+#   # default_target_password = ""
+#   [[inputs.jolokia_proxy.target]]
+#     url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
+# 	# username = ""
+# 	# password = ""
+#
+#   ## Add metrics to read
+#   [[inputs.jolokia_proxy.metric]]
+#     name  = "java_runtime"
+#     mbean = "java.lang:type=Runtime"
+#     paths = ["Uptime"]
+
+
 # # Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints
 # [[inputs.kapacitor]]
 #   ## Multiple URLs from which to read Kapacitor-formatted JSON
@@ -1479,6 +1572,9 @@
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
+#   ## Set response_timeout (default 5 seconds)
+#   # response_timeout = "5s"
+#
 #   ## Optional SSL Config
 #   # ssl_ca = /path/to/cafile
 #   # ssl_cert = /path/to/certfile
@@ -1713,6 +1809,15 @@
 #   response_timeout = "5s"
 
 
+# # Read Nginx Plus' full status information (ngx_http_status_module)
+# [[inputs.nginx_plus]]
+#   ## An array of ngx_http_status_module or status URI to gather stats.
+#   urls = ["http://localhost/status"]
+#
+#   # HTTP response timeout (default: 5s)
+#   response_timeout = "5s"
+
+
 # # Read NSQ topic and channel statistics.
 # [[inputs.nsq]]
 #   ## An array of NSQD HTTP API endpoints
@@ -1931,6 +2036,9 @@
 #   ## An array of urls to scrape metrics from.
 #   urls = ["http://localhost:9100/metrics"]
 #
+#   ## An array of Kubernetes services to scrape metrics from.
+#   # kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
+#
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
@@ -2424,6 +2532,14 @@
 #   ## Maximum line size allowed to be sent in bytes.
 #   ## 0 means to use the default of 65536 bytes (64 kibibytes)
 #   max_line_size = 0
+#
+#   ## Set one or more allowed client CA certificate file names to
+#   ## enable mutually authenticated TLS connections
+#   tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+#
+#   ## Add service certificate and key
+#   tls_cert = "/etc/telegraf/cert.pem"
+#   tls_key = "/etc/telegraf/key.pem"
 
 
 # # Read metrics from Kafka topic(s)
@@ -2499,6 +2615,9 @@
 #   ## be read from the beginning.
 #   from_beginning = false
 #
+#   ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+#   # watch_method = "inotify"
+#
 #   ## Parse logstash-style "grok" patterns:
 #   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
 #   [inputs.logparser.grok]
@@ -2537,6 +2656,8 @@
 #   servers = ["localhost:1883"]
 #   ## MQTT QoS, must be 0, 1, or 2
 #   qos = 0
+#   ## Connection timeout for initial connection in seconds
+#   connection_timeout = "30s"
 #
 #   ## Topics to subscribe to
 #   topics = [
@@ -2721,6 +2842,9 @@
 #   ## Whether file is a named pipe
 #   pipe = false
 #
+#   ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+#   # watch_method = "inotify"
+#
 #   ## Data format to consume.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -2768,3 +2892,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+

From 366f3f560cc6059029d96ce7ae75bff5cad674fc Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Fri, 29 Sep 2017 19:13:08 -0400
Subject: [PATCH 0603/1302] Add Wavefront output plugin (#3160)

---
 plugins/outputs/all/all.go                  |   1 +
 plugins/outputs/wavefront/README.md         |  81 ++++++
 plugins/outputs/wavefront/wavefront.go      | 288 ++++++++++++++++++
 plugins/outputs/wavefront/wavefront_test.go | 307 ++++++++++++++++++++
 4 files changed, 677 insertions(+)
 create mode 100644 plugins/outputs/wavefront/README.md
 create mode 100644 plugins/outputs/wavefront/wavefront.go
 create mode 100644 plugins/outputs/wavefront/wavefront_test.go

diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 089a56909..53d1cb8ca 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -23,4 +23,5 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/riemann"
 	_ "github.com/influxdata/telegraf/plugins/outputs/riemann_legacy"
 	_ "github.com/influxdata/telegraf/plugins/outputs/socket_writer"
+	_ "github.com/influxdata/telegraf/plugins/outputs/wavefront"
 )
diff --git a/plugins/outputs/wavefront/README.md b/plugins/outputs/wavefront/README.md
new file mode 100644
index 000000000..6b673b12a
--- /dev/null
+++ b/plugins/outputs/wavefront/README.md
@@ -0,0 +1,81 @@
+# Wavefront Output Plugin
+
+This plugin writes to a [Wavefront](https://www.wavefront.com) proxy, in Wavefront data format over TCP.
+
+
+### Configuration:
+
+```toml
+# Configuration for Wavefront output 
+[[outputs.wavefront]]
+  ## DNS name of the wavefront proxy server
+  host = "wavefront.example.com"
+
+  ## Port that the Wavefront proxy server listens on
+  port = 2878
+
+  ## prefix for metrics keys
+  #prefix = "my.specific.prefix."
+
+  ## wether to use "value" for name of simple fields. default is false
+  #simple_fields = false
+
+  ## character to use between metric and field name. default is . (dot)
+  #metric_separator = "."
+
+  ## Convert metric name paths to use metricSeperator character
+  ## When true will convert all _ (underscore) chartacters in final metric name. default is true
+  #convert_paths = true
+
+  ## Use Regex to sanitize metric and tag names from invalid characters
+  ## Regex is more thorough, but significantly slower. default is false
+  #use_regex = false
+
+  ## point tags to use as the source name for Wavefront (if none found, host will be used)
+  #source_override = ["hostname", "snmp_host", "node_host"]
+
+  ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0. default is true
+  #convert_bool = true
+
+  ## Define a mapping, namespaced by metric prefix, from string values to numeric values
+  ## The example below maps "green" -> 1.0, "yellow" -> 0.5, "red" -> 0.0 for
+  ## any metrics beginning with "elasticsearch"
+  #[[outputs.wavefront.string_to_number.elasticsearch]]
+  #  green = 1.0
+  #  yellow = 0.5
+  #  red = 0.0
+```
+
+
+### Convert Path & Metric Separator
+If the `convert_path` option is true any `_` in metric and field names will be converted to the `metric_separator` value. 
+By default, to ease metrics browsing in the Wavefront UI, the `convert_path` option is true, and `metric_separator` is `.` (dot). 
+Default integrations within Wavefront expect these values to be set to their defaults, however if converting from another platform
+it may be desirable to change these defaults.
+
+
+### Use Regex
+Most illegal characters in the metric name are automatically converted to `-`.  
+The `use_regex` setting can be used to ensure all illegal characters are properly handled, but can lead to performance degradation.
+
+
+### Source Override
+Often when collecting metrics from another system, you want to use the target system as the source, not the one running Telegraf. 
+Many Telegraf plugins will identify the target source with a tag. The tag name can vary for different plugins. The `source_override`
+option will use the value specified in any of the listed tags if found. The tag names are checked in the same order as listed, 
+and if found, the other tags will not be checked. If no tags specified are found, the default host tag will be used to identify the 
+source of the metric.
+
+
+### Wavefront Data format
+The expected input for Wavefront is specified in the following way:
+```
+<metric> <value> [<timestamp>] <source|host>=<soureTagValue> [tagk1=tagv1 ...tagkN=tagvN]
+```
+More information about the Wavefront data format is available [here](https://community.wavefront.com/docs/DOC-1031)
+
+
+### Allowed values for metrics
+Wavefront allows `integers` and `floats` as input values.  It will ignore most `strings`, but when configured
+will map certain `strings` to numeric values.  By default it also maps `bool` values to numeric, false -> 0.0, 
+true -> 1.0
\ No newline at end of file
diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
new file mode 100644
index 000000000..773e970bc
--- /dev/null
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -0,0 +1,288 @@
+package wavefront
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"net"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/outputs"
+)
+
+type Wavefront struct {
+	Prefix          string
+	Host            string
+	Port            int
+	SimpleFields    bool
+	MetricSeparator string
+	ConvertPaths    bool
+	ConvertBool     bool
+	UseRegex        bool
+	SourceOverride  []string
+	StringToNumber  map[string][]map[string]float64
+}
+
+// catch many of the invalid chars that could appear in a metric or tag name
+var sanitizedChars = strings.NewReplacer(
+	"!", "-", "@", "-", "#", "-", "$", "-", "%", "-", "^", "-", "&", "-",
+	"*", "-", "(", "-", ")", "-", "+", "-", "`", "-", "'", "-", "\"", "-",
+	"[", "-", "]", "-", "{", "-", "}", "-", ":", "-", ";", "-", "<", "-",
+	">", "-", ",", "-", "?", "-", "/", "-", "\\", "-", "|", "-", " ", "-",
+	"=", "-",
+)
+
+// instead of Replacer which may miss some special characters we can use a regex pattern, but this is significantly slower than Replacer
+var sanitizedRegex = regexp.MustCompile("[^a-zA-Z\\d_.-]")
+
+var tagValueReplacer = strings.NewReplacer("\"", "\\\"", "*", "-")
+
+var pathReplacer = strings.NewReplacer("_", "_")
+
+var sampleConfig = `
+  ## DNS name of the wavefront proxy server
+  host = "wavefront.example.com"
+
+  ## Port that the Wavefront proxy server listens on
+  port = 2878
+
+  ## prefix for metrics keys
+  #prefix = "my.specific.prefix."
+
+  ## whether to use "value" for name of simple fields
+  #simple_fields = false
+
+  ## character to use between metric and field name.  defaults to . (dot)
+  #metric_separator = "."
+
+  ## Convert metric name paths to use metricSeperator character
+  ## When true (default) will convert all _ (underscore) chartacters in final metric name
+  #convert_paths = true
+
+  ## Use Regex to sanitize metric and tag names from invalid characters
+  ## Regex is more thorough, but significantly slower
+  #use_regex = false
+
+  ## point tags to use as the source name for Wavefront (if none found, host will be used)
+  #source_override = ["hostname", "snmp_host", "node_host"]
+
+  ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0.  default true
+  #convert_bool = true
+
+  ## Define a mapping, namespaced by metric prefix, from string values to numeric values
+  ## The example below maps "green" -> 1.0, "yellow" -> 0.5, "red" -> 0.0 for
+  ## any metrics beginning with "elasticsearch"
+  #[[outputs.wavefront.string_to_number.elasticsearch]]
+  #  green = 1.0
+  #  yellow = 0.5
+  #  red = 0.0
+`
+
+type MetricPoint struct {
+	Metric    string
+	Value     float64
+	Timestamp int64
+	Source    string
+	Tags      map[string]string
+}
+
+func (w *Wavefront) Connect() error {
+	if w.ConvertPaths && w.MetricSeparator == "_" {
+		w.ConvertPaths = false
+	}
+	if w.ConvertPaths {
+		pathReplacer = strings.NewReplacer("_", w.MetricSeparator)
+	}
+
+	// Test Connection to Wavefront proxy Server
+	uri := fmt.Sprintf("%s:%d", w.Host, w.Port)
+	_, err := net.ResolveTCPAddr("tcp", uri)
+	if err != nil {
+		return fmt.Errorf("Wavefront: TCP address cannot be resolved %s", err.Error())
+	}
+	connection, err := net.Dial("tcp", uri)
+	if err != nil {
+		return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
+	}
+	defer connection.Close()
+	return nil
+}
+
+func (w *Wavefront) Write(metrics []telegraf.Metric) error {
+
+	// Send Data to Wavefront proxy Server
+	uri := fmt.Sprintf("%s:%d", w.Host, w.Port)
+	connection, err := net.Dial("tcp", uri)
+	if err != nil {
+		return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
+	}
+	defer connection.Close()
+
+	for _, m := range metrics {
+		for _, metricPoint := range buildMetrics(m, w) {
+			metricLine := formatMetricPoint(metricPoint, w)
+			//log.Printf("D! Output [wavefront] %s", metricLine)
+			_, err := connection.Write([]byte(metricLine))
+			if err != nil {
+				return fmt.Errorf("Wavefront: TCP writing error %s", err.Error())
+			}
+		}
+	}
+
+	return nil
+}
+
+func buildMetrics(m telegraf.Metric, w *Wavefront) []*MetricPoint {
+	ret := []*MetricPoint{}
+
+	for fieldName, value := range m.Fields() {
+		var name string
+		if !w.SimpleFields && fieldName == "value" {
+			name = fmt.Sprintf("%s%s", w.Prefix, m.Name())
+		} else {
+			name = fmt.Sprintf("%s%s%s%s", w.Prefix, m.Name(), w.MetricSeparator, fieldName)
+		}
+
+		if w.UseRegex {
+			name = sanitizedRegex.ReplaceAllLiteralString(name, "-")
+		} else {
+			name = sanitizedChars.Replace(name)
+		}
+
+		if w.ConvertPaths {
+			name = pathReplacer.Replace(name)
+		}
+
+		metric := &MetricPoint{
+			Metric:    name,
+			Timestamp: m.UnixNano() / 1000000000,
+		}
+
+		metricValue, buildError := buildValue(value, metric.Metric, w)
+		if buildError != nil {
+			log.Printf("D! Output [wavefront] %s\n", buildError.Error())
+			continue
+		}
+		metric.Value = metricValue
+
+		source, tags := buildTags(m.Tags(), w)
+		metric.Source = source
+		metric.Tags = tags
+
+		ret = append(ret, metric)
+	}
+	return ret
+}
+
+func buildTags(mTags map[string]string, w *Wavefront) (string, map[string]string) {
+	var source string
+	sourceTagFound := false
+
+	for _, s := range w.SourceOverride {
+		for k, v := range mTags {
+			if k == s {
+				source = v
+				mTags["telegraf_host"] = mTags["host"]
+				sourceTagFound = true
+				delete(mTags, k)
+				break
+			}
+		}
+		if sourceTagFound {
+			break
+		}
+	}
+
+	if !sourceTagFound {
+		source = mTags["host"]
+	}
+	delete(mTags, "host")
+
+	return tagValueReplacer.Replace(source), mTags
+}
+
+func buildValue(v interface{}, name string, w *Wavefront) (float64, error) {
+	switch p := v.(type) {
+	case bool:
+		if w.ConvertBool {
+			if p {
+				return 1, nil
+			} else {
+				return 0, nil
+			}
+		}
+	case int64:
+		return float64(v.(int64)), nil
+	case uint64:
+		return float64(v.(uint64)), nil
+	case float64:
+		return v.(float64), nil
+	case string:
+		for prefix, mappings := range w.StringToNumber {
+			if strings.HasPrefix(name, prefix) {
+				for _, mapping := range mappings {
+					val, hasVal := mapping[string(p)]
+					if hasVal {
+						return val, nil
+					}
+				}
+			}
+		}
+		return 0, fmt.Errorf("unexpected type: %T, with value: %v, for: %s", v, v, name)
+	default:
+		return 0, fmt.Errorf("unexpected type: %T, with value: %v, for: %s", v, v, name)
+	}
+
+	return 0, fmt.Errorf("unexpected type: %T, with value: %v, for: %s", v, v, name)
+}
+
+func formatMetricPoint(metricPoint *MetricPoint, w *Wavefront) string {
+	buffer := bytes.NewBufferString("")
+	buffer.WriteString(metricPoint.Metric)
+	buffer.WriteString(" ")
+	buffer.WriteString(strconv.FormatFloat(metricPoint.Value, 'f', 6, 64))
+	buffer.WriteString(" ")
+	buffer.WriteString(strconv.FormatInt(metricPoint.Timestamp, 10))
+	buffer.WriteString(" source=\"")
+	buffer.WriteString(metricPoint.Source)
+	buffer.WriteString("\"")
+
+	for k, v := range metricPoint.Tags {
+		buffer.WriteString(" ")
+		if w.UseRegex {
+			buffer.WriteString(sanitizedRegex.ReplaceAllLiteralString(k, "-"))
+		} else {
+			buffer.WriteString(sanitizedChars.Replace(k))
+		}
+		buffer.WriteString("=\"")
+		buffer.WriteString(tagValueReplacer.Replace(v))
+		buffer.WriteString("\"")
+	}
+
+	return buffer.String()
+}
+
+func (w *Wavefront) SampleConfig() string {
+	return sampleConfig
+}
+
+func (w *Wavefront) Description() string {
+	return "Configuration for Wavefront server to send metrics to"
+}
+
+func (w *Wavefront) Close() error {
+	return nil
+}
+
+func init() {
+	outputs.Add("wavefront", func() telegraf.Output {
+		return &Wavefront{
+			MetricSeparator: ".",
+			ConvertPaths:    true,
+			ConvertBool:     true,
+		}
+	})
+}
diff --git a/plugins/outputs/wavefront/wavefront_test.go b/plugins/outputs/wavefront/wavefront_test.go
new file mode 100644
index 000000000..1dd4d7078
--- /dev/null
+++ b/plugins/outputs/wavefront/wavefront_test.go
@@ -0,0 +1,307 @@
+package wavefront
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+// default config used by Tests
+func defaultWavefront() *Wavefront {
+	return &Wavefront{
+		Host:            "localhost",
+		Port:            2878,
+		Prefix:          "testWF.",
+		SimpleFields:    false,
+		MetricSeparator: ".",
+		ConvertPaths:    true,
+		ConvertBool:     true,
+		UseRegex:        false,
+	}
+}
+
+func TestBuildMetrics(t *testing.T) {
+	w := defaultWavefront()
+	w.Prefix = "testthis."
+
+	pathReplacer = strings.NewReplacer("_", w.MetricSeparator)
+
+	testMetric1, _ := metric.New(
+		"test.simple.metric",
+		map[string]string{"tag1": "value1", "host": "testHost"},
+		map[string]interface{}{"value": 123},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+
+	var timestamp int64 = 1257894000
+
+	var metricTests = []struct {
+		metric       telegraf.Metric
+		metricPoints []MetricPoint
+	}{
+		{
+			testutil.TestMetric(float64(1), "testing_just*a%metric:float", "metric2"),
+			[]MetricPoint{
+				{Metric: w.Prefix + "testing.just-a-metric-float", Value: 1, Timestamp: timestamp, Tags: map[string]string{"tag1": "value1"}},
+				{Metric: w.Prefix + "testing.metric2", Value: 1, Timestamp: timestamp, Tags: map[string]string{"tag1": "value1"}},
+			},
+		},
+		{
+			testMetric1,
+			[]MetricPoint{{Metric: w.Prefix + "test.simple.metric", Value: 123, Timestamp: timestamp, Source: "testHost", Tags: map[string]string{"tag1": "value1"}}},
+		},
+	}
+
+	for _, mt := range metricTests {
+		ml := buildMetrics(mt.metric, w)
+		for i, line := range ml {
+			if mt.metricPoints[i].Metric != line.Metric || mt.metricPoints[i].Value != line.Value {
+				t.Errorf("\nexpected\t%+v %+v\nreceived\t%+v %+v\n", mt.metricPoints[i].Metric, mt.metricPoints[i].Value, line.Metric, line.Value)
+			}
+		}
+	}
+
+}
+
+func TestBuildMetricsWithSimpleFields(t *testing.T) {
+	w := defaultWavefront()
+	w.Prefix = "testthis."
+	w.SimpleFields = true
+
+	pathReplacer = strings.NewReplacer("_", w.MetricSeparator)
+
+	testMetric1, _ := metric.New(
+		"test.simple.metric",
+		map[string]string{"tag1": "value1"},
+		map[string]interface{}{"value": 123},
+		time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+
+	var metricTests = []struct {
+		metric      telegraf.Metric
+		metricLines []MetricPoint
+	}{
+		{
+			testutil.TestMetric(float64(1), "testing_just*a%metric:float"),
+			[]MetricPoint{{Metric: w.Prefix + "testing.just-a-metric-float.value", Value: 1}},
+		},
+		{
+			testMetric1,
+			[]MetricPoint{{Metric: w.Prefix + "test.simple.metric.value", Value: 123}},
+		},
+	}
+
+	for _, mt := range metricTests {
+		ml := buildMetrics(mt.metric, w)
+		for i, line := range ml {
+			if mt.metricLines[i].Metric != line.Metric || mt.metricLines[i].Value != line.Value {
+				t.Errorf("\nexpected\t%+v %+v\nreceived\t%+v %+v\n", mt.metricLines[i].Metric, mt.metricLines[i].Value, line.Metric, line.Value)
+			}
+		}
+	}
+
+}
+
+func TestBuildTags(t *testing.T) {
+
+	w := defaultWavefront()
+
+	var tagtests = []struct {
+		ptIn      map[string]string
+		outSource string
+		outTags   map[string]string
+	}{
+		{
+			map[string]string{},
+			"",
+			map[string]string{},
+		},
+		{
+			map[string]string{"one": "two", "three": "four", "host": "testHost"},
+			"testHost",
+			map[string]string{"one": "two", "three": "four"},
+		},
+		{
+			map[string]string{"aaa": "bbb", "host": "testHost"},
+			"testHost",
+			map[string]string{"aaa": "bbb"},
+		},
+		{
+			map[string]string{"bbb": "789", "aaa": "123", "host": "testHost"},
+			"testHost",
+			map[string]string{"aaa": "123", "bbb": "789"},
+		},
+		{
+			map[string]string{"host": "aaa", "dc": "bbb"},
+			"aaa",
+			map[string]string{"dc": "bbb"},
+		},
+	}
+
+	for _, tt := range tagtests {
+		source, tags := buildTags(tt.ptIn, w)
+		if source != tt.outSource {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", tt.outSource, source)
+		}
+		if !reflect.DeepEqual(tags, tt.outTags) {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", tt.outTags, tags)
+		}
+	}
+}
+
+func TestBuildTagsWithSource(t *testing.T) {
+	w := defaultWavefront()
+	w.SourceOverride = []string{"snmp_host", "hostagent"}
+
+	var tagtests = []struct {
+		ptIn      map[string]string
+		outSource string
+		outTags   map[string]string
+	}{
+		{
+			map[string]string{"host": "realHost"},
+			"realHost",
+			map[string]string{},
+		},
+		{
+			map[string]string{"tag1": "value1", "host": "realHost"},
+			"realHost",
+			map[string]string{"tag1": "value1"},
+		},
+		{
+			map[string]string{"snmp_host": "realHost", "host": "origHost"},
+			"realHost",
+			map[string]string{"telegraf_host": "origHost"},
+		},
+		{
+			map[string]string{"hostagent": "realHost", "host": "origHost"},
+			"realHost",
+			map[string]string{"telegraf_host": "origHost"},
+		},
+		{
+			map[string]string{"hostagent": "abc", "snmp_host": "realHost", "host": "origHost"},
+			"realHost",
+			map[string]string{"hostagent": "abc", "telegraf_host": "origHost"},
+		},
+		{
+			map[string]string{"something": "abc", "host": "r*@l\"Ho/st"},
+			"r-@l\\\"Ho/st",
+			map[string]string{"something": "abc"},
+		},
+	}
+
+	for _, tt := range tagtests {
+		source, tags := buildTags(tt.ptIn, w)
+		if source != tt.outSource {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", tt.outSource, source)
+		}
+		if !reflect.DeepEqual(tags, tt.outTags) {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", tt.outTags, tags)
+		}
+	}
+}
+
+func TestBuildValue(t *testing.T) {
+	w := defaultWavefront()
+
+	var valuetests = []struct {
+		value interface{}
+		name  string
+		out   float64
+		isErr bool
+	}{
+		{value: int64(123), out: 123},
+		{value: uint64(456), out: 456},
+		{value: float64(789), out: 789},
+		{value: true, out: 1},
+		{value: false, out: 0},
+		{value: "bad", out: 0, isErr: true},
+	}
+
+	for _, vt := range valuetests {
+		value, err := buildValue(vt.value, vt.name, w)
+		if vt.isErr && err == nil {
+			t.Errorf("\nexpected error with\t%+v\nreceived\t%+v\n", vt.out, value)
+		} else if value != vt.out {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", vt.out, value)
+		}
+	}
+
+}
+
+func TestBuildValueString(t *testing.T) {
+	w := defaultWavefront()
+	w.StringToNumber = map[string][]map[string]float64{
+		"test1": {{"green": 1, "red": 10}},
+		"test2": {{"active": 1, "hidden": 2}},
+	}
+
+	var valuetests = []struct {
+		value interface{}
+		name  string
+		out   float64
+		isErr bool
+	}{
+		{value: int64(123), name: "", out: 123},
+		{value: "green", name: "test1", out: 1},
+		{value: "red", name: "test1", out: 10},
+		{value: "hidden", name: "test2", out: 2},
+		{value: "bad", name: "test1", out: 0, isErr: true},
+	}
+
+	for _, vt := range valuetests {
+		value, err := buildValue(vt.value, vt.name, w)
+		if vt.isErr && err == nil {
+			t.Errorf("\nexpected error with\t%+v\nreceived\t%+v\n", vt.out, value)
+		} else if value != vt.out {
+			t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", vt.out, value)
+		}
+	}
+
+}
+
+func TestFormatMetricPoint(t *testing.T) {
+	w := defaultWavefront()
+
+	testpoint := &MetricPoint{
+		Metric:    "test.metric.something",
+		Value:     123.456,
+		Timestamp: 1257894000,
+		Source:    "testSource",
+		Tags:      map[string]string{"sp*c!@l\"-ch/rs": "sp*c!@l/ val\"ue"},
+	}
+
+	expected := "test.metric.something 123.456000 1257894000 source=\"testSource\" sp-c--l--ch-rs=\"sp-c!@l/ val\\\"ue\""
+
+	received := formatMetricPoint(testpoint, w)
+
+	if expected != received {
+		t.Errorf("\nexpected\t%+v\nreceived\t%+v\n", expected, received)
+
+	}
+}
+
+// Benchmarks to test performance of string replacement via Regex and Replacer
+var testString = "this_is*my!test/string\\for=replacement"
+
+func BenchmarkReplaceAllString(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		sanitizedRegex.ReplaceAllString(testString, "-")
+	}
+}
+
+func BenchmarkReplaceAllLiteralString(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		sanitizedRegex.ReplaceAllLiteralString(testString, "-")
+	}
+}
+
+func BenchmarkReplacer(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		sanitizedChars.Replace(testString)
+	}
+}

From ed6f438c9dcd7b19bdca6e6068039beee7b74793 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 29 Sep 2017 16:15:48 -0700
Subject: [PATCH 0604/1302] Add Wavefront output to changelog and readme

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d475ebac..41a97ed7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### New Plugins
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
+- [wavefront](./plugins/inputswavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
 
@@ -34,6 +35,7 @@
 - [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin.
 - [#3106](https://github.com/influxdata/telegraf/pull/3106): Add configurable separator for metrics and fields in opentsdb output.
 - [#1692](https://github.com/influxdata/telegraf/pull/1692): Add support for the rollbar occurrence webhook event.
+- [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 49c0446f6..9e7ad03f9 100644
--- a/README.md
+++ b/README.md
@@ -283,3 +283,4 @@ formats may be used with input plugins supporting the `data_format` option:
 * [socket_writer](./plugins/outputs/socket_writer)
 * [tcp](./plugins/outputs/socket_writer)
 * [udp](./plugins/outputs/socket_writer)
+* [wavefront](./plugins/outputs/wavefront)

From cdca81c9999364cf6fb35f25fabdad31bb81a177 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Oct 2017 12:28:31 -0700
Subject: [PATCH 0605/1302] Fix mqtt_consumer connection_timeout test

---
 plugins/inputs/mqtt_consumer/mqtt_consumer.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index e0d668879..ddffbf258 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -121,8 +121,8 @@ func (m *MQTTConsumer) Start(acc telegraf.Accumulator) error {
 		return fmt.Errorf("MQTT Consumer, invalid QoS value: %d", m.QoS)
 	}
 
-	if int(m.ConnectionTimeout.Duration) <= 0 {
-		return fmt.Errorf("MQTT Consumer, invalid connection_timeout value: %d", m.ConnectionTimeout)
+	if m.ConnectionTimeout.Duration < 1*time.Second {
+		return fmt.Errorf("MQTT Consumer, invalid connection_timeout value: %s", m.ConnectionTimeout.Duration)
 	}
 
 	opts, err := m.createOpts()

From d7b88b10ad19747a8b75df68e496463b970800df Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Mon, 2 Oct 2017 16:50:23 -0400
Subject: [PATCH 0606/1302] New Particle Plugin

---
 .txt                                          |  0
 plugins/inputs/webhooks/particle/README.md    | 26 +++++++++
 .../webhooks/particle/particle_webhooks.go    | 48 ++++++++++++++++
 .../particle/particle_webhooks_events.go      | 22 +++++++
 .../particle_webhooks_events_json_test.go     | 39 +++++++++++++
 .../particle/particle_webhooks_test.go        | 57 +++++++++++++++++++
 plugins/inputs/webhooks/webhooks.go           |  5 ++
 plugins/inputs/webhooks/webhooks_test.go      |  6 ++
 8 files changed, 203 insertions(+)
 create mode 100644 .txt
 create mode 100644 plugins/inputs/webhooks/particle/README.md
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.txt b/.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
new file mode 100644
index 000000000..1212b742a
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -0,0 +1,26 @@
+# particle webhooks
+
+You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
+
+## Events
+
+Your Particle device should publish an event that contains a JSON in the form of:
+```
+String data = String::format("{ \"tags\" : {
+	    \"tag_name\": \"tag_value\", 
+	    \"other_tag\": \"other_value\"
+    }, 
+	\"values\": {
+	    \"value_name\": %f, 
+		\"other_value\": %f, 
+    }
+    }",  value_value, other_value
+	);
+    Particle.publish("event_name", data, PRIVATE);
+```
+Escaping the "" is required in the source file.
+The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
+
+You will need to enable JSON messages in the Webhooks setup of Particle.io
+
+See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
new file mode 100644
index 000000000..813bd0665
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -0,0 +1,48 @@
+package particle
+
+import (
+	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"time"
+)
+
+type ParticleWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
+	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
+	rb.acc = acc
+}
+
+func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	dummy := &DummyData{}
+	if err := json.Unmarshal(data, dummy); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pd := &ParticleData{}
+	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pTime, err := dummy.Time()
+	if err != nil {
+		log.Printf("Time Conversion Error")
+		pTime = time.Now()
+	}
+	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
new file mode 100644
index 000000000..089536525
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
@@ -0,0 +1,22 @@
+package particle
+
+import (
+	"time"
+)
+
+type DummyData struct {
+	Event       string `json:"event"`
+	Data        string `json:"data"`
+	Ttl         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	InfluxDB    string `json:"influx_db"`
+}
+type ParticleData struct {
+	Event  string                 `json:"event"`
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func (d *DummyData) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
new file mode 100644
index 000000000..aef0537e9
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
@@ -0,0 +1,39 @@
+package particle
+
+func NewItemJSON() string {
+	return `
+	{ 
+	  "event": "temperature",
+	  "data": "{ 
+		  "tags": {
+			  "id": "230035001147343438323536", 
+			  "location": "TravelingWilbury"
+		  }, 
+		  "values": {
+			  "temp_c": 26.680000, 
+			  "temp_f": 80.024001, 
+			  "humidity": 44.937500, 
+			  "pressure": 998.998901, 
+			  "altitude": 119.331436, 
+			  "broadband": 1266, 
+			  "infrared": 528, 
+			  "lux": 0
+		  }
+	  }",
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor"
+	  "influx_db": "mydata"
+  }`
+}
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
new file mode 100644
index 000000000..c62e0f0c8
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -0,0 +1,57 @@
+package particle
+
+import (
+	"github.com/influxdata/telegraf/testutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	log.Printf("eventBody: %s\n", eventBody)
+	w := httptest.NewRecorder()
+	w.Code = 500
+
+	rb.eventHandler(w, req)
+
+	return w
+}
+
+func TestNewItem(t *testing.T) {
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, NewItemJSON())
+	log.Printf("Respnse: %s\n", resp.Body)
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"temp_c":    26.680000,
+		"temp_f":    80.024001,
+		"humidity":  44.937500,
+		"pressure":  998.998901,
+		"altitude":  119.331436,
+		"broadband": 1266,
+		"infrared":  528,
+		"lux":       0,
+	}
+
+	tags := map[string]string{
+		"id":       "230035001147343438323536",
+		"location": "TravelingWilbury",
+	}
+
+	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
+}
+func TestUnknowItem(t *testing.T) {
+	rb := &ParticleWebhook{Path: "/particle"}
+	resp := postWebhooks(rb, UnknowJSON())
+	log.Printf("Response: %s\n", resp.Body)
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 698cde159..794b55168 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,6 +35,7 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
+	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -62,6 +64,9 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
+	
+   [inputs.webhooks.particle]
+      path = "/particle"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 6d3448870..1a5fa4aa1 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -33,4 +34,9 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
+	wb.Particle = &particle.ParticleWebhook{Path: "/particle"}
+	expected = append(expected, wb.Particle)
+	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
+		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
+	}
 }

From 771fbc311a8449446637da65237192f6f534b750 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Oct 2017 15:44:55 -0700
Subject: [PATCH 0607/1302] Regenerate TLS certs due to expiration

---
 .../http_listener/http_listener_test.go       | 187 +++++++-----------
 scripts/tls-certs.sh                          |  66 +++++++
 2 files changed, 132 insertions(+), 121 deletions(-)
 create mode 100644 scripts/tls-certs.sh

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 97c36978a..2d4da8940 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -34,137 +34,82 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 	emptyMsg = ""
 
 	serviceRootPEM = `-----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUenakcvMDj2URxBvUHBe0Mfhac0cwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTE5NDNa
-Fw0yNzA4MjkwNTIwMTNaMBsxGTAXBgNVBAMTEHRlbGVncmFmLXRlc3QtY2EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxpDlUEC6LNXQMhvTtlWKUekwa
-xh2OaiR16WvO8iA+sYmjlpFXOe+V6YWT+daOGujCqlGdrfDjj3C3pqFPJ6Q4VXaA
-xQyd0Ena7kRtuQ/IUSpTWxyrpSIzKL3dAoV0NYpjFWznjVMP3Rq4l+4cHqviZSvK
-bWUK5n0vBGpEw3A22V9urhlSNkSbECvzn9EFHyIeJX603zaKXYw5wiDwCp1swbXW
-2WS2h45JeI5xrpKcFmLaqRNe0swi6bkGnmefyCv7nsbOLeKyEW9AExDSd6nSLdu9
-TGzhAfnfodcajSmKiQ+7YL9JY1bQ9hlfXk1ULg4riSEMKF+trZFZUanaXeeBAgMB
-AAGjgYAwfjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUiPkCD8gEsSgIiV8jzACMoUZcHaIwHwYDVR0jBBgwFoAUiPkCD8gEsSgIiV8j
-zACMoUZcHaIwGwYDVR0RBBQwEoIQdGVsZWdyYWYtdGVzdC1jYTANBgkqhkiG9w0B
-AQsFAAOCAQEAXeadR7ZVkb2C0F8OEd2CQxVt2/JOqM4G2N2O8uTwf+hIn+qm+jbb
-Q6JokGhr5Ybhvtv3U9JnI6RVI+TOYNkDzs5e2DtntFQmcKb2c+y5Z+OpvWd13ObK
-GMCs4bho6O7h1qo1Z+Ftd6sYQ7JL0MuTGWCNbXv2c1iC4zPT54n1vGZC5so08RO0
-r7bqLLEnkSawabvSAeTxtweCXJUw3D576e0sb8oU0AP/Hn/2IC9E1vFZdjDswEfs
-ARE4Oc5XnN6sqjtp0q5CqPpW6tYFwxdtZFk0VYPXyRnETVgry7Dc/iX6mktIYUx+
-qWSyPEDKALyxx6yUyVDqgcY2VUm0rM/1Iw==
+MIIBxzCCATCgAwIBAgIJAOLq2g9+9TVgMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMMC1RlbGVncmFmIENBMB4XDTE3MTAwMjIyNDMwOFoXDTE3MTEwMTIyNDMwOFow
+FjEUMBIGA1UEAwwLVGVsZWdyYWYgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBALHtGXLKZz3HUA4E1H0mR3gAtgNwUSRArxylCjQwO/7tFEYDFVCCPFzAF7G8
+hzHyBNgx5FwNrH3bMEol9iIxzoZNU0XTWS7DzN4S+89C2Tn+NaFko/SeFBMp4IK/
+55YAgcYGe2QbFnPITGYPT05VkbSBMD0PBITNSwsclGZGFVoHAgMBAAGjHTAbMAwG
+A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBAIJpAA+X
+QB57JhNxevUlFFLmGx7ASKrOeZLupzak4qUK718erafMAsXhydx1eKL/5Ne7ZcFa
+Tf6dRPzCjv89WzYK/kJ59AgATkXNPvADRUKd0ViQw4Q4EcfuQrTMEym+gl1W2qQl
+U9/eBDE341pcrfdHHGhS5LKv6KTmjyYmDLxl
 -----END CERTIFICATE-----`
 	serviceCertPEM = `-----BEGIN CERTIFICATE-----
-MIIDKjCCAhKgAwIBAgIUVYjQKruuFavlMZvV7X6RRF4OyBowDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTM3MjRa
-Fw0xNzA5MzAwNTM3NTRaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANojLHm+4ttLfl8xo4orZ436/o36wdQ30sWz
-xE8eGejhARvCSNIR1Tau41Towq/MQVQQejQJRgqBSz7UEfzJNJGKKKc560j6fmTM
-FHpFNZcTrNrTb0r3blUWF1oswhTgg313OXbVsz+E9tHkT1p/s9uURy3TJ3O/CFHq
-2vTiTQMTq31v0FEN1E/d6uzMhnGy5+QuRu/0A2iPpgXgPopYZwG5t4hN1KklM//l
-j2gMlX6mAYalctFOkDbhIe4/4dQcfT0sWA49KInZmUeB1RdyiNfCoXnDRZHocPIj
-ltYAK/Igda0fdlMisoqh2ZMrCt8yhws7ycc12cFi7ZMv8zvi5p8CAwEAAaNtMGsw
-EwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFCdE87Nz7vPpgRmj++6J8rQR
-0F/TMB8GA1UdIwQYMBaAFIj5Ag/IBLEoCIlfI8wAjKFGXB2iMBQGA1UdEQQNMAuC
-CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAIPhMYCsCPvOcvLLkahaZVn2g
-ZbzPDplFhEsH1cpc7vd3GCV2EYjNTbBTDs5NlovSbJLf1DFB+gwsfEjhlFVZB3UQ
-6GtuA5CQh/Skv8ngCDiLP50BbKF0CLa4Ia0xrSTAyRsg2rt9APphbej0yKqJ7j8U
-1KK6rjOSnuzrKseex26VVovjPFq0FgkghWRm0xrAeizGTBCSEStZEPhk3pBo2x95
-a32VPpmhlQMDyiV6m1cc9/MfxMisnyeLqJl8E9nziNa4/BgwwN9DcOp63D9OOa6A
-brtLz8OXqvV+7gKlq+nASFDimXwFKRyqRH6ECyHNTE2K14KZb7+JTa0AUm6Nlw==
+MIIBzzCCATigAwIBAgIBATANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
+Z3JhZiBDQTAeFw0xNzEwMDIyMjQzMDhaFw0yNzA5MzAyMjQzMDhaMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoI/8ceps
+DvvA3KUDViYwZcB+RvfT6XCPCT35mEzuXWP42JHk1VPNA41215U8CGoJF7+OzRcZ
+an3b2WLfAph+bi4Vmpe8eolmPHjf57jJ2fdDeLtMA4T0WF8yR4fHxrrU2UFsgXod
+kpQNqa/R5+iEKNMQVQgD2HjP5BE1u+H6fscCAwEAAaMvMC0wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBSAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+gYEAV5vx8FHNlD6Z3e01/MiNSmYXn93CwlixYMRyW1Ri2P6hMtJiMRp59fNFzroa
+iv6djr30uuKYOiAvdKhNaYWERgrtjGVEuPoIMQfaAaKHQj6CKLBXeGZ5Gxhy+M6G
+OE6g0E4ufHOqr1h1GDIiAq88zyJ2AupgLLUCMFtkq0v0mr0=
 -----END CERTIFICATE-----`
 	serviceKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA2iMseb7i20t+XzGjiitnjfr+jfrB1DfSxbPETx4Z6OEBG8JI
-0hHVNq7jVOjCr8xBVBB6NAlGCoFLPtQR/Mk0kYoopznrSPp+ZMwUekU1lxOs2tNv
-SvduVRYXWizCFOCDfXc5dtWzP4T20eRPWn+z25RHLdMnc78IUera9OJNAxOrfW/Q
-UQ3UT93q7MyGcbLn5C5G7/QDaI+mBeA+ilhnAbm3iE3UqSUz/+WPaAyVfqYBhqVy
-0U6QNuEh7j/h1Bx9PSxYDj0oidmZR4HVF3KI18KhecNFkehw8iOW1gAr8iB1rR92
-UyKyiqHZkysK3zKHCzvJxzXZwWLtky/zO+LmnwIDAQABAoIBABD8MidcrK9kpndl
-FxXYIV0V0SJfBx6uJhRM1hlO/7d5ZauyqhbpWo/CeGMRKK+lmOShz9Ijcre4r5I5
-0xi61gQLHPVAdkidcKAKoAGRSAX2ezwiwIS21Xl8md7ko0wa20I2uVu+chGdGdbo
-DyG91dRgLFauHWFO26f9QIVW5aY6ifyjg1fyxR/9n2YZfkqbjvASW4Mmfv5GR1aT
-mffajgsquy78PKs86f879iG+cfCzPYdoK+h7fsm4EEqDwK8JCsUIY1qN+Tuj5RQY
-zuIuD34+wywe7Jd1vwjQ40Cyilgtnu8Q8s8J05bXrD3mqer5nrqIGOX0vKgs+EXx
-1hV+6ZECgYEA+950L2u8oPzNXu9BAL8Y5Tl384qj1+Cj/g28MuZFoPf/KU0HRN6l
-PBlXKaGP9iX+749tdiNPk5keIwOL8xCVXOpMLOA/jOlGODydG9rX67WCL/R1RcJR
-+Pip8dxO1ZNpOKHud06XLMuuVz9qNq0Xwb1VCzNTOxnEDwtXNyDm6OkCgYEA3bcW
-hMeDNn85UA4n0ljcdCmEu12WS7L//jaAOWuPPfM3GgKEIic6hqrPWEuZlZtQnybx
-L6qQgaWyCfl/8z0+5WynQqkVPz1j1dSrSKnemxyeySrmUcOH5UJfAKaG5PUd7H3t
-oPTCxkbW3Bi2QLlgd4nb7+OEk6w0V9Zzv4AFHkcCgYBL/aD2Ub4WoE9iLjNhg0aC
-mmUrcI/gaSFxXDmE7d7iIxC0KE5iI/6cdFTM9bbWoD4bjx2KgDrZIGBsVfyaeE1o
-PDSBcaMa46LRAtCv/8YXkqrVxx6+zlMnF/dGRp7uZ0xeztSA4JBR7p4KKtLj7jN1
-u6b1+yVIdoylsVk+A8pHSQKBgQCUcsn5DTyleHl/SHsRM74naMUeToMbHDaalxMz
-XvkBmZ8DIzwlQe7FzAgYLkYfDWblqMVEDQfERpT2aL9qtU8vfZhf4aYAObJmsYYd
-mN8bLAaE2txrUmfi8JV7cgRPuG7YsVgxtK/U4glqRIGCxJv6bat86vERjvNc/JFz
-XtwOcQKBgF83Ov+EA9pL0AFs+BMiO+0SX/OqLX0TDMSqUKg3jjVfgl+BSBEZIsOu
-g5jqHBx3Om/UyrXdn+lnMhyEgCuNkeC6057B5iGcWucTlnINeejXk/pnbvMtGjD1
-OGWmdXhgLtKg6Edqm+9fnH0UJN6DRxRRCUfzMfbY8TRmLzZG2W34
+MIICXAIBAAKBgQCgj/xx6mwO+8DcpQNWJjBlwH5G99PpcI8JPfmYTO5dY/jYkeTV
+U80DjXbXlTwIagkXv47NFxlqfdvZYt8CmH5uLhWal7x6iWY8eN/nuMnZ90N4u0wD
+hPRYXzJHh8fGutTZQWyBeh2SlA2pr9Hn6IQo0xBVCAPYeM/kETW74fp+xwIDAQAB
+AoGABiRb6NOp3Ize3NHnJcWCNnI9omNalOR8ZEMdqCjROXtYiphSI6L4BbnEoQyR
+ZlUAEgt+3/ORQlScM12n4EaLF4Zi4CTGmibRHUff/ybUDGMg2Lp/AL/ghP/3U37l
+C/oRjohK9Rqn28hf8xgL9Jz+KbQaVv5f+frLwL3EKreYtOkCQQDLe1s89rbxvTZr
+PhtwYrnXC8KbBNPIzJbTXrphqr0H3xuDlTpd+4tvIlL6LoqANYXAmHHlKUuPcar6
+QCj9xNwTAkEAygDRac8qewqIWhZOs0u8phC37dxzwVXslrgjO+kTLxN/Q1srK45T
+gHDbJuCrBPkYrjAXWHd2rIkOWl0rk38A/QJADct4HQLw1iSous6EF7Npu+19LPs/
+zF4qX3wNkK99jzoN6HbGdTandkpSa8mZ9CUswyjSl+Gb0Ma4+6w72zBsZwJBAKn+
+Zj0VCjrhcj3d5/0bD3bxOtgBXaimFqP/8ibIzkwfrEmSv5G4BK1iTAs7prBYsFxm
+PD9GyagI7vs8zR8jEkECQD51jhM8DDPah/ECC31we54Y9dqBOupy1a8y6os1YFkv
+BV7zTVrpOzwUsrkMW+wFyQSX9eyyMfJHJihlobXA+QY=
 -----END RSA PRIVATE KEY-----`
 	clientRootPEM = `-----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUenakcvMDj2URxBvUHBe0Mfhac0cwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTE5NDNa
-Fw0yNzA4MjkwNTIwMTNaMBsxGTAXBgNVBAMTEHRlbGVncmFmLXRlc3QtY2EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxpDlUEC6LNXQMhvTtlWKUekwa
-xh2OaiR16WvO8iA+sYmjlpFXOe+V6YWT+daOGujCqlGdrfDjj3C3pqFPJ6Q4VXaA
-xQyd0Ena7kRtuQ/IUSpTWxyrpSIzKL3dAoV0NYpjFWznjVMP3Rq4l+4cHqviZSvK
-bWUK5n0vBGpEw3A22V9urhlSNkSbECvzn9EFHyIeJX603zaKXYw5wiDwCp1swbXW
-2WS2h45JeI5xrpKcFmLaqRNe0swi6bkGnmefyCv7nsbOLeKyEW9AExDSd6nSLdu9
-TGzhAfnfodcajSmKiQ+7YL9JY1bQ9hlfXk1ULg4riSEMKF+trZFZUanaXeeBAgMB
-AAGjgYAwfjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUiPkCD8gEsSgIiV8jzACMoUZcHaIwHwYDVR0jBBgwFoAUiPkCD8gEsSgIiV8j
-zACMoUZcHaIwGwYDVR0RBBQwEoIQdGVsZWdyYWYtdGVzdC1jYTANBgkqhkiG9w0B
-AQsFAAOCAQEAXeadR7ZVkb2C0F8OEd2CQxVt2/JOqM4G2N2O8uTwf+hIn+qm+jbb
-Q6JokGhr5Ybhvtv3U9JnI6RVI+TOYNkDzs5e2DtntFQmcKb2c+y5Z+OpvWd13ObK
-GMCs4bho6O7h1qo1Z+Ftd6sYQ7JL0MuTGWCNbXv2c1iC4zPT54n1vGZC5so08RO0
-r7bqLLEnkSawabvSAeTxtweCXJUw3D576e0sb8oU0AP/Hn/2IC9E1vFZdjDswEfs
-ARE4Oc5XnN6sqjtp0q5CqPpW6tYFwxdtZFk0VYPXyRnETVgry7Dc/iX6mktIYUx+
-qWSyPEDKALyxx6yUyVDqgcY2VUm0rM/1Iw==
+MIIBxzCCATCgAwIBAgIJAOLq2g9+9TVgMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMMC1RlbGVncmFmIENBMB4XDTE3MTAwMjIyNDMwOFoXDTE3MTEwMTIyNDMwOFow
+FjEUMBIGA1UEAwwLVGVsZWdyYWYgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBALHtGXLKZz3HUA4E1H0mR3gAtgNwUSRArxylCjQwO/7tFEYDFVCCPFzAF7G8
+hzHyBNgx5FwNrH3bMEol9iIxzoZNU0XTWS7DzN4S+89C2Tn+NaFko/SeFBMp4IK/
+55YAgcYGe2QbFnPITGYPT05VkbSBMD0PBITNSwsclGZGFVoHAgMBAAGjHTAbMAwG
+A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBAIJpAA+X
+QB57JhNxevUlFFLmGx7ASKrOeZLupzak4qUK718erafMAsXhydx1eKL/5Ne7ZcFa
+Tf6dRPzCjv89WzYK/kJ59AgATkXNPvADRUKd0ViQw4Q4EcfuQrTMEym+gl1W2qQl
+U9/eBDE341pcrfdHHGhS5LKv6KTmjyYmDLxl
 -----END CERTIFICATE-----`
 	clientCertPEM = `-----BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgIUIVOF5g2zH6+J/dbGdu4q18aSJoMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQdGVsZWdyYWYtdGVzdC1jYTAeFw0xNzA4MzEwNTQ1MzJa
-Fw0yNzA4MjUwMTQ2MDJaMBcxFTATBgNVBAMTDGR1bW15LWNsaWVudDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKok1HJ40buyjrS+DG9ORLzrWIJad2y/
-6X2Bg9MSENfpEUgaS7nK2ML3m1e2poHqBSR+V8VECNs+MDCLSOeQ4FC1TdBKMLfw
-NxW88y5Gj6rTRcAXl092ba7stwbqJPBAZu1Eh1jXIp5nrFKh8Jq7kRxmMB5vC70V
-fOSPS0RZtEd7D+QZ6jgkFJWsZzn4gJr8nc/kmLcntLw+g/tz9/8lfaV306tLlhMH
-dv3Ka6Nt86j6/muOwvoeAkAnCEFAgDcXg4F37PFAiEHRw9DyTeWDuZqvnMZ3gosL
-kl15QhnP0yG2QCjSb1gaLcKB42cyxDnPc31WsVuuzQnajazcVf3lJW0CAwEAAaNw
-MG4wEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFCemMO+Qlj+YCLQ3ScAQ
-8XYJJJ5ZMB8GA1UdIwQYMBaAFIj5Ag/IBLEoCIlfI8wAjKFGXB2iMBcGA1UdEQQQ
-MA6CDGR1bW15LWNsaWVudDANBgkqhkiG9w0BAQsFAAOCAQEARThbApKvvGDp7uSc
-mINaqDOHe69F9PepV0/3+B5+X1b3yd2sbzZL/ZoHl27kajSHVrUF+09gcTosfuY3
-omnIPw+NseqTJG+qTMRb3AarLNO46EJZLOowAEhnJyVmhK5uU0YqhV1X9eN+g4/o
-BuyOPvHj6UJWviZFy6fDIj2N+ygN/CNP5X3iLDBUoyCEHAehLiQr0aRgsqe4JLlS
-P+0l0btTUpcqUhsQy+sD2lv3MO1tZ/P4zhzu0J0LUeLBDdOPf/FIvTgkCNxN9GGy
-SLmeBeCzsKmWbzE3Yuahw3h4IblVyyGc7ZDGIobDrZgFqshcZylU8wrsjUnjNSPA
-G+LOWQ==
+MIIBzjCCATegAwIBAgIBAjANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
+Z3JhZiBDQTAeFw0xNzEwMDIyMjQzMDhaFw0yNzA5MzAyMjQzMDhaMBMxETAPBgNV
+BAMMCHRlbGVncmFmMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIrPGv8Sm1
+6tI+vlATzWGOK1D40iNTiGj4FpcS2Tm4SdaDSfa3VL9N5l8aeuN4E8O2YXK3QcR8
+NoeY87cWW06PtFc/ByS42VeWDKt28/DpGzbrzCVNOumS3X5QEyySYLpi0uqI9ZZ5
+O2sOJ2yVua8F3cwqPTveVmU3LeQfVrh7QwIDAQABoy8wLTAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOB
+gQAVEfHePY9fumW8rkbbSbiuQ1dGIINbMGPO17eAjOxMT4Z1jDb8oTVHbaZM0rKo
+wKx4dDp5mnLK+NuMZ1sNxKOf6IMmQ022ANOYM0dkwfg13bpC3BGW8Z7nOFK0xXh6
+4KTcXktBUtubmn6w7szvWY2OajPVoiGgcapwwhCrBEa6rg==
 -----END CERTIFICATE-----`
 	clientKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAqiTUcnjRu7KOtL4Mb05EvOtYglp3bL/pfYGD0xIQ1+kRSBpL
-ucrYwvebV7amgeoFJH5XxUQI2z4wMItI55DgULVN0Eowt/A3FbzzLkaPqtNFwBeX
-T3Ztruy3Buok8EBm7USHWNcinmesUqHwmruRHGYwHm8LvRV85I9LRFm0R3sP5Bnq
-OCQUlaxnOfiAmvydz+SYtye0vD6D+3P3/yV9pXfTq0uWEwd2/cpro23zqPr+a47C
-+h4CQCcIQUCANxeDgXfs8UCIQdHD0PJN5YO5mq+cxneCiwuSXXlCGc/TIbZAKNJv
-WBotwoHjZzLEOc9zfVaxW67NCdqNrNxV/eUlbQIDAQABAoIBAAXZYEhTKPqn58oE
-4o6NBUXtXUyV6ZcefdtnsW13KIcTpxlwdfv8IjmJo5h/WfgLYIPhqAjLDvbii2uP
-zkDPtTZxFSy88DHSm0IvDbkgid3Yh4RUC0qbCqhB0QT21bBAtokfmvuN4c3KSJ1K
-nefj3Ng6Fxtku+WTMIj2+CJwZwcyAH47ZUngYs/77gA0hAJcbdL/bj8Bpmd+lH6C
-Ci22T2hrw+cpWMN6qwa3wxWIneCaqxkylSgpUzSNE0QO3mXkX+NYtL2BQ0w+wPqq
-lww3QJOFAX1qRLflglL9K+ruTQofm49vxv6apsoqdkrxEBoPzkljlqiPRmzUxau4
-cvbApQECgYEAy5m5O3mQt6DBrDRJWSwpZh6DRNd5USEqXOIFtp+Qze2Jx1pYQfZt
-NOXOrwy04o0+6yLzc4O4W5ta2KfTlALFzCa6Na3Ca4ZUAeteWprrdh8b1b2w/wUH
-E3uQFkvH0zFdPsA3pTTZ0k/ydmHnu4zZqBnSeh0dIW8xFYgZZCgQusECgYEA1e7O
-ujCUa8y49sY42D/Y/c8B96xVfJZO5hhY7eLgkzqUlmFl31Ld7AjlJcXpbMeW1vaa
-0Mxbfx2qAVaZEkvdnXq3V8spe6qOGBdlKzey4DMEfmEXLFp5DRYCSwpXiqDZcGqc
-jwI58wuzKoDgydN9bLdF8XYGtQXnHIE9WyTYMa0CgYBKYSBgb+rEir/2LyvUneOJ
-4P/HuIgjcWBOimvX6bc2495/q6uufV4sAwBcxuGWGk+wCxaxTp+dJ8YqfDU5T0H/
-cO56Cb6LFYm/IcNYilwWzQqYLTJqF+Yb4fojiw+3QcN01zf87K/eu0IyqVXFGJGz
-bauM3PH1cu+VlCDijBiAgQKBgDOQ9YmRriTx2t+41fjiIvbC0BGYG58FSA1UbxMg
-LcuvQiOhZIHZIp8DYeCh/Or4jRZRqO2NZLyWNOVPr2Pmn4uXCdyCnwQtD0UlVoB9
-U4ORKJMh6gkJ4cXSuUjHPGSw8tiTChu6iKdZ+ZzUJdrgPIpY/uX98g3uV0/aoyR2
-FBqdAoGAQIrcOsTpCe6l3ZDtQyNIeAj1s7sZyW8MBy95RXw3y/yzVEOAu4yWNobj
-RReeHQEsrQq+sJ/cols8HfoOpGpL3U0IGDi5vr1JlOXmBhFX2xuFrfh3jvgXlUqb
-fqxPcT3d7I/UEi0ueDh3osyTn46mDfRfF7HBLBNeyQbIFWBDDus=
+MIICXgIBAAKBgQDIrPGv8Sm16tI+vlATzWGOK1D40iNTiGj4FpcS2Tm4SdaDSfa3
+VL9N5l8aeuN4E8O2YXK3QcR8NoeY87cWW06PtFc/ByS42VeWDKt28/DpGzbrzCVN
+OumS3X5QEyySYLpi0uqI9ZZ5O2sOJ2yVua8F3cwqPTveVmU3LeQfVrh7QwIDAQAB
+AoGAHtvpdqLhRSZNGnTtn33vyIsEsp6t7ASID855gN6Cr8I7CIlxNRQFLxeD/HB1
+VlvDtuIZX/DvJCLGi1C/EOMNm2nY7IT2gZgMpxvmfjfGhHKT1MWYu9cdyiOOacqD
+yRDAcKpubIPEIV3aczglv9sVApXwZcgePzDwweTVfP/Nv5ECQQDthIv5Y5k3UO8h
+Hht+27W8McFJ5eiF5OcLGOQ4nKGHkCOskfD4u/i+j+4dUeGBdpT8CzszgofBa6wh
+dJevQerVAkEA2Ep8PUfXRjel8NiLNL8iK/SR26y8wPduKam31SMUPq71+GROKkFz
+yYYAbKORs+fS6LBT+M48cEu470o+g8eptwJBALzCEMeSOqp2XIRSPAG2NBiq5fSH
+jSIThvYPwxemisyEZYV4uivCnu06zz5n2zIa/k3L0zGdc6vomPRBh2aVmT0CQQCY
+/B5ibfUbqnLKJzBXb7Xo50Vf3w9nYdvexjfMHtLL/47lUXVkOAWBDjIwpYWCfb/V
+bBsJCj7/ot+9CYOsTEaDAkEA4XAGFxx78JMVuJLjevkf0pGUPEocdoOAvpYWT5sR
+9FODrPEtW84ZevSmuByjzeqVzS3ElIxACopRJgSN20d9vg==
 -----END RSA PRIVATE KEY-----`
 )
 
diff --git a/scripts/tls-certs.sh b/scripts/tls-certs.sh
new file mode 100644
index 000000000..39e8cf359
--- /dev/null
+++ b/scripts/tls-certs.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+mkdir certs certs_by_serial private &&
+chmod 700 private &&
+echo 01 > ./serial &&
+touch ./index.txt &&
+cat >./openssl.conf <<EOF
+[ ca ]
+default_ca = telegraf_ca
+
+[ telegraf_ca ]
+certificate = ./certs/cacert.pem
+database = ./index.txt
+new_certs_dir = ./certs_by_serial
+private_key = ./private/cakey.pem
+serial = ./serial
+
+default_crl_days = 7
+default_days = 3650
+default_md = sha256
+
+policy = telegraf_ca_policy
+x509_extensions = certificate_extensions
+
+[ telegraf_ca_policy ]
+commonName = supplied
+
+[ certificate_extensions ]
+basicConstraints = CA:false
+
+[ req ]
+default_bits = 1024
+default_keyfile = ./private/cakey.pem
+default_md = sha256
+prompt = yes
+distinguished_name = root_ca_distinguished_name
+x509_extensions = root_ca_extensions
+
+[ root_ca_distinguished_name ]
+commonName = hostname
+
+[ root_ca_extensions ]
+basicConstraints = CA:true
+keyUsage = keyCertSign, cRLSign
+
+[ client_ca_extensions ]
+basicConstraints = CA:false
+keyUsage = digitalSignature
+extendedKeyUsage = 1.3.6.1.5.5.7.3.2
+
+[ server_ca_extensions ]
+basicConstraints = CA:false
+keyUsage = keyEncipherment
+extendedKeyUsage = 1.3.6.1.5.5.7.3.1
+EOF
+openssl req -x509 -config ./openssl.conf -newkey rsa:1024 -out ./certs/cacert.pem -keyout ./private/cakey.pem -subj "/CN=Telegraf CA/" -nodes &&
+
+# Create server keypair
+openssl genrsa -out ./private/serverkey.pem 1024 &&
+openssl req -new -key ./private/serverkey.pem -out ./certs/servercsr.pem -outform PEM -subj "/CN=localhost/O=server/" &&
+openssl ca -config ./openssl.conf -in ./certs/servercsr.pem -out ./certs/servercert.pem -notext -batch -extensions server_ca_extensions &&
+
+# Create client keypair
+openssl genrsa -out ./private/clientkey.pem 1024 &&
+openssl req -new -key ./private/clientkey.pem -out ./certs/clientcsr.pem -outform PEM -subj "/CN=telegraf/O=client/" &&
+openssl ca -config ./openssl.conf -in ./certs/clientcsr.pem -out ./certs/clientcert.pem -notext -batch -extensions client_ca_extensions

From 8e3ed96d6f862d82f4c7870e8e8e75d0353fdccf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 2 Oct 2017 17:15:34 -0700
Subject: [PATCH 0608/1302] Fix case sensitivity error in sqlserver input
 (#3287)

---
 plugins/inputs/sqlserver/sqlserver.go | 37 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 2bc33a54a..373e12f7c 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -2,11 +2,12 @@ package sqlserver
 
 import (
 	"database/sql"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"sync"
 	"time"
 
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+
 	// go-mssqldb initialization
 	_ "github.com/zensqlmonitor/go-mssqldb"
 )
@@ -1436,16 +1437,16 @@ SELECT
 , type = 'Wait stats'
 ---- values
 , [I/O] = SUM([I/O])
-, [Latch] = SUM([Latch])
-, [Lock] = SUM([Lock])
-, [Network] = SUM([Network])
-, [Service broker] = SUM([Service broker])
-, [Memory] = SUM([Memory])
-, [Buffer] = SUM([Buffer])
+, [Latch] = SUM([LATCH])
+, [Lock] = SUM([LOCK])
+, [Network] = SUM([NETWORK])
+, [Service broker] = SUM([SERVICE BROKER])
+, [Memory] = SUM([MEMORY])
+, [Buffer] = SUM([BUFFER])
 , [CLR] = SUM([CLR])
 , [SQLOS] = SUM([SQLOS])
-, [XEvent] = SUM([XEvent])
-, [Other] = SUM([Other])
+, [XEvent] = SUM([XEVENT])
+, [Other] = SUM([OTHER])
 , [Total] = SUM([I/O]+[LATCH]+[LOCK]+[NETWORK]+[SERVICE BROKER]+[MEMORY]+[BUFFER]+[CLR]+[XEVENT]+[SQLOS]+[OTHER])
 FROM
 (
@@ -1479,16 +1480,16 @@ SELECT
 , type = 'Wait stats'
 ---- values
 , [I/O] = SUM([I/O])
-, [Latch] = SUM([Latch])
-, [Lock] = SUM([Lock])
-, [Network] = SUM([Network])
-, [Service broker] = SUM([Service broker])
-, [Memory] = SUM([Memory])
-, [Buffer] = SUM([Buffer])
+, [Latch] = SUM([LATCH])
+, [Lock] = SUM([LOCK])
+, [Network] = SUM([NETWORK])
+, [Service broker] = SUM([SERVICE BROKER])
+, [Memory] = SUM([MEMORY])
+, [Buffer] = SUM([BUFFER])
 , [CLR] = SUM([CLR])
 , [SQLOS] = SUM([SQLOS])
-, [XEvent] = SUM([XEvent])
-, [Other] = SUM([Other])
+, [XEvent] = SUM([XEVENT])
+, [Other] = SUM([OTHER])
 , [Total] = SUM([I/O]+[LATCH]+[LOCK]+[NETWORK]+[SERVICE BROKER]+[MEMORY]+[BUFFER]+[CLR]+[XEVENT]+[SQLOS]+[OTHER])
 FROM
 (

From f67350107d71ce6465aeeeda4e38ac9071a3b8b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Oct 2017 17:16:38 -0700
Subject: [PATCH 0609/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41a97ed7b..432c07b95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 - [#3265](https://github.com/influxdata/telegraf/issues/3265): Fix parsing of JSON with a UTF8 BOM in httpjson.
 - [#2887](https://github.com/influxdata/telegraf/issues/2887): Allow JSON data format to contain zero metrics.
 - [#3284](https://github.com/influxdata/telegraf/issues/3284): Fix format of connection_timeout in mqtt_consumer.
+- [#3081](https://github.com/influxdata/telegraf/issues/3081): Fix case sensitivity error in sqlserver input.
 
 ## v1.4.1 [2017-09-26]
 

From aba269e94c887f8259e8bec6ed00afab04df9f18 Mon Sep 17 00:00:00 2001
From: Jimena Cabrera Notari <phenomenes@gmail.com>
Date: Tue, 3 Oct 2017 01:38:51 +0100
Subject: [PATCH 0610/1302] Add extra wired tiger cache metrics to mongodb
 input (#3281)

---
 plugins/inputs/mongodb/mongodb_data.go      | 21 ++++++++--
 plugins/inputs/mongodb/mongodb_data_test.go | 18 +++++++--
 plugins/inputs/mongodb/mongostat.go         | 43 +++++++++++++++++++--
 3 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 47f35f199..36eabc90c 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -77,6 +77,21 @@ var WiredTigerStats = map[string]string{
 	"percent_cache_used":  "CacheUsedPercent",
 }
 
+var WiredTigerExtStats = map[string]string{
+	"wtcache_tracked_dirty_bytes":          "TrackedDirtyBytes",
+	"wtcache_current_bytes":                "CurrentCachedBytes",
+	"wtcache_max_bytes_configured":         "MaxBytesConfigured",
+	"wtcache_app_threads_page_read_count":  "AppThreadsPageReadCount",
+	"wtcache_app_threads_page_read_time":   "AppThreadsPageReadTime",
+	"wtcache_app_threads_page_write_count": "AppThreadsPageWriteCount",
+	"wtcache_bytes_written_from":           "BytesWrittenFrom",
+	"wtcache_bytes_read_into":              "BytesReadInto",
+	"wtcache_pages_evicted_by_app_thread":  "PagesEvictedByAppThread",
+	"wtcache_pages_queued_for_eviction":    "PagesQueuedForEviction",
+	"wtcache_server_evicting_pages":        "ServerEvictingPages",
+	"wtcache_worker_thread_evictingpages":  "WorkerThreadEvictingPages",
+}
+
 var DbDataStats = map[string]string{
 	"collections":  "Collections",
 	"objects":      "Objects",
@@ -121,13 +136,11 @@ func (d *MongodbData) AddDefaultStats() {
 			floatVal, _ := strconv.ParseFloat(percentVal, 64)
 			d.add(key, floatVal)
 		}
+		d.addStat(statLine, WiredTigerExtStats)
 	}
 }
 
-func (d *MongodbData) addStat(
-	statLine reflect.Value,
-	stats map[string]string,
-) {
+func (d *MongodbData) addStat(statLine reflect.Value, stats map[string]string) {
 	for key, value := range stats {
 		val := statLine.FieldByName(value).Interface()
 		d.add(key, val)
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index e2ecac49b..9082061d3 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -70,9 +70,21 @@ func TestAddReplStats(t *testing.T) {
 func TestAddWiredTigerStats(t *testing.T) {
 	d := NewMongodbData(
 		&StatLine{
-			StorageEngine:     "wiredTiger",
-			CacheDirtyPercent: 0,
-			CacheUsedPercent:  0,
+			StorageEngine:             "wiredTiger",
+			CacheDirtyPercent:         0,
+			CacheUsedPercent:          0,
+			TrackedDirtyBytes:         0,
+			CurrentCachedBytes:        0,
+			MaxBytesConfigured:        0,
+			AppThreadsPageReadCount:   0,
+			AppThreadsPageReadTime:    0,
+			AppThreadsPageWriteCount:  0,
+			BytesWrittenFrom:          0,
+			BytesReadInto:             0,
+			PagesEvictedByAppThread:   0,
+			PagesQueuedForEviction:    0,
+			ServerEvictingPages:       0,
+			WorkerThreadEvictingPages: 0,
 		},
 		tags,
 	)
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index bddd3fda9..cb7710798 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -127,9 +127,19 @@ type ConcurrentTransStats struct {
 
 // CacheStats stores cache statistics for WiredTiger.
 type CacheStats struct {
-	TrackedDirtyBytes  int64 `bson:"tracked dirty bytes in the cache"`
-	CurrentCachedBytes int64 `bson:"bytes currently in the cache"`
-	MaxBytesConfigured int64 `bson:"maximum bytes configured"`
+	TrackedDirtyBytes         int64 `bson:"tracked dirty bytes in the cache"`
+	CurrentCachedBytes        int64 `bson:"bytes currently in the cache"`
+	MaxBytesConfigured        int64 `bson:"maximum bytes configured"`
+	AppThreadsPageReadCount   int64 `bson:"application threads page read from disk to cache count"`
+	AppThreadsPageReadTime    int64 `bson:"application threads page read from disk to cache time (usecs)"`
+	AppThreadsPageWriteCount  int64 `bson:"application threads page write from cache to disk count"`
+	AppThreadsPageWriteTime   int64 `bson:"application threads page write from cache to disk time (usecs)"`
+	BytesWrittenFrom          int64 `bson:"bytes written from cache"`
+	BytesReadInto             int64 `bson:"bytes read into cache"`
+	PagesEvictedByAppThread   int64 `bson:"pages evicted by application threads"`
+	PagesQueuedForEviction    int64 `bson:"pages queued for eviction"`
+	ServerEvictingPages       int64 `bson:"eviction server evicting pages"`
+	WorkerThreadEvictingPages int64 `bson:"eviction worker thread evicting pages"`
 }
 
 // TransactionStats stores transaction checkpoints in WiredTiger.
@@ -406,6 +416,20 @@ type StatLine struct {
 	CacheDirtyPercent float64
 	CacheUsedPercent  float64
 
+	// Cache ultilization extended (wiredtiger only)
+	TrackedDirtyBytes         int64
+	CurrentCachedBytes        int64
+	MaxBytesConfigured        int64
+	AppThreadsPageReadCount   int64
+	AppThreadsPageReadTime    int64
+	AppThreadsPageWriteCount  int64
+	BytesWrittenFrom          int64
+	BytesReadInto             int64
+	PagesEvictedByAppThread   int64
+	PagesQueuedForEviction    int64
+	ServerEvictingPages       int64
+	WorkerThreadEvictingPages int64
+
 	// Replicated Opcounter fields
 	InsertR, QueryR, UpdateR, DeleteR, GetMoreR, CommandR int64
 	ReplLag                                               int64
@@ -534,6 +558,19 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		returnVal.Flushes = newStat.WiredTiger.Transaction.TransCheckpoints - oldStat.WiredTiger.Transaction.TransCheckpoints
 		returnVal.CacheDirtyPercent = float64(newStat.WiredTiger.Cache.TrackedDirtyBytes) / float64(newStat.WiredTiger.Cache.MaxBytesConfigured)
 		returnVal.CacheUsedPercent = float64(newStat.WiredTiger.Cache.CurrentCachedBytes) / float64(newStat.WiredTiger.Cache.MaxBytesConfigured)
+
+		returnVal.TrackedDirtyBytes = newStat.WiredTiger.Cache.TrackedDirtyBytes
+		returnVal.CurrentCachedBytes = newStat.WiredTiger.Cache.CurrentCachedBytes
+		returnVal.MaxBytesConfigured = newStat.WiredTiger.Cache.MaxBytesConfigured
+		returnVal.AppThreadsPageReadCount = newStat.WiredTiger.Cache.AppThreadsPageReadCount
+		returnVal.AppThreadsPageReadTime = newStat.WiredTiger.Cache.AppThreadsPageReadTime
+		returnVal.AppThreadsPageWriteCount = newStat.WiredTiger.Cache.AppThreadsPageWriteCount
+		returnVal.BytesWrittenFrom = newStat.WiredTiger.Cache.BytesWrittenFrom
+		returnVal.BytesReadInto = newStat.WiredTiger.Cache.BytesReadInto
+		returnVal.PagesEvictedByAppThread = newStat.WiredTiger.Cache.PagesEvictedByAppThread
+		returnVal.PagesQueuedForEviction = newStat.WiredTiger.Cache.PagesQueuedForEviction
+		returnVal.ServerEvictingPages = newStat.WiredTiger.Cache.ServerEvictingPages
+		returnVal.WorkerThreadEvictingPages = newStat.WiredTiger.Cache.WorkerThreadEvictingPages
 	} else if newStat.BackgroundFlushing != nil && oldStat.BackgroundFlushing != nil {
 		returnVal.Flushes = newStat.BackgroundFlushing.Flushes - oldStat.BackgroundFlushing.Flushes
 	}

From 0a55ab42b4aff5051c7cd0e52930872621eba170 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Oct 2017 17:39:32 -0700
Subject: [PATCH 0611/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432c07b95..464a31f68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - [#3106](https://github.com/influxdata/telegraf/pull/3106): Add configurable separator for metrics and fields in opentsdb output.
 - [#1692](https://github.com/influxdata/telegraf/pull/1692): Add support for the rollbar occurrence webhook event.
 - [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
+- [#3281](https://github.com/influxdata/telegraf/pull/3281): Add extra wired tiger cache metrics to mongodb input.
 
 ### Bugfixes
 

From 79f66dc5b339ff21883045219aef5ae5d5cef2f0 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Mon, 2 Oct 2017 20:42:21 -0400
Subject: [PATCH 0612/1302] Added newline to each metric line in wavefront
 output (#3290)

---
 plugins/outputs/wavefront/wavefront.go      | 4 +++-
 plugins/outputs/wavefront/wavefront_test.go | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 773e970bc..85a73e319 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -124,7 +124,7 @@ func (w *Wavefront) Write(metrics []telegraf.Metric) error {
 	for _, m := range metrics {
 		for _, metricPoint := range buildMetrics(m, w) {
 			metricLine := formatMetricPoint(metricPoint, w)
-			//log.Printf("D! Output [wavefront] %s", metricLine)
+			log.Printf("D! Output [wavefront] %s", metricLine)
 			_, err := connection.Write([]byte(metricLine))
 			if err != nil {
 				return fmt.Errorf("Wavefront: TCP writing error %s", err.Error())
@@ -262,6 +262,8 @@ func formatMetricPoint(metricPoint *MetricPoint, w *Wavefront) string {
 		buffer.WriteString("\"")
 	}
 
+	buffer.WriteString("\n")
+
 	return buffer.String()
 }
 
diff --git a/plugins/outputs/wavefront/wavefront_test.go b/plugins/outputs/wavefront/wavefront_test.go
index 1dd4d7078..f1722e668 100644
--- a/plugins/outputs/wavefront/wavefront_test.go
+++ b/plugins/outputs/wavefront/wavefront_test.go
@@ -275,7 +275,7 @@ func TestFormatMetricPoint(t *testing.T) {
 		Tags:      map[string]string{"sp*c!@l\"-ch/rs": "sp*c!@l/ val\"ue"},
 	}
 
-	expected := "test.metric.something 123.456000 1257894000 source=\"testSource\" sp-c--l--ch-rs=\"sp-c!@l/ val\\\"ue\""
+	expected := "test.metric.something 123.456000 1257894000 source=\"testSource\" sp-c--l--ch-rs=\"sp-c!@l/ val\\\"ue\"\n"
 
 	received := formatMetricPoint(testpoint, w)
 

From 6aee40fac1e844b0c5b23df5ce69d0f0bb7be65e Mon Sep 17 00:00:00 2001
From: David Norton <dgnorton@gmail.com>
Date: Tue, 3 Oct 2017 09:04:29 -0400
Subject: [PATCH 0613/1302] bug fixes and refactoring

---
 .../webhooks/particle/particle_webhooks.go    | 61 ++++++++++++-------
 .../particle/particle_webhooks_events.go      | 22 -------
 .../particle_webhooks_events_json_test.go     | 39 ------------
 .../particle/particle_webhooks_test.go        | 60 +++++++++++++++---
 4 files changed, 90 insertions(+), 92 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
index 813bd0665..258619856 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -2,14 +2,40 @@ package particle
 
 import (
 	"encoding/json"
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
 )
 
+type event struct {
+	Name        string `json:"event"`
+	Data        data   `json:"data"`
+	TTL         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	Database    string `json:"influx_db"`
+}
+
+type data struct {
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func newEvent() *event {
+	return &event{
+		Data: data{
+			Tags:   make(map[string]string),
+			Fields: make(map[string]interface{}),
+		},
+	}
+}
+
+func (e *event) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
+}
+
 type ParticleWebhook struct {
 	Path string
 	acc  telegraf.Accumulator
@@ -23,26 +49,19 @@ func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator
 
 func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
-	data, err := ioutil.ReadAll(r.Body)
+	e := newEvent()
+	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
+		log.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	pTime, err := e.Time()
 	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	dummy := &DummyData{}
-	if err := json.Unmarshal(data, dummy); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pd := &ParticleData{}
-	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pTime, err := dummy.Time()
-	if err != nil {
-		log.Printf("Time Conversion Error")
 		pTime = time.Now()
+		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
 	}
-	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
+
+	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
 	w.WriteHeader(http.StatusOK)
 }
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
deleted file mode 100644
index 089536525..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package particle
-
-import (
-	"time"
-)
-
-type DummyData struct {
-	Event       string `json:"event"`
-	Data        string `json:"data"`
-	Ttl         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	InfluxDB    string `json:"influx_db"`
-}
-type ParticleData struct {
-	Event  string                 `json:"event"`
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func (d *DummyData) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
deleted file mode 100644
index aef0537e9..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package particle
-
-func NewItemJSON() string {
-	return `
-	{ 
-	  "event": "temperature",
-	  "data": "{ 
-		  "tags": {
-			  "id": "230035001147343438323536", 
-			  "location": "TravelingWilbury"
-		  }, 
-		  "values": {
-			  "temp_c": 26.680000, 
-			  "temp_f": 80.024001, 
-			  "humidity": 44.937500, 
-			  "pressure": 998.998901, 
-			  "altitude": 119.331436, 
-			  "broadband": 1266, 
-			  "infrared": 528, 
-			  "lux": 0
-		  }
-	  }",
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor"
-	  "influx_db": "mydata"
-  }`
-}
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index c62e0f0c8..eecf26e14 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -1,17 +1,16 @@
 package particle
 
 import (
-	"github.com/influxdata/telegraf/testutil"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
 	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	log.Printf("eventBody: %s\n", eventBody)
 	w := httptest.NewRecorder()
 	w.Code = 500
 
@@ -21,10 +20,10 @@ func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecor
 }
 
 func TestNewItem(t *testing.T) {
+	t.Parallel()
 	var acc testutil.Accumulator
 	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, NewItemJSON())
-	log.Printf("Respnse: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
@@ -32,12 +31,12 @@ func TestNewItem(t *testing.T) {
 	fields := map[string]interface{}{
 		"temp_c":    26.680000,
 		"temp_f":    80.024001,
+		"infrared":  528.0,
+		"lux":       0.0,
 		"humidity":  44.937500,
 		"pressure":  998.998901,
 		"altitude":  119.331436,
-		"broadband": 1266,
-		"infrared":  528,
-		"lux":       0,
+		"broadband": 1266.0,
 	}
 
 	tags := map[string]string{
@@ -45,13 +44,54 @@ func TestNewItem(t *testing.T) {
 		"location": "TravelingWilbury",
 	}
 
-	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
+	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
 }
+
 func TestUnknowItem(t *testing.T) {
-	rb := &ParticleWebhook{Path: "/particle"}
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, UnknowJSON())
-	log.Printf("Response: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
 }
+
+func NewItemJSON() string {
+	return `
+	{
+	  "event": "temperature",
+	  "data": {
+		  "tags": {
+			  "id": "230035001147343438323536",
+			  "location": "TravelingWilbury"
+		  },
+		  "values": {
+			  "temp_c": 26.680000,
+			  "temp_f": 80.024001,
+			  "humidity": 44.937500,
+			  "pressure": 998.998901,
+			  "altitude": 119.331436,
+			  "broadband": 1266,
+			  "infrared": 528,
+			  "lux": 0
+		  }
+	  },
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor",
+	  "influx_db": "mydata"
+  }`
+}
+
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}

From b610276485a15a3342e95c5435e17fb7751746da Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Oct 2017 10:54:31 -0700
Subject: [PATCH 0614/1302] Skip invalid urls in nginx input

---
 plugins/inputs/nginx/nginx.go           | 1 +
 plugins/inputs/nginx_plus/nginx_plus.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/inputs/nginx/nginx.go b/plugins/inputs/nginx/nginx.go
index d389997e2..3880dd91d 100644
--- a/plugins/inputs/nginx/nginx.go
+++ b/plugins/inputs/nginx/nginx.go
@@ -72,6 +72,7 @@ func (n *Nginx) Gather(acc telegraf.Accumulator) error {
 		addr, err := url.Parse(u)
 		if err != nil {
 			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
 		}
 
 		wg.Add(1)
diff --git a/plugins/inputs/nginx_plus/nginx_plus.go b/plugins/inputs/nginx_plus/nginx_plus.go
index 5a761071e..089ba7d93 100644
--- a/plugins/inputs/nginx_plus/nginx_plus.go
+++ b/plugins/inputs/nginx_plus/nginx_plus.go
@@ -59,6 +59,7 @@ func (n *NginxPlus) Gather(acc telegraf.Accumulator) error {
 		addr, err := url.Parse(u)
 		if err != nil {
 			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
 		}
 
 		wg.Add(1)

From dd4299e9250c5c56b92e257540704896daff4925 Mon Sep 17 00:00:00 2001
From: Aditya C S <aditya.gnu@gmail.com>
Date: Wed, 4 Oct 2017 03:06:26 +0530
Subject: [PATCH 0615/1302] Collect Docker Swarm service metrics in docker
 input plugin (#3141)

---
 plugins/inputs/docker/client.go          | 13 ++++
 plugins/inputs/docker/docker.go          | 83 ++++++++++++++++++++++++
 plugins/inputs/docker/docker_test.go     | 82 +++++++++++++++++++++++
 plugins/inputs/docker/docker_testdata.go | 74 +++++++++++++++++++++
 4 files changed, 252 insertions(+)

diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go
index e918231a0..a021b59c4 100644
--- a/plugins/inputs/docker/client.go
+++ b/plugins/inputs/docker/client.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/swarm"
 	docker "github.com/docker/docker/client"
 	"github.com/docker/go-connections/sockets"
 )
@@ -20,6 +21,9 @@ type Client interface {
 	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
 	ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
 	ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
+	ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error)
+	TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
+	NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error)
 }
 
 func NewEnvClient() (Client, error) {
@@ -65,3 +69,12 @@ func (c *SocketClient) ContainerStats(ctx context.Context, containerID string, s
 func (c *SocketClient) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
 	return c.client.ContainerInspect(ctx, containerID)
 }
+func (c *SocketClient) ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error) {
+	return c.client.ServiceList(ctx, options)
+}
+func (c *SocketClient) TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error) {
+	return c.client.TaskList(ctx, options)
+}
+func (c *SocketClient) NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error) {
+	return c.client.NodeList(ctx, options)
+}
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 3634e596f..171097621 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -14,6 +15,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
@@ -35,6 +37,8 @@ type Docker struct {
 	Endpoint       string
 	ContainerNames []string
 
+	GatherServices bool `toml:"gather_services"`
+
 	Timeout        internal.Duration
 	PerDevice      bool     `toml:"perdevice"`
 	Total          bool     `toml:"total"`
@@ -82,6 +86,9 @@ var sampleConfig = `
   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
 
+  ## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
+  gather_services = false
+
   ## Only collect metrics for these containers, collect all if empty
   container_names = []
 
@@ -160,6 +167,13 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		acc.AddError(err)
 	}
 
+	if d.GatherServices {
+		err := d.gatherSwarmInfo(acc)
+		if err != nil {
+			acc.AddError(err)
+		}
+	}
+
 	// List containers
 	opts := types.ContainerListOptions{}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
@@ -187,6 +201,75 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error {
+
+	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
+	defer cancel()
+	services, err := d.client.ServiceList(ctx, types.ServiceListOptions{})
+	if err != nil {
+		return err
+	}
+
+	if len(services) > 0 {
+
+		tasks, err := d.client.TaskList(ctx, types.TaskListOptions{})
+		if err != nil {
+			return err
+		}
+
+		nodes, err := d.client.NodeList(ctx, types.NodeListOptions{})
+		if err != nil {
+			return err
+		}
+
+		running := map[string]int{}
+		tasksNoShutdown := map[string]int{}
+
+		activeNodes := make(map[string]struct{})
+		for _, n := range nodes {
+			if n.Status.State != swarm.NodeStateDown {
+				activeNodes[n.ID] = struct{}{}
+			}
+		}
+
+		for _, task := range tasks {
+			if task.DesiredState != swarm.TaskStateShutdown {
+				tasksNoShutdown[task.ServiceID]++
+			}
+
+			if task.Status.State == swarm.TaskStateRunning {
+				running[task.ServiceID]++
+			}
+		}
+
+		for _, service := range services {
+			tags := map[string]string{}
+			fields := make(map[string]interface{})
+			now := time.Now()
+			tags["service_id"] = service.ID
+			tags["service_name"] = service.Spec.Name
+			if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil {
+				tags["service_mode"] = "replicated"
+				fields["tasks_running"] = running[service.ID]
+				fields["tasks_desired"] = *service.Spec.Mode.Replicated.Replicas
+			} else if service.Spec.Mode.Global != nil {
+				tags["service_mode"] = "global"
+				fields["tasks_running"] = running[service.ID]
+				fields["tasks_desired"] = tasksNoShutdown[service.ID]
+			} else {
+				log.Printf("E! Unknow Replicas Mode")
+			}
+			// Add metrics
+			acc.AddFields("docker_swarm",
+				fields,
+				tags,
+				now)
+		}
+	}
+
+	return nil
+}
+
 func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 	// Init vars
 	dataFields := make(map[string]interface{})
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 95adfcf8e..b18274136 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,6 +17,9 @@ type MockClient struct {
 	ContainerListF    func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
 	ContainerStatsF   func(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
 	ContainerInspectF func(ctx context.Context, containerID string) (types.ContainerJSON, error)
+	ServiceListF      func(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error)
+	TaskListF         func(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
+	NodeListF         func(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error)
 }
 
 func (c *MockClient) Info(ctx context.Context) (types.Info, error) {
@@ -44,6 +48,27 @@ func (c *MockClient) ContainerInspect(
 	return c.ContainerInspectF(ctx, containerID)
 }
 
+func (c *MockClient) ServiceList(
+	ctx context.Context,
+	options types.ServiceListOptions,
+) ([]swarm.Service, error) {
+	return c.ServiceListF(ctx, options)
+}
+
+func (c *MockClient) TaskList(
+	ctx context.Context,
+	options types.TaskListOptions,
+) ([]swarm.Task, error) {
+	return c.TaskListF(ctx, options)
+}
+
+func (c *MockClient) NodeList(
+	ctx context.Context,
+	options types.NodeListOptions,
+) ([]swarm.Node, error) {
+	return c.NodeListF(ctx, options)
+}
+
 func newClient(host string, tlsConfig *tls.Config) (Client, error) {
 	return &MockClient{
 		InfoF: func(context.Context) (types.Info, error) {
@@ -58,6 +83,15 @@ func newClient(host string, tlsConfig *tls.Config) (Client, error) {
 		ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
 			return containerInspect, nil
 		},
+		ServiceListF: func(context.Context, types.ServiceListOptions) ([]swarm.Service, error) {
+			return ServiceList, nil
+		},
+		TaskListF: func(context.Context, types.TaskListOptions) ([]swarm.Task, error) {
+			return TaskList, nil
+		},
+		NodeListF: func(context.Context, types.NodeListOptions) ([]swarm.Node, error) {
+			return NodeList, nil
+		},
 	}, nil
 }
 
@@ -227,6 +261,15 @@ func TestDocker_WindowsMemoryContainerStats(t *testing.T) {
 				ContainerInspectF: func(ctx context.Context, containerID string) (types.ContainerJSON, error) {
 					return containerInspect, nil
 				},
+				ServiceListF: func(context.Context, types.ServiceListOptions) ([]swarm.Service, error) {
+					return ServiceList, nil
+				},
+				TaskListF: func(context.Context, types.TaskListOptions) ([]swarm.Task, error) {
+					return TaskList, nil
+				},
+				NodeListF: func(context.Context, types.NodeListOptions) ([]swarm.Node, error) {
+					return NodeList, nil
+				},
 			}, nil
 		},
 	}
@@ -436,3 +479,42 @@ func TestDockerGatherInfo(t *testing.T) {
 		},
 	)
 }
+
+func TestDockerGatherSwarmInfo(t *testing.T) {
+	var acc testutil.Accumulator
+	d := Docker{
+		newClient: newClient,
+	}
+
+	err := acc.GatherError(d.Gather)
+	require.NoError(t, err)
+
+	d.gatherSwarmInfo(&acc)
+
+	// test docker_container_net measurement
+	acc.AssertContainsTaggedFields(t,
+		"docker_swarm",
+		map[string]interface{}{
+			"tasks_running": int(2),
+			"tasks_desired": uint64(2),
+		},
+		map[string]string{
+			"service_id":   "qolkls9g5iasdiuihcyz9rnx2",
+			"service_name": "test1",
+			"service_mode": "replicated",
+		},
+	)
+
+	acc.AssertContainsTaggedFields(t,
+		"docker_swarm",
+		map[string]interface{}{
+			"tasks_running": int(1),
+			"tasks_desired": int(1),
+		},
+		map[string]string{
+			"service_id":   "qolkls9g5iasdiuihcyz9rn3",
+			"service_name": "test2",
+			"service_mode": "global",
+		},
+	)
+}
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
index d16a3a728..929119fcb 100644
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -8,6 +8,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 var info = types.Info{
@@ -133,6 +134,79 @@ var containerList = []types.Container{
 	},
 }
 
+var two = uint64(2)
+var ServiceList = []swarm.Service{
+	swarm.Service{
+		ID: "qolkls9g5iasdiuihcyz9rnx2",
+		Spec: swarm.ServiceSpec{
+			Annotations: swarm.Annotations{
+				Name: "test1",
+			},
+			Mode: swarm.ServiceMode{
+				Replicated: &swarm.ReplicatedService{
+					Replicas: &two,
+				},
+			},
+		},
+	},
+	swarm.Service{
+		ID: "qolkls9g5iasdiuihcyz9rn3",
+		Spec: swarm.ServiceSpec{
+			Annotations: swarm.Annotations{
+				Name: "test2",
+			},
+			Mode: swarm.ServiceMode{
+				Global: &swarm.GlobalService{},
+			},
+		},
+	},
+}
+
+var TaskList = []swarm.Task{
+	swarm.Task{
+		ID:        "kwh0lv7hwwbh",
+		ServiceID: "qolkls9g5iasdiuihcyz9rnx2",
+		NodeID:    "0cl4jturcyd1ks3fwpd010kor",
+		Status: swarm.TaskStatus{
+			State: "running",
+		},
+		DesiredState: "running",
+	},
+	swarm.Task{
+		ID:        "u78m5ojbivc3",
+		ServiceID: "qolkls9g5iasdiuihcyz9rnx2",
+		NodeID:    "0cl4jturcyd1ks3fwpd010kor",
+		Status: swarm.TaskStatus{
+			State: "running",
+		},
+		DesiredState: "running",
+	},
+	swarm.Task{
+		ID:        "1n1uilkhr98l",
+		ServiceID: "qolkls9g5iasdiuihcyz9rn3",
+		NodeID:    "0cl4jturcyd1ks3fwpd010kor",
+		Status: swarm.TaskStatus{
+			State: "running",
+		},
+		DesiredState: "running",
+	},
+}
+
+var NodeList = []swarm.Node{
+	swarm.Node{
+		ID: "0cl4jturcyd1ks3fwpd010kor",
+		Status: swarm.NodeStatus{
+			State: "ready",
+		},
+	},
+	swarm.Node{
+		ID: "0cl4jturcyd1ks3fwpd010kor",
+		Status: swarm.NodeStatus{
+			State: "ready",
+		},
+	},
+}
+
 func containerStats() types.ContainerStats {
 	var stat types.ContainerStats
 	jsonStat := `

From 93ff8113585c1ed73fcab54ef247fc1fdc257162 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Oct 2017 14:37:02 -0700
Subject: [PATCH 0616/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 464a31f68..d33fab200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - [#1692](https://github.com/influxdata/telegraf/pull/1692): Add support for the rollbar occurrence webhook event.
 - [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
 - [#3281](https://github.com/influxdata/telegraf/pull/3281): Add extra wired tiger cache metrics to mongodb input.
+- [#3141](https://github.com/influxdata/telegraf/pull/3141): Collect Docker Swarm service metrics in docker input plugin.
 
 ### Bugfixes
 

From a163effa6dc9e70857066b63eacaa41024ab46ee Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 3 Oct 2017 15:22:57 -0700
Subject: [PATCH 0617/1302] Add support for proxy environment variables to
 http_response (#3302)

---
 plugins/inputs/http_response/http_response.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 62d6e9ec1..3dd7f9ba5 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -98,6 +98,7 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	}
 	client := &http.Client{
 		Transport: &http.Transport{
+			Proxy:             http.ProxyFromEnvironment,
 			DisableKeepAlives: true,
 			TLSClientConfig:   tlsCfg,
 		},

From 002ccf3295f1aeec17b45c6356ac63cee4a21581 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Oct 2017 15:25:19 -0700
Subject: [PATCH 0618/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d33fab200..19435b098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,6 @@
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.
 - [#3196](https://github.com/influxdata/telegraf/pull/3196): Add Kafka output plugin topic_suffix option.
 - [#3027](https://github.com/influxdata/telegraf/pull/3027): Include mount mode option in disk metrics.
-- [#3212](https://github.com/influxdata/telegraf/pull/3212): Add support for standard proxy env vars in outputs.
 - [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
 - [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
 - [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
@@ -53,6 +52,8 @@
 - [#2887](https://github.com/influxdata/telegraf/issues/2887): Allow JSON data format to contain zero metrics.
 - [#3284](https://github.com/influxdata/telegraf/issues/3284): Fix format of connection_timeout in mqtt_consumer.
 - [#3081](https://github.com/influxdata/telegraf/issues/3081): Fix case sensitivity error in sqlserver input.
+- [#3297](https://github.com/influxdata/telegraf/issues/3297): Add support for proxy environment variables to http_response.
+- [#1588](https://github.com/influxdata/telegraf/issues/1588): Add support for standard proxy env vars in outputs.
 
 ## v1.4.1 [2017-09-26]
 

From e69c3f9d1c0378cf4b67d4a4d3e23edf82e7cf2b Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Thu, 5 Oct 2017 00:15:58 +0200
Subject: [PATCH 0619/1302] Add smart input plugin for collecting S.M.A.R.T.
 data (#2449)

---
 plugins/inputs/all/all.go          |   1 +
 plugins/inputs/smart/README.md     | 135 +++++++++
 plugins/inputs/smart/smart.go      | 339 +++++++++++++++++++++++
 plugins/inputs/smart/smart_test.go | 426 +++++++++++++++++++++++++++++
 4 files changed, 901 insertions(+)
 create mode 100644 plugins/inputs/smart/README.md
 create mode 100644 plugins/inputs/smart/smart.go
 create mode 100644 plugins/inputs/smart/smart_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 45d040503..1f4d3825c 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -76,6 +76,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/riak"
 	_ "github.com/influxdata/telegraf/plugins/inputs/salesforce"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
+	_ "github.com/influxdata/telegraf/plugins/inputs/smart"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/socket_listener"
diff --git a/plugins/inputs/smart/README.md b/plugins/inputs/smart/README.md
new file mode 100644
index 000000000..a81b344a5
--- /dev/null
+++ b/plugins/inputs/smart/README.md
@@ -0,0 +1,135 @@
+# Telegraf S.M.A.R.T. plugin
+
+Get metrics using the command line utility `smartctl` for S.M.A.R.T. (Self-Monitoring, Analysis and Reporting Technology) storage devices. SMART is a monitoring system included in computer hard disk drives (HDDs) and solid-state drives (SSDs)[1] that detects and reports on various indicators of drive reliability, with the intent of enabling the anticipation of hardware failures.
+See smartmontools (https://www.smartmontools.org/).
+
+If no devices are specified, the plugin will scan for SMART devices via the following command:
+
+```
+smartctl --scan
+```
+
+Metrics will be reported from the following `smartctl` command:
+
+```
+smartctl --info --attributes --health -n <nocheck> --format=brief <device>
+```
+
+This plugin supports _smartmontools_ version 5.41 and above, but v. 5.41 and v. 5.42
+might require setting `nocheck`, see the comment in the sample configuration.
+
+To enable SMART on a storage device run:
+
+```
+smartctl -s on <device>
+```
+
+## Measurements
+
+- smart_device:
+
+    * Tags:
+      - `capacity`
+      - `device`
+      - `device_model`
+      - `enabled`
+      - `health`
+      - `serial_no`
+      - `wwn`
+    * Fields:
+      - `exit_status`
+      - `health_ok`
+      - `read_error_rate`
+      - `seek_error`
+      - `temp_c`
+      - `udma_crc_errors`
+
+- smart_attribute:
+
+    * Tags:
+      - `device`
+      - `fail`
+      - `flags`
+      - `id`
+      - `name`
+      - `serial_no`
+      - `wwn`
+    * Fields:
+      - `exit_status`
+      - `raw_value`
+      - `threshold`
+      - `value`
+      - `worst`
+
+### Flags
+
+The interpretation of the tag `flags` is:
+ - *K* auto-keep
+ - *C* event count
+ - *R* error rate
+ - *S* speed/performance
+ - *O* updated online
+ - *P* prefailure warning
+
+### Exit Status
+
+The `exit_status` field captures the exit status of the smartctl command which
+is defined by a bitmask. For the interpretation of the bitmask see the man page for
+smartctl.
+
+### Device Names
+
+Device names, e.g., `/dev/sda`, are *not persistent*, and may be
+subject to change across reboots or system changes. Instead, you can the
+*World Wide Name* (WWN) or serial number to identify devices. On Linux block
+devices can be referenced by the WWN in the following location:
+`/dev/disk/by-id/`.
+
+## Configuration
+
+```toml
+# Read metrics from storage devices supporting S.M.A.R.T.
+[[inputs.smart]]
+  ## Optionally specify the path to the smartctl executable
+  # path = "/usr/bin/smartctl"
+  #
+  ## On most platforms smartctl requires root access.
+  ## Setting 'use_sudo' to true will make use of sudo to run smartctl.
+  ## Sudo must be configured to to allow the telegraf user to run smartctl
+  ## with out password.
+  # use_sudo = false
+  #
+  ## Skip checking disks in this power mode. Defaults to
+  ## "standby" to not wake up disks that have stoped rotating.
+  ## See --nockeck in the man pages for smartctl.
+  ## smartctl version 5.41 and 5.42 have faulty detection of
+  ## power mode and might require changing this value to
+  ## "never" depending on your storage device.
+  # nocheck = "standby"
+  #
+  ## Gather detailed metrics for each SMART Attribute.
+  ## Defaults to "false"
+  ##
+  # attributes = false
+  #
+  ## Optionally specify devices to exclude from reporting.
+  # excludes = [ "/dev/pass6" ]
+  #
+  ## Optionally specify devices and device type, if unset
+  ## a scan (smartctl --scan) for S.M.A.R.T. devices will
+  ## done and all found will be included except for the
+  ## excluded in excludes.
+  # devices = [ "/dev/ada0 -d atacam" ]
+```
+
+To run `smartctl` with `sudo` create a wrapper script and use `path` in
+the configuration to execute that.
+
+## Output
+
+Example output from an _Apple SSD_:
+```
+> smart_attribute,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=199,name=UDMA_CRC_Error_Count,flags=-O-RC-,fail=-,host=mbpro.local,device=/dev/rdisk0 threshold=0i,raw_value=0i,exit_status=0i,value=200i,worst=200i 1502536854000000000
+> smart_attribute,device=/dev/rdisk0,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=240,name=Unknown_SSD_Attribute,flags=-O---K,fail=-,host=mbpro.local exit_status=0i,value=100i,worst=100i,threshold=0i,raw_value=0i 1502536854000000000
+> smart_device,enabled=Enabled,host=mbpro.local,device=/dev/rdisk0,model=APPLE\ SSD\ SM0512F,serial_no=S1K5NYCD964433,wwn=5002538655584d30,capacity=500277790720 udma_crc_errors=0i,exit_status=0i,health_ok=true,read_error_rate=0i,temp_c=40i 1502536854000000000
+```
diff --git a/plugins/inputs/smart/smart.go b/plugins/inputs/smart/smart.go
new file mode 100644
index 000000000..a754d1ace
--- /dev/null
+++ b/plugins/inputs/smart/smart.go
@@ -0,0 +1,339 @@
+package smart
+
+import (
+	"fmt"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"syscall"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+var (
+	execCommand = exec.Command // execCommand is used to mock commands in tests.
+
+	// Device Model:     APPLE SSD SM256E
+	modelInInfo = regexp.MustCompile("^Device Model:\\s+(.*)$")
+	// Serial Number:    S0X5NZBC422720
+	serialInInfo = regexp.MustCompile("^Serial Number:\\s+(.*)$")
+	// LU WWN Device Id: 5 002538 655584d30
+	wwnInInfo = regexp.MustCompile("^LU WWN Device Id:\\s+(.*)$")
+	// User Capacity:    251,000,193,024 bytes [251 GB]
+	usercapacityInInfo = regexp.MustCompile("^User Capacity:\\s+([0-9,]+)\\s+bytes.*$")
+	// SMART support is: Enabled
+	smartEnabledInInfo = regexp.MustCompile("^SMART support is:\\s+(\\w+)$")
+	// SMART overall-health self-assessment test result: PASSED
+	// PASSED, FAILED, UNKNOWN
+	smartOverallHealth = regexp.MustCompile("^SMART overall-health self-assessment test result:\\s+(\\w+).*$")
+
+	// ID# ATTRIBUTE_NAME          FLAGS    VALUE WORST THRESH FAIL RAW_VALUE
+	//   1 Raw_Read_Error_Rate     -O-RC-   200   200   000    -    0
+	//   5 Reallocated_Sector_Ct   PO--CK   100   100   000    -    0
+	// 192 Power-Off_Retract_Count -O--C-   097   097   000    -    14716
+	attribute = regexp.MustCompile("^\\s*([0-9]+)\\s(\\S+)\\s+([-P][-O][-S][-R][-C][-K])\\s+([0-9]+)\\s+([0-9]+)\\s+([0-9]+)\\s+([-\\w]+)\\s+([\\w\\+\\.]+).*$")
+
+	deviceFieldIds = map[string]string{
+		"1":   "read_error_rate",
+		"7":   "seek_error_rate",
+		"194": "temp_c",
+		"199": "udma_crc_errors",
+	}
+)
+
+type Smart struct {
+	Path       string
+	Nocheck    string
+	Attributes bool
+	Excludes   []string
+	Devices    []string
+	UseSudo    bool
+}
+
+var sampleConfig = `
+  ## Optionally specify the path to the smartctl executable
+  # path = "/usr/bin/smartctl"
+  #
+  ## On most platforms smartctl requires root access.
+  ## Setting 'use_sudo' to true will make use of sudo to run smartctl.
+  ## Sudo must be configured to to allow the telegraf user to run smartctl
+  ## with out password.
+  # use_sudo = false
+  #
+  ## Skip checking disks in this power mode. Defaults to
+  ## "standby" to not wake up disks that have stoped rotating.
+  ## See --nocheck in the man pages for smartctl.
+  ## smartctl version 5.41 and 5.42 have faulty detection of
+  ## power mode and might require changing this value to
+  ## "never" depending on your disks.
+  # nocheck = "standby"
+  #
+  ## Gather detailed metrics for each SMART Attribute.
+  ## Defaults to "false"
+  ##
+  # attributes = false
+  #
+  ## Optionally specify devices to exclude from reporting.
+  # excludes = [ "/dev/pass6" ]
+  #
+  ## Optionally specify devices and device type, if unset
+  ## a scan (smartctl --scan) for S.M.A.R.T. devices will
+  ## done and all found will be included except for the
+  ## excluded in excludes.
+  # devices = [ "/dev/ada0 -d atacam" ]
+`
+
+func (m *Smart) SampleConfig() string {
+	return sampleConfig
+}
+
+func (m *Smart) Description() string {
+	return "Read metrics from storage devices supporting S.M.A.R.T."
+}
+
+func (m *Smart) Gather(acc telegraf.Accumulator) error {
+	if len(m.Path) == 0 {
+		return fmt.Errorf("smartctl not found: verify that smartctl is installed and that smartctl is in your PATH")
+	}
+
+	devices := m.Devices
+	if len(devices) == 0 {
+		var err error
+		devices, err = m.scan()
+		if err != nil {
+			return err
+		}
+	}
+
+	m.getAttributes(acc, devices)
+	return nil
+}
+
+// Wrap with sudo
+func sudo(sudo bool, command string, args ...string) *exec.Cmd {
+	if sudo {
+		return execCommand("sudo", append([]string{"-n", command}, args...)...)
+	}
+
+	return execCommand(command, args...)
+}
+
+// Scan for S.M.A.R.T. devices
+func (m *Smart) scan() ([]string, error) {
+
+	cmd := sudo(m.UseSudo, m.Path, "--scan")
+	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
+	if err != nil {
+		return []string{}, fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
+	}
+
+	devices := []string{}
+	for _, line := range strings.Split(string(out), "\n") {
+		dev := strings.Split(line, "#")
+		if len(dev) > 1 && !excludedDev(m.Excludes, strings.TrimSpace(dev[0])) {
+			devices = append(devices, strings.TrimSpace(dev[0]))
+		}
+	}
+	return devices, nil
+}
+
+func excludedDev(excludes []string, deviceLine string) bool {
+	device := strings.Split(deviceLine, " ")
+	if len(device) != 0 {
+		for _, exclude := range excludes {
+			if device[0] == exclude {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// Get info and attributes for each S.M.A.R.T. device
+func (m *Smart) getAttributes(acc telegraf.Accumulator, devices []string) {
+
+	var wg sync.WaitGroup
+	wg.Add(len(devices))
+
+	for _, device := range devices {
+		go gatherDisk(acc, m.UseSudo, m.Attributes, m.Path, m.Nocheck, device, &wg)
+	}
+
+	wg.Wait()
+}
+
+// Command line parse errors are denoted by the exit code having the 0 bit set.
+// All other errors are drive/communication errors and should be ignored.
+func exitStatus(err error) (int, error) {
+	if exiterr, ok := err.(*exec.ExitError); ok {
+		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+			return status.ExitStatus(), nil
+		}
+	}
+	return 0, err
+}
+
+func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, path, nockeck, device string, wg *sync.WaitGroup) {
+
+	defer wg.Done()
+	// smartctl 5.41 & 5.42 have are broken regarding handling of --nocheck/-n
+	args := []string{"--info", "--health", "--attributes", "--tolerance=verypermissive", "-n", nockeck, "--format=brief"}
+	args = append(args, strings.Split(device, " ")...)
+	cmd := sudo(usesudo, path, args...)
+	out, e := internal.CombinedOutputTimeout(cmd, time.Second*5)
+	outStr := string(out)
+
+	// Ignore all exit statuses except if it is a command line parse error
+	exitStatus, er := exitStatus(e)
+	if er != nil {
+		acc.AddError(fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), e, outStr))
+		return
+	}
+
+	device_tags := map[string]string{}
+	device_tags["device"] = strings.Split(device, " ")[0]
+	device_fields := make(map[string]interface{})
+	device_fields["exit_status"] = exitStatus
+
+	for _, line := range strings.Split(outStr, "\n") {
+
+		model := modelInInfo.FindStringSubmatch(line)
+		if len(model) > 1 {
+			device_tags["model"] = model[1]
+		}
+
+		serial := serialInInfo.FindStringSubmatch(line)
+		if len(serial) > 1 {
+			device_tags["serial_no"] = serial[1]
+		}
+
+		wwn := wwnInInfo.FindStringSubmatch(line)
+		if len(wwn) > 1 {
+			device_tags["wwn"] = strings.Replace(wwn[1], " ", "", -1)
+		}
+
+		capacity := usercapacityInInfo.FindStringSubmatch(line)
+		if len(capacity) > 1 {
+			device_tags["capacity"] = strings.Replace(capacity[1], ",", "", -1)
+		}
+
+		enabled := smartEnabledInInfo.FindStringSubmatch(line)
+		if len(enabled) > 1 {
+			device_tags["enabled"] = enabled[1]
+		}
+
+		health := smartOverallHealth.FindStringSubmatch(line)
+		if len(health) > 1 {
+			device_fields["health_ok"] = (health[1] == "PASSED")
+		}
+
+		attr := attribute.FindStringSubmatch(line)
+
+		if len(attr) > 1 {
+
+			if attributes {
+				tags := map[string]string{}
+				fields := make(map[string]interface{})
+
+				tags["device"] = strings.Split(device, " ")[0]
+
+				if serial, ok := device_tags["serial_no"]; ok {
+					tags["serial_no"] = serial
+				}
+				if wwn, ok := device_tags["wwn"]; ok {
+					tags["wwn"] = wwn
+				}
+				tags["id"] = attr[1]
+				tags["name"] = attr[2]
+				tags["flags"] = attr[3]
+
+				fields["exit_status"] = exitStatus
+				if i, err := strconv.ParseInt(attr[4], 10, 64); err == nil {
+					fields["value"] = i
+				}
+				if i, err := strconv.ParseInt(attr[5], 10, 64); err == nil {
+					fields["worst"] = i
+				}
+				if i, err := strconv.ParseInt(attr[6], 10, 64); err == nil {
+					fields["threshold"] = i
+				}
+
+				tags["fail"] = attr[7]
+				if val, err := parseRawValue(attr[8]); err == nil {
+					fields["raw_value"] = val
+				}
+
+				acc.AddFields("smart_attribute", fields, tags)
+			}
+
+			// If the attribute matches on the one in deviceFieldIds
+			// save the raw value to a field.
+			if field, ok := deviceFieldIds[attr[1]]; ok {
+				if val, err := parseRawValue(attr[8]); err == nil {
+					device_fields[field] = val
+				}
+			}
+		}
+	}
+	acc.AddFields("smart_device", device_fields, device_tags)
+}
+
+func parseRawValue(rawVal string) (int64, error) {
+
+	// Integer
+	if i, err := strconv.ParseInt(rawVal, 10, 64); err == nil {
+		return i, nil
+	}
+
+	// Duration: 65h+33m+09.259s
+	unit := regexp.MustCompile("^(.*)([hms])$")
+	parts := strings.Split(rawVal, "+")
+	if len(parts) == 0 {
+		return 0, fmt.Errorf("Couldn't parse RAW_VALUE '%s'", rawVal)
+	}
+
+	duration := int64(0)
+	for _, part := range parts {
+		timePart := unit.FindStringSubmatch(part)
+		if len(timePart) == 0 {
+			continue
+		}
+		switch timePart[2] {
+		case "h":
+			duration += parseInt(timePart[1]) * int64(3600)
+		case "m":
+			duration += parseInt(timePart[1]) * int64(60)
+		case "s":
+			// drop fractions of seconds
+			duration += parseInt(strings.Split(timePart[1], ".")[0])
+		default:
+			// Unknown, ignore
+		}
+	}
+	return duration, nil
+}
+
+func parseInt(str string) int64 {
+	if i, err := strconv.ParseInt(str, 10, 64); err == nil {
+		return i
+	}
+	return 0
+}
+
+func init() {
+	m := Smart{}
+	path, _ := exec.LookPath("smartctl")
+	if len(path) > 0 {
+		m.Path = path
+	}
+	m.Nocheck = "standby"
+
+	inputs.Add("smart", func() telegraf.Input {
+		return &m
+	})
+}
diff --git a/plugins/inputs/smart/smart_test.go b/plugins/inputs/smart/smart_test.go
new file mode 100644
index 000000000..c8e777033
--- /dev/null
+++ b/plugins/inputs/smart/smart_test.go
@@ -0,0 +1,426 @@
+package smart
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	mockScanData = `/dev/ada0 -d atacam # /dev/ada0, ATA device
+`
+	mockInfoAttributeData = `smartctl 6.5 2016-05-07 r4318 [Darwin 16.4.0 x86_64] (local build)
+Copyright (C) 2002-16, Bruce Allen, Christian Franke, www.smartmontools.org
+
+CHECK POWER MODE not implemented, ignoring -n option
+=== START OF INFORMATION SECTION ===
+Model Family:     Apple SD/SM/TS...E/F SSDs
+Device Model:     APPLE SSD SM256E
+Serial Number:    S0X5NZBC422720
+LU WWN Device Id: 5 002538 043584d30
+Firmware Version: CXM09A1Q
+User Capacity:    251,000,193,024 bytes [251 GB]
+Sector Sizes:     512 bytes logical, 4096 bytes physical
+Rotation Rate:    Solid State Device
+Device is:        In smartctl database [for details use: -P show]
+ATA Version is:   ATA8-ACS T13/1699-D revision 4c
+SATA Version is:  SATA 3.0, 6.0 Gb/s (current: 6.0 Gb/s)
+Local Time is:    Thu Feb  9 16:48:45 2017 CET
+SMART support is: Available - device has SMART capability.
+SMART support is: Enabled
+
+=== START OF READ SMART DATA SECTION ===
+SMART overall-health self-assessment test result: PASSED
+
+=== START OF READ SMART DATA SECTION ===
+SMART Attributes Data Structure revision number: 1
+Vendor Specific SMART Attributes with Thresholds:
+ID# ATTRIBUTE_NAME          FLAGS    VALUE WORST THRESH FAIL RAW_VALUE
+  1 Raw_Read_Error_Rate     -O-RC-   200   200   000    -    0
+  5 Reallocated_Sector_Ct   PO--CK   100   100   000    -    0
+  9 Power_On_Hours          -O--CK   099   099   000    -    2988
+ 12 Power_Cycle_Count       -O--CK   085   085   000    -    14879
+169 Unknown_Attribute       PO--C-   253   253   010    -    2044932921600
+173 Wear_Leveling_Count     -O--CK   185   185   100    -    957808640337
+190 Airflow_Temperature_Cel -O---K   055   040   045    Past 45 (Min/Max 43/57 #2689)
+192 Power-Off_Retract_Count -O--C-   097   097   000    -    14716
+194 Temperature_Celsius     -O---K   066   021   000    -    34 (Min/Max 14/79)
+197 Current_Pending_Sector  -O---K   100   100   000    -    0
+199 UDMA_CRC_Error_Count    -O-RC-   200   200   000    -    0
+240 Head_Flying_Hours       ------   100   253   000    -    6585h+55m+23.234s
+                            ||||||_ K auto-keep
+                            |||||__ C event count
+                            ||||___ R error rate
+                            |||____ S speed/performance
+                            ||_____ O updated online
+                            |______ P prefailure warning
+`
+)
+
+func TestGatherAttributes(t *testing.T) {
+	s := &Smart{
+		Path:       "smartctl",
+		Attributes: true,
+	}
+	// overwriting exec commands with mock commands
+	execCommand = fakeExecCommand
+	var acc testutil.Accumulator
+
+	err := s.Gather(&acc)
+
+	require.NoError(t, err)
+	assert.Equal(t, 65, acc.NFields(), "Wrong number of fields gathered")
+
+	var testsAda0Attributes = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"value":       int64(200),
+				"worst":       int64(200),
+				"threshold":   int64(0),
+				"raw_value":   int64(0),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "1",
+				"name":      "Raw_Read_Error_Rate",
+				"flags":     "-O-RC-",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(100),
+				"worst":       int64(100),
+				"threshold":   int64(0),
+				"raw_value":   int64(0),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "5",
+				"name":      "Reallocated_Sector_Ct",
+				"flags":     "PO--CK",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(99),
+				"worst":       int64(99),
+				"threshold":   int64(0),
+				"raw_value":   int64(2988),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "9",
+				"name":      "Power_On_Hours",
+				"flags":     "-O--CK",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(85),
+				"worst":       int64(85),
+				"threshold":   int64(0),
+				"raw_value":   int64(14879),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "12",
+				"name":      "Power_Cycle_Count",
+				"flags":     "-O--CK",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(253),
+				"worst":       int64(253),
+				"threshold":   int64(10),
+				"raw_value":   int64(2044932921600),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "169",
+				"name":      "Unknown_Attribute",
+				"flags":     "PO--C-",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(185),
+				"worst":       int64(185),
+				"threshold":   int64(100),
+				"raw_value":   int64(957808640337),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "173",
+				"name":      "Wear_Leveling_Count",
+				"flags":     "-O--CK",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(55),
+				"worst":       int64(40),
+				"threshold":   int64(45),
+				"raw_value":   int64(45),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "190",
+				"name":      "Airflow_Temperature_Cel",
+				"flags":     "-O---K",
+				"fail":      "Past",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(97),
+				"worst":       int64(97),
+				"threshold":   int64(0),
+				"raw_value":   int64(14716),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "192",
+				"name":      "Power-Off_Retract_Count",
+				"flags":     "-O--C-",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(66),
+				"worst":       int64(21),
+				"threshold":   int64(0),
+				"raw_value":   int64(34),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "194",
+				"name":      "Temperature_Celsius",
+				"flags":     "-O---K",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(100),
+				"worst":       int64(100),
+				"threshold":   int64(0),
+				"raw_value":   int64(0),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "197",
+				"name":      "Current_Pending_Sector",
+				"flags":     "-O---K",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(200),
+				"worst":       int64(200),
+				"threshold":   int64(0),
+				"raw_value":   int64(0),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "199",
+				"name":      "UDMA_CRC_Error_Count",
+				"flags":     "-O-RC-",
+				"fail":      "-",
+			},
+		},
+		{
+			map[string]interface{}{
+				"value":       int64(100),
+				"worst":       int64(253),
+				"threshold":   int64(0),
+				"raw_value":   int64(23709323),
+				"exit_status": int(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"id":        "240",
+				"name":      "Head_Flying_Hours",
+				"flags":     "------",
+				"fail":      "-",
+			},
+		},
+	}
+
+	for _, test := range testsAda0Attributes {
+		acc.AssertContainsTaggedFields(t, "smart_attribute", test.fields, test.tags)
+	}
+
+	// tags = map[string]string{}
+
+	var testsAda0Device = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"exit_status":     int(0),
+				"health_ok":       bool(true),
+				"read_error_rate": int64(0),
+				"temp_c":          int64(34),
+				"udma_crc_errors": int64(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"model":     "APPLE SSD SM256E",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"enabled":   "Enabled",
+				"capacity":  "251000193024",
+			},
+		},
+	}
+
+	for _, test := range testsAda0Device {
+		acc.AssertContainsTaggedFields(t, "smart_device", test.fields, test.tags)
+	}
+
+}
+
+func TestGatherNoAttributes(t *testing.T) {
+	s := &Smart{
+		Path:       "smartctl",
+		Attributes: false,
+	}
+	// overwriting exec commands with mock commands
+	execCommand = fakeExecCommand
+	var acc testutil.Accumulator
+
+	err := s.Gather(&acc)
+
+	require.NoError(t, err)
+	assert.Equal(t, 5, acc.NFields(), "Wrong number of fields gathered")
+	acc.AssertDoesNotContainMeasurement(t, "smart_attribute")
+
+	// tags = map[string]string{}
+
+	var testsAda0Device = []struct {
+		fields map[string]interface{}
+		tags   map[string]string
+	}{
+		{
+			map[string]interface{}{
+				"exit_status":     int(0),
+				"health_ok":       bool(true),
+				"read_error_rate": int64(0),
+				"temp_c":          int64(34),
+				"udma_crc_errors": int64(0),
+			},
+			map[string]string{
+				"device":    "/dev/ada0",
+				"model":     "APPLE SSD SM256E",
+				"serial_no": "S0X5NZBC422720",
+				"wwn":       "5002538043584d30",
+				"enabled":   "Enabled",
+				"capacity":  "251000193024",
+			},
+		},
+	}
+
+	for _, test := range testsAda0Device {
+		acc.AssertContainsTaggedFields(t, "smart_device", test.fields, test.tags)
+	}
+
+}
+
+func TestExcludedDev(t *testing.T) {
+	assert.Equal(t, true, excludedDev([]string{"/dev/pass6"}, "/dev/pass6 -d atacam"), "Should be excluded.")
+	assert.Equal(t, false, excludedDev([]string{}, "/dev/pass6 -d atacam"), "Shouldn't be excluded.")
+	assert.Equal(t, false, excludedDev([]string{"/dev/pass6"}, "/dev/pass1 -d atacam"), "Shouldn't be excluded.")
+
+}
+
+// fackeExecCommand is a helper function that mock
+// the exec.Command call (and call the test binary)
+func fakeExecCommand(command string, args ...string) *exec.Cmd {
+	cs := []string{"-test.run=TestHelperProcess", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+// TestHelperProcess isn't a real test. It's used to mock exec.Command
+// For example, if you run:
+// GO_WANT_HELPER_PROCESS=1 go test -test.run=TestHelperProcess -- --scan
+// it returns below mockScanData.
+func TestHelperProcess(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+
+	args := os.Args
+
+	// Previous arguments are tests stuff, that looks like :
+	// /tmp/go-build970079519/…/_test/integration.test -test.run=TestHelperProcess --
+	cmd, arg1, args := args[3], args[4], args[5:]
+
+	if cmd == "smartctl" {
+		if arg1 == "--scan" {
+			fmt.Fprint(os.Stdout, mockScanData)
+		}
+		if arg1 == "--info" {
+			fmt.Fprint(os.Stdout, mockInfoAttributeData)
+		}
+	} else {
+		fmt.Fprint(os.Stdout, "command not found")
+		os.Exit(1)
+	}
+	os.Exit(0)
+}

From a4ea4c7a2560d125654f4aad7487ce6ed238fe14 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Oct 2017 15:18:15 -0700
Subject: [PATCH 0620/1302] Add smart to changelog and readme

---
 CHANGELOG.md | 6 ++++--
 README.md    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19435b098..a2d176959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ## v1.5 [unreleased]
 
 ### New Plugins
-- [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
-- [wavefront](./plugins/inputswavefront/README.md) - Thanks to @puckpuck
+- [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+- [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
+- [wavefront](./plugins/inputs/wavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
 
@@ -37,6 +38,7 @@
 - [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
 - [#3281](https://github.com/influxdata/telegraf/pull/3281): Add extra wired tiger cache metrics to mongodb input.
 - [#3141](https://github.com/influxdata/telegraf/pull/3141): Collect Docker Swarm service metrics in docker input plugin.
+- [#2449](https://github.com/influxdata/telegraf/pull/2449): Add smart input plugin for collecting S.M.A.R.T. data.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9e7ad03f9..a3887e566 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ configuration options.
 * [riak](./plugins/inputs/riak)
 * [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
+* [smart](./plugins/inputs/smart)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)

From 0bb32570ba3c786b5932522a7564e9977cd3acc7 Mon Sep 17 00:00:00 2001
From: Christian Meilke <christian.meilke@googlemail.com>
Date: Thu, 5 Oct 2017 00:29:32 +0200
Subject: [PATCH 0621/1302] Add cluster health level configuration to
 elasticsearch input (#3269)

---
 plugins/inputs/elasticsearch/README.md        | 10 +++-
 plugins/inputs/elasticsearch/elasticsearch.go | 24 ++++++---
 .../elasticsearch/elasticsearch_test.go       | 54 ++++++++++++++++++-
 plugins/inputs/elasticsearch/testdata_test.go | 15 ++++++
 4 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index 9cf9b9b09..f3999dc30 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -23,8 +23,14 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
   ## Set cluster_health to true when you want to also obtain cluster health stats
   cluster_health = false
 
-  ## Set cluster_stats to true when you want to obtain cluster stats from the 
-  ## Master node. 
+  ## Adjust cluster_health_level when you want to also obtain detailed health stats
+  ## The options are
+  ##  - indices (default)
+  ##  - cluster
+  # cluster_health_level = "indices"
+
+  ## Set cluster_stats to true when you want to also obtain cluster stats from the
+  ## Master node.
   cluster_stats = false
 
   ## Optional SSL Config
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 5bf3d1c63..589d0fe3e 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -3,17 +3,16 @@ package elasticsearch
 import (
 	"encoding/json"
 	"fmt"
-	"net/http"
-	"regexp"
-	"sync"
-	"time"
-
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 	"io/ioutil"
+	"net/http"
+	"regexp"
 	"strings"
+	"sync"
+	"time"
 )
 
 // mask for masking username/password from error messages
@@ -94,6 +93,12 @@ const sampleConfig = `
   ## Set cluster_health to true when you want to also obtain cluster health stats
   cluster_health = false
 
+  ## Adjust cluster_health_level when you want to also obtain detailed health stats
+  ## The options are
+  ##  - indices (default)
+  ##  - cluster
+  # cluster_health_level = "indices"
+
   ## Set cluster_stats to true when you want to also obtain cluster stats from the
   ## Master node.
   cluster_stats = false
@@ -113,6 +118,7 @@ type Elasticsearch struct {
 	Servers                 []string
 	HttpTimeout             internal.Duration
 	ClusterHealth           bool
+	ClusterHealthLevel      string
 	ClusterStats            bool
 	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
 	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
@@ -126,7 +132,8 @@ type Elasticsearch struct {
 // NewElasticsearch return a new instance of Elasticsearch
 func NewElasticsearch() *Elasticsearch {
 	return &Elasticsearch{
-		HttpTimeout: internal.Duration{Duration: time.Second * 5},
+		HttpTimeout:        internal.Duration{Duration: time.Second * 5},
+		ClusterHealthLevel: "indices",
 	}
 }
 
@@ -182,7 +189,10 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 			}
 
 			if e.ClusterHealth {
-				url = s + "/_cluster/health?level=indices"
+				url = s + "/_cluster/health"
+				if e.ClusterHealthLevel != "" {
+					url = url + "?level=" + e.ClusterHealthLevel
+				}
 				if err := e.gatherClusterHealth(url, acc); err != nil {
 					acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
 					return
diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
index f057cfd8b..41b578c79 100644
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -93,10 +93,11 @@ func TestGatherNodeStats(t *testing.T) {
 	checkNodeStatsResult(t, &acc)
 }
 
-func TestGatherClusterHealth(t *testing.T) {
+func TestGatherClusterHealthEmptyClusterHealth(t *testing.T) {
 	es := newElasticsearchWithClient()
 	es.Servers = []string{"http://example.com:9200"}
 	es.ClusterHealth = true
+	es.ClusterHealthLevel = ""
 	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponse)
 
 	var acc testutil.Accumulator
@@ -104,6 +105,56 @@ func TestGatherClusterHealth(t *testing.T) {
 
 	checkIsMaster(es, false, t)
 
+	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
+		clusterHealthExpected,
+		map[string]string{"name": "elasticsearch_telegraf"})
+
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_indices",
+		v1IndexExpected,
+		map[string]string{"index": "v1"})
+
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_indices",
+		v2IndexExpected,
+		map[string]string{"index": "v2"})
+}
+
+func TestGatherClusterHealthSpecificClusterHealth(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.ClusterHealth = true
+	es.ClusterHealthLevel = "cluster"
+	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponse)
+
+	var acc testutil.Accumulator
+	require.NoError(t, es.gatherClusterHealth("junk", &acc))
+
+	checkIsMaster(es, false, t)
+
+	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
+		clusterHealthExpected,
+		map[string]string{"name": "elasticsearch_telegraf"})
+
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_indices",
+		v1IndexExpected,
+		map[string]string{"index": "v1"})
+
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_indices",
+		v2IndexExpected,
+		map[string]string{"index": "v2"})
+}
+
+func TestGatherClusterHealthAlsoIndicesHealth(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.ClusterHealth = true
+	es.ClusterHealthLevel = "indices"
+	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponseWithIndices)
+
+	var acc testutil.Accumulator
+	require.NoError(t, es.gatherClusterHealth("junk", &acc))
+
+	checkIsMaster(es, false, t)
+
 	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
 		clusterHealthExpected,
 		map[string]string{"name": "elasticsearch_telegraf"})
@@ -185,7 +236,6 @@ func TestGatherClusterStatsNonMaster(t *testing.T) {
 	// ensure flag is clear so Cluster Stats would not be done
 	checkIsMaster(es, false, t)
 	checkNodeStatsResult(t, &acc)
-
 }
 
 func newElasticsearchWithClient() *Elasticsearch {
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index 19ebb3bfb..d43a3f9c5 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -1,6 +1,21 @@
 package elasticsearch
 
 const clusterHealthResponse = `
+{
+   "cluster_name": "elasticsearch_telegraf",
+   "status": "green",
+   "timed_out": false,
+   "number_of_nodes": 3,
+   "number_of_data_nodes": 3,
+   "active_primary_shards": 5,
+   "active_shards": 15,
+   "relocating_shards": 0,
+   "initializing_shards": 0,
+   "unassigned_shards": 0
+}
+`
+
+const clusterHealthResponseWithIndices = `
 {
    "cluster_name": "elasticsearch_telegraf",
    "status": "green",

From b9f319529f89c3554d177d80fa7cf996de12a25b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Oct 2017 15:30:11 -0700
Subject: [PATCH 0622/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2d176959..e52e5aedf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - [#3281](https://github.com/influxdata/telegraf/pull/3281): Add extra wired tiger cache metrics to mongodb input.
 - [#3141](https://github.com/influxdata/telegraf/pull/3141): Collect Docker Swarm service metrics in docker input plugin.
 - [#2449](https://github.com/influxdata/telegraf/pull/2449): Add smart input plugin for collecting S.M.A.R.T. data.
+- [#3269](https://github.com/influxdata/telegraf/pull/3269): Add cluster health level configuration to elasticsearch input.
 
 ### Bugfixes
 

From 4fab572b6bec4326d03d13c38095f89a44c02b53 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Oct 2017 12:12:14 -0700
Subject: [PATCH 0623/1302] Release buffer back to pool earlier

---
 plugins/inputs/statsd/statsd.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 67ce29cd8..db412b549 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -427,13 +427,13 @@ func (s *Statsd) parser() error {
 			return nil
 		case buf := <-s.in:
 			lines := strings.Split(buf.String(), "\n")
+			s.bufPool.Put(buf)
 			for _, line := range lines {
 				line = strings.TrimSpace(line)
 				if line != "" {
 					s.parseStatsdLine(line)
 				}
 			}
-			s.bufPool.Put(buf)
 		}
 	}
 }

From f56dda0ac8630bd510cded806cc90ec1bbfb1740 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 5 Oct 2017 16:02:21 -0700
Subject: [PATCH 0624/1302] Fix panic in cpu input if number of cpus changes
 (#3306)

---
 plugins/inputs/system/cpu.go      | 16 +++++++++-----
 plugins/inputs/system/cpu_test.go | 35 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/system/cpu.go
index f60cb20c9..55378c93e 100644
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/system/cpu.go
@@ -11,7 +11,7 @@ import (
 
 type CPUStats struct {
 	ps        PS
-	lastStats []cpu.TimesStat
+	lastStats map[string]cpu.TimesStat
 
 	PerCPU         bool `toml:"percpu"`
 	TotalCPU       bool `toml:"totalcpu"`
@@ -53,7 +53,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 	}
 	now := time.Now()
 
-	for i, cts := range times {
+	for _, cts := range times {
 		tags := map[string]string{
 			"cpu": cts.CPU,
 		}
@@ -86,13 +86,16 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 			// If it's the 1st gather, can't get CPU Usage stats yet
 			continue
 		}
-		lastCts := s.lastStats[i]
+
+		lastCts, ok := s.lastStats[cts.CPU]
+		if !ok {
+			continue
+		}
 		lastTotal := totalCpuTime(lastCts)
 		lastActive := activeCpuTime(lastCts)
 		totalDelta := total - lastTotal
 
 		if totalDelta < 0 {
-			s.lastStats = times
 			return fmt.Errorf("Error: current total CPU time is less than previous total CPU time")
 		}
 
@@ -118,7 +121,10 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		acc.AddGauge("cpu", fieldsG, tags, now)
 	}
 
-	s.lastStats = times
+	s.lastStats = make(map[string]cpu.TimesStat)
+	for _, cts := range times {
+		s.lastStats[cts.CPU] = cts
+	}
 
 	return nil
 }
diff --git a/plugins/inputs/system/cpu_test.go b/plugins/inputs/system/cpu_test.go
index e9dc7dda9..fabff8a7d 100644
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/system/cpu_test.go
@@ -149,3 +149,38 @@ func assertContainsTaggedFloat(
 		measurement, delta, expectedValue, actualValue)
 	assert.Fail(t, msg)
 }
+
+// TestCPUCountChange tests that no errors are encountered if the number of
+// CPUs increases as reported with LXC.
+func TestCPUCountIncrease(t *testing.T) {
+	var mps MockPS
+	var mps2 MockPS
+	var acc testutil.Accumulator
+	var err error
+
+	cs := NewCPUStats(&mps)
+
+	mps.On("CPUTimes").Return(
+		[]cpu.TimesStat{
+			cpu.TimesStat{
+				CPU: "cpu0",
+			},
+		}, nil)
+
+	err = cs.Gather(&acc)
+	require.NoError(t, err)
+
+	mps2.On("CPUTimes").Return(
+		[]cpu.TimesStat{
+			cpu.TimesStat{
+				CPU: "cpu0",
+			},
+			cpu.TimesStat{
+				CPU: "cpu1",
+			},
+		}, nil)
+	cs.ps = &mps2
+
+	err = cs.Gather(&acc)
+	require.NoError(t, err)
+}

From 6e1fa559a35858f1130c2a4a3352616209fb58c3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Oct 2017 16:05:51 -0700
Subject: [PATCH 0625/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e52e5aedf..1c92a2132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - [#3081](https://github.com/influxdata/telegraf/issues/3081): Fix case sensitivity error in sqlserver input.
 - [#3297](https://github.com/influxdata/telegraf/issues/3297): Add support for proxy environment variables to http_response.
 - [#1588](https://github.com/influxdata/telegraf/issues/1588): Add support for standard proxy env vars in outputs.
+- [#3282](https://github.com/influxdata/telegraf/issues/3282): Fix panic in cpu input if number of cpus changes.
 
 ## v1.4.1 [2017-09-26]
 

From cce40c515afc2e9a03c073dc627cb02f88da80db Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 5 Oct 2017 16:14:21 -0700
Subject: [PATCH 0626/1302] Use chunked transfer encoding in InfluxDB output
 (#3307)

---
 plugins/outputs/influxdb/client/client.go    |  8 +-
 plugins/outputs/influxdb/client/http.go      | 58 +-------------
 plugins/outputs/influxdb/client/http_test.go | 82 +-------------------
 plugins/outputs/influxdb/client/udp.go       | 27 ++-----
 plugins/outputs/influxdb/client/udp_test.go  | 50 ++----------
 plugins/outputs/influxdb/influxdb.go         |  8 +-
 6 files changed, 19 insertions(+), 214 deletions(-)

diff --git a/plugins/outputs/influxdb/client/client.go b/plugins/outputs/influxdb/client/client.go
index 3f52752ad..4bcaceb74 100644
--- a/plugins/outputs/influxdb/client/client.go
+++ b/plugins/outputs/influxdb/client/client.go
@@ -4,13 +4,7 @@ import "io"
 
 type Client interface {
 	Query(command string) error
-
-	Write(b []byte) (int, error)
-	WriteWithParams(b []byte, params WriteParams) (int, error)
-
-	WriteStream(b io.Reader, contentLength int) (int, error)
-	WriteStreamWithParams(b io.Reader, contentLength int, params WriteParams) (int, error)
-
+	WriteStream(b io.Reader) error
 	Close() error
 }
 
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 8f0a6ac24..4dea82a8d 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -137,60 +137,13 @@ func (c *httpClient) Query(command string) error {
 	return c.doRequest(req, http.StatusOK)
 }
 
-func (c *httpClient) Write(b []byte) (int, error) {
-	req, err := c.makeWriteRequest(bytes.NewReader(b), len(b), c.writeURL)
+func (c *httpClient) WriteStream(r io.Reader) error {
+	req, err := c.makeWriteRequest(r, c.writeURL)
 	if err != nil {
-		return 0, nil
+		return err
 	}
 
-	err = c.doRequest(req, http.StatusNoContent)
-	if err == nil {
-		return len(b), nil
-	}
-	return 0, err
-}
-
-func (c *httpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
-	req, err := c.makeWriteRequest(bytes.NewReader(b), len(b), writeURL(c.url, wp))
-	if err != nil {
-		return 0, nil
-	}
-
-	err = c.doRequest(req, http.StatusNoContent)
-	if err == nil {
-		return len(b), nil
-	}
-	return 0, err
-}
-
-func (c *httpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
-	req, err := c.makeWriteRequest(r, contentLength, c.writeURL)
-	if err != nil {
-		return 0, nil
-	}
-
-	err = c.doRequest(req, http.StatusNoContent)
-	if err == nil {
-		return contentLength, nil
-	}
-	return 0, err
-}
-
-func (c *httpClient) WriteStreamWithParams(
-	r io.Reader,
-	contentLength int,
-	wp WriteParams,
-) (int, error) {
-	req, err := c.makeWriteRequest(r, contentLength, writeURL(c.url, wp))
-	if err != nil {
-		return 0, nil
-	}
-
-	err = c.doRequest(req, http.StatusNoContent)
-	if err == nil {
-		return contentLength, nil
-	}
-	return 0, err
+	return c.doRequest(req, http.StatusNoContent)
 }
 
 func (c *httpClient) doRequest(
@@ -232,7 +185,6 @@ func (c *httpClient) doRequest(
 
 func (c *httpClient) makeWriteRequest(
 	body io.Reader,
-	contentLength int,
 	writeURL string,
 ) (*http.Request, error) {
 	req, err := c.makeRequest(writeURL, body)
@@ -241,8 +193,6 @@ func (c *httpClient) makeWriteRequest(
 	}
 	if c.config.ContentEncoding == "gzip" {
 		req.Header.Set("Content-Encoding", "gzip")
-	} else {
-		req.Header.Set("Content-Length", fmt.Sprint(contentLength))
 	}
 	return req, nil
 }
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
index ba08918af..2cb0182e8 100644
--- a/plugins/outputs/influxdb/client/http_test.go
+++ b/plugins/outputs/influxdb/client/http_test.go
@@ -110,66 +110,8 @@ func TestHTTPClient_Write(t *testing.T) {
 	client, err := NewHTTP(config, wp)
 	defer client.Close()
 	assert.NoError(t, err)
-	n, err := client.Write([]byte("cpu value=99\n"))
-	assert.Equal(t, 13, n)
-	assert.NoError(t, err)
 
-	_, err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")), 13)
-	assert.NoError(t, err)
-}
-
-func TestHTTPClient_WriteParamsOverride(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			// test that database is set properly
-			if r.FormValue("db") != "override" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong db name"}`)
-			}
-
-			// Validate the request body:
-			buf := make([]byte, 100)
-			n, _ := r.Body.Read(buf)
-			expected := "cpu value=99"
-			got := string(buf[0 : n-1])
-			if expected != got {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				msg := fmt.Sprintf(`{"results":[{}],"error":"expected [%s], got [%s]"}`, expected, got)
-				fmt.Fprintln(w, msg)
-			}
-
-			w.WriteHeader(http.StatusNoContent)
-			w.Header().Set("Content-Type", "application/json")
-		case "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL,
-	}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	defer client.Close()
-	assert.NoError(t, err)
-
-	// test that WriteWithParams overrides the default write params
-	wp := WriteParams{
-		Database: "override",
-	}
-	n, err := client.WriteWithParams([]byte("cpu value=99\n"), wp)
-	assert.Equal(t, 13, n)
-	assert.NoError(t, err)
-
-	_, err = client.WriteStreamWithParams(bytes.NewReader([]byte("cpu value=99\n")), 13, wp)
+	err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")))
 	assert.NoError(t, err)
 }
 
@@ -197,23 +139,7 @@ func TestHTTPClient_Write_Errors(t *testing.T) {
 	assert.NoError(t, err)
 
 	lp := []byte("cpu value=99\n")
-	n, err := client.Write(lp)
-	assert.Equal(t, 0, n)
-	assert.Error(t, err)
-
-	n, err = client.WriteStream(bytes.NewReader(lp), 13)
-	assert.Equal(t, 0, n)
-	assert.Error(t, err)
-
-	wp := WriteParams{
-		Database: "override",
-	}
-	n, err = client.WriteWithParams(lp, wp)
-	assert.Equal(t, 0, n)
-	assert.Error(t, err)
-
-	n, err = client.WriteStreamWithParams(bytes.NewReader(lp), 13, wp)
-	assert.Equal(t, 0, n)
+	err = client.WriteStream(bytes.NewReader(lp))
 	assert.Error(t, err)
 }
 
@@ -404,8 +330,6 @@ func TestHTTPClient_PathPrefix(t *testing.T) {
 	assert.NoError(t, err)
 	err = client.Query("CREATE DATABASE test")
 	assert.NoError(t, err)
-	_, err = client.Write([]byte("cpu value=99\n"))
-	assert.NoError(t, err)
-	_, err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")), 13)
+	err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")))
 	assert.NoError(t, err)
 }
diff --git a/plugins/outputs/influxdb/client/udp.go b/plugins/outputs/influxdb/client/udp.go
index 1dd4d9936..786b047fa 100644
--- a/plugins/outputs/influxdb/client/udp.go
+++ b/plugins/outputs/influxdb/client/udp.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"log"
@@ -62,18 +61,8 @@ func (c *udpClient) Query(command string) error {
 	return nil
 }
 
-// Write will send the byte stream to the given UDP client endpoint
-func (c *udpClient) Write(b []byte) (int, error) {
-	return c.WriteStream(bytes.NewReader(b), -1)
-}
-
-// WriteWithParams are ignored by the UDP client, will forward to WriteStream
-func (c *udpClient) WriteWithParams(b []byte, wp WriteParams) (int, error) {
-	return c.WriteStream(bytes.NewReader(b), -1)
-}
-
 // WriteStream will send the provided data through to the client, contentLength is ignored by the UDP client
-func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
+func (c *udpClient) WriteStream(r io.Reader) error {
 	var totaln int
 	for {
 		nR, err := r.Read(c.buffer)
@@ -81,14 +70,14 @@ func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 			break
 		}
 		if err != io.EOF && err != nil {
-			return totaln, err
+			return err
 		}
 
 		if c.buffer[nR-1] == uint8('\n') {
 			nW, err := c.conn.Write(c.buffer[0:nR])
 			totaln += nW
 			if err != nil {
-				return totaln, err
+				return err
 			}
 		} else {
 			log.Printf("E! Could not fit point into UDP payload; dropping")
@@ -99,7 +88,7 @@ func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 					break
 				}
 				if err != io.EOF && err != nil {
-					return totaln, err
+					return err
 				}
 				if c.buffer[nR-1] == uint8('\n') {
 					break
@@ -107,13 +96,7 @@ func (c *udpClient) WriteStream(r io.Reader, contentLength int) (int, error) {
 			}
 		}
 	}
-	return totaln, nil
-}
-
-// WriteStreamWithParams will forward the stream to the client backend, contentLength is ignored by the UDP client
-// write params are ignored by the UDP client
-func (c *udpClient) WriteStreamWithParams(r io.Reader, contentLength int, wp WriteParams) (int, error) {
-	return c.WriteStream(r, -1)
+	return nil
 }
 
 // Close will terminate the provided client connection
diff --git a/plugins/outputs/influxdb/client/udp_test.go b/plugins/outputs/influxdb/client/udp_test.go
index 9308144b5..545f142f5 100644
--- a/plugins/outputs/influxdb/client/udp_test.go
+++ b/plugins/outputs/influxdb/client/udp_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestUDPClient(t *testing.T) {
@@ -65,43 +64,6 @@ func TestUDPClient_Write(t *testing.T) {
 		}
 	}()
 
-	// test sending simple metric
-	n, err := client.Write([]byte("cpu value=99\n"))
-	assert.Equal(t, n, 13)
-	assert.NoError(t, err)
-	pkt := <-packets
-	assert.Equal(t, "cpu value=99\n", pkt)
-
-	wp := WriteParams{}
-	//
-	// Using WriteStream() & a metric.Reader:
-	config3 := UDPConfig{
-		URL:         "udp://localhost:8199",
-		PayloadSize: 40,
-	}
-	client3, err := NewUDP(config3)
-	assert.NoError(t, err)
-
-	now := time.Unix(1484142942, 0)
-	m1, _ := metric.New("test", map[string]string{},
-		map[string]interface{}{"value": 1.1}, now)
-	m2, _ := metric.New("test", map[string]string{},
-		map[string]interface{}{"value": 1.1}, now)
-	m3, _ := metric.New("test", map[string]string{},
-		map[string]interface{}{"value": 1.1}, now)
-	ms := []telegraf.Metric{m1, m2, m3}
-	mReader := metric.NewReader(ms)
-	n, err = client3.WriteStreamWithParams(mReader, 10, wp)
-	// 3 metrics at 35 bytes each (including the newline)
-	assert.Equal(t, 105, n)
-	assert.NoError(t, err)
-	pkt = <-packets
-	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
-	pkt = <-packets
-	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
-	pkt = <-packets
-	assert.Equal(t, "test value=1.1 1484142942000000000\n", pkt)
-
 	assert.NoError(t, client.Close())
 
 	config = UDPConfig{
@@ -112,17 +74,15 @@ func TestUDPClient_Write(t *testing.T) {
 	assert.NoError(t, err)
 
 	ts := time.Unix(1484142943, 0)
-	m1, _ = metric.New("test", map[string]string{},
+	m1, _ := metric.New("test", map[string]string{},
 		map[string]interface{}{"this_is_a_very_long_field_name": 1.1}, ts)
-	m2, _ = metric.New("test", map[string]string{},
+	m2, _ := metric.New("test", map[string]string{},
 		map[string]interface{}{"value": 1.1}, ts)
-	ms = []telegraf.Metric{m1, m2}
+	ms := []telegraf.Metric{m1, m2}
 	reader := metric.NewReader(ms)
-	n, err = client4.WriteStream(reader, 0)
+	err = client4.WriteStream(reader)
 	assert.NoError(t, err)
-	require.Equal(t, 35, n)
-	assert.NoError(t, err)
-	pkt = <-packets
+	pkt := <-packets
 	assert.Equal(t, "test value=1.1 1484142943000000000\n", pkt)
 
 	assert.NoError(t, client4.Close())
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index ac5faf455..71320d01e 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -183,12 +183,6 @@ func (i *InfluxDB) Description() string {
 // Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
-
-	bufsize := 0
-	for _, m := range metrics {
-		bufsize += m.Len()
-	}
-
 	r := metric.NewReader(metrics)
 
 	// This will get set to nil if a successful write occurs
@@ -196,7 +190,7 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 
 	p := rand.Perm(len(i.clients))
 	for _, n := range p {
-		if _, e := i.clients[n].WriteStream(r, bufsize); e != nil {
+		if e := i.clients[n].WriteStream(r); e != nil {
 			// If the database was not found, try to recreate it:
 			if strings.Contains(e.Error(), "database not found") {
 				errc := i.clients[n].Query(fmt.Sprintf(`CREATE DATABASE "%s"`, qiReplacer.Replace(i.Database)))

From 13c7802b8461caa1624a85a2bdd6f7fcb86bd688 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Oct 2017 16:15:43 -0700
Subject: [PATCH 0627/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c92a2132..78bb8d0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
 - [#3297](https://github.com/influxdata/telegraf/issues/3297): Add support for proxy environment variables to http_response.
 - [#1588](https://github.com/influxdata/telegraf/issues/1588): Add support for standard proxy env vars in outputs.
 - [#3282](https://github.com/influxdata/telegraf/issues/3282): Fix panic in cpu input if number of cpus changes.
+- [#2854](https://github.com/influxdata/telegraf/issues/2854): Use chunked transfer encoding in InfluxDB output.
 
 ## v1.4.1 [2017-09-26]
 

From 59bb31e7651e14fd7694b678a3a8cbd169788d5a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Oct 2017 16:19:53 -0700
Subject: [PATCH 0628/1302] Use golang 1.9.1

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 117d03ad3..314903e9d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,8 +6,8 @@ machine:
     - rabbitmq-server
   post:
     - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.9.1.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.9.1.linux-amd64.tar.gz
     - go version
 
 dependencies:

From 75567d5b517df37b3e770dac271a1395bdcc3d50 Mon Sep 17 00:00:00 2001
From: Christian Meilke <christian.meilke@googlemail.com>
Date: Sat, 7 Oct 2017 01:16:32 +0200
Subject: [PATCH 0629/1302] Add ability to limit node stats in elasticsearch
 input (#3304)

---
 plugins/inputs/elasticsearch/README.md        |  5 +
 plugins/inputs/elasticsearch/elasticsearch.go | 34 +++++--
 .../elasticsearch/elasticsearch_test.go       | 45 +++++++--
 plugins/inputs/elasticsearch/testdata_test.go | 94 +++++++++++++++++++
 4 files changed, 164 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index f3999dc30..5698cc7f0 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -33,6 +33,11 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
   ## Master node.
   cluster_stats = false
 
+  ## node_stats is a list of sub-stats that you want to have gathered. Valid options
+  ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
+  ## "breakers". Per default, all stats are gathered.
+  # node_stats = ["jvm", "http"]
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 589d0fe3e..f5ddef5fb 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -103,6 +103,11 @@ const sampleConfig = `
   ## Master node.
   cluster_stats = false
 
+  ## node_stats is a list of sub-stats that you want to have gathered. Valid options
+  ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
+  ## "breakers". Per default, all stats are gathered.
+  # node_stats = ["jvm", "http"]
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -120,6 +125,7 @@ type Elasticsearch struct {
 	ClusterHealth           bool
 	ClusterHealthLevel      string
 	ClusterStats            bool
+	NodeStats               []string
 	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
 	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
 	SSLKey                  string `toml:"ssl_key"`  // Path to cert key file
@@ -165,12 +171,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	for _, serv := range e.Servers {
 		go func(s string, acc telegraf.Accumulator) {
 			defer wg.Done()
-			var url string
-			if e.Local {
-				url = s + statsPathLocal
-			} else {
-				url = s + statsPath
-			}
+			url := e.nodeStatsUrl(s)
 			e.isMaster = false
 
 			if e.ClusterStats {
@@ -229,6 +230,22 @@ func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
 	return client, nil
 }
 
+func (e *Elasticsearch) nodeStatsUrl(baseUrl string) string {
+	var url string
+
+	if e.Local {
+		url = baseUrl + statsPathLocal
+	} else {
+		url = baseUrl + statsPath
+	}
+
+	if len(e.NodeStats) == 0 {
+		return url
+	}
+
+	return fmt.Sprintf("%s/%s", url, strings.Join(e.NodeStats, ","))
+}
+
 func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
 	nodeStats := &struct {
 		ClusterName string               `json:"cluster_name"`
@@ -269,6 +286,11 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 
 		now := time.Now()
 		for p, s := range stats {
+			// if one of the individual node stats is not even in the
+			// original result
+			if s == nil {
+				continue
+			}
 			f := jsonparser.JSONFlattener{}
 			// parse Json, ignoring strings and bools
 			err := f.FlattenJSON("", s)
diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
index 41b578c79..1616bfeb2 100644
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -13,6 +13,16 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func defaultTags() map[string]string {
+	return map[string]string{
+		"cluster_name":          "es-testcluster",
+		"node_attribute_master": "true",
+		"node_id":               "SDFsfSDFsdfFSDSDfSFDSDF",
+		"node_name":             "test.host.com",
+		"node_host":             "test",
+	}
+}
+
 type transportMock struct {
 	statusCode int
 	body       string
@@ -45,15 +55,9 @@ func checkIsMaster(es *Elasticsearch, expected bool, t *testing.T) {
 		assert.Fail(t, msg)
 	}
 }
-func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
-	tags := map[string]string{
-		"cluster_name":          "es-testcluster",
-		"node_attribute_master": "true",
-		"node_id":               "SDFsfSDFsdfFSDSDfSFDSDF",
-		"node_name":             "test.host.com",
-		"node_host":             "test",
-	}
 
+func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
+	tags := defaultTags()
 	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", nodestatsIndicesExpected, tags)
 	acc.AssertContainsTaggedFields(t, "elasticsearch_os", nodestatsOsExpected, tags)
 	acc.AssertContainsTaggedFields(t, "elasticsearch_process", nodestatsProcessExpected, tags)
@@ -79,6 +83,31 @@ func TestGather(t *testing.T) {
 	checkNodeStatsResult(t, &acc)
 }
 
+func TestGatherIndividualStats(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.NodeStats = []string{"jvm", "process"}
+	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponseJVMProcess)
+
+	var acc testutil.Accumulator
+	if err := acc.GatherError(es.Gather); err != nil {
+		t.Fatal(err)
+	}
+
+	checkIsMaster(es, false, t)
+
+	tags := defaultTags()
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_indices", nodestatsIndicesExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_os", nodestatsOsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_process", nodestatsProcessExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", nodestatsJvmExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
+}
+
 func TestGatherNodeStats(t *testing.T) {
 	es := newElasticsearchWithClient()
 	es.Servers = []string{"http://example.com:9200"}
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index d43a3f9c5..6e487ff3f 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -504,6 +504,100 @@ const nodeStatsResponse = `
 }
 `
 
+const nodeStatsResponseJVMProcess = `
+{
+  "cluster_name": "es-testcluster",
+  "nodes": {
+    "SDFsfSDFsdfFSDSDfSFDSDF": {
+      "timestamp": 1436365550135,
+      "name": "test.host.com",
+      "transport_address": "inet[/127.0.0.1:9300]",
+      "host": "test",
+      "ip": [
+        "inet[/127.0.0.1:9300]",
+        "NONE"
+      ],
+      "attributes": {
+        "master": "true"
+      },
+      "process": {
+        "timestamp": 1436460392945,
+        "open_file_descriptors": 160,
+        "cpu": {
+          "percent": 2,
+          "sys_in_millis": 1870,
+          "user_in_millis": 13610,
+          "total_in_millis": 15480
+        },
+        "mem": {
+          "total_virtual_in_bytes": 4747890688
+        }
+      },
+      "jvm": {
+        "timestamp": 1436460392945,
+        "uptime_in_millis": 202245,
+        "mem": {
+          "heap_used_in_bytes": 52709568,
+          "heap_used_percent": 5,
+          "heap_committed_in_bytes": 259522560,
+          "heap_max_in_bytes": 1038876672,
+          "non_heap_used_in_bytes": 39634576,
+          "non_heap_committed_in_bytes": 40841216,
+          "pools": {
+            "young": {
+              "used_in_bytes": 32685760,
+              "max_in_bytes": 279183360,
+              "peak_used_in_bytes": 71630848,
+              "peak_max_in_bytes": 279183360
+            },
+            "survivor": {
+              "used_in_bytes": 8912880,
+              "max_in_bytes": 34865152,
+              "peak_used_in_bytes": 8912888,
+              "peak_max_in_bytes": 34865152
+            },
+            "old": {
+              "used_in_bytes": 11110928,
+              "max_in_bytes": 724828160,
+              "peak_used_in_bytes": 14354608,
+              "peak_max_in_bytes": 724828160
+            }
+          }
+        },
+        "threads": {
+          "count": 44,
+          "peak_count": 45
+        },
+        "gc": {
+          "collectors": {
+            "young": {
+              "collection_count": 2,
+              "collection_time_in_millis": 98
+            },
+            "old": {
+              "collection_count": 1,
+              "collection_time_in_millis": 24
+            }
+          }
+        },
+        "buffer_pools": {
+          "direct": {
+            "count": 40,
+            "used_in_bytes": 6304239,
+            "total_capacity_in_bytes": 6304239
+          },
+          "mapped": {
+            "count": 0,
+            "used_in_bytes": 0,
+            "total_capacity_in_bytes": 0
+          }
+        }
+      }
+    }
+  }
+}
+`
+
 var nodestatsIndicesExpected = map[string]interface{}{
 	"id_cache_memory_size_in_bytes":             float64(0),
 	"completion_size_in_bytes":                  float64(0),

From 4093bc98b7c711c40b8b6007d1793dfb8c51d105 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 6 Oct 2017 16:17:09 -0700
Subject: [PATCH 0630/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78bb8d0c3..56b6daae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - [#3141](https://github.com/influxdata/telegraf/pull/3141): Collect Docker Swarm service metrics in docker input plugin.
 - [#2449](https://github.com/influxdata/telegraf/pull/2449): Add smart input plugin for collecting S.M.A.R.T. data.
 - [#3269](https://github.com/influxdata/telegraf/pull/3269): Add cluster health level configuration to elasticsearch input.
+- [#3304](https://github.com/influxdata/telegraf/pull/3304): Add ability to limit node stats in elasticsearch input.
 
 ### Bugfixes
 

From 0f452ad0df4d72d9dfb32d8e36076b765185aef3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 6 Oct 2017 16:57:57 -0700
Subject: [PATCH 0631/1302] Document /etc/default/telegraf file

---
 docs/CONFIGURATION.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index d2cffbe07..6c48d2d84 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -24,6 +24,9 @@ Environment variables can be used anywhere in the config file, simply prepend
 them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
 for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
 
+When using the `.deb` or `.rpm` packages, you can define environment variables
+in the `/etc/default/telegraf` file.
+
 ## Configuration file locations
 
 The location of the configuration file can be set via the `--config` command

From 761544f56d90764b0bf5ab836a8c3ec79e5445b0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Oct 2017 15:02:57 -0700
Subject: [PATCH 0632/1302] Add HasPoint method to testutil.Accumulator

---
 plugins/inputs/filestat/filestat_test.go | 92 ++++++++++++------------
 testutil/accumulator.go                  | 25 +++++++
 2 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go
index 83d3c87cc..56d47ff7c 100644
--- a/plugins/inputs/filestat/filestat_test.go
+++ b/plugins/inputs/filestat/filestat_test.go
@@ -5,6 +5,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 )
@@ -24,28 +26,24 @@ func TestGatherNoMd5(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"exists", int64(1)))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"exists", int64(1)))
 
 	tags3 := map[string]string{
 		"file": "/non/existant/file",
 	}
-	fields3 := map[string]interface{}{
-		"exists": int64(0),
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields3, tags3)
+	require.True(t, acc.HasPoint("filestat", tags3,
+		"exists", int64(0)))
 }
 
 func TestGatherExplicitFiles(t *testing.T) {
@@ -64,30 +62,28 @@ func TestGatherExplicitFiles(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags3 := map[string]string{
 		"file": "/non/existant/file",
 	}
-	fields3 := map[string]interface{}{
-		"exists": int64(0),
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields3, tags3)
+	require.True(t, acc.HasPoint("filestat", tags3,
+		"exists", int64(0)))
 }
 
 func TestGatherGlob(t *testing.T) {
@@ -136,32 +132,32 @@ func TestGatherSuperAsterisk(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1,
+		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2,
+		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags3 := map[string]string{
 		"file": dir + "test.conf",
 	}
-	fields3 := map[string]interface{}{
-		"size_bytes": int64(104),
-		"exists":     int64(1),
-		"md5_sum":    "5a7e9b77fa25e7bb411dbd17cf403c1f",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields3, tags3)
+	require.True(t, acc.HasPoint("filestat", tags3,
+		"size_bytes", int64(104)))
+	require.True(t, acc.HasPoint("filestat", tags3,
+		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags3,
+		"md5_sum", "5a7e9b77fa25e7bb411dbd17cf403c1f"))
 }
 
 func TestGetMd5(t *testing.T) {
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 9a8eef9e3..c478400eb 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -297,6 +297,31 @@ func (a *Accumulator) AssertContainsFields(
 	assert.Fail(t, msg)
 }
 
+func (a *Accumulator) HasPoint(
+	measurement string,
+	tags map[string]string,
+	fieldKey string,
+	fieldValue interface{},
+) bool {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement != measurement {
+			continue
+		}
+
+		if !reflect.DeepEqual(tags, p.Tags) {
+			continue
+		}
+
+		v, ok := p.Fields[fieldKey]
+		if ok && reflect.DeepEqual(v, fieldValue) {
+			return true
+		}
+	}
+	return false
+}
+
 func (a *Accumulator) AssertDoesNotContainMeasurement(t *testing.T, measurement string) {
 	a.Lock()
 	defer a.Unlock()

From 61b0336d97543dc7cc8d32a77e7892ded36fdc24 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Oct 2017 15:09:07 -0700
Subject: [PATCH 0633/1302] Use 5 second timeout overhead when waiting for ping
 to complete

---
 plugins/inputs/ping/ping.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index dffa88751..dcbb2c286 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -145,7 +145,7 @@ func hostPinger(timeout float64, args ...string) (string, error) {
 	}
 	c := exec.Command(bin, args...)
 	out, err := internal.CombinedOutputTimeout(c,
-		time.Second*time.Duration(timeout+1))
+		time.Second*time.Duration(timeout+5))
 	return string(out), err
 }
 

From c7a6d4eaa40d4cd44412e9d632f6d315f4d752f2 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Tue, 10 Oct 2017 11:21:46 -0700
Subject: [PATCH 0634/1302] Fix link for wavefront plugin in changelog (#3317)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56b6daae1..5784a87b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
-- [wavefront](./plugins/inputs/wavefront/README.md) - Thanks to @puckpuck
+- [wavefront](./plugins/outputs/wavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
 

From b641f06552cdc7a1ce6cac8c8080af04f56da70a Mon Sep 17 00:00:00 2001
From: Toni Moreno <toni.moreno@gmail.com>
Date: Tue, 10 Oct 2017 21:02:01 +0200
Subject: [PATCH 0635/1302] Add new basicstats aggregator (#2167)

---
 plugins/aggregators/all/all.go                |   1 +
 plugins/aggregators/basicstats/README.md      |  43 +++++
 plugins/aggregators/basicstats/basicstats.go  | 155 ++++++++++++++++++
 .../aggregators/basicstats/basicstats_test.go | 151 +++++++++++++++++
 4 files changed, 350 insertions(+)
 create mode 100644 plugins/aggregators/basicstats/README.md
 create mode 100644 plugins/aggregators/basicstats/basicstats.go
 create mode 100644 plugins/aggregators/basicstats/basicstats_test.go

diff --git a/plugins/aggregators/all/all.go b/plugins/aggregators/all/all.go
index c4d430cc9..98aecb83f 100644
--- a/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -1,6 +1,7 @@
 package all
 
 import (
+	_ "github.com/influxdata/telegraf/plugins/aggregators/basicstats"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
 )
diff --git a/plugins/aggregators/basicstats/README.md b/plugins/aggregators/basicstats/README.md
new file mode 100644
index 000000000..0e3e5558c
--- /dev/null
+++ b/plugins/aggregators/basicstats/README.md
@@ -0,0 +1,43 @@
+# BasicStats Aggregator Plugin
+
+The BasicStats aggregator plugin give us count,max,min,mean,s2(variance), stdev for a set of values,
+emitting the aggregate every `period` seconds.
+
+### Configuration:
+
+```toml
+# Keep the aggregate basicstats of each metric passing through.
+[[aggregators.basicstats]]
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+```
+
+### Measurements & Fields:
+
+- measurement1
+    - field1_count
+    - field1_max
+    - field1_min
+    - field1_mean
+    - field1_s2 (variance)
+    - field1_stdev (standard deviation)
+
+### Tags:
+
+No tags are applied by this aggregator.
+
+### Example Output:
+
+```
+$ telegraf --config telegraf.conf --quiet
+system,host=tars load1=1 1475583980000000000
+system,host=tars load1=1 1475583990000000000
+system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_s2=0,load1_stdev=0 1475584010000000000
+system,host=tars load1=1 1475584020000000000
+system,host=tars load1=3 1475584030000000000
+system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_s2=2,load1_stdev=1.414162 1475584010000000000
+```
diff --git a/plugins/aggregators/basicstats/basicstats.go b/plugins/aggregators/basicstats/basicstats.go
new file mode 100644
index 000000000..40d65c873
--- /dev/null
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -0,0 +1,155 @@
+package basicstats
+
+import (
+	"math"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/aggregators"
+)
+
+type BasicStats struct {
+	cache map[uint64]aggregate
+}
+
+func NewBasicStats() telegraf.Aggregator {
+	mm := &BasicStats{}
+	mm.Reset()
+	return mm
+}
+
+type aggregate struct {
+	fields map[string]basicstats
+	name   string
+	tags   map[string]string
+}
+
+type basicstats struct {
+	count float64
+	min   float64
+	max   float64
+	mean  float64
+	M2    float64 //intermedia value for variance/stdev
+}
+
+var sampleConfig = `
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+`
+
+func (m *BasicStats) SampleConfig() string {
+	return sampleConfig
+}
+
+func (m *BasicStats) Description() string {
+	return "Keep the aggregate basicstats of each metric passing through."
+}
+
+func (m *BasicStats) Add(in telegraf.Metric) {
+	id := in.HashID()
+	if _, ok := m.cache[id]; !ok {
+		// hit an uncached metric, create caches for first time:
+		a := aggregate{
+			name:   in.Name(),
+			tags:   in.Tags(),
+			fields: make(map[string]basicstats),
+		}
+		for k, v := range in.Fields() {
+			if fv, ok := convert(v); ok {
+				a.fields[k] = basicstats{
+					count: 1,
+					min:   fv,
+					max:   fv,
+					mean:  fv,
+					M2:    0.0,
+				}
+			}
+		}
+		m.cache[id] = a
+	} else {
+		for k, v := range in.Fields() {
+			if fv, ok := convert(v); ok {
+				if _, ok := m.cache[id].fields[k]; !ok {
+					// hit an uncached field of a cached metric
+					m.cache[id].fields[k] = basicstats{
+						count: 1,
+						min:   fv,
+						max:   fv,
+						mean:  fv,
+						M2:    0.0,
+					}
+					continue
+				}
+
+				tmp := m.cache[id].fields[k]
+				//https://en.m.wikipedia.org/wiki/Algorithms_for_calculating_variance
+				//variable initialization
+				x := fv
+				mean := tmp.mean
+				M2 := tmp.M2
+				//counter compute
+				n := tmp.count + 1
+				tmp.count = n
+				//mean compute
+				delta := x - mean
+				mean = mean + delta/n
+				tmp.mean = mean
+				//variance/stdev compute
+				M2 = M2 + delta*(x-mean)
+				tmp.M2 = M2
+				//max/min compute
+				if fv < tmp.min {
+					tmp.min = fv
+				} else if fv > tmp.max {
+					tmp.max = fv
+				}
+				//store final data
+				m.cache[id].fields[k] = tmp
+			}
+		}
+	}
+}
+
+func (m *BasicStats) Push(acc telegraf.Accumulator) {
+	for _, aggregate := range m.cache {
+		fields := map[string]interface{}{}
+		for k, v := range aggregate.fields {
+			fields[k+"_count"] = v.count
+			fields[k+"_min"] = v.min
+			fields[k+"_max"] = v.max
+			fields[k+"_mean"] = v.mean
+			//v.count always >=1
+			if v.count > 1 {
+				variance := v.M2 / (v.count - 1)
+				fields[k+"_s2"] = variance
+				fields[k+"_stdev"] = math.Sqrt(variance)
+			}
+			//if count == 1 StdDev = infinite => so I won't send data
+		}
+		acc.AddFields(aggregate.name, fields, aggregate.tags)
+	}
+}
+
+func (m *BasicStats) Reset() {
+	m.cache = make(map[uint64]aggregate)
+}
+
+func convert(in interface{}) (float64, bool) {
+	switch v := in.(type) {
+	case float64:
+		return v, true
+	case int64:
+		return float64(v), true
+	default:
+		return 0, false
+	}
+}
+
+func init() {
+	aggregators.Add("basicstats", func() telegraf.Aggregator {
+		return NewBasicStats()
+	})
+}
diff --git a/plugins/aggregators/basicstats/basicstats_test.go b/plugins/aggregators/basicstats/basicstats_test.go
new file mode 100644
index 000000000..74237c0c7
--- /dev/null
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -0,0 +1,151 @@
+package basicstats
+
+import (
+	"math"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+var m1, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"a": int64(1),
+		"b": int64(1),
+		"c": float64(2),
+		"d": float64(2),
+	},
+	time.Now(),
+)
+var m2, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"a":        int64(1),
+		"b":        int64(3),
+		"c":        float64(4),
+		"d":        float64(6),
+		"e":        float64(200),
+		"ignoreme": "string",
+		"andme":    true,
+	},
+	time.Now(),
+)
+
+func BenchmarkApply(b *testing.B) {
+	minmax := NewBasicStats()
+
+	for n := 0; n < b.N; n++ {
+		minmax.Add(m1)
+		minmax.Add(m2)
+	}
+}
+
+// Test two metrics getting added.
+func TestBasicStatsWithPeriod(t *testing.T) {
+	acc := testutil.Accumulator{}
+	minmax := NewBasicStats()
+
+	minmax.Add(m1)
+	minmax.Add(m2)
+	minmax.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_count": float64(2), //a
+		"a_max":   float64(1),
+		"a_min":   float64(1),
+		"a_mean":  float64(1),
+		"a_stdev": float64(0),
+		"a_s2":    float64(0),
+		"b_count": float64(2), //b
+		"b_max":   float64(3),
+		"b_min":   float64(1),
+		"b_mean":  float64(2),
+		"b_s2":    float64(2),
+		"b_stdev": math.Sqrt(2),
+		"c_count": float64(2), //c
+		"c_max":   float64(4),
+		"c_min":   float64(2),
+		"c_mean":  float64(3),
+		"c_s2":    float64(2),
+		"c_stdev": math.Sqrt(2),
+		"d_count": float64(2), //d
+		"d_max":   float64(6),
+		"d_min":   float64(2),
+		"d_mean":  float64(4),
+		"d_s2":    float64(8),
+		"d_stdev": math.Sqrt(8),
+		"e_count": float64(1), //e
+		"e_max":   float64(200),
+		"e_min":   float64(200),
+		"e_mean":  float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test two metrics getting added with a push/reset in between (simulates
+// getting added in different periods.)
+func TestBasicStatsDifferentPeriods(t *testing.T) {
+	acc := testutil.Accumulator{}
+	minmax := NewBasicStats()
+
+	minmax.Add(m1)
+	minmax.Push(&acc)
+	expectedFields := map[string]interface{}{
+		"a_count": float64(1), //a
+		"a_max":   float64(1),
+		"a_min":   float64(1),
+		"a_mean":  float64(1),
+		"b_count": float64(1), //b
+		"b_max":   float64(1),
+		"b_min":   float64(1),
+		"b_mean":  float64(1),
+		"c_count": float64(1), //c
+		"c_max":   float64(2),
+		"c_min":   float64(2),
+		"c_mean":  float64(2),
+		"d_count": float64(1), //d
+		"d_max":   float64(2),
+		"d_min":   float64(2),
+		"d_mean":  float64(2),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+
+	acc.ClearMetrics()
+	minmax.Reset()
+	minmax.Add(m2)
+	minmax.Push(&acc)
+	expectedFields = map[string]interface{}{
+		"a_count": float64(1), //a
+		"a_max":   float64(1),
+		"a_min":   float64(1),
+		"a_mean":  float64(1),
+		"b_count": float64(1), //b
+		"b_max":   float64(3),
+		"b_min":   float64(3),
+		"b_mean":  float64(3),
+		"c_count": float64(1), //c
+		"c_max":   float64(4),
+		"c_min":   float64(4),
+		"c_mean":  float64(4),
+		"d_count": float64(1), //d
+		"d_max":   float64(6),
+		"d_min":   float64(6),
+		"d_mean":  float64(6),
+		"e_count": float64(1), //e
+		"e_max":   float64(200),
+		"e_min":   float64(200),
+		"e_mean":  float64(200),
+	}
+	expectedTags = map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}

From d7ea83f39bb85e68066ef923a084cc61a166e68e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Oct 2017 12:04:41 -0700
Subject: [PATCH 0636/1302] Update readme and changelog for basicstats
 aggregator

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5784a87b3..27fb7ac50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## v1.5 [unreleased]
 
 ### New Plugins
+- [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
@@ -41,6 +42,7 @@
 - [#2449](https://github.com/influxdata/telegraf/pull/2449): Add smart input plugin for collecting S.M.A.R.T. data.
 - [#3269](https://github.com/influxdata/telegraf/pull/3269): Add cluster health level configuration to elasticsearch input.
 - [#3304](https://github.com/influxdata/telegraf/pull/3304): Add ability to limit node stats in elasticsearch input.
+- [#2167](https://github.com/influxdata/telegraf/pull/2167): Add new basicstats aggregator.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index a3887e566..2dd836be2 100644
--- a/README.md
+++ b/README.md
@@ -255,6 +255,7 @@ formats may be used with input plugins supporting the `data_format` option:
 
 ## Aggregator Plugins
 
+* [basicstats](./plugins/aggregators/basicstats)
 * [minmax](./plugins/aggregators/minmax)
 * [histogram](./plugins/aggregators/histogram)
 

From 4e0c8e6026d3263a5d74ccac7c4c404fb1528430 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Oct 2017 13:29:31 -0700
Subject: [PATCH 0637/1302] Set 1.4.2 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27fb7ac50..29c4aaef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,7 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 
-## v1.4.2 [unreleased]
+## v1.4.2 [2017-10-10]
 
 ### Bugfixes
 

From c74c29b164ccb0facc7c24bcbcc78fc31e033eba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 11 Oct 2017 12:56:33 -0700
Subject: [PATCH 0638/1302] Remove suggested plugins from readme.

These are confusing since we don't support all of the examples.
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2dd836be2..62d725083 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,7 @@ and writing metrics.
 
 Design goals are to have a minimal memory footprint with a plugin system so
 that developers in the community can easily add support for collecting metrics
-from well known services (like Hadoop, Postgres, or Redis) and third party
-APIs (like Mailchimp, AWS CloudWatch, or Google Analytics).
+from local or remote services.
 
 Telegraf is plugin-driven and has the concept of 4 distinct plugins:
 

From bed14e503782ec6f8563d0fd46059d88a6d5184f Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Thu, 12 Oct 2017 18:08:51 -0400
Subject: [PATCH 0639/1302] Fix documented equation for diskio average queue
 depth (#3334)

---
 plugins/inputs/system/DISK_README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index b3b6a52fa..31eff937d 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -140,7 +140,7 @@ SELECT derivative(last("io_time"),1ms) FROM "diskio" WHERE time > now() - 30m GR
 #### Calculate average queue depth:
 `iops_in_progress` will give you an instantaneous value. This will give you the average between polling intervals.
 ```
-SELECT derivative(last("weighted_io_time",1ms))/1000 from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
+SELECT derivative(last("weighted_io_time",1ms)) from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
 ```
 
 ### Example Output:

From fa25e123d802e482a2c11a4ad5995ea58ce70dc3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 12 Oct 2017 15:50:09 -0700
Subject: [PATCH 0640/1302] Fix container name filters in docker input (#3331)

---
 filter/filter.go                     |  37 +++
 plugins/inputs/docker/docker.go      |  75 ++---
 plugins/inputs/docker/docker_test.go | 401 ++++++++++++++++++++-------
 3 files changed, 353 insertions(+), 160 deletions(-)

diff --git a/filter/filter.go b/filter/filter.go
index 9a28c2627..df171257b 100644
--- a/filter/filter.go
+++ b/filter/filter.go
@@ -77,3 +77,40 @@ func compileFilterNoGlob(filters []string) Filter {
 	}
 	return &out
 }
+
+type IncludeExcludeFilter struct {
+	include Filter
+	exclude Filter
+}
+
+func NewIncludeExcludeFilter(
+	include []string,
+	exclude []string,
+) (Filter, error) {
+	in, err := Compile(include)
+	if err != nil {
+		return nil, err
+	}
+
+	ex, err := Compile(exclude)
+	if err != nil {
+		return nil, err
+	}
+
+	return &IncludeExcludeFilter{in, ex}, nil
+}
+
+func (f *IncludeExcludeFilter) Match(s string) bool {
+	if f.include != nil {
+		if !f.include.Match(s) {
+			return false
+		}
+	}
+
+	if f.exclude != nil {
+		if f.exclude.Match(s) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 171097621..5f39fa0d9 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -22,16 +22,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type DockerLabelFilter struct {
-	labelInclude filter.Filter
-	labelExclude filter.Filter
-}
-
-type DockerContainerFilter struct {
-	containerInclude filter.Filter
-	containerExclude filter.Filter
-}
-
 // Docker object
 type Docker struct {
 	Endpoint       string
@@ -45,11 +35,9 @@ type Docker struct {
 	TagEnvironment []string `toml:"tag_env"`
 	LabelInclude   []string `toml:"docker_label_include"`
 	LabelExclude   []string `toml:"docker_label_exclude"`
-	LabelFilter    DockerLabelFilter
 
 	ContainerInclude []string `toml:"container_name_include"`
 	ContainerExclude []string `toml:"container_name_exclude"`
-	ContainerFilter  DockerContainerFilter
 
 	SSLCA              string `toml:"ssl_ca"`
 	SSLCert            string `toml:"ssl_cert"`
@@ -59,10 +47,12 @@ type Docker struct {
 	newEnvClient func() (Client, error)
 	newClient    func(string, *tls.Config) (Client, error)
 
-	client         Client
-	httpClient     *http.Client
-	engine_host    string
-	filtersCreated bool
+	client          Client
+	httpClient      *http.Client
+	engine_host     string
+	filtersCreated  bool
+	labelFilter     filter.Filter
+	containerFilter filter.Filter
 }
 
 // KB, MB, GB, TB, PB...human friendly
@@ -374,12 +364,8 @@ func (d *Docker) gatherContainer(
 		"container_version": imageVersion,
 	}
 
-	if len(d.ContainerInclude) > 0 || len(d.ContainerExclude) > 0 {
-		if len(d.ContainerInclude) == 0 || !d.ContainerFilter.containerInclude.Match(cname) {
-			if len(d.ContainerExclude) == 0 || d.ContainerFilter.containerExclude.Match(cname) {
-				return nil
-			}
-		}
+	if !d.containerFilter.Match(cname) {
+		return nil
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
@@ -400,10 +386,8 @@ func (d *Docker) gatherContainer(
 
 	// Add labels to tags
 	for k, label := range container.Labels {
-		if len(d.LabelInclude) == 0 || d.LabelFilter.labelInclude.Match(k) {
-			if len(d.LabelExclude) == 0 || !d.LabelFilter.labelExclude.Match(k) {
-				tags[k] = label
-			}
+		if d.labelFilter.Match(k) {
+			tags[k] = label
 		}
 	}
 
@@ -749,46 +733,25 @@ func parseSize(sizeStr string) (int64, error) {
 }
 
 func (d *Docker) createContainerFilters() error {
+	// Backwards compatibility for deprecated `container_names` parameter.
 	if len(d.ContainerNames) > 0 {
 		d.ContainerInclude = append(d.ContainerInclude, d.ContainerNames...)
 	}
 
-	if len(d.ContainerInclude) != 0 {
-		var err error
-		d.ContainerFilter.containerInclude, err = filter.Compile(d.ContainerInclude)
-		if err != nil {
-			return err
-		}
+	filter, err := filter.NewIncludeExcludeFilter(d.ContainerInclude, d.ContainerExclude)
+	if err != nil {
+		return err
 	}
-
-	if len(d.ContainerExclude) != 0 {
-		var err error
-		d.ContainerFilter.containerExclude, err = filter.Compile(d.ContainerExclude)
-		if err != nil {
-			return err
-		}
-	}
-
+	d.containerFilter = filter
 	return nil
 }
 
 func (d *Docker) createLabelFilters() error {
-	if len(d.LabelInclude) != 0 {
-		var err error
-		d.LabelFilter.labelInclude, err = filter.Compile(d.LabelInclude)
-		if err != nil {
-			return err
-		}
+	filter, err := filter.NewIncludeExcludeFilter(d.LabelInclude, d.LabelExclude)
+	if err != nil {
+		return err
 	}
-
-	if len(d.LabelExclude) != 0 {
-		var err error
-		d.LabelFilter.labelExclude, err = filter.Compile(d.LabelExclude)
-		if err != nil {
-			return err
-		}
-	}
-
+	d.labelFilter = filter
 	return nil
 }
 
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index b18274136..088c94597 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -69,30 +69,32 @@ func (c *MockClient) NodeList(
 	return c.NodeListF(ctx, options)
 }
 
+var baseClient = MockClient{
+	InfoF: func(context.Context) (types.Info, error) {
+		return info, nil
+	},
+	ContainerListF: func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
+		return containerList, nil
+	},
+	ContainerStatsF: func(context.Context, string, bool) (types.ContainerStats, error) {
+		return containerStats(), nil
+	},
+	ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
+		return containerInspect, nil
+	},
+	ServiceListF: func(context.Context, types.ServiceListOptions) ([]swarm.Service, error) {
+		return ServiceList, nil
+	},
+	TaskListF: func(context.Context, types.TaskListOptions) ([]swarm.Task, error) {
+		return TaskList, nil
+	},
+	NodeListF: func(context.Context, types.NodeListOptions) ([]swarm.Node, error) {
+		return NodeList, nil
+	},
+}
+
 func newClient(host string, tlsConfig *tls.Config) (Client, error) {
-	return &MockClient{
-		InfoF: func(context.Context) (types.Info, error) {
-			return info, nil
-		},
-		ContainerListF: func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
-			return containerList, nil
-		},
-		ContainerStatsF: func(context.Context, string, bool) (types.ContainerStats, error) {
-			return containerStats(), nil
-		},
-		ContainerInspectF: func(context.Context, string) (types.ContainerJSON, error) {
-			return containerInspect, nil
-		},
-		ServiceListF: func(context.Context, types.ServiceListOptions) ([]swarm.Service, error) {
-			return ServiceList, nil
-		},
-		TaskListF: func(context.Context, types.TaskListOptions) ([]swarm.Task, error) {
-			return TaskList, nil
-		},
-		NodeListF: func(context.Context, types.NodeListOptions) ([]swarm.Node, error) {
-			return NodeList, nil
-		},
-	}, nil
+	return &baseClient, nil
 }
 
 func TestDockerGatherContainerStats(t *testing.T) {
@@ -277,82 +279,291 @@ func TestDocker_WindowsMemoryContainerStats(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestDockerGatherLabels(t *testing.T) {
-	var gatherLabelsTests = []struct {
-		include     []string
-		exclude     []string
-		expected    []string
-		notexpected []string
+func TestContainerLabels(t *testing.T) {
+	var tests = []struct {
+		name      string
+		container types.Container
+		include   []string
+		exclude   []string
+		expected  map[string]string
 	}{
-		{[]string{}, []string{}, []string{"label1", "label2"}, []string{}},
-		{[]string{"*"}, []string{}, []string{"label1", "label2"}, []string{}},
-		{[]string{"lab*"}, []string{}, []string{"label1", "label2"}, []string{}},
-		{[]string{"label1"}, []string{}, []string{"label1"}, []string{"label2"}},
-		{[]string{"label1*"}, []string{}, []string{"label1"}, []string{"label2"}},
-		{[]string{}, []string{"*"}, []string{}, []string{"label1", "label2"}},
-		{[]string{}, []string{"lab*"}, []string{}, []string{"label1", "label2"}},
-		{[]string{}, []string{"label1"}, []string{"label2"}, []string{"label1"}},
-		{[]string{"*"}, []string{"*"}, []string{}, []string{"label1", "label2"}},
+		{
+			name: "Nil filters matches all",
+			container: types.Container{
+				Labels: map[string]string{
+					"a": "x",
+				},
+			},
+			include: nil,
+			exclude: nil,
+			expected: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name: "Empty filters matches all",
+			container: types.Container{
+				Labels: map[string]string{
+					"a": "x",
+				},
+			},
+			include: []string{},
+			exclude: []string{},
+			expected: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name: "Must match include",
+			container: types.Container{
+				Labels: map[string]string{
+					"a": "x",
+					"b": "y",
+				},
+			},
+			include: []string{"a"},
+			exclude: []string{},
+			expected: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name: "Must not match exclude",
+			container: types.Container{
+				Labels: map[string]string{
+					"a": "x",
+					"b": "y",
+				},
+			},
+			include: []string{},
+			exclude: []string{"b"},
+			expected: map[string]string{
+				"a": "x",
+			},
+		},
+		{
+			name: "Include Glob",
+			container: types.Container{
+				Labels: map[string]string{
+					"aa": "x",
+					"ab": "y",
+					"bb": "z",
+				},
+			},
+			include: []string{"a*"},
+			exclude: []string{},
+			expected: map[string]string{
+				"aa": "x",
+				"ab": "y",
+			},
+		},
+		{
+			name: "Exclude Glob",
+			container: types.Container{
+				Labels: map[string]string{
+					"aa": "x",
+					"ab": "y",
+					"bb": "z",
+				},
+			},
+			include: []string{},
+			exclude: []string{"a*"},
+			expected: map[string]string{
+				"bb": "z",
+			},
+		},
+		{
+			name: "Excluded Includes",
+			container: types.Container{
+				Labels: map[string]string{
+					"aa": "x",
+					"ab": "y",
+					"bb": "z",
+				},
+			},
+			include: []string{"a*"},
+			exclude: []string{"*b"},
+			expected: map[string]string{
+				"aa": "x",
+			},
+		},
 	}
-
-	for _, tt := range gatherLabelsTests {
-		t.Run("", func(t *testing.T) {
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
 			var acc testutil.Accumulator
-			d := Docker{
-				newClient: newClient,
+
+			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
+				client := baseClient
+				client.ContainerListF = func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
+					return []types.Container{tt.container}, nil
+				}
+				return &client, nil
 			}
 
-			for _, label := range tt.include {
-				d.LabelInclude = append(d.LabelInclude, label)
-			}
-			for _, label := range tt.exclude {
-				d.LabelExclude = append(d.LabelExclude, label)
+			d := Docker{
+				newClient:    newClientFunc,
+				LabelInclude: tt.include,
+				LabelExclude: tt.exclude,
 			}
 
 			err := d.Gather(&acc)
 			require.NoError(t, err)
 
-			for _, label := range tt.expected {
-				if !acc.HasTag("docker_container_cpu", label) {
-					t.Errorf("Didn't get expected label of %s.  Test was:  Include: %s  Exclude %s",
-						label, tt.include, tt.exclude)
+			// Grab tags from a container metric
+			var actual map[string]string
+			for _, metric := range acc.Metrics {
+				if metric.Measurement == "docker_container_cpu" {
+					actual = metric.Tags
 				}
 			}
 
-			for _, label := range tt.notexpected {
-				if acc.HasTag("docker_container_cpu", label) {
-					t.Errorf("Got unexpected label of %s.  Test was:  Include: %s  Exclude %s",
-						label, tt.include, tt.exclude)
-				}
+			for k, v := range tt.expected {
+				require.Equal(t, v, actual[k])
 			}
 		})
 	}
 }
 
 func TestContainerNames(t *testing.T) {
-	var gatherContainerNames = []struct {
-		include     []string
-		exclude     []string
-		expected    []string
-		notexpected []string
+	var tests = []struct {
+		name       string
+		containers [][]string
+		include    []string
+		exclude    []string
+		expected   []string
 	}{
-		{[]string{}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-		{[]string{"*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-		{[]string{"etc*"}, []string{}, []string{"etcd", "etcd2"}, []string{}},
-		{[]string{"etcd"}, []string{}, []string{"etcd"}, []string{"etcd2"}},
-		{[]string{"etcd2*"}, []string{}, []string{"etcd2"}, []string{"etcd"}},
-		{[]string{}, []string{"etc*"}, []string{}, []string{"etcd", "etcd2"}},
-		{[]string{}, []string{"etcd"}, []string{"etcd2"}, []string{"etcd"}},
-		{[]string{"*"}, []string{"*"}, []string{"etcd", "etcd2"}, []string{}},
-		{[]string{}, []string{"*"}, []string{""}, []string{"etcd", "etcd2"}},
+		{
+			name: "Nil filters matches all",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  nil,
+			exclude:  nil,
+			expected: []string{"etcd", "etcd2"},
+		},
+		{
+			name: "Empty filters matches all",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{},
+			exclude:  []string{},
+			expected: []string{"etcd", "etcd2"},
+		},
+		{
+			name: "Match all containers",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{"*"},
+			exclude:  []string{},
+			expected: []string{"etcd", "etcd2"},
+		},
+		{
+			name: "Include prefix match",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{"etc*"},
+			exclude:  []string{},
+			expected: []string{"etcd", "etcd2"},
+		},
+		{
+			name: "Exact match",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{"etcd"},
+			exclude:  []string{},
+			expected: []string{"etcd"},
+		},
+		{
+			name: "Star matches zero length",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{"etcd2*"},
+			exclude:  []string{},
+			expected: []string{"etcd2"},
+		},
+		{
+			name: "Exclude matches all",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{},
+			exclude:  []string{"etc*"},
+			expected: []string{},
+		},
+		{
+			name: "Exclude single",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{},
+			exclude:  []string{"etcd"},
+			expected: []string{"etcd2"},
+		},
+		{
+			name: "Exclude all",
+			containers: [][]string{
+				{"/etcd"},
+				{"/etcd2"},
+			},
+			include:  []string{"*"},
+			exclude:  []string{"*"},
+			expected: []string{},
+		},
+		{
+			name: "Exclude item matching include",
+			containers: [][]string{
+				{"acme"},
+				{"foo"},
+				{"acme-test"},
+			},
+			include:  []string{"acme*"},
+			exclude:  []string{"*test*"},
+			expected: []string{"acme"},
+		},
+		{
+			name: "Exclude item no wildcards",
+			containers: [][]string{
+				{"acme"},
+				{"acme-test"},
+			},
+			include:  []string{"acme*"},
+			exclude:  []string{"test"},
+			expected: []string{"acme", "acme-test"},
+		},
 	}
-
-	for _, tt := range gatherContainerNames {
-		t.Run("", func(t *testing.T) {
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
 			var acc testutil.Accumulator
 
+			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
+				client := baseClient
+				client.ContainerListF = func(context.Context, types.ContainerListOptions) ([]types.Container, error) {
+					var containers []types.Container
+					for _, names := range tt.containers {
+						containers = append(containers, types.Container{
+							Names: names,
+						})
+					}
+					return containers, nil
+				}
+				return &client, nil
+			}
+
 			d := Docker{
-				newClient:        newClient,
+				newClient:        newClientFunc,
 				ContainerInclude: tt.include,
 				ContainerExclude: tt.exclude,
 			}
@@ -360,39 +571,21 @@ func TestContainerNames(t *testing.T) {
 			err := d.Gather(&acc)
 			require.NoError(t, err)
 
+			// Set of expected names
+			var expected = make(map[string]bool)
+			for _, v := range tt.expected {
+				expected[v] = true
+			}
+
+			// Set of actual names
+			var actual = make(map[string]bool)
 			for _, metric := range acc.Metrics {
-				if metric.Measurement == "docker_container_cpu" {
-					if val, ok := metric.Tags["container_name"]; ok {
-						var found bool = false
-						for _, cname := range tt.expected {
-							if val == cname {
-								found = true
-								break
-							}
-						}
-						if !found {
-							t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
-						}
-					}
+				if name, ok := metric.Tags["container_name"]; ok {
+					actual[name] = true
 				}
 			}
 
-			for _, metric := range acc.Metrics {
-				if metric.Measurement == "docker_container_cpu" {
-					if val, ok := metric.Tags["container_name"]; ok {
-						var found bool = false
-						for _, cname := range tt.notexpected {
-							if val == cname {
-								found = true
-								break
-							}
-						}
-						if found {
-							t.Errorf("Got unexpected container of %s. Test was -> Include: %s, Exclude: %s", val, tt.include, tt.exclude)
-						}
-					}
-				}
-			}
+			require.Equal(t, expected, actual)
 		})
 	}
 }

From 024dea2ff98c191bdff0e8bcf7514074f5e0e8de Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Oct 2017 15:52:01 -0700
Subject: [PATCH 0641/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29c4aaef4..9946b2a21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,12 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 
+## v1.4.3 [unreleased]
+
+### Bugfixes
+
+- [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
+
 ## v1.4.2 [2017-10-10]
 
 ### Bugfixes

From 2f8d0f4d4784f1ee217bce2c40c94b1dd78bd908 Mon Sep 17 00:00:00 2001
From: Windkit Li <windkithk@gmail.com>
Date: Fri, 13 Oct 2017 09:26:14 +0900
Subject: [PATCH 0642/1302] Fix snmpwalk address format in leofs input (#3328)

---
 etc/telegraf.conf                  |   4 +-
 plugins/inputs/leofs/leofs.go      |  40 ++++-----
 plugins/inputs/leofs/leofs_test.go | 136 ++++++++++++++---------------
 3 files changed, 86 insertions(+), 94 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 2c23864cf..f3128b8fd 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1586,8 +1586,8 @@
 # # Read metrics from a LeoFS Server via SNMP
 # [[inputs.leofs]]
 #   ## An array of URLs of the form:
-#   ##   "udp://" host [ ":" port]
-#   servers = ["udp://127.0.0.1:4020"]
+#   ##   host [ ":" port]
+#   servers = ["127.0.0.1:4020"]
 
 
 # # Provides Linux sysctl fs metrics
diff --git a/plugins/inputs/leofs/leofs.go b/plugins/inputs/leofs/leofs.go
index 55a727ef8..9381eace8 100644
--- a/plugins/inputs/leofs/leofs.go
+++ b/plugins/inputs/leofs/leofs.go
@@ -3,8 +3,6 @@ package leofs
 import (
 	"bufio"
 	"fmt"
-	"log"
-	"net/url"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -19,7 +17,7 @@ import (
 const oid = ".1.3.6.1.4.1.35450"
 
 // For Manager Master
-const defaultEndpoint = "udp://127.0.0.1:4020"
+const defaultEndpoint = "127.0.0.1:4020"
 
 type ServerType int
 
@@ -137,8 +135,8 @@ var serverTypeMapping = map[string]ServerType{
 
 var sampleConfig = `
   ## An array of URLs of the form:
-  ##   "udp://" host [ ":" port]
-  servers = ["udp://127.0.0.1:4020"]
+  ##   host [ ":" port]
+  servers = ["127.0.0.1:4020"]
 `
 
 func (l *LeoFS) SampleConfig() string {
@@ -155,28 +153,22 @@ func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
 		return nil
 	}
 	var wg sync.WaitGroup
-	for i, endpoint := range l.Servers {
-		if !strings.HasPrefix(endpoint, "udp://") {
-			// Preserve backwards compatibility for hostnames without a
-			// scheme, broken in go 1.8. Remove in Telegraf 2.0
-			endpoint = "udp://" + endpoint
-			log.Printf("W! [inputs.mongodb] Using %q as connection URL; please update your configuration to use an URL", endpoint)
-			l.Servers[i] = endpoint
-		}
-		u, err := url.Parse(endpoint)
-		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse address %q: %s", endpoint, err))
-			continue
-		}
-		if u.Host == "" {
+	for _, endpoint := range l.Servers {
+		results := strings.Split(endpoint, ":")
+
+		port := "4020"
+		if len(results) > 2 {
 			acc.AddError(fmt.Errorf("Unable to parse address %q", endpoint))
 			continue
+		} else if len(results) == 2 {
+			if _, err := strconv.Atoi(results[1]); err == nil {
+				port = results[1]
+			} else {
+				acc.AddError(fmt.Errorf("Unable to parse port from %q", endpoint))
+				continue
+			}
 		}
 
-		port := u.Port()
-		if port == "" {
-			port = "4020"
-		}
 		st, ok := serverTypeMapping[port]
 		if !ok {
 			st = ServerTypeStorage
@@ -196,7 +188,7 @@ func (l *LeoFS) gatherServer(
 	serverType ServerType,
 	acc telegraf.Accumulator,
 ) error {
-	cmd := exec.Command("snmpwalk", "-v2c", "-cpublic", endpoint, oid)
+	cmd := exec.Command("snmpwalk", "-v2c", "-cpublic", "-On", endpoint, oid)
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return err
diff --git a/plugins/inputs/leofs/leofs_test.go b/plugins/inputs/leofs/leofs_test.go
index a5ca30432..f3699b8d9 100644
--- a/plugins/inputs/leofs/leofs_test.go
+++ b/plugins/inputs/leofs/leofs_test.go
@@ -16,21 +16,21 @@ package main
 
 import "fmt"
 
-const output = ` + "`" + `iso.3.6.1.4.1.35450.15.1.0 = STRING: "manager_888@127.0.0.1"
-iso.3.6.1.4.1.35450.15.2.0 = Gauge32: 186
-iso.3.6.1.4.1.35450.15.3.0 = Gauge32: 46235519
-iso.3.6.1.4.1.35450.15.4.0 = Gauge32: 32168525
-iso.3.6.1.4.1.35450.15.5.0 = Gauge32: 14066068
-iso.3.6.1.4.1.35450.15.6.0 = Gauge32: 5512968
-iso.3.6.1.4.1.35450.15.7.0 = Gauge32: 186
-iso.3.6.1.4.1.35450.15.8.0 = Gauge32: 46269006
-iso.3.6.1.4.1.35450.15.9.0 = Gauge32: 32202867
-iso.3.6.1.4.1.35450.15.10.0 = Gauge32: 14064995
-iso.3.6.1.4.1.35450.15.11.0 = Gauge32: 5492634
-iso.3.6.1.4.1.35450.15.12.0 = Gauge32: 60
-iso.3.6.1.4.1.35450.15.13.0 = Gauge32: 43515904
-iso.3.6.1.4.1.35450.15.14.0 = Gauge32: 60
-iso.3.6.1.4.1.35450.15.15.0 = Gauge32: 43533983` + "`" +
+const output = ` + "`" + `.1.3.6.1.4.1.35450.15.1.0 = STRING: "manager_888@127.0.0.1"
+.1.3.6.1.4.1.35450.15.2.0 = Gauge32: 186
+.1.3.6.1.4.1.35450.15.3.0 = Gauge32: 46235519
+.1.3.6.1.4.1.35450.15.4.0 = Gauge32: 32168525
+.1.3.6.1.4.1.35450.15.5.0 = Gauge32: 14066068
+.1.3.6.1.4.1.35450.15.6.0 = Gauge32: 5512968
+.1.3.6.1.4.1.35450.15.7.0 = Gauge32: 186
+.1.3.6.1.4.1.35450.15.8.0 = Gauge32: 46269006
+.1.3.6.1.4.1.35450.15.9.0 = Gauge32: 32202867
+.1.3.6.1.4.1.35450.15.10.0 = Gauge32: 14064995
+.1.3.6.1.4.1.35450.15.11.0 = Gauge32: 5492634
+.1.3.6.1.4.1.35450.15.12.0 = Gauge32: 60
+.1.3.6.1.4.1.35450.15.13.0 = Gauge32: 43515904
+.1.3.6.1.4.1.35450.15.14.0 = Gauge32: 60
+.1.3.6.1.4.1.35450.15.15.0 = Gauge32: 43533983` + "`" +
 	`
 func main() {
 	fmt.Println(output)
@@ -42,34 +42,34 @@ package main
 
 import "fmt"
 
-const output = ` + "`" + `iso.3.6.1.4.1.35450.34.1.0 = STRING: "storage_0@127.0.0.1"
-iso.3.6.1.4.1.35450.34.2.0 = Gauge32: 512
-iso.3.6.1.4.1.35450.34.3.0 = Gauge32: 38126307
-iso.3.6.1.4.1.35450.34.4.0 = Gauge32: 22308716
-iso.3.6.1.4.1.35450.34.5.0 = Gauge32: 15816448
-iso.3.6.1.4.1.35450.34.6.0 = Gauge32: 5232008
-iso.3.6.1.4.1.35450.34.7.0 = Gauge32: 512
-iso.3.6.1.4.1.35450.34.8.0 = Gauge32: 38113176
-iso.3.6.1.4.1.35450.34.9.0 = Gauge32: 22313398
-iso.3.6.1.4.1.35450.34.10.0 = Gauge32: 15798779
-iso.3.6.1.4.1.35450.34.11.0 = Gauge32: 5237315
-iso.3.6.1.4.1.35450.34.12.0 = Gauge32: 191
-iso.3.6.1.4.1.35450.34.13.0 = Gauge32: 824
-iso.3.6.1.4.1.35450.34.14.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.15.0 = Gauge32: 50105
-iso.3.6.1.4.1.35450.34.16.0 = Gauge32: 196654
-iso.3.6.1.4.1.35450.34.17.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.18.0 = Gauge32: 2052
-iso.3.6.1.4.1.35450.34.19.0 = Gauge32: 50296
-iso.3.6.1.4.1.35450.34.20.0 = Gauge32: 35
-iso.3.6.1.4.1.35450.34.21.0 = Gauge32: 898
-iso.3.6.1.4.1.35450.34.22.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.23.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.24.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.31.0 = Gauge32: 51
-iso.3.6.1.4.1.35450.34.32.0 = Gauge32: 53219328
-iso.3.6.1.4.1.35450.34.33.0 = Gauge32: 51
-iso.3.6.1.4.1.35450.34.34.0 = Gauge32: 53351083` + "`" +
+const output = ` + "`" + `.1.3.6.1.4.1.35450.34.1.0 = STRING: "storage_0@127.0.0.1"
+.1.3.6.1.4.1.35450.34.2.0 = Gauge32: 512
+.1.3.6.1.4.1.35450.34.3.0 = Gauge32: 38126307
+.1.3.6.1.4.1.35450.34.4.0 = Gauge32: 22308716
+.1.3.6.1.4.1.35450.34.5.0 = Gauge32: 15816448
+.1.3.6.1.4.1.35450.34.6.0 = Gauge32: 5232008
+.1.3.6.1.4.1.35450.34.7.0 = Gauge32: 512
+.1.3.6.1.4.1.35450.34.8.0 = Gauge32: 38113176
+.1.3.6.1.4.1.35450.34.9.0 = Gauge32: 22313398
+.1.3.6.1.4.1.35450.34.10.0 = Gauge32: 15798779
+.1.3.6.1.4.1.35450.34.11.0 = Gauge32: 5237315
+.1.3.6.1.4.1.35450.34.12.0 = Gauge32: 191
+.1.3.6.1.4.1.35450.34.13.0 = Gauge32: 824
+.1.3.6.1.4.1.35450.34.14.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.15.0 = Gauge32: 50105
+.1.3.6.1.4.1.35450.34.16.0 = Gauge32: 196654
+.1.3.6.1.4.1.35450.34.17.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.18.0 = Gauge32: 2052
+.1.3.6.1.4.1.35450.34.19.0 = Gauge32: 50296
+.1.3.6.1.4.1.35450.34.20.0 = Gauge32: 35
+.1.3.6.1.4.1.35450.34.21.0 = Gauge32: 898
+.1.3.6.1.4.1.35450.34.22.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.23.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.24.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.31.0 = Gauge32: 51
+.1.3.6.1.4.1.35450.34.32.0 = Gauge32: 53219328
+.1.3.6.1.4.1.35450.34.33.0 = Gauge32: 51
+.1.3.6.1.4.1.35450.34.34.0 = Gauge32: 53351083` + "`" +
 	`
 func main() {
 	fmt.Println(output)
@@ -81,31 +81,31 @@ package main
 
 import "fmt"
 
-const output = ` + "`" + `iso.3.6.1.4.1.35450.34.1.0 = STRING: "gateway_0@127.0.0.1"
-iso.3.6.1.4.1.35450.34.2.0 = Gauge32: 465
-iso.3.6.1.4.1.35450.34.3.0 = Gauge32: 61676335
-iso.3.6.1.4.1.35450.34.4.0 = Gauge32: 46890415
-iso.3.6.1.4.1.35450.34.5.0 = Gauge32: 14785011
-iso.3.6.1.4.1.35450.34.6.0 = Gauge32: 5578855
-iso.3.6.1.4.1.35450.34.7.0 = Gauge32: 465
-iso.3.6.1.4.1.35450.34.8.0 = Gauge32: 61644426
-iso.3.6.1.4.1.35450.34.9.0 = Gauge32: 46880358
-iso.3.6.1.4.1.35450.34.10.0 = Gauge32: 14763002
-iso.3.6.1.4.1.35450.34.11.0 = Gauge32: 5582125
-iso.3.6.1.4.1.35450.34.12.0 = Gauge32: 191
-iso.3.6.1.4.1.35450.34.13.0 = Gauge32: 827
-iso.3.6.1.4.1.35450.34.14.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.15.0 = Gauge32: 50105
-iso.3.6.1.4.1.35450.34.16.0 = Gauge32: 196650
-iso.3.6.1.4.1.35450.34.17.0 = Gauge32: 0
-iso.3.6.1.4.1.35450.34.18.0 = Gauge32: 30256
-iso.3.6.1.4.1.35450.34.19.0 = Gauge32: 532158
-iso.3.6.1.4.1.35450.34.20.0 = Gauge32: 34
-iso.3.6.1.4.1.35450.34.21.0 = Gauge32: 1
-iso.3.6.1.4.1.35450.34.31.0 = Gauge32: 53
-iso.3.6.1.4.1.35450.34.32.0 = Gauge32: 55050240
-iso.3.6.1.4.1.35450.34.33.0 = Gauge32: 53
-iso.3.6.1.4.1.35450.34.34.0 = Gauge32: 55186538` + "`" +
+const output = ` + "`" + `.1.3.6.1.4.1.35450.34.1.0 = STRING: "gateway_0@127.0.0.1"
+.1.3.6.1.4.1.35450.34.2.0 = Gauge32: 465
+.1.3.6.1.4.1.35450.34.3.0 = Gauge32: 61676335
+.1.3.6.1.4.1.35450.34.4.0 = Gauge32: 46890415
+.1.3.6.1.4.1.35450.34.5.0 = Gauge32: 14785011
+.1.3.6.1.4.1.35450.34.6.0 = Gauge32: 5578855
+.1.3.6.1.4.1.35450.34.7.0 = Gauge32: 465
+.1.3.6.1.4.1.35450.34.8.0 = Gauge32: 61644426
+.1.3.6.1.4.1.35450.34.9.0 = Gauge32: 46880358
+.1.3.6.1.4.1.35450.34.10.0 = Gauge32: 14763002
+.1.3.6.1.4.1.35450.34.11.0 = Gauge32: 5582125
+.1.3.6.1.4.1.35450.34.12.0 = Gauge32: 191
+.1.3.6.1.4.1.35450.34.13.0 = Gauge32: 827
+.1.3.6.1.4.1.35450.34.14.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.15.0 = Gauge32: 50105
+.1.3.6.1.4.1.35450.34.16.0 = Gauge32: 196650
+.1.3.6.1.4.1.35450.34.17.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.34.18.0 = Gauge32: 30256
+.1.3.6.1.4.1.35450.34.19.0 = Gauge32: 532158
+.1.3.6.1.4.1.35450.34.20.0 = Gauge32: 34
+.1.3.6.1.4.1.35450.34.21.0 = Gauge32: 1
+.1.3.6.1.4.1.35450.34.31.0 = Gauge32: 53
+.1.3.6.1.4.1.35450.34.32.0 = Gauge32: 55050240
+.1.3.6.1.4.1.35450.34.33.0 = Gauge32: 53
+.1.3.6.1.4.1.35450.34.34.0 = Gauge32: 55186538` + "`" +
 	`
 func main() {
 	fmt.Println(output)

From 0f9f757da7d0a432d3e9e2df3aff2f969037b726 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Oct 2017 17:26:58 -0700
Subject: [PATCH 0643/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9946b2a21..325512d8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 ### Bugfixes
 
 - [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
+- [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
 
 ## v1.4.2 [2017-10-10]
 

From bf9f94eb9da63bee4168b7d4f3c72862c4797ad0 Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Fri, 13 Oct 2017 19:04:40 +0100
Subject: [PATCH 0644/1302] Fix cloudwatch output requires unneeded permissions
 (#3335)

---
 plugins/outputs/cloudwatch/README.md     |  2 ++
 plugins/outputs/cloudwatch/cloudwatch.go | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/outputs/cloudwatch/README.md b/plugins/outputs/cloudwatch/README.md
index 5544b25c7..c44ac4ead 100644
--- a/plugins/outputs/cloudwatch/README.md
+++ b/plugins/outputs/cloudwatch/README.md
@@ -13,6 +13,8 @@ API endpoint. In the following order the plugin will attempt to authenticate.
 5. [Shared Credentials](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#shared-credentials-file)
 6. [EC2 Instance Profile](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
 
+The IAM user needs only the `cloudwatch:PutMetricData` permission.
+
 ## Config
 
 For this output plugin to function correctly the following variables
diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index a04e86cde..b14953dbe 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
+	"github.com/aws/aws-sdk-go/service/sts"
 
 	"github.com/influxdata/telegraf"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
@@ -71,21 +72,20 @@ func (c *CloudWatch) Connect() error {
 	}
 	configProvider := credentialConfig.Credentials()
 
-	svc := cloudwatch.New(configProvider)
+	stsService := sts.New(configProvider)
 
-	params := &cloudwatch.ListMetricsInput{
-		Namespace: aws.String(c.Namespace),
-	}
+	params := &sts.GetSessionTokenInput{}
 
-	_, err := svc.ListMetrics(params) // Try a read-only call to test connection.
+	_, err := stsService.GetSessionToken(params)
 
 	if err != nil {
-		log.Printf("E! cloudwatch: Error in ListMetrics API call : %+v \n", err.Error())
+		log.Printf("E! cloudwatch: Cannot use credentials to connect to AWS : %+v \n", err.Error())
+		return err
 	}
 
-	c.svc = svc
+	c.svc = cloudwatch.New(configProvider)
 
-	return err
+	return nil
 }
 
 func (c *CloudWatch) Close() error {

From 5cd3327d5f84524f5eb2820a4daaf94259f3492c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Oct 2017 11:12:27 -0700
Subject: [PATCH 0645/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 325512d8e..efaeb4476 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
+- [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
 
 ## v1.4.3 [unreleased]
 

From 6b67fedfdc340085a3e10963c49cbc91033e0a50 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Oct 2017 11:30:30 -0700
Subject: [PATCH 0646/1302] Remove timing sensitive riemann test

---
 plugins/outputs/riemann/riemann_test.go | 51 -------------------------
 1 file changed, 51 deletions(-)

diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index 0b7c85403..61b7b3796 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -1,14 +1,11 @@
 package riemann
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
 	"github.com/amir/raidman"
-	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -162,51 +159,3 @@ func TestStateEvents(t *testing.T) {
 	}
 	require.Equal(t, expectedEvent, events[0])
 }
-
-func TestConnectAndWrite(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	r := &Riemann{
-		URL:                    fmt.Sprintf("tcp://%s:5555", testutil.GetLocalHost()),
-		TTL:                    15.0,
-		Separator:              "/",
-		MeasurementAsAttribute: false,
-		StringAsState:          true,
-		DescriptionText:        "metrics from telegraf",
-		Tags:                   []string{"docker"},
-	}
-
-	err := r.Connect()
-	require.NoError(t, err)
-
-	err = r.Write(testutil.MockMetrics())
-	require.NoError(t, err)
-
-	metrics := make([]telegraf.Metric, 0)
-	metrics = append(metrics, testutil.TestMetric(2))
-	metrics = append(metrics, testutil.TestMetric(3.456789))
-	metrics = append(metrics, testutil.TestMetric(uint(0)))
-	metrics = append(metrics, testutil.TestMetric("ok"))
-	metrics = append(metrics, testutil.TestMetric("running"))
-	err = r.Write(metrics)
-	require.NoError(t, err)
-
-	// are there any "docker" tagged events in Riemann?
-	events, err := r.client.Query(`tagged "docker"`)
-	require.NoError(t, err)
-	require.NotZero(t, len(events))
-
-	// get Riemann events with state = "running", should be 1 event
-	events, err = r.client.Query(`state = "running"`)
-	require.NoError(t, err)
-	require.Len(t, events, 1)
-
-	// is event as expected?
-	require.Equal(t, []string{"docker", "value1"}, events[0].Tags)
-	require.Equal(t, "running", events[0].State)
-	require.Equal(t, "test1/value", events[0].Service)
-	require.Equal(t, "metrics from telegraf", events[0].Description)
-	require.Equal(t, map[string]string{"tag1": "value1"}, events[0].Attributes)
-}

From a1796989f71626a37a75d830b3a24ef9e2b0153b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 13 Oct 2017 13:53:18 -0700
Subject: [PATCH 0647/1302] Add ipmi_sensor permission documentation

---
 plugins/inputs/ipmi_sensor/README.md | 73 ++++++++++++++++------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index a1f6c8129..90abf393a 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -1,8 +1,7 @@
-# Telegraf ipmi plugin
+# IPMI Sensor Input Plugin
 
-Get bare metal metrics using the command line utility `ipmitool`
-
-see ipmitool(https://sourceforge.net/projects/ipmitool/files/ipmitool/)
+Get bare metal metrics using the command line utility
+[`ipmitool`](https://sourceforge.net/projects/ipmitool/files/ipmitool/).
 
 If no servers are specified, the plugin will query the local machine sensor stats via the following command:
 
@@ -16,18 +15,7 @@ When one or more servers are specified, the plugin will use the following comman
 ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
 ```
 
-## Measurements
-
-- ipmi_sensor:
-
-    * Tags: `name`, `unit`
-    * Fields:
-      - status
-      - value
-
-The `server` tag will be made available when retrieving stats from remote server(s).
-
-## Configuration
+### Configuration
 
 ```toml
 # Read metrics from the bare metal servers via IPMI
@@ -52,26 +40,49 @@ The `server` tag will be made available when retrieving stats from remote server
   timeout = "20s"
 ```
 
-## Output
+### Measurements
+
+- ipmi_sensor:
+  - tags:
+    - name
+    - unit
+    - server (only when retrieving stats from remote servers)
+  - fields:
+    - status (int)
+    - value (float)
+
+
+#### Permissions
+
+When gathering from the local system, Telegraf will need permission to the
+impi device node.  When using udev you can create the device node giving
+`rw` permissions to the `telegraf` user by adding the following rule to
+`/etc/udev/rules.d/52-telegraf-ipmi.rules`:
+
+```
+KERNEL=="ipmi*", MODE="660", GROUP="telegraf"
+```
+
+### Example Output
 
 When retrieving stats from a remote server:
 ```
-> ipmi_sensor,server=10.20.2.203,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
-> ipmi_sensor,server=10.20.2.203,unit=feet,name=altitude status=1i,value=80 1458488465012688613
-> ipmi_sensor,server=10.20.2.203,unit=watts,name=avg_power status=1i,value=220 1458488465012776511
-> ipmi_sensor,server=10.20.2.203,unit=volts,name=planar_3.3v status=1i,value=3.28 1458488465012861875
-> ipmi_sensor,server=10.20.2.203,unit=volts,name=planar_vbat status=1i,value=3.04 1458488465013072508
-> ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
-> ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
+ipmi_sensor,server=10.20.2.203,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
+ipmi_sensor,server=10.20.2.203,unit=feet,name=altitude status=1i,value=80 1458488465012688613
+ipmi_sensor,server=10.20.2.203,unit=watts,name=avg_power status=1i,value=220 1458488465012776511
+ipmi_sensor,server=10.20.2.203,unit=volts,name=planar_3.3v status=1i,value=3.28 1458488465012861875
+ipmi_sensor,server=10.20.2.203,unit=volts,name=planar_vbat status=1i,value=3.04 1458488465013072508
+ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
+ipmi_sensor,server=10.20.2.203,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
 ```
 
 When retrieving stats from the local machine (no server specified):
 ```
-> ipmi_sensor,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
-> ipmi_sensor,unit=feet,name=altitude status=1i,value=80 1458488465012688613
-> ipmi_sensor,unit=watts,name=avg_power status=1i,value=220 1458488465012776511
-> ipmi_sensor,unit=volts,name=planar_3.3v status=1i,value=3.28 1458488465012861875
-> ipmi_sensor,unit=volts,name=planar_vbat status=1i,value=3.04 1458488465013072508
-> ipmi_sensor,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
-> ipmi_sensor,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
+ipmi_sensor,unit=degrees_c,name=ambient_temp status=1i,value=20 1458488465012559455
+ipmi_sensor,unit=feet,name=altitude status=1i,value=80 1458488465012688613
+ipmi_sensor,unit=watts,name=avg_power status=1i,value=220 1458488465012776511
+ipmi_sensor,unit=volts,name=planar_3.3v status=1i,value=3.28 1458488465012861875
+ipmi_sensor,unit=volts,name=planar_vbat status=1i,value=3.04 1458488465013072508
+ipmi_sensor,unit=rpm,name=fan_1a_tach status=1i,value=2610 1458488465013137932
+ipmi_sensor,unit=rpm,name=fan_1b_tach status=1i,value=1775 1458488465013279896
 ```

From 86f19dee2bb9d4880ed595bbd397bfe774cfc4b2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Oct 2017 11:10:06 -0700
Subject: [PATCH 0648/1302] Fix typo in ipmi_sensor readme

---
 plugins/inputs/ipmi_sensor/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index 90abf393a..820af50a4 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -55,7 +55,7 @@ ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
 #### Permissions
 
 When gathering from the local system, Telegraf will need permission to the
-impi device node.  When using udev you can create the device node giving
+ipmi device node.  When using udev you can create the device node giving
 `rw` permissions to the `telegraf` user by adding the following rule to
 `/etc/udev/rules.d/52-telegraf-ipmi.rules`:
 

From 1f348037b77264424c65e8390f856180777507d5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 16 Oct 2017 11:26:16 -0700
Subject: [PATCH 0649/1302] Fix case sensitivity issue in sqlserver query
 (#3336)

---
 plugins/inputs/sqlserver/sqlserver.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 373e12f7c..cdf8ef4f2 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -245,10 +245,10 @@ UNION ALL
 SELECT 'Average pending disk IO', AveragePendingDiskIOCount = (SELECT AVG(pending_disk_io_count) FROM sys.dm_os_schedulers WITH (NOLOCK) WHERE scheduler_id < 255 )
 UNION ALL
 SELECT 'Buffer pool rate (bytes/sec)', BufferPoolRate = (1.0*cntr_value * 8 * 1024) /
-	(SELECT 1.0*cntr_value FROM sys.dm_os_performance_counters  WHERE object_name like '%Buffer Manager%' AND lower(counter_name) = 'Page life expectancy')
+	(SELECT 1.0*cntr_value FROM sys.dm_os_performance_counters  WHERE object_name like '%Buffer Manager%' AND counter_name = 'Page life expectancy')
 FROM sys.dm_os_performance_counters
 WHERE object_name like '%Buffer Manager%'
-AND counter_name = 'database pages'
+AND counter_name = 'Database pages'
 UNION ALL
 SELECT 'Memory grant pending', MemoryGrantPending = cntr_value
 FROM sys.dm_os_performance_counters

From 3ea41e885c59a14714ba0c1530fb6d6cb3a6574c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Oct 2017 11:27:00 -0700
Subject: [PATCH 0650/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efaeb4476..d74c507ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 
 - [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
 - [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
+- [#3329](https://github.com/influxdata/telegraf/issues/3329): Fix case sensitivity issue in sqlserver query.
 
 ## v1.4.2 [2017-10-10]
 

From 246ffab3e08ba48d764d28cc29a2104f0b63de3a Mon Sep 17 00:00:00 2001
From: Craig Wickesser <codecraig@gmail.com>
Date: Mon, 16 Oct 2017 17:18:36 -0400
Subject: [PATCH 0651/1302] Add UDP IPv6 support to statsd input (#3344)

---
 plugins/inputs/statsd/README.md |  2 +-
 plugins/inputs/statsd/statsd.go | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 69d77580d..9562b9362 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -5,7 +5,7 @@
 ```toml
 # Statsd Server
 [[inputs.statsd]]
-  ## Protocol, must be "tcp" or "udp" (default=udp)
+  ## Protocol, must be "tcp", "udp4", "udp6" or "udp" (default=udp)
   protocol = "udp"
 
   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index db412b549..93819cb09 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -171,7 +171,7 @@ func (_ *Statsd) Description() string {
 }
 
 const sampleConfig = `
-  ## Protocol, must be "tcp" or "udp" (default=udp)
+  ## Protocol, must be "tcp", "udp", "udp4" or "udp6" (default=udp)
   protocol = "udp"
 
   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
@@ -327,10 +327,9 @@ func (s *Statsd) Start(_ telegraf.Accumulator) error {
 
 	s.wg.Add(2)
 	// Start the UDP listener
-	switch s.Protocol {
-	case "udp":
+	if s.isUDP() {
 		go s.udpListen()
-	case "tcp":
+	} else {
 		go s.tcpListen()
 	}
 	// Start the line parser
@@ -382,8 +381,8 @@ func (s *Statsd) tcpListen() error {
 func (s *Statsd) udpListen() error {
 	defer s.wg.Done()
 	var err error
-	address, _ := net.ResolveUDPAddr("udp", s.ServiceAddress)
-	s.UDPlistener, err = net.ListenUDP("udp", address)
+	address, _ := net.ResolveUDPAddr(s.Protocol, s.ServiceAddress)
+	s.UDPlistener, err = net.ListenUDP(s.Protocol, address)
 	if err != nil {
 		log.Fatalf("ERROR: ListenUDP - %s", err)
 	}
@@ -825,10 +824,9 @@ func (s *Statsd) Stop() {
 	s.Lock()
 	log.Println("I! Stopping the statsd service")
 	close(s.done)
-	switch s.Protocol {
-	case "udp":
+	if s.isUDP() {
 		s.UDPlistener.Close()
-	case "tcp":
+	} else {
 		s.TCPlistener.Close()
 		// Close all open TCP connections
 		//  - get all conns from the s.conns map and put into slice
@@ -843,8 +841,6 @@ func (s *Statsd) Stop() {
 		for _, conn := range conns {
 			conn.Close()
 		}
-	default:
-		s.UDPlistener.Close()
 	}
 	s.Unlock()
 
@@ -856,6 +852,11 @@ func (s *Statsd) Stop() {
 	s.Unlock()
 }
 
+// IsUDP returns true if the protocol is UDP, false otherwise.
+func (s *Statsd) isUDP() bool {
+	return strings.HasPrefix(s.Protocol, "udp")
+}
+
 func init() {
 	inputs.Add("statsd", func() telegraf.Input {
 		return &Statsd{

From 4b05edea536ceabe871bae50e1ef4ead24b1a737 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Oct 2017 14:19:16 -0700
Subject: [PATCH 0652/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d74c507ec..a66808fc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [#3269](https://github.com/influxdata/telegraf/pull/3269): Add cluster health level configuration to elasticsearch input.
 - [#3304](https://github.com/influxdata/telegraf/pull/3304): Add ability to limit node stats in elasticsearch input.
 - [#2167](https://github.com/influxdata/telegraf/pull/2167): Add new basicstats aggregator.
+- [#3344](https://github.com/influxdata/telegraf/pull/3344): Add UDP IPv6 support to statsd input.
 
 ### Bugfixes
 

From f5a9d1bc75802493779f06eaf88bac69bbc9571c Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Mon, 16 Oct 2017 23:25:00 +0200
Subject: [PATCH 0653/1302] Fix CPU system plugin gets stuck after system
 suspend (#3342)

---
 CHANGELOG.md                      |  1 +
 plugins/inputs/system/cpu.go      |  5 ++-
 plugins/inputs/system/cpu_test.go | 69 +++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a66808fc4..cebe378fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
+- [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 
 ## v1.4.3 [unreleased]
 
diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/system/cpu.go
index 55378c93e..99fa451b3 100644
--- a/plugins/inputs/system/cpu.go
+++ b/plugins/inputs/system/cpu.go
@@ -96,7 +96,8 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		totalDelta := total - lastTotal
 
 		if totalDelta < 0 {
-			return fmt.Errorf("Error: current total CPU time is less than previous total CPU time")
+			err = fmt.Errorf("Error: current total CPU time is less than previous total CPU time")
+			break
 		}
 
 		if totalDelta == 0 {
@@ -126,7 +127,7 @@ func (s *CPUStats) Gather(acc telegraf.Accumulator) error {
 		s.lastStats[cts.CPU] = cts
 	}
 
-	return nil
+	return err
 }
 
 func totalCpuTime(t cpu.TimesStat) float64 {
diff --git a/plugins/inputs/system/cpu_test.go b/plugins/inputs/system/cpu_test.go
index fabff8a7d..773f8e7d1 100644
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/system/cpu_test.go
@@ -184,3 +184,72 @@ func TestCPUCountIncrease(t *testing.T) {
 	err = cs.Gather(&acc)
 	require.NoError(t, err)
 }
+
+// TestCPUTimesDecrease tests that telegraf continue to works after
+// CPU times decrease, which seems to occur when Linux system is suspended.
+func TestCPUTimesDecrease(t *testing.T) {
+	var mps MockPS
+	defer mps.AssertExpectations(t)
+	var acc testutil.Accumulator
+
+	cts := cpu.TimesStat{
+		CPU:    "cpu0",
+		User:   18,
+		Idle:   80,
+		Iowait: 2,
+	}
+
+	cts2 := cpu.TimesStat{
+		CPU:    "cpu0",
+		User:   38, // increased by 20
+		Idle:   40, // decreased by 40
+		Iowait: 1,  // decreased by 1
+	}
+
+	cts3 := cpu.TimesStat{
+		CPU:    "cpu0",
+		User:   56,  // increased by 18
+		Idle:   120, // increased by 80
+		Iowait: 3,   // increased by 2
+	}
+
+	mps.On("CPUTimes").Return([]cpu.TimesStat{cts}, nil)
+
+	cs := NewCPUStats(&mps)
+
+	cputags := map[string]string{
+		"cpu": "cpu0",
+	}
+
+	err := cs.Gather(&acc)
+	require.NoError(t, err)
+
+	// Computed values are checked with delta > 0 becasue of floating point arithmatic
+	// imprecision
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 18, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 80, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 2, 0, cputags)
+
+	mps2 := MockPS{}
+	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
+	cs.ps = &mps2
+
+	// CPU times decreased. An error should be raised
+	err = cs.Gather(&acc)
+	require.Error(t, err)
+
+	mps3 := MockPS{}
+	mps3.On("CPUTimes").Return([]cpu.TimesStat{cts3}, nil)
+	cs.ps = &mps3
+
+	err = cs.Gather(&acc)
+	require.NoError(t, err)
+
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 56, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 120, 0, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 3, 0, cputags)
+
+	assertContainsTaggedFloat(t, &acc, "cpu", "usage_user", 18, 0.0005, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "usage_idle", 80, 0.0005, cputags)
+	assertContainsTaggedFloat(t, &acc, "cpu", "usage_iowait", 2, 0.0005, cputags)
+}

From 9d8e935734a4ce1b2ae59ecb1748394754d6d5c3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Oct 2017 14:26:12 -0700
Subject: [PATCH 0654/1302] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cebe378fb..3c1524c64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,7 +50,6 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
-- [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 
 ## v1.4.3 [unreleased]
 
@@ -59,6 +58,7 @@
 - [#3327](https://github.com/influxdata/telegraf/issues/3327): Fix container name filters in docker input.
 - [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
 - [#3329](https://github.com/influxdata/telegraf/issues/3329): Fix case sensitivity issue in sqlserver query.
+- [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 
 ## v1.4.2 [2017-10-10]
 

From 2208657d73f8ca9b9c854ce8fdf598868bbfe1f6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Oct 2017 10:43:53 -0700
Subject: [PATCH 0655/1302] Add release date info to FAQ

---
 docs/FAQ.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index d756bb2f3..58396cbcd 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -20,3 +20,8 @@ If running as a service add the environment variable to `/etc/default/telegraf`:
 ```
 GODEBUG=netdns=cgo
 ```
+
+### Q: When will the next version be released?
+
+The latest release date estimate can be viewed on the
+[milestones](https://github.com/influxdata/telegraf/milestones) page.

From a75ab3e190234fbc7335d0bac0088f719b54d054 Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdriepalmer@gmail.com>
Date: Wed, 18 Oct 2017 15:24:30 -0400
Subject: [PATCH 0656/1302] Fix mongodb input panic when restarting mongodb
 (#3355)

---
 plugins/inputs/mongodb/mongostat.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index cb7710798..a2e270bbb 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -538,7 +538,7 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		returnVal.Command = diff(newStat.Opcounters.Command, oldStat.Opcounters.Command, sampleSecs)
 	}
 
-	if newStat.Metrics != nil && newStat.Metrics.TTL != nil && oldStat.Metrics.TTL != nil {
+	if newStat.Metrics != nil && newStat.Metrics.TTL != nil && oldStat.Metrics != nil && oldStat.Metrics.TTL != nil {
 		returnVal.Passes = diff(newStat.Metrics.TTL.Passes, oldStat.Metrics.TTL.Passes, sampleSecs)
 		returnVal.DeletedDocuments = diff(newStat.Metrics.TTL.DeletedDocuments, oldStat.Metrics.TTL.DeletedDocuments, sampleSecs)
 	}

From 7ba376964cb1e532dac0784dd091f89bf6b1031d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Oct 2017 12:25:46 -0700
Subject: [PATCH 0657/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c1524c64..0530aa679 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - [#3321](https://github.com/influxdata/telegraf/issues/3321): Fix snmpwalk address format in leofs input.
 - [#3329](https://github.com/influxdata/telegraf/issues/3329): Fix case sensitivity issue in sqlserver query.
 - [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
+- [#3013](https://github.com/influxdata/telegraf/issues/3013): Fix mongodb input panic when restarting mongodb.
 
 ## v1.4.2 [2017-10-10]
 

From a4fa19252f2a6345b45380fbc59ce9a463d74cc8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Oct 2017 12:47:58 -0700
Subject: [PATCH 0658/1302] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0530aa679..dcd1b7a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,6 @@
 - [#3191](https://github.com/influxdata/telegraf/pull/3191): TLS and MTLS enhancements to HTTPListener input plugin.
 - [#3213](https://github.com/influxdata/telegraf/pull/3213): Add polling method to logparser and tail inputs.
 - [#3211](https://github.com/influxdata/telegraf/pull/3211): Add timeout option for kubernetes input.
-- [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3234](https://github.com/influxdata/telegraf/pull/3234): Add support for timing sums in statsd input.
 - [#2617](https://github.com/influxdata/telegraf/issues/2617): Add resource limit monitoring to procstat.
 - [#3236](https://github.com/influxdata/telegraf/pull/3236): Add support for k8s service DNS discovery to prometheus input.
@@ -60,6 +59,7 @@
 - [#3329](https://github.com/influxdata/telegraf/issues/3329): Fix case sensitivity issue in sqlserver query.
 - [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 - [#3013](https://github.com/influxdata/telegraf/issues/3013): Fix mongodb input panic when restarting mongodb.
+- [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 
 ## v1.4.2 [2017-10-10]
 

From 02baa696c3775529369c44f6209f824799dbcc71 Mon Sep 17 00:00:00 2001
From: clheikes <24684947+clheikes@users.noreply.github.com>
Date: Wed, 18 Oct 2017 15:57:32 -0500
Subject: [PATCH 0659/1302] Fix TELEGRAF_OPTS expansion in systemd service unit
 (#3354)

---
 scripts/telegraf.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/telegraf.service b/scripts/telegraf.service
index cbbdc872d..ff9860d5c 100644
--- a/scripts/telegraf.service
+++ b/scripts/telegraf.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 EnvironmentFile=-/etc/default/telegraf
 User=telegraf
-ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS}
+ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d $TELEGRAF_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartForceExitStatus=SIGPIPE

From 9b59cdd10e05ecb6d404674398c311bb4a5006a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Oct 2017 13:57:58 -0700
Subject: [PATCH 0660/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcd1b7a8f..8e0350fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - [#3342](https://github.com/influxdata/telegraf/pull/3342): Fix CPU input plugin stuck after suspend on Linux.
 - [#3013](https://github.com/influxdata/telegraf/issues/3013): Fix mongodb input panic when restarting mongodb.
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
+- [#3354](https://github.com/influxdata/telegraf/pull/3354): Fix TELEGRAF_OPTS expansion in systemd service unit.
 
 ## v1.4.2 [2017-10-10]
 

From 6e5915c59f17c31ae63797dcc4e0bc609b10cd1f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Oct 2017 14:51:08 -0700
Subject: [PATCH 0661/1302] Fix prometheus passthrough for existing value types
 (#3351)

---
 plugins/inputs/prometheus/parser.go           | 13 +++-
 plugins/inputs/prometheus/prometheus.go       | 10 ++-
 .../prometheus_client/prometheus_client.go    | 42 ++++++++--
 .../prometheus_client_test.go                 | 76 +++++++++++++++----
 4 files changed, 120 insertions(+), 21 deletions(-)

diff --git a/plugins/inputs/prometheus/parser.go b/plugins/inputs/prometheus/parser.go
index ac5c608f6..0807d7e7a 100644
--- a/plugins/inputs/prometheus/parser.go
+++ b/plugins/inputs/prometheus/parser.go
@@ -86,7 +86,7 @@ func Parse(buf []byte, header http.Header) ([]telegraf.Metric, error) {
 				} else {
 					t = time.Now()
 				}
-				metric, err := metric.New(metricName, tags, fields, t)
+				metric, err := metric.New(metricName, tags, fields, t, valueType(mf.GetType()))
 				if err == nil {
 					metrics = append(metrics, metric)
 				}
@@ -97,6 +97,17 @@ func Parse(buf []byte, header http.Header) ([]telegraf.Metric, error) {
 	return metrics, err
 }
 
+func valueType(mt dto.MetricType) telegraf.ValueType {
+	switch mt {
+	case dto.MetricType_COUNTER:
+		return telegraf.Counter
+	case dto.MetricType_GAUGE:
+		return telegraf.Gauge
+	default:
+		return telegraf.Untyped
+	}
+}
+
 // Get Quantiles from summary metric
 func makeQuantiles(m *dto.Metric) map[string]interface{} {
 	fields := make(map[string]interface{})
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 7c3943bd0..5445a12a3 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -218,7 +218,15 @@ func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) erro
 		if url.Address != "" {
 			tags["address"] = url.Address
 		}
-		acc.AddFields(metric.Name(), metric.Fields(), tags, metric.Time())
+
+		switch metric.Type() {
+		case telegraf.Counter:
+			acc.AddCounter(metric.Name(), metric.Fields(), tags, metric.Time())
+		case telegraf.Gauge:
+			acc.AddGauge(metric.Name(), metric.Fields(), tags, metric.Time())
+		default:
+			acc.AddFields(metric.Name(), metric.Fields(), tags, metric.Time())
+		}
 	}
 
 	return nil
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 92addf9c0..48b625513 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"sort"
 	"strings"
@@ -15,6 +16,7 @@ import (
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
@@ -46,6 +48,7 @@ type PrometheusClient struct {
 	Listen             string
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
 	Path               string            `toml:"path"`
+	CollectorsExclude  []string          `toml:"collectors_exclude"`
 
 	server *http.Server
 
@@ -62,11 +65,26 @@ var sampleConfig = `
 
   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
   # expiration_interval = "60s"
+
+  ## Collectors to enable, valid entries are "gocollector" and "process".
+  ## If unset, both are enabled.
+  collectors_exclude = ["gocollector", "process"]
 `
 
 func (p *PrometheusClient) Start() error {
 	prometheus.Register(p)
 
+	for _, collector := range p.CollectorsExclude {
+		switch collector {
+		case "gocollector":
+			prometheus.Unregister(prometheus.NewGoCollector())
+		case "process":
+			prometheus.Unregister(prometheus.NewProcessCollector(os.Getpid(), ""))
+		default:
+			return fmt.Errorf("unrecognized collector %s", collector)
+		}
+	}
+
 	if p.Listen == "" {
 		p.Listen = "localhost:9273"
 	}
@@ -76,7 +94,9 @@ func (p *PrometheusClient) Start() error {
 	}
 
 	mux := http.NewServeMux()
-	mux.Handle(p.Path, prometheus.Handler())
+	mux.Handle(p.Path, promhttp.HandlerFor(
+		prometheus.DefaultGatherer,
+		promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
 
 	p.server = &http.Server{
 		Addr:    p.Listen,
@@ -243,10 +263,22 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 			// Special handling of value field; supports passthrough from
 			// the prometheus input.
 			var mname string
-			if fn == "value" {
-				mname = sanitize(point.Name())
-			} else {
-				mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
+			switch point.Type() {
+			case telegraf.Counter:
+				if fn == "counter" {
+					mname = sanitize(point.Name())
+				}
+			case telegraf.Gauge:
+				if fn == "gauge" {
+					mname = sanitize(point.Name())
+				}
+			}
+			if mname == "" {
+				if fn == "value" {
+					mname = sanitize(point.Name())
+				} else {
+					mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
+				}
 			}
 
 			var fam *MetricFamily
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 767f9a878..a997c0401 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -107,21 +107,69 @@ func TestWrite_SkipNonNumberField(t *testing.T) {
 	require.False(t, ok)
 }
 
-func TestWrite_Counter(t *testing.T) {
-	client := NewClient()
+func TestWrite_Counters(t *testing.T) {
+	type args struct {
+		measurement string
+		tags        map[string]string
+		fields      map[string]interface{}
+		valueType   telegraf.ValueType
+	}
+	var tests = []struct {
+		name       string
+		args       args
+		err        error
+		metricName string
+		promType   prometheus.ValueType
+	}{
+		{
+			name: "field named value is not added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"value": 42},
+				valueType:   telegraf.Counter,
+			},
+			metricName: "foo",
+			promType:   prometheus.CounterValue,
+		},
+		{
+			name: "field named counter is not added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"counter": 42},
+				valueType:   telegraf.Counter,
+			},
+			metricName: "foo",
+			promType:   prometheus.CounterValue,
+		},
+		{
+			name: "field with any other name is added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"other": 42},
+				valueType:   telegraf.Counter,
+			},
+			metricName: "foo_other",
+			promType:   prometheus.CounterValue,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(
+				tt.args.measurement,
+				tt.args.tags,
+				tt.args.fields,
+				time.Now(),
+				tt.args.valueType,
+			)
+			client := NewClient()
+			err = client.Write([]telegraf.Metric{m})
+			require.Equal(t, tt.err, err)
 
-	p1, err := metric.New(
-		"foo",
-		make(map[string]string),
-		map[string]interface{}{"value": 42},
-		time.Now(),
-		telegraf.Counter)
-	err = client.Write([]telegraf.Metric{p1})
-	require.NoError(t, err)
-
-	fam, ok := client.fam["foo"]
-	require.True(t, ok)
-	require.Equal(t, prometheus.CounterValue, fam.ValueType)
+			fam, ok := client.fam[tt.metricName]
+			require.True(t, ok)
+			require.Equal(t, tt.promType, fam.ValueType)
+		})
+	}
 }
 
 func TestWrite_Sanitize(t *testing.T) {

From adb1f5588c13b94464339b43cb61f080e287c525 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Oct 2017 14:53:34 -0700
Subject: [PATCH 0662/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e0350fb1..6667bcaf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - [#3136](https://github.com/influxdata/telegraf/issues/3136): Fix webhooks input address in use during reload.
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
+- [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 
 ## v1.4.3 [unreleased]
 

From ec4efe5b035d7123e977b721c3022e23350496f6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Oct 2017 17:42:30 -0700
Subject: [PATCH 0663/1302] Use labels in prometheus output for string fields
 (#3350)

---
 .../prometheus_client/prometheus_client.go    |  9 ++++++
 .../prometheus_client_test.go                 | 28 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 48b625513..d7702a062 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -242,6 +242,15 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 			labels[sanitize(k)] = v
 		}
 
+		// Prometheus doesn't have a string value type, so convert string
+		// fields to labels.
+		for fn, fv := range point.Fields() {
+			switch fv := fv.(type) {
+			case string:
+				labels[sanitize(fn)] = fv
+			}
+		}
+
 		for fn, fv := range point.Fields() {
 			// Ignore string and bool fields.
 			var value float64
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index a997c0401..1bb1cc83a 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -324,6 +324,34 @@ func TestWrite_Tags(t *testing.T) {
 	require.True(t, now.Before(sample2.Expiration))
 }
 
+func TestWrite_StringFields(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0, "status": "good"},
+		now,
+		telegraf.Counter)
+	p2, err := metric.New(
+		"bar",
+		make(map[string]string),
+		map[string]interface{}{"status": "needs numeric field"},
+		now,
+		telegraf.Gauge)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := NewClient()
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 1, fam.LabelSet["status"])
+
+	fam, ok = client.fam["bar"]
+	require.False(t, ok)
+}
+
 func TestExpire(t *testing.T) {
 	client := NewClient()
 

From 0e6a70b1997a848abcd3ed604a8ce0e275465398 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Oct 2017 17:43:01 -0700
Subject: [PATCH 0664/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6667bcaf1..25cc8d14c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [#3304](https://github.com/influxdata/telegraf/pull/3304): Add ability to limit node stats in elasticsearch input.
 - [#2167](https://github.com/influxdata/telegraf/pull/2167): Add new basicstats aggregator.
 - [#3344](https://github.com/influxdata/telegraf/pull/3344): Add UDP IPv6 support to statsd input.
+- [#3350](https://github.com/influxdata/telegraf/pull/3350): Use labels in prometheus output for string fields.
 
 ### Bugfixes
 

From 3bbc2beeeda21c0ea4ba5a3fbe8f8a4b2ee84d88 Mon Sep 17 00:00:00 2001
From: Mamat Rahmat <coderbodoh@gmail.com>
Date: Fri, 20 Oct 2017 04:47:40 +0700
Subject: [PATCH 0665/1302] Fix small typo in documentation (#3364)

---
 docs/WINDOWS_SERVICE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/WINDOWS_SERVICE.md b/docs/WINDOWS_SERVICE.md
index c50a10785..2b4d4f0e2 100644
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -38,7 +38,7 @@ Telegraf can manage its own service through the --service flag:
 | `telegraf.exe --service stop`      | Stop the telegraf service     |
 
 
-Trobleshooting  common error #1067
+Troubleshooting  common error #1067
 
 When installing as service in Windows, always double check to specify full path of the config file, otherwise windows service will fail to start
 

From 424340343248db788dbeb969407d27c8e3072d7d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 19 Oct 2017 16:25:58 -0700
Subject: [PATCH 0666/1302] Remove warning when JSON contains null value
 (#3359)

---
 plugins/parsers/json/parser.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index 50b3d3682..ecf9996af 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -159,8 +159,6 @@ func (f *JSONFlattener) FullFlattenJSON(
 			return nil
 		}
 	case nil:
-		// ignored types
-		fmt.Println("json parser ignoring " + fieldname)
 		return nil
 	default:
 		return fmt.Errorf("JSON Flattener: got unexpected type %T with value %v (%s)",

From 7088d98304455a9ee7b772c3216ec14c12326e04 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 19 Oct 2017 16:27:29 -0700
Subject: [PATCH 0667/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25cc8d14c..34c2241f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - [#3013](https://github.com/influxdata/telegraf/issues/3013): Fix mongodb input panic when restarting mongodb.
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3354](https://github.com/influxdata/telegraf/pull/3354): Fix TELEGRAF_OPTS expansion in systemd service unit.
+- [#3357](https://github.com/influxdata/telegraf/issues/3357): Remove warning when JSON contains null value.
 
 ## v1.4.2 [2017-10-10]
 

From 4deb6238a376e76296d8ef354524eaa93d685632 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 19 Oct 2017 16:36:32 -0700
Subject: [PATCH 0668/1302] Add support for decimal timestamps to ts-epoch
 modifier (#3358)

---
 plugins/inputs/logparser/README.md         | 15 ++++-
 plugins/inputs/logparser/grok/grok.go      | 28 +++++++--
 plugins/inputs/logparser/grok/grok_test.go | 71 ++++++++++++++++++++++
 3 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index f823cfe68..2febb8194 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -100,7 +100,7 @@ current time.
   - ts-rfc3339       ("2006-01-02T15:04:05Z07:00")
   - ts-rfc3339nano   ("2006-01-02T15:04:05.999999999Z07:00")
   - ts-httpd         ("02/Jan/2006:15:04:05 -0700")
-  - ts-epoch         (seconds since unix epoch)
+  - ts-epoch         (seconds since unix epoch, may contain decimal)
   - ts-epochnano     (nanoseconds since unix epoch)
   - ts-"CUSTOM"
 
@@ -130,6 +130,19 @@ This example input and config parses a file using a custom timestamp conversion:
     patterns = ['%{TIMESTAMP_ISO8601:timestamp:ts-"2006-01-02 15:04:05"} value=%{NUMBER:value:int}']
 ```
 
+This example input and config parses a file using a timestamp in unix time:
+
+```
+1466004605 value=42
+1466004605.123456789 value=42
+```
+
+```toml
+[[inputs.logparser]]
+  [inputs.logparser.grok]
+    patterns = ['%{NUMBER:timestamp:ts-epoch} value=%{NUMBER:value:int}']
+```
+
 This example parses a file using a built-in conversion and a custom pattern:
 
 ```
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 0be18b54c..491a13748 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -253,12 +253,30 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		case STRING:
 			fields[k] = strings.Trim(v, `"`)
 		case EPOCH:
-			iv, err := strconv.ParseInt(v, 10, 64)
-			if err != nil {
-				log.Printf("E! Error parsing %s to int: %s", v, err)
-			} else {
-				timestamp = time.Unix(iv, 0)
+			parts := strings.SplitN(v, ".", 2)
+			if len(parts) == 0 {
+				log.Printf("E! Error parsing %s to timestamp: %s", v, err)
+				break
 			}
+
+			sec, err := strconv.ParseInt(parts[0], 10, 64)
+			if err != nil {
+				log.Printf("E! Error parsing %s to timestamp: %s", v, err)
+				break
+			}
+			ts := time.Unix(sec, 0)
+
+			if len(parts) == 2 {
+				padded := fmt.Sprintf("%-9s", parts[1])
+				nsString := strings.Replace(padded[:9], " ", "0", -1)
+				nanosec, err := strconv.ParseInt(nsString, 10, 64)
+				if err != nil {
+					log.Printf("E! Error parsing %s to timestamp: %s", v, err)
+					break
+				}
+				ts = ts.Add(time.Duration(nanosec) * time.Nanosecond)
+			}
+			timestamp = ts
 		case EPOCH_NANO:
 			iv, err := strconv.ParseInt(v, 10, 64)
 			if err != nil {
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 6d07b6eca..480502d6c 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -385,6 +385,77 @@ func TestParseEpoch(t *testing.T) {
 	assert.Equal(t, time.Unix(1466004605, 0), metricA.Time())
 }
 
+func TestParseEpochDecimal(t *testing.T) {
+	var tests = []struct {
+		name    string
+		line    string
+		noMatch bool
+		err     error
+		tags    map[string]string
+		fields  map[string]interface{}
+		time    time.Time
+	}{
+		{
+			name: "ns precision",
+			line: "1466004605.359052000 value=42",
+			tags: map[string]string{},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			time: time.Unix(0, 1466004605359052000),
+		},
+		{
+			name: "ms precision",
+			line: "1466004605.359 value=42",
+			tags: map[string]string{},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			time: time.Unix(0, 1466004605359000000),
+		},
+		{
+			name: "second precision",
+			line: "1466004605 value=42",
+			tags: map[string]string{},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			time: time.Unix(0, 1466004605000000000),
+		},
+		{
+			name: "sub ns precision",
+			line: "1466004605.123456789123 value=42",
+			tags: map[string]string{},
+			fields: map[string]interface{}{
+				"value": int64(42),
+			},
+			time: time.Unix(0, 1466004605123456789),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			parser := &Parser{
+				Patterns: []string{"%{NUMBER:ts:ts-epoch} value=%{NUMBER:value:int}"},
+			}
+			assert.NoError(t, parser.Compile())
+			m, err := parser.ParseLine(tt.line)
+
+			if tt.noMatch {
+				require.Nil(t, m)
+				require.Nil(t, err)
+				return
+			}
+
+			require.Equal(t, tt.err, err)
+
+			require.NotNil(t, m)
+			require.Equal(t, tt.tags, m.Tags())
+			require.Equal(t, tt.fields, m.Fields())
+			require.Equal(t, tt.time, m.Time())
+		})
+	}
+}
+
 func TestParseEpochErrors(t *testing.T) {
 	p := &Parser{
 		Patterns: []string{"%{MYAPP}"},

From 77cc071796afd41fd14601c74f71f448dd7b0c07 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 19 Oct 2017 17:06:14 -0700
Subject: [PATCH 0669/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34c2241f1..37b1938e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [#2167](https://github.com/influxdata/telegraf/pull/2167): Add new basicstats aggregator.
 - [#3344](https://github.com/influxdata/telegraf/pull/3344): Add UDP IPv6 support to statsd input.
 - [#3350](https://github.com/influxdata/telegraf/pull/3350): Use labels in prometheus output for string fields.
+- [#3358](https://github.com/influxdata/telegraf/pull/3358): Add support for decimal timestamps to ts-epoch modifier.
 
 ### Bugfixes
 

From d2f9fc7d8cf8618fcc4aa6d01b1cb13e5499bade Mon Sep 17 00:00:00 2001
From: Sergei Smolianinov <smolse@tutanota.de>
Date: Mon, 23 Oct 2017 22:31:27 +0300
Subject: [PATCH 0670/1302] Fix ACL token usage in consul input plugin (#3376)

---
 plugins/inputs/consul/consul.go      | 4 ++++
 plugins/inputs/consul/consul_test.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index 0eaa25604..45612a928 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -69,6 +69,10 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
 		config.Datacenter = c.Datacentre
 	}
 
+	if c.Token != "" {
+		config.Token = c.Token
+	}
+
 	if c.Username != "" {
 		config.HttpAuth = &api.HttpBasicAuth{
 			Username: c.Username,
diff --git a/plugins/inputs/consul/consul_test.go b/plugins/inputs/consul/consul_test.go
index d0595508d..bbb43d066 100644
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -20,7 +20,7 @@ var sampleChecks = []*api.HealthCheck{
 	},
 }
 
-func TestGatherHealtCheck(t *testing.T) {
+func TestGatherHealthCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
 		"check_name": "foo.health",
 		"status":     "passing",

From 65580759fc48f8074f2a827337f31637f5738016 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 23 Oct 2017 12:36:31 -0700
Subject: [PATCH 0671/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37b1938e3..bca294cac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
 - [#3224](https://github.com/influxdata/telegraf/pull/3224): Preserve url path prefix in influx output.
 - [#3354](https://github.com/influxdata/telegraf/pull/3354): Fix TELEGRAF_OPTS expansion in systemd service unit.
 - [#3357](https://github.com/influxdata/telegraf/issues/3357): Remove warning when JSON contains null value.
+- [#3375](https://github.com/influxdata/telegraf/issues/3375): Fix ACL token usage in consul input plugin.
 
 ## v1.4.2 [2017-10-10]
 

From 6d1777276c449da76cec83b927998043f1523f8f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 24 Oct 2017 15:36:23 -0700
Subject: [PATCH 0672/1302] If the connector name cannot be unquoted, use the
 raw value (#3371)

---
 plugins/inputs/tomcat/tomcat.go      |  2 +-
 plugins/inputs/tomcat/tomcat_test.go | 66 ++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/tomcat/tomcat.go b/plugins/inputs/tomcat/tomcat.go
index b9dcc731d..dd3c03ce3 100644
--- a/plugins/inputs/tomcat/tomcat.go
+++ b/plugins/inputs/tomcat/tomcat.go
@@ -165,7 +165,7 @@ func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
 	for _, c := range status.TomcatConnectors {
 		name, err := strconv.Unquote(c.Name)
 		if err != nil {
-			return fmt.Errorf("Unable to unquote name '%s': %s", c.Name, err)
+			name = c.Name
 		}
 
 		tccTags := map[string]string{
diff --git a/plugins/inputs/tomcat/tomcat_test.go b/plugins/inputs/tomcat/tomcat_test.go
index 8bdddd6d0..5e206ab83 100644
--- a/plugins/inputs/tomcat/tomcat_test.go
+++ b/plugins/inputs/tomcat/tomcat_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var tomcatStatus = `<?xml version="1.0" encoding="UTF-8"?>
+var tomcatStatus8 = `<?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/manager/xform.xsl" ?>
 <status>
   <jvm>
@@ -37,10 +37,10 @@ var tomcatStatus = `<?xml version="1.0" encoding="UTF-8"?>
   </connector>
 </status>`
 
-func TestHTTPTomcat(t *testing.T) {
+func TestHTTPTomcat8(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintln(w, tomcatStatus)
+		fmt.Fprintln(w, tomcatStatus8)
 	}))
 	defer ts.Close()
 
@@ -91,5 +91,63 @@ func TestHTTPTomcat(t *testing.T) {
 		"name": "http-apr-8080",
 	}
 	acc.AssertContainsTaggedFields(t, "tomcat_connector", connectorFields, connectorTags)
-
+}
+
+var tomcatStatus6 = `<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="xform.xsl" ?>
+<status>
+  <jvm>
+    <memory free="1942681600" total="2040070144" max="2040070144"/>
+  </jvm>
+  <connector name="http-8080">
+    <threadInfo maxThreads="150" currentThreadCount="2" currentThreadsBusy="2"/>
+    <requestInfo maxTime="1005" processingTime="2465" requestCount="436" errorCount="16" bytesReceived="0" bytesSent="550196"/>
+    <workers>
+      <worker stage="K" requestProcessingTime="526" requestBytesSent="0" requestBytesReceived="0" remoteAddr="127.0.0.1" virtualHost="?" method="?" currentUri="?" currentQueryString="?" protocol="?"/>
+      <worker stage="S" requestProcessingTime="1" requestBytesSent="0" requestBytesReceived="0" remoteAddr="127.0.0.1" virtualHost="127.0.0.1" method="GET" currentUri="/manager/status/all" currentQueryString="XML=true" protocol="HTTP/1.1"/>
+    </workers>
+  </connector>
+</status>`
+
+func TestHTTPTomcat6(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprintln(w, tomcatStatus6)
+	}))
+	defer ts.Close()
+
+	tc := Tomcat{
+		URL:      ts.URL,
+		Username: "tomcat",
+		Password: "s3cret",
+	}
+
+	var acc testutil.Accumulator
+	err := tc.Gather(&acc)
+	require.NoError(t, err)
+
+	// tomcat_jvm_memory
+	jvmMemoryFields := map[string]interface{}{
+		"free":  int64(1942681600),
+		"total": int64(2040070144),
+		"max":   int64(2040070144),
+	}
+	acc.AssertContainsFields(t, "tomcat_jvm_memory", jvmMemoryFields)
+
+	// tomcat_connector
+	connectorFields := map[string]interface{}{
+		"bytes_received":       int64(0),
+		"bytes_sent":           int64(550196),
+		"current_thread_count": int64(2),
+		"current_threads_busy": int64(2),
+		"error_count":          int(16),
+		"max_threads":          int64(150),
+		"max_time":             int(1005),
+		"processing_time":      int(2465),
+		"request_count":        int(436),
+	}
+	connectorTags := map[string]string{
+		"name": "http-8080",
+	}
+	acc.AssertContainsTaggedFields(t, "tomcat_connector", connectorFields, connectorTags)
 }

From f64cf89db10ffa3c3562b9a2d46263357209b032 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Oct 2017 15:46:47 -0700
Subject: [PATCH 0673/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca294cac..f1461363b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - [#3354](https://github.com/influxdata/telegraf/pull/3354): Fix TELEGRAF_OPTS expansion in systemd service unit.
 - [#3357](https://github.com/influxdata/telegraf/issues/3357): Remove warning when JSON contains null value.
 - [#3375](https://github.com/influxdata/telegraf/issues/3375): Fix ACL token usage in consul input plugin.
+- [#3369](https://github.com/influxdata/telegraf/issues/3369): Fix unquoting error with Tomcat 6.
 
 ## v1.4.2 [2017-10-10]
 

From 9a062498e73cfff6cb8b1e826832b6cf2990d1da Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 24 Oct 2017 16:22:31 -0700
Subject: [PATCH 0674/1302] Use golang.org/x/sys/unix instead of syscall in
 diskio (#3384)

---
 plugins/inputs/system/disk.go       | 23 +++++++++---------
 plugins/inputs/system/disk_linux.go | 36 +++++++++++++++--------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index ddacbab46..3cc99de05 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"fmt"
+	"log"
 	"regexp"
 	"strings"
 
@@ -166,14 +167,13 @@ func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
 var varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`)
 
 func (s *DiskIOStats) diskName(devName string) string {
-	di, err := s.diskInfo(devName)
-	if err != nil {
-		// discard error :-(
-		// We can't return error because it's non-fatal to the Gather().
-		// And we have no logger, so we can't log it.
+	if len(s.NameTemplates) == 0 {
 		return devName
 	}
-	if di == nil {
+
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		log.Printf("W! Error gathering disk info: %s", err)
 		return devName
 	}
 
@@ -200,14 +200,13 @@ func (s *DiskIOStats) diskName(devName string) string {
 }
 
 func (s *DiskIOStats) diskTags(devName string) map[string]string {
-	di, err := s.diskInfo(devName)
-	if err != nil {
-		// discard error :-(
-		// We can't return error because it's non-fatal to the Gather().
-		// And we have no logger, so we can't log it.
+	if len(s.DeviceTags) == 0 {
 		return nil
 	}
-	if di == nil {
+
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		log.Printf("W! Error gathering disk info: %s", err)
 		return nil
 	}
 
diff --git a/plugins/inputs/system/disk_linux.go b/plugins/inputs/system/disk_linux.go
index e5a0cff55..d3fd691c4 100644
--- a/plugins/inputs/system/disk_linux.go
+++ b/plugins/inputs/system/disk_linux.go
@@ -5,25 +5,26 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 type diskInfoCache struct {
-	stat   syscall.Stat_t
-	values map[string]string
+	udevDataPath string
+	values       map[string]string
 }
 
 var udevPath = "/run/udev/data"
 
 func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
-	fi, err := os.Stat("/dev/" + devName)
+	var err error
+	var stat unix.Stat_t
+
+	path := "/dev/" + devName
+	err = unix.Stat(path, &stat)
 	if err != nil {
 		return nil, err
 	}
-	stat, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return nil, nil
-	}
 
 	if s.infoCache == nil {
 		s.infoCache = map[string]diskInfoCache{}
@@ -31,25 +32,26 @@ func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
 	ic, ok := s.infoCache[devName]
 	if ok {
 		return ic.values, nil
-	} else {
-		ic = diskInfoCache{
-			stat:   *stat,
-			values: map[string]string{},
-		}
-		s.infoCache[devName] = ic
 	}
-	di := ic.values
 
 	major := stat.Rdev >> 8 & 0xff
 	minor := stat.Rdev & 0xff
+	udevDataPath := fmt.Sprintf("%s/b%d:%d", udevPath, major, minor)
 
-	f, err := os.Open(fmt.Sprintf("%s/b%d:%d", udevPath, major, minor))
+	di := map[string]string{}
+
+	s.infoCache[devName] = diskInfoCache{
+		udevDataPath: udevDataPath,
+		values:       di,
+	}
+
+	f, err := os.Open(udevDataPath)
 	if err != nil {
 		return nil, err
 	}
 	defer f.Close()
-	scnr := bufio.NewScanner(f)
 
+	scnr := bufio.NewScanner(f)
 	for scnr.Scan() {
 		l := scnr.Text()
 		if len(l) < 4 || l[:2] != "E:" {

From 13c1f1524ad5d26e1041b19a4b85e7089eae309d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Oct 2017 16:25:49 -0700
Subject: [PATCH 0675/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1461363b..5796ea8f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - [#3357](https://github.com/influxdata/telegraf/issues/3357): Remove warning when JSON contains null value.
 - [#3375](https://github.com/influxdata/telegraf/issues/3375): Fix ACL token usage in consul input plugin.
 - [#3369](https://github.com/influxdata/telegraf/issues/3369): Fix unquoting error with Tomcat 6.
+- [#3373](https://github.com/influxdata/telegraf/issues/3373): Fix syscall panic in diskio on some Linux systems.
 
 ## v1.4.2 [2017-10-10]
 

From a6797a44d53c469f97182a25ee346fd83b6a0498 Mon Sep 17 00:00:00 2001
From: Jeremy Doupe <jeremy@doupe.com>
Date: Tue, 24 Oct 2017 18:28:52 -0500
Subject: [PATCH 0676/1302] Add history and summary types to telegraf and
 prometheus plugins (#3337)

---
 accumulator.go                                |  12 +
 agent/accumulator.go                          |  22 ++
 metric.go                                     |   2 +
 plugins/inputs/prometheus/parser.go           |   8 +-
 plugins/inputs/prometheus/prometheus.go       |   4 +
 .../prometheus_client/prometheus_client.go    | 232 ++++++++++++------
 .../prometheus_client_test.go                 | 120 ++++++++-
 testutil/accumulator.go                       |  18 ++
 8 files changed, 334 insertions(+), 84 deletions(-)

diff --git a/accumulator.go b/accumulator.go
index 13fd6e571..370f0c70c 100644
--- a/accumulator.go
+++ b/accumulator.go
@@ -28,6 +28,18 @@ type Accumulator interface {
 		tags map[string]string,
 		t ...time.Time)
 
+	// AddSummary is the same as AddFields, but will add the metric as a "Summary" type
+	AddSummary(measurement string,
+		fields map[string]interface{},
+		tags map[string]string,
+		t ...time.Time)
+
+	// AddHistogram is the same as AddFields, but will add the metric as a "Histogram" type
+	AddHistogram(measurement string,
+		fields map[string]interface{},
+		tags map[string]string,
+		t ...time.Time)
+
 	SetPrecision(precision, interval time.Duration)
 
 	AddError(err error)
diff --git a/agent/accumulator.go b/agent/accumulator.go
index 1f9e2270d..1fa9b13ee 100644
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -76,6 +76,28 @@ func (ac *accumulator) AddCounter(
 	}
 }
 
+func (ac *accumulator) AddSummary(
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+	t ...time.Time,
+) {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Summary, ac.getTime(t)); m != nil {
+		ac.metrics <- m
+	}
+}
+
+func (ac *accumulator) AddHistogram(
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+	t ...time.Time,
+) {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Histogram, ac.getTime(t)); m != nil {
+		ac.metrics <- m
+	}
+}
+
 // AddError passes a runtime error to the accumulator.
 // The error will be tagged with the plugin name and written to the log.
 func (ac *accumulator) AddError(err error) {
diff --git a/metric.go b/metric.go
index fc479b51d..3fb531358 100644
--- a/metric.go
+++ b/metric.go
@@ -13,6 +13,8 @@ const (
 	Counter
 	Gauge
 	Untyped
+	Summary
+	Histogram
 )
 
 type Metric interface {
diff --git a/plugins/inputs/prometheus/parser.go b/plugins/inputs/prometheus/parser.go
index 0807d7e7a..6584fbc05 100644
--- a/plugins/inputs/prometheus/parser.go
+++ b/plugins/inputs/prometheus/parser.go
@@ -103,6 +103,10 @@ func valueType(mt dto.MetricType) telegraf.ValueType {
 		return telegraf.Counter
 	case dto.MetricType_GAUGE:
 		return telegraf.Gauge
+	case dto.MetricType_SUMMARY:
+		return telegraf.Summary
+	case dto.MetricType_HISTOGRAM:
+		return telegraf.Histogram
 	default:
 		return telegraf.Untyped
 	}
@@ -145,11 +149,11 @@ func getNameAndValue(m *dto.Metric) map[string]interface{} {
 			fields["gauge"] = float64(m.GetGauge().GetValue())
 		}
 	} else if m.Counter != nil {
-		if !math.IsNaN(m.GetGauge().GetValue()) {
+		if !math.IsNaN(m.GetCounter().GetValue()) {
 			fields["counter"] = float64(m.GetCounter().GetValue())
 		}
 	} else if m.Untyped != nil {
-		if !math.IsNaN(m.GetGauge().GetValue()) {
+		if !math.IsNaN(m.GetUntyped().GetValue()) {
 			fields["value"] = float64(m.GetUntyped().GetValue())
 		}
 	}
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 5445a12a3..c929a5b26 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -224,6 +224,10 @@ func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) erro
 			acc.AddCounter(metric.Name(), metric.Fields(), tags, metric.Time())
 		case telegraf.Gauge:
 			acc.AddGauge(metric.Name(), metric.Fields(), tags, metric.Time())
+		case telegraf.Summary:
+			acc.AddSummary(metric.Name(), metric.Fields(), tags, metric.Time())
+		case telegraf.Histogram:
+			acc.AddHistogram(metric.Name(), metric.Fields(), tags, metric.Time())
 		default:
 			acc.AddFields(metric.Name(), metric.Fields(), tags, metric.Time())
 		}
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index d7702a062..f0b0a7673 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -28,8 +29,13 @@ type SampleID string
 type Sample struct {
 	// Labels are the Prometheus labels.
 	Labels map[string]string
-	// Value is the value in the Prometheus output.
-	Value float64
+	// Value is the value in the Prometheus output. Only one of these will populated.
+	Value          float64
+	HistogramValue map[float64]uint64
+	SummaryValue   map[float64]float64
+	// Histograms and Summaries need a count and a sum
+	Count uint64
+	Sum   float64
 	// Expiration is the deadline that this Sample is valid until.
 	Expiration time.Time
 }
@@ -38,8 +44,9 @@ type Sample struct {
 type MetricFamily struct {
 	// Samples are the Sample belonging to this MetricFamily.
 	Samples map[SampleID]*Sample
-	// Type of the Value.
-	ValueType prometheus.ValueType
+	// Need the telegraf ValueType because there isn't a Prometheus ValueType
+	// representing Histogram or Summary
+	TelegrafValueType telegraf.ValueType
 	// LabelSet is the label counts for all Samples.
 	LabelSet map[string]int
 }
@@ -189,7 +196,16 @@ func (p *PrometheusClient) Collect(ch chan<- prometheus.Metric) {
 				labels = append(labels, v)
 			}
 
-			metric, err := prometheus.NewConstMetric(desc, family.ValueType, sample.Value, labels...)
+			var metric prometheus.Metric
+			var err error
+			switch family.TelegrafValueType {
+			case telegraf.Summary:
+				metric, err = prometheus.NewConstSummary(desc, sample.Count, sample.Sum, sample.SummaryValue, labels...)
+			case telegraf.Histogram:
+				metric, err = prometheus.NewConstHistogram(desc, sample.Count, sample.Sum, sample.HistogramValue, labels...)
+			default:
+				metric, err = prometheus.NewConstMetric(desc, getPromValueType(family.TelegrafValueType), sample.Value, labels...)
+			}
 			if err != nil {
 				log.Printf("E! Error creating prometheus metric, "+
 					"key: %s, labels: %v,\nerr: %s\n",
@@ -205,7 +221,7 @@ func sanitize(value string) string {
 	return invalidNameCharRE.ReplaceAllString(value, "_")
 }
 
-func valueType(tt telegraf.ValueType) prometheus.ValueType {
+func getPromValueType(tt telegraf.ValueType) prometheus.ValueType {
 	switch tt {
 	case telegraf.Counter:
 		return prometheus.CounterValue
@@ -226,6 +242,30 @@ func CreateSampleID(tags map[string]string) SampleID {
 	return SampleID(strings.Join(pairs, ","))
 }
 
+func addSample(fam *MetricFamily, sample *Sample, sampleID SampleID) {
+
+	for k, _ := range sample.Labels {
+		fam.LabelSet[k]++
+	}
+
+	fam.Samples[sampleID] = sample
+}
+
+func (p *PrometheusClient) addMetricFamily(point telegraf.Metric, sample *Sample, mname string, sampleID SampleID) {
+	var fam *MetricFamily
+	var ok bool
+	if fam, ok = p.fam[mname]; !ok {
+		fam = &MetricFamily{
+			Samples:           make(map[SampleID]*Sample),
+			TelegrafValueType: point.Type(),
+			LabelSet:          make(map[string]int),
+		}
+		p.fam[mname] = fam
+	}
+
+	addSample(fam, sample, sampleID)
+}
+
 func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 	p.Lock()
 	defer p.Unlock()
@@ -234,7 +274,6 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 
 	for _, point := range metrics {
 		tags := point.Tags()
-		vt := valueType(point.Type())
 		sampleID := CreateSampleID(tags)
 
 		labels := make(map[string]string)
@@ -251,77 +290,128 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 			}
 		}
 
-		for fn, fv := range point.Fields() {
-			// Ignore string and bool fields.
-			var value float64
-			switch fv := fv.(type) {
-			case int64:
-				value = float64(fv)
-			case float64:
-				value = fv
-			default:
-				continue
-			}
-
-			sample := &Sample{
-				Labels:     labels,
-				Value:      value,
-				Expiration: now.Add(p.ExpirationInterval.Duration),
-			}
-
-			// Special handling of value field; supports passthrough from
-			// the prometheus input.
+		switch point.Type() {
+		case telegraf.Summary:
 			var mname string
-			switch point.Type() {
-			case telegraf.Counter:
-				if fn == "counter" {
-					mname = sanitize(point.Name())
-				}
-			case telegraf.Gauge:
-				if fn == "gauge" {
-					mname = sanitize(point.Name())
-				}
-			}
-			if mname == "" {
-				if fn == "value" {
-					mname = sanitize(point.Name())
-				} else {
-					mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
-				}
-			}
-
-			var fam *MetricFamily
-			var ok bool
-			if fam, ok = p.fam[mname]; !ok {
-				fam = &MetricFamily{
-					Samples:   make(map[SampleID]*Sample),
-					ValueType: vt,
-					LabelSet:  make(map[string]int),
-				}
-				p.fam[mname] = fam
-			} else {
-				// Metrics can be untyped even though the corresponding plugin
-				// creates them with a type.  This happens when the metric was
-				// transferred over the network in a format that does not
-				// preserve value type and received using an input such as a
-				// queue consumer.  To avoid issues we automatically upgrade
-				// value type from untyped to a typed metric.
-				if fam.ValueType == prometheus.UntypedValue {
-					fam.ValueType = vt
+			var sum float64
+			var count uint64
+			summaryvalue := make(map[float64]float64)
+			for fn, fv := range point.Fields() {
+				var value float64
+				switch fv := fv.(type) {
+				case int64:
+					value = float64(fv)
+				case float64:
+					value = fv
+				default:
+					continue
 				}
 
-				if vt != prometheus.UntypedValue && fam.ValueType != vt {
-					// Don't return an error since this would be a permanent error
-					log.Printf("Mixed ValueType for measurement %q; dropping point", point.Name())
-					break
+				switch fn {
+				case "sum":
+					sum = value
+				case "count":
+					count = uint64(value)
+				default:
+					limit, err := strconv.ParseFloat(fn, 64)
+					if err == nil {
+						summaryvalue[limit] = value
+					}
 				}
 			}
-
-			for k, _ := range sample.Labels {
-				fam.LabelSet[k]++
+			sample := &Sample{
+				Labels:       labels,
+				SummaryValue: summaryvalue,
+				Count:        count,
+				Sum:          sum,
+				Expiration:   now.Add(p.ExpirationInterval.Duration),
 			}
+			mname = sanitize(point.Name())
 
-			fam.Samples[sampleID] = sample
+			p.addMetricFamily(point, sample, mname, sampleID)
+
+		case telegraf.Histogram:
+			var mname string
+			var sum float64
+			var count uint64
+			histogramvalue := make(map[float64]uint64)
+			for fn, fv := range point.Fields() {
+				var value float64
+				switch fv := fv.(type) {
+				case int64:
+					value = float64(fv)
+				case float64:
+					value = fv
+				default:
+					continue
+				}
+
+				switch fn {
+				case "sum":
+					sum = value
+				case "count":
+					count = uint64(value)
+				default:
+					limit, err := strconv.ParseFloat(fn, 64)
+					if err == nil {
+						histogramvalue[limit] = uint64(value)
+					}
+				}
+			}
+			sample := &Sample{
+				Labels:         labels,
+				HistogramValue: histogramvalue,
+				Count:          count,
+				Sum:            sum,
+				Expiration:     now.Add(p.ExpirationInterval.Duration),
+			}
+			mname = sanitize(point.Name())
+
+			p.addMetricFamily(point, sample, mname, sampleID)
+
+		default:
+			for fn, fv := range point.Fields() {
+				// Ignore string and bool fields.
+				var value float64
+				switch fv := fv.(type) {
+				case int64:
+					value = float64(fv)
+				case float64:
+					value = fv
+				default:
+					continue
+				}
+
+				sample := &Sample{
+					Labels:     labels,
+					Value:      value,
+					Expiration: now.Add(p.ExpirationInterval.Duration),
+				}
+
+				// Special handling of value field; supports passthrough from
+				// the prometheus input.
+				var mname string
+				switch point.Type() {
+				case telegraf.Counter:
+					if fn == "counter" {
+						mname = sanitize(point.Name())
+					}
+				case telegraf.Gauge:
+					if fn == "gauge" {
+						mname = sanitize(point.Name())
+					}
+				}
+				if mname == "" {
+					if fn == "value" {
+						mname = sanitize(point.Name())
+					} else {
+						mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
+					}
+				}
+
+				p.addMetricFamily(point, sample, mname, sampleID)
+
+			}
 		}
 	}
 	return nil
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 1bb1cc83a..69509ae1c 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/influxdata/telegraf/metric"
 	prometheus_input "github.com/influxdata/telegraf/plugins/inputs/prometheus"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 )
 
@@ -45,7 +44,7 @@ func TestWrite_Basic(t *testing.T) {
 
 	fam, ok := client.fam["foo"]
 	require.True(t, ok)
-	require.Equal(t, prometheus.UntypedValue, fam.ValueType)
+	require.Equal(t, telegraf.Untyped, fam.TelegrafValueType)
 	require.Equal(t, map[string]int{}, fam.LabelSet)
 
 	sample, ok := fam.Samples[CreateSampleID(pt1.Tags())]
@@ -119,7 +118,7 @@ func TestWrite_Counters(t *testing.T) {
 		args       args
 		err        error
 		metricName string
-		promType   prometheus.ValueType
+		valueType  telegraf.ValueType
 	}{
 		{
 			name: "field named value is not added to metric name",
@@ -129,7 +128,7 @@ func TestWrite_Counters(t *testing.T) {
 				valueType:   telegraf.Counter,
 			},
 			metricName: "foo",
-			promType:   prometheus.CounterValue,
+			valueType:  telegraf.Counter,
 		},
 		{
 			name: "field named counter is not added to metric name",
@@ -139,7 +138,7 @@ func TestWrite_Counters(t *testing.T) {
 				valueType:   telegraf.Counter,
 			},
 			metricName: "foo",
-			promType:   prometheus.CounterValue,
+			valueType:  telegraf.Counter,
 		},
 		{
 			name: "field with any other name is added to metric name",
@@ -149,7 +148,7 @@ func TestWrite_Counters(t *testing.T) {
 				valueType:   telegraf.Counter,
 			},
 			metricName: "foo_other",
-			promType:   prometheus.CounterValue,
+			valueType:  telegraf.Counter,
 		},
 	}
 	for _, tt := range tests {
@@ -167,7 +166,7 @@ func TestWrite_Counters(t *testing.T) {
 
 			fam, ok := client.fam[tt.metricName]
 			require.True(t, ok)
-			require.Equal(t, tt.promType, fam.ValueType)
+			require.Equal(t, tt.valueType, fam.TelegrafValueType)
 		})
 	}
 }
@@ -196,20 +195,119 @@ func TestWrite_Sanitize(t *testing.T) {
 }
 
 func TestWrite_Gauge(t *testing.T) {
+	type args struct {
+		measurement string
+		tags        map[string]string
+		fields      map[string]interface{}
+		valueType   telegraf.ValueType
+	}
+	var tests = []struct {
+		name       string
+		args       args
+		err        error
+		metricName string
+		valueType  telegraf.ValueType
+	}{
+		{
+			name: "field named value is not added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"value": 42},
+				valueType:   telegraf.Gauge,
+			},
+			metricName: "foo",
+			valueType:  telegraf.Gauge,
+		},
+		{
+			name: "field named gauge is not added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"gauge": 42},
+				valueType:   telegraf.Gauge,
+			},
+			metricName: "foo",
+			valueType:  telegraf.Gauge,
+		},
+		{
+			name: "field with any other name is added to metric name",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"other": 42},
+				valueType:   telegraf.Gauge,
+			},
+			metricName: "foo_other",
+			valueType:  telegraf.Gauge,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(
+				tt.args.measurement,
+				tt.args.tags,
+				tt.args.fields,
+				time.Now(),
+				tt.args.valueType,
+			)
+			client := NewClient()
+			err = client.Write([]telegraf.Metric{m})
+			require.Equal(t, tt.err, err)
+
+			fam, ok := client.fam[tt.metricName]
+			require.True(t, ok)
+			require.Equal(t, tt.valueType, fam.TelegrafValueType)
+
+		})
+	}
+}
+
+func TestWrite_Summary(t *testing.T) {
 	client := NewClient()
 
 	p1, err := metric.New(
 		"foo",
 		make(map[string]string),
-		map[string]interface{}{"value": 42},
+		map[string]interface{}{"sum": 84, "count": 42, "0": 2, "0.5": 3, "1": 4},
 		time.Now(),
-		telegraf.Gauge)
+		telegraf.Summary)
+
 	err = client.Write([]telegraf.Metric{p1})
 	require.NoError(t, err)
 
 	fam, ok := client.fam["foo"]
 	require.True(t, ok)
-	require.Equal(t, prometheus.GaugeValue, fam.ValueType)
+	require.Equal(t, 1, len(fam.Samples))
+
+	sample1, ok := fam.Samples[CreateSampleID(p1.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, 84.0, sample1.Sum)
+	require.Equal(t, uint64(42), sample1.Count)
+	require.Equal(t, 3, len(sample1.SummaryValue))
+}
+
+func TestWrite_Histogram(t *testing.T) {
+	client := NewClient()
+
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"sum": 84, "count": 42, "0": 2, "0.5": 3, "1": 4},
+		time.Now(),
+		telegraf.Histogram)
+
+	err = client.Write([]telegraf.Metric{p1})
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 1, len(fam.Samples))
+
+	sample1, ok := fam.Samples[CreateSampleID(p1.Tags())]
+	require.True(t, ok)
+
+	require.Equal(t, 84.0, sample1.Sum)
+	require.Equal(t, uint64(42), sample1.Count)
+	require.Equal(t, 3, len(sample1.HistogramValue))
 }
 
 func TestWrite_MixedValueType(t *testing.T) {
@@ -307,7 +405,7 @@ func TestWrite_Tags(t *testing.T) {
 
 	fam, ok := client.fam["foo"]
 	require.True(t, ok)
-	require.Equal(t, prometheus.UntypedValue, fam.ValueType)
+	require.Equal(t, telegraf.Untyped, fam.TelegrafValueType)
 
 	require.Equal(t, map[string]int{"host": 1}, fam.LabelSet)
 
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index c478400eb..29c362c87 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -122,6 +122,24 @@ func (a *Accumulator) AddMetrics(metrics []telegraf.Metric) {
 	}
 }
 
+func (a *Accumulator) AddSummary(
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+	timestamp ...time.Time,
+) {
+	a.AddFields(measurement, fields, tags, timestamp...)
+}
+
+func (a *Accumulator) AddHistogram(
+	measurement string,
+	fields map[string]interface{},
+	tags map[string]string,
+	timestamp ...time.Time,
+) {
+	a.AddFields(measurement, fields, tags, timestamp...)
+}
+
 // AddError appends the given error to Accumulator.Errors.
 func (a *Accumulator) AddError(err error) {
 	if err == nil {

From 206397d4755e005712cf3690e843fc3c522ad15b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Oct 2017 16:31:22 -0700
Subject: [PATCH 0677/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5796ea8f9..fa2ce68f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - [#3344](https://github.com/influxdata/telegraf/pull/3344): Add UDP IPv6 support to statsd input.
 - [#3350](https://github.com/influxdata/telegraf/pull/3350): Use labels in prometheus output for string fields.
 - [#3358](https://github.com/influxdata/telegraf/pull/3358): Add support for decimal timestamps to ts-epoch modifier.
+- [#3337](https://github.com/influxdata/telegraf/pull/3337): Add histogram and summary types and use in prometheus plugins.
 
 ### Bugfixes
 

From 6ea61b55d9ab54e0bb39fb653219960304f0179b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 25 Oct 2017 14:15:10 -0700
Subject: [PATCH 0678/1302] Set release date for 1.4.3

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2ce68f5..debdb71b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,7 @@
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 
-## v1.4.3 [unreleased]
+## v1.4.3 [2017-10-25]
 
 ### Bugfixes
 

From a519abf13fad2ea1407f08bee4dce3f9ed039a95 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 25 Oct 2017 15:28:55 -0700
Subject: [PATCH 0679/1302] Gather concurrently from snmp agents (#3365)

---
 plugins/inputs/snmp/snmp.go      | 69 ++++++++++++++++++--------------
 plugins/inputs/snmp/snmp_test.go | 40 ++++++++++++------
 2 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 2aef729b3..c4f66f519 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -135,7 +135,7 @@ type Snmp struct {
 	Name   string
 	Fields []Field `toml:"field"`
 
-	connectionCache map[string]snmpConnection
+	connectionCache []snmpConnection
 	initialized     bool
 }
 
@@ -144,6 +144,8 @@ func (s *Snmp) init() error {
 		return nil
 	}
 
+	s.connectionCache = make([]snmpConnection, len(s.Agents))
+
 	for i := range s.Tables {
 		if err := s.Tables[i].init(); err != nil {
 			return Errorf(err, "initializing table %s", s.Tables[i].Name)
@@ -342,30 +344,36 @@ func (s *Snmp) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 
-	for _, agent := range s.Agents {
-		gs, err := s.getConnection(agent)
-		if err != nil {
-			acc.AddError(Errorf(err, "agent %s", agent))
-			continue
-		}
-
-		// First is the top-level fields. We treat the fields as table prefixes with an empty index.
-		t := Table{
-			Name:   s.Name,
-			Fields: s.Fields,
-		}
-		topTags := map[string]string{}
-		if err := s.gatherTable(acc, gs, t, topTags, false); err != nil {
-			acc.AddError(Errorf(err, "agent %s", agent))
-		}
-
-		// Now is the real tables.
-		for _, t := range s.Tables {
-			if err := s.gatherTable(acc, gs, t, topTags, true); err != nil {
-				acc.AddError(Errorf(err, "agent %s: gathering table %s", agent, t.Name))
+	var wg sync.WaitGroup
+	for i, agent := range s.Agents {
+		wg.Add(1)
+		go func(i int, agent string) {
+			defer wg.Done()
+			gs, err := s.getConnection(i)
+			if err != nil {
+				acc.AddError(Errorf(err, "agent %s", agent))
+				return
 			}
-		}
+
+			// First is the top-level fields. We treat the fields as table prefixes with an empty index.
+			t := Table{
+				Name:   s.Name,
+				Fields: s.Fields,
+			}
+			topTags := map[string]string{}
+			if err := s.gatherTable(acc, gs, t, topTags, false); err != nil {
+				acc.AddError(Errorf(err, "agent %s", agent))
+			}
+
+			// Now is the real tables.
+			for _, t := range s.Tables {
+				if err := s.gatherTable(acc, gs, t, topTags, true); err != nil {
+					acc.AddError(Errorf(err, "agent %s: gathering table %s", agent, t.Name))
+				}
+			}
+		}(i, agent)
 	}
+	wg.Wait()
 
 	return nil
 }
@@ -568,16 +576,18 @@ func (gsw gosnmpWrapper) Get(oids []string) (*gosnmp.SnmpPacket, error) {
 }
 
 // getConnection creates a snmpConnection (*gosnmp.GoSNMP) object and caches the
-// result using `agent` as the cache key.
-func (s *Snmp) getConnection(agent string) (snmpConnection, error) {
-	if s.connectionCache == nil {
-		s.connectionCache = map[string]snmpConnection{}
-	}
-	if gs, ok := s.connectionCache[agent]; ok {
+// result using `agentIndex` as the cache key.  This is done to allow multiple
+// connections to a single address.  It is an error to use a connection in
+// more than one goroutine.
+func (s *Snmp) getConnection(idx int) (snmpConnection, error) {
+	if gs := s.connectionCache[idx]; gs != nil {
 		return gs, nil
 	}
 
+	agent := s.Agents[idx]
+
 	gs := gosnmpWrapper{&gosnmp.GoSNMP{}}
+	s.connectionCache[idx] = gs
 
 	host, portStr, err := net.SplitHostPort(agent)
 	if err != nil {
@@ -677,7 +687,6 @@ func (s *Snmp) getConnection(agent string) (snmpConnection, error) {
 		return nil, Errorf(err, "setting up connection")
 	}
 
-	s.connectionCache[agent] = gs
 	return gs, nil
 }
 
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index 07fdeddc1..f9a7d95e2 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -120,7 +120,7 @@ func TestSampleConfig(t *testing.T) {
 			},
 		},
 	}
-	assert.Equal(t, s, *conf.Inputs.Snmp[0])
+	assert.Equal(t, &s, conf.Inputs.Snmp[0])
 }
 
 func TestFieldInit(t *testing.T) {
@@ -251,13 +251,16 @@ func TestSnmpInit_noTranslate(t *testing.T) {
 
 func TestGetSNMPConnection_v2(t *testing.T) {
 	s := &Snmp{
+		Agents:    []string{"1.2.3.4:567", "1.2.3.4"},
 		Timeout:   internal.Duration{Duration: 3 * time.Second},
 		Retries:   4,
 		Version:   2,
 		Community: "foo",
 	}
+	err := s.init()
+	require.NoError(t, err)
 
-	gsc, err := s.getConnection("1.2.3.4:567")
+	gsc, err := s.getConnection(0)
 	require.NoError(t, err)
 	gs := gsc.(gosnmpWrapper)
 	assert.Equal(t, "1.2.3.4", gs.Target)
@@ -265,7 +268,7 @@ func TestGetSNMPConnection_v2(t *testing.T) {
 	assert.Equal(t, gosnmp.Version2c, gs.Version)
 	assert.Equal(t, "foo", gs.Community)
 
-	gsc, err = s.getConnection("1.2.3.4")
+	gsc, err = s.getConnection(1)
 	require.NoError(t, err)
 	gs = gsc.(gosnmpWrapper)
 	assert.Equal(t, "1.2.3.4", gs.Target)
@@ -274,6 +277,7 @@ func TestGetSNMPConnection_v2(t *testing.T) {
 
 func TestGetSNMPConnection_v3(t *testing.T) {
 	s := &Snmp{
+		Agents:         []string{"1.2.3.4"},
 		Version:        3,
 		MaxRepetitions: 20,
 		ContextName:    "mycontext",
@@ -287,8 +291,10 @@ func TestGetSNMPConnection_v3(t *testing.T) {
 		EngineBoots:    1,
 		EngineTime:     2,
 	}
+	err := s.init()
+	require.NoError(t, err)
 
-	gsc, err := s.getConnection("1.2.3.4")
+	gsc, err := s.getConnection(0)
 	require.NoError(t, err)
 	gs := gsc.(gosnmpWrapper)
 	assert.Equal(t, gs.Version, gosnmp.Version3)
@@ -308,15 +314,22 @@ func TestGetSNMPConnection_v3(t *testing.T) {
 }
 
 func TestGetSNMPConnection_caching(t *testing.T) {
-	s := &Snmp{}
-	gs1, err := s.getConnection("1.2.3.4")
+	s := &Snmp{
+		Agents: []string{"1.2.3.4", "1.2.3.5", "1.2.3.5"},
+	}
+	err := s.init()
 	require.NoError(t, err)
-	gs2, err := s.getConnection("1.2.3.4")
+	gs1, err := s.getConnection(0)
 	require.NoError(t, err)
-	gs3, err := s.getConnection("1.2.3.5")
+	gs2, err := s.getConnection(0)
+	require.NoError(t, err)
+	gs3, err := s.getConnection(1)
+	require.NoError(t, err)
+	gs4, err := s.getConnection(2)
 	require.NoError(t, err)
 	assert.True(t, gs1 == gs2)
 	assert.False(t, gs2 == gs3)
+	assert.False(t, gs3 == gs4)
 }
 
 func TestGosnmpWrapper_walk_retry(t *testing.T) {
@@ -560,11 +573,11 @@ func TestGather(t *testing.T) {
 			},
 		},
 
-		connectionCache: map[string]snmpConnection{
-			"TestGather": tsc,
+		connectionCache: []snmpConnection{
+			tsc,
 		},
+		initialized: true,
 	}
-
 	acc := &testutil.Accumulator{}
 
 	tstart := time.Now()
@@ -607,9 +620,10 @@ func TestGather_host(t *testing.T) {
 			},
 		},
 
-		connectionCache: map[string]snmpConnection{
-			"TestGather": tsc,
+		connectionCache: []snmpConnection{
+			tsc,
 		},
+		initialized: true,
 	}
 
 	acc := &testutil.Accumulator{}

From 5885ef2c1ccea032f346d0b3cc353c56ff2bc4ad Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 25 Oct 2017 15:29:56 -0700
Subject: [PATCH 0680/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index debdb71b0..98dfbbf93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - [#3350](https://github.com/influxdata/telegraf/pull/3350): Use labels in prometheus output for string fields.
 - [#3358](https://github.com/influxdata/telegraf/pull/3358): Add support for decimal timestamps to ts-epoch modifier.
 - [#3337](https://github.com/influxdata/telegraf/pull/3337): Add histogram and summary types and use in prometheus plugins.
+- [#3365](https://github.com/influxdata/telegraf/pull/3365): Gather concurrently from snmp agents.
 
 ### Bugfixes
 

From 88ec171293585d7eeeb93e774c12f7b04ca98bed Mon Sep 17 00:00:00 2001
From: Vladimir S <vlasad@gmail.com>
Date: Thu, 26 Oct 2017 23:35:37 +0300
Subject: [PATCH 0681/1302] Perform DNS lookup before ping (#3385)

---
 plugins/inputs/ping/README.md            |  7 +++--
 plugins/inputs/ping/ping.go              | 33 +++++++++++++++++++-----
 plugins/inputs/ping/ping_test.go         |  3 +++
 plugins/inputs/ping/ping_windows.go      | 32 ++++++++++++++---------
 plugins/inputs/ping/ping_windows_test.go |  8 +++++-
 5 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 2274f42c9..914477c54 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -28,11 +28,14 @@ urls = ["www.google.com"] # required
 - packets_received ( from ping output )
 - percent_reply_loss ( compute from packets_transmitted and reply_received )
 - percent_packets_loss ( compute from packets_transmitted and packets_received )
-- errors ( when host can not be found or wrong prameters is passed to application )
+- errors ( when host can not be found or wrong parameters is passed to application )
 - response time
     - average_response_ms ( compute from minimum_response_ms and maximum_response_ms )
     - minimum_response_ms ( from ping output )
     - maximum_response_ms ( from ping output )
+- result_code
+    - 0: success
+    - 1: no such host
 
 ### Tags:
 
@@ -44,5 +47,5 @@ urls = ["www.google.com"] # required
 ```
 $ ./telegraf --config telegraf.conf --input-filter ping --test
 * Plugin: ping, Collection 1
-ping,host=WIN-PBAPLP511R7,url=www.google.com average_response_ms=7i,maximum_response_ms=9i,minimum_response_ms=7i,packets_received=4i,packets_transmitted=4i,percent_packet_loss=0,percent_reply_loss=0,reply_received=4i 1469879119000000000
+ping,host=WIN-PBAPLP511R7,url=www.google.com result_code=0i,average_response_ms=7i,maximum_response_ms=9i,minimum_response_ms=7i,packets_received=4i,packets_transmitted=4i,percent_packet_loss=0,percent_reply_loss=0,reply_received=4i 1469879119000000000
 ```
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index dcbb2c286..cae575bfd 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -5,6 +5,7 @@ package ping
 import (
 	"errors"
 	"fmt"
+	"net"
 	"os/exec"
 	"runtime"
 	"strconv"
@@ -76,6 +77,17 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(u string) {
 			defer wg.Done()
+			tags := map[string]string{"url": u}
+			fields := map[string]interface{}{"result_code": 0}
+
+			_, err := net.LookupHost(u)
+			if err != nil {
+				acc.AddError(err)
+				fields["result_code"] = 1
+				acc.AddFields("ping", fields, tags)
+				return
+			}
+
 			args := p.args(u)
 			totalTimeout := float64(p.Count)*p.Timeout + float64(p.Count-1)*p.PingInterval
 
@@ -99,24 +111,23 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					} else {
 						acc.AddError(err)
 					}
+					acc.AddFields("ping", fields, tags)
 					return
 				}
 			}
 
-			tags := map[string]string{"url": u}
 			trans, rec, min, avg, max, stddev, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
 				acc.AddError(fmt.Errorf("%s: %s", err, u))
+				acc.AddFields("ping", fields, tags)
 				return
 			}
 			// Calculate packet loss percentage
 			loss := float64(trans-rec) / float64(trans) * 100.0
-			fields := map[string]interface{}{
-				"packets_transmitted": trans,
-				"packets_received":    rec,
-				"percent_packet_loss": loss,
-			}
+			fields["packets_transmitted"] = trans
+			fields["packets_received"] = rec
+			fields["percent_packet_loss"] = loss
 			if min > 0 {
 				fields["minimum_response_ms"] = min
 			}
@@ -194,7 +205,6 @@ func processPingOutput(out string) (int, int, float64, float64, float64, float64
 	for _, line := range lines {
 		if strings.Contains(line, "transmitted") &&
 			strings.Contains(line, "received") {
-			err = nil
 			stats := strings.Split(line, ", ")
 			// Transmitted packets
 			trans, err = strconv.Atoi(strings.Split(stats[0], " ")[0])
@@ -209,8 +219,17 @@ func processPingOutput(out string) (int, int, float64, float64, float64, float64
 		} else if strings.Contains(line, "min/avg/max") {
 			stats := strings.Split(line, " ")[3]
 			min, err = strconv.ParseFloat(strings.Split(stats, "/")[0], 64)
+			if err != nil {
+				return trans, recv, min, avg, max, stddev, err
+			}
 			avg, err = strconv.ParseFloat(strings.Split(stats, "/")[1], 64)
+			if err != nil {
+				return trans, recv, min, avg, max, stddev, err
+			}
 			max, err = strconv.ParseFloat(strings.Split(stats, "/")[2], 64)
+			if err != nil {
+				return trans, recv, min, avg, max, stddev, err
+			}
 			stddev, err = strconv.ParseFloat(strings.Split(stats, "/")[3], 64)
 			if err != nil {
 				return trans, recv, min, avg, max, stddev, err
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index 8d422d4b2..eafe89428 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -158,6 +158,7 @@ func TestPingGather(t *testing.T) {
 		"average_response_ms":   43.628,
 		"maximum_response_ms":   51.806,
 		"standard_deviation_ms": 5.325,
+		"result_code":           0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 
@@ -198,6 +199,7 @@ func TestLossyPingGather(t *testing.T) {
 		"average_response_ms":   44.033,
 		"maximum_response_ms":   51.806,
 		"standard_deviation_ms": 5.325,
+		"result_code":           0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }
@@ -230,6 +232,7 @@ func TestBadPingGather(t *testing.T) {
 		"packets_transmitted": 2,
 		"packets_received":    0,
 		"percent_packet_loss": 100.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }
diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 1c83ee84e..9645d175a 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -4,6 +4,7 @@ package ping
 
 import (
 	"errors"
+	"net"
 	"os/exec"
 	"regexp"
 	"strconv"
@@ -158,6 +159,18 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 		wg.Add(1)
 		go func(u string) {
 			defer wg.Done()
+
+			tags := map[string]string{"url": u}
+			fields := map[string]interface{}{"result_code": 0}
+
+			_, err := net.LookupHost(u)
+			if err != nil {
+				errorChannel <- err
+				fields["result_code"] = 1
+				acc.AddFields("ping", fields, tags)
+				return
+			}
+
 			args := p.args(u)
 			totalTimeout := p.timeout() * float64(p.Count)
 			out, err := p.pingHost(totalTimeout, args...)
@@ -167,7 +180,6 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 				// Combine go err + stderr output
 				pendingError = errors.New(strings.TrimSpace(out) + ", " + err.Error())
 			}
-			tags := map[string]string{"url": u}
 			trans, recReply, receivePacket, avg, min, max, err := processPingOutput(out)
 			if err != nil {
 				// fatal error
@@ -175,24 +187,20 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					errorChannel <- pendingError
 				}
 				errorChannel <- err
-				fields := map[string]interface{}{
-					"errors": 100.0,
-				}
 
+				fields["errors"] = 100.0
 				acc.AddFields("ping", fields, tags)
-
 				return
 			}
 			// Calculate packet loss percentage
 			lossReply := float64(trans-recReply) / float64(trans) * 100.0
 			lossPackets := float64(trans-receivePacket) / float64(trans) * 100.0
-			fields := map[string]interface{}{
-				"packets_transmitted": trans,
-				"reply_received":      recReply,
-				"packets_received":    receivePacket,
-				"percent_packet_loss": lossPackets,
-				"percent_reply_loss":  lossReply,
-			}
+
+			fields["packets_transmitted"] = trans
+			fields["reply_received"] = recReply
+			fields["packets_received"] = receivePacket
+			fields["percent_packet_loss"] = lossPackets
+			fields["percent_reply_loss"] = lossReply
 			if avg > 0 {
 				fields["average_response_ms"] = float64(avg)
 			}
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index aa7bc064b..178e42fcb 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -4,9 +4,10 @@ package ping
 
 import (
 	"errors"
+	"testing"
+
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 // Windows ping format ( should support multilanguage ?)
@@ -81,6 +82,7 @@ func TestPingGather(t *testing.T) {
 		"average_response_ms": 50.0,
 		"minimum_response_ms": 50.0,
 		"maximum_response_ms": 52.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 
@@ -121,6 +123,7 @@ func TestBadPingGather(t *testing.T) {
 		"reply_received":      0,
 		"percent_packet_loss": 100.0,
 		"percent_reply_loss":  100.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }
@@ -167,6 +170,7 @@ func TestLossyPingGather(t *testing.T) {
 		"average_response_ms": 115.0,
 		"minimum_response_ms": 114.0,
 		"maximum_response_ms": 119.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 }
@@ -269,6 +273,7 @@ func TestUnreachablePingGather(t *testing.T) {
 		"reply_received":      0,
 		"percent_packet_loss": 75.0,
 		"percent_reply_loss":  100.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 
@@ -315,6 +320,7 @@ func TestTTLExpiredPingGather(t *testing.T) {
 		"reply_received":      0,
 		"percent_packet_loss": 75.0,
 		"percent_reply_loss":  100.0,
+		"result_code":         0,
 	}
 	acc.AssertContainsTaggedFields(t, "ping", fields, tags)
 

From 8b4708c82a987b490639e3f570d50986c60e57d3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 26 Oct 2017 13:37:54 -0700
Subject: [PATCH 0682/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98dfbbf93..06c0a776b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - [#3358](https://github.com/influxdata/telegraf/pull/3358): Add support for decimal timestamps to ts-epoch modifier.
 - [#3337](https://github.com/influxdata/telegraf/pull/3337): Add histogram and summary types and use in prometheus plugins.
 - [#3365](https://github.com/influxdata/telegraf/pull/3365): Gather concurrently from snmp agents.
+- [#3333](https://github.com/influxdata/telegraf/issues/3333): Perform DNS lookup before ping and report result.
 
 ### Bugfixes
 

From ffa8a4a716a82913e10d5ac5f6a5479282fa7fc7 Mon Sep 17 00:00:00 2001
From: Maximilien Richer <halfa@users.noreply.github.com>
Date: Fri, 27 Oct 2017 20:53:59 +0200
Subject: [PATCH 0683/1302] Add instance name option to varnish plugin (#3398)

This change add a new configuration option to allow probing of
namespaced varnish instances, usually reached using the '-n' switch on
the varnish cli.
---
 plugins/inputs/varnish/varnish.go      | 31 +++++++++++++++++---------
 plugins/inputs/varnish/varnish_test.go | 17 +++++++-------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
index 08c885e61..7ceb7d250 100644
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -17,13 +17,14 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, UseSudo bool) (*bytes.Buffer, error)
+type runner func(cmdName string, UseSudo bool, InstanceName string) (*bytes.Buffer, error)
 
 // Varnish is used to store configuration values
 type Varnish struct {
-	Stats   []string
-	Binary  string
-	UseSudo bool
+	Stats        []string
+	Binary       string
+	UseSudo      bool
+	InstanceName string
 
 	filter filter.Filter
 	run    runner
@@ -44,6 +45,10 @@ var sampleConfig = `
   ## Glob matching can be used, ie, stats = ["MAIN.*"]
   ## stats may also be set to ["*"], which will collect all stats
   stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
+
+  ## Optional name for the varnish instance (or working directory) to query
+  ## Usually appened after -n in varnish cli
+  #name = instanceName
 `
 
 func (s *Varnish) Description() string {
@@ -56,8 +61,13 @@ func (s *Varnish) SampleConfig() string {
 }
 
 // Shell out to varnish_stat and return the output
-func varnishRunner(cmdName string, UseSudo bool) (*bytes.Buffer, error) {
+func varnishRunner(cmdName string, UseSudo bool, InstanceName string) (*bytes.Buffer, error) {
 	cmdArgs := []string{"-1"}
+
+	if InstanceName != "" {
+		cmdArgs = append(cmdArgs, []string{"-n", InstanceName}...)
+	}
+
 	cmd := exec.Command(cmdName, cmdArgs...)
 
 	if UseSudo {
@@ -99,7 +109,7 @@ func (s *Varnish) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	out, err := s.run(s.Binary, s.UseSudo)
+	out, err := s.run(s.Binary, s.UseSudo, s.InstanceName)
 	if err != nil {
 		return fmt.Errorf("error gathering metrics: %s", err)
 	}
@@ -155,10 +165,11 @@ func (s *Varnish) Gather(acc telegraf.Accumulator) error {
 func init() {
 	inputs.Add("varnish", func() telegraf.Input {
 		return &Varnish{
-			run:     varnishRunner,
-			Stats:   defaultStats,
-			Binary:  defaultBinary,
-			UseSudo: false,
+			run:          varnishRunner,
+			Stats:        defaultStats,
+			Binary:       defaultBinary,
+			UseSudo:      false,
+			InstanceName: "",
 		}
 	})
 }
diff --git a/plugins/inputs/varnish/varnish_test.go b/plugins/inputs/varnish/varnish_test.go
index a2b388a0b..30f91e237 100644
--- a/plugins/inputs/varnish/varnish_test.go
+++ b/plugins/inputs/varnish/varnish_test.go
@@ -5,14 +5,15 @@ package varnish
 import (
 	"bytes"
 	"fmt"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
 )
 
-func fakeVarnishStat(output string, useSudo bool) func(string, bool) (*bytes.Buffer, error) {
-	return func(string, bool) (*bytes.Buffer, error) {
+func fakeVarnishStat(output string, useSudo bool, InstanceName string) func(string, bool, string) (*bytes.Buffer, error) {
+	return func(string, bool, string) (*bytes.Buffer, error) {
 		return bytes.NewBuffer([]byte(output)), nil
 	}
 }
@@ -20,7 +21,7 @@ func fakeVarnishStat(output string, useSudo bool) func(string, bool) (*bytes.Buf
 func TestGather(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(smOutput, false),
+		run:   fakeVarnishStat(smOutput, false, ""),
 		Stats: []string{"*"},
 	}
 	v.Gather(acc)
@@ -36,7 +37,7 @@ func TestGather(t *testing.T) {
 func TestParseFullOutput(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(fullOutput, true),
+		run:   fakeVarnishStat(fullOutput, true, ""),
 		Stats: []string{"*"},
 	}
 	err := v.Gather(acc)
@@ -51,7 +52,7 @@ func TestParseFullOutput(t *testing.T) {
 func TestFilterSomeStats(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Varnish{
-		run:   fakeVarnishStat(fullOutput, false),
+		run:   fakeVarnishStat(fullOutput, false, ""),
 		Stats: []string{"MGT.*", "VBE.*"},
 	}
 	err := v.Gather(acc)
@@ -74,7 +75,7 @@ func TestFieldConfig(t *testing.T) {
 	for fieldCfg, expected := range expect {
 		acc := &testutil.Accumulator{}
 		v := &Varnish{
-			run:   fakeVarnishStat(fullOutput, true),
+			run:   fakeVarnishStat(fullOutput, true, ""),
 			Stats: strings.Split(fieldCfg, ","),
 		}
 		err := v.Gather(acc)

From 53b13a20d00fdd148e3dcd5c168ee9c1035edeab Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 27 Oct 2017 11:55:17 -0700
Subject: [PATCH 0684/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06c0a776b..5abd7deee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 - [#3337](https://github.com/influxdata/telegraf/pull/3337): Add histogram and summary types and use in prometheus plugins.
 - [#3365](https://github.com/influxdata/telegraf/pull/3365): Gather concurrently from snmp agents.
 - [#3333](https://github.com/influxdata/telegraf/issues/3333): Perform DNS lookup before ping and report result.
+- [#3398](https://github.com/influxdata/telegraf/issues/3398): Add instance name option to varnish plugin.
 
 ### Bugfixes
 

From d9fa916711c66975fb89ed4f38ffb4d7379d9a69 Mon Sep 17 00:00:00 2001
From: Aditya C S <aditya.gnu@gmail.com>
Date: Tue, 31 Oct 2017 00:56:39 +0530
Subject: [PATCH 0685/1302] Update docker plugin README (#3404)

---
 plugins/inputs/docker/README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 158ed7bcc..faee9a57b 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -17,6 +17,11 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/)
   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
   endpoint = "unix:///var/run/docker.sock"
 
+  ## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
+  ## Note: configure this in one of the manager nodes in a Swarm cluster.
+  ## configuring in multiple Swarm managers results in duplication of metrics.
+  gather_services = false
+
   ## Only collect metrics for these containers. Values will be appended to
   ## container_name_include.
   ## Deprecated (1.4.0), use container_name_include
@@ -161,6 +166,9 @@ based on the availability of per-cpu stats on your system.
     - available
     - total
     - used
+- docker_swarm
+    - tasks_desired
+    - tasks_running
 
 
 ### Tags:
@@ -191,6 +199,10 @@ based on the availability of per-cpu stats on your system.
     - network
 - docker_container_blkio specific:
     - device
+- docker_swarm specific:
+    - service_id
+    - service_name
+    - service_mode
 
 ### Example Output:
 
@@ -242,4 +254,7 @@ io_service_bytes_recursive_sync=77824i,io_service_bytes_recursive_total=80293888
 io_service_bytes_recursive_write=368640i,io_serviced_recursive_async=6562i,\
 io_serviced_recursive_read=6492i,io_serviced_recursive_sync=37i,\
 io_serviced_recursive_total=6599i,io_serviced_recursive_write=107i 1453409536840126713
-```
+>docker_swarm,
+service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test,\
+tasks_desired=3,tasks_running=3 1508968160000000000
+```
\ No newline at end of file

From 23ad959d71f97659344609dc07530551ebdf92d1 Mon Sep 17 00:00:00 2001
From: Aditya C S <aditya.gnu@gmail.com>
Date: Tue, 31 Oct 2017 02:22:40 +0530
Subject: [PATCH 0686/1302] Add support for SSL settings to ElasticSearch
 output plugin (#3406)

---
 plugins/outputs/elasticsearch/README.md       |  7 ++++
 .../outputs/elasticsearch/elasticsearch.go    | 35 ++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md
index 620d5a82c..b69631ba8 100644
--- a/plugins/outputs/elasticsearch/README.md
+++ b/plugins/outputs/elasticsearch/README.md
@@ -174,6 +174,13 @@ This plugin will format the events in the following way:
   # %H - hour (00..23)
   index_name = "telegraf-%Y.%m.%d" # required.
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Template Config
   ## Set to true if you want telegraf to manage its index template.
   ## If enabled it will create a recommended index template for telegraf indexes
diff --git a/plugins/outputs/elasticsearch/elasticsearch.go b/plugins/outputs/elasticsearch/elasticsearch.go
index dbd359b90..31a702e55 100644
--- a/plugins/outputs/elasticsearch/elasticsearch.go
+++ b/plugins/outputs/elasticsearch/elasticsearch.go
@@ -3,15 +3,15 @@ package elasticsearch
 import (
 	"context"
 	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"time"
-
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"gopkg.in/olivere/elastic.v5"
+	"log"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
 )
 
 type Elasticsearch struct {
@@ -25,6 +25,10 @@ type Elasticsearch struct {
 	ManageTemplate      bool
 	TemplateName        string
 	OverwriteTemplate   bool
+	SSLCA               string `toml:"ssl_ca"`   // Path to CA file
+	SSLCert             string `toml:"ssl_cert"` // Path to host cert file
+	SSLKey              string `toml:"ssl_key"`  // Path to cert key file
+	InsecureSkipVerify  bool   // Use SSL but skip chain & host verification
 	Client              *elastic.Client
 }
 
@@ -56,6 +60,13 @@ var sampleConfig = `
   # %H - hour (00..23)
   index_name = "telegraf-%Y.%m.%d" # required.
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Template Config
   ## Set to true if you want telegraf to manage its index template.
   ## If enabled it will create a recommended index template for telegraf indexes
@@ -76,7 +87,21 @@ func (a *Elasticsearch) Connect() error {
 
 	var clientOptions []elastic.ClientOptionFunc
 
+	tlsCfg, err := internal.GetTLSConfig(a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
+	if err != nil {
+		return err
+	}
+	tr := &http.Transport{
+		TLSClientConfig: tlsCfg,
+	}
+
+	httpclient := &http.Client{
+		Transport: tr,
+		Timeout:   a.Timeout.Duration,
+	}
+
 	clientOptions = append(clientOptions,
+		elastic.SetHttpClient(httpclient),
 		elastic.SetSniff(a.EnableSniffer),
 		elastic.SetURL(a.URLs...),
 		elastic.SetHealthcheckInterval(a.HealthCheckInterval.Duration),

From 4d5de8698b8f21c420ea0b06bbc713b2c9ddef4d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Oct 2017 13:53:45 -0700
Subject: [PATCH 0687/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5abd7deee..ba326b864 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - [#3365](https://github.com/influxdata/telegraf/pull/3365): Gather concurrently from snmp agents.
 - [#3333](https://github.com/influxdata/telegraf/issues/3333): Perform DNS lookup before ping and report result.
 - [#3398](https://github.com/influxdata/telegraf/issues/3398): Add instance name option to varnish plugin.
+- [#3406](https://github.com/influxdata/telegraf/pull/3406):  Add support for SSL settings to ElasticSearch output plugin.
 
 ### Bugfixes
 

From fcfcc803b1f8e0e49bf808ddbdcefb79c926699f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 30 Oct 2017 15:33:20 -0700
Subject: [PATCH 0688/1302] Use explicit schemas in mqtt_consumer input (#3401)

---
 plugins/inputs/mqtt_consumer/README.md        |  4 +++-
 plugins/inputs/mqtt_consumer/mqtt_consumer.go | 20 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md
index 52990ef76..2889bde59 100644
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -10,7 +10,9 @@ The plugin expects messages in the
 ```toml
 # Read metrics from MQTT topic(s)
 [[inputs.mqtt_consumer]]
-  servers = ["localhost:1883"]
+  ## MQTT broker URLs to be used. The format should be scheme://host:port,
+  ## schema can be tcp, ssl, or ws.
+  servers = ["tcp://localhost:1883"]
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
   ## Connection timeout for initial connection in seconds
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index ddffbf258..6903f654d 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -56,7 +56,10 @@ type MQTTConsumer struct {
 }
 
 var sampleConfig = `
-  servers = ["localhost:1883"]
+  ## MQTT broker URLs to be used. The format should be scheme://host:port,
+  ## schema can be tcp, ssl, or ws.
+  servers = ["tcp://localhost:1883"]
+
   ## MQTT QoS, must be 0, 1, or 2
   qos = 0
   ## Connection timeout for initial connection in seconds
@@ -239,9 +242,7 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 		return nil, err
 	}
 
-	scheme := "tcp"
 	if tlsCfg != nil {
-		scheme = "ssl"
 		opts.SetTLSConfig(tlsCfg)
 	}
 
@@ -257,8 +258,17 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 	if len(m.Servers) == 0 {
 		return opts, fmt.Errorf("could not get host infomations")
 	}
-	for _, host := range m.Servers {
-		server := fmt.Sprintf("%s://%s", scheme, host)
+
+	for _, server := range m.Servers {
+		// Preserve support for host:port style servers; deprecated in Telegraf 1.4.4
+		if !strings.Contains(server, "://") {
+			log.Printf("W! mqtt_consumer server %q should be updated to use `scheme://host:port` format", server)
+			if tlsCfg == nil {
+				server = "tcp://" + server
+			} else {
+				server = "ssl://" + server
+			}
+		}
 
 		opts.AddBroker(server)
 	}

From c116af35c7e625fe6e839e1f77f0ccb19c1708b9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Oct 2017 15:35:34 -0700
Subject: [PATCH 0689/1302] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba326b864..8aee56f33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,10 @@
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 
+## v1.4.4 [unreleased]
+
+- [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
+
 ## v1.4.3 [2017-10-25]
 
 ### Bugfixes

From 777b84d1dca12bbe066303ee27d12cf0c9bdf764 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Oct 2017 16:32:39 -0700
Subject: [PATCH 0690/1302] Clarify what it means to filter metrics from
 processors

---
 docs/AGGREGATORS_AND_PROCESSORS.md |  5 +++++
 docs/CONFIGURATION.md              | 26 +++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/docs/AGGREGATORS_AND_PROCESSORS.md b/docs/AGGREGATORS_AND_PROCESSORS.md
index af4a0e6d0..ffa9c8f7e 100644
--- a/docs/AGGREGATORS_AND_PROCESSORS.md
+++ b/docs/AGGREGATORS_AND_PROCESSORS.md
@@ -39,6 +39,11 @@ metrics as they pass through Telegraf:
 
 Both Aggregators and Processors analyze metrics as they pass through Telegraf.
 
+Use [measurement filtering](CONFIGURATION.md#measurement-filtering)
+to control which metrics are passed through a processor or aggregator.  If a
+metric is filtered out the metric bypasses the plugin and is passed downstream
+to the next plugin.
+
 **Processor** plugins process metrics as they pass through and immediately emit
 results based on the values they process. For example, this could be printing
 all metrics or adding a tag to all metrics that pass through.
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 6c48d2d84..bf8b4ebf6 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -98,9 +98,13 @@ you can configure that here.
 * **name_suffix**: Specifies a suffix to attach to the measurement name.
 * **tags**: A map of tags to apply to a specific input's measurements.
 
+The [measurement filtering](#measurement-filtering) parameters can be used to
+limit what metrics are emitted from the input plugin.
+
 ## Output Configuration
 
-There are no generic configuration options available for all outputs.
+The [measurement filtering](#measurement-filtering) parameters can be used to
+limit what metrics are emitted from the output plugin.
 
 ## Aggregator Configuration
 
@@ -121,6 +125,10 @@ aggregator and will not get sent to the output plugins.
 * **name_suffix**: Specifies a suffix to attach to the measurement name.
 * **tags**: A map of tags to apply to a specific input's measurements.
 
+The [measurement filtering](#measurement-filtering) parameters be used to
+limit what metrics are handled by the aggregator.  Excluded metrics are passed
+downstream to the next aggregator.
+
 ## Processor Configuration
 
 The following config parameters are available for all processors:
@@ -128,6 +136,10 @@ The following config parameters are available for all processors:
 * **order**: This is the order in which the processor(s) get executed. If this
 is not specified then processor execution order will be random.
 
+The [measurement filtering](#measurement-filtering) can parameters may be used
+to limit what metrics are handled by the processor.  Excluded metrics are
+passed downstream to the next processor.
+
 #### Measurement Filtering
 
 Filters can be configured per input, output, processor, or aggregator,
@@ -377,3 +389,15 @@ to the system load metrics due to the `namepass` parameter.
 [[outputs.file]]
   files = ["stdout"]
 ```
+
+#### Processor Configuration Examples:
+
+Print only the metrics with `cpu` as the measurement name, all metrics are
+passed to the output:
+```toml
+[[processors.printer]]
+  namepass = "cpu"
+
+[[outputs.file]]
+  files = ["/tmp/metrics.out"]
+```

From 63842d48fd41f59bd0eb5038f2926aace2e221f1 Mon Sep 17 00:00:00 2001
From: Maximilien Richer <halfa@users.noreply.github.com>
Date: Wed, 1 Nov 2017 00:58:45 +0100
Subject: [PATCH 0691/1302] Add config to input-varnish README (#3414)

---
 plugins/inputs/varnish/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/varnish/README.md b/plugins/inputs/varnish/README.md
index 215852d23..01ab7ac24 100644
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -17,6 +17,10 @@ This plugin gathers stats from [Varnish HTTP Cache](https://varnish-cache.org/)
    ## Setting stats will override the defaults shown below.
    ## stats may also be set to ["all"], which will collect all stats
    stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
+
+   ## Optional name for the varnish instance (or working directory) to query
+   ## Usually appened after -n in varnish cli
+   #name = instanceName
 ```
 
 ### Measurements & Fields:

From 5f215c22fe2530070a33a7c0baff24b9a92f0ac3 Mon Sep 17 00:00:00 2001
From: Maximilien Richer <halfa@users.noreply.github.com>
Date: Wed, 1 Nov 2017 01:00:06 +0100
Subject: [PATCH 0692/1302] Fix typos in comments (#3415)

---
 agent/agent.go                                        | 2 +-
 internal/config/config.go                             | 4 ++--
 metric/parse.go                                       | 2 +-
 metric/reader_test.go                                 | 4 ++--
 plugins/inputs/cloudwatch/cloudwatch.go               | 2 +-
 plugins/inputs/couchbase/couchbase.go                 | 2 +-
 plugins/inputs/dns_query/dns_query.go                 | 2 +-
 plugins/inputs/ipmi_sensor/ipmi.go                    | 2 +-
 plugins/inputs/iptables/iptables_test.go              | 2 +-
 plugins/inputs/mesos/mesos.go                         | 2 +-
 plugins/inputs/minecraft/internal/rcon/rcon.go        | 2 +-
 plugins/inputs/minecraft/minecraft.go                 | 2 +-
 plugins/inputs/minecraft/rcon.go                      | 2 +-
 plugins/inputs/phpfpm/fcgi_client.go                  | 2 +-
 plugins/inputs/phpfpm/phpfpm_test.go                  | 6 +++---
 plugins/inputs/ping/ping_windows.go                   | 2 +-
 plugins/inputs/powerdns/powerdns_test.go              | 2 +-
 plugins/inputs/statsd/statsd.go                       | 2 +-
 plugins/inputs/sysstat/sysstat.go                     | 2 +-
 plugins/inputs/system/cpu_test.go                     | 6 +++---
 plugins/inputs/win_perf_counters/pdh.go               | 2 +-
 plugins/inputs/win_perf_counters/win_perf_counters.go | 2 +-
 plugins/outputs/graphite/graphite.go                  | 2 +-
 plugins/outputs/influxdb/influxdb.go                  | 4 ++--
 plugins/outputs/opentsdb/opentsdb_test.go             | 2 +-
 plugins/outputs/riemann_legacy/riemann.go             | 2 +-
 26 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index a591bc8d1..af96718cd 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -252,7 +252,7 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 	// the flusher will flush after metrics are collected.
 	time.Sleep(time.Millisecond * 300)
 
-	// create an output metric channel and a gorouting that continously passes
+	// create an output metric channel and a gorouting that continuously passes
 	// each metric onto the output plugins & aggregators.
 	outMetricC := make(chan telegraf.Metric, 100)
 	var wg sync.WaitGroup
diff --git a/internal/config/config.go b/internal/config/config.go
index 61263f49a..98d68f9ef 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -126,7 +126,7 @@ type AgentConfig struct {
 
 	// TODO(cam): Remove UTC and parameter, they are no longer
 	// valid for the agent config. Leaving them here for now for backwards-
-	// compatability
+	// compatibility
 	UTC bool `toml:"utc"`
 
 	// Debug is the option for running in debug mode
@@ -683,7 +683,7 @@ func (c *Config) LoadConfig(path string) error {
 }
 
 // trimBOM trims the Byte-Order-Marks from the beginning of the file.
-// this is for Windows compatability only.
+// this is for Windows compatibility only.
 // see https://github.com/influxdata/telegraf/issues/1378
 func trimBOM(f []byte) []byte {
 	return bytes.TrimPrefix(f, []byte("\xef\xbb\xbf"))
diff --git a/metric/parse.go b/metric/parse.go
index 72057fb39..1acf30094 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -647,7 +647,7 @@ func skipWhitespace(buf []byte, i int) int {
 }
 
 // makeError is a helper function for making a metric parsing error.
-//   reason is the reason that the error occured.
+//   reason is the reason why the error occurred.
 //   buf should be the current buffer we are parsing.
 //   i is the current index, to give some context on where in the buffer we are.
 func makeError(reason string, buf []byte, i int) error {
diff --git a/metric/reader_test.go b/metric/reader_test.go
index 645b618eb..1f2ffd6ea 100644
--- a/metric/reader_test.go
+++ b/metric/reader_test.go
@@ -181,7 +181,7 @@ func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
 	}
 }
 
-// Regresssion test for when a metric requires to be split and one of the
+// Regression test for when a metric requires to be split and one of the
 // split metrics is larger than the buffer.
 //
 // Previously the metric index would be set incorrectly causing a panic.
@@ -218,7 +218,7 @@ func TestMetricReader_SplitOverflowOversized(t *testing.T) {
 	}
 }
 
-// Regresssion test for when a split metric exactly fits in the buffer.
+// Regression test for when a split metric exactly fits in the buffer.
 //
 // Previously the metric would be overflow split when not required.
 func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index 733a17640..2fac94ad8 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -92,7 +92,7 @@ func (c *CloudWatch) SampleConfig() string {
   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
   delay = "5m"
 
-  ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
+  ## Recommended: use metric 'interval' that is a multiple of 'period' to avoid
   ## gaps or overlap in pulled data
   interval = "5m"
 
diff --git a/plugins/inputs/couchbase/couchbase.go b/plugins/inputs/couchbase/couchbase.go
index 35751b727..f773f5d5b 100644
--- a/plugins/inputs/couchbase/couchbase.go
+++ b/plugins/inputs/couchbase/couchbase.go
@@ -21,7 +21,7 @@ var sampleConfig = `
   ##    http://admin:secret@couchbase-0.example.com:8091/
   ##
   ## If no servers are specified, then localhost is used as the host.
-  ## If no protocol is specifed, HTTP is used.
+  ## If no protocol is specified, HTTP is used.
   ## If no port is specified, 8091 is used.
   servers = ["http://localhost:8091"]
 `
diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go
index 98b3dce73..04ce8328d 100644
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -17,7 +17,7 @@ type DnsQuery struct {
 	// Domains or subdomains to query
 	Domains []string
 
-	// Network protocl name
+	// Network protocol name
 	Network string
 
 	// Server to query
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index 3b03e62ad..9448208bd 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -35,7 +35,7 @@ var sampleConfig = `
   ##
   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
 
-  ## Recomended: use metric 'interval' that is a multiple of 'timeout' to avoid
+  ## Recommended: use metric 'interval' that is a multiple of 'timeout' to avoid
   ## gaps or overlap in pulled data
   interval = "30s"
 
diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go
index cf2f9f913..a98c24190 100644
--- a/plugins/inputs/iptables/iptables_test.go
+++ b/plugins/inputs/iptables/iptables_test.go
@@ -81,7 +81,7 @@ func TestIptables_Gather(t *testing.T) {
 		                K     4520 RETURN     tcp  --  *      *       0.0.0.0/0            0.0.0.0/0
             `},
 		},
-		{ // 8 - Multiple rows, multipe chains => no error
+		{ // 8 - Multiple rows, multiple chains => no error
 			table:  "filter",
 			chains: []string{"INPUT", "FORWARD"},
 			values: []string{
diff --git a/plugins/inputs/mesos/mesos.go b/plugins/inputs/mesos/mesos.go
index 26b55c352..e37eabf5d 100644
--- a/plugins/inputs/mesos/mesos.go
+++ b/plugins/inputs/mesos/mesos.go
@@ -367,7 +367,7 @@ func getMetrics(role Role, group string) []string {
 	ret, ok := m[group]
 
 	if !ok {
-		log.Printf("I! [mesos] Unkown %s metrics group: %s\n", role, group)
+		log.Printf("I! [mesos] Unknown %s metrics group: %s\n", role, group)
 		return []string{}
 	}
 
diff --git a/plugins/inputs/minecraft/internal/rcon/rcon.go b/plugins/inputs/minecraft/internal/rcon/rcon.go
index 118771242..a57d75629 100644
--- a/plugins/inputs/minecraft/internal/rcon/rcon.go
+++ b/plugins/inputs/minecraft/internal/rcon/rcon.go
@@ -197,7 +197,7 @@ func (c *Client) Send(typ int32, command string) (response *Packet, err error) {
 }
 
 // NewClient creates a new Client type, creating the connection
-// to the server specified by the host and port arguements. If
+// to the server specified by the host and port arguments. If
 // the connection fails, an error is returned.
 func NewClient(host string, port int) (client *Client, err error) {
 	client = new(Client)
diff --git a/plugins/inputs/minecraft/minecraft.go b/plugins/inputs/minecraft/minecraft.go
index 04b3f4ad1..6debbd25b 100644
--- a/plugins/inputs/minecraft/minecraft.go
+++ b/plugins/inputs/minecraft/minecraft.go
@@ -47,7 +47,7 @@ func (s *Minecraft) SampleConfig() string {
 	return sampleConfig
 }
 
-// Gather uses the RCON protocal to collect player and
+// Gather uses the RCON protocol to collect player and
 // scoreboard stats from a minecraft server.
 //var hasClient bool = false
 func (s *Minecraft) Gather(acc telegraf.Accumulator) error {
diff --git a/plugins/inputs/minecraft/rcon.go b/plugins/inputs/minecraft/rcon.go
index 219a1d14f..f42fc8ba4 100644
--- a/plugins/inputs/minecraft/rcon.go
+++ b/plugins/inputs/minecraft/rcon.go
@@ -76,7 +76,7 @@ func newClient(server, port string) (*rcon.Client, error) {
 	return client, nil
 }
 
-// Gather recieves all player scoreboard information and returns it per player.
+// Gather receives all player scoreboard information and returns it per player.
 func (r *RCON) Gather(producer RCONClientProducer) ([]string, error) {
 	if r.client == nil {
 		var err error
diff --git a/plugins/inputs/phpfpm/fcgi_client.go b/plugins/inputs/phpfpm/fcgi_client.go
index 56978ad3a..5a4d20019 100644
--- a/plugins/inputs/phpfpm/fcgi_client.go
+++ b/plugins/inputs/phpfpm/fcgi_client.go
@@ -59,7 +59,7 @@ func (client *conn) Request(
 	rec := &record{}
 	var err1 error
 
-	// recive untill EOF or FCGI_END_REQUEST
+	// recive until EOF or FCGI_END_REQUEST
 READ_LOOP:
 	for {
 		err1 = rec.read(client.rwc)
diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go
index 80a5d4bcf..2f470c72b 100644
--- a/plugins/inputs/phpfpm/phpfpm_test.go
+++ b/plugins/inputs/phpfpm/phpfpm_test.go
@@ -62,7 +62,7 @@ func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
 	// Let OS find an available port
 	tcp, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
-		t.Fatal("Cannot initalize test server")
+		t.Fatal("Cannot initialize test server")
 	}
 	defer tcp.Close()
 
@@ -106,7 +106,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket(t *testing.T) {
 	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
 	tcp, err := net.Listen("unix", fmt.Sprintf("/tmp/test-fpm%d.sock", randomNumber))
 	if err != nil {
-		t.Fatal("Cannot initalize server on port ")
+		t.Fatal("Cannot initialize server on port ")
 	}
 
 	defer tcp.Close()
@@ -150,7 +150,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket_Custom_Status_Path(t *testing.T) {
 	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
 	tcp, err := net.Listen("unix", fmt.Sprintf("/tmp/test-fpm%d.sock", randomNumber))
 	if err != nil {
-		t.Fatal("Cannot initalize server on port ")
+		t.Fatal("Cannot initialize server on port ")
 	}
 
 	defer tcp.Close()
diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 9645d175a..862c82c5f 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -175,7 +175,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			totalTimeout := p.timeout() * float64(p.Count)
 			out, err := p.pingHost(totalTimeout, args...)
 			// ping host return exitcode != 0 also when there was no response from host
-			// but command was execute succesfully
+			// but command was execute successfully
 			if err != nil {
 				// Combine go err + stderr output
 				pendingError = errors.New(strings.TrimSpace(out) + ", " + err.Error())
diff --git a/plugins/inputs/powerdns/powerdns_test.go b/plugins/inputs/powerdns/powerdns_test.go
index df36440de..56666a886 100644
--- a/plugins/inputs/powerdns/powerdns_test.go
+++ b/plugins/inputs/powerdns/powerdns_test.go
@@ -76,7 +76,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
 	socket, err := net.Listen("unix", fmt.Sprintf("/tmp/pdns%d.controlsocket", randomNumber))
 	if err != nil {
-		t.Fatal("Cannot initalize server on port ")
+		t.Fatal("Cannot initialize server on port ")
 	}
 
 	defer socket.Close()
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 93819cb09..9f711d913 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -66,7 +66,7 @@ type Statsd struct {
 
 	// MetricSeparator is the separator between parts of the metric name.
 	MetricSeparator string
-	// This flag enables parsing of tags in the dogstatsd extention to the
+	// This flag enables parsing of tags in the dogstatsd extension to the
 	// statsd protocol (http://docs.datadoghq.com/guides/dogstatsd/)
 	ParseDataDogTags bool
 
diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
index 551cd37aa..1daa85730 100644
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -100,7 +100,7 @@ var sampleConfig = `
   #
   #
   ## Options for the sadf command. The values on the left represent the sadf
-  ## options and the values on the right their description (wich are used for
+  ## options and the values on the right their description (which are used for
   ## grouping and prefixing metrics).
   ##
   ## Run 'sar -h' or 'man sar' to find out the supported options for your
diff --git a/plugins/inputs/system/cpu_test.go b/plugins/inputs/system/cpu_test.go
index 773f8e7d1..43825fca7 100644
--- a/plugins/inputs/system/cpu_test.go
+++ b/plugins/inputs/system/cpu_test.go
@@ -54,7 +54,7 @@ func TestCPUStats(t *testing.T) {
 	err := cs.Gather(&acc)
 	require.NoError(t, err)
 
-	// Computed values are checked with delta > 0 becasue of floating point arithmatic
+	// Computed values are checked with delta > 0 because of floating point arithmatic
 	// imprecision
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 8.8, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_system", 8.2, 0, cputags)
@@ -105,7 +105,7 @@ func TestCPUStats(t *testing.T) {
 // specific tags within a certain distance of a given expected value. Asserts a failure
 // if the measurement is of the wrong type, or if no matching measurements are found
 //
-// Paramaters:
+// Parameters:
 //     t *testing.T            : Testing object to use
 //     acc testutil.Accumulator: Accumulator to examine
 //     measurement string      : Name of the measurement to examine
@@ -224,7 +224,7 @@ func TestCPUTimesDecrease(t *testing.T) {
 	err := cs.Gather(&acc)
 	require.NoError(t, err)
 
-	// Computed values are checked with delta > 0 becasue of floating point arithmatic
+	// Computed values are checked with delta > 0 because of floating point arithmatic
 	// imprecision
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_user", 18, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 80, 0, cputags)
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index 2caa21445..a0b693506 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -347,7 +347,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 //
 //	okPath := "\\Process(*)\\% Processor Time" // notice the wildcard * character
 //
-//	// ommitted all necessary stuff ...
+//	// omitted all necessary stuff ...
 //
 //	var bufSize uint32
 //	var bufCount uint32
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 5f1c1a11b..7e3991d19 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -110,7 +110,7 @@ func (m *Win_PerfCounters) AddItem(query string, objectName string, counter stri
 		ret = PdhAddEnglishCounter(handle, query, 0, &counterHandle)
 	}
 
-	// Call PdhCollectQueryData one time to check existance of the counter
+	// Call PdhCollectQueryData one time to check existence of the counter
 	ret = PdhCollectQueryData(handle)
 	if ret != ERROR_SUCCESS {
 		PdhCloseQuery(handle)
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 180217214..53c4bdc1b 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -16,7 +16,7 @@ import (
 )
 
 type Graphite struct {
-	// URL is only for backwards compatability
+	// URL is only for backwards compatibility
 	Servers  []string
 	Prefix   string
 	Template string
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 71320d01e..e2b20caa4 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -22,7 +22,7 @@ var (
 
 // InfluxDB struct is the primary data structure for the plugin
 type InfluxDB struct {
-	// URL is only for backwards compatability
+	// URL is only for backwards compatibility
 	URL              string
 	URLs             []string `toml:"urls"`
 	Username         string
@@ -100,7 +100,7 @@ func (i *InfluxDB) Connect() error {
 	var urls []string
 	urls = append(urls, i.URLs...)
 
-	// Backward-compatability with single Influx URL config files
+	// Backward-compatibility with single Influx URL config files
 	// This could eventually be removed in favor of specifying the urls as a list
 	if i.URL != "" {
 		urls = append(urls, i.URL)
diff --git a/plugins/outputs/opentsdb/opentsdb_test.go b/plugins/outputs/opentsdb/opentsdb_test.go
index 83a659216..d5d7aa7e9 100644
--- a/plugins/outputs/opentsdb/opentsdb_test.go
+++ b/plugins/outputs/opentsdb/opentsdb_test.go
@@ -183,7 +183,7 @@ func BenchmarkHttpSend(b *testing.B) {
 // 	err = o.Write(testutil.MockMetrics())
 // 	require.NoError(t, err)
 
-// 	// Verify postive and negative test cases of writing data
+// 	// Verify positive and negative test cases of writing data
 // 	metrics := testutil.MockMetrics()
 // 	metrics = append(metrics, testutil.TestMetric(float64(1.0),
 // 		"justametric.float"))
diff --git a/plugins/outputs/riemann_legacy/riemann.go b/plugins/outputs/riemann_legacy/riemann.go
index 69de7f521..a1b140436 100644
--- a/plugins/outputs/riemann_legacy/riemann.go
+++ b/plugins/outputs/riemann_legacy/riemann.go
@@ -84,7 +84,7 @@ func (r *Riemann) Write(metrics []telegraf.Metric) error {
 
 	var senderr = r.client.SendMulti(events)
 	if senderr != nil {
-		r.Close() // always retuns nil
+		r.Close() // always returns nil
 		return fmt.Errorf("FAILED to send riemann message (will try to reconnect). Error: %s\n",
 			senderr)
 	}

From 76ed70340b98817c7dd15c3323b455adb79b4a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patric=20Kanngie=C3=9Fer?= <mail@patric-ka.de>
Date: Wed, 1 Nov 2017 21:28:00 +0100
Subject: [PATCH 0693/1302] Add Teamspeak 3 input plugin (#3315)

---
 Godeps                                     |   2 +
 docs/LICENSE_OF_DEPENDENCIES.md            |   2 +
 plugins/inputs/all/all.go                  |   1 +
 plugins/inputs/teamspeak/README.md         |  45 ++++++++++
 plugins/inputs/teamspeak/teamspeak.go      | 100 +++++++++++++++++++++
 plugins/inputs/teamspeak/teamspeak_test.go |  87 ++++++++++++++++++
 6 files changed, 237 insertions(+)
 create mode 100644 plugins/inputs/teamspeak/README.md
 create mode 100644 plugins/inputs/teamspeak/teamspeak.go
 create mode 100644 plugins/inputs/teamspeak/teamspeak_test.go

diff --git a/Godeps b/Godeps
index 0802675ba..02e20755e 100644
--- a/Godeps
+++ b/Godeps
@@ -40,6 +40,8 @@ github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
+github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
+github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 3774d34ce..ffd9751d7 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -82,6 +82,8 @@ following works:
 - github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
+- github.com/mitchellh/mapstructure [MIT](https://github.com/mitchellh/mapstructure/blob/master/LICENSE)
+- github.com/multiplay/go-ts3 [BSD](https://github.com/multiplay/go-ts3/blob/master/LICENSE)
 - github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)
 - github.com/wvanbergen/kafka [MIT](https://github.com/wvanbergen/kafka/blob/master/LICENSE)
 - github.com/wvanbergen/kazoo-go [MIT](https://github.com/wvanbergen/kazoo-go/blob/master/MIT-LICENSE)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 1f4d3825c..235169c86 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -86,6 +86,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
+	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
diff --git a/plugins/inputs/teamspeak/README.md b/plugins/inputs/teamspeak/README.md
new file mode 100644
index 000000000..84c4297e8
--- /dev/null
+++ b/plugins/inputs/teamspeak/README.md
@@ -0,0 +1,45 @@
+# Teamspeak 3 Input Plugin
+
+This plugin uses the Teamspeak 3 ServerQuery interface of the Teamspeak server to collect statistics of one or more
+virtual servers. If you are querying an external Teamspeak server, make sure to add the host which is running Telegraf
+to query_ip_whitelist.txt in the Teamspeak Server directory. For information about how to configure the server take a look 
+the [Teamspeak 3 ServerQuery Manual](http://media.teamspeak.com/ts3_literature/TeamSpeak%203%20Server%20Query%20Manual.pdf)
+
+### Configuration:
+
+```
+# Reads metrics from a Teamspeak 3 Server via ServerQuery
+[[inputs.teamspeak]]
+  ## Server address for Teamspeak 3 ServerQuery
+  # server = "127.0.0.1:10011"
+  ## Username for ServerQuery
+  username = "serverqueryuser"
+  ## Password for ServerQuery
+  password = "secret"
+  ## Array of virtual servers
+  # virtual_servers = [1]
+```
+
+### Measurements:
+
+- teamspeak
+    - uptime
+    - clients_online
+    - total_ping
+    - total_packet_loss
+    - packets_sent_total
+    - packets_received_total
+    - bytes_sent_total
+    - bytes_received_total
+
+### Tags:
+
+- The following tags are used:
+    - virtual_server
+    - name
+
+### Example output:
+
+```
+teamspeak,virtual_server=1,name=LeopoldsServer,host=vm01 bytes_received_total=29638202639i,uptime=13567846i,total_ping=26.89,total_packet_loss=0,packets_sent_total=415821252i,packets_received_total=237069900i,bytes_sent_total=55309568252i,clients_online=11i 1507406561000000000
+```
\ No newline at end of file
diff --git a/plugins/inputs/teamspeak/teamspeak.go b/plugins/inputs/teamspeak/teamspeak.go
new file mode 100644
index 000000000..91fdf1135
--- /dev/null
+++ b/plugins/inputs/teamspeak/teamspeak.go
@@ -0,0 +1,100 @@
+package teamspeak
+
+import (
+	"github.com/multiplay/go-ts3"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"strconv"
+)
+
+type Teamspeak struct {
+	Server         string
+	Username       string
+	Password       string
+	VirtualServers []int `toml:"virtual_servers"`
+
+	client    *ts3.Client
+	connected bool
+}
+
+func (ts *Teamspeak) Description() string {
+	return "Reads metrics from a Teamspeak 3 Server via ServerQuery"
+}
+
+const sampleConfig = `
+  ## Server address for Teamspeak 3 ServerQuery
+  # server = "127.0.0.1:10011"
+  ## Username for ServerQuery
+  username = "serverqueryuser"
+  ## Password for ServerQuery
+  password = "secret"
+  ## Array of virtual servers
+  # virtual_servers = [1]
+`
+
+func (ts *Teamspeak) SampleConfig() string {
+	return sampleConfig
+}
+
+func (ts *Teamspeak) Gather(acc telegraf.Accumulator) error {
+	var err error
+
+	if !ts.connected {
+		ts.client, err = ts3.NewClient(ts.Server)
+		if err != nil {
+			return err
+		}
+
+		err = ts.client.Login(ts.Username, ts.Password)
+		if err != nil {
+			return err
+		}
+
+		ts.connected = true
+	}
+
+	for _, vserver := range ts.VirtualServers {
+		ts.client.Use(vserver)
+
+		sm, err := ts.client.Server.Info()
+		if err != nil {
+			ts.connected = false
+			return err
+		}
+
+		sc, err := ts.client.Server.ServerConnectionInfo()
+		if err != nil {
+			ts.connected = false
+			return err
+		}
+
+		tags := map[string]string{
+			"virtual_server": strconv.Itoa(sm.ID),
+			"name":           sm.Name,
+		}
+
+		fields := map[string]interface{}{
+			"uptime":                 sm.Uptime,
+			"clients_online":         sm.ClientsOnline,
+			"total_ping":             sm.TotalPing,
+			"total_packet_loss":      sm.TotalPacketLossTotal,
+			"packets_sent_total":     sc.PacketsSentTotal,
+			"packets_received_total": sc.PacketsReceivedTotal,
+			"bytes_sent_total":       sc.BytesSentTotal,
+			"bytes_received_total":   sc.BytesReceivedTotal,
+		}
+
+		acc.AddFields("teamspeak", fields, tags)
+	}
+	return nil
+}
+
+func init() {
+	inputs.Add("teamspeak", func() telegraf.Input {
+		return &Teamspeak{
+			Server:         "127.0.0.1:10011",
+			VirtualServers: []int{1},
+		}
+	})
+}
diff --git a/plugins/inputs/teamspeak/teamspeak_test.go b/plugins/inputs/teamspeak/teamspeak_test.go
new file mode 100644
index 000000000..b66948f28
--- /dev/null
+++ b/plugins/inputs/teamspeak/teamspeak_test.go
@@ -0,0 +1,87 @@
+package teamspeak
+
+import (
+	"bufio"
+	"net"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+const welcome = `Welcome to the TeamSpeak 3 ServerQuery interface, type "help" for a list of commands and "help <command>" for information on a specific command.`
+const ok = `error id=0 msg=ok`
+const errorMsg = `error id=256 msg=command\snot\sfound`
+
+var cmd = map[string]string{
+	"login":                       "",
+	"use":                         "",
+	"serverinfo":                  `virtualserver_unique_identifier=a1vn9PLF8CMIU virtualserver_name=Testserver virtualserver_welcomemessage=Test virtualserver_platform=Linux virtualserver_version=3.0.13.8\s[Build:\s1500452811] virtualserver_maxclients=32 virtualserver_password virtualserver_clientsonline=2 virtualserver_channelsonline=1 virtualserver_created=1507400243 virtualserver_uptime=148 virtualserver_codec_encryption_mode=0 virtualserver_hostmessage virtualserver_hostmessage_mode=0 virtualserver_filebase=files\/virtualserver_1 virtualserver_default_server_group=8 virtualserver_default_channel_group=8 virtualserver_flag_password=0 virtualserver_default_channel_admin_group=5 virtualserver_max_download_total_bandwidth=18446744073709551615 virtualserver_max_upload_total_bandwidth=18446744073709551615 virtualserver_hostbanner_url virtualserver_hostbanner_gfx_url virtualserver_hostbanner_gfx_interval=0 virtualserver_complain_autoban_count=5 virtualserver_complain_autoban_time=1200 virtualserver_complain_remove_time=3600 virtualserver_min_clients_in_channel_before_forced_silence=100 virtualserver_priority_speaker_dimm_modificator=-18.0000 virtualserver_id=1 virtualserver_antiflood_points_tick_reduce=5 virtualserver_antiflood_points_needed_command_block=150 virtualserver_antiflood_points_needed_ip_block=250 virtualserver_client_connections=1 virtualserver_query_client_connections=1 virtualserver_hostbutton_tooltip virtualserver_hostbutton_url virtualserver_hostbutton_gfx_url virtualserver_queryclientsonline=1 virtualserver_download_quota=18446744073709551615 virtualserver_upload_quota=18446744073709551615 virtualserver_month_bytes_downloaded=0 virtualserver_month_bytes_uploaded=0 virtualserver_total_bytes_downloaded=0 virtualserver_total_bytes_uploaded=0 virtualserver_port=9987 virtualserver_autostart=1 virtualserver_machine_id virtualserver_needed_identity_security_level=8 virtualserver_log_client=0 virtualserver_log_query=0 virtualserver_log_channel=0 virtualserver_log_permissions=1 virtualserver_log_server=0 virtualserver_log_filetransfer=0 virtualserver_min_client_version=1445512488 virtualserver_name_phonetic virtualserver_icon_id=0 virtualserver_reserved_slots=0 virtualserver_total_packetloss_speech=0.0000 virtualserver_total_packetloss_keepalive=0.0000 virtualserver_total_packetloss_control=0.0000 virtualserver_total_packetloss_total=0.0000 virtualserver_total_ping=1.0000 virtualserver_ip=0.0.0.0,\s:: virtualserver_weblist_enabled=1 virtualserver_ask_for_privilegekey=0 virtualserver_hostbanner_mode=0 virtualserver_channel_temp_delete_delay_default=0 virtualserver_min_android_version=1407159763 virtualserver_min_ios_version=1407159763 virtualserver_status=online connection_filetransfer_bandwidth_sent=0 connection_filetransfer_bandwidth_received=0 connection_filetransfer_bytes_sent_total=0 connection_filetransfer_bytes_received_total=0 connection_packets_sent_speech=0 connection_bytes_sent_speech=0 connection_packets_received_speech=0 connection_bytes_received_speech=0 connection_packets_sent_keepalive=261 connection_bytes_sent_keepalive=10701 connection_packets_received_keepalive=261 connection_bytes_received_keepalive=10961 connection_packets_sent_control=54 connection_bytes_sent_control=15143 connection_packets_received_control=55 connection_bytes_received_control=4239 connection_packets_sent_total=315 connection_bytes_sent_total=25844 connection_packets_received_total=316 connection_bytes_received_total=15200 connection_bandwidth_sent_last_second_total=81 connection_bandwidth_sent_last_minute_total=141 connection_bandwidth_received_last_second_total=83 connection_bandwidth_received_last_minute_total=98`,
+	"serverrequestconnectioninfo": `connection_filetransfer_bandwidth_sent=0 connection_filetransfer_bandwidth_received=0 connection_filetransfer_bytes_sent_total=0 connection_filetransfer_bytes_received_total=0 connection_packets_sent_total=369 connection_bytes_sent_total=28058 connection_packets_received_total=370 connection_bytes_received_total=17468 connection_bandwidth_sent_last_second_total=81 connection_bandwidth_sent_last_minute_total=109 connection_bandwidth_received_last_second_total=83 connection_bandwidth_received_last_minute_total=94 connection_connected_time=174 connection_packetloss_total=0.0000 connection_ping=1.0000`,
+}
+
+func TestGather(t *testing.T) {
+	l, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal("Initializing test server failed")
+	}
+	defer l.Close()
+
+	go handleRequest(l, t)
+
+	var acc testutil.Accumulator
+	testConfig := Teamspeak{
+		Server:         l.Addr().String(),
+		Username:       "serveradmin",
+		Password:       "test",
+		VirtualServers: []int{1},
+	}
+	err = testConfig.Gather(&acc)
+
+	if err != nil {
+		t.Fatalf("Gather returned error. Error: %s\n", err)
+	}
+
+	fields := map[string]interface{}{
+		"uptime":                 int(148),
+		"clients_online":         int(2),
+		"total_ping":             float32(1.0000),
+		"total_packet_loss":      float64(0.0000),
+		"packets_sent_total":     uint64(369),
+		"packets_received_total": uint64(370),
+		"bytes_sent_total":       uint64(28058),
+		"bytes_received_total":   uint64(17468),
+	}
+
+	acc.AssertContainsFields(t, "teamspeak", fields)
+}
+
+func handleRequest(l net.Listener, t *testing.T) {
+	c, err := l.Accept()
+	if err != nil {
+		t.Fatal("Error accepting test connection")
+	}
+	c.Write([]byte("TS3\n\r" + welcome + "\n\r"))
+	for {
+		msg, _, err := bufio.NewReader(c).ReadLine()
+		if err != nil {
+			return
+		}
+		r, exists := cmd[strings.Split(string(msg), " ")[0]]
+
+		if exists {
+			switch r {
+			case "":
+				c.Write([]byte(ok + "\n\r"))
+			case "quit":
+				c.Write([]byte(ok + "\n\r"))
+				c.Close()
+				return
+			default:
+				c.Write([]byte(r + "\n\r" + ok + "\n\r"))
+			}
+		} else {
+			c.Write([]byte(errorMsg + "\n\r"))
+		}
+	}
+}

From 26ccc1f20518fc153affc69ab9507e5e4c4a31f1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 1 Nov 2017 13:30:43 -0700
Subject: [PATCH 0694/1302] Add teamspeak to readme and update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aee56f33..f527fdca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
+- [teamspeak](./plugins/inputs/teamspeak/README.md) - Thanks to @p4ddy1
 - [wavefront](./plugins/outputs/wavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
@@ -50,6 +51,7 @@
 - [#3333](https://github.com/influxdata/telegraf/issues/3333): Perform DNS lookup before ping and report result.
 - [#3398](https://github.com/influxdata/telegraf/issues/3398): Add instance name option to varnish plugin.
 - [#3406](https://github.com/influxdata/telegraf/pull/3406):  Add support for SSL settings to ElasticSearch output plugin.
+- [#3315](https://github.com/influxdata/telegraf/pull/3315): Add Teamspeak 3 input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 62d725083..0f0f85ba2 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,7 @@ configuration options.
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
 * [varnish](./plugins/inputs/varnish)

From 9b0af4478b678fbfa346ec773ecb7638eb9f6ef8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 1 Nov 2017 18:17:51 -0700
Subject: [PATCH 0695/1302] Remove incorrect comment about linker options

---
 cmd/telegraf/telegraf.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 42fd6cf2f..9e286e362 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -55,9 +55,6 @@ var fUsage = flag.String("usage", "",
 var fService = flag.String("service", "",
 	"operate on the service")
 
-// Telegraf version, populated linker.
-//   ie, -ldflags "-X main.version=`git describe --always --tags`"
-
 var (
 	nextVersion = "1.5.0"
 	version     string

From 5d135cece3bec4a6e175a25010360ba742d9266c Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 2 Nov 2017 14:19:01 -0400
Subject: [PATCH 0696/1302] test son update

---
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index eecf26e14..850b2c4fc 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -74,7 +74,7 @@ func NewItemJSON() string {
 			  "altitude": 119.331436,
 			  "broadband": 1266,
 			  "infrared": 528,
-			  "lux": 0
+			  "lux": 0.0
 		  }
 	  },
 	  "ttl": 60,

From 8560c2f88d66380d67ddc3b765040a106b2c0edc Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 2 Nov 2017 17:19:37 -0400
Subject: [PATCH 0697/1302] Fixed Readme

---
 plugins/inputs/webhooks/particle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index 1212b742a..bae4a2d14 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -1,6 +1,6 @@
 # particle webhooks
 
-You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
+You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `https://console.particle.io/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
 
 ## Events
 

From 1d1d5e6089ff67c5ab0d1ca9d015942afa8517d4 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 2 Nov 2017 17:21:50 -0400
Subject: [PATCH 0698/1302] Updated Test JSON

---
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index 850b2c4fc..53252ff17 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -72,8 +72,8 @@ func NewItemJSON() string {
 			  "humidity": 44.937500,
 			  "pressure": 998.998901,
 			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
+			  "broadband": 1266.0,
+			  "infrared": 528.0,
 			  "lux": 0.0
 		  }
 	  },

From ba462f5c9474407160123cda908db7fdb4bb1daa Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Mon, 2 Oct 2017 16:50:23 -0400
Subject: [PATCH 0699/1302] New Particle Plugin

---
 .txt                                          |  0
 plugins/inputs/webhooks/particle/README.md    | 26 +++++++++
 .../webhooks/particle/particle_webhooks.go    | 48 ++++++++++++++++
 .../particle/particle_webhooks_events.go      | 22 +++++++
 .../particle_webhooks_events_json_test.go     | 39 +++++++++++++
 .../particle/particle_webhooks_test.go        | 57 +++++++++++++++++++
 plugins/inputs/webhooks/webhooks.go           |  5 ++
 plugins/inputs/webhooks/webhooks_test.go      |  6 ++
 8 files changed, 203 insertions(+)
 create mode 100644 .txt
 create mode 100644 plugins/inputs/webhooks/particle/README.md
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.txt b/.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
new file mode 100644
index 000000000..1212b742a
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -0,0 +1,26 @@
+# particle webhooks
+
+You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
+
+## Events
+
+Your Particle device should publish an event that contains a JSON in the form of:
+```
+String data = String::format("{ \"tags\" : {
+	    \"tag_name\": \"tag_value\", 
+	    \"other_tag\": \"other_value\"
+    }, 
+	\"values\": {
+	    \"value_name\": %f, 
+		\"other_value\": %f, 
+    }
+    }",  value_value, other_value
+	);
+    Particle.publish("event_name", data, PRIVATE);
+```
+Escaping the "" is required in the source file.
+The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
+
+You will need to enable JSON messages in the Webhooks setup of Particle.io
+
+See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
new file mode 100644
index 000000000..813bd0665
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -0,0 +1,48 @@
+package particle
+
+import (
+	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"time"
+)
+
+type ParticleWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
+	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
+	rb.acc = acc
+}
+
+func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	dummy := &DummyData{}
+	if err := json.Unmarshal(data, dummy); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pd := &ParticleData{}
+	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pTime, err := dummy.Time()
+	if err != nil {
+		log.Printf("Time Conversion Error")
+		pTime = time.Now()
+	}
+	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
new file mode 100644
index 000000000..089536525
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
@@ -0,0 +1,22 @@
+package particle
+
+import (
+	"time"
+)
+
+type DummyData struct {
+	Event       string `json:"event"`
+	Data        string `json:"data"`
+	Ttl         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	InfluxDB    string `json:"influx_db"`
+}
+type ParticleData struct {
+	Event  string                 `json:"event"`
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func (d *DummyData) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
new file mode 100644
index 000000000..aef0537e9
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
@@ -0,0 +1,39 @@
+package particle
+
+func NewItemJSON() string {
+	return `
+	{ 
+	  "event": "temperature",
+	  "data": "{ 
+		  "tags": {
+			  "id": "230035001147343438323536", 
+			  "location": "TravelingWilbury"
+		  }, 
+		  "values": {
+			  "temp_c": 26.680000, 
+			  "temp_f": 80.024001, 
+			  "humidity": 44.937500, 
+			  "pressure": 998.998901, 
+			  "altitude": 119.331436, 
+			  "broadband": 1266, 
+			  "infrared": 528, 
+			  "lux": 0
+		  }
+	  }",
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor"
+	  "influx_db": "mydata"
+  }`
+}
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
new file mode 100644
index 000000000..c62e0f0c8
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -0,0 +1,57 @@
+package particle
+
+import (
+	"github.com/influxdata/telegraf/testutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	log.Printf("eventBody: %s\n", eventBody)
+	w := httptest.NewRecorder()
+	w.Code = 500
+
+	rb.eventHandler(w, req)
+
+	return w
+}
+
+func TestNewItem(t *testing.T) {
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, NewItemJSON())
+	log.Printf("Respnse: %s\n", resp.Body)
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"temp_c":    26.680000,
+		"temp_f":    80.024001,
+		"humidity":  44.937500,
+		"pressure":  998.998901,
+		"altitude":  119.331436,
+		"broadband": 1266,
+		"infrared":  528,
+		"lux":       0,
+	}
+
+	tags := map[string]string{
+		"id":       "230035001147343438323536",
+		"location": "TravelingWilbury",
+	}
+
+	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
+}
+func TestUnknowItem(t *testing.T) {
+	rb := &ParticleWebhook{Path: "/particle"}
+	resp := postWebhooks(rb, UnknowJSON())
+	log.Printf("Response: %s\n", resp.Body)
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 698cde159..794b55168 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,6 +35,7 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
+	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -62,6 +64,9 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
+	
+   [inputs.webhooks.particle]
+      path = "/particle"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 6d3448870..1a5fa4aa1 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -33,4 +34,9 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
+	wb.Particle = &particle.ParticleWebhook{Path: "/particle"}
+	expected = append(expected, wb.Particle)
+	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
+		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
+	}
 }

From 86961cc8143e3b2edfaabb97c639030754ea9edc Mon Sep 17 00:00:00 2001
From: David Norton <dgnorton@gmail.com>
Date: Tue, 3 Oct 2017 09:04:29 -0400
Subject: [PATCH 0700/1302] bug fixes and refactoring

---
 .../webhooks/particle/particle_webhooks.go    | 61 ++++++++++++-------
 .../particle/particle_webhooks_events.go      | 22 -------
 .../particle_webhooks_events_json_test.go     | 39 ------------
 .../particle/particle_webhooks_test.go        | 60 +++++++++++++++---
 4 files changed, 90 insertions(+), 92 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
index 813bd0665..258619856 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -2,14 +2,40 @@ package particle
 
 import (
 	"encoding/json"
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
 )
 
+type event struct {
+	Name        string `json:"event"`
+	Data        data   `json:"data"`
+	TTL         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	Database    string `json:"influx_db"`
+}
+
+type data struct {
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func newEvent() *event {
+	return &event{
+		Data: data{
+			Tags:   make(map[string]string),
+			Fields: make(map[string]interface{}),
+		},
+	}
+}
+
+func (e *event) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
+}
+
 type ParticleWebhook struct {
 	Path string
 	acc  telegraf.Accumulator
@@ -23,26 +49,19 @@ func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator
 
 func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
-	data, err := ioutil.ReadAll(r.Body)
+	e := newEvent()
+	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
+		log.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	pTime, err := e.Time()
 	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	dummy := &DummyData{}
-	if err := json.Unmarshal(data, dummy); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pd := &ParticleData{}
-	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pTime, err := dummy.Time()
-	if err != nil {
-		log.Printf("Time Conversion Error")
 		pTime = time.Now()
+		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
 	}
-	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
+
+	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
 	w.WriteHeader(http.StatusOK)
 }
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
deleted file mode 100644
index 089536525..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package particle
-
-import (
-	"time"
-)
-
-type DummyData struct {
-	Event       string `json:"event"`
-	Data        string `json:"data"`
-	Ttl         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	InfluxDB    string `json:"influx_db"`
-}
-type ParticleData struct {
-	Event  string                 `json:"event"`
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func (d *DummyData) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
deleted file mode 100644
index aef0537e9..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package particle
-
-func NewItemJSON() string {
-	return `
-	{ 
-	  "event": "temperature",
-	  "data": "{ 
-		  "tags": {
-			  "id": "230035001147343438323536", 
-			  "location": "TravelingWilbury"
-		  }, 
-		  "values": {
-			  "temp_c": 26.680000, 
-			  "temp_f": 80.024001, 
-			  "humidity": 44.937500, 
-			  "pressure": 998.998901, 
-			  "altitude": 119.331436, 
-			  "broadband": 1266, 
-			  "infrared": 528, 
-			  "lux": 0
-		  }
-	  }",
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor"
-	  "influx_db": "mydata"
-  }`
-}
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index c62e0f0c8..eecf26e14 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -1,17 +1,16 @@
 package particle
 
 import (
-	"github.com/influxdata/telegraf/testutil"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
 	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	log.Printf("eventBody: %s\n", eventBody)
 	w := httptest.NewRecorder()
 	w.Code = 500
 
@@ -21,10 +20,10 @@ func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecor
 }
 
 func TestNewItem(t *testing.T) {
+	t.Parallel()
 	var acc testutil.Accumulator
 	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, NewItemJSON())
-	log.Printf("Respnse: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
@@ -32,12 +31,12 @@ func TestNewItem(t *testing.T) {
 	fields := map[string]interface{}{
 		"temp_c":    26.680000,
 		"temp_f":    80.024001,
+		"infrared":  528.0,
+		"lux":       0.0,
 		"humidity":  44.937500,
 		"pressure":  998.998901,
 		"altitude":  119.331436,
-		"broadband": 1266,
-		"infrared":  528,
-		"lux":       0,
+		"broadband": 1266.0,
 	}
 
 	tags := map[string]string{
@@ -45,13 +44,54 @@ func TestNewItem(t *testing.T) {
 		"location": "TravelingWilbury",
 	}
 
-	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
+	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
 }
+
 func TestUnknowItem(t *testing.T) {
-	rb := &ParticleWebhook{Path: "/particle"}
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, UnknowJSON())
-	log.Printf("Response: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
 }
+
+func NewItemJSON() string {
+	return `
+	{
+	  "event": "temperature",
+	  "data": {
+		  "tags": {
+			  "id": "230035001147343438323536",
+			  "location": "TravelingWilbury"
+		  },
+		  "values": {
+			  "temp_c": 26.680000,
+			  "temp_f": 80.024001,
+			  "humidity": 44.937500,
+			  "pressure": 998.998901,
+			  "altitude": 119.331436,
+			  "broadband": 1266,
+			  "infrared": 528,
+			  "lux": 0
+		  }
+	  },
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor",
+	  "influx_db": "mydata"
+  }`
+}
+
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}

From 8ed00af10a9a5950850f27a5c196dcc0245166b0 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 5 Oct 2017 16:13:19 -0400
Subject: [PATCH 0701/1302] Update README.md

---
 plugins/inputs/webhooks/particle/README.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index 1212b742a..d11b6f7fb 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -1,6 +1,15 @@
 # particle webhooks
 
-You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
+You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `console.particle.io/` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
+
+```
+{
+    "influx_db": "your_database_name"
+}
+```
+
+If required, enter your username and password, etc. and then click `Save`
+
 
 ## Events
 
@@ -18,9 +27,9 @@ String data = String::format("{ \"tags\" : {
 	);
     Particle.publish("event_name", data, PRIVATE);
 ```
-Escaping the "" is required in the source file.
+Escaping the "" is required in the source file on the Particle device.
 The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
 
-You will need to enable JSON messages in the Webhooks setup of Particle.io
+
 
 See [webhook doc](https://docs.particle.io/reference/webhooks/)

From a6ada03b910ffa5ac8bc85ad52a1b789dc99aae6 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 5 Oct 2017 16:14:27 -0400
Subject: [PATCH 0702/1302] Updated README.md

---
 plugins/inputs/webhooks/particle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index d11b6f7fb..e7b206b53 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -28,7 +28,7 @@ String data = String::format("{ \"tags\" : {
     Particle.publish("event_name", data, PRIVATE);
 ```
 Escaping the "" is required in the source file on the Particle device.
-The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
+The number of tag values and field values is not restricted so you can send as many values per webhook call as you'd like.
 
 
 

From a987118b010ca3827c1ee8ebe691f6f6bd287ac5 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 2 Nov 2017 15:18:45 -0400
Subject: [PATCH 0703/1302] Small fixes

Hoping to pass CircleCI this time
---
 plugins/inputs/webhooks/particle/README.md                 | 4 ++--
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index e7b206b53..3c345daa8 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -1,10 +1,10 @@
 # particle webhooks
 
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `console.particle.io/` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
+You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
 
 ```
 {
-    "influx_db": "your_database_name"
+    "influx_db": "your_measurement_name"
 }
 ```
 
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index eecf26e14..850b2c4fc 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -74,7 +74,7 @@ func NewItemJSON() string {
 			  "altitude": 119.331436,
 			  "broadband": 1266,
 			  "infrared": 528,
-			  "lux": 0
+			  "lux": 0.0
 		  }
 	  },
 	  "ttl": 60,

From 92caf33fff56eb730be62f235ede68d2e833db83 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 2 Nov 2017 17:23:09 -0400
Subject: [PATCH 0704/1302] Updated Test JSON

---
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index 850b2c4fc..53252ff17 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -72,8 +72,8 @@ func NewItemJSON() string {
 			  "humidity": 44.937500,
 			  "pressure": 998.998901,
 			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
+			  "broadband": 1266.0,
+			  "infrared": 528.0,
 			  "lux": 0.0
 		  }
 	  },

From 4596ae70a9063f457c131291d984b77e625852d4 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 12:05:17 -0400
Subject: [PATCH 0705/1302] ignore mac-files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8269337df..e93bc8dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tivan
 .idea
 *~
 *#
+.DS_Store

From 883696c224f2d56dd07c8551e936489f691abec7 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:16:09 -0400
Subject: [PATCH 0706/1302] Revert "Updated Test JSON"

This reverts commit 92caf33fff56eb730be62f235ede68d2e833db83.
---
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index 53252ff17..850b2c4fc 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -72,8 +72,8 @@ func NewItemJSON() string {
 			  "humidity": 44.937500,
 			  "pressure": 998.998901,
 			  "altitude": 119.331436,
-			  "broadband": 1266.0,
-			  "infrared": 528.0,
+			  "broadband": 1266,
+			  "infrared": 528,
 			  "lux": 0.0
 		  }
 	  },

From c11739d143c99debd4ca3d21f54dd76e9c88ca69 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:17:10 -0400
Subject: [PATCH 0707/1302] Revert "Updated Test JSON"

This reverts commit 92caf33fff56eb730be62f235ede68d2e833db83.
---
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index 53252ff17..850b2c4fc 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -72,8 +72,8 @@ func NewItemJSON() string {
 			  "humidity": 44.937500,
 			  "pressure": 998.998901,
 			  "altitude": 119.331436,
-			  "broadband": 1266.0,
-			  "infrared": 528.0,
+			  "broadband": 1266,
+			  "infrared": 528,
 			  "lux": 0.0
 		  }
 	  },

From f64b23b724d06ac697431b6983924919080eb9e7 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:18:17 -0400
Subject: [PATCH 0708/1302] Revert "Small fixes"

This reverts commit a987118b010ca3827c1ee8ebe691f6f6bd287ac5.
---
 plugins/inputs/webhooks/particle/README.md                 | 4 ++--
 plugins/inputs/webhooks/particle/particle_webhooks_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index 3c345daa8..e7b206b53 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -1,10 +1,10 @@
 # particle webhooks
 
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
+You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `console.particle.io/` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
 
 ```
 {
-    "influx_db": "your_measurement_name"
+    "influx_db": "your_database_name"
 }
 ```
 
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index 850b2c4fc..eecf26e14 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -74,7 +74,7 @@ func NewItemJSON() string {
 			  "altitude": 119.331436,
 			  "broadband": 1266,
 			  "infrared": 528,
-			  "lux": 0.0
+			  "lux": 0
 		  }
 	  },
 	  "ttl": 60,

From 440918a03b7ae47efaf444e56485c4d76640b875 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:18:30 -0400
Subject: [PATCH 0709/1302] Revert "Updated README.md"

This reverts commit a6ada03b910ffa5ac8bc85ad52a1b789dc99aae6.
---
 plugins/inputs/webhooks/particle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index e7b206b53..d11b6f7fb 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -28,7 +28,7 @@ String data = String::format("{ \"tags\" : {
     Particle.publish("event_name", data, PRIVATE);
 ```
 Escaping the "" is required in the source file on the Particle device.
-The number of tag values and field values is not restricted so you can send as many values per webhook call as you'd like.
+The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
 
 
 

From 8e587e74f5b65aa419dfefbef01f2e500dc005e9 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:28:00 -0400
Subject: [PATCH 0710/1302] Revert "Update README.md"

This reverts commit 8ed00af10a9a5950850f27a5c196dcc0245166b0.
---
 plugins/inputs/webhooks/particle/README.md | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index d11b6f7fb..1212b742a 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -1,15 +1,6 @@
 # particle webhooks
 
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `console.particle.io/` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
-
-```
-{
-    "influx_db": "your_database_name"
-}
-```
-
-If required, enter your username and password, etc. and then click `Save`
-
+You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
 
 ## Events
 
@@ -27,9 +18,9 @@ String data = String::format("{ \"tags\" : {
 	);
     Particle.publish("event_name", data, PRIVATE);
 ```
-Escaping the "" is required in the source file on the Particle device.
+Escaping the "" is required in the source file.
 The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
 
-
+You will need to enable JSON messages in the Webhooks setup of Particle.io
 
 See [webhook doc](https://docs.particle.io/reference/webhooks/)

From 871fae6eb34d54049ad242c14cfd38c007f6b01b Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:28:35 -0400
Subject: [PATCH 0711/1302] Revert "bug fixes and refactoring"

This reverts commit 86961cc8143e3b2edfaabb97c639030754ea9edc.
---
 .../webhooks/particle/particle_webhooks.go    | 59 +++++++-----------
 .../particle/particle_webhooks_events.go      | 22 +++++++
 .../particle_webhooks_events_json_test.go     | 39 ++++++++++++
 .../particle/particle_webhooks_test.go        | 60 ++++---------------
 4 files changed, 91 insertions(+), 89 deletions(-)
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go

diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
index 258619856..813bd0665 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -2,40 +2,14 @@ package particle
 
 import (
 	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
 )
 
-type event struct {
-	Name        string `json:"event"`
-	Data        data   `json:"data"`
-	TTL         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	Database    string `json:"influx_db"`
-}
-
-type data struct {
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func newEvent() *event {
-	return &event{
-		Data: data{
-			Tags:   make(map[string]string),
-			Fields: make(map[string]interface{}),
-		},
-	}
-}
-
-func (e *event) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
-}
-
 type ParticleWebhook struct {
 	Path string
 	acc  telegraf.Accumulator
@@ -49,19 +23,26 @@ func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator
 
 func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
-	e := newEvent()
-	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
-		log.Println(err)
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-
-	pTime, err := e.Time()
-	if err != nil {
-		pTime = time.Now()
-		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
+	dummy := &DummyData{}
+	if err := json.Unmarshal(data, dummy); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
 	}
-
-	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
+	pd := &ParticleData{}
+	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pTime, err := dummy.Time()
+	if err != nil {
+		log.Printf("Time Conversion Error")
+		pTime = time.Now()
+	}
+	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
 	w.WriteHeader(http.StatusOK)
 }
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
new file mode 100644
index 000000000..089536525
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
@@ -0,0 +1,22 @@
+package particle
+
+import (
+	"time"
+)
+
+type DummyData struct {
+	Event       string `json:"event"`
+	Data        string `json:"data"`
+	Ttl         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	InfluxDB    string `json:"influx_db"`
+}
+type ParticleData struct {
+	Event  string                 `json:"event"`
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func (d *DummyData) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
new file mode 100644
index 000000000..aef0537e9
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
@@ -0,0 +1,39 @@
+package particle
+
+func NewItemJSON() string {
+	return `
+	{ 
+	  "event": "temperature",
+	  "data": "{ 
+		  "tags": {
+			  "id": "230035001147343438323536", 
+			  "location": "TravelingWilbury"
+		  }, 
+		  "values": {
+			  "temp_c": 26.680000, 
+			  "temp_f": 80.024001, 
+			  "humidity": 44.937500, 
+			  "pressure": 998.998901, 
+			  "altitude": 119.331436, 
+			  "broadband": 1266, 
+			  "infrared": 528, 
+			  "lux": 0
+		  }
+	  }",
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor"
+	  "influx_db": "mydata"
+  }`
+}
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
index eecf26e14..c62e0f0c8 100644
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -1,16 +1,17 @@
 package particle
 
 import (
+	"github.com/influxdata/telegraf/testutil"
+	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
 )
 
 func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
 	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	log.Printf("eventBody: %s\n", eventBody)
 	w := httptest.NewRecorder()
 	w.Code = 500
 
@@ -20,10 +21,10 @@ func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecor
 }
 
 func TestNewItem(t *testing.T) {
-	t.Parallel()
 	var acc testutil.Accumulator
 	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, NewItemJSON())
+	log.Printf("Respnse: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
@@ -31,12 +32,12 @@ func TestNewItem(t *testing.T) {
 	fields := map[string]interface{}{
 		"temp_c":    26.680000,
 		"temp_f":    80.024001,
-		"infrared":  528.0,
-		"lux":       0.0,
 		"humidity":  44.937500,
 		"pressure":  998.998901,
 		"altitude":  119.331436,
-		"broadband": 1266.0,
+		"broadband": 1266,
+		"infrared":  528,
+		"lux":       0,
 	}
 
 	tags := map[string]string{
@@ -44,54 +45,13 @@ func TestNewItem(t *testing.T) {
 		"location": "TravelingWilbury",
 	}
 
-	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
+	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
 }
-
 func TestUnknowItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	rb := &ParticleWebhook{Path: "/particle"}
 	resp := postWebhooks(rb, UnknowJSON())
+	log.Printf("Response: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
 }
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event": "temperature",
-	  "data": {
-		  "tags": {
-			  "id": "230035001147343438323536",
-			  "location": "TravelingWilbury"
-		  },
-		  "values": {
-			  "temp_c": 26.680000,
-			  "temp_f": 80.024001,
-			  "humidity": 44.937500,
-			  "pressure": 998.998901,
-			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
-			  "lux": 0
-		  }
-	  },
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor",
-	  "influx_db": "mydata"
-  }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}

From 7db06d2aa4faa5f979fcfe0765884088c3f2d0ca Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:28:54 -0400
Subject: [PATCH 0712/1302] Revert "New Particle Plugin"

This reverts commit ba462f5c9474407160123cda908db7fdb4bb1daa.
---
 .txt                                          |  0
 plugins/inputs/webhooks/particle/README.md    | 26 ---------
 .../webhooks/particle/particle_webhooks.go    | 48 ----------------
 .../particle/particle_webhooks_events.go      | 22 -------
 .../particle_webhooks_events_json_test.go     | 39 -------------
 .../particle/particle_webhooks_test.go        | 57 -------------------
 plugins/inputs/webhooks/webhooks.go           |  5 --
 plugins/inputs/webhooks/webhooks_test.go      |  6 --
 8 files changed, 203 deletions(-)
 delete mode 100644 .txt
 delete mode 100644 plugins/inputs/webhooks/particle/README.md
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.txt b/.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
deleted file mode 100644
index 1212b742a..000000000
--- a/plugins/inputs/webhooks/particle/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# particle webhooks
-
-You should configure your Rollbar's Webhooks to point at the `webhooks` service. To do this go to `particle.com/` and click `Settings > Notifications > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and click on `Enable Webhook Integration`.
-
-## Events
-
-Your Particle device should publish an event that contains a JSON in the form of:
-```
-String data = String::format("{ \"tags\" : {
-	    \"tag_name\": \"tag_value\", 
-	    \"other_tag\": \"other_value\"
-    }, 
-	\"values\": {
-	    \"value_name\": %f, 
-		\"other_value\": %f, 
-    }
-    }",  value_value, other_value
-	);
-    Particle.publish("event_name", data, PRIVATE);
-```
-Escaping the "" is required in the source file.
-The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
-
-You will need to enable JSON messages in the Webhooks setup of Particle.io
-
-See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
deleted file mode 100644
index 813bd0665..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package particle
-
-import (
-	"encoding/json"
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"time"
-)
-
-type ParticleWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
-}
-
-func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
-	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
-	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
-	rb.acc = acc
-}
-
-func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	data, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	dummy := &DummyData{}
-	if err := json.Unmarshal(data, dummy); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pd := &ParticleData{}
-	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	pTime, err := dummy.Time()
-	if err != nil {
-		log.Printf("Time Conversion Error")
-		pTime = time.Now()
-	}
-	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events.go b/plugins/inputs/webhooks/particle/particle_webhooks_events.go
deleted file mode 100644
index 089536525..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package particle
-
-import (
-	"time"
-)
-
-type DummyData struct {
-	Event       string `json:"event"`
-	Data        string `json:"data"`
-	Ttl         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	InfluxDB    string `json:"influx_db"`
-}
-type ParticleData struct {
-	Event  string                 `json:"event"`
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func (d *DummyData) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
deleted file mode 100644
index aef0537e9..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package particle
-
-func NewItemJSON() string {
-	return `
-	{ 
-	  "event": "temperature",
-	  "data": "{ 
-		  "tags": {
-			  "id": "230035001147343438323536", 
-			  "location": "TravelingWilbury"
-		  }, 
-		  "values": {
-			  "temp_c": 26.680000, 
-			  "temp_f": 80.024001, 
-			  "humidity": 44.937500, 
-			  "pressure": 998.998901, 
-			  "altitude": 119.331436, 
-			  "broadband": 1266, 
-			  "infrared": 528, 
-			  "lux": 0
-		  }
-	  }",
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor"
-	  "influx_db": "mydata"
-  }`
-}
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
deleted file mode 100644
index c62e0f0c8..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package particle
-
-import (
-	"github.com/influxdata/telegraf/testutil"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-)
-
-func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	log.Printf("eventBody: %s\n", eventBody)
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, NewItemJSON())
-	log.Printf("Respnse: %s\n", resp.Body)
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-
-	fields := map[string]interface{}{
-		"temp_c":    26.680000,
-		"temp_f":    80.024001,
-		"humidity":  44.937500,
-		"pressure":  998.998901,
-		"altitude":  119.331436,
-		"broadband": 1266,
-		"infrared":  528,
-		"lux":       0,
-	}
-
-	tags := map[string]string{
-		"id":       "230035001147343438323536",
-		"location": "TravelingWilbury",
-	}
-
-	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
-}
-func TestUnknowItem(t *testing.T) {
-	rb := &ParticleWebhook{Path: "/particle"}
-	resp := postWebhooks(rb, UnknowJSON())
-	log.Printf("Response: %s\n", resp.Body)
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 794b55168..698cde159 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,7 +15,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
-	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -35,7 +34,6 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
-	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -64,9 +62,6 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
-	
-   [inputs.webhooks.particle]
-      path = "/particle"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 1a5fa4aa1..6d3448870 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
-	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,9 +33,4 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
-	wb.Particle = &particle.ParticleWebhook{Path: "/particle"}
-	expected = append(expected, wb.Particle)
-	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
-		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
-	}
 }

From 2c31345c70dac556664f12a39e68cd7c85856e4e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 3 Nov 2017 21:06:59 -0700
Subject: [PATCH 0713/1302] Revert changes since 9b0af4478

---
 .gitignore                                    |  1 -
 plugins/inputs/webhooks/particle/README.md    | 35 -------
 .../webhooks/particle/particle_webhooks.go    | 67 -------------
 .../particle/particle_webhooks_test.go        | 97 -------------------
 4 files changed, 200 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/README.md
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.gitignore b/.gitignore
index e93bc8dff..8269337df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ tivan
 .idea
 *~
 *#
-.DS_Store
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
deleted file mode 100644
index 3c345daa8..000000000
--- a/plugins/inputs/webhooks/particle/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# particle webhooks
-
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
-
-```
-{
-    "influx_db": "your_measurement_name"
-}
-```
-
-If required, enter your username and password, etc. and then click `Save`
-
-
-## Events
-
-Your Particle device should publish an event that contains a JSON in the form of:
-```
-String data = String::format("{ \"tags\" : {
-	    \"tag_name\": \"tag_value\", 
-	    \"other_tag\": \"other_value\"
-    }, 
-	\"values\": {
-	    \"value_name\": %f, 
-		\"other_value\": %f, 
-    }
-    }",  value_value, other_value
-	);
-    Particle.publish("event_name", data, PRIVATE);
-```
-Escaping the "" is required in the source file on the Particle device.
-The number of tag values and field values is not restricted so you can send as many values per webhook call as you'd like.
-
-
-
-See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
deleted file mode 100644
index 258619856..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package particle
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-)
-
-type event struct {
-	Name        string `json:"event"`
-	Data        data   `json:"data"`
-	TTL         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	Database    string `json:"influx_db"`
-}
-
-type data struct {
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func newEvent() *event {
-	return &event{
-		Data: data{
-			Tags:   make(map[string]string),
-			Fields: make(map[string]interface{}),
-		},
-	}
-}
-
-func (e *event) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
-}
-
-type ParticleWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
-}
-
-func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
-	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
-	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
-	rb.acc = acc
-}
-
-func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	e := newEvent()
-	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
-		log.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	pTime, err := e.Time()
-	if err != nil {
-		pTime = time.Now()
-		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
-	}
-
-	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
deleted file mode 100644
index 850b2c4fc..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package particle
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, NewItemJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-
-	fields := map[string]interface{}{
-		"temp_c":    26.680000,
-		"temp_f":    80.024001,
-		"infrared":  528.0,
-		"lux":       0.0,
-		"humidity":  44.937500,
-		"pressure":  998.998901,
-		"altitude":  119.331436,
-		"broadband": 1266.0,
-	}
-
-	tags := map[string]string{
-		"id":       "230035001147343438323536",
-		"location": "TravelingWilbury",
-	}
-
-	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
-}
-
-func TestUnknowItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, UnknowJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event": "temperature",
-	  "data": {
-		  "tags": {
-			  "id": "230035001147343438323536",
-			  "location": "TravelingWilbury"
-		  },
-		  "values": {
-			  "temp_c": 26.680000,
-			  "temp_f": 80.024001,
-			  "humidity": 44.937500,
-			  "pressure": 998.998901,
-			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
-			  "lux": 0.0
-		  }
-	  },
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor",
-	  "influx_db": "mydata"
-  }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}

From c14478f025e053bf3947ca99db6393ae2b9e230c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 3 Nov 2017 21:52:45 -0700
Subject: [PATCH 0714/1302] Update http_listener certs

---
 .../http_listener/http_listener_test.go       | 115 ++++++++----------
 scripts/tls-certs.sh                          |   4 +-
 2 files changed, 54 insertions(+), 65 deletions(-)

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 2d4da8940..d79e9576a 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -34,82 +34,71 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 	emptyMsg = ""
 
 	serviceRootPEM = `-----BEGIN CERTIFICATE-----
-MIIBxzCCATCgAwIBAgIJAOLq2g9+9TVgMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
-BAMMC1RlbGVncmFmIENBMB4XDTE3MTAwMjIyNDMwOFoXDTE3MTEwMTIyNDMwOFow
+MIIBxzCCATCgAwIBAgIJAJb7HqN2BzWWMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMMC1RlbGVncmFmIENBMB4XDTE3MTEwNDA0MzEwN1oXDTI3MTEwMjA0MzEwN1ow
 FjEUMBIGA1UEAwwLVGVsZWdyYWYgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALHtGXLKZz3HUA4E1H0mR3gAtgNwUSRArxylCjQwO/7tFEYDFVCCPFzAF7G8
-hzHyBNgx5FwNrH3bMEol9iIxzoZNU0XTWS7DzN4S+89C2Tn+NaFko/SeFBMp4IK/
-55YAgcYGe2QbFnPITGYPT05VkbSBMD0PBITNSwsclGZGFVoHAgMBAAGjHTAbMAwG
-A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBAIJpAA+X
-QB57JhNxevUlFFLmGx7ASKrOeZLupzak4qUK718erafMAsXhydx1eKL/5Ne7ZcFa
-Tf6dRPzCjv89WzYK/kJ59AgATkXNPvADRUKd0ViQw4Q4EcfuQrTMEym+gl1W2qQl
-U9/eBDE341pcrfdHHGhS5LKv6KTmjyYmDLxl
+AoGBANbkUkK6JQC3rbLcXhLJTS9SX6uXyFwl7bUfpAN5Hm5EqfvG3PnLrogfTGLr
+Tq5CRAu/gbbdcMoL9TLv/aaDVnrpV0FslKhqYmkOgT28bdmA7Qtr539aQpMKCfcW
+WCnoMcBD5u5h9MsRqpdq+0Mjlsf1H2hSf07jHk5R1T4l8RMXAgMBAAGjHTAbMAwG
+A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBANSrwvpU
+t8ihIhpHqgJZ34DM92CZZ3ZHmH/KyqlnuGzjjpnVZiXVrLDTOzrA0ziVhmefY29w
+roHjENbFm54HW97ogxeURuO8HRHIVh2U0rkyVxOfGZiUdINHqsZdSnDY07bzCtSr
+Z/KsfWXM5llD1Ig1FyBHpKjyUvfzr73sjm/4
 -----END CERTIFICATE-----`
 	serviceCertPEM = `-----BEGIN CERTIFICATE-----
 MIIBzzCCATigAwIBAgIBATANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
-Z3JhZiBDQTAeFw0xNzEwMDIyMjQzMDhaFw0yNzA5MzAyMjQzMDhaMBQxEjAQBgNV
-BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoI/8ceps
-DvvA3KUDViYwZcB+RvfT6XCPCT35mEzuXWP42JHk1VPNA41215U8CGoJF7+OzRcZ
-an3b2WLfAph+bi4Vmpe8eolmPHjf57jJ2fdDeLtMA4T0WF8yR4fHxrrU2UFsgXod
-kpQNqa/R5+iEKNMQVQgD2HjP5BE1u+H6fscCAwEAAaMvMC0wCQYDVR0TBAIwADAL
+Z3JhZiBDQTAeFw0xNzExMDQwNDMxMDdaFw0yNzExMDIwNDMxMDdaMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsJRss1af
+XKrcIjQoAp2kdJIpT2Ya+MRQXJ18b0PP7szh2lisY11kd/HCkd4D4efuIkpszHaN
+xwyTOZLOoplxp6fizzgOYjXsJ6SzbO1MQNmq8Ch/+uKiGgFwLX+YxOOsGSDIHNhF
+vcBi93cQtCWPBFz6QRQf9yfIAA5KKxUfJcMCAwEAAaMvMC0wCQYDVR0TBAIwADAL
 BgNVHQ8EBAMCBSAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
-gYEAV5vx8FHNlD6Z3e01/MiNSmYXn93CwlixYMRyW1Ri2P6hMtJiMRp59fNFzroa
-iv6djr30uuKYOiAvdKhNaYWERgrtjGVEuPoIMQfaAaKHQj6CKLBXeGZ5Gxhy+M6G
-OE6g0E4ufHOqr1h1GDIiAq88zyJ2AupgLLUCMFtkq0v0mr0=
+gYEAiC3WI4y9vfYz53gw7FKnNK7BBdwRc43x7Pd+5J/cclWyUZPdmcj1UNmv/3rj
+2qcMmX06UdgPoHppzNAJePvMVk0vjMBUe9MmYlafMz0h4ma/it5iuldXwmejFcdL
+6wWQp7gVTileCEmq9sNvfQN1FmT3EWf4IMdO2MNat/1If0g=
 -----END CERTIFICATE-----`
 	serviceKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCgj/xx6mwO+8DcpQNWJjBlwH5G99PpcI8JPfmYTO5dY/jYkeTV
-U80DjXbXlTwIagkXv47NFxlqfdvZYt8CmH5uLhWal7x6iWY8eN/nuMnZ90N4u0wD
-hPRYXzJHh8fGutTZQWyBeh2SlA2pr9Hn6IQo0xBVCAPYeM/kETW74fp+xwIDAQAB
-AoGABiRb6NOp3Ize3NHnJcWCNnI9omNalOR8ZEMdqCjROXtYiphSI6L4BbnEoQyR
-ZlUAEgt+3/ORQlScM12n4EaLF4Zi4CTGmibRHUff/ybUDGMg2Lp/AL/ghP/3U37l
-C/oRjohK9Rqn28hf8xgL9Jz+KbQaVv5f+frLwL3EKreYtOkCQQDLe1s89rbxvTZr
-PhtwYrnXC8KbBNPIzJbTXrphqr0H3xuDlTpd+4tvIlL6LoqANYXAmHHlKUuPcar6
-QCj9xNwTAkEAygDRac8qewqIWhZOs0u8phC37dxzwVXslrgjO+kTLxN/Q1srK45T
-gHDbJuCrBPkYrjAXWHd2rIkOWl0rk38A/QJADct4HQLw1iSous6EF7Npu+19LPs/
-zF4qX3wNkK99jzoN6HbGdTandkpSa8mZ9CUswyjSl+Gb0Ma4+6w72zBsZwJBAKn+
-Zj0VCjrhcj3d5/0bD3bxOtgBXaimFqP/8ibIzkwfrEmSv5G4BK1iTAs7prBYsFxm
-PD9GyagI7vs8zR8jEkECQD51jhM8DDPah/ECC31we54Y9dqBOupy1a8y6os1YFkv
-BV7zTVrpOzwUsrkMW+wFyQSX9eyyMfJHJihlobXA+QY=
+MIICXQIBAAKBgQCwlGyzVp9cqtwiNCgCnaR0kilPZhr4xFBcnXxvQ8/uzOHaWKxj
+XWR38cKR3gPh5+4iSmzMdo3HDJM5ks6imXGnp+LPOA5iNewnpLNs7UxA2arwKH/6
+4qIaAXAtf5jE46wZIMgc2EW9wGL3dxC0JY8EXPpBFB/3J8gADkorFR8lwwIDAQAB
+AoGBAJaFHxfMmjHK77U0UnrQWFSKFy64cftmlL4t/Nl3q7L68PdIKULWZIMeEWZ4
+I0UZiFOwr4em83oejQ1ByGSwekEuiWaKUI85IaHfcbt+ogp9hY/XbOEo56OPQUAd
+bEZv1JqJOqta9Ug1/E1P9LjEEyZ5F5ubx7813rxAE31qKtKJAkEA1zaMlCWIr+Rj
+hGvzv5rlHH3wbOB4kQFXO4nqj3J/ttzR5QiJW24STMDcbNngFlVcDVju56LrNTiD
+dPh9qvl7nwJBANILguR4u33OMksEZTYB7nQZSurqXsq6382zH7pTl29ANQTROHaM
+PKC8dnDWq8RGTqKuvWblIzzGIKqIMovZo10CQC96T0UXirITFolOL3XjvAuvFO1Q
+EAkdXJs77805m0dCK+P1IChVfiAEpBw3bKJArpAbQIlFfdI953JUp5SieU0CQEub
+BSSEKMjh/cxu6peEHnb/262vayuCFKkQPu1sxWewLuVrAe36EKCy9dcsDmv5+rgo
+Odjdxc9Madm4aKlaT6kCQQCpAgeblDrrxTrNQ+Typzo37PlnQrvI+0EceAUuJ72G
+P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
 -----END RSA PRIVATE KEY-----`
-	clientRootPEM = `-----BEGIN CERTIFICATE-----
-MIIBxzCCATCgAwIBAgIJAOLq2g9+9TVgMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
-BAMMC1RlbGVncmFmIENBMB4XDTE3MTAwMjIyNDMwOFoXDTE3MTEwMTIyNDMwOFow
-FjEUMBIGA1UEAwwLVGVsZWdyYWYgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALHtGXLKZz3HUA4E1H0mR3gAtgNwUSRArxylCjQwO/7tFEYDFVCCPFzAF7G8
-hzHyBNgx5FwNrH3bMEol9iIxzoZNU0XTWS7DzN4S+89C2Tn+NaFko/SeFBMp4IK/
-55YAgcYGe2QbFnPITGYPT05VkbSBMD0PBITNSwsclGZGFVoHAgMBAAGjHTAbMAwG
-A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBAIJpAA+X
-QB57JhNxevUlFFLmGx7ASKrOeZLupzak4qUK718erafMAsXhydx1eKL/5Ne7ZcFa
-Tf6dRPzCjv89WzYK/kJ59AgATkXNPvADRUKd0ViQw4Q4EcfuQrTMEym+gl1W2qQl
-U9/eBDE341pcrfdHHGhS5LKv6KTmjyYmDLxl
------END CERTIFICATE-----`
+	clientRootPEM = serviceRootPEM
 	clientCertPEM = `-----BEGIN CERTIFICATE-----
 MIIBzjCCATegAwIBAgIBAjANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
-Z3JhZiBDQTAeFw0xNzEwMDIyMjQzMDhaFw0yNzA5MzAyMjQzMDhaMBMxETAPBgNV
-BAMMCHRlbGVncmFmMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIrPGv8Sm1
-6tI+vlATzWGOK1D40iNTiGj4FpcS2Tm4SdaDSfa3VL9N5l8aeuN4E8O2YXK3QcR8
-NoeY87cWW06PtFc/ByS42VeWDKt28/DpGzbrzCVNOumS3X5QEyySYLpi0uqI9ZZ5
-O2sOJ2yVua8F3cwqPTveVmU3LeQfVrh7QwIDAQABoy8wLTAJBgNVHRMEAjAAMAsG
+Z3JhZiBDQTAeFw0xNzExMDQwNDMxMDdaFw0yNzExMDIwNDMxMDdaMBMxETAPBgNV
+BAMMCHRlbGVncmFmMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDP2IMqyOqI
+sJjwBprrz8WPzmlrpyYikQ4XSCSJB3DSTIO+igqMpBUTj3vLlOzsHfVVot1WRqc6
+3esM4JE92rc6S73xi4g8L/r8cPIHW4hvFJdMti4UkJBWim8ArSbFqnZjcR19G3tG
+LUOiXAUG3nWzMzoEsPruvV1dkKRbJVE4MwIDAQABoy8wLTAJBgNVHRMEAjAAMAsG
 A1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOB
-gQAVEfHePY9fumW8rkbbSbiuQ1dGIINbMGPO17eAjOxMT4Z1jDb8oTVHbaZM0rKo
-wKx4dDp5mnLK+NuMZ1sNxKOf6IMmQ022ANOYM0dkwfg13bpC3BGW8Z7nOFK0xXh6
-4KTcXktBUtubmn6w7szvWY2OajPVoiGgcapwwhCrBEa6rg==
+gQCHxMk38XNxL9nPFBYo3JqITJCFswu6/NLHwDBXCuZKl53rUuFWduiO+1OuScKQ
+sQ79W0jHsWRKGOUFrF5/Gdnh8AlkVaITVlcmhdAOFCEbeGpeEvLuuK6grckPitxy
+bRF5oM4TCLKKAha60Ir41rk2bomZM9+NZu+Bm+csDqCoxQ==
 -----END CERTIFICATE-----`
 	clientKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDIrPGv8Sm16tI+vlATzWGOK1D40iNTiGj4FpcS2Tm4SdaDSfa3
-VL9N5l8aeuN4E8O2YXK3QcR8NoeY87cWW06PtFc/ByS42VeWDKt28/DpGzbrzCVN
-OumS3X5QEyySYLpi0uqI9ZZ5O2sOJ2yVua8F3cwqPTveVmU3LeQfVrh7QwIDAQAB
-AoGAHtvpdqLhRSZNGnTtn33vyIsEsp6t7ASID855gN6Cr8I7CIlxNRQFLxeD/HB1
-VlvDtuIZX/DvJCLGi1C/EOMNm2nY7IT2gZgMpxvmfjfGhHKT1MWYu9cdyiOOacqD
-yRDAcKpubIPEIV3aczglv9sVApXwZcgePzDwweTVfP/Nv5ECQQDthIv5Y5k3UO8h
-Hht+27W8McFJ5eiF5OcLGOQ4nKGHkCOskfD4u/i+j+4dUeGBdpT8CzszgofBa6wh
-dJevQerVAkEA2Ep8PUfXRjel8NiLNL8iK/SR26y8wPduKam31SMUPq71+GROKkFz
-yYYAbKORs+fS6LBT+M48cEu470o+g8eptwJBALzCEMeSOqp2XIRSPAG2NBiq5fSH
-jSIThvYPwxemisyEZYV4uivCnu06zz5n2zIa/k3L0zGdc6vomPRBh2aVmT0CQQCY
-/B5ibfUbqnLKJzBXb7Xo50Vf3w9nYdvexjfMHtLL/47lUXVkOAWBDjIwpYWCfb/V
-bBsJCj7/ot+9CYOsTEaDAkEA4XAGFxx78JMVuJLjevkf0pGUPEocdoOAvpYWT5sR
-9FODrPEtW84ZevSmuByjzeqVzS3ElIxACopRJgSN20d9vg==
+MIICXAIBAAKBgQDP2IMqyOqIsJjwBprrz8WPzmlrpyYikQ4XSCSJB3DSTIO+igqM
+pBUTj3vLlOzsHfVVot1WRqc63esM4JE92rc6S73xi4g8L/r8cPIHW4hvFJdMti4U
+kJBWim8ArSbFqnZjcR19G3tGLUOiXAUG3nWzMzoEsPruvV1dkKRbJVE4MwIDAQAB
+AoGAFzb/r4+xYoMXEfgq5ZvXXTCY5cVNpR6+jCsqqYODPnn9XRLeCsdo8z5bfWms
+7NKLzHzca/6IPzL6Rf3vOxFq1YyIZfYVHH+d63/9blAm3Iajjp1W2yW5aj9BJjTb
+nm6F0RfuW/SjrZ9IXxTZhSpCklPmUzVZpzvwV3KGeVTVCEECQQDoavCeOwLuqDpt
+0aM9GMFUpOU7kLPDuicSwCDaTae4kN2rS17Zki41YXe8A8+509IEN7mK09Vq9HxY
+SX6EmV1FAkEA5O9QcCHEa8P12EmUC8oqD2bjq6o7JjUIRlKinwZTlooMJYZw98gA
+FVSngTUvLVCVIvSdjldXPOGgfYiccTZrFwJAfHS3gKOtAEuJbkEyHodhD4h1UB4+
+hPLr9Xh4ny2yQH0ilpV3px5GLEOTMFUCKUoqTiPg8VxaDjn5U/WXED5n2QJAR4J1
+NsFlcGACj+/TvacFYlA6N2nyFeokzoqLX28Ddxdh2erXqJ4hYIhT1ik9tkLggs2z
+1T1084BquCuO6lIcOwJBALX4xChoMUF9k0IxSQzlz//seQYDkQNsE7y9IgAOXkzp
+RaR4pzgPbnKj7atG+2dBnffWfE+1Mcy0INDAO6WxPg0=
 -----END RSA PRIVATE KEY-----`
 )
 
diff --git a/scripts/tls-certs.sh b/scripts/tls-certs.sh
index 39e8cf359..b37d6541a 100644
--- a/scripts/tls-certs.sh
+++ b/scripts/tls-certs.sh
@@ -15,7 +15,7 @@ new_certs_dir = ./certs_by_serial
 private_key = ./private/cakey.pem
 serial = ./serial
 
-default_crl_days = 7
+default_crl_days = 3650
 default_days = 3650
 default_md = sha256
 
@@ -53,7 +53,7 @@ basicConstraints = CA:false
 keyUsage = keyEncipherment
 extendedKeyUsage = 1.3.6.1.5.5.7.3.1
 EOF
-openssl req -x509 -config ./openssl.conf -newkey rsa:1024 -out ./certs/cacert.pem -keyout ./private/cakey.pem -subj "/CN=Telegraf CA/" -nodes &&
+openssl req -x509 -config ./openssl.conf -days 3650 -newkey rsa:1024 -out ./certs/cacert.pem -keyout ./private/cakey.pem -subj "/CN=Telegraf CA/" -nodes &&
 
 # Create server keypair
 openssl genrsa -out ./private/serverkey.pem 1024 &&

From ae2635b5471ffd1097b923b556ee893ae9ba1ca5 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Sat, 4 Nov 2017 08:43:13 -0400
Subject: [PATCH 0715/1302] Readme update

---
 plugins/inputs/webhooks/particle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
index ae9f53c33..73417b212 100644
--- a/plugins/inputs/webhooks/particle/README.md
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -33,7 +33,7 @@ String data = String::format("{ \"tags\" : {
 Escaping the "" is required in the source file.
 The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
 
-You will need to enable JSON messages in the Webhooks setup of Particle.io
+You will need to enable JSON messages in the Webhooks setup of Particle.io, and make sure to check the "include default data" box as well.
 
 
 See [webhook doc](https://docs.particle.io/reference/webhooks/)

From 6e6aefe5da23bfc942d8652ac140179993639182 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Sat, 4 Nov 2017 09:14:52 -0400
Subject: [PATCH 0716/1302] Undo Revert "Revert changes since 9b0af4478"

This reverts commit 2c31345c70dac556664f12a39e68cd7c85856e4e.
---
 .gitignore                                    |  1 +
 plugins/inputs/webhooks/particle/README.md    | 35 +++++++
 .../webhooks/particle/particle_webhooks.go    | 67 +++++++++++++
 .../particle/particle_webhooks_test.go        | 97 +++++++++++++++++++
 4 files changed, 200 insertions(+)
 create mode 100644 plugins/inputs/webhooks/particle/README.md
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.gitignore b/.gitignore
index 8269337df..e93bc8dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tivan
 .idea
 *~
 *#
+.DS_Store
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
new file mode 100644
index 000000000..3c345daa8
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -0,0 +1,35 @@
+# particle webhooks
+
+You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
+
+```
+{
+    "influx_db": "your_measurement_name"
+}
+```
+
+If required, enter your username and password, etc. and then click `Save`
+
+
+## Events
+
+Your Particle device should publish an event that contains a JSON in the form of:
+```
+String data = String::format("{ \"tags\" : {
+	    \"tag_name\": \"tag_value\", 
+	    \"other_tag\": \"other_value\"
+    }, 
+	\"values\": {
+	    \"value_name\": %f, 
+		\"other_value\": %f, 
+    }
+    }",  value_value, other_value
+	);
+    Particle.publish("event_name", data, PRIVATE);
+```
+Escaping the "" is required in the source file on the Particle device.
+The number of tag values and field values is not restricted so you can send as many values per webhook call as you'd like.
+
+
+
+See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
new file mode 100644
index 000000000..258619856
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -0,0 +1,67 @@
+package particle
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+)
+
+type event struct {
+	Name        string `json:"event"`
+	Data        data   `json:"data"`
+	TTL         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	Database    string `json:"influx_db"`
+}
+
+type data struct {
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func newEvent() *event {
+	return &event{
+		Data: data{
+			Tags:   make(map[string]string),
+			Fields: make(map[string]interface{}),
+		},
+	}
+}
+
+func (e *event) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
+}
+
+type ParticleWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
+	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
+	rb.acc = acc
+}
+
+func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	e := newEvent()
+	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
+		log.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	pTime, err := e.Time()
+	if err != nil {
+		pTime = time.Now()
+		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
+	}
+
+	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
new file mode 100644
index 000000000..850b2c4fc
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -0,0 +1,97 @@
+package particle
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	w := httptest.NewRecorder()
+	w.Code = 500
+
+	rb.eventHandler(w, req)
+
+	return w
+}
+
+func TestNewItem(t *testing.T) {
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, NewItemJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"temp_c":    26.680000,
+		"temp_f":    80.024001,
+		"infrared":  528.0,
+		"lux":       0.0,
+		"humidity":  44.937500,
+		"pressure":  998.998901,
+		"altitude":  119.331436,
+		"broadband": 1266.0,
+	}
+
+	tags := map[string]string{
+		"id":       "230035001147343438323536",
+		"location": "TravelingWilbury",
+	}
+
+	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
+}
+
+func TestUnknowItem(t *testing.T) {
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, UnknowJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+}
+
+func NewItemJSON() string {
+	return `
+	{
+	  "event": "temperature",
+	  "data": {
+		  "tags": {
+			  "id": "230035001147343438323536",
+			  "location": "TravelingWilbury"
+		  },
+		  "values": {
+			  "temp_c": 26.680000,
+			  "temp_f": 80.024001,
+			  "humidity": 44.937500,
+			  "pressure": 998.998901,
+			  "altitude": 119.331436,
+			  "broadband": 1266,
+			  "infrared": 528,
+			  "lux": 0.0
+		  }
+	  },
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor",
+	  "influx_db": "mydata"
+  }`
+}
+
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}

From da0ca8a870fd294577a8d30d8c7eeeeba9df5e70 Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Sat, 4 Nov 2017 09:19:37 -0400
Subject: [PATCH 0717/1302] Revert "Undo Revert "Revert changes since
 9b0af4478""

This reverts commit 6e6aefe5da23bfc942d8652ac140179993639182.
---
 .gitignore                                    |  1 -
 plugins/inputs/webhooks/particle/README.md    | 35 -------
 .../webhooks/particle/particle_webhooks.go    | 67 -------------
 .../particle/particle_webhooks_test.go        | 97 -------------------
 4 files changed, 200 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/README.md
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/.gitignore b/.gitignore
index e93bc8dff..8269337df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ tivan
 .idea
 *~
 *#
-.DS_Store
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
deleted file mode 100644
index 3c345daa8..000000000
--- a/plugins/inputs/webhooks/particle/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# particle webhooks
-
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
-
-```
-{
-    "influx_db": "your_measurement_name"
-}
-```
-
-If required, enter your username and password, etc. and then click `Save`
-
-
-## Events
-
-Your Particle device should publish an event that contains a JSON in the form of:
-```
-String data = String::format("{ \"tags\" : {
-	    \"tag_name\": \"tag_value\", 
-	    \"other_tag\": \"other_value\"
-    }, 
-	\"values\": {
-	    \"value_name\": %f, 
-		\"other_value\": %f, 
-    }
-    }",  value_value, other_value
-	);
-    Particle.publish("event_name", data, PRIVATE);
-```
-Escaping the "" is required in the source file on the Particle device.
-The number of tag values and field values is not restricted so you can send as many values per webhook call as you'd like.
-
-
-
-See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
deleted file mode 100644
index 258619856..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package particle
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-)
-
-type event struct {
-	Name        string `json:"event"`
-	Data        data   `json:"data"`
-	TTL         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	Database    string `json:"influx_db"`
-}
-
-type data struct {
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func newEvent() *event {
-	return &event{
-		Data: data{
-			Tags:   make(map[string]string),
-			Fields: make(map[string]interface{}),
-		},
-	}
-}
-
-func (e *event) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
-}
-
-type ParticleWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
-}
-
-func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
-	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
-	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
-	rb.acc = acc
-}
-
-func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	e := newEvent()
-	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
-		log.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	pTime, err := e.Time()
-	if err != nil {
-		pTime = time.Now()
-		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
-	}
-
-	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
deleted file mode 100644
index 850b2c4fc..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package particle
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, NewItemJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-
-	fields := map[string]interface{}{
-		"temp_c":    26.680000,
-		"temp_f":    80.024001,
-		"infrared":  528.0,
-		"lux":       0.0,
-		"humidity":  44.937500,
-		"pressure":  998.998901,
-		"altitude":  119.331436,
-		"broadband": 1266.0,
-	}
-
-	tags := map[string]string{
-		"id":       "230035001147343438323536",
-		"location": "TravelingWilbury",
-	}
-
-	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
-}
-
-func TestUnknowItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, UnknowJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event": "temperature",
-	  "data": {
-		  "tags": {
-			  "id": "230035001147343438323536",
-			  "location": "TravelingWilbury"
-		  },
-		  "values": {
-			  "temp_c": 26.680000,
-			  "temp_f": 80.024001,
-			  "humidity": 44.937500,
-			  "pressure": 998.998901,
-			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
-			  "lux": 0.0
-		  }
-	  },
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor",
-	  "influx_db": "mydata"
-  }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}

From e5a265c8c7564ee626b3b30e732d6e056046ae6d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 6 Nov 2017 10:47:10 -0800
Subject: [PATCH 0718/1302] Revert particle webhook changes on master

---
 plugins/inputs/webhooks/particle/README.md    | 39 --------
 .../webhooks/particle/particle_webhooks.go    | 67 -------------
 .../particle/particle_webhooks_test.go        | 97 -------------------
 plugins/inputs/webhooks/webhooks.go           |  5 -
 plugins/inputs/webhooks/webhooks_test.go      |  6 --
 5 files changed, 214 deletions(-)
 delete mode 100644 plugins/inputs/webhooks/particle/README.md
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 delete mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
deleted file mode 100644
index 73417b212..000000000
--- a/plugins/inputs/webhooks/particle/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# particle webhooks
-
-
-You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
-
-```
-{
-    "influx_db": "your_measurement_name"
-}
-```
-
-If required, enter your username and password, etc. and then click `Save`
-
-
-
-## Events
-
-Your Particle device should publish an event that contains a JSON in the form of:
-```
-String data = String::format("{ \"tags\" : {
-	    \"tag_name\": \"tag_value\", 
-	    \"other_tag\": \"other_value\"
-    }, 
-	\"values\": {
-	    \"value_name\": %f, 
-		\"other_value\": %f, 
-    }
-    }",  value_value, other_value
-	);
-    Particle.publish("event_name", data, PRIVATE);
-```
-
-Escaping the "" is required in the source file.
-The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
-
-You will need to enable JSON messages in the Webhooks setup of Particle.io, and make sure to check the "include default data" box as well.
-
-
-See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
deleted file mode 100644
index 258619856..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package particle
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
-)
-
-type event struct {
-	Name        string `json:"event"`
-	Data        data   `json:"data"`
-	TTL         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	Database    string `json:"influx_db"`
-}
-
-type data struct {
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func newEvent() *event {
-	return &event{
-		Data: data{
-			Tags:   make(map[string]string),
-			Fields: make(map[string]interface{}),
-		},
-	}
-}
-
-func (e *event) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
-}
-
-type ParticleWebhook struct {
-	Path string
-	acc  telegraf.Accumulator
-}
-
-func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
-	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
-	log.Printf("I! Started the webhooks_particle on %s\n", rb.Path)
-	rb.acc = acc
-}
-
-func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-	e := newEvent()
-	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
-		log.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	pTime, err := e.Time()
-	if err != nil {
-		pTime = time.Now()
-		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
-	}
-
-	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
deleted file mode 100644
index 53252ff17..000000000
--- a/plugins/inputs/webhooks/particle/particle_webhooks_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package particle
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-)
-
-func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
-	w := httptest.NewRecorder()
-	w.Code = 500
-
-	rb.eventHandler(w, req)
-
-	return w
-}
-
-func TestNewItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, NewItemJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-
-	fields := map[string]interface{}{
-		"temp_c":    26.680000,
-		"temp_f":    80.024001,
-		"infrared":  528.0,
-		"lux":       0.0,
-		"humidity":  44.937500,
-		"pressure":  998.998901,
-		"altitude":  119.331436,
-		"broadband": 1266.0,
-	}
-
-	tags := map[string]string{
-		"id":       "230035001147343438323536",
-		"location": "TravelingWilbury",
-	}
-
-	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
-}
-
-func TestUnknowItem(t *testing.T) {
-	t.Parallel()
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
-	resp := postWebhooks(rb, UnknowJSON())
-	if resp.Code != http.StatusOK {
-		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
-	}
-}
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event": "temperature",
-	  "data": {
-		  "tags": {
-			  "id": "230035001147343438323536",
-			  "location": "TravelingWilbury"
-		  },
-		  "values": {
-			  "temp_c": 26.680000,
-			  "temp_f": 80.024001,
-			  "humidity": 44.937500,
-			  "pressure": 998.998901,
-			  "altitude": 119.331436,
-			  "broadband": 1266.0,
-			  "infrared": 528.0,
-			  "lux": 0.0
-		  }
-	  },
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor",
-	  "influx_db": "mydata"
-  }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 794b55168..698cde159 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,7 +15,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
-	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -35,7 +34,6 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
-	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -64,9 +62,6 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
-	
-   [inputs.webhooks.particle]
-      path = "/particle"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 1a5fa4aa1..6d3448870 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
-	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,9 +33,4 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
-	wb.Particle = &particle.ParticleWebhook{Path: "/particle"}
-	expected = append(expected, wb.Particle)
-	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
-		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
-	}
 }

From fdf12ce6b4a8b150c63cf16f6ab7aee38e6ce0f7 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Mon, 6 Nov 2017 20:41:14 -0500
Subject: [PATCH 0719/1302] Redact datadog API key in log output (#3420)

---
 plugins/outputs/datadog/datadog.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/datadog/datadog.go b/plugins/outputs/datadog/datadog.go
index 6d7531eb5..65b7ab751 100644
--- a/plugins/outputs/datadog/datadog.go
+++ b/plugins/outputs/datadog/datadog.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/url"
 	"sort"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
@@ -100,6 +101,7 @@ func (d *Datadog) Write(metrics []telegraf.Metric) error {
 		}
 	}
 
+	redactedApiKey := "****************"
 	ts.Series = make([]*Metric, metricCounter)
 	copy(ts.Series, tempSeries[0:])
 	tsBytes, err := json.Marshal(ts)
@@ -108,13 +110,13 @@ func (d *Datadog) Write(metrics []telegraf.Metric) error {
 	}
 	req, err := http.NewRequest("POST", d.authenticatedUrl(), bytes.NewBuffer(tsBytes))
 	if err != nil {
-		return fmt.Errorf("unable to create http.Request, %s\n", err.Error())
+		return fmt.Errorf("unable to create http.Request, %s\n", strings.Replace(err.Error(), d.Apikey, redactedApiKey, -1))
 	}
 	req.Header.Add("Content-Type", "application/json")
 
 	resp, err := d.client.Do(req)
 	if err != nil {
-		return fmt.Errorf("error POSTing metrics, %s\n", err.Error())
+		return fmt.Errorf("error POSTing metrics, %s\n", strings.Replace(err.Error(), d.Apikey, redactedApiKey, -1))
 	}
 	defer resp.Body.Close()
 

From e0df62c27bdeff47db5e91151a49e9088a5f0453 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 6 Nov 2017 17:42:42 -0800
Subject: [PATCH 0720/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f527fdca3..a3c62f35a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 ## v1.4.4 [unreleased]
 
 - [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
+- [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.
 
 ## v1.4.3 [2017-10-25]
 

From e1295c41c8cf73ece1b694fccc92e5acbd17a3ae Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Nov 2017 11:26:11 -0800
Subject: [PATCH 0721/1302] Update gopsutil to v2.17.10 (#3441)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 02e20755e..6b8ba5533 100644
--- a/Godeps
+++ b/Godeps
@@ -62,7 +62,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil a452de7c734a0fa0f16d2e5725b0fa5934d9fbec
+github.com/shirou/gopsutil 48fc5612898a1213aa5d6a0fb2d4f7b968e898fb
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From c55f285de07f26bcdfe19c67bd18711a6c74a1b1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 11:36:29 -0800
Subject: [PATCH 0722/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c62f35a..a99cc86e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@
 
 - [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
 - [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.
+- [#3311](https://github.com/influxdata/telegraf/issues/3311): Fix error getting pids in netstat input.
+- [#3339](https://github.com/influxdata/telegraf/issues/3339): Support HOST_VAR envvar to locate /var in system input.
 
 ## v1.4.3 [2017-10-25]
 

From cbbdf1043b4005911fea0f2c74362f80c7cf2e77 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Nov 2017 11:41:53 -0800
Subject: [PATCH 0723/1302] Use current time if container read time is zero
 value (#3437)

---
 plugins/inputs/docker/docker.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 5f39fa0d9..595bcc518 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -422,7 +422,11 @@ func gatherContainerStats(
 	total bool,
 	daemonOSType string,
 ) {
-	now := stat.Read
+	tm := stat.Read
+
+	if tm.Before(time.Unix(0, 0)) {
+		tm = time.Now()
+	}
 
 	memfields := map[string]interface{}{
 		"container_id": id,
@@ -482,7 +486,7 @@ func gatherContainerStats(
 		memfields["private_working_set"] = stat.MemoryStats.PrivateWorkingSet
 	}
 
-	acc.AddFields("docker_container_mem", memfields, tags, now)
+	acc.AddFields("docker_container_mem", memfields, tags, tm)
 
 	cpufields := map[string]interface{}{
 		"usage_total":                  stat.CPUStats.CPUUsage.TotalUsage,
@@ -507,7 +511,7 @@ func gatherContainerStats(
 
 	cputags := copyTags(tags)
 	cputags["cpu"] = "cpu-total"
-	acc.AddFields("docker_container_cpu", cpufields, cputags, now)
+	acc.AddFields("docker_container_cpu", cpufields, cputags, tm)
 
 	// If we have OnlineCPUs field, then use it to restrict stats gathering to only Online CPUs
 	// (https://github.com/moby/moby/commit/115f91d7575d6de6c7781a96a082f144fd17e400)
@@ -525,7 +529,7 @@ func gatherContainerStats(
 			"usage_total":  percpu,
 			"container_id": id,
 		}
-		acc.AddFields("docker_container_cpu", fields, percputags, now)
+		acc.AddFields("docker_container_cpu", fields, percputags, tm)
 	}
 
 	totalNetworkStatMap := make(map[string]interface{})
@@ -545,7 +549,7 @@ func gatherContainerStats(
 		if perDevice {
 			nettags := copyTags(tags)
 			nettags["network"] = network
-			acc.AddFields("docker_container_net", netfields, nettags, now)
+			acc.AddFields("docker_container_net", netfields, nettags, tm)
 		}
 		if total {
 			for field, value := range netfields {
@@ -578,17 +582,17 @@ func gatherContainerStats(
 		nettags := copyTags(tags)
 		nettags["network"] = "total"
 		totalNetworkStatMap["container_id"] = id
-		acc.AddFields("docker_container_net", totalNetworkStatMap, nettags, now)
+		acc.AddFields("docker_container_net", totalNetworkStatMap, nettags, tm)
 	}
 
-	gatherBlockIOMetrics(stat, acc, tags, now, id, perDevice, total)
+	gatherBlockIOMetrics(stat, acc, tags, tm, id, perDevice, total)
 }
 
 func gatherBlockIOMetrics(
 	stat *types.StatsJSON,
 	acc telegraf.Accumulator,
 	tags map[string]string,
-	now time.Time,
+	tm time.Time,
 	id string,
 	perDevice bool,
 	total bool,
@@ -659,7 +663,7 @@ func gatherBlockIOMetrics(
 		if perDevice {
 			iotags := copyTags(tags)
 			iotags["device"] = device
-			acc.AddFields("docker_container_blkio", fields, iotags, now)
+			acc.AddFields("docker_container_blkio", fields, iotags, tm)
 		}
 		if total {
 			for field, value := range fields {
@@ -690,7 +694,7 @@ func gatherBlockIOMetrics(
 		totalStatMap["container_id"] = id
 		iotags := copyTags(tags)
 		iotags["device"] = "total"
-		acc.AddFields("docker_container_blkio", totalStatMap, iotags, now)
+		acc.AddFields("docker_container_blkio", totalStatMap, iotags, tm)
 	}
 }
 

From 2c2dc97702fbe49d52d8216acab2177841e283a4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 11:43:15 -0800
Subject: [PATCH 0724/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99cc86e2..ef4377f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.
 - [#3311](https://github.com/influxdata/telegraf/issues/3311): Fix error getting pids in netstat input.
 - [#3339](https://github.com/influxdata/telegraf/issues/3339): Support HOST_VAR envvar to locate /var in system input.
+- [#3383](https://github.com/influxdata/telegraf/issues/3383): Use current time if docker container read time is zero value.
 
 ## v1.4.3 [2017-10-25]
 

From b81bea658f9dce37655e27efceeb938ba2e6ac7e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 7 Nov 2017 11:45:09 -0800
Subject: [PATCH 0725/1302] Always ignore autofs filesystems in disk input
 (#3440)

---
 plugins/inputs/system/ps.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index 979a3b164..d41e6bddf 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -85,6 +85,11 @@ func (s *systemPS) DiskUsage(
 		fstypeExcludeSet[filter] = true
 	}
 
+	// Autofs mounts indicate a potential mount, the partition will also be
+	// listed with the actual filesystem when mounted.  Ignore the autofs
+	// partition to avoid triggering a mount.
+	fstypeExcludeSet["autofs"] = true
+
 	var usage []*disk.UsageStat
 	var partitions []*disk.PartitionStat
 

From bb14589469f9aaaadfd511cfec32354b387783d9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 13:58:54 -0800
Subject: [PATCH 0726/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef4377f8f..d2e620c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - [#3258](https://github.com/influxdata/telegraf/issues/3258): Unlock Statsd when stopping to prevent deadlock.
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
+- [#3430](https://github.com/influxdata/telegraf/issues/3430): Always ignore autofs filesystems in disk input.
 
 ## v1.4.4 [unreleased]
 

From 5141f8a2a05296ed1a18b0d4cb8258c15c1a2b9e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 13:54:36 -0800
Subject: [PATCH 0727/1302] Update contributing documentation

---
 CONTRIBUTING.md                   | 49 +++++++++++++++----------------
 Makefile                          |  2 +-
 plugins/inputs/webhooks/README.md |  2 +-
 scripts/circle-test.sh            |  2 +-
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e94daff4..21ae5738e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ but any information you can provide on how the data will look is appreciated.
 See the [OpenTSDB output](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/opentsdb)
 for a good example.
 1. **Optional:** Help users of your plugin by including example queries for populating dashboards. Include these sample queries in the `README.md` for the plugin.
-1. **Optional:** Write a [tickscript](https://docs.influxdata.com/kapacitor/v1.0/tick/syntax/) for your plugin and add it to [Kapacitor](https://github.com/influxdata/kapacitor/tree/master/examples/telegraf). Or mention @jackzampolin in a PR comment with some common queries that you would want to alert on and he will write one for you.
+1. **Optional:** Write a [tickscript](https://docs.influxdata.com/kapacitor/v1.0/tick/syntax/) for your plugin and add it to [Kapacitor](https://github.com/influxdata/kapacitor/tree/master/examples/telegraf).
 
 ## GoDoc
 
@@ -52,7 +52,7 @@ See below for a quick example.
 * Input Plugins must be added to the
 `github.com/influxdata/telegraf/plugins/inputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-plugin can be configured. This is include in `telegraf -sample-config`.
+plugin can be configured. This is include in `telegraf config`.
 * The `Description` function should say in one line what this plugin does.
 
 Let's say you've written a plugin that emits metrics about processes on the
@@ -183,7 +183,7 @@ See below for a quick example.
 * To be available within Telegraf itself, plugins must add themselves to the
 `github.com/influxdata/telegraf/plugins/outputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-output can be configured. This is include in `telegraf -sample-config`.
+output can be configured. This is include in `telegraf config`.
 * The `Description` function should say in one line what this output does.
 
 ### Output Example
@@ -287,7 +287,7 @@ See below for a quick example.
 * To be available within Telegraf itself, plugins must add themselves to the
 `github.com/influxdata/telegraf/plugins/processors/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-processor can be configured. This is include in `telegraf -sample-config`.
+processor can be configured. This is include in the output of `telegraf config`.
 * The `Description` function should say in one line what this processor does.
 
 ### Processor Example
@@ -344,7 +344,7 @@ See below for a quick example.
 * To be available within Telegraf itself, plugins must add themselves to the
 `github.com/influxdata/telegraf/plugins/aggregators/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-aggregator can be configured. This is include in `telegraf -sample-config`.
+aggregator can be configured. This is include in `telegraf config`.
 * The `Description` function should say in one line what this aggregator does.
 * The Aggregator plugin will need to keep caches of metrics that have passed
 through it. This should be done using the builtin `HashID()` function of each
@@ -457,29 +457,28 @@ func init() {
 
 ## Unit Tests
 
+Before opening a pull request you should run the linter checks and
+the short tests.
+
+### Execute linter
+
+execute `make lint`
+
 ### Execute short tests
 
-execute `make test-short`
+execute `make test`
 
-### Execute long tests
+### Execute integration tests
 
-As Telegraf collects metrics from several third-party services it becomes a
-difficult task to mock each service as some of them have complicated protocols
-which would take some time to replicate.
+Running the integration tests requires several docker containers to be
+running.  You can start the containers with:
+```
+make docker-run
+```
 
-To overcome this situation we've decided to use docker containers to provide a
-fast and reproducible environment to test those services which require it.
-For other situations
-(i.e: https://github.com/influxdata/telegraf/blob/master/plugins/inputs/redis/redis_test.go)
-a simple mock will suffice.
+And run the full test suite with:
+```
+make test-all
+```
 
-To execute Telegraf tests follow these simple steps:
-
-- Install docker following [these](https://docs.docker.com/installation/)
-instructions
-- execute `make test`
-
-### Unit test troubleshooting
-
-Try cleaning up your test environment by executing `make docker-kill` and
-re-running
+Use `make docker-kill` to stop the containers.
diff --git a/Makefile b/Makefile
index 3908be1d1..d316cbb8b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ ifdef VERSION
 	LDFLAGS += -X main.version=$(VERSION)
 endif
 
-
 all:
 	$(MAKE) deps
 	$(MAKE) telegraf
@@ -50,6 +49,7 @@ test-all: lint
 
 package:
 	./scripts/build.py --package --platform=all --arch=all
+
 clean:
 	-rm -f telegraf
 	-rm -f telegraf.exe
diff --git a/plugins/inputs/webhooks/README.md b/plugins/inputs/webhooks/README.md
index 8b789e338..e6af86621 100644
--- a/plugins/inputs/webhooks/README.md
+++ b/plugins/inputs/webhooks/README.md
@@ -3,7 +3,7 @@
 This is a Telegraf service plugin that start an http server and register multiple webhook listeners.
 
 ```sh
-$ telegraf -sample-config -input-filter webhooks -output-filter influxdb > config.conf.new
+$ telegraf config -input-filter webhooks -output-filter influxdb > config.conf.new
 ```
 
 Change the config file to point to the InfluxDB server you are using and adjust the settings to match your environment. Once that is complete:
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index eb2df00e3..735e66cc7 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -63,7 +63,7 @@ exit_if_fail go test -race ./...
 # Simple Integration Tests
 #   check that one test cpu & mem output work
 tmpdir=$(mktemp -d)
-./telegraf -sample-config > $tmpdir/config.toml
+./telegraf config > $tmpdir/config.toml
 exit_if_fail ./telegraf -config $tmpdir/config.toml \
     -test -input-filter cpu:mem
 

From dcff769fedd156227d7dba0553a2c780a079a6ea Mon Sep 17 00:00:00 2001
From: Pierre Tessier <puckpuck.com@gmail.com>
Date: Tue, 7 Nov 2017 17:32:48 -0500
Subject: [PATCH 0728/1302] Add modification_time field to filestat input
 plugin (#3305)

---
 plugins/inputs/filestat/README.md        |   5 +-
 plugins/inputs/filestat/filestat.go      |   1 +
 plugins/inputs/filestat/filestat_test.go | 115 ++++++++++++-----------
 3 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/plugins/inputs/filestat/README.md b/plugins/inputs/filestat/README.md
index 2cb0136ec..79eec6c71 100644
--- a/plugins/inputs/filestat/README.md
+++ b/plugins/inputs/filestat/README.md
@@ -20,6 +20,7 @@ The filestat plugin gathers metrics about file existence, size, and other stats.
 - filestat
     - exists (int, 0 | 1)
     - size_bytes (int, bytes)
+    - modification_time (int, unixtime)
     - md5 (optional, string)
 
 ### Tags:
@@ -32,6 +33,6 @@ The filestat plugin gathers metrics about file existence, size, and other stats.
 ```
 $ telegraf --config /etc/telegraf/telegraf.conf --input-filter filestat --test
 * Plugin: filestat, Collection 1
-> filestat,file=/tmp/foo/bar,host=tyrion exists=0i 1461203374493128216
-> filestat,file=/Users/sparrc/ws/telegraf.conf,host=tyrion exists=1i,size=47894i 1461203374493199335
+> filestat,file=/tmp/foo/bar,host=tyrion exists=0i 1507218518192154351
+> filestat,file=/Users/sparrc/ws/telegraf.conf,host=tyrion exists=1i,size=47894i,modification_time=1507152973123456789i  1507218518192154351
 ```
diff --git a/plugins/inputs/filestat/filestat.go b/plugins/inputs/filestat/filestat.go
index 7519e295c..762eaa420 100644
--- a/plugins/inputs/filestat/filestat.go
+++ b/plugins/inputs/filestat/filestat.go
@@ -86,6 +86,7 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 					fileName)
 			} else {
 				fields["size_bytes"] = fileInfo.Size()
+				fields["modification_time"] = fileInfo.ModTime().UnixNano()
 			}
 
 			if f.Md5 {
diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go
index 56d47ff7c..7fdf6cde8 100644
--- a/plugins/inputs/filestat/filestat_test.go
+++ b/plugins/inputs/filestat/filestat_test.go
@@ -26,24 +26,19 @@ func TestGatherNoMd5(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(1)))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2, "exists", int64(1)))
 
 	tags3 := map[string]string{
 		"file": "/non/existant/file",
 	}
-	require.True(t, acc.HasPoint("filestat", tags3,
-		"exists", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags3, "exists", int64(0)))
 }
 
 func TestGatherExplicitFiles(t *testing.T) {
@@ -62,28 +57,21 @@ func TestGatherExplicitFiles(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"exists", int64(1)))
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
+	require.True(t, acc.HasPoint("filestat", tags1, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"exists", int64(1)))
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
+	require.True(t, acc.HasPoint("filestat", tags2, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags3 := map[string]string{
 		"file": "/non/existant/file",
 	}
-	require.True(t, acc.HasPoint("filestat", tags3,
-		"exists", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags3, "exists", int64(0)))
 }
 
 func TestGatherGlob(t *testing.T) {
@@ -100,22 +88,16 @@ func TestGatherGlob(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
+	require.True(t, acc.HasPoint("filestat", tags1, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
-	}
-	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
+	require.True(t, acc.HasPoint("filestat", tags2, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 }
 
 func TestGatherSuperAsterisk(t *testing.T) {
@@ -132,32 +114,57 @@ func TestGatherSuperAsterisk(t *testing.T) {
 	tags1 := map[string]string{
 		"file": dir + "log1.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"exists", int64(1)))
-	require.True(t, acc.HasPoint("filestat", tags1,
-		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
+	require.True(t, acc.HasPoint("filestat", tags1, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags1, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags2 := map[string]string{
 		"file": dir + "log2.log",
 	}
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"size_bytes", int64(0)))
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"exists", int64(1)))
-	require.True(t, acc.HasPoint("filestat", tags2,
-		"md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
+	require.True(t, acc.HasPoint("filestat", tags2, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags2, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags2, "md5_sum", "d41d8cd98f00b204e9800998ecf8427e"))
 
 	tags3 := map[string]string{
 		"file": dir + "test.conf",
 	}
-	require.True(t, acc.HasPoint("filestat", tags3,
-		"size_bytes", int64(104)))
-	require.True(t, acc.HasPoint("filestat", tags3,
-		"exists", int64(1)))
-	require.True(t, acc.HasPoint("filestat", tags3,
-		"md5_sum", "5a7e9b77fa25e7bb411dbd17cf403c1f"))
+	require.True(t, acc.HasPoint("filestat", tags3, "size_bytes", int64(104)))
+	require.True(t, acc.HasPoint("filestat", tags3, "exists", int64(1)))
+	require.True(t, acc.HasPoint("filestat", tags3, "md5_sum", "5a7e9b77fa25e7bb411dbd17cf403c1f"))
+}
+
+func TestModificationTime(t *testing.T) {
+	dir := getTestdataDir()
+	fs := NewFileStat()
+	fs.Files = []string{
+		dir + "log1.log",
+	}
+
+	acc := testutil.Accumulator{}
+	acc.GatherError(fs.Gather)
+
+	tags1 := map[string]string{
+		"file": dir + "log1.log",
+	}
+	require.True(t, acc.HasPoint("filestat", tags1, "size_bytes", int64(0)))
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(1)))
+	require.True(t, acc.HasInt64Field("filestat", "modification_time"))
+}
+
+func TestNoModificationTime(t *testing.T) {
+	fs := NewFileStat()
+	fs.Files = []string{
+		"/non/existant/file",
+	}
+
+	acc := testutil.Accumulator{}
+	acc.GatherError(fs.Gather)
+
+	tags1 := map[string]string{
+		"file": "/non/existant/file",
+	}
+	require.True(t, acc.HasPoint("filestat", tags1, "exists", int64(0)))
+	require.False(t, acc.HasInt64Field("filestat", "modification_time"))
 }
 
 func TestGetMd5(t *testing.T) {

From 47d013132afdc283ef5f35904a0b0cb7dfd7120c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 14:37:04 -0800
Subject: [PATCH 0729/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e620c7c..a5a4cb873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - [#3398](https://github.com/influxdata/telegraf/issues/3398): Add instance name option to varnish plugin.
 - [#3406](https://github.com/influxdata/telegraf/pull/3406):  Add support for SSL settings to ElasticSearch output plugin.
 - [#3315](https://github.com/influxdata/telegraf/pull/3315): Add Teamspeak 3 input plugin.
+- [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
 
 ### Bugfixes
 

From 493af043d34d000e4a0031e1b0c4e7c2c5f56c17 Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Tue, 7 Nov 2017 16:44:09 -0800
Subject: [PATCH 0730/1302] Add Solr input plugin (#2019)

---
 README.md                            |    1 +
 etc/telegraf.conf                    |    9 +
 plugins/inputs/all/all.go            |    1 +
 plugins/inputs/solr/README.md        |   31 +
 plugins/inputs/solr/solr.go          |  442 +++++++
 plugins/inputs/solr/solr_test.go     |   62 +
 plugins/inputs/solr/testdata_test.go | 1824 ++++++++++++++++++++++++++
 7 files changed, 2370 insertions(+)
 create mode 100644 plugins/inputs/solr/README.md
 create mode 100644 plugins/inputs/solr/solr.go
 create mode 100644 plugins/inputs/solr/solr_test.go
 create mode 100644 plugins/inputs/solr/testdata_test.go

diff --git a/README.md b/README.md
index 0f0f85ba2..a5c6f08e4 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,7 @@ configuration options.
 * [smart](./plugins/inputs/smart)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
+* [solr](./plugins/inputs/solr)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index f3128b8fd..63ce2ebfe 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2329,6 +2329,15 @@
 #     sub_tables=[".1.3.6.1.2.1.2.2.1.13", "bytes_recv", "bytes_send"]
 
 
+# # Read metrics from Solr Server
+# [[inputs.solr]]
+#   ## specify a list of one or more Solr servers
+#   servers = ["http://localhost:8983"]
+#   ##
+#   ## specify a list of one or more Solr cores (default - all)
+#   # cores = ["main"]
+
+
 # # Read metrics from Microsoft SQL Server
 # [[inputs.sqlserver]]
 #   ## Specify instances to monitor with a list of connection strings.
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 235169c86..421fd113c 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -80,6 +80,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/snmp_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/socket_listener"
+	_ "github.com/influxdata/telegraf/plugins/inputs/solr"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
diff --git a/plugins/inputs/solr/README.md b/plugins/inputs/solr/README.md
new file mode 100644
index 000000000..214ed4f7e
--- /dev/null
+++ b/plugins/inputs/solr/README.md
@@ -0,0 +1,31 @@
+# Solr input plugin
+
+The [solr](http://lucene.apache.org/solr/) plugin collects stats via the
+[MBean Request Handler](https://cwiki.apache.org/confluence/display/solr/MBean+Request+Handler)
+
+More about [performance statistics](https://cwiki.apache.org/confluence/display/solr/Performance+Statistics+Reference)
+
+### Configuration:
+
+```
+[[inputs.solr]]
+  ## specify a list of one or more Solr servers
+  servers = ["http://localhost:8983"]
+  ##
+  ## specify a list of one or more Solr cores (default - all)
+  # cores = ["main"]
+```
+
+### Example output of gathered metrics:
+
+```
+➜  ~ telegraf -config telegraf.conf -input-filter solr -test
+* Plugin: solr, Collection 1
+> solr_core,core=main,handler=searcher,host=testhost deleted_docs=17616645i,max_docs=261848363i,num_docs=244231718i 1478214949000000000
+> solr_core,core=main,handler=core,host=testhost deleted_docs=0i,max_docs=0i,num_docs=0i 1478214949000000000
+> solr_queryhandler,core=main,handler=/replication,host=testhost 15min_rate_reqs_per_second=0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000444659081257,5min_rate_reqs_per_second=0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000014821969375,75th_pc_request_time=16.484211,95th_pc_request_time=16.484211,999th_pc_request_time=16.484211,99th_pc_request_time=16.484211,avg_requests_per_second=0.0000008443809966322143,avg_time_per_request=12.984811,errors=0i,handler_start=1474662050865i,median_request_time=11.352427,requests=3i,timeouts=0i,total_time=38.954433 1478214949000000000
+> solr_queryhandler,core=main,handler=/update/extract,host=testhost 15min_rate_reqs_per_second=0,5min_rate_reqs_per_second=0,75th_pc_request_time=0,95th_pc_request_time=0,999th_pc_request_time=0,99th_pc_request_time=0,avg_requests_per_second=0,avg_time_per_request=0,errors=0i,handler_start=0i,median_request_time=0,requests=0i,timeouts=0i,total_time=0 1478214949000000000
+> solr_queryhandler,core=main,handler=org.apache.solr.handler.component.SearchHandler,host=testhost 15min_rate_reqs_per_second=0,5min_rate_reqs_per_second=0,75th_pc_request_time=0,95th_pc_request_time=0,999th_pc_request_time=0,99th_pc_request_time=0,avg_requests_per_second=0,avg_time_per_request=0,errors=0i,handler_start=1474662050861i,median_request_time=0,requests=0i,timeouts=0i,total_time=0 1478214949000000000
+> solr_queryhandler,core=main,handler=/tvrh,host=testhost 15min_rate_reqs_per_second=0,5min_rate_reqs_per_second=0,75th_pc_request_time=0,95th_pc_request_time=0,999th_pc_request_time=0,99th_pc_request_time=0,avg_requests_per_second=0,avg_time_per_request=0,errors=0i,handler_start=0i,median_request_time=0,requests=0i,timeouts=0i,total_time=0 1478214949000000000
+[…]
+```
diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go
new file mode 100644
index 000000000..1df8fa4c0
--- /dev/null
+++ b/plugins/inputs/solr/solr.go
@@ -0,0 +1,442 @@
+package solr
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const mbeansPath = "/admin/mbeans?stats=true&wt=json&cat=CORE&cat=QUERYHANDLER&cat=UPDATEHANDLER&cat=CACHE"
+const adminCoresPath = "/solr/admin/cores?action=STATUS&wt=json"
+
+type node struct {
+	Host string `json:"host"`
+}
+
+const sampleConfig = `
+  ## specify a list of one or more Solr servers
+  servers = ["http://localhost:8983"]
+
+  ## specify a list of one or more Solr cores (default - all)
+  # cores = ["main"]
+`
+
+// Solr is a plugin to read stats from one or many Solr servers
+type Solr struct {
+	Local       bool
+	Servers     []string
+	HTTPTimeout internal.Duration
+	Cores       []string
+	client      *http.Client
+}
+
+// AdminCoresStatus is an exported type that
+// contains a response with information about Solr cores.
+type AdminCoresStatus struct {
+	Status map[string]struct {
+		Index struct {
+			SizeInBytes int64 `json:"sizeInBytes"`
+			NumDocs     int64 `json:"numDocs"`
+			MaxDoc      int64 `json:"maxDoc"`
+			DeletedDocs int64 `json:"deletedDocs"`
+		} `json:"index"`
+	} `json:"status"`
+}
+
+// MBeansData is an exported type that
+// contains a response from Solr with metrics
+type MBeansData struct {
+	Headers    ResponseHeader    `json:"responseHeader"`
+	SolrMbeans []json.RawMessage `json:"solr-mbeans"`
+}
+
+// ResponseHeader is an exported type that
+// contains a response metrics: QTime and Status
+type ResponseHeader struct {
+	QTime  int64 `json:"QTime"`
+	Status int64 `json:"status"`
+}
+
+// Core is an exported type that
+// contains Core metrics
+type Core struct {
+	Stats struct {
+		DeletedDocs int64 `json:"deletedDocs"`
+		MaxDoc      int64 `json:"maxDoc"`
+		NumDocs     int64 `json:"numDocs"`
+	} `json:"stats"`
+}
+
+// QueryHandler is an exported type that
+// contains query handler metrics
+type QueryHandler struct {
+	Stats struct {
+		One5minRateReqsPerSecond float64 `json:"15minRateReqsPerSecond"`
+		FiveMinRateReqsPerSecond float64 `json:"5minRateReqsPerSecond"`
+		Seven5thPcRequestTime    float64 `json:"75thPcRequestTime"`
+		Nine5thPcRequestTime     float64 `json:"95thPcRequestTime"`
+		Nine99thPcRequestTime    float64 `json:"999thPcRequestTime"`
+		Nine9thPcRequestTime     float64 `json:"99thPcRequestTime"`
+		AvgRequestsPerSecond     float64 `json:"avgRequestsPerSecond"`
+		AvgTimePerRequest        float64 `json:"avgTimePerRequest"`
+		Errors                   int64   `json:"errors"`
+		HandlerStart             int64   `json:"handlerStart"`
+		MedianRequestTime        float64 `json:"medianRequestTime"`
+		Requests                 int64   `json:"requests"`
+		Timeouts                 int64   `json:"timeouts"`
+		TotalTime                float64 `json:"totalTime"`
+	} `json:"stats"`
+}
+
+// UpdateHandler is an exported type that
+// contains update handler metrics
+type UpdateHandler struct {
+	Stats struct {
+		Adds                     int64  `json:"adds"`
+		AutocommitMaxDocs        int64  `json:"autocommit maxDocs"`
+		AutocommitMaxTime        string `json:"autocommit maxTime"`
+		Autocommits              int64  `json:"autocommits"`
+		Commits                  int64  `json:"commits"`
+		CumulativeAdds           int64  `json:"cumulative_adds"`
+		CumulativeDeletesByID    int64  `json:"cumulative_deletesById"`
+		CumulativeDeletesByQuery int64  `json:"cumulative_deletesByQuery"`
+		CumulativeErrors         int64  `json:"cumulative_errors"`
+		DeletesByID              int64  `json:"deletesById"`
+		DeletesByQuery           int64  `json:"deletesByQuery"`
+		DocsPending              int64  `json:"docsPending"`
+		Errors                   int64  `json:"errors"`
+		ExpungeDeletes           int64  `json:"expungeDeletes"`
+		Optimizes                int64  `json:"optimizes"`
+		Rollbacks                int64  `json:"rollbacks"`
+		SoftAutocommits          int64  `json:"soft autocommits"`
+	} `json:"stats"`
+}
+
+// Hitratio is an helper interface
+// so we can later on convert it to float64
+type Hitratio interface{}
+
+// Cache is an exported type that
+// contains cache metrics
+type Cache struct {
+	Stats struct {
+		CumulativeEvictions int64    `json:"cumulative_evictions"`
+		CumulativeHitratio  Hitratio `json:"cumulative_hitratio"`
+		CumulativeHits      int64    `json:"cumulative_hits"`
+		CumulativeInserts   int64    `json:"cumulative_inserts"`
+		CumulativeLookups   int64    `json:"cumulative_lookups"`
+		Evictions           int64    `json:"evictions"`
+		Hitratio            Hitratio `json:"hitratio"`
+		Hits                int64    `json:"hits"`
+		Inserts             int64    `json:"inserts"`
+		Lookups             int64    `json:"lookups"`
+		Size                int64    `json:"size"`
+		WarmupTime          int64    `json:"warmupTime"`
+	} `json:"stats"`
+}
+
+// NewSolr return a new instance of Solr
+func NewSolr() *Solr {
+	return &Solr{
+		HTTPTimeout: internal.Duration{Duration: time.Second * 5},
+	}
+}
+
+// SampleConfig returns sample configuration for this plugin.
+func (s *Solr) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the plugin description.
+func (s *Solr) Description() string {
+	return "Read stats from one or more Solr servers or cores"
+}
+
+// Gather reads the stats from Solr and writes it to the
+// Accumulator.
+func (s *Solr) Gather(acc telegraf.Accumulator) error {
+	if s.client == nil {
+		client := s.createHTTPClient()
+		s.client = client
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(len(s.Servers))
+
+	for _, serv := range s.Servers {
+		go func(serv string, acc telegraf.Accumulator) {
+			defer wg.Done()
+			acc.AddError(s.gatherServerMetrics(serv, acc))
+		}(serv, acc)
+	}
+	wg.Wait()
+	return nil
+}
+
+// Gather all metrics from server
+func (s *Solr) gatherServerMetrics(server string, acc telegraf.Accumulator) error {
+	measurementTime := time.Now()
+	adminCoresStatus := &AdminCoresStatus{}
+	if err := s.gatherData(s.adminURL(server), adminCoresStatus); err != nil {
+		return err
+	}
+	addAdminCoresStatusToAcc(acc, adminCoresStatus, measurementTime)
+	cores := s.filterCores(getCoresFromStatus(adminCoresStatus))
+	var wg sync.WaitGroup
+	wg.Add(len(cores))
+	for _, core := range cores {
+		go func(server string, core string, acc telegraf.Accumulator) {
+			defer wg.Done()
+			mBeansData := &MBeansData{}
+			acc.AddError(s.gatherData(s.mbeansURL(server, core), mBeansData))
+			acc.AddError(addCoreMetricsToAcc(acc, core, mBeansData, measurementTime))
+			acc.AddError(addQueryHandlerMetricsToAcc(acc, core, mBeansData, measurementTime))
+			acc.AddError(addUpdateHandlerMetricsToAcc(acc, core, mBeansData, measurementTime))
+			acc.AddError(addCacheMetricsToAcc(acc, core, mBeansData, measurementTime))
+		}(server, core, acc)
+	}
+	wg.Wait()
+	return nil
+}
+
+// Use cores from configuration if exists, else use cores from server
+func (s *Solr) filterCores(serverCores []string) []string {
+	if len(s.Cores) == 0 {
+		return serverCores
+	}
+	return s.Cores
+}
+
+// Return list of cores from solr server
+func getCoresFromStatus(adminCoresStatus *AdminCoresStatus) []string {
+	serverCores := []string{}
+	for coreName := range adminCoresStatus.Status {
+		serverCores = append(serverCores, coreName)
+	}
+	return serverCores
+}
+
+// Add core metrics from admin to accumulator
+// This is the only point where size_in_bytes is available (as far as I checked)
+func addAdminCoresStatusToAcc(acc telegraf.Accumulator, adminCoreStatus *AdminCoresStatus, time time.Time) {
+	for core, metrics := range adminCoreStatus.Status {
+		coreFields := map[string]interface{}{
+			"deleted_docs":  metrics.Index.DeletedDocs,
+			"max_docs":      metrics.Index.MaxDoc,
+			"num_docs":      metrics.Index.NumDocs,
+			"size_in_bytes": metrics.Index.SizeInBytes,
+		}
+		acc.AddFields(
+			"solr_admin",
+			coreFields,
+			map[string]string{"core": core},
+			time,
+		)
+	}
+}
+
+// Add core metrics section to accumulator
+func addCoreMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
+	var coreMetrics map[string]Core
+	if err := json.Unmarshal(mBeansData.SolrMbeans[1], &coreMetrics); err != nil {
+		return err
+	}
+	for name, metrics := range coreMetrics {
+		if strings.Contains(name, "@") {
+			continue
+		}
+		coreFields := map[string]interface{}{
+			"deleted_docs": metrics.Stats.DeletedDocs,
+			"max_docs":     metrics.Stats.MaxDoc,
+			"num_docs":     metrics.Stats.NumDocs,
+		}
+		acc.AddFields(
+			"solr_core",
+			coreFields,
+			map[string]string{
+				"core":    core,
+				"handler": name},
+			time,
+		)
+	}
+	return nil
+}
+
+// Add query metrics section to accumulator
+func addQueryHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
+	var queryMetrics map[string]QueryHandler
+
+	if err := json.Unmarshal(mBeansData.SolrMbeans[3], &queryMetrics); err != nil {
+		return err
+	}
+	for name, metrics := range queryMetrics {
+		coreFields := map[string]interface{}{
+			"15min_rate_reqs_per_second": metrics.Stats.One5minRateReqsPerSecond,
+			"5min_rate_reqs_per_second":  metrics.Stats.FiveMinRateReqsPerSecond,
+			"75th_pc_request_time":       metrics.Stats.Seven5thPcRequestTime,
+			"95th_pc_request_time":       metrics.Stats.Nine5thPcRequestTime,
+			"999th_pc_request_time":      metrics.Stats.Nine99thPcRequestTime,
+			"99th_pc_request_time":       metrics.Stats.Nine9thPcRequestTime,
+			"avg_requests_per_second":    metrics.Stats.AvgRequestsPerSecond,
+			"avg_time_per_request":       metrics.Stats.AvgTimePerRequest,
+			"errors":                     metrics.Stats.Errors,
+			"handler_start":              metrics.Stats.HandlerStart,
+			"median_request_time":        metrics.Stats.MedianRequestTime,
+			"requests":                   metrics.Stats.Requests,
+			"timeouts":                   metrics.Stats.Timeouts,
+			"total_time":                 metrics.Stats.TotalTime,
+		}
+		acc.AddFields(
+			"solr_queryhandler",
+			coreFields,
+			map[string]string{
+				"core":    core,
+				"handler": name},
+			time,
+		)
+	}
+	return nil
+}
+
+// Add update metrics section to accumulator
+func addUpdateHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
+	var updateMetrics map[string]UpdateHandler
+
+	if err := json.Unmarshal(mBeansData.SolrMbeans[5], &updateMetrics); err != nil {
+		return err
+	}
+	for name, metrics := range updateMetrics {
+		var autoCommitMaxTime int64
+		if len(metrics.Stats.AutocommitMaxTime) > 2 {
+			autoCommitMaxTime, _ = strconv.ParseInt(metrics.Stats.AutocommitMaxTime[:len(metrics.Stats.AutocommitMaxTime)-2], 0, 64)
+		}
+		coreFields := map[string]interface{}{
+			"adds":                        metrics.Stats.Adds,
+			"autocommit_max_docs":         metrics.Stats.AutocommitMaxDocs,
+			"autocommit_max_time":         autoCommitMaxTime,
+			"autocommits":                 metrics.Stats.Autocommits,
+			"commits":                     metrics.Stats.Commits,
+			"cumulative_adds":             metrics.Stats.CumulativeAdds,
+			"cumulative_deletes_by_id":    metrics.Stats.CumulativeDeletesByID,
+			"cumulative_deletes_by_query": metrics.Stats.CumulativeDeletesByQuery,
+			"cumulative_errors":           metrics.Stats.CumulativeErrors,
+			"deletes_by_id":               metrics.Stats.DeletesByID,
+			"deletes_by_query":            metrics.Stats.DeletesByQuery,
+			"docs_pending":                metrics.Stats.DocsPending,
+			"errors":                      metrics.Stats.Errors,
+			"expunge_deletes":             metrics.Stats.ExpungeDeletes,
+			"optimizes":                   metrics.Stats.Optimizes,
+			"rollbacks":                   metrics.Stats.Rollbacks,
+			"soft_autocommits":            metrics.Stats.SoftAutocommits,
+		}
+		acc.AddFields(
+			"solr_updatehandler",
+			coreFields,
+			map[string]string{
+				"core":    core,
+				"handler": name},
+			time,
+		)
+	}
+	return nil
+}
+
+// Get float64 from interface
+func getFloat(unk interface{}) float64 {
+	switch i := unk.(type) {
+	case float64:
+		return i
+	case string:
+		f, _ := strconv.ParseFloat(i, 64)
+		return f
+	default:
+		return float64(0)
+	}
+}
+
+// Add cache metrics section to accumulator
+func addCacheMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
+	var cacheMetrics map[string]Cache
+	if err := json.Unmarshal(mBeansData.SolrMbeans[7], &cacheMetrics); err != nil {
+		return err
+	}
+	for name, metrics := range cacheMetrics {
+		cumulativeHits := getFloat(metrics.Stats.CumulativeHitratio)
+		hitratio := getFloat(metrics.Stats.Hitratio)
+		coreFields := map[string]interface{}{
+			"cumulative_evictions": metrics.Stats.CumulativeEvictions,
+			"cumulative_hitratio":  cumulativeHits,
+			"cumulative_hits":      metrics.Stats.CumulativeHits,
+			"cumulative_inserts":   metrics.Stats.CumulativeInserts,
+			"cumulative_lookups":   metrics.Stats.CumulativeLookups,
+			"evictions":            metrics.Stats.Evictions,
+			"hitratio":             hitratio,
+			"hits":                 metrics.Stats.Hits,
+			"inserts":              metrics.Stats.Inserts,
+			"lookups":              metrics.Stats.Lookups,
+			"size":                 metrics.Stats.Size,
+			"warmup_time":          metrics.Stats.WarmupTime,
+		}
+		acc.AddFields(
+			"solr_cache",
+			coreFields,
+			map[string]string{
+				"core":    core,
+				"handler": name},
+			time,
+		)
+	}
+	return nil
+}
+
+// Provide admin url
+func (s *Solr) adminURL(server string) string {
+	return fmt.Sprintf("%s%s", server, adminCoresPath)
+}
+
+// Provide mbeans url
+func (s *Solr) mbeansURL(server string, core string) string {
+	return fmt.Sprintf("%s/solr/%s%s", server, core, mbeansPath)
+}
+
+func (s *Solr) createHTTPClient() *http.Client {
+	tr := &http.Transport{
+		ResponseHeaderTimeout: s.HTTPTimeout.Duration,
+	}
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   s.HTTPTimeout.Duration,
+	}
+
+	return client
+}
+
+func (s *Solr) gatherData(url string, v interface{}) error {
+	r, err := s.client.Get(url)
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+	if r.StatusCode != http.StatusOK {
+		return fmt.Errorf("solr: API responded with status-code %d, expected %d, url %s",
+			r.StatusCode, http.StatusOK, url)
+	}
+	if err = json.NewDecoder(r.Body).Decode(v); err != nil {
+		return err
+	}
+	return nil
+}
+
+func init() {
+	inputs.Add("solr", func() telegraf.Input {
+		return NewSolr()
+	})
+}
diff --git a/plugins/inputs/solr/solr_test.go b/plugins/inputs/solr/solr_test.go
new file mode 100644
index 000000000..aaaba4676
--- /dev/null
+++ b/plugins/inputs/solr/solr_test.go
@@ -0,0 +1,62 @@
+package solr
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGatherStats(t *testing.T) {
+	ts := createMockServer()
+	solr := NewSolr()
+	solr.Servers = []string{ts.URL}
+	var acc testutil.Accumulator
+	require.NoError(t, solr.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminMainCoreStatusExpected,
+		map[string]string{"core": "main"})
+
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminCore1StatusExpected,
+		map[string]string{"core": "core1"})
+
+	acc.AssertContainsTaggedFields(t, "solr_core",
+		solrCoreExpected,
+		map[string]string{"core": "main", "handler": "searcher"})
+
+	acc.AssertContainsTaggedFields(t, "solr_queryhandler",
+		solrQueryHandlerExpected,
+		map[string]string{"core": "main", "handler": "org.apache.solr.handler.component.SearchHandler"})
+
+	acc.AssertContainsTaggedFields(t, "solr_updatehandler",
+		solrUpdateHandlerExpected,
+		map[string]string{"core": "main", "handler": "updateHandler"})
+
+	acc.AssertContainsTaggedFields(t, "solr_cache",
+		solrCacheExpected,
+		map[string]string{"core": "main", "handler": "filterCache"})
+}
+
+func createMockServer() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansMainResponse)
+		} else if strings.Contains(r.URL.Path, "solr/core1/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansCore1Response)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}
diff --git a/plugins/inputs/solr/testdata_test.go b/plugins/inputs/solr/testdata_test.go
new file mode 100644
index 000000000..30ae0127a
--- /dev/null
+++ b/plugins/inputs/solr/testdata_test.go
@@ -0,0 +1,1824 @@
+package solr
+
+const statusResponse = `
+{
+  "status": {
+    "core1": {
+      "index": {
+        "size": "1.66 GB",
+        "sizeInBytes": 1784635686,
+        "lastModified": "2017-01-14T10:30:07.419Z",
+        "userData": {
+          "commitTimeMSec": "1484389807419"
+        },
+        "numDocs": 7517488,
+        "maxDoc": 7620303,
+        "deletedDocs": 102815,
+        "version": 267485,
+        "segmentCount": 21,
+        "current": true,
+        "hasDeletions": true,
+        "directory": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr-core1/index.20160607000000124 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@646d42ce"
+      },
+      "name": "core1",
+      "isDefaultCore": false,
+      "instanceDir": "solr/core1/",
+      "dataDir": "/srv/solr-core1/",
+      "config": "solrconfig.xml",
+      "schema": "schema.xml",
+      "startTime": "2016-12-20T18:41:10.449Z",
+      "uptime": 2314746645
+    },
+    "main": {
+      "index": {
+        "size": "230.5 GB",
+        "sizeInBytes": 247497521642,
+        "lastModified": "2017-01-16T11:59:18.189Z",
+        "userData": {
+          "commitTimeMSec": "1484567958189"
+        },
+        "numDocs": 168943425,
+        "maxDoc": 169562700,
+        "deletedDocs": 619275,
+        "version": 70688464,
+        "segmentCount": 33,
+        "current": true,
+        "hasDeletions": true,
+        "directory": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr/index.20161110090000012 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@15088f05"
+      },
+      "name": "main",
+      "isDefaultCore": true,
+      "instanceDir": "solr/main/",
+      "dataDir": "/srv/solr/",
+      "config": "solrconfig.xml",
+      "schema": "schema.xml",
+      "startTime": "2016-12-20T18:41:10.796Z",
+      "uptime": 2314746294
+    }
+  },
+  "initFailures": {},
+  "defaultCoreName": "main",
+  "responseHeader": {
+    "QTime": 13,
+    "status": 0
+  }
+}
+`
+
+const mBeansMainResponse = `{
+  "solr-mbeans": [
+    "CORE",
+    {
+      "core": {
+        "stats": {
+          "aliases": [
+            "main"
+          ],
+          "indexDir": "/srv/solr/index.20161110090000012",
+          "refCount": 2,
+          "startTime": "2016-12-20T18:41:10.796Z",
+          "coreName": "main"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/SolrCore.java $",
+        "description": "SolrCore",
+        "version": "1.0",
+        "class": "main"
+      },
+      "searcher": {
+        "stats": {
+          "warmupTime": 0,
+          "registeredAt": "2017-01-17T09:00:03.303Z",
+          "openedAt": "2017-01-17T09:00:03.301Z",
+          "searcherName": "Searcher@62d3fac7 main",
+          "caching": true,
+          "numDocs": 168962621,
+          "maxDoc": 169647870,
+          "deletedDocs": 685249,
+          "reader": "StandardDirectoryReader(segments_jwq89:70709031:nrt _dp3n5(4.3.1):C168268689/592191 _dph0g(4.3.1):C311982/51776 _dpz3u(4.3.1):C589116/12754 _dpsbv(4.3.1):C262008/22358 _dq1e0(4.3.1):C104991/772 _dpy04(4.3.1):C24856/1389 _dq029(4.3.1):C42680/1406 _dq0rr(4.3.1):C5064/581 _dq13q(4.3.1):C4322/574 _dq165(4.3.1):C4679/364 _dq1kt(4.3.1):C8124/196 _dq1ta(4.3.1):C8138/152 _dq1x7(4.3.1):C3842/76 _dq212(4.3.1):C4934/111 _dq1wi(4.3.1):C778/145 _dq20q(4.3.1):C805/92 _dq20g(4.3.1):C1183/96 _dq21g(4.3.1):C257/58 _dq20y(4.3.1):C159/19 _dq213(4.3.1):C108/17 _dq218(4.3.1):C89/9 _dq21a(4.3.1):C213/20 _dq21d(4.3.1):C100/10 _dq21f(4.3.1):C214/16 _dq21j(4.3.1):C198/17 _dq21m(4.3.1):C112/2 _dq21n(4.3.1):C105/46 _dq21o(4.3.1):C124/2)",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr/index.20161110090000012 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@15088f05",
+          "indexVersion": 70709031
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "description": "index searcher",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrIndexSearcher"
+      },
+      "Searcher@62d3fac7 main": {
+        "stats": {
+          "warmupTime": 0,
+          "registeredAt": "2017-01-17T09:00:03.303Z",
+          "openedAt": "2017-01-17T09:00:03.301Z",
+          "searcherName": "Searcher@62d3fac7 main",
+          "caching": true,
+          "numDocs": 168962621,
+          "maxDoc": 169647870,
+          "deletedDocs": 685249,
+          "reader": "StandardDirectoryReader(segments_jwq89:70709031:nrt _dp3n5(4.3.1):C168268689/592191 _dph0g(4.3.1):C311982/51776 _dpz3u(4.3.1):C589116/12754 _dpsbv(4.3.1):C262008/22358 _dq1e0(4.3.1):C104991/772 _dpy04(4.3.1):C24856/1389 _dq029(4.3.1):C42680/1406 _dq0rr(4.3.1):C5064/581 _dq13q(4.3.1):C4322/574 _dq165(4.3.1):C4679/364 _dq1kt(4.3.1):C8124/196 _dq1ta(4.3.1):C8138/152 _dq1x7(4.3.1):C3842/76 _dq212(4.3.1):C4934/111 _dq1wi(4.3.1):C778/145 _dq20q(4.3.1):C805/92 _dq20g(4.3.1):C1183/96 _dq21g(4.3.1):C257/58 _dq20y(4.3.1):C159/19 _dq213(4.3.1):C108/17 _dq218(4.3.1):C89/9 _dq21a(4.3.1):C213/20 _dq21d(4.3.1):C100/10 _dq21f(4.3.1):C214/16 _dq21j(4.3.1):C198/17 _dq21m(4.3.1):C112/2 _dq21n(4.3.1):C105/46 _dq21o(4.3.1):C124/2)",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr/index.20161110090000012 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@15088f05",
+          "indexVersion": 70709031
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "description": "index searcher",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrIndexSearcher"
+      }
+    },
+    "QUERYHANDLER",
+    {
+      "org.apache.solr.handler.CSVRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270814,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java $",
+        "description": "Add/Update multiple documents with CSV formatted rows",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.CSVRequestHandler"
+      },
+      "/admin/": {
+        "stats": null,
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "description": "Register Standard Admin Handlers",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.AdminHandlers"
+      },
+      "/admin/mbeans": {
+        "stats": {
+          "999thPcRequestTime": 129.19901009200038,
+          "99thPcRequestTime": 11.944256130000017,
+          "95thPcRequestTime": 9.10313265,
+          "75thPcRequestTime": 7.423904,
+          "medianRequestTime": 0.046796000000000004,
+          "avgTimePerRequest": 2.0964317122172575,
+          "handlerStart": 1482259271568,
+          "requests": 230953,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 484175.0968,
+          "avgRequestsPerSecond": 0.0967113175627352,
+          "5minRateReqsPerSecond": 0.5543011916891444,
+          "15minRateReqsPerSecond": 0.5409225999558686
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java $",
+        "description": "Get Info (and statistics) for registered SolrInfoMBeans",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.SolrInfoMBeanHandler"
+      },
+      "/debug/dump": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270816,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "description": "Dump handler (debug)",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.DumpRequestHandler"
+      },
+      "/admin/logging": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259271569,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java $",
+        "description": "Logging Handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.LoggingHandler"
+      },
+      "/admin/plugins": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259271568,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java $",
+        "description": "Registry",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.PluginInfoHandler"
+      },
+      "/admin/system": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259271568,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java $",
+        "description": "Get System Info",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.SystemInfoHandler"
+      },
+      "/select": {
+        "stats": {
+          "999thPcRequestTime": 145.3845197990004,
+          "99thPcRequestTime": 1.404113640000005,
+          "95thPcRequestTime": 0.21192269999999988,
+          "75thPcRequestTime": 0.12097,
+          "medianRequestTime": 0.116272,
+          "avgTimePerRequest": 3.0322834013981987,
+          "handlerStart": 1482259270810,
+          "requests": 729510,
+          "errors": 0,
+          "timeouts": 9,
+          "totalTime": 2212081.064154,
+          "avgRequestsPerSecond": 0.3054827447483145,
+          "5minRateReqsPerSecond": 0.32614693588972216,
+          "15minRateReqsPerSecond": 0.3320899738059959
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,spellcheck,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/tvrh": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "org.apache.solr.handler.component.SearchHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270810,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/admin/luke": {
+        "stats": {
+          "999thPcRequestTime": 0.4085,
+          "99thPcRequestTime": 0.4085,
+          "95thPcRequestTime": 0.4085,
+          "75thPcRequestTime": 0.4085,
+          "medianRequestTime": 0.31491,
+          "avgTimePerRequest": 0.3105803333333333,
+          "handlerStart": 1482259271568,
+          "requests": 3,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0.931741,
+          "avgRequestsPerSecond": 1.256252178648736e-06,
+          "5minRateReqsPerSecond": 1.4821969375e-313,
+          "15minRateReqsPerSecond": 1.387107477978473e-152
+        },
+        "docs": [
+          "http://wiki.apache.org/solr/LukeRequestHandler"
+        ],
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java $",
+        "description": "Lucene Index Browser.  Inspired and modeled after Luke: http://www.getopt.org/luke/",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.LukeRequestHandler"
+      },
+      "/update/json": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270814,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java $",
+        "description": "Add documents with JSON",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.JsonUpdateRequestHandler"
+      },
+      "org.apache.solr.handler.admin.AdminHandlers": {
+        "stats": null,
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "description": "Register Standard Admin Handlers",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.AdminHandlers"
+      },
+      "org.apache.solr.handler.ReplicationHandler": {
+        "stats": {
+          "lastCycleBytesDownloaded": "240149545",
+          "timesIndexReplicated": "2697",
+          "timesFailed": "1",
+          "replicationFailedAt": "Mon Jun 06 11:55:11 UTC 2016",
+          "indexReplicatedAt": "Tue Jan 17 09:00:03 UTC 2017",
+          "previousCycleTimeInSeconds": "3",
+          "isReplicating": "false",
+          "isPollingDisabled": "false",
+          "pollInterval": "03:00:00",
+          "masterUrl": "http://solr-s1:8983/solr/main",
+          "isSlave": "true",
+          "isMaster": "false",
+          "indexPath": "/srv/solr/index.20161110090000012",
+          "generation": 33439689,
+          "15minRateReqsPerSecond": 4.3340312709959365e-152,
+          "5minRateReqsPerSecond": 1.4821969375e-313,
+          "avgRequestsPerSecond": 2.0937529718964145e-06,
+          "totalTime": 49.630943,
+          "timeouts": 0,
+          "errors": 0,
+          "requests": 5,
+          "handlerStart": 1482259270817,
+          "avgTimePerRequest": 9.9261886,
+          "medianRequestTime": 8.547115,
+          "75thPcRequestTime": 12.1924675,
+          "95thPcRequestTime": 15.377019,
+          "99thPcRequestTime": 15.377019,
+          "999thPcRequestTime": 15.377019,
+          "indexSize": "229.77 GB",
+          "indexVersion": 1484643564822
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java $",
+        "description": "ReplicationHandler provides replication of index and configuration files from Master to Slaves",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.ReplicationHandler"
+      },
+      "org.apache.solr.handler.JsonUpdateRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270814,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java $",
+        "description": "Add documents with JSON",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.JsonUpdateRequestHandler"
+      },
+      "org.apache.solr.handler.DumpRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270816,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "description": "Dump handler (debug)",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.DumpRequestHandler"
+      },
+      "org.apache.solr.handler.RealTimeGetHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270810,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java $",
+        "description": "The realtime get handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.RealTimeGetHandler"
+      },
+      "/get": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270810,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java $",
+        "description": "The realtime get handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.RealTimeGetHandler"
+      },
+      "/admin/properties": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259271568,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java $",
+        "description": "Get System Properties",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.PropertiesRequestHandler"
+      },
+      "/query": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270810,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/admin/threads": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259271568,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java $",
+        "description": "Thread Dump",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.ThreadDumpHandler"
+      },
+      "/analysis/field": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.FieldAnalysisRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.FieldAnalysisRequestHandler]"
+      },
+      "org.apache.solr.handler.PingRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 41.331967987,
+          "99thPcRequestTime": 5.392157590000151,
+          "95thPcRequestTime": 0.4901222999999999,
+          "75thPcRequestTime": 0.357574,
+          "medianRequestTime": 0.3474125,
+          "avgTimePerRequest": 0.7749319095595372,
+          "handlerStart": 1482259270816,
+          "requests": 477021,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 369658.79443,
+          "avgRequestsPerSecond": 0.19975282688134827,
+          "5minRateReqsPerSecond": 0.2000000000000008,
+          "15minRateReqsPerSecond": 0.20000000000000234
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "description": "Reports application health to a load-balancer",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.PingRequestHandler"
+      },
+      "/analysis/document": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.DocumentAnalysisRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.DocumentAnalysisRequestHandler]"
+      },
+      "/spell": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "/update/csv": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270814,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java $",
+        "description": "Add/Update multiple documents with CSV formatted rows",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.CSVRequestHandler"
+      },
+      "org.apache.solr.handler.UpdateRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270811,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java $",
+        "description": "Add documents using XML (with XSLT), CSV, JSON, or javabin",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.UpdateRequestHandler"
+      },
+      "/replication": {
+        "stats": {
+          "lastCycleBytesDownloaded": "240149545",
+          "timesIndexReplicated": "2697",
+          "timesFailed": "1",
+          "replicationFailedAt": "Mon Jun 06 11:55:11 UTC 2016",
+          "indexReplicatedAt": "Tue Jan 17 09:00:03 UTC 2017",
+          "previousCycleTimeInSeconds": "3",
+          "isReplicating": "false",
+          "isPollingDisabled": "false",
+          "pollInterval": "03:00:00",
+          "masterUrl": "http://solr-s1:8983/solr/main",
+          "isSlave": "true",
+          "isMaster": "false",
+          "indexPath": "/srv/solr/index.20161110090000012",
+          "generation": 33439689,
+          "15minRateReqsPerSecond": 4.3340312709959365e-152,
+          "5minRateReqsPerSecond": 1.4821969375e-313,
+          "avgRequestsPerSecond": 2.0937529681743243e-06,
+          "totalTime": 49.630943,
+          "timeouts": 0,
+          "errors": 0,
+          "requests": 5,
+          "handlerStart": 1482259270817,
+          "avgTimePerRequest": 9.9261886,
+          "medianRequestTime": 8.547115,
+          "75thPcRequestTime": 12.1924675,
+          "95thPcRequestTime": 15.377019,
+          "99thPcRequestTime": 15.377019,
+          "999thPcRequestTime": 15.377019,
+          "indexSize": "229.77 GB",
+          "indexVersion": 1484643564822
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java $",
+        "description": "ReplicationHandler provides replication of index and configuration files from Master to Slaves",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.ReplicationHandler"
+      },
+      "/admin/ping": {
+        "stats": {
+          "999thPcRequestTime": 41.331967987,
+          "99thPcRequestTime": 5.392157590000151,
+          "95thPcRequestTime": 0.4901222999999999,
+          "75thPcRequestTime": 0.357574,
+          "medianRequestTime": 0.3474125,
+          "avgTimePerRequest": 0.7749319095595372,
+          "handlerStart": 1482259270816,
+          "requests": 477021,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 369658.79443,
+          "avgRequestsPerSecond": 0.19975282659471533,
+          "5minRateReqsPerSecond": 0.2000000000000008,
+          "15minRateReqsPerSecond": 0.20000000000000234
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "description": "Reports application health to a load-balancer",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.PingRequestHandler"
+      },
+      "/update": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270811,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java $",
+        "description": "Add documents using XML (with XSLT), CSV, JSON, or javabin",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.UpdateRequestHandler"
+      },
+      "/terms": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "/admin/file": {
+        "stats": {
+          "999thPcRequestTime": 0.509739,
+          "99thPcRequestTime": 0.509739,
+          "95thPcRequestTime": 0.509739,
+          "75thPcRequestTime": 0.38605350000000005,
+          "medianRequestTime": 0.184437,
+          "avgTimePerRequest": 0.2358606,
+          "handlerStart": 1482259271569,
+          "requests": 5,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 1.179303,
+          "avgRequestsPerSecond": 2.0937536245042723e-06,
+          "5minRateReqsPerSecond": 1.4821969375e-313,
+          "15minRateReqsPerSecond": 3.0856020161426622e-152
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java $",
+        "description": "Admin Get File -- view config files directly",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.ShowFileRequestHandler"
+      },
+      "/update/extract": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.extraction.ExtractingRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.extraction.ExtractingRequestHandler]"
+      }
+    },
+    "UPDATEHANDLER",
+    {
+      "updateHandler": {
+        "stats": {
+          "cumulative_errors": 0,
+          "expungeDeletes": 0,
+          "rollbacks": 0,
+          "optimizes": 0,
+          "soft autocommits": 0,
+          "autocommits": 0,
+          "autocommit maxTime": "900ms",
+          "autocommit maxDocs": 500,
+          "commits": 0,
+          "docsPending": 0,
+          "adds": 0,
+          "deletesById": 0,
+          "deletesByQuery": 0,
+          "errors": 0,
+          "cumulative_adds": 0,
+          "cumulative_deletesById": 0,
+          "cumulative_deletesByQuery": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java $",
+        "description": "Update handler that efficiently directly updates the on-disk main lucene index",
+        "version": "1.0",
+        "class": "org.apache.solr.update.DirectUpdateHandler2"
+      }
+    },
+    "CACHE",
+    {
+      "fieldCache": {
+        "stats": {
+          "insanity_count": 0,
+          "entries_count": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java $",
+        "description": "Provides introspection of the Lucene FieldCache, this is **NOT** a cache that is managed by Solr.",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrFieldCacheMBean"
+      },
+      "fieldValueCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 0,
+          "cumulative_hitratio": "0.00",
+          "cumulative_hits": 0,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=5120, initialSize=5120, minSize=4608, acceptableSize=4864, cleanupThread=false, autowarmCount=1024, regenerator=org.apache.solr.search.SolrIndexSearcher$1@40acdd5)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "documentCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 5746,
+          "cumulative_hitratio": "0.99",
+          "cumulative_hits": 2405834,
+          "lookups": 3750,
+          "hits": 3733,
+          "hitratio": "0.99",
+          "inserts": 17,
+          "evictions": 0,
+          "size": 17,
+          "warmupTime": 0,
+          "cumulative_lookups": 2411580
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=10240, initialSize=10240, minSize=9216, acceptableSize=9728, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "queryResultCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 2660,
+          "cumulative_hitratio": "0.99",
+          "cumulative_hits": 726607,
+          "lookups": 1206,
+          "hits": 1179,
+          "hitratio": "0.97",
+          "inserts": 27,
+          "evictions": 0,
+          "size": 27,
+          "warmupTime": 0,
+          "cumulative_lookups": 729510
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=5120, initialSize=5120, minSize=4608, acceptableSize=4864, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "filterCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 14,
+          "cumulative_hitratio": 0,
+          "cumulative_hits": 55,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.01",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 69
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=2560, initialSize=2560, minSize=2304, acceptableSize=2432, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      }
+    }
+  ],
+  "responseHeader": {
+    "QTime": 8,
+    "status": 0
+  }
+}
+`
+
+const mBeansCore1Response = `{
+  "solr-mbeans": [
+    "CORE",
+    {
+      "core": {
+        "stats": {
+          "aliases": [
+            "corename"
+          ],
+          "indexDir": "/srv/solr-corename/index.20160607000000124",
+          "refCount": 2,
+          "startTime": "2016-12-20T18:41:10.449Z",
+          "coreName": "core1"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/SolrCore.java $",
+        "description": "SolrCore",
+        "version": "1.0",
+        "class": "core1"
+      },
+      "Searcher@6f0833b2 main": {
+        "stats": {
+          "warmupTime": 0,
+          "registeredAt": "2017-01-14T12:00:00.209Z",
+          "openedAt": "2017-01-14T12:00:00.208Z",
+          "searcherName": "Searcher@6f0833b2 main",
+          "caching": true,
+          "numDocs": 7517488,
+          "maxDoc": 7620303,
+          "deletedDocs": 102815,
+          "reader": "StandardDirectoryReader(segments_20iv:267485:nrt _2849(4.3.1):C7517434/102330 _28e8(4.3.1):C7363/115 _28h0(4.3.1):C5430/77 _28kw(4.3.1):C5984 _28k2(4.3.1):C6510/12 _28g6(4.3.1):C4537/25 _28ha(4.3.1):C5529/25 _28i4(4.3.1):C5087/42 _28js(4.3.1):C5823/10 _28ix(4.3.1):C5627/18 _28kc(4.3.1):C6710/14 _28kl(4.3.1):C7179/10 _28hk(4.3.1):C5149/65 _28j7(4.3.1):C5643/28 _28ht(4.3.1):C5428/9 _28ji(4.3.1):C5150/15 _28gq(4.3.1):C4989/9 _28ie(4.3.1):C5460/8 _28io(4.3.1):C5165/3 _28kv(4.3.1):C51 _28kx(4.3.1):C55)",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr-core1/index.20160607000000124 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@646d42ce",
+          "indexVersion": 267485
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "description": "index searcher",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrIndexSearcher"
+      },
+      "searcher": {
+        "stats": {
+          "warmupTime": 0,
+          "registeredAt": "2017-01-14T12:00:00.209Z",
+          "openedAt": "2017-01-14T12:00:00.208Z",
+          "searcherName": "Searcher@6f0833b2 main",
+          "caching": true,
+          "numDocs": 7517488,
+          "maxDoc": 7620303,
+          "deletedDocs": 102815,
+          "reader": "StandardDirectoryReader(segments_20iv:267485:nrt _2849(4.3.1):C7517434/102330 _28e8(4.3.1):C7363/115 _28h0(4.3.1):C5430/77 _28kw(4.3.1):C5984 _28k2(4.3.1):C6510/12 _28g6(4.3.1):C4537/25 _28ha(4.3.1):C5529/25 _28i4(4.3.1):C5087/42 _28js(4.3.1):C5823/10 _28ix(4.3.1):C5627/18 _28kc(4.3.1):C6710/14 _28kl(4.3.1):C7179/10 _28hk(4.3.1):C5149/65 _28j7(4.3.1):C5643/28 _28ht(4.3.1):C5428/9 _28ji(4.3.1):C5150/15 _28gq(4.3.1):C4989/9 _28ie(4.3.1):C5460/8 _28io(4.3.1):C5165/3 _28kv(4.3.1):C51 _28kx(4.3.1):C55)",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/srv/solr-core1/index.20160607000000124 lockFactory=org.apache.lucene.store.SingleInstanceLockFactory@646d42ce",
+          "indexVersion": 267485
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "description": "index searcher",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrIndexSearcher"
+      }
+    },
+    "QUERYHANDLER",
+    {
+      "org.apache.solr.handler.CSVRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270458,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java $",
+        "description": "Add/Update multiple documents with CSV formatted rows",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.CSVRequestHandler"
+      },
+      "/admin/": {
+        "stats": null,
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "description": "Register Standard Admin Handlers",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.AdminHandlers"
+      },
+      "/admin/mbeans": {
+        "stats": {
+          "999thPcRequestTime": 127.79069480400044,
+          "99thPcRequestTime": 9.033666420000003,
+          "95thPcRequestTime": 5.586449799999999,
+          "75thPcRequestTime": 4.68247075,
+          "medianRequestTime": 0.03985,
+          "avgTimePerRequest": 1.5857040673599807,
+          "handlerStart": 1482259270585,
+          "requests": 230969,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 366246.89703,
+          "avgRequestsPerSecond": 0.09671315555928528,
+          "5minRateReqsPerSecond": 0.545082835587804,
+          "15minRateReqsPerSecond": 0.5414280756665533
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java $",
+        "description": "Get Info (and statistics) for registered SolrInfoMBeans",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.SolrInfoMBeanHandler"
+      },
+      "/debug/dump": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270462,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "description": "Dump handler (debug)",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.DumpRequestHandler"
+      },
+      "/admin/logging": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java $",
+        "description": "Logging Handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.LoggingHandler"
+      },
+      "/admin/plugins": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java $",
+        "description": "Registry",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.PluginInfoHandler"
+      },
+      "/admin/system": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java $",
+        "description": "Get System Info",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.SystemInfoHandler"
+      },
+      "/select": {
+        "stats": {
+          "999thPcRequestTime": 0.518583,
+          "99thPcRequestTime": 0.518583,
+          "95thPcRequestTime": 0.518583,
+          "75thPcRequestTime": 0.518583,
+          "medianRequestTime": 0.518583,
+          "avgTimePerRequest": 0.518583,
+          "handlerStart": 1482259270455,
+          "requests": 1,
+          "errors": 1,
+          "timeouts": 0,
+          "totalTime": 0.518583,
+          "avgRequestsPerSecond": 4.187296521163843e-07,
+          "5minRateReqsPerSecond": 1.4821969375e-313,
+          "15minRateReqsPerSecond": 4.44659081257e-313
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,spellcheck,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/tvrh": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "org.apache.solr.handler.component.SearchHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270455,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/admin/luke": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "docs": [
+          "http://wiki.apache.org/solr/LukeRequestHandler"
+        ],
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java $",
+        "description": "Lucene Index Browser.  Inspired and modeled after Luke: http://www.getopt.org/luke/",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.LukeRequestHandler"
+      },
+      "/update/json": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270457,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java $",
+        "description": "Add documents with JSON",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.JsonUpdateRequestHandler"
+      },
+      "org.apache.solr.handler.admin.AdminHandlers": {
+        "stats": null,
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "description": "Register Standard Admin Handlers",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.AdminHandlers"
+      },
+      "org.apache.solr.handler.ReplicationHandler": {
+        "stats": {
+          "lastCycleBytesDownloaded": "2578996",
+          "timesIndexReplicated": "468",
+          "timesFailed": "2",
+          "replicationFailedAt": "Fri Feb 12 00:00:00 UTC 2016",
+          "indexReplicatedAt": "Sat Jan 14 12:00:00 UTC 2017",
+          "previousCycleTimeInSeconds": "0",
+          "isReplicating": "false",
+          "isPollingDisabled": "false",
+          "pollInterval": "12:00:00",
+          "masterUrl": "http://solr-s1:8983/solr/core1",
+          "isSlave": "true",
+          "isMaster": "false",
+          "indexPath": "/srv/solr-core1/index.20160607000000124",
+          "generation": 93991,
+          "15minRateReqsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "avgRequestsPerSecond": 0,
+          "totalTime": 0,
+          "timeouts": 0,
+          "errors": 0,
+          "requests": 0,
+          "handlerStart": 1482259270463,
+          "avgTimePerRequest": 0,
+          "medianRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "999thPcRequestTime": 0,
+          "indexSize": "1.66 GB",
+          "indexVersion": 1484389807419
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java $",
+        "description": "ReplicationHandler provides replication of index and configuration files from Master to Slaves",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.ReplicationHandler"
+      },
+      "org.apache.solr.handler.JsonUpdateRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270457,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java $",
+        "description": "Add documents with JSON",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.JsonUpdateRequestHandler"
+      },
+      "org.apache.solr.handler.DumpRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270462,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "description": "Dump handler (debug)",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.DumpRequestHandler"
+      },
+      "org.apache.solr.handler.RealTimeGetHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270456,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java $",
+        "description": "The realtime get handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.RealTimeGetHandler"
+      },
+      "/get": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270456,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java $",
+        "description": "The realtime get handler",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.RealTimeGetHandler"
+      },
+      "/admin/properties": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java $",
+        "description": "Get System Properties",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.PropertiesRequestHandler"
+      },
+      "/query": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270455,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "description": "Search using components: query,facet,mlt,highlight,stats,debug,",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.component.SearchHandler"
+      },
+      "/admin/threads": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java $",
+        "description": "Thread Dump",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.ThreadDumpHandler"
+      },
+      "/analysis/field": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.FieldAnalysisRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.FieldAnalysisRequestHandler]"
+      },
+      "org.apache.solr.handler.PingRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270461,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "description": "Reports application health to a load-balancer",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.PingRequestHandler"
+      },
+      "/analysis/document": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.DocumentAnalysisRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.DocumentAnalysisRequestHandler]"
+      },
+      "/spell": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "/update/csv": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270458,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java $",
+        "description": "Add/Update multiple documents with CSV formatted rows",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.CSVRequestHandler"
+      },
+      "org.apache.solr.handler.UpdateRequestHandler": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270457,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java $",
+        "description": "Add documents using XML (with XSLT), CSV, JSON, or javabin",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.UpdateRequestHandler"
+      },
+      "/replication": {
+        "stats": {
+          "lastCycleBytesDownloaded": "2578996",
+          "timesIndexReplicated": "468",
+          "timesFailed": "2",
+          "replicationFailedAt": "Fri Feb 12 00:00:00 UTC 2016",
+          "indexReplicatedAt": "Sat Jan 14 12:00:00 UTC 2017",
+          "previousCycleTimeInSeconds": "0",
+          "isReplicating": "false",
+          "isPollingDisabled": "false",
+          "pollInterval": "12:00:00",
+          "masterUrl": "http://solr-s1:8983/solr/core1",
+          "isSlave": "true",
+          "isMaster": "false",
+          "indexPath": "/srv/solr-core1/index.20160607000000124",
+          "generation": 93991,
+          "15minRateReqsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "avgRequestsPerSecond": 0,
+          "totalTime": 0,
+          "timeouts": 0,
+          "errors": 0,
+          "requests": 0,
+          "handlerStart": 1482259270463,
+          "avgTimePerRequest": 0,
+          "medianRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "999thPcRequestTime": 0,
+          "indexSize": "1.66 GB",
+          "indexVersion": 1484389807419
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java $",
+        "description": "ReplicationHandler provides replication of index and configuration files from Master to Slaves",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.ReplicationHandler"
+      },
+      "/admin/ping": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270461,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "description": "Reports application health to a load-balancer",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.PingRequestHandler"
+      },
+      "/update": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270457,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java $",
+        "description": "Add documents using XML (with XSLT), CSV, JSON, or javabin",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.UpdateRequestHandler"
+      },
+      "/terms": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.SearchHandler]",
+        "version": null,
+        "class": "Lazy[solr.SearchHandler]"
+      },
+      "/admin/file": {
+        "stats": {
+          "999thPcRequestTime": 0,
+          "99thPcRequestTime": 0,
+          "95thPcRequestTime": 0,
+          "75thPcRequestTime": 0,
+          "medianRequestTime": 0,
+          "avgTimePerRequest": 0,
+          "handlerStart": 1482259270585,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgRequestsPerSecond": 0,
+          "5minRateReqsPerSecond": 0,
+          "15minRateReqsPerSecond": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java $",
+        "description": "Admin Get File -- view config files directly",
+        "version": "4.3.1",
+        "class": "org.apache.solr.handler.admin.ShowFileRequestHandler"
+      },
+      "/update/extract": {
+        "stats": {
+          "note": "not initialized yet"
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "description": "Lazy[solr.extraction.ExtractingRequestHandler]",
+        "version": null,
+        "class": "Lazy[solr.extraction.ExtractingRequestHandler]"
+      }
+    },
+    "UPDATEHANDLER",
+    {
+      "updateHandler": {
+        "stats": {
+          "cumulative_errors": 0,
+          "expungeDeletes": 0,
+          "rollbacks": 0,
+          "optimizes": 0,
+          "soft autocommits": 0,
+          "autocommits": 0,
+          "autocommit maxTime": "900ms",
+          "autocommit maxDocs": 500,
+          "commits": 0,
+          "docsPending": 0,
+          "adds": 0,
+          "deletesById": 0,
+          "deletesByQuery": 0,
+          "errors": 0,
+          "cumulative_adds": 0,
+          "cumulative_deletesById": 0,
+          "cumulative_deletesByQuery": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java $",
+        "description": "Update handler that efficiently directly updates the on-disk main lucene index",
+        "version": "1.0",
+        "class": "org.apache.solr.update.DirectUpdateHandler2"
+      }
+    },
+    "CACHE",
+    {
+      "fieldCache": {
+        "stats": {
+          "insanity_count": 0,
+          "entries_count": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java $",
+        "description": "Provides introspection of the Lucene FieldCache, this is **NOT** a cache that is managed by Solr.",
+        "version": "1.0",
+        "class": "org.apache.solr.search.SolrFieldCacheMBean"
+      },
+      "fieldValueCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 0,
+          "cumulative_hitratio": "0.00",
+          "cumulative_hits": 0,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=4096, initialSize=4096, minSize=3686, acceptableSize=3891, cleanupThread=false, autowarmCount=128, regenerator=org.apache.solr.search.SolrIndexSearcher$1@58c2e3e9)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "documentCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 0,
+          "cumulative_hitratio": "0.00",
+          "cumulative_hits": 0,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=32768, initialSize=32768, minSize=29491, acceptableSize=31129, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "queryResultCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 0,
+          "cumulative_hitratio": "0.00",
+          "cumulative_hits": 0,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=4096, initialSize=4096, minSize=3686, acceptableSize=3891, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      },
+      "filterCache": {
+        "stats": {
+          "cumulative_evictions": 0,
+          "cumulative_inserts": 0,
+          "cumulative_hitratio": "0.00",
+          "cumulative_hits": 0,
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 0
+        },
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "description": "Concurrent LRU Cache(maxSize=512, initialSize=512, minSize=460, acceptableSize=486, cleanupThread=false)",
+        "version": "1.0",
+        "class": "org.apache.solr.search.FastLRUCache"
+      }
+    }
+  ],
+  "responseHeader": {
+    "QTime": 5,
+    "status": 0
+  }
+}
+`
+
+var solrAdminMainCoreStatusExpected = map[string]interface{}{
+	"num_docs":      int64(168943425),
+	"max_docs":      int64(169562700),
+	"deleted_docs":  int64(619275),
+	"size_in_bytes": int64(247497521642),
+}
+
+var solrAdminCore1StatusExpected = map[string]interface{}{
+	"num_docs":      int64(7517488),
+	"max_docs":      int64(7620303),
+	"deleted_docs":  int64(102815),
+	"size_in_bytes": int64(1784635686),
+}
+
+var solrCoreExpected = map[string]interface{}{
+	"num_docs":     int64(168962621),
+	"max_docs":     int64(169647870),
+	"deleted_docs": int64(685249),
+}
+
+var solrQueryHandlerExpected = map[string]interface{}{
+	"15min_rate_reqs_per_second": float64(0),
+	"5min_rate_reqs_per_second":  float64(0),
+	"75th_pc_request_time":       float64(0),
+	"95th_pc_request_time":       float64(0),
+	"999th_pc_request_time":      float64(0),
+	"99th_pc_request_time":       float64(0),
+	"avg_requests_per_second":    float64(0),
+	"avg_time_per_request":       float64(0),
+	"errors":                     int64(0),
+	"handler_start":              int64(1482259270810),
+	"median_request_time":        float64(0),
+	"requests":                   int64(0),
+	"timeouts":                   int64(0),
+	"total_time":                 float64(0),
+}
+
+var solrUpdateHandlerExpected = map[string]interface{}{
+	"adds":                        int64(0),
+	"autocommit_max_docs":         int64(500),
+	"autocommit_max_time":         int64(900),
+	"autocommits":                 int64(0),
+	"commits":                     int64(0),
+	"cumulative_adds":             int64(0),
+	"cumulative_deletes_by_id":    int64(0),
+	"cumulative_deletes_by_query": int64(0),
+	"cumulative_errors":           int64(0),
+	"deletes_by_id":               int64(0),
+	"deletes_by_query":            int64(0),
+	"docs_pending":                int64(0),
+	"errors":                      int64(0),
+	"expunge_deletes":             int64(0),
+	"optimizes":                   int64(0),
+	"rollbacks":                   int64(0),
+	"soft_autocommits":            int64(0),
+}
+
+var solrCacheExpected = map[string]interface{}{
+	"cumulative_evictions": int64(0),
+	"cumulative_hitratio":  float64(0),
+	"cumulative_hits":      int64(55),
+	"cumulative_inserts":   int64(14),
+	"cumulative_lookups":   int64(69),
+	"evictions":            int64(0),
+	"hitratio":             float64(0.01),
+	"hits":                 int64(0),
+	"inserts":              int64(0),
+	"lookups":              int64(0),
+	"size":                 int64(0),
+	"warmup_time":          int64(0),
+}

From f0578b8c83ae8e7c657090394ac53c228f916fd2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 Nov 2017 16:48:44 -0800
Subject: [PATCH 0731/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5a4cb873..5dc87ef82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
+- [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
 - [teamspeak](./plugins/inputs/teamspeak/README.md) - Thanks to @p4ddy1
 - [wavefront](./plugins/outputs/wavefront/README.md) - Thanks to @puckpuck
 
@@ -53,6 +54,7 @@
 - [#3406](https://github.com/influxdata/telegraf/pull/3406):  Add support for SSL settings to ElasticSearch output plugin.
 - [#3315](https://github.com/influxdata/telegraf/pull/3315): Add Teamspeak 3 input plugin.
 - [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
+- [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
 
 ### Bugfixes
 

From 07297e80a8420269495b338683bfd9fb2218801d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 8 Nov 2017 15:21:20 -0800
Subject: [PATCH 0732/1302] Set 1.4.4 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dc87ef82..6350ee858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,7 @@
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 - [#3430](https://github.com/influxdata/telegraf/issues/3430): Always ignore autofs filesystems in disk input.
 
-## v1.4.4 [unreleased]
+## v1.4.4 [2017-11-08]
 
 - [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
 - [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.

From 62ec3e50d93fe0303786dba547fe30677ddfa56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Geisend=C3=B6rfer?= <felix@debuggable.com>
Date: Thu, 9 Nov 2017 23:03:16 +0100
Subject: [PATCH 0733/1302] Add CrateDB output plugin (#3210)

---
 Godeps                                        |   2 +-
 Makefile                                      |  16 +-
 README.md                                     |   1 +
 etc/telegraf.conf                             |  13 +
 plugins/inputs/postgresql/postgresql_test.go  |   7 +-
 .../postgresql_extensible_test.go             |  14 +-
 plugins/outputs/all/all.go                    |   1 +
 plugins/outputs/cratedb/README.md             |  38 +++
 plugins/outputs/cratedb/cratedb.go            | 230 ++++++++++++++++++
 plugins/outputs/cratedb/cratedb_test.go       | 215 ++++++++++++++++
 10 files changed, 522 insertions(+), 15 deletions(-)
 create mode 100644 plugins/outputs/cratedb/README.md
 create mode 100644 plugins/outputs/cratedb/cratedb.go
 create mode 100644 plugins/outputs/cratedb/cratedb_test.go

diff --git a/Godeps b/Godeps
index 6b8ba5533..7e90dd061 100644
--- a/Godeps
+++ b/Godeps
@@ -32,7 +32,7 @@ github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
 github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/jackc/pgx b84338d7d62598f75859b2b146d830b22f1b9ec8
+github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
diff --git a/Makefile b/Makefile
index d316cbb8b..d8ccf2faf 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,12 @@ docker-run:
 		-e SLAPD_CONFIG_ROOTPW="secret" \
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
+	docker run --name cratedb \
+		-p "6543:5432" \
+		-d crate crate \
+		-Cnetwork.host=0.0.0.0 \
+		-Ctransport.host=localhost \
+		-Clicense.enterprise=false
 
 # Run docker containers necessary for integration tests; skipping services provided
 # by CircleCI
@@ -110,12 +116,18 @@ docker-run-circle:
 		-e SLAPD_CONFIG_ROOTPW="secret" \
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
+	docker run --name cratedb \
+		-p "6543:5432" \
+		-d crate crate \
+		-Cnetwork.host=0.0.0.0 \
+		-Ctransport.host=localhost \
+		-Clicense.enterprise=false
 
 docker-kill:
 	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper
+		openldap postgres rabbitmq redis riemann zookeeper cratedb
 	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper
+		openldap postgres rabbitmq redis riemann zookeeper cratedb
 
 .PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
 	package clean docker-run docker-run-circle docker-kill docker-image
diff --git a/README.md b/README.md
index a5c6f08e4..c013e4af3 100644
--- a/README.md
+++ b/README.md
@@ -267,6 +267,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [amqp](./plugins/outputs/amqp) (rabbitmq)
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
+* [cratedb](./plugins/outputs/cratedb)
 * [datadog](./plugins/outputs/datadog)
 * [discard](./plugins/outputs/discard)
 * [elasticsearch](./plugins/outputs/elasticsearch)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 63ce2ebfe..3ab0afd51 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -199,6 +199,19 @@
 #   namespace = "InfluxData/Telegraf"
 
 
+# # Configuration for CrateDB to send metrics to.
+# [[outputs.cratedb]]
+#   # A github.com/jackc/pgx connection string.
+#   # See https://godoc.org/github.com/jackc/pgx#ParseDSN
+#   url = "postgres://user:password@localhost/schema?sslmode=disable"
+#   # Timeout for all CrateDB queries.
+#   timeout = "5s"
+#   # Name of the table to store metrics in.
+#   table = "metrics"
+#   # If true, and the metrics table does not exist, create it automatically.
+#   table_create = true
+
+
 # # Configuration for DataDog API to send metrics to.
 # [[outputs.datadog]]
 #   ## Datadog API key
diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go
index 03c09936d..410b9b421 100644
--- a/plugins/inputs/postgresql/postgresql_test.go
+++ b/plugins/inputs/postgresql/postgresql_test.go
@@ -51,12 +51,12 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"checkpoints_req",
 		"checkpoints_timed",
 		"maxwritten_clean",
-	}
-
-	int32Metrics := []string{
+		"datid",
 		"numbackends",
 	}
 
+	int32Metrics := []string{}
+
 	floatMetrics := []string{
 		"blk_read_time",
 		"blk_write_time",
@@ -66,7 +66,6 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 
 	stringMetrics := []string{
 		"datname",
-		"datid",
 	}
 
 	metricsCounted := 0
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 466cdfd98..4545a2478 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -53,11 +53,11 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		"temp_files",
 		"temp_bytes",
 		"deadlocks",
+		"numbackends",
+		"datid",
 	}
 
-	int32Metrics := []string{
-		"numbackends",
-	}
+	int32Metrics := []string{}
 
 	floatMetrics := []string{
 		"blk_read_time",
@@ -66,7 +66,6 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 
 	stringMetrics := []string{
 		"datname",
-		"datid",
 	}
 
 	metricsCounted := 0
@@ -175,11 +174,11 @@ func TestPostgresqlFieldOutput(t *testing.T) {
 		"temp_files",
 		"temp_bytes",
 		"deadlocks",
+		"numbackends",
+		"datid",
 	}
 
-	int32Metrics := []string{
-		"numbackends",
-	}
+	int32Metrics := []string{}
 
 	floatMetrics := []string{
 		"blk_read_time",
@@ -188,7 +187,6 @@ func TestPostgresqlFieldOutput(t *testing.T) {
 
 	stringMetrics := []string{
 		"datname",
-		"datid",
 	}
 
 	for _, field := range intMetrics {
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 53d1cb8ca..5e74eb796 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -4,6 +4,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/amon"
 	_ "github.com/influxdata/telegraf/plugins/outputs/amqp"
 	_ "github.com/influxdata/telegraf/plugins/outputs/cloudwatch"
+	_ "github.com/influxdata/telegraf/plugins/outputs/cratedb"
 	_ "github.com/influxdata/telegraf/plugins/outputs/datadog"
 	_ "github.com/influxdata/telegraf/plugins/outputs/discard"
 	_ "github.com/influxdata/telegraf/plugins/outputs/elasticsearch"
diff --git a/plugins/outputs/cratedb/README.md b/plugins/outputs/cratedb/README.md
new file mode 100644
index 000000000..a8a01fdfe
--- /dev/null
+++ b/plugins/outputs/cratedb/README.md
@@ -0,0 +1,38 @@
+# CrateDB Output Plugin for Telegraf
+
+This plugin writes to [CrateDB](https://crate.io/) via its [PostgreSQL protocol](https://crate.io/docs/crate/reference/protocols/postgres.html).
+
+## Table Schema
+
+The plugin requires a table with the following schema.
+
+
+```sql
+CREATE TABLE my_metrics (
+  "hash_id" LONG INDEX OFF,
+  "timestamp" TIMESTAMP,
+  "name" STRING,
+  "tags" OBJECT(DYNAMIC),
+  "fields" OBJECT(DYNAMIC),
+  PRIMARY KEY ("timestamp", "hash_id","day")
+) PARTITIONED BY("day");
+```
+
+The plugin can create this table for you automatically via the `table_create`
+config option, see below.
+
+## Configuration
+
+```toml
+# Configuration for CrateDB to send metrics to.
+[[outputs.cratedb]]
+  # A github.com/jackc/pgx connection string.
+  # See https://godoc.org/github.com/jackc/pgx#ParseDSN
+  url = "postgres://user:password@localhost/schema?sslmode=disable"
+  # Timeout for all CrateDB queries.
+  timeout = "5s"
+  # Name of the table to store metrics in.
+  table = "metrics"
+  # If true, and the metrics table does not exist, create it automatically.
+  table_create = true
+```
diff --git a/plugins/outputs/cratedb/cratedb.go b/plugins/outputs/cratedb/cratedb.go
new file mode 100644
index 000000000..5a5987c77
--- /dev/null
+++ b/plugins/outputs/cratedb/cratedb.go
@@ -0,0 +1,230 @@
+package cratedb
+
+import (
+	"context"
+	"crypto/sha512"
+	"database/sql"
+	"encoding/binary"
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	_ "github.com/jackc/pgx/stdlib"
+)
+
+type CrateDB struct {
+	URL         string
+	Timeout     internal.Duration
+	Table       string
+	TableCreate bool `toml:"table_create"`
+	DB          *sql.DB
+}
+
+var sampleConfig = `
+  # A github.com/jackc/pgx connection string.
+  # See https://godoc.org/github.com/jackc/pgx#ParseDSN
+  url = "postgres://user:password@localhost/schema?sslmode=disable"
+  # Timeout for all CrateDB queries.
+  timeout = "5s"
+  # Name of the table to store metrics in.
+  table = "metrics"
+  # If true, and the metrics table does not exist, create it automatically.
+  table_create = true
+`
+
+func (c *CrateDB) Connect() error {
+	db, err := sql.Open("pgx", c.URL)
+	if err != nil {
+		return err
+	} else if c.TableCreate {
+		sql := `
+CREATE TABLE IF NOT EXISTS ` + c.Table + ` (
+	"hash_id" LONG INDEX OFF,
+	"timestamp" TIMESTAMP,
+	"name" STRING,
+	"tags" OBJECT(DYNAMIC),
+	"fields" OBJECT(DYNAMIC),
+	"day" TIMESTAMP GENERATED ALWAYS AS date_trunc('day', "timestamp"),
+	PRIMARY KEY ("timestamp", "hash_id","day")
+) PARTITIONED BY("day");
+`
+		ctx, cancel := context.WithTimeout(context.Background(), c.Timeout.Duration)
+		defer cancel()
+		if _, err := db.ExecContext(ctx, sql); err != nil {
+			return err
+		}
+	}
+	c.DB = db
+	return nil
+}
+
+func (c *CrateDB) Write(metrics []telegraf.Metric) error {
+	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout.Duration)
+	defer cancel()
+	if sql, err := insertSQL(c.Table, metrics); err != nil {
+		return err
+	} else if _, err := c.DB.ExecContext(ctx, sql); err != nil {
+		return err
+	}
+	return nil
+}
+
+func insertSQL(table string, metrics []telegraf.Metric) (string, error) {
+	rows := make([]string, len(metrics))
+	for i, m := range metrics {
+
+		cols := []interface{}{
+			hashID(m),
+			m.Time().UTC(),
+			m.Name(),
+			m.Tags(),
+			m.Fields(),
+		}
+
+		escapedCols := make([]string, len(cols))
+		for i, col := range cols {
+			escaped, err := escapeValue(col)
+			if err != nil {
+				return "", err
+			}
+			escapedCols[i] = escaped
+		}
+		rows[i] = `(` + strings.Join(escapedCols, ", ") + `)`
+	}
+	sql := `INSERT INTO ` + table + ` ("hash_id", "timestamp", "name", "tags", "fields")
+VALUES
+` + strings.Join(rows, " ,\n") + `;`
+	return sql, nil
+}
+
+// escapeValue returns a string version of val that is suitable for being used
+// inside of a VALUES expression or similar. Unsupported types return an error.
+//
+// Warning: This is not ideal from a security perspective, but unfortunately
+// CrateDB does not support enough of the PostgreSQL wire protocol to allow
+// using pgx with $1, $2 placeholders [1]. Security conscious users of this
+// plugin should probably refrain from using it in combination with untrusted
+// inputs.
+//
+// [1] https://github.com/influxdata/telegraf/pull/3210#issuecomment-339273371
+func escapeValue(val interface{}) (string, error) {
+	switch t := val.(type) {
+	case string:
+		return escapeString(t, `'`), nil
+	// We don't handle uint, uint32 and uint64 here because CrateDB doesn't
+	// seem to support unsigned types. But it seems like input plugins don't
+	// produce those types, so it's hopefully ok.
+	case int, int32, int64, float32, float64:
+		return fmt.Sprint(t), nil
+	case time.Time:
+		// see https://crate.io/docs/crate/reference/sql/data_types.html#timestamp
+		return escapeValue(t.Format("2006-01-02T15:04:05.999-0700"))
+	case map[string]string:
+		return escapeObject(convertMap(t))
+	case map[string]interface{}:
+		return escapeObject(t)
+	default:
+		// This might be panic worthy under normal circumstances, but it's probably
+		// better to not shut down the entire telegraf process because of one
+		// misbehaving plugin.
+		return "", fmt.Errorf("unexpected type: %T: %#v", t, t)
+	}
+}
+
+// convertMap converts m from map[string]string to map[string]interface{} by
+// copying it. Generics, oh generics where art thou?
+func convertMap(m map[string]string) map[string]interface{} {
+	c := make(map[string]interface{}, len(m))
+	for k, v := range m {
+		c[k] = v
+	}
+	return c
+}
+
+func escapeObject(m map[string]interface{}) (string, error) {
+	// There is a decent chance that the implementation below doesn't catch all
+	// edge cases, but it's hard to tell since the format seems to be a bit
+	// underspecified.
+	// See https://crate.io/docs/crate/reference/sql/data_types.html#object
+
+	// We find all keys and sort them first because iterating a map in go is
+	// randomized and we need consistent output for our unit tests.
+	keys := make([]string, 0, len(m))
+	for k, _ := range m {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// Now we build our key = val pairs
+	pairs := make([]string, 0, len(m))
+	for _, k := range keys {
+		// escape the value of our key k (potentially recursive)
+		val, err := escapeValue(m[k])
+		if err != nil {
+			return "", err
+		}
+		pairs = append(pairs, escapeString(k, `"`)+" = "+val)
+	}
+	return `{` + strings.Join(pairs, ", ") + `}`, nil
+}
+
+// escapeString wraps s in the given quote string and replaces all occurences
+// of it inside of s with a double quote.
+func escapeString(s string, quote string) string {
+	return quote + strings.Replace(s, quote, quote+quote, -1) + quote
+}
+
+// hashID returns a cryptographic hash int64 hash that includes the metric name
+// and tags. It's used instead of m.HashID() because it's not considered stable
+// and because a cryptogtaphic hash makes more sense for the use case of
+// deduplication.
+// [1] https://github.com/influxdata/telegraf/pull/3210#discussion_r148411201
+func hashID(m telegraf.Metric) int64 {
+	h := sha512.New()
+	h.Write([]byte(m.Name()))
+	tags := m.Tags()
+	tmp := make([]string, len(tags))
+	i := 0
+	for k, v := range tags {
+		tmp[i] = k + v
+		i++
+	}
+	sort.Strings(tmp)
+
+	for _, s := range tmp {
+		h.Write([]byte(s))
+	}
+	sum := h.Sum(nil)
+
+	// Note: We have to convert from uint64 to int64 below because CrateDB only
+	// supports a signed 64 bit LONG type:
+	//
+	// CREATE TABLE my_long (val LONG);
+	// INSERT INTO my_long(val) VALUES (14305102049502225714);
+	// -> ERROR:  SQLParseException: For input string: "14305102049502225714"
+	return int64(binary.LittleEndian.Uint64(sum))
+}
+
+func (c *CrateDB) SampleConfig() string {
+	return sampleConfig
+}
+
+func (c *CrateDB) Description() string {
+	return "Configuration for CrateDB to send metrics to."
+}
+
+func (c *CrateDB) Close() error {
+	return c.DB.Close()
+}
+
+func init() {
+	outputs.Add("cratedb", func() telegraf.Output {
+		return &CrateDB{
+			Timeout: internal.Duration{Duration: time.Second * 5},
+		}
+	})
+}
diff --git a/plugins/outputs/cratedb/cratedb_test.go b/plugins/outputs/cratedb/cratedb_test.go
new file mode 100644
index 000000000..590098834
--- /dev/null
+++ b/plugins/outputs/cratedb/cratedb_test.go
@@ -0,0 +1,215 @@
+package cratedb
+
+import (
+	"database/sql"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestConnectAndWrite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	url := testURL()
+	table := "test"
+
+	// dropSQL drops our table before each test. This simplifies changing the
+	// schema during development :).
+	dropSQL := "DROP TABLE IF EXISTS " + escapeString(table, `"`)
+	db, err := sql.Open("pgx", url)
+	require.NoError(t, err)
+	_, err = db.Exec(dropSQL)
+	require.NoError(t, err)
+	defer db.Close()
+
+	c := &CrateDB{
+		URL:         url,
+		Table:       table,
+		Timeout:     internal.Duration{Duration: time.Second * 5},
+		TableCreate: true,
+	}
+
+	metrics := testutil.MockMetrics()
+	require.NoError(t, c.Connect())
+	require.NoError(t, c.Write(metrics))
+
+	// The code below verifies that the metrics were written. We have to select
+	// the rows using their primary keys in order to take advantage of
+	// read-after-write consistency in CrateDB.
+	for _, m := range metrics {
+		hashIDVal, err := escapeValue(hashID(m))
+		require.NoError(t, err)
+		timestamp, err := escapeValue(m.Time())
+		require.NoError(t, err)
+
+		var id int64
+		row := db.QueryRow(
+			"SELECT hash_id FROM " + escapeString(table, `"`) + " " +
+				"WHERE hash_id = " + hashIDVal + " " +
+				"AND timestamp = " + timestamp,
+		)
+		require.NoError(t, row.Scan(&id))
+		// We could check the whole row, but this is meant to be more of a smoke
+		// test, so just checking the HashID seems fine.
+		require.Equal(t, id, hashID(m))
+	}
+
+	require.NoError(t, c.Close())
+}
+
+func Test_insertSQL(t *testing.T) {
+	tests := []struct {
+		Metrics []telegraf.Metric
+		Want    string
+	}{
+		{
+			Metrics: testutil.MockMetrics(),
+			Want: strings.TrimSpace(`
+INSERT INTO my_table ("hash_id", "timestamp", "name", "tags", "fields")
+VALUES
+(-4023501406646044814, '2009-11-10T23:00:00+0000', 'test1', {"tag1" = 'value1'}, {"value" = 1});
+`),
+		},
+	}
+
+	for _, test := range tests {
+		if got, err := insertSQL("my_table", test.Metrics); err != nil {
+			t.Error(err)
+		} else if got != test.Want {
+			t.Errorf("got:\n%s\n\nwant:\n%s", got, test.Want)
+		}
+	}
+}
+
+func Test_escapeValue(t *testing.T) {
+	tests := []struct {
+		Val  interface{}
+		Want string
+	}{
+		// string
+		{`foo`, `'foo'`},
+		{`foo'bar 'yeah`, `'foo''bar ''yeah'`},
+		// int types
+		{123, `123`}, // int
+		{int64(123), `123`},
+		{int32(123), `123`},
+		// float types
+		{123.456, `123.456`},
+		{float32(123.456), `123.456`}, // floating point SNAFU
+		{float64(123.456), `123.456`},
+		// time.Time
+		{time.Date(2017, 8, 7, 16, 44, 52, 123*1000*1000, time.FixedZone("Dreamland", 5400)), `'2017-08-07T16:44:52.123+0130'`},
+		// map[string]string
+		{map[string]string{}, `{}`},
+		{map[string]string(nil), `{}`},
+		{map[string]string{"foo": "bar"}, `{"foo" = 'bar'}`},
+		{map[string]string{"foo": "bar", "one": "more"}, `{"foo" = 'bar', "one" = 'more'}`},
+		// map[string]interface{}
+		{map[string]interface{}{}, `{}`},
+		{map[string]interface{}(nil), `{}`},
+		{map[string]interface{}{"foo": "bar"}, `{"foo" = 'bar'}`},
+		{map[string]interface{}{"foo": "bar", "one": "more"}, `{"foo" = 'bar', "one" = 'more'}`},
+		{map[string]interface{}{"foo": map[string]interface{}{"one": "more"}}, `{"foo" = {"one" = 'more'}}`},
+		{map[string]interface{}{`fo"o`: `b'ar`, `ab'c`: `xy"z`, `on"""e`: `mo'''re`}, `{"ab'c" = 'xy"z', "fo""o" = 'b''ar', "on""""""e" = 'mo''''''re'}`},
+	}
+
+	url := testURL()
+	db, err := sql.Open("pgx", url)
+	require.NoError(t, err)
+	defer db.Close()
+
+	for _, test := range tests {
+		got, err := escapeValue(test.Val)
+		if err != nil {
+			t.Errorf("val: %#v: %s", test.Val, err)
+		} else if got != test.Want {
+			t.Errorf("got:\n%s\n\nwant:\n%s", got, test.Want)
+		}
+
+		// This is a smoke test that will blow up if our escaping causing a SQL
+		// syntax error, which may allow for an attack.
+		var reply interface{}
+		row := db.QueryRow("SELECT " + got)
+		require.NoError(t, row.Scan(&reply))
+	}
+}
+
+func Test_hashID(t *testing.T) {
+	tests := []struct {
+		Name   string
+		Tags   map[string]string
+		Fields map[string]interface{}
+		Want   int64
+	}{
+		{
+			Name:   "metric1",
+			Tags:   map[string]string{"tag1": "val1", "tag2": "val2"},
+			Fields: map[string]interface{}{"field1": "val1", "field2": "val2"},
+			Want:   8973971082006474188,
+		},
+
+		// This metric has a different tag order (in a perhaps non-ideal attempt to
+		// trigger different pseudo-random map iteration)) and fields (none)
+		// compared to the previous metric, but should still get the same hash.
+		{
+			Name:   "metric1",
+			Tags:   map[string]string{"tag2": "val2", "tag1": "val1"},
+			Fields: map[string]interface{}{"field3": "val3"},
+			Want:   8973971082006474188,
+		},
+
+		// Different metric name -> different hash
+		{
+			Name:   "metric2",
+			Tags:   map[string]string{"tag1": "val1", "tag2": "val2"},
+			Fields: map[string]interface{}{"field1": "val1", "field2": "val2"},
+			Want:   306487682448261783,
+		},
+
+		// Different tag val -> different hash
+		{
+			Name:   "metric1",
+			Tags:   map[string]string{"tag1": "new-val", "tag2": "val2"},
+			Fields: map[string]interface{}{"field1": "val1", "field2": "val2"},
+			Want:   1938713695181062970,
+		},
+
+		// Different tag key -> different hash
+		{
+			Name:   "metric1",
+			Tags:   map[string]string{"new-key": "val1", "tag2": "val2"},
+			Fields: map[string]interface{}{"field1": "val1", "field2": "val2"},
+			Want:   7678889081527706328,
+		},
+	}
+
+	for i, test := range tests {
+		m, err := metric.New(
+			test.Name,
+			test.Tags,
+			test.Fields,
+			time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+		)
+		require.NoError(t, err)
+		if got := hashID(m); got != test.Want {
+			t.Errorf("test #%d: got=%d want=%d", i, got, test.Want)
+		}
+	}
+}
+
+func testURL() string {
+	url := os.Getenv("CRATE_URL")
+	if url == "" {
+		return "postgres://" + testutil.GetLocalHost() + ":6543/test?sslmode=disable"
+	}
+	return url
+}

From be13f69305a232e1b1f19f3a85087d407eab4dd3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 9 Nov 2017 14:05:36 -0800
Subject: [PATCH 0734/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6350ee858..d02acae9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### New Plugins
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
+- [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
@@ -55,6 +56,7 @@
 - [#3315](https://github.com/influxdata/telegraf/pull/3315): Add Teamspeak 3 input plugin.
 - [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
 - [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
+- [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
 
 ### Bugfixes
 

From 6a57395731da854ae87346b9f88c0fa3563733ba Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Fri, 10 Nov 2017 17:39:00 -0500
Subject: [PATCH 0735/1302] Compile with Go 1.9.2 (#3458)

---
 CHANGELOG.md | 1 +
 appveyor.yml | 4 ++--
 circle.yml   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d02acae9a..c07898743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
 - [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
 - [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
+- [#3458](https://github.com/influxdata/telegraf/pull/3458): Update CI configs to Go 1.9.2
 
 ### Bugfixes
 
diff --git a/appveyor.yml b/appveyor.yml
index 430b3563f..35cbcbc1a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,11 +12,11 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.8.1.msi" curl -o "C:\Cache\go1.8.1.msi" https://storage.googleapis.com/golang/go1.8.1.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
   - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
   - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.8.1.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version
diff --git a/circle.yml b/circle.yml
index 314903e9d..41fb2e31a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,8 +6,8 @@ machine:
     - rabbitmq-server
   post:
     - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.9.1.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.9.1.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz
     - go version
 
 dependencies:

From ebd73b72792e503c9433b50905ca811a4746ac26 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 10 Nov 2017 14:39:11 -0800
Subject: [PATCH 0736/1302] Update changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c07898743..d02acae9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,6 @@
 - [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
 - [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
 - [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
-- [#3458](https://github.com/influxdata/telegraf/pull/3458): Update CI configs to Go 1.9.2
 
 ### Bugfixes
 

From 6ee6d5575181d4d818c4f2ba40a0e1090351ab12 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 13 Nov 2017 13:59:27 -0500
Subject: [PATCH 0737/1302] Add systemd unit pid and cgroup matching to
 procstat (#3459)

---
 plugins/inputs/procstat/README.md   | 12 ++---
 plugins/inputs/procstat/procstat.go | 68 +++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 57ede8391..00820be9a 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -6,11 +6,11 @@ The procstat plugin can be used to monitor system resource usage by an
 individual process using their /proc data.
 
 Processes can be specified either by pid file, by executable name, by command
-line pattern matching, or by username (in this order or priority. Procstat
-plugin will use `pgrep` when executable name is provided to obtain the pid.
-Procstat plugin will transmit IO, memory, cpu, file descriptor related
-measurements for every process specified. A prefix can be set to isolate
-individual process specific measurements.
+line pattern matching, by username, by systemd unit name, or by cgroup name/path
+(in this order or priority). Procstat plugin will use `pgrep` when executable
+name is provided to obtain the pid. Procstat plugin will transmit IO, memory,
+cpu, file descriptor related measurements for every process specified. A prefix
+can be set to isolate individual process specific measurements.
 
 The plugin will tag processes according to how they are specified in the configuration. If a pid file is used, a "pidfile" tag will be generated.
 On the other hand, if an executable is used an "exe" tag will be generated. Possible tag names:
@@ -19,6 +19,8 @@ On the other hand, if an executable is used an "exe" tag will be generated. Poss
 * exe
 * pattern
 * user
+* systemd_unit
+* cgroup
 
 Additionally the plugin will tag processes by their PID (pid_tag = true in the config) and their process name:
 
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index a216e0e38..5df7d05e4 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -1,7 +1,10 @@
 package procstat
 
 import (
+	"bytes"
 	"fmt"
+	"io/ioutil"
+	"os/exec"
 	"strconv"
 	"time"
 
@@ -24,6 +27,8 @@ type Procstat struct {
 	Prefix      string
 	ProcessName string
 	User        string
+	SystemdUnit string
+	CGroup      string `toml:"cgroup"`
 	PidTag      bool
 
 	pidFinder       PIDFinder
@@ -42,6 +47,10 @@ var sampleConfig = `
   # pattern = "nginx"
   ## user as argument for pgrep (ie, pgrep -u <user>)
   # user = "nginx"
+  ## Systemd unit name
+  # systemd_unit = "nginx.service"
+	## CGroup name or path
+	# cgroup = "systemd/system.slice/nginx.service"
 
   ## override for process_name
   ## This is optional; default is sourced from /proc/<pid>/status
@@ -275,6 +284,12 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 	} else if p.User != "" {
 		pids, err = f.Uid(p.User)
 		tags = map[string]string{"user": p.User}
+	} else if p.SystemdUnit != "" {
+		pids, err = p.systemdUnitPIDs()
+		tags = map[string]string{"systemd_unit": p.SystemdUnit}
+	} else if p.CGroup != "" {
+		pids, err = p.cgroupPIDs()
+		tags = map[string]string{"cgroup": p.CGroup}
 	} else {
 		err = fmt.Errorf("Either exe, pid_file, user, or pattern has to be specified")
 	}
@@ -282,6 +297,59 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 	return pids, tags, err
 }
 
+func (p *Procstat) systemdUnitPIDs() ([]PID, error) {
+	var pids []PID
+	cmd := exec.Command("systemctl", "show", p.SystemdUnit)
+	out, err := cmd.Output()
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range bytes.Split(out, []byte{'\n'}) {
+		kv := bytes.SplitN(line, []byte{'='}, 2)
+		if len(kv) != 2 {
+			continue
+		}
+		if !bytes.Equal(kv[0], []byte("MainPID")) {
+			continue
+		}
+		if len(kv[1]) == 0 {
+			return nil, nil
+		}
+		pid, err := strconv.Atoi(string(kv[1]))
+		if err != nil {
+			return nil, fmt.Errorf("invalid pid '%s'", kv[1])
+		}
+		pids = append(pids, PID(pid))
+	}
+	return pids, nil
+}
+
+func (p *Procstat) cgroupPIDs() ([]PID, error) {
+	var pids []PID
+
+	procsPath := p.CGroup
+	if procsPath[0] != '/' {
+		procsPath = "/sys/fs/cgroup/" + procsPath
+	}
+	procsPath = procsPath + "/cgroup.procs"
+	out, err := ioutil.ReadFile(procsPath)
+	if err != nil {
+		return nil, err
+	}
+	for _, pidBS := range bytes.Split(out, []byte{'\n'}) {
+		if len(pidBS) == 0 {
+			continue
+		}
+		pid, err := strconv.Atoi(string(pidBS))
+		if err != nil {
+			return nil, fmt.Errorf("invalid pid '%s'", pidBS)
+		}
+		pids = append(pids, PID(pid))
+	}
+
+	return pids, nil
+}
+
 func init() {
 	inputs.Add("procstat", func() telegraf.Input {
 		return &Procstat{}

From 181a56018f44ce4107484eae85cbd5203cb8121a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 13 Nov 2017 11:02:01 -0800
Subject: [PATCH 0738/1302] Update changelog

---
 CHANGELOG.md                        | 1 +
 plugins/inputs/procstat/procstat.go | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d02acae9a..996fe1b88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - [#3305](https://github.com/influxdata/telegraf/pull/3305): Add modification_time field to filestat input plugin.
 - [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
 - [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
+- [#3459](https://github.com/influxdata/telegraf/pull/3459): Add systemd unit pid and cgroup matching to procstat.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 5df7d05e4..ca303d49f 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -49,8 +49,8 @@ var sampleConfig = `
   # user = "nginx"
   ## Systemd unit name
   # systemd_unit = "nginx.service"
-	## CGroup name or path
-	# cgroup = "systemd/system.slice/nginx.service"
+  ## CGroup name or path
+  # cgroup = "systemd/system.slice/nginx.service"
 
   ## override for process_name
   ## This is optional; default is sourced from /proc/<pid>/status

From cbd346117adce0f08680dba02cb99a2ad4a4e11d Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Mon, 13 Nov 2017 17:45:31 -0500
Subject: [PATCH 0739/1302] Add tests for procstat systemd & cgroup matching
 (#3469)

---
 plugins/inputs/procstat/procstat.go      |  8 ++-
 plugins/inputs/procstat/procstat_test.go | 72 ++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index ca303d49f..3bd92f3b5 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os/exec"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -297,9 +298,12 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 	return pids, tags, err
 }
 
+// execCommand is so tests can mock out exec.Command usage.
+var execCommand = exec.Command
+
 func (p *Procstat) systemdUnitPIDs() ([]PID, error) {
 	var pids []PID
-	cmd := exec.Command("systemctl", "show", p.SystemdUnit)
+	cmd := execCommand("systemctl", "show", p.SystemdUnit)
 	out, err := cmd.Output()
 	if err != nil {
 		return nil, err
@@ -331,7 +335,7 @@ func (p *Procstat) cgroupPIDs() ([]PID, error) {
 	if procsPath[0] != '/' {
 		procsPath = "/sys/fs/cgroup/" + procsPath
 	}
-	procsPath = procsPath + "/cgroup.procs"
+	procsPath = filepath.Join(procsPath, "cgroup.procs")
 	out, err := ioutil.ReadFile(procsPath)
 	if err != nil {
 		return nil, err
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index bc052939f..7b9d6f0c3 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -2,7 +2,11 @@ package procstat
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -13,6 +17,46 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func init() {
+	execCommand = mockExecCommand
+}
+func mockExecCommand(arg0 string, args ...string) *exec.Cmd {
+	args = append([]string{"-test.run=TestMockExecCommand", "--", arg0}, args...)
+	cmd := exec.Command(os.Args[0], args...)
+	cmd.Stderr = os.Stderr
+	return cmd
+}
+func TestMockExecCommand(t *testing.T) {
+	var cmd []string
+	for _, arg := range os.Args {
+		if string(arg) == "--" {
+			cmd = []string{}
+			continue
+		}
+		if cmd == nil {
+			continue
+		}
+		cmd = append(cmd, string(arg))
+	}
+	if cmd == nil {
+		return
+	}
+	cmdline := strings.Join(cmd, " ")
+
+	if cmdline == "systemctl show TestGather_systemdUnitPIDs" {
+		fmt.Printf(`PIDFile=
+GuessMainPID=yes
+MainPID=11408
+ControlPID=0
+ExecMainPID=11408
+`)
+		os.Exit(0)
+	}
+
+	fmt.Printf("command not found\n")
+	os.Exit(1)
+}
+
 type testPgrep struct {
 	pids []PID
 	err  error
@@ -292,3 +336,31 @@ func TestGather_PercentSecondPass(t *testing.T) {
 	assert.True(t, acc.HasFloatField("procstat", "cpu_time_user"))
 	assert.True(t, acc.HasFloatField("procstat", "cpu_usage"))
 }
+
+func TestGather_systemdUnitPIDs(t *testing.T) {
+	p := Procstat{
+		createPIDFinder: pidFinder([]PID{}, nil),
+		SystemdUnit:     "TestGather_systemdUnitPIDs",
+	}
+	pids, tags, err := p.findPids()
+	require.NoError(t, err)
+	assert.Equal(t, []PID{11408}, pids)
+	assert.Equal(t, "TestGather_systemdUnitPIDs", tags["systemd_unit"])
+}
+
+func TestGather_cgroupPIDs(t *testing.T) {
+	td, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer os.RemoveAll(td)
+	err = ioutil.WriteFile(filepath.Join(td, "cgroup.procs"), []byte("1234\n5678\n"), 0644)
+	require.NoError(t, err)
+
+	p := Procstat{
+		createPIDFinder: pidFinder([]PID{}, nil),
+		CGroup:          td,
+	}
+	pids, tags, err := p.findPids()
+	require.NoError(t, err)
+	assert.Equal(t, []PID{1234, 5678}, pids)
+	assert.Equal(t, td, tags["cgroup"])
+}

From a411306fba0dc87778e64392b57c844e0477df2b Mon Sep 17 00:00:00 2001
From: faye-sama <32477052+faye-sama@users.noreply.github.com>
Date: Mon, 13 Nov 2017 23:06:47 +0000
Subject: [PATCH 0740/1302] Fail metrics parsing on unescaped quotes (#3409)

Before this change Fields() method on a metric parsed from a line with
unescaped quotes could panic. This change makes such line unparseable.

Fixes #3326
---
 metric/parse.go                       | 20 +++++++++++++-------
 plugins/parsers/influx/parser_test.go | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/metric/parse.go b/metric/parse.go
index 1acf30094..80fe2ef3f 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -326,7 +326,9 @@ func scanTagsValue(buf []byte, i int) (int, int, error) {
 func scanFields(buf []byte, i int) (int, []byte, error) {
 	start := skipWhitespace(buf, i)
 	i = start
-	quoted := false
+
+	// track how many '"" we've seen since last '='
+	quotes := 0
 
 	// tracks how many '=' we've seen
 	equals := 0
@@ -350,13 +352,17 @@ func scanFields(buf []byte, i int) (int, []byte, error) {
 		// Only quote values in the field value since quotes are not significant
 		// in the field key
 		if buf[i] == '"' && equals > commas {
-			quoted = !quoted
 			i++
+			quotes++
+			if quotes > 2 {
+				break
+			}
 			continue
 		}
 
 		// If we see an =, ensure that there is at least on char before and after it
-		if buf[i] == '=' && !quoted {
+		if buf[i] == '=' && quotes != 1 {
+			quotes = 0
 			equals++
 
 			// check for "... =123" but allow "a\ =123"
@@ -398,19 +404,19 @@ func scanFields(buf []byte, i int) (int, []byte, error) {
 			}
 		}
 
-		if buf[i] == ',' && !quoted {
+		if buf[i] == ',' && quotes != 1 {
 			commas++
 		}
 
 		// reached end of block?
-		if buf[i] == ' ' && !quoted {
+		if buf[i] == ' ' && quotes != 1 {
 			break
 		}
 		i++
 	}
 
-	if quoted {
-		return i, buf[start:i], makeError("unbalanced quotes", buf, i)
+	if quotes != 0 && quotes != 2 {
+		return i, buf[start:i], makeError("unescaped/ublanaced quotes", buf, i)
 	}
 
 	// check that all field sections had key and values (e.g. prevent "a=1,b"
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 6b2ba8d56..67833fc56 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -1,6 +1,7 @@
 package influx
 
 import (
+	"fmt"
 	"io/ioutil"
 	"testing"
 	"time"
@@ -24,6 +25,8 @@ const (
 	validInfluxNoNewline = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000"
 	invalidInflux        = "I don't think this is line protocol\n"
 	invalidInflux2       = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
+	invalidInflux3       = `name text="unescaped "quote" ",value=1 1498077493081000000`
+	invalidInflux4       = `name text="unbalanced "quote" 1498077493081000000`
 )
 
 const influxMulti = `
@@ -221,10 +224,21 @@ func TestParseInvalidInflux(t *testing.T) {
 	assert.Error(t, err)
 	_, err = parser.Parse([]byte(invalidInflux2))
 	assert.Error(t, err)
+	_, err = parser.Parse([]byte(invalidInflux3))
+	assert.Error(t, err)
+	fmt.Printf("%+v\n", err) // output for debug
+	_, err = parser.Parse([]byte(invalidInflux4))
+	assert.Error(t, err)
+
 	_, err = parser.ParseLine(invalidInflux)
 	assert.Error(t, err)
 	_, err = parser.ParseLine(invalidInflux2)
 	assert.Error(t, err)
+	_, err = parser.ParseLine(invalidInflux3)
+	assert.Error(t, err)
+	_, err = parser.ParseLine(invalidInflux4)
+	assert.Error(t, err)
+
 }
 
 func BenchmarkParse(b *testing.B) {

From 72682973bde88b575a82edef0aa5236d276f14e9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 13 Nov 2017 15:07:54 -0800
Subject: [PATCH 0741/1302] Fix typo in error message

---
 metric/parse.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metric/parse.go b/metric/parse.go
index 80fe2ef3f..0fccbeb32 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -416,7 +416,7 @@ func scanFields(buf []byte, i int) (int, []byte, error) {
 	}
 
 	if quotes != 0 && quotes != 2 {
-		return i, buf[start:i], makeError("unescaped/ublanaced quotes", buf, i)
+		return i, buf[start:i], makeError("unbalanced quotes", buf, i)
 	}
 
 	// check that all field sections had key and values (e.g. prevent "a=1,b"

From 19839c0167b992c248d95c0d19155d301411482d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 13 Nov 2017 15:09:05 -0800
Subject: [PATCH 0742/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996fe1b88..420ed0077 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - [#3319](https://github.com/influxdata/telegraf/issues/3319): Fix cloudwatch output requires unneeded permissions.
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 - [#3430](https://github.com/influxdata/telegraf/issues/3430): Always ignore autofs filesystems in disk input.
+- [#3326](https://github.com/influxdata/telegraf/issues/3326): Fail metrics parsing on unescaped quotes.
 
 ## v1.4.4 [2017-11-08]
 

From 136c15ba33abdafd392b27b23d132db3fe72f331 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 13 Nov 2017 15:22:57 -0800
Subject: [PATCH 0743/1302] Skip test requiring cratedb server in short test
 mode

---
 plugins/outputs/cratedb/cratedb_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/outputs/cratedb/cratedb_test.go b/plugins/outputs/cratedb/cratedb_test.go
index 590098834..46fdd7b84 100644
--- a/plugins/outputs/cratedb/cratedb_test.go
+++ b/plugins/outputs/cratedb/cratedb_test.go
@@ -91,6 +91,10 @@ VALUES
 }
 
 func Test_escapeValue(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
 	tests := []struct {
 		Val  interface{}
 		Want string

From 8364417009da541e3842875ff263bcb12fc48c23 Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Wed, 15 Nov 2017 23:44:20 +0100
Subject: [PATCH 0744/1302] Whitelist allowed char classes for graphite output
 (#3473)

---
 CHANGELOG.md                                  |  1 +
 plugins/serializers/graphite/graphite.go      | 28 +++++-
 plugins/serializers/graphite/graphite_test.go | 93 +++++++++++++++++++
 3 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 420ed0077..2bc5e23fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - [#3351](https://github.com/influxdata/telegraf/issues/3351): Fix prometheus passthrough for existing value types.
 - [#3430](https://github.com/influxdata/telegraf/issues/3430): Always ignore autofs filesystems in disk input.
 - [#3326](https://github.com/influxdata/telegraf/issues/3326): Fail metrics parsing on unescaped quotes.
+- [#3473](https://github.com/influxdata/telegraf/pull/3473): Whitelist allowed char classes for graphite output.
 
 ## v1.4.4 [2017-11-08]
 
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index 084ba54e7..157add41d 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -2,6 +2,7 @@ package graphite
 
 import (
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -11,8 +12,18 @@ import (
 const DEFAULT_TEMPLATE = "host.tags.measurement.field"
 
 var (
-	fieldDeleter   = strings.NewReplacer(".FIELDNAME", "", "FIELDNAME.", "")
-	sanitizedChars = strings.NewReplacer("/", "-", "@", "-", "*", "-", " ", "_", "..", ".", `\`, "", ")", "_", "(", "_")
+	allowedChars = regexp.MustCompile(`[^a-zA-Z0-9-:._=\p{L}]`)
+	hypenChars   = strings.NewReplacer(
+		"/", "-",
+		"@", "-",
+		"*", "-",
+	)
+	dropChars = strings.NewReplacer(
+		`\`, "",
+		"..", ".",
+	)
+
+	fieldDeleter = strings.NewReplacer(".FIELDNAME", "", "FIELDNAME.", "")
 )
 
 type GraphiteSerializer struct {
@@ -44,7 +55,7 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 		}
 		metricString := fmt.Sprintf("%s %#v %d\n",
 			// insert "field" section of template
-			sanitizedChars.Replace(InsertField(bucket, fieldName)),
+			sanitize(InsertField(bucket, fieldName)),
 			value,
 			timestamp)
 		point := []byte(metricString)
@@ -122,7 +133,7 @@ func InsertField(bucket, fieldName string) string {
 	if fieldName == "value" {
 		return fieldDeleter.Replace(bucket)
 	}
-	return strings.Replace(bucket, "FIELDNAME", fieldName, 1)
+	return strings.Replace(bucket, "FIELDNAME", strings.Replace(fieldName, ".", "_", -1), 1)
 }
 
 func buildTags(tags map[string]string) string {
@@ -143,3 +154,12 @@ func buildTags(tags map[string]string) string {
 	}
 	return tag_str
 }
+
+func sanitize(value string) string {
+	// Apply special hypenation rules to preserve backwards compatibility
+	value = hypenChars.Replace(value)
+	// Apply rule to drop some chars to preserve backwards compatibility
+	value = dropChars.Replace(value)
+	// Replace any remaining illegal chars
+	return allowedChars.ReplaceAllLiteralString(value, "_")
+}
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index a6dd1aaa9..94792112f 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf/metric"
 )
@@ -468,3 +469,95 @@ func TestTemplate6(t *testing.T) {
 	expS := "localhost.cpu0.us-west-2.cpu.FIELDNAME"
 	assert.Equal(t, expS, mS)
 }
+
+func TestClean(t *testing.T) {
+	now := time.Unix(1234567890, 0)
+	tests := []struct {
+		name        string
+		metric_name string
+		tags        map[string]string
+		fields      map[string]interface{}
+		expected    string
+	}{
+		{
+			"Base metric",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"localhost.cpu.usage_busy 8.5 1234567890\n",
+		},
+		{
+			"Dot and whitespace in tags",
+			"cpu",
+			map[string]string{"host": "localhost", "label.dot and space": "value with.dot"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"localhost.value_with_dot.cpu.usage_busy 8.5 1234567890\n",
+		},
+		{
+			"Field with space",
+			"system",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"uptime_format": "20 days, 23:26"},
+			"", // yes nothing. graphite don't serialize string fields
+		},
+		{
+			"Allowed punct",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "-_:="},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"localhost.-_:=.cpu.usage_busy 10 1234567890\n",
+		},
+		{
+			"Special conversions to hyphen",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "/@*"},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"localhost.---.cpu.usage_busy 10 1234567890\n",
+		},
+		{
+			"Special drop chars",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": `\no slash`},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"localhost.no_slash.cpu.usage_busy 10 1234567890\n",
+		},
+		{
+			"Empty tag & value field",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"value": float64(10)},
+			"localhost.cpu 10 1234567890\n",
+		},
+		{
+			"Unicode Letters allowed",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "μnicodε_letters"},
+			map[string]interface{}{"value": float64(10)},
+			"localhost.μnicodε_letters.cpu 10 1234567890\n",
+		},
+		{
+			"Other Unicode not allowed",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "“☢”"},
+			map[string]interface{}{"value": float64(10)},
+			"localhost.___.cpu 10 1234567890\n",
+		},
+		{
+			"Newline in tags",
+			"cpu",
+			map[string]string{"host": "localhost", "label": "some\nthing\nwith\nnewline"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"localhost.some_thing_with_newline.cpu.usage_busy 8.5 1234567890\n",
+		},
+	}
+
+	s := GraphiteSerializer{}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(tt.metric_name, tt.tags, tt.fields, now)
+			assert.NoError(t, err)
+			actual, _ := s.Serialize(m)
+			require.Equal(t, tt.expected, string(actual))
+		})
+	}
+}

From b813e2ecae48e4d4cc2e73c99cf14ee942f85fac Mon Sep 17 00:00:00 2001
From: "David G. Simmons" <davidgs@users.noreply.github.com>
Date: Thu, 16 Nov 2017 16:03:19 -0800
Subject: [PATCH 0745/1302] Add Particle Webhook Plugin (#3477)

---
 plugins/inputs/webhooks/README.md             |  2 +
 plugins/inputs/webhooks/particle/README.md    | 39 ++++++++
 .../webhooks/particle/particle_webhooks.go    | 64 ++++++++++++
 .../particle/particle_webhooks_test.go        | 97 +++++++++++++++++++
 plugins/inputs/webhooks/webhooks.go           |  5 +
 plugins/inputs/webhooks/webhooks_test.go      |  7 ++
 6 files changed, 214 insertions(+)
 create mode 100644 plugins/inputs/webhooks/particle/README.md
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks.go
 create mode 100644 plugins/inputs/webhooks/particle/particle_webhooks_test.go

diff --git a/plugins/inputs/webhooks/README.md b/plugins/inputs/webhooks/README.md
index e6af86621..13141fc4b 100644
--- a/plugins/inputs/webhooks/README.md
+++ b/plugins/inputs/webhooks/README.md
@@ -20,6 +20,8 @@ $ sudo service telegraf start
 - [Mandrill](mandrill/)
 - [Rollbar](rollbar/)
 - [Papertrail](papertrail/)
+- [Particle](particle/)
+
 
 ## Adding new webhooks plugin
 
diff --git a/plugins/inputs/webhooks/particle/README.md b/plugins/inputs/webhooks/particle/README.md
new file mode 100644
index 000000000..4e3426da5
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/README.md
@@ -0,0 +1,39 @@
+# particle webhooks
+
+
+You should configure your Particle.io's Webhooks to point at the `webhooks` service. To do this go to `(https://console.particle.io/)[https://console.particle.io]` and click `Integrations > New Integration > Webhook`. In the resulting page set `URL` to `http://<my_ip>:1619/particle`, and  under `Advanced Settings` click on `JSON` and add:
+
+```
+{
+    "measurement": "your_measurement_name"
+}
+```
+
+If required, enter your username and password, etc. and then click `Save`
+
+
+
+## Events
+
+Your Particle device should publish an event that contains a JSON in the form of:
+```
+String data = String::format("{ \"tags\" : {
+	    \"tag_name\": \"tag_value\", 
+	    \"other_tag\": \"other_value\"
+    }, 
+	\"values\": {
+	    \"value_name\": %f, 
+		\"other_value\": %f, 
+    }
+    }",  value_value, other_value
+	);
+    Particle.publish("event_name", data, PRIVATE);
+```
+
+Escaping the "" is required in the source file.
+The number of tag values and field values is not restrictied so you can send as many values per webhook call as you'd like.
+
+You will need to enable JSON messages in the Webhooks setup of Particle.io, and make sure to check the "include default data" box as well.
+
+
+See [webhook doc](https://docs.particle.io/reference/webhooks/)
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks.go b/plugins/inputs/webhooks/particle/particle_webhooks.go
new file mode 100644
index 000000000..aa3499935
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks.go
@@ -0,0 +1,64 @@
+package particle
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+)
+
+type event struct {
+	Name        string `json:"event"`
+	Data        data   `json:"data"`
+	TTL         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	Database    string `json:"measurement"`
+}
+
+type data struct {
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func newEvent() *event {
+	return &event{
+		Data: data{
+			Tags:   make(map[string]string),
+			Fields: make(map[string]interface{}),
+		},
+	}
+}
+
+func (e *event) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
+}
+
+type ParticleWebhook struct {
+	Path string
+	acc  telegraf.Accumulator
+}
+
+func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator) {
+	router.HandleFunc(rb.Path, rb.eventHandler).Methods("POST")
+	rb.acc = acc
+}
+
+func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	e := newEvent()
+	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
+		rb.acc.AddError(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	pTime, err := e.Time()
+	if err != nil {
+		pTime = time.Now()
+	}
+
+	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/plugins/inputs/webhooks/particle/particle_webhooks_test.go b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
new file mode 100644
index 000000000..dc6213367
--- /dev/null
+++ b/plugins/inputs/webhooks/particle/particle_webhooks_test.go
@@ -0,0 +1,97 @@
+package particle
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	w := httptest.NewRecorder()
+	w.Code = 500
+
+	rb.eventHandler(w, req)
+
+	return w
+}
+
+func TestNewItem(t *testing.T) {
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, NewItemJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+
+	fields := map[string]interface{}{
+		"temp_c":    26.680000,
+		"temp_f":    80.024001,
+		"infrared":  528.0,
+		"lux":       0.0,
+		"humidity":  44.937500,
+		"pressure":  998.998901,
+		"altitude":  119.331436,
+		"broadband": 1266.0,
+	}
+
+	tags := map[string]string{
+		"id":       "230035001147343438323536",
+		"location": "TravelingWilbury",
+	}
+
+	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
+}
+
+func TestUnknowItem(t *testing.T) {
+	t.Parallel()
+	var acc testutil.Accumulator
+	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
+	resp := postWebhooks(rb, UnknowJSON())
+	if resp.Code != http.StatusOK {
+		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
+	}
+}
+
+func NewItemJSON() string {
+	return `
+	{
+	  "event": "temperature",
+	  "data": {
+		  "tags": {
+			  "id": "230035001147343438323536",
+			  "location": "TravelingWilbury"
+		  },
+		  "values": {
+			  "temp_c": 26.680000,
+			  "temp_f": 80.024001,
+			  "humidity": 44.937500,
+			  "pressure": 998.998901,
+			  "altitude": 119.331436,
+			  "broadband": 1266.0,
+			  "infrared": 528.0,
+			  "lux": 0.0
+		  }
+	  },
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor",
+	  "measurement": "mydata"
+  }`
+}
+
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index 698cde159..d8a6e07d4 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/mandrill"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -34,6 +35,7 @@ type Webhooks struct {
 	Mandrill   *mandrill.MandrillWebhook
 	Rollbar    *rollbar.RollbarWebhook
 	Papertrail *papertrail.PapertrailWebhook
+	Particle   *particle.ParticleWebhook
 
 	srv *http.Server
 }
@@ -62,6 +64,9 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
+	
+  [inputs.webhooks.particle]
+    path = "/particle"
  `
 }
 
diff --git a/plugins/inputs/webhooks/webhooks_test.go b/plugins/inputs/webhooks/webhooks_test.go
index 6d3448870..a44e41433 100644
--- a/plugins/inputs/webhooks/webhooks_test.go
+++ b/plugins/inputs/webhooks/webhooks_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/github"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/papertrail"
+	"github.com/influxdata/telegraf/plugins/inputs/webhooks/particle"
 	"github.com/influxdata/telegraf/plugins/inputs/webhooks/rollbar"
 )
 
@@ -33,4 +34,10 @@ func TestAvailableWebhooks(t *testing.T) {
 	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
 		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
 	}
+
+	wb.Particle = &particle.ParticleWebhook{Path: "/particle"}
+	expected = append(expected, wb.Particle)
+	if !reflect.DeepEqual(wb.AvailableWebhooks(), expected) {
+		t.Errorf("expected to be %v.\nGot %v", expected, wb.AvailableWebhooks())
+	}
 }

From b13eea89b107a283d4a2030c3f297473b2638dfa Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 16 Nov 2017 16:11:20 -0800
Subject: [PATCH 0746/1302] Update changelog and add particle webhook to readme

---
 CHANGELOG.md | 2 ++
 README.md    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc5e23fa..a29ec7f81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+- [particle](./plugins/inputs/webhooks/particle/README.md) - Thanks to @davidgs
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
 - [teamspeak](./plugins/inputs/teamspeak/README.md) - Thanks to @p4ddy1
@@ -58,6 +59,7 @@
 - [#2019](https://github.com/influxdata/telegraf/pull/2019): Add Solr input plugin.
 - [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
 - [#3459](https://github.com/influxdata/telegraf/pull/3459): Add systemd unit pid and cgroup matching to procstat.
+- [#3477](https://github.com/influxdata/telegraf/pull/3477): Add Particle Webhook Plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index c013e4af3..f527e6258 100644
--- a/README.md
+++ b/README.md
@@ -236,8 +236,9 @@ Telegraf can also collect metrics via the following service plugins:
   * [filestack](./plugins/inputs/webhooks/filestack)
   * [github](./plugins/inputs/webhooks/github)
   * [mandrill](./plugins/inputs/webhooks/mandrill)
-  * [rollbar](./plugins/inputs/webhooks/rollbar)
   * [papertrail](./plugins/inputs/webhooks/papertrail)
+  * [particle](./plugins/inputs/webhooks/particle)
+  * [rollbar](./plugins/inputs/webhooks/rollbar)
 * [zipkin](./plugins/inputs/zipkin)
 
 Telegraf is able to parse the following input data formats into metrics, these

From a06ee58785173202e23fc336c7c447c72400426e Mon Sep 17 00:00:00 2001
From: erayaslan <erayaslan@gmail.com>
Date: Fri, 17 Nov 2017 03:49:51 +0300
Subject: [PATCH 0747/1302] Use MAX() instead of SUM() for latency measurements
 in sqlserver (#3471)

---
 plugins/inputs/sqlserver/sqlserver.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index cdf8ef4f2..49f36b2cf 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -539,7 +539,7 @@ SELECT DatabaseName,  ReadLatency
 FROM #baseline
 WHERE datafile_type = ''LOG''
 ) as V
-PIVOT(SUM(ReadLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
+PIVOT(MAX(ReadLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
 
 UNION ALL
 
@@ -550,7 +550,7 @@ SELECT DatabaseName,  WriteLatency
 FROM #baseline
 WHERE datafile_type = ''LOG''
 ) as V
-PIVOT(SUM(WriteLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
+PIVOT(MAX(WriteLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
 
 UNION ALL
 
@@ -561,7 +561,7 @@ SELECT DatabaseName,  ReadLatency
 FROM #baseline
 WHERE datafile_type = ''ROWS''
 ) as V
-PIVOT(SUM(ReadLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
+PIVOT(MAX(ReadLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
 
 UNION ALL
 
@@ -572,7 +572,7 @@ SELECT DatabaseName,  WriteLatency
 FROM #baseline
 WHERE datafile_type = ''ROWS''
 ) as V
-PIVOT(SUM(WriteLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
+PIVOT(MAX(WriteLatency) FOR DatabaseName IN (' + @ColumnName + ')) AS PVTTable
 
 UNION ALL
 

From 9422cca2cccae58d08c27c256e9ca1e21b5359dd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 16 Nov 2017 16:51:02 -0800
Subject: [PATCH 0748/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a29ec7f81..e649c59d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - [#3210](https://github.com/influxdata/telegraf/pull/3210): Add CrateDB output plugin.
 - [#3459](https://github.com/influxdata/telegraf/pull/3459): Add systemd unit pid and cgroup matching to procstat.
 - [#3477](https://github.com/influxdata/telegraf/pull/3477): Add Particle Webhook Plugin.
+- [#3471](https://github.com/influxdata/telegraf/pull/3471): Use MAX() instead of SUM() for latency measurements in sqlserver.
 
 ### Bugfixes
 

From afe05fcfef3bc80b688ad49092ebd9c91942a5be Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Mon, 20 Nov 2017 16:19:32 -0600
Subject: [PATCH 0749/1302] Use hexadecimal ids and lowercase names in zipkin
 input (#3488)

---
 .../stress_test_write/stress_test_write.go    |  12 +-
 plugins/inputs/zipkin/codec/jsonV1/jsonV1.go  |   4 +-
 .../inputs/zipkin/codec/jsonV1/jsonV1_test.go |  16 +-
 plugins/inputs/zipkin/codec/thrift/thrift.go  |   2 +-
 plugins/inputs/zipkin/convert.go              |  22 ++-
 plugins/inputs/zipkin/convert_test.go         |  18 +--
 plugins/inputs/zipkin/handler_test.go         |  10 +-
 plugins/inputs/zipkin/zipkin_test.go          | 146 +++++++++---------
 8 files changed, 120 insertions(+), 110 deletions(-)

diff --git a/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
index f4bc134f9..ddc0d4918 100644
--- a/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
+++ b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
@@ -38,11 +38,11 @@ var (
 const usage = `./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>`
 
 func init() {
-	flag.IntVar(&BatchSize, "batch_size", 10000, usage)
-	flag.IntVar(&MaxBackLog, "max_backlog", 100000, usage)
-	flag.IntVar(&BatchTimeInterval, "batch_interval", 1, usage)
-	flag.IntVar(&SpanCount, "span_count", 100000, usage)
-	flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", usage)
+	flag.IntVar(&BatchSize, "batch_size", 10000, "")
+	flag.IntVar(&MaxBackLog, "max_backlog", 100000, "")
+	flag.IntVar(&BatchTimeInterval, "batch_interval", 1, "")
+	flag.IntVar(&SpanCount, "span_count", 100000, "")
+	flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", "")
 }
 
 func main() {
@@ -59,7 +59,7 @@ func main() {
 	}
 
 	tracer, err := zipkin.NewTracer(
-		zipkin.NewRecorder(collector, false, "127.0.0.1:0", "trivial"))
+		zipkin.NewRecorder(collector, false, "127.0.0.1:0", "Trivial"))
 
 	if err != nil {
 		log.Fatalf("Error: %v\n", err)
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
index 53670dd29..8c229b9f3 100644
--- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
@@ -239,7 +239,7 @@ func TraceIDFromString(s string) (string, error) {
 	return fmt.Sprintf("%x%016x", hi, lo), nil
 }
 
-// IDFromString creates a decimal id from a hexadecimal string
+// IDFromString validates the ID and returns it in hexadecimal format.
 func IDFromString(s string) (string, error) {
 	if len(s) > 16 {
 		return "", fmt.Errorf("ID cannot be longer than 16 hex characters: %s", s)
@@ -248,5 +248,5 @@ func IDFromString(s string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return strconv.FormatUint(id, 10), nil
+	return strconv.FormatUint(id, 16), nil
 }
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
index fa0d7c2ad..11a0920fb 100644
--- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
@@ -526,14 +526,14 @@ func Test_span_SpanID(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "converts known id correctly",
+			name: "validates known id correctly",
 			ID:   "b26412d1ac16767d",
-			want: "12854419928166856317",
+			want: "b26412d1ac16767d",
 		},
 		{
-			name: "converts hex string correctly",
+			name: "validates hex string correctly",
 			ID:   "deadbeef",
-			want: "3735928559",
+			want: "deadbeef",
 		},
 		{
 			name:    "errors when string isn't hex",
@@ -576,9 +576,9 @@ func Test_span_Parent(t *testing.T) {
 			want:     "",
 		},
 		{
-			name:     "converts hex string correctly",
+			name:     "validates hex string correctly",
 			ParentID: "deadbeef",
-			want:     "3735928559",
+			want:     "deadbeef",
 		},
 		{
 			name:     "errors when string isn't hex",
@@ -890,9 +890,9 @@ func TestIDFromString(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name: "Convert hex string id",
+			name: "validates hex string id",
 			s:    "6b221d5bc9e6496c",
-			want: "7719764991332993388",
+			want: "6b221d5bc9e6496c",
 		},
 		{
 			name:    "error : id too long",
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift.go b/plugins/inputs/zipkin/codec/thrift/thrift.go
index c2170e87a..b3fc94897 100644
--- a/plugins/inputs/zipkin/codec/thrift/thrift.go
+++ b/plugins/inputs/zipkin/codec/thrift/thrift.go
@@ -199,5 +199,5 @@ func (s *span) Duration() time.Duration {
 }
 
 func formatID(id int64) string {
-	return strconv.FormatInt(id, 10)
+	return strconv.FormatInt(id, 16)
 }
diff --git a/plugins/inputs/zipkin/convert.go b/plugins/inputs/zipkin/convert.go
index 940c16a38..ae087645f 100644
--- a/plugins/inputs/zipkin/convert.go
+++ b/plugins/inputs/zipkin/convert.go
@@ -1,6 +1,8 @@
 package zipkin
 
 import (
+	"strings"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 )
@@ -28,12 +30,13 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
 		fields := map[string]interface{}{
 			"duration_ns": s.Duration.Nanoseconds(),
 		}
+
 		tags := map[string]string{
 			"id":           s.ID,
 			"parent_id":    s.ParentID,
 			"trace_id":     s.TraceID,
-			"name":         s.Name,
-			"service_name": s.ServiceName,
+			"name":         formatName(s.Name),
+			"service_name": formatName(s.ServiceName),
 		}
 		l.acc.AddFields("zipkin", fields, tags, s.Timestamp)
 
@@ -42,8 +45,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
 				"id":            s.ID,
 				"parent_id":     s.ParentID,
 				"trace_id":      s.TraceID,
-				"name":          s.Name,
-				"service_name":  a.ServiceName,
+				"name":          formatName(s.Name),
+				"service_name":  formatName(a.ServiceName),
 				"annotation":    a.Value,
 				"endpoint_host": a.Host,
 			}
@@ -55,8 +58,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
 				"id":             s.ID,
 				"parent_id":      s.ParentID,
 				"trace_id":       s.TraceID,
-				"name":           s.Name,
-				"service_name":   b.ServiceName,
+				"name":           formatName(s.Name),
+				"service_name":   formatName(b.ServiceName),
 				"annotation":     b.Value,
 				"endpoint_host":  b.Host,
 				"annotation_key": b.Key,
@@ -71,3 +74,10 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
 func (l *LineProtocolConverter) Error(err error) {
 	l.acc.AddError(err)
 }
+
+// formatName formats name and service name
+// Zipkin forces span and service names to be lowercase:
+// https://github.com/openzipkin/zipkin/pull/805
+func formatName(name string) string {
+	return strings.ToLower(name)
+}
diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go
index 959012589..5085deecb 100644
--- a/plugins/inputs/zipkin/convert_test.go
+++ b/plugins/inputs/zipkin/convert_test.go
@@ -115,7 +115,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"parent_id":    "22964302721410078",
 						"trace_id":     "2505404965370368069",
 						"service_name": "trivial",
-						"name":         "Child",
+						"name":         "child",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
@@ -128,7 +128,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"id":             "8090652509916334619",
 						"parent_id":      "22964302721410078",
 						"trace_id":       "2505404965370368069",
-						"name":           "Child",
+						"name":           "child",
 						"service_name":   "trivial",
 						"annotation":     "dHJpdmlhbA==",
 						"endpoint_host":  "2130706433:0",
@@ -146,7 +146,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"parent_id":    "22964302721410078",
 						"trace_id":     "2505404965370368069",
 						"service_name": "trivial",
-						"name":         "Child",
+						"name":         "child",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
@@ -159,7 +159,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"id":             "103618986556047333",
 						"parent_id":      "22964302721410078",
 						"trace_id":       "2505404965370368069",
-						"name":           "Child",
+						"name":           "child",
 						"service_name":   "trivial",
 						"annotation":     "dHJpdmlhbA==",
 						"endpoint_host":  "2130706433:0",
@@ -177,7 +177,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"parent_id":    "22964302721410078",
 						"trace_id":     "2505404965370368069",
 						"service_name": "trivial",
-						"name":         "Parent",
+						"name":         "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -193,7 +193,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"id":            "22964302721410078",
 						"parent_id":     "22964302721410078",
 						"trace_id":      "2505404965370368069",
-						"name":          "Parent",
+						"name":          "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -209,7 +209,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"id":            "22964302721410078",
 						"parent_id":     "22964302721410078",
 						"trace_id":      "2505404965370368069",
-						"name":          "Parent",
+						"name":          "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -221,7 +221,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 					Tags: map[string]string{
 						"parent_id":     "22964302721410078",
 						"trace_id":      "2505404965370368069",
-						"name":          "Parent",
+						"name":          "parent",
 						"service_name":  "trivial",
 						"annotation":    "A Log",
 						"endpoint_host": "2130706433:0",
@@ -241,7 +241,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
 						"annotation_key": "lc",
 						"id":             "22964302721410078",
 						"parent_id":      "22964302721410078",
-						"name":           "Parent",
+						"name":           "parent",
 						"endpoint_host":  "2130706433:0",
 					},
 					Fields: map[string]interface{}{
diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go
index 606a8da97..b0176a22e 100644
--- a/plugins/inputs/zipkin/handler_test.go
+++ b/plugins/inputs/zipkin/handler_test.go
@@ -52,11 +52,11 @@ func TestSpanHandler(t *testing.T) {
 
 	got := mockRecorder.Data
 
-	parentID := strconv.FormatInt(22964302721410078, 10)
+	parentID := strconv.FormatInt(22964302721410078, 16)
 	want := trace.Trace{
 		{
 			Name:        "Child",
-			ID:          "8090652509916334619",
+			ID:          "7047c59776af8a1b",
 			TraceID:     "22c4fc8ab3669045",
 			ParentID:    parentID,
 			Timestamp:   time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(),
@@ -74,7 +74,7 @@ func TestSpanHandler(t *testing.T) {
 		},
 		{
 			Name:        "Child",
-			ID:          "103618986556047333",
+			ID:          "17020eb55a8bfe5",
 			TraceID:     "22c4fc8ab3669045",
 			ParentID:    parentID,
 			Timestamp:   time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(),
@@ -92,9 +92,9 @@ func TestSpanHandler(t *testing.T) {
 		},
 		{
 			Name:        "Parent",
-			ID:          "22964302721410078",
+			ID:          "5195e96239641e",
 			TraceID:     "22c4fc8ab3669045",
-			ParentID:    "22964302721410078",
+			ParentID:    parentID,
 			Timestamp:   time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(),
 			Duration:    time.Duration(103680) * time.Microsecond,
 			ServiceName: "trivial",
diff --git a/plugins/inputs/zipkin/zipkin_test.go b/plugins/inputs/zipkin/zipkin_test.go
index e07eca0cf..b14fb3aca 100644
--- a/plugins/inputs/zipkin/zipkin_test.go
+++ b/plugins/inputs/zipkin/zipkin_test.go
@@ -30,11 +30,11 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "8090652509916334619",
-						"parent_id":    "22964302721410078",
+						"id":           "7047c59776af8a1b",
+						"parent_id":    "5195e96239641e",
 						"trace_id":     "22c4fc8ab3669045",
 						"service_name": "trivial",
-						"name":         "Child",
+						"name":         "child",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
@@ -44,10 +44,10 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":             "8090652509916334619",
-						"parent_id":      "22964302721410078",
+						"id":             "7047c59776af8a1b",
+						"parent_id":      "5195e96239641e",
 						"trace_id":       "22c4fc8ab3669045",
-						"name":           "Child",
+						"name":           "child",
 						"service_name":   "trivial",
 						"annotation":     "trivial", //base64: dHJpdmlhbA==
 						"endpoint_host":  "127.0.0.1",
@@ -61,11 +61,11 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "103618986556047333",
-						"parent_id":    "22964302721410078",
+						"id":           "17020eb55a8bfe5",
+						"parent_id":    "5195e96239641e",
 						"trace_id":     "22c4fc8ab3669045",
 						"service_name": "trivial",
-						"name":         "Child",
+						"name":         "child",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
@@ -75,10 +75,10 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":             "103618986556047333",
-						"parent_id":      "22964302721410078",
+						"id":             "17020eb55a8bfe5",
+						"parent_id":      "5195e96239641e",
 						"trace_id":       "22c4fc8ab3669045",
-						"name":           "Child",
+						"name":           "child",
 						"service_name":   "trivial",
 						"annotation":     "trivial", //base64: dHJpdmlhbA==
 						"endpoint_host":  "127.0.0.1",
@@ -92,11 +92,11 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "22964302721410078",
-						"parent_id":    "22964302721410078",
+						"id":           "5195e96239641e",
+						"parent_id":    "5195e96239641e",
 						"trace_id":     "22c4fc8ab3669045",
 						"service_name": "trivial",
-						"name":         "Parent",
+						"name":         "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -109,10 +109,10 @@ func TestZipkinPlugin(t *testing.T) {
 						"service_name":  "trivial",
 						"annotation":    "Starting child #0",
 						"endpoint_host": "127.0.0.1",
-						"id":            "22964302721410078",
-						"parent_id":     "22964302721410078",
+						"id":            "5195e96239641e",
+						"parent_id":     "5195e96239641e",
 						"trace_id":      "22c4fc8ab3669045",
-						"name":          "Parent",
+						"name":          "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -125,10 +125,10 @@ func TestZipkinPlugin(t *testing.T) {
 						"service_name":  "trivial",
 						"annotation":    "Starting child #1",
 						"endpoint_host": "127.0.0.1",
-						"id":            "22964302721410078",
-						"parent_id":     "22964302721410078",
+						"id":            "5195e96239641e",
+						"parent_id":     "5195e96239641e",
 						"trace_id":      "22c4fc8ab3669045",
-						"name":          "Parent",
+						"name":          "parent",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -138,13 +138,13 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"parent_id":     "22964302721410078",
+						"parent_id":     "5195e96239641e",
 						"trace_id":      "22c4fc8ab3669045",
-						"name":          "Parent",
+						"name":          "parent",
 						"service_name":  "trivial",
 						"annotation":    "A Log",
 						"endpoint_host": "127.0.0.1",
-						"id":            "22964302721410078",
+						"id":            "5195e96239641e",
 					},
 					Fields: map[string]interface{}{
 						"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@@ -158,9 +158,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"service_name":   "trivial",
 						"annotation":     "trivial", //base64: dHJpdmlhbA==
 						"annotation_key": "lc",
-						"id":             "22964302721410078",
-						"parent_id":      "22964302721410078",
-						"name":           "Parent",
+						"id":             "5195e96239641e",
+						"parent_id":      "5195e96239641e",
+						"name":           "parent",
 						"endpoint_host":  "127.0.0.1",
 					},
 					Fields: map[string]interface{}{
@@ -179,8 +179,8 @@ func TestZipkinPlugin(t *testing.T) {
 				testutil.Metric{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "6802735349851856000",
-						"parent_id":    "6802735349851856000",
+						"id":           "5e682bc21ce99c80",
+						"parent_id":    "5e682bc21ce99c80",
 						"trace_id":     "5e682bc21ce99c80",
 						"service_name": "go-zipkin-testclient",
 						"name":         "main.dud",
@@ -195,8 +195,8 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "cs",
 						"endpoint_host": "0.0.0.0:9410",
-						"id":            "6802735349851856000",
-						"parent_id":     "6802735349851856000",
+						"id":            "5e682bc21ce99c80",
+						"parent_id":     "5e682bc21ce99c80",
 						"trace_id":      "5e682bc21ce99c80",
 						"name":          "main.dud",
 						"service_name":  "go-zipkin-testclient",
@@ -211,8 +211,8 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "cr",
 						"endpoint_host": "0.0.0.0:9410",
-						"id":            "6802735349851856000",
-						"parent_id":     "6802735349851856000",
+						"id":            "5e682bc21ce99c80",
+						"parent_id":     "5e682bc21ce99c80",
 						"trace_id":      "5e682bc21ce99c80",
 						"name":          "main.dud",
 						"service_name":  "go-zipkin-testclient",
@@ -232,9 +232,9 @@ func TestZipkinPlugin(t *testing.T) {
 				{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "12854419928166856317",
+						"id":           "b26412d1ac16767d",
 						"name":         "http:/hi2",
-						"parent_id":    "8291962692415852504",
+						"parent_id":    "7312f822d43d0fd8",
 						"service_name": "test",
 						"trace_id":     "7312f822d43d0fd8",
 					},
@@ -247,9 +247,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "sr",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "12854419928166856317",
+						"id":            "b26412d1ac16767d",
 						"name":          "http:/hi2",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -263,9 +263,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "ss",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "12854419928166856317",
+						"id":            "b26412d1ac16767d",
 						"name":          "http:/hi2",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -280,9 +280,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "Demo2Application",
 						"annotation_key": "mvc.controller.class",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -297,9 +297,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "hi2",
 						"annotation_key": "mvc.controller.method",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -314,9 +314,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "192.168.0.8:test:8010",
 						"annotation_key": "spring.instance_id",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -328,9 +328,9 @@ func TestZipkinPlugin(t *testing.T) {
 				{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "12854419928166856317",
+						"id":           "b26412d1ac16767d",
 						"name":         "http:/hi2",
-						"parent_id":    "8291962692415852504",
+						"parent_id":    "7312f822d43d0fd8",
 						"service_name": "test",
 						"trace_id":     "7312f822d43d0fd8",
 					},
@@ -344,9 +344,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "cs",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "12854419928166856317",
+						"id":            "b26412d1ac16767d",
 						"name":          "http:/hi2",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -360,9 +360,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "cr",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "12854419928166856317",
+						"id":            "b26412d1ac16767d",
 						"name":          "http:/hi2",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -377,9 +377,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "localhost",
 						"annotation_key": "http.host",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -394,9 +394,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "GET",
 						"annotation_key": "http.method",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -411,9 +411,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "/hi2",
 						"annotation_key": "http.path",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -428,9 +428,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "http://localhost:8010/hi2",
 						"annotation_key": "http.url",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -445,9 +445,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "192.168.0.8:test:8010",
 						"annotation_key": "spring.instance_id",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "12854419928166856317",
+						"id":             "b26412d1ac16767d",
 						"name":           "http:/hi2",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -459,9 +459,9 @@ func TestZipkinPlugin(t *testing.T) {
 				{
 					Measurement: "zipkin",
 					Tags: map[string]string{
-						"id":           "8291962692415852504",
+						"id":           "7312f822d43d0fd8",
 						"name":         "http:/hi",
-						"parent_id":    "8291962692415852504",
+						"parent_id":    "7312f822d43d0fd8",
 						"service_name": "test",
 						"trace_id":     "7312f822d43d0fd8",
 					},
@@ -475,9 +475,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "sr",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "8291962692415852504",
+						"id":            "7312f822d43d0fd8",
 						"name":          "http:/hi",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -491,9 +491,9 @@ func TestZipkinPlugin(t *testing.T) {
 					Tags: map[string]string{
 						"annotation":    "ss",
 						"endpoint_host": "192.168.0.8:8010",
-						"id":            "8291962692415852504",
+						"id":            "7312f822d43d0fd8",
 						"name":          "http:/hi",
-						"parent_id":     "8291962692415852504",
+						"parent_id":     "7312f822d43d0fd8",
 						"service_name":  "test",
 						"trace_id":      "7312f822d43d0fd8",
 					},
@@ -508,9 +508,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "Demo2Application",
 						"annotation_key": "mvc.controller.class",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "8291962692415852504",
+						"id":             "7312f822d43d0fd8",
 						"name":           "http:/hi",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -525,9 +525,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "hi",
 						"annotation_key": "mvc.controller.method",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "8291962692415852504",
+						"id":             "7312f822d43d0fd8",
 						"name":           "http:/hi",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},
@@ -542,9 +542,9 @@ func TestZipkinPlugin(t *testing.T) {
 						"annotation":     "192.168.0.8:test:8010",
 						"annotation_key": "spring.instance_id",
 						"endpoint_host":  "192.168.0.8:8010",
-						"id":             "8291962692415852504",
+						"id":             "7312f822d43d0fd8",
 						"name":           "http:/hi",
-						"parent_id":      "8291962692415852504",
+						"parent_id":      "7312f822d43d0fd8",
 						"service_name":   "test",
 						"trace_id":       "7312f822d43d0fd8",
 					},

From db8e767f1f1ce1269c9aad3fb7e3581f2b581ac5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 14:20:05 -0800
Subject: [PATCH 0750/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e649c59d2..c0c141fb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@
 - [#3430](https://github.com/influxdata/telegraf/issues/3430): Always ignore autofs filesystems in disk input.
 - [#3326](https://github.com/influxdata/telegraf/issues/3326): Fail metrics parsing on unescaped quotes.
 - [#3473](https://github.com/influxdata/telegraf/pull/3473): Whitelist allowed char classes for graphite output.
+- [#3488](https://github.com/influxdata/telegraf/pull/3488): Use hexadecimal ids and lowercase names in zipkin input.
 
 ## v1.4.4 [2017-11-08]
 

From 4d1bc620b22836eb574ebb69c4f7db8a3089282f Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:22:29 +0100
Subject: [PATCH 0751/1302] Add index by week number to Elasticsearch output
 (#3490)

---
 plugins/outputs/elasticsearch/README.md          |  3 ++-
 plugins/outputs/elasticsearch/elasticsearch.go   | 16 ++++++++++++----
 .../outputs/elasticsearch/elasticsearch_test.go  |  5 +++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md
index b69631ba8..d2c84a8d3 100644
--- a/plugins/outputs/elasticsearch/README.md
+++ b/plugins/outputs/elasticsearch/README.md
@@ -172,6 +172,7 @@ This plugin will format the events in the following way:
   # %m - month (01..12)
   # %d - day of month (e.g., 01)
   # %H - hour (00..23)
+  # %V - week of the year (ISO week) (01..53)
   index_name = "telegraf-%Y.%m.%d" # required.
 
   ## Optional SSL Config
@@ -220,6 +221,6 @@ Integer values collected that are bigger than 2^63 and smaller than 1e21 (or in
 
 ```{"error":{"root_cause":[{"type":"mapper_parsing_exception","reason":"failed to parse"}],"type":"mapper_parsing_exception","reason":"failed to parse","caused_by":{"type":"illegal_state_exception","reason":"No matching token for number_type [BIG_INTEGER]"}},"status":400}```
 
-The correct field mapping will be created on the telegraf index as soon as a supported JSON value is received by Elasticsearch, and subsequent insertions will work because the field mapping will already exist. 
+The correct field mapping will be created on the telegraf index as soon as a supported JSON value is received by Elasticsearch, and subsequent insertions will work because the field mapping will already exist.
 
 This issue is caused by the way Elasticsearch tries to detect integer fields, and by how golang encodes numbers in JSON. There is no clear workaround for this at the moment.
\ No newline at end of file
diff --git a/plugins/outputs/elasticsearch/elasticsearch.go b/plugins/outputs/elasticsearch/elasticsearch.go
index 31a702e55..a9fd5a491 100644
--- a/plugins/outputs/elasticsearch/elasticsearch.go
+++ b/plugins/outputs/elasticsearch/elasticsearch.go
@@ -3,15 +3,16 @@ package elasticsearch
 import (
 	"context"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/outputs"
-	"gopkg.in/olivere/elastic.v5"
 	"log"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"gopkg.in/olivere/elastic.v5"
 )
 
 type Elasticsearch struct {
@@ -58,6 +59,7 @@ var sampleConfig = `
   # %m - month (01..12)
   # %d - day of month (e.g., 01)
   # %H - hour (00..23)
+  # %V - week of the year (ISO week) (01..53)
   index_name = "telegraf-%Y.%m.%d" # required.
 
   ## Optional SSL Config
@@ -301,6 +303,7 @@ func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time) stri
 			"%m", eventTime.UTC().Format("01"),
 			"%d", eventTime.UTC().Format("02"),
 			"%H", eventTime.UTC().Format("15"),
+			"%V", getISOWeek(eventTime.UTC()),
 		)
 
 		indexName = dateReplacer.Replace(indexName)
@@ -310,6 +313,11 @@ func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time) stri
 
 }
 
+func getISOWeek(eventTime time.Time) string {
+	_, week := eventTime.ISOWeek()
+	return strconv.Itoa(week)
+}
+
 func (a *Elasticsearch) SampleConfig() string {
 	return sampleConfig
 }
diff --git a/plugins/outputs/elasticsearch/elasticsearch_test.go b/plugins/outputs/elasticsearch/elasticsearch_test.go
index 9000676d9..dadd94da9 100644
--- a/plugins/outputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/outputs/elasticsearch/elasticsearch_test.go
@@ -120,6 +120,11 @@ func TestGetIndexName(t *testing.T) {
 			"indexname-%y-%m",
 			"indexname-14-12",
 		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			"indexname-%Y-%V",
+			"indexname-2014-49",
+		},
 	}
 	for _, test := range tests {
 		indexName := e.GetIndexName(test.IndexName, test.EventTime)

From 393c4c6c2d0cb71808c094d13925812cf5ec07ee Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 14:23:16 -0800
Subject: [PATCH 0752/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0c141fb7..87e6ff8cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 - [#3459](https://github.com/influxdata/telegraf/pull/3459): Add systemd unit pid and cgroup matching to procstat.
 - [#3477](https://github.com/influxdata/telegraf/pull/3477): Add Particle Webhook Plugin.
 - [#3471](https://github.com/influxdata/telegraf/pull/3471): Use MAX() instead of SUM() for latency measurements in sqlserver.
+- [#3490](https://github.com/influxdata/telegraf/pull/3490): Add index by week number to Elasticsearch output.
 
 ### Bugfixes
 

From e544d742f938a2dc51f0cf7ba243ddba8c775e3c Mon Sep 17 00:00:00 2001
From: aromeyer <alain.romeyer@wanadoo.fr>
Date: Mon, 20 Nov 2017 23:32:06 +0100
Subject: [PATCH 0753/1302] Add unbound input plugin (#3434)

---
 README.md                              |   1 +
 etc/telegraf.conf                      |  13 ++
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/unbound/README.md       | 135 ++++++++++++++++
 plugins/inputs/unbound/unbound.go      | 137 ++++++++++++++++
 plugins/inputs/unbound/unbound_test.go | 206 +++++++++++++++++++++++++
 6 files changed, 493 insertions(+)
 create mode 100644 plugins/inputs/unbound/README.md
 create mode 100644 plugins/inputs/unbound/unbound.go
 create mode 100644 plugins/inputs/unbound/unbound_test.go

diff --git a/README.md b/README.md
index f527e6258..ad02091da 100644
--- a/README.md
+++ b/README.md
@@ -200,6 +200,7 @@ configuration options.
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
+* [unbound](./plugins/input/unbound)
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)
 * [zookeeper](./plugins/inputs/zookeeper)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 3ab0afd51..e805bb467 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2887,6 +2887,19 @@
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 
+# # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
+# [[inputs.unbound]]
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   #use_sudo = false
+#
+#   ## The default location of the unbound-control binary can be overridden with:
+#   binary = "/usr/sbin/unbound-control"
+#
+#   # The default timeout of 1s can be overriden with:
+#   #timeout = "1s"
+#
+#   # Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
+#   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
 
 # # A Webhooks Event collector
 # [[inputs.webhooks]]
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 421fd113c..0adbb8abb 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -92,6 +92,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
+	_ "github.com/influxdata/telegraf/plugins/inputs/unbound"
 	_ "github.com/influxdata/telegraf/plugins/inputs/varnish"
 	_ "github.com/influxdata/telegraf/plugins/inputs/webhooks"
 	_ "github.com/influxdata/telegraf/plugins/inputs/win_perf_counters"
diff --git a/plugins/inputs/unbound/README.md b/plugins/inputs/unbound/README.md
new file mode 100644
index 000000000..b3aff8078
--- /dev/null
+++ b/plugins/inputs/unbound/README.md
@@ -0,0 +1,135 @@
+# Unbound Input Plugin
+
+This plugin gathers stats from [Unbound - a validating, recursive, and caching DNS resolver](https://www.unbound.net/)
+
+### Configuration:
+
+```toml
+ # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
+ [[inputs.unbound]]
+   ## If running as a restricted user you can prepend sudo for additional access:
+   #use_sudo = false
+
+   ## The default location of the unbound-control binary can be overridden with:
+   binary = "/usr/sbin/unbound-control"
+
+   ## The default timeout of 1s can be overriden with:
+   #timeout = "1s"
+
+   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep only specific fields
+   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+```
+
+### Measurements & Fields:
+
+This is the full list of stats provided by unbound-control and potentially collected by telegram
+depending of your unbound configuration. Histogram related statistics will never be collected,
+extended statistics can also be imported ("extended-statistics: yes" in unbound configuration).
+In the output, the dots in the unbound-control stat name are replaced by underscores(see
+https://www.unbound.net/documentation/unbound-control.html for details).
+
+- unbound
+    thread0_num_queries
+    thread0_num_cachehits
+    thread0_num_cachemiss
+    thread0_num_prefetch
+    thread0_num_recursivereplies
+    thread0_requestlist_avg
+    thread0_requestlist_max
+    thread0_requestlist_overwritten
+    thread0_requestlist_exceeded
+    thread0_requestlist_current_all
+    thread0_requestlist_current_user
+    thread0_recursion_time_avg
+    thread0_recursion_time_median
+    total_num_queries
+    total_num_cachehits
+    total_num_cachemiss
+    total_num_prefetch
+    total_num_recursivereplies
+    total_requestlist_avg
+    total_requestlist_max
+    total_requestlist_overwritten
+    total_requestlist_exceeded
+    total_requestlist_current_all
+    total_requestlist_current_user
+    total_recursion_time_avg
+    total_recursion_time_median
+    time_now
+    time_up
+    time_elapsed
+    mem_total_sbrk
+    mem_cache_rrset
+    mem_cache_message
+    mem_mod_iterator
+    mem_mod_validator
+    num_query_type_A
+    num_query_type_PTR
+    num_query_type_TXT
+    num_query_type_AAAA
+    num_query_type_SRV
+    num_query_type_ANY
+    num_query_class_IN
+    num_query_opcode_QUERY
+    num_query_tcp
+    num_query_ipv6
+    num_query_flags_QR
+    num_query_flags_AA
+    num_query_flags_TC
+    num_query_flags_RD
+    num_query_flags_RA
+    num_query_flags_Z
+    num_query_flags_AD
+    num_query_flags_CD
+    num_query_edns_present
+    num_query_edns_DO
+    num_answer_rcode_NOERROR
+    num_answer_rcode_SERVFAIL
+    num_answer_rcode_NXDOMAIN
+    num_answer_rcode_nodata
+    num_answer_secure
+    num_answer_bogus
+    num_rrset_bogus
+    unwanted_queries
+    unwanted_replies
+
+### Permissions:
+
+It's important to note that this plugin references unbound-control, which may require additional permissions to execute successfully.
+Depending on the user/group permissions of the telegraf user executing this plugin, you may need to alter the group membership, set facls, or use sudo.
+
+**Group membership (Recommended)**:
+```bash
+$ groups telegraf
+telegraf : telegraf
+
+$ usermod -a -G unbound telegraf
+
+$ groups telegraf
+telegraf : telegraf unbound
+```
+
+**Sudo privileges**:
+If you use this method, you will need the following in your telegraf config:
+```toml
+[[inputs.unbound]]
+  use_sudo = true
+```
+
+You will also need to update your sudoers file:
+```bash
+$ visudo
+# Add the following line:
+telegraf ALL=(ALL) NOPASSWD: /usr/sbin/unbound-control
+```
+
+Please use the solution you see as most appropriate.
+
+### Example Output:
+
+```
+ telegraf --config etc/telegraf.conf --input-filter unbound --test
+* Plugin: inputs.unbound, Collection 1
+> unbound,host=localhost total_num_cachehits=0,total_num_prefetch=0,total_requestlist_avg=0,total_requestlist_max=0,total_recursion_time_median=0,total_num_queries=0,total_requestlist_overwritten=0,total_requestlist_current_all=0,time_up=159185.583967,total_num_recursivereplies=0,total_requestlist_exceeded=0,total_requestlist_current_user=0,total_recursion_time_avg=0,total_tcpusage=0,total_num_cachemiss=0 1510130793000000000
+
+```
diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
new file mode 100644
index 000000000..c3e7a4fef
--- /dev/null
+++ b/plugins/inputs/unbound/unbound.go
@@ -0,0 +1,137 @@
+package unbound
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type runner func(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error)
+
+// Unbound is used to store configuration values
+type Unbound struct {
+	Binary  string
+	Timeout internal.Duration
+	UseSudo bool
+
+	filter filter.Filter
+	run    runner
+}
+
+var defaultBinary = "/usr/sbin/unbound-control"
+var defaultTimeout = internal.Duration{Duration: time.Second}
+
+var sampleConfig = `
+  ## If running as a restricted user you can prepend sudo for additional access:
+  #use_sudo = false
+
+  ## The default location of the unbound-control binary can be overridden with:
+  binary = "/usr/sbin/unbound-control"
+
+  ## The default timeout of 1s can be overriden with:
+  timeout = "1s"
+
+  ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
+  fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+`
+
+func (s *Unbound) Description() string {
+	return "A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver "
+}
+
+// SampleConfig displays configuration instructions
+func (s *Unbound) SampleConfig() string {
+	return sampleConfig
+}
+
+// Shell out to unbound_stat and return the output
+func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+	cmdArgs := []string{"stats_noreset"}
+
+	cmd := exec.Command(cmdName, cmdArgs...)
+
+	if UseSudo {
+		cmdArgs = append([]string{cmdName}, cmdArgs...)
+		cmd = exec.Command("sudo", cmdArgs...)
+	}
+
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := internal.RunTimeout(cmd, Timeout.Duration)
+	if err != nil {
+		return &out, fmt.Errorf("error running unbound-control: %s", err)
+	}
+
+	return &out, nil
+}
+
+// Gather collects stats from unbound-control and adds them to the Accumulator
+//
+// All the dots in stat name will replaced by underscores. Histogram statistics will not be collected.
+func (s *Unbound) Gather(acc telegraf.Accumulator) error {
+
+	// Always exclude histrogram statistics
+	stat_excluded := []string{"histogram.*"}
+	filter_excluded, err := filter.Compile(stat_excluded)
+	if err != nil {
+		return err
+	}
+
+	out, err := s.run(s.Binary, s.Timeout, s.UseSudo)
+	if err != nil {
+		return fmt.Errorf("error gathering metrics: %s", err)
+	}
+
+	// Process values
+	fields := make(map[string]interface{})
+	scanner := bufio.NewScanner(out)
+	for scanner.Scan() {
+
+		cols := strings.Split(scanner.Text(), "=")
+
+		// Check split correctness
+		if len(cols) != 2 {
+			continue
+		}
+
+		stat := cols[0]
+		value := cols[1]
+
+		// Filter value
+		if filter_excluded.Match(stat) {
+			continue
+		}
+
+		field := strings.Replace(stat, ".", "_", -1)
+
+		fields[field], err = strconv.ParseFloat(value, 64)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Expected a numerical value for %s = %v\n",
+				stat, value))
+		}
+	}
+
+	acc.AddFields("unbound", fields, nil)
+
+	return nil
+}
+
+func init() {
+	inputs.Add("unbound", func() telegraf.Input {
+		return &Unbound{
+			run:     unboundRunner,
+			Binary:  defaultBinary,
+			Timeout: defaultTimeout,
+			UseSudo: false,
+		}
+	})
+}
diff --git a/plugins/inputs/unbound/unbound_test.go b/plugins/inputs/unbound/unbound_test.go
new file mode 100644
index 000000000..b8e821089
--- /dev/null
+++ b/plugins/inputs/unbound/unbound_test.go
@@ -0,0 +1,206 @@
+package unbound
+
+import (
+	"bytes"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+var TestTimeout = internal.Duration{Duration: time.Second}
+
+func UnboundControl(output string, Timeout internal.Duration, useSudo bool) func(string, internal.Duration, bool) (*bytes.Buffer, error) {
+	return func(string, internal.Duration, bool) (*bytes.Buffer, error) {
+		return bytes.NewBuffer([]byte(output)), nil
+	}
+}
+
+func TestParseFullOutput(t *testing.T) {
+	acc := &testutil.Accumulator{}
+	v := &Unbound{
+		run: UnboundControl(fullOutput, TestTimeout, true),
+	}
+	err := v.Gather(acc)
+
+	assert.NoError(t, err)
+
+	assert.True(t, acc.HasMeasurement("unbound"))
+
+	assert.Len(t, acc.Metrics, 1)
+	assert.Equal(t, acc.NFields(), 63)
+
+	acc.AssertContainsFields(t, "unbound", parsedFullOutput)
+}
+
+var parsedFullOutput = map[string]interface{}{
+	"thread0_num_queries":              float64(11907596),
+	"thread0_num_cachehits":            float64(11489288),
+	"thread0_num_cachemiss":            float64(418308),
+	"thread0_num_prefetch":             float64(0),
+	"thread0_num_recursivereplies":     float64(418308),
+	"thread0_requestlist_avg":          float64(0.400229),
+	"thread0_requestlist_max":          float64(11),
+	"thread0_requestlist_overwritten":  float64(0),
+	"thread0_requestlist_exceeded":     float64(0),
+	"thread0_requestlist_current_all":  float64(0),
+	"thread0_requestlist_current_user": float64(0),
+	"thread0_recursion_time_avg":       float64(0.015020),
+	"thread0_recursion_time_median":    float64(0.00292343),
+	"total_num_queries":                float64(11907596),
+	"total_num_cachehits":              float64(11489288),
+	"total_num_cachemiss":              float64(418308),
+	"total_num_prefetch":               float64(0),
+	"total_num_recursivereplies":       float64(418308),
+	"total_requestlist_avg":            float64(0.400229),
+	"total_requestlist_max":            float64(11),
+	"total_requestlist_overwritten":    float64(0),
+	"total_requestlist_exceeded":       float64(0),
+	"total_requestlist_current_all":    float64(0),
+	"total_requestlist_current_user":   float64(0),
+	"total_recursion_time_avg":         float64(0.015020),
+	"total_recursion_time_median":      float64(0.00292343),
+	"time_now":                         float64(1509968734.735180),
+	"time_up":                          float64(1472897.672099),
+	"time_elapsed":                     float64(1472897.672099),
+	"mem_total_sbrk":                   float64(7462912),
+	"mem_cache_rrset":                  float64(285056),
+	"mem_cache_message":                float64(320000),
+	"mem_mod_iterator":                 float64(16532),
+	"mem_mod_validator":                float64(112097),
+	"num_query_type_A":                 float64(7062688),
+	"num_query_type_PTR":               float64(43097),
+	"num_query_type_TXT":               float64(2998),
+	"num_query_type_AAAA":              float64(4499711),
+	"num_query_type_SRV":               float64(5691),
+	"num_query_type_ANY":               float64(293411),
+	"num_query_class_IN":               float64(11907596),
+	"num_query_opcode_QUERY":           float64(11907596),
+	"num_query_tcp":                    float64(293411),
+	"num_query_ipv6":                   float64(0),
+	"num_query_flags_QR":               float64(0),
+	"num_query_flags_AA":               float64(0),
+	"num_query_flags_TC":               float64(0),
+	"num_query_flags_RD":               float64(11907596),
+	"num_query_flags_RA":               float64(0),
+	"num_query_flags_Z":                float64(0),
+	"num_query_flags_AD":               float64(1),
+	"num_query_flags_CD":               float64(0),
+	"num_query_edns_present":           float64(6202),
+	"num_query_edns_DO":                float64(6201),
+	"num_answer_rcode_NOERROR":         float64(11857463),
+	"num_answer_rcode_SERVFAIL":        float64(17),
+	"num_answer_rcode_NXDOMAIN":        float64(50116),
+	"num_answer_rcode_nodata":          float64(3914360),
+	"num_answer_secure":                float64(44289),
+	"num_answer_bogus":                 float64(1),
+	"num_rrset_bogus":                  float64(0),
+	"unwanted_queries":                 float64(0),
+	"unwanted_replies":                 float64(0),
+}
+
+var fullOutput = `thread0.num.queries=11907596
+thread0.num.cachehits=11489288
+thread0.num.cachemiss=418308
+thread0.num.prefetch=0
+thread0.num.recursivereplies=418308
+thread0.requestlist.avg=0.400229
+thread0.requestlist.max=11
+thread0.requestlist.overwritten=0
+thread0.requestlist.exceeded=0
+thread0.requestlist.current.all=0
+thread0.requestlist.current.user=0
+thread0.recursion.time.avg=0.015020
+thread0.recursion.time.median=0.00292343
+total.num.queries=11907596
+total.num.cachehits=11489288
+total.num.cachemiss=418308
+total.num.prefetch=0
+total.num.recursivereplies=418308
+total.requestlist.avg=0.400229
+total.requestlist.max=11
+total.requestlist.overwritten=0
+total.requestlist.exceeded=0
+total.requestlist.current.all=0
+total.requestlist.current.user=0
+total.recursion.time.avg=0.015020
+total.recursion.time.median=0.00292343
+time.now=1509968734.735180
+time.up=1472897.672099
+time.elapsed=1472897.672099
+mem.total.sbrk=7462912
+mem.cache.rrset=285056
+mem.cache.message=320000
+mem.mod.iterator=16532
+mem.mod.validator=112097
+histogram.000000.000000.to.000000.000001=20
+histogram.000000.000001.to.000000.000002=5
+histogram.000000.000002.to.000000.000004=13
+histogram.000000.000004.to.000000.000008=18
+histogram.000000.000008.to.000000.000016=67
+histogram.000000.000016.to.000000.000032=94
+histogram.000000.000032.to.000000.000064=113
+histogram.000000.000064.to.000000.000128=190
+histogram.000000.000128.to.000000.000256=369
+histogram.000000.000256.to.000000.000512=1034
+histogram.000000.000512.to.000000.001024=5503
+histogram.000000.001024.to.000000.002048=155724
+histogram.000000.002048.to.000000.004096=107623
+histogram.000000.004096.to.000000.008192=17739
+histogram.000000.008192.to.000000.016384=4177
+histogram.000000.016384.to.000000.032768=82021
+histogram.000000.032768.to.000000.065536=33772
+histogram.000000.065536.to.000000.131072=7159
+histogram.000000.131072.to.000000.262144=1109
+histogram.000000.262144.to.000000.524288=295
+histogram.000000.524288.to.000001.000000=890
+histogram.000001.000000.to.000002.000000=136
+histogram.000002.000000.to.000004.000000=233
+histogram.000004.000000.to.000008.000000=2
+histogram.000008.000000.to.000016.000000=0
+histogram.000016.000000.to.000032.000000=2
+histogram.000032.000000.to.000064.000000=0
+histogram.000064.000000.to.000128.000000=0
+histogram.000128.000000.to.000256.000000=0
+histogram.000256.000000.to.000512.000000=0
+histogram.000512.000000.to.001024.000000=0
+histogram.001024.000000.to.002048.000000=0
+histogram.002048.000000.to.004096.000000=0
+histogram.004096.000000.to.008192.000000=0
+histogram.008192.000000.to.016384.000000=0
+histogram.016384.000000.to.032768.000000=0
+histogram.032768.000000.to.065536.000000=0
+histogram.065536.000000.to.131072.000000=0
+histogram.131072.000000.to.262144.000000=0
+histogram.262144.000000.to.524288.000000=0
+num.query.type.A=7062688
+num.query.type.PTR=43097
+num.query.type.TXT=2998
+num.query.type.AAAA=4499711
+num.query.type.SRV=5691
+num.query.type.ANY=293411
+num.query.class.IN=11907596
+num.query.opcode.QUERY=11907596
+num.query.tcp=293411
+num.query.ipv6=0
+num.query.flags.QR=0
+num.query.flags.AA=0
+num.query.flags.TC=0
+num.query.flags.RD=11907596
+num.query.flags.RA=0
+num.query.flags.Z=0
+num.query.flags.AD=1
+num.query.flags.CD=0
+num.query.edns.present=6202
+num.query.edns.DO=6201
+num.answer.rcode.NOERROR=11857463
+num.answer.rcode.SERVFAIL=17
+num.answer.rcode.NXDOMAIN=50116
+num.answer.rcode.nodata=3914360
+num.answer.secure=44289
+num.answer.bogus=1
+num.rrset.bogus=0
+unwanted.queries=0
+unwanted.replies=0`

From 367bbdeb7e44a928ed6eb8953cff7a86a7b5a78c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 14:37:09 -0800
Subject: [PATCH 0754/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87e6ff8cb..cca0763de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
 - [teamspeak](./plugins/inputs/teamspeak/README.md) - Thanks to @p4ddy1
+- [unbound](./plugins/inputs/unbound/README.md) - Thanks to @aromeyer
 - [wavefront](./plugins/outputs/wavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
@@ -62,6 +63,7 @@
 - [#3477](https://github.com/influxdata/telegraf/pull/3477): Add Particle Webhook Plugin.
 - [#3471](https://github.com/influxdata/telegraf/pull/3471): Use MAX() instead of SUM() for latency measurements in sqlserver.
 - [#3490](https://github.com/influxdata/telegraf/pull/3490): Add index by week number to Elasticsearch output.
+- [#3434](https://github.com/influxdata/telegraf/pull/3434): Add unbound input plugin.
 
 ### Bugfixes
 

From dc2c8791d09e8152a645a167fd90b0490a0fccef Mon Sep 17 00:00:00 2001
From: aromeyer <alain.romeyer@wanadoo.fr>
Date: Mon, 20 Nov 2017 23:39:13 +0100
Subject: [PATCH 0755/1302] Add opensmtpd input plugin (#3449)

---
 README.md                                  |   1 +
 etc/telegraf.conf                          |  12 ++
 plugins/inputs/all/all.go                  |   1 +
 plugins/inputs/opensmtpd/README.md         | 102 ++++++++++++++++
 plugins/inputs/opensmtpd/opensmtpd.go      | 134 +++++++++++++++++++++
 plugins/inputs/opensmtpd/opensmtpd_test.go | 111 +++++++++++++++++
 6 files changed, 361 insertions(+)
 create mode 100644 plugins/inputs/opensmtpd/README.md
 create mode 100644 plugins/inputs/opensmtpd/opensmtpd.go
 create mode 100644 plugins/inputs/opensmtpd/opensmtpd_test.go

diff --git a/README.md b/README.md
index ad02091da..b913bfc71 100644
--- a/README.md
+++ b/README.md
@@ -176,6 +176,7 @@ configuration options.
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
 * [openldap](./plugins/inputs/openldap)
+* [opensmtpd](./plugins/inputs/opensmtpd)
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index e805bb467..069b657b6 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1876,6 +1876,18 @@
 #   bind_password = ""
 
 
+# # A plugin to collect stats from OpenSMTPd
+# [[inputs.opensmtpd]]
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   #use_sudo = false
+#
+#   ## The default location of the smtpctl binary can be overridden with:
+#   #binary = "/usr/sbin/smtpctl"
+#
+#   ## The default timeout of 1s can be overriden with:
+#   #timeout = "1s"
+
+
 # # Read metrics of passenger using passenger-status
 # [[inputs.passenger]]
 #   ## Path of passenger-status.
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 0adbb8abb..e5cc96ed9 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -60,6 +60,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
 	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
+	_ "github.com/influxdata/telegraf/plugins/inputs/opensmtpd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
diff --git a/plugins/inputs/opensmtpd/README.md b/plugins/inputs/opensmtpd/README.md
new file mode 100644
index 000000000..c1166d9e5
--- /dev/null
+++ b/plugins/inputs/opensmtpd/README.md
@@ -0,0 +1,102 @@
+# OpenSMTPD Input Plugin
+
+This plugin gathers stats from [OpenSMTPD - a FREE implementation of the server-side SMTP protocol](https://www.opensmtpd.org/)
+
+### Configuration:
+
+```toml
+ # A plugin to collect stats from OpenSMTPD - a FREE implementation of the server-side SMTP protocol
+ [[inputs.smtpctl]]
+   ## If running as a restricted user you can prepend sudo for additional access:
+   #use_sudo = false
+
+   ## The default location of the smtpctl binary can be overridden with:
+   binary = "/usr/sbin/smtpctl"
+
+   # The default timeout of 1s can be overriden with:
+   #timeout = "1s"
+```
+
+### Measurements & Fields:
+
+This is the full list of stats provided by smtpctl and potentially collected by telegram
+depending of your smtpctl configuration.
+
+- smtpctl
+    bounce_envelope
+    bounce_message
+    bounce_session
+    control_session
+    mda_envelope
+    mda_pending
+    mda_running
+    mda_user
+    mta_connector
+    mta_domain
+    mta_envelope
+    mta_host
+    mta_relay
+    mta_route
+    mta_session
+    mta_source
+    mta_task
+    mta_task_running
+    queue_bounce
+    queue_evpcache_load_hit
+    queue_evpcache_size
+    queue_evpcache_update_hit
+    scheduler_delivery_ok
+    scheduler_delivery_permfail
+    scheduler_delivery_tempfail
+    scheduler_envelope
+    scheduler_envelope_expired
+    scheduler_envelope_incoming
+    scheduler_envelope_inflight
+    scheduler_ramqueue_envelope
+    scheduler_ramqueue_message
+    scheduler_ramqueue_update
+    smtp_session
+    smtp_session_inet4
+    smtp_session_local
+    uptime
+
+### Permissions:
+
+It's important to note that this plugin references smtpctl, which may require additional permissions to execute successfully.
+Depending on the user/group permissions of the telegraf user executing this plugin, you may need to alter the group membership, set facls, or use sudo.
+
+**Group membership (Recommended)**:
+```bash
+$ groups telegraf
+telegraf : telegraf
+
+$ usermod -a -G opensmtpd telegraf
+
+$ groups telegraf
+telegraf : telegraf opensmtpd
+```
+
+**Sudo privileges**:
+If you use this method, you will need the following in your telegraf config:
+```toml
+[[inputs.opensmtpd]]
+  use_sudo = true
+```
+
+You will also need to update your sudoers file:
+```bash
+$ visudo
+# Add the following line:
+telegraf ALL=(ALL) NOPASSWD: /usr/sbin/smtpctl
+```
+
+Please use the solution you see as most appropriate.
+
+### Example Output:
+
+```
+ telegraf --config etc/telegraf.conf --input-filter opensmtpd --test
+* Plugin: inputs.opensmtpd, Collection 1
+> opensmtpd,host=localhost scheduler_delivery_tempfail=822,mta_host=10,mta_task_running=4,queue_bounce=13017,scheduler_delivery_permfail=51022,mta_relay=7,queue_evpcache_size=2,scheduler_envelope_expired=26,bounce_message=0,mta_domain=7,queue_evpcache_update_hit=848,smtp_session_local=12294,bounce_envelope=0,queue_evpcache_load_hit=4389703,scheduler_ramqueue_update=0,mta_route=3,scheduler_delivery_ok=2149489,smtp_session_inet4=2131997,control_session=1,scheduler_envelope_incoming=0,uptime=10346728,scheduler_ramqueue_envelope=2,smtp_session=0,bounce_session=0,mta_envelope=2,mta_session=6,mta_task=2,scheduler_ramqueue_message=2,mta_connector=7,mta_source=1,scheduler_envelope=2,scheduler_envelope_inflight=2 1510220300000000000
+
+```
diff --git a/plugins/inputs/opensmtpd/opensmtpd.go b/plugins/inputs/opensmtpd/opensmtpd.go
new file mode 100644
index 000000000..1c0e5690d
--- /dev/null
+++ b/plugins/inputs/opensmtpd/opensmtpd.go
@@ -0,0 +1,134 @@
+package opensmtpd
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type runner func(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error)
+
+// Opensmtpd is used to store configuration values
+type Opensmtpd struct {
+	Binary  string
+	Timeout internal.Duration
+	UseSudo bool
+
+	filter filter.Filter
+	run    runner
+}
+
+var defaultBinary = "/usr/sbin/smtpctl"
+var defaultTimeout = internal.Duration{Duration: time.Second}
+
+var sampleConfig = `
+  ## If running as a restricted user you can prepend sudo for additional access:
+  #use_sudo = false
+
+  ## The default location of the smtpctl binary can be overridden with:
+  binary = "/usr/sbin/smtpctl"
+
+  ## The default timeout of 1000ms can be overriden with (in milliseconds):
+  timeout = 1000
+`
+
+func (s *Opensmtpd) Description() string {
+	return "A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver "
+}
+
+// SampleConfig displays configuration instructions
+func (s *Opensmtpd) SampleConfig() string {
+	return sampleConfig
+}
+
+// Shell out to opensmtpd_stat and return the output
+func opensmtpdRunner(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+	cmdArgs := []string{"show", "stats"}
+
+	cmd := exec.Command(cmdName, cmdArgs...)
+
+	if UseSudo {
+		cmdArgs = append([]string{cmdName}, cmdArgs...)
+		cmd = exec.Command("sudo", cmdArgs...)
+	}
+
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := internal.RunTimeout(cmd, Timeout.Duration)
+	if err != nil {
+		return &out, fmt.Errorf("error running smtpctl: %s", err)
+	}
+
+	return &out, nil
+}
+
+// Gather collects the configured stats from smtpctl and adds them to the
+// Accumulator
+//
+// All the dots in stat name will replaced by underscores. Histogram statistics will not be collected.
+func (s *Opensmtpd) Gather(acc telegraf.Accumulator) error {
+	// Always exclude uptime.human statistics
+	stat_excluded := []string{"uptime.human"}
+	filter_excluded, err := filter.Compile(stat_excluded)
+	if err != nil {
+		return err
+	}
+
+	out, err := s.run(s.Binary, s.Timeout, s.UseSudo)
+	if err != nil {
+		return fmt.Errorf("error gathering metrics: %s", err)
+	}
+
+	// Process values
+	fields := make(map[string]interface{})
+	scanner := bufio.NewScanner(out)
+	for scanner.Scan() {
+
+		cols := strings.Split(scanner.Text(), "=")
+
+		// Check split correctness
+		if len(cols) != 2 {
+			continue
+		}
+
+		stat := cols[0]
+		value := cols[1]
+
+		// Filter value
+		if filter_excluded.Match(stat) {
+			continue
+		}
+
+		field := strings.Replace(stat, ".", "_", -1)
+
+		fields[field], err = strconv.ParseFloat(value, 64)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Expected a numerical value for %s = %v\n",
+				stat, value))
+		}
+	}
+
+	acc.AddFields("opensmtpd", fields, nil)
+
+	return nil
+}
+
+func init() {
+	inputs.Add("opensmtpd", func() telegraf.Input {
+		return &Opensmtpd{
+			run:     opensmtpdRunner,
+			Binary:  defaultBinary,
+			Timeout: defaultTimeout,
+			UseSudo: false,
+		}
+	})
+}
diff --git a/plugins/inputs/opensmtpd/opensmtpd_test.go b/plugins/inputs/opensmtpd/opensmtpd_test.go
new file mode 100644
index 000000000..42e978b6c
--- /dev/null
+++ b/plugins/inputs/opensmtpd/opensmtpd_test.go
@@ -0,0 +1,111 @@
+package opensmtpd
+
+import (
+	"bytes"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+var TestTimeout = internal.Duration{Duration: time.Second}
+
+func SmtpCTL(output string, Timeout internal.Duration, useSudo bool) func(string, internal.Duration, bool) (*bytes.Buffer, error) {
+	return func(string, internal.Duration, bool) (*bytes.Buffer, error) {
+		return bytes.NewBuffer([]byte(output)), nil
+	}
+}
+
+func TestFilterSomeStats(t *testing.T) {
+	acc := &testutil.Accumulator{}
+	v := &Opensmtpd{
+		run: SmtpCTL(fullOutput, TestTimeout, false),
+	}
+	err := v.Gather(acc)
+
+	assert.NoError(t, err)
+	assert.True(t, acc.HasMeasurement("opensmtpd"))
+	assert.Equal(t, acc.NMetrics(), uint64(1))
+
+	assert.Equal(t, acc.NFields(), 36)
+	acc.AssertContainsFields(t, "opensmtpd", parsedFullOutput)
+}
+
+var parsedFullOutput = map[string]interface{}{
+	"bounce_envelope":             float64(0),
+	"bounce_message":              float64(0),
+	"bounce_session":              float64(0),
+	"control_session":             float64(1),
+	"mda_envelope":                float64(0),
+	"mda_pending":                 float64(0),
+	"mda_running":                 float64(0),
+	"mda_user":                    float64(0),
+	"mta_connector":               float64(1),
+	"mta_domain":                  float64(1),
+	"mta_envelope":                float64(0),
+	"mta_host":                    float64(6),
+	"mta_relay":                   float64(1),
+	"mta_route":                   float64(1),
+	"mta_session":                 float64(1),
+	"mta_source":                  float64(1),
+	"mta_task":                    float64(0),
+	"mta_task_running":            float64(5),
+	"queue_bounce":                float64(11495),
+	"queue_evpcache_load_hit":     float64(3927539),
+	"queue_evpcache_size":         float64(0),
+	"queue_evpcache_update_hit":   float64(508),
+	"scheduler_delivery_ok":       float64(1922951),
+	"scheduler_delivery_permfail": float64(45967),
+	"scheduler_delivery_tempfail": float64(493),
+	"scheduler_envelope":          float64(0),
+	"scheduler_envelope_expired":  float64(17),
+	"scheduler_envelope_incoming": float64(0),
+	"scheduler_envelope_inflight": float64(0),
+	"scheduler_ramqueue_envelope": float64(0),
+	"scheduler_ramqueue_message":  float64(0),
+	"scheduler_ramqueue_update":   float64(0),
+	"smtp_session":                float64(0),
+	"smtp_session_inet4":          float64(1903412),
+	"smtp_session_local":          float64(10827),
+	"uptime":                      float64(9253995),
+}
+
+var fullOutput = `bounce.envelope=0
+bounce.message=0
+bounce.session=0
+control.session=1
+mda.envelope=0
+mda.pending=0
+mda.running=0
+mda.user=0
+mta.connector=1
+mta.domain=1
+mta.envelope=0
+mta.host=6
+mta.relay=1
+mta.route=1
+mta.session=1
+mta.source=1
+mta.task=0
+mta.task.running=5
+queue.bounce=11495
+queue.evpcache.load.hit=3927539
+queue.evpcache.size=0
+queue.evpcache.update.hit=508
+scheduler.delivery.ok=1922951
+scheduler.delivery.permfail=45967
+scheduler.delivery.tempfail=493
+scheduler.envelope=0
+scheduler.envelope.expired=17
+scheduler.envelope.incoming=0
+scheduler.envelope.inflight=0
+scheduler.ramqueue.envelope=0
+scheduler.ramqueue.message=0
+scheduler.ramqueue.update=0
+smtp.session=0
+smtp.session.inet4=1903412
+smtp.session.local=10827
+uptime=9253995
+uptime.human=107d2h33m15s`

From 54b0b9e7274e01f00d9dfc2a9ebd236175871fb9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 14:40:45 -0800
Subject: [PATCH 0756/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cca0763de..5fe80ddb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+- [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer
 - [particle](./plugins/inputs/webhooks/particle/README.md) - Thanks to @davidgs
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
@@ -64,6 +65,7 @@
 - [#3471](https://github.com/influxdata/telegraf/pull/3471): Use MAX() instead of SUM() for latency measurements in sqlserver.
 - [#3490](https://github.com/influxdata/telegraf/pull/3490): Add index by week number to Elasticsearch output.
 - [#3434](https://github.com/influxdata/telegraf/pull/3434): Add unbound input plugin.
+- [#3449](https://github.com/influxdata/telegraf/pull/3449): Add opensmtpd input plugin.
 
 ### Bugfixes
 

From 92ca661662fe276e5642d34e3c1f8d30bdf58fad Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Tue, 21 Nov 2017 01:25:36 +0100
Subject: [PATCH 0757/1302] Add support for tags in the index name in
 elasticsearch output (#3470)

---
 plugins/outputs/elasticsearch/README.md       |   7 +
 .../outputs/elasticsearch/elasticsearch.go    |  74 ++++++++--
 .../elasticsearch/elasticsearch_test.go       | 130 +++++++++++++++++-
 3 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md
index d2c84a8d3..b0d2e6f9b 100644
--- a/plugins/outputs/elasticsearch/README.md
+++ b/plugins/outputs/elasticsearch/README.md
@@ -173,6 +173,11 @@ This plugin will format the events in the following way:
   # %d - day of month (e.g., 01)
   # %H - hour (00..23)
   # %V - week of the year (ISO week) (01..53)
+  ## Additionally, you can specify a tag name using the notation {{tag_name}}
+  ## which will be used as part of the index name. If the tag does not exist,
+  ## the default tag value will be used.
+  # index_name = "telegraf-{{host}}-%Y.%m.%d"
+  # default_tag_value = "none"
   index_name = "telegraf-%Y.%m.%d" # required.
 
   ## Optional SSL Config
@@ -202,7 +207,9 @@ This plugin will format the events in the following way:
   %m - month (01..12)
   %d - day of month (e.g., 01)
   %H - hour (00..23)
+  %V - week of the year (ISO week) (01..53)
 ```
+Additionally, you can specify dynamic index names by using tags with the notation ```{{tag_name}}```. This will store the metrics with different tag values in different indices. If the tag does not exist in a particular metric, the `default_tag_value` will be used instead.
 
 ### Optional parameters:
 
diff --git a/plugins/outputs/elasticsearch/elasticsearch.go b/plugins/outputs/elasticsearch/elasticsearch.go
index a9fd5a491..326def1d1 100644
--- a/plugins/outputs/elasticsearch/elasticsearch.go
+++ b/plugins/outputs/elasticsearch/elasticsearch.go
@@ -18,6 +18,8 @@ import (
 type Elasticsearch struct {
 	URLs                []string `toml:"urls"`
 	IndexName           string
+	DefaultTagValue     string
+	TagKeys             []string
 	Username            string
 	Password            string
 	EnableSniffer       bool
@@ -38,7 +40,7 @@ var sampleConfig = `
   ## Multiple urls can be specified as part of the same cluster,
   ## this means that only ONE of the urls will be written to each interval.
   urls = [ "http://node1.es.example.com:9200" ] # required.
-  ## Elasticsearch client timeout, defaults to "5s" if not set. 
+  ## Elasticsearch client timeout, defaults to "5s" if not set.
   timeout = "5s"
   ## Set to true to ask Elasticsearch a list of all cluster nodes,
   ## thus it is not necessary to list all nodes in the urls config option.
@@ -60,6 +62,11 @@ var sampleConfig = `
   # %d - day of month (e.g., 01)
   # %H - hour (00..23)
   # %V - week of the year (ISO week) (01..53)
+  ## Additionally, you can specify a tag name using the notation {{tag_name}}
+  ## which will be used as part of the index name. If the tag does not exist,
+  ## the default tag value will be used.
+  # index_name = "telegraf-{{host}}-%Y.%m.%d"
+  # default_tag_value = "none"
   index_name = "telegraf-%Y.%m.%d" # required.
 
   ## Optional SSL Config
@@ -152,6 +159,8 @@ func (a *Elasticsearch) Connect() error {
 		}
 	}
 
+	a.IndexName, a.TagKeys = a.GetTagKeys(a.IndexName)
+
 	return nil
 }
 
@@ -167,7 +176,7 @@ func (a *Elasticsearch) Write(metrics []telegraf.Metric) error {
 
 		// index name has to be re-evaluated each time for telegraf
 		// to send the metric to the correct time-based index
-		indexName := a.GetIndexName(a.IndexName, metric.Time())
+		indexName := a.GetIndexName(a.IndexName, metric.Time(), a.TagKeys, metric.Tags())
 
 		m := make(map[string]interface{})
 
@@ -214,13 +223,21 @@ func (a *Elasticsearch) manageTemplate(ctx context.Context) error {
 		return fmt.Errorf("Elasticsearch template check failed, template name: %s, error: %s", a.TemplateName, errExists)
 	}
 
-	templatePattern := a.IndexName + "*"
+	templatePattern := a.IndexName
 
-	if strings.Contains(a.IndexName, "%") {
-		templatePattern = a.IndexName[0:strings.Index(a.IndexName, "%")] + "*"
+	if strings.Contains(templatePattern, "%") {
+		templatePattern = templatePattern[0:strings.Index(templatePattern, "%")]
 	}
 
-	if (a.OverwriteTemplate) || (!templateExists) {
+	if strings.Contains(templatePattern, "{{") {
+		templatePattern = templatePattern[0:strings.Index(templatePattern, "{{")]
+	}
+
+	if templatePattern == "" {
+		return fmt.Errorf("Template cannot be created for dynamic index names without an index prefix")
+	}
+
+	if (a.OverwriteTemplate) || (!templateExists) || (templatePattern != "") {
 		// Create or update the template
 		tmpl := fmt.Sprintf(`
 			{
@@ -278,7 +295,7 @@ func (a *Elasticsearch) manageTemplate(ctx context.Context) error {
 						]
 					}
 				}
-			}`, templatePattern)
+			}`, templatePattern+"*")
 		_, errCreateTemplate := a.Client.IndexPutTemplate(a.TemplateName).BodyString(tmpl).Do(ctx)
 
 		if errCreateTemplate != nil {
@@ -295,7 +312,35 @@ func (a *Elasticsearch) manageTemplate(ctx context.Context) error {
 	return nil
 }
 
-func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time) string {
+func (a *Elasticsearch) GetTagKeys(indexName string) (string, []string) {
+
+	tagKeys := []string{}
+	startTag := strings.Index(indexName, "{{")
+
+	for startTag >= 0 {
+		endTag := strings.Index(indexName, "}}")
+
+		if endTag < 0 {
+			startTag = -1
+
+		} else {
+			tagName := indexName[startTag+2 : endTag]
+
+			var tagReplacer = strings.NewReplacer(
+				"{{"+tagName+"}}", "%s",
+			)
+
+			indexName = tagReplacer.Replace(indexName)
+			tagKeys = append(tagKeys, (strings.TrimSpace(tagName)))
+
+			startTag = strings.Index(indexName, "{{")
+		}
+	}
+
+	return indexName, tagKeys
+}
+
+func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time, tagKeys []string, metricTags map[string]string) string {
 	if strings.Contains(indexName, "%") {
 		var dateReplacer = strings.NewReplacer(
 			"%Y", eventTime.UTC().Format("2006"),
@@ -309,7 +354,18 @@ func (a *Elasticsearch) GetIndexName(indexName string, eventTime time.Time) stri
 		indexName = dateReplacer.Replace(indexName)
 	}
 
-	return indexName
+	tagValues := []interface{}{}
+
+	for _, key := range tagKeys {
+		if value, ok := metricTags[key]; ok {
+			tagValues = append(tagValues, value)
+		} else {
+			log.Printf("D! Tag '%s' not found, using '%s' on index name instead\n", key, a.DefaultTagValue)
+			tagValues = append(tagValues, a.DefaultTagValue)
+		}
+	}
+
+	return fmt.Sprintf(indexName, tagValues...)
 
 }
 
diff --git a/plugins/outputs/elasticsearch/elasticsearch_test.go b/plugins/outputs/elasticsearch/elasticsearch_test.go
index dadd94da9..e2a583402 100644
--- a/plugins/outputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/outputs/elasticsearch/elasticsearch_test.go
@@ -2,6 +2,7 @@ package elasticsearch
 
 import (
 	"context"
+	"reflect"
 	"testing"
 	"time"
 
@@ -38,6 +39,10 @@ func TestConnectAndWrite(t *testing.T) {
 }
 
 func TestTemplateManagementEmptyTemplate(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
 	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
 
 	ctx := context.Background()
@@ -82,54 +87,173 @@ func TestTemplateManagement(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestTemplateInvalidIndexPattern(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	urls := []string{"http://" + testutil.GetLocalHost() + ":9200"}
+
+	e := &Elasticsearch{
+		URLs:              urls,
+		IndexName:         "{{host}}-%Y.%m.%d",
+		Timeout:           internal.Duration{Duration: time.Second * 5},
+		ManageTemplate:    true,
+		TemplateName:      "telegraf",
+		OverwriteTemplate: true,
+	}
+
+	err := e.Connect()
+	require.Error(t, err)
+}
+
+func TestGetTagKeys(t *testing.T) {
+	e := &Elasticsearch{
+		DefaultTagValue: "none",
+	}
+
+	var tests = []struct {
+		IndexName         string
+		ExpectedIndexName string
+		ExpectedTagKeys   []string
+	}{
+		{
+			"indexname",
+			"indexname",
+			[]string{},
+		}, {
+			"indexname-%Y",
+			"indexname-%Y",
+			[]string{},
+		}, {
+			"indexname-%Y-%m",
+			"indexname-%Y-%m",
+			[]string{},
+		}, {
+			"indexname-%Y-%m-%d",
+			"indexname-%Y-%m-%d",
+			[]string{},
+		}, {
+			"indexname-%Y-%m-%d-%H",
+			"indexname-%Y-%m-%d-%H",
+			[]string{},
+		}, {
+			"indexname-%y-%m",
+			"indexname-%y-%m",
+			[]string{},
+		}, {
+			"indexname-{{tag1}}-%y-%m",
+			"indexname-%s-%y-%m",
+			[]string{"tag1"},
+		}, {
+			"indexname-{{tag1}}-{{tag2}}-%y-%m",
+			"indexname-%s-%s-%y-%m",
+			[]string{"tag1", "tag2"},
+		}, {
+			"indexname-{{tag1}}-{{tag2}}-{{tag3}}-%y-%m",
+			"indexname-%s-%s-%s-%y-%m",
+			[]string{"tag1", "tag2", "tag3"},
+		},
+	}
+	for _, test := range tests {
+		indexName, tagKeys := e.GetTagKeys(test.IndexName)
+		if indexName != test.ExpectedIndexName {
+			t.Errorf("Expected indexname %s, got %s\n", test.ExpectedIndexName, indexName)
+		}
+		if !reflect.DeepEqual(tagKeys, test.ExpectedTagKeys) {
+			t.Errorf("Expected tagKeys %s, got %s\n", test.ExpectedTagKeys, tagKeys)
+		}
+	}
+
+}
+
 func TestGetIndexName(t *testing.T) {
-	e := &Elasticsearch{}
+	e := &Elasticsearch{
+		DefaultTagValue: "none",
+	}
 
 	var tests = []struct {
 		EventTime time.Time
+		Tags      map[string]string
+		TagKeys   []string
 		IndexName string
 		Expected  string
 	}{
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname",
 			"indexname",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%Y",
 			"indexname-2014",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%Y-%m",
 			"indexname-2014-12",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%Y-%m-%d",
 			"indexname-2014-12-01",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%Y-%m-%d-%H",
 			"indexname-2014-12-01-23",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%y-%m",
 			"indexname-14-12",
 		},
 		{
 			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{},
 			"indexname-%Y-%V",
 			"indexname-2014-49",
 		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{"tag1"},
+			"indexname-%s-%y-%m",
+			"indexname-value1-14-12",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{"tag1", "tag2"},
+			"indexname-%s-%s-%y-%m",
+			"indexname-value1-value2-14-12",
+		},
+		{
+			time.Date(2014, 12, 01, 23, 30, 00, 00, time.UTC),
+			map[string]string{"tag1": "value1", "tag2": "value2"},
+			[]string{"tag1", "tag2", "tag3"},
+			"indexname-%s-%s-%s-%y-%m",
+			"indexname-value1-value2-none-14-12",
+		},
 	}
 	for _, test := range tests {
-		indexName := e.GetIndexName(test.IndexName, test.EventTime)
+		indexName := e.GetIndexName(test.IndexName, test.EventTime, test.TagKeys, test.Tags)
 		if indexName != test.Expected {
-			t.Errorf("Expected indexname %s, got %s\n", indexName, test.Expected)
+			t.Errorf("Expected indexname %s, got %s\n", test.Expected, indexName)
 		}
 	}
 }

From 154b263f149c427e47766c3bf169d466a1d8bcdb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 16:27:18 -0800
Subject: [PATCH 0758/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fe80ddb0..818cb8340 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - [#3490](https://github.com/influxdata/telegraf/pull/3490): Add index by week number to Elasticsearch output.
 - [#3434](https://github.com/influxdata/telegraf/pull/3434): Add unbound input plugin.
 - [#3449](https://github.com/influxdata/telegraf/pull/3449): Add opensmtpd input plugin.
+- [#3470](https://github.com/influxdata/telegraf/pull/3470): Add support for tags in the index name in elasticsearch output.
 
 ### Bugfixes
 

From d5bd426e0ca662c69fa13beeacd6188842865cd0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 20 Nov 2017 16:48:30 -0800
Subject: [PATCH 0759/1302] Fix snmp tools output parsing when they contain
 Windows eols (#3396)

---
 plugins/inputs/snmp/snmp.go | 96 ++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index c4f66f519..7d3cb7298 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -1,6 +1,7 @@
 package snmp
 
 import (
+	"bufio"
 	"bytes"
 	"fmt"
 	"math"
@@ -88,7 +89,7 @@ func execCmd(arg0 string, args ...string) ([]byte, error) {
 		if err, ok := err.(*exec.ExitError); ok {
 			return nil, NestedError{
 				Err:       err,
-				NestedErr: fmt.Errorf("%s", bytes.TrimRight(err.Stderr, "\n")),
+				NestedErr: fmt.Errorf("%s", bytes.TrimRight(err.Stderr, "\r\n")),
 			}
 		}
 		return nil, err
@@ -856,24 +857,26 @@ func snmpTableCall(oid string) (mibName string, oidNum string, oidText string, f
 	tagOids := map[string]struct{}{}
 	// We have to guess that the "entry" oid is `oid+".1"`. snmptable and snmptranslate don't seem to have a way to provide the info.
 	if out, err := execCmd("snmptranslate", "-Td", oidFullName+".1"); err == nil {
-		lines := bytes.Split(out, []byte{'\n'})
-		for _, line := range lines {
-			if !bytes.HasPrefix(line, []byte("  INDEX")) {
+		scanner := bufio.NewScanner(bytes.NewBuffer(out))
+		for scanner.Scan() {
+			line := scanner.Text()
+
+			if !strings.HasPrefix(line, "  INDEX") {
 				continue
 			}
 
-			i := bytes.Index(line, []byte("{ "))
+			i := strings.Index(line, "{ ")
 			if i == -1 { // parse error
 				continue
 			}
 			line = line[i+2:]
-			i = bytes.Index(line, []byte(" }"))
+			i = strings.Index(line, " }")
 			if i == -1 { // parse error
 				continue
 			}
 			line = line[:i]
-			for _, col := range bytes.Split(line, []byte(", ")) {
-				tagOids[mibPrefix+string(col)] = struct{}{}
+			for _, col := range strings.Split(line, ", ") {
+				tagOids[mibPrefix+col] = struct{}{}
 			}
 		}
 	}
@@ -883,15 +886,16 @@ func snmpTableCall(oid string) (mibName string, oidNum string, oidText string, f
 	if err != nil {
 		return "", "", "", nil, Errorf(err, "getting table columns")
 	}
-	cols := bytes.SplitN(out, []byte{'\n'}, 2)[0]
+	scanner := bufio.NewScanner(bytes.NewBuffer(out))
+	scanner.Scan()
+	cols := scanner.Text()
 	if len(cols) == 0 {
 		return "", "", "", nil, fmt.Errorf("could not find any columns in table")
 	}
-	for _, col := range bytes.Split(cols, []byte{' '}) {
+	for _, col := range strings.Split(cols, " ") {
 		if len(col) == 0 {
 			continue
 		}
-		col := string(col)
 		_, isTag := tagOids[mibPrefix+col]
 		fields = append(fields, Field{Name: col, Oid: mibPrefix + col, IsTag: isTag})
 	}
@@ -953,18 +957,18 @@ func snmpTranslateCall(oid string) (mibName string, oidNum string, oidText strin
 		return "", "", "", "", err
 	}
 
-	bb := bytes.NewBuffer(out)
-
-	oidText, err = bb.ReadString('\n')
-	if err != nil {
-		return "", "", "", "", Errorf(err, "getting OID text")
+	scanner := bufio.NewScanner(bytes.NewBuffer(out))
+	ok := scanner.Scan()
+	if !ok && scanner.Err() != nil {
+		return "", "", "", "", Errorf(scanner.Err(), "getting OID text")
 	}
-	oidText = oidText[:len(oidText)-1]
+
+	oidText = scanner.Text()
 
 	i := strings.Index(oidText, "::")
 	if i == -1 {
 		// was not found in MIB.
-		if bytes.Index(bb.Bytes(), []byte(" [TRUNCATED]")) >= 0 {
+		if bytes.Contains(out, []byte("[TRUNCATED]")) {
 			return "", oid, oid, "", nil
 		}
 		// not truncated, but not fully found. We still need to parse out numeric OID, so keep going
@@ -974,37 +978,33 @@ func snmpTranslateCall(oid string) (mibName string, oidNum string, oidText strin
 		oidText = oidText[i+2:]
 	}
 
-	if i := bytes.Index(bb.Bytes(), []byte("  -- TEXTUAL CONVENTION ")); i != -1 {
-		bb.Next(i + len("  -- TEXTUAL CONVENTION "))
-		tc, err := bb.ReadString('\n')
-		if err != nil {
-			return "", "", "", "", Errorf(err, "getting textual convention")
-		}
-		tc = tc[:len(tc)-1]
-		switch tc {
-		case "MacAddress", "PhysAddress":
-			conversion = "hwaddr"
-		case "InetAddressIPv4", "InetAddressIPv6", "InetAddress":
-			conversion = "ipaddr"
-		}
-	}
+	for scanner.Scan() {
+		line := scanner.Text()
 
-	i = bytes.Index(bb.Bytes(), []byte("::= { "))
-	bb.Next(i + len("::= { "))
-	objs, err := bb.ReadString('}')
-	if err != nil {
-		return "", "", "", "", Errorf(err, "getting numeric oid")
-	}
-	objs = objs[:len(objs)-1]
-	for _, obj := range strings.Split(objs, " ") {
-		if len(obj) == 0 {
-			continue
-		}
-		if i := strings.Index(obj, "("); i != -1 {
-			obj = obj[i+1:]
-			oidNum += "." + obj[:strings.Index(obj, ")")]
-		} else {
-			oidNum += "." + obj
+		if strings.HasPrefix(line, "  -- TEXTUAL CONVENTION ") {
+			tc := strings.TrimPrefix(line, "  -- TEXTUAL CONVENTION ")
+			switch tc {
+			case "MacAddress", "PhysAddress":
+				conversion = "hwaddr"
+			case "InetAddressIPv4", "InetAddressIPv6", "InetAddress":
+				conversion = "ipaddr"
+			}
+		} else if strings.HasPrefix(line, "::= { ") {
+			objs := strings.TrimPrefix(line, "::= { ")
+			objs = strings.TrimSuffix(objs, " }")
+
+			for _, obj := range strings.Split(objs, " ") {
+				if len(obj) == 0 {
+					continue
+				}
+				if i := strings.Index(obj, "("); i != -1 {
+					obj = obj[i+1:]
+					oidNum += "." + obj[:strings.Index(obj, ")")]
+				} else {
+					oidNum += "." + obj
+				}
+			}
+			break
 		}
 	}
 

From 7442b5645f3d8517f28ff4bf923e28ac40f0c093 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 20 Nov 2017 16:50:18 -0800
Subject: [PATCH 0760/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818cb8340..898e9c683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
 - [#3326](https://github.com/influxdata/telegraf/issues/3326): Fail metrics parsing on unescaped quotes.
 - [#3473](https://github.com/influxdata/telegraf/pull/3473): Whitelist allowed char classes for graphite output.
 - [#3488](https://github.com/influxdata/telegraf/pull/3488): Use hexadecimal ids and lowercase names in zipkin input.
+- [#3263](https://github.com/influxdata/telegraf/issues/3263): Fix snmp-tools output parsing with Windows EOLs.
 
 ## v1.4.4 [2017-11-08]
 

From f758d0c6c3c291b50cbdc6c82fdb38d31bb41f93 Mon Sep 17 00:00:00 2001
From: Laurent Gosselin <laurent.gosselin@gmail.com>
Date: Mon, 27 Nov 2017 21:29:51 +0100
Subject: [PATCH 0761/1302] Fix global variable collection when using
 interval_slow option in mysql input (#3500)

---
 plugins/inputs/mysql/mysql.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index d8ca153d0..c3dc38423 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -588,17 +588,12 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 
 	// Global Variables may be gathered less often
 	if len(m.IntervalSlow) > 0 {
-		if uint32(time.Since(lastT).Seconds()) > scanIntervalSlow {
+		if uint32(time.Since(lastT).Seconds()) >= scanIntervalSlow {
 			err = m.gatherGlobalVariables(db, serv, acc)
 			if err != nil {
 				return err
 			}
 			lastT = time.Now()
-		} else {
-			err = m.gatherGlobalVariables(db, serv, acc)
-			if err != nil {
-				return err
-			}
 		}
 	}
 

From a9ada5f65bd8fc2b802b25f583d5f61701d19665 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Nov 2017 12:32:36 -0800
Subject: [PATCH 0762/1302] Update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 898e9c683..437d53116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,8 +80,16 @@
 - [#3488](https://github.com/influxdata/telegraf/pull/3488): Use hexadecimal ids and lowercase names in zipkin input.
 - [#3263](https://github.com/influxdata/telegraf/issues/3263): Fix snmp-tools output parsing with Windows EOLs.
 
+## v1.4.5 [unreleased]
+
+### Bugfixes
+
+- [#3500](https://github.com/influxdata/telegraf/issues/3500): Fix global variable collection when using interval_slow option in mysql input.
+
 ## v1.4.4 [2017-11-08]
 
+### Bugfixes
+
 - [#3401](https://github.com/influxdata/telegraf/pull/3401): Use schema specified in mqtt_consumer input.
 - [#3419](https://github.com/influxdata/telegraf/issues/3419): Redact datadog API key in log output.
 - [#3311](https://github.com/influxdata/telegraf/issues/3311): Fix error getting pids in netstat input.

From 27994abcb5a5bfb34204273d18f695575c6f9b63 Mon Sep 17 00:00:00 2001
From: Dylan Meissner <dylanmei@gmail.com>
Date: Mon, 27 Nov 2017 13:43:19 -0800
Subject: [PATCH 0763/1302] Jolokia2 handles unordered mbean object name
 properties (#3504)

---
 plugins/inputs/jolokia2/gatherer.go     |  19 +----
 plugins/inputs/jolokia2/jolokia_test.go | 108 ++++++++++++++++++++++++
 plugins/inputs/jolokia2/metric.go       |  67 +++++++++++++++
 3 files changed, 179 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/jolokia2/gatherer.go b/plugins/inputs/jolokia2/gatherer.go
index 3cc2e1217..5005e8225 100644
--- a/plugins/inputs/jolokia2/gatherer.go
+++ b/plugins/inputs/jolokia2/gatherer.go
@@ -127,8 +127,7 @@ func mergeTags(metricTags, outerTags map[string]string) map[string]string {
 // of a Metric match the corresponding elements in a ReadResponse object
 // returned by a Jolokia agent.
 func metricMatchesResponse(metric Metric, response ReadResponse) bool {
-
-	if metric.Mbean != response.RequestMbean {
+	if !metric.MatchObjectName(response.RequestMbean) {
 		return false
 	}
 
@@ -136,19 +135,9 @@ func metricMatchesResponse(metric Metric, response ReadResponse) bool {
 		return len(response.RequestAttributes) == 0
 	}
 
-	for _, fullPath := range metric.Paths {
-		segments := strings.SplitN(fullPath, "/", 2)
-		attribute := segments[0]
-
-		var path string
-		if len(segments) == 2 {
-			path = segments[1]
-		}
-
-		for _, rattr := range response.RequestAttributes {
-			if attribute == rattr && path == response.RequestPath {
-				return true
-			}
+	for _, attribute := range response.RequestAttributes {
+		if metric.MatchAttributeAndPath(attribute, response.RequestPath) {
+			return true
 		}
 	}
 
diff --git a/plugins/inputs/jolokia2/jolokia_test.go b/plugins/inputs/jolokia2/jolokia_test.go
index dfdc4bef9..f94606ae6 100644
--- a/plugins/inputs/jolokia2/jolokia_test.go
+++ b/plugins/inputs/jolokia2/jolokia_test.go
@@ -481,6 +481,114 @@ func TestJolokia2_FieldRenaming(t *testing.T) {
 	})
 }
 
+func TestJolokia2_MetricMbeanMatching(t *testing.T) {
+	config := `
+	[jolokia2_agent]
+		urls = ["%s"]
+
+	[[jolokia2_agent.metric]]
+		name = "mbean_name_and_object_keys"
+		mbean = "test1:foo=bar,fizz=buzz"
+
+	[[jolokia2_agent.metric]]
+		name = "mbean_name_and_unordered_object_keys"
+		mbean = "test2:fizz=buzz,foo=bar"
+
+	[[jolokia2_agent.metric]]
+		name = "mbean_name_and_attributes"
+		mbean = "test3"
+		paths = ["foo", "bar"]
+
+	[[jolokia2_agent.metric]]
+		name = "mbean_name_and_attribute_with_paths"
+		mbean = "test4"
+		paths = ["flavor/chocolate", "flavor/strawberry"]
+	`
+
+	response := `[{
+		"request": {
+			"mbean": "test1:foo=bar,fizz=buzz",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "test2:foo=bar,fizz=buzz",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "test3",
+			"attribute": "foo",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "test3",
+			"attribute": "bar",
+			"type": "read"
+		},
+		"value": 456,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "test4",
+			"attribute": "flavor",
+			"path": "chocolate",
+			"type": "read"
+		},
+		"value": 123,
+		"status": 200
+	}, {
+		"request": {
+			"mbean": "test4",
+			"attribute": "flavor",
+			"path": "strawberry",
+			"type": "read"
+		},
+		"value": 456,
+		"status": 200
+	}]`
+
+	server := setupServer(http.StatusOK, response)
+	defer server.Close()
+	plugin := setupPlugin(t, fmt.Sprintf(config, server.URL))
+
+	var acc testutil.Accumulator
+	assert.NoError(t, plugin.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "mbean_name_and_object_keys", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "mbean_name_and_unordered_object_keys", map[string]interface{}{
+		"value": 123.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "mbean_name_and_attributes", map[string]interface{}{
+		"foo": 123.0,
+		"bar": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+
+	acc.AssertContainsTaggedFields(t, "mbean_name_and_attribute_with_paths", map[string]interface{}{
+		"flavor.chocolate":  123.0,
+		"flavor.strawberry": 456.0,
+	}, map[string]string{
+		"jolokia_agent_url": server.URL,
+	})
+}
+
 func TestJolokia2_MetricCompaction(t *testing.T) {
 	config := `
 	[jolokia2_agent]
diff --git a/plugins/inputs/jolokia2/metric.go b/plugins/inputs/jolokia2/metric.go
index 03baea124..0f438b3c0 100644
--- a/plugins/inputs/jolokia2/metric.go
+++ b/plugins/inputs/jolokia2/metric.go
@@ -1,5 +1,7 @@
 package jolokia2
 
+import "strings"
+
 // A MetricConfig represents a TOML form of
 // a Metric with some optional fields.
 type MetricConfig struct {
@@ -25,6 +27,9 @@ type Metric struct {
 	FieldSeparator string
 	TagPrefix      string
 	TagKeys        []string
+
+	mbeanDomain     string
+	mbeanProperties []string
 }
 
 func NewMetric(config MetricConfig, defaultFieldPrefix, defaultFieldSeparator, defaultTagPrefix string) Metric {
@@ -57,5 +62,67 @@ func NewMetric(config MetricConfig, defaultFieldPrefix, defaultFieldSeparator, d
 		metric.TagPrefix = *config.TagPrefix
 	}
 
+	mbeanDomain, mbeanProperties := parseMbeanObjectName(config.Mbean)
+	metric.mbeanDomain = mbeanDomain
+	metric.mbeanProperties = mbeanProperties
+
 	return metric
 }
+
+func (m Metric) MatchObjectName(name string) bool {
+	if name == m.Mbean {
+		return true
+	}
+
+	mbeanDomain, mbeanProperties := parseMbeanObjectName(name)
+	if mbeanDomain != m.mbeanDomain {
+		return false
+	}
+
+	if len(mbeanProperties) != len(m.mbeanProperties) {
+		return false
+	}
+
+NEXT_PROPERTY:
+	for _, mbeanProperty := range m.mbeanProperties {
+		for i := range mbeanProperties {
+			if mbeanProperties[i] == mbeanProperty {
+				continue NEXT_PROPERTY
+			}
+		}
+
+		return false
+	}
+
+	return true
+}
+
+func (m Metric) MatchAttributeAndPath(attribute, innerPath string) bool {
+	path := attribute
+	if innerPath != "" {
+		path = path + "/" + innerPath
+	}
+
+	for i := range m.Paths {
+		if path == m.Paths[i] {
+			return true
+		}
+	}
+
+	return false
+}
+
+func parseMbeanObjectName(name string) (string, []string) {
+	index := strings.Index(name, ":")
+	if index == -1 {
+		return name, []string{}
+	}
+
+	domain := name[:index]
+
+	if index+1 > len(name) {
+		return domain, []string{}
+	}
+
+	return domain, strings.Split(name[index+1:], ",")
+}

From 6514399baf39b351a7f0a4ae0c2fb7b690a1a928 Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Mon, 27 Nov 2017 17:02:16 -0800
Subject: [PATCH 0764/1302] Add shadow-utils dependency to rpm package (#3505)

---
 scripts/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.py b/scripts/build.py
index 12a8a6b22..fbf3c8590 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -646,7 +646,7 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
                             package_build_root,
                             current_location)
                         if package_type == "rpm":
-                            fpm_command += "--depends coreutils --rpm-posttrans {}".format(POSTINST_SCRIPT)
+                            fpm_command += "--depends coreutils --depends shadow-utils --rpm-posttrans {}".format(POSTINST_SCRIPT)
                         out = run(fpm_command, shell=True)
                         matches = re.search(':path=>"(.*)"', out)
                         outfile = None

From a18eedb97015f31ff758bdb98b96f5bf68e19639 Mon Sep 17 00:00:00 2001
From: Lukasz Jagiello <jagiello.lukasz@gmail.com>
Date: Mon, 27 Nov 2017 17:05:32 -0800
Subject: [PATCH 0765/1302] Use deb-systemd-invoke to restart service (#3506)

From man page:
```
deb-systemd-invoke is a Debian-specific helper script which asks
       /usr/sbin/policy-rc.d before performing a systemctl call.

deb-systemd-invoke is intended to be used from maintscripts to start
       systemd unit files. It is specifically NOT intended to be used
       interactively by users. Instead, users should run systemd and use
       systemctl, or not bother about the systemd enabled state in case they
       are not running systemd.
```

This PR replace regular `systemctl` with `deb-systemd-invoke`.
---
 scripts/post-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 9dc231a30..6c73fef8e 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -74,7 +74,7 @@ elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
     if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
         install_systemd /lib/systemd/system/telegraf.service
-        systemctl restart telegraf || echo "WARNING: systemd not running."
+        deb-systemd-invoke restart telegraf.service || echo "WARNING: systemd not running."
     else
         # Assuming SysVinit
         install_init

From 06e22ee7ac8a41ca8607b123646f27d946c30a68 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 27 Nov 2017 17:06:50 -0800
Subject: [PATCH 0766/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 437d53116..dcc05e0eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,8 @@
 - [#3473](https://github.com/influxdata/telegraf/pull/3473): Whitelist allowed char classes for graphite output.
 - [#3488](https://github.com/influxdata/telegraf/pull/3488): Use hexadecimal ids and lowercase names in zipkin input.
 - [#3263](https://github.com/influxdata/telegraf/issues/3263): Fix snmp-tools output parsing with Windows EOLs.
+- [#3447](https://github.com/influxdata/telegraf/issues/3447): Add shadow-utils dependency to rpm package.
+- [#3448](https://github.com/influxdata/telegraf/issues/3448): Use deb-systemd-invoke to restart service.
 
 ## v1.4.5 [unreleased]
 

From 76240b9f186f2286f954dc8c0154db0f9c4f572f Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Tue, 28 Nov 2017 13:08:41 -0500
Subject: [PATCH 0767/1302] Add postfix input plugin (#2553)

---
 README.md                              |   1 +
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/postfix/README.md       |  36 ++++++++
 plugins/inputs/postfix/postfix.go      | 119 +++++++++++++++++++++++++
 plugins/inputs/postfix/postfix_test.go |  63 +++++++++++++
 5 files changed, 220 insertions(+)
 create mode 100644 plugins/inputs/postfix/README.md
 create mode 100644 plugins/inputs/postfix/postfix.go
 create mode 100644 plugins/inputs/postfix/postfix_test.go

diff --git a/README.md b/README.md
index b913bfc71..20c3c584c 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,7 @@ configuration options.
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
+* [postfix](./plugins/inputs/postfix)
 * [postgresql](./plugins/inputs/postgresql)
 * [postgresql_extensible](./plugins/inputs/postgresql_extensible)
 * [powerdns](./plugins/inputs/powerdns)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index e5cc96ed9..87de7b53e 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -64,6 +64,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
+	_ "github.com/influxdata/telegraf/plugins/inputs/postfix"
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql"
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql_extensible"
 	_ "github.com/influxdata/telegraf/plugins/inputs/powerdns"
diff --git a/plugins/inputs/postfix/README.md b/plugins/inputs/postfix/README.md
new file mode 100644
index 000000000..477a78c9b
--- /dev/null
+++ b/plugins/inputs/postfix/README.md
@@ -0,0 +1,36 @@
+# Postfix Input Plugin
+
+The postfix plugin reports metrics on the postfix queues.
+
+For each of the active, hold, incoming, maildrop, and deferred queues (http://www.postfix.org/QSHAPE_README.html#queues), it will report the queue length (number of items), size (bytes used by items), and age (age of oldest item in seconds).
+
+### Configuration
+
+```toml
+[[inputs.postfix]]
+  ## Postfix queue directory. If not provided, telegraf will try to use
+  ## 'postconf -h queue_directory' to determine it.
+  # queue_directory = "/var/spool/postfix"
+```
+
+### Measurements & Fields:
+
+- postfix_queue
+    - length (integer)
+    - size (integer, bytes)
+    - age (integer, seconds)
+
+### Tags:
+
+- postfix_queue
+    - queue
+
+### Example Output
+
+```
+postfix_queue,queue=active length=3,size=12345,age=9
+postfix_queue,queue=hold length=0,size=0,age=0
+postfix_queue,queue=maildrop length=1,size=2000,age=2
+postfix_queue,queue=incoming length=1,size=1020,age=0
+postfix_queue,queue=deferred length=400,size=76543210,age=3600
+```
diff --git a/plugins/inputs/postfix/postfix.go b/plugins/inputs/postfix/postfix.go
new file mode 100644
index 000000000..02b351d78
--- /dev/null
+++ b/plugins/inputs/postfix/postfix.go
@@ -0,0 +1,119 @@
+package postfix
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const sampleConfig = `
+  ## Postfix queue directory. If not provided, telegraf will try to use
+  ## 'postconf -h queue_directory' to determine it.
+  # queue_directory = "/var/spool/postfix"
+`
+
+const description = "Measure postfix queue statistics"
+
+func getQueueDirectory() (string, error) {
+	qd, err := exec.Command("postconf", "-h", "queue_directory").Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(qd)), nil
+}
+
+func qScan(path string) (int64, int64, int64, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	finfos, err := f.Readdir(-1)
+	f.Close()
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	var length, size int64
+	var oldest time.Time
+	for _, finfo := range finfos {
+		length++
+		size += finfo.Size()
+		if oldest.IsZero() || finfo.ModTime().Before(oldest) {
+			oldest = finfo.ModTime()
+		}
+	}
+	var age time.Duration
+	if !oldest.IsZero() {
+		age = time.Now().Sub(oldest) / time.Second
+	}
+	return length, size, int64(age), nil
+}
+
+type Postfix struct {
+	QueueDirectory string
+}
+
+func (p *Postfix) Gather(acc telegraf.Accumulator) error {
+	if p.QueueDirectory == "" {
+		var err error
+		p.QueueDirectory, err = getQueueDirectory()
+		if err != nil {
+			return fmt.Errorf("unable to determine queue directory: %s", err)
+		}
+	}
+
+	for _, q := range []string{"active", "hold", "incoming", "maildrop"} {
+		length, size, age, err := qScan(path.Join(p.QueueDirectory, q))
+		if err != nil {
+			acc.AddError(fmt.Errorf("error scanning queue %s: %s", q, err))
+			continue
+		}
+		fields := map[string]interface{}{"length": length, "size": size, "age": age}
+		acc.AddFields("postfix_queue", fields, map[string]string{"queue": q})
+	}
+
+	var dLength, dSize, dAge int64
+	for _, q := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"} {
+		length, size, age, err := qScan(path.Join(p.QueueDirectory, "deferred", q))
+		if err != nil {
+			if os.IsNotExist(err) {
+				// the directories are created on first use
+				continue
+			}
+			acc.AddError(fmt.Errorf("error scanning queue deferred/%s: %s", q, err))
+			return nil
+		}
+		dLength += length
+		dSize += size
+		if age > dAge {
+			dAge = age
+		}
+	}
+	fields := map[string]interface{}{"length": dLength, "size": dSize, "age": dAge}
+	acc.AddFields("postfix_queue", fields, map[string]string{"queue": "deferred"})
+
+	return nil
+}
+
+func (p *Postfix) SampleConfig() string {
+	return sampleConfig
+}
+
+func (p *Postfix) Description() string {
+	return description
+}
+
+func init() {
+	inputs.Add("postfix", func() telegraf.Input {
+		return &Postfix{
+			QueueDirectory: "/var/spool/postfix",
+		}
+	})
+}
diff --git a/plugins/inputs/postfix/postfix_test.go b/plugins/inputs/postfix/postfix_test.go
new file mode 100644
index 000000000..859d773c7
--- /dev/null
+++ b/plugins/inputs/postfix/postfix_test.go
@@ -0,0 +1,63 @@
+package postfix
+
+import (
+	"io/ioutil"
+	"os"
+	"path"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGather(t *testing.T) {
+	td, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer os.RemoveAll(td)
+
+	for _, q := range []string{"active", "hold", "incoming", "maildrop", "deferred"} {
+		require.NoError(t, os.Mkdir(path.Join(td, q), 0755))
+	}
+	for _, q := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "F"} { // "E" deliberately left off
+		require.NoError(t, os.Mkdir(path.Join(td, "deferred", q), 0755))
+	}
+
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "02"), []byte("defg"), 0644))
+	require.NoError(t, os.Chtimes(path.Join(td, "active", "02"), time.Now(), time.Now().Add(-time.Hour)))
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "hold", "01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "incoming", "01"), []byte("abcd"), 0644))
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "deferred", "0", "01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(path.Join(td, "deferred", "F", "F1"), []byte("abc"), 0644))
+
+	p := Postfix{
+		QueueDirectory: td,
+	}
+
+	var acc testutil.Accumulator
+	require.NoError(t, p.Gather(&acc))
+
+	metrics := map[string]*testutil.Metric{}
+	for _, m := range acc.Metrics {
+		metrics[m.Tags["queue"]] = m
+	}
+
+	assert.Equal(t, int64(2), metrics["active"].Fields["length"])
+	assert.Equal(t, int64(7), metrics["active"].Fields["size"])
+	assert.InDelta(t, int64(time.Hour/time.Second), metrics["active"].Fields["age"], 10)
+
+	assert.Equal(t, int64(1), metrics["hold"].Fields["length"])
+	assert.Equal(t, int64(3), metrics["hold"].Fields["size"])
+
+	assert.Equal(t, int64(1), metrics["incoming"].Fields["length"])
+	assert.Equal(t, int64(4), metrics["incoming"].Fields["size"])
+
+	assert.Equal(t, int64(0), metrics["maildrop"].Fields["length"])
+	assert.Equal(t, int64(0), metrics["maildrop"].Fields["size"])
+	assert.Equal(t, int64(0), metrics["maildrop"].Fields["age"])
+
+	assert.Equal(t, int64(2), metrics["deferred"].Fields["length"])
+	assert.Equal(t, int64(6), metrics["deferred"].Fields["size"])
+}

From d1ba75176d333ab3fbde5b5a31449d90c64f9ed5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 28 Nov 2017 10:10:36 -0800
Subject: [PATCH 0768/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcc05e0eb..43b5acc3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer
 - [particle](./plugins/inputs/webhooks/particle/README.md) - Thanks to @davidgs
+- [postfix](./plugins/inputs/postfix/README.md) - Thanks to @phemmer
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
 - [teamspeak](./plugins/inputs/teamspeak/README.md) - Thanks to @p4ddy1
@@ -67,6 +68,7 @@
 - [#3434](https://github.com/influxdata/telegraf/pull/3434): Add unbound input plugin.
 - [#3449](https://github.com/influxdata/telegraf/pull/3449): Add opensmtpd input plugin.
 - [#3470](https://github.com/influxdata/telegraf/pull/3470): Add support for tags in the index name in elasticsearch output.
+- [#2553](https://github.com/influxdata/telegraf/pull/2553): Add postfix input plugin.
 
 ### Bugfixes
 

From 132fb501500363e0b90ab17324044a5443da7e07 Mon Sep 17 00:00:00 2001
From: Ildar Svetlov <svetlov.ildar@gmail.com>
Date: Wed, 29 Nov 2017 03:16:19 +0400
Subject: [PATCH 0769/1302] Add bond input plugin (#3424)

---
 plugins/inputs/all/all.go        |   1 +
 plugins/inputs/bond/README.md    |  85 +++++++++++++
 plugins/inputs/bond/bond.go      | 204 +++++++++++++++++++++++++++++++
 plugins/inputs/bond/bond_test.go |  77 ++++++++++++
 4 files changed, 367 insertions(+)
 create mode 100644 plugins/inputs/bond/README.md
 create mode 100644 plugins/inputs/bond/bond.go
 create mode 100644 plugins/inputs/bond/bond_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 87de7b53e..1324e7740 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -5,6 +5,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
+	_ "github.com/influxdata/telegraf/plugins/inputs/bond"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ceph"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cgroup"
diff --git a/plugins/inputs/bond/README.md b/plugins/inputs/bond/README.md
new file mode 100644
index 000000000..0a581418f
--- /dev/null
+++ b/plugins/inputs/bond/README.md
@@ -0,0 +1,85 @@
+# Bond Input Plugin
+
+The Bond Input plugin collects bond interface status, bond's slaves interfaces
+status and failures count of bond's slaves interfaces.
+The plugin collects these metrics from `/proc/net/bonding/*` files.
+
+### Configuration:
+
+```toml
+[[inputs.bond]]
+  ## Sets 'proc' directory path
+  ## If not specified, then default is /proc
+  # host_proc = "/proc"
+
+  ## By default, telegraf gather stats for all bond interfaces
+  ## Setting interfaces will restrict the stats to the specified
+  ## bond interfaces.
+  # bond_interfaces = ["bond0"]
+```
+
+### Measurements & Fields:
+
+- bond
+  - active_slave (for active-backup mode)
+  - status
+
+- bond_slave
+  - failures
+  - status
+
+### Description:
+
+```
+active_slave
+  Currently active slave interface for active-backup mode.
+
+status
+  Status of bond interface or bonds's slave interface (down = 0, up = 1).
+
+failures
+  Amount of failures for bond's slave interface.
+```
+
+### Tags:
+
+- bond
+  - bond
+
+- bond_slave
+  - bond
+  - interface
+
+### Example output:
+
+Configuration:
+
+```
+[[inputs.bond]]
+  ## Sets 'proc' directory path
+  ## If not specified, then default is /proc
+  host_proc = "/proc"
+
+  ## By default, telegraf gather stats for all bond interfaces
+  ## Setting interfaces will restrict the stats to the specified
+  ## bond interfaces.
+  bond_interfaces = ["bond0", "bond1"]
+```
+
+Run:
+
+```
+telegraf --config telegraf.conf --input-filter bond --test
+```
+
+Output:
+
+```
+* Plugin: inputs.bond, Collection 1
+> bond,bond=bond1,host=local active_slave="eth0",status=1i 1509704525000000000
+> bond_slave,bond=bond1,interface=eth0,host=local status=1i,failures=0i 1509704525000000000
+> bond_slave,host=local,bond=bond1,interface=eth1 status=1i,failures=0i 1509704525000000000
+> bond,bond=bond0,host=isvetlov-mac.local status=1i 1509704525000000000
+> bond_slave,bond=bond0,interface=eth1,host=local status=1i,failures=0i 1509704525000000000
+> bond_slave,bond=bond0,interface=eth2,host=local status=1i,failures=0i 1509704525000000000
+```
diff --git a/plugins/inputs/bond/bond.go b/plugins/inputs/bond/bond.go
new file mode 100644
index 000000000..01f6f251b
--- /dev/null
+++ b/plugins/inputs/bond/bond.go
@@ -0,0 +1,204 @@
+package bond
+
+import (
+	"bufio"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+// default host proc path
+const defaultHostProc = "/proc"
+
+// env host proc variable name
+const envProc = "HOST_PROC"
+
+type Bond struct {
+	HostProc       string   `toml:"host_proc"`
+	BondInterfaces []string `toml:"bond_interfaces"`
+}
+
+var sampleConfig = `
+  ## Sets 'proc' directory path
+  ## If not specified, then default is /proc
+  # host_proc = "/proc"
+
+  ## By default, telegraf gather stats for all bond interfaces
+  ## Setting interfaces will restrict the stats to the specified
+  ## bond interfaces.
+  # bond_interfaces = ["bond0"]
+`
+
+func (bond *Bond) Description() string {
+	return "Collect bond interface status, slaves statuses and failures count"
+}
+
+func (bond *Bond) SampleConfig() string {
+	return sampleConfig
+}
+
+func (bond *Bond) Gather(acc telegraf.Accumulator) error {
+	// load proc path, get default value if config value and env variable are empty
+	bond.loadPath()
+	// list bond interfaces from bonding directory or gather all interfaces.
+	bondNames, err := bond.listInterfaces()
+	if err != nil {
+		return err
+	}
+	for _, bondName := range bondNames {
+		bondAbsPath := bond.HostProc + "/net/bonding/" + bondName
+		file, err := ioutil.ReadFile(bondAbsPath)
+		if err != nil {
+			acc.AddError(fmt.Errorf("error inspecting '%s' interface: %v", bondAbsPath, err))
+			continue
+		}
+		rawFile := strings.TrimSpace(string(file))
+		err = bond.gatherBondInterface(bondName, rawFile, acc)
+		if err != nil {
+			acc.AddError(fmt.Errorf("error inspecting '%s' interface: %v", bondName, err))
+		}
+	}
+	return nil
+}
+
+func (bond *Bond) gatherBondInterface(bondName string, rawFile string, acc telegraf.Accumulator) error {
+	splitIndex := strings.Index(rawFile, "Slave Interface:")
+	if splitIndex == -1 {
+		splitIndex = len(rawFile)
+	}
+	bondPart := rawFile[:splitIndex]
+	slavePart := rawFile[splitIndex:]
+
+	err := bond.gatherBondPart(bondName, bondPart, acc)
+	if err != nil {
+		return err
+	}
+	err = bond.gatherSlavePart(bondName, slavePart, acc)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (bond *Bond) gatherBondPart(bondName string, rawFile string, acc telegraf.Accumulator) error {
+	fields := make(map[string]interface{})
+	tags := map[string]string{
+		"bond": bondName,
+	}
+
+	scanner := bufio.NewScanner(strings.NewReader(rawFile))
+	for scanner.Scan() {
+		line := scanner.Text()
+		stats := strings.Split(line, ":")
+		if len(stats) < 2 {
+			continue
+		}
+		name := strings.TrimSpace(stats[0])
+		value := strings.TrimSpace(stats[1])
+		if strings.Contains(name, "Currently Active Slave") {
+			fields["active_slave"] = value
+		}
+		if strings.Contains(name, "MII Status") {
+			fields["status"] = 0
+			if value == "up" {
+				fields["status"] = 1
+			}
+			acc.AddFields("bond", fields, tags)
+			return nil
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+	return fmt.Errorf("Couldn't find status info for '%s' ", bondName)
+}
+
+func (bond *Bond) gatherSlavePart(bondName string, rawFile string, acc telegraf.Accumulator) error {
+	var slave string
+	var status int
+
+	scanner := bufio.NewScanner(strings.NewReader(rawFile))
+	for scanner.Scan() {
+		line := scanner.Text()
+		stats := strings.Split(line, ":")
+		if len(stats) < 2 {
+			continue
+		}
+		name := strings.TrimSpace(stats[0])
+		value := strings.TrimSpace(stats[1])
+		if strings.Contains(name, "Slave Interface") {
+			slave = value
+		}
+		if strings.Contains(name, "MII Status") {
+			status = 0
+			if value == "up" {
+				status = 1
+			}
+		}
+		if strings.Contains(name, "Link Failure Count") {
+			count, err := strconv.Atoi(value)
+			if err != nil {
+				return err
+			}
+			fields := map[string]interface{}{
+				"status":   status,
+				"failures": count,
+			}
+			tags := map[string]string{
+				"bond":      bondName,
+				"interface": slave,
+			}
+			acc.AddFields("bond_slave", fields, tags)
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// loadPath can be used to read path firstly from config
+// if it is empty then try read from env variable
+func (bond *Bond) loadPath() {
+	if bond.HostProc == "" {
+		bond.HostProc = proc(envProc, defaultHostProc)
+	}
+}
+
+// proc can be used to read file paths from env
+func proc(env, path string) string {
+	// try to read full file path
+	if p := os.Getenv(env); p != "" {
+		return p
+	}
+	// return default path
+	return path
+}
+
+func (bond *Bond) listInterfaces() ([]string, error) {
+	var interfaces []string
+	if len(bond.BondInterfaces) > 0 {
+		interfaces = bond.BondInterfaces
+	} else {
+		paths, err := filepath.Glob(bond.HostProc + "/net/bonding/*")
+		if err != nil {
+			return nil, err
+		}
+		for _, p := range paths {
+			interfaces = append(interfaces, filepath.Base(p))
+		}
+	}
+	return interfaces, nil
+}
+
+func init() {
+	inputs.Add("bond", func() telegraf.Input {
+		return &Bond{}
+	})
+}
diff --git a/plugins/inputs/bond/bond_test.go b/plugins/inputs/bond/bond_test.go
new file mode 100644
index 000000000..c07224350
--- /dev/null
+++ b/plugins/inputs/bond/bond_test.go
@@ -0,0 +1,77 @@
+package bond
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+var sampleTest802 = `
+Ethernet Channel Bonding Driver: v3.5.0 (November 4, 2008)
+
+Bonding Mode: IEEE 802.3ad Dynamic link aggregation
+Transmit Hash Policy: layer2 (0)
+MII Status: up
+MII Polling Interval (ms): 100
+Up Delay (ms): 0
+Down Delay (ms): 0
+
+802.3ad info
+LACP rate: fast
+Aggregator selection policy (ad_select): stable
+bond bond0 has no active aggregator
+
+Slave Interface: eth1
+MII Status: up
+Link Failure Count: 0
+Permanent HW addr: 00:0c:29:f5:b7:11
+Aggregator ID: N/A
+
+Slave Interface: eth2
+MII Status: up
+Link Failure Count: 3
+Permanent HW addr: 00:0c:29:f5:b7:1b
+Aggregator ID: N/A
+`
+
+var sampleTestAB = `
+Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
+
+Bonding Mode: fault-tolerance (active-backup)
+Primary Slave: eth2 (primary_reselect always)
+Currently Active Slave: eth2
+MII Status: up
+MII Polling Interval (ms): 100
+Up Delay (ms): 0
+Down Delay (ms): 0
+
+Slave Interface: eth3
+MII Status: down
+Speed: 1000 Mbps
+Duplex: full
+Link Failure Count: 2
+Permanent HW addr:
+Slave queue ID: 0
+
+Slave Interface: eth2
+MII Status: up
+Speed: 100 Mbps
+Duplex: full
+Link Failure Count: 0
+Permanent HW addr:
+`
+
+func TestGatherBondInterface(t *testing.T) {
+	var acc testutil.Accumulator
+	bond := &Bond{}
+
+	bond.gatherBondInterface("bond802", sampleTest802, &acc)
+	acc.AssertContainsTaggedFields(t, "bond", map[string]interface{}{"status": 1}, map[string]string{"bond": "bond802"})
+	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 0, "status": 1}, map[string]string{"bond": "bond802", "interface": "eth1"})
+	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 3, "status": 1}, map[string]string{"bond": "bond802", "interface": "eth2"})
+
+	bond.gatherBondInterface("bondAB", sampleTestAB, &acc)
+	acc.AssertContainsTaggedFields(t, "bond", map[string]interface{}{"active_slave": "eth2", "status": 1}, map[string]string{"bond": "bondAB"})
+	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 2, "status": 0}, map[string]string{"bond": "bondAB", "interface": "eth3"})
+	acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"failures": 0, "status": 1}, map[string]string{"bond": "bondAB", "interface": "eth2"})
+}

From 4e9b19f7a670567fd7d945eda19b4bb21d6c2e58 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 28 Nov 2017 15:19:30 -0800
Subject: [PATCH 0770/1302] Add bond input to readme and update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43b5acc3f..5b7e1d698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### New Plugins
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
+- [bond](./plugins/inputs/bond/README.md) - Thanks to @ildarsv
 - [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
@@ -69,6 +70,7 @@
 - [#3449](https://github.com/influxdata/telegraf/pull/3449): Add opensmtpd input plugin.
 - [#3470](https://github.com/influxdata/telegraf/pull/3470): Add support for tags in the index name in elasticsearch output.
 - [#2553](https://github.com/influxdata/telegraf/pull/2553): Add postfix input plugin.
+- [#3424](https://github.com/influxdata/telegraf/pull/3424): Add bond input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 20c3c584c..2de05d7a4 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@ configuration options.
 * [apache](./plugins/inputs/apache)
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
+* [bond](./plugins/inputs/bond)
 * [cassandra](./plugins/inputs/cassandra)
 * [ceph](./plugins/inputs/ceph)
 * [cgroup](./plugins/inputs/cgroup)

From d727a6f85cdf7ac33e3bd66fed34da25b2355f84 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Nov 2017 10:49:45 -0800
Subject: [PATCH 0771/1302] Add slab to mem plugin (#3518)

---
 plugins/inputs/system/MEM_README.md  | 66 ++++++++++++----------------
 plugins/inputs/system/memory.go      |  1 +
 plugins/inputs/system/memory_test.go |  2 +
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/plugins/inputs/system/MEM_README.md b/plugins/inputs/system/MEM_README.md
index 16a0f7996..72869f67f 100644
--- a/plugins/inputs/system/MEM_README.md
+++ b/plugins/inputs/system/MEM_README.md
@@ -1,44 +1,34 @@
-## Telegraf Plugin: MEM
+# Mem Input Plugin
 
-#### Description
+The mem plugin collects system memory metrics.
 
-The mem plugin collects memory metrics, defined as follows. For a more complete
-explanation of the difference between `used` and `actual_used` RAM, see
-[Linux ate my ram](http://www.linuxatemyram.com/).
+For a more complete explanation of the difference between *used* and
+*actual_used* RAM, see [Linux ate my ram](http://www.linuxatemyram.com/).
 
-- **total**: total physical memory available
-- **available**: the actual amount of available memory that can be given instantly
-to processes that request more memory in bytes; In linux kernel 3.14+, this
-is available natively in /proc/meminfo. In other platforms, this is calculated by
-summing different memory values depending on the platform
-(e.g. free + buffers + cached on Linux).
-It is supposed to be used to monitor actual memory usage in a cross platform fashion.
-- **available_percent**: Percent of memory available, `available / total * 100`
-- **used**: memory used, calculated differently depending on the platform and
-designed for informational purposes only.
-- **free**: memory not being used at all (zeroed) that is readily available; note
-that this doesn't reflect the actual memory available (use 'available' instead).
-- **used_percent**: the percentage usage calculated as `used / total * 100`
+### Configuration:
+```toml
+# Read metrics about memory usage
+[[inputs.mem]]
+  # no configuration
+```
 
-## Measurements:
-#### Raw Memory measurements:
+### Metrics:
 
-Meta:
-- units: bytes
-- tags: `nil`
+- mem
+  - fields:
+  	- active (int)
+  	- available (int)
+  	- buffered (int)
+  	- cached (int)
+  	- free (int)
+  	- inactive (int)
+  	- slab (int)
+  	- total (int)
+  	- used (int)
+  	- available_percent (float)
+  	- used_percent (float)
 
-Measurement names:
-- mem_total
-- mem_available
-- mem_used
-- mem_free
-
-#### Derived usage percentages:
-
-Meta:
-- units: percent (out of 100)
-- tags: `nil`
-
-Measurement names:
-- mem_used_percent
-- mem_available_percent
+### Example Output:
+```
+mem cached=7809495040i,inactive=6348988416i,total=20855394304i,available=11378946048i,buffered=927199232i,active=11292905472i,slab=1351340032i,used_percent=45.43883523785713,available_percent=54.56116476214287,used=9476448256i,free=1715331072i 1511894782000000000
+```
diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go
index 3f679b36c..31388b4ca 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -32,6 +32,7 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 		"buffered":          vm.Buffers,
 		"active":            vm.Active,
 		"inactive":          vm.Inactive,
+		"slab":              vm.Slab,
 		"used_percent":      100 * float64(vm.Used) / float64(vm.Total),
 		"available_percent": 100 * float64(vm.Available) / float64(vm.Total),
 	}
diff --git a/plugins/inputs/system/memory_test.go b/plugins/inputs/system/memory_test.go
index 4467c69aa..336de95f3 100644
--- a/plugins/inputs/system/memory_test.go
+++ b/plugins/inputs/system/memory_test.go
@@ -21,6 +21,7 @@ func TestMemStats(t *testing.T) {
 		Free:      1235,
 		Active:    8134,
 		Inactive:  1124,
+		Slab:      1234,
 		// Buffers:     771,
 		// Cached:      4312,
 		// Wired:       134,
@@ -54,6 +55,7 @@ func TestMemStats(t *testing.T) {
 		"buffered":          uint64(0),
 		"active":            uint64(8134),
 		"inactive":          uint64(1124),
+		"slab":              uint64(1234),
 	}
 	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))
 

From 2c70958c247ff4013c30227f0903a38f0627723c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 10:52:59 -0800
Subject: [PATCH 0772/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b7e1d698..6e472fb48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@
 - [#3470](https://github.com/influxdata/telegraf/pull/3470): Add support for tags in the index name in elasticsearch output.
 - [#2553](https://github.com/influxdata/telegraf/pull/2553): Add postfix input plugin.
 - [#3424](https://github.com/influxdata/telegraf/pull/3424): Add bond input plugin.
+- [#3518](https://github.com/influxdata/telegraf/pull/3518): Add slab to mem plugin.
 
 ### Bugfixes
 

From bf65e19486c1a3514f021eb632487736bb7ee338 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Wed, 29 Nov 2017 14:25:31 -0500
Subject: [PATCH 0773/1302] Fix postfix plugin age to use ctime, not mtime
 (#3525)

---
 plugins/inputs/postfix/postfix.go        | 31 ++++++++++++++++++------
 plugins/inputs/postfix/postfix_test.go   |  4 +--
 plugins/inputs/postfix/stat_ctim.go      | 16 ++++++++++++
 plugins/inputs/postfix/stat_ctimespec.go | 16 ++++++++++++
 plugins/inputs/postfix/stat_none.go      |  7 ++++++
 5 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 plugins/inputs/postfix/stat_ctim.go
 create mode 100644 plugins/inputs/postfix/stat_ctimespec.go
 create mode 100644 plugins/inputs/postfix/stat_none.go

diff --git a/plugins/inputs/postfix/postfix.go b/plugins/inputs/postfix/postfix.go
index 02b351d78..a33879760 100644
--- a/plugins/inputs/postfix/postfix.go
+++ b/plugins/inputs/postfix/postfix.go
@@ -45,15 +45,23 @@ func qScan(path string) (int64, int64, int64, error) {
 	for _, finfo := range finfos {
 		length++
 		size += finfo.Size()
-		if oldest.IsZero() || finfo.ModTime().Before(oldest) {
-			oldest = finfo.ModTime()
+
+		ctime := statCTime(finfo.Sys())
+		if ctime.IsZero() {
+			continue
+		}
+		if oldest.IsZero() || ctime.Before(oldest) {
+			oldest = ctime
 		}
 	}
-	var age time.Duration
+	var age int64
 	if !oldest.IsZero() {
-		age = time.Now().Sub(oldest) / time.Second
+		age = int64(time.Now().Sub(oldest) / time.Second)
+	} else if len(finfos) != 0 {
+		// system doesn't support ctime
+		age = -1
 	}
-	return length, size, int64(age), nil
+	return length, size, age, nil
 }
 
 type Postfix struct {
@@ -75,11 +83,15 @@ func (p *Postfix) Gather(acc telegraf.Accumulator) error {
 			acc.AddError(fmt.Errorf("error scanning queue %s: %s", q, err))
 			continue
 		}
-		fields := map[string]interface{}{"length": length, "size": size, "age": age}
+		fields := map[string]interface{}{"length": length, "size": size}
+		if age != -1 {
+			fields["age"] = age
+		}
 		acc.AddFields("postfix_queue", fields, map[string]string{"queue": q})
 	}
 
-	var dLength, dSize, dAge int64
+	var dLength, dSize int64
+	dAge := int64(-1)
 	for _, q := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"} {
 		length, size, age, err := qScan(path.Join(p.QueueDirectory, "deferred", q))
 		if err != nil {
@@ -96,7 +108,10 @@ func (p *Postfix) Gather(acc telegraf.Accumulator) error {
 			dAge = age
 		}
 	}
-	fields := map[string]interface{}{"length": dLength, "size": dSize, "age": dAge}
+	fields := map[string]interface{}{"length": dLength, "size": dSize}
+	if dAge != -1 {
+		fields["age"] = dAge
+	}
 	acc.AddFields("postfix_queue", fields, map[string]string{"queue": "deferred"})
 
 	return nil
diff --git a/plugins/inputs/postfix/postfix_test.go b/plugins/inputs/postfix/postfix_test.go
index 859d773c7..75a6817a7 100644
--- a/plugins/inputs/postfix/postfix_test.go
+++ b/plugins/inputs/postfix/postfix_test.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path"
 	"testing"
-	"time"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
@@ -26,7 +25,6 @@ func TestGather(t *testing.T) {
 
 	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "01"), []byte("abc"), 0644))
 	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "02"), []byte("defg"), 0644))
-	require.NoError(t, os.Chtimes(path.Join(td, "active", "02"), time.Now(), time.Now().Add(-time.Hour)))
 	require.NoError(t, ioutil.WriteFile(path.Join(td, "hold", "01"), []byte("abc"), 0644))
 	require.NoError(t, ioutil.WriteFile(path.Join(td, "incoming", "01"), []byte("abcd"), 0644))
 	require.NoError(t, ioutil.WriteFile(path.Join(td, "deferred", "0", "01"), []byte("abc"), 0644))
@@ -46,7 +44,7 @@ func TestGather(t *testing.T) {
 
 	assert.Equal(t, int64(2), metrics["active"].Fields["length"])
 	assert.Equal(t, int64(7), metrics["active"].Fields["size"])
-	assert.InDelta(t, int64(time.Hour/time.Second), metrics["active"].Fields["age"], 10)
+	assert.InDelta(t, 0, metrics["active"].Fields["age"], 10)
 
 	assert.Equal(t, int64(1), metrics["hold"].Fields["length"])
 	assert.Equal(t, int64(3), metrics["hold"].Fields["size"])
diff --git a/plugins/inputs/postfix/stat_ctim.go b/plugins/inputs/postfix/stat_ctim.go
new file mode 100644
index 000000000..456df5ffd
--- /dev/null
+++ b/plugins/inputs/postfix/stat_ctim.go
@@ -0,0 +1,16 @@
+// +build dragonfly linux netbsd openbsd solaris
+
+package postfix
+
+import (
+	"syscall"
+	"time"
+)
+
+func statCTime(sys interface{}) time.Time {
+	stat, ok := sys.(*syscall.Stat_t)
+	if !ok {
+		return time.Time{}
+	}
+	return time.Unix(stat.Ctim.Unix())
+}
diff --git a/plugins/inputs/postfix/stat_ctimespec.go b/plugins/inputs/postfix/stat_ctimespec.go
new file mode 100644
index 000000000..40e0de6cc
--- /dev/null
+++ b/plugins/inputs/postfix/stat_ctimespec.go
@@ -0,0 +1,16 @@
+// +build darwin freebsd
+
+package postfix
+
+import (
+	"syscall"
+	"time"
+)
+
+func statCTime(sys interface{}) time.Time {
+	stat, ok := sys.(*syscall.Stat_t)
+	if !ok {
+		return time.Time{}
+	}
+	return time.Unix(stat.Ctimespec.Unix())
+}
diff --git a/plugins/inputs/postfix/stat_none.go b/plugins/inputs/postfix/stat_none.go
new file mode 100644
index 000000000..c5c013ce3
--- /dev/null
+++ b/plugins/inputs/postfix/stat_none.go
@@ -0,0 +1,7 @@
+// +build !dragonfly,!linux,!netbsd,!openbsd,!solaris,!darwin,!freebsd
+
+package postfix
+
+func statCTime(_ interface{}) time.Time {
+	return time.Time{}
+}

From 414a7e34fb13a8aa2e3774a334e2d1f3c47f1f05 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Nov 2017 11:50:32 -0800
Subject: [PATCH 0774/1302] Add input plugin for DC/OS (#3519)

---
 Godeps                             |   1 +
 plugins/inputs/all/all.go          |   1 +
 plugins/inputs/dcos/README.md      | 209 ++++++++++++++
 plugins/inputs/dcos/client.go      | 332 ++++++++++++++++++++++
 plugins/inputs/dcos/client_test.go | 232 +++++++++++++++
 plugins/inputs/dcos/creds.go       |  72 +++++
 plugins/inputs/dcos/dcos.go        | 435 ++++++++++++++++++++++++++++
 plugins/inputs/dcos/dcos_test.go   | 441 +++++++++++++++++++++++++++++
 8 files changed, 1723 insertions(+)
 create mode 100644 plugins/inputs/dcos/README.md
 create mode 100644 plugins/inputs/dcos/client.go
 create mode 100644 plugins/inputs/dcos/client_test.go
 create mode 100644 plugins/inputs/dcos/creds.go
 create mode 100644 plugins/inputs/dcos/dcos.go
 create mode 100644 plugins/inputs/dcos/dcos_test.go

diff --git a/Godeps b/Godeps
index 7e90dd061..8c13d6db8 100644
--- a/Godeps
+++ b/Godeps
@@ -10,6 +10,7 @@ github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
+github.com/dgrijalva/jwt-go dbeaa9332f19a944acb5736b4456cfcc02140e29
 github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
 github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 1324e7740..ec66f64f4 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -15,6 +15,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/consul"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/dcos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
diff --git a/plugins/inputs/dcos/README.md b/plugins/inputs/dcos/README.md
new file mode 100644
index 000000000..a1384402f
--- /dev/null
+++ b/plugins/inputs/dcos/README.md
@@ -0,0 +1,209 @@
+# DC/OS Input Plugin
+
+This input plugin gathers metrics from a DC/OS cluster's [metrics component](https://docs.mesosphere.com/1.10/metrics/).
+
+**Series Cardinality Warning**
+
+Depending on the work load of your DC/OS cluster, this plugin can quickly
+create a high number of series which, when unchecked, can cause high load on
+your database.
+
+- Use [measurement filtering](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#measurement-filtering) liberally to exclude unneeded metrics as well as the node, container, and app inclue/exclude options.
+- Write to a database with an appropriate [retention policy](https://docs.influxdata.com/influxdb/v1.3/concepts/glossary/#retention-policy-rp).
+- Limit the number of series allowed in your database using the `max-series-per-database` and `max-values-per-tag` settings.
+- Consider enabling the [TSI](https://docs.influxdata.com/influxdb/v1.3/about_the_project/releasenotes-changelog/#release-notes-8) engine.
+- Monitor your [series cardinality](https://docs.influxdata.com/influxdb/v1.3/troubleshooting/frequently-asked-questions/#how-can-i-query-for-series-cardinality).
+
+### Configuration:
+```toml
+[[inputs.dcos]]
+  ## The DC/OS cluster URL.
+  cluster_url = "https://dcos-master-1"
+
+  ## The ID of the service account.
+  service_account_id = "telegraf"
+  ## The private key file for the service account.
+  service_account_private_key = "/etc/telegraf/telegraf-sa-key.pem"
+
+  ## Path containing login token.  If set, will read on every gather.
+  # token_file = "/home/dcos/.dcos/token"
+
+  ## In all filter options if both include and exclude are empty all items
+  ## will be collected.  Arrays may contain glob patterns.
+  ##
+  ## Node IDs to collect metrics from.  If a node is excluded, no metrics will
+  ## be collected for its containers or apps.
+  # node_include = []
+  # node_exclude = []
+  ## Container IDs to collect container metrics from.
+  # container_include = []
+  # container_exclude = []
+  ## Container IDs to collect app metrics from.
+  # app_include = []
+  # app_exclude = []
+
+  ## Maximum concurrent connections to the cluster.
+  # max_connections = 10
+  ## Maximum time to receive a response from cluster.
+  # response_timeout = "20s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
+
+  ## Recommended filtering to reduce series cardinality.
+  # [inputs.dcos.tagdrop]
+  #   path = ["/var/lib/mesos/slave/slaves/*"]
+```
+
+#### Enterprise Authentication
+
+When using Enterprise DC/OS, it is recommended to use a service account to
+authenticate with the cluster.
+
+The plugin requires the following permissions:
+```
+dcos:adminrouter:ops:system-metrics full
+dcos:adminrouter:ops:mesos full
+```
+
+Follow the directions to [create a service account and assign permissions](https://docs.mesosphere.com/1.10/security/service-auth/custom-service-auth/).
+
+Quick configuration using the Enterprise CLI:
+```
+dcos security org service-accounts keypair telegraf-sa-key.pem telegraf-sa-cert.pem
+dcos security org service-accounts create -p telegraf-sa-cert.pem -d "Telegraf DC/OS input plugin" telegraf
+dcos security org users grant telegraf dcos:adminrouter:ops:system-metrics full
+dcos security org users grant telegraf dcos:adminrouter:ops:mesos full
+```
+
+#### Open Source Authentication
+
+The Open Source DC/OS does not provide service accounts.  Instead you can use
+of the following options:
+
+1. [Disable authentication](https://dcos.io/docs/1.10/security/managing-authentication/#authentication-opt-out)
+2. Use the `token_file` parameter to read a authentication token from a file.
+
+Then `token_file` can be set by using the [dcos cli] to login periodically.
+The cli can login for at most XXX days, you will need to ensure the cli
+performs a new login before this time expires.
+```
+dcos auth login --username foo --password bar
+dcos config show core.dcos_acs_token > ~/.dcos/token
+```
+
+Another option to create a `token_file` is to generate a token using the
+cluster secret.  This will allow you to set the expiration date manually or
+even create a never expiring token.  However, if the cluster secret or the
+token is compromised it cannot be revoked and may require a full reinstall of
+the cluster.  For more information on this technique reference
+[this blog post](https://medium.com/@richardgirges/authenticating-open-source-dc-os-with-third-party-services-125fa33a5add).
+
+### Metrics:
+
+Please consult the [Metrics Reference](https://docs.mesosphere.com/1.10/metrics/reference/)
+for details on interprete field interpretation.
+
+- dcos_node
+  - tags:
+    - cluster
+    - hostname
+    - path (filesystem fields only)
+    - interface (network fields only)
+  - fields:
+    - system_uptime (float)
+    - cpu_cores (float)
+    - cpu_total (float)
+    - cpu_user (float)
+    - cpu_system (float)
+    - cpu_idle (float)
+    - cpu_wait (float)
+    - load_1min (float)
+    - load_5min (float)
+    - load_15min (float)
+    - filesystem_capacity_total_bytes (int)
+    - filesystem_capacity_used_bytes (int)
+    - filesystem_capacity_free_bytes (int)
+    - filesystem_inode_total (float)
+    - filesystem_inode_used (float)
+    - filesystem_inode_free (float)
+    - memory_total_bytes (int)
+    - memory_free_bytes (int)
+    - memory_buffers_bytes (int)
+    - memory_cached_bytes (int)
+    - swap_total_bytes (int)
+    - swap_free_bytes (int)
+    - swap_used_bytes (int)
+    - network_in_bytes (int)
+    - network_out_bytes (int)
+    - network_in_packets (float)
+    - network_out_packets (float)
+    - network_in_dropped (float)
+    - network_out_dropped (float)
+    - network_in_errors (float)
+    - network_out_errors (float)
+    - process_count (float)
+
+- dcos_container
+  - tags:
+    - cluster
+    - hostname
+    - container_id
+    - task_name
+  - fields:
+    - cpus_limit (float)
+    - cpus_system_time (float)
+    - cpus_throttled_time (float)
+    - cpus_user_time (float)
+    - disk_limit_bytes (int)
+    - disk_used_bytes (int)
+    - mem_limit_bytes (int)
+    - mem_total_bytes (int)
+    - net_rx_bytes (int)
+    - net_rx_dropped (float)
+    - net_rx_errors (float)
+    - net_rx_packets (float)
+    - net_tx_bytes (int)
+    - net_tx_dropped (float)
+    - net_tx_errors (float)
+    - net_tx_packets (float)
+
+- dcos_app
+  - tags:
+    - cluster
+    - hostname
+    - container_id
+    - task_name
+  - fields:
+    - fields are application specific
+
+### Example Output:
+
+```
+dcos_node,cluster=enterprise,hostname=192.168.122.18,path=/boot filesystem_capacity_free_bytes=918188032i,filesystem_capacity_total_bytes=1063256064i,filesystem_capacity_used_bytes=145068032i,filesystem_inode_free=523958,filesystem_inode_total=524288,filesystem_inode_used=330 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=dummy0 network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=0i,network_out_dropped=0,network_out_errors=0,network_out_packets=0 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=docker0 network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=0i,network_out_dropped=0,network_out_errors=0,network_out_packets=0 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18 cpu_cores=2,cpu_idle=81.62,cpu_system=4.19,cpu_total=13.670000000000002,cpu_user=9.48,cpu_wait=0,load_15min=0.7,load_1min=0.22,load_5min=0.6,memory_buffers_bytes=970752i,memory_cached_bytes=1830473728i,memory_free_bytes=1178636288i,memory_total_bytes=3975073792i,process_count=198,swap_free_bytes=859828224i,swap_total_bytes=859828224i,swap_used_bytes=0i,system_uptime=18874 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=lo network_in_bytes=1090992450i,network_in_dropped=0,network_in_errors=0,network_in_packets=1546938,network_out_bytes=1090992450i,network_out_dropped=0,network_out_errors=0,network_out_packets=1546938 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,path=/ filesystem_capacity_free_bytes=1668378624i,filesystem_capacity_total_bytes=6641680384i,filesystem_capacity_used_bytes=4973301760i,filesystem_inode_free=3107856,filesystem_inode_total=3248128,filesystem_inode_used=140272 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=minuteman network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=210i,network_out_dropped=0,network_out_errors=0,network_out_packets=3 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=eth0 network_in_bytes=539886216i,network_in_dropped=1,network_in_errors=0,network_in_packets=979808,network_out_bytes=112395836i,network_out_dropped=0,network_out_errors=0,network_out_packets=891239 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=spartan network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=210i,network_out_dropped=0,network_out_errors=0,network_out_packets=3 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,path=/var/lib/docker/overlay filesystem_capacity_free_bytes=1668378624i,filesystem_capacity_total_bytes=6641680384i,filesystem_capacity_used_bytes=4973301760i,filesystem_inode_free=3107856,filesystem_inode_total=3248128,filesystem_inode_used=140272 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=vtep1024 network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=0i,network_out_dropped=0,network_out_errors=0,network_out_packets=0 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,path=/var/lib/docker/plugins filesystem_capacity_free_bytes=1668378624i,filesystem_capacity_total_bytes=6641680384i,filesystem_capacity_used_bytes=4973301760i,filesystem_inode_free=3107856,filesystem_inode_total=3248128,filesystem_inode_used=140272 1511859222000000000
+dcos_node,cluster=enterprise,hostname=192.168.122.18,interface=d-dcos network_in_bytes=0i,network_in_dropped=0,network_in_errors=0,network_in_packets=0,network_out_bytes=0i,network_out_dropped=0,network_out_errors=0,network_out_packets=0 1511859222000000000
+dcos_app,cluster=enterprise,container_id=9a78d34a-3bbf-467e-81cf-a57737f154ee,hostname=192.168.122.18 container_received_bytes_per_sec=0,container_throttled_bytes_per_sec=0 1511859222000000000
+dcos_container,cluster=enterprise,container_id=cbf19b77-3b8d-4bcf-b81f-824b67279629,hostname=192.168.122.18 cpus_limit=0.3,cpus_system_time=307.31,cpus_throttled_time=102.029930607,cpus_user_time=268.57,disk_limit_bytes=268435456i,disk_used_bytes=30953472i,mem_limit_bytes=570425344i,mem_total_bytes=13316096i,net_rx_bytes=0i,net_rx_dropped=0,net_rx_errors=0,net_rx_packets=0,net_tx_bytes=0i,net_tx_dropped=0,net_tx_errors=0,net_tx_packets=0 1511859222000000000
+dcos_app,cluster=enterprise,container_id=cbf19b77-3b8d-4bcf-b81f-824b67279629,hostname=192.168.122.18 container_received_bytes_per_sec=0,container_throttled_bytes_per_sec=0 1511859222000000000
+dcos_container,cluster=enterprise,container_id=5725e219-f66e-40a8-b3ab-519d85f4c4dc,hostname=192.168.122.18,task_name=hello-world cpus_limit=0.6,cpus_system_time=25.6,cpus_throttled_time=327.977109217,cpus_user_time=566.54,disk_limit_bytes=0i,disk_used_bytes=0i,mem_limit_bytes=1107296256i,mem_total_bytes=335941632i,net_rx_bytes=0i,net_rx_dropped=0,net_rx_errors=0,net_rx_packets=0,net_tx_bytes=0i,net_tx_dropped=0,net_tx_errors=0,net_tx_packets=0 1511859222000000000
+dcos_app,cluster=enterprise,container_id=5725e219-f66e-40a8-b3ab-519d85f4c4dc,hostname=192.168.122.18 container_received_bytes_per_sec=0,container_throttled_bytes_per_sec=0 1511859222000000000
+dcos_app,cluster=enterprise,container_id=c76e1488-4fb7-4010-a4cf-25725f8173f9,hostname=192.168.122.18 container_received_bytes_per_sec=0,container_throttled_bytes_per_sec=0 1511859222000000000
+dcos_container,cluster=enterprise,container_id=cbe0b2f9-061f-44ac-8f15-4844229e8231,hostname=192.168.122.18,task_name=telegraf cpus_limit=0.2,cpus_system_time=8.109999999,cpus_throttled_time=93.183916045,cpus_user_time=17.97,disk_limit_bytes=0i,disk_used_bytes=0i,mem_limit_bytes=167772160i,mem_total_bytes=0i,net_rx_bytes=0i,net_rx_dropped=0,net_rx_errors=0,net_rx_packets=0,net_tx_bytes=0i,net_tx_dropped=0,net_tx_errors=0,net_tx_packets=0 1511859222000000000
+dcos_container,cluster=enterprise,container_id=b64115de-3d2a-431d-a805-76e7c46453f1,hostname=192.168.122.18 cpus_limit=0.2,cpus_system_time=2.69,cpus_throttled_time=20.064861214,cpus_user_time=6.56,disk_limit_bytes=268435456i,disk_used_bytes=29360128i,mem_limit_bytes=297795584i,mem_total_bytes=13733888i,net_rx_bytes=0i,net_rx_dropped=0,net_rx_errors=0,net_rx_packets=0,net_tx_bytes=0i,net_tx_dropped=0,net_tx_errors=0,net_tx_packets=0 1511859222000000000
+dcos_app,cluster=enterprise,container_id=b64115de-3d2a-431d-a805-76e7c46453f1,hostname=192.168.122.18 container_received_bytes_per_sec=0,container_throttled_bytes_per_sec=0 1511859222000000000
+```
diff --git a/plugins/inputs/dcos/client.go b/plugins/inputs/dcos/client.go
new file mode 100644
index 000000000..71165e9fb
--- /dev/null
+++ b/plugins/inputs/dcos/client.go
@@ -0,0 +1,332 @@
+package dcos
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"time"
+
+	jwt "github.com/dgrijalva/jwt-go"
+)
+
+const (
+	// How long to stayed logged in for
+	loginDuration = 65 * time.Minute
+)
+
+// Client is an interface for communicating with the DC/OS API.
+type Client interface {
+	SetToken(token string)
+
+	Login(ctx context.Context, sa *ServiceAccount) (*AuthToken, error)
+	GetSummary(ctx context.Context) (*Summary, error)
+	GetContainers(ctx context.Context, node string) ([]Container, error)
+	GetNodeMetrics(ctx context.Context, node string) (*Metrics, error)
+	GetContainerMetrics(ctx context.Context, node, container string) (*Metrics, error)
+	GetAppMetrics(ctx context.Context, node, container string) (*Metrics, error)
+}
+
+type APIError struct {
+	StatusCode  int
+	Title       string
+	Description string
+}
+
+// Login is request data for logging in.
+type Login struct {
+	UID   string `json:"uid"`
+	Exp   int64  `json:"exp"`
+	Token string `json:"token"`
+}
+
+// LoginError is the response when login fails.
+type LoginError struct {
+	Title       string `json:"title"`
+	Description string `json:"description"`
+}
+
+// LoginAuth is the response to a successful login.
+type LoginAuth struct {
+	Token string `json:"token"`
+}
+
+// Slave is a node in the cluster.
+type Slave struct {
+	ID string `json:"id"`
+}
+
+// Summary provides high level cluster wide information.
+type Summary struct {
+	Cluster string
+	Slaves  []Slave
+}
+
+// Container is a container on a node.
+type Container struct {
+	ID string
+}
+
+type DataPoint struct {
+	Name  string            `json:"name"`
+	Tags  map[string]string `json:"tags"`
+	Unit  string            `json:"unit"`
+	Value float64           `json:"value"`
+}
+
+// Metrics are the DCOS metrics
+type Metrics struct {
+	Datapoints []DataPoint            `json:"datapoints"`
+	Dimensions map[string]interface{} `json:"dimensions"`
+}
+
+// AuthToken is the authentication token.
+type AuthToken struct {
+	Text   string
+	Expire time.Time
+}
+
+// ClusterClient is a Client that uses the cluster URL.
+type ClusterClient struct {
+	clusterURL  *url.URL
+	httpClient  *http.Client
+	credentials *Credentials
+	token       string
+	semaphore   chan struct{}
+}
+
+type claims struct {
+	UID string `json:"uid"`
+	jwt.StandardClaims
+}
+
+func (e APIError) Error() string {
+	if e.Description != "" {
+		return fmt.Sprintf("%s: %s", e.Title, e.Description)
+	}
+	return e.Title
+}
+
+func NewClusterClient(
+	clusterURL *url.URL,
+	timeout time.Duration,
+	maxConns int,
+	tlsConfig *tls.Config,
+) *ClusterClient {
+	httpClient := &http.Client{
+		Transport: &http.Transport{
+			MaxIdleConns:    maxConns,
+			TLSClientConfig: tlsConfig,
+		},
+		Timeout: timeout,
+	}
+	semaphore := make(chan struct{}, maxConns)
+
+	c := &ClusterClient{
+		clusterURL: clusterURL,
+		httpClient: httpClient,
+		semaphore:  semaphore,
+	}
+	return c
+}
+
+func (c *ClusterClient) SetToken(token string) {
+	c.token = token
+}
+
+func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthToken, error) {
+	token, err := c.createLoginToken(sa)
+	if err != nil {
+		return nil, err
+	}
+
+	exp := time.Now().Add(loginDuration)
+
+	body := &Login{
+		UID:   sa.AccountID,
+		Exp:   exp.Unix(),
+		Token: token,
+	}
+
+	octets, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", c.url("/acs/api/v1/auth/login"), bytes.NewBuffer(octets))
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Content-Type", "application/json")
+
+	req = req.WithContext(ctx)
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusOK {
+		auth := &LoginAuth{}
+		dec := json.NewDecoder(resp.Body)
+		err = dec.Decode(auth)
+		if err != nil {
+			return nil, err
+		}
+
+		token := &AuthToken{
+			Text:   auth.Token,
+			Expire: exp,
+		}
+		return token, nil
+	}
+
+	loginError := &LoginError{}
+	dec := json.NewDecoder(resp.Body)
+	err = dec.Decode(loginError)
+	if err != nil {
+		err := &APIError{
+			StatusCode: resp.StatusCode,
+			Title:      resp.Status,
+		}
+		return nil, err
+	}
+
+	err = &APIError{
+		StatusCode:  resp.StatusCode,
+		Title:       loginError.Title,
+		Description: loginError.Description,
+	}
+	return nil, err
+}
+
+func (c *ClusterClient) GetSummary(ctx context.Context) (*Summary, error) {
+	summary := &Summary{}
+	err := c.doGet(ctx, c.url("/mesos/master/state-summary"), summary)
+	if err != nil {
+		return nil, err
+	}
+
+	return summary, nil
+}
+
+func (c *ClusterClient) GetContainers(ctx context.Context, node string) ([]Container, error) {
+	list := []string{}
+
+	path := fmt.Sprintf("/system/v1/agent/%s/metrics/v0/containers", node)
+	err := c.doGet(ctx, c.url(path), &list)
+	if err != nil {
+		return nil, err
+	}
+
+	containers := make([]Container, 0, len(list))
+	for _, c := range list {
+		containers = append(containers, Container{ID: c})
+
+	}
+
+	return containers, nil
+}
+
+func (c *ClusterClient) getMetrics(ctx context.Context, url string) (*Metrics, error) {
+	metrics := &Metrics{}
+
+	err := c.doGet(ctx, url, metrics)
+	if err != nil {
+		return nil, err
+	}
+
+	return metrics, nil
+}
+
+func (c *ClusterClient) GetNodeMetrics(ctx context.Context, node string) (*Metrics, error) {
+	path := fmt.Sprintf("/system/v1/agent/%s/metrics/v0/node", node)
+	return c.getMetrics(ctx, c.url(path))
+}
+
+func (c *ClusterClient) GetContainerMetrics(ctx context.Context, node, container string) (*Metrics, error) {
+	path := fmt.Sprintf("/system/v1/agent/%s/metrics/v0/containers/%s", node, container)
+	return c.getMetrics(ctx, c.url(path))
+}
+
+func (c *ClusterClient) GetAppMetrics(ctx context.Context, node, container string) (*Metrics, error) {
+	path := fmt.Sprintf("/system/v1/agent/%s/metrics/v0/containers/%s/app", node, container)
+	return c.getMetrics(ctx, c.url(path))
+}
+
+func createGetRequest(url string, token string) (*http.Request, error) {
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if token != "" {
+		req.Header.Add("Authorization", "token="+token)
+	}
+	req.Header.Add("Accept", "application/json")
+
+	return req, nil
+}
+
+func (c *ClusterClient) doGet(ctx context.Context, url string, v interface{}) error {
+	req, err := createGetRequest(url, c.token)
+	if err != nil {
+		return err
+	}
+
+	select {
+	case c.semaphore <- struct{}{}:
+		break
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+
+	resp, err := c.httpClient.Do(req.WithContext(ctx))
+	if err != nil {
+		<-c.semaphore
+		return err
+	}
+	defer func() {
+		resp.Body.Close()
+		<-c.semaphore
+	}()
+
+	// Clear invalid token if unauthorized
+	if resp.StatusCode == http.StatusUnauthorized {
+		c.token = ""
+	}
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return &APIError{
+			StatusCode: resp.StatusCode,
+			Title:      resp.Status,
+		}
+	}
+
+	if resp.StatusCode == http.StatusNoContent {
+		return nil
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(v)
+	return err
+}
+
+func (c *ClusterClient) url(path string) string {
+	url := c.clusterURL
+	url.Path = path
+	return url.String()
+}
+
+func (c *ClusterClient) createLoginToken(sa *ServiceAccount) (string, error) {
+	token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims{
+		UID: sa.AccountID,
+		StandardClaims: jwt.StandardClaims{
+			// How long we have to login with this token
+			ExpiresAt: int64(5 * time.Minute / time.Second),
+		},
+	})
+	return token.SignedString(sa.PrivateKey)
+}
diff --git a/plugins/inputs/dcos/client_test.go b/plugins/inputs/dcos/client_test.go
new file mode 100644
index 000000000..2781d10b7
--- /dev/null
+++ b/plugins/inputs/dcos/client_test.go
@@ -0,0 +1,232 @@
+package dcos
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	privateKey = `-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCwlGyzVp9cqtwiNCgCnaR0kilPZhr4xFBcnXxvQ8/uzOHaWKxj
+XWR38cKR3gPh5+4iSmzMdo3HDJM5ks6imXGnp+LPOA5iNewnpLNs7UxA2arwKH/6
+4qIaAXAtf5jE46wZIMgc2EW9wGL3dxC0JY8EXPpBFB/3J8gADkorFR8lwwIDAQAB
+AoGBAJaFHxfMmjHK77U0UnrQWFSKFy64cftmlL4t/Nl3q7L68PdIKULWZIMeEWZ4
+I0UZiFOwr4em83oejQ1ByGSwekEuiWaKUI85IaHfcbt+ogp9hY/XbOEo56OPQUAd
+bEZv1JqJOqta9Ug1/E1P9LjEEyZ5F5ubx7813rxAE31qKtKJAkEA1zaMlCWIr+Rj
+hGvzv5rlHH3wbOB4kQFXO4nqj3J/ttzR5QiJW24STMDcbNngFlVcDVju56LrNTiD
+dPh9qvl7nwJBANILguR4u33OMksEZTYB7nQZSurqXsq6382zH7pTl29ANQTROHaM
+PKC8dnDWq8RGTqKuvWblIzzGIKqIMovZo10CQC96T0UXirITFolOL3XjvAuvFO1Q
+EAkdXJs77805m0dCK+P1IChVfiAEpBw3bKJArpAbQIlFfdI953JUp5SieU0CQEub
+BSSEKMjh/cxu6peEHnb/262vayuCFKkQPu1sxWewLuVrAe36EKCy9dcsDmv5+rgo
+Odjdxc9Madm4aKlaT6kCQQCpAgeblDrrxTrNQ+Typzo37PlnQrvI+0EceAUuJ72G
+P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
+-----END RSA PRIVATE KEY-----`
+)
+
+func TestLogin(t *testing.T) {
+	var tests = []struct {
+		name          string
+		responseCode  int
+		responseBody  string
+		expectedError error
+		expectedToken string
+	}{
+		{
+			name:          "Login successful",
+			responseCode:  200,
+			responseBody:  `{"token": "XXX.YYY.ZZZ"}`,
+			expectedError: nil,
+			expectedToken: "XXX.YYY.ZZZ",
+		},
+		{
+			name:          "Unauthorized Error",
+			responseCode:  http.StatusUnauthorized,
+			responseBody:  `{"title": "x", "description": "y"}`,
+			expectedError: &APIError{http.StatusUnauthorized, "x", "y"},
+			expectedToken: "",
+		},
+	}
+
+	key, err := jwt.ParseRSAPrivateKeyFromPEM([]byte(privateKey))
+	require.NoError(t, err)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(tt.responseCode)
+				fmt.Fprintln(w, tt.responseBody)
+			})
+			ts := httptest.NewServer(handler)
+			u, err := url.Parse(ts.URL)
+			require.NoError(t, err)
+
+			ctx := context.Background()
+			sa := &ServiceAccount{
+				AccountID:  "telegraf",
+				PrivateKey: key,
+			}
+			client := NewClusterClient(u, defaultResponseTimeout, 1, nil)
+			auth, err := client.Login(ctx, sa)
+
+			require.Equal(t, tt.expectedError, err)
+
+			if tt.expectedToken != "" {
+				require.Equal(t, tt.expectedToken, auth.Text)
+			} else {
+				require.Nil(t, auth)
+			}
+
+			ts.Close()
+		})
+	}
+}
+
+func TestGetSummary(t *testing.T) {
+	var tests = []struct {
+		name          string
+		responseCode  int
+		responseBody  string
+		expectedValue *Summary
+		expectedError error
+	}{
+		{
+			name:          "No nodes",
+			responseCode:  200,
+			responseBody:  `{"cluster": "a", "slaves": []}`,
+			expectedValue: &Summary{Cluster: "a", Slaves: []Slave{}},
+			expectedError: nil,
+		},
+		{
+			name:          "Unauthorized Error",
+			responseCode:  http.StatusUnauthorized,
+			responseBody:  `<html></html>`,
+			expectedValue: nil,
+			expectedError: &APIError{StatusCode: http.StatusUnauthorized, Title: "401 Unauthorized"},
+		},
+		{
+			name:         "Has nodes",
+			responseCode: 200,
+			responseBody: `{"cluster": "a", "slaves": [{"id": "a"}, {"id": "b"}]}`,
+			expectedValue: &Summary{
+				Cluster: "a",
+				Slaves: []Slave{
+					Slave{ID: "a"},
+					Slave{ID: "b"},
+				},
+			},
+			expectedError: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				// check the path
+				w.WriteHeader(tt.responseCode)
+				fmt.Fprintln(w, tt.responseBody)
+			})
+			ts := httptest.NewServer(handler)
+			u, err := url.Parse(ts.URL)
+			require.NoError(t, err)
+
+			ctx := context.Background()
+			client := NewClusterClient(u, defaultResponseTimeout, 1, nil)
+			summary, err := client.GetSummary(ctx)
+
+			require.Equal(t, tt.expectedError, err)
+			require.Equal(t, tt.expectedValue, summary)
+
+			ts.Close()
+		})
+	}
+
+}
+
+func TestGetNodeMetrics(t *testing.T) {
+	var tests = []struct {
+		name          string
+		responseCode  int
+		responseBody  string
+		expectedValue *Metrics
+		expectedError error
+	}{
+		{
+			name:          "Empty Body",
+			responseCode:  200,
+			responseBody:  `{}`,
+			expectedValue: &Metrics{},
+			expectedError: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				// check the path
+				w.WriteHeader(tt.responseCode)
+				fmt.Fprintln(w, tt.responseBody)
+			})
+			ts := httptest.NewServer(handler)
+			u, err := url.Parse(ts.URL)
+			require.NoError(t, err)
+
+			ctx := context.Background()
+			client := NewClusterClient(u, defaultResponseTimeout, 1, nil)
+			m, err := client.GetNodeMetrics(ctx, "foo")
+
+			require.Equal(t, tt.expectedError, err)
+			require.Equal(t, tt.expectedValue, m)
+
+			ts.Close()
+		})
+	}
+
+}
+
+func TestGetContainerMetrics(t *testing.T) {
+	var tests = []struct {
+		name          string
+		responseCode  int
+		responseBody  string
+		expectedValue *Metrics
+		expectedError error
+	}{
+		{
+			name:          "204 No Contents",
+			responseCode:  204,
+			responseBody:  ``,
+			expectedValue: &Metrics{},
+			expectedError: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				// check the path
+				w.WriteHeader(tt.responseCode)
+				fmt.Fprintln(w, tt.responseBody)
+			})
+			ts := httptest.NewServer(handler)
+			u, err := url.Parse(ts.URL)
+			require.NoError(t, err)
+
+			ctx := context.Background()
+			client := NewClusterClient(u, defaultResponseTimeout, 1, nil)
+			m, err := client.GetContainerMetrics(ctx, "foo", "bar")
+
+			require.Equal(t, tt.expectedError, err)
+			require.Equal(t, tt.expectedValue, m)
+
+			ts.Close()
+		})
+	}
+
+}
diff --git a/plugins/inputs/dcos/creds.go b/plugins/inputs/dcos/creds.go
new file mode 100644
index 000000000..0178315bb
--- /dev/null
+++ b/plugins/inputs/dcos/creds.go
@@ -0,0 +1,72 @@
+package dcos
+
+import (
+	"context"
+	"crypto/rsa"
+	"fmt"
+	"io/ioutil"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+const (
+	// How long before expiration to renew token
+	relogDuration = 5 * time.Minute
+)
+
+type Credentials interface {
+	Token(ctx context.Context, client Client) (string, error)
+	IsExpired() bool
+}
+
+type ServiceAccount struct {
+	AccountID  string
+	PrivateKey *rsa.PrivateKey
+
+	auth *AuthToken
+}
+
+type TokenCreds struct {
+	Path string
+}
+
+type NullCreds struct {
+}
+
+func (c *ServiceAccount) Token(ctx context.Context, client Client) (string, error) {
+	auth, err := client.Login(ctx, c)
+	if err != nil {
+		return "", err
+	}
+	c.auth = auth
+	return auth.Text, nil
+}
+
+func (c *ServiceAccount) IsExpired() bool {
+	return c.auth.Text != "" || c.auth.Expire.Add(relogDuration).After(time.Now())
+}
+
+func (c *TokenCreds) Token(ctx context.Context, client Client) (string, error) {
+	octets, err := ioutil.ReadFile(c.Path)
+	if err != nil {
+		return "", fmt.Errorf("Error reading token file %q: %s", c.Path, err)
+	}
+	if !utf8.Valid(octets) {
+		return "", fmt.Errorf("Token file does not contain utf-8 encoded text: %s", c.Path)
+	}
+	token := strings.TrimSpace(string(octets))
+	return token, nil
+}
+
+func (c *TokenCreds) IsExpired() bool {
+	return true
+}
+
+func (c *NullCreds) Token(ctx context.Context, client Client) (string, error) {
+	return "", nil
+}
+
+func (c *NullCreds) IsExpired() bool {
+	return true
+}
diff --git a/plugins/inputs/dcos/dcos.go b/plugins/inputs/dcos/dcos.go
new file mode 100644
index 000000000..91370b81f
--- /dev/null
+++ b/plugins/inputs/dcos/dcos.go
@@ -0,0 +1,435 @@
+package dcos
+
+import (
+	"context"
+	"io/ioutil"
+	"net/url"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+
+	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const (
+	defaultMaxConnections  = 10
+	defaultResponseTimeout = 20 * time.Second
+)
+
+var (
+	nodeDimensions = []string{
+		"hostname",
+		"path",
+		"interface",
+	}
+	containerDimensions = []string{
+		"hostname",
+		"container_id",
+		"task_name",
+	}
+	appDimensions = []string{
+		"hostname",
+		"container_id",
+		"task_name",
+	}
+)
+
+type DCOS struct {
+	ClusterURL string `toml:"cluster_url"`
+
+	ServiceAccountID         string `toml:"service_account_id"`
+	ServiceAccountPrivateKey string
+
+	TokenFile string
+
+	NodeInclude      []string
+	NodeExclude      []string
+	ContainerInclude []string
+	ContainerExclude []string
+	AppInclude       []string
+	AppExclude       []string
+
+	MaxConnections  int
+	ResponseTimeout internal.Duration
+
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool   `toml:"insecure_skip_verify"`
+
+	client Client
+	creds  Credentials
+
+	initialized     bool
+	nodeFilter      filter.Filter
+	containerFilter filter.Filter
+	appFilter       filter.Filter
+	taskNameFilter  filter.Filter
+}
+
+func (d *DCOS) Description() string {
+	return "Input plugin for DC/OS metrics"
+}
+
+var sampleConfig = `
+  ## The DC/OS cluster URL.
+  cluster_url = "https://dcos-ee-master-1"
+
+  ## The ID of the service account.
+  service_account_id = "telegraf"
+  ## The private key file for the service account.
+  service_account_private_key = "/etc/telegraf/telegraf-sa-key.pem"
+
+  ## Path containing login token.  If set, will read on every gather.
+  # token_file = "/home/dcos/.dcos/token"
+
+  ## In all filter options if both include and exclude are empty all items
+  ## will be collected.  Arrays may contain glob patterns.
+  ##
+  ## Node IDs to collect metrics from.  If a node is excluded, no metrics will
+  ## be collected for its containers or apps.
+  # node_include = []
+  # node_exclude = []
+  ## Container IDs to collect container metrics from.
+  # container_include = []
+  # container_exclude = []
+  ## Container IDs to collect app metrics from.
+  # app_include = []
+  # app_exclude = []
+
+  ## Maximum concurrent connections to the cluster.
+  # max_connections = 10
+  ## Maximum time to receive a response from cluster.
+  # response_timeout = "20s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
+
+  ## Recommended filtering to reduce series cardinality.
+  # [inputs.dcos.tagdrop]
+  #   path = ["/var/lib/mesos/slave/slaves/*"]
+`
+
+func (d *DCOS) SampleConfig() string {
+	return sampleConfig
+}
+
+func (d *DCOS) Gather(acc telegraf.Accumulator) error {
+	err := d.init()
+	if err != nil {
+		return err
+	}
+
+	ctx := context.Background()
+
+	token, err := d.creds.Token(ctx, d.client)
+	if err != nil {
+		return err
+	}
+	d.client.SetToken(token)
+
+	summary, err := d.client.GetSummary(ctx)
+	if err != nil {
+		return err
+	}
+
+	var wg sync.WaitGroup
+	for _, node := range summary.Slaves {
+		wg.Add(1)
+		go func(node string) {
+			defer wg.Done()
+			d.GatherNode(ctx, acc, summary.Cluster, node)
+		}(node.ID)
+	}
+	wg.Wait()
+
+	return nil
+}
+
+func (d *DCOS) GatherNode(ctx context.Context, acc telegraf.Accumulator, cluster, node string) {
+	if !d.nodeFilter.Match(node) {
+		return
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		m, err := d.client.GetNodeMetrics(ctx, node)
+		if err != nil {
+			acc.AddError(err)
+			return
+		}
+		d.addNodeMetrics(acc, cluster, m)
+	}()
+
+	d.GatherContainers(ctx, acc, cluster, node)
+	wg.Wait()
+}
+
+func (d *DCOS) GatherContainers(ctx context.Context, acc telegraf.Accumulator, cluster, node string) {
+	containers, err := d.client.GetContainers(ctx, node)
+	if err != nil {
+		acc.AddError(err)
+		return
+	}
+
+	var wg sync.WaitGroup
+	for _, container := range containers {
+		if d.containerFilter.Match(container.ID) {
+			wg.Add(1)
+			go func(container string) {
+				defer wg.Done()
+				m, err := d.client.GetContainerMetrics(ctx, node, container)
+				if err != nil {
+					if err, ok := err.(APIError); ok && err.StatusCode == 404 {
+						return
+					}
+					acc.AddError(err)
+					return
+				}
+				d.addContainerMetrics(acc, cluster, m)
+			}(container.ID)
+		}
+
+		if d.appFilter.Match(container.ID) {
+			wg.Add(1)
+			go func(container string) {
+				defer wg.Done()
+				m, err := d.client.GetAppMetrics(ctx, node, container)
+				if err != nil {
+					if err, ok := err.(APIError); ok && err.StatusCode == 404 {
+						return
+					}
+					acc.AddError(err)
+					return
+				}
+				d.addAppMetrics(acc, cluster, m)
+			}(container.ID)
+		}
+	}
+	wg.Wait()
+}
+
+type point struct {
+	tags   map[string]string
+	labels map[string]string
+	fields map[string]interface{}
+}
+
+func (d *DCOS) createPoints(acc telegraf.Accumulator, m *Metrics) []*point {
+	points := make(map[string]*point)
+	for _, dp := range m.Datapoints {
+		fieldKey := strings.Replace(dp.Name, ".", "_", -1)
+
+		tags := dp.Tags
+		if tags == nil {
+			tags = make(map[string]string)
+		}
+
+		if dp.Unit == "bytes" && !strings.HasSuffix(fieldKey, "_bytes") {
+			fieldKey = fieldKey + "_bytes"
+		}
+
+		if strings.HasPrefix(fieldKey, "dcos_metrics_module_") {
+			fieldKey = strings.TrimPrefix(fieldKey, "dcos_metrics_module_")
+		}
+
+		tagset := make([]string, 0, len(tags))
+		for k, v := range tags {
+			tagset = append(tagset, k+"="+v)
+		}
+		sort.Strings(tagset)
+		seriesParts := make([]string, 0, len(tagset))
+		seriesParts = append(seriesParts, tagset...)
+		seriesKey := strings.Join(seriesParts, ",")
+
+		p, ok := points[seriesKey]
+		if !ok {
+			p = &point{}
+			p.tags = tags
+			p.labels = make(map[string]string)
+			p.fields = make(map[string]interface{})
+			points[seriesKey] = p
+		}
+
+		if dp.Unit == "bytes" {
+			p.fields[fieldKey] = int64(dp.Value)
+		} else {
+			p.fields[fieldKey] = dp.Value
+		}
+	}
+
+	results := make([]*point, 0, len(points))
+	for _, p := range points {
+		for k, v := range m.Dimensions {
+			switch v := v.(type) {
+			case string:
+				p.tags[k] = v
+			case map[string]string:
+				if k == "labels" {
+					for k, v := range v {
+						p.labels[k] = v
+					}
+				}
+			}
+		}
+		results = append(results, p)
+	}
+	return results
+}
+
+func (d *DCOS) addMetrics(acc telegraf.Accumulator, cluster, mname string, m *Metrics, tagDimensions []string) {
+	tm := time.Now()
+
+	points := d.createPoints(acc, m)
+
+	for _, p := range points {
+		tags := make(map[string]string)
+		tags["cluster"] = cluster
+		for _, tagkey := range tagDimensions {
+			v, ok := p.tags[tagkey]
+			if ok {
+				tags[tagkey] = v
+			}
+		}
+		for k, v := range p.labels {
+			tags[k] = v
+		}
+
+		acc.AddFields(mname, p.fields, tags, tm)
+	}
+}
+
+func (d *DCOS) addNodeMetrics(acc telegraf.Accumulator, cluster string, m *Metrics) {
+	d.addMetrics(acc, cluster, "dcos_node", m, nodeDimensions)
+}
+
+func (d *DCOS) addContainerMetrics(acc telegraf.Accumulator, cluster string, m *Metrics) {
+	d.addMetrics(acc, cluster, "dcos_container", m, containerDimensions)
+}
+
+func (d *DCOS) addAppMetrics(acc telegraf.Accumulator, cluster string, m *Metrics) {
+	d.addMetrics(acc, cluster, "dcos_app", m, appDimensions)
+}
+
+func (d *DCOS) init() error {
+	if !d.initialized {
+		err := d.createFilters()
+		if err != nil {
+			return err
+		}
+
+		if d.client == nil {
+			client, err := d.createClient()
+			if err != nil {
+				return err
+			}
+			d.client = client
+		}
+
+		if d.creds == nil {
+			creds, err := d.createCredentials()
+			if err != nil {
+				return err
+			}
+			d.creds = creds
+		}
+
+		d.initialized = true
+	}
+	return nil
+}
+
+func (d *DCOS) createClient() (Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		d.SSLCert, d.SSLKey, d.SSLCA, d.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	url, err := url.Parse(d.ClusterURL)
+	if err != nil {
+		return nil, err
+	}
+
+	client := NewClusterClient(
+		url,
+		d.ResponseTimeout.Duration,
+		d.MaxConnections,
+		tlsCfg,
+	)
+
+	return client, nil
+}
+
+func (d *DCOS) createCredentials() (Credentials, error) {
+	if d.ServiceAccountID != "" && d.ServiceAccountPrivateKey != "" {
+		bs, err := ioutil.ReadFile(d.ServiceAccountPrivateKey)
+		if err != nil {
+			return nil, err
+		}
+
+		privateKey, err := jwt.ParseRSAPrivateKeyFromPEM(bs)
+		if err != nil {
+			return nil, err
+		}
+
+		creds := &ServiceAccount{
+			AccountID:  d.ServiceAccountID,
+			PrivateKey: privateKey,
+		}
+		return creds, nil
+	} else if d.TokenFile != "" {
+		creds := &TokenCreds{
+			Path: d.TokenFile,
+		}
+		return creds, nil
+	} else {
+		creds := &NullCreds{}
+		return creds, nil
+	}
+}
+
+func (d *DCOS) createFilters() error {
+	var err error
+	d.nodeFilter, err = filter.NewIncludeExcludeFilter(
+		d.NodeInclude, d.NodeExclude)
+	if err != nil {
+		return err
+	}
+
+	d.containerFilter, err = filter.NewIncludeExcludeFilter(
+		d.ContainerInclude, d.ContainerExclude)
+	if err != nil {
+		return err
+	}
+
+	d.appFilter, err = filter.NewIncludeExcludeFilter(
+		d.AppInclude, d.AppExclude)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("dcos", func() telegraf.Input {
+		return &DCOS{
+			MaxConnections: defaultMaxConnections,
+			ResponseTimeout: internal.Duration{
+				Duration: defaultResponseTimeout,
+			},
+		}
+	})
+}
diff --git a/plugins/inputs/dcos/dcos_test.go b/plugins/inputs/dcos/dcos_test.go
new file mode 100644
index 000000000..6a76f7b64
--- /dev/null
+++ b/plugins/inputs/dcos/dcos_test.go
@@ -0,0 +1,441 @@
+package dcos
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+type mockClient struct {
+	SetTokenF            func(token string)
+	LoginF               func(ctx context.Context, sa *ServiceAccount) (*AuthToken, error)
+	GetSummaryF          func(ctx context.Context) (*Summary, error)
+	GetContainersF       func(ctx context.Context, node string) ([]Container, error)
+	GetNodeMetricsF      func(ctx context.Context, node string) (*Metrics, error)
+	GetContainerMetricsF func(ctx context.Context, node, container string) (*Metrics, error)
+	GetAppMetricsF       func(ctx context.Context, node, container string) (*Metrics, error)
+}
+
+func (c *mockClient) SetToken(token string) {
+	c.SetTokenF(token)
+}
+
+func (c *mockClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthToken, error) {
+	return c.LoginF(ctx, sa)
+}
+
+func (c *mockClient) GetSummary(ctx context.Context) (*Summary, error) {
+	return c.GetSummaryF(ctx)
+}
+
+func (c *mockClient) GetContainers(ctx context.Context, node string) ([]Container, error) {
+	return c.GetContainersF(ctx, node)
+}
+
+func (c *mockClient) GetNodeMetrics(ctx context.Context, node string) (*Metrics, error) {
+	return c.GetNodeMetricsF(ctx, node)
+}
+
+func (c *mockClient) GetContainerMetrics(ctx context.Context, node, container string) (*Metrics, error) {
+	return c.GetContainerMetricsF(ctx, node, container)
+}
+
+func (c *mockClient) GetAppMetrics(ctx context.Context, node, container string) (*Metrics, error) {
+	return c.GetAppMetricsF(ctx, node, container)
+}
+
+func TestAddNodeMetrics(t *testing.T) {
+	var tests = []struct {
+		name    string
+		metrics *Metrics
+		check   func(*testutil.Accumulator) []bool
+	}{
+		{
+			name: "basic datapoint conversion",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name:  "process.count",
+						Unit:  "count",
+						Value: 42.0,
+					},
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{acc.HasPoint(
+					"dcos_node",
+					map[string]string{
+						"cluster": "a",
+					},
+					"process_count", 42.0,
+				)}
+			},
+		},
+		{
+			name: "path added as tag",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name: "filesystem.inode.free",
+						Tags: map[string]string{
+							"path": "/var/lib",
+						},
+						Unit:  "count",
+						Value: 42.0,
+					},
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{acc.HasPoint(
+					"dcos_node",
+					map[string]string{
+						"cluster": "a",
+						"path":    "/var/lib",
+					},
+					"filesystem_inode_free", 42.0,
+				)}
+			},
+		},
+		{
+			name: "interface added as tag",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name: "network.out.dropped",
+						Tags: map[string]string{
+							"interface": "eth0",
+						},
+						Unit:  "count",
+						Value: 42.0,
+					},
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{acc.HasPoint(
+					"dcos_node",
+					map[string]string{
+						"cluster":   "a",
+						"interface": "eth0",
+					},
+					"network_out_dropped", 42.0,
+				)}
+			},
+		},
+		{
+			name: "bytes unit appended to fieldkey",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name: "network.in",
+						Tags: map[string]string{
+							"interface": "eth0",
+						},
+						Unit:  "bytes",
+						Value: 42.0,
+					},
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{acc.HasPoint(
+					"dcos_node",
+					map[string]string{
+						"cluster":   "a",
+						"interface": "eth0",
+					},
+					"network_in_bytes", int64(42),
+				)}
+			},
+		},
+		{
+			name: "dimensions added as tags",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name:  "process.count",
+						Tags:  map[string]string{},
+						Unit:  "count",
+						Value: 42.0,
+					},
+					{
+						Name:  "memory.total",
+						Tags:  map[string]string{},
+						Unit:  "bytes",
+						Value: 42,
+					},
+				},
+				Dimensions: map[string]interface{}{
+					"cluster_id": "c0760bbd-9e9d-434b-bd4a-39c7cdef8a63",
+					"hostname":   "192.168.122.18",
+					"mesos_id":   "2dfbbd28-29d2-411d-92c4-e2f84c38688e-S1",
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.HasPoint(
+						"dcos_node",
+						map[string]string{
+							"cluster":  "a",
+							"hostname": "192.168.122.18",
+						},
+						"process_count", 42.0),
+					acc.HasPoint(
+						"dcos_node",
+						map[string]string{
+							"cluster":  "a",
+							"hostname": "192.168.122.18",
+						},
+						"memory_total_bytes", int64(42)),
+				}
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var acc testutil.Accumulator
+			dcos := &DCOS{}
+			dcos.addNodeMetrics(&acc, "a", tt.metrics)
+			for i, ok := range tt.check(&acc) {
+				require.True(t, ok, fmt.Sprintf("Index was not true: %d", i))
+			}
+		})
+	}
+
+}
+
+func TestAddContainerMetrics(t *testing.T) {
+	var tests = []struct {
+		name    string
+		metrics *Metrics
+		check   func(*testutil.Accumulator) []bool
+	}{
+		{
+			name: "container",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name: "net.rx.errors",
+						Tags: map[string]string{
+							"container_id":  "f25c457b-fceb-44f0-8f5b-38be34cbb6fb",
+							"executor_id":   "telegraf.192fb45f-cc0c-11e7-af48-ea183c0b541a",
+							"executor_name": "Command Executor (Task: telegraf.192fb45f-cc0c-11e7-af48-ea183c0b541a) (Command: NO EXECUTABLE)",
+							"framework_id":  "ab2f3a8b-06db-4e8c-95b6-fb1940874a30-0001",
+							"source":        "telegraf.192fb45f-cc0c-11e7-af48-ea183c0b541a",
+						},
+						Unit:  "count",
+						Value: 42.0,
+					},
+				},
+				Dimensions: map[string]interface{}{
+					"cluster_id":          "c0760bbd-9e9d-434b-bd4a-39c7cdef8a63",
+					"container_id":        "f25c457b-fceb-44f0-8f5b-38be34cbb6fb",
+					"executor_id":         "telegraf.192fb45f-cc0c-11e7-af48-ea183c0b541a",
+					"framework_id":        "ab2f3a8b-06db-4e8c-95b6-fb1940874a30-0001",
+					"framework_name":      "marathon",
+					"framework_principal": "dcos_marathon",
+					"framework_role":      "slave_public",
+					"hostname":            "192.168.122.18",
+					"labels": map[string]string{
+						"DCOS_SPACE": "/telegraf",
+					},
+					"mesos_id":  "2dfbbd28-29d2-411d-92c4-e2f84c38688e-S1",
+					"task_id":   "telegraf.192fb45f-cc0c-11e7-af48-ea183c0b541a",
+					"task_name": "telegraf",
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.HasPoint(
+						"dcos_container",
+						map[string]string{
+							"cluster":      "a",
+							"container_id": "f25c457b-fceb-44f0-8f5b-38be34cbb6fb",
+							"hostname":     "192.168.122.18",
+							"task_name":    "telegraf",
+							"DCOS_SPACE":   "/telegraf",
+						},
+						"net_rx_errors",
+						42.0,
+					),
+				}
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var acc testutil.Accumulator
+			dcos := &DCOS{}
+			dcos.addContainerMetrics(&acc, "a", tt.metrics)
+			for i, ok := range tt.check(&acc) {
+				require.True(t, ok, fmt.Sprintf("Index was not true: %d", i))
+			}
+		})
+	}
+}
+
+func TestAddAppMetrics(t *testing.T) {
+	var tests = []struct {
+		name    string
+		metrics *Metrics
+		check   func(*testutil.Accumulator) []bool
+	}{
+		{
+			name: "tags are optional",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name:  "dcos.metrics.module.container_throttled_bytes_per_sec",
+						Unit:  "",
+						Value: 42.0,
+					},
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.HasPoint(
+						"dcos_app",
+						map[string]string{
+							"cluster": "a",
+						},
+						"container_throttled_bytes_per_sec", 42.0,
+					),
+				}
+			},
+		},
+		{
+			name: "dimensions are tagged",
+			metrics: &Metrics{
+				Datapoints: []DataPoint{
+					{
+						Name:  "dcos.metrics.module.container_throttled_bytes_per_sec",
+						Unit:  "",
+						Value: 42.0,
+					},
+				},
+				Dimensions: map[string]interface{}{
+					"cluster_id":   "c0760bbd-9e9d-434b-bd4a-39c7cdef8a63",
+					"container_id": "02d31175-1c01-4459-8520-ef8b1339bc52",
+					"hostname":     "192.168.122.18",
+					"mesos_id":     "2dfbbd28-29d2-411d-92c4-e2f84c38688e-S1",
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.HasPoint(
+						"dcos_app",
+						map[string]string{
+							"cluster":      "a",
+							"container_id": "02d31175-1c01-4459-8520-ef8b1339bc52",
+							"hostname":     "192.168.122.18",
+						},
+						"container_throttled_bytes_per_sec", 42.0,
+					),
+				}
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var acc testutil.Accumulator
+			dcos := &DCOS{}
+			dcos.addAppMetrics(&acc, "a", tt.metrics)
+			for i, ok := range tt.check(&acc) {
+				require.True(t, ok, fmt.Sprintf("Index was not true: %d", i))
+			}
+		})
+	}
+}
+
+func TestGatherFilterNode(t *testing.T) {
+	var tests = []struct {
+		name        string
+		nodeInclude []string
+		nodeExclude []string
+		client      Client
+		check       func(*testutil.Accumulator) []bool
+	}{
+		{
+			name: "cluster without nodes has no metrics",
+			client: &mockClient{
+				SetTokenF: func(token string) {},
+				GetSummaryF: func(ctx context.Context) (*Summary, error) {
+					return &Summary{
+						Cluster: "a",
+						Slaves:  []Slave{},
+					}, nil
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.NMetrics() == 0,
+				}
+			},
+		},
+		{
+			name:        "node include",
+			nodeInclude: []string{"x"},
+			client: &mockClient{
+				SetTokenF: func(token string) {},
+				GetSummaryF: func(ctx context.Context) (*Summary, error) {
+					return &Summary{
+						Cluster: "a",
+						Slaves: []Slave{
+							Slave{ID: "x"},
+							Slave{ID: "y"},
+						},
+					}, nil
+				},
+				GetContainersF: func(ctx context.Context, node string) ([]Container, error) {
+					return []Container{}, nil
+				},
+				GetNodeMetricsF: func(ctx context.Context, node string) (*Metrics, error) {
+					return &Metrics{
+						Datapoints: []DataPoint{
+							{
+								Name:  "value",
+								Value: 42.0,
+							},
+						},
+						Dimensions: map[string]interface{}{
+							"hostname": "x",
+						},
+					}, nil
+				},
+			},
+			check: func(acc *testutil.Accumulator) []bool {
+				return []bool{
+					acc.HasPoint(
+						"dcos_node",
+						map[string]string{
+							"cluster":  "a",
+							"hostname": "x",
+						},
+						"value", 42.0,
+					),
+					acc.NMetrics() == 1,
+				}
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var acc testutil.Accumulator
+			dcos := &DCOS{
+				NodeInclude: tt.nodeInclude,
+				NodeExclude: tt.nodeExclude,
+				client:      tt.client,
+			}
+			err := dcos.Gather(&acc)
+			require.NoError(t, err)
+			for i, ok := range tt.check(&acc) {
+				require.True(t, ok, fmt.Sprintf("Index was not true: %d", i))
+			}
+		})
+	}
+}

From 297897ae0a1d00ea46f5b86c7b9cde6f08ab5d8d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 11:54:33 -0800
Subject: [PATCH 0775/1302] Add dcos plugin to changelog and readme

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e472fb48..cdb9ce8a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
 - [bond](./plugins/inputs/bond/README.md) - Thanks to @ildarsv
 - [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
+- [dcos](./plugins/inputs/dcos/README.md) - Thanks to @influxdata
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer
@@ -72,6 +73,7 @@
 - [#2553](https://github.com/influxdata/telegraf/pull/2553): Add postfix input plugin.
 - [#3424](https://github.com/influxdata/telegraf/pull/3424): Add bond input plugin.
 - [#3518](https://github.com/influxdata/telegraf/pull/3518): Add slab to mem plugin.
+- [#3519](https://github.com/influxdata/telegraf/pull/3519): Add input plugin for DC/OS.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 2de05d7a4..65b101dcb 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,7 @@ configuration options.
 * [conntrack](./plugins/inputs/conntrack)
 * [couchbase](./plugins/inputs/couchbase)
 * [couchdb](./plugins/inputs/couchdb)
+* [DC/OS](./plugins/inputs/dcos)
 * [disque](./plugins/inputs/disque)
 * [dmcache](./plugins/inputs/dmcache)
 * [dns query time](./plugins/inputs/dns_query)

From 7dc256e8451bd8afb041a6f903c8f0cf53131575 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 29 Nov 2017 12:06:47 -0800
Subject: [PATCH 0776/1302] Update gopsutil version to include netstat fix
 (#3513)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 8c13d6db8..252e0b4b2 100644
--- a/Godeps
+++ b/Godeps
@@ -63,7 +63,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 48fc5612898a1213aa5d6a0fb2d4f7b968e898fb
+github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From 24d82aebe67a948b618e4de843228840b7eefd8f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 12:10:56 -0800
Subject: [PATCH 0777/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdb9ce8a2..694a7b7ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
 ### Bugfixes
 
 - [#3500](https://github.com/influxdata/telegraf/issues/3500): Fix global variable collection when using interval_slow option in mysql input.
+- [#3486](https://github.com/influxdata/telegraf/issues/3486): Fix error getting net connections info in netstat input.
 
 ## v1.4.4 [2017-11-08]
 

From beb9d7560d9a4849261c03936085511b8fdcb6a4 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Wed, 29 Nov 2017 15:16:34 -0500
Subject: [PATCH 0778/1302] Add support for glob patterns in net input plugin
 (#3140)

---
 plugins/inputs/system/NET_README.md |  6 ++++--
 plugins/inputs/system/net.go        | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/system/NET_README.md b/plugins/inputs/system/NET_README.md
index de9e7d7a7..771cabb48 100644
--- a/plugins/inputs/system/NET_README.md
+++ b/plugins/inputs/system/NET_README.md
@@ -9,9 +9,11 @@ This plugin gathers metrics about network interface and protocol usage (Linux on
 [[inputs.net]]
   ## By default, telegraf gathers stats from any up interface (excluding loopback)
   ## Setting interfaces will tell it to gather these explicit interfaces,
-  ## regardless of status.
+  ## regardless of status. When specifying an interface, glob-style
+  ## patterns are also supported.
+  ##
+  # interfaces = ["eth*", "enp0s[0-1]", "lo"]
   ##
-  # interfaces = ["eth0"]
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/system/net.go b/plugins/inputs/system/net.go
index f47a2cc6c..cfb712dfb 100644
--- a/plugins/inputs/system/net.go
+++ b/plugins/inputs/system/net.go
@@ -6,11 +6,13 @@ import (
 	"strings"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type NetIOStats struct {
-	ps PS
+	filter filter.Filter
+	ps     PS
 
 	skipChecks bool
 	Interfaces []string
@@ -38,15 +40,18 @@ func (s *NetIOStats) Gather(acc telegraf.Accumulator) error {
 		return fmt.Errorf("error getting net io info: %s", err)
 	}
 
+	if s.filter == nil {
+		if s.filter, err = filter.Compile(s.Interfaces); err != nil {
+			return fmt.Errorf("error compiling filter: %s", err)
+		}
+	}
+
 	for _, io := range netio {
 		if len(s.Interfaces) != 0 {
 			var found bool
 
-			for _, name := range s.Interfaces {
-				if name == io.Name {
-					found = true
-					break
-				}
+			if s.filter.Match(io.Name) {
+				found = true
 			}
 
 			if !found {

From 3ba54582208b382bbf6ac6aec887a48cce8adc73 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 12:17:46 -0800
Subject: [PATCH 0779/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 694a7b7ba..36b514652 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@
 - [#3424](https://github.com/influxdata/telegraf/pull/3424): Add bond input plugin.
 - [#3518](https://github.com/influxdata/telegraf/pull/3518): Add slab to mem plugin.
 - [#3519](https://github.com/influxdata/telegraf/pull/3519): Add input plugin for DC/OS.
+- [#3140](https://github.com/influxdata/telegraf/pull/3140): Add support for glob patterns in net input plugin.
 
 ### Bugfixes
 

From f92a4f528fbeeb112e8838a88e53f58ce9f75c34 Mon Sep 17 00:00:00 2001
From: Nathan Ferch <nf+github@marginal.net>
Date: Wed, 29 Nov 2017 19:32:50 -0500
Subject: [PATCH 0780/1302] Add input plugin for OpenBSD/FreeBSD pf (#3405)

---
 plugins/inputs/all/all.go    |   1 +
 plugins/inputs/pf/README.md  |  68 ++++++++++
 plugins/inputs/pf/pf.go      | 192 +++++++++++++++++++++++++++
 plugins/inputs/pf/pf_test.go | 243 +++++++++++++++++++++++++++++++++++
 4 files changed, 504 insertions(+)
 create mode 100644 plugins/inputs/pf/README.md
 create mode 100644 plugins/inputs/pf/pf.go
 create mode 100644 plugins/inputs/pf/pf_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index ec66f64f4..aaf5b6ae7 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -64,6 +64,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/opensmtpd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
+	_ "github.com/influxdata/telegraf/plugins/inputs/pf"
 	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
 	_ "github.com/influxdata/telegraf/plugins/inputs/postfix"
diff --git a/plugins/inputs/pf/README.md b/plugins/inputs/pf/README.md
new file mode 100644
index 000000000..ed058671b
--- /dev/null
+++ b/plugins/inputs/pf/README.md
@@ -0,0 +1,68 @@
+# PF Plugin
+
+The pf plugin gathers information from the FreeBSD/OpenBSD pf firewall. Currently it can retrive information about the state table: the number of current entries in the table, and counters for the number of searches, inserts, and removals to the table.
+
+The pf plugin retrives this information by invoking the `pfstat` command. The `pfstat` command requires read access to the device file `/dev/pf`. You have several options to permit telegraf to run `pfctl`:
+
+* Run telegraf as root. This is strongly discouraged.
+* Change the ownership and permissions for /dev/pf such that the user telegraf runs at can read the /dev/pf device file. This is probably not that good of an idea either.
+* Configure sudo to grant telegraf to run `pfctl` as root. This is the most restrictive option, but require sudo setup.
+
+### Using sudo
+
+You may edit your sudo configuration with the following:
+
+```sudo
+telegraf ALL=(root) NOPASSWD: /sbin/pfctl -s info
+```
+
+### Configuration:
+
+```toml
+  # use sudo to run pfctl
+  use_sudo = false
+```
+
+### Measurements & Fields:
+
+
+- pf
+    - entries (integer, count)
+    - searches (integer, count)
+    - inserts (integer, count)
+    - removals (integer, count)
+
+### Example Output:
+
+```
+> pfctl -s info
+Status: Enabled for 0 days 00:26:05           Debug: Urgent
+
+State Table                          Total             Rate
+  current entries                        2               
+  searches                           11325            7.2/s
+  inserts                                5            0.0/s
+  removals                               3            0.0/s
+Counters
+  match                              11226            7.2/s
+  bad-offset                             0            0.0/s
+  fragment                               0            0.0/s
+  short                                  0            0.0/s
+  normalize                              0            0.0/s
+  memory                                 0            0.0/s
+  bad-timestamp                          0            0.0/s
+  congestion                             0            0.0/s
+  ip-option                              0            0.0/s
+  proto-cksum                            0            0.0/s
+  state-mismatch                         0            0.0/s
+  state-insert                           0            0.0/s
+  state-limit                            0            0.0/s
+  src-limit                              0            0.0/s
+  synproxy                               0            0.0/s
+```
+
+```
+> ./telegraf --config telegraf.conf --input-filter pf --test
+* Plugin: inputs.pf, Collection 1
+> pf,host=columbia entries=3i,searches=2668i,inserts=12i,removals=9i 1510941775000000000
+```
diff --git a/plugins/inputs/pf/pf.go b/plugins/inputs/pf/pf.go
new file mode 100644
index 000000000..9712ee8a6
--- /dev/null
+++ b/plugins/inputs/pf/pf.go
@@ -0,0 +1,192 @@
+package pf
+
+import (
+	"bufio"
+	"fmt"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const measurement = "pf"
+const pfctlCommand = "pfctl"
+
+type PF struct {
+	PfctlCommand string
+	PfctlArgs    []string
+	UseSudo      bool
+	StateTable   []*Entry
+	infoFunc     func() (string, error)
+}
+
+func (pf *PF) Description() string {
+	return "Gather counters from PF"
+}
+
+func (pf *PF) SampleConfig() string {
+	return `
+  ## PF require root access on most systems.
+  ## Setting 'use_sudo' to true will make use of sudo to run pfctl.
+  ## Users must configure sudo to allow telegraf user to run pfctl with no password.
+  ## pfctl can be restricted to only list command "pfctl -s info".
+  use_sudo = false
+`
+}
+
+// Gather is the entrypoint for the plugin.
+func (pf *PF) Gather(acc telegraf.Accumulator) error {
+	if pf.PfctlCommand == "" {
+		var err error
+		if pf.PfctlCommand, pf.PfctlArgs, err = pf.buildPfctlCmd(); err != nil {
+			acc.AddError(fmt.Errorf("Can't construct pfctl commandline: %s", err))
+			return nil
+		}
+	}
+
+	o, err := pf.infoFunc()
+	if err != nil {
+		acc.AddError(err)
+		return nil
+	}
+
+	if perr := pf.parsePfctlOutput(o, acc); perr != nil {
+		acc.AddError(perr)
+	}
+	return nil
+}
+
+var errParseHeader = fmt.Errorf("Cannot find header in %s output", pfctlCommand)
+
+func errMissingData(tag string) error {
+	return fmt.Errorf("struct data for tag \"%s\" not found in %s output", tag, pfctlCommand)
+}
+
+type pfctlOutputStanza struct {
+	HeaderRE  *regexp.Regexp
+	ParseFunc func([]string, telegraf.Accumulator) error
+	Found     bool
+}
+
+var pfctlOutputStanzas = []*pfctlOutputStanza{
+	&pfctlOutputStanza{
+		HeaderRE:  regexp.MustCompile("^State Table"),
+		ParseFunc: parseStateTable,
+	},
+}
+
+var anyTableHeaderRE = regexp.MustCompile("^[A-Z]")
+
+func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error {
+	scanner := bufio.NewScanner(strings.NewReader(pfoutput))
+	for scanner.Scan() {
+		line := scanner.Text()
+		for _, s := range pfctlOutputStanzas {
+			if s.HeaderRE.MatchString(line) {
+				var stanzaLines []string
+				scanner.Scan()
+				line = scanner.Text()
+				for !anyTableHeaderRE.MatchString(line) {
+					stanzaLines = append(stanzaLines, line)
+					scanner.Scan()
+					line = scanner.Text()
+				}
+				if perr := s.ParseFunc(stanzaLines, acc); perr != nil {
+					return perr
+				}
+				s.Found = true
+			}
+		}
+	}
+	for _, s := range pfctlOutputStanzas {
+		if !s.Found {
+			return errParseHeader
+		}
+	}
+	return nil
+}
+
+type Entry struct {
+	Field      string
+	PfctlTitle string
+	Value      int64
+}
+
+var StateTable = []*Entry{
+	&Entry{"entries", "current entries", -1},
+	&Entry{"searches", "searches", -1},
+	&Entry{"inserts", "inserts", -1},
+	&Entry{"removals", "removals", -1},
+}
+
+var stateTableRE = regexp.MustCompile(`^  (.*?)\s+(\d+)`)
+
+func parseStateTable(lines []string, acc telegraf.Accumulator) error {
+	for _, v := range lines {
+		entries := stateTableRE.FindStringSubmatch(v)
+		if entries != nil {
+			for _, f := range StateTable {
+				if f.PfctlTitle == entries[1] {
+					var err error
+					if f.Value, err = strconv.ParseInt(entries[2], 10, 64); err != nil {
+						return err
+					}
+				}
+			}
+		}
+	}
+
+	fields := make(map[string]interface{})
+	for _, v := range StateTable {
+		if v.Value == -1 {
+			return errMissingData(v.PfctlTitle)
+		}
+		fields[v.Field] = v.Value
+	}
+
+	acc.AddFields(measurement, fields, make(map[string]string))
+	return nil
+}
+
+func (pf *PF) callPfctl() (string, error) {
+	cmd := execCommand(pf.PfctlCommand, pf.PfctlArgs...)
+	out, oerr := cmd.Output()
+	if oerr != nil {
+		ee, ok := oerr.(*exec.ExitError)
+		if !ok {
+			return string(out), fmt.Errorf("error running %s: %s: (unable to get stderr)", pfctlCommand, oerr)
+		}
+		return string(out), fmt.Errorf("error running %s: %s: %s", pfctlCommand, oerr, ee.Stderr)
+	}
+	return string(out), oerr
+}
+
+var execLookPath = exec.LookPath
+var execCommand = exec.Command
+
+func (pf *PF) buildPfctlCmd() (string, []string, error) {
+	cmd, err := execLookPath(pfctlCommand)
+	if err != nil {
+		return "", nil, fmt.Errorf("can't locate %s: %v", pfctlCommand, err)
+	}
+	args := []string{"-s", "info"}
+	if pf.UseSudo {
+		args = append([]string{cmd}, args...)
+		cmd, err = execLookPath("sudo")
+		if err != nil {
+			return "", nil, fmt.Errorf("can't locate sudo: %v", err)
+		}
+	}
+	return cmd, args, nil
+}
+
+func init() {
+	inputs.Add("pf", func() telegraf.Input {
+		pf := new(PF)
+		pf.infoFunc = pf.callPfctl
+		return pf
+	})
+}
diff --git a/plugins/inputs/pf/pf_test.go b/plugins/inputs/pf/pf_test.go
new file mode 100644
index 000000000..233e72592
--- /dev/null
+++ b/plugins/inputs/pf/pf_test.go
@@ -0,0 +1,243 @@
+package pf
+
+import (
+	"log"
+	"reflect"
+	"strconv"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+)
+
+type measurementResult struct {
+	tags   map[string]string
+	fields map[string]interface{}
+}
+
+func TestPfctlInvocation(t *testing.T) {
+	type pfctlInvocationTestCase struct {
+		config PF
+		cmd    string
+		args   []string
+	}
+
+	var testCases = []pfctlInvocationTestCase{
+		// 0: no sudo
+		pfctlInvocationTestCase{
+			config: PF{UseSudo: false},
+			cmd:    "fakepfctl",
+			args:   []string{"-s", "info"},
+		},
+		// 1: with sudo
+		pfctlInvocationTestCase{
+			config: PF{UseSudo: true},
+			cmd:    "fakesudo",
+			args:   []string{"fakepfctl", "-s", "info"},
+		},
+	}
+
+	for i, tt := range testCases {
+		execLookPath = func(cmd string) (string, error) { return "fake" + cmd, nil }
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			log.Printf("running #%d\n", i)
+			cmd, args, err := tt.config.buildPfctlCmd()
+			if err != nil {
+				t.Fatalf("error when running buildPfctlCmd: %s", err)
+			}
+			if tt.cmd != cmd || !reflect.DeepEqual(tt.args, args) {
+				t.Errorf("%d: expected %s - %#v got %s - %#v", i, tt.cmd, tt.args, cmd, args)
+			}
+		})
+	}
+}
+
+func TestPfMeasurements(t *testing.T) {
+	type pfTestCase struct {
+		TestInput    string
+		err          error
+		measurements []measurementResult
+	}
+
+	testCases := []pfTestCase{
+		// 0: nil input should raise an error
+		pfTestCase{TestInput: "", err: errParseHeader},
+		// 1: changes to pfctl output should raise an error
+		pfTestCase{TestInput: `Status: Enabled for 161 days 21:24:45         Debug: Urgent
+
+Interface Stats for re1               IPv4             IPv6
+  Bytes In                   2585823744614    1059233657221
+  Bytes Out                  1227266932673    3274698578875
+  Packets In
+    Passed                      2289953086       1945437219
+    Blocked                      392835739            48609
+  Packets Out
+    Passed                      1649146326       2605569054
+    Blocked                            107                0
+
+State Table                          Total             Rate
+  Current Entrys                       649
+  searches                     18421725761         1317.0/s
+  inserts                        156762508           11.2/s
+  removals                       156761859           11.2/s
+Counters
+  match                          473002784           33.8/s
+  bad-offset                             0            0.0/s
+  fragment                            2729            0.0/s
+  short                                107            0.0/s
+  normalize                           1685            0.0/s
+  memory                               101            0.0/s
+  bad-timestamp                          0            0.0/s
+  congestion                             0            0.0/s
+  ip-option                         152301            0.0/s
+  proto-cksum                          108            0.0/s
+  state-mismatch                     24393            0.0/s
+  state-insert                          92            0.0/s
+  state-limit                            0            0.0/s
+  src-limit                              0            0.0/s
+  synproxy                               0            0.0/s
+`,
+			err: errMissingData("current entries"),
+		},
+		// 2: bad numbers should raise an error
+		pfTestCase{TestInput: `Status: Enabled for 0 days 00:26:05           Debug: Urgent
+
+State Table                          Total             Rate
+  current entries                      -23               
+  searches                           11325            7.2/s
+  inserts                                5            0.0/s
+  removals                               3            0.0/s
+Counters
+  match                              11226            7.2/s
+  bad-offset                             0            0.0/s
+  fragment                               0            0.0/s
+  short                                  0            0.0/s
+  normalize                              0            0.0/s
+  memory                                 0            0.0/s
+  bad-timestamp                          0            0.0/s
+  congestion                             0            0.0/s
+  ip-option                              0            0.0/s
+  proto-cksum                            0            0.0/s
+  state-mismatch                         0            0.0/s
+  state-insert                           0            0.0/s
+  state-limit                            0            0.0/s
+  src-limit                              0            0.0/s
+  synproxy                               0            0.0/s
+`,
+			err: errMissingData("current entries"),
+		},
+		pfTestCase{TestInput: `Status: Enabled for 0 days 00:26:05           Debug: Urgent
+
+State Table                          Total             Rate
+  current entries                        2               
+  searches                           11325            7.2/s
+  inserts                                5            0.0/s
+  removals                               3            0.0/s
+Counters
+  match                              11226            7.2/s
+  bad-offset                             0            0.0/s
+  fragment                               0            0.0/s
+  short                                  0            0.0/s
+  normalize                              0            0.0/s
+  memory                                 0            0.0/s
+  bad-timestamp                          0            0.0/s
+  congestion                             0            0.0/s
+  ip-option                              0            0.0/s
+  proto-cksum                            0            0.0/s
+  state-mismatch                         0            0.0/s
+  state-insert                           0            0.0/s
+  state-limit                            0            0.0/s
+  src-limit                              0            0.0/s
+  synproxy                               0            0.0/s
+`,
+			measurements: []measurementResult{
+				measurementResult{
+					fields: map[string]interface{}{
+						"entries":  int64(2),
+						"searches": int64(11325),
+						"inserts":  int64(5),
+						"removals": int64(3)},
+					tags: map[string]string{},
+				},
+			},
+		},
+		pfTestCase{TestInput: `Status: Enabled for 161 days 21:24:45         Debug: Urgent
+
+Interface Stats for re1               IPv4             IPv6
+  Bytes In                   2585823744614    1059233657221
+  Bytes Out                  1227266932673    3274698578875
+  Packets In
+    Passed                      2289953086       1945437219
+    Blocked                      392835739            48609
+  Packets Out
+    Passed                      1649146326       2605569054
+    Blocked                            107                0
+
+State Table                          Total             Rate
+  current entries                      649
+  searches                     18421725761         1317.0/s
+  inserts                        156762508           11.2/s
+  removals                       156761859           11.2/s
+Counters
+  match                          473002784           33.8/s
+  bad-offset                             0            0.0/s
+  fragment                            2729            0.0/s
+  short                                107            0.0/s
+  normalize                           1685            0.0/s
+  memory                               101            0.0/s
+  bad-timestamp                          0            0.0/s
+  congestion                             0            0.0/s
+  ip-option                         152301            0.0/s
+  proto-cksum                          108            0.0/s
+  state-mismatch                     24393            0.0/s
+  state-insert                          92            0.0/s
+  state-limit                            0            0.0/s
+  src-limit                              0            0.0/s
+  synproxy                               0            0.0/s
+`,
+			measurements: []measurementResult{
+				measurementResult{
+					fields: map[string]interface{}{
+						"entries":  int64(649),
+						"searches": int64(18421725761),
+						"inserts":  int64(156762508),
+						"removals": int64(156761859)},
+					tags: map[string]string{},
+				},
+			},
+		},
+	}
+
+	for i, tt := range testCases {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			log.Printf("running #%d\n", i)
+			pf := &PF{
+				infoFunc: func() (string, error) {
+					return tt.TestInput, nil
+				},
+			}
+			acc := new(testutil.Accumulator)
+			err := acc.GatherError(pf.Gather)
+			if !reflect.DeepEqual(tt.err, err) {
+				t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
+			}
+			n := 0
+			for j, v := range tt.measurements {
+				if len(acc.Metrics) < n+1 {
+					t.Errorf("%d: expected at least %d values got %d", i, n+1, len(acc.Metrics))
+					break
+				}
+				m := acc.Metrics[n]
+				if !reflect.DeepEqual(m.Measurement, measurement) {
+					t.Errorf("%d %d: expected measurement '%#v' got '%#v'\n", i, j, measurement, m.Measurement)
+				}
+				if !reflect.DeepEqual(m.Tags, v.tags) {
+					t.Errorf("%d %d: expected tags\n%#v got\n%#v\n", i, j, v.tags, m.Tags)
+				}
+				if !reflect.DeepEqual(m.Fields, v.fields) {
+					t.Errorf("%d %d: expected fields\n%#v got\n%#v\n", i, j, v.fields, m.Fields)
+				}
+				n++
+			}
+		})
+	}
+}

From 6426bca1f897e2499a468164aabbccc5028a1573 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 16:36:00 -0800
Subject: [PATCH 0781/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36b514652..8e83a49b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer
 - [particle](./plugins/inputs/webhooks/particle/README.md) - Thanks to @davidgs
+- [pf](./plugins/inputs/pf/README.md) Thanks to @nferch
 - [postfix](./plugins/inputs/postfix/README.md) - Thanks to @phemmer
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello
@@ -75,6 +76,7 @@
 - [#3518](https://github.com/influxdata/telegraf/pull/3518): Add slab to mem plugin.
 - [#3519](https://github.com/influxdata/telegraf/pull/3519): Add input plugin for DC/OS.
 - [#3140](https://github.com/influxdata/telegraf/pull/3140): Add support for glob patterns in net input plugin.
+- [#3405](https://github.com/influxdata/telegraf/pull/3405): Add input plugin for OpenBSD/FreeBSD pf.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 65b101dcb..c2a5fb064 100644
--- a/README.md
+++ b/README.md
@@ -179,12 +179,13 @@ configuration options.
 * [ntpq](./plugins/inputs/ntpq)
 * [openldap](./plugins/inputs/openldap)
 * [opensmtpd](./plugins/inputs/opensmtpd)
+* [pf](./plugins/inputs/pf)
 * [phpfpm](./plugins/inputs/phpfpm)
 * [phusion passenger](./plugins/inputs/passenger)
 * [ping](./plugins/inputs/ping)
 * [postfix](./plugins/inputs/postfix)
-* [postgresql](./plugins/inputs/postgresql)
 * [postgresql_extensible](./plugins/inputs/postgresql_extensible)
+* [postgresql](./plugins/inputs/postgresql)
 * [powerdns](./plugins/inputs/powerdns)
 * [procstat](./plugins/inputs/procstat)
 * [prometheus](./plugins/inputs/prometheus) (can be used for [Caddy server](./plugins/inputs/prometheus/README.md#usage-for-caddy-http-server))

From a9951710b3b08e9099c250fe6c8a227d7753bb13 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 29 Nov 2017 15:25:00 -0800
Subject: [PATCH 0782/1302] Add time import

---
 plugins/inputs/postfix/stat_none.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/postfix/stat_none.go b/plugins/inputs/postfix/stat_none.go
index c5c013ce3..d9b67b166 100644
--- a/plugins/inputs/postfix/stat_none.go
+++ b/plugins/inputs/postfix/stat_none.go
@@ -2,6 +2,10 @@
 
 package postfix
 
+import (
+	"time"
+)
+
 func statCTime(_ interface{}) time.Time {
 	return time.Time{}
 }

From 44320a542135a57a8a6ba18fc135dfac6b92af39 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 30 Nov 2017 18:40:12 -0800
Subject: [PATCH 0783/1302] Add option to amqp output to publish persistent
 messages (#3528)

---
 plugins/outputs/amqp/README.md |  3 +++
 plugins/outputs/amqp/amqp.go   | 28 ++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index d79af597a..834074436 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -29,6 +29,9 @@ For an introduction to AMQP see:
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
+  ## Delivery Mode controls if a published message is persistent
+  ## Valid options are "transient" and "persistent". default: "transient"
+  # delivery_mode = "transient"
 
   ## InfluxDB retention policy
   # retention_policy = "default"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index 75fe4c711..fed1edfe4 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -39,6 +39,9 @@ type AMQP struct {
 	Precision string
 	// Connection timeout
 	Timeout internal.Duration
+	// Delivery Mode controls if a published message is persistent
+	// Valid options are "transient" and "persistent". default: "transient"
+	DeliveryMode string
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -52,7 +55,8 @@ type AMQP struct {
 	sync.Mutex
 	c *client
 
-	serializer serializers.Serializer
+	deliveryMode uint8
+	serializer   serializers.Serializer
 }
 
 type externalAuth struct{}
@@ -82,6 +86,9 @@ var sampleConfig = `
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
   routing_tag = "host"
+  ## Delivery Mode controls if a published message is persistent
+  ## Valid options are "transient" and "persistent". default: "transient"
+  delivery_mode = "transient"
 
   ## InfluxDB retention policy
   # retention_policy = "default"
@@ -111,6 +118,18 @@ func (a *AMQP) SetSerializer(serializer serializers.Serializer) {
 }
 
 func (q *AMQP) Connect() error {
+	switch q.DeliveryMode {
+	case "transient":
+		q.deliveryMode = amqp.Transient
+		break
+	case "persistent":
+		q.deliveryMode = amqp.Persistent
+		break
+	default:
+		q.deliveryMode = amqp.Transient
+		break
+	}
+
 	headers := amqp.Table{
 		"database":         q.Database,
 		"retention_policy": q.RetentionPolicy,
@@ -245,9 +264,10 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 			false,      // mandatory
 			false,      // immediate
 			amqp.Publishing{
-				Headers:     c.headers,
-				ContentType: "text/plain",
-				Body:        buf,
+				Headers:      c.headers,
+				ContentType:  "text/plain",
+				Body:         buf,
+				DeliveryMode: q.deliveryMode,
 			})
 		if err != nil {
 			return fmt.Errorf("Failed to send AMQP message: %s", err)

From e400ec2b57ab9422da2746b7472043e4662d7f6c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 30 Nov 2017 18:42:14 -0800
Subject: [PATCH 0784/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e83a49b2..7a203ba47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
 - [#3519](https://github.com/influxdata/telegraf/pull/3519): Add input plugin for DC/OS.
 - [#3140](https://github.com/influxdata/telegraf/pull/3140): Add support for glob patterns in net input plugin.
 - [#3405](https://github.com/influxdata/telegraf/pull/3405): Add input plugin for OpenBSD/FreeBSD pf.
+- [#3528](https://github.com/influxdata/telegraf/pull/3528): Add option to amqp output to publish persistent messages.
 
 ### Bugfixes
 

From 7f66863b8731f08c963726455d53ab18e4427b44 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 1 Dec 2017 11:21:39 -0800
Subject: [PATCH 0785/1302] Fix HOST_MOUNT_PREFIX in docker with disk input
 (#3529)

---
 docs/FAQ.md                          | 19 +++++++++++++++++++
 plugins/inputs/system/DISK_README.md |  6 ++++--
 plugins/inputs/system/disk_test.go   |  2 --
 plugins/inputs/system/ps.go          | 19 +++++++++++++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 58396cbcd..1d1c490aa 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,5 +1,24 @@
 # Frequently Asked Questions
 
+### Q: How can I monitor the Docker Engine Host from within a container?
+
+You will need to setup several volume mounts as well as some environment
+variables:
+```
+docker run --name telegraf
+	-v /:/hostfs:ro
+	-v /etc:/hostfs/etc:ro
+	-v /proc:/hostfs/proc:ro
+	-v /sys:/hostfs/sys:ro
+	-v /var/run/utmp:/var/run/utmp:ro
+	-e HOST_ETC=/hostfs/etc
+	-e HOST_PROC=/hostfs/proc
+	-e HOST_SYS=/hostfs/sys
+	-e HOST_MOUNT_PREFIX=/hostfs
+	telegraf
+```
+
+
 ### Q: Why do I get a "no such host" error resolving hostnames that other
 programs can resolve?
 
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index 31eff937d..a09e818ed 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -20,9 +20,11 @@ Additionally, the behavior of resolving the `mount_points` can be configured by
 When present, this variable is prepended to the mountpoints discovered by the plugin before retrieving stats.
 The prefix is stripped from the reported `path` in the measurement.
 This settings is useful when running `telegraf` inside a docker container to report host machine metrics.
-In this case, the host's root volume should be mounted into the container and the `HOST_MOUNT_PREFIX` and `HOST_ETC` environment variables set.
+In this case, the host's root volume should be mounted into the container and the `HOST_MOUNT_PREFIX` and `HOST_PROC` environment variables set.
 
-`docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_ETC=/hostfs/etc telegraf`
+```
+docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_PROC=/hostfs/proc telegraf
+```
 
 ### Measurements & Fields:
 
diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/system/disk_test.go
index 28a433fe9..67494d712 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -62,8 +62,6 @@ func TestDiskUsage(t *testing.T) {
 
 	mps.On("Partitions", true).Return(psAll, nil)
 	mps.On("OSGetenv", "HOST_MOUNT_PREFIX").Return("")
-	mps.On("OSStat", "/").Return(MockFileInfo{}, nil)
-	mps.On("OSStat", "/home").Return(MockFileInfo{}, nil)
 	mps.On("PSDiskUsage", "/").Return(&duAll[0], nil)
 	mps.On("PSDiskUsage", "/home").Return(&duAll[1], nil)
 
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index d41e6bddf..02239e6e6 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"os"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
@@ -84,6 +85,10 @@ func (s *systemPS) DiskUsage(
 	for _, filter := range fstypeExclude {
 		fstypeExcludeSet[filter] = true
 	}
+	paths := make(map[string]bool)
+	for _, part := range parts {
+		paths[part.Mountpoint] = true
+	}
 
 	// Autofs mounts indicate a potential mount, the partition will also be
 	// listed with the actual filesystem when mounted.  Ignore the autofs
@@ -92,6 +97,7 @@ func (s *systemPS) DiskUsage(
 
 	var usage []*disk.UsageStat
 	var partitions []*disk.PartitionStat
+	hostMountPrefix := s.OSGetenv("HOST_MOUNT_PREFIX")
 
 	for i := range parts {
 		p := parts[i]
@@ -110,15 +116,20 @@ func (s *systemPS) DiskUsage(
 			continue
 		}
 
-		mountpoint := s.OSGetenv("HOST_MOUNT_PREFIX") + p.Mountpoint
-		if _, err := s.OSStat(mountpoint); err != nil {
+		// If there's a host mount prefix, exclude any paths which conflict
+		// with the prefix.
+		if len(hostMountPrefix) > 0 &&
+			!strings.HasPrefix(p.Mountpoint, hostMountPrefix) &&
+			paths[hostMountPrefix+p.Mountpoint] {
 			continue
 		}
-		du, err := s.PSDiskUsage(mountpoint)
+
+		du, err := s.PSDiskUsage(p.Mountpoint)
 		if err != nil {
 			continue
 		}
-		du.Path = p.Mountpoint
+
+		du.Path = strings.TrimPrefix(p.Mountpoint, hostMountPrefix)
 		du.Fstype = p.Fstype
 		usage = append(usage, du)
 		partitions = append(partitions, &p)

From cabe10b88ad6edb9b347d79bdc6667aa70875365 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 1 Dec 2017 11:23:18 -0800
Subject: [PATCH 0786/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a203ba47..303cef3c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
 
 - [#3500](https://github.com/influxdata/telegraf/issues/3500): Fix global variable collection when using interval_slow option in mysql input.
 - [#3486](https://github.com/influxdata/telegraf/issues/3486): Fix error getting net connections info in netstat input.
+- [#3529](https://github.com/influxdata/telegraf/issues/3529): Fix HOST_MOUNT_PREFIX in docker with disk input.
 
 ## v1.4.4 [2017-11-08]
 

From 2c5a5373f6fc22e22e164aecdc97a4a49f4de3d7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 1 Dec 2017 11:42:00 -0800
Subject: [PATCH 0787/1302] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 303cef3c6..030052960 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,7 +93,7 @@
 - [#3447](https://github.com/influxdata/telegraf/issues/3447): Add shadow-utils dependency to rpm package.
 - [#3448](https://github.com/influxdata/telegraf/issues/3448): Use deb-systemd-invoke to restart service.
 
-## v1.4.5 [unreleased]
+## v1.4.5 [2017-12-01]
 
 ### Bugfixes
 

From ca8911fec0a9bf139525fcbcfb64f61708dd993c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 1 Dec 2017 11:49:07 -0800
Subject: [PATCH 0788/1302] Update example config

---
 etc/telegraf.conf                   | 268 +++++++++++++++++++++++++---
 plugins/inputs/unbound/unbound.go   |   2 +-
 plugins/inputs/webhooks/webhooks.go |   2 +-
 3 files changed, 245 insertions(+), 27 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 069b657b6..4c751d3e4 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -151,6 +151,9 @@
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, its value will be used as the routing key
 #   routing_tag = "host"
+#   ## Delivery Mode controls if a published message is persistent
+#   ## Valid options are "transient" and "persistent". default: "transient"
+#   delivery_mode = "transient"
 #
 #   ## InfluxDB retention policy
 #   # retention_policy = "default"
@@ -253,8 +256,21 @@
 #   # %m - month (01..12)
 #   # %d - day of month (e.g., 01)
 #   # %H - hour (00..23)
+#   # %V - week of the year (ISO week) (01..53)
+#   ## Additionally, you can specify a tag name using the notation {{tag_name}}
+#   ## which will be used as part of the index name. If the tag does not exist,
+#   ## the default tag value will be used.
+#   # index_name = "telegraf-{{host}}-%Y.%m.%d"
+#   # default_tag_value = "none"
 #   index_name = "telegraf-%Y.%m.%d" # required.
 #
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
 #   ## Template Config
 #   ## Set to true if you want telegraf to manage its index template.
 #   ## If enabled it will create a recommended index template for telegraf indexes
@@ -580,6 +596,10 @@
 #
 #   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
 #   # expiration_interval = "60s"
+#
+#   ## Collectors to enable, valid entries are "gocollector" and "process".
+#   ## If unset, both are enabled.
+#   collectors_exclude = ["gocollector", "process"]
 
 
 # # Configuration for the Riemann server to send metrics to
@@ -653,6 +673,46 @@
 #   # data_format = "influx"
 
 
+# # Configuration for Wavefront server to send metrics to
+# [[outputs.wavefront]]
+#   ## DNS name of the wavefront proxy server
+#   host = "wavefront.example.com"
+#
+#   ## Port that the Wavefront proxy server listens on
+#   port = 2878
+#
+#   ## prefix for metrics keys
+#   #prefix = "my.specific.prefix."
+#
+#   ## whether to use "value" for name of simple fields
+#   #simple_fields = false
+#
+#   ## character to use between metric and field name.  defaults to . (dot)
+#   #metric_separator = "."
+#
+#   ## Convert metric name paths to use metricSeperator character
+#   ## When true (default) will convert all _ (underscore) chartacters in final metric name
+#   #convert_paths = true
+#
+#   ## Use Regex to sanitize metric and tag names from invalid characters
+#   ## Regex is more thorough, but significantly slower
+#   #use_regex = false
+#
+#   ## point tags to use as the source name for Wavefront (if none found, host will be used)
+#   #source_override = ["hostname", "snmp_host", "node_host"]
+#
+#   ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0.  default true
+#   #convert_bool = true
+#
+#   ## Define a mapping, namespaced by metric prefix, from string values to numeric values
+#   ## The example below maps "green" -> 1.0, "yellow" -> 0.5, "red" -> 0.0 for
+#   ## any metrics beginning with "elasticsearch"
+#   #[[outputs.wavefront.string_to_number.elasticsearch]]
+#   #  green = 1.0
+#   #  yellow = 0.5
+#   #  red = 0.0
+
+
 
 ###############################################################################
 #                            PROCESSOR PLUGINS                                #
@@ -667,6 +727,16 @@
 #                            AGGREGATOR PLUGINS                               #
 ###############################################################################
 
+# # Keep the aggregate basicstats of each metric passing through.
+# [[aggregators.basicstats]]
+#   ## General Aggregator Arguments:
+#   ## The period on which to flush & clear the aggregator.
+#   period = "30s"
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = false
+
+
 # # Create aggregate histograms.
 # [[aggregators.histogram]]
 #   ## The period in which to flush the aggregator.
@@ -825,6 +895,18 @@
 #   bcacheDevs = ["bcache0"]
 
 
+# # Collect bond interface status, slaves statuses and failures count
+# [[inputs.bond]]
+#   ## Sets 'proc' directory path
+#   ## If not specified, then default is /proc
+#   # host_proc = "/proc"
+#
+#   ## By default, telegraf gather stats for all bond interfaces
+#   ## Setting interfaces will restrict the stats to the specified
+#   ## bond interfaces.
+#   # bond_interfaces = ["bond0"]
+
+
 # # Read Cassandra metrics through Jolokia
 # [[inputs.cassandra]]
 #   # This is the context root used to compose the jolokia url
@@ -932,7 +1014,7 @@
 #   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
 #   delay = "5m"
 #
-#   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
+#   ## Recommended: use metric 'interval' that is a multiple of 'period' to avoid
 #   ## gaps or overlap in pulled data
 #   interval = "5m"
 #
@@ -1003,7 +1085,7 @@
 #   ##    http://admin:secret@couchbase-0.example.com:8091/
 #   ##
 #   ## If no servers are specified, then localhost is used as the host.
-#   ## If no protocol is specifed, HTTP is used.
+#   ## If no protocol is specified, HTTP is used.
 #   ## If no port is specified, 8091 is used.
 #   servers = ["http://localhost:8091"]
 
@@ -1015,6 +1097,50 @@
 #   hosts = ["http://localhost:8086/_stats"]
 
 
+# # Input plugin for DC/OS metrics
+# [[inputs.dcos]]
+#   ## The DC/OS cluster URL.
+#   cluster_url = "https://dcos-ee-master-1"
+#
+#   ## The ID of the service account.
+#   service_account_id = "telegraf"
+#   ## The private key file for the service account.
+#   service_account_private_key = "/etc/telegraf/telegraf-sa-key.pem"
+#
+#   ## Path containing login token.  If set, will read on every gather.
+#   # token_file = "/home/dcos/.dcos/token"
+#
+#   ## In all filter options if both include and exclude are empty all items
+#   ## will be collected.  Arrays may contain glob patterns.
+#   ##
+#   ## Node IDs to collect metrics from.  If a node is excluded, no metrics will
+#   ## be collected for its containers or apps.
+#   # node_include = []
+#   # node_exclude = []
+#   ## Container IDs to collect container metrics from.
+#   # container_include = []
+#   # container_exclude = []
+#   ## Container IDs to collect app metrics from.
+#   # app_include = []
+#   # app_exclude = []
+#
+#   ## Maximum concurrent connections to the cluster.
+#   # max_connections = 10
+#   ## Maximum time to receive a response from cluster.
+#   # response_timeout = "20s"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
+#
+#   ## Recommended filtering to reduce series cardinality.
+#   # [inputs.dcos.tagdrop]
+#   #   path = ["/var/lib/mesos/slave/slaves/*"]
+
+
 # # Read metrics from one or many disque servers
 # [[inputs.disque]]
 #   ## An array of URI to gather stats about. Specify an ip or hostname
@@ -1059,6 +1185,9 @@
 #   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
 #   endpoint = "unix:///var/run/docker.sock"
 #
+#   ## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
+#   gather_services = false
+#
 #   ## Only collect metrics for these containers, collect all if empty
 #   container_names = []
 #
@@ -1124,10 +1253,21 @@
 #   ## Set cluster_health to true when you want to also obtain cluster health stats
 #   cluster_health = false
 #
+#   ## Adjust cluster_health_level when you want to also obtain detailed health stats
+#   ## The options are
+#   ##  - indices (default)
+#   ##  - cluster
+#   # cluster_health_level = "indices"
+#
 #   ## Set cluster_stats to true when you want to also obtain cluster stats from the
 #   ## Master node.
 #   cluster_stats = false
 #
+#   ## node_stats is a list of sub-stats that you want to have gathered. Valid options
+#   ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
+#   ## "breakers". Per default, all stats are gathered.
+#   # node_stats = ["jvm", "http"]
+#
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -1408,7 +1548,7 @@
 #   ##
 #   # servers = ["USERID:PASSW0RD@lan(192.168.1.1)"]
 #
-#   ## Recomended: use metric 'interval' that is a multiple of 'timeout' to avoid
+#   ## Recommended: use metric 'interval' that is a multiple of 'timeout' to avoid
 #   ## gaps or overlap in pulled data
 #   interval = "30s"
 #
@@ -1876,16 +2016,16 @@
 #   bind_password = ""
 
 
-# # A plugin to collect stats from OpenSMTPd
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
 #
 #   ## The default location of the smtpctl binary can be overridden with:
-#   #binary = "/usr/sbin/smtpctl"
+#   binary = "/usr/sbin/smtpctl"
 #
-#   ## The default timeout of 1s can be overriden with:
-#   #timeout = "1s"
+#   ## The default timeout of 1000ms can be overriden with (in milliseconds):
+#   timeout = 1000
 
 
 # # Read metrics of passenger using passenger-status
@@ -1901,6 +2041,15 @@
 #   command = "passenger-status -v --show=xml"
 
 
+# # Gather counters from PF
+# [[inputs.pf]]
+#   ## PF require root access on most systems.
+#   ## Setting 'use_sudo' to true will make use of sudo to run pfctl.
+#   ## Users must configure sudo to allow telegraf user to run pfctl with no password.
+#   ## pfctl can be restricted to only list command "pfctl -s info".
+#   use_sudo = false
+
+
 # # Read metrics of phpfpm, via HTTP status page or socket
 # [[inputs.phpfpm]]
 #   ## An array of addresses to gather stats about. Specify an ip or hostname
@@ -1942,6 +2091,13 @@
 #   # interface = ""
 
 
+# # Measure postfix queue statistics
+# [[inputs.postfix]]
+#   ## Postfix queue directory. If not provided, telegraf will try to use
+#   ## 'postconf -h queue_directory' to determine it.
+#   # queue_directory = "/var/spool/postfix"
+
+
 # # Read metrics from one or many postgresql servers
 # [[inputs.postgresql]]
 #   ## specify address via a url matching:
@@ -2044,6 +2200,10 @@
 #   # pattern = "nginx"
 #   ## user as argument for pgrep (ie, pgrep -u <user>)
 #   # user = "nginx"
+#   ## Systemd unit name
+#   # systemd_unit = "nginx.service"
+#   ## CGroup name or path
+#   # cgroup = "systemd/system.slice/nginx.service"
 #
 #   ## override for process_name
 #   ## This is optional; default is sourced from /proc/<pid>/status
@@ -2191,6 +2351,40 @@
 #   # remove_numbers = true
 
 
+# # Read metrics from storage devices supporting S.M.A.R.T.
+# [[inputs.smart]]
+#   ## Optionally specify the path to the smartctl executable
+#   # path = "/usr/bin/smartctl"
+#   #
+#   ## On most platforms smartctl requires root access.
+#   ## Setting 'use_sudo' to true will make use of sudo to run smartctl.
+#   ## Sudo must be configured to to allow the telegraf user to run smartctl
+#   ## with out password.
+#   # use_sudo = false
+#   #
+#   ## Skip checking disks in this power mode. Defaults to
+#   ## "standby" to not wake up disks that have stoped rotating.
+#   ## See --nocheck in the man pages for smartctl.
+#   ## smartctl version 5.41 and 5.42 have faulty detection of
+#   ## power mode and might require changing this value to
+#   ## "never" depending on your disks.
+#   # nocheck = "standby"
+#   #
+#   ## Gather detailed metrics for each SMART Attribute.
+#   ## Defaults to "false"
+#   ##
+#   # attributes = false
+#   #
+#   ## Optionally specify devices to exclude from reporting.
+#   # excludes = [ "/dev/pass6" ]
+#   #
+#   ## Optionally specify devices and device type, if unset
+#   ## a scan (smartctl --scan) for S.M.A.R.T. devices will
+#   ## done and all found will be included except for the
+#   ## excluded in excludes.
+#   # devices = [ "/dev/ada0 -d atacam" ]
+
+
 # # Retrieves SNMP values from remote agents
 # [[inputs.snmp]]
 #   agents = [ "127.0.0.1:161" ]
@@ -2354,11 +2548,11 @@
 #     sub_tables=[".1.3.6.1.2.1.2.2.1.13", "bytes_recv", "bytes_send"]
 
 
-# # Read metrics from Solr Server
+# # Read stats from one or more Solr servers or cores
 # [[inputs.solr]]
 #   ## specify a list of one or more Solr servers
 #   servers = ["http://localhost:8983"]
-#   ##
+#
 #   ## specify a list of one or more Solr cores (default - all)
 #   # cores = ["main"]
 
@@ -2407,7 +2601,7 @@
 #   #
 #   #
 #   ## Options for the sadf command. The values on the left represent the sadf
-#   ## options and the values on the right their description (wich are used for
+#   ## options and the values on the right their description (which are used for
 #   ## grouping and prefixing metrics).
 #   ##
 #   ## Run 'sar -h' or 'man sar' to find out the supported options for your
@@ -2438,6 +2632,18 @@
 #   #  vg = "rootvg"
 
 
+# # Reads metrics from a Teamspeak 3 Server via ServerQuery
+# [[inputs.teamspeak]]
+#   ## Server address for Teamspeak 3 ServerQuery
+#   # server = "127.0.0.1:10011"
+#   ## Username for ServerQuery
+#   username = "serverqueryuser"
+#   ## Password for ServerQuery
+#   password = "secret"
+#   ## Array of virtual servers
+#   # virtual_servers = [1]
+
+
 # # Gather metrics from the Tomcat server status page.
 # [[inputs.tomcat]]
 #   ## URL of the Tomcat server status
@@ -2472,6 +2678,21 @@
 #   pools = ["redis_pool", "mc_pool"]
 
 
+# # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
+# [[inputs.unbound]]
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   #use_sudo = false
+#
+#   ## The default location of the unbound-control binary can be overridden with:
+#   binary = "/usr/sbin/unbound-control"
+#
+#   ## The default timeout of 1s can be overriden with:
+#   timeout = "1s"
+#
+#   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
+#   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+
+
 # # A plugin to collect stats from Varnish HTTP Cache
 # [[inputs.varnish]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
@@ -2485,6 +2706,10 @@
 #   ## Glob matching can be used, ie, stats = ["MAIN.*"]
 #   ## stats may also be set to ["*"], which will collect all stats
 #   stats = ["MAIN.cache_hit", "MAIN.cache_miss", "MAIN.uptime"]
+#
+#   ## Optional name for the varnish instance (or working directory) to query
+#   ## Usually appened after -n in varnish cli
+#   #name = instanceName
 
 
 # # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
@@ -2687,7 +2912,10 @@
 
 # # Read metrics from MQTT topic(s)
 # [[inputs.mqtt_consumer]]
-#   servers = ["localhost:1883"]
+#   ## MQTT broker URLs to be used. The format should be scheme://host:port,
+#   ## schema can be tcp, ssl, or ws.
+#   servers = ["tcp://localhost:1883"]
+#
 #   ## MQTT QoS, must be 0, 1, or 2
 #   qos = 0
 #   ## Connection timeout for initial connection in seconds
@@ -2812,7 +3040,7 @@
 
 # # Statsd UDP/TCP Server
 # [[inputs.statsd]]
-#   ## Protocol, must be "tcp" or "udp" (default=udp)
+#   ## Protocol, must be "tcp", "udp", "udp4" or "udp6" (default=udp)
 #   protocol = "udp"
 #
 #   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
@@ -2899,19 +3127,6 @@
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
 
-# # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
-# [[inputs.unbound]]
-#   ## If running as a restricted user you can prepend sudo for additional access:
-#   #use_sudo = false
-#
-#   ## The default location of the unbound-control binary can be overridden with:
-#   binary = "/usr/sbin/unbound-control"
-#
-#   # The default timeout of 1s can be overriden with:
-#   #timeout = "1s"
-#
-#   # Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
-#   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
 
 # # A Webhooks Event collector
 # [[inputs.webhooks]]
@@ -2933,6 +3148,9 @@
 #
 #   [inputs.webhooks.papertrail]
 #     path = "/papertrail"
+#
+#   [inputs.webhooks.particle]
+#     path = "/particle"
 
 
 # # This plugin implements the Zipkin http server to gather trace and timing data needed to troubleshoot latency problems in microservice architectures.
diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
index c3e7a4fef..94a3323e5 100644
--- a/plugins/inputs/unbound/unbound.go
+++ b/plugins/inputs/unbound/unbound.go
@@ -45,7 +45,7 @@ var sampleConfig = `
 `
 
 func (s *Unbound) Description() string {
-	return "A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver "
+	return "A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver"
 }
 
 // SampleConfig displays configuration instructions
diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go
index d8a6e07d4..fa31ec490 100644
--- a/plugins/inputs/webhooks/webhooks.go
+++ b/plugins/inputs/webhooks/webhooks.go
@@ -64,7 +64,7 @@ func (wb *Webhooks) SampleConfig() string {
 
   [inputs.webhooks.papertrail]
     path = "/papertrail"
-	
+
   [inputs.webhooks.particle]
     path = "/particle"
  `

From bdda6ceb7027ec096d9c2529fd8f14d9b689de29 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 1 Dec 2017 11:52:46 -0800
Subject: [PATCH 0789/1302] Update next version number for dev builds

---
 cmd/telegraf/telegraf.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 9e286e362..2f7b0c8e5 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -56,7 +56,7 @@ var fService = flag.String("service", "",
 	"operate on the service")
 
 var (
-	nextVersion = "1.5.0"
+	nextVersion = "1.6.0"
 	version     string
 	commit      string
 	branch      string

From d8966d506772eb8bae12c115a8bdfc86cbacee82 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Dec 2017 13:18:14 -0800
Subject: [PATCH 0790/1302] Fix formatting in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 030052960..7b0f92dc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer
 - [particle](./plugins/inputs/webhooks/particle/README.md) - Thanks to @davidgs
-- [pf](./plugins/inputs/pf/README.md) Thanks to @nferch
+- [pf](./plugins/inputs/pf/README.md) - Thanks to @nferch
 - [postfix](./plugins/inputs/postfix/README.md) - Thanks to @phemmer
 - [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
 - [solr](./plugins/inputs/solr/README.md) - Thanks to @ljagiello

From 177e7e2c73d7afe0cc6e705abe82ec00a3d5e59a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 6 Dec 2017 14:55:29 -0800
Subject: [PATCH 0791/1302] Log connect error only in wavefront output (#3549)

---
 plugins/outputs/wavefront/wavefront.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 85a73e319..be3a7d758 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -101,11 +101,13 @@ func (w *Wavefront) Connect() error {
 	uri := fmt.Sprintf("%s:%d", w.Host, w.Port)
 	_, err := net.ResolveTCPAddr("tcp", uri)
 	if err != nil {
-		return fmt.Errorf("Wavefront: TCP address cannot be resolved %s", err.Error())
+		log.Printf("Wavefront: TCP address cannot be resolved %s", err.Error())
+		return nil
 	}
 	connection, err := net.Dial("tcp", uri)
 	if err != nil {
-		return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
+		log.Printf("Wavefront: TCP connect fail %s", err.Error())
+		return nil
 	}
 	defer connection.Close()
 	return nil

From 4d91162abd15bcb6c59eb11951d562e18c82e542 Mon Sep 17 00:00:00 2001
From: Arkady Emelyanov <arkady-emelyanov@users.noreply.github.com>
Date: Thu, 7 Dec 2017 22:31:03 +0300
Subject: [PATCH 0792/1302] Add health status mapping from string to int in
 elasticsearch input (#3551)

---
 plugins/inputs/elasticsearch/README.md        | 11 +++++++++++
 plugins/inputs/elasticsearch/elasticsearch.go | 15 +++++++++++++++
 plugins/inputs/elasticsearch/testdata_test.go |  3 +++
 3 files changed, 29 insertions(+)

diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index 5698cc7f0..65869ae94 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -46,6 +46,17 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
   # insecure_skip_verify = false
 ```
 
+### Status mappings
+
+When reporting health (green/yellow/red), additional field `status_code`
+is reported. Field contains mapping from status:string to status_code:int
+with following rules:
+
+* `green` - 1
+* `yellow` - 2
+* `red` - 3
+* `unknown` - 0
+
 ### Measurements & Fields:
 
 field data circuit breaker measurement names:
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index f5ddef5fb..32e283df7 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -143,6 +143,19 @@ func NewElasticsearch() *Elasticsearch {
 	}
 }
 
+// perform status mapping
+func mapHealthStatusToCode(s string) int {
+	switch strings.ToLower(s) {
+	case "green":
+		return 1
+	case "yellow":
+		return 2
+	case "red":
+		return 3
+	}
+	return 0
+}
+
 // SampleConfig returns sample configuration for this plugin.
 func (e *Elasticsearch) SampleConfig() string {
 	return sampleConfig
@@ -311,6 +324,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
 		"status":                healthStats.Status,
+		"status_code":           mapHealthStatusToCode(healthStats.Status),
 		"timed_out":             healthStats.TimedOut,
 		"number_of_nodes":       healthStats.NumberOfNodes,
 		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
@@ -330,6 +344,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 	for name, health := range healthStats.Indices {
 		indexFields := map[string]interface{}{
 			"status":                health.Status,
+			"status_code":           mapHealthStatusToCode(health.Status),
 			"number_of_shards":      health.NumberOfShards,
 			"number_of_replicas":    health.NumberOfReplicas,
 			"active_primary_shards": health.ActivePrimaryShards,
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index 6e487ff3f..8229fd66e 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -54,6 +54,7 @@ const clusterHealthResponseWithIndices = `
 
 var clusterHealthExpected = map[string]interface{}{
 	"status":                "green",
+	"status_code":           1,
 	"timed_out":             false,
 	"number_of_nodes":       3,
 	"number_of_data_nodes":  3,
@@ -66,6 +67,7 @@ var clusterHealthExpected = map[string]interface{}{
 
 var v1IndexExpected = map[string]interface{}{
 	"status":                "green",
+	"status_code":           1,
 	"number_of_shards":      10,
 	"number_of_replicas":    1,
 	"active_primary_shards": 10,
@@ -77,6 +79,7 @@ var v1IndexExpected = map[string]interface{}{
 
 var v2IndexExpected = map[string]interface{}{
 	"status":                "red",
+	"status_code":           3,
 	"number_of_shards":      10,
 	"number_of_replicas":    1,
 	"active_primary_shards": 0,

From 654e953a89678c387cb42afe9d5a060b526fca19 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 7 Dec 2017 11:32:54 -0800
Subject: [PATCH 0793/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b0f92dc6..f635b7c04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.6 [unreleased]
+
+### Features
+- [3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
+
 ## v1.5 [unreleased]
 
 ### New Plugins

From 574034c30173d7cd480ec4abbcaf749d084d0a4a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 8 Dec 2017 13:22:41 -0800
Subject: [PATCH 0794/1302] Use device name instead of abs path for devices tag
 in smart input (#3550)

---
 plugins/inputs/smart/README.md     |  6 +++---
 plugins/inputs/smart/smart.go      | 11 +++++++----
 plugins/inputs/smart/smart_test.go | 28 ++++++++++++++--------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/plugins/inputs/smart/README.md b/plugins/inputs/smart/README.md
index a81b344a5..6af962793 100644
--- a/plugins/inputs/smart/README.md
+++ b/plugins/inputs/smart/README.md
@@ -129,7 +129,7 @@ the configuration to execute that.
 
 Example output from an _Apple SSD_:
 ```
-> smart_attribute,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=199,name=UDMA_CRC_Error_Count,flags=-O-RC-,fail=-,host=mbpro.local,device=/dev/rdisk0 threshold=0i,raw_value=0i,exit_status=0i,value=200i,worst=200i 1502536854000000000
-> smart_attribute,device=/dev/rdisk0,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=240,name=Unknown_SSD_Attribute,flags=-O---K,fail=-,host=mbpro.local exit_status=0i,value=100i,worst=100i,threshold=0i,raw_value=0i 1502536854000000000
-> smart_device,enabled=Enabled,host=mbpro.local,device=/dev/rdisk0,model=APPLE\ SSD\ SM0512F,serial_no=S1K5NYCD964433,wwn=5002538655584d30,capacity=500277790720 udma_crc_errors=0i,exit_status=0i,health_ok=true,read_error_rate=0i,temp_c=40i 1502536854000000000
+> smart_attribute,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=199,name=UDMA_CRC_Error_Count,flags=-O-RC-,fail=-,host=mbpro.local,device=rdisk0 threshold=0i,raw_value=0i,exit_status=0i,value=200i,worst=200i 1502536854000000000
+> smart_attribute,device=rdisk0,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=240,name=Unknown_SSD_Attribute,flags=-O---K,fail=-,host=mbpro.local exit_status=0i,value=100i,worst=100i,threshold=0i,raw_value=0i 1502536854000000000
+> smart_device,enabled=Enabled,host=mbpro.local,device=rdisk0,model=APPLE\ SSD\ SM0512F,serial_no=S1K5NYCD964433,wwn=5002538655584d30,capacity=500277790720 udma_crc_errors=0i,exit_status=0i,health_ok=true,read_error_rate=0i,temp_c=40i 1502536854000000000
 ```
diff --git a/plugins/inputs/smart/smart.go b/plugins/inputs/smart/smart.go
index a754d1ace..dda115d02 100644
--- a/plugins/inputs/smart/smart.go
+++ b/plugins/inputs/smart/smart.go
@@ -3,6 +3,7 @@ package smart
 import (
 	"fmt"
 	"os/exec"
+	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -178,13 +179,13 @@ func exitStatus(err error) (int, error) {
 	return 0, err
 }
 
-func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, path, nockeck, device string, wg *sync.WaitGroup) {
+func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, smartctl, nockeck, device string, wg *sync.WaitGroup) {
 
 	defer wg.Done()
 	// smartctl 5.41 & 5.42 have are broken regarding handling of --nocheck/-n
 	args := []string{"--info", "--health", "--attributes", "--tolerance=verypermissive", "-n", nockeck, "--format=brief"}
 	args = append(args, strings.Split(device, " ")...)
-	cmd := sudo(usesudo, path, args...)
+	cmd := sudo(usesudo, smartctl, args...)
 	out, e := internal.CombinedOutputTimeout(cmd, time.Second*5)
 	outStr := string(out)
 
@@ -196,7 +197,8 @@ func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, path, nockec
 	}
 
 	device_tags := map[string]string{}
-	device_tags["device"] = strings.Split(device, " ")[0]
+	device_node := strings.Split(device, " ")[0]
+	device_tags["device"] = path.Base(device_node)
 	device_fields := make(map[string]interface{})
 	device_fields["exit_status"] = exitStatus
 
@@ -240,7 +242,8 @@ func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, path, nockec
 				tags := map[string]string{}
 				fields := make(map[string]interface{})
 
-				tags["device"] = strings.Split(device, " ")[0]
+				device_node := strings.Split(device, " ")[0]
+				tags["device"] = path.Base(device_node)
 
 				if serial, ok := device_tags["serial_no"]; ok {
 					tags["serial_no"] = serial
diff --git a/plugins/inputs/smart/smart_test.go b/plugins/inputs/smart/smart_test.go
index c8e777033..da658f5f9 100644
--- a/plugins/inputs/smart/smart_test.go
+++ b/plugins/inputs/smart/smart_test.go
@@ -89,7 +89,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "1",
@@ -107,7 +107,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "5",
@@ -125,7 +125,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "9",
@@ -143,7 +143,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "12",
@@ -161,7 +161,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "169",
@@ -179,7 +179,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "173",
@@ -197,7 +197,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "190",
@@ -215,7 +215,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "192",
@@ -233,7 +233,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "194",
@@ -251,7 +251,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "197",
@@ -269,7 +269,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "199",
@@ -287,7 +287,7 @@ func TestGatherAttributes(t *testing.T) {
 				"exit_status": int(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
 				"id":        "240",
@@ -317,7 +317,7 @@ func TestGatherAttributes(t *testing.T) {
 				"udma_crc_errors": int64(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"model":     "APPLE SSD SM256E",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",
@@ -363,7 +363,7 @@ func TestGatherNoAttributes(t *testing.T) {
 				"udma_crc_errors": int64(0),
 			},
 			map[string]string{
-				"device":    "/dev/ada0",
+				"device":    "ada0",
 				"model":     "APPLE SSD SM256E",
 				"serial_no": "S0X5NZBC422720",
 				"wwn":       "5002538043584d30",

From 4f42d8a298a4be452bd853c708d5f8f05bbeb9ee Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 7 Dec 2017 15:11:04 -0800
Subject: [PATCH 0795/1302] Add benchmark test for single metric

---
 plugins/parsers/influx/parser_test.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 67833fc56..959fc0982 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -241,6 +241,17 @@ func TestParseInvalidInflux(t *testing.T) {
 
 }
 
+func BenchmarkSingle(b *testing.B) {
+	parser := InfluxParser{}
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		_, err := parser.Parse([]byte("cpu value=42\n"))
+		if err != nil {
+			panic(err)
+		}
+	}
+}
+
 func BenchmarkParse(b *testing.B) {
 	var err error
 	parser := InfluxParser{}

From 37095ef47d2abf91097c5df68228420e4ce83aa1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 8 Dec 2017 17:59:06 -0800
Subject: [PATCH 0796/1302] Update sarama-cluster to latest release (#3560)

---
 Godeps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Godeps b/Godeps
index 252e0b4b2..f69949c29 100644
--- a/Godeps
+++ b/Godeps
@@ -4,7 +4,7 @@ github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/bsm/sarama-cluster ccdc0803695fbce22f1706d04ded46cd518fd832
+github.com/bsm/sarama-cluster abf039439f66c1ce78017f560b490612552f6472
 github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
 github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
 github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
@@ -65,7 +65,7 @@ github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
 github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
-github.com/Shopify/sarama c01858abb625b73a3af51d0798e4ad42c8147093
+github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5

From 88746b01c3ccf9edf669e260f1990aa244a9b7e0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 8 Dec 2017 18:01:56 -0800
Subject: [PATCH 0797/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f635b7c04..4b7b09c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
 - [#3263](https://github.com/influxdata/telegraf/issues/3263): Fix snmp-tools output parsing with Windows EOLs.
 - [#3447](https://github.com/influxdata/telegraf/issues/3447): Add shadow-utils dependency to rpm package.
 - [#3448](https://github.com/influxdata/telegraf/issues/3448): Use deb-systemd-invoke to restart service.
+- [#3553](https://github.com/influxdata/telegraf/issues/3553): Fix kafka_consumer outside range of offsets error.
 
 ## v1.4.5 [2017-12-01]
 

From 93d16a46036d27629c1f5e081681924f9e1d4d64 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 8 Dec 2017 18:03:12 -0800
Subject: [PATCH 0798/1302] Use auto type detection for scanned devices in
 smart input (#3561)

---
 plugins/inputs/smart/smart.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/smart/smart.go b/plugins/inputs/smart/smart.go
index dda115d02..bc130363b 100644
--- a/plugins/inputs/smart/smart.go
+++ b/plugins/inputs/smart/smart.go
@@ -135,7 +135,7 @@ func (m *Smart) scan() ([]string, error) {
 
 	devices := []string{}
 	for _, line := range strings.Split(string(out), "\n") {
-		dev := strings.Split(line, "#")
+		dev := strings.Split(line, " ")
 		if len(dev) > 1 && !excludedDev(m.Excludes, strings.TrimSpace(dev[0])) {
 			devices = append(devices, strings.TrimSpace(dev[0]))
 		}

From 663a5b1f507807e551cd499f785acabe276ce5f5 Mon Sep 17 00:00:00 2001
From: Ted Zlatanov <tzz@lifelogs.com>
Date: Mon, 11 Dec 2017 18:31:52 -0500
Subject: [PATCH 0799/1302] Support I (idle) process state on procfs+Linux
 (#3530)

---
 plugins/inputs/system/PROCESSES_README.md | 4 ++--
 plugins/inputs/system/processes.go        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/system/PROCESSES_README.md b/plugins/inputs/system/PROCESSES_README.md
index 508e1fa81..3c2e27291 100644
--- a/plugins/inputs/system/PROCESSES_README.md
+++ b/plugins/inputs/system/PROCESSES_README.md
@@ -30,7 +30,7 @@ Using the environment variable `HOST_PROC` the plugin will retrieve process info
     - zombie
     - dead
     - wait (freebsd only)
-    - idle (bsd only)
+    - idle (bsd and Linux 4+ only)
     - paging (linux only)
     - total_threads (linux only)
 
@@ -47,7 +47,7 @@ Linux  FreeBSD  Darwin  meaning
   Z       Z       Z     zombie
   X      none    none   dead
   T       T       T     stopped
- none     I       I     idle (sleeping for longer than about 20 seconds)
+  I       I       I     idle (sleeping for longer than about 20 seconds)
   D      D,L      U     blocked (waiting in uninterruptible sleep, or locked)
   W       W      none   paging (linux kernel < 2.6 only), wait (freebsd)
 ```
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index 1ceb4fb2d..9258bc417 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -85,6 +85,7 @@ func getEmptyFields() map[string]interface{} {
 		fields["dead"] = int64(0)
 		fields["paging"] = int64(0)
 		fields["total_threads"] = int64(0)
+		fields["idle"] = int64(0)
 	}
 	return fields
 }
@@ -174,6 +175,8 @@ func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
 			fields["stopped"] = fields["stopped"].(int64) + int64(1)
 		case 'W':
 			fields["paging"] = fields["paging"].(int64) + int64(1)
+		case 'I':
+			fields["idle"] = fields["idle"].(int64) + int64(1)
 		default:
 			log.Printf("I! processes: Unknown state [ %s ] in file %s",
 				string(stats[0][0]), filename)

From 14b31a23545270d7f9464872bba4c4f07083f586 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Dec 2017 15:33:44 -0800
Subject: [PATCH 0800/1302] Add idle state to processes test

---
 plugins/inputs/system/processes_test.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/system/processes_test.go b/plugins/inputs/system/processes_test.go
index 8a9b0fb6b..5401e1a70 100644
--- a/plugins/inputs/system/processes_test.go
+++ b/plugins/inputs/system/processes_test.go
@@ -44,7 +44,8 @@ func TestFromPS(t *testing.T) {
 	fields["zombies"] = int64(1)
 	fields["running"] = int64(4)
 	fields["sleeping"] = int64(34)
-	fields["total"] = int64(43)
+	fields["idle"] = int64(2)
+	fields["total"] = int64(45)
 
 	acc.AssertContainsTaggedFields(t, "processes", fields, map[string]string{})
 }
@@ -172,6 +173,8 @@ U
 Z
 D
 S+
+I
+I
 `
 
 const testProcStat = `10 (rcuob/0) %s 2 0 0 0 -1 2129984 0 0 0 0 0 0 0 0 20 0 %s 0 11 0 0 18446744073709551615 0 0 0 0 0 0 0 2147483647 0 18446744073709551615 0 0 17 0 0 0 0 0 0 0 0 0 0 0 0 0 0

From ff634c5056bd12a290f26c8e8888776077ff3632 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Dec 2017 15:34:52 -0800
Subject: [PATCH 0801/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7b09c58..bc6abb281 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Features
 - [3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
+- [3530](https://github.com/influxdata/telegraf/pull/3530): Support I (idle) process state on procfs+Linux.
 
 ## v1.5 [unreleased]
 

From ab8376de0395becfe7cd4029326d2d7731fb9de1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Dec 2017 17:58:06 -0800
Subject: [PATCH 0802/1302] Update exec plugin documentation

---
 plugins/inputs/exec/README.md | 180 ++++++----------------------------
 1 file changed, 31 insertions(+), 149 deletions(-)

diff --git a/plugins/inputs/exec/README.md b/plugins/inputs/exec/README.md
index 0e2563900..788c8eec0 100644
--- a/plugins/inputs/exec/README.md
+++ b/plugins/inputs/exec/README.md
@@ -1,175 +1,57 @@
 # Exec Input Plugin
 
-Please also see: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md)
+The `exec` plugin executes the `commands` on every interval and parses metrics from
+their output in any one of the accepted [Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md).
 
-### Example 1 - JSON
+This plugin can be used to poll for custom metrics from any source.
 
-#### Configuration
-
-In this example a script called ```/tmp/test.sh```, a script called ```/tmp/test2.sh```, and
-all scripts matching glob pattern ```/tmp/collect_*.sh``` are configured for ```[[inputs.exec]]```
-in JSON format. Glob patterns are matched on every run, so adding new scripts that match the pattern
-will cause them to be picked up immediately.
+### Configuration:
 
 ```toml
-# Read flattened metrics from one or more commands that output JSON to stdout
 [[inputs.exec]]
-  # Shell/commands array
-  # Full command line to executable with parameters, or a glob pattern to run all matching files.
-  commands = ["/tmp/test.sh", "/tmp/test2.sh", "/tmp/collect_*.sh"]
+  ## Commands array
+  commands = [
+    "/tmp/test.sh",
+    "/usr/bin/mycollector --foo=bar",
+    "/tmp/collect_*.sh"
+  ]
 
   ## Timeout for each command to complete.
   timeout = "5s"
 
-  # Data format to consume.
-  # NOTE json only reads numerical measurements, strings and booleans are ignored.
-  data_format = "json"
-
-  # measurement name suffix (for separating different commands)
+  ## measurement name suffix (for separating different commands)
   name_suffix = "_mycollector"
-```
 
-Other options for modifying the measurement names are:
-
-```
-name_prefix = "prefix_"
-```
-
-Let's say that we have the above configuration, and mycollector outputs the
-following JSON:
-
-```json
-{
-    "a": 0.5,
-    "b": {
-        "c": 0.1,
-        "d": 5
-    }
-}
-```
-
-The collected metrics will be stored as fields under the measurement
-"exec_mycollector":
-
-```
-exec_mycollector a=0.5,b_c=0.1,b_d=5 1452815002357578567
-```
-If using JSON, only numeric values are parsed and turned into floats. Booleans
-and strings will be ignored.
-
-### Example 2 - Influx Line-Protocol
-
-In this example an application called ```/usr/bin/line_protocol_collector```
-and a script called ```/tmp/test2.sh``` are configured for ```[[inputs.exec]]```
-in influx line-protocol format.
-
-#### Configuration
-
-```toml
-[[inputs.exec]]
-  # Shell/commands array
-  # compatible with old version
-  # we can still use the old command configuration
-  # command = "/usr/bin/line_protocol_collector"
-  commands = ["/usr/bin/line_protocol_collector","/tmp/test2.sh"]
-
-  ## Timeout for each command to complete.
-  timeout = "5s"
-
-  # Data format to consume.
-  # NOTE json only reads numerical measurements, strings and booleans are ignored.
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   data_format = "influx"
 ```
 
-The line_protocol_collector application outputs the following line protocol:
+Glob patterns in the `command` option are matched on every run, so adding new
+scripts that match the pattern will cause them to be picked up immediately.
 
-```
-cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu1,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu2,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu3,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu4,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu5,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu6,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
+### Example:
+
+This script produces static values, since no timestamp is specified the values are at the current time.
+```sh
+#!/bin/sh
+echo 'example,tag1=a,tag2=b i=42i,j=43i,k=44i'
 ```
 
-You will get data in InfluxDB exactly as it is defined above,
-tags are cpu=cpuN, host=foo, and datacenter=us-east with fields usage_idle
-and usage_busy. They will receive a timestamp at collection time.
-Each line must end in \n, just as the Influx line protocol does.
-
-
-### Example 3 - Graphite
-
-We can also change the data_format to "graphite" to use the metrics collecting scripts such as (compatible with graphite):
-
-* Nagios [Metrics Plugins](https://exchange.nagios.org/directory/Plugins)
-* Sensu [Metrics Plugins](https://github.com/sensu-plugins)
-
-In this example a script called /tmp/test.sh and a script called /tmp/test2.sh are configured for [[inputs.exec]] in graphite format.
-
-#### Configuration
-
+It can be paired with the following configuration and will be ran at the `interval` of the agent.
 ```toml
-# Read flattened metrics from one or more commands that output JSON to stdout
 [[inputs.exec]]
-  # Shell/commands array
-  commands = ["/tmp/test.sh","/tmp/test2.sh"]
-
-  ## Timeout for each command to complete.
+  commands = ["sh /tmp/test.sh"]
   timeout = "5s"
-
-  # Data format to consume.
-  # NOTE json only reads numerical measurements, strings and booleans are ignored.
-  data_format = "graphite"
-
-  # measurement name suffix (for separating different commands)
-  name_suffix = "_mycollector"
-
-  ## Below configuration will be used for data_format = "graphite", can be ignored for other data_format
-  ## If matching multiple measurement files, this string will be used to join the matched values.
-  separator = "."
-
-  ## Each template line requires a template pattern.  It can have an optional
-  ## filter before the template and separated by spaces.  It can also have optional extra
-  ## tags following the template.  Multiple tags should be separated by commas and no spaces
-  ## similar to the line protocol format.  The can be only one default template.
-  ## Templates support below format:
-  ## 1. filter + template
-  ## 2. filter + template + extra tag
-  ## 3. filter + template with field key
-  ## 4. default template
-  templates = [
-    "*.app env.service.resource.measurement",
-    "stats.* .host.measurement* region=us-west,agent=sensu",
-    "stats2.* .host.measurement.field",
-    "measurement*"
-  ]
-```
-Graphite messages are in this format:
-
-```
-metric_path value timestamp\n
+  data_format = "influx"
 ```
 
-__metric_path__ is the metric namespace that you want to populate.
+### Common Issues:
 
-__value__ is the value that you want to assign to the metric at this time.
+#### Q: My script works when I run it by hand, but not when Telegraf is running as a service.
 
-__timestamp__ is the unix epoch time.
-
-And test.sh/test2.sh will output:
-
-```
-sensu.metric.net.server0.eth0.rx_packets 461295119435 1444234982
-sensu.metric.net.server0.eth0.tx_bytes 1093086493388480 1444234982
-sensu.metric.net.server0.eth0.rx_bytes 1015633926034834 1444234982
-sensu.metric.net.server0.eth0.tx_errors 0 1444234982
-sensu.metric.net.server0.eth0.rx_errors 0 1444234982
-sensu.metric.net.server0.eth0.tx_dropped 0 1444234982
-sensu.metric.net.server0.eth0.rx_dropped 0 1444234982
-```
-
-The templates configuration will be used to parse the graphite metrics to support influxdb/opentsdb tagging store engines.
-
-More detail information about templates, please refer to [The graphite Input](https://github.com/influxdata/influxdb/blob/master/services/graphite/README.md)
+This may be related to the Telegraf service running as a different user.  The
+official packages run Telegraf as the `telegraf` user and group on Linux
+systems.

From 8484de6c12873b2815f679bf1d7a7d61a794ee6e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 11 Dec 2017 18:00:19 -0800
Subject: [PATCH 0803/1302] Fix separation of multiple prometheus_client
 outputs (#3570)

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

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index f0b0a7673..5b3ee2189 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -79,19 +79,28 @@ var sampleConfig = `
 `
 
 func (p *PrometheusClient) Start() error {
-	prometheus.Register(p)
-
+	defaultCollectors := map[string]bool{
+		"gocollector": true,
+		"process":     true,
+	}
 	for _, collector := range p.CollectorsExclude {
+		delete(defaultCollectors, collector)
+	}
+
+	registry := prometheus.NewRegistry()
+	for collector, _ := range defaultCollectors {
 		switch collector {
 		case "gocollector":
-			prometheus.Unregister(prometheus.NewGoCollector())
+			registry.Register(prometheus.NewGoCollector())
 		case "process":
-			prometheus.Unregister(prometheus.NewProcessCollector(os.Getpid(), ""))
+			registry.Register(prometheus.NewProcessCollector(os.Getpid(), ""))
 		default:
 			return fmt.Errorf("unrecognized collector %s", collector)
 		}
 	}
 
+	registry.Register(p)
+
 	if p.Listen == "" {
 		p.Listen = "localhost:9273"
 	}
@@ -102,8 +111,7 @@ func (p *PrometheusClient) Start() error {
 
 	mux := http.NewServeMux()
 	mux.Handle(p.Path, promhttp.HandlerFor(
-		prometheus.DefaultGatherer,
-		promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
+		registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
 
 	p.server = &http.Server{
 		Addr:    p.Listen,

From abcad439eb54f71e2f61f96dee27fb11dba956d1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Dec 2017 18:01:50 -0800
Subject: [PATCH 0804/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc6abb281..1038cd6cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
 - [#3447](https://github.com/influxdata/telegraf/issues/3447): Add shadow-utils dependency to rpm package.
 - [#3448](https://github.com/influxdata/telegraf/issues/3448): Use deb-systemd-invoke to restart service.
 - [#3553](https://github.com/influxdata/telegraf/issues/3553): Fix kafka_consumer outside range of offsets error.
+- [#3568](https://github.com/influxdata/telegraf/issues/3568): Fix separation of multiple prometheus_client outputs.
 
 ## v1.4.5 [2017-12-01]
 

From d7d224d5114f6e27b32932bfc90d38e2085eadbe Mon Sep 17 00:00:00 2001
From: Steve Banik <28155421+stevebanik-ndsc@users.noreply.github.com>
Date: Tue, 12 Dec 2017 13:21:32 -0600
Subject: [PATCH 0805/1302] Fixed typo in README.md (#3574)

---
 plugins/inputs/win_perf_counters/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index 06d9f1b9d..8627d02fd 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -284,7 +284,7 @@ if any of the combinations of ObjectName/Instances/Counters are invalid.
 ```
 
 
-### .NET Montioring
+### .NET Monitoring
 ```
   [[inputs.win_perf_counters.object]]
     # .NET CLR Exceptions, in this case for IIS only

From df9c7590b3865aa8facada3c5243d5e5e9c5a53d Mon Sep 17 00:00:00 2001
From: Mike Danko <mike@l4m3.com>
Date: Tue, 12 Dec 2017 16:22:11 -0500
Subject: [PATCH 0806/1302] Fix various mysql data type conversions (#3554)

---
 plugins/inputs/mysql/mysql.go      | 321 ++++-------------------------
 plugins/inputs/mysql/mysql_test.go |  21 +-
 2 files changed, 54 insertions(+), 288 deletions(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index c3dc38423..1e75bf6b5 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -169,182 +169,6 @@ func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-type mapping struct {
-	onServer string
-	inExport string
-}
-
-var mappings = []*mapping{
-	{
-		onServer: "Aborted_",
-		inExport: "aborted_",
-	},
-	{
-		onServer: "Bytes_",
-		inExport: "bytes_",
-	},
-	{
-		onServer: "Com_",
-		inExport: "commands_",
-	},
-	{
-		onServer: "Created_",
-		inExport: "created_",
-	},
-	{
-		onServer: "Handler_",
-		inExport: "handler_",
-	},
-	{
-		onServer: "Innodb_",
-		inExport: "innodb_",
-	},
-	{
-		onServer: "Key_",
-		inExport: "key_",
-	},
-	{
-		onServer: "Open_",
-		inExport: "open_",
-	},
-	{
-		onServer: "Opened_",
-		inExport: "opened_",
-	},
-	{
-		onServer: "Qcache_",
-		inExport: "qcache_",
-	},
-	{
-		onServer: "Table_",
-		inExport: "table_",
-	},
-	{
-		onServer: "Tokudb_",
-		inExport: "tokudb_",
-	},
-	{
-		onServer: "Threads_",
-		inExport: "threads_",
-	},
-	{
-		onServer: "Access_",
-		inExport: "access_",
-	},
-	{
-		onServer: "Aria__",
-		inExport: "aria_",
-	},
-	{
-		onServer: "Binlog__",
-		inExport: "binlog_",
-	},
-	{
-		onServer: "Busy_",
-		inExport: "busy_",
-	},
-	{
-		onServer: "Connection_",
-		inExport: "connection_",
-	},
-	{
-		onServer: "Delayed_",
-		inExport: "delayed_",
-	},
-	{
-		onServer: "Empty_",
-		inExport: "empty_",
-	},
-	{
-		onServer: "Executed_",
-		inExport: "executed_",
-	},
-	{
-		onServer: "Executed_",
-		inExport: "executed_",
-	},
-	{
-		onServer: "Feature_",
-		inExport: "feature_",
-	},
-	{
-		onServer: "Flush_",
-		inExport: "flush_",
-	},
-	{
-		onServer: "Last_",
-		inExport: "last_",
-	},
-	{
-		onServer: "Master_",
-		inExport: "master_",
-	},
-	{
-		onServer: "Max_",
-		inExport: "max_",
-	},
-	{
-		onServer: "Memory_",
-		inExport: "memory_",
-	},
-	{
-		onServer: "Not_",
-		inExport: "not_",
-	},
-	{
-		onServer: "Performance_",
-		inExport: "performance_",
-	},
-	{
-		onServer: "Prepared_",
-		inExport: "prepared_",
-	},
-	{
-		onServer: "Rows_",
-		inExport: "rows_",
-	},
-	{
-		onServer: "Rpl_",
-		inExport: "rpl_",
-	},
-	{
-		onServer: "Select_",
-		inExport: "select_",
-	},
-	{
-		onServer: "Slave_",
-		inExport: "slave_",
-	},
-	{
-		onServer: "Slow_",
-		inExport: "slow_",
-	},
-	{
-		onServer: "Sort_",
-		inExport: "sort_",
-	},
-	{
-		onServer: "Subquery_",
-		inExport: "subquery_",
-	},
-	{
-		onServer: "Tc_",
-		inExport: "tc_",
-	},
-	{
-		onServer: "Threadpool_",
-		inExport: "threadpool_",
-	},
-	{
-		onServer: "wsrep_",
-		inExport: "wsrep_",
-	},
-	{
-		onServer: "Uptime_",
-		inExport: "uptime_",
-	},
-}
-
 var (
 	// status counter
 	generalThreadStates = map[string]uint32{
@@ -717,9 +541,8 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accu
 			fields[key] = string(val)
 			tags[key] = string(val)
 		}
-		// parse value, if it is numeric then save, otherwise ignore
-		if floatVal, ok := parseValue(val); ok {
-			fields[key] = floatVal
+		if value, ok := parseValue(val); ok {
+			fields[key] = value
 		}
 		// Send 20 fields at a time
 		if len(fields) >= 20 {
@@ -769,7 +592,7 @@ func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc telegraf.Accumu
 		}
 		// range over columns, and try to parse values
 		for i, col := range cols {
-			// skip unparsable values
+			col = strings.ToLower(col)
 			if value, ok := parseValue(*vals[i].(*sql.RawBytes)); ok {
 				fields["slave_"+col] = value
 			}
@@ -820,98 +643,36 @@ func (m *Mysql) gatherBinaryLogs(db *sql.DB, serv string, acc telegraf.Accumulat
 // the mappings of actual names and names of each status to be exported
 // to output is provided on mappings variable
 func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
-	// If user forgot the '/', add it
-	if strings.HasSuffix(serv, ")") {
-		serv = serv + "/"
-	} else if serv == "localhost" {
-		serv = ""
-	}
-
 	// run query
 	rows, err := db.Query(globalStatusQuery)
 	if err != nil {
 		return err
 	}
+	defer rows.Close()
 
 	// parse the DSN and save host name as a tag
 	servtag := getDSNTag(serv)
 	tags := map[string]string{"server": servtag}
 	fields := make(map[string]interface{})
 	for rows.Next() {
-		var name string
-		var val interface{}
+		var key string
+		var val sql.RawBytes
 
-		err = rows.Scan(&name, &val)
-		if err != nil {
+		if err = rows.Scan(&key, &val); err != nil {
 			return err
 		}
 
-		var found bool
+		key = strings.ToLower(key)
 
-		// iterate over mappings and gather metrics that is provided on mapping
-		for _, mapped := range mappings {
-			if strings.HasPrefix(name, mapped.onServer) {
-				// convert numeric values to integer
-				i, _ := strconv.Atoi(string(val.([]byte)))
-				fields[mapped.inExport+name[len(mapped.onServer):]] = i
-				found = true
-			}
+		if value, ok := parseValue(val); ok {
+			fields[key] = value
 		}
+
 		// Send 20 fields at a time
 		if len(fields) >= 20 {
 			acc.AddFields("mysql", fields, tags)
 			fields = make(map[string]interface{})
 		}
-
-		if found {
-			continue
-		}
-
-		// search for specific values
-		switch name {
-		case "Queries":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["queries"] = i
-			}
-		case "Questions":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["questions"] = i
-			}
-		case "Slow_queries":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["slow_queries"] = i
-			}
-		case "Connections":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["connections"] = i
-			}
-		case "Syncs":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["syncs"] = i
-			}
-		case "Uptime":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", name, err))
-			} else {
-				fields["uptime"] = i
-			}
-		}
 	}
 	// Send any remaining fields
 	if len(fields) > 0 {
@@ -1059,7 +820,7 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.
 	for s, c := range stateCounts {
 		fields[newNamespace("threads", s)] = c
 	}
-	acc.AddFields("mysql_info_schema", fields, tags)
+	acc.AddFields("mysql_process_list", fields, tags)
 	return nil
 }
 
@@ -1272,7 +1033,7 @@ func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc tel
 		fields["auto_increment_column"] = incValue
 		fields["auto_increment_column_max"] = maxInt
 
-		acc.AddFields("mysql_info_schema", fields, tags)
+		acc.AddFields("mysql_table_schema", fields, tags)
 	}
 	return nil
 }
@@ -1287,21 +1048,19 @@ func (m *Mysql) gatherInnoDBMetrics(db *sql.DB, serv string, acc telegraf.Accumu
 	}
 	defer rows.Close()
 
-	var key string
-	var val sql.RawBytes
-
 	// parse DSN and save server tag
 	servtag := getDSNTag(serv)
 	tags := map[string]string{"server": servtag}
 	fields := make(map[string]interface{})
 	for rows.Next() {
+		var key string
+		var val sql.RawBytes
 		if err := rows.Scan(&key, &val); err != nil {
 			return err
 		}
 		key = strings.ToLower(key)
-		// parse value, if it is numeric then save, otherwise ignore
-		if floatVal, ok := parseValue(val); ok {
-			fields[key] = floatVal
+		if value, ok := parseValue(val); ok {
+			fields[key] = value
 		}
 		// Send 20 fields at a time
 		if len(fields) >= 20 {
@@ -1671,23 +1430,17 @@ func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc telegraf.Accumula
 			tags["schema"] = tableSchema
 			tags["table"] = tableName
 
-			acc.AddFields(newNamespace("info_schema", "table_rows"),
-				map[string]interface{}{"value": tableRows}, tags)
+			acc.AddFields("mysql_table_schema",
+				map[string]interface{}{"rows": tableRows}, tags)
 
-			dlTags := copyTags(tags)
-			dlTags["component"] = "data_length"
-			acc.AddFields(newNamespace("info_schema", "table_size", "data_length"),
-				map[string]interface{}{"value": dataLength}, dlTags)
+			acc.AddFields("mysql_table_schema",
+				map[string]interface{}{"data_length": dataLength}, tags)
 
-			ilTags := copyTags(tags)
-			ilTags["component"] = "index_length"
-			acc.AddFields(newNamespace("info_schema", "table_size", "index_length"),
-				map[string]interface{}{"value": indexLength}, ilTags)
+			acc.AddFields("mysql_table_schema",
+				map[string]interface{}{"index_length": indexLength}, tags)
 
-			dfTags := copyTags(tags)
-			dfTags["component"] = "data_free"
-			acc.AddFields(newNamespace("info_schema", "table_size", "data_free"),
-				map[string]interface{}{"value": dataFree}, dfTags)
+			acc.AddFields("mysql_table_schema",
+				map[string]interface{}{"data_free": dataFree}, tags)
 
 			versionTags := copyTags(tags)
 			versionTags["type"] = tableType
@@ -1695,24 +1448,34 @@ func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc telegraf.Accumula
 			versionTags["row_format"] = rowFormat
 			versionTags["create_options"] = createOptions
 
-			acc.AddFields(newNamespace("info_schema", "table_version"),
-				map[string]interface{}{"value": version}, versionTags)
+			acc.AddFields("mysql_table_schema_version",
+				map[string]interface{}{"table_version": version}, versionTags)
 		}
 	}
 	return nil
 }
 
 // parseValue can be used to convert values such as "ON","OFF","Yes","No" to 0,1
-func parseValue(value sql.RawBytes) (float64, bool) {
-	if bytes.Compare(value, []byte("Yes")) == 0 || bytes.Compare(value, []byte("ON")) == 0 {
+func parseValue(value sql.RawBytes) (interface{}, bool) {
+	if bytes.EqualFold(value, []byte("YES")) || bytes.Compare(value, []byte("ON")) == 0 {
 		return 1, true
 	}
 
-	if bytes.Compare(value, []byte("No")) == 0 || bytes.Compare(value, []byte("OFF")) == 0 {
+	if bytes.EqualFold(value, []byte("NO")) || bytes.Compare(value, []byte("OFF")) == 0 {
 		return 0, true
 	}
-	n, err := strconv.ParseFloat(string(value), 64)
-	return n, err == nil
+
+	if val, err := strconv.ParseInt(string(value), 10, 64); err == nil {
+		return val, true
+	}
+	if val, err := strconv.ParseFloat(string(value), 64); err == nil {
+		return val, true
+	}
+
+	if len(string(value)) > 0 {
+		return string(value), true
+	}
+	return nil, false
 }
 
 // findThreadState can be used to find thread state by command and plain state
diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
index 5356e7bd4..1820c9347 100644
--- a/plugins/inputs/mysql/mysql_test.go
+++ b/plugins/inputs/mysql/mysql_test.go
@@ -127,26 +127,29 @@ func TestMysqlDNSAddTimeout(t *testing.T) {
 		}
 	}
 }
-
 func TestParseValue(t *testing.T) {
 	testCases := []struct {
 		rawByte   sql.RawBytes
-		value     float64
+		output    interface{}
 		boolValue bool
 	}{
-		{sql.RawBytes("Yes"), 1, true},
-		{sql.RawBytes("No"), 0, false},
+		{sql.RawBytes("123"), int64(123), true},
+		{sql.RawBytes("abc"), "abc", true},
+		{sql.RawBytes("10.1"), 10.1, true},
 		{sql.RawBytes("ON"), 1, true},
-		{sql.RawBytes("OFF"), 0, false},
-		{sql.RawBytes("ABC"), 0, false},
+		{sql.RawBytes("OFF"), 0, true},
+		{sql.RawBytes("NO"), 0, true},
+		{sql.RawBytes("YES"), 1, true},
+		{sql.RawBytes("No"), 0, true},
+		{sql.RawBytes("Yes"), 1, true},
+		{sql.RawBytes(""), nil, false},
 	}
 	for _, cases := range testCases {
-		if value, ok := parseValue(cases.rawByte); value != cases.value && ok != cases.boolValue {
-			t.Errorf("want %d with %t, got %d with %t", int(cases.value), cases.boolValue, int(value), ok)
+		if got, ok := parseValue(cases.rawByte); got != cases.output && ok != cases.boolValue {
+			t.Errorf("for %s wanted %t, got %t", string(cases.rawByte), cases.output, got)
 		}
 	}
 }
-
 func TestNewNamespace(t *testing.T) {
 	testCases := []struct {
 		words     []string

From de180d1e56dace1ddc557491ebe7ac1d7a13542a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Dec 2017 13:32:47 -0800
Subject: [PATCH 0807/1302] Update changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1038cd6cc..824d4e0d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,25 @@
 ## v1.6 [unreleased]
 
+### Release Notes
+
+- The `mysql` input plugin has been updated to convert values to the
+  correct data type.  This may cause a `field type error` when inserting into
+  InfluxDB due the change of types.  It is recommended to drop the `mysql`,
+  `mysql_variables`, and `mysql_innodb`:
+  ```
+  DROP MEASUREMENT mysql
+  DROP MEASUREMENT mysql_variables
+  DROP MEASUREMENT mysql_innodb
+  ```
+
 ### Features
 - [3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
 - [3530](https://github.com/influxdata/telegraf/pull/3530): Support I (idle) process state on procfs+Linux.
 
+### Bugfixes
+
+- [1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
+
 ## v1.5 [unreleased]
 
 ### New Plugins

From fb3d66cdd3de41411e770cfd6b0837213df6dc57 Mon Sep 17 00:00:00 2001
From: Logan <MondayHopscotch@users.noreply.github.com>
Date: Wed, 13 Dec 2017 11:51:15 -0700
Subject: [PATCH 0808/1302] Typo and sentence consistency (#3581)

---
 docs/CONFIGURATION.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index bf8b4ebf6..b1ae47bf1 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -125,7 +125,7 @@ aggregator and will not get sent to the output plugins.
 * **name_suffix**: Specifies a suffix to attach to the measurement name.
 * **tags**: A map of tags to apply to a specific input's measurements.
 
-The [measurement filtering](#measurement-filtering) parameters be used to
+The [measurement filtering](#measurement-filtering) parameters can be used to
 limit what metrics are handled by the aggregator.  Excluded metrics are passed
 downstream to the next aggregator.
 
@@ -136,7 +136,7 @@ The following config parameters are available for all processors:
 * **order**: This is the order in which the processor(s) get executed. If this
 is not specified then processor execution order will be random.
 
-The [measurement filtering](#measurement-filtering) can parameters may be used
+The [measurement filtering](#measurement-filtering) parameters can be used
 to limit what metrics are handled by the processor.  Excluded metrics are
 passed downstream to the next processor.
 

From 8785c7d78ddebeef32be5f8aaa7c20bfb37fef2a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 13 Dec 2017 10:58:50 -0800
Subject: [PATCH 0809/1302] Update changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 824d4e0d2..9f01a7225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,12 +13,11 @@
   ```
 
 ### Features
-- [3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
-- [3530](https://github.com/influxdata/telegraf/pull/3530): Support I (idle) process state on procfs+Linux.
+- [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
 
 ### Bugfixes
 
-- [1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
+- [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
 ## v1.5 [unreleased]
 
@@ -100,6 +99,7 @@
 - [#3140](https://github.com/influxdata/telegraf/pull/3140): Add support for glob patterns in net input plugin.
 - [#3405](https://github.com/influxdata/telegraf/pull/3405): Add input plugin for OpenBSD/FreeBSD pf.
 - [#3528](https://github.com/influxdata/telegraf/pull/3528): Add option to amqp output to publish persistent messages.
+- [#3530](https://github.com/influxdata/telegraf/pull/3530): Support I (idle) process state on procfs+Linux.
 
 ### Bugfixes
 

From d935dfa9edd42c8ce5cbbffadf6ec23c815bb47d Mon Sep 17 00:00:00 2001
From: Ildar Svetlov <svetlov.ildar@gmail.com>
Date: Wed, 13 Dec 2017 23:13:56 +0400
Subject: [PATCH 0810/1302] Don't add system input uptime_format as a counter
 (#3578)

---
 plugins/inputs/system/SYSTEM_README.md | 3 ++-
 plugins/inputs/system/system.go        | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/system/SYSTEM_README.md b/plugins/inputs/system/SYSTEM_README.md
index 2ade1947b..09290832c 100644
--- a/plugins/inputs/system/SYSTEM_README.md
+++ b/plugins/inputs/system/SYSTEM_README.md
@@ -34,5 +34,6 @@ $ telegraf --config ~/ws/telegraf.conf --input-filter system --test
 * Plugin: system, Collection 1
 * Plugin: inputs.system, Collection 1
 > system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
-> system,host=tyrion uptime=1249632i,uptime_format="14 days, 11:07" 1483964144000000000
+> system,host=tyrion uptime=1249632i 1483964144000000000
+> system,host=tyrion uptime_format="14 days, 11:07" 1483964144000000000
 ```
diff --git a/plugins/inputs/system/system.go b/plugins/inputs/system/system.go
index 32c391f78..980e2fa38 100644
--- a/plugins/inputs/system/system.go
+++ b/plugins/inputs/system/system.go
@@ -46,7 +46,9 @@ func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
 		"n_cpus":  runtime.NumCPU(),
 	}, nil)
 	acc.AddCounter("system", map[string]interface{}{
-		"uptime":        hostinfo.Uptime,
+		"uptime": hostinfo.Uptime,
+	}, nil)
+	acc.AddFields("system", map[string]interface{}{
 		"uptime_format": format_uptime(hostinfo.Uptime),
 	}, nil)
 

From 15266bb7ebb92fc6a2136aadaf4d19a90df29a6c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 13 Dec 2017 11:17:36 -0800
Subject: [PATCH 0811/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f01a7225..934addce6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
   ```
 
 ### Features
+
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
 
 ### Bugfixes
@@ -116,6 +117,7 @@
 - [#3448](https://github.com/influxdata/telegraf/issues/3448): Use deb-systemd-invoke to restart service.
 - [#3553](https://github.com/influxdata/telegraf/issues/3553): Fix kafka_consumer outside range of offsets error.
 - [#3568](https://github.com/influxdata/telegraf/issues/3568): Fix separation of multiple prometheus_client outputs.
+- [#3577](https://github.com/influxdata/telegraf/issues/3577): Don't add system input uptime_format as a counter.
 
 ## v1.4.5 [2017-12-01]
 

From 9ad0297b1faac096f8ab66d8f037157f1ffc8af8 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <AntoineAugusti@users.noreply.github.com>
Date: Wed, 13 Dec 2017 20:22:47 +0100
Subject: [PATCH 0812/1302] Fix refType documentation for GitHub webhooks
 (#3579)

---
 plugins/inputs/webhooks/github/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/webhooks/github/README.md b/plugins/inputs/webhooks/github/README.md
index 908d92a63..5115d287c 100644
--- a/plugins/inputs/webhooks/github/README.md
+++ b/plugins/inputs/webhooks/github/README.md
@@ -45,7 +45,7 @@ The tag values and field values show the place on the incoming JSON object where
 * 'forks' = `event.repository.forks_count` int
 * 'issues' = `event.repository.open_issues_count` int
 * 'ref' = `event.ref` string
-* 'issues' = `event.ref_type` string
+* 'refType' = `event.ref_type` string
 
 #### [`delete` event](https://developer.github.com/v3/activity/events/types/#deleteevent)
 
@@ -61,7 +61,7 @@ The tag values and field values show the place on the incoming JSON object where
 * 'forks' = `event.repository.forks_count` int
 * 'issues' = `event.repository.open_issues_count` int
 * 'ref' = `event.ref` string
-* 'issues' = `event.ref_type` string
+* 'refType' = `event.ref_type` string
 
 #### [`deployment` event](https://developer.github.com/v3/activity/events/types/#deploymentevent)
 

From 6638fc68def15a8eb778eeeab3868df2e7da7c34 Mon Sep 17 00:00:00 2001
From: Brian Knight <brianknight10@gmail.com>
Date: Wed, 13 Dec 2017 14:24:48 -0500
Subject: [PATCH 0813/1302] Update README with missing Redis measurements
 (#3582)

---
 plugins/inputs/redis/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 263923d4a..60f4ac5d9 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -87,6 +87,8 @@ Additionally the plugin also calculates the hit/miss ratio (keyspace\_hitrate) a
 
     **Replication**
     - connected_slaves(int, number)
+    - master_link_down_since_seconds(int, number)
+    - master_link_status(string)
     - master_repl_offset(int, number)
     - repl_backlog_active(int, number)
     - repl_backlog_size(int, bytes)

From 5b40173bcb355a8186e543023517e45d2f35bccf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 13 Dec 2017 17:51:55 -0800
Subject: [PATCH 0814/1302] Remove AWS credential check from cloudwatch output
 (#3583)

This method is reported to not work with IAM Instance Profiles, and we
do not want to make any calls that would require additional permissions.
---
 plugins/outputs/cloudwatch/cloudwatch.go | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index b14953dbe..0c087ce57 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"github.com/aws/aws-sdk-go/service/sts"
 
 	"github.com/influxdata/telegraf"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
@@ -71,20 +70,7 @@ func (c *CloudWatch) Connect() error {
 		Token:     c.Token,
 	}
 	configProvider := credentialConfig.Credentials()
-
-	stsService := sts.New(configProvider)
-
-	params := &sts.GetSessionTokenInput{}
-
-	_, err := stsService.GetSessionToken(params)
-
-	if err != nil {
-		log.Printf("E! cloudwatch: Cannot use credentials to connect to AWS : %+v \n", err.Error())
-		return err
-	}
-
 	c.svc = cloudwatch.New(configProvider)
-
 	return nil
 }
 

From d6fd9ce73858dd4b29eb251491277396b3c1f474 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Dec 2017 10:58:33 -0800
Subject: [PATCH 0815/1302] Set release date for 1.5.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 934addce6..7a4e36cd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
-## v1.5 [unreleased]
+## v1.5 [2017-12-14]
 
 ### New Plugins
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno

From 4537eb2c5d1e8387b54db9e28497e94dad125b08 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Dec 2017 15:50:03 -0800
Subject: [PATCH 0816/1302] Update haproxy documentation

---
 plugins/inputs/haproxy/README.md  | 108 +++++++++++++++++++++---------
 plugins/inputs/haproxy/haproxy.go |   2 +-
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index dfb955796..9f9654610 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -1,11 +1,14 @@
-# HAproxy Input Plugin
+# HAProxy Input Plugin
 
-[HAproxy](http://www.haproxy.org/) input plugin gathers metrics directly from any running HAproxy instance. It can do so by using CSV generated by HAproxy status page or from admin socket(s).
+The [HAProxy](http://www.haproxy.org/) input plugin gathers
+[statistics](https://cbonte.github.io/haproxy-dconv/1.9/intro.html#3.3.16)
+using the [stats socket](https://cbonte.github.io/haproxy-dconv/1.9/management.html#9.3)
+or [HTTP statistics page](https://cbonte.github.io/haproxy-dconv/1.9/management.html#9) of a HAProxy server.
 
 ### Configuration:
 
 ```toml
-# SampleConfig
+# Read metrics of HAProxy, via socket or HTTP stats page
 [[inputs.haproxy]]
   ## An array of address to gather stats about. Specify an ip on hostname
   ## with optional port. ie localhost, 10.10.3.33:1936, etc.
@@ -23,7 +26,7 @@
   ## By default, some of the fields are renamed from what haproxy calls them.
   ## Setting this option to true results in the plugin keeping the original
   ## field names.
-  # keep_field_names = true
+  # keep_field_names = false
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -33,34 +36,77 @@
   # insecure_skip_verify = false
 ```
 
-#### `servers`
-Server addresses need to explicitly start with 'http' if you wish to use HAproxy status page. Otherwise, address will be assumed to be an UNIX socket and protocol (if present) will be discarded.
+#### HAProxy Configuration
 
-For basic authentication you need to add username and password in the URL: `http://user:password@1.2.3.4/haproxy?stats`.
+The following information may be useful when getting started, but please
+consult the HAProxy documentation for complete and up to date instructions.
 
-Following examples will all resolve to the same socket:
+The [`stats enable`](https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#4-stats%20enable)
+option can be used to add unauthenticated access over HTTP using the default
+settings.  To enable the unix socket begin by reading about the
+[`stats socket`](https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#3.1-stats%20socket)
+option.
+
+
+#### servers
+
+Server addresses must explicitly start with 'http' if you wish to use HAProxy
+status page.  Otherwise, addresses will be assumed to be an UNIX socket and
+any protocol (if present) will be discarded.
+
+When using socket names, wildcard expansion is supported so plugin can gather
+stats from multiple sockets at once.
+
+To use HTTP Basic Auth add the username and password in the userinfo section
+of the URL: `http://user:password@1.2.3.4/haproxy?stats`.  The credentials sent via the
+`Authorization` header and not using the request URL.
+
+
+#### keep_field_names
+
+By default, some of the fields are renamed from what haproxy calls them.
+Setting the `keep_field_names` parameter to `true` will result in the plugin
+keeping the original field names.
+
+The following renames are made:
+- `pxname` -> `proxy`
+- `svname` -> `sv`
+- `act` -> `active_servers`
+- `bck` -> `backup_servers`
+- `cli_abrt` -> `cli_abort`
+- `srv_abrt` -> `srv_abort`
+- `hrsp_1xx` -> `http_response.1xx`
+- `hrsp_2xx` -> `http_response.2xx`
+- `hrsp_3xx` -> `http_response.3xx`
+- `hrsp_4xx` -> `http_response.4xx`
+- `hrsp_5xx` -> `http_response.5xx`
+- `hrsp_other` -> `http_response.other`
+
+### Metrics:
+
+For more details about collected metrics reference the [HAProxy CSV format
+documentation](https://cbonte.github.io/haproxy-dconv/1.8/management.html#9.1).
+
+- haproxy
+  - tags:
+    - `server` - address of the server data was gathered from
+    - `proxy` - proxy name
+    - `sv` - service name
+    - `type` - proxy session type
+  - fields:
+    - `status` (string)
+    - `check_status` (string)
+    - `last_chk` (string)
+    - `mode` (string)
+    - `tracked` (string)
+    - `agent_status` (string)
+    - `last_agt` (string)
+    - `addr` (string)
+    - `cookie` (string)
+    - `lastsess` (int)
+    - **all other stats** (int)
+
+### Example Output:
 ```
-socket:/var/run/haproxy.sock
-unix:/var/run/haproxy.sock
-foo:/var/run/haproxy.sock
-/var/run/haproxy.sock
+haproxy,server=/run/haproxy/admin.sock,proxy=public,sv=FRONTEND,type=frontend http_response.other=0i,req_rate_max=1i,comp_byp=0i,status="OPEN",rate_lim=0i,dses=0i,req_rate=0i,comp_rsp=0i,bout=9287i,comp_in=0i,mode="http",smax=1i,slim=2000i,http_response.1xx=0i,conn_rate=0i,dreq=0i,ereq=0i,iid=2i,rate_max=1i,http_response.2xx=1i,comp_out=0i,intercepted=1i,stot=2i,pid=1i,http_response.5xx=1i,http_response.3xx=0i,http_response.4xx=0i,conn_rate_max=1i,conn_tot=2i,dcon=0i,bin=294i,rate=0i,sid=0i,req_tot=2i,scur=0i,dresp=0i 1513293519000000000
 ```
-
-When using socket names, wildcard expansion is supported so plugin can gather stats from multiple sockets at once.
-
-If no servers are specified, then the default address of `http://127.0.0.1:1936/haproxy?stats` will be used.
-
-#### `keep_field_names`
-By default, some of the fields are renamed from what haproxy calls them. Setting the `keep_field_names` parameter to `true` will result in the plugin keeping the original field names.
-
-### Measurements & Fields:
-
-Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.7/management.html#9.1).
-
-### Tags:
-
-- All measurements have the following tags:
-    - server - address of server data is gathered from
-    - proxy - proxy name as reported in `pxname`
-	- sv - service name as reported in `svname`
-
diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index c5c83e5d4..81783cf2b 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -54,7 +54,7 @@ var sampleConfig = `
   ## By default, some of the fields are renamed from what haproxy calls them.
   ## Setting this option to true results in the plugin keeping the original
   ## field names.
-  # keep_field_names = true
+  # keep_field_names = false
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"

From b90ee4a43ce630cfadf9856b58ca84ffe7ebf409 Mon Sep 17 00:00:00 2001
From: timhallinflux <timhallinflux@users.noreply.github.com>
Date: Thu, 14 Dec 2017 15:59:20 -0800
Subject: [PATCH 0817/1302] Improve bond plugin description (#3588)

---
 plugins/inputs/bond/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/bond/README.md b/plugins/inputs/bond/README.md
index 0a581418f..706a9c1c7 100644
--- a/plugins/inputs/bond/README.md
+++ b/plugins/inputs/bond/README.md
@@ -1,6 +1,6 @@
 # Bond Input Plugin
 
-The Bond Input plugin collects bond interface status, bond's slaves interfaces
+The Bond Input plugin collects network bond interface status, bond's slaves interfaces
 status and failures count of bond's slaves interfaces.
 The plugin collects these metrics from `/proc/net/bonding/*` files.
 

From 4f1ea13ebf6c0bbe7e79d65a9bb9c56ce0aadcc9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Dec 2017 16:03:29 -0800
Subject: [PATCH 0818/1302] Update bond input description

---
 plugins/inputs/bond/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/bond/README.md b/plugins/inputs/bond/README.md
index 706a9c1c7..abcf72c91 100644
--- a/plugins/inputs/bond/README.md
+++ b/plugins/inputs/bond/README.md
@@ -1,7 +1,7 @@
 # Bond Input Plugin
 
-The Bond Input plugin collects network bond interface status, bond's slaves interfaces
-status and failures count of bond's slaves interfaces.
+The Bond input plugin collects network bond interface status for both the
+network bond interface as well as slave interfaces.
 The plugin collects these metrics from `/proc/net/bonding/*` files.
 
 ### Configuration:

From fcc9c82d3475e1c9c4790b5b752ae77287463dc1 Mon Sep 17 00:00:00 2001
From: Jeff Ashton <JeffAshton@users.noreply.github.com>
Date: Thu, 14 Dec 2017 19:56:10 -0500
Subject: [PATCH 0819/1302] Add control over which stats to gather in
 basicstats aggregator (#3580)

---
 plugins/aggregators/basicstats/README.md      |  12 +
 plugins/aggregators/basicstats/basicstats.go  | 109 ++++++++-
 .../aggregators/basicstats/basicstats_test.go | 208 ++++++++++++++++++
 3 files changed, 320 insertions(+), 9 deletions(-)

diff --git a/plugins/aggregators/basicstats/README.md b/plugins/aggregators/basicstats/README.md
index 0e3e5558c..f96dfa134 100644
--- a/plugins/aggregators/basicstats/README.md
+++ b/plugins/aggregators/basicstats/README.md
@@ -8,14 +8,26 @@ emitting the aggregate every `period` seconds.
 ```toml
 # Keep the aggregate basicstats of each metric passing through.
 [[aggregators.basicstats]]
+
   ## General Aggregator Arguments:
+
   ## The period on which to flush & clear the aggregator.
   period = "30s"
+
   ## If true, the original metric will be dropped by the
   ## aggregator and will not get sent to the output plugins.
   drop_original = false
+
+  ## BasicStats Arguments:
+
+  ## Configures which basic stats to push as fields
+  stats = ["count","min","max","mean","stdev","s2"]
 ```
 
+- stats
+    - If not specified, all stats are aggregated and pushed as fields
+    - If empty array, no stats are aggregated
+
 ### Measurements & Fields:
 
 - measurement1
diff --git a/plugins/aggregators/basicstats/basicstats.go b/plugins/aggregators/basicstats/basicstats.go
index 40d65c873..4ad241e91 100644
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -1,6 +1,7 @@
 package basicstats
 
 import (
+	"log"
 	"math"
 
 	"github.com/influxdata/telegraf"
@@ -8,10 +9,22 @@ import (
 )
 
 type BasicStats struct {
-	cache map[uint64]aggregate
+	Stats []string `toml:"stats"`
+
+	cache       map[uint64]aggregate
+	statsConfig *configuredStats
 }
 
-func NewBasicStats() telegraf.Aggregator {
+type configuredStats struct {
+	count    bool
+	min      bool
+	max      bool
+	mean     bool
+	variance bool
+	stdev    bool
+}
+
+func NewBasicStats() *BasicStats {
 	mm := &BasicStats{}
 	mm.Reset()
 	return mm
@@ -114,25 +127,103 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 }
 
 func (m *BasicStats) Push(acc telegraf.Accumulator) {
+
+	config := getConfiguredStats(m)
+
 	for _, aggregate := range m.cache {
 		fields := map[string]interface{}{}
 		for k, v := range aggregate.fields {
-			fields[k+"_count"] = v.count
-			fields[k+"_min"] = v.min
-			fields[k+"_max"] = v.max
-			fields[k+"_mean"] = v.mean
+
+			if config.count {
+				fields[k+"_count"] = v.count
+			}
+			if config.min {
+				fields[k+"_min"] = v.min
+			}
+			if config.max {
+				fields[k+"_max"] = v.max
+			}
+			if config.mean {
+				fields[k+"_mean"] = v.mean
+			}
+
 			//v.count always >=1
 			if v.count > 1 {
 				variance := v.M2 / (v.count - 1)
-				fields[k+"_s2"] = variance
-				fields[k+"_stdev"] = math.Sqrt(variance)
+
+				if config.variance {
+					fields[k+"_s2"] = variance
+				}
+				if config.stdev {
+					fields[k+"_stdev"] = math.Sqrt(variance)
+				}
 			}
 			//if count == 1 StdDev = infinite => so I won't send data
 		}
-		acc.AddFields(aggregate.name, fields, aggregate.tags)
+
+		if len(fields) > 0 {
+			acc.AddFields(aggregate.name, fields, aggregate.tags)
+		}
 	}
 }
 
+func parseStats(names []string) *configuredStats {
+
+	parsed := &configuredStats{}
+
+	for _, name := range names {
+
+		switch name {
+
+		case "count":
+			parsed.count = true
+		case "min":
+			parsed.min = true
+		case "max":
+			parsed.max = true
+		case "mean":
+			parsed.mean = true
+		case "s2":
+			parsed.variance = true
+		case "stdev":
+			parsed.stdev = true
+
+		default:
+			log.Printf("W! Unrecognized basic stat '%s', ignoring", name)
+		}
+	}
+
+	return parsed
+}
+
+func defaultStats() *configuredStats {
+
+	defaults := &configuredStats{}
+
+	defaults.count = true
+	defaults.min = true
+	defaults.max = true
+	defaults.mean = true
+	defaults.variance = true
+	defaults.stdev = true
+
+	return defaults
+}
+
+func getConfiguredStats(m *BasicStats) *configuredStats {
+
+	if m.statsConfig == nil {
+
+		if m.Stats == nil {
+			m.statsConfig = defaultStats()
+		} else {
+			m.statsConfig = parseStats(m.Stats)
+		}
+	}
+
+	return m.statsConfig
+}
+
 func (m *BasicStats) Reset() {
 	m.cache = make(map[uint64]aggregate)
 }
diff --git a/plugins/aggregators/basicstats/basicstats_test.go b/plugins/aggregators/basicstats/basicstats_test.go
index 74237c0c7..d2642b568 100644
--- a/plugins/aggregators/basicstats/basicstats_test.go
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -149,3 +149,211 @@ func TestBasicStatsDifferentPeriods(t *testing.T) {
 	}
 	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
 }
+
+// Test only aggregating count
+func TestBasicStatsWithOnlyCount(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"count"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_count": float64(2),
+		"b_count": float64(2),
+		"c_count": float64(2),
+		"d_count": float64(2),
+		"e_count": float64(1),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating minimum
+func TestBasicStatsWithOnlyMin(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"min"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_min": float64(1),
+		"b_min": float64(1),
+		"c_min": float64(2),
+		"d_min": float64(2),
+		"e_min": float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating maximum
+func TestBasicStatsWithOnlyMax(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"max"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_max": float64(1),
+		"b_max": float64(3),
+		"c_max": float64(4),
+		"d_max": float64(6),
+		"e_max": float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating mean
+func TestBasicStatsWithOnlyMean(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"mean"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_mean": float64(1),
+		"b_mean": float64(2),
+		"c_mean": float64(3),
+		"d_mean": float64(4),
+		"e_mean": float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating variance
+func TestBasicStatsWithOnlyVariance(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"s2"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_s2": float64(0),
+		"b_s2": float64(2),
+		"c_s2": float64(2),
+		"d_s2": float64(8),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating standard deviation
+func TestBasicStatsWithOnlyStandardDeviation(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"stdev"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_stdev": float64(0),
+		"b_stdev": math.Sqrt(2),
+		"c_stdev": math.Sqrt(2),
+		"d_stdev": math.Sqrt(8),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test only aggregating minimum and maximum
+func TestBasicStatsWithMinAndMax(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"min", "max"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_max": float64(1), //a
+		"a_min": float64(1),
+		"b_max": float64(3), //b
+		"b_min": float64(1),
+		"c_max": float64(4), //c
+		"c_min": float64(2),
+		"d_max": float64(6), //d
+		"d_min": float64(2),
+		"e_max": float64(200), //e
+		"e_min": float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test that if an empty array is passed, no points are pushed
+func TestBasicStatsWithNoStats(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	acc.AssertDoesNotContainMeasurement(t, "m1")
+}
+
+// Test that if an unknown stat is configured, it doesn't explode
+func TestBasicStatsWithUnknownStat(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"crazy"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	acc.AssertDoesNotContainMeasurement(t, "m1")
+}

From 3029d58cadfb85e7232338455777ab88ced0ee36 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Dec 2017 16:59:58 -0800
Subject: [PATCH 0820/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4e36cd1..b5cd10273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### Features
 
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
+- [#3580](https://github.com/influxdata/telegraf/pull/3580): Add control over which stats to gather in basicstats aggregator.
 
 ### Bugfixes
 

From 496452144c77a095cc85d05602990ea3f569c8c7 Mon Sep 17 00:00:00 2001
From: kerams <kerams@users.noreply.github.com>
Date: Tue, 19 Dec 2017 05:36:59 +0100
Subject: [PATCH 0821/1302] Add messages_delivered_get to rabbitmq_overview
 (#3596)

---
 plugins/inputs/rabbitmq/README.md   |  7 +++++++
 plugins/inputs/rabbitmq/rabbitmq.go | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 8f9a77aad..83e4bd2ee 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -52,6 +52,7 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   - messages (int, messages)
   - messages_acked (int, messages)
   - messages_delivered (int, messages)
+  - messages_delivered_get (int, messages)
   - messages_published (int, messages)
   - messages_ready (int, messages)
   - messages_unacked (int, messages)
@@ -115,6 +116,12 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
 
 ### Sample Queries:
 
+Message rates for the entire node can be calculated from total message counts. For instance, to get the rate of messages published per minute, use this query:
+
+```
+SELECT NON_NEGATIVE_DERIVATIVE(LAST("messages_published"), 1m) AS messages_published_rate
+FROM rabbitmq_overview WHERE time > now() - 10m GROUP BY time(1m)
+```
 
 ### Example Output:
 
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index f51cb123e..06966ab58 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -268,17 +268,18 @@ func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator) {
 		tags["name"] = r.Name
 	}
 	fields := map[string]interface{}{
-		"messages":           overview.QueueTotals.Messages,
-		"messages_ready":     overview.QueueTotals.MessagesReady,
-		"messages_unacked":   overview.QueueTotals.MessagesUnacknowledged,
-		"channels":           overview.ObjectTotals.Channels,
-		"connections":        overview.ObjectTotals.Connections,
-		"consumers":          overview.ObjectTotals.Consumers,
-		"exchanges":          overview.ObjectTotals.Exchanges,
-		"queues":             overview.ObjectTotals.Queues,
-		"messages_acked":     overview.MessageStats.Ack,
-		"messages_delivered": overview.MessageStats.Deliver,
-		"messages_published": overview.MessageStats.Publish,
+		"messages":               overview.QueueTotals.Messages,
+		"messages_ready":         overview.QueueTotals.MessagesReady,
+		"messages_unacked":       overview.QueueTotals.MessagesUnacknowledged,
+		"channels":               overview.ObjectTotals.Channels,
+		"connections":            overview.ObjectTotals.Connections,
+		"consumers":              overview.ObjectTotals.Consumers,
+		"exchanges":              overview.ObjectTotals.Exchanges,
+		"queues":                 overview.ObjectTotals.Queues,
+		"messages_acked":         overview.MessageStats.Ack,
+		"messages_delivered":     overview.MessageStats.Deliver,
+		"messages_delivered_get": overview.MessageStats.DeliverGet,
+		"messages_published":     overview.MessageStats.Publish,
 	}
 	acc.AddFields("rabbitmq_overview", fields, tags)
 }

From 801a248668c17b79c5142d4a9ab787561301e051 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Dec 2017 20:39:26 -0800
Subject: [PATCH 0822/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5cd10273..90b323dbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
 - [#3580](https://github.com/influxdata/telegraf/pull/3580): Add control over which stats to gather in basicstats aggregator.
+- [#3596](https://github.com/influxdata/telegraf/pull/3596): Add messages_delivered_get to rabbitmq input.
 
 ### Bugfixes
 

From 6639f44c177ae0deee7beadc9cee81689edd1098 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Dec 2017 16:26:50 -0800
Subject: [PATCH 0823/1302] Fix grammar in dcos readme

---
 plugins/inputs/dcos/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/dcos/README.md b/plugins/inputs/dcos/README.md
index a1384402f..fcb62da33 100644
--- a/plugins/inputs/dcos/README.md
+++ b/plugins/inputs/dcos/README.md
@@ -106,7 +106,7 @@ the cluster.  For more information on this technique reference
 ### Metrics:
 
 Please consult the [Metrics Reference](https://docs.mesosphere.com/1.10/metrics/reference/)
-for details on interprete field interpretation.
+for details about field interpretation.
 
 - dcos_node
   - tags:

From 7f3f556b3965f87889da5773d33fb90ed1eb031a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Dec 2017 18:46:03 -0800
Subject: [PATCH 0824/1302] Fix grammar in haproxy docs

---
 plugins/inputs/haproxy/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index 9f9654610..50bd4b3da 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -58,8 +58,8 @@ When using socket names, wildcard expansion is supported so plugin can gather
 stats from multiple sockets at once.
 
 To use HTTP Basic Auth add the username and password in the userinfo section
-of the URL: `http://user:password@1.2.3.4/haproxy?stats`.  The credentials sent via the
-`Authorization` header and not using the request URL.
+of the URL: `http://user:password@1.2.3.4/haproxy?stats`.  The credentials are
+sent via the `Authorization` header and not using the request URL.
 
 
 #### keep_field_names

From 6c075c4346c795d4bec3505ec031fcc4d2766c46 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 28 Dec 2017 16:10:00 -0800
Subject: [PATCH 0825/1302] Fix name error in jolokia2_agent sample config
 (#3624)

---
 etc/telegraf.conf                        | 4 ++--
 plugins/inputs/jolokia2/jolokia_agent.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 4c751d3e4..438a32771 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1391,7 +1391,7 @@
 #   ## By default, some of the fields are renamed from what haproxy calls them.
 #   ## Setting this option to true results in the plugin keeping the original
 #   ## field names.
-#   # keep_field_names = true
+#   # keep_field_names = false
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -1661,7 +1661,7 @@
 #   # insecure_skip_verify = false
 #
 #   ## Add metrics to read
-#   [[inputs.jolokia2.metric]]
+#   [[inputs.jolokia2_agent.metric]]
 #     name  = "java_runtime"
 #     mbean = "java.lang:type=Runtime"
 #     paths = ["Uptime"]
diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
index ff37fdaf6..1042da9d9 100644
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -46,7 +46,7 @@ func (ja *JolokiaAgent) SampleConfig() string {
   # insecure_skip_verify = false
 
   ## Add metrics to read
-  [[inputs.jolokia2.metric]]
+  [[inputs.jolokia2_agent.metric]]
     name  = "java_runtime"
     mbean = "java.lang:type=Runtime"
     paths = ["Uptime"]

From 1011cd0c947e5f5584ceab560e87cf3185e072f0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 28 Dec 2017 16:12:56 -0800
Subject: [PATCH 0826/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90b323dbf..a7303ac45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,12 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
+## v1.5.1 [unreleased]
+
+### Bugfixes
+
+- [#3624](https://github.com/influxdata/telegraf/pull/3624): Fix name error in jolokia2_agent sample config.
+
 ## v1.5 [2017-12-14]
 
 ### New Plugins

From 005face7c0e263692d8d9a70b312be6acb307688 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 28 Dec 2017 16:17:40 -0800
Subject: [PATCH 0827/1302] Fix DC/OS login expiration time (#3625)

---
 plugins/inputs/dcos/client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/dcos/client.go b/plugins/inputs/dcos/client.go
index 71165e9fb..50d78482f 100644
--- a/plugins/inputs/dcos/client.go
+++ b/plugins/inputs/dcos/client.go
@@ -325,7 +325,7 @@ func (c *ClusterClient) createLoginToken(sa *ServiceAccount) (string, error) {
 		UID: sa.AccountID,
 		StandardClaims: jwt.StandardClaims{
 			// How long we have to login with this token
-			ExpiresAt: int64(5 * time.Minute / time.Second),
+			ExpiresAt: time.Now().Add(5 * time.Minute).Unix(),
 		},
 	})
 	return token.SignedString(sa.PrivateKey)

From ef6e5c5a85c8d218d784f6bf1d64ff118f5d0111 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 28 Dec 2017 16:19:04 -0800
Subject: [PATCH 0828/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7303ac45..38ecf3e32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 ### Bugfixes
 
 - [#3624](https://github.com/influxdata/telegraf/pull/3624): Fix name error in jolokia2_agent sample config.
+- [#3625](https://github.com/influxdata/telegraf/pull/3625): Fix DC/OS login expiration time.
 
 ## v1.5 [2017-12-14]
 

From 4f7afb8cb5abb89f3f67c8e677bfa9fc057874d6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 28 Dec 2017 16:22:19 -0800
Subject: [PATCH 0829/1302] Set content-type charset in influxdb output and
 allow it be overridden (#3593)

---
 plugins/outputs/influxdb/client/http.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
index 4dea82a8d..601e40386 100644
--- a/plugins/outputs/influxdb/client/http.go
+++ b/plugins/outputs/influxdb/client/http.go
@@ -211,11 +211,12 @@ func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, err
 		return nil, err
 	}
 
+	req.Header.Set("Content-Type", "text/plain; charset=utf-8")
+
 	for header, value := range c.config.HTTPHeaders {
 		req.Header.Set(header, value)
 	}
 
-	req.Header.Set("Content-Type", "text/plain")
 	req.Header.Set("User-Agent", c.config.UserAgent)
 	if c.config.Username != "" && c.config.Password != "" {
 		req.SetBasicAuth(c.config.Username, c.config.Password)

From 06c21fb9f746336af4c8882226461fa1979f1d81 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 28 Dec 2017 16:24:04 -0800
Subject: [PATCH 0830/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38ecf3e32..b375c437e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 
 - [#3624](https://github.com/influxdata/telegraf/pull/3624): Fix name error in jolokia2_agent sample config.
 - [#3625](https://github.com/influxdata/telegraf/pull/3625): Fix DC/OS login expiration time.
+- [#3593](https://github.com/influxdata/telegraf/pull/3593): Set Content-Type charset in influxdb output and allow it be overridden.
 
 ## v1.5 [2017-12-14]
 

From a440ed8d8c982a495d0bc89077289b38d920f810 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 2 Jan 2018 14:09:14 -0800
Subject: [PATCH 0831/1302] Add information about how to set permissions for
 postfix input (#3594)

---
 plugins/inputs/postfix/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/plugins/inputs/postfix/README.md b/plugins/inputs/postfix/README.md
index 477a78c9b..3dab2b39d 100644
--- a/plugins/inputs/postfix/README.md
+++ b/plugins/inputs/postfix/README.md
@@ -13,6 +13,25 @@ For each of the active, hold, incoming, maildrop, and deferred queues (http://ww
   # queue_directory = "/var/spool/postfix"
 ```
 
+#### Permissions:
+
+Telegraf will need read access to the files in the queue directory.  You may
+need to alter the permissions of these directories to provide access to the
+telegraf user.
+
+Unix permissions:
+```sh
+$ sudo chgrp -R telegraf /var/spool/postfix/{active,hold,incoming,deferred}
+$ sudo chmod -R g+rXs /var/spool/postfix/{active,hold,incoming,deferred}
+$ sudo usermod -a -G postdrop telegraf
+$ sudo chmod g+r /var/spool/postfix/maildrop
+```
+
+Posix ACL:
+```sh
+$ sudo setfacl -Rdm u:telegraf:rX /var/spool/postfix/{active,hold,incoming,deferred,maildrop}
+```
+
 ### Measurements & Fields:
 
 - postfix_queue

From 56be3d3236e031f638f6abcaa059011e777053f4 Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Wed, 3 Jan 2018 00:33:16 +0000
Subject: [PATCH 0832/1302] Reintroduce AWS credential check to cloudwatch
 output (#3587)

---
 plugins/outputs/cloudwatch/cloudwatch.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 0c087ce57..783a21416 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
+	"github.com/aws/aws-sdk-go/service/sts"
 
 	"github.com/influxdata/telegraf"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
@@ -70,7 +71,20 @@ func (c *CloudWatch) Connect() error {
 		Token:     c.Token,
 	}
 	configProvider := credentialConfig.Credentials()
+
+	stsService := sts.New(configProvider)
+
+	params := &sts.GetCallerIdentityInput{}
+
+	_, err := stsService.GetCallerIdentity(params)
+
+	if err != nil {
+		log.Printf("E! cloudwatch: Cannot use credentials to connect to AWS : %+v \n", err.Error())
+		return err
+	}
+
 	c.svc = cloudwatch.New(configProvider)
+
 	return nil
 }
 

From 81f42e8b176656b5c2e3d46017e35c979fe26d6e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 2 Jan 2018 16:36:04 -0800
Subject: [PATCH 0833/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b375c437e..32cdd8316 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#3624](https://github.com/influxdata/telegraf/pull/3624): Fix name error in jolokia2_agent sample config.
 - [#3625](https://github.com/influxdata/telegraf/pull/3625): Fix DC/OS login expiration time.
 - [#3593](https://github.com/influxdata/telegraf/pull/3593): Set Content-Type charset in influxdb output and allow it be overridden.
+- [#3594](https://github.com/influxdata/telegraf/pull/3594): Document permissions setup for postfix input.
 
 ## v1.5 [2017-12-14]
 

From b900967b787f52d2f7e872ff3b3ecffb6585fd8e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 2 Jan 2018 16:37:11 -0800
Subject: [PATCH 0834/1302] Add wired field to mem input (#3632)

---
 plugins/inputs/system/MEM_README.md  | 1 +
 plugins/inputs/system/memory.go      | 1 +
 plugins/inputs/system/memory_test.go | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/system/MEM_README.md b/plugins/inputs/system/MEM_README.md
index 72869f67f..8a9ff823c 100644
--- a/plugins/inputs/system/MEM_README.md
+++ b/plugins/inputs/system/MEM_README.md
@@ -27,6 +27,7 @@ For a more complete explanation of the difference between *used* and
   	- used (int)
   	- available_percent (float)
   	- used_percent (float)
+  	- wired (int)
 
 ### Example Output:
 ```
diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go
index 31388b4ca..490c56f89 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -32,6 +32,7 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 		"buffered":          vm.Buffers,
 		"active":            vm.Active,
 		"inactive":          vm.Inactive,
+		"wired":             vm.Wired,
 		"slab":              vm.Slab,
 		"used_percent":      100 * float64(vm.Used) / float64(vm.Total),
 		"available_percent": 100 * float64(vm.Available) / float64(vm.Total),
diff --git a/plugins/inputs/system/memory_test.go b/plugins/inputs/system/memory_test.go
index 336de95f3..5d5860a8e 100644
--- a/plugins/inputs/system/memory_test.go
+++ b/plugins/inputs/system/memory_test.go
@@ -22,9 +22,9 @@ func TestMemStats(t *testing.T) {
 		Active:    8134,
 		Inactive:  1124,
 		Slab:      1234,
+		Wired:     134,
 		// Buffers:     771,
 		// Cached:      4312,
-		// Wired:       134,
 		// Shared:      2142,
 	}
 
@@ -55,6 +55,7 @@ func TestMemStats(t *testing.T) {
 		"buffered":          uint64(0),
 		"active":            uint64(8134),
 		"inactive":          uint64(1124),
+		"wired":             uint64(134),
 		"slab":              uint64(1234),
 	}
 	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))

From 009b649a13fde74dc209caac291f8d7553636b43 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 2 Jan 2018 16:38:20 -0800
Subject: [PATCH 0835/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32cdd8316..fb9455f92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
 - [#3580](https://github.com/influxdata/telegraf/pull/3580): Add control over which stats to gather in basicstats aggregator.
 - [#3596](https://github.com/influxdata/telegraf/pull/3596): Add messages_delivered_get to rabbitmq input.
+- [#3632](https://github.com/influxdata/telegraf/pull/3632): Add wired field to mem input.
 
 ### Bugfixes
 

From acea7109d4307e351070eb24707b4a0a2f072210 Mon Sep 17 00:00:00 2001
From: kerams <kerams@users.noreply.github.com>
Date: Wed, 3 Jan 2018 22:43:17 +0100
Subject: [PATCH 0836/1302] Fix deliver_get field in rabbitmq input (#3633)

---
 plugins/inputs/rabbitmq/rabbitmq.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 06966ab58..b6b5a6772 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -72,7 +72,7 @@ type MessageStats struct {
 	AckDetails        Details `json:"ack_details"`
 	Deliver           int64
 	DeliverDetails    Details `json:"deliver_details"`
-	DeliverGet        int64
+	DeliverGet        int64   `json:"deliver_get"`
 	DeliverGetDetails Details `json:"deliver_get_details"`
 	Publish           int64
 	PublishDetails    Details `json:"publish_details"`

From 07cb749e044f997a41e9f1f9b3cc58e0368e6e2e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 3 Jan 2018 13:44:33 -0800
Subject: [PATCH 0837/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb9455f92..a2c55c4da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - [#3625](https://github.com/influxdata/telegraf/pull/3625): Fix DC/OS login expiration time.
 - [#3593](https://github.com/influxdata/telegraf/pull/3593): Set Content-Type charset in influxdb output and allow it be overridden.
 - [#3594](https://github.com/influxdata/telegraf/pull/3594): Document permissions setup for postfix input.
+- [#3633](https://github.com/influxdata/telegraf/pull/3633): Fix deliver_get field in rabbitmq input.
 
 ## v1.5 [2017-12-14]
 

From 87f1d45ee0f615ff47ab2ec920fd1dd290d3bea0 Mon Sep 17 00:00:00 2001
From: kerams <kerams@users.noreply.github.com>
Date: Thu, 4 Jan 2018 02:38:11 +0100
Subject: [PATCH 0838/1302] Add support for exchanges to RabbitMQ input (#3619)

---
 plugins/inputs/rabbitmq/README.md        |  18 ++++
 plugins/inputs/rabbitmq/rabbitmq.go      |  71 ++++++++++++++-
 plugins/inputs/rabbitmq/rabbitmq_test.go | 107 +++++++++++++++++++++++
 3 files changed, 193 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 83e4bd2ee..a1dfc879a 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -40,6 +40,10 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   ## A list of queues to gather as the rabbitmq_queue measurement. If not
   ## specified, metrics for all queues are gathered.
   # queues = ["telegraf"]
+
+  ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
+  ## specified, metrics for all exchanges are gathered.
+  # exchanges = ["telegraf"]
 ```
 
 ### Measurements & Fields:
@@ -95,6 +99,10 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   - messages_redeliver_rate (float, messages per second)
   - messages_unack (integer, count)
 
+- rabbitmq_exchange
+  - messages_publish_in (int, count)
+  - messages_publish_out (int, count)
+
 ### Tags:
 
 - All measurements have the following tags:
@@ -114,6 +122,15 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   - durable
   - auto_delete
 
+- rabbitmq_exchange
+  - url
+  - exchange
+  - type
+  - vhost
+  - internal
+  - durable
+  - auto_delete
+
 ### Sample Queries:
 
 Message rates for the entire node can be calculated from total message counts. For instance, to get the rate of messages published per minute, use this query:
@@ -129,4 +146,5 @@ FROM rabbitmq_overview WHERE time > now() - 10m GROUP BY time(1m)
 rabbitmq_queue,url=http://amqp.example.org:15672,queue=telegraf,vhost=influxdb,node=rabbit@amqp.example.org,durable=true,auto_delete=false,host=amqp.example.org messages_deliver_get=0i,messages_publish=329i,messages_publish_rate=0.2,messages_redeliver_rate=0,message_bytes_ready=0i,message_bytes_unacked=0i,messages_deliver=329i,messages_unack=0i,consumers=1i,idle_since="",messages=0i,messages_deliver_rate=0.2,messages_deliver_get_rate=0.2,messages_redeliver=0i,memory=43032i,message_bytes_ram=0i,messages_ack=329i,messages_ready=0i,messages_ack_rate=0.2,consumer_utilisation=1,message_bytes=0i,message_bytes_persist=0i 1493684035000000000
 rabbitmq_overview,url=http://amqp.example.org:15672,host=amqp.example.org channels=2i,consumers=1i,exchanges=17i,messages_acked=329i,messages=0i,messages_ready=0i,messages_unacked=0i,connections=2i,queues=1i,messages_delivered=329i,messages_published=329i 1493684035000000000
 rabbitmq_node,url=http://amqp.example.org:15672,node=rabbit@amqp.example.org,host=amqp.example.org fd_total=1024i,fd_used=32i,mem_limit=8363329126i,sockets_total=829i,disk_free=8175935488i,disk_free_limit=50000000i,mem_used=58771080i,proc_total=1048576i,proc_used=267i,run_queue=0i,sockets_used=2i 149368403500000000
+rabbitmq_exchange,url=http://amqp.example.org:15672,exchange=telegraf,type=fanout,vhost=influxdb,internal=false,durable=true,auto_delete=false,host=amqp.example.org messages_publish_in=2i,messages_publish_out=1i 149368403500000000
 ```
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index b6b5a6772..775ea75df 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -48,8 +48,9 @@ type RabbitMQ struct {
 	ResponseHeaderTimeout internal.Duration `toml:"header_timeout"`
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
 
-	Nodes  []string
-	Queues []string
+	Nodes     []string
+	Queues    []string
+	Exchanges []string
 
 	Client *http.Client
 }
@@ -78,6 +79,8 @@ type MessageStats struct {
 	PublishDetails    Details `json:"publish_details"`
 	Redeliver         int64
 	RedeliverDetails  Details `json:"redeliver_details"`
+	PublishIn         int64   `json:"publish_in"`
+	PublishOut        int64   `json:"publish_out"`
 }
 
 // ObjectTotals ...
@@ -133,10 +136,20 @@ type Node struct {
 	SocketsUsed   int64 `json:"sockets_used"`
 }
 
+type Exchange struct {
+	Name         string
+	MessageStats `json:"message_stats"`
+	Type         string
+	Internal     bool
+	Vhost        string
+	Durable      bool
+	AutoDelete   bool `json:"auto_delete"`
+}
+
 // gatherFunc ...
 type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator)
 
-var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues}
+var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues, gatherExchanges}
 
 var sampleConfig = `
   ## Management Plugin url. (default: http://localhost:15672)
@@ -171,6 +184,10 @@ var sampleConfig = `
   ## A list of queues to gather as the rabbitmq_queue measurement. If not
   ## specified, metrics for all queues are gathered.
   # queues = ["telegraf"]
+
+  ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
+  ## specified, metrics for all exchanges are gathered. 
+  # exchanges = ["telegraf"]
 `
 
 // SampleConfig ...
@@ -374,6 +391,40 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator) {
 	}
 }
 
+func gatherExchanges(r *RabbitMQ, acc telegraf.Accumulator) {
+	// Gather information about exchanges
+	exchanges := make([]Exchange, 0)
+	err := r.requestJSON("/api/exchanges", &exchanges)
+	if err != nil {
+		acc.AddError(err)
+		return
+	}
+
+	for _, exchange := range exchanges {
+		if !r.shouldGatherExchange(exchange) {
+			continue
+		}
+		tags := map[string]string{
+			"url":         r.URL,
+			"exchange":    exchange.Name,
+			"type":        exchange.Type,
+			"vhost":       exchange.Vhost,
+			"internal":    strconv.FormatBool(exchange.Internal),
+			"durable":     strconv.FormatBool(exchange.Durable),
+			"auto_delete": strconv.FormatBool(exchange.AutoDelete),
+		}
+
+		acc.AddFields(
+			"rabbitmq_exchange",
+			map[string]interface{}{
+				"messages_publish_in":  exchange.MessageStats.PublishIn,
+				"messages_publish_out": exchange.MessageStats.PublishOut,
+			},
+			tags,
+		)
+	}
+}
+
 func (r *RabbitMQ) shouldGatherNode(node Node) bool {
 	if len(r.Nodes) == 0 {
 		return true
@@ -402,6 +453,20 @@ func (r *RabbitMQ) shouldGatherQueue(queue Queue) bool {
 	return false
 }
 
+func (r *RabbitMQ) shouldGatherExchange(exchange Exchange) bool {
+	if len(r.Exchanges) == 0 {
+		return true
+	}
+
+	for _, name := range r.Exchanges {
+		if name == exchange.Name {
+			return true
+		}
+	}
+
+	return false
+}
+
 func init() {
 	inputs.Add("rabbitmq", func() telegraf.Input {
 		return &RabbitMQ{
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index 3be0259bc..759c71c41 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -374,6 +374,102 @@ const sampleQueuesResponse = `
 ]
 `
 
+const sampleExchangesResponse = `
+[
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "direct",
+    "vhost": "\/",
+    "name": ""
+  },
+  {
+    "message_stats": {
+      "publish_in_details": {
+        "rate": 0
+      },
+      "publish_in": 2,
+      "publish_out_details": {
+        "rate": 0
+      },
+      "publish_out": 1
+    },
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "fanout",
+    "vhost": "\/",
+    "name": "telegraf"
+  },
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "direct",
+    "vhost": "\/",
+    "name": "amq.direct"
+  },
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "fanout",
+    "vhost": "\/",
+    "name": "amq.fanout"
+  },
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "headers",
+    "vhost": "\/",
+    "name": "amq.headers"
+  },
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "headers",
+    "vhost": "\/",
+    "name": "amq.match"
+  },
+  {
+    "arguments": { },
+    "internal": true,
+    "auto_delete": false,
+    "durable": true,
+    "type": "topic",
+    "vhost": "\/",
+    "name": "amq.rabbitmq.log"
+  },
+  {
+    "arguments": { },
+    "internal": true,
+    "auto_delete": false,
+    "durable": true,
+    "type": "topic",
+    "vhost": "\/",
+    "name": "amq.rabbitmq.trace"
+  },
+  {
+    "arguments": { },
+    "internal": false,
+    "auto_delete": false,
+    "durable": true,
+    "type": "topic",
+    "vhost": "\/",
+    "name": "amq.topic"
+  }
+]
+`
+
 func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var rsp string
@@ -385,6 +481,8 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 			rsp = sampleNodesResponse
 		case "/api/queues":
 			rsp = sampleQueuesResponse
+		case "/api/exchanges":
+			rsp = sampleExchangesResponse
 		default:
 			panic("Cannot handle request")
 		}
@@ -441,4 +539,13 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	}
 
 	assert.True(t, acc.HasMeasurement("rabbitmq_queue"))
+
+	exchangeIntMetrics := []string{
+		"messages_publish_in",
+		"messages_publish_out",
+	}
+
+	for _, metric := range exchangeIntMetrics {
+		assert.True(t, acc.HasInt64Field("rabbitmq_exchange", metric))
+	}
 }

From 5397c0257092ffece0230c97aca577c01429dca4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 3 Jan 2018 17:40:37 -0800
Subject: [PATCH 0839/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2c55c4da..173ce9b88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#3580](https://github.com/influxdata/telegraf/pull/3580): Add control over which stats to gather in basicstats aggregator.
 - [#3596](https://github.com/influxdata/telegraf/pull/3596): Add messages_delivered_get to rabbitmq input.
 - [#3632](https://github.com/influxdata/telegraf/pull/3632): Add wired field to mem input.
+- [#3619](https://github.com/influxdata/telegraf/pull/3619): Add support for gathering exchange metrics to the rabbitmq input.
 
 ### Bugfixes
 

From 92acef16642db769d84f190a8f30d4adbb79e4fa Mon Sep 17 00:00:00 2001
From: Richard Elling <Richard.Elling@RichardElling.com>
Date: Wed, 3 Jan 2018 17:45:48 -0800
Subject: [PATCH 0840/1302] Add support for additional metrics on Linux in zfs
 input (#3565)

---
 plugins/inputs/zfs/README.md         |  77 +++++++---
 plugins/inputs/zfs/zfs.go            |   4 +-
 plugins/inputs/zfs/zfs_linux.go      |  11 +-
 plugins/inputs/zfs/zfs_linux_test.go | 214 ++++++++++++++++++++++++---
 4 files changed, 261 insertions(+), 45 deletions(-)

diff --git a/plugins/inputs/zfs/README.md b/plugins/inputs/zfs/README.md
index 3215aaf3f..b60711e30 100644
--- a/plugins/inputs/zfs/README.md
+++ b/plugins/inputs/zfs/README.md
@@ -13,8 +13,12 @@ from `sysctl` and `zpool` on FreeBSD.
   # kstatPath = "/proc/spl/kstat/zfs"
 
   ## By default, telegraf gather all zfs stats
-  ## If not specified, then default is:
+  ## Override the stats list using the kstatMetrics array:
+  ## For FreeBSD, the default is:
   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
+  ## For Linux, the default is:
+  # kstatMetrics = ["abdstats", "arcstats", "dnodestats", "dbufcachestats",
+  #     "dmu_tx", "fm", "vdev_mirror_stats", "zfetchstats", "zil"]
 
   ## By default, don't gather zpool stats
   # poolMetrics = false
@@ -22,8 +26,8 @@ from `sysctl` and `zpool` on FreeBSD.
 
 ### Measurements & Fields:
 
-By default this plugin collects metrics about **Arc**, **Zfetch**, and
-**Vdev cache**. All these metrics are either counters or measure sizes
+By default this plugin collects metrics about ZFS internals and pool.
+These metrics are either counters or measure sizes
 in bytes. These metrics will be in the `zfs` measurement with the field
 names listed bellow.
 
@@ -33,7 +37,7 @@ each pool.
 - zfs
     With fields listed bellow.
 
-#### Arc Stats
+#### ARC Stats (FreeBSD and Linux)
 
 - arcstats_allocated (FreeBSD only)
 - arcstats_anon_evict_data (Linux only)
@@ -153,7 +157,7 @@ each pool.
 - arcstats_size
 - arcstats_sync_wait_for_async (FreeBSD only)
 
-#### Zfetch Stats
+#### Zfetch Stats (FreeBSD and Linux)
 
 - zfetchstats_bogus_streams (Linux only)
 - zfetchstats_colinear_hits (Linux only)
@@ -168,7 +172,7 @@ each pool.
 - zfetchstats_stride_hits (Linux only)
 - zfetchstats_stride_misses (Linux only)
 
-#### Vdev Cache Stats
+#### Vdev Cache Stats (FreeBSD)
 
 - vdev_cache_stats_delegations
 - vdev_cache_stats_hits
@@ -176,21 +180,21 @@ each pool.
 
 #### Pool Metrics (optional)
 
-On Linux:
+On Linux (reference: kstat accumulated time and queue length statistics):
 
 - zfs_pool
-    - nread (integer, )
-    - nwritten (integer, )
-    - reads (integer, )
-    - writes (integer, )
-    - wtime (integer, )
-    - wlentime (integer, )
-    - wupdate (integer, )
-    - rtime (integer, )
-    - rlentime (integer, )
-    - rupdate (integer, )
-    - wcnt (integer, )
-    - rcnt (integer, )
+    - nread (integer, bytes)
+    - nwritten (integer, bytes)
+    - reads (integer, count)
+    - writes (integer, count)
+    - wtime (integer, nanoseconds) 
+    - wlentime (integer, queuelength * nanoseconds)
+    - wupdate (integer, timestamp)
+    - rtime (integer, nanoseconds)
+    - rlentime (integer, queuelength * nanoseconds)
+    - rupdate (integer, timestamp)
+    - wcnt (integer, count)
+    - rcnt (integer, count)
 
 On FreeBSD:
 
@@ -224,7 +228,7 @@ $ ./telegraf --config telegraf.conf --input-filter zfs --test
 
 A short description for some of the metrics.
 
-#### Arc Stats
+#### ARC Stats
 
 `arcstats_hits` Total amount of cache hits in the arc.
 
@@ -283,12 +287,43 @@ A short description for some of the metrics.
 
 `zfetchstats_hits` Counts the number of cache hits, to items which are in the cache because of the prefetcher.
 
+`zfetchstats_misses` Counts the number of prefetch cache misses.
+
 `zfetchstats_colinear_hits` Counts the number of cache hits, to items which are in the cache because of the prefetcher (prefetched linear reads)
 
 `zfetchstats_stride_hits` Counts the number of cache hits, to items which are in the cache because of the prefetcher (prefetched stride reads)
 
-#### Vdev Cache Stats
+#### Vdev Cache Stats (FreeBSD only)
+note: the vdev cache is deprecated in some ZFS implementations
 
 `vdev_cache_stats_hits` Hits to the vdev (device level) cache.
 
 `vdev_cache_stats_misses` Misses to the vdev (device level) cache.
+
+#### ABD Stats (Linux Only)
+ABD is a linear/scatter dual typed buffer for ARC
+
+`abdstats_linear_cnt` number of linear ABDs which are currently allocated
+
+`abdstats_linear_data_size` amount of data stored in all linear ABDs
+
+`abdstats_scatter_cnt` number of scatter ABDs which are currently allocated
+
+`abdstats_scatter_data_size` amount of data stored in all scatter ABDs
+
+#### DMU Stats (Linux Only)
+
+`dmu_tx_dirty_throttle` counts when writes are throttled due to the amount of dirty data growing too large
+
+`dmu_tx_memory_reclaim` counts when memory is low and throttling activity
+
+`dmu_tx_memory_reserve` counts when memory footprint of the txg exceeds the ARC size
+
+#### Fault Management Ereport errors (Linux Only)
+
+`fm_erpt-dropped` counts when an error report cannot be created (eg available memory is too low)
+
+#### ZIL (Linux Only)
+note: ZIL measurements are system-wide, neither per-pool nor per-dataset
+
+`zil_commit_count` counts when ZFS transactions are committed to a ZIL
diff --git a/plugins/inputs/zfs/zfs.go b/plugins/inputs/zfs/zfs.go
index 05ca346b0..8e6bec464 100644
--- a/plugins/inputs/zfs/zfs.go
+++ b/plugins/inputs/zfs/zfs.go
@@ -19,7 +19,9 @@ var sampleConfig = `
   ## By default, telegraf gather all zfs stats
   ## If not specified, then default is:
   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
-
+  ## For Linux, the default is:
+  # kstatMetrics = ["abdstats", "arcstats", "dnodestats", "dbufcachestats",
+  #   "dmu_tx", "fm", "vdev_mirror_stats", "zfetchstats", "zil"]
   ## By default, don't gather zpool stats
   # poolMetrics = false
 `
diff --git a/plugins/inputs/zfs/zfs_linux.go b/plugins/inputs/zfs/zfs_linux.go
index 71ec7e5dc..276880d7d 100644
--- a/plugins/inputs/zfs/zfs_linux.go
+++ b/plugins/inputs/zfs/zfs_linux.go
@@ -80,7 +80,11 @@ func gatherPoolStats(pool poolInfo, acc telegraf.Accumulator) error {
 func (z *Zfs) Gather(acc telegraf.Accumulator) error {
 	kstatMetrics := z.KstatMetrics
 	if len(kstatMetrics) == 0 {
-		kstatMetrics = []string{"arcstats", "zfetchstats", "vdev_cache_stats"}
+		// vdev_cache_stats is deprecated
+		// xuio_stats are ignored because as of Sep-2016, no known
+		// consumers of xuio exist on Linux
+		kstatMetrics = []string{"abdstats", "arcstats", "dnodestats", "dbufcachestats",
+			"dmu_tx", "fm", "vdev_mirror_stats", "zfetchstats", "zil"}
 	}
 
 	kstatPath := z.KstatPath
@@ -104,7 +108,7 @@ func (z *Zfs) Gather(acc telegraf.Accumulator) error {
 	for _, metric := range kstatMetrics {
 		lines, err := internal.ReadLines(kstatPath + "/" + metric)
 		if err != nil {
-			return err
+			continue
 		}
 		for i, line := range lines {
 			if i == 0 || i == 1 {
@@ -115,6 +119,9 @@ func (z *Zfs) Gather(acc telegraf.Accumulator) error {
 			}
 			rawData := strings.Split(line, " ")
 			key := metric + "_" + rawData[0]
+			if metric == "zil" || metric == "dmu_tx" || metric == "dnodestats" {
+				key = rawData[0]
+			}
 			rawValue := rawData[len(rawData)-1]
 			value, _ := strconv.ParseInt(rawValue, 10, 64)
 			fields[key] = value
diff --git a/plugins/inputs/zfs/zfs_linux_test.go b/plugins/inputs/zfs/zfs_linux_test.go
index c4db75ff5..133d1cafa 100644
--- a/plugins/inputs/zfs/zfs_linux_test.go
+++ b/plugins/inputs/zfs/zfs_linux_test.go
@@ -115,16 +115,133 @@ streams_resets                  4    20989756
 streams_noresets                4    503182328
 bogus_streams                   4    0
 `
-const vdev_cache_statsContents = `7 1 0x01 3 144 23617323692 12081684236238879
-name                            type data
-delegations                     4    0
-hits                            4    0
-misses                          4    0
-`
 const pool_ioContents = `11 3 0x00 1 80 2225326830828 32953476980628
 nread    nwritten reads    writes   wtime    wlentime wupdate  rtime    rlentime rupdate  wcnt     rcnt
 1884160  6450688  22       978      272187126 2850519036 2263669418655 424226814 2850519036 2263669871823 0        0
 `
+const zilContents = `7 1 0x01 14 672 34118481334 437444452158445
+name                            type data
+zil_commit_count                4    77
+zil_commit_writer_count         4    77
+zil_itx_count                   4    1
+zil_itx_indirect_count          4    2
+zil_itx_indirect_bytes          4    3
+zil_itx_copied_count            4    4
+zil_itx_copied_bytes            4    5
+zil_itx_needcopy_count          4    6
+zil_itx_needcopy_bytes          4    7
+zil_itx_metaslab_normal_count   4    8
+zil_itx_metaslab_normal_bytes   4    9
+zil_itx_metaslab_slog_count     4    10
+zil_itx_metaslab_slog_bytes     4    11
+`
+const fmContents = `0 1 0x01 4 192 34087340971 437562103532892
+name                            type data
+erpt-dropped                    4    101
+erpt-set-failed                 4    202
+fmri-set-failed                 4    303
+payload-set-failed              4    404
+`
+const dmu_txContents = `5 1 0x01 11 528 34103260832 437683925071438
+name                            type data
+dmu_tx_assigned                 4    39321636
+dmu_tx_delay                    4    111
+dmu_tx_error                    4    222
+dmu_tx_suspended                4    333
+dmu_tx_group                    4    444
+dmu_tx_memory_reserve           4    555
+dmu_tx_memory_reclaim           4    666
+dmu_tx_dirty_throttle           4    777
+dmu_tx_dirty_delay              4    888
+dmu_tx_dirty_over_max           4    999
+dmu_tx_quota                    4    101010
+`
+
+const abdstatsContents = `7 1 0x01 21 1008 25476602923533 29223577332204
+name                            type data
+struct_size                     4    33840
+linear_cnt                      4    834
+linear_data_size                4    989696
+scatter_cnt                     4    12
+scatter_data_size               4    187904
+scatter_chunk_waste             4    4608
+scatter_order_0                 4    1
+scatter_order_1                 4    21
+scatter_order_2                 4    11
+scatter_order_3                 4    33
+scatter_order_4                 4    44
+scatter_order_5                 4    76
+scatter_order_6                 4    489
+scatter_order_7                 4    237483
+scatter_order_8                 4    233
+scatter_order_9                 4    4411
+scatter_order_10                4    1023
+scatter_page_multi_chunk        4    32122
+scatter_page_multi_zone         4    9930
+scatter_page_alloc_retry        4    99311
+scatter_sg_table_retry          4    99221
+`
+
+const dbufcachestatsContents = `
+15 1 0x01 11 2992 6257505590736 8516276189184
+name                            type data
+size                            4    242688
+size_max                        4    338944
+max_bytes                       4    62834368
+lowater_bytes                   4    56550932
+hiwater_bytes                   4    69117804
+total_evicts                    4    0
+hash_collisions                 4    0
+hash_elements                   4    31
+hash_elements_max               4    32
+hash_chains                     4    0
+hash_chain_max                  4    0
+`
+
+const dnodestatsContents = `
+10 1 0x01 28 7616 6257498525011 8671911551753
+name                            type data
+dnode_hold_dbuf_hold            4    0
+dnode_hold_dbuf_read            4    0
+dnode_hold_alloc_hits           4    1460
+dnode_hold_alloc_misses         4    0
+dnode_hold_alloc_interior       4    0
+dnode_hold_alloc_lock_retry     4    0
+dnode_hold_alloc_lock_misses    4    0
+dnode_hold_alloc_type_none      4    0
+dnode_hold_free_hits            4    2
+dnode_hold_free_misses          4    0
+dnode_hold_free_lock_misses     4    0
+dnode_hold_free_lock_retry      4    0
+dnode_hold_free_overflow        4    0
+dnode_hold_free_refcount        4    0
+dnode_hold_free_txg             4    0
+dnode_allocate                  4    2
+dnode_reallocate                4    0
+dnode_buf_evict                 4    6
+dnode_alloc_next_chunk          4    1
+dnode_alloc_race                4    0
+dnode_alloc_next_block          4    0
+dnode_move_invalid              4    0
+dnode_move_recheck1             4    0
+dnode_move_recheck2             4    0
+dnode_move_special              4    0
+dnode_move_handle               4    0
+dnode_move_rwlock               4    0
+dnode_move_active               4    0
+`
+
+const vdevmirrorcachestatsContents = `
+18 1 0x01 7 1904 6257505684227 9638257816287
+name                            type data
+rotating_linear                 4    0
+rotating_offset                 4    0
+rotating_seek                   4    0
+non_rotating_linear             4    0
+non_rotating_seek               4    0
+preferred_found                 4    0
+preferred_not_found             4    43
+`
 
 var testKstatPath = os.TempDir() + "/telegraf/proc/spl/kstat/zfs"
 
@@ -183,7 +300,16 @@ func TestZfsGeneratesMetrics(t *testing.T) {
 	err = ioutil.WriteFile(testKstatPath+"/zfetchstats", []byte(zfetchstatsContents), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testKstatPath+"/vdev_cache_stats", []byte(vdev_cache_statsContents), 0644)
+	err = ioutil.WriteFile(testKstatPath+"/zil", []byte(zilContents), 0644)
+	require.NoError(t, err)
+
+	err = ioutil.WriteFile(testKstatPath+"/fm", []byte(fmContents), 0644)
+	require.NoError(t, err)
+
+	err = ioutil.WriteFile(testKstatPath+"/dmu_tx", []byte(dmu_txContents), 0644)
+	require.NoError(t, err)
+
+	err = ioutil.WriteFile(testKstatPath+"/abdstats", []byte(abdstatsContents), 0644)
 	require.NoError(t, err)
 
 	intMetrics := getKstatMetricsAll()
@@ -328,20 +454,66 @@ func getKstatMetricsArcOnly() map[string]interface{} {
 
 func getKstatMetricsAll() map[string]interface{} {
 	otherMetrics := map[string]interface{}{
-		"zfetchstats_hits":              int64(7812959060),
-		"zfetchstats_misses":            int64(4154484207),
-		"zfetchstats_colinear_hits":     int64(1366368),
-		"zfetchstats_colinear_misses":   int64(4153117839),
-		"zfetchstats_stride_hits":       int64(7309776732),
-		"zfetchstats_stride_misses":     int64(222766182),
-		"zfetchstats_reclaim_successes": int64(107788388),
-		"zfetchstats_reclaim_failures":  int64(4045329451),
-		"zfetchstats_streams_resets":    int64(20989756),
-		"zfetchstats_streams_noresets":  int64(503182328),
-		"zfetchstats_bogus_streams":     int64(0),
-		"vdev_cache_stats_delegations":  int64(0),
-		"vdev_cache_stats_hits":         int64(0),
-		"vdev_cache_stats_misses":       int64(0),
+		"zfetchstats_hits":                  int64(7812959060),
+		"zfetchstats_misses":                int64(4154484207),
+		"zfetchstats_colinear_hits":         int64(1366368),
+		"zfetchstats_colinear_misses":       int64(4153117839),
+		"zfetchstats_stride_hits":           int64(7309776732),
+		"zfetchstats_stride_misses":         int64(222766182),
+		"zfetchstats_reclaim_successes":     int64(107788388),
+		"zfetchstats_reclaim_failures":      int64(4045329451),
+		"zfetchstats_streams_resets":        int64(20989756),
+		"zfetchstats_streams_noresets":      int64(503182328),
+		"zfetchstats_bogus_streams":         int64(0),
+		"zil_commit_count":                  int64(77),
+		"zil_commit_writer_count":           int64(77),
+		"zil_itx_count":                     int64(1),
+		"zil_itx_indirect_count":            int64(2),
+		"zil_itx_indirect_bytes":            int64(3),
+		"zil_itx_copied_count":              int64(4),
+		"zil_itx_copied_bytes":              int64(5),
+		"zil_itx_needcopy_count":            int64(6),
+		"zil_itx_needcopy_bytes":            int64(7),
+		"zil_itx_metaslab_normal_count":     int64(8),
+		"zil_itx_metaslab_normal_bytes":     int64(9),
+		"zil_itx_metaslab_slog_count":       int64(10),
+		"zil_itx_metaslab_slog_bytes":       int64(11),
+		"fm_erpt-dropped":                   int64(101),
+		"fm_erpt-set-failed":                int64(202),
+		"fm_fmri-set-failed":                int64(303),
+		"fm_payload-set-failed":             int64(404),
+		"dmu_tx_assigned":                   int64(39321636),
+		"dmu_tx_delay":                      int64(111),
+		"dmu_tx_error":                      int64(222),
+		"dmu_tx_suspended":                  int64(333),
+		"dmu_tx_group":                      int64(444),
+		"dmu_tx_memory_reserve":             int64(555),
+		"dmu_tx_memory_reclaim":             int64(666),
+		"dmu_tx_dirty_throttle":             int64(777),
+		"dmu_tx_dirty_delay":                int64(888),
+		"dmu_tx_dirty_over_max":             int64(999),
+		"dmu_tx_quota":                      int64(101010),
+		"abdstats_struct_size":              int64(33840),
+		"abdstats_linear_cnt":               int64(834),
+		"abdstats_linear_data_size":         int64(989696),
+		"abdstats_scatter_cnt":              int64(12),
+		"abdstats_scatter_data_size":        int64(187904),
+		"abdstats_scatter_chunk_waste":      int64(4608),
+		"abdstats_scatter_order_0":          int64(1),
+		"abdstats_scatter_order_1":          int64(21),
+		"abdstats_scatter_order_2":          int64(11),
+		"abdstats_scatter_order_3":          int64(33),
+		"abdstats_scatter_order_4":          int64(44),
+		"abdstats_scatter_order_5":          int64(76),
+		"abdstats_scatter_order_6":          int64(489),
+		"abdstats_scatter_order_7":          int64(237483),
+		"abdstats_scatter_order_8":          int64(233),
+		"abdstats_scatter_order_9":          int64(4411),
+		"abdstats_scatter_order_10":         int64(1023),
+		"abdstats_scatter_page_multi_chunk": int64(32122),
+		"abdstats_scatter_page_multi_zone":  int64(9930),
+		"abdstats_scatter_page_alloc_retry": int64(99311),
+		"abdstats_scatter_sg_table_retry":   int64(99221),
 	}
 	arcMetrics := getKstatMetricsArcOnly()
 	for k, v := range otherMetrics {

From 11c6a7f9c9992e7e08cd1c9a464a5ffcc0c3f6b2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 3 Jan 2018 17:47:13 -0800
Subject: [PATCH 0841/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173ce9b88..9eb273bfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [#3596](https://github.com/influxdata/telegraf/pull/3596): Add messages_delivered_get to rabbitmq input.
 - [#3632](https://github.com/influxdata/telegraf/pull/3632): Add wired field to mem input.
 - [#3619](https://github.com/influxdata/telegraf/pull/3619): Add support for gathering exchange metrics to the rabbitmq input.
+- [#3565](https://github.com/influxdata/telegraf/pull/3565): Add support for additional metrics on Linux in zfs input.
 
 ### Bugfixes
 

From b0c2bb870e51a24761e1b3b32943808a85200906 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 4 Jan 2018 15:28:00 -0800
Subject: [PATCH 0842/1302] Escape environment variables during config toml
 parsing (#3637)

---
 internal/config/config.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 98d68f9ef..2aaa2da19 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -40,6 +40,11 @@ var (
 
 	// envVarRe is a regex to find environment variables in the config file
 	envVarRe = regexp.MustCompile(`\$\w+`)
+
+	envVarEscaper = strings.NewReplacer(
+		`"`, `\"`,
+		`\`, `\\`,
+	)
 )
 
 // Config specifies the URL/user/password for the database that telegraf
@@ -689,6 +694,11 @@ func trimBOM(f []byte) []byte {
 	return bytes.TrimPrefix(f, []byte("\xef\xbb\xbf"))
 }
 
+// escapeEnv escapes a value for inserting into a TOML string.
+func escapeEnv(value string) string {
+	return envVarEscaper.Replace(value)
+}
+
 // parseFile loads a TOML configuration from a provided path and
 // returns the AST produced from the TOML parser. When loading the file, it
 // will find environment variables and replace them.
@@ -702,8 +712,9 @@ func parseFile(fpath string) (*ast.Table, error) {
 
 	env_vars := envVarRe.FindAll(contents, -1)
 	for _, env_var := range env_vars {
-		env_val := os.Getenv(strings.TrimPrefix(string(env_var), "$"))
-		if env_val != "" {
+		env_val, ok := os.LookupEnv(strings.TrimPrefix(string(env_var), "$"))
+		if ok {
+			env_val = escapeEnv(env_val)
 			contents = bytes.Replace(contents, env_var, []byte(env_val), 1)
 		}
 	}

From 315fd1e987cbef245a2ab33df5561d54396ce748 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 4 Jan 2018 15:29:56 -0800
Subject: [PATCH 0843/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eb273bfb..0e9dee617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - [#3593](https://github.com/influxdata/telegraf/pull/3593): Set Content-Type charset in influxdb output and allow it be overridden.
 - [#3594](https://github.com/influxdata/telegraf/pull/3594): Document permissions setup for postfix input.
 - [#3633](https://github.com/influxdata/telegraf/pull/3633): Fix deliver_get field in rabbitmq input.
+- [#3607](https://github.com/influxdata/telegraf/issues/3607): Escape environment variables during config toml parsing.
 
 ## v1.5 [2017-12-14]
 

From 37757b7782390ca77354c1af9e7d98d3cb23afdd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 4 Jan 2018 15:34:55 -0800
Subject: [PATCH 0844/1302] Add link to docs for configuring the openldap
 monitoring backend

---
 plugins/inputs/openldap/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index a57aabb84..e55d16509 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -4,6 +4,8 @@ This plugin gathers metrics from OpenLDAP's cn=Monitor backend.
 
 ### Configuration:
 
+To use this plugin you must enable the [monitoring](https://www.openldap.org/devel/admin/monitoringslapd.html) backend.
+
 ```toml
 [[inputs.openldap]]
   host = "localhost"

From 163f18f959e84246114c446d8148219f08bc6b41 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 4 Jan 2018 18:05:21 -0800
Subject: [PATCH 0845/1302] Update release notes for 1.5

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9dee617..a97e6f31d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,11 @@
   plugin is deprecated and will be removed in a future release.  Users of this
   plugin are encouraged to update to the new `jolokia2` plugin.
 
+- In the `postgresql` and `postgresql_extensible` plugins, the type of the oid
+  data type has changed from string to integer.  It is recommended to drop
+  affected fields until a new shard is started. For details on how to
+  workaround this issue please see [#3622](https://github.com/influxdata/telegraf/issues/3622).
+
 ### Features
 
 - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name.

From ae848e953910c932649ddd2ccc5d1251345cec20 Mon Sep 17 00:00:00 2001
From: gerardocorea92 <gerardocorea92@gmail.com>
Date: Fri, 5 Jan 2018 17:54:29 -0500
Subject: [PATCH 0846/1302] Add available_entropy field to kernel input plugin
 (#3524)

---
 plugins/inputs/system/KERNEL_README.md | 11 +++++++++--
 plugins/inputs/system/kernel.go        | 21 +++++++++++++++++++--
 plugins/inputs/system/kernel_test.go   | 26 +++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/system/KERNEL_README.md b/plugins/inputs/system/KERNEL_README.md
index 5ce2d21f8..0f28bf777 100644
--- a/plugins/inputs/system/KERNEL_README.md
+++ b/plugins/inputs/system/KERNEL_README.md
@@ -4,11 +4,17 @@ This plugin is only available on Linux.
 
 The kernel plugin gathers info about the kernel that doesn't fit into other
 plugins. In general, it is the statistics available in `/proc/stat` that are
-not covered by other plugins.
+not covered by other plugins as well as the value of `/proc/sys/kernel/random/entropy_avail`
 
 The metrics are documented in `man proc` under the `/proc/stat` section.
+The metrics are documented in `man 4 random` under the `/proc/stat` section.
 
 ```
+
+
+/proc/sys/kernel/random/entropy_avail
+Contains the value of available entropy
+
 /proc/stat
 kernel/system statistics. Varies with architecture. Common entries include:
 
@@ -50,6 +56,7 @@ Number of forks since boot.
     - disk_pages_out (integer, `page (1)`)
     - interrupts (integer, `intr`)
     - processes_forked (integer, `processes`)
+    - entropy_avail (integer, `entropy_available`)
 
 ### Tags:
 
@@ -60,5 +67,5 @@ None
 ```
 $ telegraf --config ~/ws/telegraf.conf --input-filter kernel --test
 * Plugin: kernel, Collection 1
-> kernel boot_time=1457505775i,context_switches=2626618i,disk_pages_in=5741i,disk_pages_out=1808i,interrupts=1472736i,processes_forked=10673i 1457613402960879816
+> kernel entropy_available=2469i,boot_time=1457505775i,context_switches=2626618i,disk_pages_in=5741i,disk_pages_out=1808i,interrupts=1472736i,processes_forked=10673i 1457613402960879816
 ```
diff --git a/plugins/inputs/system/kernel.go b/plugins/inputs/system/kernel.go
index 66cb0f763..1b3bc1dfa 100644
--- a/plugins/inputs/system/kernel.go
+++ b/plugins/inputs/system/kernel.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -23,7 +24,8 @@ var (
 )
 
 type Kernel struct {
-	statFile string
+	statFile        string
+	entropyStatFile string
 }
 
 func (k *Kernel) Description() string {
@@ -33,13 +35,27 @@ func (k *Kernel) Description() string {
 func (k *Kernel) SampleConfig() string { return "" }
 
 func (k *Kernel) Gather(acc telegraf.Accumulator) error {
+
 	data, err := k.getProcStat()
 	if err != nil {
 		return err
 	}
 
+	entropyData, err := ioutil.ReadFile(k.entropyStatFile)
+	if err != nil {
+		return err
+	}
+
+	entropyString := string(entropyData)
+	entropyValue, err := strconv.ParseInt(strings.TrimSpace(entropyString), 10, 64)
+	if err != nil {
+		return err
+	}
+
 	fields := make(map[string]interface{})
 
+	fields["entropy_avail"] = int64(entropyValue)
+
 	dataFields := bytes.Fields(data)
 	for i, field := range dataFields {
 		switch {
@@ -104,7 +120,8 @@ func (k *Kernel) getProcStat() ([]byte, error) {
 func init() {
 	inputs.Add("kernel", func() telegraf.Input {
 		return &Kernel{
-			statFile: "/proc/stat",
+			statFile:        "/proc/stat",
+			entropyStatFile: "/proc/sys/kernel/random/entropy_avail",
 		}
 	})
 }
diff --git a/plugins/inputs/system/kernel_test.go b/plugins/inputs/system/kernel_test.go
index 398cba4cc..bf090eb88 100644
--- a/plugins/inputs/system/kernel_test.go
+++ b/plugins/inputs/system/kernel_test.go
@@ -14,10 +14,13 @@ import (
 
 func TestFullProcFile(t *testing.T) {
 	tmpfile := makeFakeStatFile([]byte(statFile_Full))
+	tmpfile2 := makeFakeStatFile([]byte(entropyStatFile_Full))
 	defer os.Remove(tmpfile)
+	defer os.Remove(tmpfile2)
 
 	k := Kernel{
-		statFile: tmpfile,
+		statFile:        tmpfile,
+		entropyStatFile: tmpfile2,
 	}
 
 	acc := testutil.Accumulator{}
@@ -31,16 +34,20 @@ func TestFullProcFile(t *testing.T) {
 		"disk_pages_out":   int64(1808),
 		"interrupts":       int64(1472736),
 		"processes_forked": int64(10673),
+		"entropy_avail":    int64(1024),
 	}
 	acc.AssertContainsFields(t, "kernel", fields)
 }
 
 func TestPartialProcFile(t *testing.T) {
 	tmpfile := makeFakeStatFile([]byte(statFile_Partial))
+	tmpfile2 := makeFakeStatFile([]byte(entropyStatFile_Partial))
 	defer os.Remove(tmpfile)
+	defer os.Remove(tmpfile2)
 
 	k := Kernel{
-		statFile: tmpfile,
+		statFile:        tmpfile,
+		entropyStatFile: tmpfile2,
 	}
 
 	acc := testutil.Accumulator{}
@@ -53,16 +60,20 @@ func TestPartialProcFile(t *testing.T) {
 		"disk_pages_in":    int64(5741),
 		"disk_pages_out":   int64(1808),
 		"interrupts":       int64(1472736),
+		"entropy_avail":    int64(1024),
 	}
 	acc.AssertContainsFields(t, "kernel", fields)
 }
 
 func TestInvalidProcFile1(t *testing.T) {
 	tmpfile := makeFakeStatFile([]byte(statFile_Invalid))
+	tmpfile2 := makeFakeStatFile([]byte(entropyStatFile_Invalid))
 	defer os.Remove(tmpfile)
+	defer os.Remove(tmpfile2)
 
 	k := Kernel{
-		statFile: tmpfile,
+		statFile:        tmpfile,
+		entropyStatFile: tmpfile2,
 	}
 
 	acc := testutil.Accumulator{}
@@ -108,6 +119,7 @@ procs_blocked 0
 softirq 1031662 0 649485 20946 111071 11620 0 1 0 994 237545
 page 5741 1808
 swap 1 0
+entropy_avail 1024
 `
 
 const statFile_Partial = `cpu  6796 252 5655 10444977 175 0 101 0 0 0
@@ -133,6 +145,7 @@ procs_blocked 0
 softirq 1031662 0 649485 20946 111071 11620 0 1 0 994 237545
 page 5741 1808
 swap 1 0
+entropy_avail 1024
 `
 
 // missing second page measurement
@@ -145,8 +158,15 @@ procs_running 2
 page 5741
 procs_blocked 0
 softirq 1031662 0 649485 20946 111071 11620 0 1 0 994 237545
+entropy_avail 1024 2048
 `
 
+const entropyStatFile_Full = `1024`
+
+const entropyStatFile_Partial = `1024`
+
+const entropyStatFile_Invalid = ``
+
 func makeFakeStatFile(content []byte) string {
 	tmpfile, err := ioutil.TempFile("", "kerneltest")
 	if err != nil {

From 35f1b9f500f70179db02ed739c75b48fd069dcdd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 5 Jan 2018 14:56:54 -0800
Subject: [PATCH 0847/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a97e6f31d..bed730f4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#3632](https://github.com/influxdata/telegraf/pull/3632): Add wired field to mem input.
 - [#3619](https://github.com/influxdata/telegraf/pull/3619): Add support for gathering exchange metrics to the rabbitmq input.
 - [#3565](https://github.com/influxdata/telegraf/pull/3565): Add support for additional metrics on Linux in zfs input.
+- [#3524](https://github.com/influxdata/telegraf/pull/3524): Add available_entropy field to kernel input plugin.
 
 ### Bugfixes
 

From 2938c2fa793d397ca9867a7e9bcbbd23716dab5b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 5 Jan 2018 15:59:25 -0800
Subject: [PATCH 0848/1302] Add user privilege level setting to IPMI sensors
 (#3643)

---
 plugins/inputs/ipmi_sensor/README.md          |  5 ++++-
 plugins/inputs/ipmi_sensor/connection.go      |  8 ++++++--
 plugins/inputs/ipmi_sensor/connection_test.go |  4 +++-
 plugins/inputs/ipmi_sensor/ipmi.go            | 16 +++++++++-------
 plugins/inputs/ipmi_sensor/ipmi_test.go       |  9 +++++----
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/ipmi_sensor/README.md b/plugins/inputs/ipmi_sensor/README.md
index 820af50a4..74cfe3bc5 100644
--- a/plugins/inputs/ipmi_sensor/README.md
+++ b/plugins/inputs/ipmi_sensor/README.md
@@ -22,7 +22,10 @@ ipmitool -I lan -H SERVER -U USERID -P PASSW0RD sdr
 [[inputs.ipmi_sensor]]
   ## optionally specify the path to the ipmitool executable
   # path = "/usr/bin/ipmitool"
-  #
+  ##
+  ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
+  # privilege = "ADMINISTRATOR"
+  ##
   ## optionally specify one or more servers via a url matching
   ##  [username[:password]@][protocol[(address)]]
   ##  e.g.
diff --git a/plugins/inputs/ipmi_sensor/connection.go b/plugins/inputs/ipmi_sensor/connection.go
index b93cda7d4..87922b984 100644
--- a/plugins/inputs/ipmi_sensor/connection.go
+++ b/plugins/inputs/ipmi_sensor/connection.go
@@ -14,10 +14,12 @@ type Connection struct {
 	Password  string
 	Port      int
 	Interface string
+	Privilege string
 }
 
-func NewConnection(server string) *Connection {
+func NewConnection(server string, privilege string) *Connection {
 	conn := &Connection{}
+	conn.Privilege = privilege
 	inx1 := strings.LastIndex(server, "@")
 	inx2 := strings.Index(server, "(")
 	inx3 := strings.Index(server, ")")
@@ -59,7 +61,9 @@ func (t *Connection) options() []string {
 	if t.Port != 0 {
 		options = append(options, "-p", strconv.Itoa(t.Port))
 	}
-
+	if t.Privilege != "" {
+		options = append(options, "-L", t.Privilege)
+	}
 	return options
 }
 
diff --git a/plugins/inputs/ipmi_sensor/connection_test.go b/plugins/inputs/ipmi_sensor/connection_test.go
index 13a62061d..74944890f 100644
--- a/plugins/inputs/ipmi_sensor/connection_test.go
+++ b/plugins/inputs/ipmi_sensor/connection_test.go
@@ -23,6 +23,7 @@ func TestNewConnection(t *testing.T) {
 				Username:  "USERID",
 				Password:  "PASSW0RD",
 				Interface: "lan",
+				Privilege: "USER",
 			},
 		},
 		{
@@ -32,11 +33,12 @@ func TestNewConnection(t *testing.T) {
 				Username:  "USERID",
 				Password:  "PASS:!@#$%^&*(234)_+W0RD",
 				Interface: "lan",
+				Privilege: "USER",
 			},
 		},
 	}
 
 	for _, v := range testData {
-		assert.Equal(t, v.con, NewConnection(v.addr))
+		assert.Equal(t, v.con, NewConnection(v.addr, "USER"))
 	}
 }
diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go
index 9448208bd..2d7bcaefc 100644
--- a/plugins/inputs/ipmi_sensor/ipmi.go
+++ b/plugins/inputs/ipmi_sensor/ipmi.go
@@ -17,15 +17,19 @@ var (
 )
 
 type Ipmi struct {
-	Path    string
-	Servers []string
-	Timeout internal.Duration
+	Path      string
+	Privilege string
+	Servers   []string
+	Timeout   internal.Duration
 }
 
 var sampleConfig = `
   ## optionally specify the path to the ipmitool executable
   # path = "/usr/bin/ipmitool"
-  #
+  ##
+  ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
+  # privilege = "ADMINISTRATOR"
+  ##
   ## optionally specify one or more servers via a url matching
   ##  [username[:password]@][protocol[(address)]]
   ##  e.g.
@@ -77,13 +81,11 @@ func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
 	opts := make([]string, 0)
 	hostname := ""
-
 	if server != "" {
-		conn := NewConnection(server)
+		conn := NewConnection(server, m.Privilege)
 		hostname = conn.Hostname
 		opts = conn.options()
 	}
-
 	opts = append(opts, "sdr")
 	cmd := execCommand(m.Path, opts...)
 	out, err := internal.CombinedOutputTimeout(cmd, m.Timeout.Duration)
diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go
index a6f5148c1..3d45f2fa8 100644
--- a/plugins/inputs/ipmi_sensor/ipmi_test.go
+++ b/plugins/inputs/ipmi_sensor/ipmi_test.go
@@ -15,9 +15,10 @@ import (
 
 func TestGather(t *testing.T) {
 	i := &Ipmi{
-		Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
-		Path:    "ipmitool",
-		Timeout: internal.Duration{Duration: time.Second * 5},
+		Servers:   []string{"USERID:PASSW0RD@lan(192.168.1.1)"},
+		Path:      "ipmitool",
+		Privilege: "USER",
+		Timeout:   internal.Duration{Duration: time.Second * 5},
 	}
 	// overwriting exec commands with mock commands
 	execCommand = fakeExecCommand
@@ -29,7 +30,7 @@ func TestGather(t *testing.T) {
 
 	assert.Equal(t, acc.NFields(), 266, "non-numeric measurements should be ignored")
 
-	conn := NewConnection(i.Servers[0])
+	conn := NewConnection(i.Servers[0], i.Privilege)
 	assert.Equal(t, "USERID", conn.Username)
 	assert.Equal(t, "lan", conn.Interface)
 

From 6dd5c3b2c0d173e1d4f39e265858188e90fb00a9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 5 Jan 2018 16:00:44 -0800
Subject: [PATCH 0849/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bed730f4b..e96c83432 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - [#3619](https://github.com/influxdata/telegraf/pull/3619): Add support for gathering exchange metrics to the rabbitmq input.
 - [#3565](https://github.com/influxdata/telegraf/pull/3565): Add support for additional metrics on Linux in zfs input.
 - [#3524](https://github.com/influxdata/telegraf/pull/3524): Add available_entropy field to kernel input plugin.
+- [#3643](https://github.com/influxdata/telegraf/pull/3643): Add user privilege level setting to IPMI sensors.
 
 ### Bugfixes
 

From 53e7537c5c1a3c93b43ea2dd4147a66024f4a3b4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 5 Jan 2018 16:01:06 -0800
Subject: [PATCH 0850/1302] Fix link to cratedb readme

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e96c83432..232ccd940 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@
 ### New Plugins
 - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno
 - [bond](./plugins/inputs/bond/README.md) - Thanks to @ildarsv
-- [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge
+- [cratedb](./plugins/outputs/cratedb/README.md) - Thanks to @felixge
 - [dcos](./plugins/inputs/dcos/README.md) - Thanks to @influxdata
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah

From 1d86064fb7d44ab0f845ee47a746ca20ec261f30 Mon Sep 17 00:00:00 2001
From: James <james-lawrence@users.noreply.github.com>
Date: Fri, 5 Jan 2018 19:03:09 -0500
Subject: [PATCH 0851/1302] Use persistent connection to postgresql database
 (#2701)

---
 CHANGELOG.md                                  |   4 +
 plugins/inputs/postgresql/connect.go          |  77 ----------
 plugins/inputs/postgresql/postgresql.go       |  91 ++++-------
 plugins/inputs/postgresql/postgresql_test.go  | 109 +++++++-------
 plugins/inputs/postgresql/service.go          | 142 ++++++++++++++++++
 .../postgresql_extensible.go                  |  90 ++++-------
 .../postgresql_extensible_test.go             |  66 ++++----
 7 files changed, 298 insertions(+), 281 deletions(-)
 delete mode 100644 plugins/inputs/postgresql/connect.go
 create mode 100644 plugins/inputs/postgresql/service.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 232ccd940..ea9b8721a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,10 @@
   `use_random_partitionkey` options has been deprecated in favor of the
   `partition` subtable.  This allows for more flexible methods to set the
   partition key such as by metric name or by tag.
+- `postgresql` plugins will now default to using a persistent connection to the database.
+  `Important` In environments TCP connections are terminated when idle for periods shorter than 15 minutes
+  and the collection interval is longer than the termination period then max_lifetime
+  should be set to be less than the collection interval to pervent errors when collecting metrics.
 
 - With the release of the new improved `jolokia2` input, the legacy `jolokia`
   plugin is deprecated and will be removed in a future release.  Users of this
diff --git a/plugins/inputs/postgresql/connect.go b/plugins/inputs/postgresql/connect.go
deleted file mode 100644
index 011ae32e0..000000000
--- a/plugins/inputs/postgresql/connect.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package postgresql
-
-import (
-	"fmt"
-	"net"
-	"net/url"
-	"sort"
-	"strings"
-)
-
-// pulled from lib/pq
-// ParseURL no longer needs to be used by clients of this library since supplying a URL as a
-// connection string to sql.Open() is now supported:
-//
-//	sql.Open("postgres", "postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full")
-//
-// It remains exported here for backwards-compatibility.
-//
-// ParseURL converts a url to a connection string for driver.Open.
-// Example:
-//
-//	"postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full"
-//
-// converts to:
-//
-//	"user=bob password=secret host=1.2.3.4 port=5432 dbname=mydb sslmode=verify-full"
-//
-// A minimal example:
-//
-//	"postgres://"
-//
-// This will be blank, causing driver.Open to use all of the defaults
-func ParseURL(uri string) (string, error) {
-	u, err := url.Parse(uri)
-	if err != nil {
-		return "", err
-	}
-
-	if u.Scheme != "postgres" && u.Scheme != "postgresql" {
-		return "", fmt.Errorf("invalid connection protocol: %s", u.Scheme)
-	}
-
-	var kvs []string
-	escaper := strings.NewReplacer(` `, `\ `, `'`, `\'`, `\`, `\\`)
-	accrue := func(k, v string) {
-		if v != "" {
-			kvs = append(kvs, k+"="+escaper.Replace(v))
-		}
-	}
-
-	if u.User != nil {
-		v := u.User.Username()
-		accrue("user", v)
-
-		v, _ = u.User.Password()
-		accrue("password", v)
-	}
-
-	if host, port, err := net.SplitHostPort(u.Host); err != nil {
-		accrue("host", u.Host)
-	} else {
-		accrue("host", host)
-		accrue("port", port)
-	}
-
-	if u.Path != "" {
-		accrue("dbname", u.Path[1:])
-	}
-
-	q := u.Query()
-	for k := range q {
-		accrue(k, q.Get(k))
-	}
-
-	sort.Strings(kvs) // Makes testing easier (not a performance concern)
-	return strings.Join(kvs, " "), nil
-}
diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go
index 832c433ed..19c9db9ce 100644
--- a/plugins/inputs/postgresql/postgresql.go
+++ b/plugins/inputs/postgresql/postgresql.go
@@ -2,26 +2,21 @@ package postgresql
 
 import (
 	"bytes"
-	"database/sql"
 	"fmt"
-	"regexp"
-	"sort"
 	"strings"
 
 	// register in driver.
 	_ "github.com/jackc/pgx/stdlib"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Postgresql struct {
-	Address          string
+	Service
 	Databases        []string
 	IgnoredDatabases []string
-	OrderedColumns   []string
-	AllColumns       []string
-	sanitizedAddress string
 }
 
 var ignoredColumns = map[string]bool{"stats_reset": true}
@@ -41,6 +36,15 @@ var sampleConfig = `
   ## to grab metrics for.
   ##
   address = "host=localhost user=postgres sslmode=disable"
+  ## A custom name for the database that will be used as the "server" tag in the
+  ## measurement output. If not specified, a default one generated from
+  ## the connection address is used.
+  # outputaddress = "db01"
+
+  ## connection configuration.
+  ## maxlifetime - specify the maximum lifetime of a connection.
+  ## default is forever (0s)
+  max_lifetime = "0s"
 
   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
   ## databases are gathered.  Do NOT use with the 'databases' option.
@@ -63,24 +67,13 @@ func (p *Postgresql) IgnoredColumns() map[string]bool {
 	return ignoredColumns
 }
 
-var localhost = "host=localhost sslmode=disable"
-
 func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	var (
-		err   error
-		db    *sql.DB
-		query string
+		err     error
+		query   string
+		columns []string
 	)
 
-	if p.Address == "" || p.Address == "localhost" {
-		p.Address = localhost
-	}
-
-	if db, err = sql.Open("pgx", p.Address); err != nil {
-		return err
-	}
-	defer db.Close()
-
 	if len(p.Databases) == 0 && len(p.IgnoredDatabases) == 0 {
 		query = `SELECT * FROM pg_stat_database`
 	} else if len(p.IgnoredDatabases) != 0 {
@@ -91,7 +84,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			strings.Join(p.Databases, "','"))
 	}
 
-	rows, err := db.Query(query)
+	rows, err := p.DB.Query(query)
 	if err != nil {
 		return err
 	}
@@ -99,16 +92,12 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	defer rows.Close()
 
 	// grab the column information from the result
-	p.OrderedColumns, err = rows.Columns()
-	if err != nil {
+	if columns, err = rows.Columns(); err != nil {
 		return err
-	} else {
-		p.AllColumns = make([]string, len(p.OrderedColumns))
-		copy(p.AllColumns, p.OrderedColumns)
 	}
 
 	for rows.Next() {
-		err = p.accRow(rows, acc)
+		err = p.accRow(rows, acc, columns)
 		if err != nil {
 			return err
 		}
@@ -116,7 +105,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 
 	query = `SELECT * FROM pg_stat_bgwriter`
 
-	bg_writer_row, err := db.Query(query)
+	bg_writer_row, err := p.DB.Query(query)
 	if err != nil {
 		return err
 	}
@@ -124,22 +113,17 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	defer bg_writer_row.Close()
 
 	// grab the column information from the result
-	p.OrderedColumns, err = bg_writer_row.Columns()
-	if err != nil {
+	if columns, err = bg_writer_row.Columns(); err != nil {
 		return err
-	} else {
-		for _, v := range p.OrderedColumns {
-			p.AllColumns = append(p.AllColumns, v)
-		}
 	}
 
 	for bg_writer_row.Next() {
-		err = p.accRow(bg_writer_row, acc)
+		err = p.accRow(bg_writer_row, acc, columns)
 		if err != nil {
 			return err
 		}
 	}
-	sort.Strings(p.AllColumns)
+
 	return bg_writer_row.Err()
 }
 
@@ -147,37 +131,20 @@ type scanner interface {
 	Scan(dest ...interface{}) error
 }
 
-var passwordKVMatcher, _ = regexp.Compile("password=\\S+ ?")
-
-func (p *Postgresql) SanitizedAddress() (_ string, err error) {
-	var canonicalizedAddress string
-	if strings.HasPrefix(p.Address, "postgres://") || strings.HasPrefix(p.Address, "postgresql://") {
-		canonicalizedAddress, err = ParseURL(p.Address)
-		if err != nil {
-			return p.sanitizedAddress, err
-		}
-	} else {
-		canonicalizedAddress = p.Address
-	}
-	p.sanitizedAddress = passwordKVMatcher.ReplaceAllString(canonicalizedAddress, "")
-
-	return p.sanitizedAddress, err
-}
-
-func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator) error {
+func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator, columns []string) error {
 	var columnVars []interface{}
 	var dbname bytes.Buffer
 
 	// this is where we'll store the column name with its *interface{}
 	columnMap := make(map[string]*interface{})
 
-	for _, column := range p.OrderedColumns {
+	for _, column := range columns {
 		columnMap[column] = new(interface{})
 	}
 
 	// populate the array of interface{} with the pointers in the right order
 	for i := 0; i < len(columnMap); i++ {
-		columnVars = append(columnVars, columnMap[p.OrderedColumns[i]])
+		columnVars = append(columnVars, columnMap[columns[i]])
 	}
 
 	// deconstruct array of variables and send to Scan
@@ -215,6 +182,14 @@ func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("postgresql", func() telegraf.Input {
-		return &Postgresql{}
+		return &Postgresql{
+			Service: Service{
+				MaxIdle: 1,
+				MaxOpen: 1,
+				MaxLifetime: internal.Duration{
+					Duration: 0,
+				},
+			},
+		}
 	})
 }
diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go
index 410b9b421..306dca3b6 100644
--- a/plugins/inputs/postgresql/postgresql_test.go
+++ b/plugins/inputs/postgresql/postgresql_test.go
@@ -15,19 +15,18 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 		Databases: []string{"postgres"},
 	}
 
 	var acc testutil.Accumulator
-	err := p.Gather(&acc)
-	require.NoError(t, err)
-
-	availableColumns := make(map[string]bool)
-	for _, col := range p.AllColumns {
-		availableColumns[col] = true
-	}
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	intMetrics := []string{
 		"xact_commit",
@@ -71,39 +70,27 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	metricsCounted := 0
 
 	for _, metric := range intMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasInt64Field("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasInt64Field("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range int32Metrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasInt32Field("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasInt32Field("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range floatMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasFloatField("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasFloatField("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range stringMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasStringField("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasStringField("postgresql", metric))
+		metricsCounted++
 	}
 
 	assert.True(t, metricsCounted > 0)
-	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
+	assert.Equal(t, len(floatMetrics)+len(intMetrics)+len(int32Metrics)+len(stringMetrics), metricsCounted)
 }
 
 func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
@@ -112,15 +99,19 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 		Databases: []string{"postgres"},
 	}
 
 	var acc testutil.Accumulator
 
-	err := p.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	point, ok := acc.Get("postgresql")
 	require.True(t, ok)
@@ -134,14 +125,18 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 	}
 
 	var acc testutil.Accumulator
 
-	err := p.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	var found bool
 
@@ -163,14 +158,17 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 	}
 
 	var acc testutil.Accumulator
-
-	err := p.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	for col := range p.IgnoredColumns() {
 		assert.False(t, acc.HasMeasurement(col))
@@ -183,15 +181,19 @@ func TestPostgresqlDatabaseWhitelistTest(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 		Databases: []string{"template0"},
 	}
 
 	var acc testutil.Accumulator
 
-	err := p.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	var foundTemplate0 = false
 	var foundTemplate1 = false
@@ -219,15 +221,18 @@ func TestPostgresqlDatabaseBlacklistTest(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 		IgnoredDatabases: []string{"template0"},
 	}
 
 	var acc testutil.Accumulator
-
-	err := p.Gather(&acc)
-	require.NoError(t, err)
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, p.Gather(&acc))
 
 	var foundTemplate0 = false
 	var foundTemplate1 = false
diff --git a/plugins/inputs/postgresql/service.go b/plugins/inputs/postgresql/service.go
new file mode 100644
index 000000000..4f7b21e54
--- /dev/null
+++ b/plugins/inputs/postgresql/service.go
@@ -0,0 +1,142 @@
+package postgresql
+
+import (
+	"database/sql"
+	"fmt"
+	"net"
+	"net/url"
+	"regexp"
+	"sort"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+)
+
+// pulled from lib/pq
+// ParseURL no longer needs to be used by clients of this library since supplying a URL as a
+// connection string to sql.Open() is now supported:
+//
+//	sql.Open("postgres", "postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full")
+//
+// It remains exported here for backwards-compatibility.
+//
+// ParseURL converts a url to a connection string for driver.Open.
+// Example:
+//
+//	"postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full"
+//
+// converts to:
+//
+//	"user=bob password=secret host=1.2.3.4 port=5432 dbname=mydb sslmode=verify-full"
+//
+// A minimal example:
+//
+//	"postgres://"
+//
+// This will be blank, causing driver.Open to use all of the defaults
+func parseURL(uri string) (string, error) {
+	u, err := url.Parse(uri)
+	if err != nil {
+		return "", err
+	}
+
+	if u.Scheme != "postgres" && u.Scheme != "postgresql" {
+		return "", fmt.Errorf("invalid connection protocol: %s", u.Scheme)
+	}
+
+	var kvs []string
+	escaper := strings.NewReplacer(` `, `\ `, `'`, `\'`, `\`, `\\`)
+	accrue := func(k, v string) {
+		if v != "" {
+			kvs = append(kvs, k+"="+escaper.Replace(v))
+		}
+	}
+
+	if u.User != nil {
+		v := u.User.Username()
+		accrue("user", v)
+
+		v, _ = u.User.Password()
+		accrue("password", v)
+	}
+
+	if host, port, err := net.SplitHostPort(u.Host); err != nil {
+		accrue("host", u.Host)
+	} else {
+		accrue("host", host)
+		accrue("port", port)
+	}
+
+	if u.Path != "" {
+		accrue("dbname", u.Path[1:])
+	}
+
+	q := u.Query()
+	for k := range q {
+		accrue(k, q.Get(k))
+	}
+
+	sort.Strings(kvs) // Makes testing easier (not a performance concern)
+	return strings.Join(kvs, " "), nil
+}
+
+// Service common functionality shared between the postgresql and postgresql_extensible
+// packages.
+type Service struct {
+	Address       string
+	Outputaddress string
+	MaxIdle       int
+	MaxOpen       int
+	MaxLifetime   internal.Duration
+	DB            *sql.DB
+}
+
+// Start starts the ServiceInput's service, whatever that may be
+func (p *Service) Start(telegraf.Accumulator) (err error) {
+	const localhost = "host=localhost sslmode=disable"
+
+	if p.Address == "" || p.Address == "localhost" {
+		p.Address = localhost
+	}
+
+	if p.DB, err = sql.Open("pgx", p.Address); err != nil {
+		return err
+	}
+
+	p.DB.SetMaxOpenConns(p.MaxOpen)
+	p.DB.SetMaxIdleConns(p.MaxIdle)
+	p.DB.SetConnMaxLifetime(p.MaxLifetime.Duration)
+
+	return nil
+}
+
+// Stop stops the services and closes any necessary channels and connections
+func (p *Service) Stop() {
+	p.DB.Close()
+}
+
+var kvMatcher, _ = regexp.Compile("(password|sslcert|sslkey|sslmode|sslrootcert)=\\S+ ?")
+
+// SanitizedAddress utility function to strip sensitive information from the connection string.
+func (p *Service) SanitizedAddress() (sanitizedAddress string, err error) {
+	var (
+		canonicalizedAddress string
+	)
+
+	if p.Outputaddress != "" {
+		return p.Outputaddress, nil
+	}
+
+	if strings.HasPrefix(p.Address, "postgres://") || strings.HasPrefix(p.Address, "postgresql://") {
+		if canonicalizedAddress, err = parseURL(p.Address); err != nil {
+			return sanitizedAddress, err
+		}
+	} else {
+		canonicalizedAddress = p.Address
+	}
+
+	sanitizedAddress = kvMatcher.ReplaceAllString(canonicalizedAddress, "")
+
+	return sanitizedAddress, err
+}
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 07a782f89..056f4afc8 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -2,29 +2,24 @@ package postgresql_extensible
 
 import (
 	"bytes"
-	"database/sql"
 	"fmt"
 	"log"
-	"regexp"
 	"strings"
 
 	// register in driver.
 	_ "github.com/jackc/pgx/stdlib"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
 )
 
 type Postgresql struct {
-	Address          string
-	Outputaddress    string
-	Databases        []string
-	OrderedColumns   []string
-	AllColumns       []string
-	AdditionalTags   []string
-	sanitizedAddress string
-	Query            []struct {
+	postgresql.Service
+	Databases      []string
+	AdditionalTags []string
+	Query          []struct {
 		Sqlquery    string
 		Version     int
 		Withdbname  bool
@@ -58,14 +53,20 @@ var sampleConfig = `
   ## to grab metrics for.
   #
   address = "host=localhost user=postgres sslmode=disable"
+
+  ## connection configuration.
+  ## maxlifetime - specify the maximum lifetime of a connection.
+  ## default is forever (0s)
+  max_lifetime = "0s"
+
   ## A list of databases to pull metrics about. If not specified, metrics for all
   ## databases are gathered.
   ## databases = ["app_production", "testing"]
   #
-  # outputaddress = "db01"
   ## A custom name for the database that will be used as the "server" tag in the
   ## measurement output. If not specified, a default one generated from
   ## the connection address is used.
+  # outputaddress = "db01"
   #
   ## Define the toml config where the sql queries are stored
   ## New queries can be added, if the withdbname is set to true and there is no
@@ -113,36 +114,25 @@ func (p *Postgresql) IgnoredColumns() map[string]bool {
 	return ignoredColumns
 }
 
-var localhost = "host=localhost sslmode=disable"
-
 func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 	var (
 		err         error
-		db          *sql.DB
 		sql_query   string
 		query_addon string
 		db_version  int
 		query       string
 		tag_value   string
 		meas_name   string
+		columns     []string
 	)
 
-	if p.Address == "" || p.Address == "localhost" {
-		p.Address = localhost
-	}
-
-	if db, err = sql.Open("pgx", p.Address); err != nil {
-		return err
-	}
-	defer db.Close()
-
 	// Retreiving the database version
 
 	query = `select substring(setting from 1 for 3) as version from pg_settings where name='server_version_num'`
-	err = db.QueryRow(query).Scan(&db_version)
-	if err != nil {
+	if err = p.DB.QueryRow(query).Scan(&db_version); err != nil {
 		db_version = 0
 	}
+
 	// We loop in order to process each query
 	// Query is not run if Database version does not match the query version.
 
@@ -168,7 +158,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 		sql_query += query_addon
 
 		if p.Query[i].Version <= db_version {
-			rows, err := db.Query(sql_query)
+			rows, err := p.DB.Query(sql_query)
 			if err != nil {
 				acc.AddError(err)
 				continue
@@ -177,15 +167,11 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			defer rows.Close()
 
 			// grab the column information from the result
-			p.OrderedColumns, err = rows.Columns()
-			if err != nil {
+			if columns, err = rows.Columns(); err != nil {
 				acc.AddError(err)
 				continue
-			} else {
-				for _, v := range p.OrderedColumns {
-					p.AllColumns = append(p.AllColumns, v)
-				}
 			}
+
 			p.AdditionalTags = nil
 			if tag_value != "" {
 				tag_list := strings.Split(tag_value, ",")
@@ -195,7 +181,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 			}
 
 			for rows.Next() {
-				err = p.accRow(meas_name, rows, acc)
+				err = p.accRow(meas_name, rows, acc, columns)
 				if err != nil {
 					acc.AddError(err)
 					break
@@ -210,27 +196,7 @@ type scanner interface {
 	Scan(dest ...interface{}) error
 }
 
-var KVMatcher, _ = regexp.Compile("(password|sslcert|sslkey|sslmode|sslrootcert)=\\S+ ?")
-
-func (p *Postgresql) SanitizedAddress() (_ string, err error) {
-	if p.Outputaddress != "" {
-		return p.Outputaddress, nil
-	}
-	var canonicalizedAddress string
-	if strings.HasPrefix(p.Address, "postgres://") || strings.HasPrefix(p.Address, "postgresql://") {
-		canonicalizedAddress, err = postgresql.ParseURL(p.Address)
-		if err != nil {
-			return p.sanitizedAddress, err
-		}
-	} else {
-		canonicalizedAddress = p.Address
-	}
-	p.sanitizedAddress = KVMatcher.ReplaceAllString(canonicalizedAddress, "")
-
-	return p.sanitizedAddress, err
-}
-
-func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumulator) error {
+func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumulator, columns []string) error {
 	var (
 		err        error
 		columnVars []interface{}
@@ -241,13 +207,13 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 	// this is where we'll store the column name with its *interface{}
 	columnMap := make(map[string]*interface{})
 
-	for _, column := range p.OrderedColumns {
+	for _, column := range columns {
 		columnMap[column] = new(interface{})
 	}
 
 	// populate the array of interface{} with the pointers in the right order
 	for i := 0; i < len(columnMap); i++ {
-		columnVars = append(columnVars, columnMap[p.OrderedColumns[i]])
+		columnVars = append(columnVars, columnMap[columns[i]])
 	}
 
 	// deconstruct array of variables and send to Scan
@@ -275,7 +241,7 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 	fields := make(map[string]interface{})
 COLUMN:
 	for col, val := range columnMap {
-		log.Printf("D! postgresql_extensible: column: %s = %T: %s\n", col, *val, *val)
+		log.Printf("D! postgresql_extensible: column: %s = %T: %v\n", col, *val, *val)
 		_, ignore := ignoredColumns[col]
 		if ignore || *val == nil {
 			continue
@@ -310,6 +276,14 @@ COLUMN:
 
 func init() {
 	inputs.Add("postgresql_extensible", func() telegraf.Input {
-		return &Postgresql{}
+		return &Postgresql{
+			Service: postgresql.Service{
+				MaxIdle: 1,
+				MaxOpen: 1,
+				MaxLifetime: internal.Duration{
+					Duration: 0,
+				},
+			},
+		}
 	})
 }
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
index 4545a2478..77db5feb5 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -4,22 +4,28 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/postgresql"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func queryRunner(t *testing.T, q query) (*Postgresql, *testutil.Accumulator) {
+func queryRunner(t *testing.T, q query) *testutil.Accumulator {
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: postgresql.Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 		Databases: []string{"postgres"},
 		Query:     q,
 	}
 	var acc testutil.Accumulator
+	p.Start(&acc)
 
 	require.NoError(t, acc.GatherError(p.Gather))
-	return p, &acc
+	return &acc
 }
 
 func TestPostgresqlGeneratesMetrics(t *testing.T) {
@@ -27,18 +33,13 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	p, acc := queryRunner(t, query{{
+	acc := queryRunner(t, query{{
 		Sqlquery:   "select * from pg_stat_database",
 		Version:    901,
 		Withdbname: false,
 		Tagvalue:   "",
 	}})
 
-	availableColumns := make(map[string]bool)
-	for _, col := range p.AllColumns {
-		availableColumns[col] = true
-	}
-
 	intMetrics := []string{
 		"xact_commit",
 		"xact_rollback",
@@ -71,39 +72,27 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	metricsCounted := 0
 
 	for _, metric := range intMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasInt64Field("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasInt64Field("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range int32Metrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasInt32Field("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasInt32Field("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range floatMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasFloatField("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasFloatField("postgresql", metric))
+		metricsCounted++
 	}
 
 	for _, metric := range stringMetrics {
-		_, ok := availableColumns[metric]
-		if ok {
-			assert.True(t, acc.HasStringField("postgresql", metric))
-			metricsCounted++
-		}
+		assert.True(t, acc.HasStringField("postgresql", metric))
+		metricsCounted++
 	}
 
 	assert.True(t, metricsCounted > 0)
-	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
+	assert.Equal(t, len(floatMetrics)+len(intMetrics)+len(int32Metrics)+len(stringMetrics), metricsCounted)
 }
 
 func TestPostgresqlQueryOutputTests(t *testing.T) {
@@ -137,7 +126,7 @@ func TestPostgresqlQueryOutputTests(t *testing.T) {
 	}
 
 	for q, assertions := range examples {
-		_, acc := queryRunner(t, query{{
+		acc := queryRunner(t, query{{
 			Sqlquery:   q,
 			Version:    901,
 			Withdbname: false,
@@ -153,7 +142,7 @@ func TestPostgresqlFieldOutput(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	_, acc := queryRunner(t, query{{
+	acc := queryRunner(t, query{{
 		Sqlquery:   "select * from pg_stat_database",
 		Version:    901,
 		Withdbname: false,
@@ -216,13 +205,18 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-			testutil.GetLocalHost()),
+		Service: postgresql.Service{
+			Address: fmt.Sprintf(
+				"host=%s user=postgres sslmode=disable",
+				testutil.GetLocalHost(),
+			),
+		},
 	}
 
 	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(p.Gather))
 
+	require.NoError(t, p.Start(&acc))
+	require.NoError(t, acc.GatherError(p.Gather))
 	assert.NotEmpty(t, p.IgnoredColumns())
 	for col := range p.IgnoredColumns() {
 		assert.False(t, acc.HasMeasurement(col))

From 0bf63a29f1f692b800d29394bcd788cfd836064e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 5 Jan 2018 16:04:12 -0800
Subject: [PATCH 0852/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea9b8721a..30465895f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [#3565](https://github.com/influxdata/telegraf/pull/3565): Add support for additional metrics on Linux in zfs input.
 - [#3524](https://github.com/influxdata/telegraf/pull/3524): Add available_entropy field to kernel input plugin.
 - [#3643](https://github.com/influxdata/telegraf/pull/3643): Add user privilege level setting to IPMI sensors.
+- [#2701](https://github.com/influxdata/telegraf/pull/2701): Use persistent connection to postgresql database.
 
 ### Bugfixes
 

From 9cfa3b292bbdffa4ecefd3062632eaef4dc68cb1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 15:06:58 -0800
Subject: [PATCH 0853/1302] Reorder httpjson config to keep variables out of
 toml table

---
 plugins/inputs/httpjson/README.md   | 14 +++++++-------
 plugins/inputs/httpjson/httpjson.go | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/httpjson/README.md b/plugins/inputs/httpjson/README.md
index 1aa1ad1a4..50a36dd6c 100644
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -32,6 +32,13 @@ The httpjson plugin collects data from HTTP URLs which respond with JSON.  It fl
   #   "my_tag_2"
   # ]
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## HTTP Request Parameters (all values must be strings).  For "GET" requests, data
   ## will be included in the query.  For "POST" requests, data will be included
   ## in the request body as "x-www-form-urlencoded".
@@ -43,13 +50,6 @@ The httpjson plugin collects data from HTTP URLs which respond with JSON.  It fl
   # [inputs.httpjson.headers]
   #   X-Auth-Token = "my-xauth-token"
   #   apiVersion = "v1"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index f3edc57ba..bfa35752b 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -100,6 +100,13 @@ var sampleConfig = `
   #   "my_tag_2"
   # ]
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## HTTP parameters (all values must be strings).  For "GET" requests, data
   ## will be included in the query.  For "POST" requests, data will be included
   ## in the request body as "x-www-form-urlencoded".
@@ -111,13 +118,6 @@ var sampleConfig = `
   # [inputs.httpjson.headers]
   #   X-Auth-Token = "my-xauth-token"
   #   apiVersion = "v1"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
 `
 
 func (h *HttpJson) SampleConfig() string {

From 317de40ac4e3ce2d30faa321024c94b34cde0a24 Mon Sep 17 00:00:00 2001
From: atzoum <atzoum@gmail.com>
Date: Tue, 9 Jan 2018 01:11:36 +0200
Subject: [PATCH 0854/1302] Add support for dropwizard input format (#2846)

---
 Godeps                                    |   2 +
 README.md                                 |   1 +
 docs/DATA_FORMATS_INPUT.md                | 174 ++++++++
 internal/config/config.go                 |  46 ++
 internal/templating/engine.go             |  86 ++++
 internal/templating/matcher.go            |  58 +++
 internal/templating/node.go               | 122 ++++++
 internal/templating/template.go           | 148 +++++++
 plugins/parsers/dropwizard/parser.go      | 253 +++++++++++
 plugins/parsers/dropwizard/parser_test.go | 485 ++++++++++++++++++++++
 plugins/parsers/graphite/parser.go        | 342 +--------------
 plugins/parsers/graphite/parser_test.go   |   5 +-
 plugins/parsers/registry.go               |  47 +++
 13 files changed, 1436 insertions(+), 333 deletions(-)
 create mode 100644 internal/templating/engine.go
 create mode 100644 internal/templating/matcher.go
 create mode 100644 internal/templating/node.go
 create mode 100644 internal/templating/template.go
 create mode 100644 plugins/parsers/dropwizard/parser.go
 create mode 100644 plugins/parsers/dropwizard/parser_test.go

diff --git a/Godeps b/Godeps
index f69949c29..784c6044c 100644
--- a/Godeps
+++ b/Godeps
@@ -72,6 +72,8 @@ github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
+github.com/tidwall/gjson 0623bd8fbdbf97cc62b98d15108832851a658e59
+github.com/tidwall/match 173748da739a410c5b0b813b956f89ff94730b4c
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
 github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
diff --git a/README.md b/README.md
index c2a5fb064..917975c78 100644
--- a/README.md
+++ b/README.md
@@ -256,6 +256,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [Value](./docs/DATA_FORMATS_INPUT.md#value)
 * [Nagios](./docs/DATA_FORMATS_INPUT.md#nagios)
 * [Collectd](./docs/DATA_FORMATS_INPUT.md#collectd)
+* [Dropwizard](./docs/DATA_FORMATS_INPUT.md#dropwizard)
 
 ## Processor Plugins
 
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 1b6c0b683..64097e7d6 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -8,6 +8,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
 1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
 1. [Collectd](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#collectd)
+1. [Dropwizard](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#dropwizard)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -479,3 +480,176 @@ You can also change the path to the typesdb or add additional typesdb using
   ## Path of to TypesDB specifications
   collectd_typesdb = ["/usr/share/collectd/types.db"]
 ```
+
+# Dropwizard:
+
+The dropwizard format can parse the JSON representation of a single dropwizard metric registry. By default, tags are parsed from metric names as if they were actual influxdb line protocol keys (`measurement<,tag_set>`) which can be overriden by defining custom [measurement & tag templates](./DATA_FORMATS_INPUT.md#measurement--tag-templates). All field values are collected as float64 fields.
+
+A typical JSON of a dropwizard metric registry:
+
+```json
+{
+	"version": "3.0.0",
+	"counters" : {
+		"measurement,tag1=green" : {
+			"count" : 1
+		}
+	},
+	"meters" : {
+		"measurement" : {
+			"count" : 1,
+			"m15_rate" : 1.0,
+			"m1_rate" : 1.0,
+			"m5_rate" : 1.0,
+			"mean_rate" : 1.0,
+			"units" : "events/second"
+		}
+	},
+	"gauges" : {
+		"measurement" : {
+			"value" : 1
+		}
+	},
+	"histograms" : {
+		"measurement" : {
+			"count" : 1,
+			"max" : 1.0,
+			"mean" : 1.0,
+			"min" : 1.0,
+			"p50" : 1.0,
+			"p75" : 1.0,
+			"p95" : 1.0,
+			"p98" : 1.0,
+			"p99" : 1.0,
+			"p999" : 1.0,
+			"stddev" : 1.0
+		}
+	},
+	"timers" : {
+		"measurement" : {
+			"count" : 1,
+			"max" : 1.0,
+			"mean" : 1.0,
+			"min" : 1.0,
+			"p50" : 1.0,
+			"p75" : 1.0,
+			"p95" : 1.0,
+			"p98" : 1.0,
+			"p99" : 1.0,
+			"p999" : 1.0,
+			"stddev" : 1.0,
+			"m15_rate" : 1.0,
+			"m1_rate" : 1.0,
+			"m5_rate" : 1.0,
+			"mean_rate" : 1.0,
+			"duration_units" : "seconds",
+			"rate_units" : "calls/second"
+		}
+	}
+}
+```
+
+Would get translated into 4 different measurements:
+
+```
+measurement,metric_type=counter,tag1=green count=1
+measurement,metric_type=meter count=1,m15_rate=1.0,m1_rate=1.0,m5_rate=1.0,mean_rate=1.0
+measurement,metric_type=gauge value=1
+measurement,metric_type=histogram count=1,max=1.0,mean=1.0,min=1.0,p50=1.0,p75=1.0,p95=1.0,p98=1.0,p99=1.0,p999=1.0
+measurement,metric_type=timer count=1,max=1.0,mean=1.0,min=1.0,p50=1.0,p75=1.0,p95=1.0,p98=1.0,p99=1.0,p999=1.0,stddev=1.0,m15_rate=1.0,m1_rate=1.0,m5_rate=1.0,mean_rate=1.0
+```
+
+You may also parse a dropwizard registry from any JSON document which contains a dropwizard registry in some inner field. 
+Eg. to parse the following JSON document:
+
+```json
+{
+	"time" : "2017-02-22T14:33:03.662+02:00",
+	"tags" : {
+		"tag1" : "green",
+		"tag2" : "yellow"
+	},
+	"metrics" : {
+		"counters" : 	{ 
+			"measurement" : {
+				"count" : 1
+			}
+		},
+		"meters" : {},
+		"gauges" : {},
+		"histograms" : {},
+		"timers" : {}
+	}
+}
+```
+and translate it into:
+
+```
+measurement,metric_type=counter,tag1=green,tag2=yellow count=1 1487766783662000000
+```
+
+you simply need to use the following additional configuration properties:
+
+```toml
+dropwizard_metric_registry_path = "metrics"
+dropwizard_time_path = "time"
+dropwizard_time_format = "2006-01-02T15:04:05Z07:00"
+dropwizard_tags_path = "tags"
+## tag paths per tag are supported too, eg.
+#[inputs.yourinput.dropwizard_tag_paths]
+#  tag1 = "tags.tag1"
+#  tag2 = "tags.tag2"
+```
+
+
+For more information about the dropwizard json format see
+[here](http://metrics.dropwizard.io/3.1.0/manual/json/).
+
+#### Dropwizard Configuration:
+
+```toml
+[[inputs.exec]]
+  ## Commands array
+  commands = ["curl http://localhost:8080/sys/metrics"]
+  timeout = "5s"
+
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  data_format = "dropwizard"
+
+  ## Used by the templating engine to join matched values when cardinality is > 1
+  separator = "_"
+
+  ## Each template line requires a template pattern. It can have an optional
+  ## filter before the template and separated by spaces. It can also have optional extra
+  ## tags following the template. Multiple tags should be separated by commas and no spaces
+  ## similar to the line protocol format. There can be only one default template.
+  ## Templates support below format:
+  ## 1. filter + template
+  ## 2. filter + template + extra tag(s)
+  ## 3. filter + template with field key
+  ## 4. default template
+  ## By providing an empty template array, templating is disabled and measurements are parsed as influxdb line protocol keys (measurement<,tag_set>)
+  templates = []
+
+  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
+  ## to locate the metric registry within the JSON document
+  # dropwizard_metric_registry_path = "metrics"
+  
+  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
+  ## to locate the default time of the measurements within the JSON document
+  # dropwizard_time_path = "time"
+  # dropwizard_time_format = "2006-01-02T15:04:05Z07:00"
+  
+  ## You may use an appropriate [gjson path](https://github.com/tidwall/gjson#path-syntax) 
+  ## to locate the tags map within the JSON document
+  # dropwizard_tags_path = "tags"
+
+  ## You may even use tag paths per tag
+  # [inputs.exec.dropwizard_tag_paths]
+  #   tag1 = "tags.tag1"
+  #   tag2 = "tags.tag2"
+
+```
\ No newline at end of file
diff --git a/internal/config/config.go b/internal/config/config.go
index 2aaa2da19..8488df28a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1272,6 +1272,47 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	if node, ok := tbl.Fields["dropwizard_metric_registry_path"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.DropwizardMetricRegistryPath = str.Value
+			}
+		}
+	}
+	if node, ok := tbl.Fields["dropwizard_time_path"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.DropwizardTimePath = str.Value
+			}
+		}
+	}
+	if node, ok := tbl.Fields["dropwizard_time_format"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.DropwizardTimeFormat = str.Value
+			}
+		}
+	}
+	if node, ok := tbl.Fields["dropwizard_tags_path"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if str, ok := kv.Value.(*ast.String); ok {
+				c.DropwizardTagsPath = str.Value
+			}
+		}
+	}
+	c.DropwizardTagPathsMap = make(map[string]string)
+	if node, ok := tbl.Fields["dropwizard_tag_paths"]; ok {
+		if subtbl, ok := node.(*ast.Table); ok {
+			for name, val := range subtbl.Fields {
+				if kv, ok := val.(*ast.KeyValue); ok {
+					if str, ok := kv.Value.(*ast.String); ok {
+						c.DropwizardTagPathsMap[name] = str.Value
+					}
+				}
+			}
+		}
+	}
+
 	c.MetricName = name
 
 	delete(tbl.Fields, "data_format")
@@ -1282,6 +1323,11 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")
 	delete(tbl.Fields, "collectd_typesdb")
+	delete(tbl.Fields, "dropwizard_metric_registry_path")
+	delete(tbl.Fields, "dropwizard_time_path")
+	delete(tbl.Fields, "dropwizard_time_format")
+	delete(tbl.Fields, "dropwizard_tags_path")
+	delete(tbl.Fields, "dropwizard_tag_paths")
 
 	return parsers.NewParser(c)
 }
diff --git a/internal/templating/engine.go b/internal/templating/engine.go
new file mode 100644
index 000000000..65d15a426
--- /dev/null
+++ b/internal/templating/engine.go
@@ -0,0 +1,86 @@
+package templating
+
+import (
+	"sort"
+	"strings"
+)
+
+const (
+	// DefaultSeparator is the default separation character to use when separating template parts.
+	DefaultSeparator = "."
+)
+
+// Engine uses a Matcher to retrieve the appropriate template and applies the template
+// to the input string
+type Engine struct {
+	joiner  string
+	matcher *matcher
+}
+
+// Apply extracts the template fields from the given line and returns the measurement
+// name, tags and field name
+func (e *Engine) Apply(line string) (string, map[string]string, string, error) {
+	return e.matcher.match(line).Apply(line, e.joiner)
+}
+
+// NewEngine creates a new templating engine
+func NewEngine(joiner string, defaultTemplate *Template, templates []string) (*Engine, error) {
+	engine := Engine{
+		joiner:  joiner,
+		matcher: newMatcher(defaultTemplate),
+	}
+	templateSpecs := parseTemplateSpecs(templates)
+
+	for _, templateSpec := range templateSpecs {
+		if err := engine.matcher.addSpec(templateSpec); err != nil {
+			return nil, err
+		}
+	}
+
+	return &engine, nil
+}
+
+func parseTemplateSpecs(templates []string) templateSpecs {
+	tmplts := templateSpecs{}
+	for _, pattern := range templates {
+		tmplt := templateSpec{
+			separator: DefaultSeparator,
+		}
+
+		// Format is [separator] [filter] <template> [tag1=value1,tag2=value2]
+		parts := strings.Fields(pattern)
+		partsLength := len(parts)
+		if partsLength < 1 {
+			// ignore
+			continue
+		}
+		if partsLength == 1 {
+			tmplt.template = pattern
+		} else if partsLength == 4 {
+			tmplt.separator = parts[0]
+			tmplt.filter = parts[1]
+			tmplt.template = parts[2]
+			tmplt.tagstring = parts[3]
+		} else {
+			hasTagstring := strings.Contains(parts[partsLength-1], "=")
+			if hasTagstring {
+				tmplt.tagstring = parts[partsLength-1]
+				tmplt.template = parts[partsLength-2]
+				if partsLength == 3 {
+					tmplt.filter = parts[0]
+				}
+			} else {
+				tmplt.template = parts[partsLength-1]
+				if partsLength == 2 {
+					tmplt.filter = parts[0]
+				} else { // length == 3
+					tmplt.separator = parts[0]
+					tmplt.filter = parts[1]
+				}
+			}
+		}
+		tmplts = append(tmplts, tmplt)
+	}
+	sort.Sort(tmplts)
+	return tmplts
+}
diff --git a/internal/templating/matcher.go b/internal/templating/matcher.go
new file mode 100644
index 000000000..9e1770b55
--- /dev/null
+++ b/internal/templating/matcher.go
@@ -0,0 +1,58 @@
+package templating
+
+import (
+	"strings"
+)
+
+// matcher determines which template should be applied to a given metric
+// based on a filter tree.
+type matcher struct {
+	root            *node
+	defaultTemplate *Template
+}
+
+// newMatcher creates a new matcher.
+func newMatcher(defaultTemplate *Template) *matcher {
+	return &matcher{
+		root:            &node{},
+		defaultTemplate: defaultTemplate,
+	}
+}
+
+func (m *matcher) addSpec(tmplt templateSpec) error {
+	// Parse out the default tags specific to this template
+	tags := map[string]string{}
+	if tmplt.tagstring != "" {
+		for _, kv := range strings.Split(tmplt.tagstring, ",") {
+			parts := strings.Split(kv, "=")
+			tags[parts[0]] = parts[1]
+		}
+	}
+
+	tmpl, err := NewTemplate(tmplt.separator, tmplt.template, tags)
+	if err != nil {
+		return err
+	}
+	m.add(tmplt.filter, tmpl)
+	return nil
+}
+
+// add inserts the template in the filter tree based the given filter
+func (m *matcher) add(filter string, template *Template) {
+	if filter == "" {
+		m.defaultTemplate = template
+		m.root.separator = template.separator
+		return
+	}
+	m.root.insert(filter, template)
+}
+
+// match returns the template that matches the given measurement line.
+// If no template matches, the default template is returned.
+func (m *matcher) match(line string) *Template {
+	tmpl := m.root.search(line)
+	if tmpl != nil {
+		return tmpl
+	}
+	return m.defaultTemplate
+}
diff --git a/internal/templating/node.go b/internal/templating/node.go
new file mode 100644
index 000000000..83ab1a40c
--- /dev/null
+++ b/internal/templating/node.go
@@ -0,0 +1,122 @@
+package templating
+
+import (
+	"sort"
+	"strings"
+)
+
+// node is an item in a sorted k-ary tree of filter parts. Each child is sorted by its part value.
+// The special value of "*", is always sorted last.
+type node struct {
+	separator string
+	value     string
+	children  nodes
+	template  *Template
+}
+
+// insert inserts the given string template into the tree.  The filter string is separated
+// on the template separator and each part is used as the path in the tree.
+func (n *node) insert(filter string, template *Template) {
+	n.separator = template.separator
+	n.recursiveInsert(strings.Split(filter, n.separator), template)
+}
+
+// recursiveInsert does the actual recursive insertion
+func (n *node) recursiveInsert(values []string, template *Template) {
+	// Add the end, set the template
+	if len(values) == 0 {
+		n.template = template
+		return
+	}
+
+	// See if the the current element already exists in the tree. If so, insert the
+	// into that sub-tree
+	for _, v := range n.children {
+		if v.value == values[0] {
+			v.recursiveInsert(values[1:], template)
+			return
+		}
+	}
+
+	// New element, add it to the tree and sort the children
+	newNode := &node{value: values[0]}
+	n.children = append(n.children, newNode)
+	sort.Sort(&n.children)
+
+	// Now insert the rest of the tree into the new element
+	newNode.recursiveInsert(values[1:], template)
+}
+
+// search searches for a template matching the input string
+func (n *node) search(line string) *Template {
+	separator := n.separator
+	return n.recursiveSearch(strings.Split(line, separator))
+}
+
+// recursiveSearch performs the actual recursive search
+func (n *node) recursiveSearch(lineParts []string) *Template {
+	// Nothing to search
+	if len(lineParts) == 0 || len(n.children) == 0 {
+		return n.template
+	}
+
+	// If last element is a wildcard, don't include it in this search since it's sorted
+	// to the end but lexicographically it would not always be and sort.Search assumes
+	// the slice is sorted.
+	length := len(n.children)
+	if n.children[length-1].value == "*" {
+		length--
+	}
+
+	// Find the index of child with an exact match
+	i := sort.Search(length, func(i int) bool {
+		return n.children[i].value >= lineParts[0]
+	})
+
+	// Found an exact match, so search that child sub-tree
+	if i < len(n.children) && n.children[i].value == lineParts[0] {
+		return n.children[i].recursiveSearch(lineParts[1:])
+	}
+	// Not an exact match, see if we have a wildcard child to search
+	if n.children[len(n.children)-1].value == "*" {
+		return n.children[len(n.children)-1].recursiveSearch(lineParts[1:])
+	}
+	return n.template
+}
+
+// nodes is simply an array of nodes implementing the sorting interface.
+type nodes []*node
+
+// Less returns a boolean indicating whether the filter at position j
+// is less than the filter at position k. Filters are order by string
+// comparison of each component parts.  A wildcard value "*" is never
+// less than a non-wildcard value.
+//
+// For example, the filters:
+//             "*.*"
+//             "servers.*"
+//             "servers.localhost"
+//             "*.localhost"
+//
+// Would be sorted as:
+//             "servers.localhost"
+//             "servers.*"
+//             "*.localhost"
+//             "*.*"
+func (n *nodes) Less(j, k int) bool {
+	if (*n)[j].value == "*" && (*n)[k].value != "*" {
+		return false
+	}
+
+	if (*n)[j].value != "*" && (*n)[k].value == "*" {
+		return true
+	}
+
+	return (*n)[j].value < (*n)[k].value
+}
+
+// Swap swaps two elements of the array
+func (n *nodes) Swap(i, j int) { (*n)[i], (*n)[j] = (*n)[j], (*n)[i] }
+
+// Len returns the length of the array
+func (n *nodes) Len() int { return len(*n) }
diff --git a/internal/templating/template.go b/internal/templating/template.go
new file mode 100644
index 000000000..472bd2686
--- /dev/null
+++ b/internal/templating/template.go
@@ -0,0 +1,148 @@
+package templating
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Template represents a pattern and tags to map a metric string to a influxdb Point
+type Template struct {
+	separator         string
+	parts             []string
+	defaultTags       map[string]string
+	greedyField       bool
+	greedyMeasurement bool
+}
+
+// apply extracts the template fields from the given line and returns the measurement
+// name, tags and field name
+func (t *Template) Apply(line string, joiner string) (string, map[string]string, string, error) {
+	fields := strings.Split(line, t.separator)
+	var (
+		measurement []string
+		tags        = make(map[string][]string)
+		field       []string
+	)
+
+	// Set any default tags
+	for k, v := range t.defaultTags {
+		tags[k] = append(tags[k], v)
+	}
+
+	// See if an invalid combination has been specified in the template:
+	for _, tag := range t.parts {
+		if tag == "measurement*" {
+			t.greedyMeasurement = true
+		} else if tag == "field*" {
+			t.greedyField = true
+		}
+	}
+	if t.greedyField && t.greedyMeasurement {
+		return "", nil, "",
+			fmt.Errorf("either 'field*' or 'measurement*' can be used in each "+
+				"template (but not both together): %q",
+				strings.Join(t.parts, joiner))
+	}
+
+	for i, tag := range t.parts {
+		if i >= len(fields) {
+			continue
+		}
+		if tag == "" {
+			continue
+		}
+
+		switch tag {
+		case "measurement":
+			measurement = append(measurement, fields[i])
+		case "field":
+			field = append(field, fields[i])
+		case "field*":
+			field = append(field, fields[i:]...)
+			break
+		case "measurement*":
+			measurement = append(measurement, fields[i:]...)
+			break
+		default:
+			tags[tag] = append(tags[tag], fields[i])
+		}
+	}
+
+	// Convert to map of strings.
+	outtags := make(map[string]string)
+	for k, values := range tags {
+		outtags[k] = strings.Join(values, joiner)
+	}
+
+	return strings.Join(measurement, joiner), outtags, strings.Join(field, joiner), nil
+}
+
+func NewDefaultTemplateWithPattern(pattern string) (*Template, error) {
+	return NewTemplate(DefaultSeparator, pattern, nil)
+}
+
+// NewTemplate returns a new template ensuring it has a measurement
+// specified.
+func NewTemplate(separator string, pattern string, defaultTags map[string]string) (*Template, error) {
+	parts := strings.Split(pattern, separator)
+	hasMeasurement := false
+	template := &Template{
+		separator:   separator,
+		parts:       parts,
+		defaultTags: defaultTags,
+	}
+
+	for _, part := range parts {
+		if strings.HasPrefix(part, "measurement") {
+			hasMeasurement = true
+		}
+		if part == "measurement*" {
+			template.greedyMeasurement = true
+		} else if part == "field*" {
+			template.greedyField = true
+		}
+	}
+
+	if !hasMeasurement {
+		return nil, fmt.Errorf("no measurement specified for template. %q", pattern)
+	}
+
+	return template, nil
+}
+
+// templateSpec is a template string split in its constituent parts
+type templateSpec struct {
+	separator string
+	filter    string
+	template  string
+	tagstring string
+}
+
+// templateSpecs is simply an array of template specs implementing the sorting interface
+type templateSpecs []templateSpec
+
+// Less reports whether the element with
+// index j should sort before the element with index k.
+func (e templateSpecs) Less(j, k int) bool {
+	if len(e[j].filter) == 0 && len(e[k].filter) == 0 {
+		jlength := len(strings.Split(e[j].template, e[j].separator))
+		klength := len(strings.Split(e[k].template, e[k].separator))
+		return jlength < klength
+	}
+	if len(e[j].filter) == 0 {
+		return true
+	}
+	if len(e[k].filter) == 0 {
+		return false
+	}
+
+	jlength := len(strings.Split(e[j].template, e[j].separator))
+	klength := len(strings.Split(e[k].template, e[k].separator))
+	return jlength < klength
+}
+
+// Swap swaps the elements with indexes i and j.
+func (e templateSpecs) Swap(i, j int) { e[i], e[j] = e[j], e[i] }
+
+// Len is the number of elements in the collection.
+func (e templateSpecs) Len() int { return len(e) }
diff --git a/plugins/parsers/dropwizard/parser.go b/plugins/parsers/dropwizard/parser.go
new file mode 100644
index 000000000..dc5442068
--- /dev/null
+++ b/plugins/parsers/dropwizard/parser.go
@@ -0,0 +1,253 @@
+package dropwizard
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"log"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/templating"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/tidwall/gjson"
+)
+
+// Parser parses json inputs containing dropwizard metrics,
+// either top-level or embedded inside a json field.
+// This parser is using gjon for retrieving paths within the json file.
+type Parser struct {
+
+	// an optional json path containing the metric registry object
+	// if left empty, the whole json object is parsed as a metric registry
+	MetricRegistryPath string
+
+	// an optional json path containing the default time of the metrics
+	// if left empty, or if cannot be parsed the current processing time is used as the time of the metrics
+	TimePath string
+
+	// time format to use for parsing the time field
+	// defaults to time.RFC3339
+	TimeFormat string
+
+	// an optional json path pointing to a json object with tag key/value pairs
+	// takes precedence over TagPathsMap
+	TagsPath string
+
+	// an optional map containing tag names as keys and json paths to retrieve the tag values from as values
+	// used if TagsPath is empty or doesn't return any tags
+	TagPathsMap map[string]string
+
+	// an optional map of default tags to use for metrics
+	DefaultTags map[string]string
+
+	// templating configuration
+	Separator string
+	Templates []string
+
+	templateEngine *templating.Engine
+}
+
+// Parse parses the input bytes to an array of metrics
+func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
+
+	metrics := make([]telegraf.Metric, 0)
+
+	metricTime, err := p.parseTime(buf)
+	if err != nil {
+		return nil, err
+	}
+	dwr, err := p.unmarshalMetrics(buf)
+	if err != nil {
+		return nil, err
+	}
+
+	metrics = p.readDWMetrics("counter", dwr["counters"], metrics, metricTime)
+	metrics = p.readDWMetrics("meter", dwr["meters"], metrics, metricTime)
+	metrics = p.readDWMetrics("gauge", dwr["gauges"], metrics, metricTime)
+	metrics = p.readDWMetrics("histogram", dwr["histograms"], metrics, metricTime)
+	metrics = p.readDWMetrics("timer", dwr["timers"], metrics, metricTime)
+
+	jsonTags := p.readTags(buf)
+
+	// fill json tags first
+	if len(jsonTags) > 0 {
+		for _, m := range metrics {
+			for k, v := range jsonTags {
+				// only set the tag if it doesn't already exist:
+				if !m.HasTag(k) {
+					m.AddTag(k, v)
+				}
+			}
+		}
+	}
+	// fill default tags last
+	if len(p.DefaultTags) > 0 {
+		for _, m := range metrics {
+			for k, v := range p.DefaultTags {
+				// only set the default tag if it doesn't already exist:
+				if !m.HasTag(k) {
+					m.AddTag(k, v)
+				}
+			}
+		}
+	}
+
+	return metrics, nil
+}
+
+// InitTemplating initializes the templating support
+func (p *Parser) InitTemplating() error {
+	if len(p.Templates) > 0 {
+		defaultTemplate, _ := templating.NewDefaultTemplateWithPattern("measurement*")
+		templateEngine, err := templating.NewEngine(p.Separator, defaultTemplate, p.Templates)
+		p.templateEngine = templateEngine
+		return err
+	}
+	return nil
+}
+
+// ParseLine is not supported by the dropwizard format
+func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
+	return nil, fmt.Errorf("ParseLine not supported: %s, for data format: dropwizard", line)
+}
+
+// SetDefaultTags sets the default tags
+func (p *Parser) SetDefaultTags(tags map[string]string) {
+	p.DefaultTags = tags
+}
+
+func (p *Parser) readTags(buf []byte) map[string]string {
+
+	if p.TagsPath != "" {
+		var tagsBytes []byte
+		tagsResult := gjson.GetBytes(buf, p.TagsPath)
+		if tagsResult.Index > 0 {
+			tagsBytes = buf[tagsResult.Index : tagsResult.Index+len(tagsResult.Raw)]
+		} else {
+			tagsBytes = []byte(tagsResult.Raw)
+		}
+		var tags map[string]string
+		err := json.Unmarshal(tagsBytes, &tags)
+		if err != nil {
+			log.Printf("W! failed to parse tags from JSON path '%s': %s\n", p.TagsPath, err)
+		} else if len(tags) > 0 {
+			return tags
+		}
+	}
+
+	tags := make(map[string]string)
+	for tagKey, jsonPath := range p.TagPathsMap {
+		tags[tagKey] = gjson.GetBytes(buf, jsonPath).String()
+	}
+	return tags
+}
+
+func (p *Parser) parseTime(buf []byte) (time.Time, error) {
+
+	if p.TimePath != "" {
+		timeFormat := p.TimeFormat
+		if timeFormat == "" {
+			timeFormat = time.RFC3339
+		}
+		timeString := gjson.GetBytes(buf, p.TimePath).String()
+		if timeString == "" {
+			err := fmt.Errorf("time not found in JSON path %s", p.TimePath)
+			return time.Now().UTC(), err
+		}
+		t, err := time.Parse(timeFormat, timeString)
+		if err != nil {
+			err = fmt.Errorf("time %s cannot be parsed with format %s, %s", timeString, timeFormat, err)
+			return time.Now().UTC(), err
+		}
+		return t.UTC(), nil
+	}
+	return time.Now().UTC(), nil
+}
+
+func (p *Parser) unmarshalMetrics(buf []byte) (map[string]interface{}, error) {
+
+	var registryBytes []byte
+	if p.MetricRegistryPath != "" {
+		regResult := gjson.GetBytes(buf, p.MetricRegistryPath)
+		if regResult.Index > 0 {
+			registryBytes = buf[regResult.Index : regResult.Index+len(regResult.Raw)]
+		} else {
+			registryBytes = []byte(regResult.Raw)
+		}
+		if len(registryBytes) == 0 {
+			err := fmt.Errorf("metric registry not found in JSON path %s", p.MetricRegistryPath)
+			return nil, err
+		}
+	} else {
+		registryBytes = buf
+	}
+	var jsonOut map[string]interface{}
+	err := json.Unmarshal(registryBytes, &jsonOut)
+	if err != nil {
+		err = fmt.Errorf("unable to parse dropwizard metric registry from JSON document, %s", err)
+		return nil, err
+	}
+	return jsonOut, nil
+}
+
+func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []telegraf.Metric, time time.Time) []telegraf.Metric {
+
+	switch dwmsTyped := dwms.(type) {
+	case map[string]interface{}:
+		var metricsBuffer bytes.Buffer
+		for dwmName, dwmFields := range dwmsTyped {
+			measurementName := dwmName
+			tags := make(map[string]string)
+			fieldPrefix := ""
+			if p.templateEngine != nil {
+				measurementName, tags, fieldPrefix, _ = p.templateEngine.Apply(dwmName)
+				if len(fieldPrefix) > 0 {
+					fieldPrefix = fmt.Sprintf("%s%s", fieldPrefix, p.Separator)
+				}
+			}
+			tags["metric_type"] = metricType
+
+			measurementWithTags := measurementName
+			for tagName, tagValue := range tags {
+				tagKeyValue := fmt.Sprintf("%s=%s", tagName, tagValue)
+				measurementWithTags = fmt.Sprintf("%s,%s", measurementWithTags, tagKeyValue)
+			}
+
+			fields := make([]string, 0)
+			switch t := dwmFields.(type) {
+			case map[string]interface{}: // json object
+				for fieldName, fieldValue := range t {
+
+					switch v := fieldValue.(type) {
+					case float64:
+						fields = append(fields, fmt.Sprintf("%s%s=%f", fieldPrefix, fieldName, v))
+					default: // ignore
+					}
+				}
+			default: // ignore
+			}
+
+			metricsBuffer.WriteString(fmt.Sprintf("%s,metric_type=%s ", measurementWithTags, metricType))
+			metricsBuffer.WriteString(strings.Join(fields, ","))
+			metricsBuffer.WriteString("\n")
+		}
+		newMetrics, err := metric.ParseWithDefaultTime(metricsBuffer.Bytes(), time)
+		if err != nil {
+			log.Printf("W! failed to create metric of type '%s': %s\n", metricType, err)
+		}
+		return append(metrics, newMetrics...)
+	default:
+		return metrics
+	}
+
+}
+
+func arraymap(vs []string, f func(string) string) []string {
+	vsm := make([]string, len(vs))
+	for i, v := range vs {
+		vsm[i] = f(v)
+	}
+	return vsm
+}
diff --git a/plugins/parsers/dropwizard/parser_test.go b/plugins/parsers/dropwizard/parser_test.go
new file mode 100644
index 000000000..5834eb516
--- /dev/null
+++ b/plugins/parsers/dropwizard/parser_test.go
@@ -0,0 +1,485 @@
+package dropwizard
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf"
+
+	"fmt"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// validEmptyJSON is a valid dropwizard json document, but without any metrics
+const validEmptyJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" :	{},
+	"meters" :		{},
+	"gauges" :		{},
+	"histograms" :	{},
+	"timers" :		{}
+}
+`
+
+func TestParseValidEmptyJSON(t *testing.T) {
+	parser := Parser{}
+
+	// Most basic vanilla test
+	metrics, err := parser.Parse([]byte(validEmptyJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 0)
+}
+
+// validCounterJSON is a valid dropwizard json document containing one counter
+const validCounterJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{ 
+		"measurement" : {
+			"count" : 1
+		}
+	},
+	"meters" : 		{},
+	"gauges" : 		{},
+	"histograms" : 	{},
+	"timers" : 		{}
+}
+`
+
+func TestParseValidCounterJSON(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validCounterJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count": float64(1),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "counter"}, metrics[0].Tags())
+}
+
+// validEmbeddedCounterJSON is a valid json document containing separate fields for dropwizard metrics, tags and time override.
+const validEmbeddedCounterJSON = `
+{
+	"time" : "2017-02-22T14:33:03.662+02:00",
+	"tags" : {
+		"tag1" : "green",
+		"tag2" : "yellow"
+	},
+	"metrics" : {
+		"counters" : 	{ 
+			"measurement" : {
+				"count" : 1
+			}
+		},
+		"meters" : 		{},
+		"gauges" : 		{},
+		"histograms" : 	{},
+		"timers" : 		{}
+	}
+}
+`
+
+func TestParseValidEmbeddedCounterJSON(t *testing.T) {
+	timeFormat := "2006-01-02T15:04:05Z07:00"
+	metricTime, _ := time.Parse(timeFormat, "2017-02-22T15:33:03.662+03:00")
+	parser := Parser{
+		MetricRegistryPath: "metrics",
+		TagsPath:           "tags",
+		TimePath:           "time",
+	}
+
+	metrics, err := parser.Parse([]byte(validEmbeddedCounterJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count": float64(1),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "counter", "tag1": "green", "tag2": "yellow"}, metrics[0].Tags())
+	assert.True(t, metricTime.Equal(metrics[0].Time()), fmt.Sprintf("%s should be equal to %s", metrics[0].Time(), metricTime))
+
+	// now test json tags through TagPathsMap
+	parser2 := Parser{
+		MetricRegistryPath: "metrics",
+		TagPathsMap:        map[string]string{"tag1": "tags.tag1"},
+		TimePath:           "time",
+	}
+	metrics2, err2 := parser2.Parse([]byte(validEmbeddedCounterJSON))
+	assert.NoError(t, err2)
+	assert.Equal(t, map[string]string{"metric_type": "counter", "tag1": "green"}, metrics2[0].Tags())
+}
+
+// validMeterJSON1 is a valid dropwizard json document containing one meter
+const validMeterJSON1 = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{},
+	"meters" : 		{ 
+		"measurement1" : {
+			"count" : 1,
+			"m15_rate" : 1.0,
+			"m1_rate" : 1.0,
+			"m5_rate" : 1.0,
+			"mean_rate" : 1.0,
+			"units" : "events/second"
+		}
+	},
+	"gauges" : 		{},
+	"histograms" : 	{},
+	"timers" : 		{}
+}
+`
+
+func TestParseValidMeterJSON1(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validMeterJSON1))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement1", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count":     float64(1),
+		"m15_rate":  float64(1),
+		"m1_rate":   float64(1),
+		"m5_rate":   float64(1),
+		"mean_rate": float64(1),
+	}, metrics[0].Fields())
+
+	assert.Equal(t, map[string]string{"metric_type": "meter"}, metrics[0].Tags())
+}
+
+// validMeterJSON2 is a valid dropwizard json document containing one meter with one tag
+const validMeterJSON2 = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{},
+	"meters" : 		{ 
+		"measurement2,key=value" : {
+			"count" : 2,
+			"m15_rate" : 2.0,
+			"m1_rate" : 2.0,
+			"m5_rate" : 2.0,
+			"mean_rate" : 2.0,
+			"units" : "events/second"
+		}
+	},
+	"gauges" : 		{},
+	"histograms" : 	{},
+	"timers" : 		{}
+}
+`
+
+func TestParseValidMeterJSON2(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validMeterJSON2))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement2", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count":     float64(2),
+		"m15_rate":  float64(2),
+		"m1_rate":   float64(2),
+		"m5_rate":   float64(2),
+		"mean_rate": float64(2),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "meter", "key": "value"}, metrics[0].Tags())
+}
+
+// validGaugeJSON is a valid dropwizard json document containing one gauge
+const validGaugeJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{},
+	"meters" : 		{},
+	"gauges" : 		{
+		"measurement" : {
+			"value" : 0
+		}
+	},
+	"histograms" : 	{},
+	"timers" : 		{}
+}
+`
+
+func TestParseValidGaugeJSON(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validGaugeJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"value": float64(0),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "gauge"}, metrics[0].Tags())
+}
+
+// validHistogramJSON is a valid dropwizard json document containing one histogram
+const validHistogramJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{},
+	"meters" : 		{},
+	"gauges" : 		{},
+	"histograms" : 	{
+		"measurement" : {
+			"count" : 1,
+			"max" : 2,
+			"mean" : 3,
+			"min" : 4,
+			"p50" : 5,
+			"p75" : 6,
+			"p95" : 7,
+			"p98" : 8,
+			"p99" : 9,
+			"p999" : 10,
+			"stddev" : 11
+		}
+	},
+	"timers" : 		{}
+}
+`
+
+func TestParseValidHistogramJSON(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validHistogramJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count":  float64(1),
+		"max":    float64(2),
+		"mean":   float64(3),
+		"min":    float64(4),
+		"p50":    float64(5),
+		"p75":    float64(6),
+		"p95":    float64(7),
+		"p98":    float64(8),
+		"p99":    float64(9),
+		"p999":   float64(10),
+		"stddev": float64(11),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "histogram"}, metrics[0].Tags())
+}
+
+// validTimerJSON is a valid dropwizard json document containing one timer
+const validTimerJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{},
+	"meters" : 		{},
+	"gauges" : 		{},
+	"histograms" : 	{},
+	"timers" : 		{
+		"measurement" : {
+			"count" : 1,
+			"max" : 2,
+			"mean" : 3,
+			"min" : 4,
+			"p50" : 5,
+			"p75" : 6,
+			"p95" : 7,
+			"p98" : 8,
+			"p99" : 9,
+			"p999" : 10,
+			"stddev" : 11,
+			"m15_rate" : 12,
+			"m1_rate" : 13,
+			"m5_rate" : 14,
+			"mean_rate" : 15,
+			"duration_units" : "seconds",
+			"rate_units" : "calls/second"
+		}
+	}
+}
+`
+
+func TestParseValidTimerJSON(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validTimerJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 1)
+	assert.Equal(t, "measurement", metrics[0].Name())
+	assert.Equal(t, map[string]interface{}{
+		"count":     float64(1),
+		"max":       float64(2),
+		"mean":      float64(3),
+		"min":       float64(4),
+		"p50":       float64(5),
+		"p75":       float64(6),
+		"p95":       float64(7),
+		"p98":       float64(8),
+		"p99":       float64(9),
+		"p999":      float64(10),
+		"stddev":    float64(11),
+		"m15_rate":  float64(12),
+		"m1_rate":   float64(13),
+		"m5_rate":   float64(14),
+		"mean_rate": float64(15),
+	}, metrics[0].Fields())
+	assert.Equal(t, map[string]string{"metric_type": "timer"}, metrics[0].Tags())
+}
+
+// validAllJSON is a valid dropwizard json document containing one metric of each type
+const validAllJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" : 	{
+		"measurement" : {"count" : 1}
+	},
+	"meters" : 		{
+		"measurement" : {"count" : 1}
+	},
+	"gauges" : 		{
+		"measurement" : {"value" : 1}
+	},
+	"histograms" : 	{
+		"measurement" : {"count" : 1}
+	},
+	"timers" : 		{
+		"measurement" : {"count" : 1}
+	}
+}
+`
+
+func TestParseValidAllJSON(t *testing.T) {
+	parser := Parser{}
+
+	metrics, err := parser.Parse([]byte(validAllJSON))
+	assert.NoError(t, err)
+	assert.Len(t, metrics, 5)
+}
+
+func TestTagParsingProblems(t *testing.T) {
+	// giving a wrong path results in empty tags
+	parser1 := Parser{MetricRegistryPath: "metrics", TagsPath: "tags1"}
+	metrics1, err1 := parser1.Parse([]byte(validEmbeddedCounterJSON))
+	assert.NoError(t, err1)
+	assert.Len(t, metrics1, 1)
+	assert.Equal(t, map[string]string{"metric_type": "counter"}, metrics1[0].Tags())
+
+	// giving a wrong TagsPath falls back to TagPathsMap
+	parser2 := Parser{
+		MetricRegistryPath: "metrics",
+		TagsPath:           "tags1",
+		TagPathsMap:        map[string]string{"tag1": "tags.tag1"},
+	}
+	metrics2, err2 := parser2.Parse([]byte(validEmbeddedCounterJSON))
+	assert.NoError(t, err2)
+	assert.Len(t, metrics2, 1)
+	assert.Equal(t, map[string]string{"metric_type": "counter", "tag1": "green"}, metrics2[0].Tags())
+}
+
+// sampleTemplateJSON is a sample json document containing metrics to be tested against the templating engine.
+const sampleTemplateJSON = `
+{
+	"version": 		"3.0.0",
+	"counters" :	{},
+	"meters" :		{},
+	"gauges" :		{
+		"vm.memory.heap.committed" 		: { "value" : 1 },
+		"vm.memory.heap.init" 			: { "value" : 2 },
+		"vm.memory.heap.max" 			: { "value" : 3 },
+		"vm.memory.heap.usage" 			: { "value" : 4 },
+		"vm.memory.heap.used" 			: { "value" : 5 },
+		"vm.memory.non-heap.committed" 	: { "value" : 6 },
+		"vm.memory.non-heap.init" 		: { "value" : 7 },
+		"vm.memory.non-heap.max" 		: { "value" : 8 },
+		"vm.memory.non-heap.usage" 		: { "value" : 9 },
+		"vm.memory.non-heap.used" 		: { "value" : 10 }
+	},
+	"histograms" :	{
+		"jenkins.job.building.duration" : {
+			"count" : 1,
+			"max" : 2,
+			"mean" : 3,
+			"min" : 4,
+			"p50" : 5,
+			"p75" : 6,
+			"p95" : 7,
+			"p98" : 8,
+			"p99" : 9,
+			"p999" : 10,
+			"stddev" : 11
+		}
+	},
+	"timers" :		{}
+}
+`
+
+func TestParseSampleTemplateJSON(t *testing.T) {
+	parser := Parser{
+		Separator: "_",
+		Templates: []string{
+			"jenkins.* measurement.metric.metric.field",
+			"vm.* measurement.measurement.pool.field",
+		},
+	}
+	parser.InitTemplating()
+
+	metrics, err := parser.Parse([]byte(sampleTemplateJSON))
+	assert.NoError(t, err)
+
+	assert.Len(t, metrics, 11)
+
+	jenkinsMetric := search(metrics, "jenkins", nil, "")
+	assert.NotNil(t, jenkinsMetric, "the metrics should contain a jenkins measurement")
+	assert.Equal(t, map[string]interface{}{
+		"duration_count":  float64(1),
+		"duration_max":    float64(2),
+		"duration_mean":   float64(3),
+		"duration_min":    float64(4),
+		"duration_p50":    float64(5),
+		"duration_p75":    float64(6),
+		"duration_p95":    float64(7),
+		"duration_p98":    float64(8),
+		"duration_p99":    float64(9),
+		"duration_p999":   float64(10),
+		"duration_stddev": float64(11),
+	}, jenkinsMetric.Fields())
+	assert.Equal(t, map[string]string{"metric_type": "histogram", "metric": "job_building"}, jenkinsMetric.Tags())
+
+	vmMemoryHeapCommitted := search(metrics, "vm_memory", map[string]string{"pool": "heap"}, "committed_value")
+	assert.NotNil(t, vmMemoryHeapCommitted)
+	assert.Equal(t, map[string]interface{}{
+		"committed_value": float64(1),
+	}, vmMemoryHeapCommitted.Fields())
+	assert.Equal(t, map[string]string{"metric_type": "gauge", "pool": "heap"}, vmMemoryHeapCommitted.Tags())
+
+	vmMemoryNonHeapCommitted := search(metrics, "vm_memory", map[string]string{"pool": "non-heap"}, "committed_value")
+	assert.NotNil(t, vmMemoryNonHeapCommitted)
+	assert.Equal(t, map[string]interface{}{
+		"committed_value": float64(6),
+	}, vmMemoryNonHeapCommitted.Fields())
+	assert.Equal(t, map[string]string{"metric_type": "gauge", "pool": "non-heap"}, vmMemoryNonHeapCommitted.Tags())
+}
+
+func search(metrics []telegraf.Metric, name string, tags map[string]string, fieldName string) telegraf.Metric {
+	for _, v := range metrics {
+		if v.Name() == name && containsAll(v.Tags(), tags) {
+			if len(fieldName) == 0 {
+				return v
+			}
+			if _, ok := v.Fields()[fieldName]; ok {
+				return v
+			}
+		}
+	}
+	return nil
+}
+
+func containsAll(t1 map[string]string, t2 map[string]string) bool {
+	for k, v := range t2 {
+		if foundValue, ok := t1[k]; !ok || v != foundValue {
+			return false
+		}
+	}
+	return true
+}
diff --git a/plugins/parsers/graphite/parser.go b/plugins/parsers/graphite/parser.go
index 1c353a31d..ebbbcd280 100644
--- a/plugins/parsers/graphite/parser.go
+++ b/plugins/parsers/graphite/parser.go
@@ -6,11 +6,12 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/influxdata/telegraf/internal/templating"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 )
@@ -23,11 +24,10 @@ var (
 
 // Parser encapsulates a Graphite Parser.
 type GraphiteParser struct {
-	Separator   string
-	Templates   []string
-	DefaultTags map[string]string
-
-	matcher *matcher
+	Separator      string
+	Templates      []string
+	DefaultTags    map[string]string
+	templateEngine *templating.Engine
 }
 
 func (p *GraphiteParser) SetDefaultTags(tags map[string]string) {
@@ -52,65 +52,13 @@ func NewGraphiteParser(
 	if defaultTags != nil {
 		p.DefaultTags = defaultTags
 	}
-
-	matcher := newMatcher()
-	p.matcher = matcher
-	defaultTemplate, _ := NewTemplate("measurement*", nil, p.Separator)
-	matcher.AddDefaultTemplate(defaultTemplate)
-
-	tmplts := parsedTemplates{}
-	for _, pattern := range p.Templates {
-		tmplt := parsedTemplate{}
-		tmplt.template = pattern
-		// Format is [filter] <template> [tag1=value1,tag2=value2]
-		parts := strings.Fields(pattern)
-		if len(parts) < 1 {
-			continue
-		} else if len(parts) >= 2 {
-			if strings.Contains(parts[1], "=") {
-				tmplt.template = parts[0]
-				tmplt.tagstring = parts[1]
-			} else {
-				tmplt.filter = parts[0]
-				tmplt.template = parts[1]
-				if len(parts) > 2 {
-					tmplt.tagstring = parts[2]
-				}
-			}
-		}
-		tmplts = append(tmplts, tmplt)
-	}
-
-	sort.Sort(tmplts)
-	for _, tmplt := range tmplts {
-		if err := p.addToMatcher(tmplt); err != nil {
-			return nil, err
-		}
-	}
+	defaultTemplate, _ := templating.NewDefaultTemplateWithPattern("measurement*")
+	p.templateEngine, err = templating.NewEngine(p.Separator, defaultTemplate, p.Templates)
 
 	if err != nil {
 		return p, fmt.Errorf("exec input parser config is error: %s ", err.Error())
-	} else {
-		return p, nil
 	}
-}
-
-func (p *GraphiteParser) addToMatcher(tmplt parsedTemplate) error {
-	// Parse out the default tags specific to this template
-	tags := map[string]string{}
-	if tmplt.tagstring != "" {
-		for _, kv := range strings.Split(tmplt.tagstring, ",") {
-			parts := strings.Split(kv, "=")
-			tags[parts[0]] = parts[1]
-		}
-	}
-
-	tmpl, err := NewTemplate(tmplt.template, tags, p.Separator)
-	if err != nil {
-		return err
-	}
-	p.matcher.Add(tmplt.filter, tmpl)
-	return nil
+	return p, nil
 }
 
 func (p *GraphiteParser) Parse(buf []byte) ([]telegraf.Metric, error) {
@@ -162,8 +110,7 @@ func (p *GraphiteParser) ParseLine(line string) (telegraf.Metric, error) {
 	}
 
 	// decode the name and tags
-	template := p.matcher.Match(fields[0])
-	measurement, tags, field, err := template.Apply(fields[0])
+	measurement, tags, field, err := p.templateEngine.Apply(fields[0])
 	if err != nil {
 		return nil, err
 	}
@@ -229,8 +176,7 @@ func (p *GraphiteParser) ApplyTemplate(line string) (string, map[string]string,
 		return "", make(map[string]string), "", nil
 	}
 	// decode the name and tags
-	template := p.matcher.Match(fields[0])
-	name, tags, field, err := template.Apply(fields[0])
+	name, tags, field, err := p.templateEngine.Apply(fields[0])
 
 	// Set the default tags on the point if they are not already set
 	for k, v := range p.DefaultTags {
@@ -241,269 +187,3 @@ func (p *GraphiteParser) ApplyTemplate(line string) (string, map[string]string,
 
 	return name, tags, field, err
 }
-
-// template represents a pattern and tags to map a graphite metric string to a influxdb Point
-type template struct {
-	tags              []string
-	defaultTags       map[string]string
-	greedyField       bool
-	greedyMeasurement bool
-	separator         string
-}
-
-// NewTemplate returns a new template ensuring it has a measurement
-// specified.
-func NewTemplate(pattern string, defaultTags map[string]string, separator string) (*template, error) {
-	tags := strings.Split(pattern, ".")
-	hasMeasurement := false
-	template := &template{tags: tags, defaultTags: defaultTags, separator: separator}
-
-	for _, tag := range tags {
-		if strings.HasPrefix(tag, "measurement") {
-			hasMeasurement = true
-		}
-		if tag == "measurement*" {
-			template.greedyMeasurement = true
-		} else if tag == "field*" {
-			template.greedyField = true
-		}
-	}
-
-	if !hasMeasurement {
-		return nil, fmt.Errorf("no measurement specified for template. %q", pattern)
-	}
-
-	return template, nil
-}
-
-// Apply extracts the template fields from the given line and returns the measurement
-// name and tags
-func (t *template) Apply(line string) (string, map[string]string, string, error) {
-	fields := strings.Split(line, ".")
-	var (
-		measurement []string
-		tags        = make(map[string][]string)
-		field       []string
-	)
-
-	// Set any default tags
-	for k, v := range t.defaultTags {
-		tags[k] = append(tags[k], v)
-	}
-
-	// See if an invalid combination has been specified in the template:
-	for _, tag := range t.tags {
-		if tag == "measurement*" {
-			t.greedyMeasurement = true
-		} else if tag == "field*" {
-			t.greedyField = true
-		}
-	}
-	if t.greedyField && t.greedyMeasurement {
-		return "", nil, "",
-			fmt.Errorf("either 'field*' or 'measurement*' can be used in each "+
-				"template (but not both together): %q",
-				strings.Join(t.tags, t.separator))
-	}
-
-	for i, tag := range t.tags {
-		if i >= len(fields) {
-			continue
-		}
-		if tag == "" {
-			continue
-		}
-
-		switch tag {
-		case "measurement":
-			measurement = append(measurement, fields[i])
-		case "field":
-			field = append(field, fields[i])
-		case "field*":
-			field = append(field, fields[i:]...)
-			break
-		case "measurement*":
-			measurement = append(measurement, fields[i:]...)
-			break
-		default:
-			tags[tag] = append(tags[tag], fields[i])
-		}
-	}
-
-	// Convert to map of strings.
-	outtags := make(map[string]string)
-	for k, values := range tags {
-		outtags[k] = strings.Join(values, t.separator)
-	}
-
-	return strings.Join(measurement, t.separator), outtags, strings.Join(field, t.separator), nil
-}
-
-// matcher determines which template should be applied to a given metric
-// based on a filter tree.
-type matcher struct {
-	root            *node
-	defaultTemplate *template
-}
-
-func newMatcher() *matcher {
-	return &matcher{
-		root: &node{},
-	}
-}
-
-// Add inserts the template in the filter tree based the given filter
-func (m *matcher) Add(filter string, template *template) {
-	if filter == "" {
-		m.AddDefaultTemplate(template)
-		return
-	}
-	m.root.Insert(filter, template)
-}
-
-func (m *matcher) AddDefaultTemplate(template *template) {
-	m.defaultTemplate = template
-}
-
-// Match returns the template that matches the given graphite line
-func (m *matcher) Match(line string) *template {
-	tmpl := m.root.Search(line)
-	if tmpl != nil {
-		return tmpl
-	}
-
-	return m.defaultTemplate
-}
-
-// node is an item in a sorted k-ary tree.  Each child is sorted by its value.
-// The special value of "*", is always last.
-type node struct {
-	value    string
-	children nodes
-	template *template
-}
-
-func (n *node) insert(values []string, template *template) {
-	// Add the end, set the template
-	if len(values) == 0 {
-		n.template = template
-		return
-	}
-
-	// See if the the current element already exists in the tree. If so, insert the
-	// into that sub-tree
-	for _, v := range n.children {
-		if v.value == values[0] {
-			v.insert(values[1:], template)
-			return
-		}
-	}
-
-	// New element, add it to the tree and sort the children
-	newNode := &node{value: values[0]}
-	n.children = append(n.children, newNode)
-	sort.Sort(&n.children)
-
-	// Now insert the rest of the tree into the new element
-	newNode.insert(values[1:], template)
-}
-
-// Insert inserts the given string template into the tree.  The filter string is separated
-// on "." and each part is used as the path in the tree.
-func (n *node) Insert(filter string, template *template) {
-	n.insert(strings.Split(filter, "."), template)
-}
-
-func (n *node) search(lineParts []string) *template {
-	// Nothing to search
-	if len(lineParts) == 0 || len(n.children) == 0 {
-		return n.template
-	}
-
-	// If last element is a wildcard, don't include in this search since it's sorted
-	// to the end but lexicographically it would not always be and sort.Search assumes
-	// the slice is sorted.
-	length := len(n.children)
-	if n.children[length-1].value == "*" {
-		length--
-	}
-
-	// Find the index of child with an exact match
-	i := sort.Search(length, func(i int) bool {
-		return n.children[i].value >= lineParts[0]
-	})
-
-	// Found an exact match, so search that child sub-tree
-	if i < len(n.children) && n.children[i].value == lineParts[0] {
-		return n.children[i].search(lineParts[1:])
-	}
-	// Not an exact match, see if we have a wildcard child to search
-	if n.children[len(n.children)-1].value == "*" {
-		return n.children[len(n.children)-1].search(lineParts[1:])
-	}
-	return n.template
-}
-
-func (n *node) Search(line string) *template {
-	return n.search(strings.Split(line, "."))
-}
-
-type nodes []*node
-
-// Less returns a boolean indicating whether the filter at position j
-// is less than the filter at position k.  Filters are order by string
-// comparison of each component parts.  A wildcard value "*" is never
-// less than a non-wildcard value.
-//
-// For example, the filters:
-//             "*.*"
-//             "servers.*"
-//             "servers.localhost"
-//             "*.localhost"
-//
-// Would be sorted as:
-//             "servers.localhost"
-//             "servers.*"
-//             "*.localhost"
-//             "*.*"
-func (n *nodes) Less(j, k int) bool {
-	if (*n)[j].value == "*" && (*n)[k].value != "*" {
-		return false
-	}
-
-	if (*n)[j].value != "*" && (*n)[k].value == "*" {
-		return true
-	}
-
-	return (*n)[j].value < (*n)[k].value
-}
-
-func (n *nodes) Swap(i, j int) { (*n)[i], (*n)[j] = (*n)[j], (*n)[i] }
-func (n *nodes) Len() int      { return len(*n) }
-
-type parsedTemplate struct {
-	template  string
-	filter    string
-	tagstring string
-}
-type parsedTemplates []parsedTemplate
-
-func (e parsedTemplates) Less(j, k int) bool {
-	if len(e[j].filter) == 0 && len(e[k].filter) == 0 {
-		nj := len(strings.Split(e[j].template, "."))
-		nk := len(strings.Split(e[k].template, "."))
-		return nj < nk
-	}
-	if len(e[j].filter) == 0 {
-		return true
-	}
-	if len(e[k].filter) == 0 {
-		return false
-	}
-
-	nj := len(strings.Split(e[j].template, "."))
-	nk := len(strings.Split(e[k].template, "."))
-	return nj < nk
-}
-func (e parsedTemplates) Swap(i, j int) { e[i], e[j] = e[j], e[i] }
-func (e parsedTemplates) Len() int      { return len(e) }
diff --git a/plugins/parsers/graphite/parser_test.go b/plugins/parsers/graphite/parser_test.go
index af0cf3fb8..c1c25f986 100644
--- a/plugins/parsers/graphite/parser_test.go
+++ b/plugins/parsers/graphite/parser_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/influxdata/telegraf/internal/templating"
 	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
@@ -118,7 +119,7 @@ func TestTemplateApply(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		tmpl, err := NewTemplate(test.template, nil, DefaultSeparator)
+		tmpl, err := templating.NewDefaultTemplateWithPattern(test.template)
 		if errstr(err) != test.err {
 			t.Fatalf("err does not match.  expected %v, got %v", test.err, err)
 		}
@@ -127,7 +128,7 @@ func TestTemplateApply(t *testing.T) {
 			continue
 		}
 
-		measurement, tags, _, _ := tmpl.Apply(test.input)
+		measurement, tags, _, _ := tmpl.Apply(test.input, DefaultSeparator)
 		if measurement != test.measurement {
 			t.Fatalf("name parse failer.  expected %v, got %v", test.measurement, measurement)
 		}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index bda6aeba3..fbeca17e8 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -6,6 +6,7 @@ import (
 	"github.com/influxdata/telegraf"
 
 	"github.com/influxdata/telegraf/plugins/parsers/collectd"
+	"github.com/influxdata/telegraf/plugins/parsers/dropwizard"
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
@@ -66,6 +67,22 @@ type Config struct {
 
 	// DefaultTags are the default tags that will be added to all parsed metrics.
 	DefaultTags map[string]string
+
+	// an optional json path containing the metric registry object
+	// if left empty, the whole json object is parsed as a metric registry
+	DropwizardMetricRegistryPath string
+	// an optional json path containing the default time of the metrics
+	// if left empty, the processing time is used
+	DropwizardTimePath string
+	// time format to use for parsing the time field
+	// defaults to time.RFC3339
+	DropwizardTimeFormat string
+	// an optional json path pointing to a json object with tag key/value pairs
+	// takes precedence over DropwizardTagPathsMap
+	DropwizardTagsPath string
+	// an optional map containing tag names as keys and json paths to retrieve the tag values from as values
+	// used if TagsPath is empty or doesn't return any tags
+	DropwizardTagPathsMap map[string]string
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -89,6 +106,10 @@ func NewParser(config *Config) (Parser, error) {
 	case "collectd":
 		parser, err = NewCollectdParser(config.CollectdAuthFile,
 			config.CollectdSecurityLevel, config.CollectdTypesDB)
+	case "dropwizard":
+		parser, err = NewDropwizardParser(config.DropwizardMetricRegistryPath,
+			config.DropwizardTimePath, config.DropwizardTimeFormat, config.DropwizardTagsPath, config.DropwizardTagPathsMap, config.DefaultTags,
+			config.Separator, config.Templates)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
@@ -143,3 +164,29 @@ func NewCollectdParser(
 ) (Parser, error) {
 	return collectd.NewCollectdParser(authFile, securityLevel, typesDB)
 }
+
+func NewDropwizardParser(
+	metricRegistryPath string,
+	timePath string,
+	timeFormat string,
+	tagsPath string,
+	tagPathsMap map[string]string,
+	defaultTags map[string]string,
+	separator string,
+	templates []string,
+
+) (Parser, error) {
+	parser := &dropwizard.Parser{
+		MetricRegistryPath: metricRegistryPath,
+		TimePath:           timePath,
+		TimeFormat:         timeFormat,
+		TagsPath:           tagsPath,
+		TagPathsMap:        tagPathsMap,
+		DefaultTags:        defaultTags,
+		Separator:          separator,
+		Templates:          templates,
+	}
+	err := parser.InitTemplating()
+
+	return parser, err
+}

From 0ddb1d26a0ef9b7bb94dafd3768319fd59fe9377 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 15:15:23 -0800
Subject: [PATCH 0855/1302] Add gjson and match to dependency license file

---
 docs/LICENSE_OF_DEPENDENCIES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index ffd9751d7..92acc3270 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -82,6 +82,8 @@ following works:
 - github.com/streadway/amqp [BSD](https://github.com/streadway/amqp/blob/master/LICENSE)
 - github.com/stretchr/objx [MIT](https://github.com/stretchr/objx/blob/master/LICENSE.md)
 - github.com/stretchr/testify [MIT](https://github.com/stretchr/testify/blob/master/LICENCE.txt)
+- github.com/tidwall/gjson [MIT](https://github.com/tidwall/gjson/blob/master/LICENSE)
+- github.com/tidwall/match [MIT](https://github.com/tidwall/match/blob/master/LICENSE)
 - github.com/mitchellh/mapstructure [MIT](https://github.com/mitchellh/mapstructure/blob/master/LICENSE)
 - github.com/multiplay/go-ts3 [BSD](https://github.com/multiplay/go-ts3/blob/master/LICENSE)
 - github.com/vjeantet/grok [APACHE](https://github.com/vjeantet/grok/blob/master/LICENSE)

From 24ae3293bcc06cf9425727724db9a606a72dec8f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 15:18:31 -0800
Subject: [PATCH 0856/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30465895f..093cf286b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - [#3524](https://github.com/influxdata/telegraf/pull/3524): Add available_entropy field to kernel input plugin.
 - [#3643](https://github.com/influxdata/telegraf/pull/3643): Add user privilege level setting to IPMI sensors.
 - [#2701](https://github.com/influxdata/telegraf/pull/2701): Use persistent connection to postgresql database.
+- [#2846](https://github.com/influxdata/telegraf/pull/2846): Add support for dropwizard input format.
 
 ### Bugfixes
 

From ce06d0cee0cfb12f74c022dd1df31f6971a7853d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 15:21:20 -0800
Subject: [PATCH 0857/1302] Update changelog

---
 CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 093cf286b..fd5deb873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,11 @@
   DROP MEASUREMENT mysql_innodb
   ```
 
+- `postgresql` plugins will now default to using a persistent connection to the database.
+  `Important` In environments TCP connections are terminated when idle for periods shorter than 15 minutes
+  and the collection interval is longer than the termination period then max_lifetime
+  should be set to be less than the collection interval to pervent errors when collecting metrics.
+
 ### Features
 
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
@@ -65,10 +70,6 @@
   `use_random_partitionkey` options has been deprecated in favor of the
   `partition` subtable.  This allows for more flexible methods to set the
   partition key such as by metric name or by tag.
-- `postgresql` plugins will now default to using a persistent connection to the database.
-  `Important` In environments TCP connections are terminated when idle for periods shorter than 15 minutes
-  and the collection interval is longer than the termination period then max_lifetime
-  should be set to be less than the collection interval to pervent errors when collecting metrics.
 
 - With the release of the new improved `jolokia2` input, the legacy `jolokia`
   plugin is deprecated and will be removed in a future release.  Users of this

From 2b972dcd562a3ef414334a057931dde57bd0f3a7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 16:29:59 -0800
Subject: [PATCH 0858/1302] Update release notes

---
 CHANGELOG.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd5deb873..954f0b3d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,10 +12,9 @@
   DROP MEASUREMENT mysql_innodb
   ```
 
-- `postgresql` plugins will now default to using a persistent connection to the database.
-  `Important` In environments TCP connections are terminated when idle for periods shorter than 15 minutes
-  and the collection interval is longer than the termination period then max_lifetime
-  should be set to be less than the collection interval to pervent errors when collecting metrics.
+- The `postgresql` plugins now defaults to using a persistent connection to the database.
+  In environments where TCP connections are terminated the `max_lifetime`
+  setting should be set less than the collection `interval` to prevent errors.
 
 ### Features
 

From 3cf0ba1ccf42dd8b4631a7dcb9bcabfcad374c33 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 8 Jan 2018 18:48:17 -0800
Subject: [PATCH 0859/1302] Pin crate docker image for testing

---
 Makefile                                | 8 +-------
 plugins/outputs/cratedb/cratedb_test.go | 8 ++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d8ccf2faf..a0c340eeb 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ docker-run:
 		-d cobaugh/openldap-alpine
 	docker run --name cratedb \
 		-p "6543:5432" \
-		-d crate crate \
+		-d crate:2.2 \
 		-Cnetwork.host=0.0.0.0 \
 		-Ctransport.host=localhost \
 		-Clicense.enterprise=false
@@ -116,12 +116,6 @@ docker-run-circle:
 		-e SLAPD_CONFIG_ROOTPW="secret" \
 		-p "389:389" -p "636:636" \
 		-d cobaugh/openldap-alpine
-	docker run --name cratedb \
-		-p "6543:5432" \
-		-d crate crate \
-		-Cnetwork.host=0.0.0.0 \
-		-Ctransport.host=localhost \
-		-Clicense.enterprise=false
 
 docker-kill:
 	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
diff --git a/plugins/outputs/cratedb/cratedb_test.go b/plugins/outputs/cratedb/cratedb_test.go
index 46fdd7b84..be1d889c0 100644
--- a/plugins/outputs/cratedb/cratedb_test.go
+++ b/plugins/outputs/cratedb/cratedb_test.go
@@ -19,6 +19,10 @@ func TestConnectAndWrite(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
+	if os.Getenv("CIRCLE_PROJECT_REPONAME") != "" {
+		t.Skip("Skipping test on CircleCI due to docker failures")
+	}
+
 	url := testURL()
 	table := "test"
 
@@ -95,6 +99,10 @@ func Test_escapeValue(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
+	if os.Getenv("CIRCLE_PROJECT_REPONAME") != "" {
+		t.Skip("Skipping test on CircleCI due to docker failures")
+	}
+
 	tests := []struct {
 		Val  interface{}
 		Want string

From f3147cc44d79fdc0f530bb5f4e261c4f2f1bc367 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 9 Jan 2018 15:01:20 -0800
Subject: [PATCH 0860/1302] Skip CircleCI test of tail plugin due to
 intermittent deadlock

---
 plugins/inputs/tail/tail_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 34e2abce9..9fafbbe87 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -14,6 +14,10 @@ import (
 )
 
 func TestTailFromBeginning(t *testing.T) {
+	if os.Getenv("CIRCLE_PROJECT_REPONAME") != "" {
+		t.Skip("Skipping CI testing due to race conditions")
+	}
+
 	tmpfile, err := ioutil.TempFile("", "")
 	require.NoError(t, err)
 	defer os.Remove(tmpfile.Name())

From 90b6b760d1c9ff53ad779a710e76aa733a88b170 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 10 Jan 2018 13:27:58 -0800
Subject: [PATCH 0861/1302] Set 1.5.1 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954f0b3d8..44e1be22d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
-## v1.5.1 [unreleased]
+## v1.5.1 [2017-01-10]
 
 ### Bugfixes
 

From 666eb47613540b212f394a78698368a959fb2f3c Mon Sep 17 00:00:00 2001
From: Jacob McCann <jmccann.git@gmail.com>
Date: Fri, 12 Jan 2018 14:08:19 -0600
Subject: [PATCH 0862/1302] Listen on localhost interface in tests (#3667)

---
 plugins/inputs/http_listener/http_listener_test.go | 12 ++++++------
 plugins/inputs/statsd/statsd_test.go               | 12 ++++++------
 plugins/inputs/tcp_listener/tcp_listener_test.go   | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index d79e9576a..f4569cadf 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -114,7 +114,7 @@ var (
 
 func newTestHTTPListener() *HTTPListener {
 	listener := &HTTPListener{
-		ServiceAddress: ":0",
+		ServiceAddress: "localhost:0",
 	}
 	return listener
 }
@@ -155,7 +155,7 @@ func newTestHTTPSListener() *HTTPListener {
 	})
 
 	listener := &HTTPListener{
-		ServiceAddress:    ":0",
+		ServiceAddress:    "localhost:0",
 		TlsAllowedCacerts: allowedCAFiles,
 		TlsCert:           serviceCertFile,
 		TlsKey:            serviceKeyFile,
@@ -309,7 +309,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
 
 func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":0",
+		ServiceAddress: "localhost:0",
 		MaxLineSize:    128 * 1000,
 	}
 
@@ -326,7 +326,7 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 
 func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":0",
+		ServiceAddress: "localhost:0",
 		MaxBodySize:    4096,
 	}
 
@@ -342,7 +342,7 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 
 func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":0",
+		ServiceAddress: "localhost:0",
 		MaxLineSize:    70,
 	}
 
@@ -368,7 +368,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 
 func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	listener := &HTTPListener{
-		ServiceAddress: ":0",
+		ServiceAddress: "localhost:0",
 		MaxLineSize:    100,
 	}
 
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index 1331e1f4b..a9161e5ba 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -21,7 +21,7 @@ func newTestTcpListener() (*Statsd, chan *bytes.Buffer) {
 	in := make(chan *bytes.Buffer, 1500)
 	listener := &Statsd{
 		Protocol:               "tcp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      250,
 		in:                     in,
@@ -50,7 +50,7 @@ func NewTestStatsd() *Statsd {
 func TestConcurrentConns(t *testing.T) {
 	listener := Statsd{
 		Protocol:               "tcp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      2,
 	}
@@ -80,7 +80,7 @@ func TestConcurrentConns(t *testing.T) {
 func TestConcurrentConns1(t *testing.T) {
 	listener := Statsd{
 		Protocol:               "tcp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      1,
 	}
@@ -108,7 +108,7 @@ func TestConcurrentConns1(t *testing.T) {
 func TestCloseConcurrentConns(t *testing.T) {
 	listener := Statsd{
 		Protocol:               "tcp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      2,
 	}
@@ -129,7 +129,7 @@ func TestCloseConcurrentConns(t *testing.T) {
 func BenchmarkUDP(b *testing.B) {
 	listener := Statsd{
 		Protocol:               "udp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 250000,
 	}
 	acc := &testutil.Accumulator{Discard: true}
@@ -159,7 +159,7 @@ func BenchmarkUDP(b *testing.B) {
 func BenchmarkTCP(b *testing.B) {
 	listener := Statsd{
 		Protocol:               "tcp",
-		ServiceAddress:         ":8125",
+		ServiceAddress:         "localhost:8125",
 		AllowedPendingMessages: 250000,
 		MaxTCPConnections:      250,
 	}
diff --git a/plugins/inputs/tcp_listener/tcp_listener_test.go b/plugins/inputs/tcp_listener/tcp_listener_test.go
index 27ced791c..1063cb5c1 100644
--- a/plugins/inputs/tcp_listener/tcp_listener_test.go
+++ b/plugins/inputs/tcp_listener/tcp_listener_test.go
@@ -33,7 +33,7 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 func newTestTcpListener() (*TcpListener, chan []byte) {
 	in := make(chan []byte, 1500)
 	listener := &TcpListener{
-		ServiceAddress:         ":8194",
+		ServiceAddress:         "localhost:8194",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      250,
 		in:                     in,
@@ -45,7 +45,7 @@ func newTestTcpListener() (*TcpListener, chan []byte) {
 // benchmark how long it takes to accept & process 100,000 metrics:
 func BenchmarkTCP(b *testing.B) {
 	listener := TcpListener{
-		ServiceAddress:         ":8198",
+		ServiceAddress:         "localhost:8198",
 		AllowedPendingMessages: 100000,
 		MaxTCPConnections:      250,
 	}
@@ -76,7 +76,7 @@ func BenchmarkTCP(b *testing.B) {
 
 func TestHighTrafficTCP(t *testing.T) {
 	listener := TcpListener{
-		ServiceAddress:         ":8199",
+		ServiceAddress:         "localhost:8199",
 		AllowedPendingMessages: 100000,
 		MaxTCPConnections:      250,
 	}
@@ -103,7 +103,7 @@ func TestHighTrafficTCP(t *testing.T) {
 
 func TestConnectTCP(t *testing.T) {
 	listener := TcpListener{
-		ServiceAddress:         ":8194",
+		ServiceAddress:         "localhost:8194",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      250,
 	}
@@ -140,7 +140,7 @@ func TestConnectTCP(t *testing.T) {
 // Test that MaxTCPConections is respected
 func TestConcurrentConns(t *testing.T) {
 	listener := TcpListener{
-		ServiceAddress:         ":8195",
+		ServiceAddress:         "localhost:8195",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      2,
 	}
@@ -175,7 +175,7 @@ func TestConcurrentConns(t *testing.T) {
 // Test that MaxTCPConections is respected when max==1
 func TestConcurrentConns1(t *testing.T) {
 	listener := TcpListener{
-		ServiceAddress:         ":8196",
+		ServiceAddress:         "localhost:8196",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      1,
 	}
@@ -208,7 +208,7 @@ func TestConcurrentConns1(t *testing.T) {
 // Test that MaxTCPConections is respected
 func TestCloseConcurrentConns(t *testing.T) {
 	listener := TcpListener{
-		ServiceAddress:         ":8195",
+		ServiceAddress:         "localhost:8195",
 		AllowedPendingMessages: 10000,
 		MaxTCPConnections:      2,
 	}

From 97f6c9d8e1c21075a81eb7d22c70641bdd8c8ed0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 12 Jan 2018 16:48:45 -0800
Subject: [PATCH 0863/1302] Skip intermittent test on CircleCI

---
 plugins/inputs/tail/tail_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 9fafbbe87..4ebf00171 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -47,6 +47,10 @@ func TestTailFromBeginning(t *testing.T) {
 }
 
 func TestTailFromEnd(t *testing.T) {
+	if os.Getenv("CIRCLE_PROJECT_REPONAME") != "" {
+		t.Skip("Skipping CI testing due to race conditions")
+	}
+
 	tmpfile, err := ioutil.TempFile("", "")
 	require.NoError(t, err)
 	defer os.Remove(tmpfile.Name())

From 7ab0d50116b940233ac3361120b5da314ba6010e Mon Sep 17 00:00:00 2001
From: Jacob McCann <jmccann.git@gmail.com>
Date: Fri, 12 Jan 2018 19:43:51 -0600
Subject: [PATCH 0864/1302] Add container health metrics to docker input
 (#3666)

---
 plugins/inputs/docker/README.md          |  5 ++++-
 plugins/inputs/docker/docker.go          | 17 +++++++++++++----
 plugins/inputs/docker/docker_testdata.go |  8 ++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index faee9a57b..7e9907588 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -199,6 +199,9 @@ based on the availability of per-cpu stats on your system.
     - network
 - docker_container_blkio specific:
     - device
+- docker_container_health specific:
+    - health_status
+    - failing_streak
 - docker_swarm specific:
     - service_id
     - service_name
@@ -257,4 +260,4 @@ io_serviced_recursive_total=6599i,io_serviced_recursive_write=107i 1453409536840
 >docker_swarm,
 service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test,\
 tasks_desired=3,tasks_running=3 1508968160000000000
-```
\ No newline at end of file
+```
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 595bcc518..7178eb497 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -391,12 +391,13 @@ func (d *Docker) gatherContainer(
 		}
 	}
 
+	info, err := d.client.ContainerInspect(ctx, container.ID)
+	if err != nil {
+		return fmt.Errorf("Error inspecting docker container: %s", err.Error())
+	}
+
 	// Add whitelisted environment variables to tags
 	if len(d.TagEnvironment) > 0 {
-		info, err := d.client.ContainerInspect(ctx, container.ID)
-		if err != nil {
-			return fmt.Errorf("Error inspecting docker container: %s", err.Error())
-		}
 		for _, envvar := range info.Config.Env {
 			for _, configvar := range d.TagEnvironment {
 				dock_env := strings.SplitN(envvar, "=", 2)
@@ -408,6 +409,14 @@ func (d *Docker) gatherContainer(
 		}
 	}
 
+	if info.State.Health != nil {
+		healthfields := map[string]interface{}{
+			"health_status":  info.State.Health.Status,
+			"failing_streak": info.ContainerJSONBase.State.Health.FailingStreak,
+		}
+		acc.AddFields("docker_container_health", healthfields, tags, time.Now())
+	}
+
 	gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
 
 	return nil
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
index 929119fcb..8042461db 100644
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -477,4 +477,12 @@ var containerInspect = types.ContainerJSON{
 			"PATH=/bin:/sbin",
 		},
 	},
+	ContainerJSONBase: &types.ContainerJSONBase{
+		State: &types.ContainerState{
+			Health: &types.Health{
+				FailingStreak: 1,
+				Status:        "Unhealthy",
+			},
+		},
+	},
 }

From 6e4650da3a9b5c54505079b52899ac014c72b65b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 12 Jan 2018 17:46:20 -0800
Subject: [PATCH 0865/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44e1be22d..c34da29bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - [#3643](https://github.com/influxdata/telegraf/pull/3643): Add user privilege level setting to IPMI sensors.
 - [#2701](https://github.com/influxdata/telegraf/pull/2701): Use persistent connection to postgresql database.
 - [#2846](https://github.com/influxdata/telegraf/pull/2846): Add support for dropwizard input format.
+- [#3666](https://github.com/influxdata/telegraf/pull/3666): Add container health metrics to docker input.
 
 ### Bugfixes
 

From d188b78d9e1818a2667a5f29c06f18eefe63773e Mon Sep 17 00:00:00 2001
From: atzoum <atzoum@gmail.com>
Date: Tue, 16 Jan 2018 22:12:14 +0200
Subject: [PATCH 0866/1302] Add string and boolean support to dropwizard; fix
 escaping of tags/fields (#3664)

---
 docs/DATA_FORMATS_INPUT.md                |  2 +-
 plugins/parsers/dropwizard/parser.go      | 13 ++++--
 plugins/parsers/dropwizard/parser_test.go | 48 ++++++++++++++---------
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 64097e7d6..c1192e72b 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -483,7 +483,7 @@ You can also change the path to the typesdb or add additional typesdb using
 
 # Dropwizard:
 
-The dropwizard format can parse the JSON representation of a single dropwizard metric registry. By default, tags are parsed from metric names as if they were actual influxdb line protocol keys (`measurement<,tag_set>`) which can be overriden by defining custom [measurement & tag templates](./DATA_FORMATS_INPUT.md#measurement--tag-templates). All field values are collected as float64 fields.
+The dropwizard format can parse the JSON representation of a single dropwizard metric registry. By default, tags are parsed from metric names as if they were actual influxdb line protocol keys (`measurement<,tag_set>`) which can be overriden by defining custom [measurement & tag templates](./DATA_FORMATS_INPUT.md#measurement--tag-templates). All field value types are supported, `string`, `number` and `boolean`.
 
 A typical JSON of a dropwizard metric registry:
 
diff --git a/plugins/parsers/dropwizard/parser.go b/plugins/parsers/dropwizard/parser.go
index dc5442068..4c07ca286 100644
--- a/plugins/parsers/dropwizard/parser.go
+++ b/plugins/parsers/dropwizard/parser.go
@@ -14,6 +14,9 @@ import (
 	"github.com/tidwall/gjson"
 )
 
+var fieldEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"")
+var keyEscaper = strings.NewReplacer(" ", "\\ ", ",", "\\,", "=", "\\=")
+
 // Parser parses json inputs containing dropwizard metrics,
 // either top-level or embedded inside a json field.
 // This parser is using gjon for retrieving paths within the json file.
@@ -211,7 +214,7 @@ func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []te
 
 			measurementWithTags := measurementName
 			for tagName, tagValue := range tags {
-				tagKeyValue := fmt.Sprintf("%s=%s", tagName, tagValue)
+				tagKeyValue := fmt.Sprintf("%s=%s", keyEscaper.Replace(tagName), keyEscaper.Replace(tagValue))
 				measurementWithTags = fmt.Sprintf("%s,%s", measurementWithTags, tagKeyValue)
 			}
 
@@ -219,10 +222,14 @@ func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []te
 			switch t := dwmFields.(type) {
 			case map[string]interface{}: // json object
 				for fieldName, fieldValue := range t {
-
+					key := keyEscaper.Replace(fieldPrefix + fieldName)
 					switch v := fieldValue.(type) {
 					case float64:
-						fields = append(fields, fmt.Sprintf("%s%s=%f", fieldPrefix, fieldName, v))
+						fields = append(fields, fmt.Sprintf("%s=%f", key, v))
+					case string:
+						fields = append(fields, fmt.Sprintf("%s=\"%s\"", key, fieldEscaper.Replace(v)))
+					case bool:
+						fields = append(fields, fmt.Sprintf("%s=%t", key, v))
 					default: // ignore
 					}
 				}
diff --git a/plugins/parsers/dropwizard/parser_test.go b/plugins/parsers/dropwizard/parser_test.go
index 5834eb516..fa92f3c30 100644
--- a/plugins/parsers/dropwizard/parser_test.go
+++ b/plugins/parsers/dropwizard/parser_test.go
@@ -67,7 +67,8 @@ const validEmbeddedCounterJSON = `
 	"time" : "2017-02-22T14:33:03.662+02:00",
 	"tags" : {
 		"tag1" : "green",
-		"tag2" : "yellow"
+		"tag2" : "yellow",
+		"tag3 space,comma=equals" : "red ,="
 	},
 	"metrics" : {
 		"counters" : 	{ 
@@ -99,7 +100,12 @@ func TestParseValidEmbeddedCounterJSON(t *testing.T) {
 	assert.Equal(t, map[string]interface{}{
 		"count": float64(1),
 	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{"metric_type": "counter", "tag1": "green", "tag2": "yellow"}, metrics[0].Tags())
+	assert.Equal(t, map[string]string{
+		"metric_type": "counter",
+		"tag1":        "green",
+		"tag2":        "yellow",
+		"tag3 space,comma=equals": "red ,=",
+	}, metrics[0].Tags())
 	assert.True(t, metricTime.Equal(metrics[0].Time()), fmt.Sprintf("%s should be equal to %s", metrics[0].Time(), metricTime))
 
 	// now test json tags through TagPathsMap
@@ -147,6 +153,7 @@ func TestParseValidMeterJSON1(t *testing.T) {
 		"m1_rate":   float64(1),
 		"m5_rate":   float64(1),
 		"mean_rate": float64(1),
+		"units":     "events/second",
 	}, metrics[0].Fields())
 
 	assert.Equal(t, map[string]string{"metric_type": "meter"}, metrics[0].Tags())
@@ -186,6 +193,7 @@ func TestParseValidMeterJSON2(t *testing.T) {
 		"m1_rate":   float64(2),
 		"m5_rate":   float64(2),
 		"mean_rate": float64(2),
+		"units":     "events/second",
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{"metric_type": "meter", "key": "value"}, metrics[0].Tags())
 }
@@ -198,7 +206,7 @@ const validGaugeJSON = `
 	"meters" : 		{},
 	"gauges" : 		{
 		"measurement" : {
-			"value" : 0
+			"value" : true
 		}
 	},
 	"histograms" : 	{},
@@ -214,7 +222,7 @@ func TestParseValidGaugeJSON(t *testing.T) {
 	assert.Len(t, metrics, 1)
 	assert.Equal(t, "measurement", metrics[0].Name())
 	assert.Equal(t, map[string]interface{}{
-		"value": float64(0),
+		"value": true,
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{"metric_type": "gauge"}, metrics[0].Tags())
 }
@@ -308,21 +316,23 @@ func TestParseValidTimerJSON(t *testing.T) {
 	assert.Len(t, metrics, 1)
 	assert.Equal(t, "measurement", metrics[0].Name())
 	assert.Equal(t, map[string]interface{}{
-		"count":     float64(1),
-		"max":       float64(2),
-		"mean":      float64(3),
-		"min":       float64(4),
-		"p50":       float64(5),
-		"p75":       float64(6),
-		"p95":       float64(7),
-		"p98":       float64(8),
-		"p99":       float64(9),
-		"p999":      float64(10),
-		"stddev":    float64(11),
-		"m15_rate":  float64(12),
-		"m1_rate":   float64(13),
-		"m5_rate":   float64(14),
-		"mean_rate": float64(15),
+		"count":          float64(1),
+		"max":            float64(2),
+		"mean":           float64(3),
+		"min":            float64(4),
+		"p50":            float64(5),
+		"p75":            float64(6),
+		"p95":            float64(7),
+		"p98":            float64(8),
+		"p99":            float64(9),
+		"p999":           float64(10),
+		"stddev":         float64(11),
+		"m15_rate":       float64(12),
+		"m1_rate":        float64(13),
+		"m5_rate":        float64(14),
+		"mean_rate":      float64(15),
+		"duration_units": "seconds",
+		"rate_units":     "calls/second",
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{"metric_type": "timer"}, metrics[0].Tags())
 }

From 87830a1c387528de03167073fbb00f1919044e0b Mon Sep 17 00:00:00 2001
From: Noah Crowley <noah.crowley@gmail.com>
Date: Tue, 16 Jan 2018 16:44:56 -0500
Subject: [PATCH 0867/1302] Ignore empty lines in Graphite plaintext (#3684)

---
 plugins/parsers/graphite/parser.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/parsers/graphite/parser.go b/plugins/parsers/graphite/parser.go
index ebbbcd280..42d617c7d 100644
--- a/plugins/parsers/graphite/parser.go
+++ b/plugins/parsers/graphite/parser.go
@@ -86,8 +86,11 @@ func (p *GraphiteParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 
 		// Trim the buffer, even though there should be no padding
 		line := strings.TrimSpace(string(buf))
-		metric, err := p.ParseLine(line)
+		if line == "" {
+			continue
+		}
 
+		metric, err := p.ParseLine(line)
 		if err == nil {
 			metrics = append(metrics, metric)
 		} else {

From 6e24056757283e0750fbcb408ef40621732b4083 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 16 Jan 2018 13:46:41 -0800
Subject: [PATCH 0868/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34da29bb..a18df1dcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,12 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
+## v1.5.2 [unreleased]
+
+### Bugfixes
+
+- [#3684](https://github.com/influxdata/telegraf/pull/3684): Ignore empty lines in Graphite plaintext.
+
 ## v1.5.1 [2017-01-10]
 
 ### Bugfixes

From 9d559292a53de5b512b17ac02a445235cee29a69 Mon Sep 17 00:00:00 2001
From: Michael Boudreau <mkboudreau@yahoo.com>
Date: Wed, 17 Jan 2018 14:37:34 -0800
Subject: [PATCH 0869/1302] Fix index out of bounds error in solr input plugin
 (#3683)

---
 plugins/inputs/solr/solr.go      | 14 +++++++++++
 plugins/inputs/solr/solr_test.go | 41 ++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go
index 1df8fa4c0..6421db80b 100644
--- a/plugins/inputs/solr/solr.go
+++ b/plugins/inputs/solr/solr.go
@@ -246,6 +246,9 @@ func addAdminCoresStatusToAcc(acc telegraf.Accumulator, adminCoreStatus *AdminCo
 // Add core metrics section to accumulator
 func addCoreMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
 	var coreMetrics map[string]Core
+	if len(mBeansData.SolrMbeans) < 2 {
+		return fmt.Errorf("no core metric data to unmarshall")
+	}
 	if err := json.Unmarshal(mBeansData.SolrMbeans[1], &coreMetrics); err != nil {
 		return err
 	}
@@ -274,9 +277,14 @@ func addCoreMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBea
 func addQueryHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
 	var queryMetrics map[string]QueryHandler
 
+	if len(mBeansData.SolrMbeans) < 4 {
+		return fmt.Errorf("no query handler metric data to unmarshall")
+	}
+
 	if err := json.Unmarshal(mBeansData.SolrMbeans[3], &queryMetrics); err != nil {
 		return err
 	}
+
 	for name, metrics := range queryMetrics {
 		coreFields := map[string]interface{}{
 			"15min_rate_reqs_per_second": metrics.Stats.One5minRateReqsPerSecond,
@@ -310,6 +318,9 @@ func addQueryHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansDa
 func addUpdateHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
 	var updateMetrics map[string]UpdateHandler
 
+	if len(mBeansData.SolrMbeans) < 6 {
+		return fmt.Errorf("no update handler metric data to unmarshall")
+	}
 	if err := json.Unmarshal(mBeansData.SolrMbeans[5], &updateMetrics); err != nil {
 		return err
 	}
@@ -364,6 +375,9 @@ func getFloat(unk interface{}) float64 {
 
 // Add cache metrics section to accumulator
 func addCacheMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
+	if len(mBeansData.SolrMbeans) < 8 {
+		return fmt.Errorf("no cache metric data to unmarshall")
+	}
 	var cacheMetrics map[string]Cache
 	if err := json.Unmarshal(mBeansData.SolrMbeans[7], &cacheMetrics); err != nil {
 		return err
diff --git a/plugins/inputs/solr/solr_test.go b/plugins/inputs/solr/solr_test.go
index aaaba4676..cdaad57e2 100644
--- a/plugins/inputs/solr/solr_test.go
+++ b/plugins/inputs/solr/solr_test.go
@@ -60,3 +60,44 @@ func createMockServer() *httptest.Server {
 		}
 	}))
 }
+
+func TestNoCoreDataHandling(t *testing.T) {
+	ts := createMockNoCoreDataServer()
+	solr := NewSolr()
+	solr.Servers = []string{ts.URL}
+	var acc testutil.Accumulator
+	require.NoError(t, solr.Gather(&acc))
+
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminMainCoreStatusExpected,
+		map[string]string{"core": "main"})
+
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminCore1StatusExpected,
+		map[string]string{"core": "core1"})
+
+	acc.AssertDoesNotContainMeasurement(t, "solr_core")
+	acc.AssertDoesNotContainMeasurement(t, "solr_queryhandler")
+	acc.AssertDoesNotContainMeasurement(t, "solr_updatehandler")
+	acc.AssertDoesNotContainMeasurement(t, "solr_handler")
+
+}
+
+func createMockNoCoreDataServer() *httptest.Server {
+	var nodata string
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, nodata)
+		} else if strings.Contains(r.URL.Path, "solr/core1/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, nodata)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}

From ad921a3840bd08cd92a6fba7b2e0f27719833ca6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 17 Jan 2018 14:38:47 -0800
Subject: [PATCH 0870/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a18df1dcc..df2ed937e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 ### Bugfixes
 
 - [#3684](https://github.com/influxdata/telegraf/pull/3684): Ignore empty lines in Graphite plaintext.
+- [#3604](https://github.com/influxdata/telegraf/issues/3604): Fix index out of bounds error in solr input plugin.
 
 ## v1.5.1 [2017-01-10]
 

From fa5f1bf6d99350bd338ba4246477f2dfb0af4766 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 17 Jan 2018 14:57:46 -0800
Subject: [PATCH 0871/1302] Use go-redis for the redis input (#3661)

---
 Godeps                        |   1 +
 plugins/inputs/redis/redis.go | 186 +++++++++++++++++++---------------
 2 files changed, 103 insertions(+), 84 deletions(-)

diff --git a/Godeps b/Godeps
index 784c6044c..c659227ca 100644
--- a/Godeps
+++ b/Godeps
@@ -27,6 +27,7 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
+github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 7f6143340..c809aa437 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -2,21 +2,47 @@ package redis
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
-	"net"
+	"io"
+	"log"
 	"net/url"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/go-redis/redis"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Redis struct {
 	Servers []string
+
+	clients     []Client
+	initialized bool
+}
+
+type Client interface {
+	Info() *redis.StringCmd
+	BaseTags() map[string]string
+}
+
+type RedisClient struct {
+	client *redis.Client
+	tags   map[string]string
+}
+
+func (r *RedisClient) Info() *redis.StringCmd {
+	return r.client.Info()
+}
+
+func (r *RedisClient) BaseTags() map[string]string {
+	tags := make(map[string]string)
+	for k, v := range r.tags {
+		tags[k] = v
+	}
+	return tags
 }
 
 var sampleConfig = `
@@ -32,8 +58,6 @@ var sampleConfig = `
   servers = ["tcp://localhost:6379"]
 `
 
-var defaultTimeout = 5 * time.Second
-
 func (r *Redis) SampleConfig() string {
 	return sampleConfig
 }
@@ -48,111 +72,107 @@ var Tracking = map[string]string{
 	"role":              "replication_role",
 }
 
-var ErrProtocolError = errors.New("redis protocol error")
-
-const defaultPort = "6379"
-
-// Reads stats from all configured servers accumulates stats.
-// Returns one of the errors encountered while gather stats (if any).
-func (r *Redis) Gather(acc telegraf.Accumulator) error {
-	if len(r.Servers) == 0 {
-		url := &url.URL{
-			Scheme: "tcp",
-			Host:   ":6379",
-		}
-		r.gatherServer(url, acc)
+func (r *Redis) init(acc telegraf.Accumulator) error {
+	if r.initialized {
 		return nil
 	}
 
-	var wg sync.WaitGroup
-	for _, serv := range r.Servers {
+	if len(r.Servers) == 0 {
+		r.Servers = []string{"tcp://localhost:6379"}
+	}
+
+	r.clients = make([]Client, len(r.Servers))
+
+	for i, serv := range r.Servers {
 		if !strings.HasPrefix(serv, "tcp://") && !strings.HasPrefix(serv, "unix://") {
+			log.Printf("W! [inputs.redis]: server URL found without scheme; please update your configuration file")
 			serv = "tcp://" + serv
 		}
 
 		u, err := url.Parse(serv)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse to address '%s': %s", serv, err))
-			continue
-		} else if u.Scheme == "" {
-			// fallback to simple string based address (i.e. "10.0.0.1:10000")
-			u.Scheme = "tcp"
-			u.Host = serv
-			u.Path = ""
+			return fmt.Errorf("Unable to parse to address %q: %v", serv, err)
 		}
-		if u.Scheme == "tcp" {
-			_, _, err := net.SplitHostPort(u.Host)
-			if err != nil {
-				u.Host = u.Host + ":" + defaultPort
+
+		password := ""
+		if u.User != nil {
+			pw, ok := u.User.Password()
+			if ok {
+				password = pw
 			}
 		}
 
+		var address string
+		if u.Scheme == "unix" {
+			address = u.Path
+		} else {
+			address = u.Host
+		}
+
+		client := redis.NewClient(
+			&redis.Options{
+				Addr:     address,
+				Password: password,
+				Network:  u.Scheme,
+				PoolSize: 1,
+			},
+		)
+
+		tags := map[string]string{}
+		if u.Scheme == "unix" {
+			tags["socket"] = u.Path
+		} else {
+			tags["server"] = u.Hostname()
+			tags["port"] = u.Port()
+		}
+
+		r.clients[i] = &RedisClient{
+			client: client,
+			tags:   tags,
+		}
+	}
+
+	r.initialized = true
+	return nil
+}
+
+// Reads stats from all configured servers accumulates stats.
+// Returns one of the errors encountered while gather stats (if any).
+func (r *Redis) Gather(acc telegraf.Accumulator) error {
+	if !r.initialized {
+		err := r.init(acc)
+		if err != nil {
+			return err
+		}
+	}
+
+	var wg sync.WaitGroup
+
+	for _, client := range r.clients {
 		wg.Add(1)
-		go func(serv string) {
+		go func(client Client) {
 			defer wg.Done()
-			acc.AddError(r.gatherServer(u, acc))
-		}(serv)
+			acc.AddError(r.gatherServer(client, acc))
+		}(client)
 	}
 
 	wg.Wait()
 	return nil
 }
 
-func (r *Redis) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
-	var address string
-
-	if addr.Scheme == "unix" {
-		address = addr.Path
-	} else {
-		address = addr.Host
-	}
-	c, err := net.DialTimeout(addr.Scheme, address, defaultTimeout)
+func (r *Redis) gatherServer(client Client, acc telegraf.Accumulator) error {
+	info, err := client.Info().Result()
 	if err != nil {
-		return fmt.Errorf("Unable to connect to redis server '%s': %s", address, err)
-	}
-	defer c.Close()
-
-	// Extend connection
-	c.SetDeadline(time.Now().Add(defaultTimeout))
-
-	if addr.User != nil {
-		pwd, set := addr.User.Password()
-		if set && pwd != "" {
-			c.Write([]byte(fmt.Sprintf("AUTH %s\r\n", pwd)))
-
-			rdr := bufio.NewReader(c)
-
-			line, err := rdr.ReadString('\n')
-			if err != nil {
-				return err
-			}
-			if line[0] != '+' {
-				return fmt.Errorf("%s", strings.TrimSpace(line)[1:])
-			}
-		}
+		return err
 	}
 
-	c.Write([]byte("INFO\r\n"))
-	c.Write([]byte("EOF\r\n"))
-	rdr := bufio.NewReader(c)
-
-	var tags map[string]string
-
-	if addr.Scheme == "unix" {
-		tags = map[string]string{"socket": addr.Path}
-	} else {
-		// Setup tags for all redis metrics
-		host, port := "unknown", "unknown"
-		// If there's an error, ignore and use 'unknown' tags
-		host, port, _ = net.SplitHostPort(addr.Host)
-		tags = map[string]string{"server": host, "port": port}
-	}
-	return gatherInfoOutput(rdr, acc, tags)
+	rdr := strings.NewReader(info)
+	return gatherInfoOutput(rdr, acc, client.BaseTags())
 }
 
 // gatherInfoOutput gathers
 func gatherInfoOutput(
-	rdr *bufio.Reader,
+	rdr io.Reader,
 	acc telegraf.Accumulator,
 	tags map[string]string,
 ) error {
@@ -163,13 +183,11 @@ func gatherInfoOutput(
 	fields := make(map[string]interface{})
 	for scanner.Scan() {
 		line := scanner.Text()
-		if strings.Contains(line, "ERR") {
-			break
-		}
 
 		if len(line) == 0 {
 			continue
 		}
+
 		if line[0] == '#' {
 			if len(line) > 2 {
 				section = line[2:]

From 822cfbc8e887f24d5a016339a7dc47a670a34c96 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 17 Jan 2018 15:12:05 -0800
Subject: [PATCH 0872/1302] Add support for using globs in devices list of
 diskio input plugin (#3687)

---
 plugins/inputs/system/DISKIO_README.md        | 129 ++++++++++++
 plugins/inputs/system/DISK_README.md          | 149 +++----------
 plugins/inputs/system/disk.go                 | 151 +-------------
 plugins/inputs/system/disk_test.go            |  82 --------
 plugins/inputs/system/diskio.go               | 196 ++++++++++++++++++
 .../system/{disk_linux.go => diskio_linux.go} |   2 +-
 ...isk_linux_test.go => diskio_linux_test.go} |   6 +-
 .../system/{disk_other.go => diskio_other.go} |   2 +-
 plugins/inputs/system/diskio_test.go          | 121 +++++++++++
 testutil/accumulator.go                       |  18 ++
 10 files changed, 497 insertions(+), 359 deletions(-)
 create mode 100644 plugins/inputs/system/DISKIO_README.md
 create mode 100644 plugins/inputs/system/diskio.go
 rename plugins/inputs/system/{disk_linux.go => diskio_linux.go} (93%)
 rename plugins/inputs/system/{disk_linux_test.go => diskio_linux_test.go} (97%)
 rename plugins/inputs/system/{disk_other.go => diskio_other.go} (51%)
 create mode 100644 plugins/inputs/system/diskio_test.go

diff --git a/plugins/inputs/system/DISKIO_README.md b/plugins/inputs/system/DISKIO_README.md
new file mode 100644
index 000000000..c71b6d76b
--- /dev/null
+++ b/plugins/inputs/system/DISKIO_README.md
@@ -0,0 +1,129 @@
+# DiskIO Input Plugin
+
+The diskio input plugin gathers metrics about disk traffic and timing.
+
+### Configuration:
+
+```toml
+# Read metrics about disk IO by device
+[[inputs.diskio]]
+  ## By default, telegraf will gather stats for all devices including
+  ## disk partitions.
+  ## Setting devices will restrict the stats to the specified devices.
+  # devices = ["sda", "sdb"]
+  ## Uncomment the following line if you need disk serial numbers.
+  # skip_serial_number = false
+  #
+  ## On systems which support it, device metadata can be added in the form of
+  ## tags.
+  ## Currently only Linux is supported via udev properties. You can view
+  ## available properties for a device by running:
+  ## 'udevadm info -q property -n /dev/sda'
+  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+  #
+  ## Using the same metadata source as device_tags, you can also customize the
+  ## name of the device via templates.
+  ## The 'name_templates' parameter is a list of templates to try and apply to
+  ## the device. The template may contain variables in the form of '$PROPERTY' or
+  ## '${PROPERTY}'. The first template which does not contain any variables not
+  ## present for the device is used as the device name tag.
+  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+  ## the near-meaningless DM-0 name.
+  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
+```
+
+#### Docker container
+
+To monitor the Docker engine host from within a container you will need to
+mount the host's filesystem into the container and set the `HOST_PROC`
+environment variable to the location of the `/proc` filesystem.  Additionally,
+it is required to use privileged mode to provide access to `/dev`.
+
+If you are using the `device_tags` or `name_templates` options, you will need
+to bind mount `/run/udev` into the container.
+
+```
+docker run --privileged -v /:/hostfs:ro -v /run/udev:/run/udev:ro -e HOST_PROC=/hostfs/proc telegraf
+```
+
+### Metrics:
+
+- diskio
+  - tags:
+    - name (device name)
+    - serial (device serial number)
+  - fields:
+    - reads (integer, counter)
+    - writes (integer, counter)
+    - read_bytes (integer, counter, bytes)
+    - write_bytes (integer, counter, bytes)
+    - read_time (integer, counter, milliseconds)
+    - write_time (integer, counter, milliseconds)
+    - io_time (integer, counter, milliseconds)
+    - weighted_io_time (integer, counter, milliseconds)
+    - iops_in_progress (integer, gauge)
+
+On linux these values correspond to the values in
+[`/proc/diskstats`](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats)
+and
+[`/sys/block/<dev>/stat`](https://www.kernel.org/doc/Documentation/block/stat.txt).
+
+#### `reads` & `writes`:
+
+These values increment when an I/O request completes.
+
+#### `read_bytes` & `write_bytes`:
+
+These values count the number of bytes read from or written to this
+block device.
+
+#### `read_time` & `write_time`:
+
+These values count the number of milliseconds that I/O requests have
+waited on this block device.  If there are multiple I/O requests waiting,
+these values will increase at a rate greater than 1000/second; for
+example, if 60 read requests wait for an average of 30 ms, the read_time
+field will increase by 60*30 = 1800.
+
+#### `io_time`:
+
+This value counts the number of milliseconds during which the device has
+had I/O requests queued.
+
+#### `weighted_io_time`:
+
+This value counts the number of milliseconds that I/O requests have waited
+on this block device.  If there are multiple I/O requests waiting, this
+value will increase as the product of the number of milliseconds times the
+number of requests waiting (see `read_time` above for an example).
+
+#### `iops_in_progress`:
+
+This value counts the number of I/O requests that have been issued to
+the device driver but have not yet completed.  It does not include I/O
+requests that are in the queue but not yet issued to the device driver.
+
+### Sample Queries:
+
+#### Calculate percent IO utilization per disk and host:
+```
+SELECT derivative(last("io_time"),1ms) FROM "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
+```
+
+#### Calculate average queue depth:
+`iops_in_progress` will give you an instantaneous value. This will give you the average between polling intervals.
+```
+SELECT derivative(last("weighted_io_time",1ms)) from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
+```
+
+### Example Output:
+
+```
+diskio,name=sda weighted_io_time=8411917i,read_time=7446444i,write_time=971489i,io_time=866197i,write_bytes=5397686272i,iops_in_progress=0i,reads=2970519i,writes=361139i,read_bytes=119528903168i 1502467254359000000
+diskio,name=sda1 reads=2149i,read_bytes=10753536i,write_bytes=20697088i,write_time=346i,weighted_io_time=505i,writes=2110i,read_time=161i,io_time=208i,iops_in_progress=0i 1502467254359000000
+diskio,name=sda2 reads=2968279i,writes=359029i,write_bytes=5376989184i,iops_in_progress=0i,weighted_io_time=8411250i,read_bytes=119517334528i,read_time=7446249i,write_time=971143i,io_time=866010i 1502467254359000000
+diskio,name=sdb writes=99391856i,write_time=466700894i,io_time=630259874i,weighted_io_time=4245949844i,reads=2750773828i,read_bytes=80667939499008i,write_bytes=6329347096576i,read_time=3783042534i,iops_in_progress=2i 1502467254359000000
+diskio,name=centos/root read_time=7472461i,write_time=950014i,iops_in_progress=0i,weighted_io_time=8424447i,writes=298543i,read_bytes=119510105088i,io_time=837421i,reads=2971769i,write_bytes=5192795648i 1502467254359000000
+diskio,name=centos/var_log reads=1065i,writes=69711i,read_time=1083i,write_time=35376i,read_bytes=6828032i,write_bytes=184193536i,io_time=29699i,iops_in_progress=0i,weighted_io_time=36460i 1502467254359000000
+diskio,name=postgresql/pgsql write_time=478267417i,io_time=631098730i,iops_in_progress=2i,weighted_io_time=4263637564i,reads=2750777151i,writes=110044361i,read_bytes=80667939288064i,write_bytes=6329347096576i,read_time=3784499336i 1502467254359000000
+```
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index a09e818ed..b647f8128 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -8,27 +8,39 @@ https://en.wikipedia.org/wiki/Df_(Unix) for more details.
 
 ### Configuration:
 
-```
+```toml
 # Read metrics about disk usage by mount point
 [[inputs.disk]]
-  # By default, telegraf gather stats for all mountpoints.
-  # Setting mountpoints will restrict the stats to the specified mountpoints.
+  ## By default stats will be gathered for all mount points.
+  ## Set mount_points will restrict the stats to only the specified mount points.
   # mount_points = ["/"]
+
+  ## Ignore mount points by filesystem type.
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
 ```
 
-Additionally, the behavior of resolving the `mount_points` can be configured by using the `HOST_MOUNT_PREFIX` environment variable.
-When present, this variable is prepended to the mountpoints discovered by the plugin before retrieving stats.
-The prefix is stripped from the reported `path` in the measurement.
-This settings is useful when running `telegraf` inside a docker container to report host machine metrics.
-In this case, the host's root volume should be mounted into the container and the `HOST_MOUNT_PREFIX` and `HOST_PROC` environment variables set.
+#### Docker container
+
+To monitor the Docker engine host from within a container you will need to
+mount the host's filesystem into the container and set the `HOST_PROC`
+environment variable to the location of the `/proc` filesystem.  If desired, you can
+also set the `HOST_MOUNT_PREFIX` environment variable to the prefix containing
+the `/proc` directory, when present this variable is stripped from the
+reported `path` tag.
 
 ```
 docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_PROC=/hostfs/proc telegraf
 ```
 
-### Measurements & Fields:
+### Metrics:
 
 - disk
+  - tags:
+    - fstype (filesystem type)
+    - device (device file)
+    - path (mount point path)
+    - mode (whether the mount is rw or ro)
+  - fields:
     - free (integer, bytes)
     - total (integer, bytes)
     - used (integer, bytes)
@@ -37,124 +49,13 @@ docker run -v /:/hostfs:ro -e HOST_MOUNT_PREFIX=/hostfs -e HOST_PROC=/hostfs/pro
     - inodes_total (integer, files)
     - inodes_used (integer, files)
 
-### Tags:
-
-- All measurements have the following tags:
-    - fstype (filesystem type)
-    - path (mount point path)
-    - mode (whether the mount is rw or ro)
-
 ### Example Output:
 
 ```
-% ./telegraf --config ~/ws/telegraf.conf --input-filter disk --test
-* Plugin: disk, Collection 1
-> disk,fstype=hfs,mode=ro,path=/ free=398407520256i,inodes_free=97267461i,inodes_total=121847806i,inodes_used=24580345i,total=499088621568i,used=100418957312i,used_percent=20.131039916242397 1453832006274071563
-> disk,fstype=devfs,mode=rw,path=/dev free=0i,inodes_free=0i,inodes_total=628i,inodes_used=628i,total=185856i,used=185856i,used_percent=100 1453832006274137913
-> disk,fstype=autofs,mode=rw,path=/net free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274157077
-> disk,fstype=autofs,mode=rw,path=/home free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274169688
+disk,fstype=hfs,mode=ro,path=/ free=398407520256i,inodes_free=97267461i,inodes_total=121847806i,inodes_used=24580345i,total=499088621568i,used=100418957312i,used_percent=20.131039916242397 1453832006274071563
+disk,fstype=devfs,mode=rw,path=/dev free=0i,inodes_free=0i,inodes_total=628i,inodes_used=628i,total=185856i,used=185856i,used_percent=100 1453832006274137913
+disk,fstype=autofs,mode=rw,path=/net free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274157077
+disk,fstype=autofs,mode=rw,path=/home free=0i,inodes_free=0i,inodes_total=0i,inodes_used=0i,total=0i,used=0i,used_percent=0 1453832006274169688
 ```
 
 
-# DiskIO Input Plugin
-
-The diskio input plugin gathers metrics about disk traffic and timing.
-
-### Configuration:
-
-```
-# Read metrics about disk IO by device
-[[inputs.diskio]]
-  ## By default, telegraf will gather stats for all devices including
-  ## disk partitions.
-  ## Setting devices will restrict the stats to the specified devices.
-  # devices = ["sda", "sdb"]
-  ## Uncomment the following line if you need disk serial numbers.
-  # skip_serial_number = false
-```
-
-Data collection is based on github.com/shirou/gopsutil. This package handles platform dependencies and converts all timing information to milliseconds.
-
-### Measurements & Fields:
-
-- diskio
-    - reads (integer, counter)
-    - writes (integer, counter)
-    - read_bytes (integer, counter, bytes)
-    - write_bytes (integer, counter, bytes)
-    - read_time (integer, counter, milliseconds)
-    - write_time (integer, counter, milliseconds)
-    - io_time (integer, counter, milliseconds)
-    - weighted_io_time (integer, counter, milliseconds)
-    - iops_in_progress (integer, gauge)
-
-On linux these values correspond to the values in [`/proc/diskstats`](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) and [`/sys/block/<dev>/stat`](https://www.kernel.org/doc/Documentation/block/stat.txt).
-
-#### `reads` & `writes`:
-
-These values increment when an I/O request completes.
-
-#### `read_bytes` & `write_bytes`:
-
-These values count the number of bytes read from or written to this
-block device.
-
-#### `read_time` & `write_time`:
-
-These values count the number of milliseconds that I/O requests have
-waited on this block device.  If there are multiple I/O requests waiting,
-these values will increase at a rate greater than 1000/second; for
-example, if 60 read requests wait for an average of 30 ms, the read_time
-field will increase by 60*30 = 1800.
-
-#### `io_time`:
-
-This value counts the number of milliseconds during which the device has
-had I/O requests queued.
-
-#### `weighted_io_time`:
-
-This value counts the number of milliseconds that I/O requests have waited
-on this block device.  If there are multiple I/O requests waiting, this
-value will increase as the product of the number of milliseconds times the
-number of requests waiting (see `read_time` above for an example).
-
-#### `iops_in_progress`:
-
-This value counts the number of I/O requests that have been issued to
-the device driver but have not yet completed.  It does not include I/O
-requests that are in the queue but not yet issued to the device driver.
-
-### Tags:
-
-- All measurements have the following tags:
-    - name (device name)
-- If configured to use serial numbers (default: disabled):
-    - serial (device serial number)
-
-### Sample Queries:
-
-#### Calculate percent IO utilization per disk and host:
-```
-SELECT derivative(last("io_time"),1ms) FROM "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
-```
-
-#### Calculate average queue depth:
-`iops_in_progress` will give you an instantaneous value. This will give you the average between polling intervals.
-```
-SELECT derivative(last("weighted_io_time",1ms)) from "diskio" WHERE time > now() - 30m GROUP BY "host","name",time(60s)
-```
-
-### Example Output:
-
-```
-% telegraf -config ~/.telegraf/telegraf.conf -input-filter diskio -test
-* Plugin: inputs.diskio, Collection 1
-> diskio,name=sda weighted_io_time=8411917i,read_time=7446444i,write_time=971489i,io_time=866197i,write_bytes=5397686272i,iops_in_progress=0i,reads=2970519i,writes=361139i,read_bytes=119528903168i 1502467254359000000
-> diskio,name=sda1 reads=2149i,read_bytes=10753536i,write_bytes=20697088i,write_time=346i,weighted_io_time=505i,writes=2110i,read_time=161i,io_time=208i,iops_in_progress=0i 1502467254359000000
-> diskio,name=sda2 reads=2968279i,writes=359029i,write_bytes=5376989184i,iops_in_progress=0i,weighted_io_time=8411250i,read_bytes=119517334528i,read_time=7446249i,write_time=971143i,io_time=866010i 1502467254359000000
-> diskio,name=sdb writes=99391856i,write_time=466700894i,io_time=630259874i,weighted_io_time=4245949844i,reads=2750773828i,read_bytes=80667939499008i,write_bytes=6329347096576i,read_time=3783042534i,iops_in_progress=2i 1502467254359000000
-> diskio,name=centos/root read_time=7472461i,write_time=950014i,iops_in_progress=0i,weighted_io_time=8424447i,writes=298543i,read_bytes=119510105088i,io_time=837421i,reads=2971769i,write_bytes=5192795648i 1502467254359000000
-> diskio,name=centos/var_log reads=1065i,writes=69711i,read_time=1083i,write_time=35376i,read_bytes=6828032i,write_bytes=184193536i,io_time=29699i,iops_in_progress=0i,weighted_io_time=36460i 1502467254359000000
-> diskio,name=postgresql/pgsql write_time=478267417i,io_time=631098730i,iops_in_progress=2i,weighted_io_time=4263637564i,reads=2750777151i,writes=110044361i,read_bytes=80667939288064i,write_bytes=6329347096576i,read_time=3784499336i 1502467254359000000
-```
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 3cc99de05..864b28477 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -2,8 +2,6 @@ package system
 
 import (
 	"fmt"
-	"log"
-	"regexp"
 	"strings"
 
 	"github.com/influxdata/telegraf"
@@ -25,12 +23,11 @@ func (_ *DiskStats) Description() string {
 }
 
 var diskSampleConfig = `
-  ## By default, telegraf gather stats for all mountpoints.
-  ## Setting mountpoints will restrict the stats to the specified mountpoints.
+  ## By default stats will be gathered for all mount points.
+  ## Set mount_points will restrict the stats to only the specified mount points.
   # mount_points = ["/"]
 
-  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
-  ## present on /run, /var/run, /dev/shm or /dev).
+  ## Ignore mount points by filesystem type.
   ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
 `
 
@@ -82,144 +79,6 @@ func (s *DiskStats) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-type DiskIOStats struct {
-	ps PS
-
-	Devices          []string
-	DeviceTags       []string
-	NameTemplates    []string
-	SkipSerialNumber bool
-
-	infoCache map[string]diskInfoCache
-}
-
-func (_ *DiskIOStats) Description() string {
-	return "Read metrics about disk IO by device"
-}
-
-var diskIoSampleConfig = `
-  ## By default, telegraf will gather stats for all devices including
-  ## disk partitions.
-  ## Setting devices will restrict the stats to the specified devices.
-  # devices = ["sda", "sdb"]
-  ## Uncomment the following line if you need disk serial numbers.
-  # skip_serial_number = false
-  #
-  ## On systems which support it, device metadata can be added in the form of
-  ## tags.
-  ## Currently only Linux is supported via udev properties. You can view
-  ## available properties for a device by running:
-  ## 'udevadm info -q property -n /dev/sda'
-  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
-  #
-  ## Using the same metadata source as device_tags, you can also customize the
-  ## name of the device via templates.
-  ## The 'name_templates' parameter is a list of templates to try and apply to
-  ## the device. The template may contain variables in the form of '$PROPERTY' or
-  ## '${PROPERTY}'. The first template which does not contain any variables not
-  ## present for the device is used as the device name tag.
-  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
-  ## the near-meaningless DM-0 name.
-  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
-`
-
-func (_ *DiskIOStats) SampleConfig() string {
-	return diskIoSampleConfig
-}
-
-func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
-	diskio, err := s.ps.DiskIO(s.Devices)
-	if err != nil {
-		return fmt.Errorf("error getting disk io info: %s", err)
-	}
-
-	for _, io := range diskio {
-		tags := map[string]string{}
-		tags["name"] = s.diskName(io.Name)
-		for t, v := range s.diskTags(io.Name) {
-			tags[t] = v
-		}
-		if !s.SkipSerialNumber {
-			if len(io.SerialNumber) != 0 {
-				tags["serial"] = io.SerialNumber
-			} else {
-				tags["serial"] = "unknown"
-			}
-		}
-
-		fields := map[string]interface{}{
-			"reads":            io.ReadCount,
-			"writes":           io.WriteCount,
-			"read_bytes":       io.ReadBytes,
-			"write_bytes":      io.WriteBytes,
-			"read_time":        io.ReadTime,
-			"write_time":       io.WriteTime,
-			"io_time":          io.IoTime,
-			"weighted_io_time": io.WeightedIO,
-			"iops_in_progress": io.IopsInProgress,
-		}
-		acc.AddCounter("diskio", fields, tags)
-	}
-
-	return nil
-}
-
-var varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`)
-
-func (s *DiskIOStats) diskName(devName string) string {
-	if len(s.NameTemplates) == 0 {
-		return devName
-	}
-
-	di, err := s.diskInfo(devName)
-	if err != nil {
-		log.Printf("W! Error gathering disk info: %s", err)
-		return devName
-	}
-
-	for _, nt := range s.NameTemplates {
-		miss := false
-		name := varRegex.ReplaceAllStringFunc(nt, func(sub string) string {
-			sub = sub[1:] // strip leading '$'
-			if sub[0] == '{' {
-				sub = sub[1 : len(sub)-1] // strip leading & trailing '{' '}'
-			}
-			if v, ok := di[sub]; ok {
-				return v
-			}
-			miss = true
-			return ""
-		})
-
-		if !miss {
-			return name
-		}
-	}
-
-	return devName
-}
-
-func (s *DiskIOStats) diskTags(devName string) map[string]string {
-	if len(s.DeviceTags) == 0 {
-		return nil
-	}
-
-	di, err := s.diskInfo(devName)
-	if err != nil {
-		log.Printf("W! Error gathering disk info: %s", err)
-		return nil
-	}
-
-	tags := map[string]string{}
-	for _, dt := range s.DeviceTags {
-		if v, ok := di[dt]; ok {
-			tags[dt] = v
-		}
-	}
-
-	return tags
-}
-
 type MountOptions []string
 
 func (opts MountOptions) Mode() string {
@@ -250,8 +109,4 @@ func init() {
 	inputs.Add("disk", func() telegraf.Input {
 		return &DiskStats{ps: ps}
 	})
-
-	inputs.Add("diskio", func() telegraf.Input {
-		return &DiskIOStats{ps: ps, SkipSerialNumber: true}
-	})
 }
diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/system/disk_test.go
index 67494d712..8aeca5523 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -237,85 +237,3 @@ func TestDiskStats(t *testing.T) {
 	err = (&DiskStats{ps: &mps, MountPoints: []string{"/", "/home"}}).Gather(&acc)
 	assert.Equal(t, 2*expectedAllDiskMetrics+7, acc.NFields())
 }
-
-// func TestDiskIOStats(t *testing.T) {
-// 	var mps MockPS
-// 	defer mps.AssertExpectations(t)
-// 	var acc testutil.Accumulator
-// 	var err error
-
-// 	diskio1 := disk.IOCountersStat{
-// 		ReadCount:    888,
-// 		WriteCount:   5341,
-// 		ReadBytes:    100000,
-// 		WriteBytes:   200000,
-// 		ReadTime:     7123,
-// 		WriteTime:    9087,
-// 		Name:         "sda1",
-// 		IoTime:       123552,
-// 		SerialNumber: "ab-123-ad",
-// 	}
-// 	diskio2 := disk.IOCountersStat{
-// 		ReadCount:    444,
-// 		WriteCount:   2341,
-// 		ReadBytes:    200000,
-// 		WriteBytes:   400000,
-// 		ReadTime:     3123,
-// 		WriteTime:    6087,
-// 		Name:         "sdb1",
-// 		IoTime:       246552,
-// 		SerialNumber: "bb-123-ad",
-// 	}
-
-// 	mps.On("DiskIO").Return(
-// 		map[string]disk.IOCountersStat{"sda1": diskio1, "sdb1": diskio2},
-// 		nil)
-
-// 	err = (&DiskIOStats{ps: &mps}).Gather(&acc)
-// 	require.NoError(t, err)
-
-// 	numDiskIOMetrics := acc.NFields()
-// 	expectedAllDiskIOMetrics := 14
-// 	assert.Equal(t, expectedAllDiskIOMetrics, numDiskIOMetrics)
-
-// 	dtags1 := map[string]string{
-// 		"name":   "sda1",
-// 		"serial": "ab-123-ad",
-// 	}
-// 	dtags2 := map[string]string{
-// 		"name":   "sdb1",
-// 		"serial": "bb-123-ad",
-// 	}
-
-// 	assert.True(t, acc.CheckTaggedValue("reads", uint64(888), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("writes", uint64(5341), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("read_bytes", uint64(100000), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("write_bytes", uint64(200000), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("read_time", uint64(7123), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("write_time", uint64(9087), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("io_time", uint64(123552), dtags1))
-// 	assert.True(t, acc.CheckTaggedValue("reads", uint64(444), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("writes", uint64(2341), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("read_bytes", uint64(200000), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("write_bytes", uint64(400000), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("read_time", uint64(3123), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("write_time", uint64(6087), dtags2))
-// 	assert.True(t, acc.CheckTaggedValue("io_time", uint64(246552), dtags2))
-
-// 	// We expect 7 more DiskIOMetrics to show up with an explicit match on "sdb1"
-// 	// and serial should be missing from the tags with SkipSerialNumber set
-// 	err = (&DiskIOStats{ps: &mps, Devices: []string{"sdb1"}, SkipSerialNumber: true}).Gather(&acc)
-// 	assert.Equal(t, expectedAllDiskIOMetrics+7, acc.NFields())
-
-// 	dtags3 := map[string]string{
-// 		"name": "sdb1",
-// 	}
-
-// 	assert.True(t, acc.CheckTaggedValue("reads", uint64(444), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("writes", uint64(2341), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("read_bytes", uint64(200000), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("write_bytes", uint64(400000), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("read_time", uint64(3123), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("write_time", uint64(6087), dtags3))
-// 	assert.True(t, acc.CheckTaggedValue("io_time", uint64(246552), dtags3))
-// }
diff --git a/plugins/inputs/system/diskio.go b/plugins/inputs/system/diskio.go
new file mode 100644
index 000000000..21e70d5eb
--- /dev/null
+++ b/plugins/inputs/system/diskio.go
@@ -0,0 +1,196 @@
+package system
+
+import (
+	"fmt"
+	"log"
+	"regexp"
+	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+var (
+	varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`)
+)
+
+type DiskIO struct {
+	ps PS
+
+	Devices          []string
+	DeviceTags       []string
+	NameTemplates    []string
+	SkipSerialNumber bool
+
+	infoCache    map[string]diskInfoCache
+	deviceFilter filter.Filter
+	initialized  bool
+}
+
+func (_ *DiskIO) Description() string {
+	return "Read metrics about disk IO by device"
+}
+
+var diskIOsampleConfig = `
+  ## By default, telegraf will gather stats for all devices including
+  ## disk partitions.
+  ## Setting devices will restrict the stats to the specified devices.
+  # devices = ["sda", "sdb", "vd*"]
+  ## Uncomment the following line if you need disk serial numbers.
+  # skip_serial_number = false
+  #
+  ## On systems which support it, device metadata can be added in the form of
+  ## tags.
+  ## Currently only Linux is supported via udev properties. You can view
+  ## available properties for a device by running:
+  ## 'udevadm info -q property -n /dev/sda'
+  # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+  #
+  ## Using the same metadata source as device_tags, you can also customize the
+  ## name of the device via templates.
+  ## The 'name_templates' parameter is a list of templates to try and apply to
+  ## the device. The template may contain variables in the form of '$PROPERTY' or
+  ## '${PROPERTY}'. The first template which does not contain any variables not
+  ## present for the device is used as the device name tag.
+  ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+  ## the near-meaningless DM-0 name.
+  # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
+`
+
+func (_ *DiskIO) SampleConfig() string {
+	return diskIOsampleConfig
+}
+
+// hasMeta reports whether s contains any special glob characters.
+func hasMeta(s string) bool {
+	return strings.IndexAny(s, "*?[") >= 0
+}
+
+func (s *DiskIO) init() error {
+	for _, device := range s.Devices {
+		if hasMeta(device) {
+			filter, err := filter.Compile(s.Devices)
+			if err != nil {
+				return fmt.Errorf("error compiling device pattern: %v", err)
+			}
+			s.deviceFilter = filter
+		}
+	}
+	s.initialized = true
+	return nil
+}
+
+func (s *DiskIO) Gather(acc telegraf.Accumulator) error {
+	if !s.initialized {
+		err := s.init()
+		if err != nil {
+			return err
+		}
+	}
+
+	devices := []string{}
+	if s.deviceFilter == nil {
+		devices = s.Devices
+	}
+
+	diskio, err := s.ps.DiskIO(devices)
+	if err != nil {
+		return fmt.Errorf("error getting disk io info: %s", err)
+	}
+
+	for _, io := range diskio {
+		if s.deviceFilter != nil && !s.deviceFilter.Match(io.Name) {
+			continue
+		}
+
+		tags := map[string]string{}
+		tags["name"] = s.diskName(io.Name)
+		for t, v := range s.diskTags(io.Name) {
+			tags[t] = v
+		}
+		if !s.SkipSerialNumber {
+			if len(io.SerialNumber) != 0 {
+				tags["serial"] = io.SerialNumber
+			} else {
+				tags["serial"] = "unknown"
+			}
+		}
+
+		fields := map[string]interface{}{
+			"reads":            io.ReadCount,
+			"writes":           io.WriteCount,
+			"read_bytes":       io.ReadBytes,
+			"write_bytes":      io.WriteBytes,
+			"read_time":        io.ReadTime,
+			"write_time":       io.WriteTime,
+			"io_time":          io.IoTime,
+			"weighted_io_time": io.WeightedIO,
+			"iops_in_progress": io.IopsInProgress,
+		}
+		acc.AddCounter("diskio", fields, tags)
+	}
+
+	return nil
+}
+
+func (s *DiskIO) diskName(devName string) string {
+	if len(s.NameTemplates) == 0 {
+		return devName
+	}
+
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		log.Printf("W! Error gathering disk info: %s", err)
+		return devName
+	}
+
+	for _, nt := range s.NameTemplates {
+		miss := false
+		name := varRegex.ReplaceAllStringFunc(nt, func(sub string) string {
+			sub = sub[1:] // strip leading '$'
+			if sub[0] == '{' {
+				sub = sub[1 : len(sub)-1] // strip leading & trailing '{' '}'
+			}
+			if v, ok := di[sub]; ok {
+				return v
+			}
+			miss = true
+			return ""
+		})
+
+		if !miss {
+			return name
+		}
+	}
+
+	return devName
+}
+
+func (s *DiskIO) diskTags(devName string) map[string]string {
+	if len(s.DeviceTags) == 0 {
+		return nil
+	}
+
+	di, err := s.diskInfo(devName)
+	if err != nil {
+		log.Printf("W! Error gathering disk info: %s", err)
+		return nil
+	}
+
+	tags := map[string]string{}
+	for _, dt := range s.DeviceTags {
+		if v, ok := di[dt]; ok {
+			tags[dt] = v
+		}
+	}
+
+	return tags
+}
+
+func init() {
+	ps := newSystemPS()
+	inputs.Add("diskio", func() telegraf.Input {
+		return &DiskIO{ps: ps, SkipSerialNumber: true}
+	})
+}
diff --git a/plugins/inputs/system/disk_linux.go b/plugins/inputs/system/diskio_linux.go
similarity index 93%
rename from plugins/inputs/system/disk_linux.go
rename to plugins/inputs/system/diskio_linux.go
index d3fd691c4..b15f74383 100644
--- a/plugins/inputs/system/disk_linux.go
+++ b/plugins/inputs/system/diskio_linux.go
@@ -16,7 +16,7 @@ type diskInfoCache struct {
 
 var udevPath = "/run/udev/data"
 
-func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
+func (s *DiskIO) diskInfo(devName string) (map[string]string, error) {
 	var err error
 	var stat unix.Stat_t
 
diff --git a/plugins/inputs/system/disk_linux_test.go b/plugins/inputs/system/diskio_linux_test.go
similarity index 97%
rename from plugins/inputs/system/disk_linux_test.go
rename to plugins/inputs/system/diskio_linux_test.go
index 801ad328a..96aed211b 100644
--- a/plugins/inputs/system/disk_linux_test.go
+++ b/plugins/inputs/system/diskio_linux_test.go
@@ -42,7 +42,7 @@ func TestDiskInfo(t *testing.T) {
 	clean := setupNullDisk(t)
 	defer clean()
 
-	s := &DiskIOStats{}
+	s := &DiskIO{}
 	di, err := s.diskInfo("null")
 	require.NoError(t, err)
 	assert.Equal(t, "myval1", di["MY_PARAM_1"])
@@ -81,7 +81,7 @@ func TestDiskIOStats_diskName(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		s := DiskIOStats{
+		s := DiskIO{
 			NameTemplates: tc.templates,
 		}
 		assert.Equal(t, tc.expected, s.diskName("null"), "Templates: %#v", tc.templates)
@@ -93,7 +93,7 @@ func TestDiskIOStats_diskName(t *testing.T) {
 func TestDiskIOStats_diskTags(t *testing.T) {
 	defer setupNullDisk(t)()
 
-	s := &DiskIOStats{
+	s := &DiskIO{
 		DeviceTags: []string{"MY_PARAM_2"},
 	}
 	dt := s.diskTags("null")
diff --git a/plugins/inputs/system/disk_other.go b/plugins/inputs/system/diskio_other.go
similarity index 51%
rename from plugins/inputs/system/disk_other.go
rename to plugins/inputs/system/diskio_other.go
index fa9121cdf..0a3abb686 100644
--- a/plugins/inputs/system/disk_other.go
+++ b/plugins/inputs/system/diskio_other.go
@@ -4,6 +4,6 @@ package system
 
 type diskInfoCache struct{}
 
-func (s *DiskIOStats) diskInfo(devName string) (map[string]string, error) {
+func (s *DiskIO) diskInfo(devName string) (map[string]string, error) {
 	return nil, nil
 }
diff --git a/plugins/inputs/system/diskio_test.go b/plugins/inputs/system/diskio_test.go
new file mode 100644
index 000000000..d8b908c3e
--- /dev/null
+++ b/plugins/inputs/system/diskio_test.go
@@ -0,0 +1,121 @@
+package system
+
+import (
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/shirou/gopsutil/disk"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDiskIO(t *testing.T) {
+	type Result struct {
+		stats map[string]disk.IOCountersStat
+		err   error
+	}
+	type Metric struct {
+		tags   map[string]string
+		fields map[string]interface{}
+	}
+
+	tests := []struct {
+		name    string
+		devices []string
+		result  Result
+		err     error
+		metrics []Metric
+	}{
+		{
+			name: "minimal",
+			result: Result{
+				stats: map[string]disk.IOCountersStat{
+					"sda": disk.IOCountersStat{
+						ReadCount:    888,
+						WriteCount:   5341,
+						ReadBytes:    100000,
+						WriteBytes:   200000,
+						ReadTime:     7123,
+						WriteTime:    9087,
+						Name:         "sda",
+						IoTime:       123552,
+						SerialNumber: "ab-123-ad",
+					},
+				},
+				err: nil,
+			},
+			err: nil,
+			metrics: []Metric{
+				Metric{
+					tags: map[string]string{
+						"name":   "sda",
+						"serial": "ab-123-ad",
+					},
+					fields: map[string]interface{}{
+						"reads":            uint64(888),
+						"writes":           uint64(5341),
+						"read_bytes":       uint64(100000),
+						"write_bytes":      uint64(200000),
+						"read_time":        uint64(7123),
+						"write_time":       uint64(9087),
+						"io_time":          uint64(123552),
+						"weighted_io_time": uint64(0),
+						"iops_in_progress": uint64(0),
+					},
+				},
+			},
+		},
+		{
+			name:    "glob device",
+			devices: []string{"sd*"},
+			result: Result{
+				stats: map[string]disk.IOCountersStat{
+					"sda": disk.IOCountersStat{
+						Name:      "sda",
+						ReadCount: 42,
+					},
+					"vda": disk.IOCountersStat{
+						Name:      "vda",
+						ReadCount: 42,
+					},
+				},
+				err: nil,
+			},
+			err: nil,
+			metrics: []Metric{
+				Metric{
+					tags: map[string]string{
+						"name":   "sda",
+						"serial": "unknown",
+					},
+					fields: map[string]interface{}{
+						"reads": uint64(42),
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var mps MockPS
+			mps.On("DiskIO").Return(tt.result.stats, tt.result.err)
+
+			var acc testutil.Accumulator
+
+			diskio := &DiskIO{
+				ps:      &mps,
+				Devices: tt.devices,
+			}
+			err := diskio.Gather(&acc)
+			require.Equal(t, tt.err, err)
+
+			for _, metric := range tt.metrics {
+				for k, v := range metric.fields {
+					require.True(t, acc.HasPoint("diskio", metric.tags, k, v),
+						"missing point: diskio %v %q: %v", metric.tags, k, v)
+				}
+			}
+			require.Equal(t, len(tt.metrics), int(acc.NMetrics()), "unexpected number of metrics")
+			require.True(t, mps.AssertExpectations(t))
+		})
+	}
+}
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 29c362c87..cefe8b787 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -537,6 +537,24 @@ func (a *Accumulator) Int64Field(measurement string, field string) (int64, bool)
 	return 0, false
 }
 
+// Uint64Field returns the int64 value of the given measurement and field or false.
+func (a *Accumulator) Uint64Field(measurement string, field string) (uint64, bool) {
+	a.Lock()
+	defer a.Unlock()
+	for _, p := range a.Metrics {
+		if p.Measurement == measurement {
+			for fieldname, value := range p.Fields {
+				if fieldname == field {
+					v, ok := value.(uint64)
+					return v, ok
+				}
+			}
+		}
+	}
+
+	return 0, false
+}
+
 // Int32Field returns the int32 value of the given measurement and field or false.
 func (a *Accumulator) Int32Field(measurement string, field string) (int32, bool) {
 	a.Lock()

From 548157852c7771eceea64aa225cf20936abd4ebf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 17 Jan 2018 15:14:07 -0800
Subject: [PATCH 0873/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2ed937e..f0c91e926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#2701](https://github.com/influxdata/telegraf/pull/2701): Use persistent connection to postgresql database.
 - [#2846](https://github.com/influxdata/telegraf/pull/2846): Add support for dropwizard input format.
 - [#3666](https://github.com/influxdata/telegraf/pull/3666): Add container health metrics to docker input.
+- [#3687](https://github.com/influxdata/telegraf/pull/3687): Add support for using globs in devices list of diskio input plugin.
 
 ### Bugfixes
 

From f374a295d932945f092c8269829a6c273c9338c0 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Thu, 18 Jan 2018 00:27:24 +0100
Subject: [PATCH 0874/1302] Reconnect before sending graphite metrics if
 disconnected (#3680)

---
 plugins/outputs/graphite/graphite.go      | 24 +++++++++++++++++------
 plugins/outputs/graphite/graphite_test.go |  6 ++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 53c4bdc1b..7bad4be07 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -155,8 +155,22 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 		batch = append(batch, buf...)
 	}
 
+	err = g.send(batch)
+
+	// try to reconnect and retry to send
+	if err != nil {
+		log.Println("E! Graphite: Reconnecting and retrying: ")
+		g.Connect()
+		err = g.send(batch)
+	}
+
+	return err
+}
+
+func (g *Graphite) send(batch []byte) error {
 	// This will get set to nil if a successful write occurs
-	err = errors.New("Could not write to any Graphite server in cluster\n")
+	err := errors.New("Could not write to any Graphite server in cluster\n")
+
 	// Send data to a random server
 	p := rand.Perm(len(g.conns))
 	for _, n := range p {
@@ -167,6 +181,8 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 		if _, e := g.conns[n].Write(batch); e != nil {
 			// Error
 			log.Println("E! Graphite Error: " + e.Error())
+			// Close explicitely
+			g.conns[n].Close()
 			// Let's try the next one
 		} else {
 			// Success
@@ -174,11 +190,7 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 			break
 		}
 	}
-	// try to reconnect
-	if err != nil {
-		log.Println("E! Reconnecting: ")
-		g.Connect()
-	}
+
 	return err
 }
 
diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go
index 3984728af..485829fec 100644
--- a/plugins/outputs/graphite/graphite_test.go
+++ b/plugins/outputs/graphite/graphite_test.go
@@ -81,7 +81,7 @@ func TestGraphiteOK(t *testing.T) {
 	err2 := g.Write(metrics)
 	require.NoError(t, err2)
 
-	// Waiting TCPserver
+	// Waiting TCPserver, should reconnect and resend
 	wg.Wait()
 	t.Log("Finished Waiting for first data")
 	var wg2 sync.WaitGroup
@@ -89,10 +89,8 @@ func TestGraphiteOK(t *testing.T) {
 	wg2.Add(1)
 	TCPServer2(t, &wg2)
 	//Write but expect an error, but reconnect
-	g.Write(metrics2)
 	err3 := g.Write(metrics2)
-	t.Log("Finished writing second data, it should have failed")
-	//Actually write the new metrics
+	t.Log("Finished writing second data, it should have reconnected automatically")
 
 	require.NoError(t, err3)
 	t.Log("Finished writing third data")

From 0f55d9eba2983de348a6abb49451293fc1194e08 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 17 Jan 2018 15:28:35 -0800
Subject: [PATCH 0875/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c91e926..b950a4e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 
 - [#3684](https://github.com/influxdata/telegraf/pull/3684): Ignore empty lines in Graphite plaintext.
 - [#3604](https://github.com/influxdata/telegraf/issues/3604): Fix index out of bounds error in solr input plugin.
+- [#3680](https://github.com/influxdata/telegraf/pull/3680): Reconnect before sending graphite metrics if disconnected.
 
 ## v1.5.1 [2017-01-10]
 

From 601dc99606359a47c1b1519bf4e3be59a6f5f364 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Fri, 19 Jan 2018 02:37:53 +0100
Subject: [PATCH 0876/1302] Align aggregator period with internal ticker to
 avoid skipping metrics (#3693)

By the time the aggregator.run() was called about 600ms already passed since setting now which was skewing up the aggregation intervals and skipping metrics.
---
 agent/agent.go                             | 4 +---
 internal/models/running_aggregator.go      | 2 +-
 internal/models/running_aggregator_test.go | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index af96718cd..8739f941d 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -364,8 +364,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)
 
-	now := time.Now()
-
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
 		input.SetDefaultTags(a.Config.Tags)
@@ -406,7 +404,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 			acc := NewAccumulator(agg, aggC)
 			acc.SetPrecision(a.Config.Agent.Precision.Duration,
 				a.Config.Agent.Interval.Duration)
-			agg.Run(acc, now, shutdown)
+			agg.Run(acc, shutdown)
 		}(aggregator)
 	}
 
diff --git a/internal/models/running_aggregator.go b/internal/models/running_aggregator.go
index 91e5334e8..8189a6667 100644
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -114,7 +114,6 @@ func (r *RunningAggregator) reset() {
 // for period ticks to tell it when to push and reset the aggregator.
 func (r *RunningAggregator) Run(
 	acc telegraf.Accumulator,
-	now time.Time,
 	shutdown chan struct{},
 ) {
 	// The start of the period is truncated to the nearest second.
@@ -133,6 +132,7 @@ func (r *RunningAggregator) Run(
 	// 2nd interval: 00:10 - 00:20.5
 	// etc.
 	//
+	now := time.Now()
 	r.periodStart = now.Truncate(time.Second)
 	truncation := now.Sub(r.periodStart)
 	r.periodEnd = r.periodStart.Add(r.Config.Period)
diff --git a/internal/models/running_aggregator_test.go b/internal/models/running_aggregator_test.go
index cb56dc4ef..30279f0ee 100644
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -24,7 +24,7 @@ func TestAdd(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, time.Now(), make(chan struct{}))
+	go ra.Run(&acc, make(chan struct{}))
 
 	m := ra.MakeMetric(
 		"RITest",
@@ -55,7 +55,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 	})
 	assert.NoError(t, ra.Config.Filter.Compile())
 	acc := testutil.Accumulator{}
-	go ra.Run(&acc, time.Now(), make(chan struct{}))
+	go ra.Run(&acc, make(chan struct{}))
 
 	// metric before current period
 	m := ra.MakeMetric(
@@ -113,7 +113,7 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		ra.Run(&acc, time.Now(), shutdown)
+		ra.Run(&acc, shutdown)
 	}()
 
 	m := ra.MakeMetric(

From 5bac08662e1376918ea3f70155cec8b4e95a0ffc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 18 Jan 2018 17:39:03 -0800
Subject: [PATCH 0877/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b950a4e27..bf9f6786e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
 - [#3684](https://github.com/influxdata/telegraf/pull/3684): Ignore empty lines in Graphite plaintext.
 - [#3604](https://github.com/influxdata/telegraf/issues/3604): Fix index out of bounds error in solr input plugin.
 - [#3680](https://github.com/influxdata/telegraf/pull/3680): Reconnect before sending graphite metrics if disconnected.
+- [#3693](https://github.com/influxdata/telegraf/pull/3693): Align aggregator period with internal ticker to avoid skipping metrics.
 
 ## v1.5.1 [2017-01-10]
 

From ef776f120b1164d8e1cc9bd652ee105f36d1eac3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 19 Jan 2018 12:16:28 -0800
Subject: [PATCH 0878/1302] Make error loading tls config fatal in mysql input

---
 plugins/inputs/mysql/mysql.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 1e75bf6b5..d15f46101 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -147,7 +147,7 @@ func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 
 	tlsConfig, err := internal.GetTLSConfig(m.SSLCert, m.SSLKey, m.SSLCA, false)
 	if err != nil {
-		log.Printf("E! MySQL Error registering TLS config: %s", err)
+		return fmt.Errorf("registering TLS config: %s", err)
 	}
 
 	if tlsConfig != nil {

From 91fc2765b1033bfdc58e21fab630b9a0d8f0bf02 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 22 Jan 2018 11:15:13 -0800
Subject: [PATCH 0879/1302] Limit wait time for writes in mqtt output (#3699)

---
 plugins/outputs/mqtt/mqtt.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 3bcf1b7d8..05978aa60 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
@@ -25,6 +26,9 @@ var sampleConfig = `
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
+  ## Timeout for write operations. default: 5s
+  # timeout = "5s"
+
   ## client ID, if not set a random ID is generated
   # client_id = ""
 
@@ -149,7 +153,7 @@ func (m *MQTT) Write(metrics []telegraf.Metric) error {
 
 func (m *MQTT) publish(topic string, body []byte) error {
 	token := m.client.Publish(topic, byte(m.QoS), false, body)
-	token.Wait()
+	token.WaitTimeout(m.Timeout.Duration)
 	if token.Error() != nil {
 		return token.Error()
 	}
@@ -159,6 +163,11 @@ func (m *MQTT) publish(topic string, body []byte) error {
 func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	opts := paho.NewClientOptions()
 
+	if m.Timeout.Duration < time.Second {
+		m.Timeout.Duration = 5 * time.Second
+	}
+	opts.WriteTimeout = m.Timeout.Duration
+
 	if m.ClientID != "" {
 		opts.SetClientID(m.ClientID)
 	} else {

From 5270aa451c3da6e778bd831e0cd6903cfcfb305c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 22 Jan 2018 11:16:07 -0800
Subject: [PATCH 0880/1302] Avoid loop creation in second processor pass
 (#3656)

---
 agent/agent.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/agent/agent.go b/agent/agent.go
index 8739f941d..b1250cc9f 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -308,7 +308,13 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 					metrics = processor.Apply(metrics...)
 				}
 				for _, m := range metrics {
-					outMetricC <- m
+					for i, o := range a.Config.Outputs {
+						if i == len(a.Config.Outputs)-1 {
+							o.AddMetric(m)
+						} else {
+							o.AddMetric(m.Copy())
+						}
+					}
 				}
 			}
 		}

From 36c91139173e9e140847dd3252afde9e79d816e5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 22 Jan 2018 12:01:09 -0800
Subject: [PATCH 0881/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf9f6786e..fb1081760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@
 - [#3604](https://github.com/influxdata/telegraf/issues/3604): Fix index out of bounds error in solr input plugin.
 - [#3680](https://github.com/influxdata/telegraf/pull/3680): Reconnect before sending graphite metrics if disconnected.
 - [#3693](https://github.com/influxdata/telegraf/pull/3693): Align aggregator period with internal ticker to avoid skipping metrics.
+- [#3629](https://github.com/influxdata/telegraf/issues/3629): Fix a potential deadlock when using aggregators.
+- [#3697](https://github.com/influxdata/telegraf/issues/3697): Limit wait time for writes in mqtt output.
 
 ## v1.5.1 [2017-01-10]
 

From 4558aeddeb672192cd2588ff8dd45e06f70b7d18 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 22 Jan 2018 12:04:16 -0800
Subject: [PATCH 0882/1302] Remove graphite serializer replacement of dot with
 underscore in field key (#3705)

---
 plugins/serializers/graphite/graphite.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index 157add41d..f88305ab4 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -133,7 +133,7 @@ func InsertField(bucket, fieldName string) string {
 	if fieldName == "value" {
 		return fieldDeleter.Replace(bucket)
 	}
-	return strings.Replace(bucket, "FIELDNAME", strings.Replace(fieldName, ".", "_", -1), 1)
+	return strings.Replace(bucket, "FIELDNAME", fieldName, 1)
 }
 
 func buildTags(tags map[string]string) string {

From 899c3a2ae1db19f6cbf8b4165399b3e99ef496db Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 22 Jan 2018 12:06:10 -0800
Subject: [PATCH 0883/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb1081760..6fcaddf11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - [#3693](https://github.com/influxdata/telegraf/pull/3693): Align aggregator period with internal ticker to avoid skipping metrics.
 - [#3629](https://github.com/influxdata/telegraf/issues/3629): Fix a potential deadlock when using aggregators.
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Limit wait time for writes in mqtt output.
+- [#3698](https://github.com/influxdata/telegraf/issues/3698): Revert change in graphite output where dot in field key was replaced by underscore.
 
 ## v1.5.1 [2017-01-10]
 

From 3e4c91880a0622ad0f2abce7be0c375f09ea214c Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Thu, 25 Jan 2018 16:44:25 -0500
Subject: [PATCH 0884/1302] Add timeout to wavefront output write (#3711)

---
 plugins/outputs/wavefront/wavefront.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index be3a7d758..475e28253 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/outputs"
+	"time"
 )
 
 type Wavefront struct {
@@ -101,13 +102,11 @@ func (w *Wavefront) Connect() error {
 	uri := fmt.Sprintf("%s:%d", w.Host, w.Port)
 	_, err := net.ResolveTCPAddr("tcp", uri)
 	if err != nil {
-		log.Printf("Wavefront: TCP address cannot be resolved %s", err.Error())
-		return nil
+		return fmt.Errorf("Wavefront: TCP address cannot be resolved %s", err.Error())
 	}
 	connection, err := net.Dial("tcp", uri)
 	if err != nil {
-		log.Printf("Wavefront: TCP connect fail %s", err.Error())
-		return nil
+		return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
 	}
 	defer connection.Close()
 	return nil
@@ -122,6 +121,7 @@ func (w *Wavefront) Write(metrics []telegraf.Metric) error {
 		return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
 	}
 	defer connection.Close()
+	connection.SetWriteDeadline(time.Now().Add(5 * time.Second))
 
 	for _, m := range metrics {
 		for _, metricPoint := range buildMetrics(m, w) {

From f9c0aa1e23c958c4a2b6f91ebf5e5fedff8df716 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 25 Jan 2018 13:47:21 -0800
Subject: [PATCH 0885/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fcaddf11..2b345c88b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - [#3629](https://github.com/influxdata/telegraf/issues/3629): Fix a potential deadlock when using aggregators.
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Limit wait time for writes in mqtt output.
 - [#3698](https://github.com/influxdata/telegraf/issues/3698): Revert change in graphite output where dot in field key was replaced by underscore.
+- [#3710](https://github.com/influxdata/telegraf/issues/3710): Add timeout to wavefront output write.
 
 ## v1.5.1 [2017-01-10]
 

From d831dbc51dfb357b707803841b48b15ddb576ac1 Mon Sep 17 00:00:00 2001
From: Logan <MondayHopscotch@users.noreply.github.com>
Date: Thu, 25 Jan 2018 16:04:09 -0700
Subject: [PATCH 0886/1302] Allow running as console application on Windows
 (#2754)

---
 CHANGELOG.md             | 1 +
 cmd/telegraf/telegraf.go | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b345c88b..15d173ae2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -465,6 +465,7 @@ be deprecated eventually.
 
 ### Bugfixes
 
+- [#2754](https://github.com/influxdata/telegraf/pull/2754): allow running as console application on Windows
 - [#2633](https://github.com/influxdata/telegraf/pull/2633): ipmi_sensor: allow @ symbol in password
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 2f7b0c8e5..4abfd0a3e 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -54,6 +54,7 @@ var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
 	"operate on the service")
+var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
 	nextVersion = "1.6.0"
@@ -358,7 +359,7 @@ func main() {
 		return
 	}
 
-	if runtime.GOOS == "windows" {
+	if runtime.GOOS == "windows" && !(*fRunAsConsole) {
 		svcConfig := &service.Config{
 			Name:        "telegraf",
 			DisplayName: "Telegraf Data Collector Service",

From 8527a1b7b89b2fb4f524d5c0e66d0ceb172285e5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 25 Jan 2018 15:05:46 -0800
Subject: [PATCH 0887/1302] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d173ae2..10e186168 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#2846](https://github.com/influxdata/telegraf/pull/2846): Add support for dropwizard input format.
 - [#3666](https://github.com/influxdata/telegraf/pull/3666): Add container health metrics to docker input.
 - [#3687](https://github.com/influxdata/telegraf/pull/3687): Add support for using globs in devices list of diskio input plugin.
+- [#2754](https://github.com/influxdata/telegraf/pull/2754): Allow running as console application on Windows.
 
 ### Bugfixes
 
@@ -465,7 +466,6 @@ be deprecated eventually.
 
 ### Bugfixes
 
-- [#2754](https://github.com/influxdata/telegraf/pull/2754): allow running as console application on Windows
 - [#2633](https://github.com/influxdata/telegraf/pull/2633): ipmi_sensor: allow @ symbol in password
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.

From c17427631dcfaf08034d03cf32d065807cf247b4 Mon Sep 17 00:00:00 2001
From: Peter <MaZderMind@users.noreply.github.com>
Date: Fri, 26 Jan 2018 00:38:11 +0100
Subject: [PATCH 0888/1302] Expand on tagvalue option in postgresql_extensible
 (#3720)

---
 plugins/inputs/postgresql_extensible/README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/postgresql_extensible/README.md b/plugins/inputs/postgresql_extensible/README.md
index 50f745d41..29c5e36d8 100644
--- a/plugins/inputs/postgresql_extensible/README.md
+++ b/plugins/inputs/postgresql_extensible/README.md
@@ -43,7 +43,11 @@ The example below has two queries are specified, with the following parameters:
   # withdbname was true.
   # Be careful that if the withdbname is set to false you don't have to define
   # the where clause (aka with the dbname)
-  # the tagvalue field is used to define custom tags (separated by comas)
+  #
+  # the tagvalue field is used to define custom tags (separated by comas).
+  # the query is expected to return columns which match the names of the
+  # defined tags. The values in these columns must be of a string-type,
+  # a number-type or a blob-type.
   #
   # Structure :
   # [[inputs.postgresql_extensible.query]]
@@ -109,6 +113,15 @@ using postgreql extensions ([pg_stat_statements](http://www.postgresql.org/docs/
   version=901
   withdbname=false
   tagvalue="db"
+[[inputs.postgresql_extensible.query]]
+  sqlquery="""
+    SELECT type, (enabled || '') AS enabled, COUNT(*)
+      FROM application_users
+      GROUP BY type, enabled
+  """
+  version=901
+  withdbname=false
+  tagvalue="type,enabled"
 ```
 
 # Postgresql Side

From efb9d5b4cb5805ac21128fc975dd1bbef4fb1d3c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 26 Jan 2018 11:39:58 -0800
Subject: [PATCH 0889/1302] Return Accumulator interface from NewAccumulator

---
 agent/accumulator.go      |  2 +-
 agent/accumulator_test.go | 26 +++++++++++++-------------
 agent/agent.go            |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/agent/accumulator.go b/agent/accumulator.go
index 1fa9b13ee..51c213a81 100644
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -26,7 +26,7 @@ type MetricMaker interface {
 func NewAccumulator(
 	maker MetricMaker,
 	metrics chan telegraf.Metric,
-) *accumulator {
+) telegraf.Accumulator {
 	acc := accumulator{
 		maker:     maker,
 		metrics:   metrics,
diff --git a/agent/accumulator_test.go b/agent/accumulator_test.go
index e13446bac..c3f552d9e 100644
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -115,15 +115,15 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
 
-	testm := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@@ -147,15 +147,15 @@ func TestAddDisablePrecision(t *testing.T) {
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
 
-	testm := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
@@ -179,15 +179,15 @@ func TestAddNoPrecisionWithInterval(t *testing.T) {
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
 
-	testm := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")
 
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@@ -204,7 +204,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
-	testm := <-a.metrics
+	testm := <-metrics
 	actual := testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@@ -214,7 +214,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
@@ -224,7 +224,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
@@ -234,7 +234,7 @@ func TestDifferentPrecisions(t *testing.T) {
 	a.AddFields("acctest",
 		map[string]interface{}{"value": float64(101)},
 		map[string]string{"acc": "test"}, now)
-	testm = <-a.metrics
+	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
diff --git a/agent/agent.go b/agent/agent.go
index b1250cc9f..5ca3de882 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -143,7 +143,7 @@ func (a *Agent) gatherer(
 func gatherWithTimeout(
 	shutdown chan struct{},
 	input *models.RunningInput,
-	acc *accumulator,
+	acc telegraf.Accumulator,
 	timeout time.Duration,
 ) {
 	ticker := time.NewTicker(timeout)

From 48092ed598ee5e69534b5ff31ac4ac72a317ba48 Mon Sep 17 00:00:00 2001
From: Ivan Lopez <ivan@askai.net>
Date: Sat, 27 Jan 2018 00:00:58 +0100
Subject: [PATCH 0890/1302] Add RabbitMQ cluster and running nodes count and
 running node status (#3703)

---
 plugins/inputs/rabbitmq/README.md        |  7 ++++--
 plugins/inputs/rabbitmq/rabbitmq.go      | 28 ++++++++++++++++++++++--
 plugins/inputs/rabbitmq/rabbitmq_test.go | 23 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index a1dfc879a..796dfc7bf 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -61,6 +61,8 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   - messages_ready (int, messages)
   - messages_unacked (int, messages)
   - queues (int, queues)
+  - clustering_listeners (int, cluster nodes)
+  - amqp_listeners (int, amqp nodes up)
 
 - rabbitmq_node
   - disk_free (int, bytes)
@@ -74,6 +76,7 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   - run_queue (int, erlang processes)
   - sockets_total (int, sockets)
   - sockets_used (int, sockets)
+  - running (int, node up)
 
 - rabbitmq_queue
   - consumer_utilisation (float, percent)
@@ -144,7 +147,7 @@ FROM rabbitmq_overview WHERE time > now() - 10m GROUP BY time(1m)
 
 ```
 rabbitmq_queue,url=http://amqp.example.org:15672,queue=telegraf,vhost=influxdb,node=rabbit@amqp.example.org,durable=true,auto_delete=false,host=amqp.example.org messages_deliver_get=0i,messages_publish=329i,messages_publish_rate=0.2,messages_redeliver_rate=0,message_bytes_ready=0i,message_bytes_unacked=0i,messages_deliver=329i,messages_unack=0i,consumers=1i,idle_since="",messages=0i,messages_deliver_rate=0.2,messages_deliver_get_rate=0.2,messages_redeliver=0i,memory=43032i,message_bytes_ram=0i,messages_ack=329i,messages_ready=0i,messages_ack_rate=0.2,consumer_utilisation=1,message_bytes=0i,message_bytes_persist=0i 1493684035000000000
-rabbitmq_overview,url=http://amqp.example.org:15672,host=amqp.example.org channels=2i,consumers=1i,exchanges=17i,messages_acked=329i,messages=0i,messages_ready=0i,messages_unacked=0i,connections=2i,queues=1i,messages_delivered=329i,messages_published=329i 1493684035000000000
-rabbitmq_node,url=http://amqp.example.org:15672,node=rabbit@amqp.example.org,host=amqp.example.org fd_total=1024i,fd_used=32i,mem_limit=8363329126i,sockets_total=829i,disk_free=8175935488i,disk_free_limit=50000000i,mem_used=58771080i,proc_total=1048576i,proc_used=267i,run_queue=0i,sockets_used=2i 149368403500000000
+rabbitmq_overview,url=http://amqp.example.org:15672,host=amqp.example.org channels=2i,consumers=1i,exchanges=17i,messages_acked=329i,messages=0i,messages_ready=0i,messages_unacked=0i,connections=2i,queues=1i,messages_delivered=329i,messages_published=329i,clustering_listeners=2i,amqp_listeners=1i 1493684035000000000
+rabbitmq_node,url=http://amqp.example.org:15672,node=rabbit@amqp.example.org,host=amqp.example.org fd_total=1024i,fd_used=32i,mem_limit=8363329126i,sockets_total=829i,disk_free=8175935488i,disk_free_limit=50000000i,mem_used=58771080i,proc_total=1048576i,proc_used=267i,run_queue=0i,sockets_used=2i,running=1i 149368403500000000
 rabbitmq_exchange,url=http://amqp.example.org:15672,exchange=telegraf,type=fanout,vhost=influxdb,internal=false,durable=true,auto_delete=false,host=amqp.example.org messages_publish_in=2i,messages_publish_out=1i 149368403500000000
 ```
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 775ea75df..64aa6408d 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -60,6 +60,12 @@ type OverviewResponse struct {
 	MessageStats *MessageStats `json:"message_stats"`
 	ObjectTotals *ObjectTotals `json:"object_totals"`
 	QueueTotals  *QueueTotals  `json:"queue_totals"`
+	Listeners    []Listeners   `json:"listeners"`
+}
+
+// Listeners ...
+type Listeners struct {
+	Protocol string `json:"protocol"`
 }
 
 // Details ...
@@ -134,6 +140,7 @@ type Node struct {
 	RunQueue      int64 `json:"run_queue"`
 	SocketsTotal  int64 `json:"sockets_total"`
 	SocketsUsed   int64 `json:"sockets_used"`
+	Running       bool  `json:"running"`
 }
 
 type Exchange struct {
@@ -186,7 +193,7 @@ var sampleConfig = `
   # queues = ["telegraf"]
 
   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
-  ## specified, metrics for all exchanges are gathered. 
+  ## specified, metrics for all exchanges are gathered.
   # exchanges = ["telegraf"]
 `
 
@@ -275,11 +282,20 @@ func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator) {
 		return
 	}
 
-	if overview.QueueTotals == nil || overview.ObjectTotals == nil || overview.MessageStats == nil {
+	if overview.QueueTotals == nil || overview.ObjectTotals == nil || overview.MessageStats == nil || overview.Listeners == nil {
 		acc.AddError(fmt.Errorf("Wrong answer from rabbitmq. Probably auth issue"))
 		return
 	}
 
+	var clustering_listeners, amqp_listeners int64 = 0, 0
+	for _, listener := range overview.Listeners {
+		if listener.Protocol == "clustering" {
+			clustering_listeners++
+		} else if listener.Protocol == "amqp" {
+			amqp_listeners++
+		}
+	}
+
 	tags := map[string]string{"url": r.URL}
 	if r.Name != "" {
 		tags["name"] = r.Name
@@ -297,6 +313,8 @@ func gatherOverview(r *RabbitMQ, acc telegraf.Accumulator) {
 		"messages_delivered":     overview.MessageStats.Deliver,
 		"messages_delivered_get": overview.MessageStats.DeliverGet,
 		"messages_published":     overview.MessageStats.Publish,
+		"clustering_listeners":   clustering_listeners,
+		"amqp_listeners":         amqp_listeners,
 	}
 	acc.AddFields("rabbitmq_overview", fields, tags)
 }
@@ -319,6 +337,11 @@ func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator) {
 		tags := map[string]string{"url": r.URL}
 		tags["node"] = node.Name
 
+		var running int64 = 0
+		if node.Running {
+			running = 1
+		}
+
 		fields := map[string]interface{}{
 			"disk_free":       node.DiskFree,
 			"disk_free_limit": node.DiskFreeLimit,
@@ -331,6 +354,7 @@ func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator) {
 			"run_queue":       node.RunQueue,
 			"sockets_total":   node.SocketsTotal,
 			"sockets_used":    node.SocketsUsed,
+			"running":         running,
 		}
 		acc.AddFields("rabbitmq_node", fields, tags, now)
 	}
diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
index 759c71c41..5e9829cc0 100644
--- a/plugins/inputs/rabbitmq/rabbitmq_test.go
+++ b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -51,7 +51,25 @@ const sampleOverviewResponse = `
         "messages_unacknowledged_details": {
             "rate": 0.0
         }
-    }
+    },
+    "listeners": [
+        {
+            "name": "rabbit@node-a",
+            "protocol": "amqp"
+        },
+        {
+            "name": "rabbit@node-b",
+            "protocol": "amqp"
+        },
+        {
+            "name": "rabbit@node-a",
+            "protocol": "clustering"
+        },
+        {
+            "name": "rabbit@node-b",
+            "protocol": "clustering"
+        }
+    ]
 }
 `
 
@@ -514,6 +532,8 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 		"consumers",
 		"exchanges",
 		"queues",
+		"clustering_listeners",
+		"amqp_listeners",
 	}
 
 	for _, metric := range intMetrics {
@@ -532,6 +552,7 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 		"run_queue",
 		"sockets_total",
 		"sockets_used",
+		"running",
 	}
 
 	for _, metric := range nodeIntMetrics {

From 5b130b6ea03e9d8153dc42338a1083fd84c37367 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 26 Jan 2018 15:03:19 -0800
Subject: [PATCH 0891/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10e186168..06d0f6281 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - [#3666](https://github.com/influxdata/telegraf/pull/3666): Add container health metrics to docker input.
 - [#3687](https://github.com/influxdata/telegraf/pull/3687): Add support for using globs in devices list of diskio input plugin.
 - [#2754](https://github.com/influxdata/telegraf/pull/2754): Allow running as console application on Windows.
+- [#3703](https://github.com/influxdata/telegraf/pull/3703): Add listener counts and node running status to rabbitmq input.
 
 ### Bugfixes
 

From fb947e8fe7adf9f39e64291f23a3e98e4facbf64 Mon Sep 17 00:00:00 2001
From: Menno Finlay-Smits <inbox@menno.io>
Date: Sat, 27 Jan 2018 12:14:54 +1300
Subject: [PATCH 0892/1302] Add NATS Monitoring Input Plugin (#3674)

---
 Godeps                           |   1 +
 docs/LICENSE_OF_DEPENDENCIES.md  |   1 +
 plugins/inputs/all/all.go        |   1 +
 plugins/inputs/nats/README.md    |  12 ++++
 plugins/inputs/nats/nats.go      | 112 +++++++++++++++++++++++++++++++
 plugins/inputs/nats/nats_test.go | 112 +++++++++++++++++++++++++++++++
 6 files changed, 239 insertions(+)
 create mode 100644 plugins/inputs/nats/README.md
 create mode 100644 plugins/inputs/nats/nats.go
 create mode 100644 plugins/inputs/nats/nats_test.go

diff --git a/Godeps b/Godeps
index c659227ca..8fb336d08 100644
--- a/Godeps
+++ b/Godeps
@@ -45,6 +45,7 @@ github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
 github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
+github.com/nats-io/gnatsd 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 92acc3270..cdf991c5a 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -54,6 +54,7 @@ following works:
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
 - github.com/naoina/toml [MIT](https://github.com/naoina/toml/blob/master/LICENSE)
+- github.com/nats-io/gnatsd [MIT](https://github.com/nats-io/gnatsd/blob/master/LICENSE)
 - github.com/nats-io/go-nats [MIT](https://github.com/nats-io/go-nats/blob/master/LICENSE)
 - github.com/nats-io/nats [MIT](https://github.com/nats-io/nats/blob/master/LICENSE)
 - github.com/nats-io/nuid [MIT](https://github.com/nats-io/nuid/blob/master/LICENSE)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index aaf5b6ae7..fa78b3ff0 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -53,6 +53,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/mongodb"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mqtt_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nats"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nats_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
diff --git a/plugins/inputs/nats/README.md b/plugins/inputs/nats/README.md
new file mode 100644
index 000000000..3cd9ee7ac
--- /dev/null
+++ b/plugins/inputs/nats/README.md
@@ -0,0 +1,12 @@
+# NATS Monitoring Input Plugin
+
+The [NATS](http://www.nats.io/about/) monitoring plugin reads from
+specified NATS instance and submits metrics to InfluxDB. 
+
+## Configuration
+
+```toml
+[[inputs.nats]]
+  ## The address of the monitoring end-point of the NATS server
+  server = "http://localhost:8222"
+```
diff --git a/plugins/inputs/nats/nats.go b/plugins/inputs/nats/nats.go
new file mode 100644
index 000000000..5099bd9fd
--- /dev/null
+++ b/plugins/inputs/nats/nats.go
@@ -0,0 +1,112 @@
+package nats
+
+import (
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"path"
+	"time"
+
+	"encoding/json"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+
+	gnatsd "github.com/nats-io/gnatsd/server"
+)
+
+type Nats struct {
+	Server          string
+	ResponseTimeout internal.Duration
+
+	client *http.Client
+}
+
+var sampleConfig = `
+  ## The address of the monitoring endpoint of the NATS server
+  server = "http://localhost:1337"
+
+  ## Maximum time to receive response
+  # response_timeout = "5s"
+`
+
+func (n *Nats) SampleConfig() string {
+	return sampleConfig
+}
+
+func (n *Nats) Description() string {
+	return "Provides metrics about the state of a NATS server"
+}
+
+func (n *Nats) Gather(acc telegraf.Accumulator) error {
+	url, err := url.Parse(n.Server)
+	if err != nil {
+		return err
+	}
+	url.Path = path.Join(url.Path, "varz")
+
+	if n.client == nil {
+		n.client = n.createHTTPClient()
+	}
+	resp, err := n.client.Get(url.String())
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	bytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	stats := new(gnatsd.Varz)
+	err = json.Unmarshal([]byte(bytes), &stats)
+	if err != nil {
+		return err
+	}
+
+	acc.AddFields("nats",
+		map[string]interface{}{
+			"in_msgs":           stats.InMsgs,
+			"out_msgs":          stats.OutMsgs,
+			"in_bytes":          stats.InBytes,
+			"out_bytes":         stats.OutBytes,
+			"uptime":            stats.Now.Sub(stats.Start).Nanoseconds(),
+			"cores":             stats.Cores,
+			"cpu":               stats.CPU,
+			"mem":               stats.Mem,
+			"connections":       stats.Connections,
+			"total_connections": stats.TotalConnections,
+			"subscriptions":     stats.Subscriptions,
+			"slow_consumers":    stats.SlowConsumers,
+			"routes":            stats.Routes,
+			"remotes":           stats.Remotes,
+		},
+		map[string]string{"server": n.Server},
+		time.Now())
+
+	return nil
+}
+
+func (n *Nats) createHTTPClient() *http.Client {
+	transport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+	}
+	timeout := n.ResponseTimeout.Duration
+	if timeout == time.Duration(0) {
+		timeout = 5 * time.Second
+	}
+	return &http.Client{
+		Transport: transport,
+		Timeout:   timeout,
+	}
+}
+
+func init() {
+	inputs.Add("nats", func() telegraf.Input {
+		return &Nats{
+			Server: "http://localhost:8222",
+		}
+	})
+}
diff --git a/plugins/inputs/nats/nats_test.go b/plugins/inputs/nats/nats_test.go
new file mode 100644
index 000000000..7dd28006b
--- /dev/null
+++ b/plugins/inputs/nats/nats_test.go
@@ -0,0 +1,112 @@
+package nats
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var sampleVarz = `
+{
+  "server_id": "n2afhLHLl64Gcaj7S7jaNa",
+  "version": "1.0.0",
+  "go": "go1.8",
+  "host": "0.0.0.0",
+  "auth_required": false,
+  "ssl_required": false,
+  "tls_required": false,
+  "tls_verify": false,
+  "addr": "0.0.0.0",
+  "max_connections": 65536,
+  "ping_interval": 120000000000,
+  "ping_max": 2,
+  "http_host": "0.0.0.0",
+  "http_port": 1337,
+  "https_port": 0,
+  "auth_timeout": 1,
+  "max_control_line": 1024,
+  "cluster": {
+    "addr": "0.0.0.0",
+    "cluster_port": 0,
+    "auth_timeout": 1
+  },
+  "tls_timeout": 0.5,
+  "port": 4222,
+  "max_payload": 1048576,
+  "start": "1861-04-12T10:15:26.841483489-05:00",
+  "now": "2011-10-05T15:24:23.722084098-07:00",
+  "uptime": "150y5md237h8m57s",
+  "mem": 15581184,
+  "cores": 48,
+  "cpu": 9,
+  "connections": 5,
+  "total_connections": 109,
+  "routes": 1,
+  "remotes": 2,
+  "in_msgs": 74148556,
+  "out_msgs": 68863261,
+  "in_bytes": 946267004717,
+  "out_bytes": 948110960598,
+  "slow_consumers": 2,
+  "subscriptions": 4,
+  "http_req_stats": {
+    "/": 1,
+    "/connz": 100847,
+    "/routez": 0,
+    "/subsz": 1,
+    "/varz": 205785
+  },
+  "config_load_time": "2017-07-24T10:15:26.841483489-05:00"
+}
+`
+
+func TestMetricsCorrect(t *testing.T) {
+	var acc testutil.Accumulator
+
+	srv := newTestNatsServer()
+	defer srv.Close()
+
+	n := &Nats{Server: srv.URL}
+	err := n.Gather(&acc)
+	require.NoError(t, err)
+
+	fields := map[string]interface{}{
+		"in_msgs":           int64(74148556),
+		"out_msgs":          int64(68863261),
+		"in_bytes":          int64(946267004717),
+		"out_bytes":         int64(948110960598),
+		"uptime":            int64(4748742536880600609),
+		"cores":             48,
+		"cpu":               float64(9),
+		"mem":               int64(15581184),
+		"connections":       int(5),
+		"total_connections": uint64(109),
+		"subscriptions":     uint32(4),
+		"slow_consumers":    int64(2),
+		"routes":            int(1),
+		"remotes":           int(2),
+	}
+	tags := map[string]string{
+		"server": srv.URL,
+	}
+	acc.AssertContainsTaggedFields(t, "nats", fields, tags)
+}
+
+func newTestNatsServer() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rsp string
+
+		switch r.URL.Path {
+		case "/varz":
+			rsp = sampleVarz
+		default:
+			panic("Cannot handle request")
+		}
+
+		fmt.Fprintln(w, rsp)
+	}))
+}

From fbd3544a9d4e5dea4e9106e0ea4161c67e099a71 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 26 Jan 2018 15:18:15 -0800
Subject: [PATCH 0893/1302] Add nats input to readme and changelog

---
 CHANGELOG.md | 4 ++++
 README.md    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06d0f6281..0ad93f706 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@
   In environments where TCP connections are terminated the `max_lifetime`
   setting should be set less than the collection `interval` to prevent errors.
 
+### New Plugins
+- [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
+
 ### Features
 
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.
@@ -32,6 +35,7 @@
 - [#3687](https://github.com/influxdata/telegraf/pull/3687): Add support for using globs in devices list of diskio input plugin.
 - [#2754](https://github.com/influxdata/telegraf/pull/2754): Allow running as console application on Windows.
 - [#3703](https://github.com/influxdata/telegraf/pull/3703): Add listener counts and node running status to rabbitmq input.
+- [#3674](https://github.com/influxdata/telegraf/pull/3674): Add NATS Monitoring Input Plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 917975c78..7411c3248 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ configuration options.
 * [minecraft](./plugins/inputs/minecraft)
 * [mongodb](./plugins/inputs/mongodb)
 * [mysql](./plugins/inputs/mysql)
+* [nats](./plugins/inputs/nats)
 * [net_response](./plugins/inputs/net_response)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus](./plugins/inputs/nginx_plus)

From de03ee3caa4da667f8d3e19200872a1f7ed024a0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 26 Jan 2018 17:15:02 -0800
Subject: [PATCH 0894/1302] Update nats readme

---
 plugins/inputs/nats/README.md | 40 ++++++++++++++++++++++++++++++-----
 plugins/inputs/nats/nats.go   |  2 +-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/nats/README.md b/plugins/inputs/nats/README.md
index 3cd9ee7ac..362ee17b2 100644
--- a/plugins/inputs/nats/README.md
+++ b/plugins/inputs/nats/README.md
@@ -1,12 +1,42 @@
-# NATS Monitoring Input Plugin
+# NATS Input Plugin
 
-The [NATS](http://www.nats.io/about/) monitoring plugin reads from
-specified NATS instance and submits metrics to InfluxDB. 
+The [NATS](http://www.nats.io/about/) monitoring plugin gathers metrics from
+the NATS [monitoring http server](https://www.nats.io/documentation/server/gnatsd-monitoring/).
 
-## Configuration
+### Configuration
 
 ```toml
 [[inputs.nats]]
-  ## The address of the monitoring end-point of the NATS server
+  ## The address of the monitoring endpoint of the NATS server
   server = "http://localhost:8222"
+
+  ## Maximum time to receive response
+  # response_timeout = "5s"
+```
+
+### Metrics:
+
+- nats
+  - tags
+    - server
+  - fields:
+    - uptime (integer, nanoseconds)
+    - mem (integer, bytes)
+    - subscriptions (integer, count)
+    - out_bytes (integer, bytes)
+    - connections (integer, count)
+    - in_msgs (integer, bytes)
+    - total_connections (integer, count)
+    - cores (integer, count)
+    - cpu (integer, count)
+    - slow_consumers (integer, count)
+    - routes (integer, count)
+    - remotes (integer, count)
+    - out_msgs (integer, count)
+    - in_bytes (integer, bytes)
+
+### Example Output:
+
+```
+nats,server=http://localhost:8222 uptime=117158348682i,mem=6647808i,subscriptions=0i,out_bytes=0i,connections=0i,in_msgs=0i,total_connections=0i,cores=2i,cpu=0,slow_consumers=0i,routes=0i,remotes=0i,out_msgs=0i,in_bytes=0i 1517015107000000000
 ```
diff --git a/plugins/inputs/nats/nats.go b/plugins/inputs/nats/nats.go
index 5099bd9fd..34a72b739 100644
--- a/plugins/inputs/nats/nats.go
+++ b/plugins/inputs/nats/nats.go
@@ -25,7 +25,7 @@ type Nats struct {
 
 var sampleConfig = `
   ## The address of the monitoring endpoint of the NATS server
-  server = "http://localhost:1337"
+  server = "http://localhost:8222"
 
   ## Maximum time to receive response
   # response_timeout = "5s"

From da12c647910d3bd04393a5adace8dda5cbe4b976 Mon Sep 17 00:00:00 2001
From: Ildar Svetlov <svetlov.ildar@gmail.com>
Date: Tue, 30 Jan 2018 00:14:49 +0400
Subject: [PATCH 0895/1302] Add ability to select which queues will be gathered
 to rabbitmq input (#3702)

---
 plugins/inputs/rabbitmq/README.md   |  5 +++
 plugins/inputs/rabbitmq/rabbitmq.go | 48 ++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 796dfc7bf..5dae5e091 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -44,6 +44,11 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
   ## specified, metrics for all exchanges are gathered.
   # exchanges = ["telegraf"]
+
+  ## Queues to include and exclude. Globs accepted.
+  ## Note that an empty array for both will include all queues
+  # queue_name_include = []
+  # queue_name_exclude = []
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 64aa6408d..e0d12c3db 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -52,7 +53,14 @@ type RabbitMQ struct {
 	Queues    []string
 	Exchanges []string
 
+	QueueInclude []string `toml:"queue_name_include"`
+	QueueExclude []string `toml:"queue_name_exclude"`
+
 	Client *http.Client
+
+	filterCreated     bool
+	excludeEveryQueue bool
+	queueFilter       filter.Filter
 }
 
 // OverviewResponse ...
@@ -195,6 +203,11 @@ var sampleConfig = `
   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
   ## specified, metrics for all exchanges are gathered.
   # exchanges = ["telegraf"]
+
+  ## Queues to include and exclude. Globs accepted.
+  ## Note that an empty array for both will include all queues
+  queue_name_include = []
+  queue_name_exclude = []
 `
 
 // SampleConfig ...
@@ -225,6 +238,15 @@ func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
+	// Create queue filter if not already created
+	if !r.filterCreated {
+		err := r.createQueueFilter()
+		if err != nil {
+			return err
+		}
+		r.filterCreated = true
+	}
+
 	var wg sync.WaitGroup
 	wg.Add(len(gatherFunctions))
 	for _, f := range gatherFunctions {
@@ -361,6 +383,9 @@ func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator) {
 }
 
 func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator) {
+	if r.excludeEveryQueue {
+		return
+	}
 	// Gather information about queues
 	queues := make([]Queue, 0)
 	err := r.requestJSON("/api/queues", &queues)
@@ -370,7 +395,7 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator) {
 	}
 
 	for _, queue := range queues {
-		if !r.shouldGatherQueue(queue) {
+		if !r.queueFilter.Match(queue.Name) {
 			continue
 		}
 		tags := map[string]string{
@@ -463,18 +488,25 @@ func (r *RabbitMQ) shouldGatherNode(node Node) bool {
 	return false
 }
 
-func (r *RabbitMQ) shouldGatherQueue(queue Queue) bool {
-	if len(r.Queues) == 0 {
-		return true
+func (r *RabbitMQ) createQueueFilter() error {
+	// Backwards compatibility for deprecated `queues` parameter.
+	if len(r.Queues) > 0 {
+		r.QueueInclude = append(r.QueueInclude, r.Queues...)
 	}
 
-	for _, name := range r.Queues {
-		if name == queue.Name {
-			return true
+	filter, err := filter.NewIncludeExcludeFilter(r.QueueInclude, r.QueueExclude)
+	if err != nil {
+		return err
+	}
+	r.queueFilter = filter
+
+	for _, q := range r.QueueExclude {
+		if q == "*" {
+			r.excludeEveryQueue = true
 		}
 	}
 
-	return false
+	return nil
 }
 
 func (r *RabbitMQ) shouldGatherExchange(exchange Exchange) bool {

From bcefe9084646b2f788508bdceeb67838a7c8f09e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 29 Jan 2018 12:16:15 -0800
Subject: [PATCH 0896/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ad93f706..2d4d79c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
   setting should be set less than the collection `interval` to prevent errors.
 
 ### New Plugins
+
 - [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
 
 ### Features
@@ -36,6 +37,7 @@
 - [#2754](https://github.com/influxdata/telegraf/pull/2754): Allow running as console application on Windows.
 - [#3703](https://github.com/influxdata/telegraf/pull/3703): Add listener counts and node running status to rabbitmq input.
 - [#3674](https://github.com/influxdata/telegraf/pull/3674): Add NATS Monitoring Input Plugin.
+- [#3702](https://github.com/influxdata/telegraf/pull/3702): Add ability to select which queues will be gathered in rabbitmq input.
 
 ### Bugfixes
 

From 1b84ac08ab2f74f73e8a81b03063778139546dbc Mon Sep 17 00:00:00 2001
From: Philipp Weber <6884041+phlipse@users.noreply.github.com>
Date: Mon, 29 Jan 2018 23:01:00 +0100
Subject: [PATCH 0897/1302] Add support for setting bsd source address to the
 ping input (#3726)

---
 plugins/inputs/ping/README.md |  3 ++-
 plugins/inputs/ping/ping.go   | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 914477c54..5e4c637f5 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -17,7 +17,8 @@ urls = ["www.google.com"] # required
 # ping_interval = 1.0
 ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
 # timeout = 1.0
-## interface to send ping from (ping -I <INTERFACE>)
+## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
+## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
 # interface = ""
 ```
 
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index cae575bfd..4ed36bd05 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -34,7 +34,7 @@ type Ping struct {
 	// Ping timeout, in seconds. 0 means no timeout (ping -W <TIMEOUT>)
 	Timeout float64
 
-	// Interface to send ping from (ping -I <INTERFACE>)
+	// Interface or source address to send ping from (ping -I/-S <INTERFACE/SRC_ADDR>)
 	Interface string
 
 	// URLs to ping
@@ -60,7 +60,8 @@ const sampleConfig = `
   # ping_interval = 1.0
   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
   # timeout = 1.0
-  ## interface to send ping from (ping -I <INTERFACE>)
+  ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
+  ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
   # interface = ""
 `
 
@@ -179,7 +180,15 @@ func (p *Ping) args(url string) []string {
 		}
 	}
 	if p.Interface != "" {
-		args = append(args, "-I", p.Interface)
+		switch runtime.GOOS {
+		case "linux":
+			args = append(args, "-I", p.Interface)
+		case "freebsd", "darwin":
+			args = append(args, "-S", p.Interface)
+		default:
+			// Not sure the best option here, just assume GNU ping?
+			args = append(args, "-I", p.Interface)
+		}
 	}
 	args = append(args, url)
 	return args

From f9c48ee2f0f69977754f5332bc073df6b0e08f96 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 29 Jan 2018 14:02:44 -0800
Subject: [PATCH 0898/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d4d79c5c..e7e9e34a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - [#3703](https://github.com/influxdata/telegraf/pull/3703): Add listener counts and node running status to rabbitmq input.
 - [#3674](https://github.com/influxdata/telegraf/pull/3674): Add NATS Monitoring Input Plugin.
 - [#3702](https://github.com/influxdata/telegraf/pull/3702): Add ability to select which queues will be gathered in rabbitmq input.
+- [#3726](https://github.com/influxdata/telegraf/pull/3726): Add support for setting bsd source address to the ping input.
 
 ### Bugfixes
 

From 1b0a4e49cdf30cd0ae4984253549c443520c11ca Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 Jan 2018 12:03:16 -0800
Subject: [PATCH 0899/1302] Do not build nats input on freebsd

This plugin can work on freebsd, but will only build with cgo
enabled.  For now, disable this plugin to avoid this requirement.
---
 plugins/inputs/nats/nats.go         | 2 ++
 plugins/inputs/nats/nats_freebsd.go | 3 +++
 plugins/inputs/nats/nats_test.go    | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 plugins/inputs/nats/nats_freebsd.go

diff --git a/plugins/inputs/nats/nats.go b/plugins/inputs/nats/nats.go
index 34a72b739..ba1cc803c 100644
--- a/plugins/inputs/nats/nats.go
+++ b/plugins/inputs/nats/nats.go
@@ -1,3 +1,5 @@
+// +build !freebsd
+
 package nats
 
 import (
diff --git a/plugins/inputs/nats/nats_freebsd.go b/plugins/inputs/nats/nats_freebsd.go
new file mode 100644
index 000000000..c23a6eec5
--- /dev/null
+++ b/plugins/inputs/nats/nats_freebsd.go
@@ -0,0 +1,3 @@
+// +build freebsd
+
+package nats
diff --git a/plugins/inputs/nats/nats_test.go b/plugins/inputs/nats/nats_test.go
index 7dd28006b..ef387f7e4 100644
--- a/plugins/inputs/nats/nats_test.go
+++ b/plugins/inputs/nats/nats_test.go
@@ -1,3 +1,5 @@
+// +build !freebsd
+
 package nats
 
 import (

From c28d0e1b168426c88330aca2ce87c87130c5d07b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 30 Jan 2018 13:58:44 -0800
Subject: [PATCH 0900/1302] Exclude master_replid fields from redis input
 (#3725)

---
 plugins/inputs/redis/README.md     | 1 +
 plugins/inputs/redis/redis.go      | 4 ++++
 plugins/inputs/redis/redis_test.go | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 60f4ac5d9..c68f6624e 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -90,6 +90,7 @@ Additionally the plugin also calculates the hit/miss ratio (keyspace\_hitrate) a
     - master_link_down_since_seconds(int, number)
     - master_link_status(string)
     - master_repl_offset(int, number)
+    - second_repl_offset(int, number)
     - repl_backlog_active(int, number)
     - repl_backlog_size(int, bytes)
     - repl_backlog_first_byte_offset(int, number)
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index c809aa437..5c5238f5d 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -207,6 +207,10 @@ func gatherInfoOutput(
 			}
 		}
 
+		if strings.HasPrefix(name, "master_replid") {
+			continue
+		}
+
 		if name == "mem_allocator" {
 			continue
 		}
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index 7d2fd1b51..fd16bbdd9 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -86,6 +86,7 @@ func TestRedis_ParseMetrics(t *testing.T) {
 		"repl_backlog_size":              int64(1048576),
 		"repl_backlog_first_byte_offset": int64(0),
 		"repl_backlog_histlen":           int64(0),
+		"second_repl_offset":             int64(-1),
 		"used_cpu_sys":                   float64(0.14),
 		"used_cpu_user":                  float64(0.05),
 		"used_cpu_sys_children":          float64(0.00),
@@ -189,7 +190,10 @@ latest_fork_usec:0
 # Replication
 role:master
 connected_slaves:0
+master_replid:8c4d7b768b26826825ceb20ff4a2c7c54616350b
+master_replid2:0000000000000000000000000000000000000000
 master_repl_offset:0
+second_repl_offset:-1
 repl_backlog_active:0
 repl_backlog_size:1048576
 repl_backlog_first_byte_offset:0

From 5d87ad85a1c8793b2cc46d19bfc16efbbc9ad29a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 Jan 2018 14:00:22 -0800
Subject: [PATCH 0901/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e9e34a9..60d89d30b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Limit wait time for writes in mqtt output.
 - [#3698](https://github.com/influxdata/telegraf/issues/3698): Revert change in graphite output where dot in field key was replaced by underscore.
 - [#3710](https://github.com/influxdata/telegraf/issues/3710): Add timeout to wavefront output write.
+- [#3725](https://github.com/influxdata/telegraf/issues/3725): Exclude master_replid fields from redis input.
 
 ## v1.5.1 [2017-01-10]
 

From 3a85e7b1f0366c1b6f1cba9cbe0025c966a01556 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 Jan 2018 13:55:24 -0800
Subject: [PATCH 0902/1302] Set release date for 1.5.2

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60d89d30b..33c0e0d1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,7 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
-## v1.5.2 [unreleased]
+## v1.5.2 [2018-01-30]
 
 ### Bugfixes
 
@@ -58,7 +58,7 @@
 - [#3710](https://github.com/influxdata/telegraf/issues/3710): Add timeout to wavefront output write.
 - [#3725](https://github.com/influxdata/telegraf/issues/3725): Exclude master_replid fields from redis input.
 
-## v1.5.1 [2017-01-10]
+## v1.5.1 [2018-01-10]
 
 ### Bugfixes
 

From 10e51e4b49dbcefb939850574592763302beee92 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 30 Jan 2018 18:06:53 -0800
Subject: [PATCH 0903/1302] Set path to / if HOST_MOUNT_PREFIX matches full
 path (#3736)

---
 plugins/inputs/system/disk_test.go | 134 +++++++++++++++++++++++++++++
 plugins/inputs/system/ps.go        |   3 +-
 2 files changed, 136 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/system/disk_test.go b/plugins/inputs/system/disk_test.go
index 8aeca5523..938ca1b06 100644
--- a/plugins/inputs/system/disk_test.go
+++ b/plugins/inputs/system/disk_test.go
@@ -117,6 +117,140 @@ func TestDiskUsage(t *testing.T) {
 	assert.Equal(t, 2*expectedAllDiskMetrics+7, acc.NFields())
 }
 
+func TestDiskUsageHostMountPrefix(t *testing.T) {
+	tests := []struct {
+		name            string
+		partitionStats  []disk.PartitionStat
+		usageStats      []*disk.UsageStat
+		hostMountPrefix string
+		expectedTags    map[string]string
+		expectedFields  map[string]interface{}
+	}{
+		{
+			name: "no host mount prefix",
+			partitionStats: []disk.PartitionStat{
+				{
+					Device:     "/dev/sda",
+					Mountpoint: "/",
+					Fstype:     "ext4",
+					Opts:       "ro",
+				},
+			},
+			usageStats: []*disk.UsageStat{
+				&disk.UsageStat{
+					Path:  "/",
+					Total: 42,
+				},
+			},
+			expectedTags: map[string]string{
+				"path":   "/",
+				"device": "sda",
+				"fstype": "ext4",
+				"mode":   "ro",
+			},
+			expectedFields: map[string]interface{}{
+				"total":        uint64(42),
+				"used":         uint64(0),
+				"free":         uint64(0),
+				"inodes_total": uint64(0),
+				"inodes_free":  uint64(0),
+				"inodes_used":  uint64(0),
+				"used_percent": float64(0),
+			},
+		},
+		{
+			name: "host mount prefix",
+			partitionStats: []disk.PartitionStat{
+				{
+					Device:     "/dev/sda",
+					Mountpoint: "/hostfs/var",
+					Fstype:     "ext4",
+					Opts:       "ro",
+				},
+			},
+			usageStats: []*disk.UsageStat{
+				&disk.UsageStat{
+					Path:  "/hostfs/var",
+					Total: 42,
+				},
+			},
+			hostMountPrefix: "/hostfs",
+			expectedTags: map[string]string{
+				"path":   "/var",
+				"device": "sda",
+				"fstype": "ext4",
+				"mode":   "ro",
+			},
+			expectedFields: map[string]interface{}{
+				"total":        uint64(42),
+				"used":         uint64(0),
+				"free":         uint64(0),
+				"inodes_total": uint64(0),
+				"inodes_free":  uint64(0),
+				"inodes_used":  uint64(0),
+				"used_percent": float64(0),
+			},
+		},
+		{
+			name: "host mount prefix exact match",
+			partitionStats: []disk.PartitionStat{
+				{
+					Device:     "/dev/sda",
+					Mountpoint: "/hostfs",
+					Fstype:     "ext4",
+					Opts:       "ro",
+				},
+			},
+			usageStats: []*disk.UsageStat{
+				&disk.UsageStat{
+					Path:  "/hostfs",
+					Total: 42,
+				},
+			},
+			hostMountPrefix: "/hostfs",
+			expectedTags: map[string]string{
+				"path":   "/",
+				"device": "sda",
+				"fstype": "ext4",
+				"mode":   "ro",
+			},
+			expectedFields: map[string]interface{}{
+				"total":        uint64(42),
+				"used":         uint64(0),
+				"free":         uint64(0),
+				"inodes_total": uint64(0),
+				"inodes_free":  uint64(0),
+				"inodes_used":  uint64(0),
+				"used_percent": float64(0),
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mck := &mock.Mock{}
+			mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+			defer mps.AssertExpectations(t)
+
+			var acc testutil.Accumulator
+			var err error
+
+			mps.On("Partitions", true).Return(tt.partitionStats, nil)
+
+			for _, v := range tt.usageStats {
+				mps.On("PSDiskUsage", v.Path).Return(v, nil)
+			}
+
+			mps.On("OSGetenv", "HOST_MOUNT_PREFIX").Return(tt.hostMountPrefix)
+
+			err = (&DiskStats{ps: mps}).Gather(&acc)
+			require.NoError(t, err)
+
+			acc.AssertContainsTaggedFields(t, "disk", tt.expectedFields, tt.expectedTags)
+		})
+	}
+}
+
 func TestDiskStats(t *testing.T) {
 	var mps MockPS
 	defer mps.AssertExpectations(t)
diff --git a/plugins/inputs/system/ps.go b/plugins/inputs/system/ps.go
index 02239e6e6..81161ae68 100644
--- a/plugins/inputs/system/ps.go
+++ b/plugins/inputs/system/ps.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/influxdata/telegraf"
@@ -129,7 +130,7 @@ func (s *systemPS) DiskUsage(
 			continue
 		}
 
-		du.Path = strings.TrimPrefix(p.Mountpoint, hostMountPrefix)
+		du.Path = filepath.Join("/", strings.TrimPrefix(p.Mountpoint, hostMountPrefix))
 		du.Fstype = p.Fstype
 		usage = append(usage, du)
 		partitions = append(partitions, &p)

From 32732d42f8fe59145a69265683345e0a1d69f97e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 30 Jan 2018 18:08:31 -0800
Subject: [PATCH 0904/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c0e0d1b..47b40966d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,12 @@
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 
+## v1.5.3 [unreleased]
+
+### Bugfixes
+
+- [#3729](https://github.com/influxdata/telegraf/issues/3729): Set path to / if HOST_MOUNT_PREFIX matches full path.
+
 ## v1.5.2 [2018-01-30]
 
 ### Bugfixes

From 7b365180d07bdde84c1002efeb12696bc19e9377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Sesqu=C3=A8s?= <sajoupa@users.noreply.github.com>
Date: Wed, 31 Jan 2018 21:25:27 +0100
Subject: [PATCH 0905/1302] Add Ipset input plugin (#3346)

---
 plugins/inputs/all/all.go          |   1 +
 plugins/inputs/ipset/README.md     |  62 +++++++++++++
 plugins/inputs/ipset/ipset.go      | 126 +++++++++++++++++++++++++++
 plugins/inputs/ipset/ipset_test.go | 135 +++++++++++++++++++++++++++++
 4 files changed, 324 insertions(+)
 create mode 100644 plugins/inputs/ipset/README.md
 create mode 100644 plugins/inputs/ipset/ipset.go
 create mode 100644 plugins/inputs/ipset/ipset_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index fa78b3ff0..a13bd6cd3 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -36,6 +36,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
 	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ipmi_sensor"
+	_ "github.com/influxdata/telegraf/plugins/inputs/ipset"
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia2"
diff --git a/plugins/inputs/ipset/README.md b/plugins/inputs/ipset/README.md
new file mode 100644
index 000000000..2209de911
--- /dev/null
+++ b/plugins/inputs/ipset/README.md
@@ -0,0 +1,62 @@
+# Ipset Plugin
+
+The ipset plugin gathers packets and bytes counters from Linux ipset.
+It uses the output of the command "ipset save".
+Ipsets created without the "counters" option are ignored.
+
+Results are tagged with:
+- ipset name
+- ipset entry
+
+There are 3 ways to grant telegraf the right to run ipset:
+* Run as root (strongly discouraged)
+* Use sudo
+* Configure systemd to run telegraf with CAP_NET_ADMIN and CAP_NET_RAW capabilities.
+
+### Using systemd capabilities
+
+You may run `systemctl edit telegraf.service` and add the following:
+
+```
+[Service]
+CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN
+AmbientCapabilities=CAP_NET_RAW CAP_NET_ADMIN
+```
+
+### Using sudo
+
+You may edit your sudo configuration with the following:
+
+```sudo
+telegraf ALL=(root) NOPASSWD: /sbin/ipset save
+```
+
+### Configuration
+
+```toml
+  [[inputs.ipset]]
+    ## By default, we only show sets which have already matched at least 1 packet.
+    ## set include_unmatched_sets = true to gather them all.
+    include_unmatched_sets = false
+    ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
+    ## You can avoid using sudo or root, by setting appropriate privileges for
+    ## the telegraf.service systemd service.
+    use_sudo = false
+    ## The default timeout of 1s for ipset execution can be overridden here:
+    # timeout = "1s"
+
+```
+
+### Example Output
+
+```
+$ sudo ipset save
+create myset hash:net family inet hashsize 1024 maxelem 65536 counters comment
+add myset 10.69.152.1 packets 8 bytes 672 comment "machine A"
+```
+
+```
+$ telegraf --config telegraf.conf --input-filter ipset --test --debug
+* Plugin: inputs.ipset, Collection 1
+> ipset,rule=10.69.152.1,host=trashme,set=myset bytes_total=8i,packets_total=672i 1507615028000000000
+```
diff --git a/plugins/inputs/ipset/ipset.go b/plugins/inputs/ipset/ipset.go
new file mode 100644
index 000000000..c459ebf4c
--- /dev/null
+++ b/plugins/inputs/ipset/ipset.go
@@ -0,0 +1,126 @@
+package ipset
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+// Ipsets is a telegraf plugin to gather packets and bytes counters from ipset
+type Ipset struct {
+	IncludeUnmatchedSets bool
+	UseSudo              bool
+	Timeout              internal.Duration
+	lister               setLister
+}
+
+type setLister func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error)
+
+const measurement = "ipset"
+
+var defaultTimeout = internal.Duration{Duration: time.Second}
+
+// Description returns a short description of the plugin
+func (ipset *Ipset) Description() string {
+	return "Gather packets and bytes counters from Linux ipsets"
+}
+
+// SampleConfig returns sample configuration options.
+func (ipset *Ipset) SampleConfig() string {
+	return `
+  ## By default, we only show sets which have already matched at least 1 packet.
+  ## set include_unmatched_sets = true to gather them all.
+  include_unmatched_sets = false
+  ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
+  use_sudo = false
+  ## The default timeout of 1s for ipset execution can be overridden here:
+  # timeout = "1s"
+`
+}
+
+func (ips *Ipset) Gather(acc telegraf.Accumulator) error {
+	out, e := ips.lister(ips.Timeout, ips.UseSudo)
+	if e != nil {
+		acc.AddError(e)
+	}
+
+	scanner := bufio.NewScanner(out)
+	for scanner.Scan() {
+		line := scanner.Text()
+		// Ignore sets created without the "counters" option
+		nocomment := strings.Split(line, "\"")[0]
+		if !(strings.Contains(nocomment, "packets") &&
+			strings.Contains(nocomment, "bytes")) {
+			continue
+		}
+
+		data := strings.Fields(line)
+		if len(data) < 7 {
+			acc.AddError(fmt.Errorf("Error parsing line (expected at least 7 fields): %s", line))
+			continue
+		}
+		if data[0] == "add" && (data[4] != "0" || ips.IncludeUnmatchedSets) {
+			tags := map[string]string{
+				"set":  data[1],
+				"rule": data[2],
+			}
+			packets_total, err := strconv.ParseUint(data[4], 10, 64)
+			if err != nil {
+				acc.AddError(err)
+			}
+			bytes_total, err := strconv.ParseUint(data[6], 10, 64)
+			if err != nil {
+				acc.AddError(err)
+			}
+			fields := map[string]interface{}{
+				"packets_total": packets_total,
+				"bytes_total":   bytes_total,
+			}
+			acc.AddCounter(measurement, fields, tags)
+		}
+	}
+	return nil
+}
+
+func setList(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+	// Is ipset installed ?
+	ipsetPath, err := exec.LookPath("ipset")
+	if err != nil {
+		return nil, err
+	}
+	var args []string
+	cmdName := ipsetPath
+	if UseSudo {
+		cmdName = "sudo"
+		args = append(args, ipsetPath)
+	}
+	args = append(args, "save")
+
+	cmd := exec.Command(cmdName, args...)
+
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err = internal.RunTimeout(cmd, Timeout.Duration)
+	if err != nil {
+		return &out, fmt.Errorf("error running ipset save: %s", err)
+	}
+
+	return &out, nil
+}
+
+func init() {
+	inputs.Add("ipset", func() telegraf.Input {
+		return &Ipset{
+			lister:  setList,
+			Timeout: defaultTimeout,
+		}
+	})
+}
diff --git a/plugins/inputs/ipset/ipset_test.go b/plugins/inputs/ipset/ipset_test.go
new file mode 100644
index 000000000..9438c806d
--- /dev/null
+++ b/plugins/inputs/ipset/ipset_test.go
@@ -0,0 +1,135 @@
+package ipset
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestIpset(t *testing.T) {
+	tests := []struct {
+		name   string
+		value  string
+		tags   []map[string]string
+		fields [][]map[string]interface{}
+		err    error
+	}{
+		{
+			name:  "0 sets, no results",
+			value: "",
+		},
+		{
+			name: "Empty sets, no values",
+			value: `create myset hash:net family inet hashsize 1024 maxelem 65536
+				create myset2 hash:net,port family inet hashsize 16384 maxelem 524288 counters comment
+				`,
+		},
+		{
+			name: "Non-empty sets, but no counters, no results",
+			value: `create myset hash:net family inet hashsize 1024 maxelem 65536
+				add myset 1.2.3.4
+				`,
+		},
+		{
+			name: "Line with data but not enough fields",
+			value: `create hash:net family inet hashsize 1024 maxelem 65536 counters
+				add myset 4.5.6.7 packets 123 bytes
+				`,
+			err: fmt.Errorf("Error parsing line (expected at least 7 fields): \t\t\t\tadd myset 4.5.6.7 packets 123 bytes"),
+		},
+		{
+			name: "Non-empty sets, counters, no comment",
+			value: `create myset hash:net family inet hashsize 1024 maxelem 65536 counters
+				add myset 1.2.3.4 packets 1328 bytes 79680
+				add myset 2.3.4.5 packets 0 bytes 0
+				add myset 3.4.5.6 packets 3 bytes 222
+				`,
+			tags: []map[string]string{
+				map[string]string{"set": "myset", "rule": "1.2.3.4"},
+				map[string]string{"set": "myset", "rule": "3.4.5.6"},
+			},
+			fields: [][]map[string]interface{}{
+				{map[string]interface{}{"packets_total": uint64(1328), "bytes_total": uint64(79680)}},
+				{map[string]interface{}{"packets_total": uint64(3), "bytes_total": uint64(222)}},
+			},
+		},
+		{
+			name: "Sets with counters and comment",
+			value: `create myset hash:net family inet hashsize 1024 maxelem 65536 counters comment
+				add myset 1.2.3.4 packets 1328 bytes 79680 comment "first IP"
+				add myset 2.3.4.5 packets 0 bytes 0 comment "2nd IP"
+				add myset 3.4.5.6 packets 3 bytes 222 "3rd IP"
+				`,
+			tags: []map[string]string{
+				map[string]string{"set": "myset", "rule": "1.2.3.4"},
+				map[string]string{"set": "myset", "rule": "3.4.5.6"},
+			},
+			fields: [][]map[string]interface{}{
+				{map[string]interface{}{"packets_total": uint64(1328), "bytes_total": uint64(79680)}},
+				{map[string]interface{}{"packets_total": uint64(3), "bytes_total": uint64(222)}},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			i++
+			ips := &Ipset{
+				lister: func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+					return bytes.NewBufferString(tt.value), nil
+				},
+			}
+			acc := new(testutil.Accumulator)
+			err := acc.GatherError(ips.Gather)
+			if !reflect.DeepEqual(tt.err, err) {
+				t.Errorf("%d: expected error '%#v' got '%#v'", i, tt.err, err)
+			}
+			if len(tt.tags) == 0 {
+				n := acc.NFields()
+				if n != 0 {
+					t.Errorf("%d: expected 0 values got %d", i, n)
+				}
+				return
+			}
+			n := 0
+			for j, tags := range tt.tags {
+				for k, fields := range tt.fields[j] {
+					if len(acc.Metrics) < n+1 {
+						t.Errorf("%d: expected at least %d values got %d", i, n+1, len(acc.Metrics))
+						break
+					}
+					m := acc.Metrics[n]
+					if !reflect.DeepEqual(m.Measurement, measurement) {
+						t.Errorf("%d %d %d: expected measurement '%#v' got '%#v'\n", i, j, k, measurement, m.Measurement)
+					}
+					if !reflect.DeepEqual(m.Tags, tags) {
+						t.Errorf("%d %d %d: expected tags\n%#v got\n%#v\n", i, j, k, tags, m.Tags)
+					}
+					if !reflect.DeepEqual(m.Fields, fields) {
+						t.Errorf("%d %d %d: expected fields\n%#v got\n%#v\n", i, j, k, fields, m.Fields)
+					}
+					n++
+				}
+			}
+		})
+	}
+}
+
+func TestIpset_Gather_listerError(t *testing.T) {
+	errFoo := errors.New("error foobar")
+	ips := &Ipset{
+		lister: func(Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+			return new(bytes.Buffer), errFoo
+		},
+	}
+	acc := new(testutil.Accumulator)
+	err := acc.GatherError(ips.Gather)
+	if !reflect.DeepEqual(err, errFoo) {
+		t.Errorf("Expected error %#v got\n%#v\n", errFoo, err)
+	}
+}

From d43e8262b7a9f369a4b0eff27f5646209b502a39 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 31 Jan 2018 12:30:03 -0800
Subject: [PATCH 0906/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b40966d..8d2acf082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 ### New Plugins
 
+- [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
 - [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
 
 ### Features
@@ -39,6 +40,7 @@
 - [#3674](https://github.com/influxdata/telegraf/pull/3674): Add NATS Monitoring Input Plugin.
 - [#3702](https://github.com/influxdata/telegraf/pull/3702): Add ability to select which queues will be gathered in rabbitmq input.
 - [#3726](https://github.com/influxdata/telegraf/pull/3726): Add support for setting bsd source address to the ping input.
+- [#3346](https://github.com/influxdata/telegraf/pull/3346): Add Ipset input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 7411c3248..d52327f4c 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,7 @@ configuration options.
 * [interrupts](./plugins/inputs/interrupts)
 * [ipmi_sensor](./plugins/inputs/ipmi_sensor)
 * [iptables](./plugins/inputs/iptables)
+* [ipset](./plugins/inputs/ipset)
 * [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [jolokia2](./plugins/inputs/jolokia2)
 * [kapacitor](./plugins/inputs/kapacitor)

From ec8e923fda24166ddd2d1f0c83954aa4812f8771 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 10:51:03 -0800
Subject: [PATCH 0907/1302] Update documetation style for smart input

---
 plugins/inputs/smart/README.md | 133 ++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 68 deletions(-)

diff --git a/plugins/inputs/smart/README.md b/plugins/inputs/smart/README.md
index 6af962793..4826edbc6 100644
--- a/plugins/inputs/smart/README.md
+++ b/plugins/inputs/smart/README.md
@@ -1,4 +1,4 @@
-# Telegraf S.M.A.R.T. plugin
+# S.M.A.R.T. Input Plugin
 
 Get metrics using the command line utility `smartctl` for S.M.A.R.T. (Self-Monitoring, Analysis and Reporting Technology) storage devices. SMART is a monitoring system included in computer hard disk drives (HDDs) and solid-state drives (SSDs)[1] that detects and reports on various indicators of drive reliability, with the intent of enabling the anticipation of hardware failures.
 See smartmontools (https://www.smartmontools.org/).
@@ -24,68 +24,7 @@ To enable SMART on a storage device run:
 smartctl -s on <device>
 ```
 
-## Measurements
-
-- smart_device:
-
-    * Tags:
-      - `capacity`
-      - `device`
-      - `device_model`
-      - `enabled`
-      - `health`
-      - `serial_no`
-      - `wwn`
-    * Fields:
-      - `exit_status`
-      - `health_ok`
-      - `read_error_rate`
-      - `seek_error`
-      - `temp_c`
-      - `udma_crc_errors`
-
-- smart_attribute:
-
-    * Tags:
-      - `device`
-      - `fail`
-      - `flags`
-      - `id`
-      - `name`
-      - `serial_no`
-      - `wwn`
-    * Fields:
-      - `exit_status`
-      - `raw_value`
-      - `threshold`
-      - `value`
-      - `worst`
-
-### Flags
-
-The interpretation of the tag `flags` is:
- - *K* auto-keep
- - *C* event count
- - *R* error rate
- - *S* speed/performance
- - *O* updated online
- - *P* prefailure warning
-
-### Exit Status
-
-The `exit_status` field captures the exit status of the smartctl command which
-is defined by a bitmask. For the interpretation of the bitmask see the man page for
-smartctl.
-
-### Device Names
-
-Device names, e.g., `/dev/sda`, are *not persistent*, and may be
-subject to change across reboots or system changes. Instead, you can the
-*World Wide Name* (WWN) or serial number to identify devices. On Linux block
-devices can be referenced by the WWN in the following location:
-`/dev/disk/by-id/`.
-
-## Configuration
+### Configuration:
 
 ```toml
 # Read metrics from storage devices supporting S.M.A.R.T.
@@ -122,14 +61,72 @@ devices can be referenced by the WWN in the following location:
   # devices = [ "/dev/ada0 -d atacam" ]
 ```
 
+### Metrics:
+
+- smart_device:
+  - tags:
+    - capacity
+    - device
+    - device_model
+    - enabled
+    - health
+    - serial_no
+    - wwn
+  - fields:
+    - exit_status
+    - health_ok
+    - read_error_rate
+    - seek_error
+    - temp_c
+    - udma_crc_errors
+
+- smart_attribute:
+  - tags:
+    - device
+    - fail
+    - flags
+    - id
+    - name
+    - serial_no
+    - wwn
+  - fields:
+    - exit_status
+    - raw_value
+    - threshold
+    - value
+    - worst
+
+#### Flags
+
+The interpretation of the tag `flags` is:
+ - `K` auto-keep
+ - `C` event count
+ - `R` error rate
+ - `S` speed/performance
+ - `O` updated online
+ - `P` prefailure warning
+
+#### Exit Status
+
+The `exit_status` field captures the exit status of the smartctl command which
+is defined by a bitmask. For the interpretation of the bitmask see the man page for
+smartctl.
+
+#### Device Names
+
+Device names, e.g., `/dev/sda`, are *not persistent*, and may be
+subject to change across reboots or system changes. Instead, you can the
+*World Wide Name* (WWN) or serial number to identify devices. On Linux block
+devices can be referenced by the WWN in the following location:
+`/dev/disk/by-id/`.
+
 To run `smartctl` with `sudo` create a wrapper script and use `path` in
 the configuration to execute that.
 
-## Output
+### Output
 
-Example output from an _Apple SSD_:
 ```
-> smart_attribute,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=199,name=UDMA_CRC_Error_Count,flags=-O-RC-,fail=-,host=mbpro.local,device=rdisk0 threshold=0i,raw_value=0i,exit_status=0i,value=200i,worst=200i 1502536854000000000
-> smart_attribute,device=rdisk0,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=240,name=Unknown_SSD_Attribute,flags=-O---K,fail=-,host=mbpro.local exit_status=0i,value=100i,worst=100i,threshold=0i,raw_value=0i 1502536854000000000
-> smart_device,enabled=Enabled,host=mbpro.local,device=rdisk0,model=APPLE\ SSD\ SM0512F,serial_no=S1K5NYCD964433,wwn=5002538655584d30,capacity=500277790720 udma_crc_errors=0i,exit_status=0i,health_ok=true,read_error_rate=0i,temp_c=40i 1502536854000000000
+smart_device,enabled=Enabled,host=mbpro.local,device=rdisk0,model=APPLE\ SSD\ SM0512F,serial_no=S1K5NYCD964433,wwn=5002538655584d30,capacity=500277790720 udma_crc_errors=0i,exit_status=0i,health_ok=true,read_error_rate=0i,temp_c=40i 1502536854000000000
+smart_attribute,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=199,name=UDMA_CRC_Error_Count,flags=-O-RC-,fail=-,host=mbpro.local,device=rdisk0 threshold=0i,raw_value=0i,exit_status=0i,value=200i,worst=200i 1502536854000000000
+smart_attribute,device=rdisk0,serial_no=S1K5NYCD964433,wwn=5002538655584d30,id=240,name=Unknown_SSD_Attribute,flags=-O---K,fail=-,host=mbpro.local exit_status=0i,value=100i,worst=100i,threshold=0i,raw_value=0i 1502536854000000000
 ```

From a2635573a89685375ae15a83bc26939318a06ae0 Mon Sep 17 00:00:00 2001
From: Philipp Weber <6884041+phlipse@users.noreply.github.com>
Date: Thu, 1 Feb 2018 20:12:16 +0100
Subject: [PATCH 0908/1302] Add TLS and http basic_auth to prometheus_client
 output (#3719)

---
 plugins/outputs/prometheus_client/README.md   |  8 +++
 .../prometheus_client/prometheus_client.go    | 50 ++++++++++++++++---
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index 13cd80412..d42eecfd4 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -10,6 +10,14 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
   # Address to listen on
   listen = ":9273"
 
+  # Use TLS
+  tls_cert = "/etc/ssl/telegraf.crt"
+  tls_key = "/etc/ssl/telegraf.key"
+
+  # Use http basic authentication
+  basic_username = "Foo"
+  basic_password = "Bar"
+
   # Path to publish the metrics on, defaults to /metrics
   path = "/metrics"   
 
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 5b3ee2189..bec4f413a 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -2,6 +2,7 @@ package prometheus_client
 
 import (
 	"context"
+	"crypto/subtle"
 	"fmt"
 	"log"
 	"net/http"
@@ -53,6 +54,10 @@ type MetricFamily struct {
 
 type PrometheusClient struct {
 	Listen             string
+	TLSCert            string            `toml:"tls_cert"`
+	TLSKey             string            `toml:"tls_key"`
+	BasicUsername      string            `toml:"basic_username"`
+	BasicPassword      string            `toml:"basic_password"`
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
 	Path               string            `toml:"path"`
 	CollectorsExclude  []string          `toml:"collectors_exclude"`
@@ -70,6 +75,14 @@ var sampleConfig = `
   ## Address to listen on
   # listen = ":9273"
 
+  ## Use TLS
+  #tls_cert = "/etc/ssl/telegraf.crt"
+  #tls_key = "/etc/ssl/telegraf.key"
+
+  ## Use http basic authentication
+  #basic_username = "Foo"
+  #basic_password = "Bar"
+
   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
   # expiration_interval = "60s"
 
@@ -78,6 +91,24 @@ var sampleConfig = `
   collectors_exclude = ["gocollector", "process"]
 `
 
+func (p *PrometheusClient) basicAuth(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if p.BasicUsername != "" && p.BasicPassword != "" {
+			w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
+
+			username, password, ok := r.BasicAuth()
+			if !ok ||
+				subtle.ConstantTimeCompare([]byte(username), []byte(p.BasicUsername)) != 1 ||
+				subtle.ConstantTimeCompare([]byte(password), []byte(p.BasicPassword)) != 1 {
+				http.Error(w, "Not authorized", 401)
+				return
+			}
+		}
+
+		h.ServeHTTP(w, r)
+	})
+}
+
 func (p *PrometheusClient) Start() error {
 	defaultCollectors := map[string]bool{
 		"gocollector": true,
@@ -110,8 +141,8 @@ func (p *PrometheusClient) Start() error {
 	}
 
 	mux := http.NewServeMux()
-	mux.Handle(p.Path, promhttp.HandlerFor(
-		registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
+	mux.Handle(p.Path, p.basicAuth(promhttp.HandlerFor(
+		registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError})))
 
 	p.server = &http.Server{
 		Addr:    p.Listen,
@@ -119,13 +150,18 @@ func (p *PrometheusClient) Start() error {
 	}
 
 	go func() {
-		if err := p.server.ListenAndServe(); err != nil {
-			if err != http.ErrServerClosed {
-				log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
-					err.Error())
-			}
+		var err error
+		if p.TLSCert != "" && p.TLSKey != "" {
+			err = p.server.ListenAndServeTLS(p.TLSCert, p.TLSKey)
+		} else {
+			err = p.server.ListenAndServe()
+		}
+		if err != nil && err != http.ErrServerClosed {
+			log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
+				err.Error())
 		}
 	}()
+
 	return nil
 }
 

From a462b555a7f3174c610bb9577786ce0a2df784b9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 11:13:14 -0800
Subject: [PATCH 0909/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2acf082..f2629c804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 - [#3702](https://github.com/influxdata/telegraf/pull/3702): Add ability to select which queues will be gathered in rabbitmq input.
 - [#3726](https://github.com/influxdata/telegraf/pull/3726): Add support for setting bsd source address to the ping input.
 - [#3346](https://github.com/influxdata/telegraf/pull/3346): Add Ipset input plugin.
+- [#3719](https://github.com/influxdata/telegraf/pull/3719): Add TLS and HTTP basic auth to prometheus_client output.
 
 ### Bugfixes
 

From 86e08e6ce726f7f4348afe0db7b1219eb030651e Mon Sep 17 00:00:00 2001
From: John Eismeier <32205350+jeis2497052@users.noreply.github.com>
Date: Thu, 1 Feb 2018 14:15:12 -0500
Subject: [PATCH 0910/1302] Fix spelling mistakes in zipkin and apache inputs 
 (#3741)

---
 plugins/inputs/apache/README.md | 2 +-
 plugins/inputs/zipkin/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/apache/README.md b/plugins/inputs/apache/README.md
index 634abd11a..0edac3166 100644
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -2,7 +2,7 @@
 
 The Apache plugin collects server performance information using the [`mod_status`](https://httpd.apache.org/docs/2.4/mod/mod_status.html) module of the [Apache HTTP Server](https://httpd.apache.org/).
 
-Typically, the `mod_status` module is configured to expose a page at the `/server-status?auto` location of the Apache server.  The [ExtendedStatus](https://httpd.apache.org/docs/2.4/mod/core.html#extendedstatus) option must be enabled in order to collect all available fields.  For information about how to configure your server reference the [module documenation](https://httpd.apache.org/docs/2.4/mod/mod_status.html#enable).
+Typically, the `mod_status` module is configured to expose a page at the `/server-status?auto` location of the Apache server.  The [ExtendedStatus](https://httpd.apache.org/docs/2.4/mod/core.html#extendedstatus) option must be enabled in order to collect all available fields.  For information about how to configure your server reference the [module documentation](https://httpd.apache.org/docs/2.4/mod/mod_status.html#enable).
 
 ### Configuration:
 
diff --git a/plugins/inputs/zipkin/README.md b/plugins/inputs/zipkin/README.md
index af95542b3..b3ff82c13 100644
--- a/plugins/inputs/zipkin/README.md
+++ b/plugins/inputs/zipkin/README.md
@@ -84,7 +84,7 @@ SELECT max("duration_ns") FROM "zipkin" WHERE "service_name" = 'my_service' AND
 
 ### Recommended InfluxDB setup
 
-This test will create high cardinality data so we reccomend using the [tsi influxDB engine](https://www.influxdata.com/path-1-billion-time-series-influxdb-high-cardinality-indexing-ready-testing/).
+This test will create high cardinality data so we recommend using the [tsi influxDB engine](https://www.influxdata.com/path-1-billion-time-series-influxdb-high-cardinality-indexing-ready-testing/).
 #### How To Set Up InfluxDB For Work With Zipkin
 
   ##### Steps

From 426360d61f1a5405db3737d2789bb87024c85de0 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Thu, 1 Feb 2018 14:50:26 -0500
Subject: [PATCH 0911/1302] Add new sql server output data model (#3618)

---
 plugins/inputs/sqlserver/README.md    | 1307 ++-----------------------
 plugins/inputs/sqlserver/sqlserver.go |  964 +++++++++++++++++-
 2 files changed, 1004 insertions(+), 1267 deletions(-)

diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index 7ff0752c2..801e61a5b 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -1,20 +1,6 @@
 # SQL Server plugin
 
-This sqlserver plugin provides metrics for your SQL Server instance. 
-It currently works with SQL Server versions 2008+. 
-Recorded metrics are lightweight and use Dynamic Management Views supplied by SQL Server:
-```
-Performance counters  : 1000+ metrics from sys.dm_os_performance_counters
-Performance metrics   : special performance and ratio metrics
-Wait stats 			  : wait tasks categorized from sys.dm_os_wait_stats
-Memory clerk		  : memory breakdown from sys.dm_os_memory_clerks
-Database size         : databases size trend from sys.dm_io_virtual_file_stats
-Database IO			  : databases I/O from sys.dm_io_virtual_file_stats
-Database latency	  : databases latency from sys.dm_io_virtual_file_stats
-Database properties   : databases properties, state and recovery model, from sys.databases
-OS Volume             : available, used and total space from sys.dm_os_volume_stats
-CPU				      : cpu usage from sys.dm_os_ring_buffers
-```
+This sqlserver plugin provides metrics for your SQL Server instance. It currently works with SQL Server versions 2008+. Recorded metrics are lightweight and use Dynamic Management Views supplied by SQL Server.
 
 ## Getting started :
 
@@ -36,1240 +22,73 @@ GO
 ``` 
 # Read metrics from Microsoft SQL Server
 [[inputs.sqlserver]]
-  # Specify instances to monitor with a list of connection strings.
-  # All connection parameters are optional. 
-  # By default, the host is localhost, listening on default port (TCP/1433) 
-  #    for Windows, the user is the currently running AD user (SSO).
-  #    See https://github.com/denisenkom/go-mssqldb for detailed connection parameters.
-
-  servers = [
-	"Server=192.168.1.30;Port=1433;User Id=telegraf;Password=T$l$gr@f69*;app name=telegraf;log=1;",
-    "Server=192.168.1.30;Port=2222;User Id=telegraf;Password=T$l$gr@f69*;app name=telegraf;log=1;"
+# Specify instances to monitor with a list of connection strings.
+# All connection parameters are optional.
+# By default, the host is localhost, listening on default port, TCP 1433.
+#   for Windows, the user is the currently running AD user (SSO).
+#   See https://github.com/denisenkom/go-mssqldb for detailed connection
+#   parameters.
+	servers = [
+		"Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
 	]
+
+# Optional parameter, setting this to 2 will use a new version
+# of the collection queries that break compatibility with the original
+# dashboards. 
+	query_version = 2
+# If you are using AzureDB, setting this to True will gather resource utilization metrics
+	azuredb = False
+# If you would like to exclude some of the metrics queries, list them here
+# Possible choices:
+# - PerformanceCounters
+# - WaitStatsCategorized
+# - DatabaseIO
+# - DatabaseProperties
+# - CPUHistory
+# - DatabaseSize
+# - DatabaseStats
+# - MemoryClerk
+# - VolumeSpace
+# - PerformanceMetrics
+	exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
 ```
 
+# Metrics Collected
+To provide backwards compatibility, this plugin support two versions of metrics queries. 
 
-## Measurement | Fields:
+The original metrics queries provide:
+* *Performance counters*: 1000+ metrics from `sys.dm_os_performance_counters`
+* *Performance metrics*: special performance and ratio metrics
+* *Wait stats*: wait tasks categorized from `sys.dm_os_wait_stats`
+* *Memory clerk*: memory breakdown from `sys.dm_os_memory_clerks`
+* *Database size*: databases size trend from `sys.dm_io_virtual_file_stats`
+* *Database IO*: databases I/O from `sys.dm_io_virtual_file_stats`
+* *Database latency*: databases latency from `sys.dm_io_virtual_file_stats`
+* *Database properties*: databases properties, state and recovery model, from `sys.databases`
+* *OS Volume*: available, used and total space from `sys.dm_os_volume_stats`
+* *CPU*: cpu usage from `sys.dm_os_ring_buffers`
 
-- Wait stats 
-	- Wait time (ms) | I/O, Latch, Lock, Network, Service broker, Memory, Buffer, CLR, XEvent, Other, Total
-	- Wait tasks | I/O, Latch, Lock, Network, Service broker, Memory, Buffer, CLR, XEvent, Other, Total
-- Memory clerk	
-	- Memory breakdown (%) | Buffer pool, Cache (objects), Cache (sql plans), Other
-	- Memory breakdown (bytes) | Buffer pool, Cache (objects), Cache (sql plans), Other
-- Database size 
-	- Log size (bytes) | databases (included sysdb)
-	- Rows size (bytes) | databases (included sysdb)
-- Database IO	
-	- Log writes (bytes/sec) | databases (included sysdb)
-	- Rows writes (bytes/sec) | databases (included sysdb)
-	- Log reads (bytes/sec) | databases (included sysdb)
-	- Rows reads (bytes/sec) | databases (included sysdb)
-	- Log (writes/sec) | databases (included sysdb)
-	- Rows (writes/sec) | databases (included sysdb)
-	- Log (reads/sec) | databases (included sysdb)
-	- Rows (reads/sec) | databases (included sysdb)
-- Database latency	 
- 	- Log read latency (ms) | databases (included sysdb)
- 	- Log write latency (ms) | databases (included sysdb)
- 	- Rows read latency (ms) | databases (included sysdb)
- 	- Rows write latency (ms) | databases (included sysdb)
-	- Log (average bytes/read) | databases (included sysdb)
-	- Log (average bytes/write) | databases (included sysdb)
-	- Rows (average bytes/read) | databases (included sysdb)
-	- Rows (average bytes/write) | databases (included sysdb)
-- Database properties  
-	- Recovery Model FULL | databases (included sysdb)
-	- Recovery Model BULK_LOGGED | databases (included sysdb)
-	- Recovery Model SIMPLE | databases (included sysdb)
-	- State ONLINE | databases (included sysdb)
-	- State RESTORING | databases (included sysdb)
-	- State RECOVERING | databases (included sysdb)
-	- State RECOVERY_PENDING | databases (included sysdb)
-	- State SUSPECT | databases (included sysdb)
-	- State EMERGENCY | databases (included sysdb)
-	- State OFFLINE | databases (included sysdb)
-- OS Volume    
-	- Volume total space (bytes) | logical volumes 
-	- Volume available space (bytes) | logical volumes 
-	- Volume used space (bytes) | logical volumes
-	- Volume used space (%) | logical volumes
-- CPU	
-	- CPU (%) | SQL process, External process, SystemIdle
-- Performance metrics
-	- Performance metrics | Point In Time Recovery, Available physical memory (bytes), Average pending disk IO, Average runnable tasks, Average tasks, Buffer pool rate (bytes/sec), Connection memory per connection (bytes), Memory grant pending, Page File Usage (%), Page lookup per batch request, Page split per batch request, Readahead per page read, Signal wait (%), Sql compilation per batch request, Sql recompilation per batch request, Total target memory ratio
-- Performance counters
-	- AU cleanup batches/sec | Value
-	- ... 1000+ metrics
-	  See https://msdn.microsoft.com/fr-fr/library/ms190382(v=sql.120).aspx
+The new (version 2) metrics provide:
+* *AzureDB*: AzureDB resource utilization from `sys.dm_db_resource_stats`
+* *Database IO*: IO stats from `sys.dm_io_virtual_file_stats`
+* *Memory Clerk*: Memory clerk breakdown from `sys.dm_os_memory_clerks`, most clerks have been given a friendly name.
+* *Performance Counters*: A select list of performance counters from `sys.dm_os_performance_counters`. Some of the important metrics included:
+    * *Activity*: Transactions/sec/database, Batch requests/sec, blocked processes, + more
+	* *Availability Groups*: Bytes sent to replica, Bytes received from replica, Log bytes received, Log send queue, transaction delay, + more
+	* *Log activity*: Log bytes flushed/sec, Log flushes/sec, Log Flush Wait Time
+	* *Memory*: PLE, Page reads/sec, Page writes/sec, + more
+	* *TempDB*: Free space, Version store usage, Active temp tables, temp table creation rate, + more
+	* *Resource Governor*: CPU Usage, Requests/sec, Queued Requests, and Blocked tasks per workload group
+* *Server properties*: Number of databases in all possible states (online, offline, suspect, etc.), cpu count, physical memory, SQL Server service uptime, and SQL Server version
+* *Wait stats*: Wait time in ms, number of waiting tasks, resource wait time, signal wait time, max wait time in ms, wait type, and wait category. The waits are categorized using the sasme categories used in Query Store.
 
-	  
-## Tags:
-- All stats have the following tags:
-	- servername (server name:instance ID)
-	- type (type of stats to easily filter measurements)
+**Note**: Version 2 queries are not backwards compatible with the old queries. Any dashboards or queries based on the old query format will not work with the new format. The version 2 queries are written in such a way as to only gather SQL specific metrics (no disk space or overall CPU related metrics) and they only report raw metrics, no math has been done to calculate deltas. To graph this data you must calculate deltas in your dashboarding software.
 
-	
-## Overview in Grafana:
+# Tags
+If you are using the original queries all stats have the following tags:
+* `servername`:  hostname:instance
+* `type`: type of stats to easily filter measurements
 
-![telegraf-sqlserver-0](https://cloud.githubusercontent.com/assets/16494280/12538189/ec1b70aa-c2d3-11e5-97ec-1a4f575e8a07.png)
-
-General Activity
-![telegraf-sqlserver-1](https://cloud.githubusercontent.com/assets/16494280/12591410/f098b602-c467-11e5-9acf-2edea077ed7e.png)
-
-Memory
-![telegraf-sqlserver-2](https://cloud.githubusercontent.com/assets/16494280/12591412/f2075688-c467-11e5-9d0f-d256e032cd0e.png)
-
-I/O
-![telegraf-sqlserver-3](https://cloud.githubusercontent.com/assets/16494280/12591417/f40ccb84-c467-11e5-89ff-498fb1bc3110.png)
-
-Disks
-![telegraf-sqlserver-4](https://cloud.githubusercontent.com/assets/16494280/12591420/f5de5f68-c467-11e5-90c8-9185444ac490.png)
-
-CPU
-![telegraf-sqlserver-5](https://cloud.githubusercontent.com/assets/16494280/12591446/11dfe7b8-c468-11e5-9681-6e33296e70e8.png)
-
-Full view
-![telegraf-sqlserver-full](https://cloud.githubusercontent.com/assets/16494280/12591426/fa2b17b4-c467-11e5-9c00-929f4c4aea57.png)
-
-
-## Example Output:
-
-``` 
-./telegraf --config telegraf.conf --test 
-* Plugin: sqlserver, Collection 1
-> Memory\ breakdown\ (%),servername=WIN8-DEV,type=Memory\ clerk Buffer\ pool=27.20,Cache\ (objects)=6.50,Cache\ (sql\ plans)=31.50,Other=34.80 1453876411474582877
-> Memory\ breakdown\ (bytes),servername=WIN8-DEV,type=Memory\ clerk Buffer\ pool=100016128.00,Cache\ (objects)=23904256.00,Cache\ (sql\ plans)=115621888.00,Other=127942656.00 1453876411474655779
-> Log\ size\ (bytes),servername=WIN8-DEV,type=Database\ size AdventureWorks2014=538968064i,Australian=1048576i,DOC.Azure=786432i,ResumeCloud=786432i,master=2359296i,model=4325376i,msdb=30212096i,ngMon=1048576i,tempdb=4194304i 1453876411497506186
-> Rows\ size\ (bytes),servername=WIN8-DEV,type=Database\ size AdventureWorks2014=2362703872i,Australian=3211264i,DOC.Azure=26083328i,ResumeCloud=10551296i,master=5111808i,model=3342336i,msdb=24051712i,ngMon=46137344i,tempdb=1073741824i 1453876411497557587
-> CPU\ (%),servername=WIN8-DEV,type=CPU\ usage External\ process=1i,SQL\ process=0i,SystemIdle=99i 1453876411546452385
-> Log\ read\ latency\ (ms),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=28i,Australian=7i,DOC.Azure=2i,ResumeCloud=3i,master=13i,model=35i,msdb=33i,ngMon=12i,tempdb=2i 1453876411559643935
-> Log\ write\ latency\ (ms),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=1i,model=0i,msdb=0i,ngMon=0i,tempdb=15i 1453876411559700937
-> Rows\ read\ latency\ (ms),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=39i,Australian=18i,DOC.Azure=39i,ResumeCloud=48i,master=26i,model=9i,msdb=29i,ngMon=42i,tempdb=63i 1453876411559729338
-> Rows\ write\ latency\ (ms),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=7i,model=0i,msdb=5i,ngMon=0i,tempdb=3i 1453876411559767639
-> Rows\ (average\ bytes/read),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=786310i,Australian=62968i,DOC.Azure=515034i,ResumeCloud=203113i,master=63126i,model=60503i,msdb=56555i,ngMon=156254i,tempdb=148091i 1453876411559790439
-> Rows\ (average\ bytes/write),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=9011i,Australian=8192i,DOC.Azure=8192i,ResumeCloud=8192i,master=8192i,model=8192i,msdb=8960i,ngMon=8192i,tempdb=32768i 1453876411559815940
-> Log\ (average\ bytes/read),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=66560i,Australian=57856i,DOC.Azure=13312i,ResumeCloud=28086i,master=39384i,model=13653i,msdb=29857i,ngMon=50688i,tempdb=143945i 1453876411559838741
-> Log\ (average\ bytes/write),servername=WIN8-DEV,type=Database\ stats AdventureWorks2014=4949i,Australian=5213i,DOC.Azure=6264i,ResumeCloud=5213i,master=4256i,model=5120i,msdb=5412i,ngMon=5120i,tempdb=55033i 1453876411559861941
-> Performance\ metrics,servername=WIN8-DEV,type=Performance\ metrics Available\ physical\ memory\ (bytes)=5708369920i,Average\ pending\ disk\ IO=0i,Average\ runnable\ tasks=0i,Average\ tasks=9i,Buffer\ pool\ rate\ (bytes/sec)=2194i,Connection\ memory\ per\ connection\ (bytes)=120832i,Memory\ grant\ pending=0i,Page\ File\ Usage\ (%)=32i,Page\ lookup\ per\ batch\ request=162800i,Page\ split\ per\ batch\ request=377i,Point\ In\ Time\ Recovery=0i,Readahead\ per\ page\ read=19i,Signal\ wait\ (%)=18i,Sql\ compilation\ per\ batch\ request=501i,Sql\ recompilation\ per\ batch\ request=230i,Total\ target\ memory\ ratio=27i 1453876411621085067
-> Volume\ total\ space\ (bytes),servername=WIN8-DEV,type=OS\ Volume\ space C:=135338651648.00,D:\ (DATA)=32075874304.00,L:\ (LOG)=10701701120.00 1453876411645554817
-> Volume\ available\ space\ (bytes),servername=WIN8-DEV,type=OS\ Volume\ space C:=59092901888.00,D:\ (DATA)=28439674880.00,L:\ (LOG)=10107617280.00 1453876411645599018
-> Volume\ used\ space\ (bytes),servername=WIN8-DEV,type=OS\ Volume\ space C:=76245749760.00,D:\ (DATA)=3636199424.00,L:\ (LOG)=594083840.00 1453876411645619518
-> Volume\ used\ space\ (%),servername=WIN8-DEV,type=OS\ Volume\ space C:=56.00,D:\ (DATA)=11.00,L:\ (LOG)=6.00 1453876411645639419
-> Recovery\ Model\ FULL,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=1i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=1i,msdb=0i,ngMon=0i,tempdb=0i,total=2i 1453876411649946833
-> Recovery\ Model\ BULK_LOGGED,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650019335
-> Recovery\ Model\ SIMPLE,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=1i,DOC.Azure=1i,ResumeCloud=1i,master=1i,model=0i,msdb=1i,ngMon=1i,tempdb=1i,total=7i 1453876411650045636
-> State\ ONLINE,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=1i,Australian=1i,DOC.Azure=1i,ResumeCloud=1i,master=1i,model=1i,msdb=1i,ngMon=1i,tempdb=1i,total=9i 1453876411650071137
-> State\ RESTORING,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650095937
-> State\ RECOVERING,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650119138
-> State\ RECOVERY_PENDING,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650154939
-> State\ SUSPECT,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650177939
-> State\ EMERGENCY,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650201140
-> State\ OFFLINE,servername=WIN8-DEV,type=Database\ properties AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i,total=0i 1453876411650222841
-> AU\ cleanup\ batches/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515666120
-> AU\ cleanups/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515723222
-> By-reference\ Lob\ Create\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515741722
-> By-reference\ Lob\ Use\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515754423
-> Count\ Lob\ Readahead\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515780423
-> Count\ Pull\ In\ Row\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515806724
-> Count\ Push\ Off\ Row\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515818924
-> Deferred\ dropped\ AUs\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515832925
-> Deferred\ Dropped\ rowsets\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515844225
-> Dropped\ rowset\ cleanups/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515856425
-> Dropped\ rowsets\ skipped/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515882726
-> Extent\ Deallocations/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412515902227
-> Extents\ Allocated/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=5i 1453876412515947828
-> Failed\ AU\ cleanup\ batches/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515963628
-> Failed\ leaf\ page\ cookie\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412515981729
-> Failed\ tree\ page\ cookie\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516030230
-> Forwarded\ Records/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516043030
-> FreeSpace\ Page\ Fetches/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=6i 1453876412516065131
-> FreeSpace\ Scans/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=6i 1453876412516076631
-> Full\ Scans/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=132i 1453876412516088332
-> Index\ Searches/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=3387i 1453876412516122932
-> InSysXact\ waits/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516138833
-> LobHandle\ Create\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516151733
-> LobHandle\ Destroy\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516163134
-> LobSS\ Provider\ Create\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=5i 1453876412516176834
-> LobSS\ Provider\ Destroy\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=5i 1453876412516237036
-> LobSS\ Provider\ Truncation\ Count\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516249536
-> Mixed\ page\ allocations/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=36i 1453876412516261536
-> Page\ compression\ attempts/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516272536
-> Page\ Deallocations/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=14i 1453876412516284237
-> Page\ Splits/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=24i 1453876412516310037
-> Pages\ Allocated/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=50i 1453876412516321338
-> Pages\ compressed/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516333038
-> Probe\ Scans/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=724i 1453876412516343338
-> Range\ Scans/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=610i 1453876412516356639
-> Scan\ Point\ Revalidations/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412516381539
-> Skipped\ Ghosted\ Records/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=9i 1453876412516392940
-> Table\ Lock\ Escalations/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516404740
-> Used\ leaf\ page\ cookie\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516415540
-> Used\ tree\ page\ cookie\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516427241
-> Workfiles\ Created/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=144i 1453876412516451441
-> Worktables\ Created/sec\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=46i 1453876412516464242
-> Worktables\ From\ Cache\ Base\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516475942
-> Worktables\ From\ Cache\ Ratio\ |\ Access\ Methods,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412516487742
-> Bytes\ Received\ from\ Replica/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516499642
-> Bytes\ Sent\ to\ Replica/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516524443
-> Bytes\ Sent\ to\ Transport/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516537143
-> Flow\ Control\ Time\ (ms/sec)\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516549644
-> Flow\ Control/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516560444
-> Receives\ from\ Replica/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516576045
-> Resent\ Messages/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516624246
-> Sends\ to\ Replica/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516643746
-> Sends\ to\ Transport/sec\ |\ _Total\ |\ Availability\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516656347
-> Batches\ >=000000ms\ &\ <000001ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=265i 1453876412516666947
-> Batches\ >=000000ms\ &\ <000001ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516678947
-> Batches\ >=000000ms\ &\ <000001ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=261i 1453876412516719248
-> Batches\ >=000000ms\ &\ <000001ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412516731249
-> Batches\ >=000001ms\ &\ <000002ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=86i 1453876412516745149
-> Batches\ >=000001ms\ &\ <000002ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=86i 1453876412516756149
-> Batches\ >=000001ms\ &\ <000002ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=31i 1453876412516767750
-> Batches\ >=000001ms\ &\ <000002ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=31i 1453876412516794050
-> Batches\ >=000002ms\ &\ <000005ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=116i 1453876412516805351
-> Batches\ >=000002ms\ &\ <000005ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=257i 1453876412516817051
-> Batches\ >=000002ms\ &\ <000005ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=43i 1453876412516830151
-> Batches\ >=000002ms\ &\ <000005ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=108i 1453876412516842152
-> Batches\ >=000005ms\ &\ <000010ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=199i 1453876412516869752
-> Batches\ >=000005ms\ &\ <000010ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1676i 1453876412516881053
-> Batches\ >=000005ms\ &\ <000010ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=60i 1453876412516918754
-> Batches\ >=000005ms\ &\ <000010ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=440i 1453876412516935054
-> Batches\ >=000010ms\ &\ <000020ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=193i 1453876412516947954
-> Batches\ >=000010ms\ &\ <000020ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=2327i 1453876412516976455
-> Batches\ >=000010ms\ &\ <000020ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=117i 1453876412516987855
-> Batches\ >=000010ms\ &\ <000020ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1619i 1453876412516999656
-> Batches\ >=000020ms\ &\ <000050ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=586i 1453876412517010356
-> Batches\ >=000020ms\ &\ <000050ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=18826i 1453876412517021956
-> Batches\ >=000020ms\ &\ <000050ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=307i 1453876412517066858
-> Batches\ >=000020ms\ &\ <000050ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=10144i 1453876412517079258
-> Batches\ >=000050ms\ &\ <000100ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=283i 1453876412517095158
-> Batches\ >=000050ms\ &\ <000100ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=22015i 1453876412517112259
-> Batches\ >=000050ms\ &\ <000100ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=234i 1453876412517138159
-> Batches\ >=000050ms\ &\ <000100ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=16312i 1453876412517169260
-> Batches\ >=000100ms\ &\ <000200ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=338i 1453876412517180961
-> Batches\ >=000100ms\ &\ <000200ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=54584i 1453876412517192961
-> Batches\ >=000100ms\ &\ <000200ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=239i 1453876412517203761
-> Batches\ >=000100ms\ &\ <000200ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=37309i 1453876412517217362
-> Batches\ >=000200ms\ &\ <000500ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=101i 1453876412517245062
-> Batches\ >=000200ms\ &\ <000500ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=25711i 1453876412517256463
-> Batches\ >=000200ms\ &\ <000500ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=321i 1453876412517269763
-> Batches\ >=000200ms\ &\ <000500ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=85623i 1453876412517280463
-> Batches\ >=000500ms\ &\ <001000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412517292064
-> Batches\ >=000500ms\ &\ <001000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1270i 1453876412517320064
-> Batches\ >=000500ms\ &\ <001000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=10i 1453876412517332465
-> Batches\ >=000500ms\ &\ <001000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=6518i 1453876412517344465
-> Batches\ >=001000ms\ &\ <002000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517354965
-> Batches\ >=001000ms\ &\ <002000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517366666
-> Batches\ >=001000ms\ &\ <002000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=184i 1453876412517406967
-> Batches\ >=001000ms\ &\ <002000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=209039i 1453876412517420367
-> Batches\ >=002000ms\ &\ <005000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517432467
-> Batches\ >=002000ms\ &\ <005000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517443168
-> Batches\ >=002000ms\ &\ <005000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517458668
-> Batches\ >=002000ms\ &\ <005000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517486269
-> Batches\ >=005000ms\ &\ <010000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517499269
-> Batches\ >=005000ms\ &\ <010000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517512669
-> Batches\ >=005000ms\ &\ <010000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=360i 1453876412517523870
-> Batches\ >=005000ms\ &\ <010000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1816241i 1453876412517535770
-> Batches\ >=010000ms\ &\ <020000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517564171
-> Batches\ >=010000ms\ &\ <020000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517575571
-> Batches\ >=010000ms\ &\ <020000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517587571
-> Batches\ >=010000ms\ &\ <020000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517597872
-> Batches\ >=020000ms\ &\ <050000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412517609472
-> Batches\ >=020000ms\ &\ <050000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=20954i 1453876412517634873
-> Batches\ >=020000ms\ &\ <050000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412517645673
-> Batches\ >=020000ms\ &\ <050000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=28069i 1453876412517657173
-> Batches\ >=050000ms\ &\ <100000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517667574
-> Batches\ >=050000ms\ &\ <100000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517679174
-> Batches\ >=050000ms\ &\ <100000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517734775
-> Batches\ >=050000ms\ &\ <100000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517747276
-> Batches\ >=100000ms\ |\ CPU\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517759476
-> Batches\ >=100000ms\ |\ CPU\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517771476
-> Batches\ >=100000ms\ |\ Elapsed\ Time:Requests\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517783377
-> Batches\ >=100000ms\ |\ Elapsed\ Time:Total(ms)\ |\ Batch\ Resp\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517809077
-> Stored\ Procedures\ Invoked/sec\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517820378
-> Task\ Limit\ Reached\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412517831978
-> Task\ Limit\ Reached/sec\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517843478
-> Tasks\ Aborted/sec\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517870579
-> Tasks\ Running\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517915980
-> Tasks\ Started/sec\ |\ _Total\ |\ Broker\ Activation,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517930480
-> Activation\ Errors\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517942581
-> Broker\ Transaction\ Rollbacks\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517956181
-> Corrupted\ Messages\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517968982
-> Dequeued\ TransmissionQ\ Msgs/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412517992382
-> Dialog\ Timer\ Event\ Count\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518002982
-> Dropped\ Messages\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518016083
-> Enqueued\ Local\ Messages\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518026883
-> Enqueued\ Local\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518038183
-> Enqueued\ Messages\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518061484
-> Enqueued\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518072084
-> Enqueued\ P1\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518083385
-> Enqueued\ P10\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518093785
-> Enqueued\ P2\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518111585
-> Enqueued\ P3\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518145586
-> Enqueued\ P4\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518166287
-> Enqueued\ P5\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518187587
-> Enqueued\ P6\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518203488
-> Enqueued\ P7\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518223488
-> Enqueued\ P8\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518286490
-> Enqueued\ P9\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518310291
-> Enqueued\ TransmissionQ\ Msgs/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518330291
-> Enqueued\ Transport\ Msg\ Frag\ Tot\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518346092
-> Enqueued\ Transport\ Msg\ Frags/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518363392
-> Enqueued\ Transport\ Msgs\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518404593
-> Enqueued\ Transport\ Msgs/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518424494
-> Forwarded\ Messages\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518446394
-> Forwarded\ Messages/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518486895
-> Forwarded\ Msg\ Byte\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518508596
-> Forwarded\ Msg\ Bytes/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518548897
-> Forwarded\ Msg\ Discarded\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518572198
-> Forwarded\ Msgs\ Discarded/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518592098
-> Forwarded\ Pending\ Msg\ Bytes\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518608698
-> Forwarded\ Pending\ Msg\ Count\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518626999
-> SQL\ RECEIVE\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518671100
-> SQL\ RECEIVEs/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518683400
-> SQL\ SEND\ Total\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518694801
-> SQL\ SENDs/sec\ |\ Broker\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518705301
-> Avg.\ Length\ of\ Batched\ Writes\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518716501
-> Avg.\ Length\ of\ Batched\ Writes\ BS\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412518741102
-> Avg.\ Time\ Between\ Batches\ (ms)\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=2062i 1453876412518752002
-> Avg.\ Time\ Between\ Batches\ Base\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412518763803
-> Avg.\ Time\ to\ Write\ Batch\ (ms)\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518774503
-> Avg.\ Time\ to\ Write\ Batch\ Base\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412518787903
-> Transmission\ Obj\ Gets/Sec\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518812104
-> Transmission\ Obj\ Set\ Dirty/Sec\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518824504
-> Transmission\ Obj\ Writes/Sec\ |\ Broker\ TO\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518853005
-> Current\ Bytes\ for\ Recv\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518864005
-> Current\ Bytes\ for\ Send\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518876906
-> Current\ Msg\ Frags\ for\ Send\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518928607
-> Message\ Fragment\ P1\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518944407
-> Message\ Fragment\ P10\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518956508
-> Message\ Fragment\ P2\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518966908
-> Message\ Fragment\ P3\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412518978108
-> Message\ Fragment\ P4\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519004309
-> Message\ Fragment\ P5\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519016509
-> Message\ Fragment\ P6\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519027810
-> Message\ Fragment\ P7\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519038010
-> Message\ Fragment\ P8\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519049010
-> Message\ Fragment\ P9\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519074911
-> Message\ Fragment\ Receives/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519087211
-> Message\ Fragment\ Sends/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519104212
-> Msg\ Fragment\ Recv\ Size\ Avg\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519137113
-> Msg\ Fragment\ Recv\ Size\ Avg\ Base\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519150413
-> Msg\ Fragment\ Send\ Size\ Avg\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519175214
-> Msg\ Fragment\ Send\ Size\ Avg\ Base\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519186014
-> Open\ Connection\ Count\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519197514
-> Pending\ Bytes\ for\ Recv\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519207814
-> Pending\ Bytes\ for\ Send\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519221515
-> Pending\ Msg\ Frags\ for\ Recv\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519245015
-> Pending\ Msg\ Frags\ for\ Send\ I/O\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519255516
-> Receive\ I/O\ bytes/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519267116
-> Receive\ I/O\ Len\ Avg\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519277516
-> Receive\ I/O\ Len\ Avg\ Base\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519289017
-> Receive\ I/Os/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519327718
-> Recv\ I/O\ Buffer\ Copies\ bytes/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519339718
-> Recv\ I/O\ Buffer\ Copies\ Count\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519355918
-> Send\ I/O\ bytes/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519372119
-> Send\ I/O\ Len\ Avg\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519383919
-> Send\ I/O\ Len\ Avg\ Base\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519414420
-> Send\ I/Os/sec\ |\ Broker/DBM\ Transport,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519425520
-> Background\ writer\ pages/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519436720
-> Buffer\ cache\ hit\ ratio\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412519447021
-> Buffer\ cache\ hit\ ratio\ base\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=7341i 1453876412519458421
-> Checkpoint\ pages/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519481922
-> Database\ pages\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=12217i 1453876412519493222
-> Extension\ allocated\ pages\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519518323
-> Extension\ free\ pages\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519529023
-> Extension\ in\ use\ as\ percentage\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519540323
-> Extension\ outstanding\ IO\ counter\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519567224
-> Extension\ page\ evictions/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519582924
-> Extension\ page\ reads/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519595025
-> Extension\ page\ unreferenced\ time\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519609425
-> Extension\ page\ writes/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519621425
-> Free\ list\ stalls/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519644326
-> Integral\ Controller\ Slope\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=10i 1453876412519655926
-> Lazy\ writes/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519683827
-> Page\ life\ expectancy\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=45614i 1453876412519698327
-> Page\ lookups/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=7427i 1453876412519709828
-> Page\ reads/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519732628
-> Page\ writes/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519743529
-> Readahead\ pages/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519754729
-> Readahead\ time/sec\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412519764929
-> Target\ pages\ |\ Buffer\ Manager,servername=WIN8-DEV,type=Performance\ counters value=16367616i 1453876412519779730
-> Database\ pages\ |\ 000\ |\ Buffer\ Node,servername=WIN8-DEV,type=Performance\ counters value=12217i 1453876412519818131
-> Local\ node\ page\ lookups/sec\ |\ 000\ |\ Buffer\ Node,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519830031
-> Page\ life\ expectancy\ |\ 000\ |\ Buffer\ Node,servername=WIN8-DEV,type=Performance\ counters value=45614i 1453876412519841831
-> Remote\ node\ page\ lookups/sec\ |\ 000\ |\ Buffer\ Node,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519852232
-> Cache\ Entries\ Count\ |\ _Total\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=2589i 1453876412519863832
-> Cache\ Entries\ Count\ |\ mssqlsystemresource\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=2212i 1453876412519893033
-> Cache\ Entries\ Pinned\ Count\ |\ _Total\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=5i 1453876412519916933
-> Cache\ Entries\ Pinned\ Count\ |\ mssqlsystemresource\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412519932234
-> Cache\ Hit\ Ratio\ |\ _Total\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412519943534
-> Cache\ Hit\ Ratio\ |\ mssqlsystemresource\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412519955034
-> Cache\ Hit\ Ratio\ Base\ |\ _Total\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=1883i 1453876412519978935
-> Cache\ Hit\ Ratio\ Base\ |\ mssqlsystemresource\ |\ Catalog\ Metadata,servername=WIN8-DEV,type=Performance\ counters value=444i 1453876412519989735
-> CLR\ Execution\ |\ CLR,servername=WIN8-DEV,type=Performance\ counters value=339517i 1453876412520001435
-> Active\ cursors\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520011836
-> Active\ cursors\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520025336
-> Active\ cursors\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520049937
-> Active\ cursors\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520060837
-> Cache\ Hit\ Ratio\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520072437
-> Cache\ Hit\ Ratio\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520084438
-> Cache\ Hit\ Ratio\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520101238
-> Cache\ Hit\ Ratio\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520156440
-> Cache\ Hit\ Ratio\ Base\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520168740
-> Cache\ Hit\ Ratio\ Base\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520180740
-> Cache\ Hit\ Ratio\ Base\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520193241
-> Cache\ Hit\ Ratio\ Base\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520209441
-> Cached\ Cursor\ Counts\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520237442
-> Cached\ Cursor\ Counts\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520248742
-> Cached\ Cursor\ Counts\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520260542
-> Cached\ Cursor\ Counts\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520271243
-> Cursor\ Cache\ Use\ Counts/sec\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520285143
-> Cursor\ Cache\ Use\ Counts/sec\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520325944
-> Cursor\ Cache\ Use\ Counts/sec\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520338144
-> Cursor\ Cache\ Use\ Counts/sec\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520350145
-> Cursor\ memory\ usage\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520360945
-> Cursor\ memory\ usage\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520372545
-> Cursor\ memory\ usage\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520397346
-> Cursor\ memory\ usage\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520408246
-> Cursor\ Requests/sec\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520420147
-> Cursor\ Requests/sec\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520444947
-> Cursor\ Requests/sec\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520458648
-> Cursor\ Requests/sec\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520483948
-> Cursor\ worktable\ usage\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520494849
-> Cursor\ worktable\ usage\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520506249
-> Cursor\ worktable\ usage\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520516749
-> Cursor\ worktable\ usage\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520528349
-> Number\ of\ active\ cursor\ plans\ |\ _Total\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520552950
-> Number\ of\ active\ cursor\ plans\ |\ API\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520565650
-> Number\ of\ active\ cursor\ plans\ |\ TSQL\ Global\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520582651
-> Number\ of\ active\ cursor\ plans\ |\ TSQL\ Local\ Cursor\ |\ Cursor\ Manager\ by\ Type,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520595851
-> Async\ population\ count\ |\ Cursor\ Manager\ Total,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520607652
-> Cursor\ conversion\ rate\ |\ Cursor\ Manager\ Total,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520653453
-> Cursor\ flushes\ |\ Cursor\ Manager\ Total,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520676953
-> File\ Bytes\ Received/sec\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520691854
-> Log\ Bytes\ Received/sec\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520702454
-> Log\ remaining\ for\ undo\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520713954
-> Log\ Send\ Queue\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520737655
-> Mirrored\ Write\ Transactions/sec\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520750455
-> Recovery\ Queue\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520763456
-> Redo\ blocked/sec\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520773956
-> Redo\ Bytes\ Remaining\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520785256
-> Redone\ Bytes/sec\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520808457
-> Total\ Log\ requiring\ undo\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520818857
-> Transaction\ Delay\ |\ _Total\ |\ Database\ Replica,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520830357
-> Active\ Transactions\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520840458
-> Active\ Transactions\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520852958
-> Backup/Restore\ Throughput/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520877359
-> Backup/Restore\ Throughput/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520887959
-> Bulk\ Copy\ Rows/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520899059
-> Bulk\ Copy\ Rows/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520925360
-> Bulk\ Copy\ Throughput/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520939560
-> Bulk\ Copy\ Throughput/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520965161
-> Commit\ table\ entries\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520976061
-> Commit\ table\ entries\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412520999262
-> Data\ File(s)\ Size\ (KB)\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=3512576i 1453876412521010862
-> Data\ File(s)\ Size\ (KB)\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=40960i 1453876412521022563
-> DBCC\ Logical\ Scan\ Bytes/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521048563
-> DBCC\ Logical\ Scan\ Bytes/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521062964
-> Group\ Commit\ Time/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521075064
-> Group\ Commit\ Time/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521086864
-> Log\ Bytes\ Flushed/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=483328i 1453876412521100065
-> Log\ Bytes\ Flushed/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521160066
-> Log\ Cache\ Hit\ Ratio\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521177567
-> Log\ Cache\ Hit\ Ratio\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521190167
-> Log\ Cache\ Hit\ Ratio\ Base\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521200567
-> Log\ Cache\ Hit\ Ratio\ Base\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521212368
-> Log\ Cache\ Reads/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521236568
-> Log\ Cache\ Reads/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521247369
-> Log\ File(s)\ Size\ (KB)\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=570992i 1453876412521258769
-> Log\ File(s)\ Size\ (KB)\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=1016i 1453876412521269969
-> Log\ File(s)\ Used\ Size\ (KB)\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=317272i 1453876412521284270
-> Log\ File(s)\ Used\ Size\ (KB)\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=634i 1453876412521310470
-> Log\ Flush\ Wait\ Time\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521321671
-> Log\ Flush\ Wait\ Time\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521336771
-> Log\ Flush\ Waits/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521347671
-> Log\ Flush\ Waits/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521361972
-> Log\ Flush\ Write\ Time\ (ms)\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=13i 1453876412521387272
-> Log\ Flush\ Write\ Time\ (ms)\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521398473
-> Log\ Flushes/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=8i 1453876412521410273
-> Log\ Flushes/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521420973
-> Log\ Growths\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521432473
-> Log\ Growths\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521457774
-> Log\ Pool\ Cache\ Misses/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521468574
-> Log\ Pool\ Cache\ Misses/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521479975
-> Log\ Pool\ Disk\ Reads/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521490375
-> Log\ Pool\ Disk\ Reads/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521501775
-> Log\ Pool\ Requests/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521527776
-> Log\ Pool\ Requests/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521540876
-> Log\ Shrinks\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521556077
-> Log\ Shrinks\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521577877
-> Log\ Truncations\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=81i 1453876412521591878
-> Log\ Truncations\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521628379
-> Percent\ Log\ Used\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=55i 1453876412521639779
-> Percent\ Log\ Used\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=62i 1453876412521653179
-> Repl.\ Pending\ Xacts\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521663780
-> Repl.\ Pending\ Xacts\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521675280
-> Repl.\ Trans.\ Rate\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521701881
-> Repl.\ Trans.\ Rate\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521712981
-> Shrink\ Data\ Movement\ Bytes/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521724581
-> Shrink\ Data\ Movement\ Bytes/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521734982
-> Tracked\ transactions/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521746582
-> Tracked\ transactions/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521784183
-> Transactions/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=111i 1453876412521798783
-> Transactions/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=9i 1453876412521810484
-> Write\ Transactions/sec\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=54i 1453876412521820884
-> Write\ Transactions/sec\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521832084
-> XTP\ Memory\ Used\ (KB)\ |\ _Total\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521858885
-> XTP\ Memory\ Used\ (KB)\ |\ mssqlsystemresource\ |\ Databases,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521869885
-> Usage\ |\ '#'\ and\ '##'\ as\ the\ name\ of\ temporary\ tables\ and\ stored\ procedures\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521881185
-> Usage\ |\ '::'\ function\ calling\ syntax\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521892486
-> Usage\ |\ '@'\ and\ names\ that\ start\ with\ '@@'\ as\ Transact-SQL\ identifiers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521914186
-> Usage\ |\ ADDING\ TAPE\ DEVICE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521944987
-> Usage\ |\ ALL\ Permission\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521956487
-> Usage\ |\ ALTER\ DATABASE\ WITH\ TORN_PAGE_DETECTION\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521971288
-> Usage\ |\ ALTER\ LOGIN\ WITH\ SET\ CREDENTIAL\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412521985288
-> Usage\ |\ asymmetric_keys\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522000189
-> Usage\ |\ asymmetric_keys.attested_by\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522049290
-> Usage\ |\ Azeri_Cyrillic_90\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522066290
-> Usage\ |\ Azeri_Latin_90\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522082791
-> Usage\ |\ BACKUP\ DATABASE\ or\ LOG\ TO\ TAPE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522102491
-> Usage\ |\ certificates\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522124292
-> Usage\ |\ certificates.attested_by\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522150593
-> Usage\ |\ Create/alter\ SOAP\ endpoint\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522161493
-> Usage\ |\ CREATE_DROP_DEFAULT\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522175393
-> Usage\ |\ CREATE_DROP_RULE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522186093
-> Usage\ |\ Data\ types:\ text\ ntext\ or\ image\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522197594
-> Usage\ |\ Database\ compatibility\ level\ 100\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522223894
-> Usage\ |\ Database\ compatibility\ level\ 110\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412522234995
-> Usage\ |\ Database\ compatibility\ level\ 90\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522249695
-> Usage\ |\ Database\ Mirroring\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522260995
-> Usage\ |\ DATABASEPROPERTY\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522272596
-> Usage\ |\ DATABASEPROPERTYEX('IsFullTextEnabled')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522297496
-> Usage\ |\ DBCC\ [UN]PINTABLE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522308597
-> Usage\ |\ DBCC\ DBREINDEX\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522320097
-> Usage\ |\ DBCC\ INDEXDEFRAG\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522330797
-> Usage\ |\ DBCC\ SHOWCONTIG\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522342298
-> Usage\ |\ DBCC_EXTENTINFO\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522367798
-> Usage\ |\ DBCC_IND\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522378699
-> Usage\ |\ DEFAULT\ keyword\ as\ a\ default\ value\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522390399
-> Usage\ |\ Deprecated\ Attested\ Option\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522400899
-> Usage\ |\ Deprecated\ encryption\ algorithm\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522425100
-> Usage\ |\ DESX\ algorithm\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522467701
-> Usage\ |\ dm_fts_active_catalogs\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522483201
-> Usage\ |\ dm_fts_active_catalogs.is_paused\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522494802
-> Usage\ |\ dm_fts_active_catalogs.previous_status\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522505102
-> Usage\ |\ dm_fts_active_catalogs.previous_status_description\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522518302
-> Usage\ |\ dm_fts_active_catalogs.row_count_in_thousands\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522543103
-> Usage\ |\ dm_fts_active_catalogs.status\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522559203
-> Usage\ |\ dm_fts_active_catalogs.status_description\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522572204
-> Usage\ |\ dm_fts_active_catalogs.worker_count\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522595904
-> Usage\ |\ dm_fts_memory_buffers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522611105
-> Usage\ |\ dm_fts_memory_buffers.row_count\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522635505
-> Usage\ |\ DROP\ INDEX\ with\ two-part\ name\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522646406
-> Usage\ |\ endpoint_webmethods\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522658106
-> Usage\ |\ EXTPROP_LEVEL0TYPE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522668306
-> Usage\ |\ EXTPROP_LEVEL0USER\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522681607
-> Usage\ |\ FILE_ID\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522705307
-> Usage\ |\ fn_get_sql\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522717808
-> Usage\ |\ fn_servershareddrives\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522731008
-> Usage\ |\ fn_trace_geteventinfo\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522741408
-> Usage\ |\ fn_trace_getfilterinfo\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522752709
-> Usage\ |\ fn_trace_getinfo\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522778009
-> Usage\ |\ fn_trace_gettable\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522788809
-> Usage\ |\ fn_virtualservernodes\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522800010
-> Usage\ |\ fulltext_catalogs\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522810210
-> Usage\ |\ fulltext_catalogs.data_space_id\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522823010
-> Usage\ |\ fulltext_catalogs.file_id\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522864011
-> Usage\ |\ fulltext_catalogs.path\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522877112
-> Usage\ |\ FULLTEXTCATALOGPROPERTY('LogSize')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522889212
-> Usage\ |\ FULLTEXTCATALOGPROPERTY('PopulateStatus')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522899712
-> Usage\ |\ FULLTEXTSERVICEPROPERTY('ConnectTimeout')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522939013
-> Usage\ |\ FULLTEXTSERVICEPROPERTY('DataTimeout')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522982115
-> Usage\ |\ FULLTEXTSERVICEPROPERTY('ResourceUsage')\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412522994915
-> Usage\ |\ GROUP\ BY\ ALL\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523006415
-> Usage\ |\ Hindi\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523019416
-> Usage\ |\ IDENTITYCOL\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523030816
-> Usage\ |\ IN\ PATH\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523054817
-> Usage\ |\ Index\ view\ select\ list\ without\ COUNT_BIG(*)\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523070517
-> Usage\ |\ INDEX_OPTION\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523082917
-> Usage\ |\ INDEXKEY_PROPERTY\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523093118
-> Usage\ |\ Indirect\ TVF\ hints\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523109018
-> Usage\ |\ INSERT\ NULL\ into\ TIMESTAMP\ columns\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523136519
-> Usage\ |\ INSERT_HINTS\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523149419
-> Usage\ |\ Korean_Wansung_Unicode\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523164019
-> Usage\ |\ Lithuanian_Classic\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523174620
-> Usage\ |\ Macedonian\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523186520
-> Usage\ |\ MODIFY\ FILEGROUP\ READONLY\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523214321
-> Usage\ |\ MODIFY\ FILEGROUP\ READWRITE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523225521
-> Usage\ |\ More\ than\ two-part\ column\ name\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523237121
-> Usage\ |\ Multiple\ table\ hints\ without\ comma\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523247822
-> Usage\ |\ NOLOCK\ or\ READUNCOMMITTED\ in\ UPDATE\ or\ DELETE\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523259522
-> Usage\ |\ Numbered\ stored\ procedures\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523285723
-> Usage\ |\ numbered_procedure_parameters\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523296823
-> Usage\ |\ numbered_procedures\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523309923
-> Usage\ |\ objidupdate\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523320524
-> Usage\ |\ Old\ NEAR\ Syntax\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523335124
-> Usage\ |\ OLEDB\ for\ ad\ hoc\ connections\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523374225
-> Usage\ |\ PERMISSIONS\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523400326
-> Usage\ |\ READTEXT\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523412626
-> Usage\ |\ REMSERVER\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523425326
-> Usage\ |\ RESTORE\ DATABASE\ or\ LOG\ WITH\ MEDIAPASSWORD\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523436927
-> Usage\ |\ RESTORE\ DATABASE\ or\ LOG\ WITH\ PASSWORD\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523461727
-> Usage\ |\ Returning\ results\ from\ trigger\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523472828
-> Usage\ |\ ROWGUIDCOL\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523486128
-> Usage\ |\ SET\ ANSI_NULLS\ OFF\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523496828
-> Usage\ |\ SET\ ANSI_PADDING\ OFF\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523510229
-> Usage\ |\ SET\ CONCAT_NULL_YIELDS_NULL\ OFF\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523539229
-> Usage\ |\ SET\ ERRLVL\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523551030
-> Usage\ |\ SET\ FMTONLY\ ON\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523564530
-> Usage\ |\ SET\ OFFSETS\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523576930
-> Usage\ |\ SET\ REMOTE_PROC_TRANSACTIONS\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523591931
-> Usage\ |\ SET\ ROWCOUNT\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523625132
-> Usage\ |\ SETUSER\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523636932
-> Usage\ |\ soap_endpoints\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523648532
-> Usage\ |\ sp_addapprole\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523659133
-> Usage\ |\ sp_addextendedproc\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523670433
-> Usage\ |\ sp_addlogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523695334
-> Usage\ |\ sp_addremotelogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523706634
-> Usage\ |\ sp_addrole\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523718134
-> Usage\ |\ sp_addrolemember\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523728534
-> Usage\ |\ sp_addserver\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523740035
-> Usage\ |\ sp_addsrvrolemember\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523764935
-> Usage\ |\ sp_addtype\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523777236
-> Usage\ |\ sp_adduser\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523788836
-> Usage\ |\ sp_approlepassword\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523798936
-> Usage\ |\ sp_attach_db\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523811837
-> Usage\ |\ sp_attach_single_file_db\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523856038
-> Usage\ |\ sp_bindefault\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523868238
-> Usage\ |\ sp_bindrule\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523879738
-> Usage\ |\ sp_bindsession\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523889939
-> Usage\ |\ sp_certify_removable\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523901139
-> Usage\ |\ sp_change_users_login\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523943340
-> Usage\ |\ sp_changedbowner\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523954940
-> Usage\ |\ sp_changeobjectowner\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523966741
-> Usage\ |\ sp_configure\ 'affinity\ mask'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523978741
-> Usage\ |\ sp_configure\ 'affinity64\ mask'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412523990641
-> Usage\ |\ sp_configure\ 'allow\ updates'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524016742
-> Usage\ |\ sp_configure\ 'c2\ audit\ mode'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524031542
-> Usage\ |\ sp_configure\ 'default\ trace\ enabled'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524046343
-> Usage\ |\ sp_configure\ 'disallow\ results\ from\ triggers'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524057343
-> Usage\ |\ sp_configure\ 'ft\ crawl\ bandwidth\ (max)'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524069043
-> Usage\ |\ sp_configure\ 'ft\ crawl\ bandwidth\ (min)'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524093444
-> Usage\ |\ sp_configure\ 'ft\ notify\ bandwidth\ (max)'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524111545
-> Usage\ |\ sp_configure\ 'ft\ notify\ bandwidth\ (min)'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524144745
-> Usage\ |\ sp_configure\ 'locks'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524155646
-> Usage\ |\ sp_configure\ 'open\ objects'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524167246
-> Usage\ |\ sp_configure\ 'priority\ boost'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524192247
-> Usage\ |\ sp_configure\ 'remote\ proc\ trans'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524206447
-> Usage\ |\ sp_configure\ 'set\ working\ set\ size'\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524218347
-> Usage\ |\ sp_control_dbmasterkey_password\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524230848
-> Usage\ |\ sp_create_removable\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524242348
-> Usage\ |\ sp_db_increased_partitions\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524281149
-> Usage\ |\ sp_db_selective_xml_index\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524294249
-> Usage\ |\ sp_db_vardecimal_storage_format\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524305750
-> Usage\ |\ sp_dbcmptlevel\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524316050
-> Usage\ |\ sp_dbfixedrolepermission\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524329050
-> Usage\ |\ sp_dbremove\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524352651
-> Usage\ |\ sp_defaultdb\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524363451
-> Usage\ |\ sp_defaultlanguage\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524374852
-> Usage\ |\ sp_denylogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524384952
-> Usage\ |\ sp_depends\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524399052
-> Usage\ |\ sp_detach_db\ @keepfulltextindexfile\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524423953
-> Usage\ |\ sp_dropapprole\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524434753
-> Usage\ |\ sp_dropextendedproc\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524446053
-> Usage\ |\ sp_droplogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524456454
-> Usage\ |\ sp_dropremotelogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524467554
-> Usage\ |\ sp_droprole\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524492655
-> Usage\ |\ sp_droprolemember\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524506655
-> Usage\ |\ sp_dropsrvrolemember\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524518355
-> Usage\ |\ sp_droptype\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524528756
-> Usage\ |\ sp_dropuser\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524539756
-> Usage\ |\ sp_estimated_rowsize_reduction_for_vardecimal\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524565457
-> Usage\ |\ sp_fulltext_catalog\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524576357
-> Usage\ |\ sp_fulltext_column\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524587457
-> Usage\ |\ sp_fulltext_database\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524605858
-> Usage\ |\ sp_fulltext_service\ @action=clean_up\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524617758
-> Usage\ |\ sp_fulltext_service\ @action=connect_timeout\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524659159
-> Usage\ |\ sp_fulltext_service\ @action=data_timeout\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524674860
-> Usage\ |\ sp_fulltext_service\ @action=resource_usage\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524686560
-> Usage\ |\ sp_fulltext_table\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524697160
-> Usage\ |\ sp_getbindtoken\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524708460
-> Usage\ |\ sp_grantdbaccess\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524736461
-> Usage\ |\ sp_grantlogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524747662
-> Usage\ |\ sp_help_fulltext_catalog_components\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524759062
-> Usage\ |\ sp_help_fulltext_catalogs\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524782162
-> Usage\ |\ sp_help_fulltext_catalogs_cursor\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524806463
-> Usage\ |\ sp_help_fulltext_columns\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524838864
-> Usage\ |\ sp_help_fulltext_columns_cursor\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524850564
-> Usage\ |\ sp_help_fulltext_tables\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524862165
-> Usage\ |\ sp_help_fulltext_tables_cursor\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524872665
-> Usage\ |\ sp_helpdevice\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524884065
-> Usage\ |\ sp_helpextendedproc\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524922766
-> Usage\ |\ sp_helpremotelogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524936967
-> Usage\ |\ sp_indexoption\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524948967
-> Usage\ |\ sp_lock\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524959267
-> Usage\ |\ sp_password\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524970667
-> Usage\ |\ sp_remoteoption\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412524993668
-> Usage\ |\ sp_renamedb\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525007168
-> Usage\ |\ sp_resetstatus\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525018969
-> Usage\ |\ sp_revokedbaccess\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525032869
-> Usage\ |\ sp_revokelogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525059370
-> Usage\ |\ sp_srvrolepermission\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525086671
-> Usage\ |\ sp_trace_create\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525102771
-> Usage\ |\ sp_trace_getdata\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525118471
-> Usage\ |\ sp_trace_setevent\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525128972
-> Usage\ |\ sp_trace_setfilter\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525140272
-> Usage\ |\ sp_trace_setstatus\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525184773
-> Usage\ |\ sp_unbindefault\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525197073
-> Usage\ |\ sp_unbindrule\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525208574
-> Usage\ |\ SQL_AltDiction_CP1253_CS_AS\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525218674
-> Usage\ |\ sql_dependencies\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525230174
-> Usage\ |\ String\ literals\ as\ column\ aliases\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412525257075
-> Usage\ |\ sysaltfiles\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525268475
-> Usage\ |\ syscacheobjects\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525279876
-> Usage\ |\ syscolumns\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525299176
-> Usage\ |\ syscomments\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525313677
-> Usage\ |\ sysconfigures\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525340677
-> Usage\ |\ sysconstraints\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525351478
-> Usage\ |\ syscurconfigs\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525362778
-> Usage\ |\ sysdatabases\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412525372978
-> Usage\ |\ sysdepends\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525384178
-> Usage\ |\ sysdevices\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525407279
-> Usage\ |\ sysfilegroups\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525421379
-> Usage\ |\ sysfiles\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525432780
-> Usage\ |\ sysforeignkeys\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525442980
-> Usage\ |\ sysfulltextcatalogs\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525454180
-> Usage\ |\ sysindexes\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525476481
-> Usage\ |\ sysindexkeys\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525486781
-> Usage\ |\ syslockinfo\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525503582
-> Usage\ |\ syslogins\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=8i 1453876412525514682
-> Usage\ |\ sysmembers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525525982
-> Usage\ |\ sysmessages\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525553883
-> Usage\ |\ sysobjects\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525564483
-> Usage\ |\ sysoledbusers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525575683
-> Usage\ |\ sysopentapes\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525585884
-> Usage\ |\ sysperfinfo\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525596984
-> Usage\ |\ syspermissions\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525639885
-> Usage\ |\ sysprocesses\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525651786
-> Usage\ |\ sysprotects\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525663186
-> Usage\ |\ sysreferences\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525673286
-> Usage\ |\ sysremotelogins\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525687986
-> Usage\ |\ sysservers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525720987
-> Usage\ |\ systypes\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525740588
-> Usage\ |\ sysusers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525752688
-> Usage\ |\ Table\ hint\ without\ WITH\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525762788
-> Usage\ |\ Text\ in\ row\ table\ option\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525774389
-> Usage\ |\ TEXTPTR\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525798089
-> Usage\ |\ TEXTVALID\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525808390
-> Usage\ |\ TIMESTAMP\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525819790
-> Usage\ |\ UPDATETEXT\ or\ WRITETEXT\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525830090
-> Usage\ |\ USER_ID\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412525841291
-> Usage\ |\ Using\ OLEDB\ for\ linked\ servers\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525877392
-> Usage\ |\ Vardecimal\ storage\ format\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525889492
-> Usage\ |\ XMLDATA\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525901192
-> Usage\ |\ XP_API\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=7i 1453876412525952493
-> Usage\ |\ xp_grantlogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412525964994
-> Usage\ |\ xp_loginconfig\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526001095
-> Usage\ |\ xp_revokelogin\ |\ Deprecated\ Features,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526015695
-> Distributed\ Query\ |\ Average\ execution\ time\ (ms)\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526035096
-> Distributed\ Query\ |\ Cumulative\ execution\ time\ (ms)\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526046596
-> Distributed\ Query\ |\ Execs\ in\ progress\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526061696
-> Distributed\ Query\ |\ Execs\ started\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526116398
-> DTC\ calls\ |\ Average\ execution\ time\ (ms)\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526137598
-> DTC\ calls\ |\ Cumulative\ execution\ time\ (ms)\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526153299
-> DTC\ calls\ |\ Execs\ in\ progress\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526164599
-> DTC\ calls\ |\ Execs\ started\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526176299
-> Extended\ Procedures\ |\ Average\ execution\ time\ (ms)\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526201600
-> Extended\ Procedures\ |\ Cumulative\ execution\ time\ (ms)\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526212600
-> Extended\ Procedures\ |\ Execs\ in\ progress\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526230901
-> Extended\ Procedures\ |\ Execs\ started\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526244401
-> OLEDB\ calls\ |\ Average\ execution\ time\ (ms)\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526256002
-> OLEDB\ calls\ |\ Cumulative\ execution\ time\ (ms)\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526282802
-> OLEDB\ calls\ |\ Execs\ in\ progress\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526294103
-> OLEDB\ calls\ |\ Execs\ started\ per\ second\ |\ Exec\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526305703
-> Avg\ time\ delete\ FileTable\ item\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526316203
-> Avg\ time\ FileTable\ enumeration\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526327703
-> Avg\ time\ FileTable\ handle\ kill\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526350504
-> Avg\ time\ move\ FileTable\ item\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526361104
-> Avg\ time\ per\ file\ I/O\ request\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526372405
-> Avg\ time\ per\ file\ I/O\ response\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526386705
-> Avg\ time\ rename\ FileTable\ item\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526398605
-> Avg\ time\ to\ get\ FileTable\ item\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526421406
-> Avg\ time\ update\ FileTable\ item\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526432106
-> FileTable\ db\ operations/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526457907
-> FileTable\ enumeration\ reqs/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526468807
-> FileTable\ file\ I/O\ requests/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526480108
-> FileTable\ file\ I/O\ response/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526507008
-> FileTable\ item\ delete\ reqs/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526525809
-> FileTable\ item\ get\ requests/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526540209
-> FileTable\ item\ move\ reqs/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526550709
-> FileTable\ item\ rename\ reqs/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526565010
-> FileTable\ item\ update\ reqs/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526609511
-> FileTable\ kill\ handle\ ops/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526621511
-> FileTable\ table\ operations/sec\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526633012
-> Time\ delete\ FileTable\ item\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526643112
-> Time\ FileTable\ enumeration\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526654312
-> Time\ FileTable\ handle\ kill\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526677313
-> Time\ move\ FileTable\ item\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526692713
-> Time\ per\ file\ I/O\ request\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526704613
-> Time\ per\ file\ I/O\ response\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526715014
-> Time\ rename\ FileTable\ item\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526726314
-> Time\ to\ get\ FileTable\ item\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526753015
-> Time\ update\ FileTable\ item\ BASE\ |\ FileTable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526763915
-> Active\ Temp\ Tables\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=26i 1453876412526775915
-> Connection\ Reset/sec\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526801716
-> Event\ Notifications\ Delayed\ Drop\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526816616
-> HTTP\ Authenticated\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526839717
-> Logical\ Connections\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=9i 1453876412526850217
-> Logins/sec\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412526861518
-> Logouts/sec\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=7i 1453876412526871718
-> Mars\ Deadlocks\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526882918
-> Non-atomic\ yield\ rate\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526920619
-> Processes\ blocked\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526938020
-> SOAP\ Empty\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526950020
-> SOAP\ Method\ Invocations\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526960220
-> SOAP\ Session\ Initiate\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412526971521
-> SOAP\ Session\ Terminate\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527004821
-> SOAP\ SQL\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527015822
-> SOAP\ WSDL\ Requests\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527027222
-> SQL\ Trace\ IO\ Provider\ Lock\ Waits\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527040822
-> Temp\ Tables\ Creation\ Rate\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=11i 1453876412527052523
-> Temp\ Tables\ For\ Destruction\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527095024
-> Tempdb\ recovery\ unit\ id\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527114824
-> Tempdb\ rowset\ id\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527136125
-> Trace\ Event\ Notification\ Queue\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527147925
-> Transactions\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412527168326
-> User\ Connections\ |\ General\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=9i 1453876412527195927
-> Avg.\ Bytes/Read\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527206527
-> Avg.\ Bytes/Read\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527217927
-> Avg.\ Bytes/Transfer\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527228427
-> Avg.\ Bytes/Transfer\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527239828
-> Avg.\ Bytes/Write\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527266328
-> Avg.\ Bytes/Write\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527277429
-> Avg.\ microsec/Read\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527289029
-> Avg.\ microsec/Read\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527299229
-> Avg.\ microsec/Transfer\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527310630
-> Avg.\ microsec/Transfer\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527334230
-> Avg.\ microsec/Write\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527344830
-> Avg.\ microsec/Write\ BASE\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527360331
-> HTTP\ Storage\ IO\ retry/sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527374031
-> Outstanding\ HTTP\ Storage\ IO\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527385632
-> Read\ Bytes/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527415432
-> Reads/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527427033
-> Total\ Bytes/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527441733
-> Transfers/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527452233
-> Write\ Bytes/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527466634
-> Writes/Sec\ |\ _Total\ |\ HTTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527496134
-> Average\ Latch\ Wait\ Time\ (ms)\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412527507035
-> Average\ Latch\ Wait\ Time\ Base\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=33i 1453876412527518435
-> Latch\ Waits/sec\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=39i 1453876412527528935
-> Number\ of\ SuperLatches\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527540136
-> SuperLatch\ Demotions/sec\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527562936
-> SuperLatch\ Promotions/sec\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527573137
-> Total\ Latch\ Wait\ Time\ (ms)\ |\ Latches,servername=WIN8-DEV,type=Performance\ counters value=33i 1453876412527587337
-> Average\ Wait\ Time\ (ms)\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527606237
-> Average\ Wait\ Time\ (ms)\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527622138
-> Average\ Wait\ Time\ (ms)\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527662339
-> Average\ Wait\ Time\ (ms)\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527674539
-> Average\ Wait\ Time\ (ms)\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527686040
-> Average\ Wait\ Time\ (ms)\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527696540
-> Average\ Wait\ Time\ (ms)\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527707640
-> Average\ Wait\ Time\ (ms)\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527730341
-> Average\ Wait\ Time\ (ms)\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527754641
-> Average\ Wait\ Time\ (ms)\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527767442
-> Average\ Wait\ Time\ (ms)\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527784142
-> Average\ Wait\ Time\ (ms)\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527795842
-> Average\ Wait\ Time\ (ms)\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527826443
-> Average\ Wait\ Time\ (ms)\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527844244
-> Average\ Wait\ Time\ Base\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527865044
-> Average\ Wait\ Time\ Base\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527875645
-> Average\ Wait\ Time\ Base\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527887045
-> Average\ Wait\ Time\ Base\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527924846
-> Average\ Wait\ Time\ Base\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527939346
-> Average\ Wait\ Time\ Base\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527951347
-> Average\ Wait\ Time\ Base\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527961847
-> Average\ Wait\ Time\ Base\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527973347
-> Average\ Wait\ Time\ Base\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412527999748
-> Average\ Wait\ Time\ Base\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528010848
-> Average\ Wait\ Time\ Base\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528022348
-> Average\ Wait\ Time\ Base\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528032549
-> Average\ Wait\ Time\ Base\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528043949
-> Average\ Wait\ Time\ Base\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528075750
-> Lock\ Requests/sec\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=8075i 1453876412528086950
-> Lock\ Requests/sec\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412528098250
-> Lock\ Requests/sec\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528127151
-> Lock\ Requests/sec\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=229i 1453876412528146652
-> Lock\ Requests/sec\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=70i 1453876412528197753
-> Lock\ Requests/sec\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528213754
-> Lock\ Requests/sec\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=49i 1453876412528232254
-> Lock\ Requests/sec\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=2282i 1453876412528242954
-> Lock\ Requests/sec\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=3501i 1453876412528254355
-> Lock\ Requests/sec\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=1799i 1453876412528277055
-> Lock\ Requests/sec\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528287355
-> Lock\ Requests/sec\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=103i 1453876412528298756
-> Lock\ Requests/sec\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=40i 1453876412528312756
-> Lock\ Requests/sec\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528327357
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528363258
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528374958
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528386858
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528397558
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528408859
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528432359
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528442860
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412528454260
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529628991
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529651592
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529663992
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529676692
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529688093
-> Lock\ Timeouts\ (timeout\ >\ 0)/sec\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529700393
-> Lock\ Timeouts/sec\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=7i 1453876412529725794
-> Lock\ Timeouts/sec\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529737294
-> Lock\ Timeouts/sec\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529749294
-> Lock\ Timeouts/sec\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529759995
-> Lock\ Timeouts/sec\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529771695
-> Lock\ Timeouts/sec\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529794996
-> Lock\ Timeouts/sec\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529805696
-> Lock\ Timeouts/sec\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=7i 1453876412529818596
-> Lock\ Timeouts/sec\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529829396
-> Lock\ Timeouts/sec\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529840797
-> Lock\ Timeouts/sec\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529902898
-> Lock\ Timeouts/sec\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529931399
-> Lock\ Timeouts/sec\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529944099
-> Lock\ Timeouts/sec\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529955000
-> Lock\ Wait\ Time\ (ms)\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412529966800
-> Lock\ Wait\ Time\ (ms)\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530001301
-> Lock\ Wait\ Time\ (ms)\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530012901
-> Lock\ Wait\ Time\ (ms)\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530025002
-> Lock\ Wait\ Time\ (ms)\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530036502
-> Lock\ Wait\ Time\ (ms)\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530052302
-> Lock\ Wait\ Time\ (ms)\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530075903
-> Lock\ Wait\ Time\ (ms)\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530088903
-> Lock\ Wait\ Time\ (ms)\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530101204
-> Lock\ Wait\ Time\ (ms)\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530120204
-> Lock\ Wait\ Time\ (ms)\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530136505
-> Lock\ Wait\ Time\ (ms)\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530159905
-> Lock\ Wait\ Time\ (ms)\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530171306
-> Lock\ Wait\ Time\ (ms)\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530183206
-> Lock\ Waits/sec\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530193706
-> Lock\ Waits/sec\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530205606
-> Lock\ Waits/sec\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530229807
-> Lock\ Waits/sec\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530240707
-> Lock\ Waits/sec\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530255108
-> Lock\ Waits/sec\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530265708
-> Lock\ Waits/sec\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530277308
-> Lock\ Waits/sec\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530309209
-> Lock\ Waits/sec\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530320709
-> Lock\ Waits/sec\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530332210
-> Lock\ Waits/sec\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530342910
-> Lock\ Waits/sec\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530364311
-> Lock\ Waits/sec\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530389911
-> Lock\ Waits/sec\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530401012
-> Number\ of\ Deadlocks/sec\ |\ _Total\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530412312
-> Number\ of\ Deadlocks/sec\ |\ AllocUnit\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530423812
-> Number\ of\ Deadlocks/sec\ |\ Application\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530435413
-> Number\ of\ Deadlocks/sec\ |\ Database\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530476714
-> Number\ of\ Deadlocks/sec\ |\ Extent\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530488814
-> Number\ of\ Deadlocks/sec\ |\ File\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530500114
-> Number\ of\ Deadlocks/sec\ |\ HoBT\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530510415
-> Number\ of\ Deadlocks/sec\ |\ Key\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530524215
-> Number\ of\ Deadlocks/sec\ |\ Metadata\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530547416
-> Number\ of\ Deadlocks/sec\ |\ Object\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530558916
-> Number\ of\ Deadlocks/sec\ |\ OIB\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530570416
-> Number\ of\ Deadlocks/sec\ |\ Page\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530580716
-> Number\ of\ Deadlocks/sec\ |\ RID\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530592117
-> Number\ of\ Deadlocks/sec\ |\ RowGroup\ |\ Locks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530623618
-> Internal\ benefit\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530634618
-> Internal\ benefit\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530646418
-> Memory\ broker\ clerk\ size\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=12217i 1453876412530662619
-> Memory\ broker\ clerk\ size\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412530674519
-> Periodic\ evictions\ (pages)\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530700020
-> Periodic\ evictions\ (pages)\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530711120
-> Pressure\ evictions\ (pages/sec)\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530722720
-> Pressure\ evictions\ (pages/sec)\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530735621
-> Simulation\ benefit\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530747421
-> Simulation\ benefit\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530773322
-> Simulation\ size\ |\ Buffer\ Pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530784522
-> Simulation\ size\ |\ Column\ store\ object\ pool\ |\ Memory\ Broker\ Clerks,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530796322
-> Connection\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1416i 1453876412530807022
-> Database\ Cache\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=97736i 1453876412530818623
-> External\ benefit\ of\ memory\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530855524
-> Free\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=14080i 1453876412530867224
-> Granted\ Workspace\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1024i 1453876412530881024
-> Lock\ Blocks\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530892625
-> Lock\ Blocks\ Allocated\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=3050i 1453876412530915725
-> Lock\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=768i 1453876412530967127
-> Lock\ Owner\ Blocks\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412530983227
-> Lock\ Owner\ Blocks\ Allocated\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=5550i 1453876412530997627
-> Log\ Pool\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1552i 1453876412531013928
-> Maximum\ Workspace\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1041480i 1453876412531026628
-> Memory\ Grants\ Outstanding\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531059429
-> Memory\ Grants\ Pending\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531070729
-> Optimizer\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=21264i 1453876412531082430
-> Reserved\ Server\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1016i 1453876412531092830
-> SQL\ Cache\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=2072i 1453876412531128431
-> Stolen\ Server\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=314424i 1453876412531155632
-> Target\ Server\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=1536000i 1453876412531166632
-> Total\ Server\ Memory\ (KB)\ |\ Memory\ Manager,servername=WIN8-DEV,type=Performance\ counters value=426240i 1453876412531178132
-> Database\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=97736i 1453876412531190433
-> Foreign\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531202033
-> Free\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=14072i 1453876412531225434
-> Stolen\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=314408i 1453876412531237434
-> Target\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=1535976i 1453876412531249334
-> Total\ Node\ Memory\ (KB)\ |\ 000\ |\ Memory\ Node,servername=WIN8-DEV,type=Performance\ counters value=426216i 1453876412531262634
-> Cache\ Hit\ Ratio\ |\ _Total\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531274235
-> Cache\ Hit\ Ratio\ |\ Bound\ Trees\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531302236
-> Cache\ Hit\ Ratio\ |\ Extended\ Stored\ Procedures\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531313536
-> Cache\ Hit\ Ratio\ |\ Object\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531326736
-> Cache\ Hit\ Ratio\ |\ SQL\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1i 1453876412531337436
-> Cache\ Hit\ Ratio\ |\ Temporary\ Tables\ &\ Table\ Variables\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531349137
-> Cache\ Hit\ Ratio\ Base\ |\ _Total\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=-436i 1453876412531393738
-> Cache\ Hit\ Ratio\ Base\ |\ Bound\ Trees\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=-449i 1453876412531406038
-> Cache\ Hit\ Ratio\ Base\ |\ Extended\ Stored\ Procedures\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=5i 1453876412531418039
-> Cache\ Hit\ Ratio\ Base\ |\ Object\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531428839
-> Cache\ Hit\ Ratio\ Base\ |\ SQL\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=8i 1453876412531443539
-> Cache\ Hit\ Ratio\ Base\ |\ Temporary\ Tables\ &\ Table\ Variables\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531488941
-> Cache\ Object\ Counts\ |\ _Total\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=369i 1453876412531508441
-> Cache\ Object\ Counts\ |\ Bound\ Trees\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=98i 1453876412531521041
-> Cache\ Object\ Counts\ |\ Extended\ Stored\ Procedures\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=9i 1453876412531531942
-> Cache\ Object\ Counts\ |\ Object\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=38i 1453876412531543742
-> Cache\ Object\ Counts\ |\ SQL\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=207i 1453876412531572243
-> Cache\ Object\ Counts\ |\ Temporary\ Tables\ &\ Table\ Variables\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=17i 1453876412531584843
-> Cache\ Objects\ in\ use\ |\ _Total\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412531597943
-> Cache\ Objects\ in\ use\ |\ Bound\ Trees\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531608644
-> Cache\ Objects\ in\ use\ |\ Extended\ Stored\ Procedures\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531620444
-> Cache\ Objects\ in\ use\ |\ Object\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531644845
-> Cache\ Objects\ in\ use\ |\ SQL\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412531658345
-> Cache\ Objects\ in\ use\ |\ Temporary\ Tables\ &\ Table\ Variables\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531673945
-> Cache\ Pages\ |\ _Total\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=18687i 1453876412531685046
-> Cache\ Pages\ |\ Bound\ Trees\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=1104i 1453876412531700446
-> Cache\ Pages\ |\ Extended\ Stored\ Procedures\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=11i 1453876412531724847
-> Cache\ Pages\ |\ Object\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=2918i 1453876412531735747
-> Cache\ Pages\ |\ SQL\ Plans\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=14650i 1453876412531747447
-> Cache\ Pages\ |\ Temporary\ Tables\ &\ Table\ Variables\ |\ Plan\ Cache,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412531757948
-> Active\ memory\ grant\ amount\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531769848
-> Active\ memory\ grant\ amount\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531798249
-> Active\ memory\ grants\ count\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531809749
-> Active\ memory\ grants\ count\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531821449
-> Avg\ Disk\ Read\ IO\ (ms)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531832350
-> Avg\ Disk\ Read\ IO\ (ms)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531846150
-> Avg\ Disk\ Read\ IO\ (ms)\ Base\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531889551
-> Avg\ Disk\ Read\ IO\ (ms)\ Base\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531902551
-> Avg\ Disk\ Write\ IO\ (ms)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531931052
-> Avg\ Disk\ Write\ IO\ (ms)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531942553
-> Avg\ Disk\ Write\ IO\ (ms)\ Base\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531954453
-> Avg\ Disk\ Write\ IO\ (ms)\ Base\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412531982654
-> Cache\ memory\ target\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1231200i 1453876412531994254
-> Cache\ memory\ target\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1122336i 1453876412532007754
-> Compile\ memory\ target\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1171672i 1453876412532018455
-> Compile\ memory\ target\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1173240i 1453876412532030155
-> CPU\ control\ effect\ %\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=31i 1453876412532054056
-> CPU\ control\ effect\ %\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532065056
-> CPU\ usage\ %\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532076556
-> CPU\ usage\ %\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532091256
-> CPU\ usage\ %\ base\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532122657
-> CPU\ usage\ %\ base\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532153158
-> CPU\ usage\ target\ %\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=56i 1453876412532164558
-> CPU\ usage\ target\ %\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532176059
-> Disk\ Read\ Bytes/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532188659
-> Disk\ Read\ Bytes/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532200459
-> Disk\ Read\ IO\ Throttled/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532224560
-> Disk\ Read\ IO\ Throttled/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532235560
-> Disk\ Read\ IO/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532252661
-> Disk\ Read\ IO/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532263461
-> Disk\ Write\ Bytes/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532275061
-> Disk\ Write\ Bytes/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532312762
-> Disk\ Write\ IO\ Throttled/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532324463
-> Disk\ Write\ IO\ Throttled/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532336363
-> Disk\ Write\ IO/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532348863
-> Disk\ Write\ IO/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532361464
-> Max\ memory\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1459200i 1453876412532387564
-> Max\ memory\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1459200i 1453876412532398765
-> Memory\ grant\ timeouts/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532410465
-> Memory\ grant\ timeouts/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532421265
-> Memory\ grants/sec\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=16i 1453876412532436666
-> Memory\ grants/sec\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532461866
-> Pending\ memory\ grants\ count\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532472567
-> Pending\ memory\ grants\ count\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532484667
-> Query\ exec\ memory\ target\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1041480i 1453876412532498167
-> Query\ exec\ memory\ target\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1039560i 1453876412532510168
-> Target\ memory\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1459200i 1453876412532534968
-> Target\ memory\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=1459200i 1453876412532546269
-> Used\ memory\ (KB)\ |\ default\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=189552i 1453876412532557769
-> Used\ memory\ (KB)\ |\ internal\ |\ Resource\ Pool\ Stats,servername=WIN8-DEV,type=Performance\ counters value=125856i 1453876412532569269
-> Errors/sec\ |\ _Total\ |\ SQL\ Errors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532580769
-> Errors/sec\ |\ DB\ Offline\ Errors\ |\ SQL\ Errors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532610970
-> Errors/sec\ |\ Info\ Errors\ |\ SQL\ Errors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532622271
-> Errors/sec\ |\ Kill\ Connection\ Errors\ |\ SQL\ Errors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532633671
-> Errors/sec\ |\ User\ Errors\ |\ SQL\ Errors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532644371
-> Auto-Param\ Attempts/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532655671
-> Batch\ Requests/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412532684772
-> Failed\ Auto-Params/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532696073
-> Forced\ Parameterizations/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532707573
-> Guided\ plan\ executions/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532717873
-> Misguided\ plan\ executions/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532729073
-> Safe\ Auto-Params/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532764674
-> SQL\ Attention\ rate\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532776175
-> SQL\ Compilations/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=32i 1453876412532788575
-> SQL\ Re-Compilations/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=12i 1453876412532798875
-> Unsafe\ Auto-Params/sec\ |\ SQL\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532809976
-> Free\ Space\ in\ tempdb\ (KB)\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=1044992i 1453876412532834776
-> Longest\ Transaction\ Running\ Time\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532846077
-> NonSnapshot\ Version\ Transactions\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532857377
-> Snapshot\ Transactions\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532868977
-> Transactions\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=14i 1453876412532883178
-> Update\ conflict\ ratio\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532925579
-> Update\ conflict\ ratio\ base\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532939679
-> Update\ Snapshot\ Transactions\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532951879
-> Version\ Cleanup\ rate\ (KB/s)\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532962180
-> Version\ Generation\ rate\ (KB/s)\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532976080
-> Version\ Store\ Size\ (KB)\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412532999681
-> Version\ Store\ unit\ count\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=2i 1453876412533011581
-> Version\ Store\ unit\ creation\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=12i 1453876412533023081
-> Version\ Store\ unit\ truncation\ |\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=10i 1453876412533033482
-> Query\ |\ User\ counter\ 1\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533044782
-> Query\ |\ User\ counter\ 10\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533068482
-> Query\ |\ User\ counter\ 2\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533079683
-> Query\ |\ User\ counter\ 3\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533090983
-> Query\ |\ User\ counter\ 4\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533104283
-> Query\ |\ User\ counter\ 5\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533119384
-> Query\ |\ User\ counter\ 6\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533143584
-> Query\ |\ User\ counter\ 7\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533154485
-> Query\ |\ User\ counter\ 8\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533165885
-> Query\ |\ User\ counter\ 9\ |\ User\ Settable,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533176285
-> Lock\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533188986
-> Lock\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533231087
-> Lock\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533243487
-> Lock\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533260588
-> Log\ buffer\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533273688
-> Log\ buffer\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533288388
-> Log\ buffer\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533316189
-> Log\ buffer\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533327689
-> Log\ write\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533339290
-> Log\ write\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533349990
-> Log\ write\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533361690
-> Log\ write\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533388291
-> Memory\ grant\ queue\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533402291
-> Memory\ grant\ queue\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533415792
-> Memory\ grant\ queue\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533426892
-> Memory\ grant\ queue\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533438392
-> Network\ IO\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533463393
-> Network\ IO\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533474493
-> Network\ IO\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533486194
-> Network\ IO\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533496594
-> Non-Page\ latch\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533511394
-> Non-Page\ latch\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533536695
-> Non-Page\ latch\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533547895
-> Non-Page\ latch\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533561496
-> Page\ IO\ latch\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533572096
-> Page\ IO\ latch\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533583896
-> Page\ IO\ latch\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533629397
-> Page\ IO\ latch\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533641398
-> Page\ latch\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533653298
-> Page\ latch\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533663798
-> Page\ latch\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533675899
-> Page\ latch\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533705599
-> Thread-safe\ memory\ objects\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533716800
-> Thread-safe\ memory\ objects\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533728700
-> Thread-safe\ memory\ objects\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533739700
-> Thread-safe\ memory\ objects\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533751501
-> Transaction\ ownership\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533778501
-> Transaction\ ownership\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533801602
-> Transaction\ ownership\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533818402
-> Transaction\ ownership\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533829403
-> Wait\ for\ the\ worker\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533841103
-> Wait\ for\ the\ worker\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533868204
-> Wait\ for\ the\ worker\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533879704
-> Wait\ for\ the\ worker\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533891604
-> Workspace\ synchronization\ waits\ |\ Average\ wait\ time\ (ms)\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533902305
-> Workspace\ synchronization\ waits\ |\ Cumulative\ wait\ time\ (ms)\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533929505
-> Workspace\ synchronization\ waits\ |\ Waits\ in\ progress\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533976207
-> Workspace\ synchronization\ waits\ |\ Waits\ started\ per\ second\ |\ Wait\ Statistics,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412533988307
-> Active\ parallel\ threads\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534000107
-> Active\ parallel\ threads\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534013008
-> Active\ requests\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=3i 1453876412534024608
-> Active\ requests\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534049608
-> Blocked\ tasks\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534061609
-> Blocked\ tasks\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534073209
-> CPU\ usage\ %\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534083709
-> CPU\ usage\ %\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534095410
-> CPU\ usage\ %\ base\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534134711
-> CPU\ usage\ %\ base\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534148011
-> Max\ request\ cpu\ time\ (ms)\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=731i 1453876412534160011
-> Max\ request\ cpu\ time\ (ms)\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534170612
-> Max\ request\ memory\ grant\ (KB)\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=11056i 1453876412534183912
-> Max\ request\ memory\ grant\ (KB)\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534208113
-> Query\ optimizations/sec\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=30i 1453876412534219313
-> Query\ optimizations/sec\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534232113
-> Queued\ requests\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534242914
-> Queued\ requests\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534254514
-> Reduced\ memory\ grants/sec\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534284615
-> Reduced\ memory\ grants/sec\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534296215
-> Requests\ completed/sec\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=7i 1453876412534307715
-> Requests\ completed/sec\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534323716
-> Suboptimal\ plans/sec\ |\ default\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=4i 1453876412534335316
-> Suboptimal\ plans/sec\ |\ internal\ |\ Workload\ Group\ Stats,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534374117
-> Cursor\ deletes/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534385817
-> Cursor\ inserts/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534397818
-> Cursor\ scans\ started/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534408518
-> Cursor\ unique\ violations/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534420118
-> Cursor\ updates/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534445819
-> Cursor\ write\ conflicts/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534457119
-> Dusty\ corner\ scan\ retries/sec\ (user-issued)\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534468620
-> Expired\ rows\ removed/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534482420
-> Expired\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534494220
-> Rows\ returned/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534521721
-> Rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534532821
-> Tentatively-deleted\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Cursors,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534544222
-> Dusty\ corner\ scan\ retries/sec\ (GC-issued)\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534556122
-> Main\ GC\ work\ items/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534569422
-> Parallel\ GC\ work\ item/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534597823
-> Rows\ processed/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534608923
-> Rows\ processed/sec\ (first\ in\ bucket\ and\ removed)\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534620624
-> Rows\ processed/sec\ (first\ in\ bucket)\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534631824
-> Rows\ processed/sec\ (marked\ for\ unlink)\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534643624
-> Rows\ processed/sec\ (no\ sweep\ needed)\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534673825
-> Sweep\ expired\ rows\ removed/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534687525
-> Sweep\ expired\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534699526
-> Sweep\ expiring\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534714626
-> Sweep\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534727026
-> Sweep\ scans\ started/sec\ |\ MSSQLSERVER\ |\ XTP\ Garbage\ Collection,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534765628
-> Dusty\ corner\ scan\ retries/sec\ (Phantom-issued)\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534777328
-> Phantom\ expired\ rows\ removed/sec\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534789428
-> Phantom\ expired\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534800128
-> Phantom\ expiring\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534811529
-> Phantom\ rows\ touched/sec\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534835629
-> Phantom\ scans\ started/sec\ |\ MSSQLSERVER\ |\ XTP\ Phantom\ Processor,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534846630
-> Checkpoints\ Closed\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534858230
-> Checkpoints\ Completed\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534869630
-> Core\ Merges\ Completed\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534881131
-> Merge\ Policy\ Evaluations\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534919832
-> Merge\ Requests\ Outstanding\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534934132
-> Merges\ Abandoned\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534946332
-> Merges\ Installed\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534959133
-> Total\ Files\ Merged\ |\ MSSQLSERVER\ |\ XTP\ Storage,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412534970533
-> Log\ bytes\ written/sec\ |\ MSSQLSERVER\ |\ XTP\ Transaction\ Log,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535001434
-> Log\ records\ written/sec\ |\ MSSQLSERVER\ |\ XTP\ Transaction\ Log,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535014034
-> Cascading\ aborts/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535025934
-> Commit\ dependencies\ taken/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535036635
-> Read-only\ transactions\ prepared/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535051635
-> Save\ point\ refreshes/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535076736
-> Save\ point\ rollbacks/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535088536
-> Save\ points\ created/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535102536
-> Transaction\ validation\ failures/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535116437
-> Transactions\ aborted\ by\ user/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535128337
-> Transactions\ aborted/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535146038
-> Transactions\ created/sec\ |\ MSSQLSERVER\ |\ XTP\ Transactions,servername=WIN8-DEV,type=Performance\ counters value=0i 1453876412535159838
-> Wait\ time\ (ms),servername=WIN8-DEV,type=Wait\ stats Buffer=0i,CLR=0i,I/O=0i,Latch=13i,Lock=0i,Memory=0i,Network=0i,Other=98i,SQLOS=115i,Service\ broker=0i,Total=226i,XEvent=0i 1453876416521666190
-> Wait\ tasks,servername=WIN8-DEV,type=Wait\ stats Buffer=0i,CLR=0i,I/O=0i,Latch=22i,Lock=0i,Memory=0i,Network=0i,Other=30i,SQLOS=80i,Service\ broker=0i,Total=132i,XEvent=0i 1453876416521726692
-> Log\ writes\ (bytes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=86835i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=86835i 1453876416602799144
-> Rows\ writes\ (bytes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i 1453876416602853046
-> Log\ reads\ (bytes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i 1453876416602897047
-> Rows\ reads\ (bytes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=6553i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=6553i 1453876416602943248
-> Log\ (writes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=1i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=1i 1453876416602969849
-> Rows\ (writes/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i 1453876416602993950
-> Log\ (reads/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i 1453876416603018350
-> Rows\ (reads/sec),servername=WIN8-DEV,type=Database\ IO AdventureWorks2014=0i,Australian=0i,DOC.Azure=0i,ResumeCloud=0i,Total=0i,master=0i,model=0i,msdb=0i,ngMon=0i,tempdb=0i 1453876416603047751
-``` 
+Version 2 queries all have the following:
+* `host`: Physical host name
+* `sql_instance`: Physical host and instance name (hostname:instance)
\ No newline at end of file
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 49f36b2cf..8b9f19f86 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -14,7 +14,10 @@ import (
 
 // SQLServer struct
 type SQLServer struct {
-	Servers []string
+	Servers      []string `toml:"servers"`
+	QueryVersion int      `toml:"query_version"`
+	AzureDB      bool     `toml:"azuredb"`
+	ExcludeQuery []string `toml:"exclude_query"`
 }
 
 // Query struct
@@ -29,18 +32,41 @@ type MapQuery map[string]Query
 
 var queries MapQuery
 
+// Initialized flag
+var isInitialized = false
+
 var defaultServer = "Server=.;app name=telegraf;log=1;"
 
 var sampleConfig = `
-  ## Specify instances to monitor with a list of connection strings.
-  ## All connection parameters are optional.
-  ## By default, the host is localhost, listening on default port, TCP 1433.
-  ##   for Windows, the user is the currently running AD user (SSO).
-  ##   See https://github.com/denisenkom/go-mssqldb for detailed connection
-  ##   parameters.
-  # servers = [
-  #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
-  # ]
+## Specify instances to monitor with a list of connection strings.
+## All connection parameters are optional.
+## By default, the host is localhost, listening on default port, TCP 1433.
+##   for Windows, the user is the currently running AD user (SSO).
+##   See https://github.com/denisenkom/go-mssqldb for detailed connection
+##   parameters.
+# servers = [
+#  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
+# ]
+#
+## Optional parameter, setting this to 2 will use a new version
+## of the collection queries that break compatibility with the original
+## dashboards. 
+# query_version = 2
+## If you are using AzureDB, setting this to True will gather resource utilization metrics
+# azuredb = False
+## If you would like to exclude some of the metrics queries, list them here
+## Possible choices:
+## - PerformanceCounters
+## - WaitStatsCategorized
+## - DatabaseIO
+## - DatabaseProperties
+## - CPUHistory
+## - DatabaseSize
+## - DatabaseStats
+## - MemoryClerk
+## - VolumeSpace
+## - PerformanceMetrics
+# exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
 `
 
 // SampleConfig return the sample configuration
@@ -57,23 +83,47 @@ type scanner interface {
 	Scan(dest ...interface{}) error
 }
 
-func initQueries() {
+func initQueries(s *SQLServer) {
 	queries = make(MapQuery)
-	queries["PerformanceCounters"] = Query{Script: sqlPerformanceCounters, ResultByRow: true}
-	queries["WaitStatsCategorized"] = Query{Script: sqlWaitStatsCategorized, ResultByRow: false}
-	queries["CPUHistory"] = Query{Script: sqlCPUHistory, ResultByRow: false}
-	queries["DatabaseIO"] = Query{Script: sqlDatabaseIO, ResultByRow: false}
-	queries["DatabaseSize"] = Query{Script: sqlDatabaseSize, ResultByRow: false}
-	queries["DatabaseStats"] = Query{Script: sqlDatabaseStats, ResultByRow: false}
-	queries["DatabaseProperties"] = Query{Script: sqlDatabaseProperties, ResultByRow: false}
-	queries["MemoryClerk"] = Query{Script: sqlMemoryClerk, ResultByRow: false}
-	queries["VolumeSpace"] = Query{Script: sqlVolumeSpace, ResultByRow: false}
-	queries["PerformanceMetrics"] = Query{Script: sqlPerformanceMetrics, ResultByRow: false}
+
+	// If this is an AzureDB instance, grab some extra metrics
+	if s.AzureDB {
+		queries["AzureDB"] = Query{Script: sqlAzureDB, ResultByRow: true}
+	}
+
+	// Decide if we want to run version 1 or version 2 queries
+	if s.QueryVersion == 2 {
+		queries["PerformanceCounters"] = Query{Script: sqlPerformanceCountersV2, ResultByRow: true}
+		queries["WaitStatsCategorized"] = Query{Script: sqlWaitStatsCategorizedV2, ResultByRow: false}
+		queries["DatabaseIO"] = Query{Script: sqlDatabaseIOV2, ResultByRow: false}
+		queries["ServerProperties"] = Query{Script: sqlServerPropertiesV2, ResultByRow: false}
+		queries["MemoryClerk"] = Query{Script: sqlMemoryClerkV2, ResultByRow: false}
+	} else {
+		queries["PerformanceCounters"] = Query{Script: sqlPerformanceCounters, ResultByRow: true}
+		queries["WaitStatsCategorized"] = Query{Script: sqlWaitStatsCategorized, ResultByRow: false}
+		queries["CPUHistory"] = Query{Script: sqlCPUHistory, ResultByRow: false}
+		queries["DatabaseIO"] = Query{Script: sqlDatabaseIO, ResultByRow: false}
+		queries["DatabaseSize"] = Query{Script: sqlDatabaseSize, ResultByRow: false}
+		queries["DatabaseStats"] = Query{Script: sqlDatabaseStats, ResultByRow: false}
+		queries["DatabaseProperties"] = Query{Script: sqlDatabaseProperties, ResultByRow: false}
+		queries["MemoryClerk"] = Query{Script: sqlMemoryClerk, ResultByRow: false}
+		queries["VolumeSpace"] = Query{Script: sqlVolumeSpace, ResultByRow: false}
+		queries["PerformanceMetrics"] = Query{Script: sqlPerformanceMetrics, ResultByRow: false}
+	}
+
+	for _, query := range s.ExcludeQuery {
+		delete(queries, query)
+	}
+
+	// Set a flag so we know that queries have already been initialized
+	isInitialized = true
 }
 
 // Gather collect data from SQL Server
 func (s *SQLServer) Gather(acc telegraf.Accumulator) error {
-	initQueries()
+	if !isInitialized {
+		initQueries(s)
+	}
 
 	if len(s.Servers) == 0 {
 		s.Servers = append(s.Servers, defaultServer)
@@ -188,7 +238,875 @@ func init() {
 	})
 }
 
-// queries
+// Queries - V2
+// Thanks Bob Ward (http://aka.ms/bobwardms)
+// and the folks at Stack Overflow (https://github.com/opserver/Opserver/blob/9c89c7e9936b58ad237b30e6f4cc6cd59c406889/Opserver.Core/Data/SQL/SQLInstance.Memory.cs)
+// for putting most of the memory clerk definitions online!
+const sqlMemoryClerkV2 = `SELECT	
+'sqlserver_memory_clerks' As [measurement],
+REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+SERVERPROPERTY('ServerName') AS [host],
+ISNULL(clerk_names.name,mc.type) AS clerk_type,
+SUM(mc.pages_kb) AS size_kb
+FROM
+sys.dm_os_memory_clerks AS mc WITH (NOLOCK)
+LEFT OUTER JOIN ( VALUES
+('CACHESTORE_BROKERDSH','Service Broker Dialog Security Header Cache'),
+('CACHESTORE_BROKERKEK','Service Broker Key Exchange Key Cache'),
+('CACHESTORE_BROKERREADONLY','Service Broker (Read-Only)'),
+('CACHESTORE_BROKERRSB','Service Broker Null Remote Service Binding Cache'),
+('CACHESTORE_BROKERTBLACS','Broker dormant rowsets'),
+('CACHESTORE_BROKERTO','Service Broker Transmission Object Cache'),
+('CACHESTORE_BROKERUSERCERTLOOKUP','Service Broker user certificates lookup result cache'),
+('CACHESTORE_CLRPROC','CLR Procedure Cache'),
+('CACHESTORE_CLRUDTINFO','CLR UDT Info'),
+('CACHESTORE_COLUMNSTOREOBJECTPOOL','Column Store Object Pool'),
+('CACHESTORE_CONVPRI','Conversation Priority Cache'),
+('CACHESTORE_EVENTS','Event Notification Cache'),
+('CACHESTORE_FULLTEXTSTOPLIST','Full Text Stoplist Cache'),
+('CACHESTORE_NOTIF','Notification Store'),
+('CACHESTORE_OBJCP','Object Plans'),
+('CACHESTORE_PHDR','Bound Trees'),
+('CACHESTORE_SEARCHPROPERTYLIST','Search Property List Cache'),
+('CACHESTORE_SEHOBTCOLUMNATTRIBUTE','SE Shared Column Metadata Cache'),
+('CACHESTORE_SQLCP','SQL Plans'),
+('CACHESTORE_STACKFRAMES','SOS_StackFramesStore'),
+('CACHESTORE_SYSTEMROWSET','System Rowset Store'),
+('CACHESTORE_TEMPTABLES','Temporary Tables & Table Variables'),
+('CACHESTORE_VIEWDEFINITIONS','View Definition Cache'),
+('CACHESTORE_XML_SELECTIVE_DG','XML DB Cache (Selective)'),
+('CACHESTORE_XMLDBATTRIBUTE','XML DB Cache (Attribute)'),
+('CACHESTORE_XMLDBELEMENT','XML DB Cache (Element)'),
+('CACHESTORE_XMLDBTYPE','XML DB Cache (Type)'),
+('CACHESTORE_XPROC','Extended Stored Procedures'),
+('MEMORYCLERK_FILETABLE','Memory Clerk (File Table)'),
+('MEMORYCLERK_FSCHUNKER','Memory Clerk (FS Chunker)'),
+('MEMORYCLERK_FULLTEXT','Full Text'),
+('MEMORYCLERK_FULLTEXT_SHMEM','Full-text IG'),
+('MEMORYCLERK_HADR','HADR'),
+('MEMORYCLERK_HOST','Host'),
+('MEMORYCLERK_LANGSVC','Language Service'),
+('MEMORYCLERK_LWC','Light Weight Cache'),
+('MEMORYCLERK_QSRANGEPREFETCH','QS Range Prefetch'),
+('MEMORYCLERK_SERIALIZATION','Serialization'),
+('MEMORYCLERK_SNI','SNI'),
+('MEMORYCLERK_SOSMEMMANAGER','SOS Memory Manager'),
+('MEMORYCLERK_SOSNODE','SOS Node'),
+('MEMORYCLERK_SOSOS','SOS Memory Clerk'),
+('MEMORYCLERK_SQLBUFFERPOOL','Buffer Pool'),
+('MEMORYCLERK_SQLCLR','CLR'),
+('MEMORYCLERK_SQLCLRASSEMBLY','CLR Assembly'),
+('MEMORYCLERK_SQLCONNECTIONPOOL','Connection Pool'),
+('MEMORYCLERK_SQLGENERAL','General'),
+('MEMORYCLERK_SQLHTTP','HTTP'),
+('MEMORYCLERK_SQLLOGPOOL','Log Pool'),
+('MEMORYCLERK_SQLOPTIMIZER','SQL Optimizer'),
+('MEMORYCLERK_SQLQERESERVATIONS','SQL Reservations'),
+('MEMORYCLERK_SQLQUERYCOMPILE','SQL Query Compile'),
+('MEMORYCLERK_SQLQUERYEXEC','SQL Query Exec'),
+('MEMORYCLERK_SQLQUERYPLAN','SQL Query Plan'),
+('MEMORYCLERK_SQLSERVICEBROKER','SQL Service Broker'),
+('MEMORYCLERK_SQLSERVICEBROKERTRANSPORT','Unified Communication Stack'),
+('MEMORYCLERK_SQLSOAP','SQL SOAP'),
+('MEMORYCLERK_SQLSOAPSESSIONSTORE','SQL SOAP (Session Store)'),
+('MEMORYCLERK_SQLSTORENG','SQL Storage Engine'),
+('MEMORYCLERK_SQLUTILITIES','SQL Utilities'),
+('MEMORYCLERK_SQLXML','SQL XML'),
+('MEMORYCLERK_SQLXP','SQL XP'),
+('MEMORYCLERK_TRACE_EVTNOTIF','Trace Event Notification'),
+('MEMORYCLERK_XE','XE Engine'),
+('MEMORYCLERK_XE_BUFFER','XE Buffer'),
+('MEMORYCLERK_XTP','In-Memory OLTP'),
+('OBJECTSTORE_LBSS','Lbss Cache (Object Store)'),
+('OBJECTSTORE_LOCK_MANAGER','Lock Manager (Object Store)'),
+('OBJECTSTORE_SECAUDIT_EVENT_BUFFER','Audit Event Buffer (Object Store)'),
+('OBJECTSTORE_SERVICE_BROKER','Service Broker (Object Store)'),
+('OBJECTSTORE_SNI_PACKET','SNI Packet (Object Store)'),
+('OBJECTSTORE_XACT_CACHE','Transactions Cache (Object Store)'),
+('USERSTORE_DBMETADATA','DB Metadata (User Store)'),
+('USERSTORE_OBJPERM','Object Permissions (User Store)'),
+('USERSTORE_SCHEMAMGR','Schema Manager (User Store)'),
+('USERSTORE_SXC','SXC (User Store)'),
+('USERSTORE_TOKENPERM','Token Permissions (User Store)'),
+('USERSTORE_QDSSTMT','QDS Statement Buffer (Pre-persist)'),
+('CACHESTORE_QDSRUNTIMESTATS','QDS Runtime Stats (Pre-persist)'),
+('CACHESTORE_QDSCONTEXTSETTINGS','QDS Unique Context Settings'),
+('MEMORYCLERK_QUERYDISKSTORE','QDS General'),
+('MEMORYCLERK_QUERYDISKSTORE_HASHMAP','QDS Query/Plan Hash Table')
+) AS clerk_names(system_name,name)
+ON mc.type = clerk_names.system_name
+GROUP BY ISNULL(clerk_names.name,mc.type)
+HAVING SUM(pages_kb) >= 1024
+OPTION( RECOMPILE );
+`
+
+const sqlDatabaseIOV2 = `SELECT
+'sqlserver_database_io' As [measurement],
+REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+SERVERPROPERTY('ServerName') AS [host],
+DB_NAME([vfs].[database_id]) [database_name],
+vfs.io_stall_read_ms AS read_latency_ms,
+vfs.num_of_reads AS reads,
+vfs.num_of_bytes_read AS read_bytes,
+vfs.io_stall_write_ms AS write_latency_ms,
+vfs.num_of_writes AS writes,
+vfs.num_of_bytes_written AS write_bytes,
+CASE WHEN vfs.file_id = 2 THEN 'LOG' ELSE 'ROWS' END AS file_type
+FROM
+[sys].[dm_io_virtual_file_stats](NULL,NULL) AS vfs
+OPTION( RECOMPILE );
+`
+
+const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (
+	cpu_count INT,
+	server_memory INT,
+	uptime INT
+)
+
+IF OBJECT_ID('master.sys.dm_os_sys_info') IS NOT NULL
+BEGIN
+	INSERT INTO @sys_info ( cpu_count, server_memory, uptime )
+	EXEC('SELECT cpu_count, physical_memory_kb, DATEDIFF(MINUTE,sqlserver_start_time,GETDATE())	FROM sys.dm_os_sys_info')
+END
+
+SELECT
+'sqlserver_server_properties' As [measurement],
+REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+SERVERPROPERTY('ServerName') AS [host],
+SUM( CASE WHEN state = 0 THEN 1 ELSE 0 END ) AS db_online,
+SUM( CASE WHEN state = 1 THEN 1 ELSE 0 END ) AS db_restoring,
+SUM( CASE WHEN state = 2 THEN 1 ELSE 0 END ) AS db_recovering,
+SUM( CASE WHEN state = 3 THEN 1 ELSE 0 END ) AS db_recoveryPending,
+SUM( CASE WHEN state = 4 THEN 1 ELSE 0 END ) AS db_suspect,
+SUM( CASE WHEN state = 10 THEN 1 ELSE 0 END ) AS db_offline,
+MAX( sinfo.cpu_count ) AS cpu_count,
+MAX( sinfo.server_memory ) AS server_memory,
+MAX( sinfo.uptime ) AS uptime,
+SERVERPROPERTY('ProductVersion') AS sql_version
+FROM	sys.databases
+CROSS APPLY (
+	SELECT	*
+	FROM	@sys_info
+) AS sinfo
+WHERE	database_id > 4
+OPTION( RECOMPILE );
+`
+
+const sqlPerformanceCountersV2 string = `DECLARE @PCounters TABLE
+(
+	object_name nvarchar(128),
+	counter_name nvarchar(128),
+	instance_name nvarchar(128),
+	cntr_value bigint,
+	cntr_type INT,
+	Primary Key(object_name, counter_name, instance_name)
+);
+
+INSERT	INTO @PCounters
+SELECT	DISTINCT
+		RTrim(spi.object_name) object_name,
+		RTrim(spi.counter_name) counter_name,
+		RTrim(spi.instance_name) instance_name,
+		spi.cntr_value,
+		spi.cntr_type
+FROM	sys.dm_os_performance_counters AS spi
+WHERE	(
+		counter_name IN (
+			'SQL Compilations/sec',
+			'SQL Re-Compilations/sec',
+			'User Connections',
+			'Batch Requests/sec',
+			'Logouts/sec',
+			'Logins/sec',
+			'Processes blocked',
+			'Latch Waits/sec',
+			'Full Scans/sec',
+			'Index Searches/sec',
+			'Page Splits/sec',
+			'Page Lookups/sec',
+			'Page Reads/sec',
+			'Page Writes/sec',
+			'Readahead Pages/sec',
+			'Lazy Writes/sec',
+			'Checkpoint Pages/sec',
+			'Page life expectancy',
+			'Log File(s) Size (KB)',
+			'Log File(s) Used Size (KB)',
+			'Data File(s) Size (KB)',
+			'Transactions/sec',
+			'Write Transactions/sec',
+			'Active Temp Tables',
+			'Temp Tables Creation Rate',
+			'Temp Tables For Destruction',
+			'Free Space in tempdb (KB)',
+			'Version Store Size (KB)',
+			'Memory Grants Pending',
+			'Free list stalls/sec',
+			'Buffer cache hit ratio',
+			'Buffer cache hit ratio base'
+		)
+		) OR (
+			instance_name IN ('_Total','Column store object pool')
+			AND counter_name IN (
+				'Log Flushes/sec',
+				'Log Flush Wait Time',
+				'Lock Timeouts/sec',
+				'Number of Deadlocks/sec',
+				'Lock Waits/sec',
+				'Latch Waits/sec',
+				'Memory broker clerk size',
+				'Log Bytes Flushed/sec',
+				'Bytes Sent to Replica/sec',
+				'Log Send Queue',
+				'Bytes Sent to Transport/sec',
+				'Sends to Replica/sec',
+				'Bytes Sent to Transport/sec',
+				'Sends to Transport/sec',
+				'Bytes Received from Replica/sec',
+				'Receives from Replica/sec',
+				'Flow Control Time (ms/sec)',
+				'Flow Control/sec',
+				'Resent Messages/sec',
+				'Redone Bytes/sec',
+				'XTP Memory Used (KB)'
+			) OR ( 
+				object_name = 'SQLServer:Database Replica'
+				AND counter_name IN (
+					'Log Bytes Received/sec',
+					'Log Apply Pending Queue',
+					'Redone Bytes/sec',
+					'Recovery Queue',
+					'Log Apply Ready Queue'
+				)
+				AND instance_name = '_Total'
+			)
+		) OR (
+			object_name = 'SQLServer:Database Replica'
+			AND counter_name IN ('Transaction Delay')
+		) OR (
+			object_name = 'SQLServer:Workload Group Stats'
+			AND counter_name IN (
+				'CPU usage %',
+				'CPU usage % base',
+				'Queued requests',
+				'Requests completed/sec',
+				'Blocked tasks'
+			)
+		)
+
+SELECT	'sqlserver_performance' AS [measurement],
+		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+		SERVERPROPERTY('ServerName') AS [host],
+		pc.object_name AS [object],
+		pc.counter_name AS [counter],
+		CASE pc.instance_name WHEN '_Total' THEN 'Total' ELSE ISNULL(pc.instance_name,'') END AS [instance],
+		CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS [value],
+		CASE 
+			WHEN pc.cntr_type = 272696576 THEN 'rate'
+			WHEN pc.cntr_type IN (65792,537003264) THEN 'raw'
+			ELSE 'unknown'
+		END AS c_type
+FROM	@PCounters AS pc
+		LEFT OUTER JOIN @PCounters AS pc1
+			ON (
+				pc.counter_name = REPLACE(pc1.counter_name,' base','')
+				OR pc.counter_name = REPLACE(pc1.counter_name,' base',' (ms)')
+			)
+			AND pc.object_name = pc1.object_name
+			AND pc.instance_name = pc1.instance_name
+			AND pc1.counter_name LIKE '%base'
+WHERE	pc.counter_name NOT LIKE '% base'
+OPTION( RECOMPILE );
+`
+
+const sqlWaitStatsCategorizedV2 string = `SELECT
+'sqlserver_waitstats' AS [measurement],
+REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+SERVERPROPERTY('ServerName') AS [host],
+ws.wait_type,
+wait_time_ms,
+wait_time_ms - signal_wait_time_ms AS [resource_wait_ms],
+signal_wait_time_ms,
+max_wait_time_ms,
+waiting_tasks_count,
+ISNULL(wc.wait_category,'OTHER') AS [wait_category]
+FROM
+sys.dm_os_wait_stats AS ws WITH (NOLOCK)
+LEFT OUTER JOIN ( VALUES
+('ASYNC_IO_COMPLETION','Other Disk IO'),
+('ASYNC_NETWORK_IO','Network IO'),
+('BACKUPIO','Other Disk IO'),
+('BROKER_CONNECTION_RECEIVE_TASK','Service Broker'),
+('BROKER_DISPATCHER','Service Broker'),
+('BROKER_ENDPOINT_STATE_MUTEX','Service Broker'),
+('BROKER_EVENTHANDLER','Service Broker'),
+('BROKER_FORWARDER','Service Broker'),
+('BROKER_INIT','Service Broker'),
+('BROKER_MASTERSTART','Service Broker'),
+('BROKER_RECEIVE_WAITFOR','User Wait'),
+('BROKER_REGISTERALLENDPOINTS','Service Broker'),
+('BROKER_SERVICE','Service Broker'),
+('BROKER_SHUTDOWN','Service Broker'),
+('BROKER_START','Service Broker'),
+('BROKER_TASK_SHUTDOWN','Service Broker'),
+('BROKER_TASK_STOP','Service Broker'),
+('BROKER_TASK_SUBMIT','Service Broker'),
+('BROKER_TO_FLUSH','Service Broker'),
+('BROKER_TRANSMISSION_OBJECT','Service Broker'),
+('BROKER_TRANSMISSION_TABLE','Service Broker'),
+('BROKER_TRANSMISSION_WORK','Service Broker'),
+('BROKER_TRANSMITTER','Service Broker'),
+('CHECKPOINT_QUEUE','Idle'),
+('CHKPT','Tran Log IO'),
+('CLR_AUTO_EVENT','SQL CLR'),
+('CLR_CRST','SQL CLR'),
+('CLR_JOIN','SQL CLR'),
+('CLR_MANUAL_EVENT','SQL CLR'),
+('CLR_MEMORY_SPY','SQL CLR'),
+('CLR_MONITOR','SQL CLR'),
+('CLR_RWLOCK_READER','SQL CLR'),
+('CLR_RWLOCK_WRITER','SQL CLR'),
+('CLR_SEMAPHORE','SQL CLR'),
+('CLR_TASK_START','SQL CLR'),
+('CLRHOST_STATE_ACCESS','SQL CLR'),
+('CMEMPARTITIONED','Memory'),
+('CMEMTHREAD','Memory'),
+('CXPACKET','Parallelism'),
+('DBMIRROR_DBM_EVENT','Mirroring'),
+('DBMIRROR_DBM_MUTEX','Mirroring'),
+('DBMIRROR_EVENTS_QUEUE','Mirroring'),
+('DBMIRROR_SEND','Mirroring'),
+('DBMIRROR_WORKER_QUEUE','Mirroring'),
+('DBMIRRORING_CMD','Mirroring'),
+('DTC','Transaction'),
+('DTC_ABORT_REQUEST','Transaction'),
+('DTC_RESOLVE','Transaction'),
+('DTC_STATE','Transaction'),
+('DTC_TMDOWN_REQUEST','Transaction'),
+('DTC_WAITFOR_OUTCOME','Transaction'),
+('DTCNEW_ENLIST','Transaction'),
+('DTCNEW_PREPARE','Transaction'),
+('DTCNEW_RECOVERY','Transaction'),
+('DTCNEW_TM','Transaction'),
+('DTCNEW_TRANSACTION_ENLISTMENT','Transaction'),
+('DTCPNTSYNC','Transaction'),
+('EE_PMOLOCK','Memory'),
+('EXCHANGE','Parallelism'),
+('EXTERNAL_SCRIPT_NETWORK_IOF','Network IO'),
+('FCB_REPLICA_READ','Replication'),
+('FCB_REPLICA_WRITE','Replication'),
+('FT_COMPROWSET_RWLOCK','Full Text Search'),
+('FT_IFTS_RWLOCK','Full Text Search'),
+('FT_IFTS_SCHEDULER_IDLE_WAIT','Idle'),
+('FT_IFTSHC_MUTEX','Full Text Search'),
+('FT_IFTSISM_MUTEX','Full Text Search'),
+('FT_MASTER_MERGE','Full Text Search'),
+('FT_MASTER_MERGE_COORDINATOR','Full Text Search'),
+('FT_METADATA_MUTEX','Full Text Search'),
+('FT_PROPERTYLIST_CACHE','Full Text Search'),
+('FT_RESTART_CRAWL','Full Text Search'),
+('FULLTEXT GATHERER','Full Text Search'),
+('HADR_AG_MUTEX','Replication'),
+('HADR_AR_CRITICAL_SECTION_ENTRY','Replication'),
+('HADR_AR_MANAGER_MUTEX','Replication'),
+('HADR_AR_UNLOAD_COMPLETED','Replication'),
+('HADR_ARCONTROLLER_NOTIFICATIONS_SUBSCRIBER_LIST','Replication'),
+('HADR_BACKUP_BULK_LOCK','Replication'),
+('HADR_BACKUP_QUEUE','Replication'),
+('HADR_CLUSAPI_CALL','Replication'),
+('HADR_COMPRESSED_CACHE_SYNC','Replication'),
+('HADR_CONNECTIVITY_INFO','Replication'),
+('HADR_DATABASE_FLOW_CONTROL','Replication'),
+('HADR_DATABASE_VERSIONING_STATE','Replication'),
+('HADR_DATABASE_WAIT_FOR_RECOVERY','Replication'),
+('HADR_DATABASE_WAIT_FOR_RESTART','Replication'),
+('HADR_DATABASE_WAIT_FOR_TRANSITION_TO_VERSIONING','Replication'),
+('HADR_DB_COMMAND','Replication'),
+('HADR_DB_OP_COMPLETION_SYNC','Replication'),
+('HADR_DB_OP_START_SYNC','Replication'),
+('HADR_DBR_SUBSCRIBER','Replication'),
+('HADR_DBR_SUBSCRIBER_FILTER_LIST','Replication'),
+('HADR_DBSEEDING','Replication'),
+('HADR_DBSEEDING_LIST','Replication'),
+('HADR_DBSTATECHANGE_SYNC','Replication'),
+('HADR_FABRIC_CALLBACK','Replication'),
+('HADR_FILESTREAM_BLOCK_FLUSH','Replication'),
+('HADR_FILESTREAM_FILE_CLOSE','Replication'),
+('HADR_FILESTREAM_FILE_REQUEST','Replication'),
+('HADR_FILESTREAM_IOMGR','Replication'),
+('HADR_FILESTREAM_IOMGR_IOCOMPLETION','Replication'),
+('HADR_FILESTREAM_MANAGER','Replication'),
+('HADR_FILESTREAM_PREPROC','Replication'),
+('HADR_GROUP_COMMIT','Replication'),
+('HADR_LOGCAPTURE_SYNC','Replication'),
+('HADR_LOGCAPTURE_WAIT','Replication'),
+('HADR_LOGPROGRESS_SYNC','Replication'),
+('HADR_NOTIFICATION_DEQUEUE','Replication'),
+('HADR_NOTIFICATION_WORKER_EXCLUSIVE_ACCESS','Replication'),
+('HADR_NOTIFICATION_WORKER_STARTUP_SYNC','Replication'),
+('HADR_NOTIFICATION_WORKER_TERMINATION_SYNC','Replication'),
+('HADR_PARTNER_SYNC','Replication'),
+('HADR_READ_ALL_NETWORKS','Replication'),
+('HADR_RECOVERY_WAIT_FOR_CONNECTION','Replication'),
+('HADR_RECOVERY_WAIT_FOR_UNDO','Replication'),
+('HADR_REPLICAINFO_SYNC','Replication'),
+('HADR_SEEDING_CANCELLATION','Replication'),
+('HADR_SEEDING_FILE_LIST','Replication'),
+('HADR_SEEDING_LIMIT_BACKUPS','Replication'),
+('HADR_SEEDING_SYNC_COMPLETION','Replication'),
+('HADR_SEEDING_TIMEOUT_TASK','Replication'),
+('HADR_SEEDING_WAIT_FOR_COMPLETION','Replication'),
+('HADR_SYNC_COMMIT','Replication'),
+('HADR_SYNCHRONIZING_THROTTLE','Replication'),
+('HADR_TDS_LISTENER_SYNC','Replication'),
+('HADR_TDS_LISTENER_SYNC_PROCESSING','Replication'),
+('HADR_THROTTLE_LOG_RATE_GOVERNOR','Log Rate Governor'),
+('HADR_TIMER_TASK','Replication'),
+('HADR_TRANSPORT_DBRLIST','Replication'),
+('HADR_TRANSPORT_FLOW_CONTROL','Replication'),
+('HADR_TRANSPORT_SESSION','Replication'),
+('HADR_WORK_POOL','Replication'),
+('HADR_WORK_QUEUE','Replication'),
+('HADR_XRF_STACK_ACCESS','Replication'),
+('INSTANCE_LOG_RATE_GOVERNOR','Log Rate Governor'),
+('IO_COMPLETION','Other Disk IO'),
+('IO_QUEUE_LIMIT','Other Disk IO'),
+('IO_RETRY','Other Disk IO'),
+('LATCH_DT','Latch'),
+('LATCH_EX','Latch'),
+('LATCH_KP','Latch'),
+('LATCH_NL','Latch'),
+('LATCH_SH','Latch'),
+('LATCH_UP','Latch'),
+('LAZYWRITER_SLEEP','Idle'),
+('LCK_M_BU','Lock'),
+('LCK_M_BU_ABORT_BLOCKERS','Lock'),
+('LCK_M_BU_LOW_PRIORITY','Lock'),
+('LCK_M_IS','Lock'),
+('LCK_M_IS_ABORT_BLOCKERS','Lock'),
+('LCK_M_IS_LOW_PRIORITY','Lock'),
+('LCK_M_IU','Lock'),
+('LCK_M_IU_ABORT_BLOCKERS','Lock'),
+('LCK_M_IU_LOW_PRIORITY','Lock'),
+('LCK_M_IX','Lock'),
+('LCK_M_IX_ABORT_BLOCKERS','Lock'),
+('LCK_M_IX_LOW_PRIORITY','Lock'),
+('LCK_M_RIn_NL','Lock'),
+('LCK_M_RIn_NL_ABORT_BLOCKERS','Lock'),
+('LCK_M_RIn_NL_LOW_PRIORITY','Lock'),
+('LCK_M_RIn_S','Lock'),
+('LCK_M_RIn_S_ABORT_BLOCKERS','Lock'),
+('LCK_M_RIn_S_LOW_PRIORITY','Lock'),
+('LCK_M_RIn_U','Lock'),
+('LCK_M_RIn_U_ABORT_BLOCKERS','Lock'),
+('LCK_M_RIn_U_LOW_PRIORITY','Lock'),
+('LCK_M_RIn_X','Lock'),
+('LCK_M_RIn_X_ABORT_BLOCKERS','Lock'),
+('LCK_M_RIn_X_LOW_PRIORITY','Lock'),
+('LCK_M_RS_S','Lock'),
+('LCK_M_RS_S_ABORT_BLOCKERS','Lock'),
+('LCK_M_RS_S_LOW_PRIORITY','Lock'),
+('LCK_M_RS_U','Lock'),
+('LCK_M_RS_U_ABORT_BLOCKERS','Lock'),
+('LCK_M_RS_U_LOW_PRIORITY','Lock'),
+('LCK_M_RX_S','Lock'),
+('LCK_M_RX_S_ABORT_BLOCKERS','Lock'),
+('LCK_M_RX_S_LOW_PRIORITY','Lock'),
+('LCK_M_RX_U','Lock'),
+('LCK_M_RX_U_ABORT_BLOCKERS','Lock'),
+('LCK_M_RX_U_LOW_PRIORITY','Lock'),
+('LCK_M_RX_X','Lock'),
+('LCK_M_RX_X_ABORT_BLOCKERS','Lock'),
+('LCK_M_RX_X_LOW_PRIORITY','Lock'),
+('LCK_M_S','Lock'),
+('LCK_M_S_ABORT_BLOCKERS','Lock'),
+('LCK_M_S_LOW_PRIORITY','Lock'),
+('LCK_M_SCH_M','Lock'),
+('LCK_M_SCH_M_ABORT_BLOCKERS','Lock'),
+('LCK_M_SCH_M_LOW_PRIORITY','Lock'),
+('LCK_M_SCH_S','Lock'),
+('LCK_M_SCH_S_ABORT_BLOCKERS','Lock'),
+('LCK_M_SCH_S_LOW_PRIORITY','Lock'),
+('LCK_M_SIU','Lock'),
+('LCK_M_SIU_ABORT_BLOCKERS','Lock'),
+('LCK_M_SIU_LOW_PRIORITY','Lock'),
+('LCK_M_SIX','Lock'),
+('LCK_M_SIX_ABORT_BLOCKERS','Lock'),
+('LCK_M_SIX_LOW_PRIORITY','Lock'),
+('LCK_M_U','Lock'),
+('LCK_M_U_ABORT_BLOCKERS','Lock'),
+('LCK_M_U_LOW_PRIORITY','Lock'),
+('LCK_M_UIX','Lock'),
+('LCK_M_UIX_ABORT_BLOCKERS','Lock'),
+('LCK_M_UIX_LOW_PRIORITY','Lock'),
+('LCK_M_X','Lock'),
+('LCK_M_X_ABORT_BLOCKERS','Lock'),
+('LCK_M_X_LOW_PRIORITY','Lock'),
+('LOGBUFFER','Tran Log IO'),
+('LOGMGR','Tran Log IO'),
+('LOGMGR_FLUSH','Tran Log IO'),
+('LOGMGR_PMM_LOG','Tran Log IO'),
+('LOGMGR_QUEUE','Idle'),
+('LOGMGR_RESERVE_APPEND','Tran Log IO'),
+('MEMORY_ALLOCATION_EXT','Memory'),
+('MEMORY_GRANT_UPDATE','Memory'),
+('MSQL_XACT_MGR_MUTEX','Transaction'),
+('MSQL_XACT_MUTEX','Transaction'),
+('MSSEARCH','Full Text Search'),
+('NET_WAITFOR_PACKET','Network IO'),
+('ONDEMAND_TASK_QUEUE','Idle'),
+('PAGEIOLATCH_DT','Buffer IO'),
+('PAGEIOLATCH_EX','Buffer IO'),
+('PAGEIOLATCH_KP','Buffer IO'),
+('PAGEIOLATCH_NL','Buffer IO'),
+('PAGEIOLATCH_SH','Buffer IO'),
+('PAGEIOLATCH_UP','Buffer IO'),
+('PAGELATCH_DT','Buffer Latch'),
+('PAGELATCH_EX','Buffer Latch'),
+('PAGELATCH_KP','Buffer Latch'),
+('PAGELATCH_NL','Buffer Latch'),
+('PAGELATCH_SH','Buffer Latch'),
+('PAGELATCH_UP','Buffer Latch'),
+('POOL_LOG_RATE_GOVERNOR','Log Rate Governor'),
+('PREEMPTIVE_ABR','Preemptive'),
+('PREEMPTIVE_CLOSEBACKUPMEDIA','Preemptive'),
+('PREEMPTIVE_CLOSEBACKUPTAPE','Preemptive'),
+('PREEMPTIVE_CLOSEBACKUPVDIDEVICE','Preemptive'),
+('PREEMPTIVE_CLUSAPI_CLUSTERRESOURCECONTROL','Preemptive'),
+('PREEMPTIVE_COM_COCREATEINSTANCE','Preemptive'),
+('PREEMPTIVE_COM_COGETCLASSOBJECT','Preemptive'),
+('PREEMPTIVE_COM_CREATEACCESSOR','Preemptive'),
+('PREEMPTIVE_COM_DELETEROWS','Preemptive'),
+('PREEMPTIVE_COM_GETCOMMANDTEXT','Preemptive'),
+('PREEMPTIVE_COM_GETDATA','Preemptive'),
+('PREEMPTIVE_COM_GETNEXTROWS','Preemptive'),
+('PREEMPTIVE_COM_GETRESULT','Preemptive'),
+('PREEMPTIVE_COM_GETROWSBYBOOKMARK','Preemptive'),
+('PREEMPTIVE_COM_LBFLUSH','Preemptive'),
+('PREEMPTIVE_COM_LBLOCKREGION','Preemptive'),
+('PREEMPTIVE_COM_LBREADAT','Preemptive'),
+('PREEMPTIVE_COM_LBSETSIZE','Preemptive'),
+('PREEMPTIVE_COM_LBSTAT','Preemptive'),
+('PREEMPTIVE_COM_LBUNLOCKREGION','Preemptive'),
+('PREEMPTIVE_COM_LBWRITEAT','Preemptive'),
+('PREEMPTIVE_COM_QUERYINTERFACE','Preemptive'),
+('PREEMPTIVE_COM_RELEASE','Preemptive'),
+('PREEMPTIVE_COM_RELEASEACCESSOR','Preemptive'),
+('PREEMPTIVE_COM_RELEASEROWS','Preemptive'),
+('PREEMPTIVE_COM_RELEASESESSION','Preemptive'),
+('PREEMPTIVE_COM_RESTARTPOSITION','Preemptive'),
+('PREEMPTIVE_COM_SEQSTRMREAD','Preemptive'),
+('PREEMPTIVE_COM_SEQSTRMREADANDWRITE','Preemptive'),
+('PREEMPTIVE_COM_SETDATAFAILURE','Preemptive'),
+('PREEMPTIVE_COM_SETPARAMETERINFO','Preemptive'),
+('PREEMPTIVE_COM_SETPARAMETERPROPERTIES','Preemptive'),
+('PREEMPTIVE_COM_STRMLOCKREGION','Preemptive'),
+('PREEMPTIVE_COM_STRMSEEKANDREAD','Preemptive'),
+('PREEMPTIVE_COM_STRMSEEKANDWRITE','Preemptive'),
+('PREEMPTIVE_COM_STRMSETSIZE','Preemptive'),
+('PREEMPTIVE_COM_STRMSTAT','Preemptive'),
+('PREEMPTIVE_COM_STRMUNLOCKREGION','Preemptive'),
+('PREEMPTIVE_CONSOLEWRITE','Preemptive'),
+('PREEMPTIVE_CREATEPARAM','Preemptive'),
+('PREEMPTIVE_DEBUG','Preemptive'),
+('PREEMPTIVE_DFSADDLINK','Preemptive'),
+('PREEMPTIVE_DFSLINKEXISTCHECK','Preemptive'),
+('PREEMPTIVE_DFSLINKHEALTHCHECK','Preemptive'),
+('PREEMPTIVE_DFSREMOVELINK','Preemptive'),
+('PREEMPTIVE_DFSREMOVEROOT','Preemptive'),
+('PREEMPTIVE_DFSROOTFOLDERCHECK','Preemptive'),
+('PREEMPTIVE_DFSROOTINIT','Preemptive'),
+('PREEMPTIVE_DFSROOTSHARECHECK','Preemptive'),
+('PREEMPTIVE_DTC_ABORT','Preemptive'),
+('PREEMPTIVE_DTC_ABORTREQUESTDONE','Preemptive'),
+('PREEMPTIVE_DTC_BEGINTRANSACTION','Preemptive'),
+('PREEMPTIVE_DTC_COMMITREQUESTDONE','Preemptive'),
+('PREEMPTIVE_DTC_ENLIST','Preemptive'),
+('PREEMPTIVE_DTC_PREPAREREQUESTDONE','Preemptive'),
+('PREEMPTIVE_FILESIZEGET','Preemptive'),
+('PREEMPTIVE_FSAOLEDB_ABORTTRANSACTION','Preemptive'),
+('PREEMPTIVE_FSAOLEDB_COMMITTRANSACTION','Preemptive'),
+('PREEMPTIVE_FSAOLEDB_STARTTRANSACTION','Preemptive'),
+('PREEMPTIVE_FSRECOVER_UNCONDITIONALUNDO','Preemptive'),
+('PREEMPTIVE_GETRMINFO','Preemptive'),
+('PREEMPTIVE_HADR_LEASE_MECHANISM','Preemptive'),
+('PREEMPTIVE_HTTP_EVENT_WAIT','Preemptive'),
+('PREEMPTIVE_HTTP_REQUEST','Preemptive'),
+('PREEMPTIVE_LOCKMONITOR','Preemptive'),
+('PREEMPTIVE_MSS_RELEASE','Preemptive'),
+('PREEMPTIVE_ODBCOPS','Preemptive'),
+('PREEMPTIVE_OLE_UNINIT','Preemptive'),
+('PREEMPTIVE_OLEDB_ABORTORCOMMITTRAN','Preemptive'),
+('PREEMPTIVE_OLEDB_ABORTTRAN','Preemptive'),
+('PREEMPTIVE_OLEDB_GETDATASOURCE','Preemptive'),
+('PREEMPTIVE_OLEDB_GETLITERALINFO','Preemptive'),
+('PREEMPTIVE_OLEDB_GETPROPERTIES','Preemptive'),
+('PREEMPTIVE_OLEDB_GETPROPERTYINFO','Preemptive'),
+('PREEMPTIVE_OLEDB_GETSCHEMALOCK','Preemptive'),
+('PREEMPTIVE_OLEDB_JOINTRANSACTION','Preemptive'),
+('PREEMPTIVE_OLEDB_RELEASE','Preemptive'),
+('PREEMPTIVE_OLEDB_SETPROPERTIES','Preemptive'),
+('PREEMPTIVE_OLEDBOPS','Preemptive'),
+('PREEMPTIVE_OS_ACCEPTSECURITYCONTEXT','Preemptive'),
+('PREEMPTIVE_OS_ACQUIRECREDENTIALSHANDLE','Preemptive'),
+('PREEMPTIVE_OS_AUTHENTICATIONOPS','Preemptive'),
+('PREEMPTIVE_OS_AUTHORIZATIONOPS','Preemptive'),
+('PREEMPTIVE_OS_AUTHZGETINFORMATIONFROMCONTEXT','Preemptive'),
+('PREEMPTIVE_OS_AUTHZINITIALIZECONTEXTFROMSID','Preemptive'),
+('PREEMPTIVE_OS_AUTHZINITIALIZERESOURCEMANAGER','Preemptive'),
+('PREEMPTIVE_OS_BACKUPREAD','Preemptive'),
+('PREEMPTIVE_OS_CLOSEHANDLE','Preemptive'),
+('PREEMPTIVE_OS_CLUSTEROPS','Preemptive'),
+('PREEMPTIVE_OS_COMOPS','Preemptive'),
+('PREEMPTIVE_OS_COMPLETEAUTHTOKEN','Preemptive'),
+('PREEMPTIVE_OS_COPYFILE','Preemptive'),
+('PREEMPTIVE_OS_CREATEDIRECTORY','Preemptive'),
+('PREEMPTIVE_OS_CREATEFILE','Preemptive'),
+('PREEMPTIVE_OS_CRYPTACQUIRECONTEXT','Preemptive'),
+('PREEMPTIVE_OS_CRYPTIMPORTKEY','Preemptive'),
+('PREEMPTIVE_OS_CRYPTOPS','Preemptive'),
+('PREEMPTIVE_OS_DECRYPTMESSAGE','Preemptive'),
+('PREEMPTIVE_OS_DELETEFILE','Preemptive'),
+('PREEMPTIVE_OS_DELETESECURITYCONTEXT','Preemptive'),
+('PREEMPTIVE_OS_DEVICEIOCONTROL','Preemptive'),
+('PREEMPTIVE_OS_DEVICEOPS','Preemptive'),
+('PREEMPTIVE_OS_DIRSVC_NETWORKOPS','Preemptive'),
+('PREEMPTIVE_OS_DISCONNECTNAMEDPIPE','Preemptive'),
+('PREEMPTIVE_OS_DOMAINSERVICESOPS','Preemptive'),
+('PREEMPTIVE_OS_DSGETDCNAME','Preemptive'),
+('PREEMPTIVE_OS_DTCOPS','Preemptive'),
+('PREEMPTIVE_OS_ENCRYPTMESSAGE','Preemptive'),
+('PREEMPTIVE_OS_FILEOPS','Preemptive'),
+('PREEMPTIVE_OS_FINDFILE','Preemptive'),
+('PREEMPTIVE_OS_FLUSHFILEBUFFERS','Preemptive'),
+('PREEMPTIVE_OS_FORMATMESSAGE','Preemptive'),
+('PREEMPTIVE_OS_FREECREDENTIALSHANDLE','Preemptive'),
+('PREEMPTIVE_OS_FREELIBRARY','Preemptive'),
+('PREEMPTIVE_OS_GENERICOPS','Preemptive'),
+('PREEMPTIVE_OS_GETADDRINFO','Preemptive'),
+('PREEMPTIVE_OS_GETCOMPRESSEDFILESIZE','Preemptive'),
+('PREEMPTIVE_OS_GETDISKFREESPACE','Preemptive'),
+('PREEMPTIVE_OS_GETFILEATTRIBUTES','Preemptive'),
+('PREEMPTIVE_OS_GETFILESIZE','Preemptive'),
+('PREEMPTIVE_OS_GETFINALFILEPATHBYHANDLE','Preemptive'),
+('PREEMPTIVE_OS_GETLONGPATHNAME','Preemptive'),
+('PREEMPTIVE_OS_GETPROCADDRESS','Preemptive'),
+('PREEMPTIVE_OS_GETVOLUMENAMEFORVOLUMEMOUNTPOINT','Preemptive'),
+('PREEMPTIVE_OS_GETVOLUMEPATHNAME','Preemptive'),
+('PREEMPTIVE_OS_INITIALIZESECURITYCONTEXT','Preemptive'),
+('PREEMPTIVE_OS_LIBRARYOPS','Preemptive'),
+('PREEMPTIVE_OS_LOADLIBRARY','Preemptive'),
+('PREEMPTIVE_OS_LOGONUSER','Preemptive'),
+('PREEMPTIVE_OS_LOOKUPACCOUNTSID','Preemptive'),
+('PREEMPTIVE_OS_MESSAGEQUEUEOPS','Preemptive'),
+('PREEMPTIVE_OS_MOVEFILE','Preemptive'),
+('PREEMPTIVE_OS_NETGROUPGETUSERS','Preemptive'),
+('PREEMPTIVE_OS_NETLOCALGROUPGETMEMBERS','Preemptive'),
+('PREEMPTIVE_OS_NETUSERGETGROUPS','Preemptive'),
+('PREEMPTIVE_OS_NETUSERGETLOCALGROUPS','Preemptive'),
+('PREEMPTIVE_OS_NETUSERMODALSGET','Preemptive'),
+('PREEMPTIVE_OS_NETVALIDATEPASSWORDPOLICY','Preemptive'),
+('PREEMPTIVE_OS_NETVALIDATEPASSWORDPOLICYFREE','Preemptive'),
+('PREEMPTIVE_OS_OPENDIRECTORY','Preemptive'),
+('PREEMPTIVE_OS_PDH_WMI_INIT','Preemptive'),
+('PREEMPTIVE_OS_PIPEOPS','Preemptive'),
+('PREEMPTIVE_OS_PROCESSOPS','Preemptive'),
+('PREEMPTIVE_OS_QUERYCONTEXTATTRIBUTES','Preemptive'),
+('PREEMPTIVE_OS_QUERYREGISTRY','Preemptive'),
+('PREEMPTIVE_OS_QUERYSECURITYCONTEXTTOKEN','Preemptive'),
+('PREEMPTIVE_OS_REMOVEDIRECTORY','Preemptive'),
+('PREEMPTIVE_OS_REPORTEVENT','Preemptive'),
+('PREEMPTIVE_OS_REVERTTOSELF','Preemptive'),
+('PREEMPTIVE_OS_RSFXDEVICEOPS','Preemptive'),
+('PREEMPTIVE_OS_SECURITYOPS','Preemptive'),
+('PREEMPTIVE_OS_SERVICEOPS','Preemptive'),
+('PREEMPTIVE_OS_SETENDOFFILE','Preemptive'),
+('PREEMPTIVE_OS_SETFILEPOINTER','Preemptive'),
+('PREEMPTIVE_OS_SETFILEVALIDDATA','Preemptive'),
+('PREEMPTIVE_OS_SETNAMEDSECURITYINFO','Preemptive'),
+('PREEMPTIVE_OS_SQLCLROPS','Preemptive'),
+('PREEMPTIVE_OS_SQMLAUNCH','Preemptive'),
+('PREEMPTIVE_OS_VERIFYSIGNATURE','Preemptive'),
+('PREEMPTIVE_OS_VERIFYTRUST','Preemptive'),
+('PREEMPTIVE_OS_VSSOPS','Preemptive'),
+('PREEMPTIVE_OS_WAITFORSINGLEOBJECT','Preemptive'),
+('PREEMPTIVE_OS_WINSOCKOPS','Preemptive'),
+('PREEMPTIVE_OS_WRITEFILE','Preemptive'),
+('PREEMPTIVE_OS_WRITEFILEGATHER','Preemptive'),
+('PREEMPTIVE_OS_WSASETLASTERROR','Preemptive'),
+('PREEMPTIVE_REENLIST','Preemptive'),
+('PREEMPTIVE_RESIZELOG','Preemptive'),
+('PREEMPTIVE_ROLLFORWARDREDO','Preemptive'),
+('PREEMPTIVE_ROLLFORWARDUNDO','Preemptive'),
+('PREEMPTIVE_SB_STOPENDPOINT','Preemptive'),
+('PREEMPTIVE_SERVER_STARTUP','Preemptive'),
+('PREEMPTIVE_SETRMINFO','Preemptive'),
+('PREEMPTIVE_SHAREDMEM_GETDATA','Preemptive'),
+('PREEMPTIVE_SNIOPEN','Preemptive'),
+('PREEMPTIVE_SOSHOST','Preemptive'),
+('PREEMPTIVE_SOSTESTING','Preemptive'),
+('PREEMPTIVE_SP_SERVER_DIAGNOSTICS','Preemptive'),
+('PREEMPTIVE_STARTRM','Preemptive'),
+('PREEMPTIVE_STREAMFCB_CHECKPOINT','Preemptive'),
+('PREEMPTIVE_STREAMFCB_RECOVER','Preemptive'),
+('PREEMPTIVE_STRESSDRIVER','Preemptive'),
+('PREEMPTIVE_TESTING','Preemptive'),
+('PREEMPTIVE_TRANSIMPORT','Preemptive'),
+('PREEMPTIVE_UNMARSHALPROPAGATIONTOKEN','Preemptive'),
+('PREEMPTIVE_VSS_CREATESNAPSHOT','Preemptive'),
+('PREEMPTIVE_VSS_CREATEVOLUMESNAPSHOT','Preemptive'),
+('PREEMPTIVE_XE_CALLBACKEXECUTE','Preemptive'),
+('PREEMPTIVE_XE_CX_FILE_OPEN','Preemptive'),
+('PREEMPTIVE_XE_CX_HTTP_CALL','Preemptive'),
+('PREEMPTIVE_XE_DISPATCHER','Preemptive'),
+('PREEMPTIVE_XE_ENGINEINIT','Preemptive'),
+('PREEMPTIVE_XE_GETTARGETSTATE','Preemptive'),
+('PREEMPTIVE_XE_SESSIONCOMMIT','Preemptive'),
+('PREEMPTIVE_XE_TARGETFINALIZE','Preemptive'),
+('PREEMPTIVE_XE_TARGETINIT','Preemptive'),
+('PREEMPTIVE_XE_TIMERRUN','Preemptive'),
+('PREEMPTIVE_XETESTING','Preemptive'),
+('PWAIT_HADR_ACTION_COMPLETED','Replication'),
+('PWAIT_HADR_CHANGE_NOTIFIER_TERMINATION_SYNC','Replication'),
+('PWAIT_HADR_CLUSTER_INTEGRATION','Replication'),
+('PWAIT_HADR_FAILOVER_COMPLETED','Replication'),
+('PWAIT_HADR_JOIN','Replication'),
+('PWAIT_HADR_OFFLINE_COMPLETED','Replication'),
+('PWAIT_HADR_ONLINE_COMPLETED','Replication'),
+('PWAIT_HADR_POST_ONLINE_COMPLETED','Replication'),
+('PWAIT_HADR_SERVER_READY_CONNECTIONS','Replication'),
+('PWAIT_HADR_WORKITEM_COMPLETED','Replication'),
+('PWAIT_HADRSIM','Replication'),
+('PWAIT_RESOURCE_SEMAPHORE_FT_PARALLEL_QUERY_SYNC','Full Text Search'),
+('QUERY_TRACEOUT','Tracing'),
+('REPL_CACHE_ACCESS','Replication'),
+('REPL_HISTORYCACHE_ACCESS','Replication'),
+('REPL_SCHEMA_ACCESS','Replication'),
+('REPL_TRANFSINFO_ACCESS','Replication'),
+('REPL_TRANHASHTABLE_ACCESS','Replication'),
+('REPL_TRANTEXTINFO_ACCESS','Replication'),
+('REPLICA_WRITES','Replication'),
+('REQUEST_FOR_DEADLOCK_SEARCH','Idle'),
+('RESERVED_MEMORY_ALLOCATION_EXT','Memory'),
+('RESOURCE_SEMAPHORE','Memory'),
+('RESOURCE_SEMAPHORE_QUERY_COMPILE','Compilation'),
+('SLEEP_BPOOL_FLUSH','Idle'),
+('SLEEP_BUFFERPOOL_HELPLW','Idle'),
+('SLEEP_DBSTARTUP','Idle'),
+('SLEEP_DCOMSTARTUP','Idle'),
+('SLEEP_MASTERDBREADY','Idle'),
+('SLEEP_MASTERMDREADY','Idle'),
+('SLEEP_MASTERUPGRADED','Idle'),
+('SLEEP_MEMORYPOOL_ALLOCATEPAGES','Idle'),
+('SLEEP_MSDBSTARTUP','Idle'),
+('SLEEP_RETRY_VIRTUALALLOC','Idle'),
+('SLEEP_SYSTEMTASK','Idle'),
+('SLEEP_TASK','Idle'),
+('SLEEP_TEMPDBSTARTUP','Idle'),
+('SLEEP_WORKSPACE_ALLOCATEPAGE','Idle'),
+('SOS_SCHEDULER_YIELD','CPU'),
+('SQLCLR_APPDOMAIN','SQL CLR'),
+('SQLCLR_ASSEMBLY','SQL CLR'),
+('SQLCLR_DEADLOCK_DETECTION','SQL CLR'),
+('SQLCLR_QUANTUM_PUNISHMENT','SQL CLR'),
+('SQLTRACE_BUFFER_FLUSH','Idle'),
+('SQLTRACE_FILE_BUFFER','Tracing'),
+('SQLTRACE_FILE_READ_IO_COMPLETION','Tracing'),
+('SQLTRACE_FILE_WRITE_IO_COMPLETION','Tracing'),
+('SQLTRACE_INCREMENTAL_FLUSH_SLEEP','Idle'),
+('SQLTRACE_PENDING_BUFFER_WRITERS','Tracing'),
+('SQLTRACE_SHUTDOWN','Tracing'),
+('SQLTRACE_WAIT_ENTRIES','Idle'),
+('THREADPOOL','Worker Thread'),
+('TRACE_EVTNOTIF','Tracing'),
+('TRACEWRITE','Tracing'),
+('TRAN_MARKLATCH_DT','Transaction'),
+('TRAN_MARKLATCH_EX','Transaction'),
+('TRAN_MARKLATCH_KP','Transaction'),
+('TRAN_MARKLATCH_NL','Transaction'),
+('TRAN_MARKLATCH_SH','Transaction'),
+('TRAN_MARKLATCH_UP','Transaction'),
+('TRANSACTION_MUTEX','Transaction'),
+('WAIT_FOR_RESULTS','User Wait'),
+('WAITFOR','User Wait'),
+('WRITE_COMPLETION','Other Disk IO'),
+('WRITELOG','Tran Log IO'),
+('XACT_OWN_TRANSACTION','Transaction'),
+('XACT_RECLAIM_SESSION','Transaction'),
+('XACTLOCKINFO','Transaction'),
+('XACTWORKSPACE_MUTEX','Transaction'),
+('XE_DISPATCHER_WAIT','Idle'),
+('XE_TIMER_EVENT','Idle')) AS wc(wait_type, wait_category)
+	ON ws.wait_type = wc.wait_type
+WHERE
+ws.wait_type NOT IN (
+	N'BROKER_EVENTHANDLER', N'BROKER_RECEIVE_WAITFOR', N'BROKER_TASK_STOP',
+	N'BROKER_TO_FLUSH', N'BROKER_TRANSMITTER', N'CHECKPOINT_QUEUE',
+	N'CHKPT', N'CLR_AUTO_EVENT', N'CLR_MANUAL_EVENT', N'CLR_SEMAPHORE',
+	N'DBMIRROR_DBM_EVENT', N'DBMIRROR_EVENTS_QUEUE', N'DBMIRROR_WORKER_QUEUE',
+	N'DBMIRRORING_CMD', N'DIRTY_PAGE_POLL', N'DISPATCHER_QUEUE_SEMAPHORE',
+	N'EXECSYNC', N'FSAGENT', N'FT_IFTS_SCHEDULER_IDLE_WAIT', N'FT_IFTSHC_MUTEX',
+	N'HADR_CLUSAPI_CALL', N'HADR_FILESTREAM_IOMGR_IOCOMPLETION', N'HADR_LOGCAPTURE_WAIT', 
+	N'HADR_NOTIFICATION_DEQUEUE', N'HADR_TIMER_TASK', N'HADR_WORK_QUEUE',
+	N'KSOURCE_WAKEUP', N'LAZYWRITER_SLEEP', N'LOGMGR_QUEUE', 
+	N'MEMORY_ALLOCATION_EXT', N'ONDEMAND_TASK_QUEUE',
+	N'PARALLEL_REDO_WORKER_WAIT_WORK',
+	N'PREEMPTIVE_HADR_LEASE_MECHANISM', N'PREEMPTIVE_SP_SERVER_DIAGNOSTICS',
+	N'PREEMPTIVE_OS_LIBRARYOPS', N'PREEMPTIVE_OS_COMOPS', N'PREEMPTIVE_OS_CRYPTOPS',
+	N'PREEMPTIVE_OS_PIPEOPS', N'PREEMPTIVE_OS_AUTHENTICATIONOPS',
+	N'PREEMPTIVE_OS_GENERICOPS', N'PREEMPTIVE_OS_VERIFYTRUST',
+	N'PREEMPTIVE_OS_FILEOPS', N'PREEMPTIVE_OS_DEVICEOPS', N'PREEMPTIVE_OS_QUERYREGISTRY',
+	N'PREEMPTIVE_OS_WRITEFILE',
+	N'PREEMPTIVE_XE_CALLBACKEXECUTE', N'PREEMPTIVE_XE_DISPATCHER',
+	N'PREEMPTIVE_XE_GETTARGETSTATE', N'PREEMPTIVE_XE_SESSIONCOMMIT',
+	N'PREEMPTIVE_XE_TARGETINIT', N'PREEMPTIVE_XE_TARGETFINALIZE',
+	N'PWAIT_ALL_COMPONENTS_INITIALIZED', N'PWAIT_DIRECTLOGCONSUMER_GETNEXT',
+	N'QDS_PERSIST_TASK_MAIN_LOOP_SLEEP',
+	N'QDS_ASYNC_QUEUE',
+	N'QDS_CLEANUP_STALE_QUERIES_TASK_MAIN_LOOP_SLEEP', N'REQUEST_FOR_DEADLOCK_SEARCH',
+	N'RESOURCE_QUEUE', N'SERVER_IDLE_CHECK', N'SLEEP_BPOOL_FLUSH', N'SLEEP_DBSTARTUP',
+	N'SLEEP_DCOMSTARTUP', N'SLEEP_MASTERDBREADY', N'SLEEP_MASTERMDREADY',
+	N'SLEEP_MASTERUPGRADED', N'SLEEP_MSDBSTARTUP', N'SLEEP_SYSTEMTASK', N'SLEEP_TASK',
+	N'SLEEP_TEMPDBSTARTUP', N'SNI_HTTP_ACCEPT', N'SP_SERVER_DIAGNOSTICS_SLEEP',
+	N'SQLTRACE_BUFFER_FLUSH', N'SQLTRACE_INCREMENTAL_FLUSH_SLEEP', N'SQLTRACE_WAIT_ENTRIES',
+	N'WAIT_FOR_RESULTS', N'WAITFOR', N'WAITFOR_TASKSHUTDOWN', N'WAIT_XTP_HOST_WAIT',
+	N'WAIT_XTP_OFFLINE_CKPT_NEW_LOG', N'WAIT_XTP_CKPT_CLOSE',
+	N'XE_BUFFERMGR_ALLPROCESSED_EVENT', N'XE_DISPATCHER_JOIN',
+	N'XE_DISPATCHER_WAIT', N'XE_LIVE_TARGET_TVF', N'XE_TIMER_EVENT')
+AND waiting_tasks_count > 0
+ORDER BY
+waiting_tasks_count DESC
+OPTION (RECOMPILE);
+`
+
+const sqlAzureDB string = `IF OBJECT_ID('sys.dm_db_resource_stats') IS NOT NULL
+BEGIN
+	SELECT TOP(1)
+		'sqlserver_azurestats' AS [measurement],
+		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+		SERVERPROPERTY('ServerName') AS [host],
+		avg_cpu_percent,
+		avg_data_io_percent,
+		avg_log_write_percent,
+		avg_memory_usage_percent,
+		xtp_storage_percent,
+		max_worker_percent,
+		max_session_percent,
+		dtu_limit,
+		avg_login_rate_percent,
+		end_time 
+	FROM
+		sys.dm_db_resource_stats WITH (NOLOCK) 
+	ORDER BY
+		end_time DESC
+	OPTION (RECOMPILE)
+END
+ELSE
+BEGIN
+	RAISERROR('This does not seem to be an AzureDB instance. Set "azureDB = false" in your telegraf configuration.',16,1)
+END`
+
+// Queries V1
 const sqlPerformanceMetrics string = `SET NOCOUNT ON;
 SET ARITHABORT ON;
 SET QUOTED_IDENTIFIER ON;

From 8c8c9200e78ecaf7a7a30e1e542bae7f9576c4d1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 12:13:49 -0800
Subject: [PATCH 0912/1302] Update sqlserver readme; enable query_version = 2
 in default config

If unset, query_version is still treated as version 1 for compatibility.
---
 plugins/inputs/sqlserver/README.md    | 150 +++++++++++++-------------
 plugins/inputs/sqlserver/sqlserver.go |  60 ++++++-----
 2 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index 801e61a5b..502d1aef8 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -1,94 +1,98 @@
-# SQL Server plugin
+# SQL Server Input Plugin
 
-This sqlserver plugin provides metrics for your SQL Server instance. It currently works with SQL Server versions 2008+. Recorded metrics are lightweight and use Dynamic Management Views supplied by SQL Server.
+The `sqlserver` plugin provides metrics for your SQL Server instance. It
+currently works with SQL Server versions 2008+. Recorded metrics are
+lightweight and use Dynamic Management Views supplied by SQL Server.
 
-## Getting started :
+### Additional Setup:
 
 You have to create a login on every instance you want to monitor, with following script:
-```SQL 
-USE master; 
+```sql
+USE master;
 GO
 CREATE LOGIN [telegraf] WITH PASSWORD = N'mystrongpassword';
 GO
-GRANT VIEW SERVER STATE TO [telegraf]; 
+GRANT VIEW SERVER STATE TO [telegraf];
 GO
-GRANT VIEW ANY DEFINITION TO [telegraf]; 
+GRANT VIEW ANY DEFINITION TO [telegraf];
 GO
 ```
 
+### Configuration:
 
-## Configuration:
-
-``` 
+```toml
 # Read metrics from Microsoft SQL Server
 [[inputs.sqlserver]]
-# Specify instances to monitor with a list of connection strings.
-# All connection parameters are optional.
-# By default, the host is localhost, listening on default port, TCP 1433.
-#   for Windows, the user is the currently running AD user (SSO).
-#   See https://github.com/denisenkom/go-mssqldb for detailed connection
-#   parameters.
-	servers = [
-		"Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
-	]
+  ## Specify instances to monitor with a list of connection strings.
+  ## All connection parameters are optional.
+  ## By default, the host is localhost, listening on default port, TCP 1433.
+  ##   for Windows, the user is the currently running AD user (SSO).
+  ##   See https://github.com/denisenkom/go-mssqldb for detailed connection
+  ##   parameters.
+  # servers = [
+  #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
+  # ]
 
-# Optional parameter, setting this to 2 will use a new version
-# of the collection queries that break compatibility with the original
-# dashboards. 
-	query_version = 2
-# If you are using AzureDB, setting this to True will gather resource utilization metrics
-	azuredb = False
-# If you would like to exclude some of the metrics queries, list them here
-# Possible choices:
-# - PerformanceCounters
-# - WaitStatsCategorized
-# - DatabaseIO
-# - DatabaseProperties
-# - CPUHistory
-# - DatabaseSize
-# - DatabaseStats
-# - MemoryClerk
-# - VolumeSpace
-# - PerformanceMetrics
-	exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
+  ## Optional parameter, setting this to 2 will use a new version
+  ## of the collection queries that break compatibility with the original
+  ## dashboards.
+  query_version = 2
+
+  ## If you are using AzureDB, setting this to true will gather resource utilization metrics
+  # azuredb = false
+
+  ## If you would like to exclude some of the metrics queries, list them here
+  ## Possible choices:
+  ## - PerformanceCounters
+  ## - WaitStatsCategorized
+  ## - DatabaseIO
+  ## - DatabaseProperties
+  ## - CPUHistory
+  ## - DatabaseSize
+  ## - DatabaseStats
+  ## - MemoryClerk
+  ## - VolumeSpace
+  ## - PerformanceMetrics
+  # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
 ```
 
-# Metrics Collected
-To provide backwards compatibility, this plugin support two versions of metrics queries. 
-
-The original metrics queries provide:
-* *Performance counters*: 1000+ metrics from `sys.dm_os_performance_counters`
-* *Performance metrics*: special performance and ratio metrics
-* *Wait stats*: wait tasks categorized from `sys.dm_os_wait_stats`
-* *Memory clerk*: memory breakdown from `sys.dm_os_memory_clerks`
-* *Database size*: databases size trend from `sys.dm_io_virtual_file_stats`
-* *Database IO*: databases I/O from `sys.dm_io_virtual_file_stats`
-* *Database latency*: databases latency from `sys.dm_io_virtual_file_stats`
-* *Database properties*: databases properties, state and recovery model, from `sys.databases`
-* *OS Volume*: available, used and total space from `sys.dm_os_volume_stats`
-* *CPU*: cpu usage from `sys.dm_os_ring_buffers`
-
-The new (version 2) metrics provide:
-* *AzureDB*: AzureDB resource utilization from `sys.dm_db_resource_stats`
-* *Database IO*: IO stats from `sys.dm_io_virtual_file_stats`
-* *Memory Clerk*: Memory clerk breakdown from `sys.dm_os_memory_clerks`, most clerks have been given a friendly name.
-* *Performance Counters*: A select list of performance counters from `sys.dm_os_performance_counters`. Some of the important metrics included:
-    * *Activity*: Transactions/sec/database, Batch requests/sec, blocked processes, + more
-	* *Availability Groups*: Bytes sent to replica, Bytes received from replica, Log bytes received, Log send queue, transaction delay, + more
-	* *Log activity*: Log bytes flushed/sec, Log flushes/sec, Log Flush Wait Time
-	* *Memory*: PLE, Page reads/sec, Page writes/sec, + more
-	* *TempDB*: Free space, Version store usage, Active temp tables, temp table creation rate, + more
-	* *Resource Governor*: CPU Usage, Requests/sec, Queued Requests, and Blocked tasks per workload group
-* *Server properties*: Number of databases in all possible states (online, offline, suspect, etc.), cpu count, physical memory, SQL Server service uptime, and SQL Server version
-* *Wait stats*: Wait time in ms, number of waiting tasks, resource wait time, signal wait time, max wait time in ms, wait type, and wait category. The waits are categorized using the sasme categories used in Query Store.
+### Metrics:
+To provide backwards compatibility, this plugin support two versions of metrics queries.
 
 **Note**: Version 2 queries are not backwards compatible with the old queries. Any dashboards or queries based on the old query format will not work with the new format. The version 2 queries are written in such a way as to only gather SQL specific metrics (no disk space or overall CPU related metrics) and they only report raw metrics, no math has been done to calculate deltas. To graph this data you must calculate deltas in your dashboarding software.
 
-# Tags
-If you are using the original queries all stats have the following tags:
-* `servername`:  hostname:instance
-* `type`: type of stats to easily filter measurements
+#### Version 1 (deprecated in 1.6):
+The original metrics queries provide:
+- *Performance counters*: 1000+ metrics from `sys.dm_os_performance_counters`
+- *Performance metrics*: special performance and ratio metrics
+- *Wait stats*: wait tasks categorized from `sys.dm_os_wait_stats`
+- *Memory clerk*: memory breakdown from `sys.dm_os_memory_clerks`
+- *Database size*: databases size trend from `sys.dm_io_virtual_file_stats`
+- *Database IO*: databases I/O from `sys.dm_io_virtual_file_stats`
+- *Database latency*: databases latency from `sys.dm_io_virtual_file_stats`
+- *Database properties*: databases properties, state and recovery model, from `sys.databases`
+- *OS Volume*: available, used and total space from `sys.dm_os_volume_stats`
+- *CPU*: cpu usage from `sys.dm_os_ring_buffers`
 
-Version 2 queries all have the following:
-* `host`: Physical host name
-* `sql_instance`: Physical host and instance name (hostname:instance)
\ No newline at end of file
+If you are using the original queries all stats have the following tags:
+- `servername`:  hostname:instance
+- `type`: type of stats to easily filter measurements
+
+#### Version 2:
+The new (version 2) metrics provide:
+- *AzureDB*: AzureDB resource utilization from `sys.dm_db_resource_stats`
+- *Database IO*: IO stats from `sys.dm_io_virtual_file_stats`
+- *Memory Clerk*: Memory clerk breakdown from `sys.dm_os_memory_clerks`, most clerks have been given a friendly name.
+- *Performance Counters*: A select list of performance counters from `sys.dm_os_performance_counters`. Some of the important metrics included:
+  - *Activity*: Transactions/sec/database, Batch requests/sec, blocked processes, + more
+  - *Availability Groups*: Bytes sent to replica, Bytes received from replica, Log bytes received, Log send queue, transaction delay, + more
+  - *Log activity*: Log bytes flushed/sec, Log flushes/sec, Log Flush Wait Time
+  - *Memory*: PLE, Page reads/sec, Page writes/sec, + more
+  - *TempDB*: Free space, Version store usage, Active temp tables, temp table creation rate, + more
+  - *Resource Governor*: CPU Usage, Requests/sec, Queued Requests, and Blocked tasks per workload group
+- *Server properties*: Number of databases in all possible states (online, offline, suspect, etc.), cpu count, physical memory, SQL Server service uptime, and SQL Server version
+- *Wait stats*: Wait time in ms, number of waiting tasks, resource wait time, signal wait time, max wait time in ms, wait type, and wait category. The waits are categorized using the sasme categories used in Query Store.
+
+Version 2 queries have the following tags:
+- `host`: Physical host name
+- `sql_instance`: Physical host and instance name (hostname:instance)
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 8b9f19f86..90aa9c837 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -38,35 +38,37 @@ var isInitialized = false
 var defaultServer = "Server=.;app name=telegraf;log=1;"
 
 var sampleConfig = `
-## Specify instances to monitor with a list of connection strings.
-## All connection parameters are optional.
-## By default, the host is localhost, listening on default port, TCP 1433.
-##   for Windows, the user is the currently running AD user (SSO).
-##   See https://github.com/denisenkom/go-mssqldb for detailed connection
-##   parameters.
-# servers = [
-#  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
-# ]
-#
-## Optional parameter, setting this to 2 will use a new version
-## of the collection queries that break compatibility with the original
-## dashboards. 
-# query_version = 2
-## If you are using AzureDB, setting this to True will gather resource utilization metrics
-# azuredb = False
-## If you would like to exclude some of the metrics queries, list them here
-## Possible choices:
-## - PerformanceCounters
-## - WaitStatsCategorized
-## - DatabaseIO
-## - DatabaseProperties
-## - CPUHistory
-## - DatabaseSize
-## - DatabaseStats
-## - MemoryClerk
-## - VolumeSpace
-## - PerformanceMetrics
-# exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
+  ## Specify instances to monitor with a list of connection strings.
+  ## All connection parameters are optional.
+  ## By default, the host is localhost, listening on default port, TCP 1433.
+  ##   for Windows, the user is the currently running AD user (SSO).
+  ##   See https://github.com/denisenkom/go-mssqldb for detailed connection
+  ##   parameters.
+  # servers = [
+  #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
+  # ]
+
+  ## Optional parameter, setting this to 2 will use a new version
+  ## of the collection queries that break compatibility with the original
+  ## dashboards.
+  query_version = 2
+
+  ## If you are using AzureDB, setting this to true will gather resource utilization metrics
+  # azuredb = false
+
+  ## If you would like to exclude some of the metrics queries, list them here
+  ## Possible choices:
+  ## - PerformanceCounters
+  ## - WaitStatsCategorized
+  ## - DatabaseIO
+  ## - DatabaseProperties
+  ## - CPUHistory
+  ## - DatabaseSize
+  ## - DatabaseStats
+  ## - MemoryClerk
+  ## - VolumeSpace
+  ## - PerformanceMetrics
+  # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
 `
 
 // SampleConfig return the sample configuration

From 4153d2ca42cccec42272162df5eaae222eb0b820 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 12:15:24 -0800
Subject: [PATCH 0913/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2629c804..ca8fba245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,11 @@
   In environments where TCP connections are terminated the `max_lifetime`
   setting should be set less than the collection `interval` to prevent errors.
 
+- The `sqlserver` input plugin has a new query and data model that can be enabled
+  by setting `query_version = 2`.  It is encouraged to migrate to the new
+  model when possible as the old version is deprectated and will be removed in
+  a future version.
+
 ### New Plugins
 
 - [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
@@ -42,6 +47,7 @@
 - [#3726](https://github.com/influxdata/telegraf/pull/3726): Add support for setting bsd source address to the ping input.
 - [#3346](https://github.com/influxdata/telegraf/pull/3346): Add Ipset input plugin.
 - [#3719](https://github.com/influxdata/telegraf/pull/3719): Add TLS and HTTP basic auth to prometheus_client output.
+- [#3618](https://github.com/influxdata/telegraf/pull/3618): Add new sqlserver output data model.
 
 ### Bugfixes
 

From 12d62e60b325aeab5659bbc41eb91c6447f8224a Mon Sep 17 00:00:00 2001
From: Paul Myjavec <pauly@buzbox.net>
Date: Fri, 2 Feb 2018 10:05:39 +1100
Subject: [PATCH 0914/1302] Use CircleCI 2.0 for builds (#3731)

---
 .circleci/config.yml             |  47 +++++++++++++
 .gitignore                       |   2 +
 Makefile                         | 113 ++++++++++++-------------------
 appveyor.yml                     |  12 ++--
 circle.yml                       |  19 ------
 docker-compose.yml               |  93 +++++++++++++++++++++++++
 internal/internal_test.go        |   7 ++
 plugins/inputs/snmp/snmp_test.go |   5 ++
 scripts/circle-test.sh           |  95 --------------------------
 scripts/release.sh               |  34 ++++++++++
 10 files changed, 236 insertions(+), 191 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml
 create mode 100644 docker-compose.yml
 delete mode 100755 scripts/circle-test.sh
 create mode 100755 scripts/release.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..d9e9a9a42
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,47 @@
+---
+defaults: &defaults
+  docker:
+    - image: 'circleci/golang:1.9.2'
+  working_directory: '/go/src/github.com/influxdata/telegraf'
+version: 2
+jobs:
+  build:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: 'make ci-test'
+  release:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: './scripts/release.sh'
+      - store_artifacts:
+          path: './artifacts'
+          destination: '.'
+  nightly:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: './scripts/release.sh'
+      - store_artifacts:
+          path: './artifacts'
+          destination: '.'
+workflows:
+  version: 2
+  build_and_release:
+    jobs:
+      - 'build'
+      - 'release':
+          requires:
+            - 'build'
+  nightly:
+    jobs:
+      - 'build'
+      - 'nightly'
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
diff --git a/.gitignore b/.gitignore
index 8269337df..38fd3ec9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ tivan
 .idea
 *~
 *#
+telegraf
+telegraf.gz
diff --git a/Makefile b/Makefile
index a0c340eeb..ab4662575 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ PREFIX := /usr/local
 VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
+GOFILES ?= $(shell find . -name '*.go')
+GOFMT ?= $(shell gofmt -l $(GOFILES))
+
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
@@ -16,10 +19,18 @@ ifdef VERSION
 endif
 
 all:
+	$(MAKE) fmtcheck
 	$(MAKE) deps
 	$(MAKE) telegraf
 
+ci-test:
+	$(MAKE) deps
+	$(MAKE) fmtcheck
+	$(MAKE) vet
+	$(MAKE) test
+
 deps:
+	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
 	gdm restore
 
@@ -36,92 +47,52 @@ install: telegraf
 test:
 	go test -short ./...
 
+fmt:
+	@gofmt -w $(GOFILES)
+
+fmtcheck:
+	@echo '[INFO] running gofmt to identify incorrectly formatted code...'
+	@if [ ! -z $(GOFMT) ]; then \
+		echo "[ERROR] gofmt has found errors in the following files:"  ; \
+		echo "$(GOFMT)" ; \
+		echo "" ;\
+		echo "Run make fmt to fix them." ; \
+		exit 1 ;\
+	fi
+	@echo '[INFO] done.'
+
+lint:
+	golint ./...
+
 test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
 	go test ./plugins/inputs/win_services/...
 
-lint:
-	go vet ./...
+# vet runs the Go source code static analysis tool `vet` to find
+# any common errors.
+vet:
+	@echo 'go vet $$(go list ./...)'
+	@go vet $$(go list ./...) ; if [ $$? -eq 1 ]; then \
+		echo ""; \
+		echo "go vet has found suspicious constructs. Please remediate any reported errors"; \
+		echo "to fix them before submitting code for review."; \
+		exit 1; \
+	fi
 
-test-all: lint
+test-all: vet
 	go test ./...
 
 package:
 	./scripts/build.py --package --platform=all --arch=all
 
 clean:
-	-rm -f telegraf
-	-rm -f telegraf.exe
+	rm -f telegraf
+	rm -f telegraf.exe
 
 docker-image:
 	./scripts/build.py --package --platform=linux --arch=amd64
 	cp build/telegraf*$(COMMIT)*.deb .
 	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .
 
-# Run all docker containers necessary for integration tests
-docker-run:
-	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
-	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
-	docker run --name kafka \
-		--link zookeeper:zookeeper \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
-		-e KAFKA_ADVERTISED_PORT=9092 \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
-		-e KAFKA_CREATE_TOPICS="test:1:1" \
-		-p "9092:9092" \
-		-d wurstmeister/kafka
-	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
-	docker run --name mysql -p "3306:3306" -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql
-	docker run --name memcached -p "11211:11211" -d memcached
-	docker run --name postgres -p "5432:5432" -d postgres
-	docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
-	docker run --name redis -p "6379:6379" -d redis
-	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
-	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
-	docker run --name nats -p "4222:4222" -d nats
-	docker run --name openldap \
-		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
-		-e SLAPD_CONFIG_ROOTPW="secret" \
-		-p "389:389" -p "636:636" \
-		-d cobaugh/openldap-alpine
-	docker run --name cratedb \
-		-p "6543:5432" \
-		-d crate:2.2 \
-		-Cnetwork.host=0.0.0.0 \
-		-Ctransport.host=localhost \
-		-Clicense.enterprise=false
-
-# Run docker containers necessary for integration tests; skipping services provided
-# by CircleCI
-docker-run-circle:
-	docker run --name aerospike -p "3000:3000" -d aerospike/aerospike-server:3.9.0
-	docker run --name zookeeper -p "2181:2181" -d wurstmeister/zookeeper
-	docker run --name kafka \
-		--link zookeeper:zookeeper \
-		-e KAFKA_ADVERTISED_HOST_NAME=localhost \
-		-e KAFKA_ADVERTISED_PORT=9092 \
-		-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
-		-e KAFKA_CREATE_TOPICS="test:1:1" \
-		-p "9092:9092" \
-		-d wurstmeister/kafka
-	docker run --name elasticsearch -p "9200:9200" -p "9300:9300" -d elasticsearch:5
-	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
-	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
-	docker run --name riemann -p "5555:5555" -d stealthly/docker-riemann
-	docker run --name nats -p "4222:4222" -d nats
-	docker run --name openldap \
-		-e SLAPD_CONFIG_ROOTDN="cn=manager,cn=config" \
-		-e SLAPD_CONFIG_ROOTPW="secret" \
-		-p "389:389" -p "636:636" \
-		-d cobaugh/openldap-alpine
-
-docker-kill:
-	-docker kill aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper cratedb
-	-docker rm aerospike elasticsearch kafka memcached mqtt mysql nats nsq \
-		openldap postgres rabbitmq redis riemann zookeeper cratedb
-
-.PHONY: deps telegraf telegraf.exe install test test-windows lint test-all \
-	package clean docker-run docker-run-circle docker-kill docker-image
+.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck
diff --git a/appveyor.yml b/appveyor.yml
index 35cbcbc1a..1a52f8adc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,20 +13,20 @@ platform: x64
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
   - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
-  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
-  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
   - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
-  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
-  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version
   - go env
 
 build_script:
-  - cmd: C:\GnuWin32\bin\make
+  - cmd: go get github.com/sparrc/gdm
+  - cmd: C:\gopath\bin\gdm restore
+  - cmd: go build -i -o telegraf.exe ./cmd/telegraf/telegraf.go
 
 test_script:
-  - cmd: C:\GnuWin32\bin\make test-windows
+  - cmd: go test ./plugins/inputs/ping/...
+  - cmd: go test ./plugins/inputs/win_perf_counters/...
+  - cmd: go test ./plugins/inputs/win_services/...
 
 artifacts:
   - path: telegraf.exe
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 41fb2e31a..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-machine:
-  services:
-    - docker
-    - memcached
-    - redis
-    - rabbitmq-server
-  post:
-    - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz
-    - go version
-
-dependencies:
-  override:
-    - docker info
-
-test:
-  override:
-    - bash scripts/circle-test.sh
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..7dd3feeb4
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,93 @@
+version: '3'
+
+services:
+  aerospike:
+    image: aerospike/aerospike-server:3.9.0
+    ports:
+      - "3000:3000"
+  zookeeper:
+    image: wurstmeister/zookeeper
+    environment:
+      - JAVA_OPTS="-Xms256m -Xmx256m"
+    ports:
+      - "2181:2181"
+  kafka:
+    image: wurstmeister/kafka
+    environment:
+      - KAFKA_ADVERTISED_HOST_NAME=localhost
+      - KAFKA_ADVERTISED_PORT=9092
+      - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
+      - KAFKA_CREATE_TOPICS="test:1:1"
+      - JAVA_OPTS="-Xms256m -Xmx256m"
+    ports:
+      - "9092:9092"
+    depends_on:
+      - zookeeper
+  elasticsearch:
+    image: elasticsearch:5
+    environment:
+    - JAVA_OPTS="-Xms256m -Xmx256m"
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+  mysql:
+    image: mysql
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    ports:
+      - "3306:3306"
+  memcached:
+    image: memcached
+    ports: 
+      - "11211:11211"
+  postgres:
+    image: postgres:alpine
+    ports:
+      - "5432:5432"
+  rabbitmq:
+    image: rabbitmq:3-management
+    ports:
+      - "15672:15672"
+      - "5672:5672"
+  redis:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
+  nsq:
+    image: nsqio/nsq
+    ports:
+      - "4150:4150"
+    command: "/nsqd"
+  mqtt:
+    image: ncarlier/mqtt
+    ports:
+      - "1883:1883"
+  riemann:
+    image: stealthly/docker-riemann
+    ports:
+      - "5555:5555"
+  nats:
+    image: nats
+    ports:
+      - "4222:4222"
+  openldap:
+    image: cobaugh/openldap-alpine
+    environment:
+      - SLAPD_CONFIG_ROOTDN="cn=manager,cn=config"
+      - SLAPD_CONFIG_ROOTPW="secret"
+    ports:
+      - "389:389"
+      - "636:636"
+  crate:
+   image: crate/crate
+   ports:
+    - "4200:4200"
+    - "4230:4230"
+   command:
+    - crate
+    - -Cnetwork.host=0.0.0.0
+    - -Ctransport.host=localhost
+    - -Clicense.enterprise=false
+   environment:
+    - CRATE_HEAP_SIZE=128m
+    - JAVA_OPTS='-Xms256m -Xmx256m'
diff --git a/internal/internal_test.go b/internal/internal_test.go
index 5be5b08d2..ee1d24418 100644
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -44,6 +44,9 @@ var (
 )
 
 func TestRunTimeout(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test due to random failures.")
+	}
 	if sleepbin == "" {
 		t.Skip("'sleep' binary not available on OS, skipping.")
 	}
@@ -58,6 +61,8 @@ func TestRunTimeout(t *testing.T) {
 }
 
 func TestCombinedOutputTimeout(t *testing.T) {
+	// TODO: Fix this test
+	t.Skip("Test failing too often, skip for now and revisit later.")
 	if sleepbin == "" {
 		t.Skip("'sleep' binary not available on OS, skipping.")
 	}
@@ -109,6 +114,8 @@ func TestRunError(t *testing.T) {
 }
 
 func TestRandomSleep(t *testing.T) {
+	// TODO: Fix this test
+	t.Skip("Test failing too often, skip for now and revisit later.")
 	// test that zero max returns immediately
 	s := time.Now()
 	RandomSleep(time.Duration(0), make(chan struct{}))
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index f9a7d95e2..497461485 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -333,6 +333,9 @@ func TestGetSNMPConnection_caching(t *testing.T) {
 }
 
 func TestGosnmpWrapper_walk_retry(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test due to random failures.")
+	}
 	srvr, err := net.ListenUDP("udp4", &net.UDPAddr{})
 	defer srvr.Close()
 	require.NoError(t, err)
@@ -379,6 +382,8 @@ func TestGosnmpWrapper_walk_retry(t *testing.T) {
 }
 
 func TestGosnmpWrapper_get_retry(t *testing.T) {
+	// TODO: Fix this test
+	t.Skip("Test failing too often, skip for now and revisit later.")
 	srvr, err := net.ListenUDP("udp4", &net.UDPAddr{})
 	defer srvr.Close()
 	require.NoError(t, err)
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
deleted file mode 100755
index 735e66cc7..000000000
--- a/scripts/circle-test.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-# This is the Telegraf CircleCI test script. Using this script allows total control
-# the environment in which the build and test is run, and matches the official
-# build process for InfluxDB.
-
-BUILD_DIR=$HOME/telegraf-build
-VERSION=`git describe --always --tags`
-
-# Executes the given statement, and exits if the command returns a non-zero code.
-function exit_if_fail {
-    command=$@
-    echo "Executing '$command'"
-    eval $command
-    rc=$?
-    if [ $rc -ne 0 ]; then
-        echo "'$command' returned $rc."
-        exit $rc
-    fi
-}
-
-# Check that go fmt has been run.
-function check_go_fmt {
-    fmtcount=`git ls-files | grep '.go$' | grep -v Godep | xargs gofmt -l 2>&1 | wc -l`
-    if [ $fmtcount -gt 0 ]; then
-        echo "run 'go fmt ./...' to format your source code."
-        exit 1
-    fi
-}
-
-# Set up the build directory, and then GOPATH.
-exit_if_fail mkdir $BUILD_DIR
-export GOPATH=$BUILD_DIR
-# Turning off GOGC speeds up build times
-export GOGC=off
-export PATH=$GOPATH/bin:$PATH
-exit_if_fail mkdir -p $GOPATH/src/github.com/influxdata
-
-# Dump some test config to the log.
-echo "Test configuration"
-echo "========================================"
-echo "\$HOME: $HOME"
-echo "\$GOPATH: $GOPATH"
-echo "\$CIRCLE_BRANCH: $CIRCLE_BRANCH"
-
-# Move the checked-out source to a better location
-exit_if_fail mv $HOME/telegraf $GOPATH/src/github.com/influxdata
-exit_if_fail cd $GOPATH/src/github.com/influxdata/telegraf
-
-# Verify that go fmt has been run
-check_go_fmt
-
-# Build the code
-exit_if_fail make
-
-# Run the tests
-exit_if_fail go vet ./...
-exit_if_fail make docker-run-circle
-# Sleep for OpenTSDB leadership election, aerospike cluster, etc.
-exit_if_fail sleep 60
-exit_if_fail go test -race ./...
-
-# Simple Integration Tests
-#   check that one test cpu & mem output work
-tmpdir=$(mktemp -d)
-./telegraf config > $tmpdir/config.toml
-exit_if_fail ./telegraf -config $tmpdir/config.toml \
-    -test -input-filter cpu:mem
-
-gzip telegraf -c > "$CIRCLE_ARTIFACTS/telegraf.gz"
-
-if git describe --exact-match HEAD 2>&1 >/dev/null; then
-    # install fpm (packaging dependency)
-    exit_if_fail gem install fpm
-    # install boto & rpm (packaging & AWS dependencies)
-    exit_if_fail sudo apt-get install -y rpm python-boto
-    unset GOGC
-    tag=$(git describe --exact-match HEAD)
-    echo $tag
-    exit_if_fail ./scripts/build.py --release --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/releases
-    mv build $CIRCLE_ARTIFACTS
-elif [ -n "${PACKAGE}" ]; then
-    # install fpm (packaging dependency)
-    exit_if_fail gem install fpm
-    # install boto & rpm (packaging & AWS dependencies)
-    exit_if_fail sudo apt-get install -y rpm python-boto
-    unset GOGC
-    if [ "$(git rev-parse --abbrev-ref HEAD)" = master ]
-    then
-        exit_if_fail ./scripts/build.py --nightly --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/nightlies
-    else
-        exit_if_fail ./scripts/build.py --package --platform=all --arch=all
-    fi
-    mv build $CIRCLE_ARTIFACTS
-fi
diff --git a/scripts/release.sh b/scripts/release.sh
new file mode 100755
index 000000000..968f28165
--- /dev/null
+++ b/scripts/release.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+ARTIFACT_DIR='artifacts'
+run()
+{
+    "$@"
+    ret=$?
+    if [[ $ret -eq 0 ]]
+    then
+        echo "[INFO]  [ $@ ]"
+    else
+        echo "[ERROR] [ $@ ] returned $ret"
+        exit $ret
+    fi
+}
+
+run make
+run mkdir -p ${ARTIFACT_DIR}
+run gzip telegraf -c > "$ARTIFACT_DIR/telegraf.gz"
+
+# RPM is used to build packages for Enterprise Linux hosts.
+# Boto is used to upload packages to S3.
+run sudo apt-get install -y rpm python-boto ruby ruby-dev
+run sudo gem install fpm
+
+if git describe --exact-match HEAD 2>&1 >/dev/null; then
+    run ./scripts/build.py --release --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/releases
+elif [ "${CIRCLE_STAGE}" = nightly ]; then
+	run ./scripts/build.py --nightly --package --platform=all --arch=all --upload --bucket=dl.influxdata.com/telegraf/nightlies
+else
+	run ./scripts/build.py --package --platform=all --arch=all
+fi
+
+run mv build $ARTIFACT_DIR

From a7571d57301e48b5ffa16f85a6a70757836ffe61 Mon Sep 17 00:00:00 2001
From: Ben Aldrich <vrecan@gmail.com>
Date: Thu, 1 Feb 2018 16:14:27 -0700
Subject: [PATCH 0915/1302] Add native Go method for finding pids to procstat
 (#3559)

---
 Makefile                                      |  1 +
 plugins/inputs/procstat/README.md             | 21 ++++-
 plugins/inputs/procstat/native_finder.go      | 57 ++++++++++++
 .../procstat/native_finder_notwindows.go      | 59 ++++++++++++
 .../inputs/procstat/native_finder_windows.go  | 91 +++++++++++++++++++
 .../procstat/native_finder_windows_test.go    | 40 ++++++++
 plugins/inputs/procstat/pgrep.go              |  7 --
 plugins/inputs/procstat/process.go            |  7 ++
 plugins/inputs/procstat/procstat.go           | 26 +++++-
 plugins/inputs/procstat/procstat_test.go      |  5 +
 10 files changed, 301 insertions(+), 13 deletions(-)
 create mode 100644 plugins/inputs/procstat/native_finder.go
 create mode 100644 plugins/inputs/procstat/native_finder_notwindows.go
 create mode 100644 plugins/inputs/procstat/native_finder_windows.go
 create mode 100644 plugins/inputs/procstat/native_finder_windows_test.go

diff --git a/Makefile b/Makefile
index ab4662575..f71e127a7 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
 	go test ./plugins/inputs/win_services/...
+	go test ./plugins/inputs/procstat/...
 
 # vet runs the Go source code static analysis tool `vet` to find
 # any common errors.
diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 00820be9a..153b893d3 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -27,8 +27,28 @@ Additionally the plugin will tag processes by their PID (pid_tag = true in the c
 * pid
 * process_name
 
+
+### Windows
+On windows we only support exe and pattern. Both of these are implemented using WMI queries. exe is on the Name field and pattern is on the CommandLine field.
+
+Windows Support:
+* exe  (WMI Name)
+* pattern (WMI CommandLine)
+
+this allows you to do fuzzy matching but only what is supported by [WMI query patterns](https://msdn.microsoft.com/en-us/library/aa392263(v=vs.85).aspx).
+
 Example:
 
+Windows fuzzy matching:
+```[[inputs.procstat]]
+  exe = "%influx%"
+  process_name="influxd"
+  prefix = "influxd"
+
+```
+
+### Linux
+
 ```
 [[inputs.procstat]]
   exe = "influxd"
@@ -48,7 +68,6 @@ The above configuration would result in output like:
 # Measurements
 Note: prefix can be set by the user, per process.
 
-
 Threads related measurement names:
 - procstat_[prefix_]num_threads value=5
 
diff --git a/plugins/inputs/procstat/native_finder.go b/plugins/inputs/procstat/native_finder.go
new file mode 100644
index 000000000..583e56d06
--- /dev/null
+++ b/plugins/inputs/procstat/native_finder.go
@@ -0,0 +1,57 @@
+package procstat
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/process"
+)
+
+//NativeFinder uses gopsutil to find processes
+type NativeFinder struct {
+}
+
+//NewNativeFinder ...
+func NewNativeFinder() (PIDFinder, error) {
+	return &NativeFinder{}, nil
+}
+
+//Uid will return all pids for the given user
+func (pg *NativeFinder) Uid(user string) ([]PID, error) {
+	var dst []PID
+	procs, err := process.Processes()
+	if err != nil {
+		return dst, err
+	}
+	for _, p := range procs {
+		username, err := p.Username()
+		if err != nil {
+			//skip, this can happen if we don't have permissions or
+			//the pid no longer exists
+			continue
+		}
+		if username == user {
+			dst = append(dst, PID(p.Pid))
+		}
+	}
+	return dst, nil
+}
+
+//PidFile returns the pid from the pid file given.
+func (pg *NativeFinder) PidFile(path string) ([]PID, error) {
+	var pids []PID
+	pidString, err := ioutil.ReadFile(path)
+	if err != nil {
+		return pids, fmt.Errorf("Failed to read pidfile '%s'. Error: '%s'",
+			path, err)
+	}
+	pid, err := strconv.Atoi(strings.TrimSpace(string(pidString)))
+	if err != nil {
+		return pids, err
+	}
+	pids = append(pids, PID(pid))
+	return pids, nil
+
+}
diff --git a/plugins/inputs/procstat/native_finder_notwindows.go b/plugins/inputs/procstat/native_finder_notwindows.go
new file mode 100644
index 000000000..533b7333a
--- /dev/null
+++ b/plugins/inputs/procstat/native_finder_notwindows.go
@@ -0,0 +1,59 @@
+// +build !windows
+
+package procstat
+
+import (
+	"regexp"
+
+	"github.com/shirou/gopsutil/process"
+)
+
+//Pattern matches on the process name
+func (pg *NativeFinder) Pattern(pattern string) ([]PID, error) {
+	var pids []PID
+	regxPattern, err := regexp.Compile(pattern)
+	if err != nil {
+		return pids, err
+	}
+	procs, err := process.Processes()
+	if err != nil {
+		return pids, err
+	}
+	for _, p := range procs {
+		name, err := p.Exe()
+		if err != nil {
+			//skip, this can be caused by the pid no longer existing
+			//or you having no permissions to access it
+			continue
+		}
+		if regxPattern.MatchString(name) {
+			pids = append(pids, PID(p.Pid))
+		}
+	}
+	return pids, err
+}
+
+//FullPattern matches on the command line when the proccess was executed
+func (pg *NativeFinder) FullPattern(pattern string) ([]PID, error) {
+	var pids []PID
+	regxPattern, err := regexp.Compile(pattern)
+	if err != nil {
+		return pids, err
+	}
+	procs, err := process.Processes()
+	if err != nil {
+		return pids, err
+	}
+	for _, p := range procs {
+		cmd, err := p.Cmdline()
+		if err != nil {
+			//skip, this can be caused by the pid no longer existing
+			//or you having no permissions to access it
+			continue
+		}
+		if regxPattern.MatchString(cmd) {
+			pids = append(pids, PID(p.Pid))
+		}
+	}
+	return pids, err
+}
diff --git a/plugins/inputs/procstat/native_finder_windows.go b/plugins/inputs/procstat/native_finder_windows.go
new file mode 100644
index 000000000..f9c1013ca
--- /dev/null
+++ b/plugins/inputs/procstat/native_finder_windows.go
@@ -0,0 +1,91 @@
+package procstat
+
+import (
+	"context"
+	"fmt"
+	"regexp"
+	"time"
+
+	"github.com/StackExchange/wmi"
+	"github.com/shirou/gopsutil/process"
+)
+
+//Timeout is the timeout used when making wmi calls
+var Timeout = 5 * time.Second
+
+type queryType string
+
+const (
+	like     = queryType("LIKE")
+	equals   = queryType("=")
+	notEqual = queryType("!=")
+)
+
+//Pattern matches on the process name
+func (pg *NativeFinder) Pattern(pattern string) ([]PID, error) {
+	var pids []PID
+	regxPattern, err := regexp.Compile(pattern)
+	if err != nil {
+		return pids, err
+	}
+	procs, err := process.Processes()
+	if err != nil {
+		return pids, err
+	}
+	for _, p := range procs {
+		name, err := p.Name()
+		if err != nil {
+			//skip, this can be caused by the pid no longer existing
+			//or you having no permissions to access it
+			continue
+		}
+		if regxPattern.MatchString(name) {
+			pids = append(pids, PID(p.Pid))
+		}
+	}
+	return pids, err
+}
+
+//FullPattern matches the cmdLine on windows and will find a pattern using a WMI like query
+func (pg *NativeFinder) FullPattern(pattern string) ([]PID, error) {
+	var pids []PID
+	procs, err := getWin32ProcsByVariable("CommandLine", like, pattern, Timeout)
+	if err != nil {
+		return pids, err
+	}
+	for _, p := range procs {
+		pids = append(pids, PID(p.ProcessID))
+	}
+	return pids, nil
+}
+
+//GetWin32ProcsByVariable allows you to query any variable with a like query
+func getWin32ProcsByVariable(variable string, qType queryType, value string, timeout time.Duration) ([]process.Win32_Process, error) {
+	var dst []process.Win32_Process
+	var query string
+	// should look like "WHERE CommandLine LIKE "procstat"
+	query = fmt.Sprintf("WHERE %s %s %q", variable, qType, value)
+	q := wmi.CreateQuery(&dst, query)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+	err := WMIQueryWithContext(ctx, q, &dst)
+	if err != nil {
+		return []process.Win32_Process{}, fmt.Errorf("could not get win32Proc: %s", err)
+	}
+	return dst, nil
+}
+
+// WMIQueryWithContext - wraps wmi.Query with a timed-out context to avoid hanging
+func WMIQueryWithContext(ctx context.Context, query string, dst interface{}, connectServerArgs ...interface{}) error {
+	errChan := make(chan error, 1)
+	go func() {
+		errChan <- wmi.Query(query, dst, connectServerArgs...)
+	}()
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case err := <-errChan:
+		return err
+	}
+}
diff --git a/plugins/inputs/procstat/native_finder_windows_test.go b/plugins/inputs/procstat/native_finder_windows_test.go
new file mode 100644
index 000000000..2f51a3f92
--- /dev/null
+++ b/plugins/inputs/procstat/native_finder_windows_test.go
@@ -0,0 +1,40 @@
+package procstat
+
+import (
+	"fmt"
+	"testing"
+
+	"os/user"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGather_RealPattern(t *testing.T) {
+	pg, err := NewNativeFinder()
+	require.NoError(t, err)
+	pids, err := pg.Pattern(`procstat`)
+	require.NoError(t, err)
+	fmt.Println(pids)
+	assert.Equal(t, len(pids) > 0, true)
+}
+
+func TestGather_RealFullPattern(t *testing.T) {
+	pg, err := NewNativeFinder()
+	require.NoError(t, err)
+	pids, err := pg.FullPattern(`%procstat%`)
+	require.NoError(t, err)
+	fmt.Println(pids)
+	assert.Equal(t, len(pids) > 0, true)
+}
+
+func TestGather_RealUser(t *testing.T) {
+	user, err := user.Current()
+	require.NoError(t, err)
+	pg, err := NewNativeFinder()
+	require.NoError(t, err)
+	pids, err := pg.Uid(user.Username)
+	require.NoError(t, err)
+	fmt.Println(pids)
+	assert.Equal(t, len(pids) > 0, true)
+}
diff --git a/plugins/inputs/procstat/pgrep.go b/plugins/inputs/procstat/pgrep.go
index bae5161e4..cf0754e6d 100644
--- a/plugins/inputs/procstat/pgrep.go
+++ b/plugins/inputs/procstat/pgrep.go
@@ -8,13 +8,6 @@ import (
 	"strings"
 )
 
-type PIDFinder interface {
-	PidFile(path string) ([]PID, error)
-	Pattern(pattern string) ([]PID, error)
-	Uid(user string) ([]PID, error)
-	FullPattern(path string) ([]PID, error)
-}
-
 // Implemention of PIDGatherer that execs pgrep to find processes
 type Pgrep struct {
 	path string
diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
index 3470a8a94..361582c33 100644
--- a/plugins/inputs/procstat/process.go
+++ b/plugins/inputs/procstat/process.go
@@ -23,6 +23,13 @@ type Process interface {
 	RlimitUsage(bool) ([]process.RlimitStat, error)
 }
 
+type PIDFinder interface {
+	PidFile(path string) ([]PID, error)
+	Pattern(pattern string) ([]PID, error)
+	Uid(user string) ([]PID, error)
+	FullPattern(path string) ([]PID, error)
+}
+
 type Proc struct {
 	hasCPUTimes bool
 	tags        map[string]string
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 3bd92f3b5..6b58953f0 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -22,6 +22,7 @@ var (
 type PID int32
 
 type Procstat struct {
+	PidFinder   string `toml:"pid_finder"`
 	PidFile     string `toml:"pid_file"`
 	Exe         string
 	Pattern     string
@@ -32,13 +33,19 @@ type Procstat struct {
 	CGroup      string `toml:"cgroup"`
 	PidTag      bool
 
-	pidFinder       PIDFinder
+	finder PIDFinder
+
 	createPIDFinder func() (PIDFinder, error)
 	procs           map[PID]Process
 	createProcess   func(PID) (Process, error)
 }
 
 var sampleConfig = `
+  ## pidFinder can be pgrep or native
+  ## pgrep tries to exec pgrep
+  ## native will work on all platforms, unix systems will use regexp. 
+  ## Windows will use WMI calls with like queries
+  pid_finder = "native"
   ## Must specify one of: pid_file, exe, or pattern
   ## PID file to monitor process
   pid_file = "/var/run/nginx.pid"
@@ -74,7 +81,15 @@ func (_ *Procstat) Description() string {
 
 func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 	if p.createPIDFinder == nil {
-		p.createPIDFinder = defaultPIDFinder
+		switch p.PidFinder {
+		case "native":
+			p.createPIDFinder = NewNativeFinder
+		case "pgrep":
+			p.createPIDFinder = NewPgrep
+		default:
+			p.createPIDFinder = defaultPIDFinder
+		}
+
 	}
 	if p.createProcess == nil {
 		p.createProcess = defaultProcess
@@ -252,14 +267,15 @@ func (p *Procstat) updateProcesses(prevInfo map[PID]Process) (map[PID]Process, e
 
 // Create and return PIDGatherer lazily
 func (p *Procstat) getPIDFinder() (PIDFinder, error) {
-	if p.pidFinder == nil {
+
+	if p.finder == nil {
 		f, err := p.createPIDFinder()
 		if err != nil {
 			return nil, err
 		}
-		p.pidFinder = f
+		p.finder = f
 	}
-	return p.pidFinder, nil
+	return p.finder, nil
 }
 
 // Get matching PIDs and their initial tags
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index 7b9d6f0c3..d77391fc2 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -349,6 +350,10 @@ func TestGather_systemdUnitPIDs(t *testing.T) {
 }
 
 func TestGather_cgroupPIDs(t *testing.T) {
+	//no cgroups in windows
+	if runtime.GOOS == "windows" {
+		t.Skip("no cgroups in windows")
+	}
 	td, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(td)

From 23933e11390b9b38d55b5ae20d3ead40ed15f50f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 16:12:08 -0800
Subject: [PATCH 0916/1302] Improve procstat readme

---
 plugins/inputs/procstat/README.md   | 254 ++++++++++++++--------------
 plugins/inputs/procstat/procstat.go |  26 +--
 2 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index 153b893d3..0ff9884b2 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -1,140 +1,138 @@
-# Telegraf plugin: procstat
+# Procstat Input Plugin
 
-#### Description
+The procstat plugin can be used to monitor the system resource usage of one or more processes.
 
-The procstat plugin can be used to monitor system resource usage by an
-individual process using their /proc data.
+Processes can be selected for monitoring using one of several methods:
+- pidfile
+- exe
+- pattern
+- user
+- systemd_unit
+- cgroup
 
-Processes can be specified either by pid file, by executable name, by command
-line pattern matching, by username, by systemd unit name, or by cgroup name/path
-(in this order or priority). Procstat plugin will use `pgrep` when executable
-name is provided to obtain the pid. Procstat plugin will transmit IO, memory,
-cpu, file descriptor related measurements for every process specified. A prefix
-can be set to isolate individual process specific measurements.
+### Configuration:
 
-The plugin will tag processes according to how they are specified in the configuration. If a pid file is used, a "pidfile" tag will be generated.
-On the other hand, if an executable is used an "exe" tag will be generated. Possible tag names:
-
-* pidfile
-* exe
-* pattern
-* user
-* systemd_unit
-* cgroup
-
-Additionally the plugin will tag processes by their PID (pid_tag = true in the config) and their process name:
-
-* pid
-* process_name
-
-
-### Windows
-On windows we only support exe and pattern. Both of these are implemented using WMI queries. exe is on the Name field and pattern is on the CommandLine field.
-
-Windows Support:
-* exe  (WMI Name)
-* pattern (WMI CommandLine)
-
-this allows you to do fuzzy matching but only what is supported by [WMI query patterns](https://msdn.microsoft.com/en-us/library/aa392263(v=vs.85).aspx).
-
-Example:
-
-Windows fuzzy matching:
-```[[inputs.procstat]]
-  exe = "%influx%"
-  process_name="influxd"
-  prefix = "influxd"
-
-```
-
-### Linux
-
-```
+```toml
+# Monitor process cpu and memory usage
 [[inputs.procstat]]
-  exe = "influxd"
-  prefix = "influxd"
+  ## PID file to monitor process
+  pid_file = "/var/run/nginx.pid"
+  ## executable name (ie, pgrep <exe>)
+  # exe = "nginx"
+  ## pattern as argument for pgrep (ie, pgrep -f <pattern>)
+  # pattern = "nginx"
+  ## user as argument for pgrep (ie, pgrep -u <user>)
+  # user = "nginx"
+  ## Systemd unit name
+  # systemd_unit = "nginx.service"
+  ## CGroup name or path
+  # cgroup = "systemd/system.slice/nginx.service"
 
+  ## override for process_name
+  ## This is optional; default is sourced from /proc/<pid>/status
+  # process_name = "bar"
+
+  ## Field name prefix
+  # prefix = ""
+
+  ## Add PID as a tag instead of a field; useful to differentiate between
+  ## processes whose tags are otherwise the same.  Can create a large number
+  ## of series, use judiciously.
+  # pid_tag = false
+
+  ## Method to use when finding process IDs.  Can be one of 'pgrep', or
+  ## 'native'.  The pgrep finder calls the pgrep executable in the PATH while
+  ## the native finder performs the search directly in a manor dependent on the
+  ## platform.  Default is 'pgrep'
+  # pid_finder = "pgrep"
+```
+
+#### Windows support
+
+Preliminary support for Windows has been added, however you may prefer using
+the `win_perf_counters` input plugin as a more mature alternative.
+
+When using the `pid_finder = "native"` in Windows, the pattern lookup method is
+implemented as a WMI query.  The pattern allows fuzzy matching using only
+[WMI query patterns](https://msdn.microsoft.com/en-us/library/aa392263(v=vs.85).aspx):
+```toml
 [[inputs.procstat]]
-  pid_file = "/var/run/lxc/dnsmasq.pid"
+  pattern = "%influx%"
+  pid_finder = "native"
 ```
 
-The above configuration would result in output like:
+### Metrics:
+
+- procstat
+  - tags:
+    - pid (when `pid_tag` is true)
+    - process_name
+    - pidfile (when defined)
+    - exe (when defined)
+    - pattern (when defined)
+    - user (when selected)
+    - systemd_unit (when defined)
+    - cgroup (when defined)
+  - fields:
+    - cpu_time (int)
+    - cpu_time_guest (float)
+    - cpu_time_guest_nice (float)
+    - cpu_time_idle (float)
+    - cpu_time_iowait (float)
+    - cpu_time_irq (float)
+    - cpu_time_nice (float)
+    - cpu_time_soft_irq (float)
+    - cpu_time_steal (float)
+    - cpu_time_stolen (float)
+    - cpu_time_system (float)
+    - cpu_time_user (float)
+    - cpu_usage (float)
+    - involuntary_context_switches (int)
+    - memory_data (int)
+    - memory_locked (int)
+    - memory_rss (int)
+    - memory_stack (int)
+    - memory_swap (int)
+    - memory_vms (int)
+    - nice_priority (int)
+    - num_fds (int, *telegraf* may need to be ran as **root**)
+    - num_threads (int)
+    - pid (int)
+    - read_bytes (int, *telegraf* may need to be ran as **root**)
+    - read_count (int, *telegraf* may need to be ran as **root**)
+    - realtime_priority (int)
+    - rlimit_cpu_time_hard (int)
+    - rlimit_cpu_time_soft (int)
+    - rlimit_file_locks_hard (int)
+    - rlimit_file_locks_soft (int)
+    - rlimit_memory_data_hard (int)
+    - rlimit_memory_data_soft (int)
+    - rlimit_memory_locked_hard (int)
+    - rlimit_memory_locked_soft (int)
+    - rlimit_memory_rss_hard (int)
+    - rlimit_memory_rss_soft (int)
+    - rlimit_memory_stack_hard (int)
+    - rlimit_memory_stack_soft (int)
+    - rlimit_memory_vms_hard (int)
+    - rlimit_memory_vms_soft (int)
+    - rlimit_nice_priority_hard (int)
+    - rlimit_nice_priority_soft (int)
+    - rlimit_num_fds_hard (int)
+    - rlimit_num_fds_soft (int)
+    - rlimit_realtime_priority_hard (int)
+    - rlimit_realtime_priority_soft (int)
+    - rlimit_signals_pending_hard (int)
+    - rlimit_signals_pending_soft (int)
+    - signals_pending (int)
+    - voluntary_context_switches (int)
+    - write_bytes (int, *telegraf* may need to be ran as **root**)
+    - write_count (int, *telegraf* may need to be ran as **root**)
+
+*NOTE: Resource limit > 2147483647 will be reported as 2147483647.*
+
+### Example Output:
 
 ```
-> procstat,pidfile=/var/run/lxc/dnsmasq.pid,process_name=dnsmasq rlimit_file_locks_soft=2147483647i,rlimit_signals_pending_hard=1758i,voluntary_context_switches=478i,read_bytes=307200i,cpu_time_user=0.01,cpu_time_guest=0,memory_swap=0i,memory_locked=0i,rlimit_num_fds_hard=4096i,rlimit_nice_priority_hard=0i,num_fds=11i,involuntary_context_switches=20i,read_count=23i,memory_rss=1388544i,rlimit_memory_rss_soft=2147483647i,rlimit_memory_rss_hard=2147483647i,nice_priority=20i,rlimit_cpu_time_hard=2147483647i,cpu_time=0i,write_bytes=0i,cpu_time_idle=0,cpu_time_nice=0,memory_data=229376i,memory_stack=135168i,rlimit_cpu_time_soft=2147483647i,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_hard=65536i,rlimit_signals_pending_soft=1758i,write_count=11i,cpu_time_iowait=0,cpu_time_steal=0,cpu_time_stolen=0,rlimit_memory_stack_soft=8388608i,cpu_time_system=0.02,cpu_time_guest_nice=0,rlimit_memory_locked_soft=65536i,rlimit_memory_vms_soft=2147483647i,rlimit_file_locks_hard=2147483647i,rlimit_realtime_priority_hard=0i,pid=828i,num_threads=1i,cpu_time_soft_irq=0,rlimit_memory_vms_hard=2147483647i,rlimit_realtime_priority_soft=0i,memory_vms=15884288i,rlimit_memory_stack_hard=2147483647i,cpu_time_irq=0,rlimit_memory_data_soft=2147483647i,rlimit_num_fds_soft=1024i,signals_pending=0i,rlimit_nice_priority_soft=0i,realtime_priority=0i
-> procstat,exe=influxd,process_name=influxd rlimit_num_fds_hard=16384i,rlimit_signals_pending_hard=1758i,realtime_priority=0i,rlimit_memory_vms_hard=2147483647i,rlimit_signals_pending_soft=1758i,cpu_time_stolen=0,rlimit_memory_stack_hard=2147483647i,rlimit_realtime_priority_hard=0i,cpu_time=0i,pid=500i,voluntary_context_switches=975i,cpu_time_idle=0,memory_rss=3072000i,memory_locked=0i,rlimit_nice_priority_soft=0i,signals_pending=0i,nice_priority=20i,read_bytes=823296i,cpu_time_soft_irq=0,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_soft=65536i,write_count=8i,cpu_time_irq=0,memory_vms=33501184i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,rlimit_memory_vms_soft=2147483647i,rlimit_nice_priority_hard=0i,num_fds=29i,memory_data=229376i,rlimit_cpu_time_soft=2147483647i,rlimit_file_locks_soft=2147483647i,num_threads=1i,write_bytes=0i,cpu_time_steal=0,rlimit_memory_rss_hard=2147483647i,cpu_time_guest=0,cpu_time_guest_nice=0,cpu_usage=0,rlimit_memory_locked_hard=65536i,rlimit_file_locks_hard=2147483647i,involuntary_context_switches=38i,read_count=16851i,memory_swap=0i,rlimit_memory_data_soft=2147483647i,cpu_time_user=0.11,rlimit_cpu_time_hard=2147483647i,rlimit_num_fds_soft=16384i,rlimit_realtime_priority_soft=0i,cpu_time_system=0.27,cpu_time_nice=0,memory_stack=135168i,rlimit_memory_rss_soft=2147483647i
+procstat,pidfile=/var/run/lxc/dnsmasq.pid,process_name=dnsmasq rlimit_file_locks_soft=2147483647i,rlimit_signals_pending_hard=1758i,voluntary_context_switches=478i,read_bytes=307200i,cpu_time_user=0.01,cpu_time_guest=0,memory_swap=0i,memory_locked=0i,rlimit_num_fds_hard=4096i,rlimit_nice_priority_hard=0i,num_fds=11i,involuntary_context_switches=20i,read_count=23i,memory_rss=1388544i,rlimit_memory_rss_soft=2147483647i,rlimit_memory_rss_hard=2147483647i,nice_priority=20i,rlimit_cpu_time_hard=2147483647i,cpu_time=0i,write_bytes=0i,cpu_time_idle=0,cpu_time_nice=0,memory_data=229376i,memory_stack=135168i,rlimit_cpu_time_soft=2147483647i,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_hard=65536i,rlimit_signals_pending_soft=1758i,write_count=11i,cpu_time_iowait=0,cpu_time_steal=0,cpu_time_stolen=0,rlimit_memory_stack_soft=8388608i,cpu_time_system=0.02,cpu_time_guest_nice=0,rlimit_memory_locked_soft=65536i,rlimit_memory_vms_soft=2147483647i,rlimit_file_locks_hard=2147483647i,rlimit_realtime_priority_hard=0i,pid=828i,num_threads=1i,cpu_time_soft_irq=0,rlimit_memory_vms_hard=2147483647i,rlimit_realtime_priority_soft=0i,memory_vms=15884288i,rlimit_memory_stack_hard=2147483647i,cpu_time_irq=0,rlimit_memory_data_soft=2147483647i,rlimit_num_fds_soft=1024i,signals_pending=0i,rlimit_nice_priority_soft=0i,realtime_priority=0i
+procstat,exe=influxd,process_name=influxd rlimit_num_fds_hard=16384i,rlimit_signals_pending_hard=1758i,realtime_priority=0i,rlimit_memory_vms_hard=2147483647i,rlimit_signals_pending_soft=1758i,cpu_time_stolen=0,rlimit_memory_stack_hard=2147483647i,rlimit_realtime_priority_hard=0i,cpu_time=0i,pid=500i,voluntary_context_switches=975i,cpu_time_idle=0,memory_rss=3072000i,memory_locked=0i,rlimit_nice_priority_soft=0i,signals_pending=0i,nice_priority=20i,read_bytes=823296i,cpu_time_soft_irq=0,rlimit_memory_data_hard=2147483647i,rlimit_memory_locked_soft=65536i,write_count=8i,cpu_time_irq=0,memory_vms=33501184i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,rlimit_memory_vms_soft=2147483647i,rlimit_nice_priority_hard=0i,num_fds=29i,memory_data=229376i,rlimit_cpu_time_soft=2147483647i,rlimit_file_locks_soft=2147483647i,num_threads=1i,write_bytes=0i,cpu_time_steal=0,rlimit_memory_rss_hard=2147483647i,cpu_time_guest=0,cpu_time_guest_nice=0,cpu_usage=0,rlimit_memory_locked_hard=65536i,rlimit_file_locks_hard=2147483647i,involuntary_context_switches=38i,read_count=16851i,memory_swap=0i,rlimit_memory_data_soft=2147483647i,cpu_time_user=0.11,rlimit_cpu_time_hard=2147483647i,rlimit_num_fds_soft=16384i,rlimit_realtime_priority_soft=0i,cpu_time_system=0.27,cpu_time_nice=0,memory_stack=135168i,rlimit_memory_rss_soft=2147483647i
 ```
-
-# Measurements
-Note: prefix can be set by the user, per process.
-
-Threads related measurement names:
-- procstat_[prefix_]num_threads value=5
-
-File descriptor related measurement names (*telegraf* needs to run as **root**):
-- procstat_[prefix_]num_fds value=4
-
-Priority related measurement names:
-- procstat_[prefix_]realtime_priority value=0
-- procstat_[prefix_]nice_priority value=20
-
-Signals related measurement names:
-- procstat_[prefix_]signals_pending value=0
-
-Context switch related measurement names:
-- procstat_[prefix_]voluntary_context_switches value=250
-- procstat_[prefix_]involuntary_context_switches value=0
-
-I/O related measurement names (*telegraf* needs to run as **root**):
-- procstat_[prefix_]read_count value=396
-- procstat_[prefix_]write_count value=1
-- procstat_[prefix_]read_bytes value=1019904
-- procstat_[prefix_]write_bytes value=1
-
-CPU related measurement names:
-- procstat_[prefix_]cpu_time value=0.01
-- procstat_[prefix_]cpu_time_user value=0
-- procstat_[prefix_]cpu_time_system value=0.01
-- procstat_[prefix_]cpu_time_idle value=0
-- procstat_[prefix_]cpu_time_nice value=0
-- procstat_[prefix_]cpu_time_iowait value=0
-- procstat_[prefix_]cpu_time_irq value=0
-- procstat_[prefix_]cpu_time_soft_irq value=0
-- procstat_[prefix_]cpu_time_steal value=0
-- procstat_[prefix_]cpu_time_stolen value=0
-- procstat_[prefix_]cpu_time_guest value=0
-- procstat_[prefix_]cpu_time_guest_nice value=0
-
-Memory related measurement names:
-- procstat_[prefix_]memory_rss value=1777664
-- procstat_[prefix_]memory_vms value=24227840
-- procstat_[prefix_]memory_swap value=282624
-- procstat_[prefix_]memory_data value=229376
-- procstat_[prefix_]memory_stack value=135168
-- procstat_[prefix_]memory_locked value=0
-
-Resource limits:
-- procstat_[prefix_]rlimit_cpu_time_hard value=2147483647
-- procstat_[prefix_]rlimit_cpu_time_soft value=2147483647
-- procstat_[prefix_]rlimit_file_locks_hard value=2147483647
-- procstat_[prefix_]rlimit_file_locks_soft value=2147483647
-- procstat_[prefix_]rlimit_memory_data_hard value=2147483647
-- procstat_[prefix_]rlimit_memory_data_soft value=2147483647
-- procstat_[prefix_]rlimit_memory_locked_hard value=65536
-- procstat_[prefix_]rlimit_memory_locked_soft value=65536
-- procstat_[prefix_]rlimit_memory_rss_hard value=2147483647
-- procstat_[prefix_]rlimit_memory_rss_soft value=2147483647
-- procstat_[prefix_]rlimit_memory_stack_hard value=2147483647
-- procstat_[prefix_]rlimit_memory_stack_soft value=8388608
-- procstat_[prefix_]rlimit_memory_vms_hard value=2147483647
-- procstat_[prefix_]rlimit_memory_vms_soft value=2147483647
-- procstat_[prefix_]rlimit_nice_priority_hard value=0
-- procstat_[prefix_]rlimit_nice_priority_soft value=0
-- procstat_[prefix_]rlimit_num_fds_hard value=16384
-- procstat_[prefix_]rlimit_num_fds_soft value=16384
-- procstat_[prefix_]rlimit_realtime_priority_hard value=0
-- procstat_[prefix_]rlimit_realtime_priority_soft value=0
-- procstat_[prefix_]rlimit_signals_pending_hard value=1758
-- procstat_[prefix_]rlimit_signals_pending_soft value=1758
-
-*NOTE: Due to a limitation in an underlying library Telegraf uses, any resource limit > 2147483647 will be misreported as 2147483647.*
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 6b58953f0..51f71f6a1 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -41,12 +41,6 @@ type Procstat struct {
 }
 
 var sampleConfig = `
-  ## pidFinder can be pgrep or native
-  ## pgrep tries to exec pgrep
-  ## native will work on all platforms, unix systems will use regexp. 
-  ## Windows will use WMI calls with like queries
-  pid_finder = "native"
-  ## Must specify one of: pid_file, exe, or pattern
   ## PID file to monitor process
   pid_file = "/var/run/nginx.pid"
   ## executable name (ie, pgrep <exe>)
@@ -63,12 +57,20 @@ var sampleConfig = `
   ## override for process_name
   ## This is optional; default is sourced from /proc/<pid>/status
   # process_name = "bar"
+
   ## Field name prefix
-  prefix = ""
-  ## comment this out if you want raw cpu_time stats
-  fielddrop = ["cpu_time_*"]
-  ## This is optional; moves pid into a tag instead of a field
-  pid_tag = false
+  # prefix = ""
+
+  ## Add PID as a tag instead of a field; useful to differentiate between
+  ## processes whose tags are otherwise the same.  Can create a large number
+  ## of series, use judiciously.
+  # pid_tag = false
+
+  ## Method to use when finding process IDs.  Can be one of 'pgrep', or
+  ## 'native'.  The pgrep finder calls the pgrep executable in the PATH while
+  ## the native finder performs the search directly in a manor dependent on the
+  ## platform.  Default is 'pgrep'
+  # pid_finder = "pgrep"
 `
 
 func (_ *Procstat) SampleConfig() string {
@@ -308,7 +310,7 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 		pids, err = p.cgroupPIDs()
 		tags = map[string]string{"cgroup": p.CGroup}
 	} else {
-		err = fmt.Errorf("Either exe, pid_file, user, or pattern has to be specified")
+		err = fmt.Errorf("Either exe, pid_file, user, pattern, systemd_unit, or cgroup must be specified")
 	}
 
 	return pids, tags, err

From 01479af096ee879491f7e2c4e23801f93ed5bfd6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 16:12:57 -0800
Subject: [PATCH 0917/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca8fba245..48c969101 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 - [#3346](https://github.com/influxdata/telegraf/pull/3346): Add Ipset input plugin.
 - [#3719](https://github.com/influxdata/telegraf/pull/3719): Add TLS and HTTP basic auth to prometheus_client output.
 - [#3618](https://github.com/influxdata/telegraf/pull/3618): Add new sqlserver output data model.
+- [#3559](https://github.com/influxdata/telegraf/pull/3559): Add native Go method for finding pids to procstat.
 
 ### Bugfixes
 

From 3dcf66aed61c7cf2f339a8d68b1849b500cbdf9a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 1 Feb 2018 16:18:01 -0800
Subject: [PATCH 0918/1302] Update gitignore

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38fd3ec9f..459ae7d79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,5 @@
 build
-tivan
-.vagrant
 /telegraf
-.idea
+/telegraf.gz
 *~
 *#
-telegraf
-telegraf.gz

From 281f4d368819c8880c0e14f85bc44697a5fd7667 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Fri, 2 Feb 2018 13:51:00 -0500
Subject: [PATCH 0919/1302] Fix example source_override values in wavefront
 output (#3744)

---
 plugins/outputs/wavefront/README.md    | 2 +-
 plugins/outputs/wavefront/wavefront.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/wavefront/README.md b/plugins/outputs/wavefront/README.md
index 6b673b12a..be8fcd7dc 100644
--- a/plugins/outputs/wavefront/README.md
+++ b/plugins/outputs/wavefront/README.md
@@ -32,7 +32,7 @@ This plugin writes to a [Wavefront](https://www.wavefront.com) proxy, in Wavefro
   #use_regex = false
 
   ## point tags to use as the source name for Wavefront (if none found, host will be used)
-  #source_override = ["hostname", "snmp_host", "node_host"]
+  #source_override = ["hostname", "agent_host", "node_host"]
 
   ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0. default is true
   #convert_bool = true
diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 475e28253..7f1f8c077 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -68,7 +68,7 @@ var sampleConfig = `
   #use_regex = false
 
   ## point tags to use as the source name for Wavefront (if none found, host will be used)
-  #source_override = ["hostname", "snmp_host", "node_host"]
+  #source_override = ["hostname", "agent_host", "node_host"]
 
   ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0.  default true
   #convert_bool = true

From 1f87c10dd4b92e4a65081532fad1b54550fc45f5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 2 Feb 2018 12:25:59 -0800
Subject: [PATCH 0920/1302] Fix Makefile on Windows and use in AppVeyor build
 (#3748)

---
 Makefile     |  2 +-
 appveyor.yml | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index f71e127a7..3250e69ed 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PREFIX := /usr/local
 VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
-GOFILES ?= $(shell find . -name '*.go')
+GOFILES ?= $(shell git ls-files '*.go')
 GOFMT ?= $(shell gofmt -l $(GOFILES))
 
 ifdef GOBIN
diff --git a/appveyor.yml b/appveyor.yml
index 1a52f8adc..993870209 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,20 +13,21 @@ platform: x64
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
   - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
+  - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
   - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
+  - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
+  - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version
   - go env
 
 build_script:
-  - cmd: go get github.com/sparrc/gdm
-  - cmd: C:\gopath\bin\gdm restore
-  - cmd: go build -i -o telegraf.exe ./cmd/telegraf/telegraf.go
+  - cmd: C:\GnuWin32\bin\make deps
+  - cmd: C:\GnuWin32\bin\make telegraf
 
 test_script:
-  - cmd: go test ./plugins/inputs/ping/...
-  - cmd: go test ./plugins/inputs/win_perf_counters/...
-  - cmd: go test ./plugins/inputs/win_services/...
+  - cmd: C:\GnuWin32\bin\make test-windows
 
 artifacts:
   - path: telegraf.exe

From 3208fc32eece1ff21aff20e0cb7c207f86938b19 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 2 Feb 2018 12:29:54 -0800
Subject: [PATCH 0921/1302] Run nightly build sequentially

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9e9a9a42..5c1ccbddd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,7 +37,9 @@ workflows:
   nightly:
     jobs:
       - 'build'
-      - 'nightly'
+      - 'nightly':
+          requires:
+            - 'build'
     triggers:
       - schedule:
           cron: "0 0 * * *"

From be688ec76110f4880eb42a148ec5be320c521afc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 2 Feb 2018 12:30:12 -0800
Subject: [PATCH 0922/1302] Update sample config in contributing docs

---
 CONTRIBUTING.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 21ae5738e..949f73300 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -79,7 +79,10 @@ func (s *Simple) Description() string {
 }
 
 func (s *Simple) SampleConfig() string {
-    return "ok = true # indicate if everything is fine"
+    return `
+  ## Indicate if everything is fine
+  ok = true
+`
 }
 
 func (s *Simple) Gather(acc telegraf.Accumulator) error {
@@ -207,7 +210,9 @@ func (s *Simple) Description() string {
 }
 
 func (s *Simple) SampleConfig() string {
-    return "url = localhost"
+    return `
+  ok = true
+`
 }
 
 func (s *Simple) Connect() error {

From b7a68eef561824c4fce261c5e7254a312931fe4d Mon Sep 17 00:00:00 2001
From: Philipp Weber <6884041+phlipse@users.noreply.github.com>
Date: Mon, 5 Feb 2018 20:16:00 +0100
Subject: [PATCH 0923/1302] Remove userinfo from url tag in prometheus input
 (#3743)

---
 plugins/inputs/prometheus/README.md           |  2 +-
 plugins/inputs/prometheus/prometheus.go       | 68 +++++++++++--------
 plugins/inputs/prometheus/prometheus_test.go  |  4 +-
 .../prometheus_client_test.go                 |  2 +-
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index d2d19520c..ac7405014 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -67,7 +67,7 @@ Measurement names are based on the Metric Family and tags are created for each
 label.  The value is added to a field named based on the metric type.
 
 All metrics receive the `url` tag indicating the related URL specified in the
-Telegraf configuration.  If using Kubernetes service discovery the `address`
+Telegraf configuration. If using Kubernetes service discovery the `address`
 tag is also added indicating the discovered ip address.
 
 ### Example Output:
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index c929a5b26..2a8a6b284 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -20,7 +20,7 @@ const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client
 
 type Prometheus struct {
 	// An array of urls to scrape metrics from.
-	Urls []string
+	URLs []string `toml:"urls"`
 
 	// An array of Kubernetes services to scrape metrics from.
 	KubernetesServices []string
@@ -73,12 +73,12 @@ func (p *Prometheus) Description() string {
 
 var ErrProtocolError = errors.New("prometheus protocol error")
 
-func (p *Prometheus) AddressToURL(u *url.URL, address string) string {
+func (p *Prometheus) AddressToURL(u *url.URL, address string) *url.URL {
 	host := address
 	if u.Port() != "" {
 		host = address + ":" + u.Port()
 	}
-	reconstructedUrl := url.URL{
+	reconstructedURL := &url.URL{
 		Scheme:     u.Scheme,
 		Opaque:     u.Opaque,
 		User:       u.User,
@@ -89,36 +89,42 @@ func (p *Prometheus) AddressToURL(u *url.URL, address string) string {
 		Fragment:   u.Fragment,
 		Host:       host,
 	}
-	return reconstructedUrl.String()
+	return reconstructedURL
 }
 
-type UrlAndAddress struct {
-	OriginalUrl string
-	Url         string
+type URLAndAddress struct {
+	OriginalURL *url.URL
+	URL         *url.URL
 	Address     string
 }
 
-func (p *Prometheus) GetAllURLs() ([]UrlAndAddress, error) {
-	allUrls := make([]UrlAndAddress, 0)
-	for _, url := range p.Urls {
-		allUrls = append(allUrls, UrlAndAddress{Url: url, OriginalUrl: url})
+func (p *Prometheus) GetAllURLs() ([]URLAndAddress, error) {
+	allURLs := make([]URLAndAddress, 0)
+	for _, u := range p.URLs {
+		URL, err := url.Parse(u)
+		if err != nil {
+			log.Printf("prometheus: Could not parse %s, skipping it. Error: %s", u, err)
+			continue
+		}
+
+		allURLs = append(allURLs, URLAndAddress{URL: URL, OriginalURL: URL})
 	}
 	for _, service := range p.KubernetesServices {
-		u, err := url.Parse(service)
+		URL, err := url.Parse(service)
 		if err != nil {
 			return nil, err
 		}
-		resolvedAddresses, err := net.LookupHost(u.Hostname())
+		resolvedAddresses, err := net.LookupHost(URL.Hostname())
 		if err != nil {
-			log.Printf("prometheus: Could not resolve %s, skipping it. Error: %s", u.Host, err)
+			log.Printf("prometheus: Could not resolve %s, skipping it. Error: %s", URL.Host, err)
 			continue
 		}
 		for _, resolved := range resolvedAddresses {
-			serviceUrl := p.AddressToURL(u, resolved)
-			allUrls = append(allUrls, UrlAndAddress{Url: serviceUrl, Address: resolved, OriginalUrl: service})
+			serviceURL := p.AddressToURL(URL, resolved)
+			allURLs = append(allURLs, URLAndAddress{URL: serviceURL, Address: resolved, OriginalURL: URL})
 		}
 	}
-	return allUrls, nil
+	return allURLs, nil
 }
 
 // Reads stats from all configured servers accumulates stats.
@@ -134,16 +140,16 @@ func (p *Prometheus) Gather(acc telegraf.Accumulator) error {
 
 	var wg sync.WaitGroup
 
-	allUrls, err := p.GetAllURLs()
+	allURLs, err := p.GetAllURLs()
 	if err != nil {
 		return err
 	}
-	for _, url := range allUrls {
+	for _, URL := range allURLs {
 		wg.Add(1)
-		go func(serviceUrl UrlAndAddress) {
+		go func(serviceURL URLAndAddress) {
 			defer wg.Done()
-			acc.AddError(p.gatherURL(serviceUrl, acc))
-		}(url)
+			acc.AddError(p.gatherURL(serviceURL, acc))
+		}(URL)
 	}
 
 	wg.Wait()
@@ -178,8 +184,8 @@ func (p *Prometheus) createHttpClient() (*http.Client, error) {
 	return client, nil
 }
 
-func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) error {
-	var req, err = http.NewRequest("GET", url.Url, nil)
+func (p *Prometheus) gatherURL(u URLAndAddress, acc telegraf.Accumulator) error {
+	var req, err = http.NewRequest("GET", u.URL.String(), nil)
 	req.Header.Add("Accept", acceptHeader)
 	var token []byte
 	var resp *http.Response
@@ -194,11 +200,11 @@ func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) erro
 
 	resp, err = p.client.Do(req)
 	if err != nil {
-		return fmt.Errorf("error making HTTP request to %s: %s", url.Url, err)
+		return fmt.Errorf("error making HTTP request to %s: %s", u.URL, err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%s returned HTTP status %s", url.Url, resp.Status)
+		return fmt.Errorf("%s returned HTTP status %s", u.URL, resp.Status)
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
@@ -209,14 +215,16 @@ func (p *Prometheus) gatherURL(url UrlAndAddress, acc telegraf.Accumulator) erro
 	metrics, err := Parse(body, resp.Header)
 	if err != nil {
 		return fmt.Errorf("error reading metrics for %s: %s",
-			url.Url, err)
+			u.URL, err)
 	}
 	// Add (or not) collected metrics
 	for _, metric := range metrics {
 		tags := metric.Tags()
-		tags["url"] = url.OriginalUrl
-		if url.Address != "" {
-			tags["address"] = url.Address
+		// strip user and password from URL
+		u.OriginalURL.User = nil
+		tags["url"] = u.OriginalURL.String()
+		if u.Address != "" {
+			tags["address"] = u.Address
 		}
 
 		switch metric.Type() {
diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
index 5bf07eb3f..9a2982ff9 100644
--- a/plugins/inputs/prometheus/prometheus_test.go
+++ b/plugins/inputs/prometheus/prometheus_test.go
@@ -37,7 +37,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
 	defer ts.Close()
 
 	p := &Prometheus{
-		Urls: []string{ts.URL},
+		URLs: []string{ts.URL},
 	}
 
 	var acc testutil.Accumulator
@@ -89,7 +89,7 @@ func TestPrometheusGeneratesMetricsAlthoughFirstDNSFails(t *testing.T) {
 	defer ts.Close()
 
 	p := &Prometheus{
-		Urls:               []string{ts.URL},
+		URLs:               []string{ts.URL},
 		KubernetesServices: []string{"http://random.telegraf.local:88/metrics"},
 	}
 
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 69509ae1c..276fde009 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -631,7 +631,7 @@ func setupPrometheus() (*PrometheusClient, *prometheus_input.Prometheus, error)
 	time.Sleep(time.Millisecond * 200)
 
 	p := &prometheus_input.Prometheus{
-		Urls: []string{"http://localhost:9127/metrics"},
+		URLs: []string{"http://localhost:9127/metrics"},
 	}
 
 	return pTesting, p, nil

From 9a1d69a2ae58e7c1c7c2bf5ef00b41441153b861 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Feb 2018 11:17:36 -0800
Subject: [PATCH 0924/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48c969101..9afddcecc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 ### Bugfixes
 
 - [#3729](https://github.com/influxdata/telegraf/issues/3729): Set path to / if HOST_MOUNT_PREFIX matches full path.
+- [#3739](https://github.com/influxdata/telegraf/issues/3739): Remove userinfo from url tag in prometheus input.
 
 ## v1.5.2 [2018-01-30]
 

From 5639d5608dd3d0c6f3c8932cc5b0a84ab34421e5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Feb 2018 12:20:14 -0800
Subject: [PATCH 0925/1302] Update paho mqtt to latest release

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 8fb336d08..80d92d39a 100644
--- a/Godeps
+++ b/Godeps
@@ -16,7 +16,7 @@ github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
 github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
-github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb
+github.com/eclipse/paho.mqtt.golang aff15770515e3c57fc6109da73d42b0d46f7f483
 github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a

From ea0be51985ee8e82626ca3fc2dfe946c26f4ad22 Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrew.cobaugh@gmail.com>
Date: Mon, 5 Feb 2018 15:48:41 -0500
Subject: [PATCH 0926/1302] Add additional metrics and reverse metric names
 option to openldap (#3722)

---
 plugins/inputs/openldap/README.md        | 80 ++++++++++++++----------
 plugins/inputs/openldap/openldap.go      | 46 ++++++++++----
 plugins/inputs/openldap/openldap_test.go | 21 +++++++
 3 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index e55d16509..44e751f5e 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -25,50 +25,62 @@ To use this plugin you must enable the [monitoring](https://www.openldap.org/dev
   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
   bind_dn = ""
   bind_password = ""
+  
+  # reverse metric names so they sort more naturally
+  # Defaults to false if unset, but is set to true when generating a new config
+  reverse_metric_names = true
 ```
 
 ### Measurements & Fields:
 
-All **monitorCounter**, **monitorOpInitiated**, and **monitorOpCompleted** attributes are gathered based on this LDAP query:
+All **monitorCounter**, **monitoredInfo**, **monitorOpInitiated**, and **monitorOpCompleted** attributes are gathered based on this LDAP query:
 
-```(|(objectClass=monitorCounterObject)(objectClass=monitorOperation))```
+```(|(objectClass=monitorCounterObject)(objectClass=monitorOperation)(objectClass=monitoredObject))```
 
-Metric names are based on their entry DN.
+Metric names are based on their entry DN with the cn=Monitor base removed. If `reverse_metric_names` is not set, metrics are based on their DN. If `reverse_metric_names` is set to `true`, the names are reversed. This is recommended as it allows the names to sort more naturally.
 
-Metrics for the **monitorOp*** attributes have **_initiated** and **_completed** added to the base name.
+Metrics for the **monitorOp*** attributes have **_initiated** and **_completed** added to the base name as appropriate.
 
 An OpenLDAP 2.4 server will provide these metrics:
 
 - openldap
-	- max_file_descriptors_connections
-	- current_connections
-	- total_connections
-	- abandon_operations_completed
-	- abandon_operations_initiated
-	- add_operations_completed
-	- add_operations_initiated
-	- bind_operations_completed
-	- bind_operations_initiated
-	- compare_operations_completed
-	- compare_operations_initiated
-	- delete_operations_completed
-	- delete_operations_initiated
-	- extended_operations_completed
-	- extended_operations_initiated
-	- modify_operations_completed
-	- modify_operations_initiated
-	- modrdn_operations_completed
-	- modrdn_operations_initiated
-	- search_operations_completed
-	- search_operations_initiated
-	- unbind_operations_completed
-	- unbind_operations_initiated
-	- bytes_statistics
-	- entries_statistics
-	- pdu_statistics
-	- referrals_statistics
-	- read_waiters
-	- write_waiters
+	- connections_current
+	- connections_max_file_descriptors
+	- connections_total
+	- operations_abandon_completed
+	- operations_abandon_initiated
+	- operations_add_completed
+	- operations_add_initiated
+	- operations_bind_completed
+	- operations_bind_initiated
+	- operations_compare_completed
+	- operations_compare_initiated
+	- operations_delete_completed
+	- operations_delete_initiated
+	- operations_extended_completed
+	- operations_extended_initiated
+	- operations_modify_completed
+	- operations_modify_initiated
+	- operations_modrdn_completed
+	- operations_modrdn_initiated
+	- operations_search_completed
+	- operations_search_initiated
+	- operations_unbind_completed
+	- operations_unbind_initiated
+	- statistics_bytes
+	- statistics_entries
+	- statistics_pdu
+	- statistics_referrals
+	- threads_active
+	- threads_backload
+	- threads_max
+	- threads_max_pending
+	- threads_open
+	- threads_pending
+	- threads_starting
+	- time_uptime
+	- waiters_read
+	- waiters_write
 
 ### Tags:
 
@@ -80,5 +92,5 @@ An OpenLDAP 2.4 server will provide these metrics:
 ```
 $ telegraf -config telegraf.conf -input-filter openldap -test --debug
 * Plugin: inputs.openldap, Collection 1
-> openldap,server=localhost,port=389,host=zirzla search_operations_completed=2i,delete_operations_completed=0i,read_waiters=1i,total_connections=1004i,bind_operations_completed=3i,unbind_operations_completed=3i,referrals_statistics=0i,current_connections=1i,bind_operations_initiated=3i,compare_operations_completed=0i,add_operations_completed=2i,delete_operations_initiated=0i,unbind_operations_initiated=3i,search_operations_initiated=3i,add_operations_initiated=2i,max_file_descriptors_connections=4096i,abandon_operations_initiated=0i,write_waiters=0i,modrdn_operations_completed=0i,abandon_operations_completed=0i,pdu_statistics=23i,modify_operations_initiated=0i,bytes_statistics=1660i,entries_statistics=17i,compare_operations_initiated=0i,modrdn_operations_initiated=0i,extended_operations_completed=0i,modify_operations_completed=0i,extended_operations_initiated=0i 1499990455000000000
+> openldap,server=localhost,port=389,host=niska.ait.psu.edu operations_bind_initiated=10i,operations_unbind_initiated=6i,operations_modrdn_completed=0i,operations_delete_initiated=0i,operations_add_completed=2i,operations_delete_completed=0i,operations_abandon_completed=0i,statistics_entries=1516i,threads_open=2i,threads_active=1i,waiters_read=1i,operations_modify_completed=0i,operations_extended_initiated=4i,threads_pending=0i,operations_search_initiated=36i,operations_compare_initiated=0i,connections_max_file_descriptors=4096i,operations_modify_initiated=0i,operations_modrdn_initiated=0i,threads_max=16i,time_uptime=6017i,connections_total=1037i,connections_current=1i,operations_add_initiated=2i,statistics_bytes=162071i,operations_unbind_completed=6i,operations_abandon_initiated=0i,statistics_pdu=1566i,threads_max_pending=0i,threads_backload=1i,waiters_write=0i,operations_bind_completed=10i,operations_search_completed=35i,operations_compare_completed=0i,operations_extended_completed=4i,statistics_referrals=0i,threads_starting=0i 1516912070000000000
 ```
diff --git a/plugins/inputs/openldap/openldap.go b/plugins/inputs/openldap/openldap.go
index a70cfd13a..e413ecbed 100644
--- a/plugins/inputs/openldap/openldap.go
+++ b/plugins/inputs/openldap/openldap.go
@@ -20,6 +20,7 @@ type Openldap struct {
 	SslCa              string
 	BindDn             string
 	BindPassword       string
+	ReverseMetricNames bool
 }
 
 const sampleConfig string = `
@@ -40,13 +41,18 @@ const sampleConfig string = `
   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
   bind_dn = ""
   bind_password = ""
+
+  # Reverse metric names so they sort more naturally. Recommended.
+  # This defaults to false if unset, but is set to true when generating a new config
+  reverse_metric_names = true
 `
 
 var searchBase = "cn=Monitor"
-var searchFilter = "(|(objectClass=monitorCounterObject)(objectClass=monitorOperation))"
-var searchAttrs = []string{"monitorCounter", "monitorOpInitiated", "monitorOpCompleted"}
+var searchFilter = "(|(objectClass=monitorCounterObject)(objectClass=monitorOperation)(objectClass=monitoredObject))"
+var searchAttrs = []string{"monitorCounter", "monitorOpInitiated", "monitorOpCompleted", "monitoredInfo"}
 var attrTranslate = map[string]string{
 	"monitorCounter":     "",
+	"monitoredInfo":      "",
 	"monitorOpInitiated": "_initiated",
 	"monitorOpCompleted": "_completed",
 }
@@ -69,6 +75,7 @@ func NewOpenldap() *Openldap {
 		SslCa:              "",
 		BindDn:             "",
 		BindPassword:       "",
+		ReverseMetricNames: false,
 	}
 }
 
@@ -149,7 +156,7 @@ func gatherSearchResult(sr *ldap.SearchResult, o *Openldap, acc telegraf.Accumul
 		"port":   strconv.Itoa(o.Port),
 	}
 	for _, entry := range sr.Entries {
-		metricName := dnToMetric(entry.DN, searchBase)
+		metricName := dnToMetric(entry.DN, o)
 		for _, attr := range entry.Attributes {
 			if len(attr.Values[0]) >= 1 {
 				if v, err := strconv.ParseInt(attr.Values[0], 10, 64); err == nil {
@@ -162,15 +169,30 @@ func gatherSearchResult(sr *ldap.SearchResult, o *Openldap, acc telegraf.Accumul
 	return
 }
 
-// Convert a DN to metric name, eg cn=Read,cn=Waiters,cn=Monitor to read_waiters
-func dnToMetric(dn, searchBase string) string {
-	metricName := strings.Trim(dn, " ")
-	metricName = strings.Replace(metricName, " ", "_", -1)
-	metricName = strings.ToLower(metricName)
-	metricName = strings.TrimPrefix(metricName, "cn=")
-	metricName = strings.Replace(metricName, strings.ToLower(searchBase), "", -1)
-	metricName = strings.Replace(metricName, "cn=", "_", -1)
-	return strings.Replace(metricName, ",", "", -1)
+// Convert a DN to metric name, eg cn=Read,cn=Waiters,cn=Monitor becomes waiters_read
+// Assumes the last part of the DN is cn=Monitor and we want to drop it
+func dnToMetric(dn string, o *Openldap) string {
+	if o.ReverseMetricNames {
+		var metricParts []string
+
+		dn = strings.Trim(dn, " ")
+		dn = strings.Replace(dn, " ", "_", -1)
+		dn = strings.Replace(dn, "cn=", "", -1)
+		dn = strings.ToLower(dn)
+		metricParts = strings.Split(dn, ",")
+		for i, j := 0, len(metricParts)-1; i < j; i, j = i+1, j-1 {
+			metricParts[i], metricParts[j] = metricParts[j], metricParts[i]
+		}
+		return strings.Join(metricParts[1:], "_")
+	} else {
+		metricName := strings.Trim(dn, " ")
+		metricName = strings.Replace(metricName, " ", "_", -1)
+		metricName = strings.ToLower(metricName)
+		metricName = strings.TrimPrefix(metricName, "cn=")
+		metricName = strings.Replace(metricName, strings.ToLower("cn=Monitor"), "", -1)
+		metricName = strings.Replace(metricName, "cn=", "_", -1)
+		return strings.Replace(metricName, ",", "", -1)
+	}
 }
 
 func init() {
diff --git a/plugins/inputs/openldap/openldap_test.go b/plugins/inputs/openldap/openldap_test.go
index 489ef8636..b33354ece 100644
--- a/plugins/inputs/openldap/openldap_test.go
+++ b/plugins/inputs/openldap/openldap_test.go
@@ -148,3 +148,24 @@ func commonTests(t *testing.T, o *Openldap, acc *testutil.Accumulator) {
 	assert.Equal(t, strconv.Itoa(o.Port), acc.TagValue("openldap", "port"), "Has a tag value of port=o.Port")
 	assert.True(t, acc.HasInt64Field("openldap", "total_connections"), "Has an integer field called total_connections")
 }
+
+func TestOpenldapReverseMetrics(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	o := &Openldap{
+		Host:               testutil.GetLocalHost(),
+		Port:               389,
+		Ssl:                "",
+		InsecureSkipVerify: true,
+		BindDn:             "cn=manager,cn=config",
+		BindPassword:       "secret",
+		ReverseMetricNames: true,
+	}
+
+	var acc testutil.Accumulator
+	err := o.Gather(&acc)
+	require.NoError(t, err)
+	assert.True(t, acc.HasInt64Field("openldap", "connections_total"), "Has an integer field called connections_total")
+}

From 8c51d629eb8fb1ebaf0b92ab55d191e6c83edd70 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Feb 2018 12:55:22 -0800
Subject: [PATCH 0927/1302] Update changelog

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9afddcecc..6e4c27fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,9 +18,15 @@
 
 - The `sqlserver` input plugin has a new query and data model that can be enabled
   by setting `query_version = 2`.  It is encouraged to migrate to the new
-  model when possible as the old version is deprectated and will be removed in
+  model when possible as the old version is deprecated and will be removed in
   a future version.
 
+- An option has been added to the `openldap` input plugin that reverses metric
+  name to improve grouping.  This change is enabled when `reverse_metric_names = true`
+  is set.  It is encouraged to enable this option when possible as the old
+  ordering is deprecated.
+
+
 ### New Plugins
 
 - [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
@@ -49,6 +55,7 @@
 - [#3719](https://github.com/influxdata/telegraf/pull/3719): Add TLS and HTTP basic auth to prometheus_client output.
 - [#3618](https://github.com/influxdata/telegraf/pull/3618): Add new sqlserver output data model.
 - [#3559](https://github.com/influxdata/telegraf/pull/3559): Add native Go method for finding pids to procstat.
+- [#3722](https://github.com/influxdata/telegraf/pull/3722): Add additional metrics and reverse metric names option to openldap.
 
 ### Bugfixes
 

From 89974d96d77e3e06a3f4ffbf7986cb25f39ca1b2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 6 Feb 2018 11:33:18 -0800
Subject: [PATCH 0928/1302] Install new requirements for fpm gem install

---
 scripts/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index 968f28165..8ac0156da 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -20,7 +20,7 @@ run gzip telegraf -c > "$ARTIFACT_DIR/telegraf.gz"
 
 # RPM is used to build packages for Enterprise Linux hosts.
 # Boto is used to upload packages to S3.
-run sudo apt-get install -y rpm python-boto ruby ruby-dev
+run sudo apt-get install -y rpm python-boto ruby ruby-dev autoconf libtool
 run sudo gem install fpm
 
 if git describe --exact-match HEAD 2>&1 >/dev/null; then

From efa90958291136b70d8ae1ea854821358df9c31f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 7 Feb 2018 18:36:38 -0800
Subject: [PATCH 0929/1302] Add TLS support to the mesos input plugin (#3769)

---
 plugins/inputs/mesos/README.md     |  12 +-
 plugins/inputs/mesos/mesos.go      | 192 +++++++++++++++++++++--------
 plugins/inputs/mesos/mesos_test.go |  18 +++
 3 files changed, 170 insertions(+), 52 deletions(-)

diff --git a/plugins/inputs/mesos/README.md b/plugins/inputs/mesos/README.md
index 67590c3ff..46df267aa 100644
--- a/plugins/inputs/mesos/README.md
+++ b/plugins/inputs/mesos/README.md
@@ -11,7 +11,7 @@ For more information, please check the [Mesos Observability Metrics](http://meso
   ## Timeout, in ms.
   timeout = 100
   ## A list of Mesos masters.
-  masters = ["localhost:5050"]
+  masters = ["http://localhost:5050"]
   ## Master metrics groups to be collected, by default, all enabled.
   master_collections = [
     "resources",
@@ -35,6 +35,13 @@ For more information, please check the [Mesos Observability Metrics](http://meso
   #   "tasks",
   #   "messages",
   # ]
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 By default this plugin is not configured to gather metrics from mesos. Since a mesos cluster can be deployed in numerous ways it does not provide any default
@@ -235,7 +242,8 @@ Mesos slave metric groups
 ### Tags:
 
 - All master/slave measurements have the following tags:
-    - server
+    - server (network location of server: `host:port`)
+    - url (URL origin of server: `scheme://host:port`)
     - role (master/slave)
 
 - All master measurements have the extra tags:
diff --git a/plugins/inputs/mesos/mesos.go b/plugins/inputs/mesos/mesos.go
index e37eabf5d..5b0697cab 100644
--- a/plugins/inputs/mesos/mesos.go
+++ b/plugins/inputs/mesos/mesos.go
@@ -7,11 +7,14 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"net/url"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
@@ -30,6 +33,20 @@ type Mesos struct {
 	Slaves     []string
 	SlaveCols  []string `toml:"slave_collections"`
 	//SlaveTasks bool
+
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
+
+	initialized bool
+	client      *http.Client
+	masterURLs  []*url.URL
+	slaveURLs   []*url.URL
 }
 
 var allMetrics = map[Role][]string{
@@ -41,7 +58,7 @@ var sampleConfig = `
   ## Timeout, in ms.
   timeout = 100
   ## A list of Mesos masters.
-  masters = ["localhost:5050"]
+  masters = ["http://localhost:5050"]
   ## Master metrics groups to be collected, by default, all enabled.
   master_collections = [
     "resources",
@@ -65,6 +82,13 @@ var sampleConfig = `
   #   "tasks",
   #   "messages",
   # ]
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 // SampleConfig returns a sample configuration block
@@ -77,7 +101,28 @@ func (m *Mesos) Description() string {
 	return "Telegraf plugin for gathering metrics from N Mesos masters"
 }
 
-func (m *Mesos) SetDefaults() {
+func parseURL(s string, role Role) (*url.URL, error) {
+	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
+		host, port, err := net.SplitHostPort(s)
+		// no port specified
+		if err != nil {
+			host = s
+			switch role {
+			case MASTER:
+				port = "5050"
+			case SLAVE:
+				port = "5051"
+			}
+		}
+
+		s = "http://" + host + ":" + port
+		log.Printf("W! [inputs.mesos] Using %q as connection URL; please update your configuration to use an URL", s)
+	}
+
+	return url.Parse(s)
+}
+
+func (m *Mesos) initialize() error {
 	if len(m.MasterCols) == 0 {
 		m.MasterCols = allMetrics[MASTER]
 	}
@@ -87,33 +132,71 @@ func (m *Mesos) SetDefaults() {
 	}
 
 	if m.Timeout == 0 {
-		log.Println("I! [mesos] Missing timeout value, setting default value (100ms)")
+		log.Println("I! [inputs.mesos] Missing timeout value, setting default value (100ms)")
 		m.Timeout = 100
 	}
+
+	rawQuery := "timeout=" + strconv.Itoa(m.Timeout) + "ms"
+
+	m.masterURLs = make([]*url.URL, 0, len(m.Masters))
+	for _, master := range m.Masters {
+		u, err := parseURL(master, MASTER)
+		if err != nil {
+			return err
+		}
+
+		u.RawQuery = rawQuery
+		m.masterURLs = append(m.masterURLs, u)
+	}
+
+	m.slaveURLs = make([]*url.URL, 0, len(m.Slaves))
+	for _, slave := range m.Slaves {
+		u, err := parseURL(slave, SLAVE)
+		if err != nil {
+			return err
+		}
+
+		u.RawQuery = rawQuery
+		m.slaveURLs = append(m.slaveURLs, u)
+	}
+
+	client, err := m.createHttpClient()
+	if err != nil {
+		return err
+	}
+	m.client = client
+
+	return nil
 }
 
 // Gather() metrics from given list of Mesos Masters
 func (m *Mesos) Gather(acc telegraf.Accumulator) error {
-	var wg sync.WaitGroup
-
-	m.SetDefaults()
-
-	for _, v := range m.Masters {
-		wg.Add(1)
-		go func(c string) {
-			acc.AddError(m.gatherMainMetrics(c, ":5050", MASTER, acc))
-			wg.Done()
-			return
-		}(v)
+	if !m.initialized {
+		err := m.initialize()
+		if err != nil {
+			return err
+		}
+		m.initialized = true
 	}
 
-	for _, v := range m.Slaves {
+	var wg sync.WaitGroup
+
+	for _, master := range m.masterURLs {
 		wg.Add(1)
-		go func(c string) {
-			acc.AddError(m.gatherMainMetrics(c, ":5051", SLAVE, acc))
+		go func(master *url.URL) {
+			acc.AddError(m.gatherMainMetrics(master, MASTER, acc))
 			wg.Done()
 			return
-		}(v)
+		}(master)
+	}
+
+	for _, slave := range m.slaveURLs {
+		wg.Add(1)
+		go func(slave *url.URL) {
+			acc.AddError(m.gatherMainMetrics(slave, SLAVE, acc))
+			wg.Done()
+			return
+		}(slave)
 
 		// if !m.SlaveTasks {
 		// 	continue
@@ -121,7 +204,7 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 
 		// wg.Add(1)
 		// go func(c string) {
-		// 	acc.AddError(m.gatherSlaveTaskMetrics(c, ":5051", acc))
+		// 	acc.AddError(m.gatherSlaveTaskMetrics(slave, acc))
 		// 	wg.Done()
 		// 	return
 		// }(v)
@@ -132,6 +215,24 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func (m *Mesos) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: 4 * time.Second,
+	}
+
+	return client, nil
+}
+
 // metricsDiff() returns set names for removal
 func metricsDiff(role Role, w []string) []string {
 	b := []string{}
@@ -393,15 +494,6 @@ func (m *Mesos) filterMetrics(role Role, metrics *map[string]interface{}) {
 	}
 }
 
-var tr = &http.Transport{
-	ResponseHeaderTimeout: time.Duration(3 * time.Second),
-}
-
-var client = &http.Client{
-	Transport: tr,
-	Timeout:   time.Duration(4 * time.Second),
-}
-
 // TaskStats struct for JSON API output /monitor/statistics
 type TaskStats struct {
 	ExecutorID  string                 `json:"executor_id"`
@@ -409,22 +501,15 @@ type TaskStats struct {
 	Statistics  map[string]interface{} `json:"statistics"`
 }
 
-func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc telegraf.Accumulator) error {
+func (m *Mesos) gatherSlaveTaskMetrics(u *url.URL, acc telegraf.Accumulator) error {
 	var metrics []TaskStats
 
-	host, _, err := net.SplitHostPort(address)
-	if err != nil {
-		host = address
-		address = address + defaultPort
-	}
-
 	tags := map[string]string{
-		"server": host,
+		"server": u.Hostname(),
+		"url":    urlTag(u),
 	}
 
-	ts := strconv.Itoa(m.Timeout) + "ms"
-
-	resp, err := client.Get("http://" + address + "/monitor/statistics?timeout=" + ts)
+	resp, err := m.client.Get(withPath(u, "/monitor/statistics").String())
 
 	if err != nil {
 		return err
@@ -459,24 +544,31 @@ func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc t
 	return nil
 }
 
+func withPath(u *url.URL, path string) *url.URL {
+	c := *u
+	c.Path = path
+	return &c
+}
+
+func urlTag(u *url.URL) string {
+	c := *u
+	c.Path = ""
+	c.User = nil
+	c.RawQuery = ""
+	return c.String()
+}
+
 // This should not belong to the object
-func (m *Mesos) gatherMainMetrics(a string, defaultPort string, role Role, acc telegraf.Accumulator) error {
+func (m *Mesos) gatherMainMetrics(u *url.URL, role Role, acc telegraf.Accumulator) error {
 	var jsonOut map[string]interface{}
 
-	host, _, err := net.SplitHostPort(a)
-	if err != nil {
-		host = a
-		a = a + defaultPort
-	}
-
 	tags := map[string]string{
-		"server": host,
+		"server": u.Hostname(),
+		"url":    urlTag(u),
 		"role":   string(role),
 	}
 
-	ts := strconv.Itoa(m.Timeout) + "ms"
-
-	resp, err := client.Get("http://" + a + "/metrics/snapshot?timeout=" + ts)
+	resp, err := m.client.Get(withPath(u, "/metrics/snapshot").String())
 
 	if err != nil {
 		return err
diff --git a/plugins/inputs/mesos/mesos_test.go b/plugins/inputs/mesos/mesos_test.go
index a7705d11e..905adb6e3 100644
--- a/plugins/inputs/mesos/mesos_test.go
+++ b/plugins/inputs/mesos/mesos_test.go
@@ -6,10 +6,12 @@ import (
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"os"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
 )
 
 var masterMetrics map[string]interface{}
@@ -378,3 +380,19 @@ func TestSlaveFilter(t *testing.T) {
 		}
 	}
 }
+
+func TestWithPathDoesNotModify(t *testing.T) {
+	u, err := url.Parse("http://localhost:5051")
+	require.NoError(t, err)
+	v := withPath(u, "/xyzzy")
+	require.Equal(t, u.String(), "http://localhost:5051")
+	require.Equal(t, v.String(), "http://localhost:5051/xyzzy")
+}
+
+func TestURLTagDoesNotModify(t *testing.T) {
+	u, err := url.Parse("http://a:b@localhost:5051?timeout=1ms")
+	require.NoError(t, err)
+	v := urlTag(u)
+	require.Equal(t, u.String(), "http://a:b@localhost:5051?timeout=1ms")
+	require.Equal(t, v, "http://localhost:5051")
+}

From 1b0e87a8b080e96ee7008a61fbc32a9ddd6b9e72 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Feb 2018 18:37:22 -0800
Subject: [PATCH 0930/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e4c27fb1..a80dd5460 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - [#3618](https://github.com/influxdata/telegraf/pull/3618): Add new sqlserver output data model.
 - [#3559](https://github.com/influxdata/telegraf/pull/3559): Add native Go method for finding pids to procstat.
 - [#3722](https://github.com/influxdata/telegraf/pull/3722): Add additional metrics and reverse metric names option to openldap.
+- [#3769](https://github.com/influxdata/telegraf/pull/3769): Add TLS support to the mesos input plugin.
 
 ### Bugfixes
 

From 32dd1b372563ef2675f9c5510eb40810e2c68422 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Feb 2018 18:30:43 -0800
Subject: [PATCH 0931/1302] Adjust time of nightly build

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c1ccbddd..c95fe71f0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,7 +42,7 @@ workflows:
             - 'build'
     triggers:
       - schedule:
-          cron: "0 0 * * *"
+          cron: "0 18 * * *"
           filters:
             branches:
               only:

From f5ea13a9abdaf522466ca86b26b7790b1d47e0fe Mon Sep 17 00:00:00 2001
From: efficks <efficks@users.noreply.github.com>
Date: Fri, 9 Feb 2018 15:11:19 -0500
Subject: [PATCH 0932/1302] Fix ping plugin not reporting zero durations
 (#3778)

---
 plugins/inputs/ping/ping.go         | 10 +++++-----
 plugins/inputs/ping/ping_windows.go | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 4ed36bd05..2fb48a20b 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -129,16 +129,16 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			fields["packets_transmitted"] = trans
 			fields["packets_received"] = rec
 			fields["percent_packet_loss"] = loss
-			if min > 0 {
+			if min >= 0 {
 				fields["minimum_response_ms"] = min
 			}
-			if avg > 0 {
+			if avg >= 0 {
 				fields["average_response_ms"] = avg
 			}
-			if max > 0 {
+			if max >= 0 {
 				fields["maximum_response_ms"] = max
 			}
-			if stddev > 0 {
+			if stddev >= 0 {
 				fields["standard_deviation_ms"] = stddev
 			}
 			acc.AddFields("ping", fields, tags)
@@ -207,7 +207,7 @@ func (p *Ping) args(url string) []string {
 // It returns (<transmitted packets>, <received packets>, <average response>)
 func processPingOutput(out string) (int, int, float64, float64, float64, float64, error) {
 	var trans, recv int
-	var min, avg, max, stddev float64
+	var min, avg, max, stddev float64 = -1.0, -1.0, -1.0, -1.0
 	// Set this error to nil if we find a 'transmitted' line
 	err := errors.New("Fatal error processing ping output")
 	lines := strings.Split(out, "\n")
diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 862c82c5f..06a7f590e 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -93,32 +93,32 @@ func processPingOutput(out string) (int, int, int, int, int, int, error) {
 
 	// stats data should contain 4 members: entireExpression + ( Send, Receive, Lost )
 	if len(stats) != 4 {
-		return 0, 0, 0, 0, 0, 0, err
+		return 0, 0, 0, -1, -1, -1, err
 	}
 	trans, err := strconv.Atoi(stats[1])
 	if err != nil {
-		return 0, 0, 0, 0, 0, 0, err
+		return 0, 0, 0, -1, -1, -1, err
 	}
 	receivedPacket, err := strconv.Atoi(stats[2])
 	if err != nil {
-		return 0, 0, 0, 0, 0, 0, err
+		return 0, 0, 0, -1, -1, -1, err
 	}
 
 	// aproxs data should contain 4 members: entireExpression + ( min, max, avg )
 	if len(aproxs) != 4 {
-		return trans, receivedReply, receivedPacket, 0, 0, 0, err
+		return trans, receivedReply, receivedPacket, -1, -1, -1, err
 	}
 	min, err := strconv.Atoi(aproxs[1])
 	if err != nil {
-		return trans, receivedReply, receivedPacket, 0, 0, 0, err
+		return trans, receivedReply, receivedPacket, -1, -1, -1, err
 	}
 	max, err := strconv.Atoi(aproxs[2])
 	if err != nil {
-		return trans, receivedReply, receivedPacket, 0, 0, 0, err
+		return trans, receivedReply, receivedPacket, -1, -1, -1, err
 	}
 	avg, err := strconv.Atoi(aproxs[3])
 	if err != nil {
-		return 0, 0, 0, 0, 0, 0, err
+		return 0, 0, 0, -1, -1, -1, err
 	}
 
 	return trans, receivedReply, receivedPacket, avg, min, max, err
@@ -201,13 +201,13 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 			fields["packets_received"] = receivePacket
 			fields["percent_packet_loss"] = lossPackets
 			fields["percent_reply_loss"] = lossReply
-			if avg > 0 {
+			if avg >= 0 {
 				fields["average_response_ms"] = float64(avg)
 			}
-			if min > 0 {
+			if min >= 0 {
 				fields["minimum_response_ms"] = float64(min)
 			}
-			if max > 0 {
+			if max >= 0 {
 				fields["maximum_response_ms"] = float64(max)
 			}
 			acc.AddFields("ping", fields, tags)

From a00d5b48f8cc726e9f214b87878eaaeda996e6a7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 9 Feb 2018 12:13:07 -0800
Subject: [PATCH 0933/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a80dd5460..b8b3a2fdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 
 - [#3729](https://github.com/influxdata/telegraf/issues/3729): Set path to / if HOST_MOUNT_PREFIX matches full path.
 - [#3739](https://github.com/influxdata/telegraf/issues/3739): Remove userinfo from url tag in prometheus input.
+- [#3778](https://github.com/influxdata/telegraf/issues/3778): Fix ping plugin not reporting zero durations.
 
 ## v1.5.2 [2018-01-30]
 

From 42ccc9f32469e01f2da17a6a4abdda086350474f Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Fri, 9 Feb 2018 15:45:22 -0500
Subject: [PATCH 0934/1302] Added additional SQL Server performance counters
 (#3770)

* Included system databases in server properties, added backup/restore throughput counter, error counters, and user settable counters.

* Added more resource governor counters.

* Added Target and Total Server Memory counters.

* Removed the c_type tag from the performance counters query, added more documentation instead.
---
 plugins/inputs/sqlserver/README.md    | 38 ++++++++++++++++++++++++++-
 plugins/inputs/sqlserver/sqlserver.go | 28 ++++++++++++++------
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index 502d1aef8..6a5b62d6d 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -89,10 +89,46 @@ The new (version 2) metrics provide:
   - *Log activity*: Log bytes flushed/sec, Log flushes/sec, Log Flush Wait Time
   - *Memory*: PLE, Page reads/sec, Page writes/sec, + more
   - *TempDB*: Free space, Version store usage, Active temp tables, temp table creation rate, + more
-  - *Resource Governor*: CPU Usage, Requests/sec, Queued Requests, and Blocked tasks per workload group
+  - *Resource Governor*: CPU Usage, Requests/sec, Queued Requests, and Blocked tasks per workload group + more
 - *Server properties*: Number of databases in all possible states (online, offline, suspect, etc.), cpu count, physical memory, SQL Server service uptime, and SQL Server version
 - *Wait stats*: Wait time in ms, number of waiting tasks, resource wait time, signal wait time, max wait time in ms, wait type, and wait category. The waits are categorized using the sasme categories used in Query Store.
 
+The following metrics can be used directly, with no delta calculations:
+ - SQLServer:Buffer Manager\Buffer cache hit ratio
+ - SQLServer:Buffer Manager\Page life expectancy
+ - SQLServer:Buffer Node\Page life expectancy
+ - SQLServer:Database Replica\Log Apply Pending Queue
+ - SQLServer:Database Replica\Log Apply Ready Queue
+ - SQLServer:Database Replica\Log Send Queue
+ - SQLServer:Database Replica\Recovery Queue
+ - SQLServer:Databases\Data File(s) Size (KB)
+ - SQLServer:Databases\Log File(s) Size (KB)
+ - SQLServer:Databases\Log File(s) Used Size (KB)
+ - SQLServer:Databases\XTP Memory Used (KB)
+ - SQLServer:General Statistics\Active Temp Tables
+ - SQLServer:General Statistics\Processes blocked
+ - SQLServer:General Statistics\Temp Tables For Destruction
+ - SQLServer:General Statistics\User Connections
+ - SQLServer:Memory Broker Clerks\Memory broker clerk size
+ - SQLServer:Memory Manager\Memory Grants Pending
+ - SQLServer:Memory Manager\Target Server Memory (KB)
+ - SQLServer:Memory Manager\Total Server Memory (KB)
+ - SQLServer:Resource Pool Stats\Active memory grant amount (KB)
+ - SQLServer:Resource Pool Stats\Disk Read Bytes/sec
+ - SQLServer:Resource Pool Stats\Disk Read IO Throttled/sec
+ - SQLServer:Resource Pool Stats\Disk Read IO/sec
+ - SQLServer:Resource Pool Stats\Disk Write Bytes/sec
+ - SQLServer:Resource Pool Stats\Disk Write IO Throttled/sec
+ - SQLServer:Resource Pool Stats\Disk Write IO/sec
+ - SQLServer:Resource Pool Stats\Used memory (KB)
+ - SQLServer:Transactions\Free Space in tempdb (KB)
+ - SQLServer:Transactions\Version Store Size (KB)
+ - SQLServer:User Settable\Query
+ - SQLServer:Workload Group Stats\Blocked tasks
+ - SQLServer:Workload Group Stats\CPU usage %
+ - SQLServer:Workload Group Stats\Queued requests
+ - SQLServer:Workload Group Stats\Requests completed/sec
+
 Version 2 queries have the following tags:
 - `host`: Physical host name
 - `sql_instance`: Physical host and instance name (hostname:instance)
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 90aa9c837..e66d7972d 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -390,7 +390,6 @@ CROSS APPLY (
 	SELECT	*
 	FROM	@sys_info
 ) AS sinfo
-WHERE	database_id > 4
 OPTION( RECOMPILE );
 `
 
@@ -445,7 +444,10 @@ WHERE	(
 			'Memory Grants Pending',
 			'Free list stalls/sec',
 			'Buffer cache hit ratio',
-			'Buffer cache hit ratio base'
+			'Buffer cache hit ratio base',
+			'Backup/Restore Throughput/sec',
+			'Total Server Memory (KB)',
+			'Target Server Memory (KB)'
 		)
 		) OR (
 			instance_name IN ('_Total','Column store object pool')
@@ -494,6 +496,21 @@ WHERE	(
 				'Requests completed/sec',
 				'Blocked tasks'
 			)
+		) OR (
+			object_name = 'SQLServer:Resource Pool Stats'
+			AND counter_name IN (
+				'Active memory grant amount (KB)',
+				'Disk Read Bytes/sec',
+				'Disk Read IO Throttled/sec',
+				'Disk Read IO/sec',
+				'Disk Write Bytes/sec',
+				'Disk Write IO Throttled/sec',
+				'Disk Write IO/sec',
+				'Used memory (KB)'
+			)
+		) OR object_name IN (
+			'SQLServer:User Settable',
+			'SQLServer:SQL Errors'
 		)
 
 SELECT	'sqlserver_performance' AS [measurement],
@@ -502,12 +519,7 @@ SELECT	'sqlserver_performance' AS [measurement],
 		pc.object_name AS [object],
 		pc.counter_name AS [counter],
 		CASE pc.instance_name WHEN '_Total' THEN 'Total' ELSE ISNULL(pc.instance_name,'') END AS [instance],
-		CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS [value],
-		CASE 
-			WHEN pc.cntr_type = 272696576 THEN 'rate'
-			WHEN pc.cntr_type IN (65792,537003264) THEN 'raw'
-			ELSE 'unknown'
-		END AS c_type
+		CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS [value]
 FROM	@PCounters AS pc
 		LEFT OUTER JOIN @PCounters AS pc1
 			ON (

From f82f03b92cdf4b83fd147541c85ddc9eecf023cf Mon Sep 17 00:00:00 2001
From: Nicolas Grange <grange74@gmail.com>
Date: Fri, 16 Feb 2018 11:00:10 +1100
Subject: [PATCH 0935/1302] Add http input plugin which supports any input data
 format (#3546)

---
 README.md                        |   1 +
 plugins/inputs/all/all.go        |   1 +
 plugins/inputs/http/README.md    |  42 +++++++
 plugins/inputs/http/http.go      | 200 +++++++++++++++++++++++++++++++
 plugins/inputs/http/http_test.go | 117 ++++++++++++++++++
 5 files changed, 361 insertions(+)
 create mode 100644 plugins/inputs/http/README.md
 create mode 100644 plugins/inputs/http/http.go
 create mode 100644 plugins/inputs/http/http_test.go

diff --git a/README.md b/README.md
index d52327f4c..19a5afe7e 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ configuration options.
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
+* [http](./plugins/inputs/http) (generic HTTP plugin, supports using input data formats)
 * [http_response](./plugins/inputs/http_response)
 * [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
 * [internal](./plugins/inputs/internal)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index a13bd6cd3..d58002089 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -29,6 +29,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/hddtemp"
+	_ "github.com/influxdata/telegraf/plugins/inputs/http"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/http_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
diff --git a/plugins/inputs/http/README.md b/plugins/inputs/http/README.md
new file mode 100644
index 000000000..430a19b2b
--- /dev/null
+++ b/plugins/inputs/http/README.md
@@ -0,0 +1,42 @@
+# HTTP Input Plugin
+
+The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The metrics need to be formatted in one of the supported data formats.  Each data format has its own unique set of configuration options, read more about them here:
+  https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+
+
+### Configuration:
+
+This section contains the default TOML to configure the plugin.  You can
+generate it using `telegraf --usage http`.
+
+```toml
+# Read formatted metrics from one or more HTTP endpoints
+[[inputs.http]]
+  ## One or more URLs from which to read formatted metrics
+  urls = [
+    "http://localhost/metrics"
+  ]
+
+  ## Optional HTTP Basic Auth Credentials
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  # timeout = "5s"
+
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+```
+
+### Metrics:
+
+The metrics collected by this input plugin will depend on the configurated `data_format` and the payload returned by the HTTP endpoint(s).
diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
new file mode 100644
index 000000000..6a98ab4fc
--- /dev/null
+++ b/plugins/inputs/http/http.go
@@ -0,0 +1,200 @@
+package http
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/parsers"
+)
+
+type HTTP struct {
+	URLs []string `toml:"urls"`
+
+	Headers map[string]string
+
+	// HTTP Basic Auth Credentials
+	Username string
+	Password string
+
+	// Option to add "url" tag to each metric
+	TagURL bool `toml:"tag_url"`
+
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
+
+	Timeout internal.Duration
+
+	client *http.Client
+
+	// The parser will automatically be set by Telegraf core code because
+	// this plugin implements the ParserInput interface (i.e. the SetParser method)
+	parser parsers.Parser
+}
+
+var sampleConfig = `
+  ## One or more URLs from which to read formatted metrics
+  urls = [
+    "http://localhost/metrics"
+  ]
+
+  ## Optional HTTP headers
+  # headers = {"X-Special-Header" = "Special-Value"}
+
+  ## Optional HTTP Basic Auth Credentials
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Tag all metrics with the url
+  # tag_url = true
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
+  # timeout = "5s"
+
+  ## Data format to consume.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+  # data_format = "influx"
+`
+
+// SampleConfig returns the default configuration of the Input
+func (*HTTP) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns a one-sentence description on the Input
+func (*HTTP) Description() string {
+	return "Read formatted metrics from one or more HTTP endpoints"
+}
+
+// Gather takes in an accumulator and adds the metrics that the Input
+// gathers. This is called every "interval"
+func (h *HTTP) Gather(acc telegraf.Accumulator) error {
+	if h.client == nil {
+		tlsCfg, err := internal.GetTLSConfig(
+			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
+		if err != nil {
+			return err
+		}
+		h.client = &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: tlsCfg,
+			},
+			Timeout: h.Timeout.Duration,
+		}
+	}
+
+	var wg sync.WaitGroup
+	for _, u := range h.URLs {
+		wg.Add(1)
+		go func(url string) {
+			defer wg.Done()
+			if err := h.gatherURL(acc, url); err != nil {
+				acc.AddError(fmt.Errorf("[url=%s]: %s", url, err))
+			}
+		}(u)
+	}
+
+	wg.Wait()
+
+	return nil
+}
+
+// SetParser takes the data_format from the config and finds the right parser for that format
+func (h *HTTP) SetParser(parser parsers.Parser) {
+	h.parser = parser
+}
+
+// Gathers data from a particular URL
+// Parameters:
+//     acc    : The telegraf Accumulator to use
+//     url    : endpoint to send request to
+//
+// Returns:
+//     error: Any error that may have occurred
+func (h *HTTP) gatherURL(
+	acc telegraf.Accumulator,
+	url string,
+) error {
+	request, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	for k, v := range h.Headers {
+		if strings.ToLower(k) == "host" {
+			request.Host = v
+		} else {
+			request.Header.Add(k, v)
+		}
+	}
+
+	if h.Username != "" {
+		request.SetBasicAuth(h.Username, h.Password)
+	}
+
+	resp, err := h.client.Do(request)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("Received status code %d (%s), expected %d (%s)",
+			resp.StatusCode,
+			http.StatusText(resp.StatusCode),
+			http.StatusOK,
+			http.StatusText(http.StatusOK))
+	}
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	if h.parser == nil {
+		return errors.New("Parser is not set")
+	}
+
+	metrics, err := h.parser.Parse(b)
+	if err != nil {
+		return err
+	}
+
+	for _, metric := range metrics {
+		if h.TagURL {
+			metric.AddTag("url", url)
+		}
+		acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("http", func() telegraf.Input {
+		return &HTTP{
+			Timeout: internal.Duration{Duration: time.Second * 5},
+		}
+	})
+}
diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go
new file mode 100644
index 000000000..fd352829c
--- /dev/null
+++ b/plugins/inputs/http/http_test.go
@@ -0,0 +1,117 @@
+package http_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	plugin "github.com/influxdata/telegraf/plugins/inputs/http"
+	"github.com/influxdata/telegraf/plugins/parsers"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHTTPwithJSONFormat(t *testing.T) {
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/endpoint" {
+			_, _ = w.Write([]byte(simpleJSON))
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeServer.Close()
+
+	url := fakeServer.URL + "/endpoint"
+	plugin := &plugin.HTTP{
+		URLs:   []string{url},
+		TagURL: true,
+	}
+	metricName := "metricName"
+	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	plugin.SetParser(p)
+
+	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(plugin.Gather))
+
+	require.Len(t, acc.Metrics, 1)
+
+	// basic check to see if we got the right field, value and tag
+	var metric = acc.Metrics[0]
+	require.Equal(t, metric.Measurement, metricName)
+	require.Len(t, acc.Metrics[0].Fields, 1)
+	require.Equal(t, acc.Metrics[0].Fields["a"], 1.2)
+	require.Equal(t, acc.Metrics[0].Tags["url"], url)
+}
+
+func TestHTTPHeaders(t *testing.T) {
+	header := "X-Special-Header"
+	headerValue := "Special-Value"
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/endpoint" {
+			if r.Header.Get(header) == headerValue {
+				_, _ = w.Write([]byte(simpleJSON))
+			} else {
+				w.WriteHeader(http.StatusForbidden)
+			}
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeServer.Close()
+
+	url := fakeServer.URL + "/endpoint"
+	plugin := &plugin.HTTP{
+		URLs:    []string{url},
+		Headers: map[string]string{header: headerValue},
+	}
+	metricName := "metricName"
+	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	plugin.SetParser(p)
+
+	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(plugin.Gather))
+}
+
+func TestInvalidStatusCode(t *testing.T) {
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNotFound)
+	}))
+	defer fakeServer.Close()
+
+	url := fakeServer.URL + "/endpoint"
+	plugin := &plugin.HTTP{
+		URLs: []string{url},
+	}
+
+	metricName := "metricName"
+	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	plugin.SetParser(p)
+
+	var acc testutil.Accumulator
+	require.Error(t, acc.GatherError(plugin.Gather))
+}
+
+func TestParserNotSet(t *testing.T) {
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/endpoint" {
+			_, _ = w.Write([]byte(simpleJSON))
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeServer.Close()
+
+	url := fakeServer.URL + "/endpoint"
+	plugin := &plugin.HTTP{
+		URLs: []string{url},
+	}
+
+	var acc testutil.Accumulator
+	require.Error(t, acc.GatherError(plugin.Gather))
+}
+
+const simpleJSON = `
+{
+    "a": 1.2
+}
+`

From 5b37fd3ae9ffcfe4adc769f283cfb2fa3c26c2ea Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 17:54:08 -0800
Subject: [PATCH 0936/1302] Update http input documentation

---
 plugins/inputs/http/README.md | 22 ++++++++++++++++------
 plugins/inputs/http/http.go   |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/http/README.md b/plugins/inputs/http/README.md
index 430a19b2b..85a57c99a 100644
--- a/plugins/inputs/http/README.md
+++ b/plugins/inputs/http/README.md
@@ -1,14 +1,10 @@
 # HTTP Input Plugin
 
-The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The metrics need to be formatted in one of the supported data formats.  Each data format has its own unique set of configuration options, read more about them here:
-  https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The endpoint should have metrics formatted in one of the supported [input data formats](../../../docs/DATA_FORMATS_INPUT.md).  Each data format has its own unique set of configuration options which can be added to the input configuration.
 
 
 ### Configuration:
 
-This section contains the default TOML to configure the plugin.  You can
-generate it using `telegraf --usage http`.
-
 ```toml
 # Read formatted metrics from one or more HTTP endpoints
 [[inputs.http]]
@@ -17,10 +13,16 @@ generate it using `telegraf --usage http`.
     "http://localhost/metrics"
   ]
 
+  ## Optional HTTP headers
+  # headers = {"X-Special-Header" = "Special-Value"}
+
   ## Optional HTTP Basic Auth Credentials
   # username = "username"
   # password = "pa$$word"
 
+  ## Tag all metrics with the url
+  # tag_url = true
+
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -28,6 +30,7 @@ generate it using `telegraf --usage http`.
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## Amount of time allowed to complete the HTTP request
   # timeout = "5s"
 
   ## Data format to consume.
@@ -35,8 +38,15 @@ generate it using `telegraf --usage http`.
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
   # data_format = "influx"
+
 ```
 
 ### Metrics:
 
-The metrics collected by this input plugin will depend on the configurated `data_format` and the payload returned by the HTTP endpoint(s).
+The metrics collected by this input plugin will depend on the configured `data_format` and the payload returned by the HTTP endpoint(s).
+
+The default values below are added if the input format does not specify a value:
+
+- http
+  - tags:
+    - url
diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index 6a98ab4fc..beece0458 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -68,6 +68,7 @@ var sampleConfig = `
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## Amount of time allowed to complete the HTTP request
   # timeout = "5s"
 
   ## Data format to consume.

From 2ee270f2746e2c8b591b0c9e2931f084a6f66ae3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 18:22:49 -0800
Subject: [PATCH 0937/1302] Allow setting basic auth with empty username

---
 plugins/inputs/http/http.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index beece0458..1f6a2e924 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -150,7 +150,7 @@ func (h *HTTP) gatherURL(
 		}
 	}
 
-	if h.Username != "" {
+	if h.Username != "" || h.Password != "" {
 		request.SetBasicAuth(h.Username, h.Password)
 	}
 

From 6c656d92a04b9b67a5fd380e558743cff5db7269 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 18:24:09 -0800
Subject: [PATCH 0938/1302] Add url tag only if not already set

---
 plugins/inputs/http/README.md    | 3 ---
 plugins/inputs/http/http.go      | 5 +----
 plugins/inputs/http/http_test.go | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/http/README.md b/plugins/inputs/http/README.md
index 85a57c99a..2c22aaa42 100644
--- a/plugins/inputs/http/README.md
+++ b/plugins/inputs/http/README.md
@@ -20,9 +20,6 @@ The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The
   # username = "username"
   # password = "pa$$word"
 
-  ## Tag all metrics with the url
-  # tag_url = true
-
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index 1f6a2e924..00a13e3f3 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -24,9 +24,6 @@ type HTTP struct {
 	Username string
 	Password string
 
-	// Option to add "url" tag to each metric
-	TagURL bool `toml:"tag_url"`
-
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
 	// Path to host cert file
@@ -183,7 +180,7 @@ func (h *HTTP) gatherURL(
 	}
 
 	for _, metric := range metrics {
-		if h.TagURL {
+		if !metric.HasTag("url") {
 			metric.AddTag("url", url)
 		}
 		acc.AddFields(metric.Name(), metric.Fields(), metric.Tags(), metric.Time())
diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go
index fd352829c..843015990 100644
--- a/plugins/inputs/http/http_test.go
+++ b/plugins/inputs/http/http_test.go
@@ -23,8 +23,7 @@ func TestHTTPwithJSONFormat(t *testing.T) {
 
 	url := fakeServer.URL + "/endpoint"
 	plugin := &plugin.HTTP{
-		URLs:   []string{url},
-		TagURL: true,
+		URLs: []string{url},
 	}
 	metricName := "metricName"
 	p, _ := parsers.NewJSONParser(metricName, nil, nil)

From a55456b56c2b957ef437c70d41137f87908b2ed4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 18:24:49 -0800
Subject: [PATCH 0939/1302] Check parser initialization earlier

---
 plugins/inputs/http/http.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index 00a13e3f3..5bf895ca5 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -88,6 +88,10 @@ func (*HTTP) Description() string {
 // Gather takes in an accumulator and adds the metrics that the Input
 // gathers. This is called every "interval"
 func (h *HTTP) Gather(acc telegraf.Accumulator) error {
+	if h.parser == nil {
+		return errors.New("Parser is not set")
+	}
+
 	if h.client == nil {
 		tlsCfg, err := internal.GetTLSConfig(
 			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
@@ -170,10 +174,6 @@ func (h *HTTP) gatherURL(
 		return err
 	}
 
-	if h.parser == nil {
-		return errors.New("Parser is not set")
-	}
-
 	metrics, err := h.parser.Parse(b)
 	if err != nil {
 		return err

From 3fe3d75bb3d9665508bee30a6f59c8d910bd6e53 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 18:36:01 -0800
Subject: [PATCH 0940/1302] Add configurable method to http input

---
 plugins/inputs/http/README.md    |  3 +++
 plugins/inputs/http/http.go      |  9 +++++++--
 plugins/inputs/http/http_test.go | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/http/README.md b/plugins/inputs/http/README.md
index 2c22aaa42..2c0441364 100644
--- a/plugins/inputs/http/README.md
+++ b/plugins/inputs/http/README.md
@@ -13,6 +13,9 @@ The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The
     "http://localhost/metrics"
   ]
 
+  ## HTTP method
+  # method = "GET"
+
   ## Optional HTTP headers
   # headers = {"X-Special-Header" = "Special-Value"}
 
diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index 5bf895ca5..bdbb5f6fa 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -16,7 +16,8 @@ import (
 )
 
 type HTTP struct {
-	URLs []string `toml:"urls"`
+	URLs   []string `toml:"urls"`
+	Method string
 
 	Headers map[string]string
 
@@ -48,6 +49,9 @@ var sampleConfig = `
     "http://localhost/metrics"
   ]
 
+  ## HTTP method
+  # method = "GET"
+
   ## Optional HTTP headers
   # headers = {"X-Special-Header" = "Special-Value"}
 
@@ -138,7 +142,7 @@ func (h *HTTP) gatherURL(
 	acc telegraf.Accumulator,
 	url string,
 ) error {
-	request, err := http.NewRequest("GET", url, nil)
+	request, err := http.NewRequest(h.Method, url, nil)
 	if err != nil {
 		return err
 	}
@@ -193,6 +197,7 @@ func init() {
 	inputs.Add("http", func() telegraf.Input {
 		return &HTTP{
 			Timeout: internal.Duration{Duration: time.Second * 5},
+			Method:  "GET",
 		}
 	})
 }
diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go
index 843015990..486edabc9 100644
--- a/plugins/inputs/http/http_test.go
+++ b/plugins/inputs/http/http_test.go
@@ -90,6 +90,29 @@ func TestInvalidStatusCode(t *testing.T) {
 	require.Error(t, acc.GatherError(plugin.Gather))
 }
 
+func TestMethod(t *testing.T) {
+	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "POST" {
+			w.WriteHeader(http.StatusOK)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer fakeServer.Close()
+
+	plugin := &plugin.HTTP{
+		URLs:   []string{fakeServer.URL},
+		Method: "POST",
+	}
+
+	metricName := "metricName"
+	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	plugin.SetParser(p)
+
+	var acc testutil.Accumulator
+	require.NoError(t, acc.GatherError(plugin.Gather))
+}
+
 func TestParserNotSet(t *testing.T) {
 	fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/endpoint" {

From 4ac78d5c6d5797f79dc7462a078b8d671327546f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 18:51:32 -0800
Subject: [PATCH 0941/1302] Deprecate httpjson input

---
 plugins/inputs/httpjson/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/httpjson/README.md b/plugins/inputs/httpjson/README.md
index 50a36dd6c..e3ef83c87 100644
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -2,6 +2,8 @@
 
 The httpjson plugin collects data from HTTP URLs which respond with JSON.  It flattens the JSON and finds all numeric values, treating them as floats.
 
+Deprecated (1.6): use the [http](../http) input.
+
 ### Configuration:
 
 ```toml

From 9aabf567954ded0c12d9926d9673a55c83bd2937 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 19:05:13 -0800
Subject: [PATCH 0942/1302] Use proxy from environment in http input

---
 plugins/inputs/http/http.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index bdbb5f6fa..16e776cd0 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -105,6 +105,7 @@ func (h *HTTP) Gather(acc telegraf.Accumulator) error {
 		h.client = &http.Client{
 			Transport: &http.Transport{
 				TLSClientConfig: tlsCfg,
+				Proxy:           http.ProxyFromEnvironment,
 			},
 			Timeout: h.Timeout.Duration,
 		}

From 6406abbc892c9dd656fc4295f045e4c9d4cecea7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 19:09:50 -0800
Subject: [PATCH 0943/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8b3a2fdc..61d56f986 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,9 +26,13 @@
   is set.  It is encouraged to enable this option when possible as the old
   ordering is deprecated.
 
+- The `httpjson` is now deprecated, please migrate to the new `http` input.
+
 
 ### New Plugins
 
+
+- [http](./plugins/inputs/http/README.md) - Thanks to @grange74
 - [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
 - [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
 
@@ -57,6 +61,7 @@
 - [#3559](https://github.com/influxdata/telegraf/pull/3559): Add native Go method for finding pids to procstat.
 - [#3722](https://github.com/influxdata/telegraf/pull/3722): Add additional metrics and reverse metric names option to openldap.
 - [#3769](https://github.com/influxdata/telegraf/pull/3769): Add TLS support to the mesos input plugin.
+- [#3546](https://github.com/influxdata/telegraf/pull/3546): Add http input plugin.
 
 ### Bugfixes
 

From cd620ac144472c18e420cbdfa4d637da419c2ff8 Mon Sep 17 00:00:00 2001
From: Jorge Canha <canha@users.noreply.github.com>
Date: Fri, 16 Feb 2018 04:04:49 +0000
Subject: [PATCH 0944/1302] Add keep alive support to the TCP mode of statsd
 (#3781)

---
 etc/telegraf.conf               |  7 +++++++
 plugins/inputs/statsd/README.md | 10 ++++++++++
 plugins/inputs/statsd/statsd.go | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 438a32771..b09ff3912 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -3045,6 +3045,13 @@
 #
 #   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
 #   max_tcp_connections = 250
+#   ## Enable TCP keep alive probes (default=false)
+#   tcp_keep_alive = false
+#
+#   ## Specifies the keep-alive period for an active network connection.
+#   ## Only applies to TCP sockets and will be ignored if tcp_keep_alive is false.
+#   ## Defaults to the OS configuration.
+#   # tcp_keep_alive_period = "2h"
 #
 #   ## Address and port to host UDP listener on
 #   service_address = ":8125"
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 9562b9362..648fa72ac 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -10,6 +10,14 @@
 
   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
   max_tcp_connections = 250
+  
+  ## Enable TCP keep alive probes (default=false)
+  tcp_keep_alive = false
+
+  ## Specifies the keep-alive period for an active network connection.
+  ## Only applies to TCP sockets and will be ignored if tcp_keep_alive is false.
+  ## Defaults to the OS configuration.
+  # tcp_keep_alive_period = "2h"
 
   ## Address and port to host UDP listener on
   service_address = ":8125"
@@ -157,6 +165,8 @@ metric type:
 - **protocol** string: Protocol used in listener - tcp or udp options
 - **max_tcp_connections** []int: Maximum number of concurrent TCP connections
 to allow. Used when protocol is set to tcp.
+- **tcp_keep_alive** boolean: Enable TCP keep alive probes
+- **tcp_keep_alive_period** internal.Duration: Specifies the keep-alive period for an active network connection
 - **service_address** string: Address to listen for statsd UDP packets on
 - **delete_gauges** boolean: Delete gauges on every collection interval
 - **delete_counters** boolean: Delete counters on every collection interval
diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go
index 9f711d913..3e5a73aa3 100644
--- a/plugins/inputs/statsd/statsd.go
+++ b/plugins/inputs/statsd/statsd.go
@@ -113,6 +113,9 @@ type Statsd struct {
 
 	MaxTCPConnections int `toml:"max_tcp_connections"`
 
+	TCPKeepAlive       bool               `toml:"tcp_keep_alive"`
+	TCPKeepAlivePeriod *internal.Duration `toml:"tcp_keep_alive_period"`
+
 	graphiteParser *graphite.GraphiteParser
 
 	acc telegraf.Accumulator
@@ -177,6 +180,14 @@ const sampleConfig = `
   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
   max_tcp_connections = 250
 
+  ## Enable TCP keep alive probes (default=false)
+  tcp_keep_alive = false
+
+  ## Specifies the keep-alive period for an active network connection.
+  ## Only applies to TCP sockets and will be ignored if tcp_keep_alive is false.
+  ## Defaults to the OS configuration.
+  # tcp_keep_alive_period = "2h"
+
   ## Address and port to host UDP listener on
   service_address = ":8125"
 
@@ -361,6 +372,18 @@ func (s *Statsd) tcpListen() error {
 				return err
 			}
 
+			if s.TCPKeepAlive {
+				if err = conn.SetKeepAlive(true); err != nil {
+					return err
+				}
+
+				if s.TCPKeepAlivePeriod != nil {
+					if err = conn.SetKeepAlivePeriod(s.TCPKeepAlivePeriod.Duration); err != nil {
+						return err
+					}
+				}
+			}
+
 			select {
 			case <-s.accept:
 				// not over connection limit, handle the connection properly.
@@ -863,6 +886,7 @@ func init() {
 			Protocol:               defaultProtocol,
 			ServiceAddress:         ":8125",
 			MaxTCPConnections:      250,
+			TCPKeepAlive:           false,
 			MetricSeparator:        "_",
 			AllowedPendingMessages: defaultAllowPendingMessage,
 			DeleteCounters:         true,

From 6e35071c8992333ddc0736e4de78ee2c545bcd70 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 20:06:01 -0800
Subject: [PATCH 0945/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61d56f986..59fd4753c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - [#3722](https://github.com/influxdata/telegraf/pull/3722): Add additional metrics and reverse metric names option to openldap.
 - [#3769](https://github.com/influxdata/telegraf/pull/3769): Add TLS support to the mesos input plugin.
 - [#3546](https://github.com/influxdata/telegraf/pull/3546): Add http input plugin.
+- [#3781](https://github.com/influxdata/telegraf/pull/3781): Add keep alive support to the TCP mode of statsd.
 
 ### Bugfixes
 

From 3242f97debe0dd2ebbfdc236e5e0ee9a01616c3b Mon Sep 17 00:00:00 2001
From: everpcpc <git@everpcpc.com>
Date: Fri, 16 Feb 2018 12:11:07 +0800
Subject: [PATCH 0946/1302] Support deadline in ping plugin (#3783)

---
 plugins/inputs/ping/README.md    |  2 ++
 plugins/inputs/ping/ping.go      | 17 +++++++++++++++++
 plugins/inputs/ping/ping_test.go | 21 +++++++++++++--------
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/ping/README.md b/plugins/inputs/ping/README.md
index 5e4c637f5..eadc60ab7 100644
--- a/plugins/inputs/ping/README.md
+++ b/plugins/inputs/ping/README.md
@@ -17,6 +17,8 @@ urls = ["www.google.com"] # required
 # ping_interval = 1.0
 ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
 # timeout = 1.0
+## total-ping deadline, in s. 0 == no deadline (ping -w <DEADLINE>)
+# deadline = 10
 ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
 ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
 # interface = ""
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 2fb48a20b..0609a367e 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -34,6 +34,9 @@ type Ping struct {
 	// Ping timeout, in seconds. 0 means no timeout (ping -W <TIMEOUT>)
 	Timeout float64
 
+	// Ping deadline, in seconds. 0 means no deadline. (ping -w <DEADLINE>)
+	Deadline int
+
 	// Interface or source address to send ping from (ping -I/-S <INTERFACE/SRC_ADDR>)
 	Interface string
 
@@ -60,6 +63,8 @@ const sampleConfig = `
   # ping_interval = 1.0
   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
   # timeout = 1.0
+  ## total-ping deadline, in s. 0 == no deadline (ping -w <DEADLINE>)
+  # deadline = 10
   ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
   ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
   # interface = ""
@@ -179,6 +184,17 @@ func (p *Ping) args(url string) []string {
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', 1, 64))
 		}
 	}
+	if p.Deadline > 0 {
+		switch runtime.GOOS {
+		case "darwin":
+			args = append(args, "-t", strconv.Itoa(p.Deadline))
+		case "linux":
+			args = append(args, "-w", strconv.Itoa(p.Deadline))
+		default:
+			// Not sure the best option here, just assume GNU ping?
+			args = append(args, "-w", strconv.Itoa(p.Deadline))
+		}
+	}
 	if p.Interface != "" {
 		switch runtime.GOOS {
 		case "linux":
@@ -255,6 +271,7 @@ func init() {
 			PingInterval: 1.0,
 			Count:        1,
 			Timeout:      1.0,
+			Deadline:     10,
 		}
 	})
 }
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index eafe89428..ca50092a9 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -104,14 +104,22 @@ func TestArgs(t *testing.T) {
 	case "darwin":
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
 			"12000.0", "www.google.com"}
-	case "freebsd":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-t",
-			"12.0", "www.google.com"}
 	default:
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
 			"12.0", "www.google.com"}
 	}
 
+	p.Deadline = 24
+	actual = p.args("www.google.com")
+	switch runtime.GOOS {
+	case "darwin":
+		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
+			"12000.0", "-t", "24", "www.google.com"}
+	default:
+		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
+			"12.0", "-w", "24", "www.google.com"}
+	}
+
 	sort.Strings(actual)
 	sort.Strings(expected)
 	assert.True(t, reflect.DeepEqual(expected, actual),
@@ -122,13 +130,10 @@ func TestArgs(t *testing.T) {
 	switch runtime.GOOS {
 	case "darwin":
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12000.0", "-i", "1.2", "www.google.com"}
-	case "freebsd":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-t",
-			"12.0", "-i", "1.2", "www.google.com"}
+			"12000.0", "-t", "24", "-i", "1.2", "www.google.com"}
 	default:
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12.0", "-i", "1.2", "www.google.com"}
+			"12.0", "-w", "24", "-i", "1.2", "www.google.com"}
 	}
 	sort.Strings(actual)
 	sort.Strings(expected)

From a777ce9293c0f15662a247f8b9a7ab751a5ad55c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 20:11:52 -0800
Subject: [PATCH 0947/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59fd4753c..c39ef9e3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - [#3769](https://github.com/influxdata/telegraf/pull/3769): Add TLS support to the mesos input plugin.
 - [#3546](https://github.com/influxdata/telegraf/pull/3546): Add http input plugin.
 - [#3781](https://github.com/influxdata/telegraf/pull/3781): Add keep alive support to the TCP mode of statsd.
+- [#3783](https://github.com/influxdata/telegraf/pull/3783): Support deadline in ping plugin.
 
 ### Bugfixes
 

From 0ca3900abed92f8bc9184fd520d1e03576bebf5a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 15 Feb 2018 20:33:57 -0800
Subject: [PATCH 0948/1302] Method new dropwizard parser more prominently.

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c39ef9e3b..7cf537eb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,13 +29,16 @@
 - The `httpjson` is now deprecated, please migrate to the new `http` input.
 
 
-### New Plugins
-
+### New Inputs
 
 - [http](./plugins/inputs/http/README.md) - Thanks to @grange74
 - [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
 - [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
 
+### New Parsers
+
+- [dropwizard](./docs/DATA_FORMATS_INPUT.md#dropwizard) - Thanks to @atzoum
+
 ### Features
 
 - [#3551](https://github.com/influxdata/telegraf/pull/3551): Add health status mapping from string to int in elasticsearch input.

From ddde8809f47436051520cfe6dc4e746bd95ba8b4 Mon Sep 17 00:00:00 2001
From: Dwight Spencer <dspencer@computekindustries.com>
Date: Fri, 16 Feb 2018 15:51:20 -0600
Subject: [PATCH 0949/1302] Add README.md for mqtt output (#3764)

---
 plugins/outputs/mqtt/README.md | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 plugins/outputs/mqtt/README.md

diff --git a/plugins/outputs/mqtt/README.md b/plugins/outputs/mqtt/README.md
new file mode 100644
index 000000000..562149b9b
--- /dev/null
+++ b/plugins/outputs/mqtt/README.md
@@ -0,0 +1,54 @@
+# MQTT Producer Output Plugin
+
+This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt Producer.
+
+```
+[[outputs.mqtt]]
+  ## URLs of mqtt brokers
+  servers = ["localhost:1883"]
+  
+  ## topic for producer messages
+  topic = "telegraf"
+  
+  ## QoS policy for messages
+  qos = 2
+  
+  ## username and password to connect MQTT server.
+  # username = "telegraf"
+  # password = "metricsmetricsmetricsmetrics"
+   
+  ## client ID, if not set a random ID is generated
+  # client_id = ""
+    
+  ## Timeout for write operations. default: 5s
+  # timeout = "5s"
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+  
+  ## Data format to output.
+  data_format = "influx"
+
+
+```
+
+### Required parameters:
+
+* `servers`: List of strings, this is for speaking to a cluster of `mqtt` brokers. On each flush interval, Telegraf will randomly choose one of the urls to write to. Each URL should just include host and port e.g. -> `["{host}:{port}","{host2}:{port2}"]`
+* `topic_prefix`: The `mqtt` topic prefix to publish to. MQTT outputs send metrics to this topic format "<topic_prefix>/<hostname>/<pluginname>/" ( ex: prefix/web01.example.com/mem)
+* `qos`: The `mqtt` QoS policy for sending messages. See https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_9.0.0/com.ibm.mq.dev.doc/q029090_.htm for details.
+
+### Optional parameters:
+* `username`: The username to connect MQTT server.
+* `password`: The password to connect MQTT server.
+* `client_id`: The unique client id to connect MQTT server. If this paramater is not set then a random ID is generated.
+* `timeout`: Timeout for write operations. default: 5s
+* `ssl_ca`: SSL CA
+* `ssl_cert`: SSL CERT
+* `ssl_key`: SSL key
+* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
+* `data_format`: [About Telegraf data formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md)

From 53221d87eb04eabb659c7c4b3f66c451ab1f05d1 Mon Sep 17 00:00:00 2001
From: S <shaheed121@users.noreply.github.com>
Date: Fri, 16 Feb 2018 23:07:26 +0100
Subject: [PATCH 0950/1302] Add option to disable labels in prometheus output
 for string fields (#3765)

---
 plugins/outputs/prometheus_client/README.md   |  4 +++
 .../prometheus_client/prometheus_client.go    | 18 +++++++---
 .../prometheus_client_test.go                 | 35 +++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
index d42eecfd4..6cb0cc59e 100644
--- a/plugins/outputs/prometheus_client/README.md
+++ b/plugins/outputs/prometheus_client/README.md
@@ -23,4 +23,8 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
 
   # Expiration interval for each metric. 0 == no expiration
   expiration_interval = "60s"
+
+  # Send string metrics as Prometheus labels.
+  # Unless set to false all string metrics will be sent as labels.
+  string_as_label = true
 ```
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index bec4f413a..5b416b72e 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -61,6 +61,7 @@ type PrometheusClient struct {
 	ExpirationInterval internal.Duration `toml:"expiration_interval"`
 	Path               string            `toml:"path"`
 	CollectorsExclude  []string          `toml:"collectors_exclude"`
+	StringAsLabel      bool              `toml:"string_as_label"`
 
 	server *http.Server
 
@@ -89,6 +90,10 @@ var sampleConfig = `
   ## Collectors to enable, valid entries are "gocollector" and "process".
   ## If unset, both are enabled.
   collectors_exclude = ["gocollector", "process"]
+
+  # Send string metrics as Prometheus labels.
+  # Unless set to false all string metrics will be sent as labels.
+  string_as_label = true
 `
 
 func (p *PrometheusClient) basicAuth(h http.Handler) http.Handler {
@@ -326,11 +331,13 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 		}
 
 		// Prometheus doesn't have a string value type, so convert string
-		// fields to labels.
-		for fn, fv := range point.Fields() {
-			switch fv := fv.(type) {
-			case string:
-				labels[sanitize(fn)] = fv
+		// fields to labels if enabled.
+		if p.StringAsLabel {
+			for fn, fv := range point.Fields() {
+				switch fv := fv.(type) {
+				case string:
+					labels[sanitize(fn)] = fv
+				}
 			}
 		}
 
@@ -465,6 +472,7 @@ func init() {
 	outputs.Add("prometheus_client", func() telegraf.Output {
 		return &PrometheusClient{
 			ExpirationInterval: internal.Duration{Duration: time.Second * 60},
+			StringAsLabel:      true,
 			fam:                make(map[string]*MetricFamily),
 			now:                time.Now,
 		}
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 276fde009..05bd5264a 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -22,6 +22,7 @@ func setUnixTime(client *PrometheusClient, sec int64) {
 func NewClient() *PrometheusClient {
 	return &PrometheusClient{
 		ExpirationInterval: internal.Duration{Duration: time.Second * 60},
+		StringAsLabel:      true,
 		fam:                make(map[string]*MetricFamily),
 		now:                time.Now,
 	}
@@ -450,6 +451,40 @@ func TestWrite_StringFields(t *testing.T) {
 	require.False(t, ok)
 }
 
+func TestDoNotWrite_StringFields(t *testing.T) {
+	now := time.Now()
+	p1, err := metric.New(
+		"foo",
+		make(map[string]string),
+		map[string]interface{}{"value": 1.0, "status": "good"},
+		now,
+		telegraf.Counter)
+	p2, err := metric.New(
+		"bar",
+		make(map[string]string),
+		map[string]interface{}{"status": "needs numeric field"},
+		now,
+		telegraf.Gauge)
+	var metrics = []telegraf.Metric{p1, p2}
+
+	client := &PrometheusClient{
+		ExpirationInterval: internal.Duration{Duration: time.Second * 60},
+		StringAsLabel:      false,
+		fam:                make(map[string]*MetricFamily),
+		now:                time.Now,
+	}
+
+	err = client.Write(metrics)
+	require.NoError(t, err)
+
+	fam, ok := client.fam["foo"]
+	require.True(t, ok)
+	require.Equal(t, 0, fam.LabelSet["status"])
+
+	fam, ok = client.fam["bar"]
+	require.False(t, ok)
+}
+
 func TestExpire(t *testing.T) {
 	client := NewClient()
 

From df80fa6099c83850ed108b50be5ba459baf992df Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Feb 2018 14:08:11 -0800
Subject: [PATCH 0951/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf537eb1..c42e1c5d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - [#3546](https://github.com/influxdata/telegraf/pull/3546): Add http input plugin.
 - [#3781](https://github.com/influxdata/telegraf/pull/3781): Add keep alive support to the TCP mode of statsd.
 - [#3783](https://github.com/influxdata/telegraf/pull/3783): Support deadline in ping plugin.
+- [#3765](https://github.com/influxdata/telegraf/pull/3765): Add option to disable labels in prometheus output for string fields.
 
 ### Bugfixes
 

From 8147d609730c0265be477c79d077e8ea05bc956b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 19 Feb 2018 20:54:02 -0800
Subject: [PATCH 0952/1302] Fix metric buffer limit in internal plugin after
 reload

---
 CHANGELOG.md                      | 1 +
 internal/models/running_output.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c42e1c5d3..f0f2b2027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
 ### Bugfixes
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
+- [#3810](https://github.com/influxdata/telegraf/issues/3810): Fix metric buffer limit in internal plugin after reload.
 
 ## v1.5.3 [unreleased]
 
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 335fb792f..713c28cce 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -87,7 +87,7 @@ func NewRunningOutput(
 			map[string]string{"output": name},
 		),
 	}
-	ro.BufferLimit.Incr(int64(ro.MetricBufferLimit))
+	ro.BufferLimit.Set(int64(ro.MetricBufferLimit))
 	return ro
 }
 

From 18aef35c585a62e04fecb451585a5b2a7e8cb6d1 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake@gnu.space>
Date: Tue, 20 Feb 2018 16:55:56 -0500
Subject: [PATCH 0953/1302] Add shard server stats to the mongodb input plugin
 (#3808)

---
 plugins/inputs/mongodb/README.md            |  4 ++++
 plugins/inputs/mongodb/mongodb_data.go      |  8 +++++++
 plugins/inputs/mongodb/mongodb_data_test.go | 25 +++++++++++++++++++++
 plugins/inputs/mongodb/mongodb_server.go    | 13 ++++++++++-
 plugins/inputs/mongodb/mongostat.go         | 19 ++++++++++++++++
 5 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index f09457821..5ddf4e2b2 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -49,6 +49,10 @@ and create a single measurement containing values e.g.
  * resident_megabytes
  * updates_per_sec
  * vsize_megabytes
+ * total_in_use
+ * total_available
+ * total_created
+ * total_refreshing
  * ttl_deletes_per_sec
  * ttl_passes_per_sec
  * repl_lag
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 36eabc90c..4eab5b185 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -66,6 +66,13 @@ var DefaultClusterStats = map[string]string{
 	"jumbo_chunks": "JumboChunksCount",
 }
 
+var DefaultShardStats = map[string]string{
+	"total_in_use":     "TotalInUse",
+	"total_available":  "TotalAvailable",
+	"total_created":    "TotalCreated",
+	"total_refreshing": "TotalRefreshing",
+}
+
 var MmapStats = map[string]string{
 	"mapped_megabytes":     "Mapped",
 	"non-mapped_megabytes": "NonMapped",
@@ -127,6 +134,7 @@ func (d *MongodbData) AddDefaultStats() {
 		d.addStat(statLine, DefaultReplStats)
 	}
 	d.addStat(statLine, DefaultClusterStats)
+	d.addStat(statLine, DefaultShardStats)
 	if d.StatLine.StorageEngine == "mmapv1" {
 		d.addStat(statLine, MmapStats)
 	} else if d.StatLine.StorageEngine == "wiredTiger" {
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 9082061d3..9a12be6a5 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -99,6 +99,27 @@ func TestAddWiredTigerStats(t *testing.T) {
 	}
 }
 
+func TestAddShardStats(t *testing.T) {
+	d := NewMongodbData(
+		&StatLine{
+			TotalInUse:      0,
+			TotalAvailable:  0,
+			TotalCreated:    0,
+			TotalRefreshing: 0,
+		},
+		tags,
+	)
+
+	var acc testutil.Accumulator
+
+	d.AddDefaultStats()
+	d.flush(&acc)
+
+	for key, _ := range DefaultShardStats {
+		assert.True(t, acc.HasInt64Field("mongodb", key))
+	}
+}
+
 func TestStateTag(t *testing.T) {
 	d := NewMongodbData(
 		&StatLine{
@@ -147,6 +168,10 @@ func TestStateTag(t *testing.T) {
 		"ttl_deletes_per_sec":   int64(0),
 		"ttl_passes_per_sec":    int64(0),
 		"jumbo_chunks":          int64(0),
+		"total_in_use":          int64(0),
+		"total_available":       int64(0),
+		"total_created":         int64(0),
+		"total_refreshing":      int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "mongodb", fields, stateTags)
 }
diff --git a/plugins/inputs/mongodb/mongodb_server.go b/plugins/inputs/mongodb/mongodb_server.go
index 2bab8242b..51eb48a71 100644
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -55,8 +55,18 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		JumboChunksCount: int64(jumbo_chunks),
 	}
 
-	result_db_stats := &DbStats{}
+	resultShards := &ShardStats{}
+	err = s.Session.DB("admin").Run(bson.D{
+		{
+			Name:  "shardConnPoolStats",
+			Value: 1,
+		},
+	}, &resultShards)
+	if err != nil {
+		log.Println("E! Error getting database shard stats (" + err.Error() + ")")
+	}
 
+	result_db_stats := &DbStats{}
 	if gatherDbStats == true {
 		names := []string{}
 		names, err = s.Session.DatabaseNames()
@@ -88,6 +98,7 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		ReplSetStatus: result_repl,
 		ClusterStatus: result_cluster,
 		DbStats:       result_db_stats,
+		ShardStats:    resultShards,
 	}
 
 	defer func() {
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index a2e270bbb..daf5a4504 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -34,6 +34,7 @@ type MongoStatus struct {
 	ReplSetStatus *ReplSetStatus
 	ClusterStatus *ClusterStatus
 	DbStats       *DbStats
+	ShardStats    *ShardStats
 }
 
 type ServerStatus struct {
@@ -116,6 +117,14 @@ type WiredTiger struct {
 	Cache       CacheStats             `bson:"cache"`
 }
 
+// ShardStats stores information from shardConnPoolStats.
+type ShardStats struct {
+	TotalInUse      int64 `bson:"totalInUse"`
+	TotalAvailable  int64 `bson:"totalAvailable"`
+	TotalCreated    int64 `bson:"totalCreated"`
+	TotalRefreshing int64 `bson:"totalRefreshing"`
+}
+
 type ConcurrentTransactions struct {
 	Write ConcurrentTransStats `bson:"write"`
 	Read  ConcurrentTransStats `bson:"read"`
@@ -450,6 +459,9 @@ type StatLine struct {
 
 	// DB stats field
 	DbStatsLines []DbStatLine
+
+	// Shard stats
+	TotalInUse, TotalAvailable, TotalCreated, TotalRefreshing int64
 }
 
 type DbStatLine struct {
@@ -783,5 +795,12 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		returnVal.DbStatsLines = append(returnVal.DbStatsLines, *dbStatLine)
 	}
 
+	// Set shard stats
+	newShardStats := *newMongo.ShardStats
+	returnVal.TotalInUse = newShardStats.TotalInUse
+	returnVal.TotalAvailable = newShardStats.TotalAvailable
+	returnVal.TotalCreated = newShardStats.TotalCreated
+	returnVal.TotalRefreshing = newShardStats.TotalRefreshing
+
 	return returnVal
 }

From f4fa05530a09245f04657caf6a0ca08394d99a35 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 20 Feb 2018 13:56:44 -0800
Subject: [PATCH 0954/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0f2b2027..41ade9da1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - [#3781](https://github.com/influxdata/telegraf/pull/3781): Add keep alive support to the TCP mode of statsd.
 - [#3783](https://github.com/influxdata/telegraf/pull/3783): Support deadline in ping plugin.
 - [#3765](https://github.com/influxdata/telegraf/pull/3765): Add option to disable labels in prometheus output for string fields.
+- [#3808](https://github.com/influxdata/telegraf/pull/3808): Add shard server stats to the mongodb input plugin.
 
 ### Bugfixes
 

From 80d94173159e00cd0f3214a5743cc4e9c9586542 Mon Sep 17 00:00:00 2001
From: Fred Cox <mcfedr@gmail.com>
Date: Wed, 21 Feb 2018 02:06:13 +0200
Subject: [PATCH 0955/1302] Add server option to unbound plugin (#3713)

---
 README.md                              |  2 +-
 plugins/inputs/unbound/README.md       |  4 +++
 plugins/inputs/unbound/unbound.go      | 40 ++++++++++++++++++++++++--
 plugins/inputs/unbound/unbound_test.go |  6 ++--
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 19a5afe7e..0ae1a9316 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,7 @@ configuration options.
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
-* [unbound](./plugins/input/unbound)
+* [unbound](./plugins/inputs/unbound)
 * [varnish](./plugins/inputs/varnish)
 * [zfs](./plugins/inputs/zfs)
 * [zookeeper](./plugins/inputs/zookeeper)
diff --git a/plugins/inputs/unbound/README.md b/plugins/inputs/unbound/README.md
index b3aff8078..b2cf3d799 100644
--- a/plugins/inputs/unbound/README.md
+++ b/plugins/inputs/unbound/README.md
@@ -18,6 +18,10 @@ This plugin gathers stats from [Unbound - a validating, recursive, and caching D
 
    ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep only specific fields
    fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+
+   ## IP of server to connect to, read from unbound conf default, optionally ':port'
+   ## Will lookup IP if given a hostname
+   server = "127.0.0.1:8953"
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
index 94a3323e5..6bed9ea75 100644
--- a/plugins/inputs/unbound/unbound.go
+++ b/plugins/inputs/unbound/unbound.go
@@ -3,7 +3,9 @@ package unbound
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"fmt"
+	"net"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -15,13 +17,14 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error)
+type runner func(cmdName string, Timeout internal.Duration, UseSudo bool, Server string) (*bytes.Buffer, error)
 
 // Unbound is used to store configuration values
 type Unbound struct {
 	Binary  string
 	Timeout internal.Duration
 	UseSudo bool
+	Server  string
 
 	filter filter.Filter
 	run    runner
@@ -42,6 +45,10 @@ var sampleConfig = `
 
   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+  
+  ## IP of server to connect to, read from unbound conf default, optionally ':port'
+  ## Will lookup IP if given a hostname
+  server = "127.0.0.1:8953"
 `
 
 func (s *Unbound) Description() string {
@@ -54,9 +61,35 @@ func (s *Unbound) SampleConfig() string {
 }
 
 // Shell out to unbound_stat and return the output
-func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool) (*bytes.Buffer, error) {
+func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Server string) (*bytes.Buffer, error) {
 	cmdArgs := []string{"stats_noreset"}
 
+	if Server != "" {
+		host, port, err := net.SplitHostPort(Server)
+		if err != nil { // No port was specified
+			host = Server
+			port = ""
+		}
+
+		// Unbound control requires an IP address, and we want to be nice to the user
+		resolver := net.Resolver{}
+		ctx, lookUpCancel := context.WithTimeout(context.Background(), Timeout.Duration)
+		defer lookUpCancel()
+		serverIps, err := resolver.LookupIPAddr(ctx, host)
+		if err != nil {
+			return nil, fmt.Errorf("error looking up ip for server: %s: %s", Server, err)
+		}
+		if len(serverIps) == 0 {
+			return nil, fmt.Errorf("error no ip for server: %s: %s", Server, err)
+		}
+		server := serverIps[0].IP.String()
+		if port != "" {
+			server = server + "@" + port
+		}
+
+		cmdArgs = append(cmdArgs, "-s", server)
+	}
+
 	cmd := exec.Command(cmdName, cmdArgs...)
 
 	if UseSudo {
@@ -86,7 +119,7 @@ func (s *Unbound) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 
-	out, err := s.run(s.Binary, s.Timeout, s.UseSudo)
+	out, err := s.run(s.Binary, s.Timeout, s.UseSudo, s.Server)
 	if err != nil {
 		return fmt.Errorf("error gathering metrics: %s", err)
 	}
@@ -132,6 +165,7 @@ func init() {
 			Binary:  defaultBinary,
 			Timeout: defaultTimeout,
 			UseSudo: false,
+			Server:  "",
 		}
 	})
 }
diff --git a/plugins/inputs/unbound/unbound_test.go b/plugins/inputs/unbound/unbound_test.go
index b8e821089..b1e042307 100644
--- a/plugins/inputs/unbound/unbound_test.go
+++ b/plugins/inputs/unbound/unbound_test.go
@@ -12,8 +12,8 @@ import (
 
 var TestTimeout = internal.Duration{Duration: time.Second}
 
-func UnboundControl(output string, Timeout internal.Duration, useSudo bool) func(string, internal.Duration, bool) (*bytes.Buffer, error) {
-	return func(string, internal.Duration, bool) (*bytes.Buffer, error) {
+func UnboundControl(output string, Timeout internal.Duration, useSudo bool, Server string) func(string, internal.Duration, bool, string) (*bytes.Buffer, error) {
+	return func(string, internal.Duration, bool, string) (*bytes.Buffer, error) {
 		return bytes.NewBuffer([]byte(output)), nil
 	}
 }
@@ -21,7 +21,7 @@ func UnboundControl(output string, Timeout internal.Duration, useSudo bool) func
 func TestParseFullOutput(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Unbound{
-		run: UnboundControl(fullOutput, TestTimeout, true),
+		run: UnboundControl(fullOutput, TestTimeout, true, ""),
 	}
 	err := v.Gather(acc)
 

From e988c830684eff9a8eeb0f57b13ac07a837685c1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 20 Feb 2018 16:07:10 -0800
Subject: [PATCH 0956/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ade9da1..210977aa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
 - [#3783](https://github.com/influxdata/telegraf/pull/3783): Support deadline in ping plugin.
 - [#3765](https://github.com/influxdata/telegraf/pull/3765): Add option to disable labels in prometheus output for string fields.
 - [#3808](https://github.com/influxdata/telegraf/pull/3808): Add shard server stats to the mongodb input plugin.
+- [#3713](https://github.com/influxdata/telegraf/pull/3713): Add server option to unbound plugin.
 
 ### Bugfixes
 

From b355536b207b7675fbf0a9cf8d7aff654178f0e8 Mon Sep 17 00:00:00 2001
From: Pranay Kanwar <pranay.kanwar@gmail.com>
Date: Wed, 21 Feb 2018 07:02:18 +0530
Subject: [PATCH 0957/1302] Convert boolean metric values to float in datadog
 output (#3804)

---
 plugins/outputs/datadog/datadog.go      |  9 +++++++--
 plugins/outputs/datadog/datadog_test.go | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/plugins/outputs/datadog/datadog.go b/plugins/outputs/datadog/datadog.go
index 65b7ab751..92d31e128 100644
--- a/plugins/outputs/datadog/datadog.go
+++ b/plugins/outputs/datadog/datadog.go
@@ -97,7 +97,7 @@ func (d *Datadog) Write(metrics []telegraf.Metric) error {
 				metricCounter++
 			}
 		} else {
-			log.Printf("I! unable to build Metric for %s, skipping\n", m.Name())
+			log.Printf("I! unable to build Metric for %s due to error '%v', skipping\n", m.Name(), err)
 		}
 	}
 
@@ -150,7 +150,7 @@ func buildMetrics(m telegraf.Metric) (map[string]Point, error) {
 		}
 		var p Point
 		if err := p.setValue(v); err != nil {
-			return ms, fmt.Errorf("unable to extract value from Fields, %s", err.Error())
+			return ms, fmt.Errorf("unable to extract value from Fields %v error %v", k, err.Error())
 		}
 		p[0] = float64(m.Time().Unix())
 		ms[k] = p
@@ -189,6 +189,11 @@ func (p *Point) setValue(v interface{}) error {
 		p[1] = float64(d)
 	case float64:
 		p[1] = float64(d)
+	case bool:
+		p[1] = float64(0)
+		if d {
+			p[1] = float64(1)
+		}
 	default:
 		return fmt.Errorf("undeterminable type")
 	}
diff --git a/plugins/outputs/datadog/datadog_test.go b/plugins/outputs/datadog/datadog_test.go
index 2d3095be1..6a97bad5f 100644
--- a/plugins/outputs/datadog/datadog_test.go
+++ b/plugins/outputs/datadog/datadog_test.go
@@ -152,6 +152,22 @@ func TestBuildPoint(t *testing.T) {
 			},
 			nil,
 		},
+		{
+			testutil.TestMetric(bool(true), "test7"),
+			Point{
+				float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
+				1.0,
+			},
+			nil,
+		},
+		{
+			testutil.TestMetric(bool(false), "test8"),
+			Point{
+				float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
+				0.0,
+			},
+			nil,
+		},
 	}
 	for _, tt := range tagtests {
 		pt, err := buildMetrics(tt.ptIn)

From fcd6d4eb09472c92d6468a64ab681f445366cf64 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 20 Feb 2018 17:33:25 -0800
Subject: [PATCH 0958/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210977aa1..3a4e2d1b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - [#3765](https://github.com/influxdata/telegraf/pull/3765): Add option to disable labels in prometheus output for string fields.
 - [#3808](https://github.com/influxdata/telegraf/pull/3808): Add shard server stats to the mongodb input plugin.
 - [#3713](https://github.com/influxdata/telegraf/pull/3713): Add server option to unbound plugin.
+- [#3804](https://github.com/influxdata/telegraf/pull/3804): Convert boolean metric values to float in datadog output.
 
 ### Bugfixes
 

From 8c932abff64c7a905e58ab708502ebf54c52b6bd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Sun, 25 Feb 2018 01:04:04 -0800
Subject: [PATCH 0959/1302] Disable keepalive in mqtt output. (#3779)

This functionality currently has race conditions that can result in the
output deadlocking.
---
 plugins/outputs/mqtt/mqtt.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 05978aa60..3e2a36e9e 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -162,6 +162,7 @@ func (m *MQTT) publish(topic string, body []byte) error {
 
 func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	opts := paho.NewClientOptions()
+	opts.KeepAlive = 0 * time.Second
 
 	if m.Timeout.Duration < time.Second {
 		m.Timeout.Duration = 5 * time.Second

From 5928219454181ac24f3dc410f55798402e9d4eb8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 25 Feb 2018 01:06:44 -0800
Subject: [PATCH 0960/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a4e2d1b1..3bee898be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@
 - [#3729](https://github.com/influxdata/telegraf/issues/3729): Set path to / if HOST_MOUNT_PREFIX matches full path.
 - [#3739](https://github.com/influxdata/telegraf/issues/3739): Remove userinfo from url tag in prometheus input.
 - [#3778](https://github.com/influxdata/telegraf/issues/3778): Fix ping plugin not reporting zero durations.
+- [#3697](https://github.com/influxdata/telegraf/issues/3697): Disable keepalive in mqtt output to prevent deadlock.
 
 ## v1.5.2 [2018-01-30]
 

From dc96c34e2c17ebe2a41c352a5eb2c4d7ca63d779 Mon Sep 17 00:00:00 2001
From: Michael Boudreau <mkboudreau@yahoo.com>
Date: Mon, 5 Mar 2018 11:41:10 -0800
Subject: [PATCH 0961/1302] Add Solr 3 compatibility (#3799)

---
 plugins/inputs/solr/README.md         |   2 +
 plugins/inputs/solr/solr.go           | 105 ++--
 plugins/inputs/solr/solr_test.go      |  83 ++-
 plugins/inputs/solr/testdata3_test.go | 789 ++++++++++++++++++++++++++
 4 files changed, 930 insertions(+), 49 deletions(-)
 create mode 100644 plugins/inputs/solr/testdata3_test.go

diff --git a/plugins/inputs/solr/README.md b/plugins/inputs/solr/README.md
index 214ed4f7e..3162cfe04 100644
--- a/plugins/inputs/solr/README.md
+++ b/plugins/inputs/solr/README.md
@@ -5,6 +5,8 @@ The [solr](http://lucene.apache.org/solr/) plugin collects stats via the
 
 More about [performance statistics](https://cwiki.apache.org/confluence/display/solr/Performance+Statistics+Reference)
 
+Tested from 3.5 to 6.*
+
 ### Configuration:
 
 ```
diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go
index 6421db80b..36c3193ff 100644
--- a/plugins/inputs/solr/solr.go
+++ b/plugins/inputs/solr/solr.go
@@ -3,6 +3,7 @@ package solr
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/http"
 	"strconv"
 	"strings"
@@ -78,22 +79,7 @@ type Core struct {
 // QueryHandler is an exported type that
 // contains query handler metrics
 type QueryHandler struct {
-	Stats struct {
-		One5minRateReqsPerSecond float64 `json:"15minRateReqsPerSecond"`
-		FiveMinRateReqsPerSecond float64 `json:"5minRateReqsPerSecond"`
-		Seven5thPcRequestTime    float64 `json:"75thPcRequestTime"`
-		Nine5thPcRequestTime     float64 `json:"95thPcRequestTime"`
-		Nine99thPcRequestTime    float64 `json:"999thPcRequestTime"`
-		Nine9thPcRequestTime     float64 `json:"99thPcRequestTime"`
-		AvgRequestsPerSecond     float64 `json:"avgRequestsPerSecond"`
-		AvgTimePerRequest        float64 `json:"avgTimePerRequest"`
-		Errors                   int64   `json:"errors"`
-		HandlerStart             int64   `json:"handlerStart"`
-		MedianRequestTime        float64 `json:"medianRequestTime"`
-		Requests                 int64   `json:"requests"`
-		Timeouts                 int64   `json:"timeouts"`
-		TotalTime                float64 `json:"totalTime"`
-	} `json:"stats"`
+	Stats interface{} `json:"stats"`
 }
 
 // UpdateHandler is an exported type that
@@ -286,22 +272,22 @@ func addQueryHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansDa
 	}
 
 	for name, metrics := range queryMetrics {
-		coreFields := map[string]interface{}{
-			"15min_rate_reqs_per_second": metrics.Stats.One5minRateReqsPerSecond,
-			"5min_rate_reqs_per_second":  metrics.Stats.FiveMinRateReqsPerSecond,
-			"75th_pc_request_time":       metrics.Stats.Seven5thPcRequestTime,
-			"95th_pc_request_time":       metrics.Stats.Nine5thPcRequestTime,
-			"999th_pc_request_time":      metrics.Stats.Nine99thPcRequestTime,
-			"99th_pc_request_time":       metrics.Stats.Nine9thPcRequestTime,
-			"avg_requests_per_second":    metrics.Stats.AvgRequestsPerSecond,
-			"avg_time_per_request":       metrics.Stats.AvgTimePerRequest,
-			"errors":                     metrics.Stats.Errors,
-			"handler_start":              metrics.Stats.HandlerStart,
-			"median_request_time":        metrics.Stats.MedianRequestTime,
-			"requests":                   metrics.Stats.Requests,
-			"timeouts":                   metrics.Stats.Timeouts,
-			"total_time":                 metrics.Stats.TotalTime,
+		var coreFields map[string]interface{}
+
+		if metrics.Stats == nil {
+			continue
 		}
+
+		switch v := metrics.Stats.(type) {
+		case []interface{}:
+			m := convertArrayToMap(v)
+			coreFields = convertQueryHandlerMap(m)
+		case map[string]interface{}:
+			coreFields = convertQueryHandlerMap(v)
+		default:
+			continue
+		}
+
 		acc.AddFields(
 			"solr_queryhandler",
 			coreFields,
@@ -310,10 +296,44 @@ func addQueryHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansDa
 				"handler": name},
 			time,
 		)
+
 	}
 	return nil
 }
 
+func convertArrayToMap(values []interface{}) map[string]interface{} {
+	var key string
+	result := make(map[string]interface{})
+	for i, item := range values {
+		if i%2 == 0 {
+			key = fmt.Sprintf("%v", item)
+		} else {
+			result[key] = item
+		}
+	}
+
+	return result
+}
+
+func convertQueryHandlerMap(value map[string]interface{}) map[string]interface{} {
+	return map[string]interface{}{
+		"15min_rate_reqs_per_second": getFloat(value["15minRateReqsPerSecond"]),
+		"5min_rate_reqs_per_second":  getFloat(value["5minRateReqsPerSecond"]),
+		"75th_pc_request_time":       getFloat(value["75thPcRequestTime"]),
+		"95th_pc_request_time":       getFloat(value["95thPcRequestTime"]),
+		"99th_pc_request_time":       getFloat(value["99thPcRequestTime"]),
+		"999th_pc_request_time":      getFloat(value["999thPcRequestTime"]),
+		"avg_requests_per_second":    getFloat(value["avgRequestsPerSecond"]),
+		"avg_time_per_request":       getFloat(value["avgTimePerRequest"]),
+		"errors":                     getInt(value["errors"]),
+		"handler_start":              getInt(value["handlerStart"]),
+		"median_request_time":        getFloat(value["medianRequestTime"]),
+		"requests":                   getInt(value["requests"]),
+		"timeouts":                   getInt(value["timeouts"]),
+		"total_time":                 getFloat(value["totalTime"]),
+	}
+}
+
 // Add update metrics section to accumulator
 func addUpdateHandlerMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
 	var updateMetrics map[string]UpdateHandler
@@ -366,13 +386,34 @@ func getFloat(unk interface{}) float64 {
 	case float64:
 		return i
 	case string:
-		f, _ := strconv.ParseFloat(i, 64)
+		f, err := strconv.ParseFloat(i, 64)
+		if err != nil || math.IsNaN(f) {
+			return float64(0)
+		}
 		return f
 	default:
 		return float64(0)
 	}
 }
 
+// Get int64 from interface
+func getInt(unk interface{}) int64 {
+	switch i := unk.(type) {
+	case int64:
+		return i
+	case float64:
+		return int64(i)
+	case string:
+		v, err := strconv.ParseInt(i, 10, 64)
+		if err != nil {
+			return int64(0)
+		}
+		return v
+	default:
+		return int64(0)
+	}
+}
+
 // Add cache metrics section to accumulator
 func addCacheMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBeansData, time time.Time) error {
 	if len(mBeansData.SolrMbeans) < 8 {
diff --git a/plugins/inputs/solr/solr_test.go b/plugins/inputs/solr/solr_test.go
index cdaad57e2..b79f89602 100644
--- a/plugins/inputs/solr/solr_test.go
+++ b/plugins/inputs/solr/solr_test.go
@@ -43,24 +43,37 @@ func TestGatherStats(t *testing.T) {
 		map[string]string{"core": "main", "handler": "filterCache"})
 }
 
-func createMockServer() *httptest.Server {
-	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
-			w.WriteHeader(http.StatusOK)
-			fmt.Fprintln(w, statusResponse)
-		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
-			w.WriteHeader(http.StatusOK)
-			fmt.Fprintln(w, mBeansMainResponse)
-		} else if strings.Contains(r.URL.Path, "solr/core1/admin") {
-			w.WriteHeader(http.StatusOK)
-			fmt.Fprintln(w, mBeansCore1Response)
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-			fmt.Fprintln(w, "nope")
-		}
-	}))
-}
+func TestSolr3GatherStats(t *testing.T) {
+	ts := createMockSolr3Server()
+	solr := NewSolr()
+	solr.Servers = []string{ts.URL}
+	var acc testutil.Accumulator
+	require.NoError(t, solr.Gather(&acc))
 
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminMainCoreStatusExpected,
+		map[string]string{"core": "main"})
+
+	acc.AssertContainsTaggedFields(t, "solr_admin",
+		solrAdminCore1StatusExpected,
+		map[string]string{"core": "core1"})
+
+	acc.AssertContainsTaggedFields(t, "solr_core",
+		solr3CoreExpected,
+		map[string]string{"core": "main", "handler": "searcher"})
+
+	acc.AssertContainsTaggedFields(t, "solr_queryhandler",
+		solr3QueryHandlerExpected,
+		map[string]string{"core": "main", "handler": "org.apache.solr.handler.component.SearchHandler"})
+
+	acc.AssertContainsTaggedFields(t, "solr_updatehandler",
+		solr3UpdateHandlerExpected,
+		map[string]string{"core": "main", "handler": "updateHandler"})
+
+	acc.AssertContainsTaggedFields(t, "solr_cache",
+		solr3CacheExpected,
+		map[string]string{"core": "main", "handler": "filterCache"})
+}
 func TestNoCoreDataHandling(t *testing.T) {
 	ts := createMockNoCoreDataServer()
 	solr := NewSolr()
@@ -83,6 +96,24 @@ func TestNoCoreDataHandling(t *testing.T) {
 
 }
 
+func createMockServer() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansMainResponse)
+		} else if strings.Contains(r.URL.Path, "solr/core1/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansCore1Response)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}
+
 func createMockNoCoreDataServer() *httptest.Server {
 	var nodata string
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -101,3 +132,21 @@ func createMockNoCoreDataServer() *httptest.Server {
 		}
 	}))
 }
+
+func createMockSolr3Server() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansSolr3MainResponse)
+		} else if strings.Contains(r.URL.Path, "solr/core1/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansSolr3MainResponse)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}
diff --git a/plugins/inputs/solr/testdata3_test.go b/plugins/inputs/solr/testdata3_test.go
new file mode 100644
index 000000000..cc5a4960d
--- /dev/null
+++ b/plugins/inputs/solr/testdata3_test.go
@@ -0,0 +1,789 @@
+package solr
+
+const mBeansSolr3MainResponse = `{
+  "solr-mbeans": [
+    "CORE",
+    {
+      "searcher": {
+        "class": "org.apache.solr.search.SolrIndexSearcher",
+        "version": "1.0",
+        "description": "index searcher",
+        "srcId": "$Id: SolrIndexSearcher.java 1201291 2011-11-12 18:02:03Z simonw $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "docs": null,
+        "stats": {
+          "searcherName": "Searcher@4eea69e8 main",
+          "caching": true,
+          "numDocs": 117166,
+          "maxDoc": 117305,
+          "reader": "SolrIndexReader{this=2ee29b0,r=ReadOnlyDirectoryReader@2ee29b0,refCnt=1,segments=5}",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/usr/solrData/search/index lockFactory=org.apache.lucene.store.NativeFSLockFactory@178671d8",
+          "indexVersion": 1491861981523,
+          "openedAt": "2018-01-17T20:14:54.677Z",
+          "registeredAt": "2018-01-17T20:14:54.679Z",
+          "warmupTime": 1
+        }
+      },
+      "core": {
+        "class": "search",
+        "version": "1.0",
+        "description": "SolrCore",
+        "srcId": "$Id: SolrCore.java 1190108 2011-10-28 01:13:25Z yonik $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/SolrCore.java $",
+        "docs": null,
+        "stats": {
+          "coreName": "search",
+          "startTime": "2018-01-16T06:15:53.152Z",
+          "refCount": 2,
+          "aliases": [
+            "search"
+          ]
+        }
+      },
+      "Searcher@4eea69e8 main": {
+        "class": "org.apache.solr.search.SolrIndexSearcher",
+        "version": "1.0",
+        "description": "index searcher",
+        "srcId": "$Id: SolrIndexSearcher.java 1201291 2011-11-12 18:02:03Z simonw $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java $",
+        "docs": null,
+        "stats": {
+          "searcherName": "Searcher@4eea69e8 main",
+          "caching": true,
+          "numDocs": 117166,
+          "maxDoc": 117305,
+          "reader": "SolrIndexReader{this=2ee29b0,r=ReadOnlyDirectoryReader@2ee29b0,refCnt=1,segments=5}",
+          "readerDir": "org.apache.lucene.store.MMapDirectory:org.apache.lucene.store.MMapDirectory@/usr/solrData/search/index lockFactory=org.apache.lucene.store.NativeFSLockFactory@178671d8",
+          "indexVersion": 1491861981523,
+          "openedAt": "2018-01-17T20:14:54.677Z",
+          "registeredAt": "2018-01-17T20:14:54.679Z",
+          "warmupTime": 1
+        }
+      }
+    },
+    "QUERYHANDLER",
+    {
+      "/admin/system": {
+        "class": "org.apache.solr.handler.admin.SystemInfoHandler",
+        "version": "$Revision: 1067172 $",
+        "description": "Get System Info",
+        "srcId": "$Id: SystemInfoHandler.java 1067172 2011-02-04 12:50:14Z uschindler $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/plugins": {
+        "class": "org.apache.solr.handler.admin.PluginInfoHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Registry",
+        "srcId": "$Id: PluginInfoHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/file": {
+        "class": "org.apache.solr.handler.admin.ShowFileRequestHandler",
+        "version": "$Revision: 1146806 $",
+        "description": "Admin Get File -- view config files directly",
+        "srcId": "$Id: ShowFileRequestHandler.java 1146806 2011-07-14 17:01:37Z erick $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/update/javabin": {
+        "class": "org.apache.solr.handler.BinaryUpdateRequestHandler",
+        "version": "$Revision: 1165749 $",
+        "description": "Add/Update multiple documents with javabin format",
+        "srcId": "$Id: BinaryUpdateRequestHandler.java 1165749 2011-09-06 16:20:07Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353158,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/luke": {
+        "class": "org.apache.solr.handler.admin.LukeRequestHandler",
+        "version": "$Revision: 1201265 $",
+        "description": "Lucene Index Browser.  Inspired and modeled after Luke: http://www.getopt.org/luke/",
+        "srcId": "$Id: LukeRequestHandler.java 1201265 2011-11-12 14:09:28Z mikemccand $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java $",
+        "docs": [
+          "java.net.URL:http://wiki.apache.org/solr/LukeRequestHandler"
+        ],
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/dataimport": {
+        "class": "org.apache.solr.handler.dataimport.DataImportHandler",
+        "version": "1.0",
+        "description": "Manage data import from databases to Solr",
+        "srcId": "$Id: DataImportHandler.java 1171306 2011-09-15 22:43:33Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java $",
+        "docs": null,
+        "stats": [
+          "Status",
+          "IDLE",
+          "Documents Processed",
+          "java.util.concurrent.atomic.AtomicLong:1",
+          "Requests made to DataSource",
+          "java.util.concurrent.atomic.AtomicLong:2",
+          "Rows Fetched",
+          "java.util.concurrent.atomic.AtomicLong:2",
+          "Documents Deleted",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Documents Skipped",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Total Documents Processed",
+          "java.util.concurrent.atomic.AtomicLong:351705",
+          "Total Requests made to DataSource",
+          "java.util.concurrent.atomic.AtomicLong:1438",
+          "Total Rows Fetched",
+          "java.util.concurrent.atomic.AtomicLong:876393",
+          "Total Documents Deleted",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Total Documents Skipped",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "handlerStart",
+          1516083353155,
+          "requests",
+          2442,
+          "errors",
+          0,
+          "timeouts",
+          0,
+          "totalTime",
+          1748,
+          "avgTimePerRequest",
+          0.7158067,
+          "avgRequestsPerSecond",
+          0.017792022
+        ]
+      },
+      "/update": {
+        "class": "org.apache.solr.handler.XmlUpdateRequestHandler",
+        "version": "$Revision: 1165749 $",
+        "description": "Add documents with XML",
+        "srcId": "$Id: XmlUpdateRequestHandler.java 1165749 2011-09-06 16:20:07Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353157,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/terms": {
+        "class": "Lazy[solr.SearchHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.SearchHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "org.apache.solr.handler.XmlUpdateRequestHandler": {
+        "class": "org.apache.solr.handler.XmlUpdateRequestHandler",
+        "version": "$Revision: 1165749 $",
+        "description": "Add documents with XML",
+        "srcId": "$Id: XmlUpdateRequestHandler.java 1165749 2011-09-06 16:20:07Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353157,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "org.apache.solr.handler.PingRequestHandler": {
+        "class": "org.apache.solr.handler.PingRequestHandler",
+        "version": "$Revision: 1142180 $",
+        "description": "Reports application health to a load-balancer",
+        "srcId": "$Id: PingRequestHandler.java 1142180 2011-07-02 09:04:29Z uschindler $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353163,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/threads": {
+        "class": "org.apache.solr.handler.admin.ThreadDumpHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Thread Dump",
+        "srcId": "$Id: ThreadDumpHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "org.apache.solr.handler.BinaryUpdateRequestHandler": {
+        "class": "org.apache.solr.handler.BinaryUpdateRequestHandler",
+        "version": "$Revision: 1165749 $",
+        "description": "Add/Update multiple documents with javabin format",
+        "srcId": "$Id: BinaryUpdateRequestHandler.java 1165749 2011-09-06 16:20:07Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353158,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "org.apache.solr.handler.dataimport.DataImportHandler": {
+        "class": "org.apache.solr.handler.dataimport.DataImportHandler",
+        "version": "1.0",
+        "description": "Manage data import from databases to Solr",
+        "srcId": "$Id: DataImportHandler.java 1171306 2011-09-15 22:43:33Z janhoy $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java $",
+        "docs": null,
+        "stats": [
+          "Status",
+          "IDLE",
+          "Documents Processed",
+          "java.util.concurrent.atomic.AtomicLong:1",
+          "Requests made to DataSource",
+          "java.util.concurrent.atomic.AtomicLong:2",
+          "Rows Fetched",
+          "java.util.concurrent.atomic.AtomicLong:2",
+          "Documents Deleted",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Documents Skipped",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Total Documents Processed",
+          "java.util.concurrent.atomic.AtomicLong:351705",
+          "Total Requests made to DataSource",
+          "java.util.concurrent.atomic.AtomicLong:1438",
+          "Total Rows Fetched",
+          "java.util.concurrent.atomic.AtomicLong:876393",
+          "Total Documents Deleted",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "Total Documents Skipped",
+          "java.util.concurrent.atomic.AtomicLong:0",
+          "handlerStart",
+          1516083353155,
+          "requests",
+          2442,
+          "errors",
+          0,
+          "timeouts",
+          0,
+          "totalTime",
+          1748,
+          "avgTimePerRequest",
+          0.7158067,
+          "avgRequestsPerSecond",
+          0.017792022
+        ]
+      },
+      "/analysis/field": {
+        "class": "Lazy[solr.FieldAnalysisRequestHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.FieldAnalysisRequestHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "/browse": {
+        "class": "org.apache.solr.handler.component.SearchHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Search using components: org.apache.solr.handler.component.QueryComponent,org.apache.solr.handler.component.FacetComponent,org.apache.solr.handler.component.MoreLikeThisComponent,org.apache.solr.handler.component.HighlightComponent,org.apache.solr.handler.component.StatsComponent,org.apache.solr.handler.component.SpellCheckComponent,org.apache.solr.handler.component.DebugComponent,",
+        "srcId": "$Id: SearchHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353156,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/ping": {
+        "class": "org.apache.solr.handler.PingRequestHandler",
+        "version": "$Revision: 1142180 $",
+        "description": "Reports application health to a load-balancer",
+        "srcId": "$Id: PingRequestHandler.java 1142180 2011-07-02 09:04:29Z uschindler $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353163,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/admin/mbeans": {
+        "class": "org.apache.solr.handler.admin.SolrInfoMBeanHandler",
+        "version": "$Revision: 1065312 $",
+        "description": "Get Info (and statistics) about all registered SolrInfoMBeans",
+        "srcId": "$Id: SolrInfoMBeanHandler.java 1065312 2011-01-30 16:08:25Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 1078,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 547,
+          "avgTimePerRequest": 0.50742114,
+          "avgRequestsPerSecond": 0.00785414
+        }
+      },
+      "/analysis/document": {
+        "class": "Lazy[solr.DocumentAnalysisRequestHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.DocumentAnalysisRequestHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "search": {
+        "class": "org.apache.solr.handler.component.SearchHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Search using components: org.apache.solr.handler.component.QueryComponent,org.apache.solr.handler.component.FacetComponent,org.apache.solr.handler.component.MoreLikeThisComponent,org.apache.solr.handler.component.HighlightComponent,org.apache.solr.handler.component.StatsComponent,org.apache.solr.handler.component.DebugComponent,",
+        "srcId": "$Id: SearchHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353156,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/update/csv": {
+        "class": "Lazy[solr.CSVRequestHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.CSVRequestHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "/update/json": {
+        "class": "Lazy[solr.JsonUpdateRequestHandler]",
+        "version": "$Revision: 1086822 $ :: $Revision: 1102081 $",
+        "description": "Add documents with JSON",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $ :: $Id: JsonUpdateRequestHandler.java 1102081 2011-05-11 20:37:04Z yonik $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $\n$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516103486630,
+          "requests": 2530,
+          "errors": 26,
+          "timeouts": 0,
+          "totalTime": 132438,
+          "avgTimePerRequest": 52.347034,
+          "avgRequestsPerSecond": 0.02160195
+        }
+      },
+      "/admin/": {
+        "class": "org.apache.solr.handler.admin.AdminHandlers",
+        "version": "$Revision: 953887 $",
+        "description": "Register Standard Admin Handlers",
+        "srcId": "$Id: AdminHandlers.java 953887 2010-06-11 21:53:43Z hossman $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "docs": null,
+        "stats": null
+      },
+      "standard": {
+        "class": "org.apache.solr.handler.component.SearchHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Search using components: org.apache.solr.handler.component.QueryComponent,org.apache.solr.handler.component.FacetComponent,org.apache.solr.handler.component.MoreLikeThisComponent,org.apache.solr.handler.component.HighlightComponent,org.apache.solr.handler.component.StatsComponent,org.apache.solr.handler.component.DebugComponent,",
+        "srcId": "$Id: SearchHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353155,
+          "requests": 11480,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 318753,
+          "avgTimePerRequest": 27.765942,
+          "avgRequestsPerSecond": 0.08364145
+        }
+      },
+      "org.apache.solr.handler.admin.AdminHandlers": {
+        "class": "org.apache.solr.handler.admin.AdminHandlers",
+        "version": "$Revision: 953887 $",
+        "description": "Register Standard Admin Handlers",
+        "srcId": "$Id: AdminHandlers.java 953887 2010-06-11 21:53:43Z hossman $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java $",
+        "docs": null,
+        "stats": null
+      },
+      "tvrh": {
+        "class": "Lazy[solr.SearchHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.SearchHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "org.apache.solr.handler.DumpRequestHandler": {
+        "class": "org.apache.solr.handler.DumpRequestHandler",
+        "version": "$Revision: 1067172 $",
+        "description": "Dump handler (debug)",
+        "srcId": "$Id: DumpRequestHandler.java 1067172 2011-02-04 12:50:14Z uschindler $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353163,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/update/extract": {
+        "class": "Lazy[solr.extraction.ExtractingRequestHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.extraction.ExtractingRequestHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "/admin/properties": {
+        "class": "org.apache.solr.handler.admin.PropertiesRequestHandler",
+        "version": "$Revision: 898152 $",
+        "description": "Get System Properties",
+        "srcId": "$Id: PropertiesRequestHandler.java 898152 2010-01-12 02:19:56Z ryan $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353227,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "org.apache.solr.handler.component.SearchHandler": {
+        "class": "org.apache.solr.handler.component.SearchHandler",
+        "version": "$Revision: 1052938 $",
+        "description": "Search using components: org.apache.solr.handler.component.QueryComponent,org.apache.solr.handler.component.FacetComponent,org.apache.solr.handler.component.MoreLikeThisComponent,org.apache.solr.handler.component.HighlightComponent,org.apache.solr.handler.component.StatsComponent,org.apache.solr.handler.component.SpellCheckComponent,org.apache.solr.handler.component.DebugComponent,",
+        "srcId": "$Id: SearchHandler.java 1052938 2010-12-26 20:21:48Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353156,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      },
+      "/spell": {
+        "class": "Lazy[solr.SearchHandler]",
+        "version": "$Revision: 1086822 $",
+        "description": "Lazy[solr.SearchHandler]",
+        "srcId": "$Id: RequestHandlers.java 1086822 2011-03-30 02:23:07Z koji $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/core/RequestHandlers.java $",
+        "docs": null,
+        "stats": {
+          "note": "not initialized yet"
+        }
+      },
+      "/debug/dump": {
+        "class": "org.apache.solr.handler.DumpRequestHandler",
+        "version": "$Revision: 1067172 $",
+        "description": "Dump handler (debug)",
+        "srcId": "$Id: DumpRequestHandler.java 1067172 2011-02-04 12:50:14Z uschindler $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java $",
+        "docs": null,
+        "stats": {
+          "handlerStart": 1516083353163,
+          "requests": 0,
+          "errors": 0,
+          "timeouts": 0,
+          "totalTime": 0,
+          "avgTimePerRequest": "NaN",
+          "avgRequestsPerSecond": 0
+        }
+      }
+    },
+    "UPDATEHANDLER",
+    {
+      "updateHandler": {
+        "class": "org.apache.solr.update.DirectUpdateHandler2",
+        "version": "1.0",
+        "description": "Update handler that efficiently directly updates the on-disk main lucene index",
+        "srcId": "$Id: DirectUpdateHandler2.java 1203770 2011-11-18 17:55:52Z mikemccand $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java $",
+        "docs": null,
+        "stats": {
+          "commits": 3220,
+          "autocommits": 0,
+          "optimizes": 3,
+          "rollbacks": 0,
+          "expungeDeletes": 0,
+          "docsPending": 0,
+          "adds": 0,
+          "deletesById": 0,
+          "deletesByQuery": 0,
+          "errors": 0,
+          "cumulative_adds": 354209,
+          "cumulative_deletesById": 0,
+          "cumulative_deletesByQuery": 3,
+          "cumulative_errors": 0
+        }
+      }
+    },
+    "CACHE",
+    {
+      "queryResultCache": {
+        "class": "org.apache.solr.search.LRUCache",
+        "version": "1.0",
+        "description": "LRU Cache(maxSize=512, initialSize=512)",
+        "srcId": "$Id: LRUCache.java 1065312 2011-01-30 16:08:25Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/LRUCache.java $",
+        "docs": null,
+        "stats": {
+          "lookups": 4,
+          "hits": 2,
+          "hitratio": "0.50",
+          "inserts": 2,
+          "evictions": 0,
+          "size": 2,
+          "warmupTime": 0,
+          "cumulative_lookups": 10630,
+          "cumulative_hits": 5509,
+          "cumulative_hitratio": "0.51",
+          "cumulative_inserts": 5626,
+          "cumulative_evictions": 0
+        }
+      },
+      "fieldCache": {
+        "class": "org.apache.solr.search.SolrFieldCacheMBean",
+        "version": "1.0",
+        "description": "Provides introspection of the Lucene FieldCache, this is **NOT** a cache that is managed by Solr.",
+        "srcId": "$Id: SolrFieldCacheMBean.java 984594 2010-08-11 21:42:04Z yonik $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java $",
+        "docs": null,
+        "stats": {
+          "entries_count": 174,
+          "entry#0": "'MMapIndexInput(path=\"/usr/solrData/search/index/_9eir.frq\")'=>'latlng_0_coordinate',double,org.apache.lucene.search.FieldCache.NUMERIC_UTILS_DOUBLE_PARSER=>[D#661647869",
+	   "insanity_count": 1,
+           "insanity#0": "SUBREADER: Found caches for descendants of ReadOnlyDirectoryReader(segments_1wo _3kl(3.5):C133115/12 _3kw(3.5):C17/2 _3kx(3.5):C6 _3ky(3.5):C1 _3kz(3.5):C2 _3l0(3.5):C2 _3l1(3.5):C1 _3l2(3.5):C1 _3l3(3.5):C1 _3l4(3.5):C1)+owner\n\t'ReadOnlyDirectoryReader(segments_1wo _3kl(3.5):C133115/12 _3kw(3.5):C17/2 _3kx(3.5):C6 _3ky(3.5):C1 _3kz(3.5):C2 _3l0(3.5):C2 _3l1(3.5):C1 _3l2(3.5):C1 _3l3(3.5):C1 _3l4(3.5):C1)'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#927712538\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3kx.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#969886745\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3kz.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#495952608\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3ky.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1581258843\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3l1.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#359550090\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3kl.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1748227582\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3l4.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1084424163\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3l3.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1116912780\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3l0.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1187916045\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3l2.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#62119827\n\t'MMapIndexInput(path=\"/usr/solrData/search/index/_3kw.frq\")'=>'owner',class org.apache.lucene.search.FieldCache$StringIndex,null=>org.apache.lucene.search.FieldCache$StringIndex#1756606907\n"
+        }
+      },
+      "documentCache": {
+        "class": "org.apache.solr.search.LRUCache",
+        "version": "1.0",
+        "description": "LRU Cache(maxSize=512, initialSize=512)",
+        "srcId": "$Id: LRUCache.java 1065312 2011-01-30 16:08:25Z rmuir $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/LRUCache.java $",
+        "docs": null,
+        "stats": {
+          "lookups": 0,
+          "hits": 0,
+          "hitratio": "0.00",
+          "inserts": 0,
+          "evictions": 0,
+          "size": 0,
+          "warmupTime": 0,
+          "cumulative_lookups": 180435,
+          "cumulative_hits": 22584,
+          "cumulative_hitratio": "0.12",
+          "cumulative_inserts": 157851,
+          "cumulative_evictions": 40344
+        }
+      },
+      "fieldValueCache": {
+        "class": "org.apache.solr.search.FastLRUCache",
+        "version": "1.0",
+        "description": "Concurrent LRU Cache(maxSize=10000, initialSize=10, minSize=9000, acceptableSize=9500, cleanupThread=false)",
+        "srcId": "$Id: FastLRUCache.java 1170772 2011-09-14 19:09:56Z sarowe $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "docs": null,
+        "stats": {
+          "lookups": 5,
+          "hits": 3,
+          "hitratio": "0.60",
+          "inserts": 1,
+          "evictions": 0,
+          "size": 1,
+          "warmupTime": 0,
+          "cumulative_lookups": 8529,
+          "cumulative_hits": 5432,
+          "cumulative_hitratio": "0.63",
+          "cumulative_inserts": 1437,
+          "cumulative_evictions": 0,
+          "item_parentCompanyId": "{field=parentCompanyId,memSize=785156,tindexSize=13056,time=136,phase1=135,nTerms=75696,bigTerms=0,termInstances=117166,uses=4}"
+        }
+      },
+      "filterCache": {
+        "class": "org.apache.solr.search.FastLRUCache",
+        "version": "1.0",
+        "description": "Concurrent LRU Cache(maxSize=512, initialSize=512, minSize=460, acceptableSize=486, cleanupThread=false)",
+        "srcId": "$Id: FastLRUCache.java 1170772 2011-09-14 19:09:56Z sarowe $",
+        "src": "$URL: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_5/solr/core/src/java/org/apache/solr/search/FastLRUCache.java $",
+        "docs": null,
+        "stats": {
+          "lookups": 2,
+          "hits": 2,
+          "hitratio": "1.00",
+          "inserts": 2,
+          "evictions": 0,
+          "size": 2,
+          "warmupTime": 0,
+          "cumulative_lookups": 4041,
+          "cumulative_hits": 4041,
+          "cumulative_hitratio": "1.00",
+          "cumulative_inserts": 2828,
+          "cumulative_evictions": 0
+        }
+      }
+    }
+  ]
+}
+`
+
+var solr3CoreExpected = map[string]interface{}{
+	"num_docs":     int64(117166),
+	"max_docs":     int64(117305),
+	"deleted_docs": int64(0),
+}
+
+var solr3QueryHandlerExpected = map[string]interface{}{
+	"15min_rate_reqs_per_second": float64(0),
+	"5min_rate_reqs_per_second":  float64(0),
+	"75th_pc_request_time":       float64(0),
+	"95th_pc_request_time":       float64(0),
+	"999th_pc_request_time":      float64(0),
+	"99th_pc_request_time":       float64(0),
+	"avg_requests_per_second":    float64(0),
+	"avg_time_per_request":       float64(0),
+	"errors":                     int64(0),
+	"handler_start":              int64(1516083353156),
+	"median_request_time":        float64(0),
+	"requests":                   int64(0),
+	"timeouts":                   int64(0),
+	"total_time":                 float64(0),
+}
+
+var solr3UpdateHandlerExpected = map[string]interface{}{
+	"adds":                        int64(0),
+	"autocommit_max_docs":         int64(0),
+	"autocommit_max_time":         int64(0),
+	"autocommits":                 int64(0),
+	"commits":                     int64(3220),
+	"cumulative_adds":             int64(354209),
+	"cumulative_deletes_by_id":    int64(0),
+	"cumulative_deletes_by_query": int64(3),
+	"cumulative_errors":           int64(0),
+	"deletes_by_id":               int64(0),
+	"deletes_by_query":            int64(0),
+	"docs_pending":                int64(0),
+	"errors":                      int64(0),
+	"expunge_deletes":             int64(0),
+	"optimizes":                   int64(3),
+	"rollbacks":                   int64(0),
+	"soft_autocommits":            int64(0),
+}
+
+var solr3CacheExpected = map[string]interface{}{
+	"cumulative_evictions": int64(0),
+	"cumulative_hitratio":  float64(1.00),
+	"cumulative_hits":      int64(4041),
+	"cumulative_inserts":   int64(2828),
+	"cumulative_lookups":   int64(4041),
+	"evictions":            int64(0),
+	"hitratio":             float64(1.00),
+	"hits":                 int64(2),
+	"inserts":              int64(2),
+	"lookups":              int64(2),
+	"size":                 int64(2),
+	"warmup_time":          int64(0),
+}

From 00a52a67b9722823df660bc392f53283ab3ca343 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Mar 2018 11:42:01 -0800
Subject: [PATCH 0962/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bee898be..fdd39cbc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@
 - [#3808](https://github.com/influxdata/telegraf/pull/3808): Add shard server stats to the mongodb input plugin.
 - [#3713](https://github.com/influxdata/telegraf/pull/3713): Add server option to unbound plugin.
 - [#3804](https://github.com/influxdata/telegraf/pull/3804): Convert boolean metric values to float in datadog output.
+- [#3799](https://github.com/influxdata/telegraf/pull/3799): Add Solr 3 compatibility.
 
 ### Bugfixes
 

From 0a37386c5efc7d2a2b406d4d49b2d180af4ab130 Mon Sep 17 00:00:00 2001
From: Carl Pacey <cpacey@users.noreply.github.com>
Date: Mon, 5 Mar 2018 18:26:31 -0500
Subject: [PATCH 0963/1302] Add sum stat to basicstats aggregator (#3797)

---
 plugins/aggregators/basicstats/README.md      |  11 +-
 plugins/aggregators/basicstats/basicstats.go  |  12 ++
 .../aggregators/basicstats/basicstats_test.go | 152 ++++++++++++++++++
 3 files changed, 170 insertions(+), 5 deletions(-)

diff --git a/plugins/aggregators/basicstats/README.md b/plugins/aggregators/basicstats/README.md
index f96dfa134..f5023dfc7 100644
--- a/plugins/aggregators/basicstats/README.md
+++ b/plugins/aggregators/basicstats/README.md
@@ -1,6 +1,6 @@
 # BasicStats Aggregator Plugin
 
-The BasicStats aggregator plugin give us count,max,min,mean,s2(variance), stdev for a set of values,
+The BasicStats aggregator plugin give us count,max,min,mean,sum,s2(variance), stdev for a set of values,
 emitting the aggregate every `period` seconds.
 
 ### Configuration:
@@ -21,11 +21,11 @@ emitting the aggregate every `period` seconds.
   ## BasicStats Arguments:
 
   ## Configures which basic stats to push as fields
-  stats = ["count","min","max","mean","stdev","s2"]
+  stats = ["count","min","max","mean","stdev","s2","sum"]
 ```
 
 - stats
-    - If not specified, all stats are aggregated and pushed as fields
+    - If not specified, then `count`, `min`, `max`, `mean`, `stdev`, and `s2` are aggregated and pushed as fields.  `sum` is not aggregated by default to maintain backwards compatibility.
     - If empty array, no stats are aggregated
 
 ### Measurements & Fields:
@@ -35,6 +35,7 @@ emitting the aggregate every `period` seconds.
     - field1_max
     - field1_min
     - field1_mean
+    - field1_sum
     - field1_s2 (variance)
     - field1_stdev (standard deviation)
 
@@ -48,8 +49,8 @@ No tags are applied by this aggregator.
 $ telegraf --config telegraf.conf --quiet
 system,host=tars load1=1 1475583980000000000
 system,host=tars load1=1 1475583990000000000
-system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_s2=0,load1_stdev=0 1475584010000000000
+system,host=tars load1_count=2,load1_max=1,load1_min=1,load1_mean=1,load1_sum=2,load1_s2=0,load1_stdev=0 1475584010000000000
 system,host=tars load1=1 1475584020000000000
 system,host=tars load1=3 1475584030000000000
-system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_s2=2,load1_stdev=1.414162 1475584010000000000
+system,host=tars load1_count=2,load1_max=3,load1_min=1,load1_mean=2,load1_sum=4,load1_s2=2,load1_stdev=1.414162 1475584010000000000
 ```
diff --git a/plugins/aggregators/basicstats/basicstats.go b/plugins/aggregators/basicstats/basicstats.go
index 4ad241e91..8c3291bb0 100644
--- a/plugins/aggregators/basicstats/basicstats.go
+++ b/plugins/aggregators/basicstats/basicstats.go
@@ -22,6 +22,7 @@ type configuredStats struct {
 	mean     bool
 	variance bool
 	stdev    bool
+	sum      bool
 }
 
 func NewBasicStats() *BasicStats {
@@ -40,6 +41,7 @@ type basicstats struct {
 	count float64
 	min   float64
 	max   float64
+	sum   float64
 	mean  float64
 	M2    float64 //intermedia value for variance/stdev
 }
@@ -77,6 +79,7 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 					min:   fv,
 					max:   fv,
 					mean:  fv,
+					sum:   fv,
 					M2:    0.0,
 				}
 			}
@@ -92,6 +95,7 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 						min:   fv,
 						max:   fv,
 						mean:  fv,
+						sum:   fv,
 						M2:    0.0,
 					}
 					continue
@@ -119,6 +123,8 @@ func (m *BasicStats) Add(in telegraf.Metric) {
 				} else if fv > tmp.max {
 					tmp.max = fv
 				}
+				//sum compute
+				tmp.sum += fv
 				//store final data
 				m.cache[id].fields[k] = tmp
 			}
@@ -146,6 +152,9 @@ func (m *BasicStats) Push(acc telegraf.Accumulator) {
 			if config.mean {
 				fields[k+"_mean"] = v.mean
 			}
+			if config.sum {
+				fields[k+"_sum"] = v.sum
+			}
 
 			//v.count always >=1
 			if v.count > 1 {
@@ -187,6 +196,8 @@ func parseStats(names []string) *configuredStats {
 			parsed.variance = true
 		case "stdev":
 			parsed.stdev = true
+		case "sum":
+			parsed.sum = true
 
 		default:
 			log.Printf("W! Unrecognized basic stat '%s', ignoring", name)
@@ -206,6 +217,7 @@ func defaultStats() *configuredStats {
 	defaults.mean = true
 	defaults.variance = true
 	defaults.stdev = true
+	defaults.sum = false
 
 	return defaults
 }
diff --git a/plugins/aggregators/basicstats/basicstats_test.go b/plugins/aggregators/basicstats/basicstats_test.go
index d2642b568..b35be2da6 100644
--- a/plugins/aggregators/basicstats/basicstats_test.go
+++ b/plugins/aggregators/basicstats/basicstats_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
 )
 
 var m1, _ = metric.New("m1",
@@ -250,6 +251,83 @@ func TestBasicStatsWithOnlyMean(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
 }
 
+// Test only aggregating sum
+func TestBasicStatsWithOnlySum(t *testing.T) {
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"sum"}
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_sum": float64(2),
+		"b_sum": float64(4),
+		"c_sum": float64(6),
+		"d_sum": float64(8),
+		"e_sum": float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Verify that sum doesn't suffer from floating point errors.  Early
+// implementations of sum were calulated from mean and count, which
+// e.g. summed "1, 1, 5, 1" as "7.999999..." instead of 8.
+func TestBasicStatsWithOnlySumFloatingPointErrata(t *testing.T) {
+
+	var sum1, _ = metric.New("m1",
+		map[string]string{},
+		map[string]interface{}{
+			"a": int64(1),
+		},
+		time.Now(),
+	)
+	var sum2, _ = metric.New("m1",
+		map[string]string{},
+		map[string]interface{}{
+			"a": int64(1),
+		},
+		time.Now(),
+	)
+	var sum3, _ = metric.New("m1",
+		map[string]string{},
+		map[string]interface{}{
+			"a": int64(5),
+		},
+		time.Now(),
+	)
+	var sum4, _ = metric.New("m1",
+		map[string]string{},
+		map[string]interface{}{
+			"a": int64(1),
+		},
+		time.Now(),
+	)
+
+	aggregator := NewBasicStats()
+	aggregator.Stats = []string{"sum"}
+
+	aggregator.Add(sum1)
+	aggregator.Add(sum2)
+	aggregator.Add(sum3)
+	aggregator.Add(sum4)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_sum": float64(8),
+	}
+	expectedTags := map[string]string{}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
 // Test only aggregating variance
 func TestBasicStatsWithOnlyVariance(t *testing.T) {
 
@@ -328,6 +406,57 @@ func TestBasicStatsWithMinAndMax(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
 }
 
+// Test aggregating with all stats
+func TestBasicStatsWithAllStats(t *testing.T) {
+	acc := testutil.Accumulator{}
+	minmax := NewBasicStats()
+	minmax.Stats = []string{"count", "min", "max", "mean", "stdev", "s2", "sum"}
+
+	minmax.Add(m1)
+	minmax.Add(m2)
+	minmax.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"a_count": float64(2), //a
+		"a_max":   float64(1),
+		"a_min":   float64(1),
+		"a_mean":  float64(1),
+		"a_stdev": float64(0),
+		"a_s2":    float64(0),
+		"a_sum":   float64(2),
+		"b_count": float64(2), //b
+		"b_max":   float64(3),
+		"b_min":   float64(1),
+		"b_mean":  float64(2),
+		"b_s2":    float64(2),
+		"b_sum":   float64(4),
+		"b_stdev": math.Sqrt(2),
+		"c_count": float64(2), //c
+		"c_max":   float64(4),
+		"c_min":   float64(2),
+		"c_mean":  float64(3),
+		"c_s2":    float64(2),
+		"c_stdev": math.Sqrt(2),
+		"c_sum":   float64(6),
+		"d_count": float64(2), //d
+		"d_max":   float64(6),
+		"d_min":   float64(2),
+		"d_mean":  float64(4),
+		"d_s2":    float64(8),
+		"d_stdev": math.Sqrt(8),
+		"d_sum":   float64(8),
+		"e_count": float64(1), //e
+		"e_max":   float64(200),
+		"e_min":   float64(200),
+		"e_mean":  float64(200),
+		"e_sum":   float64(200),
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
 // Test that if an empty array is passed, no points are pushed
 func TestBasicStatsWithNoStats(t *testing.T) {
 
@@ -357,3 +486,26 @@ func TestBasicStatsWithUnknownStat(t *testing.T) {
 
 	acc.AssertDoesNotContainMeasurement(t, "m1")
 }
+
+// Test that if Stats isn't supplied, then we only do count, min, max, mean,
+// stdev, and s2.  We purposely exclude sum for backwards compatability,
+// otherwise user's working systems will suddenly (and surprisingly) start
+// capturing sum without their input.
+func TestBasicStatsWithDefaultStats(t *testing.T) {
+
+	aggregator := NewBasicStats()
+
+	aggregator.Add(m1)
+	aggregator.Add(m2)
+
+	acc := testutil.Accumulator{}
+	aggregator.Push(&acc)
+
+	assert.True(t, acc.HasField("m1", "a_count"))
+	assert.True(t, acc.HasField("m1", "a_min"))
+	assert.True(t, acc.HasField("m1", "a_max"))
+	assert.True(t, acc.HasField("m1", "a_mean"))
+	assert.True(t, acc.HasField("m1", "a_stdev"))
+	assert.True(t, acc.HasField("m1", "a_s2"))
+	assert.False(t, acc.HasField("m1", "a_sum"))
+}

From 1212b2ddc52489818e90befc25d0b42098e44ab0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 5 Mar 2018 15:28:09 -0800
Subject: [PATCH 0964/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd39cbc6..0abab719b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
 - [#3713](https://github.com/influxdata/telegraf/pull/3713): Add server option to unbound plugin.
 - [#3804](https://github.com/influxdata/telegraf/pull/3804): Convert boolean metric values to float in datadog output.
 - [#3799](https://github.com/influxdata/telegraf/pull/3799): Add Solr 3 compatibility.
+- [#3797](https://github.com/influxdata/telegraf/pull/3797): Add sum stat to basicstats aggregator.
 
 ### Bugfixes
 

From 35378ae9cca3dce12e1ae6bca1af333c9424465e Mon Sep 17 00:00:00 2001
From: Jiri Tyr <jtyr@users.noreply.github.com>
Date: Mon, 5 Mar 2018 23:29:26 +0000
Subject: [PATCH 0965/1302] Fixing error in snmp example config (#3855)

---
 plugins/inputs/snmp/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/snmp/README.md b/plugins/inputs/snmp/README.md
index 27b1f7571..42181d6a8 100644
--- a/plugins/inputs/snmp/README.md
+++ b/plugins/inputs/snmp/README.md
@@ -85,7 +85,7 @@ Telegraf config:
 
   [[inputs.snmp.table]]
     oid = "TEST::testTable"
-    inherit_tags = "hostname"
+    inherit_tags = [ "hostname" ]
 ```
 
 Resulting output:

From 3501b65f7c3c4c3e0214d55fcc0b7b01c55983da Mon Sep 17 00:00:00 2001
From: Patrick O'Keeffe <patricktokeeffe@users.noreply.github.com>
Date: Mon, 5 Mar 2018 16:32:45 -0800
Subject: [PATCH 0966/1302] Improve fail2ban use_sudo docs (#3852)

---
 etc/telegraf.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index b09ff3912..ab4eeaa63 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1301,6 +1301,9 @@
 # # Read metrics from fail2ban.
 # [[inputs.fail2ban]]
 #   ## Use sudo to run fail2ban-client
+#   ## Generally the fail2ban-client requires root access but running telegraf
+#   ## as root is not recommended. Learn more here:
+#   ## https://github.com/influxdata/telegraf/tree/master/plugins/inputs/fail2ban
 #   use_sudo = false
 
 

From 93b2870b285c61897b0ff20ba63c5baf30cb8f82 Mon Sep 17 00:00:00 2001
From: Demian Dekoninck <demian@live.be>
Date: Tue, 6 Mar 2018 19:14:14 +0100
Subject: [PATCH 0967/1302] Add link to ServiceInput interface in contributing
 guide (#3828)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 949f73300..ded08cb54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -170,7 +170,7 @@ and `Stop()` methods.
 ### Service Plugin Guidelines
 
 * Same as the `Plugin` guidelines, except that they must conform to the
-`inputs.ServiceInput` interface.
+[`telegraf.ServiceInput`](https://godoc.org/github.com/influxdata/telegraf#ServiceInput) interface.
 
 ## Output Plugins
 

From ad5e9540477e1f1379046860169fb60cba3d7fcd Mon Sep 17 00:00:00 2001
From: Marcel <mweinberg@email.de>
Date: Tue, 6 Mar 2018 21:11:38 +0100
Subject: [PATCH 0968/1302] Add ability to override proxy from environment in
 http response (#3626)

---
 plugins/inputs/http_response/http_response.go | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 3dd7f9ba5..77aaf367e 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -20,6 +20,7 @@ import (
 // HTTPResponse struct
 type HTTPResponse struct {
 	Address             string
+	Proxy               string
 	Body                string
 	Method              string
 	ResponseTimeout     internal.Duration
@@ -49,6 +50,9 @@ var sampleConfig = `
   ## Server address (default http://localhost)
   # address = "http://localhost"
 
+  ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
+  # http_proxy = "http://localhost:8888"
+
   ## Set response_timeout (default 5 seconds)
   # response_timeout = "5s"
 
@@ -88,6 +92,22 @@ func (h *HTTPResponse) SampleConfig() string {
 // ErrRedirectAttempted indicates that a redirect occurred
 var ErrRedirectAttempted = errors.New("redirect")
 
+// Set the proxy. A configured proxy overwrites the system wide proxy.
+func getProxyFunc(http_proxy string) func(*http.Request) (*url.URL, error) {
+	if http_proxy == "" {
+		return http.ProxyFromEnvironment
+	}
+	proxyURL, err := url.Parse(http_proxy)
+	if err != nil {
+		return func(_ *http.Request) (*url.URL, error) {
+			return nil, errors.New("bad proxy: " + err.Error())
+		}
+	}
+	return func(r *http.Request) (*url.URL, error) {
+		return proxyURL, nil
+	}
+}
+
 // CreateHttpClient creates an http client which will timeout at the specified
 // timeout period and can follow redirects if specified
 func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
@@ -98,7 +118,7 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	}
 	client := &http.Client{
 		Transport: &http.Transport{
-			Proxy:             http.ProxyFromEnvironment,
+			Proxy:             getProxyFunc(h.Proxy),
 			DisableKeepAlives: true,
 			TLSClientConfig:   tlsCfg,
 		},

From 45c22e42daa80a786aa294ec432f7fb460b5a2a2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 6 Mar 2018 12:12:26 -0800
Subject: [PATCH 0969/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0abab719b..6747f8653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@
 - [#3804](https://github.com/influxdata/telegraf/pull/3804): Convert boolean metric values to float in datadog output.
 - [#3799](https://github.com/influxdata/telegraf/pull/3799): Add Solr 3 compatibility.
 - [#3797](https://github.com/influxdata/telegraf/pull/3797): Add sum stat to basicstats aggregator.
+- [#3626](https://github.com/influxdata/telegraf/pull/3626): Add ability to override proxy from environment in http response.
 
 ### Bugfixes
 

From c377c8fb7c7af4cd1ec15f871a52f3995d69f82b Mon Sep 17 00:00:00 2001
From: Margarita Bliznikova <captainderteufel@gmail.com>
Date: Tue, 6 Mar 2018 13:10:44 -0800
Subject: [PATCH 0970/1302] Add host to ping timeout log message (#3853)

---
 plugins/inputs/ping/ping.go      |  4 ++--
 plugins/inputs/ping/ping_test.go | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 0609a367e..5de67322e 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -113,9 +113,9 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 					// Combine go err + stderr output
 					out = strings.TrimSpace(out)
 					if len(out) > 0 {
-						acc.AddError(fmt.Errorf("%s, %s", out, err))
+						acc.AddError(fmt.Errorf("host %s: %s, %s", u, out, err))
 					} else {
-						acc.AddError(err)
+						acc.AddError(fmt.Errorf("host %s: %s", u, err))
 					}
 					acc.AddFields("ping", fields, tags)
 					return
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index ca50092a9..85f5ca079 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -268,3 +268,26 @@ func TestFatalPingGather(t *testing.T) {
 	assert.False(t, acc.HasMeasurement("maximum_response_ms"),
 		"Fatal ping should not have packet measurements")
 }
+
+func TestErrorWithHostNamePingGather(t *testing.T) {
+	params := []struct {
+		out   string
+		error error
+	}{
+		{"", errors.New("host www.amazon.com: So very bad")},
+		{"so bad", errors.New("host www.amazon.com: so bad, So very bad")},
+	}
+
+	for _, param := range params {
+		var acc testutil.Accumulator
+		p := Ping{
+			Urls: []string{"www.amazon.com"},
+			pingHost: func(timeout float64, args ...string) (string, error) {
+				return param.out, errors.New("So very bad")
+			},
+		}
+		acc.GatherError(p.Gather)
+		assert.True(t, len(acc.Errors) > 0)
+		assert.Contains(t, acc.Errors, param.error)
+	}
+}

From b9ddbbd5ed4432c6c19729cbbecf476d0ae125af Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 6 Mar 2018 13:12:16 -0800
Subject: [PATCH 0971/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6747f8653..08ca426b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@
 - [#3799](https://github.com/influxdata/telegraf/pull/3799): Add Solr 3 compatibility.
 - [#3797](https://github.com/influxdata/telegraf/pull/3797): Add sum stat to basicstats aggregator.
 - [#3626](https://github.com/influxdata/telegraf/pull/3626): Add ability to override proxy from environment in http response.
+- [#3853](https://github.com/influxdata/telegraf/pull/3853): Add host to ping timeout log message.
 
 ### Bugfixes
 

From 9d8b1b1e87eea0918cc277fe230ccd7206db0657 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Wed, 7 Mar 2018 22:27:43 +0100
Subject: [PATCH 0972/1302] Add override processor (#3773)

This plugin can perform the standard metric modifications using override semantics.
---
 plugins/processors/all/all.go                |  1 +
 plugins/processors/override/README.md        | 30 ++++++++
 plugins/processors/override/override.go      | 60 +++++++++++++++
 plugins/processors/override/override_test.go | 80 ++++++++++++++++++++
 4 files changed, 171 insertions(+)
 create mode 100644 plugins/processors/override/README.md
 create mode 100644 plugins/processors/override/override.go
 create mode 100644 plugins/processors/override/override_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index 462298f6b..1eecbfa7e 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -1,5 +1,6 @@
 package all
 
 import (
+	_ "github.com/influxdata/telegraf/plugins/processors/override"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
 )
diff --git a/plugins/processors/override/README.md b/plugins/processors/override/README.md
new file mode 100644
index 000000000..3fb1b7c0f
--- /dev/null
+++ b/plugins/processors/override/README.md
@@ -0,0 +1,30 @@
+# Override Processor Plugin
+
+The override processor plugin allows overriding all modifications that are
+supported by input plugins and aggregators:
+
+* name_override
+* name_prefix
+* name_suffix
+* tags
+
+All metrics passing through this processor will be modified accordingly. Values
+of *name_override*, *name_prefix*, *name_suffix* and already present *tags* with
+conflicting keys will be overwritten. Absent *tags* will be created.
+
+Use-case of this plugin encompass ensuring certain tags or naming conventions
+are adhered to irrespective of input plugin configurations, e.g. by
+`taginclude`.
+
+### Configuration:
+
+```toml
+# Add a global tag to all metrics
+[[processors.override]]
+  name_override = "new name_override"
+  name_prefix = "new name_prefix"
+  name_suffix = ":new name_suffix"
+  [processors.tags.add]
+    additional_tag = "tag_value"
+    existing_tag = "new tag_value"
+```
diff --git a/plugins/processors/override/override.go b/plugins/processors/override/override.go
new file mode 100644
index 000000000..347b64033
--- /dev/null
+++ b/plugins/processors/override/override.go
@@ -0,0 +1,60 @@
+package override
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+var sampleConfig = `
+## NOTE This processor will override names, name prefixes, name suffixes and
+## values of tags, that are already present in the metric passed through this
+## filter.
+
+## All modifications on inputs and aggregators can be overridden:
+# name_override = "new name"
+#	name_prefix = "new name_prefix"
+#	name_suffix = "new name_suffix"
+
+## Tags to be added (all values must be strings)
+# [processors.overide.tags]
+#   additional_tag = "tag_value"
+`
+
+type Override struct {
+	NameOverride string
+	NamePrefix   string
+	NameSuffix   string
+	Tags         map[string]string
+}
+
+func (p *Override) SampleConfig() string {
+	return sampleConfig
+}
+
+func (p *Override) Description() string {
+	return "Add all configured tags to all metrics that pass through this filter."
+}
+
+func (p *Override) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	for _, metric := range in {
+		if len(p.NameOverride) > 0 {
+			metric.SetName(p.NameOverride)
+		}
+		if len(p.NamePrefix) > 0 {
+			metric.SetPrefix(p.NamePrefix)
+		}
+		if len(p.NameSuffix) > 0 {
+			metric.SetSuffix(p.NameSuffix)
+		}
+		for key, value := range p.Tags {
+			metric.AddTag(key, value)
+		}
+	}
+	return in
+}
+
+func init() {
+	processors.Add("override", func() telegraf.Processor {
+		return &Override{}
+	})
+}
diff --git a/plugins/processors/override/override_test.go b/plugins/processors/override/override_test.go
new file mode 100644
index 000000000..433751af9
--- /dev/null
+++ b/plugins/processors/override/override_test.go
@@ -0,0 +1,80 @@
+package override
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/assert"
+)
+
+func createTestMetric() telegraf.Metric {
+	metric, _ := metric.New("m1",
+		map[string]string{"metric_tag": "from_metric"},
+		map[string]interface{}{"value": int64(1)},
+		time.Now(),
+	)
+	return metric
+}
+
+func calculateProcessedTags(processor Override, metric telegraf.Metric) map[string]string {
+	processed := processor.Apply(metric)
+	return processed[0].Tags()
+}
+
+func TestRetainsTags(t *testing.T) {
+	processor := Override{}
+
+	tags := calculateProcessedTags(processor, createTestMetric())
+
+	value, present := tags["metric_tag"]
+	assert.True(t, present, "Tag of metric was not present")
+	assert.Equal(t, "from_metric", value, "Value of Tag was changed")
+}
+
+func TestAddTags(t *testing.T) {
+	processor := Override{Tags: map[string]string{"added_tag": "from_config", "another_tag": ""}}
+
+	tags := calculateProcessedTags(processor, createTestMetric())
+
+	value, present := tags["added_tag"]
+	assert.True(t, present, "Additional Tag of metric was not present")
+	assert.Equal(t, "from_config", value, "Value of Tag was changed")
+	assert.Equal(t, 3, len(tags), "Should have one previous and two added tags.")
+}
+
+func TestOverwritesPresentTagValues(t *testing.T) {
+	processor := Override{Tags: map[string]string{"metric_tag": "from_config"}}
+
+	tags := calculateProcessedTags(processor, createTestMetric())
+
+	value, present := tags["metric_tag"]
+	assert.True(t, present, "Tag of metric was not present")
+	assert.Equal(t, 1, len(tags), "Should only have one tag.")
+	assert.Equal(t, "from_config", value, "Value of Tag was not changed")
+}
+
+func TestOverridesName(t *testing.T) {
+	processor := Override{NameOverride: "overridden"}
+
+	processed := processor.Apply(createTestMetric())
+
+	assert.Equal(t, "overridden", processed[0].Name(), "Name was not overridden")
+}
+
+func TestNamePrefix(t *testing.T) {
+	processor := Override{NamePrefix: "Pre-"}
+
+	processed := processor.Apply(createTestMetric())
+
+	assert.Equal(t, "Pre-m1", processed[0].Name(), "Prefix was not applied")
+}
+
+func TestNameSuffix(t *testing.T) {
+	processor := Override{NameSuffix: "-suff"}
+
+	processed := processor.Apply(createTestMetric())
+
+	assert.Equal(t, "m1-suff", processed[0].Name(), "Suffix was not applied")
+}

From 2b65915b9686c22c06ae68e594673e209ab89402 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Mar 2018 13:47:54 -0800
Subject: [PATCH 0973/1302] Update docs for addition of override processor

---
 CHANGELOG.md                            |  5 +++++
 README.md                               |  1 +
 plugins/processors/override/README.md   | 27 ++++++++++++++++---------
 plugins/processors/override/override.go | 20 ++++++++----------
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08ca426b0..ab9f4d9ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,10 @@
 - [ipset](./plugins/inputs/ipset/README.md) - Thanks to @sajoupa
 - [nats](./plugins/inputs/nats/README.md) - Thanks to @mjs & @levex
 
+### New Processors
+
+- [override](./plugins/processors/override/README.md) - Thanks to @KarstenSchnitter
+
 ### New Parsers
 
 - [dropwizard](./docs/DATA_FORMATS_INPUT.md#dropwizard) - Thanks to @atzoum
@@ -75,6 +79,7 @@
 - [#3797](https://github.com/influxdata/telegraf/pull/3797): Add sum stat to basicstats aggregator.
 - [#3626](https://github.com/influxdata/telegraf/pull/3626): Add ability to override proxy from environment in http response.
 - [#3853](https://github.com/influxdata/telegraf/pull/3853): Add host to ping timeout log message.
+- [#3773](https://github.com/influxdata/telegraf/pull/3773): Add override processor.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 0ae1a9316..d7d2a3599 100644
--- a/README.md
+++ b/README.md
@@ -264,6 +264,7 @@ formats may be used with input plugins supporting the `data_format` option:
 ## Processor Plugins
 
 * [printer](./plugins/processors/printer)
+* [override](./plugins/processors/override)
 
 ## Aggregator Plugins
 
diff --git a/plugins/processors/override/README.md b/plugins/processors/override/README.md
index 3fb1b7c0f..174663e2b 100644
--- a/plugins/processors/override/README.md
+++ b/plugins/processors/override/README.md
@@ -8,9 +8,14 @@ supported by input plugins and aggregators:
 * name_suffix
 * tags
 
-All metrics passing through this processor will be modified accordingly. Values
-of *name_override*, *name_prefix*, *name_suffix* and already present *tags* with
-conflicting keys will be overwritten. Absent *tags* will be created.
+All metrics passing through this processor will be modified accordingly.
+Select the metrics to modify using the standard
+[measurement filtering](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#measurement-filtering)
+options.
+
+Values of *name_override*, *name_prefix*, *name_suffix* and already present
+*tags* with conflicting keys will be overwritten. Absent *tags* will be
+created.
 
 Use-case of this plugin encompass ensuring certain tags or naming conventions
 are adhered to irrespective of input plugin configurations, e.g. by
@@ -19,12 +24,14 @@ are adhered to irrespective of input plugin configurations, e.g. by
 ### Configuration:
 
 ```toml
-# Add a global tag to all metrics
+# Apply metric modifications using override semantics.
 [[processors.override]]
-  name_override = "new name_override"
-  name_prefix = "new name_prefix"
-  name_suffix = ":new name_suffix"
-  [processors.tags.add]
-    additional_tag = "tag_value"
-    existing_tag = "new tag_value"
+  ## All modifications on inputs and aggregators can be overridden:
+  # name_override = "new_name"
+  # name_prefix = "new_name_prefix"
+  # name_suffix = "new_name_suffix"
+
+  ## Tags to be added (all values must be strings)
+  # [processors.override.tags]
+  #   additional_tag = "tag_value"
 ```
diff --git a/plugins/processors/override/override.go b/plugins/processors/override/override.go
index 347b64033..46a2f84db 100644
--- a/plugins/processors/override/override.go
+++ b/plugins/processors/override/override.go
@@ -6,18 +6,14 @@ import (
 )
 
 var sampleConfig = `
-## NOTE This processor will override names, name prefixes, name suffixes and
-## values of tags, that are already present in the metric passed through this
-## filter.
+  ## All modifications on inputs and aggregators can be overridden:
+  # name_override = "new_name"
+  # name_prefix = "new_name_prefix"
+  # name_suffix = "new_name_suffix"
 
-## All modifications on inputs and aggregators can be overridden:
-# name_override = "new name"
-#	name_prefix = "new name_prefix"
-#	name_suffix = "new name_suffix"
-
-## Tags to be added (all values must be strings)
-# [processors.overide.tags]
-#   additional_tag = "tag_value"
+  ## Tags to be added (all values must be strings)
+  # [processors.override.tags]
+  #   additional_tag = "tag_value"
 `
 
 type Override struct {
@@ -32,7 +28,7 @@ func (p *Override) SampleConfig() string {
 }
 
 func (p *Override) Description() string {
-	return "Add all configured tags to all metrics that pass through this filter."
+	return "Apply metric modifications using override semantics."
 }
 
 func (p *Override) Apply(in ...telegraf.Metric) []telegraf.Metric {

From de22480e7d42bd28967bb72d1025fd54085d6c71 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Mar 2018 13:49:04 -0800
Subject: [PATCH 0974/1302] Update example config

---
 etc/telegraf.conf | 380 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 270 insertions(+), 110 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index ab4eeaa63..63e3cf5bc 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -510,6 +510,9 @@
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
+#   ## Timeout for write operations. default: 5s
+#   # timeout = "5s"
+#
 #   ## client ID, if not set a random ID is generated
 #   # client_id = ""
 #
@@ -594,12 +597,24 @@
 #   ## Address to listen on
 #   # listen = ":9273"
 #
+#   ## Use TLS
+#   #tls_cert = "/etc/ssl/telegraf.crt"
+#   #tls_key = "/etc/ssl/telegraf.key"
+#
+#   ## Use http basic authentication
+#   #basic_username = "Foo"
+#   #basic_password = "Bar"
+#
 #   ## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
 #   # expiration_interval = "60s"
 #
 #   ## Collectors to enable, valid entries are "gocollector" and "process".
 #   ## If unset, both are enabled.
 #   collectors_exclude = ["gocollector", "process"]
+#
+#   # Send string metrics as Prometheus labels.
+#   # Unless set to false all string metrics will be sent as labels.
+#   string_as_label = true
 
 
 # # Configuration for the Riemann server to send metrics to
@@ -699,7 +714,7 @@
 #   #use_regex = false
 #
 #   ## point tags to use as the source name for Wavefront (if none found, host will be used)
-#   #source_override = ["hostname", "snmp_host", "node_host"]
+#   #source_override = ["hostname", "agent_host", "node_host"]
 #
 #   ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0.  default true
 #   #convert_bool = true
@@ -718,6 +733,18 @@
 #                            PROCESSOR PLUGINS                                #
 ###############################################################################
 
+# # Apply metric modifications using override semantics.
+# [[processors.override]]
+#   ## All modifications on inputs and aggregators can be overridden:
+#   # name_override = "new_name"
+#   # name_prefix = "new_name_prefix"
+#   # name_suffix = "new_name_suffix"
+#
+#   ## Tags to be added (all values must be strings)
+#   # [processors.override.tags]
+#   #   additional_tag = "tag_value"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.printer]]
 
@@ -792,12 +819,11 @@
 
 # Read metrics about disk usage by mount point
 [[inputs.disk]]
-  ## By default, telegraf gather stats for all mountpoints.
-  ## Setting mountpoints will restrict the stats to the specified mountpoints.
+  ## By default stats will be gathered for all mount points.
+  ## Set mount_points will restrict the stats to only the specified mount points.
   # mount_points = ["/"]
 
-  ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
-  ## present on /run, /var/run, /dev/shm or /dev).
+  ## Ignore mount points by filesystem type.
   ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
 
 
@@ -806,7 +832,7 @@
   ## By default, telegraf will gather stats for all devices including
   ## disk partitions.
   ## Setting devices will restrict the stats to the specified devices.
-  # devices = ["sda", "sdb"]
+  # devices = ["sda", "sdb", "vd*"]
   ## Uncomment the following line if you need disk serial numbers.
   # skip_serial_number = false
   #
@@ -1301,9 +1327,6 @@
 # # Read metrics from fail2ban.
 # [[inputs.fail2ban]]
 #   ## Use sudo to run fail2ban-client
-#   ## Generally the fail2ban-client requires root access but running telegraf
-#   ## as root is not recommended. Learn more here:
-#   ## https://github.com/influxdata/telegraf/tree/master/plugins/inputs/fail2ban
 #   use_sudo = false
 
 
@@ -1417,11 +1440,51 @@
 #   # devices = ["sda", "*"]
 
 
+# # Read formatted metrics from one or more HTTP endpoints
+# [[inputs.http]]
+#   ## One or more URLs from which to read formatted metrics
+#   urls = [
+#     "http://localhost/metrics"
+#   ]
+#
+#   ## HTTP method
+#   # method = "GET"
+#
+#   ## Optional HTTP headers
+#   # headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## Optional HTTP Basic Auth Credentials
+#   # username = "username"
+#   # password = "pa$$word"
+#
+#   ## Tag all metrics with the url
+#   # tag_url = true
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Amount of time allowed to complete the HTTP request
+#   # timeout = "5s"
+#
+#   ## Data format to consume.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   # data_format = "influx"
+
+
 # # HTTP/HTTPS request given an address a method and a timeout
 # [[inputs.http_response]]
 #   ## Server address (default http://localhost)
 #   # address = "http://localhost"
 #
+#   ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
+#   # http_proxy = "http://localhost:8888"
+#
 #   ## Set response_timeout (default 5 seconds)
 #   # response_timeout = "5s"
 #
@@ -1481,6 +1544,13 @@
 #   #   "my_tag_2"
 #   # ]
 #
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
 #   ## HTTP parameters (all values must be strings).  For "GET" requests, data
 #   ## will be included in the query.  For "POST" requests, data will be included
 #   ## in the request body as "x-www-form-urlencoded".
@@ -1492,13 +1562,6 @@
 #   # [inputs.httpjson.headers]
 #   #   X-Auth-Token = "my-xauth-token"
 #   #   apiVersion = "v1"
-#
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
-#   # insecure_skip_verify = false
 
 
 # # Read InfluxDB-formatted JSON metrics from one or more HTTP endpoints
@@ -1541,7 +1604,10 @@
 # [[inputs.ipmi_sensor]]
 #   ## optionally specify the path to the ipmitool executable
 #   # path = "/usr/bin/ipmitool"
-#   #
+#   ##
+#   ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
+#   # privilege = "ADMINISTRATOR"
+#   ##
 #   ## optionally specify one or more servers via a url matching
 #   ##  [username[:password]@][protocol[(address)]]
 #   ##  e.g.
@@ -1559,6 +1625,17 @@
 #   timeout = "20s"
 
 
+# # Gather packets and bytes counters from Linux ipsets
+# [[inputs.ipset]]
+#   ## By default, we only show sets which have already matched at least 1 packet.
+#   ## set include_unmatched_sets = true to gather them all.
+#   include_unmatched_sets = false
+#   ## Adjust your sudo settings appropriately if using this option ("sudo ipset save")
+#   use_sudo = false
+#   ## The default timeout of 1s for ipset execution can be overridden here:
+#   # timeout = "1s"
+
+
 # # Gather packets and bytes throughput from iptables
 # [[inputs.iptables]]
 #   ## iptables require root access on most systems.
@@ -1792,7 +1869,7 @@
 #   ## Timeout, in ms.
 #   timeout = 100
 #   ## A list of Mesos masters.
-#   masters = ["localhost:5050"]
+#   masters = ["http://localhost:5050"]
 #   ## Master metrics groups to be collected, by default, all enabled.
 #   master_collections = [
 #     "resources",
@@ -1816,6 +1893,13 @@
 #   #   "tasks",
 #   #   "messages",
 #   # ]
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Collects scores from a minecraft server's scoreboard using the RCON protocol
@@ -1913,6 +1997,15 @@
 #   ssl_key = "/etc/telegraf/key.pem"
 
 
+# # Provides metrics about the state of a NATS server
+# [[inputs.nats]]
+#   ## The address of the monitoring endpoint of the NATS server
+#   server = "http://localhost:8222"
+#
+#   ## Maximum time to receive response
+#   # response_timeout = "5s"
+
+
 # # Read metrics about network interface usage
 # [[inputs.net]]
 #   ## By default, telegraf gathers stats from any up interface (excluding loopback)
@@ -2017,6 +2110,10 @@
 #   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
 #   bind_dn = ""
 #   bind_password = ""
+#
+#   # Reverse metric names so they sort more naturally. Recommended.
+#   # This defaults to false if unset, but is set to true when generating a new config
+#   reverse_metric_names = true
 
 
 # # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
@@ -2090,7 +2187,10 @@
 #   # ping_interval = 1.0
 #   ## per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
 #   # timeout = 1.0
-#   ## interface to send ping from (ping -I <INTERFACE>)
+#   ## total-ping deadline, in s. 0 == no deadline (ping -w <DEADLINE>)
+#   # deadline = 10
+#   ## interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
+#   ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
 #   # interface = ""
 
 
@@ -2101,90 +2201,6 @@
 #   # queue_directory = "/var/spool/postfix"
 
 
-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   ##
-#   ## All connection parameters are optional.
-#   ##
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   ##
-#   address = "host=localhost user=postgres sslmode=disable"
-#
-#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'databases' option.
-#   # ignored_databases = ["postgres", "template0", "template1"]
-#
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
-#   # databases = ["app_production", "testing"]
-
-
-# # Read metrics from one or many postgresql servers
-# [[inputs.postgresql_extensible]]
-#   ## specify address via a url matching:
-#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
-#   ##       ?sslmode=[disable|verify-ca|verify-full]
-#   ## or a simple string:
-#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
-#   #
-#   ## All connection parameters are optional.  #
-#   ## Without the dbname parameter, the driver will default to a database
-#   ## with the same name as the user. This dbname is just for instantiating a
-#   ## connection with the server and doesn't restrict the databases we are trying
-#   ## to grab metrics for.
-#   #
-#   address = "host=localhost user=postgres sslmode=disable"
-#   ## A list of databases to pull metrics about. If not specified, metrics for all
-#   ## databases are gathered.
-#   ## databases = ["app_production", "testing"]
-#   #
-#   # outputaddress = "db01"
-#   ## A custom name for the database that will be used as the "server" tag in the
-#   ## measurement output. If not specified, a default one generated from
-#   ## the connection address is used.
-#   #
-#   ## Define the toml config where the sql queries are stored
-#   ## New queries can be added, if the withdbname is set to true and there is no
-#   ## databases defined in the 'databases field', the sql query is ended by a
-#   ## 'is not null' in order to make the query succeed.
-#   ## Example :
-#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
-#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
-#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
-#   ## withdbname was true. Be careful that if the withdbname is set to false you
-#   ## don't have to define the where clause (aka with the dbname) the tagvalue
-#   ## field is used to define custom tags (separated by commas)
-#   ## The optional "measurement" value can be used to override the default
-#   ## output measurement name ("postgresql").
-#   #
-#   ## Structure :
-#   ## [[inputs.postgresql_extensible.query]]
-#   ##   sqlquery string
-#   ##   version string
-#   ##   withdbname boolean
-#   ##   tagvalue string (comma separated)
-#   ##   measurement string
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_database"
-#     version=901
-#     withdbname=false
-#     tagvalue=""
-#     measurement=""
-#   [[inputs.postgresql_extensible.query]]
-#     sqlquery="SELECT * FROM pg_stat_bgwriter"
-#     version=901
-#     withdbname=false
-#     tagvalue="postgresql.stats"
-
-
 # # Read metrics from one or many PowerDNS servers
 # [[inputs.powerdns]]
 #   ## An array of sockets to gather stats about.
@@ -2194,7 +2210,6 @@
 
 # # Monitor process cpu and memory usage
 # [[inputs.procstat]]
-#   ## Must specify one of: pid_file, exe, or pattern
 #   ## PID file to monitor process
 #   pid_file = "/var/run/nginx.pid"
 #   ## executable name (ie, pgrep <exe>)
@@ -2211,12 +2226,20 @@
 #   ## override for process_name
 #   ## This is optional; default is sourced from /proc/<pid>/status
 #   # process_name = "bar"
+#
 #   ## Field name prefix
-#   prefix = ""
-#   ## comment this out if you want raw cpu_time stats
-#   fielddrop = ["cpu_time_*"]
-#   ## This is optional; moves pid into a tag instead of a field
-#   pid_tag = false
+#   # prefix = ""
+#
+#   ## Add PID as a tag instead of a field; useful to differentiate between
+#   ## processes whose tags are otherwise the same.  Can create a large number
+#   ## of series, use judiciously.
+#   # pid_tag = false
+#
+#   ## Method to use when finding process IDs.  Can be one of 'pgrep', or
+#   ## 'native'.  The pgrep finder calls the pgrep executable in the PATH while
+#   ## the native finder performs the search directly in a manor dependent on the
+#   ## platform.  Default is 'pgrep'
+#   # pid_finder = "pgrep"
 
 
 # # Read metrics from one or many prometheus clients
@@ -2281,6 +2304,15 @@
 #   ## A list of queues to gather as the rabbitmq_queue measurement. If not
 #   ## specified, metrics for all queues are gathered.
 #   # queues = ["telegraf"]
+#
+#   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
+#   ## specified, metrics for all exchanges are gathered.
+#   # exchanges = ["telegraf"]
+#
+#   ## Queues to include and exclude. Globs accepted.
+#   ## Note that an empty array for both will include all queues
+#   queue_name_include = []
+#   queue_name_exclude = []
 
 
 # # Read raindrops stats (raindrops - real-time stats for preforking Rack servers)
@@ -2571,6 +2603,28 @@
 #   # servers = [
 #   #  "Server=192.168.1.10;Port=1433;User Id=<user>;Password=<pw>;app name=telegraf;log=1;",
 #   # ]
+#
+#   ## Optional parameter, setting this to 2 will use a new version
+#   ## of the collection queries that break compatibility with the original
+#   ## dashboards.
+#   query_version = 2
+#
+#   ## If you are using AzureDB, setting this to true will gather resource utilization metrics
+#   # azuredb = false
+#
+#   ## If you would like to exclude some of the metrics queries, list them here
+#   ## Possible choices:
+#   ## - PerformanceCounters
+#   ## - WaitStatsCategorized
+#   ## - DatabaseIO
+#   ## - DatabaseProperties
+#   ## - CPUHistory
+#   ## - DatabaseSize
+#   ## - DatabaseStats
+#   ## - MemoryClerk
+#   ## - VolumeSpace
+#   ## - PerformanceMetrics
+#   # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
 
 
 # # Sysstat metrics collector
@@ -2694,6 +2748,10 @@
 #
 #   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
 #   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+#
+#   ## IP of server to connect to, read from unbound conf default, optionally ':port'
+#   ## Will lookup IP if given a hostname
+#   server = "127.0.0.1:8953"
 
 
 # # A plugin to collect stats from Varnish HTTP Cache
@@ -2724,7 +2782,9 @@
 #   ## By default, telegraf gather all zfs stats
 #   ## If not specified, then default is:
 #   # kstatMetrics = ["arcstats", "zfetchstats", "vdev_cache_stats"]
-#
+#   ## For Linux, the default is:
+#   # kstatMetrics = ["abdstats", "arcstats", "dnodestats", "dbufcachestats",
+#   #   "dmu_tx", "fm", "vdev_mirror_stats", "zfetchstats", "zil"]
 #   ## By default, don't gather zpool stats
 #   # poolMetrics = false
 
@@ -2998,6 +3058,105 @@
 #   data_format = "influx"
 
 
+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   ##
+#   ## All connection parameters are optional.
+#   ##
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   ##
+#   address = "host=localhost user=postgres sslmode=disable"
+#   ## A custom name for the database that will be used as the "server" tag in the
+#   ## measurement output. If not specified, a default one generated from
+#   ## the connection address is used.
+#   # outputaddress = "db01"
+#
+#   ## connection configuration.
+#   ## maxlifetime - specify the maximum lifetime of a connection.
+#   ## default is forever (0s)
+#   max_lifetime = "0s"
+#
+#   ## A  list of databases to explicitly ignore.  If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'databases' option.
+#   # ignored_databases = ["postgres", "template0", "template1"]
+#
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.  Do NOT use with the 'ignored_databases' option.
+#   # databases = ["app_production", "testing"]
+
+
+# # Read metrics from one or many postgresql servers
+# [[inputs.postgresql_extensible]]
+#   ## specify address via a url matching:
+#   ##   postgres://[pqgotest[:password]]@localhost[/dbname]\
+#   ##       ?sslmode=[disable|verify-ca|verify-full]
+#   ## or a simple string:
+#   ##   host=localhost user=pqotest password=... sslmode=... dbname=app_production
+#   #
+#   ## All connection parameters are optional.  #
+#   ## Without the dbname parameter, the driver will default to a database
+#   ## with the same name as the user. This dbname is just for instantiating a
+#   ## connection with the server and doesn't restrict the databases we are trying
+#   ## to grab metrics for.
+#   #
+#   address = "host=localhost user=postgres sslmode=disable"
+#
+#   ## connection configuration.
+#   ## maxlifetime - specify the maximum lifetime of a connection.
+#   ## default is forever (0s)
+#   max_lifetime = "0s"
+#
+#   ## A list of databases to pull metrics about. If not specified, metrics for all
+#   ## databases are gathered.
+#   ## databases = ["app_production", "testing"]
+#   #
+#   ## A custom name for the database that will be used as the "server" tag in the
+#   ## measurement output. If not specified, a default one generated from
+#   ## the connection address is used.
+#   # outputaddress = "db01"
+#   #
+#   ## Define the toml config where the sql queries are stored
+#   ## New queries can be added, if the withdbname is set to true and there is no
+#   ## databases defined in the 'databases field', the sql query is ended by a
+#   ## 'is not null' in order to make the query succeed.
+#   ## Example :
+#   ## The sqlquery : "SELECT * FROM pg_stat_database where datname" become
+#   ## "SELECT * FROM pg_stat_database where datname IN ('postgres', 'pgbench')"
+#   ## because the databases variable was set to ['postgres', 'pgbench' ] and the
+#   ## withdbname was true. Be careful that if the withdbname is set to false you
+#   ## don't have to define the where clause (aka with the dbname) the tagvalue
+#   ## field is used to define custom tags (separated by commas)
+#   ## The optional "measurement" value can be used to override the default
+#   ## output measurement name ("postgresql").
+#   #
+#   ## Structure :
+#   ## [[inputs.postgresql_extensible.query]]
+#   ##   sqlquery string
+#   ##   version string
+#   ##   withdbname boolean
+#   ##   tagvalue string (comma separated)
+#   ##   measurement string
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_database"
+#     version=901
+#     withdbname=false
+#     tagvalue=""
+#     measurement=""
+#   [[inputs.postgresql_extensible.query]]
+#     sqlquery="SELECT * FROM pg_stat_bgwriter"
+#     version=901
+#     withdbname=false
+#     tagvalue="postgresql.stats"
+
+
 # # Generic socket listener capable of handling multiple socket types.
 # [[inputs.socket_listener]]
 #   ## URL to listen on
@@ -3048,6 +3207,7 @@
 #
 #   ## MaxTCPConnection - applicable when protocol is set to tcp (default=250)
 #   max_tcp_connections = 250
+#
 #   ## Enable TCP keep alive probes (default=false)
 #   tcp_keep_alive = false
 #

From a6d366fb849a35d11398ea0d038f7be2e66ed0e3 Mon Sep 17 00:00:00 2001
From: dilshatm <dilshatm@gmail.com>
Date: Thu, 8 Mar 2018 01:16:17 +0300
Subject: [PATCH 0975/1302] Fix collation difference in sqlserver input (#3786)

---
 plugins/inputs/sqlserver/sqlserver.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index e66d7972d..7d945f791 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -2048,30 +2048,30 @@ DECLARE @delayInterval char(8) = CONVERT(Char(8), DATEADD(SECOND, @secondsBetwee
 
 DECLARE @w1 TABLE
 (
-	WaitType nvarchar(64) NOT NULL,
+	WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL,
 	WaitTimeInMs bigint NOT NULL,
 	WaitTaskCount bigint NOT NULL,
 	CollectionDate datetime NOT NULL
 )
 DECLARE @w2 TABLE
 (
-	WaitType nvarchar(64) NOT NULL,
+	WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL,
 	WaitTimeInMs bigint NOT NULL,
 	WaitTaskCount bigint NOT NULL,
 	CollectionDate datetime NOT NULL
 )
 DECLARE @w3 TABLE
 (
-	WaitType nvarchar(64) NOT NULL
+	WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL
 )
 DECLARE @w4 TABLE
 (
-	WaitType nvarchar(64) NOT NULL,
-	WaitCategory nvarchar(64) NOT NULL
+	WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL,
+	WaitCategory nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL
 )
 DECLARE @w5 TABLE
 (
-	WaitCategory nvarchar(64) NOT NULL,
+	WaitCategory nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL,
 	WaitTimeInMs bigint NOT NULL,
 	WaitTaskCount bigint NOT NULL
 )
@@ -2312,12 +2312,12 @@ INSERT @w4 (WaitType, WaitCategory) VALUES ('ABR', 'OTHER') ,
 
 INSERT @w1 (WaitType, WaitTimeInMs, WaitTaskCount, CollectionDate)
 SELECT
-  WaitType = wait_type
+  WaitType = wait_type  collate SQL_Latin1_General_CP1_CI_AS
 , WaitTimeInMs = SUM(wait_time_ms)
 , WaitTaskCount = SUM(waiting_tasks_count)
 , CollectionDate = GETDATE()
 FROM sys.dm_os_wait_stats
-WHERE [wait_type] NOT IN
+WHERE [wait_type]  collate SQL_Latin1_General_CP1_CI_AS NOT IN
 (
 	SELECT WaitType FROM  @w3
 )
@@ -2328,12 +2328,12 @@ WAITFOR DELAY @delayInterval;
 
 INSERT @w2 (WaitType, WaitTimeInMs, WaitTaskCount, CollectionDate)
 SELECT
-  WaitType = wait_type
+  WaitType = wait_type  collate SQL_Latin1_General_CP1_CI_AS
 , WaitTimeInMs = SUM(wait_time_ms)
 , WaitTaskCount = SUM(waiting_tasks_count)
 , CollectionDate = GETDATE()
 FROM sys.dm_os_wait_stats
-WHERE [wait_type] NOT IN
+WHERE [wait_type]  collate SQL_Latin1_General_CP1_CI_AS NOT IN
 (
 	SELECT WaitType FROM  @w3
 )

From e4ce0578850529592f44514ba137ef5a03be4b2f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 7 Mar 2018 14:17:11 -0800
Subject: [PATCH 0976/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9f4d9ed..b022793ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
 - [#3739](https://github.com/influxdata/telegraf/issues/3739): Remove userinfo from url tag in prometheus input.
 - [#3778](https://github.com/influxdata/telegraf/issues/3778): Fix ping plugin not reporting zero durations.
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Disable keepalive in mqtt output to prevent deadlock.
+- [#3786](https://github.com/influxdata/telegraf/pull/3786): Fix collation difference in sqlserver input.
 
 ## v1.5.2 [2018-01-30]
 

From f1c8abd68cd402ea7d6e53248a6600aa34fa2f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Sch=C3=B6n?= <rocco.blues@gmail.com>
Date: Thu, 8 Mar 2018 19:52:58 +0100
Subject: [PATCH 0977/1302] Fix uptime metric in passenger input plugin (#3871)

---
 plugins/inputs/passenger/passenger.go      | 2 +-
 plugins/inputs/passenger/passenger_test.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/passenger/passenger.go b/plugins/inputs/passenger/passenger.go
index 84e92cb1a..f00bfc824 100644
--- a/plugins/inputs/passenger/passenger.go
+++ b/plugins/inputs/passenger/passenger.go
@@ -102,7 +102,7 @@ func (p *process) getUptime() int64 {
 				uptime += value * (24 * 60 * 60)
 			}
 		case strings.HasSuffix(v, "h"):
-			iValue := strings.TrimSuffix(v, "y")
+			iValue := strings.TrimSuffix(v, "h")
 			value, err := strconv.ParseInt(iValue, 10, 64)
 			if err == nil {
 				uptime += value * (60 * 60)
diff --git a/plugins/inputs/passenger/passenger_test.go b/plugins/inputs/passenger/passenger_test.go
index 6124a968e..c54239d39 100644
--- a/plugins/inputs/passenger/passenger_test.go
+++ b/plugins/inputs/passenger/passenger_test.go
@@ -126,7 +126,7 @@ func TestPassengerGenerateMetric(t *testing.T) {
 		"spawn_start_time":      int64(1452746844946982),
 		"spawn_end_time":        int64(1452746845013365),
 		"last_used":             int64(1452747071764940),
-		"uptime":                int64(226), // in seconds of 3m 46s
+		"uptime":                int64(191026), // in seconds of 2d 5h 3m 46s
 		"cpu":                   int64(58),
 		"rss":                   int64(418548),
 		"pss":                   int64(319391),
@@ -219,7 +219,7 @@ var sampleStat = `
             <spawn_end_time>1452746845013365</spawn_end_time>
             <last_used>1452747071764940</last_used>
             <last_used_desc>0s ago</last_used_desc>
-            <uptime>3m 46s</uptime>
+            <uptime>2d 5h 3m 46s</uptime>
             <code_revision>899ac7f</code_revision>
             <life_status>ALIVE</life_status>
             <enabled>ENABLED</enabled>
@@ -263,7 +263,7 @@ var sampleStat = `
             <spawn_end_time>1452746845172460</spawn_end_time>
             <last_used>1452747071709179</last_used>
             <last_used_desc>0s ago</last_used_desc>
-            <uptime>3m 46s</uptime>
+            <uptime>2d 5h 3m 46s</uptime>
             <code_revision>899ac7f</code_revision>
             <life_status>ALIVE</life_status>
             <enabled>ENABLED</enabled>

From f7207f514e43e424977da2b291868a33148b3712 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 8 Mar 2018 10:54:03 -0800
Subject: [PATCH 0978/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b022793ce..030e707ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,7 @@
 - [#3778](https://github.com/influxdata/telegraf/issues/3778): Fix ping plugin not reporting zero durations.
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Disable keepalive in mqtt output to prevent deadlock.
 - [#3786](https://github.com/influxdata/telegraf/pull/3786): Fix collation difference in sqlserver input.
+- [#3871](https://github.com/influxdata/telegraf/pull/3871): Fix uptime metric in passenger input plugin.
 
 ## v1.5.2 [2018-01-30]
 

From 8005883de8fc1f92702cae5a8aa1d04e4c1a41aa Mon Sep 17 00:00:00 2001
From: Margarita Bliznikova <captainderteufel@gmail.com>
Date: Thu, 8 Mar 2018 13:03:48 -0800
Subject: [PATCH 0979/1302] Fix intermittent TestTailBadLine failures (#3869)

---
 plugins/inputs/tail/tail_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 4ebf00171..e8a16cc5c 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -103,10 +103,10 @@ func TestTailBadLine(t *testing.T) {
 
 	acc := testutil.Accumulator{}
 	require.NoError(t, tt.Start(&acc))
+	require.NoError(t, acc.GatherError(tt.Gather))
 
 	_, err = tmpfile.WriteString("cpu mytag= foo usage_idle= 100\n")
 	require.NoError(t, err)
-	require.NoError(t, acc.GatherError(tt.Gather))
 
 	acc.WaitError(1)
 	assert.Contains(t, acc.Errors[0].Error(), "E! Malformed log line")

From 81a93fcddf0c277cbb3cac3125904604b2b23908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jaber?= <germanjaber@gmail.com>
Date: Thu, 8 Mar 2018 16:55:59 -0600
Subject: [PATCH 0980/1302] Add result related tags and fields to http_response
 (#3814)

---
 plugins/inputs/http_response/README.md        |  32 +-
 plugins/inputs/http_response/http_response.go | 133 ++++--
 .../http_response/http_response_test.go       | 442 +++++++++++++++---
 3 files changed, 496 insertions(+), 111 deletions(-)

diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 924d35384..3bee4fdfe 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -44,18 +44,38 @@ This input plugin will test HTTP/HTTPS connections.
 ### Measurements & Fields:
 
 - http_response
-    - response_time (float, seconds)
-    - http_response_code (int) #The code received
-	- result_type (string) # success, timeout, response_string_mismatch, connection_failed
+    - response_time (float, seconds) # Not set if target is unreachable for any reason
+    - http_response_code (int) # The HTTP code received
+	- result_type (string) # Legacy field mantained for backwards compatibility
+    - result_code (int) # Details [here](#result-tag-and-result_code-field)
+
 
 ### Tags:
 
 - All measurements have the following tags:
-    - server
-    - method
+    - server # Server URL used
+    - method # HTTP method used (GET, POST, PUT, etc)
+    - status_code # String with the HTTP status code
+    - result # Details [here](#result-tag-and-result_code-field)
+
+### Result tag and Result_code field
+Upon finishing polling the target server, the plugin registers the result of the operation in the `result` tag, and adds a numeric field called `result_code` corresponding with that tag value.
+
+This tag is used to expose network and plugin errors. HTTP errors are considered a sucessful connection by the plugin.
+
+|Tag value                |Corresponding field value|Description|
+--------------------------|-------------------------|-----------|
+|success                  | 0                       |The HTTP request completed, even if the HTTP code represents an error|
+|response_string_mismatch | 1                       |The option `response_string_match` was used, and the body of the response didn't match the regex|
+|body_read_error          | 2                       |The option `response_string_match` was used, but the plugin wans't able to read the body of the response. Responses with empty bodies (like 3xx, HEAD, etc) will trigger this error|
+|connection_failed        | 3                       |Catch all for any network error not specifically handled by the plugin|
+|timeout                  | 4                       |The plugin timed out while awaiting the HTTP connection to complete|
+|dns_error                | 5                       |There was a DNS error while attempting to connect to the host|
+
+NOTE: The error codes are derived from the error object returned by the `net/http` Go library, so the accuracy of the errors depends on the handling of error states by the `net/http` Go library. **If a more detailed error report is required use the `log_network_errors` setting.**
 
 ### Example Output:
 
 ```
-http_response,method=GET,server=http://www.github.com http_response_code=200i,response_time=6.223266528 1459419354977857955
+http_response,method=GET,server=http://www.github.com,status_code="200",result="success" http_response_code=200i,response_time=6.223266528,result_type="sucess",result_code=0i 1459419354977857955
 ```
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 77aaf367e..b0f1009fc 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -2,6 +2,7 @@ package http_response
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -9,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 
@@ -133,10 +135,54 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	return client, nil
 }
 
+func setResult(result_string string, fields map[string]interface{}, tags map[string]string) {
+	result_codes := map[string]int{
+		"success":                  0,
+		"response_string_mismatch": 1,
+		"body_read_error":          2,
+		"connection_failed":        3,
+		"timeout":                  4,
+		"dns_error":                5,
+	}
+
+	tags["result"] = result_string
+	fields["result_type"] = result_string
+	fields["result_code"] = result_codes[result_string]
+}
+
+func setError(err error, fields map[string]interface{}, tags map[string]string) error {
+	if timeoutError, ok := err.(net.Error); ok && timeoutError.Timeout() {
+		setResult("timeout", fields, tags)
+		return timeoutError
+	}
+
+	urlErr, isUrlErr := err.(*url.Error)
+	if !isUrlErr {
+		return nil
+	}
+
+	opErr, isNetErr := (urlErr.Err).(*net.OpError)
+	if isNetErr {
+		switch e := (opErr.Err).(type) {
+		case (*net.DNSError):
+			setResult("dns_error", fields, tags)
+			return e
+		case (*net.ParseError):
+			// Parse error has to do with parsing of IP addresses, so we
+			// group it with address errors
+			setResult("address_error", fields, tags)
+			return e
+		}
+	}
+
+	return nil
+}
+
 // HTTPGather gathers all fields and returns any errors it encounters
-func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
-	// Prepare fields
+func (h *HTTPResponse) httpGather() (map[string]interface{}, map[string]string, error) {
+	// Prepare fields and tags
 	fields := make(map[string]interface{})
+	tags := map[string]string{"server": h.Address, "method": h.Method}
 
 	var body io.Reader
 	if h.Body != "" {
@@ -144,7 +190,7 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 	}
 	request, err := http.NewRequest(h.Method, h.Address, body)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	for key, val := range h.Headers {
@@ -157,68 +203,87 @@ func (h *HTTPResponse) httpGather() (map[string]interface{}, error) {
 	// Start Timer
 	start := time.Now()
 	resp, err := h.client.Do(request)
+	response_time := time.Since(start).Seconds()
 
+	// If an error in returned, it means we are dealing with a network error, as
+	// HTTP error codes do not generate errors in the net/http library
 	if err != nil {
-		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
-			fields["result_type"] = "timeout"
-			return fields, nil
+		// Log error
+		log.Printf("D! Network error while polling %s: %s", h.Address, err.Error())
+
+		// Get error details
+		netErr := setError(err, fields, tags)
+
+		// If recognize the returnded error, get out
+		if netErr != nil {
+			return fields, tags, nil
 		}
-		fields["result_type"] = "connection_failed"
-		if h.FollowRedirects {
-			return fields, nil
-		}
-		if urlError, ok := err.(*url.Error); ok &&
-			urlError.Err == ErrRedirectAttempted {
+
+		// Any error not recognized by `set_error` is considered a "connection_failed"
+		setResult("connection_failed", fields, tags)
+
+		// If the error is a redirect we continue processing and log the HTTP code
+		urlError, isUrlError := err.(*url.Error)
+		if !h.FollowRedirects && isUrlError && urlError.Err == ErrRedirectAttempted {
 			err = nil
 		} else {
-			return fields, nil
+			// If the error isn't a timeout or a redirect stop
+			// processing the request
+			return fields, tags, nil
 		}
 	}
+
+	if _, ok := fields["response_time"]; !ok {
+		fields["response_time"] = response_time
+	}
+
+	// This function closes the response body, as
+	// required by the net/http library
 	defer func() {
 		io.Copy(ioutil.Discard, resp.Body)
 		resp.Body.Close()
 	}()
 
-	fields["response_time"] = time.Since(start).Seconds()
+	// Set log the HTTP response code
+	tags["status_code"] = strconv.Itoa(resp.StatusCode)
 	fields["http_response_code"] = resp.StatusCode
 
 	// Check the response for a regex match.
 	if h.ResponseStringMatch != "" {
 
-		// Compile once and reuse
-		if h.compiledStringMatch == nil {
-			h.compiledStringMatch = regexp.MustCompile(h.ResponseStringMatch)
-			if err != nil {
-				log.Printf("E! Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
-				fields["result_type"] = "response_string_mismatch"
-				return fields, nil
-			}
-		}
-
 		bodyBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
-			log.Printf("E! Failed to read body of HTTP Response : %s", err)
-			fields["result_type"] = "response_string_mismatch"
+			log.Printf("D! Failed to read body of HTTP Response : %s", err)
+			setResult("body_read_error", fields, tags)
 			fields["response_string_match"] = 0
-			return fields, nil
+			return fields, tags, nil
 		}
 
 		if h.compiledStringMatch.Match(bodyBytes) {
-			fields["result_type"] = "success"
+			setResult("success", fields, tags)
 			fields["response_string_match"] = 1
 		} else {
-			fields["result_type"] = "response_string_mismatch"
+			setResult("response_string_mismatch", fields, tags)
 			fields["response_string_match"] = 0
 		}
 	} else {
-		fields["result_type"] = "success"
+		setResult("success", fields, tags)
 	}
 
-	return fields, nil
+	return fields, tags, nil
 }
 
 // Gather gets all metric fields and tags and returns any errors it encounters
 func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
+	// Compile the body regex if it exist
+	if h.compiledStringMatch == nil {
+		var err error
+		h.compiledStringMatch, err = regexp.Compile(h.ResponseStringMatch)
+		if err != nil {
+			return fmt.Errorf("Failed to compile regular expression %s : %s", h.ResponseStringMatch, err)
+		}
+	}
+
 	// Set default values
 	if h.ResponseTimeout.Duration < time.Second {
 		h.ResponseTimeout.Duration = time.Second * 5
@@ -237,9 +302,10 @@ func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	if addr.Scheme != "http" && addr.Scheme != "https" {
 		return errors.New("Only http and https are supported")
 	}
+
 	// Prepare data
-	tags := map[string]string{"server": h.Address, "method": h.Method}
 	var fields map[string]interface{}
+	var tags map[string]string
 
 	if h.client == nil {
 		client, err := h.createHttpClient()
@@ -250,10 +316,11 @@ func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	}
 
 	// Gather data
-	fields, err = h.httpGather()
+	fields, tags, err = h.httpGather()
 	if err != nil {
 		return err
 	}
+
 	// Add metrics
 	acc.AddFields("http_response", fields, tags)
 	return nil
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index 484a06f2f..c12d6c0f0 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -15,6 +15,68 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+// Receives a list with fields that are expected to be absent
+func checkAbsentFields(t *testing.T, fields []string, acc testutil.Accumulator) {
+	for _, field := range fields {
+		ok := acc.HasField("http_response", field)
+		require.False(t, ok)
+	}
+}
+
+// Receives a list with tags that are expected to be absent
+func checkAbsentTags(t *testing.T, tags []string, acc testutil.Accumulator) {
+	for _, tag := range tags {
+		ok := acc.HasTag("http_response", tag)
+		require.False(t, ok)
+	}
+}
+
+// Receives a dictionary and with expected fields and their values. If a value is nil, it will only check
+// that the field exists, but not its contents
+func checkFields(t *testing.T, fields map[string]interface{}, acc testutil.Accumulator) {
+	for key, field := range fields {
+		switch v := field.(type) {
+		case int:
+			value, ok := acc.IntField("http_response", key)
+			require.True(t, ok)
+			require.Equal(t, field, value)
+		case float64:
+			value, ok := acc.FloatField("http_response", key)
+			require.True(t, ok)
+			require.Equal(t, field, value)
+		case string:
+			value, ok := acc.StringField("http_response", key)
+			require.True(t, ok)
+			require.Equal(t, field, value)
+		case nil:
+			ok := acc.HasField("http_response", key)
+			require.True(t, ok)
+		default:
+			t.Log("Unsupported type for field: ", v)
+			t.Fail()
+		}
+	}
+}
+
+// Receives a dictionary and with expected tags and their values. If a value is nil, it will only check
+// that the tag exists, but not its contents
+func checkTags(t *testing.T, tags map[string]interface{}, acc testutil.Accumulator) {
+	for key, tag := range tags {
+		switch v := tag.(type) {
+		case string:
+			ok := acc.HasTag("http_response", key)
+			require.True(t, ok)
+			require.Equal(t, tag, acc.TagValue("http_response", key))
+		case nil:
+			ok := acc.HasTag("http_response", key)
+			require.True(t, ok)
+		default:
+			t.Log("Unsupported type for tag: ", v)
+			t.Fail()
+		}
+	}
+}
+
 func setUpTestMux() http.Handler {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/redirect", func(w http.ResponseWriter, req *http.Request) {
@@ -56,6 +118,24 @@ func setUpTestMux() http.Handler {
 	return mux
 }
 
+func checkOutput(t *testing.T, acc testutil.Accumulator, presentFields map[string]interface{}, presentTags map[string]interface{}, absentFields []string, absentTags []string) {
+	if presentFields != nil {
+		checkFields(t, presentFields, acc)
+	}
+
+	if presentTags != nil {
+		checkTags(t, presentTags, acc)
+	}
+
+	if absentFields != nil {
+		checkAbsentFields(t, absentFields, acc)
+	}
+
+	if absentTags != nil {
+		checkAbsentTags(t, absentTags, acc)
+	}
+}
+
 func TestHeaders(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		cHeader := r.Header.Get("Content-Type")
@@ -78,9 +158,20 @@ func TestHeaders(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
+	expectedFields := map[string]interface{}{
+		"http_response_code": http.StatusOK,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	absentFields := []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestFields(t *testing.T) {
@@ -103,12 +194,20 @@ func TestFields(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "success", response_value)
+	expectedFields := map[string]interface{}{
+		"http_response_code": http.StatusOK,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	absentFields := []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestRedirects(t *testing.T) {
@@ -130,9 +229,20 @@ func TestRedirects(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
+	expectedFields := map[string]interface{}{
+		"http_response_code": http.StatusOK,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	absentFields := []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/badredirect",
@@ -148,11 +258,21 @@ func TestRedirects(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok = acc.IntField("http_response", "http_response_code")
-	require.False(t, ok)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "connection_failed", response_value)
+	expectedFields = map[string]interface{}{
+		"result_type": "connection_failed",
+		"result_code": 3,
+	}
+	expectedTags = map[string]interface{}{
+		"server": nil,
+		"method": "GET",
+		"result": "connection_failed",
+	}
+	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
+	absentTags := []string{"status_code"}
+	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+
+	expectedFields = map[string]interface{}{"result_type": "connection_failed"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
 }
 
 func TestMethod(t *testing.T) {
@@ -174,9 +294,20 @@ func TestMethod(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
+	expectedFields := map[string]interface{}{
+		"http_response_code": http.StatusOK,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "POST",
+		"status_code": "200",
+		"result":      "success",
+	}
+	absentFields := []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/mustbepostmethod",
@@ -192,9 +323,20 @@ func TestMethod(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok = acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusMethodNotAllowed, value)
+	expectedFields = map[string]interface{}{
+		"http_response_code": http.StatusMethodNotAllowed,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags = map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "405",
+		"result":      "success",
+	}
+	absentFields = []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 
 	//check that lowercase methods work correctly
 	h = &HTTPResponse{
@@ -211,9 +353,20 @@ func TestMethod(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok = acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusMethodNotAllowed, value)
+	expectedFields = map[string]interface{}{
+		"http_response_code": http.StatusMethodNotAllowed,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags = map[string]interface{}{
+		"server":      nil,
+		"method":      "head",
+		"status_code": "405",
+		"result":      "success",
+	}
+	absentFields = []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestBody(t *testing.T) {
@@ -235,9 +388,20 @@ func TestBody(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
+	expectedFields := map[string]interface{}{
+		"http_response_code": http.StatusOK,
+		"result_type":        "success",
+		"result_code":        0,
+		"response_time":      nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	absentFields := []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/musthaveabody",
@@ -252,9 +416,19 @@ func TestBody(t *testing.T) {
 	err = h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok = acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusBadRequest, value)
+	expectedFields = map[string]interface{}{
+		"http_response_code": http.StatusBadRequest,
+		"result_type":        "success",
+		"result_code":        0,
+	}
+	expectedTags = map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "400",
+		"result":      "success",
+	}
+	absentFields = []string{"response_string_match"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestStringMatch(t *testing.T) {
@@ -277,17 +451,20 @@ func TestStringMatch(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
-	value, ok = acc.IntField("http_response", "response_string_match")
-	require.True(t, ok)
-	require.Equal(t, 1, value)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "success", response_value)
-	_, ok = acc.FloatField("http_response", "response_time")
-	require.True(t, ok)
+	expectedFields := map[string]interface{}{
+		"http_response_code":    http.StatusOK,
+		"response_string_match": 1,
+		"result_type":           "success",
+		"result_code":           0,
+		"response_time":         nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestStringMatchJson(t *testing.T) {
@@ -310,17 +487,20 @@ func TestStringMatchJson(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
-	value, ok = acc.IntField("http_response", "response_string_match")
-	require.True(t, ok)
-	require.Equal(t, 1, value)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "success", response_value)
-	_, ok = acc.FloatField("http_response", "response_time")
-	require.True(t, ok)
+	expectedFields := map[string]interface{}{
+		"http_response_code":    http.StatusOK,
+		"response_string_match": 1,
+		"result_type":           "success",
+		"result_code":           0,
+		"response_time":         nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "success",
+	}
+	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestStringMatchFail(t *testing.T) {
@@ -344,17 +524,20 @@ func TestStringMatchFail(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	value, ok := acc.IntField("http_response", "http_response_code")
-	require.True(t, ok)
-	require.Equal(t, http.StatusOK, value)
-	value, ok = acc.IntField("http_response", "response_string_match")
-	require.True(t, ok)
-	require.Equal(t, 0, value)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "response_string_mismatch", response_value)
-	_, ok = acc.FloatField("http_response", "response_time")
-	require.True(t, ok)
+	expectedFields := map[string]interface{}{
+		"http_response_code":    http.StatusOK,
+		"response_string_match": 0,
+		"result_type":           "response_string_mismatch",
+		"result_code":           1,
+		"response_time":         nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "200",
+		"result":      "response_string_mismatch",
+	}
+	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestTimeout(t *testing.T) {
@@ -380,11 +563,126 @@ func TestTimeout(t *testing.T) {
 	err := h.Gather(&acc)
 	require.NoError(t, err)
 
-	_, ok := acc.IntField("http_response", "http_response_code")
-	require.False(t, ok)
-	response_value, ok := acc.StringField("http_response", "result_type")
-	require.True(t, ok)
-	require.Equal(t, "timeout", response_value)
-	_, ok = acc.FloatField("http_response", "response_time")
-	require.False(t, ok)
+	expectedFields := map[string]interface{}{
+		"result_type": "timeout",
+		"result_code": 4,
+	}
+	expectedTags := map[string]interface{}{
+		"server": nil,
+		"method": "GET",
+		"result": "timeout",
+	}
+	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
+	absentTags := []string{"status_code"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+}
+
+func TestPluginErrors(t *testing.T) {
+	mux := setUpTestMux()
+	ts := httptest.NewServer(mux)
+	defer ts.Close()
+
+	// Bad regex test. Should return an error and return nothing
+	h := &HTTPResponse{
+		Address:             ts.URL + "/good",
+		Body:                "{ 'test': 'data'}",
+		Method:              "GET",
+		ResponseStringMatch: "bad regex:[[",
+		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+		FollowRedirects: true,
+	}
+
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
+	require.Error(t, err)
+
+	absentFields := []string{"http_response_code", "response_time", "response_string_match", "result_type", "result_code"}
+	absentTags := []string{"status_code", "result", "server", "method"}
+	checkOutput(t, acc, nil, nil, absentFields, absentTags)
+
+	// Attempt to read empty body test
+	h = &HTTPResponse{
+		Address:             ts.URL + "/redirect",
+		Body:                "",
+		Method:              "GET",
+		ResponseStringMatch: ".*",
+		ResponseTimeout:     internal.Duration{Duration: time.Second * 20},
+		FollowRedirects:     false,
+	}
+
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
+	require.NoError(t, err)
+
+	expectedFields := map[string]interface{}{
+		"http_response_code":    http.StatusMovedPermanently,
+		"response_string_match": 0,
+		"result_type":           "body_read_error",
+		"result_code":           2,
+		"response_time":         nil,
+	}
+	expectedTags := map[string]interface{}{
+		"server":      nil,
+		"method":      "GET",
+		"status_code": "301",
+		"result":      "body_read_error",
+	}
+	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+}
+
+func TestNetworkErrors(t *testing.T) {
+	// DNS error
+	h := &HTTPResponse{
+		Address:         "https://nonexistent.nonexistent", // Any non-resolvable URL works here
+		Body:            "",
+		Method:          "GET",
+		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		FollowRedirects: false,
+	}
+
+	var acc testutil.Accumulator
+	err := h.Gather(&acc)
+	require.NoError(t, err)
+
+	expectedFields := map[string]interface{}{
+		"result_type": "dns_error",
+		"result_code": 5,
+	}
+	expectedTags := map[string]interface{}{
+		"server": nil,
+		"method": "GET",
+		"result": "dns_error",
+	}
+	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
+	absentTags := []string{"status_code"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+
+	// Connecton failed
+	h = &HTTPResponse{
+		Address:         "https://127.127.127.127", // Any non-routable IP works here
+		Body:            "",
+		Method:          "GET",
+		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		FollowRedirects: false,
+	}
+
+	acc = testutil.Accumulator{}
+	err = h.Gather(&acc)
+	require.NoError(t, err)
+
+	expectedFields = map[string]interface{}{
+		"result_type": "connection_failed",
+		"result_code": 3,
+	}
+	expectedTags = map[string]interface{}{
+		"server": nil,
+		"method": "GET",
+		"result": "connection_failed",
+	}
+	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
+	absentTags = []string{"status_code"}
+	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
 }

From 8b3767fd6e0e5cff0cea249e5a514cdb9362224a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 8 Mar 2018 15:13:26 -0800
Subject: [PATCH 0981/1302] Update http_response documentation

---
 plugins/inputs/http_response/README.md | 35 ++++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 3bee4fdfe..127a4530b 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -1,6 +1,6 @@
-# Example Input Plugin
+# HTTP Response Input Plugin
 
-This input plugin will test HTTP/HTTPS connections.
+This input plugin checks HTTP/HTTPS connections.
 
 ### Configuration:
 
@@ -41,27 +41,25 @@ This input plugin will test HTTP/HTTPS connections.
   #   Host = "github.com"
 ```
 
-### Measurements & Fields:
+### Metrics:
 
 - http_response
-    - response_time (float, seconds) # Not set if target is unreachable for any reason
-    - http_response_code (int) # The HTTP code received
-	- result_type (string) # Legacy field mantained for backwards compatibility
-    - result_code (int) # Details [here](#result-tag-and-result_code-field)
+  - tags:
+    - server (target URL)
+    - method (request method)
+    - status_code (response status code)
+    - result ([see below](#result--result_code))
+  - fields:
+    - response_time (float, seconds)
+    - http_response_code (int, response status code)
+	- result_type (string, deprecated in 1.6: use `result` tag and `result_code` field)
+    - result_code (int, [see below](#result--result_code))
 
+#### `result` / `result_code`
 
-### Tags:
-
-- All measurements have the following tags:
-    - server # Server URL used
-    - method # HTTP method used (GET, POST, PUT, etc)
-    - status_code # String with the HTTP status code
-    - result # Details [here](#result-tag-and-result_code-field)
-
-### Result tag and Result_code field
 Upon finishing polling the target server, the plugin registers the result of the operation in the `result` tag, and adds a numeric field called `result_code` corresponding with that tag value.
 
-This tag is used to expose network and plugin errors. HTTP errors are considered a sucessful connection by the plugin.
+This tag is used to expose network and plugin errors. HTTP errors are considered a successful connection.
 
 |Tag value                |Corresponding field value|Description|
 --------------------------|-------------------------|-----------|
@@ -72,10 +70,9 @@ This tag is used to expose network and plugin errors. HTTP errors are considered
 |timeout                  | 4                       |The plugin timed out while awaiting the HTTP connection to complete|
 |dns_error                | 5                       |There was a DNS error while attempting to connect to the host|
 
-NOTE: The error codes are derived from the error object returned by the `net/http` Go library, so the accuracy of the errors depends on the handling of error states by the `net/http` Go library. **If a more detailed error report is required use the `log_network_errors` setting.**
 
 ### Example Output:
 
 ```
-http_response,method=GET,server=http://www.github.com,status_code="200",result="success" http_response_code=200i,response_time=6.223266528,result_type="sucess",result_code=0i 1459419354977857955
+http_response,method=GET,server=http://www.github.com,status_code=200,result=success http_response_code=200i,response_time=6.223266528,result_type="success",result_code=0i 1459419354977857955
 ```

From 0e14e31b0a2e9b1552ba26051d17f9d1ef03768a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 8 Mar 2018 15:16:46 -0800
Subject: [PATCH 0982/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 030e707ac..6723ca112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,11 +80,13 @@
 - [#3626](https://github.com/influxdata/telegraf/pull/3626): Add ability to override proxy from environment in http response.
 - [#3853](https://github.com/influxdata/telegraf/pull/3853): Add host to ping timeout log message.
 - [#3773](https://github.com/influxdata/telegraf/pull/3773): Add override processor.
+- [#3814](https://github.com/influxdata/telegraf/pull/3814): Add status_code and result tags and result_type field to http_response input.
 
 ### Bugfixes
 
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 - [#3810](https://github.com/influxdata/telegraf/issues/3810): Fix metric buffer limit in internal plugin after reload.
+- [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
 
 ## v1.5.3 [unreleased]
 

From 07dbbb27dcc63e20b90bb0b04326996f4e14aca6 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Fri, 9 Mar 2018 12:44:35 -0500
Subject: [PATCH 0983/1302] Fix socket_listener setting ReadBufferSize on TCP
 sockets (#3874)

---
 CHANGELOG.md                                  |  1 +
 .../inputs/socket_listener/socket_listener.go | 19 ++++++++------
 .../socket_listener/socket_listener_test.go   | 26 +++++++++++++++++++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6723ca112..00310c38c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
 - [#1896](https://github.com/influxdata/telegraf/issues/1896): Fix various mysql data type conversions.
 - [#3810](https://github.com/influxdata/telegraf/issues/3810): Fix metric buffer limit in internal plugin after reload.
 - [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
+- [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
 
 ## v1.5.3 [unreleased]
 
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 965a6a870..2ad6c4264 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -26,6 +26,8 @@ type streamSocketListener struct {
 	net.Listener
 	*SocketListener
 
+	sockType string
+
 	connections    map[string]net.Conn
 	connectionsMtx sync.Mutex
 }
@@ -42,6 +44,14 @@ func (ssl *streamSocketListener) listen() {
 			break
 		}
 
+		if ssl.ReadBufferSize > 0 {
+			if srb, ok := c.(setReadBufferer); ok {
+				srb.SetReadBuffer(ssl.ReadBufferSize)
+			} else {
+				log.Printf("W! Unable to set read buffer on a %s socket", ssl.sockType)
+			}
+		}
+
 		ssl.connectionsMtx.Lock()
 		if ssl.MaxConnections > 0 && len(ssl.connections) >= ssl.MaxConnections {
 			ssl.connectionsMtx.Unlock()
@@ -237,17 +247,10 @@ func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
 			return err
 		}
 
-		if sl.ReadBufferSize > 0 {
-			if srb, ok := l.(setReadBufferer); ok {
-				srb.SetReadBuffer(sl.ReadBufferSize)
-			} else {
-				log.Printf("W! Unable to set read buffer on a %s socket", spl[0])
-			}
-		}
-
 		ssl := &streamSocketListener{
 			Listener:       l,
 			SocketListener: sl,
+			sockType:       spl[0],
 		}
 
 		sl.Closer = ssl
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index b263e5082..4e8335699 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -1,6 +1,8 @@
 package socket_listener
 
 import (
+	"bytes"
+	"log"
 	"net"
 	"os"
 	"testing"
@@ -11,9 +13,24 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+// testEmptyLog is a helper function to ensure no data is written to log.
+// Should be called at the start of the test, and returns a function which should run at the end.
+func testEmptyLog(t *testing.T) func() {
+	buf := bytes.NewBuffer(nil)
+	log.SetOutput(buf)
+
+	return func() {
+		log.SetOutput(os.Stderr)
+		assert.Empty(t, string(buf.Bytes()), "log not empty")
+	}
+}
+
 func TestSocketListener_tcp(t *testing.T) {
+	defer testEmptyLog(t)()
+
 	sl := newSocketListener()
 	sl.ServiceAddress = "tcp://127.0.0.1:0"
+	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
@@ -27,8 +44,11 @@ func TestSocketListener_tcp(t *testing.T) {
 }
 
 func TestSocketListener_udp(t *testing.T) {
+	defer testEmptyLog(t)()
+
 	sl := newSocketListener()
 	sl.ServiceAddress = "udp://127.0.0.1:0"
+	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
@@ -42,9 +62,12 @@ func TestSocketListener_udp(t *testing.T) {
 }
 
 func TestSocketListener_unix(t *testing.T) {
+	defer testEmptyLog(t)()
+
 	os.Create("/tmp/telegraf_test.sock")
 	sl := newSocketListener()
 	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
@@ -58,9 +81,12 @@ func TestSocketListener_unix(t *testing.T) {
 }
 
 func TestSocketListener_unixgram(t *testing.T) {
+	defer testEmptyLog(t)()
+
 	os.Create("/tmp/telegraf_test.sock")
 	sl := newSocketListener()
 	sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock"
+	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)

From 9ce70aad77421f27ea2c82541a2198af935d1c6a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 9 Mar 2018 14:13:52 -0800
Subject: [PATCH 0984/1302] Use Go 1.9.4 for builds

---
 .circleci/config.yml | 2 +-
 appveyor.yml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c95fe71f0..ea5a789d4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 ---
 defaults: &defaults
   docker:
-    - image: 'circleci/golang:1.9.2'
+    - image: 'circleci/golang:1.9.4'
   working_directory: '/go/src/github.com/influxdata/telegraf'
 version: 2
 jobs:
diff --git a/appveyor.yml b/appveyor.yml
index 993870209..651478c99 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,11 +12,11 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.9.4.msi" curl -o "C:\Cache\go1.9.4.msi" https://storage.googleapis.com/golang/go1.9.4.windows-amd64.msi
   - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
   - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.9.4.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version

From 8cfd001441d4a6e727983d69834be92af82c3c0e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Mar 2018 20:44:51 -0700
Subject: [PATCH 0985/1302] Disable parallel restore in gdm

May be aggrevating timeout issue on appveyor builds.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3250e69ed..d41f7c04e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ ci-test:
 deps:
 	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
-	gdm restore
+	gdm restore --parallel false
 
 telegraf:
 	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go

From f114f6a124cd683c12c8d51bf3a723a3755af09a Mon Sep 17 00:00:00 2001
From: Chris Ottinger <Chris.ottinger@bigpond.com>
Date: Wed, 14 Mar 2018 15:08:21 +1100
Subject: [PATCH 0986/1302] Added config flag to skip collection of network
 protocol metrics (#3880)

---
 plugins/inputs/system/NET_README.md |  5 +++++
 plugins/inputs/system/net.go        | 35 ++++++++++++++++++-----------
 plugins/inputs/system/net_test.go   |  6 +++++
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/system/NET_README.md b/plugins/inputs/system/NET_README.md
index 771cabb48..f265e2448 100644
--- a/plugins/inputs/system/NET_README.md
+++ b/plugins/inputs/system/NET_README.md
@@ -14,6 +14,11 @@ This plugin gathers metrics about network interface and protocol usage (Linux on
   ##
   # interfaces = ["eth*", "enp0s[0-1]", "lo"]
   ##
+  ## On linux systems telegraf also collects protocol stats.
+  ## Setting ignore_protocol_stats to true will skip reporting of protocol metrics.
+  ##
+  # ignore_protocol_stats = false
+  ##
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/system/net.go b/plugins/inputs/system/net.go
index cfb712dfb..a7ba5c63d 100644
--- a/plugins/inputs/system/net.go
+++ b/plugins/inputs/system/net.go
@@ -14,8 +14,9 @@ type NetIOStats struct {
 	filter filter.Filter
 	ps     PS
 
-	skipChecks bool
-	Interfaces []string
+	skipChecks          bool
+	IgnoreProtocolStats bool
+	Interfaces          []string
 }
 
 func (_ *NetIOStats) Description() string {
@@ -28,6 +29,12 @@ var netSampleConfig = `
   ## regardless of status.
   ##
   # interfaces = ["eth0"]
+  ##
+  ## On linux systems telegraf also collects protocol stats.
+  ## Setting ignore_protocol_stats to true will skip reporting of protocol metrics.
+  ##
+  # ignore_protocol_stats = false
+  ##
 `
 
 func (_ *NetIOStats) SampleConfig() string {
@@ -91,19 +98,21 @@ func (s *NetIOStats) Gather(acc telegraf.Accumulator) error {
 
 	// Get system wide stats for different network protocols
 	// (ignore these stats if the call fails)
-	netprotos, _ := s.ps.NetProto()
-	fields := make(map[string]interface{})
-	for _, proto := range netprotos {
-		for stat, value := range proto.Stats {
-			name := fmt.Sprintf("%s_%s", strings.ToLower(proto.Protocol),
-				strings.ToLower(stat))
-			fields[name] = value
+	if !s.IgnoreProtocolStats {
+		netprotos, _ := s.ps.NetProto()
+		fields := make(map[string]interface{})
+		for _, proto := range netprotos {
+			for stat, value := range proto.Stats {
+				name := fmt.Sprintf("%s_%s", strings.ToLower(proto.Protocol),
+					strings.ToLower(stat))
+				fields[name] = value
+			}
 		}
+		tags := map[string]string{
+			"interface": "all",
+		}
+		acc.AddFields("net", fields, tags)
 	}
-	tags := map[string]string{
-		"interface": "all",
-	}
-	acc.AddFields("net", fields, tags)
 
 	return nil
 }
diff --git a/plugins/inputs/system/net_test.go b/plugins/inputs/system/net_test.go
index 5eb30fe4f..83b9bd460 100644
--- a/plugins/inputs/system/net_test.go
+++ b/plugins/inputs/system/net_test.go
@@ -106,4 +106,10 @@ func TestNetStats(t *testing.T) {
 		"udp_socket":      1,
 	}
 	acc.AssertContainsTaggedFields(t, "netstat", fields3, make(map[string]string))
+
+	acc.Metrics = nil
+	err = (&NetIOStats{ps: &mps, IgnoreProtocolStats: true}).Gather(&acc)
+	require.NoError(t, err)
+
+	acc.AssertDoesNotContainsTaggedFields(t, "netstat", fields3, make(map[string]string))
 }

From 4118ec76298eda2b5520d37a98d6c718796fbc5b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 13 Mar 2018 21:09:54 -0700
Subject: [PATCH 0987/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00310c38c..95b096c6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
 - [#3853](https://github.com/influxdata/telegraf/pull/3853): Add host to ping timeout log message.
 - [#3773](https://github.com/influxdata/telegraf/pull/3773): Add override processor.
 - [#3814](https://github.com/influxdata/telegraf/pull/3814): Add status_code and result tags and result_type field to http_response input.
+- [#3880](https://github.com/influxdata/telegraf/pull/3880): Added config flag to skip collection of network protocol metrics.
 
 ### Bugfixes
 

From f1b681cbdcbb888c0359e6133adff80284837102 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 14 Mar 2018 11:02:33 -0700
Subject: [PATCH 0988/1302] Use previous image on appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 651478c99..91f86cbb5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,4 @@
+image: Previous Visual Studio 2015
 version: "{build}"
 
 cache:

From 6d6631382c547718cf0011d027c6aeb2005e05c6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 14 Mar 2018 11:36:03 -0700
Subject: [PATCH 0989/1302] Remove gdm -parallel false

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d41f7c04e..3250e69ed 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ ci-test:
 deps:
 	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
-	gdm restore --parallel false
+	gdm restore
 
 telegraf:
 	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go

From 8e515688ebfabce40d0fbc509c3ad512063bb148 Mon Sep 17 00:00:00 2001
From: Jonas Hahnfeld <hahnjo@hahnjo.de>
Date: Wed, 14 Mar 2018 20:09:01 +0100
Subject: [PATCH 0990/1302] Add output of stderr in case of error to exec log
 message (#3862)

If the command failed with a non-zero exit status there might be an error
message on stderr. Append the first line to the error message to ease the
search for its cause.
---
 plugins/inputs/exec/exec.go | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/exec/exec.go b/plugins/inputs/exec/exec.go
index bcd1cc8e5..9cb86c3cd 100644
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -41,6 +41,8 @@ const sampleConfig = `
   data_format = "influx"
 `
 
+const MaxStderrBytes = 512
+
 type Exec struct {
 	Commands []string
 	Command  string
@@ -96,15 +98,41 @@ func (c CommandRunner) Run(
 
 	cmd := exec.Command(split_cmd[0], split_cmd[1:]...)
 
-	var out bytes.Buffer
+	var (
+		out    bytes.Buffer
+		stderr bytes.Buffer
+	)
 	cmd.Stdout = &out
+	cmd.Stderr = &stderr
 
 	if err := internal.RunTimeout(cmd, e.Timeout.Duration); err != nil {
 		switch e.parser.(type) {
 		case *nagios.NagiosParser:
 			AddNagiosState(err, acc)
 		default:
-			return nil, fmt.Errorf("exec: %s for command '%s'", err, command)
+			var errMessage = ""
+			if stderr.Len() > 0 {
+				stderr = removeCarriageReturns(stderr)
+				// Limit the number of bytes.
+				didTruncate := false
+				if stderr.Len() > MaxStderrBytes {
+					stderr.Truncate(MaxStderrBytes)
+					didTruncate = true
+				}
+				if i := bytes.IndexByte(stderr.Bytes(), '\n'); i > 0 {
+					// Only show truncation if the newline wasn't the last character.
+					if i < stderr.Len()-1 {
+						didTruncate = true
+					}
+					stderr.Truncate(i)
+				}
+				if didTruncate {
+					stderr.WriteString("...")
+				}
+
+				errMessage = fmt.Sprintf(": %s", stderr.String())
+			}
+			return nil, fmt.Errorf("exec: %s for command '%s'%s", err, command, errMessage)
 		}
 	} else {
 		switch e.parser.(type) {

From 6e5e2f713d157dd999daef84803d7f0995924e7a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 14 Mar 2018 12:10:16 -0700
Subject: [PATCH 0991/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95b096c6e..ddb04b1e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
 - [#3697](https://github.com/influxdata/telegraf/issues/3697): Disable keepalive in mqtt output to prevent deadlock.
 - [#3786](https://github.com/influxdata/telegraf/pull/3786): Fix collation difference in sqlserver input.
 - [#3871](https://github.com/influxdata/telegraf/pull/3871): Fix uptime metric in passenger input plugin.
+- [#3851](https://github.com/influxdata/telegraf/issues/3851): Add output of stderr in case of error to exec log message.
 
 ## v1.5.2 [2018-01-30]
 

From 2160779126246d0dc9b9056307e1af7fda6802af Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 14 Mar 2018 16:32:18 -0700
Subject: [PATCH 0992/1302] Set 1.5.3 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddb04b1e3..8076d366a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,7 +90,7 @@
 - [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
 - [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
 
-## v1.5.3 [unreleased]
+## v1.5.3 [2018-03-14]
 
 ### Bugfixes
 

From 76ce71f7fa0ef46a700be4e51826b6be66dd8edd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 16 Mar 2018 12:58:39 -0700
Subject: [PATCH 0993/1302] Fix breaker stat name in elasticsearch comment

---
 plugins/inputs/elasticsearch/README.md        | 2 +-
 plugins/inputs/elasticsearch/elasticsearch.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index 65869ae94..09ae15cc3 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -35,7 +35,7 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
 
   ## node_stats is a list of sub-stats that you want to have gathered. Valid options
   ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-  ## "breakers". Per default, all stats are gathered.
+  ## "breaker". Per default, all stats are gathered.
   # node_stats = ["jvm", "http"]
 
   ## Optional SSL Config
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 32e283df7..1f548a0e0 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -105,7 +105,7 @@ const sampleConfig = `
 
   ## node_stats is a list of sub-stats that you want to have gathered. Valid options
   ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-  ## "breakers". Per default, all stats are gathered.
+  ## "breaker". Per default, all stats are gathered.
   # node_stats = ["jvm", "http"]
 
   ## Optional SSL Config

From 6200683c29f055ca131e2fb4f89042fdd4e082c5 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Mon, 19 Mar 2018 13:04:35 -0500
Subject: [PATCH 0994/1302] Remove noisy debug message from Wavefront output
 (#3899)

---
 plugins/outputs/wavefront/wavefront.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 7f1f8c077..563e58bbd 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -126,7 +126,6 @@ func (w *Wavefront) Write(metrics []telegraf.Metric) error {
 	for _, m := range metrics {
 		for _, metricPoint := range buildMetrics(m, w) {
 			metricLine := formatMetricPoint(metricPoint, w)
-			log.Printf("D! Output [wavefront] %s", metricLine)
 			_, err := connection.Write([]byte(metricLine))
 			if err != nil {
 				return fmt.Errorf("Wavefront: TCP writing error %s", err.Error())

From cd919066d59afd1ee744fb750b1846c60ee5a9ea Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 21 Mar 2018 10:23:28 -0700
Subject: [PATCH 0995/1302] Use copy of fsnotify from tail vendor

---
 Godeps | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Godeps b/Godeps
index 80d92d39a..4b5dd4012 100644
--- a/Godeps
+++ b/Godeps
@@ -87,7 +87,6 @@ golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
 gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
-gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
 gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
 gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655

From e28f422d210b82f0e4649bf14a47ad8ee98165c8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 21 Mar 2018 23:06:14 -0700
Subject: [PATCH 0996/1302] Update fsnotify path in license of dependencies

---
 docs/LICENSE_OF_DEPENDENCIES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index cdf991c5a..91526098b 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -24,6 +24,7 @@ following works:
 - github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
 - github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
 - github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
+- github.com/fsnotify/fsnotify [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
 - github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)
@@ -99,7 +100,6 @@ following works:
 - gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
-- gopkg.in/fsnotify.v1 [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
 - gopkg.in/ldap.v2 [MIT](https://github.com/go-ldap/ldap/blob/v2.5.0/LICENSE)
 - gopkg.in/mgo.v2 [BSD](https://github.com/go-mgo/mgo/blob/v2/LICENSE)
 - gopkg.in/olivere/elastic.v5 [MIT](https://github.com/olivere/elastic/blob/v5.0.38/LICENSE)

From d7f279e3d39afaa3228964d988baad75957037b5 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Thu, 22 Mar 2018 13:38:40 -0400
Subject: [PATCH 0997/1302] Fix SQL Server 2008 compatibility (#3916)

* Fixed a bug in the performance counter query when run against SQL Server 2016 SP1-CU2. The performance counter DMV contains duplicate entries which are not handled by the query.

* Adding more stats related to workload groups.

* Adding new RG stats, removing "host" tag

* Removed workload group query

* Fixing some 2008 compat issues, removed the host field from the result set.

* Adding fixes for SQL Server 2008 compat around RG columns. Also converted perf counter query to support named instances.
---
 plugins/inputs/sqlserver/README.md    |   5 +-
 plugins/inputs/sqlserver/sqlserver.go | 416 ++++++++++++++------------
 2 files changed, 227 insertions(+), 194 deletions(-)

diff --git a/plugins/inputs/sqlserver/README.md b/plugins/inputs/sqlserver/README.md
index 6a5b62d6d..766bb95e0 100644
--- a/plugins/inputs/sqlserver/README.md
+++ b/plugins/inputs/sqlserver/README.md
@@ -52,8 +52,7 @@ GO
   ## - DatabaseStats
   ## - MemoryClerk
   ## - VolumeSpace
-  ## - PerformanceMetrics
-  # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
+  exclude_query = [ 'DatabaseIO' ]
 ```
 
 ### Metrics:
@@ -130,5 +129,5 @@ The following metrics can be used directly, with no delta calculations:
  - SQLServer:Workload Group Stats\Requests completed/sec
 
 Version 2 queries have the following tags:
-- `host`: Physical host name
 - `sql_instance`: Physical host and instance name (hostname:instance)
+
diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 7d945f791..f17574a9e 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -68,7 +68,7 @@ var sampleConfig = `
   ## - MemoryClerk
   ## - VolumeSpace
   ## - PerformanceMetrics
-  # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
+  # exclude_query = [ 'DatabaseIO' ]
 `
 
 // SampleConfig return the sample configuration
@@ -244,102 +244,108 @@ func init() {
 // Thanks Bob Ward (http://aka.ms/bobwardms)
 // and the folks at Stack Overflow (https://github.com/opserver/Opserver/blob/9c89c7e9936b58ad237b30e6f4cc6cd59c406889/Opserver.Core/Data/SQL/SQLInstance.Memory.cs)
 // for putting most of the memory clerk definitions online!
-const sqlMemoryClerkV2 = `SELECT	
-'sqlserver_memory_clerks' As [measurement],
-REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-SERVERPROPERTY('ServerName') AS [host],
+const sqlMemoryClerkV2 = `DECLARE @SQL NVARCHAR(MAX) = 'SELECT	
+"sqlserver_memory_clerks" As [measurement],
+REPLACE(@@SERVERNAME,"\",":") AS [sql_instance],
 ISNULL(clerk_names.name,mc.type) AS clerk_type,
-SUM(mc.pages_kb) AS size_kb
+SUM({pages_kb}) AS size_kb
 FROM
 sys.dm_os_memory_clerks AS mc WITH (NOLOCK)
 LEFT OUTER JOIN ( VALUES
-('CACHESTORE_BROKERDSH','Service Broker Dialog Security Header Cache'),
-('CACHESTORE_BROKERKEK','Service Broker Key Exchange Key Cache'),
-('CACHESTORE_BROKERREADONLY','Service Broker (Read-Only)'),
-('CACHESTORE_BROKERRSB','Service Broker Null Remote Service Binding Cache'),
-('CACHESTORE_BROKERTBLACS','Broker dormant rowsets'),
-('CACHESTORE_BROKERTO','Service Broker Transmission Object Cache'),
-('CACHESTORE_BROKERUSERCERTLOOKUP','Service Broker user certificates lookup result cache'),
-('CACHESTORE_CLRPROC','CLR Procedure Cache'),
-('CACHESTORE_CLRUDTINFO','CLR UDT Info'),
-('CACHESTORE_COLUMNSTOREOBJECTPOOL','Column Store Object Pool'),
-('CACHESTORE_CONVPRI','Conversation Priority Cache'),
-('CACHESTORE_EVENTS','Event Notification Cache'),
-('CACHESTORE_FULLTEXTSTOPLIST','Full Text Stoplist Cache'),
-('CACHESTORE_NOTIF','Notification Store'),
-('CACHESTORE_OBJCP','Object Plans'),
-('CACHESTORE_PHDR','Bound Trees'),
-('CACHESTORE_SEARCHPROPERTYLIST','Search Property List Cache'),
-('CACHESTORE_SEHOBTCOLUMNATTRIBUTE','SE Shared Column Metadata Cache'),
-('CACHESTORE_SQLCP','SQL Plans'),
-('CACHESTORE_STACKFRAMES','SOS_StackFramesStore'),
-('CACHESTORE_SYSTEMROWSET','System Rowset Store'),
-('CACHESTORE_TEMPTABLES','Temporary Tables & Table Variables'),
-('CACHESTORE_VIEWDEFINITIONS','View Definition Cache'),
-('CACHESTORE_XML_SELECTIVE_DG','XML DB Cache (Selective)'),
-('CACHESTORE_XMLDBATTRIBUTE','XML DB Cache (Attribute)'),
-('CACHESTORE_XMLDBELEMENT','XML DB Cache (Element)'),
-('CACHESTORE_XMLDBTYPE','XML DB Cache (Type)'),
-('CACHESTORE_XPROC','Extended Stored Procedures'),
-('MEMORYCLERK_FILETABLE','Memory Clerk (File Table)'),
-('MEMORYCLERK_FSCHUNKER','Memory Clerk (FS Chunker)'),
-('MEMORYCLERK_FULLTEXT','Full Text'),
-('MEMORYCLERK_FULLTEXT_SHMEM','Full-text IG'),
-('MEMORYCLERK_HADR','HADR'),
-('MEMORYCLERK_HOST','Host'),
-('MEMORYCLERK_LANGSVC','Language Service'),
-('MEMORYCLERK_LWC','Light Weight Cache'),
-('MEMORYCLERK_QSRANGEPREFETCH','QS Range Prefetch'),
-('MEMORYCLERK_SERIALIZATION','Serialization'),
-('MEMORYCLERK_SNI','SNI'),
-('MEMORYCLERK_SOSMEMMANAGER','SOS Memory Manager'),
-('MEMORYCLERK_SOSNODE','SOS Node'),
-('MEMORYCLERK_SOSOS','SOS Memory Clerk'),
-('MEMORYCLERK_SQLBUFFERPOOL','Buffer Pool'),
-('MEMORYCLERK_SQLCLR','CLR'),
-('MEMORYCLERK_SQLCLRASSEMBLY','CLR Assembly'),
-('MEMORYCLERK_SQLCONNECTIONPOOL','Connection Pool'),
-('MEMORYCLERK_SQLGENERAL','General'),
-('MEMORYCLERK_SQLHTTP','HTTP'),
-('MEMORYCLERK_SQLLOGPOOL','Log Pool'),
-('MEMORYCLERK_SQLOPTIMIZER','SQL Optimizer'),
-('MEMORYCLERK_SQLQERESERVATIONS','SQL Reservations'),
-('MEMORYCLERK_SQLQUERYCOMPILE','SQL Query Compile'),
-('MEMORYCLERK_SQLQUERYEXEC','SQL Query Exec'),
-('MEMORYCLERK_SQLQUERYPLAN','SQL Query Plan'),
-('MEMORYCLERK_SQLSERVICEBROKER','SQL Service Broker'),
-('MEMORYCLERK_SQLSERVICEBROKERTRANSPORT','Unified Communication Stack'),
-('MEMORYCLERK_SQLSOAP','SQL SOAP'),
-('MEMORYCLERK_SQLSOAPSESSIONSTORE','SQL SOAP (Session Store)'),
-('MEMORYCLERK_SQLSTORENG','SQL Storage Engine'),
-('MEMORYCLERK_SQLUTILITIES','SQL Utilities'),
-('MEMORYCLERK_SQLXML','SQL XML'),
-('MEMORYCLERK_SQLXP','SQL XP'),
-('MEMORYCLERK_TRACE_EVTNOTIF','Trace Event Notification'),
-('MEMORYCLERK_XE','XE Engine'),
-('MEMORYCLERK_XE_BUFFER','XE Buffer'),
-('MEMORYCLERK_XTP','In-Memory OLTP'),
-('OBJECTSTORE_LBSS','Lbss Cache (Object Store)'),
-('OBJECTSTORE_LOCK_MANAGER','Lock Manager (Object Store)'),
-('OBJECTSTORE_SECAUDIT_EVENT_BUFFER','Audit Event Buffer (Object Store)'),
-('OBJECTSTORE_SERVICE_BROKER','Service Broker (Object Store)'),
-('OBJECTSTORE_SNI_PACKET','SNI Packet (Object Store)'),
-('OBJECTSTORE_XACT_CACHE','Transactions Cache (Object Store)'),
-('USERSTORE_DBMETADATA','DB Metadata (User Store)'),
-('USERSTORE_OBJPERM','Object Permissions (User Store)'),
-('USERSTORE_SCHEMAMGR','Schema Manager (User Store)'),
-('USERSTORE_SXC','SXC (User Store)'),
-('USERSTORE_TOKENPERM','Token Permissions (User Store)'),
-('USERSTORE_QDSSTMT','QDS Statement Buffer (Pre-persist)'),
-('CACHESTORE_QDSRUNTIMESTATS','QDS Runtime Stats (Pre-persist)'),
-('CACHESTORE_QDSCONTEXTSETTINGS','QDS Unique Context Settings'),
-('MEMORYCLERK_QUERYDISKSTORE','QDS General'),
-('MEMORYCLERK_QUERYDISKSTORE_HASHMAP','QDS Query/Plan Hash Table')
+("CACHESTORE_BROKERDSH","Service Broker Dialog Security Header Cache"),
+("CACHESTORE_BROKERKEK","Service Broker Key Exchange Key Cache"),
+("CACHESTORE_BROKERREADONLY","Service Broker (Read-Only)"),
+("CACHESTORE_BROKERRSB","Service Broker Null Remote Service Binding Cache"),
+("CACHESTORE_BROKERTBLACS","Broker dormant rowsets"),
+("CACHESTORE_BROKERTO","Service Broker Transmission Object Cache"),
+("CACHESTORE_BROKERUSERCERTLOOKUP","Service Broker user certificates lookup result cache"),
+("CACHESTORE_CLRPROC","CLR Procedure Cache"),
+("CACHESTORE_CLRUDTINFO","CLR UDT Info"),
+("CACHESTORE_COLUMNSTOREOBJECTPOOL","Column Store Object Pool"),
+("CACHESTORE_CONVPRI","Conversation Priority Cache"),
+("CACHESTORE_EVENTS","Event Notification Cache"),
+("CACHESTORE_FULLTEXTSTOPLIST","Full Text Stoplist Cache"),
+("CACHESTORE_NOTIF","Notification Store"),
+("CACHESTORE_OBJCP","Object Plans"),
+("CACHESTORE_PHDR","Bound Trees"),
+("CACHESTORE_SEARCHPROPERTYLIST","Search Property List Cache"),
+("CACHESTORE_SEHOBTCOLUMNATTRIBUTE","SE Shared Column Metadata Cache"),
+("CACHESTORE_SQLCP","SQL Plans"),
+("CACHESTORE_STACKFRAMES","SOS_StackFramesStore"),
+("CACHESTORE_SYSTEMROWSET","System Rowset Store"),
+("CACHESTORE_TEMPTABLES","Temporary Tables & Table Variables"),
+("CACHESTORE_VIEWDEFINITIONS","View Definition Cache"),
+("CACHESTORE_XML_SELECTIVE_DG","XML DB Cache (Selective)"),
+("CACHESTORE_XMLDBATTRIBUTE","XML DB Cache (Attribute)"),
+("CACHESTORE_XMLDBELEMENT","XML DB Cache (Element)"),
+("CACHESTORE_XMLDBTYPE","XML DB Cache (Type)"),
+("CACHESTORE_XPROC","Extended Stored Procedures"),
+("MEMORYCLERK_FILETABLE","Memory Clerk (File Table)"),
+("MEMORYCLERK_FSCHUNKER","Memory Clerk (FS Chunker)"),
+("MEMORYCLERK_FULLTEXT","Full Text"),
+("MEMORYCLERK_FULLTEXT_SHMEM","Full-text IG"),
+("MEMORYCLERK_HADR","HADR"),
+("MEMORYCLERK_HOST","Host"),
+("MEMORYCLERK_LANGSVC","Language Service"),
+("MEMORYCLERK_LWC","Light Weight Cache"),
+("MEMORYCLERK_QSRANGEPREFETCH","QS Range Prefetch"),
+("MEMORYCLERK_SERIALIZATION","Serialization"),
+("MEMORYCLERK_SNI","SNI"),
+("MEMORYCLERK_SOSMEMMANAGER","SOS Memory Manager"),
+("MEMORYCLERK_SOSNODE","SOS Node"),
+("MEMORYCLERK_SOSOS","SOS Memory Clerk"),
+("MEMORYCLERK_SQLBUFFERPOOL","Buffer Pool"),
+("MEMORYCLERK_SQLCLR","CLR"),
+("MEMORYCLERK_SQLCLRASSEMBLY","CLR Assembly"),
+("MEMORYCLERK_SQLCONNECTIONPOOL","Connection Pool"),
+("MEMORYCLERK_SQLGENERAL","General"),
+("MEMORYCLERK_SQLHTTP","HTTP"),
+("MEMORYCLERK_SQLLOGPOOL","Log Pool"),
+("MEMORYCLERK_SQLOPTIMIZER","SQL Optimizer"),
+("MEMORYCLERK_SQLQERESERVATIONS","SQL Reservations"),
+("MEMORYCLERK_SQLQUERYCOMPILE","SQL Query Compile"),
+("MEMORYCLERK_SQLQUERYEXEC","SQL Query Exec"),
+("MEMORYCLERK_SQLQUERYPLAN","SQL Query Plan"),
+("MEMORYCLERK_SQLSERVICEBROKER","SQL Service Broker"),
+("MEMORYCLERK_SQLSERVICEBROKERTRANSPORT","Unified Communication Stack"),
+("MEMORYCLERK_SQLSOAP","SQL SOAP"),
+("MEMORYCLERK_SQLSOAPSESSIONSTORE","SQL SOAP (Session Store)"),
+("MEMORYCLERK_SQLSTORENG","SQL Storage Engine"),
+("MEMORYCLERK_SQLUTILITIES","SQL Utilities"),
+("MEMORYCLERK_SQLXML","SQL XML"),
+("MEMORYCLERK_SQLXP","SQL XP"),
+("MEMORYCLERK_TRACE_EVTNOTIF","Trace Event Notification"),
+("MEMORYCLERK_XE","XE Engine"),
+("MEMORYCLERK_XE_BUFFER","XE Buffer"),
+("MEMORYCLERK_XTP","In-Memory OLTP"),
+("OBJECTSTORE_LBSS","Lbss Cache (Object Store)"),
+("OBJECTSTORE_LOCK_MANAGER","Lock Manager (Object Store)"),
+("OBJECTSTORE_SECAUDIT_EVENT_BUFFER","Audit Event Buffer (Object Store)"),
+("OBJECTSTORE_SERVICE_BROKER","Service Broker (Object Store)"),
+("OBJECTSTORE_SNI_PACKET","SNI Packet (Object Store)"),
+("OBJECTSTORE_XACT_CACHE","Transactions Cache (Object Store)"),
+("USERSTORE_DBMETADATA","DB Metadata (User Store)"),
+("USERSTORE_OBJPERM","Object Permissions (User Store)"),
+("USERSTORE_SCHEMAMGR","Schema Manager (User Store)"),
+("USERSTORE_SXC","SXC (User Store)"),
+("USERSTORE_TOKENPERM","Token Permissions (User Store)"),
+("USERSTORE_QDSSTMT","QDS Statement Buffer (Pre-persist)"),
+("CACHESTORE_QDSRUNTIMESTATS","QDS Runtime Stats (Pre-persist)"),
+("CACHESTORE_QDSCONTEXTSETTINGS","QDS Unique Context Settings"),
+("MEMORYCLERK_QUERYDISKSTORE","QDS General"),
+("MEMORYCLERK_QUERYDISKSTORE_HASHMAP","QDS Query/Plan Hash Table")
 ) AS clerk_names(system_name,name)
 ON mc.type = clerk_names.system_name
 GROUP BY ISNULL(clerk_names.name,mc.type)
-HAVING SUM(pages_kb) >= 1024
-OPTION( RECOMPILE );
+HAVING SUM({pages_kb}) >= 1024
+OPTION( RECOMPILE );'
+
+IF CAST(LEFT(CAST(SERVERPROPERTY('productversion') as varchar), 2) AS INT) > 10 -- SQL Server 2008 Compat
+    SET @SQL = REPLACE(REPLACE(@SQL,'{pages_kb}','mc.pages_kb'),'"','''')
+ELSE
+    SET @SQL = REPLACE(REPLACE(@SQL,'{pages_kb}','mc.single_pages_kb + mc.multi_pages_kb'),'"','''')
+
+EXEC(@SQL)
 `
 
 const sqlDatabaseIOV2 = `SELECT
@@ -368,13 +374,12 @@ const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (
 IF OBJECT_ID('master.sys.dm_os_sys_info') IS NOT NULL
 BEGIN
 	INSERT INTO @sys_info ( cpu_count, server_memory, uptime )
-	EXEC('SELECT cpu_count, physical_memory_kb, DATEDIFF(MINUTE,sqlserver_start_time,GETDATE())	FROM sys.dm_os_sys_info')
+	EXEC('SELECT cpu_count, (select total_physical_memory_kb from sys.dm_os_sys_memory) AS physical_memory_kb, DATEDIFF(MINUTE,sqlserver_start_time,GETDATE()) FROM sys.dm_os_sys_info')
 END
 
 SELECT
 'sqlserver_server_properties' As [measurement],
 REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-SERVERPROPERTY('ServerName') AS [host],
 SUM( CASE WHEN state = 0 THEN 1 ELSE 0 END ) AS db_online,
 SUM( CASE WHEN state = 1 THEN 1 ELSE 0 END ) AS db_restoring,
 SUM( CASE WHEN state = 2 THEN 1 ELSE 0 END ) AS db_recovering,
@@ -393,7 +398,10 @@ CROSS APPLY (
 OPTION( RECOMPILE );
 `
 
-const sqlPerformanceCountersV2 string = `DECLARE @PCounters TABLE
+const sqlPerformanceCountersV2 string = `DECLARE @DynamicPerf NVARCHAR(MAX) = ''
+
+SET @DynamicPerf += REPLACE('
+DECLARE @PCounters TABLE
 (
 	object_name nvarchar(128),
 	counter_name nvarchar(128),
@@ -413,130 +421,157 @@ SELECT	DISTINCT
 FROM	sys.dm_os_performance_counters AS spi
 WHERE	(
 		counter_name IN (
-			'SQL Compilations/sec',
-			'SQL Re-Compilations/sec',
-			'User Connections',
-			'Batch Requests/sec',
-			'Logouts/sec',
-			'Logins/sec',
-			'Processes blocked',
-			'Latch Waits/sec',
-			'Full Scans/sec',
-			'Index Searches/sec',
-			'Page Splits/sec',
-			'Page Lookups/sec',
-			'Page Reads/sec',
-			'Page Writes/sec',
-			'Readahead Pages/sec',
-			'Lazy Writes/sec',
-			'Checkpoint Pages/sec',
-			'Page life expectancy',
-			'Log File(s) Size (KB)',
-			'Log File(s) Used Size (KB)',
-			'Data File(s) Size (KB)',
-			'Transactions/sec',
-			'Write Transactions/sec',
-			'Active Temp Tables',
-			'Temp Tables Creation Rate',
-			'Temp Tables For Destruction',
-			'Free Space in tempdb (KB)',
-			'Version Store Size (KB)',
-			'Memory Grants Pending',
-			'Free list stalls/sec',
-			'Buffer cache hit ratio',
-			'Buffer cache hit ratio base',
-			'Backup/Restore Throughput/sec',
-			'Total Server Memory (KB)',
-			'Target Server Memory (KB)'
+			"SQL Compilations/sec",
+			"SQL Re-Compilations/sec",
+			"User Connections",
+			"Batch Requests/sec",
+			"Logouts/sec",
+			"Logins/sec",
+			"Processes blocked",
+			"Latch Waits/sec",
+			"Full Scans/sec",
+			"Index Searches/sec",
+			"Page Splits/sec",
+			"Page Lookups/sec",
+			"Page Reads/sec",
+			"Page Writes/sec",
+			"Readahead Pages/sec",
+			"Lazy Writes/sec",
+			"Checkpoint Pages/sec",
+			"Page life expectancy",
+			"Log File(s) Size (KB)",
+			"Log File(s) Used Size (KB)",
+			"Data File(s) Size (KB)",
+			"Transactions/sec",
+			"Write Transactions/sec",
+			"Active Temp Tables",
+			"Temp Tables Creation Rate",
+			"Temp Tables For Destruction",
+			"Free Space in tempdb (KB)",
+			"Version Store Size (KB)",
+			"Memory Grants Pending",
+			"Free list stalls/sec",
+			"Buffer cache hit ratio",
+			"Buffer cache hit ratio base",
+			"Backup/Restore Throughput/sec",
+			"Total Server Memory (KB)",
+			"Target Server Memory (KB)"
 		)
 		) OR (
-			instance_name IN ('_Total','Column store object pool')
+			instance_name IN ("_Total","Column store object pool")
 			AND counter_name IN (
-				'Log Flushes/sec',
-				'Log Flush Wait Time',
-				'Lock Timeouts/sec',
-				'Number of Deadlocks/sec',
-				'Lock Waits/sec',
-				'Latch Waits/sec',
-				'Memory broker clerk size',
-				'Log Bytes Flushed/sec',
-				'Bytes Sent to Replica/sec',
-				'Log Send Queue',
-				'Bytes Sent to Transport/sec',
-				'Sends to Replica/sec',
-				'Bytes Sent to Transport/sec',
-				'Sends to Transport/sec',
-				'Bytes Received from Replica/sec',
-				'Receives from Replica/sec',
-				'Flow Control Time (ms/sec)',
-				'Flow Control/sec',
-				'Resent Messages/sec',
-				'Redone Bytes/sec',
-				'XTP Memory Used (KB)'
+				"Log Flushes/sec",
+				"Log Flush Wait Time",
+				"Lock Timeouts/sec",
+				"Number of Deadlocks/sec",
+				"Lock Waits/sec",
+				"Latch Waits/sec",
+				"Memory broker clerk size",
+				"Log Bytes Flushed/sec",
+				"Bytes Sent to Replica/sec",
+				"Log Send Queue",
+				"Bytes Sent to Transport/sec",
+				"Sends to Replica/sec",
+				"Bytes Sent to Transport/sec",
+				"Sends to Transport/sec",
+				"Bytes Received from Replica/sec",
+				"Receives from Replica/sec",
+				"Flow Control Time (ms/sec)",
+				"Flow Control/sec",
+				"Resent Messages/sec",
+				"Redone Bytes/sec",
+				"XTP Memory Used (KB)"
 			) OR ( 
-				object_name = 'SQLServer:Database Replica'
-				AND counter_name IN (
-					'Log Bytes Received/sec',
-					'Log Apply Pending Queue',
-					'Redone Bytes/sec',
-					'Recovery Queue',
-					'Log Apply Ready Queue'
+				counter_name IN (
+					"Log Bytes Received/sec",
+					"Log Apply Pending Queue",
+					"Redone Bytes/sec",
+					"Recovery Queue",
+					"Log Apply Ready Queue"
 				)
-				AND instance_name = '_Total'
+				AND instance_name = "_Total"
 			)
 		) OR (
-			object_name = 'SQLServer:Database Replica'
-			AND counter_name IN ('Transaction Delay')
+			counter_name IN ("Transaction Delay")
 		) OR (
-			object_name = 'SQLServer:Workload Group Stats'
-			AND counter_name IN (
-				'CPU usage %',
-				'CPU usage % base',
-				'Queued requests',
-				'Requests completed/sec',
-				'Blocked tasks'
+			counter_name IN (
+				"CPU usage %",
+				"CPU usage % base",
+				"Queued requests",
+				"Requests completed/sec",
+				"Blocked tasks"
 			)
 		) OR (
-			object_name = 'SQLServer:Resource Pool Stats'
-			AND counter_name IN (
-				'Active memory grant amount (KB)',
-				'Disk Read Bytes/sec',
-				'Disk Read IO Throttled/sec',
-				'Disk Read IO/sec',
-				'Disk Write Bytes/sec',
-				'Disk Write IO Throttled/sec',
-				'Disk Write IO/sec',
-				'Used memory (KB)'
+			counter_name IN (
+				"Active memory grant amount (KB)",
+				"Disk Read Bytes/sec",
+				"Disk Read IO Throttled/sec",
+				"Disk Read IO/sec",
+				"Disk Write Bytes/sec",
+				"Disk Write IO Throttled/sec",
+				"Disk Write IO/sec",
+				"Used memory (KB)"
 			)
-		) OR object_name IN (
-			'SQLServer:User Settable',
-			'SQLServer:SQL Errors'
+		) OR  (
+			object_name LIKE "%User Settable%"
+			OR object_name LIKE "%SQL Errors%"
 		)
+'
+,'"','''')
 
-SELECT	'sqlserver_performance' AS [measurement],
-		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-		SERVERPROPERTY('ServerName') AS [host],
+SET @DynamicPerf += REPLACE('
+SELECT	"sqlserver_performance" AS [measurement],
+		REPLACE(@@SERVERNAME,"\",":") AS [sql_instance],
 		pc.object_name AS [object],
 		pc.counter_name AS [counter],
-		CASE pc.instance_name WHEN '_Total' THEN 'Total' ELSE ISNULL(pc.instance_name,'') END AS [instance],
+		CASE pc.instance_name WHEN "_Total" THEN "Total" ELSE ISNULL(pc.instance_name,"") END AS [instance],
 		CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS [value]
 FROM	@PCounters AS pc
 		LEFT OUTER JOIN @PCounters AS pc1
 			ON (
-				pc.counter_name = REPLACE(pc1.counter_name,' base','')
-				OR pc.counter_name = REPLACE(pc1.counter_name,' base',' (ms)')
+				pc.counter_name = REPLACE(pc1.counter_name," base","")
+				OR pc.counter_name = REPLACE(pc1.counter_name," base"," (ms)")
 			)
 			AND pc.object_name = pc1.object_name
 			AND pc.instance_name = pc1.instance_name
-			AND pc1.counter_name LIKE '%base'
-WHERE	pc.counter_name NOT LIKE '% base'
-OPTION( RECOMPILE );
+			AND pc1.counter_name LIKE "%base"
+WHERE	pc.counter_name NOT LIKE "% base"
+UNION ALL
+SELECT
+"sqlserver_performance" As [measurement],
+REPLACE(@@SERVERNAME,"\",":") AS [sql_instance],
+"SQLServer:Workload Group Stats" AS object,
+counter,
+instance,
+vs.value
+FROM
+(
+    SELECT 
+    rgwg.name AS instance,
+    rgwg.total_request_count AS "Request Count",
+    rgwg.total_queued_request_count AS "Queued Request Count",
+    rgwg.total_cpu_limit_violation_count AS "CPU Limit Violation Count",
+    rgwg.total_cpu_usage_ms AS "CPU Usage (time)",
+    ' + CASE WHEN SERVERPROPERTY('ProductMajorVersion') > 10 THEN 'rgwg.total_cpu_usage_preemptive_ms AS "Premptive CPU Usage (time)",' ELSE '' END + '
+    rgwg.total_lock_wait_count AS "Lock Wait Count",
+    rgwg.total_lock_wait_time_ms AS "Lock Wait Time",
+    rgwg.total_reduced_memgrant_count AS "Reduced Memory Grant Count"
+    FROM sys.dm_resource_governor_workload_groups AS rgwg
+    INNER JOIN sys.dm_resource_governor_resource_pools AS rgrp
+    ON rgwg.pool_id = rgrp.pool_id
+) AS rg
+UNPIVOT (
+    value FOR counter IN ( [Request Count], [Queued Request Count], [CPU Limit Violation Count], [CPU Usage (time)], ' + CASE WHEN SERVERPROPERTY('ProductMajorVersion') > 10 THEN '[Premptive CPU Usage (time)], ' ELSE '' END + '[Lock Wait Count], [Lock Wait Time], [Reduced Memory Grant Count] )
+) AS vs
+OPTION(RECOMPILE);'
+,'"','''')
+
+EXEC(@DynamicPerf)
 `
 
 const sqlWaitStatsCategorizedV2 string = `SELECT
 'sqlserver_waitstats' AS [measurement],
 REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-SERVERPROPERTY('ServerName') AS [host],
 ws.wait_type,
 wait_time_ms,
 wait_time_ms - signal_wait_time_ms AS [resource_wait_ms],
@@ -1098,7 +1133,6 @@ BEGIN
 	SELECT TOP(1)
 		'sqlserver_azurestats' AS [measurement],
 		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-		SERVERPROPERTY('ServerName') AS [host],
 		avg_cpu_percent,
 		avg_data_io_percent,
 		avg_log_write_percent,

From 3658ac8f53e4b2b3dc39b2d8672fa31dd1101d2d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 21 Feb 2018 14:25:13 -0800
Subject: [PATCH 0998/1302] Skip hanging test on darwin

---
 plugins/inputs/http_listener/http_listener_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index f4569cadf..1c2e77e70 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"runtime"
 	"strconv"
 	"sync"
 	"testing"
@@ -425,6 +426,9 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 
 // writes 25,000 metrics to the listener with 10 different writers
 func TestWriteHTTPHighTraffic(t *testing.T) {
+	if runtime.GOOS != "darwin" {
+		t.Skip("Skipping due to hang on darwin")
+	}
 	listener := newTestHTTPListener()
 
 	acc := &testutil.Accumulator{}

From be9d4f4be0e4c4fa8e80163f7e269fb39e49a92b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 23 Mar 2018 11:50:52 -0700
Subject: [PATCH 0999/1302] Add tag for target url to phpfpm input (#3928)

---
 plugins/inputs/phpfpm/README.md      | 110 +++++++++++++--------------
 plugins/inputs/phpfpm/phpfpm.go      |  11 +--
 plugins/inputs/phpfpm/phpfpm_test.go |   4 +
 3 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/plugins/inputs/phpfpm/README.md b/plugins/inputs/phpfpm/README.md
index 117d24298..aed41ada6 100644
--- a/plugins/inputs/phpfpm/README.md
+++ b/plugins/inputs/phpfpm/README.md
@@ -1,65 +1,59 @@
-# Telegraf plugin: phpfpm
+# PHP-FPM Input Plugin
 
-Get phpfpm stat using either HTTP status page or fpm socket.
+Get phpfpm stats using either HTTP status page or fpm socket.
 
-# Measurements
-
-Meta:
-
-- tags: `pool=poolname`
-
-Measurement names:
-
-- phpfpm
-
-Measurement field:
-
-- accepted_conn
-- listen_queue
-- max_listen_queue
-- listen_queue_len
-- idle_processes
-- active_processes
-- total_processes
-- max_active_processes
-- max_children_reached
-- slow_requests
-
-# Example output
-
-Using this configuration:
+### Configuration:
 
+```toml
+# Read metrics of phpfpm, via HTTP status page or socket
+[[inputs.phpfpm]]
+  ## An array of addresses to gather stats about. Specify an ip or hostname
+  ## with optional port and path
+  ##
+  ## Plugin can be configured in three modes (either can be used):
+  ##   - http: the URL must start with http:// or https://, ie:
+  ##       "http://localhost/status"
+  ##       "http://192.168.130.1/status?full"
+  ##
+  ##   - unixsocket: path to fpm socket, ie:
+  ##       "/var/run/php5-fpm.sock"
+  ##      or using a custom fpm status path:
+  ##       "/var/run/php5-fpm.sock:fpm-custom-status-path"
+  ##
+  ##   - fcgi: the URL must start with fcgi:// or cgi://, and port must be present, ie:
+  ##       "fcgi://10.0.0.12:9000/status"
+  ##       "cgi://10.0.10.12:9001/status"
+  ##
+  ## Example of multiple gathering from local socket and remove host
+  ## urls = ["http://192.168.1.20/status", "/tmp/fpm.sock"]
+  urls = ["http://localhost/status"]
 ```
-[phpfpm]
-  # An array of address to gather stats about. Specify an ip on hostname
-  # with optional port and path. ie localhost, 10.10.3.33/server-status, etc.
-  #
-  # We can configure in three modes:
-  #   - unixsocket: the string is the path to fpm socket like
-  #      /var/run/php5-fpm.sock
-  #   - http: the URL has to start with http:// or https://
-  #   - fcgi: the URL has to start with fcgi:// or cgi://, and socket port must present
-  #
-  # If no servers are specified, then default to 127.0.0.1/server-status
-  urls = ["http://localhost/status", "10.0.0.12:/var/run/php5-fpm-www2.sock", "fcgi://10.0.0.12:9000/status"]
-```
-
-When run with:
-
-```
-./telegraf --config telegraf.conf --input-filter phpfpm --test
-```
-
-It produces:
-
-```
-* Plugin: phpfpm, Collection 1
-> phpfpm,pool=www accepted_conn=13i,active_processes=2i,idle_processes=1i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083331187
-> phpfpm,pool=www2 accepted_conn=12i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083691422
-> phpfpm,pool=www3 accepted_conn=11i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083691658
-```
-
-## Note
 
 When using `unixsocket`, you have to ensure that telegraf runs on same
 host, and socket path is accessible to telegraf user.
+
+### Metrics:
+
+- phpfpm
+  - tags:
+    - pool
+    - url
+  - fields:
+    - accepted_conn
+    - listen_queue
+    - max_listen_queue
+    - listen_queue_len
+    - idle_processes
+    - active_processes
+    - total_processes
+    - max_active_processes
+    - max_children_reached
+    - slow_requests
+
+# Example Output
+
+```
+phpfpm,pool=www accepted_conn=13i,active_processes=2i,idle_processes=1i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083331187
+phpfpm,pool=www2 accepted_conn=12i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083691422
+phpfpm,pool=www3 accepted_conn=11i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i 1453011293083691658
+```
diff --git a/plugins/inputs/phpfpm/phpfpm.go b/plugins/inputs/phpfpm/phpfpm.go
index 36cd02f59..e40dae174 100644
--- a/plugins/inputs/phpfpm/phpfpm.go
+++ b/plugins/inputs/phpfpm/phpfpm.go
@@ -148,11 +148,11 @@ func (g *phpfpm) gatherServer(addr string, acc telegraf.Accumulator) error {
 		return err
 	}
 
-	return g.gatherFcgi(fcgi, statusPath, acc)
+	return g.gatherFcgi(fcgi, statusPath, acc, addr)
 }
 
 // Gather stat using fcgi protocol
-func (g *phpfpm) gatherFcgi(fcgi *conn, statusPath string, acc telegraf.Accumulator) error {
+func (g *phpfpm) gatherFcgi(fcgi *conn, statusPath string, acc telegraf.Accumulator, addr string) error {
 	fpmOutput, fpmErr, err := fcgi.Request(map[string]string{
 		"SCRIPT_NAME":     "/" + statusPath,
 		"SCRIPT_FILENAME": statusPath,
@@ -164,7 +164,7 @@ func (g *phpfpm) gatherFcgi(fcgi *conn, statusPath string, acc telegraf.Accumula
 	}, "/"+statusPath)
 
 	if len(fpmErr) == 0 && err == nil {
-		importMetric(bytes.NewReader(fpmOutput), acc)
+		importMetric(bytes.NewReader(fpmOutput), acc, addr)
 		return nil
 	} else {
 		return fmt.Errorf("Unable parse phpfpm status. Error: %v %v", string(fpmErr), err)
@@ -192,12 +192,12 @@ func (g *phpfpm) gatherHttp(addr string, acc telegraf.Accumulator) error {
 			addr, err)
 	}
 
-	importMetric(res.Body, acc)
+	importMetric(res.Body, acc, addr)
 	return nil
 }
 
 // Import stat data into Telegraf system
-func importMetric(r io.Reader, acc telegraf.Accumulator) (poolStat, error) {
+func importMetric(r io.Reader, acc telegraf.Accumulator, addr string) (poolStat, error) {
 	stats := make(poolStat)
 	var currentPool string
 
@@ -240,6 +240,7 @@ func importMetric(r io.Reader, acc telegraf.Accumulator) (poolStat, error) {
 	for pool := range stats {
 		tags := map[string]string{
 			"pool": pool,
+			"url":  addr,
 		}
 		fields := make(map[string]interface{})
 		for k, v := range stats[pool] {
diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go
index 2f470c72b..ba24b0f36 100644
--- a/plugins/inputs/phpfpm/phpfpm_test.go
+++ b/plugins/inputs/phpfpm/phpfpm_test.go
@@ -40,6 +40,7 @@ func TestPhpFpmGeneratesMetrics_From_Http(t *testing.T) {
 
 	tags := map[string]string{
 		"pool": "www",
+		"url":  ts.URL,
 	}
 
 	fields := map[string]interface{}{
@@ -80,6 +81,7 @@ func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
 
 	tags := map[string]string{
 		"pool": "www",
+		"url":  r.Urls[0],
 	}
 
 	fields := map[string]interface{}{
@@ -124,6 +126,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket(t *testing.T) {
 
 	tags := map[string]string{
 		"pool": "www",
+		"url":  r.Urls[0],
 	}
 
 	fields := map[string]interface{}{
@@ -168,6 +171,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket_Custom_Status_Path(t *testing.T) {
 
 	tags := map[string]string{
 		"pool": "www",
+		"url":  r.Urls[0],
 	}
 
 	fields := map[string]interface{}{

From 729388f4dd8e7de782568cdf4682ef051a1a47cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Mar 2018 11:52:00 -0700
Subject: [PATCH 1000/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8076d366a..8b7660db1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
 - [#3810](https://github.com/influxdata/telegraf/issues/3810): Fix metric buffer limit in internal plugin after reload.
 - [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
 - [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
+- [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
 
 ## v1.5.3 [2018-03-14]
 

From e8fc3ca70c2abc45af0fdf6fa7ab5cf689716586 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 23 Mar 2018 11:53:18 -0700
Subject: [PATCH 1001/1302] Add TLS support to kapacitor input (#3927)

---
 plugins/inputs/kapacitor/README.md    |  7 +++++
 plugins/inputs/kapacitor/kapacitor.go | 39 ++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/kapacitor/README.md b/plugins/inputs/kapacitor/README.md
index 822aef1bf..ae5b365da 100644
--- a/plugins/inputs/kapacitor/README.md
+++ b/plugins/inputs/kapacitor/README.md
@@ -14,6 +14,13 @@ The Kapacitor plugin will collect metrics from the given Kapacitor instances.
 
   ## Time limit for http requests
   timeout = "5s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 ```
 
 ### Measurements & Fields
diff --git a/plugins/inputs/kapacitor/kapacitor.go b/plugins/inputs/kapacitor/kapacitor.go
index 4c75bd0ce..ea0ca055b 100644
--- a/plugins/inputs/kapacitor/kapacitor.go
+++ b/plugins/inputs/kapacitor/kapacitor.go
@@ -21,6 +21,15 @@ type Kapacitor struct {
 
 	Timeout internal.Duration
 
+	// Path to CA file
+	SSLCA string `toml:"ssl_ca"`
+	// Path to host cert file
+	SSLCert string `toml:"ssl_cert"`
+	// Path to cert key file
+	SSLKey string `toml:"ssl_key"`
+	// Use SSL but skip chain & host verification
+	InsecureSkipVerify bool
+
 	client *http.Client
 }
 
@@ -38,12 +47,23 @@ func (*Kapacitor) SampleConfig() string {
 
   ## Time limit for http requests
   timeout = "5s"
+
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
 `
 }
 
 func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
 	if k.client == nil {
-		k.client = &http.Client{Timeout: k.Timeout.Duration}
+		client, err := k.createHttpClient()
+		if err != nil {
+			return err
+		}
+		k.client = client
 	}
 
 	var wg sync.WaitGroup
@@ -61,6 +81,23 @@ func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func (k *Kapacitor) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := internal.GetTLSConfig(
+		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: k.Timeout.Duration,
+	}
+
+	return client, nil
+}
+
 type object struct {
 	Name   string                 `json:"name"`
 	Values map[string]interface{} `json:"values"`

From 05393da939dce0b21eaa2a84731946622566934b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Mar 2018 11:54:06 -0700
Subject: [PATCH 1002/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b7660db1..c3975a1f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
 - [#3773](https://github.com/influxdata/telegraf/pull/3773): Add override processor.
 - [#3814](https://github.com/influxdata/telegraf/pull/3814): Add status_code and result tags and result_type field to http_response input.
 - [#3880](https://github.com/influxdata/telegraf/pull/3880): Added config flag to skip collection of network protocol metrics.
+- [#3927](https://github.com/influxdata/telegraf/pull/3927): Add TLS support to kapacitor input.
 
 ### Bugfixes
 

From def76ace3be448bb5a8aa28dd8eaf6949a97665c Mon Sep 17 00:00:00 2001
From: Evan Kinney <evan@evan.cat>
Date: Fri, 23 Mar 2018 14:56:49 -0400
Subject: [PATCH 1003/1302] Add HTTP basic auth support to the http_listener
 input (#3496)

---
 etc/telegraf.conf                             |  5 ++
 plugins/inputs/http_listener/README.md        |  6 +++
 plugins/inputs/http_listener/http_listener.go | 46 ++++++++++++++++---
 .../http_listener/http_listener_test.go       | 28 +++++++++++
 4 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 63e3cf5bc..8b78ed331 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2862,6 +2862,11 @@
 #   ## Add service certificate and key
 #   tls_cert = "/etc/telegraf/cert.pem"
 #   tls_key = "/etc/telegraf/key.pem"
+#
+#   ## Optional username and password to accept for HTTP basic authentication.
+#   ## You probably want to make sure you have TLS configured above for this.
+#   basic_username = "foobar"
+#   basic_password = "barfoo"
 
 
 # # Read metrics from Kafka topic(s)
diff --git a/plugins/inputs/http_listener/README.md b/plugins/inputs/http_listener/README.md
index 65fef036e..f1ff71f0a 100644
--- a/plugins/inputs/http_listener/README.md
+++ b/plugins/inputs/http_listener/README.md
@@ -12,6 +12,8 @@ Enable TLS by specifying the file names of a service TLS certificate and key.
 
 Enable mutually authenticated TLS and authorize client connections by signing certificate authority by including a list of allowed CA certificate file names in ````tls_allowed_cacerts````.
 
+Enable basic HTTP authentication of clients by specifying a username and password to check for. These credentials will be received from the client _as plain text_ if TLS is not configured.
+
 See: [Telegraf Input Data Formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx).
 
 **Example:**
@@ -39,4 +41,8 @@ This is a sample configuration for the plugin.
 
   ## MTLS
   tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+
+  ## Basic authentication
+  basic_username = "foobar"
+  basic_password = "barfoo"
 ```
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index c1153b149..834a0b2ab 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -3,6 +3,7 @@ package http_listener
 import (
 	"bytes"
 	"compress/gzip"
+	"crypto/subtle"
 	"crypto/tls"
 	"crypto/x509"
 	"io"
@@ -44,6 +45,9 @@ type HTTPListener struct {
 	TlsCert           string
 	TlsKey            string
 
+	BasicUsername string
+	BasicPassword string
+
 	mu sync.Mutex
 	wg sync.WaitGroup
 
@@ -64,6 +68,7 @@ type HTTPListener struct {
 	PingsRecv       selfstat.Stat
 	NotFoundsServed selfstat.Stat
 	BuffersCreated  selfstat.Stat
+	AuthFailures    selfstat.Stat
 }
 
 const sampleConfig = `
@@ -90,6 +95,11 @@ const sampleConfig = `
   ## Add service certificate and key
   tls_cert = "/etc/telegraf/cert.pem"
   tls_key = "/etc/telegraf/key.pem"
+
+  ## Optional username and password to accept for HTTP basic authentication.
+  ## You probably want to make sure you have TLS configured above for this.
+  # basic_username = "foobar"
+  # basic_password = "barfoo"
 `
 
 func (h *HTTPListener) SampleConfig() string {
@@ -124,6 +134,7 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.PingsRecv = selfstat.Register("http_listener", "pings_received", tags)
 	h.NotFoundsServed = selfstat.Register("http_listener", "not_founds_served", tags)
 	h.BuffersCreated = selfstat.Register("http_listener", "buffers_created", tags)
+	h.AuthFailures = selfstat.Register("http_listener", "auth_failures", tags)
 
 	if h.MaxBodySize == 0 {
 		h.MaxBodySize = DEFAULT_MAX_BODY_SIZE
@@ -194,25 +205,29 @@ func (h *HTTPListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	case "/write":
 		h.WritesRecv.Incr(1)
 		defer h.WritesServed.Incr(1)
-		h.serveWrite(res, req)
+		h.AuthenticateIfSet(h.serveWrite, res, req)
 	case "/query":
 		h.QueriesRecv.Incr(1)
 		defer h.QueriesServed.Incr(1)
 		// Deliver a dummy response to the query endpoint, as some InfluxDB
 		// clients test endpoint availability with a query
-		res.Header().Set("Content-Type", "application/json")
-		res.Header().Set("X-Influxdb-Version", "1.0")
-		res.WriteHeader(http.StatusOK)
-		res.Write([]byte("{\"results\":[]}"))
+		h.AuthenticateIfSet(func(res http.ResponseWriter, req *http.Request) {
+			res.Header().Set("Content-Type", "application/json")
+			res.Header().Set("X-Influxdb-Version", "1.0")
+			res.WriteHeader(http.StatusOK)
+			res.Write([]byte("{\"results\":[]}"))
+		}, res, req)
 	case "/ping":
 		h.PingsRecv.Incr(1)
 		defer h.PingsServed.Incr(1)
 		// respond to ping requests
-		res.WriteHeader(http.StatusNoContent)
+		h.AuthenticateIfSet(func(res http.ResponseWriter, req *http.Request) {
+			res.WriteHeader(http.StatusNoContent)
+		}, res, req)
 	default:
 		defer h.NotFoundsServed.Incr(1)
 		// Don't know how to respond to calls to other endpoints
-		http.NotFound(res, req)
+		h.AuthenticateIfSet(http.NotFound, res, req)
 	}
 }
 
@@ -376,6 +391,23 @@ func (h *HTTPListener) getTLSConfig() *tls.Config {
 	return tlsConf
 }
 
+func (h *HTTPListener) AuthenticateIfSet(handler http.HandlerFunc, res http.ResponseWriter, req *http.Request) {
+	if h.BasicUsername != "" && h.BasicPassword != "" {
+		reqUsername, reqPassword, ok := req.BasicAuth()
+		if !ok ||
+			subtle.ConstantTimeCompare([]byte(reqUsername), []byte(h.BasicUsername)) != 1 ||
+			subtle.ConstantTimeCompare([]byte(reqPassword), []byte(h.BasicPassword)) != 1 {
+
+			h.AuthFailures.Incr(1)
+			http.Error(res, "Unauthorized.", http.StatusUnauthorized)
+			return
+		}
+		handler(res, req)
+	} else {
+		handler(res, req)
+	}
+}
+
 func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 1c2e77e70..0b8b7a450 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -101,6 +101,9 @@ NsFlcGACj+/TvacFYlA6N2nyFeokzoqLX28Ddxdh2erXqJ4hYIhT1ik9tkLggs2z
 1T1084BquCuO6lIcOwJBALX4xChoMUF9k0IxSQzlz//seQYDkQNsE7y9IgAOXkzp
 RaR4pzgPbnKj7atG+2dBnffWfE+1Mcy0INDAO6WxPg0=
 -----END RSA PRIVATE KEY-----`
+
+	basicUsername = "test-username-please-ignore"
+	basicPassword = "super-secure-password!"
 )
 
 var (
@@ -120,6 +123,13 @@ func newTestHTTPListener() *HTTPListener {
 	return listener
 }
 
+func newTestHTTPAuthListener() *HTTPListener {
+	listener := newTestHTTPListener()
+	listener.BasicUsername = basicUsername
+	listener.BasicPassword = basicPassword
+	return listener
+}
+
 func newTestHTTPSListener() *HTTPListener {
 	initServiceCertFiles.Do(func() {
 		acaf, err := ioutil.TempFile("", "allowedCAFile.crt")
@@ -239,6 +249,24 @@ func TestWriteHTTPSWithClientAuth(t *testing.T) {
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
+func TestWriteHTTPBasicAuth(t *testing.T) {
+	listener := newTestHTTPAuthListener()
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	client := &http.Client{}
+
+	req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg)))
+	require.NoError(t, err)
+	req.SetBasicAuth(basicUsername, basicPassword)
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	resp.Body.Close()
+	require.EqualValues(t, http.StatusNoContent, resp.StatusCode)
+}
+
 func TestWriteHTTP(t *testing.T) {
 	listener := newTestHTTPListener()
 

From 3469e74dd9047324b7dd66fee4c43ab41f20c6f5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Mar 2018 11:57:42 -0700
Subject: [PATCH 1004/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3975a1f0..20a8d9d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@
 - [#3814](https://github.com/influxdata/telegraf/pull/3814): Add status_code and result tags and result_type field to http_response input.
 - [#3880](https://github.com/influxdata/telegraf/pull/3880): Added config flag to skip collection of network protocol metrics.
 - [#3927](https://github.com/influxdata/telegraf/pull/3927): Add TLS support to kapacitor input.
+- [#3496](https://github.com/influxdata/telegraf/pull/3496): Add HTTP basic auth support to the http_listener input.
 
 ### Bugfixes
 

From a4870e6a6d2f1503b2feea689207bd5093c6033a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 23 Mar 2018 19:14:07 -0700
Subject: [PATCH 1005/1302] Fix DC/OS URL creation race (#3932)

---
 plugins/inputs/dcos/client.go      | 13 ++++--
 plugins/inputs/dcos/client_test.go | 67 ++++++++++++++++++------------
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/plugins/inputs/dcos/client.go b/plugins/inputs/dcos/client.go
index 50d78482f..c7561ee35 100644
--- a/plugins/inputs/dcos/client.go
+++ b/plugins/inputs/dcos/client.go
@@ -31,6 +31,7 @@ type Client interface {
 }
 
 type APIError struct {
+	URL         string
 	StatusCode  int
 	Title       string
 	Description string
@@ -105,9 +106,9 @@ type claims struct {
 
 func (e APIError) Error() string {
 	if e.Description != "" {
-		return fmt.Sprintf("%s: %s", e.Title, e.Description)
+		return fmt.Sprintf("[%s] %s: %s", e.URL, e.Title, e.Description)
 	}
-	return e.Title
+	return fmt.Sprintf("[%s] %s", e.URL, e.Title)
 }
 
 func NewClusterClient(
@@ -156,7 +157,8 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 		return nil, err
 	}
 
-	req, err := http.NewRequest("POST", c.url("/acs/api/v1/auth/login"), bytes.NewBuffer(octets))
+	loc := c.url("/acs/api/v1/auth/login")
+	req, err := http.NewRequest("POST", loc, bytes.NewBuffer(octets))
 	if err != nil {
 		return nil, err
 	}
@@ -189,6 +191,7 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 	err = dec.Decode(loginError)
 	if err != nil {
 		err := &APIError{
+			URL:        loc,
 			StatusCode: resp.StatusCode,
 			Title:      resp.Status,
 		}
@@ -196,6 +199,7 @@ func (c *ClusterClient) Login(ctx context.Context, sa *ServiceAccount) (*AuthTok
 	}
 
 	err = &APIError{
+		URL:         loc,
 		StatusCode:  resp.StatusCode,
 		Title:       loginError.Title,
 		Description: loginError.Description,
@@ -301,6 +305,7 @@ func (c *ClusterClient) doGet(ctx context.Context, url string, v interface{}) er
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		return &APIError{
+			URL:        url,
 			StatusCode: resp.StatusCode,
 			Title:      resp.Status,
 		}
@@ -315,7 +320,7 @@ func (c *ClusterClient) doGet(ctx context.Context, url string, v interface{}) er
 }
 
 func (c *ClusterClient) url(path string) string {
-	url := c.clusterURL
+	url := *c.clusterURL
 	url.Path = path
 	return url.String()
 }
diff --git a/plugins/inputs/dcos/client_test.go b/plugins/inputs/dcos/client_test.go
index 2781d10b7..3b8d93e37 100644
--- a/plugins/inputs/dcos/client_test.go
+++ b/plugins/inputs/dcos/client_test.go
@@ -31,6 +31,9 @@ P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
 )
 
 func TestLogin(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -40,16 +43,21 @@ func TestLogin(t *testing.T) {
 	}{
 		{
 			name:          "Login successful",
-			responseCode:  200,
+			responseCode:  http.StatusOK,
 			responseBody:  `{"token": "XXX.YYY.ZZZ"}`,
 			expectedError: nil,
 			expectedToken: "XXX.YYY.ZZZ",
 		},
 		{
-			name:          "Unauthorized Error",
-			responseCode:  http.StatusUnauthorized,
-			responseBody:  `{"title": "x", "description": "y"}`,
-			expectedError: &APIError{http.StatusUnauthorized, "x", "y"},
+			name:         "Unauthorized Error",
+			responseCode: http.StatusUnauthorized,
+			responseBody: `{"title": "x", "description": "y"}`,
+			expectedError: &APIError{
+				URL:         ts.URL + "/acs/api/v1/auth/login",
+				StatusCode:  http.StatusUnauthorized,
+				Title:       "x",
+				Description: "y",
+			},
 			expectedToken: "",
 		},
 	}
@@ -59,11 +67,11 @@ func TestLogin(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-			ts := httptest.NewServer(handler)
+
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)
 
@@ -82,13 +90,14 @@ func TestLogin(t *testing.T) {
 			} else {
 				require.Nil(t, auth)
 			}
-
-			ts.Close()
 		})
 	}
 }
 
 func TestGetSummary(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -98,7 +107,7 @@ func TestGetSummary(t *testing.T) {
 	}{
 		{
 			name:          "No nodes",
-			responseCode:  200,
+			responseCode:  http.StatusOK,
 			responseBody:  `{"cluster": "a", "slaves": []}`,
 			expectedValue: &Summary{Cluster: "a", Slaves: []Slave{}},
 			expectedError: nil,
@@ -108,11 +117,15 @@ func TestGetSummary(t *testing.T) {
 			responseCode:  http.StatusUnauthorized,
 			responseBody:  `<html></html>`,
 			expectedValue: nil,
-			expectedError: &APIError{StatusCode: http.StatusUnauthorized, Title: "401 Unauthorized"},
+			expectedError: &APIError{
+				URL:        ts.URL + "/mesos/master/state-summary",
+				StatusCode: http.StatusUnauthorized,
+				Title:      "401 Unauthorized",
+			},
 		},
 		{
 			name:         "Has nodes",
-			responseCode: 200,
+			responseCode: http.StatusOK,
 			responseBody: `{"cluster": "a", "slaves": [{"id": "a"}, {"id": "b"}]}`,
 			expectedValue: &Summary{
 				Cluster: "a",
@@ -127,12 +140,12 @@ func TestGetSummary(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-			ts := httptest.NewServer(handler)
+
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)
 
@@ -142,14 +155,15 @@ func TestGetSummary(t *testing.T) {
 
 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, summary)
-
-			ts.Close()
 		})
 	}
 
 }
 
 func TestGetNodeMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -159,7 +173,7 @@ func TestGetNodeMetrics(t *testing.T) {
 	}{
 		{
 			name:          "Empty Body",
-			responseCode:  200,
+			responseCode:  http.StatusOK,
 			responseBody:  `{}`,
 			expectedValue: &Metrics{},
 			expectedError: nil,
@@ -168,12 +182,12 @@ func TestGetNodeMetrics(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-			ts := httptest.NewServer(handler)
+
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)
 
@@ -183,14 +197,15 @@ func TestGetNodeMetrics(t *testing.T) {
 
 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, m)
-
-			ts.Close()
 		})
 	}
 
 }
 
 func TestGetContainerMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
 	var tests = []struct {
 		name          string
 		responseCode  int
@@ -199,8 +214,8 @@ func TestGetContainerMetrics(t *testing.T) {
 		expectedError error
 	}{
 		{
-			name:          "204 No Contents",
-			responseCode:  204,
+			name:          "204 No Content",
+			responseCode:  http.StatusNoContent,
 			responseBody:  ``,
 			expectedValue: &Metrics{},
 			expectedError: nil,
@@ -209,12 +224,12 @@ func TestGetContainerMetrics(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				// check the path
 				w.WriteHeader(tt.responseCode)
 				fmt.Fprintln(w, tt.responseBody)
 			})
-			ts := httptest.NewServer(handler)
+
 			u, err := url.Parse(ts.URL)
 			require.NoError(t, err)
 
@@ -224,8 +239,6 @@ func TestGetContainerMetrics(t *testing.T) {
 
 			require.Equal(t, tt.expectedError, err)
 			require.Equal(t, tt.expectedValue, m)
-
-			ts.Close()
 		})
 	}
 

From e5e75a62cc5ae0d47e0da91e41b67bb98945e05d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 23 Mar 2018 19:17:03 -0700
Subject: [PATCH 1006/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a8d9d05..1f5c9c06a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,7 @@
 - [#3801](https://github.com/influxdata/telegraf/issues/3801): Fix panic in http_response on invalid regex.
 - [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
 - [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
+- [#3868](https://github.com/influxdata/telegraf/issues/3868): Fix cannot unmarshal object error in DC/OS input.
 
 ## v1.5.3 [2018-03-14]
 

From e60abdf8eadc17742fca88a72dfcecbf2fff3e15 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 26 Mar 2018 19:11:08 -0700
Subject: [PATCH 1007/1302] Update passenger input documentation (#3938)

---
 plugins/inputs/passenger/README.md | 156 ++++++++++++-----------------
 1 file changed, 63 insertions(+), 93 deletions(-)

diff --git a/plugins/inputs/passenger/README.md b/plugins/inputs/passenger/README.md
index 90c0a2d80..688f4e69a 100644
--- a/plugins/inputs/passenger/README.md
+++ b/plugins/inputs/passenger/README.md
@@ -1,57 +1,78 @@
-# Telegraf plugin: passenger
+# Passenger Input Plugin
 
-Get phusion passenger stat using their command line utility
-`passenger-status`
+Gather [Phusion Passenger](https://www.phusionpassenger.com/) metrics using the `passenger-status` command line utility.
 
-# Measurements
+**Series Cardinality Warning**
 
-Meta:
+Depending on your environment, this `passenger_process` measurement of this
+plugin can quickly create a high number of series which, when unchecked, can
+cause high load on your database.  You can use the following techniques to
+manage your series cardinality:
 
-- tags:
+- Use the
+  [measurement filtering](https://docs.influxdata.com/telegraf/latest/administration/configuration/#measurement-filtering)
+  options to exclude unneeded tags.  In some environments, you may wish to use
+  `tagexclude` to remove the `pid` and `process_group_id` tags.
+- Write to a database with an appropriate
+  [retention policy](https://docs.influxdata.com/influxdb/latest/guides/downsampling_and_retention/).
+- Limit series cardinality in your database using the
+  [`max-series-per-database`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-series-per-database-1000000) and
+  [`max-values-per-tag`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-values-per-tag-100000) settings.
+- Consider using the
+  [Time Series Index](https://docs.influxdata.com/influxdb/latest/concepts/time-series-index/).
+- Monitor your databases
+  [series cardinality](https://docs.influxdata.com/influxdb/latest/query_language/spec/#show-cardinality).
 
-  * name
-  * passenger_version
-  * pid
-  * code_revision
+### Configuration
 
-Measurement names:
+```toml
+# Read metrics of passenger using passenger-status
+[[inputs.passenger]]
+  ## Path of passenger-status.
+  ##
+  ## Plugin gather metric via parsing XML output of passenger-status
+  ## More information about the tool:
+  ##   https://www.phusionpassenger.com/library/admin/apache/overall_status_report.html
+  ##
+  ## If no path is specified, then the plugin simply execute passenger-status
+  ## hopefully it can be found in your PATH
+  command = "passenger-status -v --show=xml"
+```
 
-- passenger:
+#### Permissions:
 
-  * Tags: `passenger_version`
-  * Fields:
+Telegraf must have permission to execute the `passenger-status` command.  On most systems, Telegraf runs as the `telegraf` user.
 
+### Metrics:
+
+- passenger
+  - tags:
+    - passenger_version
+  - fields:
     - process_count
-		- max
-		- capacity_used
-		- get_wait_list_size
+    - max
+    - capacity_used
+    - get_wait_list_size
 
-- passenger_supergroup:
-
-    * Tags: `name`
-    * Fields:
-
-      - get_wait_list_size
-      - capacity_used
-
-- passenger_group:
-
-  * Tags:
+- passenger_supergroup
+  - tags:
+    - name
+  - fields:
+    - get_wait_list_size
+    - capacity_used
 
+- passenger_group
+  - tags:
     - name
     - app_root
     - app_type
-
-  * Fields:
-
+  - fields:
     - get_wait_list_size
     - capacity_used
     - processes_being_spawned
 
-- passenger_process:
-
-  * Tags:
-
+- passenger_process
+  - tags:
     - group_name
     - app_root
     - supergroup_name
@@ -59,9 +80,7 @@ Measurement names:
     - code_revision
     - life_status
     - process_group_id
-
-  * Field:
-
+  - fields:
     - concurrency
     - sessions
     - busyness
@@ -79,60 +98,11 @@ Measurement names:
     - real_memory
     - vmsize
 
-# Example output
-
-Using this configuration:
-
+### Example Output:
 ```
-[[inputs.passenger]]
-  # Path of passenger-status.
-  #
-  # Plugin gather metric via parsing XML output of passenger-status
-  # More information about the tool:
-  #   https://www.phusionpassenger.com/library/admin/apache/overall_status_report.html
-  #
-  #
-  # If no path is specified, then the plugin simply execute passenger-status
-  # hopefully it can be found in your PATH
-  command = "passenger-status -v --show=xml"
+passenger,passenger_version=5.0.17 capacity_used=23i,get_wait_list_size=0i,max=23i,process_count=23i 1452984112799414257
+passenger_supergroup,name=/var/app/current/public capacity_used=23i,get_wait_list_size=0i 1452984112799496977
+passenger_group,app_root=/var/app/current,app_type=rack,name=/var/app/current/public capacity_used=23i,get_wait_list_size=0i,processes_being_spawned=0i 1452984112799527021
+passenger_process,app_root=/var/app/current,code_revision=899ac7f,group_name=/var/app/current/public,life_status=ALIVE,pid=11553,process_group_id=13608,supergroup_name=/var/app/current/public busyness=0i,concurrency=1i,cpu=58i,last_used=1452747071764940i,private_dirty=314900i,processed=951i,pss=319391i,real_memory=314900i,rss=418548i,sessions=0i,spawn_end_time=1452746845013365i,spawn_start_time=1452746844946982i,spawner_creation_time=1452746835922747i,swap=0i,uptime=226i,vmsize=1563580i 1452984112799571490
+passenger_process,app_root=/var/app/current,code_revision=899ac7f,group_name=/var/app/current/public,life_status=ALIVE,pid=11563,process_group_id=13608,supergroup_name=/var/app/current/public busyness=2147483647i,concurrency=1i,cpu=47i,last_used=1452747071709179i,private_dirty=309240i,processed=756i,pss=314036i,real_memory=309240i,rss=418296i,sessions=1i,spawn_end_time=1452746845172460i,spawn_start_time=1452746845136882i,spawner_creation_time=1452746835922747i,swap=0i,uptime=226i,vmsize=1563608i 1452984112799638581
 ```
-
-When run with:
-
-```
-./telegraf --config telegraf.conf --input-filter passenger --test
-```
-
-It produces:
-
-```
-> passenger,passenger_version=5.0.17 capacity_used=23i,get_wait_list_size=0i,max=23i,process_count=23i 1452984112799414257
-> passenger_supergroup,name=/var/app/current/public capacity_used=23i,get_wait_list_size=0i 1452984112799496977
-> passenger_group,app_root=/var/app/current,app_type=rack,name=/var/app/current/public capacity_used=23i,get_wait_list_size=0i,processes_being_spawned=0i 1452984112799527021
-> passenger_process,app_root=/var/app/current,code_revision=899ac7f,group_name=/var/app/current/public,life_status=ALIVE,pid=11553,process_group_id=13608,supergroup_name=/var/app/current/public busyness=0i,concurrency=1i,cpu=58i,last_used=1452747071764940i,private_dirty=314900i,processed=951i,pss=319391i,real_memory=314900i,rss=418548i,sessions=0i,spawn_end_time=1452746845013365i,spawn_start_time=1452746844946982i,spawner_creation_time=1452746835922747i,swap=0i,uptime=226i,vmsize=1563580i 1452984112799571490
-> passenger_process,app_root=/var/app/current,code_revision=899ac7f,group_name=/var/app/current/public,life_status=ALIVE,pid=11563,process_group_id=13608,supergroup_name=/var/app/current/public busyness=2147483647i,concurrency=1i,cpu=47i,last_used=1452747071709179i,private_dirty=309240i,processed=756i,pss=314036i,real_memory=309240i,rss=418296i,sessions=1i,spawn_end_time=1452746845172460i,spawn_start_time=1452746845136882i,spawner_creation_time=1452746835922747i,swap=0i,uptime=226i,vmsize=1563608i 1452984112799638581
-```
-
-# Note
-
-You have to ensure that you can run the `passenger-status` command under
-telegraf user. Depend on how you install and configure passenger, this
-maybe an issue for you. If you are using passenger standlone, or compile
-yourself, it is straight forward. However, if you are using gem and
-`rvm`, it maybe harder to get this right.
-
-Such as with `rvm`, you can use this command:
-
-```
-~/.rvm/bin/rvm default do passenger-status -v --show=xml
-```
-
-You can use `&` and `;` in the shell command to run comlicated shell command
-in order to get the passenger-status such as load the rvm shell, source the
-path
-```
-command = "source .rvm/scripts/rvm && passenger-status -v --show=xml"
-```
-
-Anyway, just ensure that you can run the command under `telegraf` user, and it
-has to produce XML output.

From b63073deb26481951b8609e3eb388e1708473cf9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 26 Mar 2018 19:20:27 -0700
Subject: [PATCH 1008/1302] Update DC/OS guidance for cardinality

---
 plugins/inputs/dcos/README.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/dcos/README.md b/plugins/inputs/dcos/README.md
index fcb62da33..967c376a7 100644
--- a/plugins/inputs/dcos/README.md
+++ b/plugins/inputs/dcos/README.md
@@ -8,11 +8,18 @@ Depending on the work load of your DC/OS cluster, this plugin can quickly
 create a high number of series which, when unchecked, can cause high load on
 your database.
 
-- Use [measurement filtering](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#measurement-filtering) liberally to exclude unneeded metrics as well as the node, container, and app inclue/exclude options.
-- Write to a database with an appropriate [retention policy](https://docs.influxdata.com/influxdb/v1.3/concepts/glossary/#retention-policy-rp).
-- Limit the number of series allowed in your database using the `max-series-per-database` and `max-values-per-tag` settings.
-- Consider enabling the [TSI](https://docs.influxdata.com/influxdb/v1.3/about_the_project/releasenotes-changelog/#release-notes-8) engine.
-- Monitor your [series cardinality](https://docs.influxdata.com/influxdb/v1.3/troubleshooting/frequently-asked-questions/#how-can-i-query-for-series-cardinality).
+- Use the
+  [measurement filtering](https://docs.influxdata.com/telegraf/latest/administration/configuration/#measurement-filtering)
+  options to exclude unneeded tags.
+- Write to a database with an appropriate
+  [retention policy](https://docs.influxdata.com/influxdb/latest/guides/downsampling_and_retention/).
+- Limit series cardinality in your database using the
+  [`max-series-per-database`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-series-per-database-1000000) and
+  [`max-values-per-tag`](https://docs.influxdata.com/influxdb/latest/administration/config/#max-values-per-tag-100000) settings.
+- Consider using the
+  [Time Series Index](https://docs.influxdata.com/influxdb/latest/concepts/time-series-index/).
+- Monitor your databases
+  [series cardinality](https://docs.influxdata.com/influxdb/latest/query_language/spec/#show-cardinality).
 
 ### Configuration:
 ```toml

From 4cefe3eadd4f59ada19e88cc1df48640db4bfbfd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 26 Mar 2018 19:22:17 -0700
Subject: [PATCH 1009/1302] Add documentation for existing TLS settings in
 consul input (#3931)

---
 plugins/inputs/consul/README.md | 73 ++++++++++++++++++---------------
 plugins/inputs/consul/consul.go | 23 +++++++----
 2 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index 29027805b..7e68a4931 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -1,43 +1,54 @@
-# Telegraf Input Plugin: Consul
+# Consul Input Plugin
 
-This plugin will collect statistics about all health checks registered in the Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
-to query the data. It will not report the [telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can report those stats already using StatsD protocol if needed.
+This plugin will collect statistics about all health checks registered in the
+Consul. It uses [Consul API](https://www.consul.io/docs/agent/http/health.html#health_state)
+to query the data. It will not report the
+[telemetry](https://www.consul.io/docs/agent/telemetry.html) but Consul can
+report those stats already using StatsD protocol if needed.
 
-## Configuration:
+### Configuration:
 
-```
+```toml
 # Gather health check statuses from services registered in Consul
 [[inputs.consul]]
-  ## Most of these values defaults to the one configured on a Consul's agent level.
-  ## Optional Consul server address (default: "")
-  # address = ""
-  ## Optional URI scheme for the Consul server (default: "")
-  # scheme = ""
-  ## Optional ACL token used in every request (default: "")
+  ## Consul server address
+  # address = "localhost"
+
+  ## URI scheme for the Consul server, one of "http", "https"
+  # scheme = "http"
+
+  ## ACL token used in every request
   # token = ""
-  ## Optional username used for request HTTP Basic Authentication (default: "")
+
+  ## HTTP Basic Authentication username and password.
   # username = ""
-  ## Optional password used for HTTP Basic Authentication (default: "")
   # password = ""
-  ## Optional data centre to query the health checks from (default: "")
+
+  ## Data centre to query the health checks from
   # datacentre = ""
+
+  ## SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
 ```
 
-## Measurements:
+### Metrics:
 
-### Consul:
-Tags:
-- node: on which node check/service is registered on
-- service_name: name of the service (this is the service name not the service ID)
-- check_id
-
-Fields:
-- check_name
-- service_id
-- status
-- passing
-- critical
-- warning
+- consul_health_checks
+  - tags:
+  	- node (node that check/service is registred on)
+  	- service_name
+  	- check_id
+  - fields:
+    - check_name
+    - service_id
+    - status
+    - passing (integer)
+    - critical (integer)
+    - warning (integer)
 
 `passing`, `critical`, and `warning` are integer representations of the health
 check state. A value of `1` represents that the status was the state of the
@@ -46,8 +57,6 @@ the health check at this sample.
 ## Example output
 
 ```
-$ telegraf --config ./telegraf.conf --input-filter consul --test
-* Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
+consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing",passing=1i,critical=0i,warning=0i 1464698464486439902
+consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical",passing=0i,critical=1i,warning=0i 1464698464486519036
 ```
diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index 45612a928..bfd9b4340 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -31,19 +31,28 @@ type Consul struct {
 }
 
 var sampleConfig = `
-  ## Most of these values defaults to the one configured on a Consul's agent level.
-  ## Optional Consul server address (default: "localhost")
+  ## Consul server address
   # address = "localhost"
-  ## Optional URI scheme for the Consul server (default: "http")
+
+  ## URI scheme for the Consul server, one of "http", "https"
   # scheme = "http"
-  ## Optional ACL token used in every request (default: "")
+
+  ## ACL token used in every request
   # token = ""
-  ## Optional username used for request HTTP Basic Authentication (default: "")
+
+  ## HTTP Basic Authentication username and password.
   # username = ""
-  ## Optional password used for HTTP Basic Authentication (default: "")
   # password = ""
-  ## Optional data centre to query the health checks from (default: "")
+
+  ## Data centre to query the health checks from
   # datacentre = ""
+
+  ## SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
 `
 
 func (c *Consul) Description() string {

From 63de4ffc51e35a762c45f106920e4bc916f3a7db Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 27 Mar 2018 15:12:57 -0700
Subject: [PATCH 1010/1302] Update to latest gopsutil release

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 4b5dd4012..2a9595e2d 100644
--- a/Godeps
+++ b/Godeps
@@ -65,7 +65,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99
+github.com/shirou/gopsutil 5776ff9c7c5d063d574ef53d740f75c68b448e53
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From 503881d4d754730d8f03c151e2eccf11e7fc78fc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 27 Mar 2018 17:02:33 -0700
Subject: [PATCH 1011/1302] Update to latest fsnotify release

---
 Godeps                          | 3 ++-
 docs/LICENSE_OF_DEPENDENCIES.md | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Godeps b/Godeps
index 2a9595e2d..7af083c8c 100644
--- a/Godeps
+++ b/Godeps
@@ -31,9 +31,10 @@ github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
-github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea
+github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
+github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
 github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
 github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 91526098b..4c9e2d616 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -24,7 +24,7 @@ following works:
 - github.com/eapache/go-xerial-snappy [MIT](https://github.com/eapache/go-xerial-snappy/blob/master/LICENSE)
 - github.com/eapache/queue [MIT](https://github.com/eapache/queue/blob/master/LICENSE)
 - github.com/eclipse/paho.mqtt.golang [ECLIPSE](https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE)
-- github.com/fsnotify/fsnotify [BSD](https://github.com/fsnotify/fsnotify/blob/v1.4.2/LICENSE)
+- github.com/fsnotify/fsnotify [BSD](https://github.com/fsnotify/fsnotify/blob/master/LICENSE)
 - github.com/fsouza/go-dockerclient [BSD](https://github.com/fsouza/go-dockerclient/blob/master/LICENSE)
 - github.com/gobwas/glob [MIT](https://github.com/gobwas/glob/blob/master/LICENSE)
 - github.com/google/go-cmp [BSD](https://github.com/google/go-cmp/blob/master/LICENSE)

From 1c0f63a90d60da228ff32944b4078e57d826dc83 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 27 Mar 2018 17:30:51 -0700
Subject: [PATCH 1012/1302] Add new line protocol parser and serializer,
 influxdb output (#3924)

---
 .gitignore                                    |     4 +-
 Godeps                                        |     4 +-
 Makefile                                      |    11 +-
 agent/accumulator_test.go                     |   319 +-
 agent/agent.go                                |     8 +-
 internal/config/config.go                     |    27 +
 internal/models/makemetric.go                 |    80 -
 internal/models/running_aggregator_test.go    |    64 -
 internal/models/running_input.go              |     7 +-
 internal/models/running_input_test.go         |   335 +-
 metric.go                                     |    60 +-
 metric/builder.go                             |    51 +
 metric/escape.go                              |    55 -
 metric/inline_strconv_parse_test.go           |   103 -
 metric/metric.go                              |   791 +-
 metric/metric_benchmark_test.go               |   148 -
 metric/metric_test.go                         |   843 +-
 metric/parse.go                               |   680 -
 metric/parse_test.go                          |   413 -
 metric/reader.go                              |   159 -
 metric/reader_test.go                         |   713 -
 plugins/inputs/exec/exec_test.go              |    77 -
 plugins/inputs/http_listener/http_listener.go |    33 +-
 plugins/inputs/logparser/grok/grok.go         |     4 +
 plugins/inputs/logparser/grok/grok_test.go    |    20 +-
 .../nats_consumer/nats_consumer_test.go       |     2 +-
 plugins/inputs/prometheus/parser_test.go      |     8 +-
 .../inputs/udp_listener/udp_listener_test.go  |     6 +-
 plugins/outputs/file/file.go                  |     2 +-
 plugins/outputs/graylog/graylog.go            |     7 +-
 plugins/outputs/influxdb/README.md            |    72 +-
 plugins/outputs/influxdb/client/client.go     |    16 -
 plugins/outputs/influxdb/client/http.go       |   277 -
 plugins/outputs/influxdb/client/http_test.go  |   335 -
 plugins/outputs/influxdb/client/udp.go        |   105 -
 plugins/outputs/influxdb/client/udp_test.go   |    89 -
 plugins/outputs/influxdb/http.go              |   404 +
 plugins/outputs/influxdb/http_test.go         |   558 +
 plugins/outputs/influxdb/influxdb.go          |   314 +-
 plugins/outputs/influxdb/influxdb_test.go     |   406 +-
 plugins/outputs/influxdb/udp.go               |   116 +
 plugins/outputs/influxdb/udp_test.go          |   241 +
 plugins/outputs/instrumental/instrumental.go  |    17 +-
 plugins/outputs/librato/librato.go            |     4 +-
 plugins/outputs/mqtt/mqtt.go                  |     3 +-
 plugins/outputs/opentsdb/opentsdb.go          |     4 +-
 plugins/outputs/wavefront/wavefront.go        |     5 +-
 plugins/parsers/dropwizard/parser.go          |    11 +-
 plugins/parsers/graphite/parser.go            |     1 -
 plugins/parsers/graphite/parser_test.go       |    83 +-
 plugins/parsers/influx/500.metrics            |   500 -
 .../parsers/influx/escape.go                  |    53 +-
 plugins/parsers/influx/handler.go             |    95 +
 plugins/parsers/influx/machine.go             | 21171 ++++++++++++++++
 plugins/parsers/influx/machine.go.rl          |   297 +
 plugins/parsers/influx/machine_test.go        |  1312 +
 plugins/parsers/influx/parser.go              |   118 +-
 plugins/parsers/influx/parser_test.go         |   756 +-
 plugins/parsers/nagios/parser.go              |    31 +-
 plugins/parsers/registry.go                   |     3 +-
 plugins/processors/override/override.go       |     4 +-
 plugins/processors/printer/printer.go         |    13 +-
 plugins/serializers/graphite/graphite.go      |     2 +-
 plugins/serializers/influx/escape.go          |    52 +
 plugins/serializers/influx/influx.go          |   271 +-
 plugins/serializers/influx/influx_test.go     |   370 +-
 plugins/serializers/influx/reader.go          |    58 +
 plugins/serializers/influx/reader_test.go     |   135 +
 plugins/serializers/json/json.go              |     2 +-
 plugins/serializers/registry.go               |    22 +-
 70 files changed, 26827 insertions(+), 6533 deletions(-)
 create mode 100644 metric/builder.go
 delete mode 100644 metric/escape.go
 delete mode 100644 metric/inline_strconv_parse_test.go
 delete mode 100644 metric/metric_benchmark_test.go
 delete mode 100644 metric/parse.go
 delete mode 100644 metric/parse_test.go
 delete mode 100644 metric/reader.go
 delete mode 100644 metric/reader_test.go
 delete mode 100644 plugins/outputs/influxdb/client/client.go
 delete mode 100644 plugins/outputs/influxdb/client/http.go
 delete mode 100644 plugins/outputs/influxdb/client/http_test.go
 delete mode 100644 plugins/outputs/influxdb/client/udp.go
 delete mode 100644 plugins/outputs/influxdb/client/udp_test.go
 create mode 100644 plugins/outputs/influxdb/http.go
 create mode 100644 plugins/outputs/influxdb/http_test.go
 create mode 100644 plugins/outputs/influxdb/udp.go
 create mode 100644 plugins/outputs/influxdb/udp_test.go
 delete mode 100644 plugins/parsers/influx/500.metrics
 rename metric/inline_strconv_parse.go => plugins/parsers/influx/escape.go (53%)
 create mode 100644 plugins/parsers/influx/handler.go
 create mode 100644 plugins/parsers/influx/machine.go
 create mode 100644 plugins/parsers/influx/machine.go.rl
 create mode 100644 plugins/parsers/influx/machine_test.go
 create mode 100644 plugins/serializers/influx/escape.go
 create mode 100644 plugins/serializers/influx/reader.go
 create mode 100644 plugins/serializers/influx/reader_test.go

diff --git a/.gitignore b/.gitignore
index 459ae7d79..66a7c7c0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-build
+/build
 /telegraf
 /telegraf.gz
-*~
-*#
diff --git a/Godeps b/Godeps
index 7af083c8c..1b1b4be37 100644
--- a/Godeps
+++ b/Godeps
@@ -73,8 +73,8 @@ github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
 github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
-github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
+github.com/stretchr/objx facf9a85c22f48d2f52f2380e4efce1768749a89
+github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71
 github.com/tidwall/gjson 0623bd8fbdbf97cc62b98d15108832851a658e59
 github.com/tidwall/match 173748da739a410c5b0b813b956f89ff94730b4c
 github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
diff --git a/Makefile b/Makefile
index 3250e69ed..3e4b4f019 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
 GOFILES ?= $(shell git ls-files '*.go')
-GOFMT ?= $(shell gofmt -l $(GOFILES))
+GOFMT ?= $(shell gofmt -l $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
@@ -48,7 +48,7 @@ test:
 	go test -short ./...
 
 fmt:
-	@gofmt -w $(GOFILES)
+	@gofmt -w $(filter-out plugins/parsers/influx/machine.go, $(GOFILES))
 
 fmtcheck:
 	@echo '[INFO] running gofmt to identify incorrectly formatted code...'
@@ -73,8 +73,8 @@ test-windows:
 # vet runs the Go source code static analysis tool `vet` to find
 # any common errors.
 vet:
-	@echo 'go vet $$(go list ./...)'
-	@go vet $$(go list ./...) ; if [ $$? -eq 1 ]; then \
+	@echo 'go vet $$(go list ./... | grep -v ./plugins/parsers/influx)'
+	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -eq 1 ]; then \
 		echo ""; \
 		echo "go vet has found suspicious constructs. Please remediate any reported errors"; \
 		echo "to fix them before submitting code for review."; \
@@ -96,4 +96,7 @@ docker-image:
 	cp build/telegraf*$(COMMIT)*.deb .
 	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .
 
+plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
+	ragel -Z -G2 $^ -o $@
+
 .PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck
diff --git a/agent/accumulator_test.go b/agent/accumulator_test.go
index c3f552d9e..22fa3e409 100644
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -15,63 +15,36 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestAdd(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-}
-
 func TestAddFields(t *testing.T) {
-	now := time.Now()
 	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
+	tags := map[string]string{"foo": "bar"}
 	fields := map[string]interface{}{
 		"usage": float64(99),
 	}
-	a.AddFields("acctest", fields, map[string]string{})
-	a.AddGauge("acctest", fields, map[string]string{"acc": "test"})
-	a.AddCounter("acctest", fields, map[string]string{"acc": "test"}, now)
+	now := time.Now()
+	a.AddCounter("acctest", fields, tags, now)
 
 	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest usage=99")
 
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test usage=99")
+	require.Equal(t, "acctest", testm.Name())
+	actual, ok := testm.GetField("usage")
 
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test usage=99 %d\n", now.UnixNano()),
-		actual)
+	require.True(t, ok)
+	require.Equal(t, float64(99), actual)
+
+	actual, ok = testm.GetTag("foo")
+	require.True(t, ok)
+	require.Equal(t, "bar", actual)
+
+	tm := testm.Time()
+	// okay if monotonic clock differs
+	require.True(t, now.Equal(tm))
+
+	tp := testm.Type()
+	require.Equal(t, telegraf.Counter, tp)
 }
 
 func TestAccAddError(t *testing.T) {
@@ -98,215 +71,61 @@ func TestAccAddError(t *testing.T) {
 	assert.Contains(t, string(errs[2]), "baz")
 }
 
-func TestAddNoIntervalWithPrecision(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-	a.SetPrecision(0, time.Second)
+func TestSetPrecision(t *testing.T) {
+	tests := []struct {
+		name      string
+		unset     bool
+		precision time.Duration
+		interval  time.Duration
+		timestamp time.Time
+		expected  time.Time
+	}{
+		{
+			name:      "default precision is nanosecond",
+			unset:     true,
+			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
+			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
+		},
+		{
+			name:      "second interval",
+			interval:  time.Second,
+			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
+			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 0, time.UTC),
+		},
+		{
+			name:      "microsecond interval",
+			interval:  time.Microsecond,
+			timestamp: time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC),
+			expected:  time.Date(2006, time.February, 10, 12, 0, 0, 82913000, time.UTC),
+		},
+		{
+			name:      "2 second precision",
+			precision: 2 * time.Second,
+			timestamp: time.Date(2006, time.February, 10, 12, 0, 2, 4, time.UTC),
+			expected:  time.Date(2006, time.February, 10, 12, 0, 2, 0, time.UTC),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			metrics := make(chan telegraf.Metric, 10)
 
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
+			a := NewAccumulator(&TestMetricMaker{}, metrics)
+			if !tt.unset {
+				a.SetPrecision(tt.precision, tt.interval)
+			}
 
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
+			a.AddFields("acctest",
+				map[string]interface{}{"value": float64(101)},
+				map[string]string{},
+				tt.timestamp,
+			)
 
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
+			testm := <-metrics
+			require.Equal(t, tt.expected, testm.Time())
 
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
-		actual)
-}
-
-func TestAddDisablePrecision(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(time.Nanosecond, 0)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
-		actual)
-}
-
-func TestAddNoPrecisionWithInterval(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(0, time.Second)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
-		actual)
-}
-
-func TestDifferentPrecisions(t *testing.T) {
-	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.SetPrecision(0, time.Second)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm := <-metrics
-	actual := testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
-		actual)
-
-	a.SetPrecision(0, time.Millisecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
-		actual)
-
-	a.SetPrecision(0, time.Microsecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
-		actual)
-
-	a.SetPrecision(0, time.Nanosecond)
-	a.AddFields("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
-		actual)
-}
-
-func TestAddGauge(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddGauge("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-	assert.Equal(t, testm.Type(), telegraf.Gauge)
-}
-
-func TestAddCounter(t *testing.T) {
-	now := time.Now()
-	metrics := make(chan telegraf.Metric, 10)
-	defer close(metrics)
-	a := NewAccumulator(&TestMetricMaker{}, metrics)
-
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{})
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"})
-	a.AddCounter("acctest",
-		map[string]interface{}{"value": float64(101)},
-		map[string]string{"acc": "test"}, now)
-
-	testm := <-metrics
-	actual := testm.String()
-	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), telegraf.Counter)
-
-	testm = <-metrics
-	actual = testm.String()
-	assert.Equal(t,
-		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
-		actual)
-	assert.Equal(t, testm.Type(), telegraf.Counter)
+			close(metrics)
+		})
+	}
 }
 
 type TestMetricMaker struct {
diff --git a/agent/agent.go b/agent/agent.go
index 5ca3de882..2183ba42c 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -271,11 +271,9 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric, ag
 				// if dropOriginal is set to true, then we will only send this
 				// metric to the aggregators, not the outputs.
 				var dropOriginal bool
-				if !m.IsAggregate() {
-					for _, agg := range a.Config.Aggregators {
-						if ok := agg.Add(m.Copy()); ok {
-							dropOriginal = true
-						}
+				for _, agg := range a.Config.Aggregators {
+					if ok := agg.Add(m.Copy()); ok {
+						dropOriginal = true
 					}
 				}
 				if !dropOriginal {
diff --git a/internal/config/config.go b/internal/config/config.go
index 8488df28a..db1e1f82b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -9,6 +9,7 @@ import (
 	"math"
 	"os"
 	"path/filepath"
+
 	"regexp"
 	"runtime"
 	"sort"
@@ -1366,6 +1367,30 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	if node, ok := tbl.Fields["influx_max_line_bytes"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if integer, ok := kv.Value.(*ast.Integer); ok {
+				v, err := integer.Int()
+				if err != nil {
+					return nil, err
+				}
+				c.InfluxMaxLineBytes = int(v)
+			}
+		}
+	}
+
+	if node, ok := tbl.Fields["influx_sort_fields"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Boolean); ok {
+				var err error
+				c.InfluxSortFields, err = b.Boolean()
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+
 	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1382,6 +1407,8 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	delete(tbl.Fields, "influx_max_line_bytes")
+	delete(tbl.Fields, "influx_sort_fields")
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
diff --git a/internal/models/makemetric.go b/internal/models/makemetric.go
index 19d10f589..b74e236cd 100644
--- a/internal/models/makemetric.go
+++ b/internal/models/makemetric.go
@@ -2,8 +2,6 @@ package models
 
 import (
 	"log"
-	"math"
-	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -78,84 +76,6 @@ func makemetric(
 		}
 	}
 
-	for k, v := range tags {
-		if strings.HasSuffix(k, `\`) {
-			log.Printf("D! Measurement [%s] tag [%s] "+
-				"ends with a backslash, skipping", measurement, k)
-			delete(tags, k)
-			continue
-		} else if strings.HasSuffix(v, `\`) {
-			log.Printf("D! Measurement [%s] tag [%s] has a value "+
-				"ending with a backslash, skipping", measurement, k)
-			delete(tags, k)
-			continue
-		}
-	}
-
-	for k, v := range fields {
-		if strings.HasSuffix(k, `\`) {
-			log.Printf("D! Measurement [%s] field [%s] "+
-				"ends with a backslash, skipping", measurement, k)
-			delete(fields, k)
-			continue
-		}
-		// Validate uint64 and float64 fields
-		// convert all int & uint types to int64
-		switch val := v.(type) {
-		case nil:
-			// delete nil fields
-			delete(fields, k)
-		case uint:
-			fields[k] = int64(val)
-			continue
-		case uint8:
-			fields[k] = int64(val)
-			continue
-		case uint16:
-			fields[k] = int64(val)
-			continue
-		case uint32:
-			fields[k] = int64(val)
-			continue
-		case int:
-			fields[k] = int64(val)
-			continue
-		case int8:
-			fields[k] = int64(val)
-			continue
-		case int16:
-			fields[k] = int64(val)
-			continue
-		case int32:
-			fields[k] = int64(val)
-			continue
-		case uint64:
-			// InfluxDB does not support writing uint64
-			if val < uint64(9223372036854775808) {
-				fields[k] = int64(val)
-			} else {
-				fields[k] = int64(9223372036854775807)
-			}
-			continue
-		case float32:
-			fields[k] = float64(val)
-			continue
-		case float64:
-			// NaNs are invalid values in influxdb, skip measurement
-			if math.IsNaN(val) || math.IsInf(val, 0) {
-				log.Printf("D! Measurement [%s] field [%s] has a NaN or Inf "+
-					"field, skipping",
-					measurement, k)
-				delete(fields, k)
-				continue
-			}
-		case string:
-			fields[k] = v
-		default:
-			fields[k] = v
-		}
-	}
-
 	m, err := metric.New(measurement, tags, fields, t, mType)
 	if err != nil {
 		log.Printf("Error adding point [%s]: %s\n", measurement, err.Error())
diff --git a/internal/models/running_aggregator_test.go b/internal/models/running_aggregator_test.go
index 30279f0ee..cf92fe675 100644
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -1,7 +1,6 @@
 package models
 
 import (
-	"fmt"
 	"sync"
 	"sync/atomic"
 	"testing"
@@ -167,69 +166,6 @@ func TestAddDropOriginal(t *testing.T) {
 	assert.False(t, ra.Add(m2))
 }
 
-// make an untyped, counter, & gauge metric
-func TestMakeMetricA(t *testing.T) {
-	now := time.Now()
-	ra := NewRunningAggregator(&TestAggregator{}, &AggregatorConfig{
-		Name: "TestRunningAggregator",
-	})
-	assert.Equal(t, "aggregators.TestRunningAggregator", ra.Name())
-
-	m := ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Untyped,
-	)
-
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Counter,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Counter,
-	)
-
-	m = ra.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Gauge,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Gauge,
-	)
-}
-
 type TestAggregator struct {
 	sum int64
 }
diff --git a/internal/models/running_input.go b/internal/models/running_input.go
index e9b757bbf..9cf4f6136 100644
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -75,7 +76,11 @@ func (r *RunningInput) MakeMetric(
 	)
 
 	if r.trace && m != nil {
-		fmt.Print("> " + m.String())
+		s := influx.NewSerializer()
+		octets, err := s.Serialize(m)
+		if err == nil {
+			fmt.Print("> " + string(octets))
+		}
 	}
 
 	r.MetricsGathered.Incr(1)
diff --git a/internal/models/running_input_test.go b/internal/models/running_input_test.go
index c653090e8..4d016851a 100644
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -1,12 +1,11 @@
 package models
 
 import (
-	"fmt"
-	"math"
 	"testing"
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -45,77 +44,17 @@ func TestMakeMetricNilFields(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
 
-// make an untyped, counter, & gauge metric
-func TestMakeMetric(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-	assert.Equal(t, "inputs.TestRunningInput", ri.Name())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
+	expected, err := metric.New("RITest",
 		map[string]string{},
-		telegraf.Untyped,
+		map[string]interface{}{
+			"value": int(101),
+		},
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Untyped,
-	)
+	require.NoError(t, err)
 
-	m = ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Counter,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Counter,
-	)
-
-	m = ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{"value": int(101)},
-		map[string]string{},
-		telegraf.Gauge,
-		now,
-	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-	assert.Equal(
-		t,
-		m.Type(),
-		telegraf.Gauge,
-	)
+	require.Equal(t, expected, m)
 }
 
 func TestMakeMetricWithPluginTags(t *testing.T) {
@@ -137,11 +76,18 @@ func TestMakeMetricWithPluginTags(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
-		m.String(),
+
+	expected, err := metric.New("RITest",
+		map[string]string{
+			"foo": "bar",
+		},
+		map[string]interface{}{
+			"value": 101,
+		},
+		now,
 	)
+	require.NoError(t, err)
+	require.Equal(t, expected, m)
 }
 
 func TestMakeMetricFilteredOut(t *testing.T) {
@@ -187,87 +133,17 @@ func TestMakeMetricWithDaemonTags(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-// make an untyped, counter, & gauge metric
-func TestMakeMetricInfFields(t *testing.T) {
-	inf := math.Inf(1)
-	ninf := math.Inf(-1)
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{
-			"value": int(101),
-			"inf":   inf,
-			"ninf":  ninf,
+	expected, err := metric.New("RITest",
+		map[string]string{
+			"foo": "bar",
+		},
+		map[string]interface{}{
+			"value": 101,
 		},
-		map[string]string{},
-		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
-	)
-}
-
-func TestMakeMetricAllFieldTypes(t *testing.T) {
-	now := time.Now()
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	ri.SetTrace(true)
-	assert.Equal(t, true, ri.Trace())
-
-	m := ri.MakeMetric(
-		"RITest",
-		map[string]interface{}{
-			"a": int(10),
-			"b": int8(10),
-			"c": int16(10),
-			"d": int32(10),
-			"e": uint(10),
-			"f": uint8(10),
-			"g": uint16(10),
-			"h": uint32(10),
-			"i": uint64(10),
-			"j": float32(10),
-			"k": uint64(9223372036854775810),
-			"l": "foobar",
-			"m": true,
-		},
-		map[string]string{},
-		telegraf.Untyped,
-		now,
-	)
-	assert.Contains(t, m.String(), "a=10i")
-	assert.Contains(t, m.String(), "b=10i")
-	assert.Contains(t, m.String(), "c=10i")
-	assert.Contains(t, m.String(), "d=10i")
-	assert.Contains(t, m.String(), "e=10i")
-	assert.Contains(t, m.String(), "f=10i")
-	assert.Contains(t, m.String(), "g=10i")
-	assert.Contains(t, m.String(), "h=10i")
-	assert.Contains(t, m.String(), "i=10i")
-	assert.Contains(t, m.String(), "j=10")
-	assert.NotContains(t, m.String(), "j=10i")
-	assert.Contains(t, m.String(), "k=9223372036854775807i")
-	assert.Contains(t, m.String(), "l=\"foobar\"")
-	assert.Contains(t, m.String(), "m=true")
+	require.NoError(t, err)
+	require.Equal(t, expected, m)
 }
 
 func TestMakeMetricNameOverride(t *testing.T) {
@@ -284,11 +160,15 @@ func TestMakeMetricNameOverride(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("foobar value=101i %d\n", now.UnixNano()),
-		m.String(),
+	expected, err := metric.New("foobar",
+		nil,
+		map[string]interface{}{
+			"value": 101,
+		},
+		now,
 	)
+	require.NoError(t, err)
+	require.Equal(t, expected, m)
 }
 
 func TestMakeMetricNamePrefix(t *testing.T) {
@@ -305,11 +185,15 @@ func TestMakeMetricNamePrefix(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("foobar_RITest value=101i %d\n", now.UnixNano()),
-		m.String(),
+	expected, err := metric.New("foobar_RITest",
+		nil,
+		map[string]interface{}{
+			"value": 101,
+		},
+		now,
 	)
+	require.NoError(t, err)
+	require.Equal(t, expected, m)
 }
 
 func TestMakeMetricNameSuffix(t *testing.T) {
@@ -326,134 +210,15 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 		telegraf.Untyped,
 		now,
 	)
-	assert.Equal(
-		t,
-		fmt.Sprintf("RITest_foobar value=101i %d\n", now.UnixNano()),
-		m.String(),
+	expected, err := metric.New("RITest_foobar",
+		nil,
+		map[string]interface{}{
+			"value": 101,
+		},
+		now,
 	)
-}
-
-func TestMakeMetric_TrailingSlash(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name                string
-		measurement         string
-		fields              map[string]interface{}
-		tags                map[string]string
-		expectedNil         bool
-		expectedMeasurement string
-		expectedFields      map[string]interface{}
-		expectedTags        map[string]string
-	}{
-		{
-			name:        "Measurement cannot have trailing slash",
-			measurement: `cpu\`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags:        map[string]string{},
-			expectedNil: true,
-		},
-		{
-			name:        "Field key with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-				`bad\`:  `xyzzy`,
-			},
-			tags:                map[string]string{},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{},
-		},
-		{
-			name:        "Field value with trailing slash okay",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-				"ok":    `xyzzy\`,
-			},
-			tags:                map[string]string{},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-				"ok":    `xyzzy\`,
-			},
-			expectedTags: map[string]string{},
-		},
-		{
-			name:        "Must have one field after dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"bad": math.NaN(),
-			},
-			tags:        map[string]string{},
-			expectedNil: true,
-		},
-		{
-			name:        "Tag key with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags: map[string]string{
-				`host\`: "localhost",
-				"a":     "x",
-			},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{
-				"a": "x",
-			},
-		},
-		{
-			name:        "Tag value with trailing slash dropped",
-			measurement: `cpu`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-			tags: map[string]string{
-				`host`: `localhost\`,
-				"a":    "x",
-			},
-			expectedMeasurement: `cpu`,
-			expectedFields: map[string]interface{}{
-				"value": int64(42),
-			},
-			expectedTags: map[string]string{
-				"a": "x",
-			},
-		},
-	}
-
-	ri := NewRunningInput(&testInput{}, &InputConfig{
-		Name: "TestRunningInput",
-	})
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			m := ri.MakeMetric(
-				tc.measurement,
-				tc.fields,
-				tc.tags,
-				telegraf.Untyped,
-				now)
-
-			if tc.expectedNil {
-				require.Nil(t, m)
-			} else {
-				require.NotNil(t, m)
-				require.Equal(t, tc.expectedMeasurement, m.Name())
-				require.Equal(t, tc.expectedFields, m.Fields())
-				require.Equal(t, tc.expectedTags, m.Tags())
-			}
-		})
-	}
+	require.NoError(t, err)
+	require.Equal(t, expected, m)
 }
 
 type testInput struct{}
diff --git a/metric.go b/metric.go
index 3fb531358..970477403 100644
--- a/metric.go
+++ b/metric.go
@@ -17,48 +17,50 @@ const (
 	Histogram
 )
 
+type Tag struct {
+	Key   string
+	Value string
+}
+
+type Field struct {
+	Key   string
+	Value interface{}
+}
+
 type Metric interface {
-	// Serialize serializes the metric into a line-protocol byte buffer,
-	// including a newline at the end.
-	Serialize() []byte
-	// same as Serialize, but avoids an allocation.
-	// returns number of bytes copied into dst.
-	SerializeTo(dst []byte) int
-	// String is the same as Serialize, but returns a string.
-	String() string
-	// Copy deep-copies the metric.
-	Copy() Metric
-	// Split will attempt to return multiple metrics with the same timestamp
-	// whose string representations are no longer than maxSize.
-	// Metrics with a single field may exceed the requested size.
-	Split(maxSize int) []Metric
+	// Getting data structure functions
+	Name() string
+	Tags() map[string]string
+	TagList() []*Tag
+	Fields() map[string]interface{}
+	FieldList() []*Field
+	Time() time.Time
+	Type() ValueType
+
+	// Name functions
+	SetName(name string)
+	AddPrefix(prefix string)
+	AddSuffix(suffix string)
 
 	// Tag functions
+	GetTag(key string) (string, bool)
 	HasTag(key string) bool
 	AddTag(key, value string)
 	RemoveTag(key string)
 
 	// Field functions
+	GetField(key string) (interface{}, bool)
 	HasField(key string) bool
 	AddField(key string, value interface{})
-	RemoveField(key string) error
+	RemoveField(key string)
 
-	// Name functions
-	SetName(name string)
-	SetPrefix(prefix string)
-	SetSuffix(suffix string)
-
-	// Getting data structure functions
-	Name() string
-	Tags() map[string]string
-	Fields() map[string]interface{}
-	Time() time.Time
-	UnixNano() int64
-	Type() ValueType
-	Len() int // returns the length of the serialized metric, including newline
+	// HashID returns an unique identifier for the series.
 	HashID() uint64
 
-	// aggregator things:
+	// Copy returns a deep copy of the Metric.
+	Copy() Metric
+
+	// Mark Metric as an aggregate
 	SetAggregate(bool)
 	IsAggregate() bool
 }
diff --git a/metric/builder.go b/metric/builder.go
new file mode 100644
index 000000000..d80f566fb
--- /dev/null
+++ b/metric/builder.go
@@ -0,0 +1,51 @@
+package metric
+
+import (
+	"time"
+
+	"github.com/influxdata/telegraf"
+)
+
+type TimeFunc func() time.Time
+
+type Builder struct {
+	TimeFunc
+
+	*metric
+}
+
+func NewBuilder() *Builder {
+	b := &Builder{
+		TimeFunc: time.Now,
+	}
+	b.Reset()
+	return b
+}
+
+func (b *Builder) SetName(name string) {
+	b.name = name
+}
+
+func (b *Builder) AddTag(key string, value string) {
+	b.metric.AddTag(key, value)
+}
+
+func (b *Builder) AddField(key string, value interface{}) {
+	b.metric.AddField(key, value)
+}
+
+func (b *Builder) SetTime(tm time.Time) {
+	b.tm = tm
+}
+
+func (b *Builder) Reset() {
+	b.metric = &metric{}
+}
+
+func (b *Builder) Metric() (telegraf.Metric, error) {
+	if b.tm.IsZero() {
+		b.tm = b.TimeFunc()
+	}
+
+	return b.metric, nil
+}
diff --git a/metric/escape.go b/metric/escape.go
deleted file mode 100644
index cb040b7f2..000000000
--- a/metric/escape.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package metric
-
-import (
-	"strings"
-)
-
-var (
-	// escaper is for escaping:
-	//   - tag keys
-	//   - tag values
-	//   - field keys
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	escaper   = strings.NewReplacer(`,`, `\,`, `"`, `\"`, ` `, `\ `, `=`, `\=`)
-	unEscaper = strings.NewReplacer(`\,`, `,`, `\"`, `"`, `\ `, ` `, `\=`, `=`)
-
-	// nameEscaper is for escaping measurement names only.
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	nameEscaper   = strings.NewReplacer(`,`, `\,`, ` `, `\ `)
-	nameUnEscaper = strings.NewReplacer(`\,`, `,`, `\ `, ` `)
-
-	// stringFieldEscaper is for escaping string field values only.
-	// see https://docs.influxdata.com/influxdb/v1.0/write_protocols/line_protocol_tutorial/#special-characters-and-keywords
-	stringFieldEscaper = strings.NewReplacer(
-		`"`, `\"`,
-		`\`, `\\`,
-	)
-	stringFieldUnEscaper = strings.NewReplacer(
-		`\"`, `"`,
-		`\\`, `\`,
-	)
-)
-
-func escape(s string, t string) string {
-	switch t {
-	case "fieldkey", "tagkey", "tagval":
-		return escaper.Replace(s)
-	case "name":
-		return nameEscaper.Replace(s)
-	case "fieldval":
-		return stringFieldEscaper.Replace(s)
-	}
-	return s
-}
-
-func unescape(s string, t string) string {
-	switch t {
-	case "fieldkey", "tagkey", "tagval":
-		return unEscaper.Replace(s)
-	case "name":
-		return nameUnEscaper.Replace(s)
-	case "fieldval":
-		return stringFieldUnEscaper.Replace(s)
-	}
-	return s
-}
diff --git a/metric/inline_strconv_parse_test.go b/metric/inline_strconv_parse_test.go
deleted file mode 100644
index 2998d4c27..000000000
--- a/metric/inline_strconv_parse_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package metric
-
-import (
-	"strconv"
-	"testing"
-	"testing/quick"
-)
-
-func TestParseIntBytesEquivalenceFuzz(t *testing.T) {
-	f := func(b []byte, base int, bitSize int) bool {
-		exp, expErr := strconv.ParseInt(string(b), base, bitSize)
-		got, gotErr := parseIntBytes(b, base, bitSize)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseIntBytesValid64bitBase10EquivalenceFuzz(t *testing.T) {
-	buf := []byte{}
-	f := func(n int64) bool {
-		buf = strconv.AppendInt(buf[:0], n, 10)
-
-		exp, expErr := strconv.ParseInt(string(buf), 10, 64)
-		got, gotErr := parseIntBytes(buf, 10, 64)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseFloatBytesEquivalenceFuzz(t *testing.T) {
-	f := func(b []byte, bitSize int) bool {
-		exp, expErr := strconv.ParseFloat(string(b), bitSize)
-		got, gotErr := parseFloatBytes(b, bitSize)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseFloatBytesValid64bitEquivalenceFuzz(t *testing.T) {
-	buf := []byte{}
-	f := func(n float64) bool {
-		buf = strconv.AppendFloat(buf[:0], n, 'f', -1, 64)
-
-		exp, expErr := strconv.ParseFloat(string(buf), 64)
-		got, gotErr := parseFloatBytes(buf, 64)
-
-		return exp == got && checkErrs(expErr, gotErr)
-	}
-
-	cfg := &quick.Config{
-		MaxCount: 10000,
-	}
-
-	if err := quick.Check(f, cfg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseBoolBytesEquivalence(t *testing.T) {
-	var buf []byte
-	for _, s := range []string{"1", "t", "T", "TRUE", "true", "True", "0", "f", "F", "FALSE", "false", "False", "fail", "TrUe", "FAlSE", "numbers", ""} {
-		buf = append(buf[:0], s...)
-
-		exp, expErr := strconv.ParseBool(s)
-		got, gotErr := parseBoolBytes(buf)
-
-		if got != exp || !checkErrs(expErr, gotErr) {
-			t.Errorf("Failed to parse boolean value %q correctly: wanted (%t, %v), got (%t, %v)", s, exp, expErr, got, gotErr)
-		}
-	}
-}
-
-func checkErrs(a, b error) bool {
-	if (a == nil) != (b == nil) {
-		return false
-	}
-
-	return a == nil || a.Error() == b.Error()
-}
diff --git a/metric/metric.go b/metric/metric.go
index e46cfd189..06e705a66 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -1,12 +1,9 @@
 package metric
 
 import (
-	"bytes"
 	"fmt"
 	"hash/fnv"
 	"sort"
-	"strconv"
-	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -14,610 +11,282 @@ import (
 
 const MaxInt = int(^uint(0) >> 1)
 
+type metric struct {
+	name   string
+	tags   []*telegraf.Tag
+	fields []*telegraf.Field
+	tm     time.Time
+
+	tp        telegraf.ValueType
+	aggregate bool
+}
+
 func New(
 	name string,
 	tags map[string]string,
 	fields map[string]interface{},
-	t time.Time,
-	mType ...telegraf.ValueType,
+	tm time.Time,
+	tp ...telegraf.ValueType,
 ) (telegraf.Metric, error) {
-	if len(name) == 0 {
-		return nil, fmt.Errorf("missing measurement name")
-	}
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("%s: must have one or more fields", name)
-	}
-	if strings.HasSuffix(name, `\`) {
-		return nil, fmt.Errorf("%s: measurement name cannot end with a backslash", name)
-	}
-
-	var thisType telegraf.ValueType
-	if len(mType) > 0 {
-		thisType = mType[0]
+	var vtype telegraf.ValueType
+	if len(tp) > 0 {
+		vtype = tp[0]
 	} else {
-		thisType = telegraf.Untyped
+		vtype = telegraf.Untyped
 	}
 
 	m := &metric{
-		name:  []byte(escape(name, "name")),
-		t:     []byte(fmt.Sprint(t.UnixNano())),
-		nsec:  t.UnixNano(),
-		mType: thisType,
+		name:   name,
+		tags:   nil,
+		fields: nil,
+		tm:     tm,
+		tp:     vtype,
 	}
 
-	// pre-allocate exact size of the tags slice
-	taglen := 0
-	for k, v := range tags {
-		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("%s: tag key cannot end with a backslash: %s", name, k)
+	if len(tags) > 0 {
+		m.tags = make([]*telegraf.Tag, 0, len(tags))
+		for k, v := range tags {
+			m.tags = append(m.tags,
+				&telegraf.Tag{Key: k, Value: v})
 		}
-		if strings.HasSuffix(v, `\`) {
-			return nil, fmt.Errorf("%s: tag value cannot end with a backslash: %s", name, v)
-		}
-
-		if len(k) == 0 || len(v) == 0 {
-			continue
-		}
-		taglen += 2 + len(escape(k, "tagkey")) + len(escape(v, "tagval"))
-	}
-	m.tags = make([]byte, taglen)
-
-	i := 0
-	for k, v := range tags {
-		if len(k) == 0 || len(v) == 0 {
-			continue
-		}
-		m.tags[i] = ','
-		i++
-		i += copy(m.tags[i:], escape(k, "tagkey"))
-		m.tags[i] = '='
-		i++
-		i += copy(m.tags[i:], escape(v, "tagval"))
+		sort.Slice(m.tags, func(i, j int) bool { return m.tags[i].Key < m.tags[j].Key })
 	}
 
-	// pre-allocate capacity of the fields slice
-	fieldlen := 0
-	for k, _ := range fields {
-		if strings.HasSuffix(k, `\`) {
-			return nil, fmt.Errorf("%s: field key cannot end with a backslash: %s", name, k)
-		}
-
-		// 10 bytes is completely arbitrary, but will at least prevent some
-		// amount of allocations. There's a small possibility this will create
-		// slightly more allocations for a metric that has many short fields.
-		fieldlen += len(k) + 10
-	}
-	m.fields = make([]byte, 0, fieldlen)
-
-	i = 0
+	m.fields = make([]*telegraf.Field, 0, len(fields))
 	for k, v := range fields {
-		if i != 0 {
-			m.fields = append(m.fields, ',')
+		v := convertField(v)
+		if v == nil {
+			continue
 		}
-		m.fields = appendField(m.fields, k, v)
-		i++
+		m.AddField(k, v)
 	}
 
 	return m, nil
 }
 
-// indexUnescapedByte finds the index of the first byte equal to b in buf that
-// is not escaped.  Does not allow the escape char to be escaped. Returns -1 if
-// not found.
-func indexUnescapedByte(buf []byte, b byte) int {
-	var keyi int
-	for {
-		i := bytes.IndexByte(buf[keyi:], b)
-		if i == -1 {
-			return -1
-		} else if i == 0 {
-			break
-		}
-		keyi += i
-		if buf[keyi-1] != '\\' {
-			break
-		} else {
-			keyi++
-		}
-	}
-	return keyi
-}
-
-// indexUnescapedByteBackslashEscaping finds the index of the first byte equal
-// to b in buf that is not escaped.  Allows for the escape char `\` to be
-// escaped.  Returns -1 if not found.
-func indexUnescapedByteBackslashEscaping(buf []byte, b byte) int {
-	var keyi int
-	for {
-		i := bytes.IndexByte(buf[keyi:], b)
-		if i == -1 {
-			return -1
-		} else if i == 0 {
-			break
-		}
-		keyi += i
-		if countBackslashes(buf, keyi-1)%2 == 0 {
-			break
-		} else {
-			keyi++
-		}
-	}
-	return keyi
-}
-
-// countBackslashes counts the number of preceding backslashes starting at
-// the 'start' index.
-func countBackslashes(buf []byte, index int) int {
-	var count int
-	for {
-		if index < 0 {
-			return count
-		}
-		if buf[index] == '\\' {
-			count++
-			index--
-		} else {
-			break
-		}
-	}
-	return count
-}
-
-type metric struct {
-	name   []byte
-	tags   []byte
-	fields []byte
-	t      []byte
-
-	mType     telegraf.ValueType
-	aggregate bool
-
-	// cached values for reuse in "get" functions
-	hashID uint64
-	nsec   int64
-}
-
 func (m *metric) String() string {
-	return string(m.name) + string(m.tags) + " " + string(m.fields) + " " + string(m.t) + "\n"
+	return fmt.Sprintf("%s %v %v %d", m.name, m.Tags(), m.Fields(), m.tm.UnixNano())
+}
+
+func (m *metric) Name() string {
+	return m.name
+}
+
+func (m *metric) Tags() map[string]string {
+	tags := make(map[string]string, len(m.tags))
+	for _, tag := range m.tags {
+		tags[tag.Key] = tag.Value
+	}
+	return tags
+}
+
+func (m *metric) TagList() []*telegraf.Tag {
+	return m.tags
+}
+
+func (m *metric) Fields() map[string]interface{} {
+	fields := make(map[string]interface{}, len(m.fields))
+	for _, field := range m.fields {
+		fields[field.Key] = field.Value
+	}
+
+	return fields
+}
+
+func (m *metric) FieldList() []*telegraf.Field {
+	return m.fields
+}
+
+func (m *metric) Time() time.Time {
+	return m.tm
+}
+
+func (m *metric) Type() telegraf.ValueType {
+	return m.tp
+}
+
+func (m *metric) SetName(name string) {
+	m.name = name
+}
+
+func (m *metric) AddPrefix(prefix string) {
+	m.name = prefix + m.name
+}
+
+func (m *metric) AddSuffix(suffix string) {
+	m.name = m.name + suffix
+}
+
+func (m *metric) AddTag(key, value string) {
+	for i, tag := range m.tags {
+		if key > tag.Key {
+			continue
+		}
+
+		if key == tag.Key {
+			tag.Value = value
+		}
+
+		m.tags = append(m.tags, nil)
+		copy(m.tags[i+1:], m.tags[i:])
+		m.tags[i] = &telegraf.Tag{Key: key, Value: value}
+		return
+	}
+
+	m.tags = append(m.tags, &telegraf.Tag{Key: key, Value: value})
+}
+
+func (m *metric) HasTag(key string) bool {
+	for _, tag := range m.tags {
+		if tag.Key == key {
+			return true
+		}
+	}
+	return false
+}
+
+func (m *metric) GetTag(key string) (string, bool) {
+	for _, tag := range m.tags {
+		if tag.Key == key {
+			return tag.Value, true
+		}
+	}
+	return "", false
+}
+
+func (m *metric) RemoveTag(key string) {
+	for i, tag := range m.tags {
+		if tag.Key == key {
+			copy(m.tags[i:], m.tags[i+1:])
+			m.tags[len(m.tags)-1] = nil
+			m.tags = m.tags[:len(m.tags)-1]
+			return
+		}
+	}
+}
+
+func (m *metric) AddField(key string, value interface{}) {
+	for i, field := range m.fields {
+		if key == field.Key {
+			m.fields[i] = &telegraf.Field{Key: key, Value: convertField(value)}
+		}
+	}
+	m.fields = append(m.fields, &telegraf.Field{Key: key, Value: convertField(value)})
+}
+
+func (m *metric) HasField(key string) bool {
+	for _, field := range m.fields {
+		if field.Key == key {
+			return true
+		}
+	}
+	return false
+}
+
+func (m *metric) GetField(key string) (interface{}, bool) {
+	for _, field := range m.fields {
+		if field.Key == key {
+			return field.Value, true
+		}
+	}
+	return nil, false
+}
+
+func (m *metric) RemoveField(key string) {
+	for i, field := range m.fields {
+		if field.Key == key {
+			copy(m.fields[i:], m.fields[i+1:])
+			m.fields[len(m.fields)-1] = nil
+			m.fields = m.fields[:len(m.fields)-1]
+			return
+		}
+	}
+}
+
+func (m *metric) Copy() telegraf.Metric {
+	m2 := &metric{
+		name:      m.name,
+		tags:      make([]*telegraf.Tag, len(m.tags)),
+		fields:    make([]*telegraf.Field, len(m.fields)),
+		tm:        m.tm,
+		tp:        m.tp,
+		aggregate: m.aggregate,
+	}
+
+	for i, tag := range m.tags {
+		m2.tags[i] = tag
+	}
+
+	for i, field := range m.fields {
+		m2.fields[i] = field
+	}
+	return m2
 }
 
 func (m *metric) SetAggregate(b bool) {
-	m.aggregate = b
+	m.aggregate = true
 }
 
 func (m *metric) IsAggregate() bool {
 	return m.aggregate
 }
 
-func (m *metric) Type() telegraf.ValueType {
-	return m.mType
-}
-
-func (m *metric) Len() int {
-	// 3 is for 2 spaces surrounding the fields array + newline at the end.
-	return len(m.name) + len(m.tags) + len(m.fields) + len(m.t) + 3
-}
-
-func (m *metric) Serialize() []byte {
-	tmp := make([]byte, m.Len())
-	i := 0
-	i += copy(tmp[i:], m.name)
-	i += copy(tmp[i:], m.tags)
-	tmp[i] = ' '
-	i++
-	i += copy(tmp[i:], m.fields)
-	tmp[i] = ' '
-	i++
-	i += copy(tmp[i:], m.t)
-	tmp[i] = '\n'
-	return tmp
-}
-
-func (m *metric) SerializeTo(dst []byte) int {
-	i := 0
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.name)
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.tags)
-	if i >= len(dst) {
-		return i
-	}
-
-	dst[i] = ' '
-	i++
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.fields)
-	if i >= len(dst) {
-		return i
-	}
-
-	dst[i] = ' '
-	i++
-	if i >= len(dst) {
-		return i
-	}
-
-	i += copy(dst[i:], m.t)
-	if i >= len(dst) {
-		return i
-	}
-	dst[i] = '\n'
-
-	return i + 1
-}
-
-func (m *metric) Split(maxSize int) []telegraf.Metric {
-	if m.Len() <= maxSize {
-		return []telegraf.Metric{m}
-	}
-	var out []telegraf.Metric
-
-	// constant number of bytes for each metric (in addition to field bytes)
-	constant := len(m.name) + len(m.tags) + len(m.t) + 3
-	// currently selected fields
-	fields := make([]byte, 0, maxSize)
-
-	i := 0
-	for {
-		if i >= len(m.fields) {
-			// hit the end of the field byte slice
-			if len(fields) > 0 {
-				out = append(out, copyWith(m.name, m.tags, fields, m.t))
-			}
-			break
-		}
-
-		// find the end of the next field
-		j := indexUnescapedByte(m.fields[i:], ',')
-		if j == -1 {
-			j = len(m.fields)
-		} else {
-			j += i
-		}
-
-		// if true, then we need to create a metric _not_ including the currently
-		// selected field
-		if len(m.fields[i:j])+len(fields)+constant >= maxSize {
-			// if false, then we'll create a metric including the currently
-			// selected field anyways. This means that the given maxSize is too
-			// small for a single field to fit.
-			if len(fields) > 0 {
-				out = append(out, copyWith(m.name, m.tags, fields, m.t))
-			}
-
-			fields = make([]byte, 0, maxSize)
-		}
-		if len(fields) > 0 {
-			fields = append(fields, ',')
-		}
-		fields = append(fields, m.fields[i:j]...)
-
-		i = j + 1
-	}
-	return out
-}
-
-func (m *metric) Fields() map[string]interface{} {
-	fieldMap := map[string]interface{}{}
-	i := 0
-	for {
-		if i >= len(m.fields) {
-			break
-		}
-		// end index of field key
-		i1 := indexUnescapedByte(m.fields[i:], '=')
-		if i1 == -1 {
-			break
-		}
-		// start index of field value
-		i2 := i1 + 1
-
-		// end index of field value
-		var i3 int
-		if m.fields[i:][i2] == '"' {
-			i3 = indexUnescapedByteBackslashEscaping(m.fields[i:][i2+1:], '"')
-			if i3 == -1 {
-				i3 = len(m.fields[i:])
-			}
-			i3 += i2 + 2 // increment index to the comma
-		} else {
-			i3 = indexUnescapedByte(m.fields[i:], ',')
-			if i3 == -1 {
-				i3 = len(m.fields[i:])
-			}
-		}
-
-		switch m.fields[i:][i2] {
-		case '"':
-			// string field
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = unescape(string(m.fields[i:][i2+1:i3-1]), "fieldval")
-		case '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			// number field
-			switch m.fields[i:][i3-1] {
-			case 'i':
-				// integer field
-				n, err := parseIntBytes(m.fields[i:][i2:i3-1], 10, 64)
-				if err == nil {
-					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
-				} else {
-					// TODO handle error or just ignore field silently?
-				}
-			default:
-				// float field
-				n, err := parseFloatBytes(m.fields[i:][i2:i3], 64)
-				if err == nil {
-					fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = n
-				} else {
-					// TODO handle error or just ignore field silently?
-				}
-			}
-		case 'T', 't':
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = true
-		case 'F', 'f':
-			fieldMap[unescape(string(m.fields[i:][0:i1]), "fieldkey")] = false
-		default:
-			// TODO handle unsupported field type
-		}
-
-		i += i3 + 1
-	}
-
-	return fieldMap
-}
-
-func (m *metric) Tags() map[string]string {
-	tagMap := map[string]string{}
-	if len(m.tags) == 0 {
-		return tagMap
-	}
-
-	i := 0
-	for {
-		// start index of tag key
-		i0 := indexUnescapedByte(m.tags[i:], ',') + 1
-		if i0 == 0 {
-			// didn't find a tag start
-			break
-		}
-		// end index of tag key
-		i1 := indexUnescapedByte(m.tags[i:], '=')
-		// start index of tag value
-		i2 := i1 + 1
-		// end index of tag value (starting from i2)
-		i3 := indexUnescapedByte(m.tags[i+i2:], ',')
-		if i3 == -1 {
-			tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:]), "tagval")
-			break
-		}
-		tagMap[unescape(string(m.tags[i:][i0:i1]), "tagkey")] = unescape(string(m.tags[i:][i2:i2+i3]), "tagval")
-		// increment start index for the next tag
-		i += i2 + i3
-	}
-
-	return tagMap
-}
-
-func (m *metric) Name() string {
-	return unescape(string(m.name), "name")
-}
-
-func (m *metric) Time() time.Time {
-	// assume metric has been verified already and ignore error:
-	if m.nsec == 0 {
-		m.nsec, _ = parseIntBytes(m.t, 10, 64)
-	}
-	return time.Unix(0, m.nsec)
-}
-
-func (m *metric) UnixNano() int64 {
-	// assume metric has been verified already and ignore error:
-	if m.nsec == 0 {
-		m.nsec, _ = parseIntBytes(m.t, 10, 64)
-	}
-	return m.nsec
-}
-
-func (m *metric) SetName(name string) {
-	m.hashID = 0
-	m.name = []byte(nameEscaper.Replace(name))
-}
-
-func (m *metric) SetPrefix(prefix string) {
-	m.hashID = 0
-	m.name = append([]byte(nameEscaper.Replace(prefix)), m.name...)
-}
-
-func (m *metric) SetSuffix(suffix string) {
-	m.hashID = 0
-	m.name = append(m.name, []byte(nameEscaper.Replace(suffix))...)
-}
-
-func (m *metric) AddTag(key, value string) {
-	m.RemoveTag(key)
-	m.tags = append(m.tags, []byte(","+escape(key, "tagkey")+"="+escape(value, "tagval"))...)
-}
-
-func (m *metric) HasTag(key string) bool {
-	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return false
-	}
-	return true
-}
-
-func (m *metric) RemoveTag(key string) {
-	m.hashID = 0
-
-	i := bytes.Index(m.tags, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return
-	}
-
-	tmp := m.tags[0 : i-1]
-	j := indexUnescapedByte(m.tags[i:], ',')
-	if j != -1 {
-		tmp = append(tmp, m.tags[i+j:]...)
-	}
-	m.tags = tmp
-	return
-}
-
-func (m *metric) AddField(key string, value interface{}) {
-	m.fields = append(m.fields, ',')
-	m.fields = appendField(m.fields, key, value)
-}
-
-func (m *metric) HasField(key string) bool {
-	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return false
-	}
-	return true
-}
-
-func (m *metric) RemoveField(key string) error {
-	i := bytes.Index(m.fields, []byte(escape(key, "tagkey")+"="))
-	if i == -1 {
-		return nil
-	}
-
-	var tmp []byte
-	if i != 0 {
-		tmp = m.fields[0 : i-1]
-	}
-	j := indexUnescapedByte(m.fields[i:], ',')
-	if j != -1 {
-		tmp = append(tmp, m.fields[i+j:]...)
-	}
-
-	if len(tmp) == 0 {
-		return fmt.Errorf("Metric cannot remove final field: %s", m.fields)
-	}
-
-	m.fields = tmp
-	return nil
-}
-
-func (m *metric) Copy() telegraf.Metric {
-	return copyWith(m.name, m.tags, m.fields, m.t)
-}
-
-func copyWith(name, tags, fields, t []byte) telegraf.Metric {
-	out := metric{
-		name:   make([]byte, len(name)),
-		tags:   make([]byte, len(tags)),
-		fields: make([]byte, len(fields)),
-		t:      make([]byte, len(t)),
-	}
-	copy(out.name, name)
-	copy(out.tags, tags)
-	copy(out.fields, fields)
-	copy(out.t, t)
-	return &out
-}
-
 func (m *metric) HashID() uint64 {
-	if m.hashID == 0 {
-		h := fnv.New64a()
-		h.Write(m.name)
-
-		tags := m.Tags()
-		tmp := make([]string, len(tags))
-		i := 0
-		for k, v := range tags {
-			tmp[i] = k + v
-			i++
-		}
-		sort.Strings(tmp)
-
-		for _, s := range tmp {
-			h.Write([]byte(s))
-		}
-
-		m.hashID = h.Sum64()
+	h := fnv.New64a()
+	h.Write([]byte(m.name))
+	for _, tag := range m.tags {
+		h.Write([]byte(tag.Key))
+		h.Write([]byte(tag.Value))
 	}
-	return m.hashID
+	return h.Sum64()
 }
 
-func appendField(b []byte, k string, v interface{}) []byte {
-	if v == nil {
-		return b
-	}
-	b = append(b, []byte(escape(k, "tagkey")+"=")...)
-
-	// check popular types first
+// Convert field to a supported type or nil if unconvertible
+func convertField(v interface{}) interface{} {
 	switch v := v.(type) {
 	case float64:
-		b = strconv.AppendFloat(b, v, 'f', -1, 64)
+		return v
 	case int64:
-		b = strconv.AppendInt(b, v, 10)
-		b = append(b, 'i')
+		return v
 	case string:
-		b = append(b, '"')
-		b = append(b, []byte(escape(v, "fieldval"))...)
-		b = append(b, '"')
+		if v == "" {
+			return nil
+		} else {
+			return v
+		}
 	case bool:
-		b = strconv.AppendBool(b, v)
-	case int32:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case int16:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case int8:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
+		return v
 	case int:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint64:
-		// Cap uints above the maximum int value
-		var intv int64
-		if v <= uint64(MaxInt) {
-			intv = int64(v)
-		} else {
-			intv = int64(MaxInt)
-		}
-		b = strconv.AppendInt(b, intv, 10)
-		b = append(b, 'i')
-	case uint32:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint16:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
-	case uint8:
-		b = strconv.AppendInt(b, int64(v), 10)
-		b = append(b, 'i')
+		return int64(v)
 	case uint:
-		// Cap uints above the maximum int value
-		var intv int64
 		if v <= uint(MaxInt) {
-			intv = int64(v)
+			return int64(v)
 		} else {
-			intv = int64(MaxInt)
+			return int64(MaxInt)
+		}
+	case uint64:
+		if v <= uint64(MaxInt) {
+			return int64(v)
+		} else {
+			return int64(MaxInt)
 		}
-		b = strconv.AppendInt(b, intv, 10)
-		b = append(b, 'i')
-	case float32:
-		b = strconv.AppendFloat(b, float64(v), 'f', -1, 32)
 	case []byte:
-		b = append(b, v...)
+		return string(v)
+	case int32:
+		return int64(v)
+	case int16:
+		return int64(v)
+	case int8:
+		return int64(v)
+	case uint32:
+		return int64(v)
+	case uint16:
+		return int64(v)
+	case uint8:
+		return int64(v)
+	case float32:
+		return float64(v)
 	default:
-		// Can't determine the type, so convert to string
-		b = append(b, '"')
-		b = append(b, []byte(escape(fmt.Sprintf("%v", v), "fieldval"))...)
-		b = append(b, '"')
+		return nil
 	}
-
-	return b
 }
diff --git a/metric/metric_benchmark_test.go b/metric/metric_benchmark_test.go
deleted file mode 100644
index 9383fb0dc..000000000
--- a/metric/metric_benchmark_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package metric
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-// vars for making sure that the compiler doesnt optimize out the benchmarks:
-var (
-	s      string
-	I      interface{}
-	tags   map[string]string
-	fields map[string]interface{}
-)
-
-func BenchmarkNewMetric(b *testing.B) {
-	var mt telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-	}
-	s = string(mt.String())
-}
-
-func BenchmarkAddTag(b *testing.B) {
-	var mt telegraf.Metric
-	mt = &metric{
-		name:   []byte("cpu"),
-		tags:   []byte(",host=localhost"),
-		fields: []byte("a=101"),
-		t:      []byte("1480614053000000000"),
-	}
-	for n := 0; n < b.N; n++ {
-		mt.AddTag("foo", "bar")
-	}
-	s = string(mt.String())
-}
-
-func BenchmarkSplit(b *testing.B) {
-	var mt telegraf.Metric
-	mt = &metric{
-		name:   []byte("cpu"),
-		tags:   []byte(",host=localhost"),
-		fields: []byte("a=101,b=10i,c=10101,d=101010,e=42"),
-		t:      []byte("1480614053000000000"),
-	}
-	var metrics []telegraf.Metric
-	for n := 0; n < b.N; n++ {
-		metrics = mt.Split(60)
-	}
-	s = string(metrics[0].String())
-}
-
-func BenchmarkTags(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		var mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-		tags = mt.Tags()
-	}
-	s = fmt.Sprint(tags)
-}
-
-func BenchmarkFields(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		var mt, _ = New("test_metric",
-			map[string]string{
-				"test_tag_1": "tag_value_1",
-				"test_tag_2": "tag_value_2",
-				"test_tag_3": "tag_value_3",
-			},
-			map[string]interface{}{
-				"string_field": "string",
-				"int_field":    int64(1000),
-				"float_field":  float64(2.1),
-			},
-			time.Now(),
-		)
-		fields = mt.Fields()
-	}
-	s = fmt.Sprint(fields)
-}
-
-func BenchmarkString(b *testing.B) {
-	mt, _ := New("test_metric",
-		map[string]string{
-			"test_tag_1": "tag_value_1",
-			"test_tag_2": "tag_value_2",
-			"test_tag_3": "tag_value_3",
-		},
-		map[string]interface{}{
-			"string_field": "string",
-			"int_field":    int64(1000),
-			"float_field":  float64(2.1),
-		},
-		time.Now(),
-	)
-	var S string
-	for n := 0; n < b.N; n++ {
-		S = mt.String()
-	}
-	s = S
-}
-
-func BenchmarkSerialize(b *testing.B) {
-	mt, _ := New("test_metric",
-		map[string]string{
-			"test_tag_1": "tag_value_1",
-			"test_tag_2": "tag_value_2",
-			"test_tag_3": "tag_value_3",
-		},
-		map[string]interface{}{
-			"string_field": "string",
-			"int_field":    int64(1000),
-			"float_field":  float64(2.1),
-		},
-		time.Now(),
-	)
-	var B []byte
-	for n := 0; n < b.N; n++ {
-		B = mt.Serialize()
-	}
-	s = string(B)
-}
diff --git a/metric/metric_test.go b/metric/metric_test.go
index 062399d6e..31f1729d8 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -1,14 +1,10 @@
 package metric
 
 import (
-	"fmt"
-	"math"
-	"regexp"
 	"testing"
 	"time"
 
 	"github.com/influxdata/telegraf"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -25,102 +21,184 @@ func TestNewMetric(t *testing.T) {
 		"usage_busy": float64(1),
 	}
 	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
-	assert.Equal(t, telegraf.Untyped, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
+	require.Equal(t, "cpu", m.Name())
+	require.Equal(t, tags, m.Tags())
+	require.Equal(t, fields, m.Fields())
+	require.Equal(t, 2, len(m.FieldList()))
+	require.Equal(t, now, m.Time())
 }
 
-func TestNewErrors(t *testing.T) {
-	// creating a metric with an empty name produces an error:
-	m, err := New(
-		"",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{
-			"value": float64(1),
-		},
-		time.Now(),
-	)
-	assert.Error(t, err)
-	assert.Nil(t, m)
-
-	// creating a metric with empty fields produces an error:
-	m, err = New(
-		"foobar",
-		map[string]string{
-			"datacenter": "us-east-1",
-			"mytag":      "foo",
-			"another":    "tag",
-		},
-		map[string]interface{}{},
-		time.Now(),
-	)
-	assert.Error(t, err)
-	assert.Nil(t, m)
-}
-
-func TestNewMetric_Tags(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host":       "localhost",
-		"datacenter": "us-east-1",
-	}
+func baseMetric() telegraf.Metric {
+	tags := map[string]string{}
 	fields := map[string]interface{}{
 		"value": float64(1),
 	}
+	now := time.Now()
+
 	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
+	if err != nil {
+		panic(err)
+	}
+	return m
+}
 
-	assert.True(t, m.HasTag("host"))
-	assert.True(t, m.HasTag("datacenter"))
+func TestHasTag(t *testing.T) {
+	m := baseMetric()
 
-	m.AddTag("newtag", "foo")
-	assert.True(t, m.HasTag("newtag"))
+	require.False(t, m.HasTag("host"))
+	m.AddTag("host", "localhost")
+	require.True(t, m.HasTag("host"))
+	m.RemoveTag("host")
+	require.False(t, m.HasTag("host"))
+}
+
+func TestAddTagOverwrites(t *testing.T) {
+	m := baseMetric()
+
+	m.AddTag("host", "localhost")
+	m.AddTag("host", "example.org")
+
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "example.org", value)
+}
+
+func TestRemoveTagNoEffectOnMissingTags(t *testing.T) {
+	m := baseMetric()
+
+	m.RemoveTag("foo")
+	m.AddTag("a", "x")
+	m.RemoveTag("foo")
+	m.RemoveTag("bar")
+	value, ok := m.GetTag("a")
+	require.True(t, ok)
+	require.Equal(t, "x", value)
+}
+
+func TestGetTag(t *testing.T) {
+	m := baseMetric()
+
+	value, ok := m.GetTag("host")
+	require.False(t, ok)
+
+	m.AddTag("host", "localhost")
+
+	value, ok = m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
 
 	m.RemoveTag("host")
-	assert.False(t, m.HasTag("host"))
-	assert.True(t, m.HasTag("newtag"))
-	assert.True(t, m.HasTag("datacenter"))
-
-	m.RemoveTag("datacenter")
-	assert.False(t, m.HasTag("datacenter"))
-	assert.True(t, m.HasTag("newtag"))
-	assert.Equal(t, map[string]string{"newtag": "foo"}, m.Tags())
-
-	m.RemoveTag("newtag")
-	assert.False(t, m.HasTag("newtag"))
-	assert.Equal(t, map[string]string{}, m.Tags())
-
-	assert.Equal(t, "cpu value=1 "+fmt.Sprint(now.UnixNano())+"\n", m.String())
+	value, ok = m.GetTag("host")
+	require.False(t, ok)
 }
 
-func TestSerialize(t *testing.T) {
+func TestHasField(t *testing.T) {
+	m := baseMetric()
+
+	require.False(t, m.HasField("x"))
+	m.AddField("x", 42.0)
+	require.True(t, m.HasField("x"))
+	m.RemoveTag("x")
+	require.False(t, m.HasTag("x"))
+}
+
+func TestAddFieldOverwrites(t *testing.T) {
+	m := baseMetric()
+
+	m.AddField("value", 1.0)
+	m.AddField("value", 42.0)
+
+	value, ok := m.GetField("value")
+	require.True(t, ok)
+	require.Equal(t, 42.0, value)
+}
+
+func TestAddFieldChangesType(t *testing.T) {
+	m := baseMetric()
+
+	m.AddField("value", 1.0)
+	m.AddField("value", "xyzzy")
+
+	value, ok := m.GetField("value")
+	require.True(t, ok)
+	require.Equal(t, "xyzzy", value)
+}
+
+func TestRemoveFieldNoEffectOnMissingFields(t *testing.T) {
+	m := baseMetric()
+
+	m.RemoveField("foo")
+	m.AddField("a", "x")
+	m.RemoveField("foo")
+	m.RemoveField("bar")
+	value, ok := m.GetField("a")
+	require.True(t, ok)
+	require.Equal(t, "x", value)
+}
+
+func TestGetField(t *testing.T) {
+	m := baseMetric()
+
+	value, ok := m.GetField("foo")
+	require.False(t, ok)
+
+	m.AddField("foo", "bar")
+
+	value, ok = m.GetField("foo")
+	require.True(t, ok)
+	require.Equal(t, "bar", value)
+
+	m.RemoveTag("foo")
+	value, ok = m.GetTag("foo")
+	require.False(t, ok)
+}
+
+func TestTagList_Sorted(t *testing.T) {
+	m := baseMetric()
+
+	m.AddTag("b", "y")
+	m.AddTag("c", "z")
+	m.AddTag("a", "x")
+
+	taglist := m.TagList()
+	require.Equal(t, "a", taglist[0].Key)
+	require.Equal(t, "b", taglist[1].Key)
+	require.Equal(t, "c", taglist[2].Key)
+}
+
+func TestEquals(t *testing.T) {
 	now := time.Now()
-	tags := map[string]string{
-		"datacenter": "us-east-1",
-	}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
+	m1, err := New("cpu",
+		map[string]string{
+			"host": "localhost",
+		},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		now,
+	)
+	require.NoError(t, err)
 
-	assert.Equal(t,
-		[]byte("cpu,datacenter=us-east-1 value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
-		m.Serialize())
+	m2, err := New("cpu",
+		map[string]string{
+			"host": "localhost",
+		},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		now,
+	)
+	require.NoError(t, err)
 
-	m.RemoveTag("datacenter")
-	assert.Equal(t,
-		[]byte("cpu value=1 "+fmt.Sprint(now.UnixNano())+"\n"),
-		m.Serialize())
+	lhs := m1.(*metric)
+	require.Equal(t, lhs, m2)
+
+	m3 := m2.Copy()
+	require.Equal(t, lhs, m3)
+	m3.AddTag("a", "x")
+	require.NotEqual(t, lhs, m3)
 }
 
 func TestHashID(t *testing.T) {
@@ -171,567 +249,62 @@ func TestHashID_Consistency(t *testing.T) {
 	)
 	hash := m.HashID()
 
-	for i := 0; i < 1000; i++ {
-		m2, _ := New(
-			"cpu",
-			map[string]string{
-				"datacenter": "us-east-1",
-				"mytag":      "foo",
-				"another":    "tag",
-			},
-			map[string]interface{}{
-				"value": float64(1),
-			},
-			time.Now(),
-		)
-		assert.Equal(t, hash, m2.HashID())
-	}
+	m2, _ := New(
+		"cpu",
+		map[string]string{
+			"datacenter": "us-east-1",
+			"mytag":      "foo",
+			"another":    "tag",
+		},
+		map[string]interface{}{
+			"value": float64(1),
+		},
+		time.Now(),
+	)
+	assert.Equal(t, hash, m2.HashID())
+
+	m3 := m.Copy()
+	assert.Equal(t, m2.HashID(), m3.HashID())
 }
 
-func TestNewMetric_NameModifiers(t *testing.T) {
+func TestSetName(t *testing.T) {
+	m := baseMetric()
+	m.SetName("foo")
+	require.Equal(t, "foo", m.Name())
+}
+
+func TestAddPrefix(t *testing.T) {
+	m := baseMetric()
+	m.AddPrefix("foo_")
+	require.Equal(t, "foo_cpu", m.Name())
+	m.AddPrefix("foo_")
+	require.Equal(t, "foo_foo_cpu", m.Name())
+}
+
+func TestAddSuffix(t *testing.T) {
+	m := baseMetric()
+	m.AddSuffix("_foo")
+	require.Equal(t, "cpu_foo", m.Name())
+	m.AddSuffix("_foo")
+	require.Equal(t, "cpu_foo_foo", m.Name())
+}
+
+func TestValueType(t *testing.T) {
 	now := time.Now()
+
 	tags := map[string]string{}
 	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	hash := m.HashID()
-	suffix := fmt.Sprintf(" value=1 %d\n", now.UnixNano())
-	assert.Equal(t, "cpu"+suffix, m.String())
-
-	m.SetPrefix("pre_")
-	assert.NotEqual(t, hash, m.HashID())
-	hash = m.HashID()
-	assert.Equal(t, "pre_cpu"+suffix, m.String())
-
-	m.SetSuffix("_post")
-	assert.NotEqual(t, hash, m.HashID())
-	hash = m.HashID()
-	assert.Equal(t, "pre_cpu_post"+suffix, m.String())
-
-	m.SetName("mem")
-	assert.NotEqual(t, hash, m.HashID())
-	assert.Equal(t, "mem"+suffix, m.String())
-}
-
-func TestNewMetric_FieldModifiers(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"value": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.True(t, m.HasField("value"))
-	assert.False(t, m.HasField("foo"))
-
-	m.AddField("newfield", "foo")
-	assert.True(t, m.HasField("newfield"))
-
-	assert.NoError(t, m.RemoveField("newfield"))
-	assert.False(t, m.HasField("newfield"))
-
-	// don't allow user to remove all fields:
-	assert.Error(t, m.RemoveField("value"))
-
-	m.AddField("value2", int64(101))
-	assert.NoError(t, m.RemoveField("value"))
-	assert.False(t, m.HasField("value"))
-}
-
-func TestNewMetric_Fields(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":                  float64(1),
-		"int":                    int64(1),
-		"bool":                   true,
-		"false":                  false,
-		"string":                 "test",
-		"quote_string":           `x"y`,
-		"backslash_quote_string": `x\"y`,
-		"backslash":              `x\y`,
-		"ends_with_backslash":    `x\`,
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, fields, m.Fields())
-}
-
-func TestNewMetric_Time(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(1),
-		"int":    int64(1),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	m = m.Copy()
-	m2 := m.Copy()
-
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m2.UnixNano())
-}
-
-func TestNewMetric_Copy(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{}
-	fields := map[string]interface{}{
-		"float": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	m2 := m.Copy()
-
-	assert.Equal(t,
-		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
-		m.String())
-	m.AddTag("host", "localhost")
-	assert.Equal(t,
-		fmt.Sprintf("cpu,host=localhost float=1 %d\n", now.UnixNano()),
-		m.String())
-
-	assert.Equal(t,
-		fmt.Sprintf("cpu float=1 %d\n", now.UnixNano()),
-		m2.String())
-}
-
-func TestNewMetric_AllTypes(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{}
-	fields := map[string]interface{}{
-		"float64":     float64(1),
-		"float32":     float32(1),
-		"int64":       int64(1),
-		"int32":       int32(1),
-		"int16":       int16(1),
-		"int8":        int8(1),
-		"int":         int(1),
-		"uint64":      uint64(1),
-		"uint32":      uint32(1),
-		"uint16":      uint16(1),
-		"uint8":       uint8(1),
-		"uint":        uint(1),
-		"bytes":       []byte("foo"),
-		"nil":         nil,
-		"maxuint64":   uint64(MaxInt) + 10,
-		"maxuint":     uint(MaxInt) + 10,
-		"unsupported": []int{1, 2},
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Contains(t, m.String(), "float64=1")
-	assert.Contains(t, m.String(), "float32=1")
-	assert.Contains(t, m.String(), "int64=1i")
-	assert.Contains(t, m.String(), "int32=1i")
-	assert.Contains(t, m.String(), "int16=1i")
-	assert.Contains(t, m.String(), "int8=1i")
-	assert.Contains(t, m.String(), "int=1i")
-	assert.Contains(t, m.String(), "uint64=1i")
-	assert.Contains(t, m.String(), "uint32=1i")
-	assert.Contains(t, m.String(), "uint16=1i")
-	assert.Contains(t, m.String(), "uint8=1i")
-	assert.Contains(t, m.String(), "uint=1i")
-	assert.NotContains(t, m.String(), "nil")
-	assert.Contains(t, m.String(), fmt.Sprintf("maxuint64=%di", MaxInt))
-	assert.Contains(t, m.String(), fmt.Sprintf("maxuint=%di", MaxInt))
-}
-
-func TestIndexUnescapedByte(t *testing.T) {
-	tests := []struct {
-		in       []byte
-		b        byte
-		expected int
-	}{
-		{
-			in:       []byte(`foobar`),
-			b:        'b',
-			expected: 3,
-		},
-		{
-			in:       []byte(`foo\bar`),
-			b:        'b',
-			expected: -1,
-		},
-		{
-			in:       []byte(`foo\\bar`),
-			b:        'b',
-			expected: -1,
-		},
-		{
-			in:       []byte(`foobar`),
-			b:        'f',
-			expected: 0,
-		},
-		{
-			in:       []byte(`foobar`),
-			b:        'r',
-			expected: 5,
-		},
-		{
-			in:       []byte(`\foobar`),
-			b:        'f',
-			expected: -1,
-		},
-	}
-
-	for _, test := range tests {
-		got := indexUnescapedByte(test.in, test.b)
-		assert.Equal(t, test.expected, got)
-	}
-}
-
-func TestNewGaugeMetric(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host":       "localhost",
-		"datacenter": "us-east-1",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-		"usage_busy": float64(1),
+		"value": float64(42),
 	}
 	m, err := New("cpu", tags, fields, now, telegraf.Gauge)
 	assert.NoError(t, err)
 
 	assert.Equal(t, telegraf.Gauge, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
 }
 
-func TestNewCounterMetric(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host":       "localhost",
-		"datacenter": "us-east-1",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-		"usage_busy": float64(1),
-	}
-	m, err := New("cpu", tags, fields, now, telegraf.Counter)
-	assert.NoError(t, err)
-
-	assert.Equal(t, telegraf.Counter, m.Type())
-	assert.Equal(t, tags, m.Tags())
-	assert.Equal(t, fields, m.Fields())
-	assert.Equal(t, "cpu", m.Name())
-	assert.Equal(t, now.UnixNano(), m.Time().UnixNano())
-	assert.Equal(t, now.UnixNano(), m.UnixNano())
-}
-
-// test splitting metric into various max lengths
-func TestSplitMetric(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split80 := m.Split(80)
-	assert.Len(t, split80, 2)
-
-	split70 := m.Split(70)
-	assert.Len(t, split70, 3)
-
-	split60 := m.Split(60)
-	assert.Len(t, split60, 5)
-}
-
-// test splitting metric into various max lengths
-// use a simple regex check to verify that the split metrics are valid
-func TestSplitMetric_RegexVerify(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"foo":     float64(98934259085),
-		"bar":     float64(19385292),
-		"number":  float64(19385292),
-		"another": float64(19385292),
-		"n":       float64(19385292),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	// verification regex
-	re := regexp.MustCompile(`cpu,host=localhost \w+=\d+(,\w+=\d+)* 1480940990034083306`)
-
-	split90 := m.Split(90)
-	assert.Len(t, split90, 2)
-	for _, splitM := range split90 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-
-	split70 := m.Split(70)
-	assert.Len(t, split70, 3)
-	for _, splitM := range split70 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-
-	split20 := m.Split(20)
-	assert.Len(t, split20, 5)
-	for _, splitM := range split20 {
-		assert.True(t, re.Match(splitM.Serialize()), splitM.String())
-	}
-}
-
-// test splitting metric even when given length is shorter than
-// shortest possible length
-// Split should split metric as short as possible, ie, 1 field per metric
-func TestSplitMetric_TooShort(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split := m.Split(10)
-	assert.Len(t, split, 5)
-	strings := make([]string, 5)
-	for i, splitM := range split {
-		strings[i] = splitM.String()
-	}
-
-	assert.Contains(t, strings, "cpu,host=localhost float=100001 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost int=100001i 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost bool=true 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost false=false 1480940990034083306\n")
-	assert.Contains(t, strings, "cpu,host=localhost string=\"test\" 1480940990034083306\n")
-}
-
-func TestSplitMetric_NoOp(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	split := m.Split(1000)
-	assert.Len(t, split, 1)
-	assert.Equal(t, m, split[0])
-}
-
-func TestSplitMetric_OneField(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float": float64(100001),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", m.String())
-
-	split := m.Split(1000)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-
-	split = m.Split(1)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-
-	split = m.Split(40)
-	assert.Len(t, split, 1)
-	assert.Equal(t, "cpu,host=localhost float=100001 1480940990034083306\n", split[0].String())
-}
-
-func TestSplitMetric_ExactSize(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float":  float64(100001),
-		"int":    int64(100001),
-		"bool":   true,
-		"false":  false,
-		"string": "test",
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	actual := m.Split(m.Len())
-	// check that no copy was made
-	require.Equal(t, &m, &actual[0])
-}
-
-func TestSplitMetric_NoRoomForNewline(t *testing.T) {
-	now := time.Unix(0, 1480940990034083306)
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"float": float64(100001),
-		"int":   int64(100001),
-		"bool":  true,
-		"false": false,
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-	actual := m.Split(m.Len() - 1)
-	require.Equal(t, 2, len(actual))
-}
-
-func TestNewMetricAggregate(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	assert.False(t, m.IsAggregate())
-	m.SetAggregate(true)
-	assert.True(t, m.IsAggregate())
-}
-
-func TestNewMetricString(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	lineProto := fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n",
-		now.UnixNano())
-	assert.Equal(t, lineProto, m.String())
-}
-
-func TestNewMetricFailNaN(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host": "localhost",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": math.NaN(),
-	}
-
-	_, err := New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-}
-
-func TestEmptyTagValueOrKey(t *testing.T) {
-	now := time.Now()
-
-	tags := map[string]string{
-		"host":     "localhost",
-		"emptytag": "",
-		"":         "valuewithoutkey",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-	}
-	m, err := New("cpu", tags, fields, now)
-
-	assert.True(t, m.HasTag("host"))
-	assert.False(t, m.HasTag("emptytag"))
-	assert.Equal(t,
-		fmt.Sprintf("cpu,host=localhost usage_idle=99 %d\n", now.UnixNano()),
-		m.String())
-
-	assert.NoError(t, err)
-
-}
-
-func TestNewMetric_TrailingSlash(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name   string
-		tags   map[string]string
-		fields map[string]interface{}
-	}{
-		{
-			name: `cpu\`,
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-		{
-			name: "cpu",
-			fields: map[string]interface{}{
-				`value\`: "x",
-			},
-		},
-		{
-			name: "cpu",
-			tags: map[string]string{
-				`host\`: "localhost",
-			},
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-		{
-			name: "cpu",
-			tags: map[string]string{
-				"host": `localhost\`,
-			},
-			fields: map[string]interface{}{
-				"value": int64(42),
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		_, err := New(tc.name, tc.tags, tc.fields, now)
-		assert.Error(t, err)
-	}
+func TestCopyAggreate(t *testing.T) {
+	m1 := baseMetric()
+	m1.SetAggregate(true)
+	m2 := m1.Copy()
+	assert.True(t, m2.IsAggregate())
 }
diff --git a/metric/parse.go b/metric/parse.go
deleted file mode 100644
index 0fccbeb32..000000000
--- a/metric/parse.go
+++ /dev/null
@@ -1,680 +0,0 @@
-package metric
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/influxdata/telegraf"
-)
-
-var (
-	ErrInvalidNumber = errors.New("invalid number")
-)
-
-const (
-	// the number of characters for the largest possible int64 (9223372036854775807)
-	maxInt64Digits = 19
-
-	// the number of characters for the smallest possible int64 (-9223372036854775808)
-	minInt64Digits = 20
-
-	// the number of characters required for the largest float64 before a range check
-	// would occur during parsing
-	maxFloat64Digits = 25
-
-	// the number of characters required for smallest float64 before a range check occur
-	// would occur during parsing
-	minFloat64Digits = 27
-
-	MaxKeyLength = 65535
-)
-
-// The following constants allow us to specify which state to move to
-// next, when scanning sections of a Point.
-const (
-	tagKeyState = iota
-	tagValueState
-	fieldsState
-)
-
-func Parse(buf []byte) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTimePrecision(buf, time.Now(), "")
-}
-
-func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
-	return ParseWithDefaultTimePrecision(buf, t, "")
-}
-
-func ParseWithDefaultTimePrecision(
-	buf []byte,
-	t time.Time,
-	precision string,
-) ([]telegraf.Metric, error) {
-	if len(buf) == 0 {
-		return []telegraf.Metric{}, nil
-	}
-	if len(buf) <= 6 {
-		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
-	}
-	metrics := make([]telegraf.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
-	var errStr string
-	i := 0
-	for {
-		j := bytes.IndexByte(buf[i:], '\n')
-		if j == -1 {
-			break
-		}
-		if len(buf[i:i+j]) < 2 {
-			i += j + 1 // increment i past the previous newline
-			continue
-		}
-
-		m, err := parseMetric(buf[i:i+j], t, precision)
-		if err != nil {
-			i += j + 1 // increment i past the previous newline
-			errStr += " " + err.Error()
-			continue
-		}
-		i += j + 1 // increment i past the previous newline
-
-		metrics = append(metrics, m)
-	}
-
-	if len(errStr) > 0 {
-		return metrics, fmt.Errorf(errStr)
-	}
-	return metrics, nil
-}
-
-func parseMetric(buf []byte,
-	defaultTime time.Time,
-	precision string,
-) (telegraf.Metric, error) {
-	var dTime string
-	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
-	pos, key, err := scanKey(buf, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	// measurement name is required
-	if len(key) == 0 {
-		return nil, fmt.Errorf("missing measurement")
-	}
-
-	if len(key) > MaxKeyLength {
-		return nil, fmt.Errorf("max key length exceeded: %v > %v", len(key), MaxKeyLength)
-	}
-
-	// scan the second block is which is field1=value1[,field2=value2,...]
-	pos, fields, err := scanFields(buf, pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// at least one field is required
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("missing fields")
-	}
-
-	// scan the last block which is an optional integer timestamp
-	pos, ts, err := scanTime(buf, pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// apply precision multiplier
-	var nsec int64
-	multiplier := getPrecisionMultiplier(precision)
-	if len(ts) > 0 && multiplier > 1 {
-		tsint, err := parseIntBytes(ts, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		nsec := multiplier * tsint
-		ts = []byte(strconv.FormatInt(nsec, 10))
-	}
-
-	m := &metric{
-		fields: fields,
-		t:      ts,
-		nsec:   nsec,
-	}
-
-	// parse out the measurement name
-	// namei is the index at which the "name" ends
-	namei := indexUnescapedByte(key, ',')
-	if namei < 1 {
-		// no tags
-		m.name = key
-	} else {
-		m.name = key[0:namei]
-		m.tags = key[namei:]
-	}
-
-	if len(m.t) == 0 {
-		if len(dTime) == 0 {
-			dTime = fmt.Sprint(defaultTime.UnixNano())
-		}
-		// use default time
-		m.t = []byte(dTime)
-	}
-
-	// here we copy on return because this allows us to later call
-	// AddTag, AddField, RemoveTag, RemoveField, etc. without worrying about
-	// modifying 'tag' bytes having an affect on 'field' bytes, for example.
-	return m.Copy(), nil
-}
-
-// scanKey scans buf starting at i for the measurement and tag portion of the point.
-// It returns the ending position and the byte slice of key within buf.  If there
-// are tags, they will be sorted if they are not already.
-func scanKey(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	// First scan the Point's measurement.
-	state, i, err := scanMeasurement(buf, i)
-	if err != nil {
-		return i, buf[start:i], err
-	}
-
-	// Optionally scan tags if needed.
-	if state == tagKeyState {
-		i, err = scanTags(buf, i)
-		if err != nil {
-			return i, buf[start:i], err
-		}
-	}
-
-	return i, buf[start:i], nil
-}
-
-// scanMeasurement examines the measurement part of a Point, returning
-// the next state to move to, and the current location in the buffer.
-func scanMeasurement(buf []byte, i int) (int, int, error) {
-	// Check first byte of measurement, anything except a comma is fine.
-	// It can't be a space, since whitespace is stripped prior to this
-	// function call.
-	if i >= len(buf) || buf[i] == ',' {
-		return -1, i, makeError("missing measurement", buf, i)
-	}
-
-	for {
-		i++
-		if i >= len(buf) {
-			// cpu
-			return -1, i, makeError("missing fields", buf, i)
-		}
-
-		if buf[i-1] == '\\' {
-			// Skip character (it's escaped).
-			continue
-		}
-
-		// Unescaped comma; move onto scanning the tags.
-		if buf[i] == ',' {
-			return tagKeyState, i + 1, nil
-		}
-
-		// Unescaped space; move onto scanning the fields.
-		if buf[i] == ' ' {
-			// cpu value=1.0
-			return fieldsState, i, nil
-		}
-	}
-}
-
-// scanTags examines all the tags in a Point, keeping track of and
-// returning the updated indices slice, number of commas and location
-// in buf where to start examining the Point fields.
-func scanTags(buf []byte, i int) (int, error) {
-	var (
-		err   error
-		state = tagKeyState
-	)
-
-	for {
-		switch state {
-		case tagKeyState:
-			i, err = scanTagsKey(buf, i)
-			state = tagValueState // tag value always follows a tag key
-		case tagValueState:
-			state, i, err = scanTagsValue(buf, i)
-		case fieldsState:
-			return i, nil
-		}
-
-		if err != nil {
-			return i, err
-		}
-	}
-}
-
-// scanTagsKey scans each character in a tag key.
-func scanTagsKey(buf []byte, i int) (int, error) {
-	// First character of the key.
-	if i >= len(buf) || buf[i] == ' ' || buf[i] == ',' || buf[i] == '=' {
-		// cpu,{'', ' ', ',', '='}
-		return i, makeError("missing tag key", buf, i)
-	}
-
-	// Examine each character in the tag key until we hit an unescaped
-	// equals (the tag value), or we hit an error (i.e., unescaped
-	// space or comma).
-	for {
-		i++
-
-		// Either we reached the end of the buffer or we hit an
-		// unescaped comma or space.
-		if i >= len(buf) ||
-			((buf[i] == ' ' || buf[i] == ',') && buf[i-1] != '\\') {
-			// cpu,tag{'', ' ', ','}
-			return i, makeError("missing tag value", buf, i)
-		}
-
-		if buf[i] == '=' && buf[i-1] != '\\' {
-			// cpu,tag=
-			return i + 1, nil
-		}
-	}
-}
-
-// scanTagsValue scans each character in a tag value.
-func scanTagsValue(buf []byte, i int) (int, int, error) {
-	// Tag value cannot be empty.
-	if i >= len(buf) || buf[i] == ',' || buf[i] == ' ' {
-		// cpu,tag={',', ' '}
-		return -1, i, makeError("missing tag value", buf, i)
-	}
-
-	// Examine each character in the tag value until we hit an unescaped
-	// comma (move onto next tag key), an unescaped space (move onto
-	// fields), or we error out.
-	for {
-		i++
-		if i >= len(buf) {
-			// cpu,tag=value
-			return -1, i, makeError("missing fields", buf, i)
-		}
-
-		// An unescaped equals sign is an invalid tag value.
-		if buf[i] == '=' && buf[i-1] != '\\' {
-			// cpu,tag={'=', 'fo=o'}
-			return -1, i, makeError("invalid tag format", buf, i)
-		}
-
-		if buf[i] == ',' && buf[i-1] != '\\' {
-			// cpu,tag=foo,
-			return tagKeyState, i + 1, nil
-		}
-
-		// cpu,tag=foo value=1.0
-		// cpu, tag=foo\= value=1.0
-		if buf[i] == ' ' && buf[i-1] != '\\' {
-			return fieldsState, i, nil
-		}
-	}
-}
-
-// scanFields scans buf, starting at i for the fields section of a point.  It returns
-// the ending position and the byte slice of the fields within buf
-func scanFields(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	// track how many '"" we've seen since last '='
-	quotes := 0
-
-	// tracks how many '=' we've seen
-	equals := 0
-
-	// tracks how many commas we've seen
-	commas := 0
-
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// escaped characters?
-		if buf[i] == '\\' && i+1 < len(buf) {
-			i += 2
-			continue
-		}
-
-		// If the value is quoted, scan until we get to the end quote
-		// Only quote values in the field value since quotes are not significant
-		// in the field key
-		if buf[i] == '"' && equals > commas {
-			i++
-			quotes++
-			if quotes > 2 {
-				break
-			}
-			continue
-		}
-
-		// If we see an =, ensure that there is at least on char before and after it
-		if buf[i] == '=' && quotes != 1 {
-			quotes = 0
-			equals++
-
-			// check for "... =123" but allow "a\ =123"
-			if buf[i-1] == ' ' && buf[i-2] != '\\' {
-				return i, buf[start:i], makeError("missing field key", buf, i)
-			}
-
-			// check for "...a=123,=456" but allow "a=123,a\,=456"
-			if buf[i-1] == ',' && buf[i-2] != '\\' {
-				return i, buf[start:i], makeError("missing field key", buf, i)
-			}
-
-			// check for "... value="
-			if i+1 >= len(buf) {
-				return i, buf[start:i], makeError("missing field value", buf, i)
-			}
-
-			// check for "... value=,value2=..."
-			if buf[i+1] == ',' || buf[i+1] == ' ' {
-				return i, buf[start:i], makeError("missing field value", buf, i)
-			}
-
-			if isNumeric(buf[i+1]) || buf[i+1] == '-' || buf[i+1] == 'N' || buf[i+1] == 'n' {
-				var err error
-				i, err = scanNumber(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-			// If next byte is not a double-quote, the value must be a boolean
-			if buf[i+1] != '"' {
-				var err error
-				i, _, err = scanBoolean(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-		}
-
-		if buf[i] == ',' && quotes != 1 {
-			commas++
-		}
-
-		// reached end of block?
-		if buf[i] == ' ' && quotes != 1 {
-			break
-		}
-		i++
-	}
-
-	if quotes != 0 && quotes != 2 {
-		return i, buf[start:i], makeError("unbalanced quotes", buf, i)
-	}
-
-	// check that all field sections had key and values (e.g. prevent "a=1,b"
-	if equals == 0 || commas != equals-1 {
-		return i, buf[start:i], makeError("invalid field format", buf, i)
-	}
-
-	return i, buf[start:i], nil
-}
-
-// scanTime scans buf, starting at i for the time section of a point. It
-// returns the ending position and the byte slice of the timestamp within buf
-// and and error if the timestamp is not in the correct numeric format.
-func scanTime(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// Reached end of block or trailing whitespace?
-		if buf[i] == '\n' || buf[i] == ' ' {
-			break
-		}
-
-		// Handle negative timestamps
-		if i == start && buf[i] == '-' {
-			i++
-			continue
-		}
-
-		// Timestamps should be integers, make sure they are so we don't need
-		// to actually  parse the timestamp until needed.
-		if buf[i] < '0' || buf[i] > '9' {
-			return i, buf[start:i], makeError("invalid timestamp", buf, i)
-		}
-		i++
-	}
-	return i, buf[start:i], nil
-}
-
-func isNumeric(b byte) bool {
-	return (b >= '0' && b <= '9') || b == '.'
-}
-
-// scanNumber returns the end position within buf, start at i after
-// scanning over buf for an integer, or float.  It returns an
-// error if a invalid number is scanned.
-func scanNumber(buf []byte, i int) (int, error) {
-	start := i
-	var isInt bool
-
-	// Is negative number?
-	if i < len(buf) && buf[i] == '-' {
-		i++
-		// There must be more characters now, as just '-' is illegal.
-		if i == len(buf) {
-			return i, ErrInvalidNumber
-		}
-	}
-
-	// how many decimal points we've see
-	decimal := false
-
-	// indicates the number is float in scientific notation
-	scientific := false
-
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-
-		if buf[i] == 'i' && i > start && !isInt {
-			isInt = true
-			i++
-			continue
-		}
-
-		if buf[i] == '.' {
-			// Can't have more than 1 decimal (e.g. 1.1.1 should fail)
-			if decimal {
-				return i, ErrInvalidNumber
-			}
-			decimal = true
-		}
-
-		// `e` is valid for floats but not as the first char
-		if i > start && (buf[i] == 'e' || buf[i] == 'E') {
-			scientific = true
-			i++
-			continue
-		}
-
-		// + and - are only valid at this point if they follow an e (scientific notation)
-		if (buf[i] == '+' || buf[i] == '-') && (buf[i-1] == 'e' || buf[i-1] == 'E') {
-			i++
-			continue
-		}
-
-		// NaN is an unsupported value
-		if i+2 < len(buf) && (buf[i] == 'N' || buf[i] == 'n') {
-			return i, ErrInvalidNumber
-		}
-
-		if !isNumeric(buf[i]) {
-			return i, ErrInvalidNumber
-		}
-		i++
-	}
-
-	if isInt && (decimal || scientific) {
-		return i, ErrInvalidNumber
-	}
-
-	numericDigits := i - start
-	if isInt {
-		numericDigits--
-	}
-	if decimal {
-		numericDigits--
-	}
-	if buf[start] == '-' {
-		numericDigits--
-	}
-
-	if numericDigits == 0 {
-		return i, ErrInvalidNumber
-	}
-
-	// It's more common that numbers will be within min/max range for their type but we need to prevent
-	// out or range numbers from being parsed successfully.  This uses some simple heuristics to decide
-	// if we should parse the number to the actual type.  It does not do it all the time because it incurs
-	// extra allocations and we end up converting the type again when writing points to disk.
-	if isInt {
-		// Make sure the last char is an 'i' for integers (e.g. 9i10 is not valid)
-		if buf[i-1] != 'i' {
-			return i, ErrInvalidNumber
-		}
-		// Parse the int to check bounds the number of digits could be larger than the max range
-		// We subtract 1 from the index to remove the `i` from our tests
-		if len(buf[start:i-1]) >= maxInt64Digits || len(buf[start:i-1]) >= minInt64Digits {
-			if _, err := parseIntBytes(buf[start:i-1], 10, 64); err != nil {
-				return i, makeError(fmt.Sprintf("unable to parse integer %s: %s", buf[start:i-1], err), buf, i)
-			}
-		}
-	} else {
-		// Parse the float to check bounds if it's scientific or the number of digits could be larger than the max range
-		if scientific || len(buf[start:i]) >= maxFloat64Digits || len(buf[start:i]) >= minFloat64Digits {
-			if _, err := parseFloatBytes(buf[start:i], 10); err != nil {
-				return i, makeError("invalid float", buf, i)
-			}
-		}
-	}
-
-	return i, nil
-}
-
-// scanBoolean returns the end position within buf, start at i after
-// scanning over buf for boolean. Valid values for a boolean are
-// t, T, true, TRUE, f, F, false, FALSE. It returns an error if a invalid boolean
-// is scanned.
-func scanBoolean(buf []byte, i int) (int, []byte, error) {
-	start := i
-
-	if i < len(buf) && (buf[i] != 't' && buf[i] != 'f' && buf[i] != 'T' && buf[i] != 'F') {
-		return i, buf[start:i], makeError("invalid value", buf, i)
-	}
-
-	i++
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-		i++
-	}
-
-	// Single char bool (t, T, f, F) is ok
-	if i-start == 1 {
-		return i, buf[start:i], nil
-	}
-
-	// length must be 4 for true or TRUE
-	if (buf[start] == 't' || buf[start] == 'T') && i-start != 4 {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	// length must be 5 for false or FALSE
-	if (buf[start] == 'f' || buf[start] == 'F') && i-start != 5 {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	// Otherwise
-	valid := false
-	switch buf[start] {
-	case 't':
-		valid = bytes.Equal(buf[start:i], []byte("true"))
-	case 'f':
-		valid = bytes.Equal(buf[start:i], []byte("false"))
-	case 'T':
-		valid = bytes.Equal(buf[start:i], []byte("TRUE")) || bytes.Equal(buf[start:i], []byte("True"))
-	case 'F':
-		valid = bytes.Equal(buf[start:i], []byte("FALSE")) || bytes.Equal(buf[start:i], []byte("False"))
-	}
-
-	if !valid {
-		return i, buf[start:i], makeError("invalid boolean", buf, i)
-	}
-
-	return i, buf[start:i], nil
-
-}
-
-// skipWhitespace returns the end position within buf, starting at i after
-// scanning over spaces in tags
-func skipWhitespace(buf []byte, i int) int {
-	for i < len(buf) {
-		if buf[i] != ' ' && buf[i] != '\t' && buf[i] != 0 {
-			break
-		}
-		i++
-	}
-	return i
-}
-
-// makeError is a helper function for making a metric parsing error.
-//   reason is the reason why the error occurred.
-//   buf should be the current buffer we are parsing.
-//   i is the current index, to give some context on where in the buffer we are.
-func makeError(reason string, buf []byte, i int) error {
-	return fmt.Errorf("metric parsing error, reason: [%s], buffer: [%s], index: [%d]",
-		reason, buf, i)
-}
-
-// getPrecisionMultiplier will return a multiplier for the precision specified.
-func getPrecisionMultiplier(precision string) int64 {
-	d := time.Nanosecond
-	switch precision {
-	case "u":
-		d = time.Microsecond
-	case "ms":
-		d = time.Millisecond
-	case "s":
-		d = time.Second
-	case "m":
-		d = time.Minute
-	case "h":
-		d = time.Hour
-	}
-	return int64(d)
-}
diff --git a/metric/parse_test.go b/metric/parse_test.go
deleted file mode 100644
index 27185224a..000000000
--- a/metric/parse_test.go
+++ /dev/null
@@ -1,413 +0,0 @@
-package metric
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const trues = `booltest b=T
-booltest b=t
-booltest b=True
-booltest b=TRUE
-booltest b=true
-`
-
-const falses = `booltest b=F
-booltest b=f
-booltest b=False
-booltest b=FALSE
-booltest b=false
-`
-
-const withEscapes = `w\,\ eather,host=local temp=99 1465839830100400200
-w\,eather,host=local temp=99 1465839830100400200
-weather,location=us\,midwest temperature=82 1465839830100400200
-weather,location=us-midwest temp\=rature=82 1465839830100400200
-weather,location\ place=us-midwest temperature=82 1465839830100400200
-weather,location=us-midwest temperature="too\"hot\"" 1465839830100400200
-`
-
-const withTimestamps = `cpu usage=99 1480595849000000000
-cpu usage=99 1480595850000000000
-cpu usage=99 1480595851700030000
-cpu usage=99 1480595852000000300
-`
-
-const sevenMetrics = `cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-cpu,host=foo,datacenter=us-east idle=99,busy=1i,b=true,s="string"
-`
-
-const negMetrics = `weather,host=local temp=-99i,temp_float=-99.4 1465839830100400200
-`
-
-// some metrics are invalid
-const someInvalid = `cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu3, host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu4 , usage_idle=99,usage_busy=1
-cpu 1480595852000000300
-cpu usage=99 1480595852foobar300
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-`
-
-func TestParse(t *testing.T) {
-	start := time.Now()
-	metrics, err := Parse([]byte(sevenMetrics))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 7)
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	firstTime := metrics[0].Time()
-	for _, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"idle": float64(99),
-				"busy": int64(1),
-				"b":    true,
-				"s":    "string",
-			},
-			m.Fields(),
-		)
-		assert.Equal(t,
-			map[string]string{
-				"host":       "foo",
-				"datacenter": "us-east",
-			},
-			m.Tags(),
-		)
-		assert.True(t, m.Time().After(start))
-		assert.True(t, m.Time().Equal(firstTime))
-	}
-}
-
-func TestParseNegNumbers(t *testing.T) {
-	metrics, err := Parse([]byte(negMetrics))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-
-	assert.Equal(t,
-		map[string]interface{}{
-			"temp":       int64(-99),
-			"temp_float": float64(-99.4),
-		},
-		metrics[0].Fields(),
-	)
-	assert.Equal(t,
-		map[string]string{
-			"host": "local",
-		},
-		metrics[0].Tags(),
-	)
-}
-
-func TestParseErrors(t *testing.T) {
-	start := time.Now()
-	metrics, err := Parse([]byte(someInvalid))
-	assert.Error(t, err)
-	assert.Len(t, metrics, 4)
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	firstTime := metrics[0].Time()
-	for _, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"usage_idle": float64(99),
-				"usage_busy": float64(1),
-			},
-			m.Fields(),
-		)
-		assert.Equal(t,
-			map[string]string{
-				"host":       "foo",
-				"datacenter": "us-east",
-			},
-			m.Tags(),
-		)
-		assert.True(t, m.Time().After(start))
-		assert.True(t, m.Time().Equal(firstTime))
-	}
-}
-
-func TestParseWithTimestamps(t *testing.T) {
-	metrics, err := Parse([]byte(withTimestamps))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 4)
-
-	expectedTimestamps := []time.Time{
-		time.Unix(0, 1480595849000000000),
-		time.Unix(0, 1480595850000000000),
-		time.Unix(0, 1480595851700030000),
-		time.Unix(0, 1480595852000000300),
-	}
-
-	// all metrics parsed together w/o a timestamp should have the same time.
-	for i, m := range metrics {
-		assert.Equal(t,
-			map[string]interface{}{
-				"usage": float64(99),
-			},
-			m.Fields(),
-		)
-		assert.True(t, m.Time().Equal(expectedTimestamps[i]))
-	}
-}
-
-func TestParseEscapes(t *testing.T) {
-	metrics, err := Parse([]byte(withEscapes))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 6)
-
-	tests := []struct {
-		name   string
-		fields map[string]interface{}
-		tags   map[string]string
-	}{
-		{
-			name:   `w, eather`,
-			fields: map[string]interface{}{"temp": float64(99)},
-			tags:   map[string]string{"host": "local"},
-		},
-		{
-			name:   `w,eather`,
-			fields: map[string]interface{}{"temp": float64(99)},
-			tags:   map[string]string{"host": "local"},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{"temperature": float64(82)},
-			tags:   map[string]string{"location": `us,midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{`temp=rature`: float64(82)},
-			tags:   map[string]string{"location": `us-midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{"temperature": float64(82)},
-			tags:   map[string]string{`location place`: `us-midwest`},
-		},
-		{
-			name:   `weather`,
-			fields: map[string]interface{}{`temperature`: `too"hot"`},
-			tags:   map[string]string{"location": `us-midwest`},
-		},
-	}
-
-	for i, test := range tests {
-		assert.Equal(t, test.name, metrics[i].Name())
-		assert.Equal(t, test.fields, metrics[i].Fields())
-		assert.Equal(t, test.tags, metrics[i].Tags())
-	}
-}
-
-func TestParseTrueBooleans(t *testing.T) {
-	metrics, err := Parse([]byte(trues))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 5)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "booltest", metric.Name())
-		assert.Equal(t, true, metric.Fields()["b"])
-	}
-}
-
-func TestParseFalseBooleans(t *testing.T) {
-	metrics, err := Parse([]byte(falses))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 5)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "booltest", metric.Name())
-		assert.Equal(t, false, metric.Fields()["b"])
-	}
-}
-
-func TestParsePointBadNumber(t *testing.T) {
-	for _, tt := range []string{
-		"cpu v=- ",
-		"cpu v=-i ",
-		"cpu v=-. ",
-		"cpu v=. ",
-		"cpu v=1.0i ",
-		"cpu v=1ii ",
-		"cpu v=1a ",
-		"cpu v=-e-e-e ",
-		"cpu v=42+3 ",
-		"cpu v= ",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseTagsMissingParts(t *testing.T) {
-	for _, tt := range []string{
-		`cpu,host`,
-		`cpu,host,`,
-		`cpu,host=`,
-		`cpu,f=oo=bar value=1`,
-		`cpu,host value=1i`,
-		`cpu,host=serverA,region value=1i`,
-		`cpu,host=serverA,region= value=1i`,
-		`cpu,host=serverA,region=,zone=us-west value=1i`,
-		`cpu, value=1`,
-		`cpu, ,,`,
-		`cpu,,,`,
-		`cpu,host=serverA,=us-east value=1i`,
-		`cpu,host=serverAa\,,=us-east value=1i`,
-		`cpu,host=serverA\,,=us-east value=1i`,
-		`cpu, =serverA value=1i`,
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParsePointWhitespace(t *testing.T) {
-	for _, tt := range []string{
-		`cpu    value=1.0 1257894000000000000`,
-		`cpu value=1.0     1257894000000000000`,
-		`cpu      value=1.0     1257894000000000000`,
-		`cpu value=1.0 1257894000000000000   `,
-	} {
-		m, err := Parse([]byte(tt + "\n"))
-		assert.NoError(t, err, tt)
-		assert.Equal(t, "cpu", m[0].Name())
-		assert.Equal(t, map[string]interface{}{"value": float64(1)}, m[0].Fields())
-	}
-}
-
-func TestParsePointInvalidFields(t *testing.T) {
-	for _, tt := range []string{
-		"test,foo=bar a=101,=value",
-		"test,foo=bar =value",
-		"test,foo=bar a=101,key=",
-		"test,foo=bar key=",
-		`test,foo=bar a=101,b="foo`,
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParsePointNoFields(t *testing.T) {
-	for _, tt := range []string{
-		"cpu_load_short,host=server01,region=us-west",
-		"very_long_measurement_name",
-		"cpu,host==",
-		"============",
-		"cpu",
-		"cpu\n\n\n\n\n\n\n",
-		"                ",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-// a b=1 << this is the shortest possible metric
-// any shorter is just ignored
-func TestParseBufTooShort(t *testing.T) {
-	for _, tt := range []string{
-		"",
-		"a",
-		"a ",
-		"a b=",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseInvalidBooleans(t *testing.T) {
-	for _, tt := range []string{
-		"test b=tru",
-		"test b=fals",
-		"test b=faLse",
-		"test q=foo",
-		"test b=lambchops",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseInvalidNumbers(t *testing.T) {
-	for _, tt := range []string{
-		"test b=-",
-		"test b=1.1.1",
-		"test b=nan",
-		"test b=9i10",
-		"test b=9999999999999999999i",
-	} {
-		_, err := Parse([]byte(tt + "\n"))
-		assert.Error(t, err, tt)
-	}
-}
-
-func TestParseNegativeTimestamps(t *testing.T) {
-	for _, tt := range []string{
-		"test foo=101 -1257894000000000000",
-	} {
-		metrics, err := Parse([]byte(tt + "\n"))
-		assert.NoError(t, err, tt)
-		assert.True(t, metrics[0].Time().Equal(time.Unix(0, -1257894000000000000)))
-	}
-}
-
-func TestParsePrecision(t *testing.T) {
-	for _, tt := range []struct {
-		line      string
-		precision string
-		expected  int64
-	}{
-		{"test v=42 1491847420", "s", 1491847420000000000},
-		{"test v=42 1491847420123", "ms", 1491847420123000000},
-		{"test v=42 1491847420123456", "u", 1491847420123456000},
-		{"test v=42 1491847420123456789", "ns", 1491847420123456789},
-
-		{"test v=42 1491847420123456789", "1s", 1491847420123456789},
-		{"test v=42 1491847420123456789", "asdf", 1491847420123456789},
-	} {
-		metrics, err := ParseWithDefaultTimePrecision(
-			[]byte(tt.line+"\n"), time.Now(), tt.precision)
-		assert.NoError(t, err)
-		assert.Equal(t, tt.expected, metrics[0].UnixNano())
-	}
-}
-
-func TestParsePrecisionUnsetTime(t *testing.T) {
-	for _, tt := range []struct {
-		line      string
-		precision string
-	}{
-		{"test v=42", "s"},
-		{"test v=42", "ns"},
-	} {
-		_, err := ParseWithDefaultTimePrecision(
-			[]byte(tt.line+"\n"), time.Now(), tt.precision)
-		assert.NoError(t, err)
-	}
-}
-
-func TestParseMaxKeyLength(t *testing.T) {
-	key := ""
-	for {
-		if len(key) > MaxKeyLength {
-			break
-		}
-		key += "test"
-	}
-
-	_, err := Parse([]byte(key + " value=1\n"))
-	assert.Error(t, err)
-}
diff --git a/metric/reader.go b/metric/reader.go
deleted file mode 100644
index ef9d2977d..000000000
--- a/metric/reader.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package metric
-
-import (
-	"io"
-
-	"github.com/influxdata/telegraf"
-)
-
-type state int
-
-const (
-	_ state = iota
-	// normal state copies whole metrics into the given buffer until we can't
-	// fit the next metric.
-	normal
-	// split state means that we have a metric that we were able to split, so
-	// that we can fit it into multiple metrics (and calls to Read)
-	split
-	// overflow state means that we have a metric that didn't fit into a single
-	// buffer, and needs to be split across multiple calls to Read.
-	overflow
-	// splitOverflow state means that a split metric didn't fit into a single
-	// buffer, and needs to be split across multiple calls to Read.
-	splitOverflow
-	// done means we're done reading metrics, and now always return (0, io.EOF)
-	done
-)
-
-type reader struct {
-	metrics      []telegraf.Metric
-	splitMetrics []telegraf.Metric
-	buf          []byte
-	state        state
-
-	// metric index
-	iM int
-	// split metric index
-	iSM int
-	// buffer index
-	iB int
-}
-
-func NewReader(metrics []telegraf.Metric) io.Reader {
-	return &reader{
-		metrics: metrics,
-		state:   normal,
-	}
-}
-
-func (r *reader) Read(p []byte) (n int, err error) {
-	var i int
-	switch r.state {
-	case done:
-		return 0, io.EOF
-	case normal:
-		for {
-			// this for-loop is the sunny-day scenario, where we are given a
-			// buffer that is large enough to hold at least a single metric.
-			// all of the cases below it are edge-cases.
-			if r.metrics[r.iM].Len() <= len(p[i:]) {
-				i += r.metrics[r.iM].SerializeTo(p[i:])
-			} else {
-				break
-			}
-			r.iM++
-			if r.iM == len(r.metrics) {
-				r.state = done
-				return i, io.EOF
-			}
-		}
-
-		// if we haven't written any bytes, check if we can split the current
-		// metric into multiple full metrics at a smaller size.
-		if i == 0 {
-			tmp := r.metrics[r.iM].Split(len(p))
-			if len(tmp) > 1 {
-				r.splitMetrics = tmp
-				r.state = split
-				if r.splitMetrics[0].Len() <= len(p) {
-					i += r.splitMetrics[0].SerializeTo(p)
-					r.iSM = 1
-				} else {
-					// splitting didn't quite work, so we'll drop down and
-					// overflow the metric.
-					r.state = normal
-					r.iSM = 0
-				}
-			}
-		}
-
-		// if we haven't written any bytes and we're not at the end of the metrics
-		// slice, then it means we have a single metric that is larger than the
-		// provided buffer.
-		if i == 0 {
-			r.buf = r.metrics[r.iM].Serialize()
-			i += copy(p, r.buf[r.iB:])
-			r.iB += i
-			r.state = overflow
-		}
-
-	case split:
-		if r.splitMetrics[r.iSM].Len() <= len(p) {
-			// write the current split metric
-			i += r.splitMetrics[r.iSM].SerializeTo(p)
-			r.iSM++
-			if r.iSM >= len(r.splitMetrics) {
-				// done writing the current split metrics
-				r.iSM = 0
-				r.iM++
-				if r.iM == len(r.metrics) {
-					r.state = done
-					return i, io.EOF
-				}
-				r.state = normal
-			}
-		} else {
-			// This would only happen if we split the metric, and then a
-			// subsequent buffer was smaller than the initial one given,
-			// so that our split metric no longer fits.
-			r.buf = r.splitMetrics[r.iSM].Serialize()
-			i += copy(p, r.buf[r.iB:])
-			r.iB += i
-			r.state = splitOverflow
-		}
-
-	case splitOverflow:
-		i = copy(p, r.buf[r.iB:])
-		r.iB += i
-		if r.iB >= len(r.buf) {
-			r.iB = 0
-			r.iSM++
-			if r.iSM == len(r.splitMetrics) {
-				r.iM++
-				if r.iM == len(r.metrics) {
-					r.state = done
-					return i, io.EOF
-				}
-				r.state = normal
-			} else {
-				r.state = split
-			}
-		}
-
-	case overflow:
-		i = copy(p, r.buf[r.iB:])
-		r.iB += i
-		if r.iB >= len(r.buf) {
-			r.iB = 0
-			r.iM++
-			if r.iM == len(r.metrics) {
-				r.state = done
-				return i, io.EOF
-			}
-			r.state = normal
-		}
-	}
-
-	return i, nil
-}
diff --git a/metric/reader_test.go b/metric/reader_test.go
deleted file mode 100644
index 1f2ffd6ea..000000000
--- a/metric/reader_test.go
+++ /dev/null
@@ -1,713 +0,0 @@
-package metric
-
-import (
-	"io"
-	"io/ioutil"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func BenchmarkMetricReader(b *testing.B) {
-	metrics := make([]telegraf.Metric, 10)
-	for i := 0; i < 10; i++ {
-		metrics[i], _ = New("foo", map[string]string{},
-			map[string]interface{}{"value": int64(1)}, time.Now())
-	}
-	for n := 0; n < b.N; n++ {
-		r := NewReader(metrics)
-		io.Copy(ioutil.Discard, r)
-	}
-}
-
-func TestMetricReader(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	metrics := make([]telegraf.Metric, 10)
-	for i := 0; i < 10; i++ {
-		metrics[i], _ = New("foo", map[string]string{},
-			map[string]interface{}{"value": int64(1)}, ts)
-	}
-
-	r := NewReader(metrics)
-
-	buf := make([]byte, 35)
-	for i := 0; i < 10; i++ {
-		n, err := r.Read(buf)
-		if err != nil {
-			assert.True(t, err == io.EOF, err.Error())
-		}
-		assert.Equal(t, 33, n)
-		assert.Equal(t, "foo value=1i 1481032190000000000\n", string(buf[0:n]))
-	}
-
-	// reader should now be done, and always return 0, io.EOF
-	for i := 0; i < 10; i++ {
-		n, err := r.Read(buf)
-		assert.True(t, err == io.EOF, err.Error())
-		assert.Equal(t, 0, n)
-	}
-}
-
-func TestMetricReader_OverflowMetric(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m, _ := New("foo", map[string]string{},
-		map[string]interface{}{"value": int64(10)}, ts)
-	metrics := []telegraf.Metric{m}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 5)
-
-	tests := []struct {
-		exp string
-		err error
-		n   int
-	}{
-		{
-			"foo v",
-			nil,
-			5,
-		},
-		{
-			"alue=",
-			nil,
-			5,
-		},
-		{
-			"10i 1",
-			nil,
-			5,
-		},
-		{
-			"48103",
-			nil,
-			5,
-		},
-		{
-			"21900",
-			nil,
-			5,
-		},
-		{
-			"00000",
-			nil,
-			5,
-		},
-		{
-			"000\n",
-			io.EOF,
-			4,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		assert.Equal(t, test.exp, string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// Regression test for when a metric is the same size as the buffer.
-//
-// Previously EOF would not be set until the next call to Read.
-func TestMetricReader_MetricSizeEqualsBufferSize(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, m1.Len())
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a metric requires to be split and one of the
-// split metrics is exactly the size of the buffer.
-//
-// Previously an empty string would be returned on the next Read without error,
-// and then next Read call would panic.
-func TestMetricReader_SplitWithExactLengthSplit(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1), "bb": int64(2)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	//  foo a=1i,bb=2i 1481032190000000000\n // len 35
-	//
-	// Requires this specific split order:
-	//  foo a=1i 1481032190000000000\n  // len 29
-	//  foo bb=2i 1481032190000000000\n // len 30
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a metric requires to be split and one of the
-// split metrics is larger than the buffer.
-//
-// Previously the metric index would be set incorrectly causing a panic.
-func TestMetricReader_SplitOverflowOversized(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"a":   int64(1),
-			"bbb": int64(2),
-		}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	// foo a=1i,bbb=2i 1481032190000000000\n // len 36
-	//
-	// foo a=1i 1481032190000000000\n  // len 29
-	// foo bbb=2i 1481032190000000000\n // len 31
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-// Regression test for when a split metric exactly fits in the buffer.
-//
-// Previously the metric would be overflow split when not required.
-func TestMetricReader_SplitOverflowUneeded(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{"a": int64(1), "b": int64(2)}, ts)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 29)
-
-	// foo a=1i,b=2i 1481032190000000000\n // len 34
-	//
-	// foo a=1i 1481032190000000000\n  // len 29
-	// foo b=2i 1481032190000000000\n // len 29
-
-	for {
-		n, err := r.Read(buf)
-		// Should never read 0 bytes unless at EOF, unless input buffer is 0 length
-		if n == 0 {
-			require.Equal(t, io.EOF, err)
-			break
-		}
-		// Lines should be terminated with a LF
-		if err == io.EOF {
-			require.Equal(t, uint8('\n'), buf[n-1])
-			break
-		}
-		require.NoError(t, err)
-	}
-}
-
-func TestMetricReader_OverflowMultipleMetrics(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m, _ := New("foo", map[string]string{},
-		map[string]interface{}{"value": int64(10)}, ts)
-	metrics := []telegraf.Metric{m, m.Copy()}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 10)
-
-	tests := []struct {
-		exp string
-		err error
-		n   int
-	}{
-		{
-			"foo value=",
-			nil,
-			10,
-		},
-		{
-			"10i 148103",
-			nil,
-			10,
-		},
-		{
-			"2190000000",
-			nil,
-			10,
-		},
-		{
-			"000\n",
-			nil,
-			4,
-		},
-		{
-			"foo value=",
-			nil,
-			10,
-		},
-		{
-			"10i 148103",
-			nil,
-			10,
-		},
-		{
-			"2190000000",
-			nil,
-			10,
-		},
-		{
-			"000\n",
-			io.EOF,
-			4,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		assert.Equal(t, test.exp, string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test splitting a metric
-func TestMetricReader_SplitMetric(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-			"value4": int64(10),
-			"value5": int64(10),
-			"value6": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 60)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			io.EOF,
-			57,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test an array with one split metric and one unsplit
-func TestMetricReader_SplitMetric2(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-			"value4": int64(10),
-			"value5": int64(10),
-			"value6": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 60)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value\d=10i,value\d=10i,value\d=10i 1481032190000000000\n`,
-			nil,
-			57,
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test split that results in metrics that are still too long, which results in
-// the reader falling back to regular overflow.
-func TestMetricReader_SplitMetricTooLong(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1}
-
-	r := NewReader(metrics)
-	buf := make([]byte, 30)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-	}{
-		{
-			`foo value\d=10i,value\d=10i 1481`,
-			nil,
-			30,
-		},
-		{
-			`032190000000000\n`,
-			io.EOF,
-			16,
-		},
-		{
-			"",
-			io.EOF,
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(buf)
-		assert.Equal(t, test.n, n)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(buf[0:n])), string(buf[0:n]))
-		assert.Equal(t, test.err, err)
-	}
-}
-
-// test split with a changing buffer size in the middle of subsequent calls
-// to Read
-func TestMetricReader_SplitMetricChangingBuffer(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-			"value3": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-		buf      []byte
-	}{
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value\d=10i 148103219000000`,
-			nil,
-			30,
-			make([]byte, 30),
-		},
-		{
-			`0000\n`,
-			nil,
-			5,
-			make([]byte, 30),
-		},
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-			make([]byte, 36),
-		},
-		{
-			"",
-			io.EOF,
-			0,
-			make([]byte, 36),
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(test.buf)
-		assert.Equal(t, test.n, n, test.expRegex)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
-		assert.Equal(t, test.err, err, test.expRegex)
-	}
-}
-
-// test split with a changing buffer size in the middle of subsequent calls
-// to Read
-func TestMetricReader_SplitMetricChangingBuffer2(t *testing.T) {
-	ts := time.Unix(1481032190, 0)
-	m1, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-			"value2": int64(10),
-		},
-		ts,
-	)
-	m2, _ := New("foo", map[string]string{},
-		map[string]interface{}{
-			"value1": int64(10),
-		},
-		ts,
-	)
-	metrics := []telegraf.Metric{m1, m2}
-
-	r := NewReader(metrics)
-
-	tests := []struct {
-		expRegex string
-		err      error
-		n        int
-		buf      []byte
-	}{
-		{
-			`foo value\d=10i 1481032190000000000\n`,
-			nil,
-			35,
-			make([]byte, 36),
-		},
-		{
-			`foo value\d=10i 148103219000000`,
-			nil,
-			30,
-			make([]byte, 30),
-		},
-		{
-			`0000\n`,
-			nil,
-			5,
-			make([]byte, 30),
-		},
-		{
-			`foo value1=10i 1481032190000000000\n`,
-			io.EOF,
-			35,
-			make([]byte, 36),
-		},
-		{
-			"",
-			io.EOF,
-			0,
-			make([]byte, 36),
-		},
-	}
-
-	for _, test := range tests {
-		n, err := r.Read(test.buf)
-		assert.Equal(t, test.n, n, test.expRegex)
-		re := regexp.MustCompile(test.expRegex)
-		assert.True(t, re.MatchString(string(test.buf[0:n])), string(test.buf[0:n]))
-		assert.Equal(t, test.err, err, test.expRegex)
-	}
-}
-
-func TestReader_Read(t *testing.T) {
-	epoch := time.Unix(0, 0)
-
-	type args struct {
-		name   string
-		tags   map[string]string
-		fields map[string]interface{}
-		t      time.Time
-		mType  []telegraf.ValueType
-	}
-	tests := []struct {
-		name     string
-		args     args
-		expected []byte
-	}{
-		{
-			name: "escape backslashes in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\" 0`),
-		},
-		{
-			name: "escape quote in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test"`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\"" 0`),
-		},
-		{
-			name: "escape quote and backslash in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\"`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\\"" 0`),
-		},
-		{
-			name: "escape multiple backslash in string field",
-			args: args{
-				name:   "cpu",
-				tags:   map[string]string{},
-				fields: map[string]interface{}{"value": `test\\`},
-				t:      epoch,
-			},
-			expected: []byte(`cpu value="test\\\\" 0`),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			buf := make([]byte, 512)
-			m, err := New(tt.args.name, tt.args.tags, tt.args.fields, tt.args.t, tt.args.mType...)
-			require.NoError(t, err)
-
-			r := NewReader([]telegraf.Metric{m})
-			num, err := r.Read(buf)
-			if err != io.EOF {
-				require.NoError(t, err)
-			}
-			line := string(buf[:num])
-			// This is done so that we can use raw strings in the test spec
-			noeol := strings.TrimRight(line, "\n")
-			require.Equal(t, string(tt.expected), noeol)
-			require.Equal(t, len(tt.expected)+1, num)
-		})
-	}
-}
-
-func TestMetricRoundtrip(t *testing.T) {
-	const lp = `nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=netstat,sr=database IpExtInBcastOctets=12570626154i,IpExtInBcastPkts=95541226i,IpExtInCEPkts=0i,IpExtInCsumErrors=0i,IpExtInECT0Pkts=55674i,IpExtInECT1Pkts=0i,IpExtInMcastOctets=5928296i,IpExtInMcastPkts=174365i,IpExtInNoECTPkts=17965863529i,IpExtInNoRoutes=20i,IpExtInOctets=3334866321815i,IpExtInTruncatedPkts=0i,IpExtOutBcastOctets=0i,IpExtOutBcastPkts=0i,IpExtOutMcastOctets=0i,IpExtOutMcastPkts=0i,IpExtOutOctets=31397892391399i,TcpExtArpFilter=0i,TcpExtBusyPollRxPackets=0i,TcpExtDelayedACKLocked=14094i,TcpExtDelayedACKLost=302083i,TcpExtDelayedACKs=55486507i,TcpExtEmbryonicRsts=11879i,TcpExtIPReversePathFilter=0i,TcpExtListenDrops=1736i,TcpExtListenOverflows=0i,TcpExtLockDroppedIcmps=0i,TcpExtOfoPruned=0i,TcpExtOutOfWindowIcmps=8i,TcpExtPAWSActive=0i,TcpExtPAWSEstab=974i,TcpExtPAWSPassive=0i,TcpExtPruneCalled=0i,TcpExtRcvPruned=0i,TcpExtSyncookiesFailed=12593i,TcpExtSyncookiesRecv=0i,TcpExtSyncookiesSent=0i,TcpExtTCPACKSkippedChallenge=0i,TcpExtTCPACKSkippedFinWait2=0i,TcpExtTCPACKSkippedPAWS=806i,TcpExtTCPACKSkippedSeq=519i,TcpExtTCPACKSkippedSynRecv=0i,TcpExtTCPACKSkippedTimeWait=0i,TcpExtTCPAbortFailed=0i,TcpExtTCPAbortOnClose=22i,TcpExtTCPAbortOnData=36593i,TcpExtTCPAbortOnLinger=0i,TcpExtTCPAbortOnMemory=0i,TcpExtTCPAbortOnTimeout=674i,TcpExtTCPAutoCorking=494253233i,TcpExtTCPBacklogDrop=0i,TcpExtTCPChallengeACK=281i,TcpExtTCPDSACKIgnoredNoUndo=93354i,TcpExtTCPDSACKIgnoredOld=336i,TcpExtTCPDSACKOfoRecv=0i,TcpExtTCPDSACKOfoSent=7i,TcpExtTCPDSACKOldSent=302073i,TcpExtTCPDSACKRecv=215884i,TcpExtTCPDSACKUndo=7633i,TcpExtTCPDeferAcceptDrop=0i,TcpExtTCPDirectCopyFromBacklog=0i,TcpExtTCPDirectCopyFromPrequeue=0i,TcpExtTCPFACKReorder=1320i,TcpExtTCPFastOpenActive=0i,TcpExtTCPFastOpenActiveFail=0i,TcpExtTCPFastOpenCookieReqd=0i,TcpExtTCPFastOpenListenOverflow=0i,TcpExtTCPFastOpenPassive=0i,TcpExtTCPFastOpenPassiveFail=0i,TcpExtTCPFastRetrans=350681i,TcpExtTCPForwardRetrans=142168i,TcpExtTCPFromZeroWindowAdv=4317i,TcpExtTCPFullUndo=29502i,TcpExtTCPHPAcks=10267073000i,TcpExtTCPHPHits=5629837098i,TcpExtTCPHPHitsToUser=0i,TcpExtTCPHystartDelayCwnd=285127i,TcpExtTCPHystartDelayDetect=12318i,TcpExtTCPHystartTrainCwnd=69160570i,TcpExtTCPHystartTrainDetect=3315799i,TcpExtTCPLossFailures=109i,TcpExtTCPLossProbeRecovery=110819i,TcpExtTCPLossProbes=233995i,TcpExtTCPLossUndo=5276i,TcpExtTCPLostRetransmit=397i,TcpExtTCPMD5NotFound=0i,TcpExtTCPMD5Unexpected=0i,TcpExtTCPMemoryPressures=0i,TcpExtTCPMinTTLDrop=0i,TcpExtTCPOFODrop=0i,TcpExtTCPOFOMerge=7i,TcpExtTCPOFOQueue=15196i,TcpExtTCPOrigDataSent=29055119435i,TcpExtTCPPartialUndo=21320i,TcpExtTCPPrequeueDropped=0i,TcpExtTCPPrequeued=0i,TcpExtTCPPureAcks=1236441827i,TcpExtTCPRcvCoalesce=225590473i,TcpExtTCPRcvCollapsed=0i,TcpExtTCPRenoFailures=0i,TcpExtTCPRenoRecovery=0i,TcpExtTCPRenoRecoveryFail=0i,TcpExtTCPRenoReorder=0i,TcpExtTCPReqQFullDoCookies=0i,TcpExtTCPReqQFullDrop=0i,TcpExtTCPRetransFail=41i,TcpExtTCPSACKDiscard=0i,TcpExtTCPSACKReneging=0i,TcpExtTCPSACKReorder=4307i,TcpExtTCPSYNChallenge=244i,TcpExtTCPSackFailures=1698i,TcpExtTCPSackMerged=184668i,TcpExtTCPSackRecovery=97369i,TcpExtTCPSackRecoveryFail=381i,TcpExtTCPSackShiftFallback=2697079i,TcpExtTCPSackShifted=760299i,TcpExtTCPSchedulerFailed=0i,TcpExtTCPSlowStartRetrans=9276i,TcpExtTCPSpuriousRTOs=959i,TcpExtTCPSpuriousRtxHostQueues=2973i,TcpExtTCPSynRetrans=200970i,TcpExtTCPTSReorder=15221i,TcpExtTCPTimeWaitOverflow=0i,TcpExtTCPTimeouts=70127i,TcpExtTCPToZeroWindowAdv=4317i,TcpExtTCPWantZeroWindowAdv=2133i,TcpExtTW=24809813i,TcpExtTWKilled=0i,TcpExtTWRecycled=0i 1496460785000000000
-nstat,bu=linux,cls=server,dc=cer,env=production,host=hostname,name=snmp,sr=database IcmpInAddrMaskReps=0i,IcmpInAddrMasks=90i,IcmpInCsumErrors=0i,IcmpInDestUnreachs=284401i,IcmpInEchoReps=9i,IcmpInEchos=1761912i,IcmpInErrors=407i,IcmpInMsgs=2047767i,IcmpInParmProbs=0i,IcmpInRedirects=0i,IcmpInSrcQuenchs=0i,IcmpInTimeExcds=46i,IcmpInTimestampReps=0i,IcmpInTimestamps=1309i,IcmpMsgInType0=9i,IcmpMsgInType11=46i,IcmpMsgInType13=1309i,IcmpMsgInType17=90i,IcmpMsgInType3=284401i,IcmpMsgInType8=1761912i,IcmpMsgOutType0=1761912i,IcmpMsgOutType14=1248i,IcmpMsgOutType3=108709i,IcmpMsgOutType8=9i,IcmpOutAddrMaskReps=0i,IcmpOutAddrMasks=0i,IcmpOutDestUnreachs=108709i,IcmpOutEchoReps=1761912i,IcmpOutEchos=9i,IcmpOutErrors=0i,IcmpOutMsgs=1871878i,IcmpOutParmProbs=0i,IcmpOutRedirects=0i,IcmpOutSrcQuenchs=0i,IcmpOutTimeExcds=0i,IcmpOutTimestampReps=1248i,IcmpOutTimestamps=0i,IpDefaultTTL=64i,IpForwDatagrams=0i,IpForwarding=2i,IpFragCreates=0i,IpFragFails=0i,IpFragOKs=0i,IpInAddrErrors=0i,IpInDelivers=17658795773i,IpInDiscards=0i,IpInHdrErrors=0i,IpInReceives=17659269339i,IpInUnknownProtos=0i,IpOutDiscards=236976i,IpOutNoRoutes=1009i,IpOutRequests=23466783734i,IpReasmFails=0i,IpReasmOKs=0i,IpReasmReqds=0i,IpReasmTimeout=0i,TcpActiveOpens=23308977i,TcpAttemptFails=3757543i,TcpCurrEstab=280i,TcpEstabResets=184792i,TcpInCsumErrors=0i,TcpInErrs=232i,TcpInSegs=17536573089i,TcpMaxConn=-1i,TcpOutRsts=4051451i,TcpOutSegs=29836254873i,TcpPassiveOpens=176546974i,TcpRetransSegs=878085i,TcpRtoAlgorithm=1i,TcpRtoMax=120000i,TcpRtoMin=200i,UdpInCsumErrors=0i,UdpInDatagrams=24441661i,UdpInErrors=0i,UdpLiteInCsumErrors=0i,UdpLiteInDatagrams=0i,UdpLiteInErrors=0i,UdpLiteNoPorts=0i,UdpLiteOutDatagrams=0i,UdpLiteRcvbufErrors=0i,UdpLiteSndbufErrors=0i,UdpNoPorts=17660i,UdpOutDatagrams=51807896i,UdpRcvbufErrors=0i,UdpSndbufErrors=236922i 1496460785000000000
-`
-	metrics, err := Parse([]byte(lp))
-	require.NoError(t, err)
-	r := NewReader(metrics)
-	buf := make([]byte, 128)
-	_, err = r.Read(buf)
-	require.NoError(t, err)
-	metrics, err = Parse(buf)
-	require.NoError(t, err)
-}
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index 52bcd1fb4..c7c181b17 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -144,83 +144,6 @@ func TestCommandError(t *testing.T) {
 	assert.Equal(t, acc.NFields(), 0, "No new points should have been added")
 }
 
-func TestLineProtocolParse(t *testing.T) {
-	parser, _ := parsers.NewInfluxParser()
-	e := &Exec{
-		runner:   newRunnerMock([]byte(lineProtocol), nil),
-		Commands: []string{"line-protocol"},
-		parser:   parser,
-	}
-
-	var acc testutil.Accumulator
-	require.NoError(t, acc.GatherError(e.Gather))
-
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-		"usage_busy": float64(1),
-	}
-	tags := map[string]string{
-		"host":       "foo",
-		"datacenter": "us-east",
-	}
-	acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
-}
-
-func TestLineProtocolEmptyParse(t *testing.T) {
-	parser, _ := parsers.NewInfluxParser()
-	e := &Exec{
-		runner:   newRunnerMock([]byte(lineProtocolEmpty), nil),
-		Commands: []string{"line-protocol"},
-		parser:   parser,
-	}
-
-	var acc testutil.Accumulator
-	err := e.Gather(&acc)
-	require.NoError(t, err)
-}
-
-func TestLineProtocolShortParse(t *testing.T) {
-	parser, _ := parsers.NewInfluxParser()
-	e := &Exec{
-		runner:   newRunnerMock([]byte(lineProtocolShort), nil),
-		Commands: []string{"line-protocol"},
-		parser:   parser,
-	}
-
-	var acc testutil.Accumulator
-	err := acc.GatherError(e.Gather)
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "buffer too short", "A buffer too short error was expected")
-}
-
-func TestLineProtocolParseMultiple(t *testing.T) {
-	parser, _ := parsers.NewInfluxParser()
-	e := &Exec{
-		runner:   newRunnerMock([]byte(lineProtocolMulti), nil),
-		Commands: []string{"line-protocol"},
-		parser:   parser,
-	}
-
-	var acc testutil.Accumulator
-	err := acc.GatherError(e.Gather)
-	require.NoError(t, err)
-
-	fields := map[string]interface{}{
-		"usage_idle": float64(99),
-		"usage_busy": float64(1),
-	}
-	tags := map[string]string{
-		"host":       "foo",
-		"datacenter": "us-east",
-	}
-	cpuTags := []string{"cpu0", "cpu1", "cpu2", "cpu3", "cpu4", "cpu5", "cpu6"}
-
-	for _, cpu := range cpuTags {
-		tags["cpu"] = cpu
-		acc.AssertContainsTaggedFields(t, "cpu", fields, tags)
-	}
-}
-
 func TestExecCommandWithGlob(t *testing.T) {
 	parser, _ := parsers.NewValueParser("metric", "string", nil)
 	e := NewExec()
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 834a0b2ab..cccd39472 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -53,9 +53,10 @@ type HTTPListener struct {
 
 	listener net.Listener
 
-	parser influx.InfluxParser
-	acc    telegraf.Accumulator
-	pool   *pool
+	handler *influx.MetricHandler
+	parser  *influx.Parser
+	acc     telegraf.Accumulator
+	pool    *pool
 
 	BytesRecv       selfstat.Stat
 	RequestsServed  selfstat.Stat
@@ -176,6 +177,9 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.listener = listener
 	h.Port = listener.Addr().(*net.TCPAddr).Port
 
+	h.handler = influx.NewMetricHandler()
+	h.parser = influx.NewParser(h.handler)
+
 	h.wg.Add(1)
 	go func() {
 		defer h.wg.Done()
@@ -336,7 +340,11 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
-	metrics, err := h.parser.ParseWithDefaultTimePrecision(b, t, precision)
+	h.handler.SetPrecision(getPrecisionMultiplier(precision))
+	metrics, err := h.parser.Parse(b)
+	if err != nil {
+		return err
+	}
 
 	for _, m := range metrics {
 		h.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
@@ -408,6 +416,23 @@ func (h *HTTPListener) AuthenticateIfSet(handler http.HandlerFunc, res http.Resp
 	}
 }
 
+func getPrecisionMultiplier(precision string) time.Duration {
+	d := time.Nanosecond
+	switch precision {
+	case "u":
+		d = time.Microsecond
+	case "ms":
+		d = time.Millisecond
+	case "s":
+		d = time.Second
+	case "m":
+		d = time.Minute
+	case "h":
+		d = time.Hour
+	}
+	return d
+}
+
 func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 491a13748..66715ef37 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -326,6 +326,10 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		}
 	}
 
+	if len(fields) == 0 {
+		return nil, fmt.Errorf("logparser_grok: must have one or more fields")
+	}
+
 	return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp))
 }
 
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 480502d6c..e5e124b9c 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -799,7 +799,7 @@ func TestTimezoneEmptyCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
 
 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -812,7 +812,7 @@ func TestTimezoneEmptyCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
+	assert.Equal(t, int64(1465044105000000000), metricB.Time().UnixNano())
 }
 
 func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
@@ -835,7 +835,7 @@ func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
 
 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -848,7 +848,7 @@ func TestTimezoneMalformedCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465044105000000000), metricB.UnixNano())
+	assert.Equal(t, int64(1465044105000000000), metricB.Time().UnixNano())
 }
 
 func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
@@ -871,7 +871,7 @@ func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
 
 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -884,7 +884,7 @@ func TestTimezoneEuropeCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465036905000000000), metricB.UnixNano())
+	assert.Equal(t, int64(1465036905000000000), metricB.Time().UnixNano())
 }
 
 func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
@@ -907,7 +907,7 @@ func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
 
 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -920,7 +920,7 @@ func TestTimezoneAmericasCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, int64(1465058505000000000), metricB.UnixNano())
+	assert.Equal(t, int64(1465058505000000000), metricB.Time().UnixNano())
 }
 
 func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
@@ -943,7 +943,7 @@ func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
 		},
 		metricA.Fields())
 	assert.Equal(t, map[string]string{"response_code": "200"}, metricA.Tags())
-	assert.Equal(t, int64(1465040505000000000), metricA.UnixNano())
+	assert.Equal(t, int64(1465040505000000000), metricA.Time().UnixNano())
 
 	metricB, err := p.ParseLine(`[04/06/2016--12:41:45] 1.25 mystring dropme nomodifier`)
 	require.NotNil(t, metricB)
@@ -956,5 +956,5 @@ func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
 		},
 		metricB.Fields())
 	assert.Equal(t, map[string]string{}, metricB.Tags())
-	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.UnixNano())
+	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.Time().UnixNano())
 }
diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go
index 30ba0d2af..a6897b714 100644
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -59,7 +59,7 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	in <- natsMsg(invalidMsg)
 
 	acc.WaitError(1)
-	assert.Contains(t, acc.Errors[0].Error(), "E! subject: telegraf, error:  metric parsing error")
+	assert.Contains(t, acc.Errors[0].Error(), "E! subject: telegraf, error: metric parse error")
 	assert.EqualValues(t, 0, acc.NMetrics())
 }
 
diff --git a/plugins/inputs/prometheus/parser_test.go b/plugins/inputs/prometheus/parser_test.go
index 4f2a8516f..7b2bfeca2 100644
--- a/plugins/inputs/prometheus/parser_test.go
+++ b/plugins/inputs/prometheus/parser_test.go
@@ -111,9 +111,11 @@ func TestParseValidPrometheus(t *testing.T) {
 		"gauge": float64(1),
 	}, metrics[0].Fields())
 	assert.Equal(t, map[string]string{
-		"osVersion":     "CentOS Linux 7 (Core)",
-		"dockerVersion": "1.8.2",
-		"kernelVersion": "3.10.0-229.20.1.el7.x86_64",
+		"osVersion":        "CentOS Linux 7 (Core)",
+		"cadvisorRevision": "",
+		"cadvisorVersion":  "",
+		"dockerVersion":    "1.8.2",
+		"kernelVersion":    "3.10.0-229.20.1.el7.x86_64",
 	}, metrics[0].Tags())
 
 	// Counter value
diff --git a/plugins/inputs/udp_listener/udp_listener_test.go b/plugins/inputs/udp_listener/udp_listener_test.go
index 4d78a1a42..e0e0e862e 100644
--- a/plugins/inputs/udp_listener/udp_listener_test.go
+++ b/plugins/inputs/udp_listener/udp_listener_test.go
@@ -47,11 +47,13 @@ func TestHighTrafficUDP(t *testing.T) {
 		ServiceAddress:         ":8126",
 		AllowedPendingMessages: 100000,
 	}
-	listener.parser, _ = parsers.NewInfluxParser()
+	var err error
+	listener.parser, err = parsers.NewInfluxParser()
+	require.NoError(t, err)
 	acc := &testutil.Accumulator{}
 
 	// send multiple messages to socket
-	err := listener.Start(acc)
+	err = listener.Start(acc)
 	require.NoError(t, err)
 
 	conn, err := net.Dial("udp", "127.0.0.1:8126")
diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go
index 4f0bcca77..3a763b792 100644
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -97,7 +97,7 @@ func (f *File) Write(metrics []telegraf.Metric) error {
 		}
 		_, err = f.writer.Write(b)
 		if err != nil {
-			return fmt.Errorf("failed to write message: %s, %s", metric.Serialize(), err)
+			return fmt.Errorf("failed to write message: %s, %s", b, err)
 		}
 	}
 	return nil
diff --git a/plugins/outputs/graylog/graylog.go b/plugins/outputs/graylog/graylog.go
index e77eae558..4b2c1693a 100644
--- a/plugins/outputs/graylog/graylog.go
+++ b/plugins/outputs/graylog/graylog.go
@@ -7,12 +7,13 @@ import (
 	"encoding/binary"
 	ejson "encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/outputs"
 	"io"
 	"math"
 	"net"
 	"os"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
 const (
@@ -212,7 +213,7 @@ func serialize(metric telegraf.Metric) ([]string, error) {
 
 	m := make(map[string]interface{})
 	m["version"] = "1.1"
-	m["timestamp"] = metric.UnixNano() / 1000000000
+	m["timestamp"] = metric.Time().UnixNano() / 1000000000
 	m["short_message"] = "telegraf"
 	m["name"] = metric.Name()
 
diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 35f896523..9547292ed 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -1,35 +1,40 @@
 # InfluxDB Output Plugin
 
-This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
+This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/influxdata/influxdb) HTTP or UDP service.
 
 ### Configuration:
 
 ```toml
-# Configuration for influxdb server to send metrics to
+# Configuration for sending metrics to InfluxDB
 [[outputs.influxdb]]
   ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
-  ## Multiple urls can be specified as part of the same cluster,
-  ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
-  urls = ["http://127.0.0.1:8086"] # required
-  ## The target database for metrics (telegraf will create it if not exists).
-  database = "telegraf" # required
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  # urls = ["udp://127.0.0.1:8089"]
+  # urls = ["http://127.0.0.1:8086"]
+
+  ## The target database for metrics; will be created as needed.
+  # database = "telegraf"
 
   ## Name of existing retention policy to write to.  Empty string writes to
   ## the default retention policy.
-  retention_policy = ""
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
-  write_consistency = "any"
+  # retention_policy = ""
 
-  ## Write timeout (for the InfluxDB client), formatted as a string.
-  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
-  timeout = "5s"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  # write_consistency = "any"
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## HTTP Basic Auth
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
-  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
+
+  ## HTTP User-Agent
   # user_agent = "telegraf"
-  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+
+  ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
   ## Optional SSL Config
@@ -39,37 +44,14 @@ This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## HTTP Proxy Config
+  ## HTTP Proxy override, if unset values the standard proxy environment
+  ## variables are consulted to determine which proxy, if any, should be used.
   # http_proxy = "http://corporate.proxy:3128"
 
-  ## Optional HTTP headers
+  ## Additional HTTP headers
   # http_headers = {"X-Special-Header" = "Special-Value"}
 
-  ## Compress each HTTP request payload using GZIP.
-  # content_encoding = "gzip"
+  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "identity"
 ```
-
-### Required parameters:
-
-* `urls`: List of strings, this is for InfluxDB clustering
-support. On each flush interval, Telegraf will randomly choose one of the urls
-to write to. Each URL should start with either `http://` or `udp://`
-* `database`: The name of the database to write to.
-
-
-### Optional parameters:
-
-* `write_consistency`: Write consistency (clusters only), can be: "any", "one", "quorum", "all".
-* `retention_policy`:  Name of existing retention policy to write to.  Empty string writes to the default retention policy.
-* `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)
-* `ssl_ca`: SSL CA
-* `ssl_cert`: SSL CERT
-* `ssl_key`: SSL key
-* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
-* `http_proxy`: HTTP Proxy URI
-* `http_headers`: HTTP headers to add to each HTTP request
-* `content_encoding`: Compress each HTTP request payload using gzip if set to: "gzip"
diff --git a/plugins/outputs/influxdb/client/client.go b/plugins/outputs/influxdb/client/client.go
deleted file mode 100644
index 4bcaceb74..000000000
--- a/plugins/outputs/influxdb/client/client.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package client
-
-import "io"
-
-type Client interface {
-	Query(command string) error
-	WriteStream(b io.Reader) error
-	Close() error
-}
-
-type WriteParams struct {
-	Database        string
-	RetentionPolicy string
-	Precision       string
-	Consistency     string
-}
diff --git a/plugins/outputs/influxdb/client/http.go b/plugins/outputs/influxdb/client/http.go
deleted file mode 100644
index 601e40386..000000000
--- a/plugins/outputs/influxdb/client/http.go
+++ /dev/null
@@ -1,277 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"compress/gzip"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"path"
-	"time"
-)
-
-var (
-	defaultRequestTimeout = time.Second * 5
-)
-
-func NewHTTP(config HTTPConfig, defaultWP WriteParams) (Client, error) {
-	// validate required parameters:
-	if len(config.URL) == 0 {
-		return nil, fmt.Errorf("config.URL is required to create an HTTP client")
-	}
-	if len(defaultWP.Database) == 0 {
-		return nil, fmt.Errorf("A default database is required to create an HTTP client")
-	}
-
-	// set defaults:
-	if config.Timeout == 0 {
-		config.Timeout = defaultRequestTimeout
-	}
-
-	// parse URL:
-	u, err := url.Parse(config.URL)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing config.URL: %s", err)
-	}
-	if u.Scheme != "http" && u.Scheme != "https" {
-		return nil, fmt.Errorf("config.URL scheme must be http(s), got %s", u.Scheme)
-	}
-
-	var transport http.Transport
-	if len(config.HTTPProxy) > 0 {
-		proxyURL, err := url.Parse(config.HTTPProxy)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing config.HTTPProxy: %s", err)
-		}
-
-		transport = http.Transport{
-			Proxy:           http.ProxyURL(proxyURL),
-			TLSClientConfig: config.TLSConfig,
-		}
-	} else {
-		transport = http.Transport{
-			Proxy:           http.ProxyFromEnvironment,
-			TLSClientConfig: config.TLSConfig,
-		}
-	}
-
-	return &httpClient{
-		writeURL: writeURL(u, defaultWP),
-		config:   config,
-		url:      u,
-		client: &http.Client{
-			Timeout:   config.Timeout,
-			Transport: &transport,
-		},
-	}, nil
-}
-
-type HTTPHeaders map[string]string
-
-type HTTPConfig struct {
-	// URL should be of the form "http://host:port" (REQUIRED)
-	URL string
-
-	// UserAgent sets the User-Agent header.
-	UserAgent string
-
-	// Timeout specifies a time limit for requests made by this
-	// Client. The timeout includes connection time, any
-	// redirects, and reading the response body. The timer remains
-	// running after Get, Head, Post, or Do return and will
-	// interrupt reading of the Response.Body.
-	//
-	// A Timeout of zero means no timeout.
-	Timeout time.Duration
-
-	// Username is the basic auth username for the server.
-	Username string
-	// Password is the basic auth password for the server.
-	Password string
-
-	// TLSConfig is the tls auth settings to use for each request.
-	TLSConfig *tls.Config
-
-	// Proxy URL should be of the form "http://host:port"
-	HTTPProxy string
-
-	// HTTP headers to append to HTTP requests.
-	HTTPHeaders HTTPHeaders
-
-	// The content encoding mechanism to use for each request.
-	ContentEncoding string
-}
-
-// Response represents a list of statement results.
-type Response struct {
-	// ignore Results:
-	Results []interface{} `json:"-"`
-	Err     string        `json:"error,omitempty"`
-}
-
-// Error returns the first error from any statement.
-// Returns nil if no errors occurred on any statements.
-func (r *Response) Error() error {
-	if r.Err != "" {
-		return fmt.Errorf(r.Err)
-	}
-	return nil
-}
-
-type httpClient struct {
-	writeURL string
-	config   HTTPConfig
-	client   *http.Client
-	url      *url.URL
-}
-
-func (c *httpClient) Query(command string) error {
-	req, err := c.makeRequest(queryURL(c.url, command), bytes.NewReader([]byte("")))
-	if err != nil {
-		return err
-	}
-	return c.doRequest(req, http.StatusOK)
-}
-
-func (c *httpClient) WriteStream(r io.Reader) error {
-	req, err := c.makeWriteRequest(r, c.writeURL)
-	if err != nil {
-		return err
-	}
-
-	return c.doRequest(req, http.StatusNoContent)
-}
-
-func (c *httpClient) doRequest(
-	req *http.Request,
-	expectedCode int,
-) error {
-	resp, err := c.client.Do(req)
-	if err != nil {
-		return err
-	}
-
-	code := resp.StatusCode
-	// If it's a "no content" response, then release and return nil
-	if code == http.StatusNoContent {
-		return nil
-	}
-
-	// not a "no content" response, so parse the result:
-	var response Response
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("Fatal error reading body: %s", err)
-	}
-	decErr := json.Unmarshal(body, &response)
-
-	// If we got a JSON decode error, send that back
-	if decErr != nil {
-		err = fmt.Errorf("Unable to decode json: received status code %d err: %s", code, decErr)
-	}
-	// Unexpected response code OR error in JSON response body overrides
-	// a JSON decode error:
-	if code != expectedCode || response.Error() != nil {
-		err = fmt.Errorf("Response Error: Status Code [%d], expected [%d], [%v]",
-			code, expectedCode, response.Error())
-	}
-
-	return err
-}
-
-func (c *httpClient) makeWriteRequest(
-	body io.Reader,
-	writeURL string,
-) (*http.Request, error) {
-	req, err := c.makeRequest(writeURL, body)
-	if err != nil {
-		return nil, err
-	}
-	if c.config.ContentEncoding == "gzip" {
-		req.Header.Set("Content-Encoding", "gzip")
-	}
-	return req, nil
-}
-
-func (c *httpClient) makeRequest(uri string, body io.Reader) (*http.Request, error) {
-	var req *http.Request
-	var err error
-	if c.config.ContentEncoding == "gzip" {
-		body, err = compressWithGzip(body)
-		if err != nil {
-			return nil, err
-		}
-	}
-	req, err = http.NewRequest("POST", uri, body)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Set("Content-Type", "text/plain; charset=utf-8")
-
-	for header, value := range c.config.HTTPHeaders {
-		req.Header.Set(header, value)
-	}
-
-	req.Header.Set("User-Agent", c.config.UserAgent)
-	if c.config.Username != "" && c.config.Password != "" {
-		req.SetBasicAuth(c.config.Username, c.config.Password)
-	}
-	return req, nil
-}
-
-func compressWithGzip(data io.Reader) (io.Reader, error) {
-	pr, pw := io.Pipe()
-	gw := gzip.NewWriter(pw)
-	var err error
-
-	go func() {
-		_, err = io.Copy(gw, data)
-		gw.Close()
-		pw.Close()
-	}()
-
-	return pr, err
-}
-
-func (c *httpClient) Close() error {
-	// Nothing to do.
-	return nil
-}
-
-func writeURL(u *url.URL, wp WriteParams) string {
-	params := url.Values{}
-	params.Set("db", wp.Database)
-	if wp.RetentionPolicy != "" {
-		params.Set("rp", wp.RetentionPolicy)
-	}
-	if wp.Precision != "n" && wp.Precision != "" {
-		params.Set("precision", wp.Precision)
-	}
-	if wp.Consistency != "one" && wp.Consistency != "" {
-		params.Set("consistency", wp.Consistency)
-	}
-
-	u.RawQuery = params.Encode()
-	p := u.Path
-	u.Path = path.Join(p, "write")
-	s := u.String()
-	u.Path = p
-	return s
-}
-
-func queryURL(u *url.URL, command string) string {
-	params := url.Values{}
-	params.Set("q", command)
-
-	u.RawQuery = params.Encode()
-	p := u.Path
-	u.Path = path.Join(p, "query")
-	s := u.String()
-	u.Path = p
-	return s
-}
diff --git a/plugins/outputs/influxdb/client/http_test.go b/plugins/outputs/influxdb/client/http_test.go
deleted file mode 100644
index 2cb0182e8..000000000
--- a/plugins/outputs/influxdb/client/http_test.go
+++ /dev/null
@@ -1,335 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestHTTPClient_Write(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			// test form values:
-			if r.FormValue("db") != "test" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong db name"}`)
-			}
-			if r.FormValue("rp") != "policy" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong rp name"}`)
-			}
-			if r.FormValue("precision") != "ns" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong precision"}`)
-			}
-			if r.FormValue("consistency") != "all" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong consistency"}`)
-			}
-			// test that user agent is set properly
-			if r.UserAgent() != "test-agent" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong agent name"}`)
-			}
-			// test basic auth params
-			user, pass, ok := r.BasicAuth()
-			if !ok {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"basic auth not set"}`)
-			}
-			if user != "test-user" || pass != "test-password" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"basic auth incorrect"}`)
-			}
-
-			// test that user-specified http header is set properly
-			if r.Header.Get("X-Test-Header") != "Test-Value" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				fmt.Fprintln(w, `{"results":[{}],"error":"wrong http header value"}`)
-			}
-
-			// Validate Content-Length Header
-			if r.ContentLength != 13 {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				msg := fmt.Sprintf(`{"results":[{}],"error":"Content-Length: expected [13], got [%d]"}`, r.ContentLength)
-				fmt.Fprintln(w, msg)
-			}
-
-			// Validate the request body:
-			buf := make([]byte, 100)
-			n, _ := r.Body.Read(buf)
-			expected := "cpu value=99"
-			got := string(buf[0 : n-1])
-			if expected != got {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				msg := fmt.Sprintf(`{"results":[{}],"error":"expected [%s], got [%s]"}`, expected, got)
-				fmt.Fprintln(w, msg)
-			}
-
-			w.WriteHeader(http.StatusNoContent)
-			w.Header().Set("Content-Type", "application/json")
-		case "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL:       ts.URL,
-		UserAgent: "test-agent",
-		Username:  "test-user",
-		Password:  "test-password",
-		HTTPHeaders: HTTPHeaders{
-			"X-Test-Header": "Test-Value",
-		},
-	}
-	wp := WriteParams{
-		Database:        "test",
-		RetentionPolicy: "policy",
-		Precision:       "ns",
-		Consistency:     "all",
-	}
-	client, err := NewHTTP(config, wp)
-	defer client.Close()
-	assert.NoError(t, err)
-
-	err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")))
-	assert.NoError(t, err)
-}
-
-func TestHTTPClient_Write_Errors(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusTeapot)
-		case "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL,
-	}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	defer client.Close()
-	assert.NoError(t, err)
-
-	lp := []byte("cpu value=99\n")
-	err = client.WriteStream(bytes.NewReader(lp))
-	assert.Error(t, err)
-}
-
-func TestNewHTTPErrors(t *testing.T) {
-	// No URL:
-	config := HTTPConfig{}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	assert.Error(t, err)
-	assert.Nil(t, client)
-
-	// No Database:
-	config = HTTPConfig{
-		URL: "http://localhost:8086",
-	}
-	defaultWP = WriteParams{}
-	client, err = NewHTTP(config, defaultWP)
-	assert.Nil(t, client)
-	assert.Error(t, err)
-
-	// Invalid URL:
-	config = HTTPConfig{
-		URL: "http://192.168.0.%31:8080/",
-	}
-	defaultWP = WriteParams{
-		Database: "test",
-	}
-	client, err = NewHTTP(config, defaultWP)
-	assert.Nil(t, client)
-	assert.Error(t, err)
-
-	// Invalid URL scheme:
-	config = HTTPConfig{
-		URL: "mailto://localhost:8086",
-	}
-	defaultWP = WriteParams{
-		Database: "test",
-	}
-	client, err = NewHTTP(config, defaultWP)
-	assert.Nil(t, client)
-	assert.Error(t, err)
-}
-
-func TestHTTPClient_Query(t *testing.T) {
-	command := "CREATE DATABASE test"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusNoContent)
-		case "/query":
-			// validate the create database command is correct
-			got := r.FormValue("q")
-			if got != command {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-				msg := fmt.Sprintf(`{"results":[{}],"error":"got %s, expected %s"}`, got, command)
-				fmt.Fprintln(w, msg)
-			}
-
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL,
-	}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	defer client.Close()
-	assert.NoError(t, err)
-	err = client.Query(command)
-	assert.NoError(t, err)
-}
-
-func TestHTTPClient_Query_ResponseError(t *testing.T) {
-	command := "CREATE DATABASE test"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusNoContent)
-		case "/query":
-			w.WriteHeader(http.StatusTeapot)
-			w.Header().Set("Content-Type", "application/json")
-			msg := fmt.Sprintf(`{"results":[{}],"error":"couldnt create database"}`)
-			fmt.Fprintln(w, msg)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL,
-	}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	defer client.Close()
-	assert.NoError(t, err)
-	err = client.Query(command)
-	assert.Error(t, err)
-}
-
-func TestHTTPClient_Query_JSONDecodeError(t *testing.T) {
-	command := "CREATE DATABASE test"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusNoContent)
-		case "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			// write JSON missing a ']'
-			msg := fmt.Sprintf(`{"results":[{}}`)
-			fmt.Fprintln(w, msg)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL,
-	}
-	defaultWP := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, defaultWP)
-	defer client.Close()
-	assert.NoError(t, err)
-	err = client.Query(command)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "json")
-}
-
-func TestGzipCompression(t *testing.T) {
-	influxLine := "cpu value=99\n"
-
-	// Compress the payload using GZIP.
-	payload := bytes.NewReader([]byte(influxLine))
-	compressed, err := compressWithGzip(payload)
-	assert.Nil(t, err)
-
-	// Decompress the compressed payload and make sure
-	// that its original value has not changed.
-	gr, err := gzip.NewReader(compressed)
-	assert.Nil(t, err)
-	gr.Close()
-
-	var uncompressed bytes.Buffer
-	_, err = uncompressed.ReadFrom(gr)
-	assert.Nil(t, err)
-
-	assert.Equal(t, []byte(influxLine), uncompressed.Bytes())
-}
-
-func TestHTTPClient_PathPrefix(t *testing.T) {
-	prefix := "/some/random/prefix"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case prefix + "/write":
-			w.WriteHeader(http.StatusNoContent)
-			w.Header().Set("Content-Type", "application/json")
-		case prefix + "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		default:
-			w.WriteHeader(http.StatusNotFound)
-			msg := fmt.Sprintf("Path not found: %s", r.URL.Path)
-			fmt.Fprintln(w, msg)
-		}
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{
-		URL: ts.URL + prefix,
-	}
-	wp := WriteParams{
-		Database: "test",
-	}
-	client, err := NewHTTP(config, wp)
-	defer client.Close()
-	assert.NoError(t, err)
-	err = client.Query("CREATE DATABASE test")
-	assert.NoError(t, err)
-	err = client.WriteStream(bytes.NewReader([]byte("cpu value=99\n")))
-	assert.NoError(t, err)
-}
diff --git a/plugins/outputs/influxdb/client/udp.go b/plugins/outputs/influxdb/client/udp.go
deleted file mode 100644
index 786b047fa..000000000
--- a/plugins/outputs/influxdb/client/udp.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/url"
-)
-
-const (
-	// UDPPayloadSize is a reasonable default payload size for UDP packets that
-	// could be travelling over the internet.
-	UDPPayloadSize = 512
-)
-
-// UDPConfig is the config data needed to create a UDP Client
-type UDPConfig struct {
-	// URL should be of the form "udp://host:port"
-	// or "udp://[ipv6-host%zone]:port".
-	URL string
-
-	// PayloadSize is the maximum size of a UDP client message, optional
-	// Tune this based on your network. Defaults to UDPPayloadSize.
-	PayloadSize int
-}
-
-// NewUDP will return an instance of the telegraf UDP output plugin for influxdb
-func NewUDP(config UDPConfig) (Client, error) {
-	p, err := url.Parse(config.URL)
-	if err != nil {
-		return nil, fmt.Errorf("Error parsing UDP url [%s]: %s", config.URL, err)
-	}
-
-	udpAddr, err := net.ResolveUDPAddr("udp", p.Host)
-	if err != nil {
-		return nil, fmt.Errorf("Error resolving UDP Address [%s]: %s", p.Host, err)
-	}
-
-	conn, err := net.DialUDP("udp", nil, udpAddr)
-	if err != nil {
-		return nil, fmt.Errorf("Error dialing UDP address [%s]: %s",
-			udpAddr.String(), err)
-	}
-
-	size := config.PayloadSize
-	if size == 0 {
-		size = UDPPayloadSize
-	}
-	buf := make([]byte, size)
-	return &udpClient{conn: conn, buffer: buf}, nil
-}
-
-type udpClient struct {
-	conn   *net.UDPConn
-	buffer []byte
-}
-
-// Query will send the provided query command to the client, returning an error if any issues arise
-func (c *udpClient) Query(command string) error {
-	return nil
-}
-
-// WriteStream will send the provided data through to the client, contentLength is ignored by the UDP client
-func (c *udpClient) WriteStream(r io.Reader) error {
-	var totaln int
-	for {
-		nR, err := r.Read(c.buffer)
-		if nR == 0 {
-			break
-		}
-		if err != io.EOF && err != nil {
-			return err
-		}
-
-		if c.buffer[nR-1] == uint8('\n') {
-			nW, err := c.conn.Write(c.buffer[0:nR])
-			totaln += nW
-			if err != nil {
-				return err
-			}
-		} else {
-			log.Printf("E! Could not fit point into UDP payload; dropping")
-			// Scan forward until next line break to realign.
-			for {
-				nR, err := r.Read(c.buffer)
-				if nR == 0 {
-					break
-				}
-				if err != io.EOF && err != nil {
-					return err
-				}
-				if c.buffer[nR-1] == uint8('\n') {
-					break
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// Close will terminate the provided client connection
-func (c *udpClient) Close() error {
-	return c.conn.Close()
-}
diff --git a/plugins/outputs/influxdb/client/udp_test.go b/plugins/outputs/influxdb/client/udp_test.go
deleted file mode 100644
index 545f142f5..000000000
--- a/plugins/outputs/influxdb/client/udp_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package client
-
-import (
-	"net"
-	"testing"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestUDPClient(t *testing.T) {
-	config := UDPConfig{
-		URL: "udp://localhost:8089",
-	}
-	client, err := NewUDP(config)
-	assert.NoError(t, err)
-
-	err = client.Query("ANY QUERY RETURNS NIL")
-	assert.NoError(t, err)
-
-	assert.NoError(t, client.Close())
-}
-
-func TestNewUDPClient_Errors(t *testing.T) {
-	// url.Parse Error
-	config := UDPConfig{
-		URL: "udp://localhost%35:8089",
-	}
-	_, err := NewUDP(config)
-	assert.Error(t, err)
-
-	// ResolveUDPAddr Error
-	config = UDPConfig{
-		URL: "udp://localhost:999999",
-	}
-	_, err = NewUDP(config)
-	assert.Error(t, err)
-}
-
-func TestUDPClient_Write(t *testing.T) {
-	config := UDPConfig{
-		URL: "udp://localhost:8199",
-	}
-	client, err := NewUDP(config)
-	assert.NoError(t, err)
-
-	packets := make(chan string, 100)
-	address, err := net.ResolveUDPAddr("udp", "localhost:8199")
-	assert.NoError(t, err)
-	listener, err := net.ListenUDP("udp", address)
-	defer listener.Close()
-	assert.NoError(t, err)
-	go func() {
-		buf := make([]byte, 200)
-		for {
-			n, _, err := listener.ReadFromUDP(buf)
-			if err != nil {
-				packets <- err.Error()
-			}
-			packets <- string(buf[0:n])
-		}
-	}()
-
-	assert.NoError(t, client.Close())
-
-	config = UDPConfig{
-		URL:         "udp://localhost:8199",
-		PayloadSize: 40,
-	}
-	client4, err := NewUDP(config)
-	assert.NoError(t, err)
-
-	ts := time.Unix(1484142943, 0)
-	m1, _ := metric.New("test", map[string]string{},
-		map[string]interface{}{"this_is_a_very_long_field_name": 1.1}, ts)
-	m2, _ := metric.New("test", map[string]string{},
-		map[string]interface{}{"value": 1.1}, ts)
-	ms := []telegraf.Metric{m1, m2}
-	reader := metric.NewReader(ms)
-	err = client4.WriteStream(reader)
-	assert.NoError(t, err)
-	pkt := <-packets
-	assert.Equal(t, "test value=1.1 1484142943000000000\n", pkt)
-
-	assert.NoError(t, client4.Close())
-}
diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
new file mode 100644
index 000000000..852784f0d
--- /dev/null
+++ b/plugins/outputs/influxdb/http.go
@@ -0,0 +1,404 @@
+package influxdb
+
+import (
+	"compress/gzip"
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
+)
+
+type APIErrorType int
+
+const (
+	_ APIErrorType = iota
+	DatabaseNotFound
+)
+
+const (
+	defaultRequestTimeout = time.Second * 5
+	defaultDatabase       = "telegraf"
+	defaultUserAgent      = "telegraf"
+
+	errStringDatabaseNotFound      = "database not found"
+	errStringHintedHandoffNotEmpty = "hinted handoff queue not empty"
+	errStringPartialWrite          = "partial write"
+	errStringPointsBeyondRP        = "points beyond retention policy"
+	errStringUnableToParse         = "unable to parse"
+)
+
+var (
+
+	// Escape an identifier in InfluxQL.
+	escapeIdentifier = strings.NewReplacer(
+		"\n", `\n`,
+		`\`, `\\`,
+		`"`, `\"`,
+	)
+)
+
+// APIError is an error reported by the InfluxDB server
+type APIError struct {
+	StatusCode  int
+	Title       string
+	Description string
+	Type        APIErrorType
+}
+
+func (e APIError) Error() string {
+	if e.Description != "" {
+		return fmt.Sprintf("%s: %s", e.Title, e.Description)
+	}
+	return e.Title
+}
+
+// QueryResponse is the response body from the /query endpoint
+type QueryResponse struct {
+	Results []QueryResult `json:"results"`
+}
+
+type QueryResult struct {
+	Err string `json:"error,omitempty"`
+}
+
+func (r QueryResponse) Error() string {
+	if len(r.Results) > 0 {
+		return r.Results[0].Err
+	}
+	return ""
+}
+
+// WriteResponse is the response body from the /write endpoint
+type WriteResponse struct {
+	Err string `json:"error,omitempty"`
+}
+
+func (r WriteResponse) Error() string {
+	return r.Err
+}
+
+type HTTPConfig struct {
+	URL             *url.URL
+	UserAgent       string
+	Timeout         time.Duration
+	Username        string
+	Password        string
+	TLSConfig       *tls.Config
+	Proxy           *url.URL
+	Headers         map[string]string
+	ContentEncoding string
+	Database        string
+	RetentionPolicy string
+	Consistency     string
+
+	Serializer *influx.Serializer
+}
+
+type httpClient struct {
+	WriteURL        string
+	QueryURL        string
+	ContentEncoding string
+	Timeout         time.Duration
+	Username        string
+	Password        string
+	Headers         map[string]string
+
+	client     *http.Client
+	serializer *influx.Serializer
+	url        *url.URL
+	database   string
+}
+
+func NewHTTPClient(config *HTTPConfig) (*httpClient, error) {
+	if config.URL == nil {
+		return nil, ErrMissingURL
+	}
+
+	database := config.Database
+	if database == "" {
+		database = defaultDatabase
+	}
+
+	timeout := config.Timeout
+	if timeout == 0 {
+		timeout = defaultRequestTimeout
+	}
+
+	userAgent := config.UserAgent
+	if userAgent == "" {
+		userAgent = defaultUserAgent
+	}
+
+	var headers = make(map[string]string, len(config.Headers)+1)
+	headers["User-Agent"] = userAgent
+	for k, v := range config.Headers {
+		headers[k] = v
+	}
+
+	var proxy func(*http.Request) (*url.URL, error)
+	if config.Proxy != nil {
+		proxy = http.ProxyURL(config.Proxy)
+	} else {
+		proxy = http.ProxyFromEnvironment
+	}
+
+	serializer := config.Serializer
+	if serializer == nil {
+		serializer = influx.NewSerializer()
+	}
+
+	writeURL := makeWriteURL(
+		config.URL,
+		database,
+		config.RetentionPolicy,
+		config.Consistency)
+	queryURL := makeQueryURL(config.URL)
+
+	client := &httpClient{
+		serializer: serializer,
+		client: &http.Client{
+			Timeout: timeout,
+			Transport: &http.Transport{
+				Proxy:           proxy,
+				TLSClientConfig: config.TLSConfig,
+			},
+		},
+		database:        database,
+		url:             config.URL,
+		WriteURL:        writeURL,
+		QueryURL:        queryURL,
+		ContentEncoding: config.ContentEncoding,
+		Timeout:         timeout,
+		Username:        config.Username,
+		Password:        config.Password,
+		Headers:         headers,
+	}
+	return client, nil
+}
+
+// URL returns the origin URL that this client connects too.
+func (c *httpClient) URL() string {
+	return c.url.String()
+}
+
+// URL returns the database that this client connects too.
+func (c *httpClient) Database() string {
+	return c.database
+}
+
+// CreateDatabase attemps to create a new database in the InfluxDB server.
+// Note that some names are not allowed by the server, notably those with
+// non-printable characters or slashes.
+func (c *httpClient) CreateDatabase(ctx context.Context) error {
+	query := fmt.Sprintf(`CREATE DATABASE "%s"`,
+		escapeIdentifier.Replace(c.database))
+
+	req, err := c.makeQueryRequest(query)
+
+	resp, err := c.client.Do(req.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	queryResp := &QueryResponse{}
+	dec := json.NewDecoder(resp.Body)
+	err = dec.Decode(queryResp)
+
+	if err != nil {
+		if resp.StatusCode == 200 {
+			return nil
+		}
+
+		return &APIError{
+			StatusCode: resp.StatusCode,
+			Title:      resp.Status,
+		}
+	}
+
+	// Even with a 200 response there can be an error
+	if resp.StatusCode == http.StatusOK && queryResp.Error() == "" {
+		return nil
+	}
+
+	return &APIError{
+		StatusCode:  resp.StatusCode,
+		Title:       resp.Status,
+		Description: queryResp.Error(),
+	}
+}
+
+// Write sends the metrics to InfluxDB
+func (c *httpClient) Write(ctx context.Context, metrics []telegraf.Metric) error {
+	var err error
+
+	reader := influx.NewReader(metrics, c.serializer)
+	req, err := c.makeWriteRequest(reader)
+	if err != nil {
+		return err
+	}
+
+	resp, err := c.client.Do(req.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusNoContent {
+		return nil
+	}
+
+	writeResp := &WriteResponse{}
+	dec := json.NewDecoder(resp.Body)
+
+	var desc string
+	err = dec.Decode(writeResp)
+	if err == nil {
+		desc = writeResp.Err
+	}
+
+	if strings.Contains(desc, errStringDatabaseNotFound) {
+		return &APIError{
+			StatusCode:  resp.StatusCode,
+			Title:       resp.Status,
+			Description: desc,
+			Type:        DatabaseNotFound,
+		}
+	}
+
+	// This "error" is an informational message about the state of the
+	// InfluxDB cluster.
+	if strings.Contains(desc, errStringHintedHandoffNotEmpty) {
+		return nil
+	}
+
+	// Points beyond retention policy is returned when points are immediately
+	// discarded for being older than the retention policy.  Usually this not
+	// a cause for concern and we don't want to retry.
+	if strings.Contains(desc, errStringPointsBeyondRP) {
+		log.Printf("W! [outputs.influxdb]: when writing to [%s]: received error %v",
+			c.URL(), desc)
+		return nil
+	}
+
+	// Other partial write errors, such as "field type conflict", are not
+	// correctable at this point and so the point is dropped instead of
+	// retrying.
+	if strings.Contains(desc, errStringPartialWrite) {
+		log.Printf("E! [outputs.influxdb]: when writing to [%s]: received error %v; discarding points",
+			c.URL(), desc)
+		return nil
+	}
+
+	// This error indicates a bug in either Telegraf line protocol
+	// serialization, retries would not be successful.
+	if strings.Contains(desc, errStringUnableToParse) {
+		log.Printf("E! [outputs.influxdb]: when writing to [%s]: received error %v; discarding points",
+			c.URL(), desc)
+		return nil
+	}
+
+	return &APIError{
+		StatusCode:  resp.StatusCode,
+		Title:       resp.Status,
+		Description: desc,
+	}
+}
+
+func (c *httpClient) makeQueryRequest(query string) (*http.Request, error) {
+	params := url.Values{}
+	params.Set("q", query)
+	form := strings.NewReader(params.Encode())
+
+	req, err := http.NewRequest("POST", c.QueryURL, form)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	c.addHeaders(req)
+
+	return req, nil
+}
+
+func (c *httpClient) makeWriteRequest(body io.Reader) (*http.Request, error) {
+	var err error
+	if c.ContentEncoding == "gzip" {
+		body, err = compressWithGzip(body)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	req, err := http.NewRequest("POST", c.WriteURL, body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", "text/plain; charset=utf-8")
+	c.addHeaders(req)
+
+	if c.ContentEncoding == "gzip" {
+		req.Header.Set("Content-Encoding", "gzip")
+	}
+
+	return req, nil
+}
+
+func compressWithGzip(data io.Reader) (io.Reader, error) {
+	pr, pw := io.Pipe()
+	gw := gzip.NewWriter(pw)
+	var err error
+
+	go func() {
+		_, err = io.Copy(gw, data)
+		gw.Close()
+		pw.Close()
+	}()
+
+	return pr, err
+}
+
+func (c *httpClient) addHeaders(req *http.Request) {
+	if c.Username != "" || c.Password != "" {
+		req.SetBasicAuth(c.Username, c.Password)
+	}
+
+	for header, value := range c.Headers {
+		req.Header.Set(header, value)
+	}
+}
+
+func makeWriteURL(loc *url.URL, db, rp, consistency string) string {
+	params := url.Values{}
+	params.Set("db", db)
+
+	if rp != "" {
+		params.Set("rp", rp)
+	}
+
+	if consistency != "one" && consistency != "" {
+		params.Set("consistency", consistency)
+	}
+
+	u := *loc
+	u.Path = path.Join(u.Path, "write")
+	u.RawQuery = params.Encode()
+	return u.String()
+}
+
+func makeQueryURL(loc *url.URL) string {
+	u := *loc
+	u.Path = path.Join(u.Path, "query")
+	return u.String()
+}
diff --git a/plugins/outputs/influxdb/http_test.go b/plugins/outputs/influxdb/http_test.go
new file mode 100644
index 000000000..d6463c050
--- /dev/null
+++ b/plugins/outputs/influxdb/http_test.go
@@ -0,0 +1,558 @@
+package influxdb_test
+
+import (
+	"bytes"
+	"compress/gzip"
+	"context"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/outputs/influxdb"
+	"github.com/stretchr/testify/require"
+)
+
+func getHTTPURL() *url.URL {
+	u, err := url.Parse("http://localhost")
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+func TestHTTP_EmptyConfig(t *testing.T) {
+	config := &influxdb.HTTPConfig{}
+	_, err := influxdb.NewHTTPClient(config)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), influxdb.ErrMissingURL.Error())
+}
+
+func TestHTTP_MinimalConfig(t *testing.T) {
+	config := &influxdb.HTTPConfig{
+		URL: getHTTPURL(),
+	}
+	_, err := influxdb.NewHTTPClient(config)
+	require.NoError(t, err)
+}
+
+func TestHTTP_CreateDatabase(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	successResponse := []byte(`{"results": [{"statement_id": 0}]}`)
+
+	tests := []struct {
+		name             string
+		config           *influxdb.HTTPConfig
+		database         string
+		queryHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+		errFunc          func(t *testing.T, err error)
+	}{
+		{
+			name: "success",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "xyzzy",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, `CREATE DATABASE "xyzzy"`, r.FormValue("q"))
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "send basic auth",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Username: "guy",
+				Password: "smiley",
+				Database: "telegraf",
+			},
+			database: "telegraf",
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				username, password, ok := r.BasicAuth()
+				require.True(t, ok)
+				require.Equal(t, "guy", username)
+				require.Equal(t, "smiley", password)
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "send user agent",
+			config: &influxdb.HTTPConfig{
+				URL: u,
+				Headers: map[string]string{
+					"A": "B",
+					"C": "D",
+				},
+				Database: "telegraf",
+			},
+			database: `a " b`,
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, r.Header.Get("A"), "B")
+				require.Equal(t, r.Header.Get("C"), "D")
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "send headers",
+			config: &influxdb.HTTPConfig{
+				URL: u,
+				Headers: map[string]string{
+					"A": "B",
+					"C": "D",
+				},
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, r.Header.Get("A"), "B")
+				require.Equal(t, r.Header.Get("C"), "D")
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "database default",
+			config: &influxdb.HTTPConfig{
+				URL: u,
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, `CREATE DATABASE "telegraf"`, r.FormValue("q"))
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "database name is escaped",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: `a " b`,
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, `CREATE DATABASE "a \" b"`, r.FormValue("q"))
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+		},
+		{
+			name: "invalid database name creates api error",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: `a \\ b`,
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				// Yes, 200 OK is the correct response...
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(`{"results": [{"error": "invalid name", "statement_id": 0}]}`))
+			},
+			errFunc: func(t *testing.T, err error) {
+				expected := &influxdb.APIError{
+					StatusCode:  200,
+					Title:       "200 OK",
+					Description: "invalid name",
+				}
+
+				require.Equal(t, expected, err)
+			},
+		},
+		{
+			name: "error with no response body",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusNotFound)
+			},
+			errFunc: func(t *testing.T, err error) {
+				expected := &influxdb.APIError{
+					StatusCode: 404,
+					Title:      "404 Not Found",
+				}
+
+				require.Equal(t, expected, err)
+			},
+		},
+		{
+			name: "ok with no response body",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				switch r.URL.Path {
+				case "/query":
+					tt.queryHandlerFunc(t, w, r)
+					return
+				default:
+					w.WriteHeader(http.StatusNotFound)
+					return
+				}
+			})
+
+			ctx := context.Background()
+
+			client, err := influxdb.NewHTTPClient(tt.config)
+			require.NoError(t, err)
+			err = client.CreateDatabase(ctx)
+			if tt.errFunc != nil {
+				tt.errFunc(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestHTTP_Write(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	tests := []struct {
+		name             string
+		config           *influxdb.HTTPConfig
+		queryHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+		errFunc          func(t *testing.T, err error)
+		logFunc          func(t *testing.T, str string)
+	}{
+		{
+			name: "success",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, r.FormValue("db"), "telegraf")
+				body, err := ioutil.ReadAll(r.Body)
+				require.NoError(t, err)
+				require.Contains(t, string(body), "cpu value=42")
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "send basic auth",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+				Username: "guy",
+				Password: "smiley",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				username, password, ok := r.BasicAuth()
+				require.True(t, ok)
+				require.Equal(t, "guy", username)
+				require.Equal(t, "smiley", password)
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "send user agent",
+			config: &influxdb.HTTPConfig{
+				URL:       u,
+				Database:  "telegraf",
+				UserAgent: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, r.Header.Get("User-Agent"), "telegraf")
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "default database",
+			config: &influxdb.HTTPConfig{
+				URL: u,
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, "telegraf", r.FormValue("db"))
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "send headers",
+			config: &influxdb.HTTPConfig{
+				URL: u,
+				Headers: map[string]string{
+					"A": "B",
+					"C": "D",
+				},
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, r.Header.Get("A"), "B")
+				require.Equal(t, r.Header.Get("C"), "D")
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "send retention policy",
+			config: &influxdb.HTTPConfig{
+				URL:             u,
+				Database:        "telegraf",
+				RetentionPolicy: "foo",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, "foo", r.FormValue("rp"))
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "send consistency",
+			config: &influxdb.HTTPConfig{
+				URL:         u,
+				Database:    "telegraf",
+				Consistency: "all",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, "all", r.FormValue("consistency"))
+				w.WriteHeader(http.StatusNoContent)
+			},
+		},
+		{
+			name: "hinted handoff not empty no log no error",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadRequest)
+				w.Write([]byte(`{"error": "write failed: hinted handoff queue not empty"}`))
+			},
+			logFunc: func(t *testing.T, str string) {
+				require.False(t, strings.Contains(str, "hinted handoff queue not empty"))
+			},
+		},
+		{
+			name: "partial write errors are logged no error",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadRequest)
+				w.Write([]byte(`{"error": "partial write: field type conflict:"}`))
+			},
+			logFunc: func(t *testing.T, str string) {
+				require.Contains(t, str, "partial write")
+			},
+		},
+		{
+			name: "parse errors are logged no error",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadRequest)
+				w.Write([]byte(`{"error": "unable to parse 'cpu value': invalid field format"}`))
+			},
+			logFunc: func(t *testing.T, str string) {
+				require.Contains(t, str, "unable to parse")
+			},
+		},
+		{
+			name: "http error",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadGateway)
+			},
+			errFunc: func(t *testing.T, err error) {
+				expected := &influxdb.APIError{
+					StatusCode: 502,
+					Title:      "502 Bad Gateway",
+				}
+				require.Equal(t, expected, err)
+			},
+		},
+		{
+			name: "http error with desc",
+			config: &influxdb.HTTPConfig{
+				URL:      u,
+				Database: "telegraf",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte(`{"error": "unknown error"}`))
+			},
+			errFunc: func(t *testing.T, err error) {
+				expected := &influxdb.APIError{
+					StatusCode:  503,
+					Title:       "503 Service Unavailable",
+					Description: "unknown error",
+				}
+				require.Equal(t, expected, err)
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				switch r.URL.Path {
+				case "/write":
+					tt.queryHandlerFunc(t, w, r)
+					return
+				default:
+					w.WriteHeader(http.StatusNotFound)
+					return
+				}
+			})
+
+			var b bytes.Buffer
+			if tt.logFunc != nil {
+				log.SetOutput(&b)
+			}
+
+			ctx := context.Background()
+
+			m, err := metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": 42.0,
+				},
+				time.Unix(0, 0),
+			)
+			require.NoError(t, err)
+			metrics := []telegraf.Metric{m}
+
+			client, err := influxdb.NewHTTPClient(tt.config)
+			require.NoError(t, err)
+			err = client.Write(ctx, metrics)
+			if tt.errFunc != nil {
+				tt.errFunc(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+
+			if tt.logFunc != nil {
+				tt.logFunc(t, b.String())
+			}
+		})
+	}
+}
+
+func TestHTTP_WritePathPrefix(t *testing.T) {
+	ts := httptest.NewServer(
+		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			switch r.URL.Path {
+			case "/x/y/z/query":
+				w.WriteHeader(http.StatusOK)
+				return
+			case "/x/y/z/write":
+				w.WriteHeader(http.StatusNoContent)
+				return
+			default:
+				w.WriteHeader(http.StatusNotFound)
+				return
+			}
+		},
+		),
+	)
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s/x/y/z", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	ctx := context.Background()
+
+	m, err := metric.New(
+		"cpu",
+		map[string]string{},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		time.Unix(0, 0),
+	)
+	require.NoError(t, err)
+	metrics := []telegraf.Metric{m}
+
+	config := &influxdb.HTTPConfig{
+		URL:      u,
+		Database: "telegraf",
+	}
+
+	client, err := influxdb.NewHTTPClient(config)
+	require.NoError(t, err)
+	err = client.CreateDatabase(ctx)
+	require.NoError(t, err)
+	err = client.Write(ctx, metrics)
+	require.NoError(t, err)
+}
+
+func TestHTTP_WriteContentEncodingGzip(t *testing.T) {
+	ts := httptest.NewServer(
+		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			switch r.URL.Path {
+			case "/write":
+				require.Equal(t, r.Header.Get("Content-Encoding"), "gzip")
+
+				gr, err := gzip.NewReader(r.Body)
+				require.NoError(t, err)
+				body, err := ioutil.ReadAll(gr)
+				require.NoError(t, err)
+
+				require.Contains(t, string(body), "cpu value=42")
+				w.WriteHeader(http.StatusNoContent)
+				return
+			default:
+				w.WriteHeader(http.StatusNotFound)
+				return
+			}
+		},
+		),
+	)
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s/", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	ctx := context.Background()
+
+	m, err := metric.New(
+		"cpu",
+		map[string]string{},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		time.Unix(0, 0),
+	)
+	require.NoError(t, err)
+	metrics := []telegraf.Metric{m}
+
+	config := &influxdb.HTTPConfig{
+		URL:             u,
+		Database:        "telegraf",
+		ContentEncoding: "gzip",
+	}
+
+	client, err := influxdb.NewHTTPClient(config)
+	require.NoError(t, err)
+	err = client.Write(ctx, metrics)
+	require.NoError(t, err)
+}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index e2b20caa4..04a4c6987 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -1,29 +1,37 @@
 package influxdb
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"log"
 	"math/rand"
-	"strings"
+	"net/url"
 	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs"
-
-	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
 )
 
 var (
-	// Quote Ident replacer.
-	qiReplacer = strings.NewReplacer("\n", `\n`, `\`, `\\`, `"`, `\"`)
+	defaultURL = "http://localhost:8086"
+
+	ErrMissingURL = errors.New("missing URL")
 )
 
+type Client interface {
+	Write(context.Context, []telegraf.Metric) error
+	CreateDatabase(ctx context.Context) error
+
+	URL() string
+	Database() string
+}
+
 // InfluxDB struct is the primary data structure for the plugin
 type InfluxDB struct {
-	// URL is only for backwards compatibility
-	URL              string
+	URL              string   // url deprecated in 0.1.9; use urls
 	URLs             []string `toml:"urls"`
 	Username         string
 	Password         string
@@ -46,36 +54,45 @@ type InfluxDB struct {
 	// Use SSL but skip chain & host verification
 	InsecureSkipVerify bool
 
-	// Precision is only here for legacy support. It will be ignored.
-	Precision string
+	Precision string // precision deprecated in 1.0; value is ignored
 
-	clients []client.Client
+	clients []Client
+
+	CreateHTTPClientF func(config *HTTPConfig) (Client, error)
+	CreateUDPClientF  func(config *UDPConfig) (Client, error)
+
+	serializer *influx.Serializer
 }
 
 var sampleConfig = `
   ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
-  ## Multiple urls can be specified as part of the same cluster,
-  ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
-  urls = ["http://127.0.0.1:8086"] # required
-  ## The target database for metrics (telegraf will create it if not exists).
-  database = "telegraf" # required
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  # urls = ["udp://127.0.0.1:8089"]
+  # urls = ["http://127.0.0.1:8086"]
+
+  ## The target database for metrics; will be created as needed.
+  # database = "telegraf"
 
   ## Name of existing retention policy to write to.  Empty string writes to
   ## the default retention policy.
-  retention_policy = ""
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
-  write_consistency = "any"
+  # retention_policy = ""
 
-  ## Write timeout (for the InfluxDB client), formatted as a string.
-  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
-  timeout = "5s"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  # write_consistency = "any"
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## HTTP Basic Auth
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
-  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
+
+  ## HTTP User-Agent
   # user_agent = "telegraf"
-  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+
+  ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
   ## Optional SSL Config
@@ -85,170 +102,181 @@ var sampleConfig = `
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## HTTP Proxy Config
+  ## HTTP Proxy override, if unset values the standard proxy environment
+  ## variables are consulted to determine which proxy, if any, should be used.
   # http_proxy = "http://corporate.proxy:3128"
 
-  ## Optional HTTP headers
+  ## Additional HTTP headers
   # http_headers = {"X-Special-Header" = "Special-Value"}
 
-  ## Compress each HTTP request payload using GZIP.
-  # content_encoding = "gzip"
+  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "identity"
 `
 
-// Connect initiates the primary connection to the range of provided URLs
 func (i *InfluxDB) Connect() error {
-	var urls []string
-	urls = append(urls, i.URLs...)
+	ctx := context.Background()
 
-	// Backward-compatibility with single Influx URL config files
-	// This could eventually be removed in favor of specifying the urls as a list
+	urls := make([]string, 0, len(i.URLs))
+	urls = append(urls, i.URLs...)
 	if i.URL != "" {
 		urls = append(urls, i.URL)
 	}
 
-	tlsConfig, err := internal.GetTLSConfig(
-		i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
-	if err != nil {
-		return err
+	if len(urls) == 0 {
+		urls = append(urls, defaultURL)
 	}
 
+	i.serializer = influx.NewSerializer()
+
 	for _, u := range urls {
-		switch {
-		case strings.HasPrefix(u, "udp"):
-			config := client.UDPConfig{
-				URL:         u,
-				PayloadSize: i.UDPPayload,
-			}
-			c, err := client.NewUDP(config)
+		u, err := url.Parse(u)
+		if err != nil {
+			return fmt.Errorf("error parsing url [%s]: %v", u, err)
+		}
+
+		var proxy *url.URL
+		if len(i.HTTPProxy) > 0 {
+			proxy, err = url.Parse(i.HTTPProxy)
 			if err != nil {
-				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
+				return fmt.Errorf("error parsing proxy_url [%s]: %v", proxy, err)
 			}
+		}
+
+		switch u.Scheme {
+		case "udp", "udp4", "udp6":
+			c, err := i.udpClient(u)
+			if err != nil {
+				return err
+			}
+
+			i.clients = append(i.clients, c)
+		case "http", "https":
+			c, err := i.httpClient(ctx, u, proxy)
+			if err != nil {
+				return err
+			}
+
 			i.clients = append(i.clients, c)
 		default:
-			// If URL doesn't start with "udp", assume HTTP client
-			config := client.HTTPConfig{
-				URL:             u,
-				Timeout:         i.Timeout.Duration,
-				TLSConfig:       tlsConfig,
-				UserAgent:       i.UserAgent,
-				Username:        i.Username,
-				Password:        i.Password,
-				HTTPProxy:       i.HTTPProxy,
-				HTTPHeaders:     client.HTTPHeaders{},
-				ContentEncoding: i.ContentEncoding,
-			}
-			for header, value := range i.HTTPHeaders {
-				config.HTTPHeaders[header] = value
-			}
-			wp := client.WriteParams{
-				Database:        i.Database,
-				RetentionPolicy: i.RetentionPolicy,
-				Consistency:     i.WriteConsistency,
-			}
-			c, err := client.NewHTTP(config, wp)
-			if err != nil {
-				return fmt.Errorf("Error creating HTTP Client [%s]: %s", u, err)
-			}
-			i.clients = append(i.clients, c)
-
-			err = c.Query(fmt.Sprintf(`CREATE DATABASE "%s"`, qiReplacer.Replace(i.Database)))
-			if err != nil {
-				if !strings.Contains(err.Error(), "Status Code [403]") {
-					log.Println("I! Database creation failed: " + err.Error())
-				}
-				continue
-			}
+			return fmt.Errorf("unsupported scheme [%s]: %q", u, u.Scheme)
 		}
 	}
 
-	rand.Seed(time.Now().UnixNano())
 	return nil
 }
 
-// Close will terminate the session to the backend, returning error if an issue arises
 func (i *InfluxDB) Close() error {
 	return nil
 }
 
-// SampleConfig returns the formatted sample configuration for the plugin
+func (i *InfluxDB) Description() string {
+	return "Configuration for sending metrics to InfluxDB"
+}
+
 func (i *InfluxDB) SampleConfig() string {
 	return sampleConfig
 }
 
-// Description returns the human-readable function definition of the plugin
-func (i *InfluxDB) Description() string {
-	return "Configuration for influxdb server to send metrics to"
-}
-
-// Write will choose a random server in the cluster to write to until a successful write
-// occurs, logging each unsuccessful. If all servers fail, return error.
+// Write sends metrics to one of the configured servers, logging each
+// unsuccessful. If all servers fail, return an error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
-	r := metric.NewReader(metrics)
-
-	// This will get set to nil if a successful write occurs
-	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")
+	ctx := context.Background()
 
+	var err error
 	p := rand.Perm(len(i.clients))
 	for _, n := range p {
-		if e := i.clients[n].WriteStream(r); e != nil {
-			// If the database was not found, try to recreate it:
-			if strings.Contains(e.Error(), "database not found") {
-				errc := i.clients[n].Query(fmt.Sprintf(`CREATE DATABASE "%s"`, qiReplacer.Replace(i.Database)))
-				if errc != nil {
-					log.Printf("E! Error: Database %s not found and failed to recreate\n",
-						i.Database)
+		client := i.clients[n]
+		err = client.Write(ctx, metrics)
+		if err == nil {
+			return nil
+		}
+
+		switch apiError := err.(type) {
+		case APIError:
+			if apiError.Type == DatabaseNotFound {
+				err := client.CreateDatabase(ctx)
+				if err != nil {
+					log.Printf("E! [outputs.influxdb] when writing to [%s]: database %q not found and failed to recreate",
+						client.URL(), client.Database())
 				}
 			}
-
-			if strings.Contains(e.Error(), "field type conflict") {
-				log.Printf("E! Field type conflict, dropping conflicted points: %s", e)
-				// setting err to nil, otherwise we will keep retrying and points
-				// w/ conflicting types will get stuck in the buffer forever.
-				err = nil
-				break
-			}
-
-			if strings.Contains(e.Error(), "points beyond retention policy") {
-				log.Printf("W! Points beyond retention policy: %s", e)
-				// This error is indicates the point is older than the
-				// retention policy permits, and is probably not a cause for
-				// concern.  Retrying will not help unless the retention
-				// policy is modified.
-				err = nil
-				break
-			}
-
-			if strings.Contains(e.Error(), "unable to parse") {
-				log.Printf("E! Parse error; dropping points: %s", e)
-				// This error indicates a bug in Telegraf or InfluxDB parsing
-				// of line protocol.  Retries will not be successful.
-				err = nil
-				break
-			}
-
-			if strings.Contains(e.Error(), "hinted handoff queue not empty") {
-				// This is an informational message
-				err = nil
-				break
-			}
-
-			// Log write failure
-			log.Printf("E! InfluxDB Output Error: %s", e)
-		} else {
-			err = nil
-			break
 		}
+
+		log.Printf("E! [outputs.influxdb]: when writing to [%s]: %v", client.URL(), err)
 	}
 
-	return err
+	return errors.New("could not write any address")
 }
 
-func newInflux() *InfluxDB {
-	return &InfluxDB{
-		Timeout: internal.Duration{Duration: time.Second * 5},
+func (i *InfluxDB) udpClient(url *url.URL) (Client, error) {
+	config := &UDPConfig{
+		URL:            url,
+		MaxPayloadSize: i.UDPPayload,
+		Serializer:     i.serializer,
 	}
+
+	c, err := i.CreateUDPClientF(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating UDP client [%s]: %v", url, err)
+	}
+
+	return c, nil
+}
+
+func (i *InfluxDB) httpClient(ctx context.Context, url *url.URL, proxy *url.URL) (Client, error) {
+	tlsConfig, err := internal.GetTLSConfig(
+		i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
+	if err != nil {
+		return nil, err
+	}
+
+	config := &HTTPConfig{
+		URL:             url,
+		Timeout:         i.Timeout.Duration,
+		TLSConfig:       tlsConfig,
+		UserAgent:       i.UserAgent,
+		Username:        i.Username,
+		Password:        i.Password,
+		Proxy:           proxy,
+		ContentEncoding: i.ContentEncoding,
+		Headers:         i.HTTPHeaders,
+		Database:        i.Database,
+		RetentionPolicy: i.RetentionPolicy,
+		Consistency:     i.WriteConsistency,
+		Serializer:      i.serializer,
+	}
+
+	c, err := i.CreateHTTPClientF(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating HTTP client [%s]: %v", url, err)
+	}
+
+	err = c.CreateDatabase(ctx)
+	if err != nil {
+		if err, ok := err.(APIError); ok {
+			if err.StatusCode == 503 {
+				return c, nil
+			}
+		}
+
+		log.Printf("W! [outputs.influxdb] when writing to [%s]: database %q creation failed: %v",
+			c.URL(), c.Database(), err)
+	}
+
+	return c, nil
 }
 
 func init() {
-	outputs.Add("influxdb", func() telegraf.Output { return newInflux() })
+	outputs.Add("influxdb", func() telegraf.Output {
+		return &InfluxDB{
+			Timeout: internal.Duration{Duration: time.Second * 5},
+			CreateHTTPClientF: func(config *HTTPConfig) (Client, error) {
+				return NewHTTPClient(config)
+			},
+			CreateUDPClientF: func(config *UDPConfig) (Client, error) {
+				return NewUDPClient(config)
+			},
+		}
+	})
 }
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 50c86125d..3e9824ad0 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -1,313 +1,135 @@
-package influxdb
+package influxdb_test
 
 import (
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
+	"context"
 	"testing"
+	"time"
 
-	"github.com/influxdata/telegraf/plugins/outputs/influxdb/client"
-	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs/influxdb"
 	"github.com/stretchr/testify/require"
 )
 
-func TestIdentQuoting(t *testing.T) {
-	var testCases = []struct {
-		database string
-		expected string
-	}{
-		{"x-y", `CREATE DATABASE "x-y"`},
-		{`x"y`, `CREATE DATABASE "x\"y"`},
-		{"x\ny", `CREATE DATABASE "x\ny"`},
-		{`x\y`, `CREATE DATABASE "x\\y"`},
-	}
-
-	for _, tc := range testCases {
-		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			r.ParseForm()
-			q := r.Form.Get("q")
-			assert.Equal(t, tc.expected, q)
-
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}))
-		defer ts.Close()
-
-		i := InfluxDB{
-			URLs:     []string{ts.URL},
-			Database: tc.database,
-		}
-
-		err := i.Connect()
-		require.NoError(t, err)
-		require.NoError(t, i.Close())
-	}
-}
-
-func TestUDPInflux(t *testing.T) {
-	i := InfluxDB{
-		URLs: []string{"udp://localhost:8089"},
-	}
-
-	err := i.Connect()
-	require.NoError(t, err)
-	err = i.Write(testutil.MockMetrics())
-	require.NoError(t, err)
-	require.NoError(t, i.Close())
-}
-
-func TestHTTPInflux(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			// test that database is set properly
-			if r.FormValue("db") != "test" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-			}
-			// test that user agent is set properly
-			if r.UserAgent() != "telegraf" {
-				w.WriteHeader(http.StatusTeapot)
-				w.Header().Set("Content-Type", "application/json")
-			}
-			w.WriteHeader(http.StatusNoContent)
-			w.Header().Set("Content-Type", "application/json")
-		case "/query":
-			w.WriteHeader(http.StatusOK)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}]}`)
-		}
-	}))
-	defer ts.Close()
-
-	i := newInflux()
-	i.URLs = []string{ts.URL}
-	i.Database = "test"
-	i.UserAgent = "telegraf"
-
-	err := i.Connect()
-	require.NoError(t, err)
-	err = i.Write(testutil.MockMetrics())
-	require.NoError(t, err)
-	require.NoError(t, i.Close())
-}
-
-func TestUDPConnectError(t *testing.T) {
-	i := InfluxDB{
-		URLs: []string{"udp://foobar:8089"},
-	}
-
-	err := i.Connect()
-	require.Error(t, err)
-
-	i = InfluxDB{
-		URLs: []string{"udp://localhost:9999999"},
-	}
-
-	err = i.Connect()
-	require.Error(t, err)
-}
-
-func TestHTTPConnectError_InvalidURL(t *testing.T) {
-	i := InfluxDB{
-		URLs: []string{"http://foobar:8089"},
-	}
-
-	err := i.Connect()
-	require.Error(t, err)
-
-	i = InfluxDB{
-		URLs: []string{"http://localhost:9999999"},
-	}
-
-	err = i.Connect()
-	require.Error(t, err)
-}
-
-func TestHTTPConnectError_DatabaseCreateFail(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/query":
-			w.WriteHeader(http.StatusNotFound)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}],"error":"test error"}`)
-		}
-	}))
-	defer ts.Close()
-
-	i := InfluxDB{
-		URLs:     []string{ts.URL},
-		Database: "test",
-	}
-
-	// database creation errors do not return an error from Connect
-	// they are only logged.
-	err := i.Connect()
-	require.NoError(t, err)
-	require.NoError(t, i.Close())
-}
-
-func TestHTTPError_DatabaseNotFound(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/write":
-			w.WriteHeader(http.StatusNotFound)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}],"error":"database not found"}`)
-		case "/query":
-			w.WriteHeader(http.StatusNotFound)
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprintln(w, `{"results":[{}],"error":"database not found"}`)
-		}
-	}))
-	defer ts.Close()
-
-	i := InfluxDB{
-		URLs:     []string{ts.URL},
-		Database: "test",
-	}
-
-	err := i.Connect()
-	require.NoError(t, err)
-	err = i.Write(testutil.MockMetrics())
-	require.Error(t, err)
-	require.NoError(t, i.Close())
-}
-
-func TestHTTPError_WriteErrors(t *testing.T) {
-	var testCases = []struct {
-		name        string
-		status      int
-		contentType string
-		body        string
-		err         error
-	}{
-		{
-			// HTTP/1.1 400 Bad Request
-			// Content-Type: application/json
-			// X-Influxdb-Version: 1.3.3
-			//
-			// {
-			//     "error": "partial write: points beyond retention policy dropped=1"
-			// }
-			name:        "beyond retention policy is not an error",
-			status:      http.StatusBadRequest,
-			contentType: "application/json",
-			body:        `{"error":"partial write: points beyond retention policy dropped=1"}`,
-			err:         nil,
-		},
-		{
-			// HTTP/1.1 400 Bad Request
-			// Content-Type: application/json
-			// X-Influxdb-Version: 1.3.3
-			//
-			// {
-			//     "error": "unable to parse 'foo bar=': missing field value"
-			// }
-			name:        "unable to parse is not an error",
-			status:      http.StatusBadRequest,
-			contentType: "application/json",
-			body:        `{"error":"unable to parse 'foo bar=': missing field value"}`,
-			err:         nil,
-		},
-		{
-			// HTTP/1.1 400 Bad Request
-			// Content-Type: application/json
-			// X-Influxdb-Version: 1.3.3
-			//
-			// {
-			//     "error": "partial write: field type conflict: input field \"bar\" on measurement \"foo\" is type float, already exists as type integer dropped=1"
-			// }
-			name:        "field type conflict is not an error",
-			status:      http.StatusBadRequest,
-			contentType: "application/json",
-			body:        `{"error": "partial write: field type conflict: input field \"bar\" on measurement \"foo\" is type float, already exists as type integer dropped=1"}`,
-			err:         nil,
-		},
-		{
-			// HTTP/1.1 500 Internal Server Error
-			// Content-Type: application/json
-			// X-Influxdb-Version: 1.3.3-c1.3.3
-			//
-			// {
-			//     "error": "write failed: hinted handoff queue not empty"
-			// }
-			name:        "hinted handoff queue not empty is not an error",
-			status:      http.StatusInternalServerError,
-			contentType: "application/json",
-			body:        `{"error":"write failed: hinted handoff queue not empty"}`,
-			err:         nil,
-		},
-		{
-			// HTTP/1.1 500 Internal Server Error
-			// Content-Type: application/json
-			// X-Influxdb-Version: 1.3.3-c1.3.3
-			//
-			// {
-			//     "error": "partial write"
-			// }
-			name:        "plain partial write is an error",
-			status:      http.StatusInternalServerError,
-			contentType: "application/json",
-			body:        `{"error":"partial write"}`,
-			err:         fmt.Errorf("Could not write to any InfluxDB server in cluster"),
-		},
-	}
-
-	for _, tt := range testCases {
-		t.Run(tt.name, func(t *testing.T) {
-			ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-				rw.WriteHeader(tt.status)
-				rw.Header().Set("Content-Type", tt.contentType)
-				fmt.Fprintln(rw, tt.body)
-			}))
-			defer ts.Close()
-
-			influx := InfluxDB{
-				URLs:     []string{ts.URL},
-				Database: "test",
-			}
-
-			err := influx.Connect()
-			require.NoError(t, err)
-			err = influx.Write(testutil.MockMetrics())
-			require.Equal(t, tt.err, err)
-			require.NoError(t, influx.Close())
-		})
-	}
-}
-
 type MockClient struct {
-	writeStreamCalled int
-	contentLength     int
+	URLF            func() string
+	DatabaseF       func() string
+	WriteF          func(context.Context, []telegraf.Metric) error
+	CreateDatabaseF func(ctx context.Context) error
 }
 
-func (m *MockClient) Query(command string) error {
-	panic("not implemented")
+func (c *MockClient) URL() string {
+	return c.URLF()
 }
 
-func (m *MockClient) Write(b []byte) (int, error) {
-	panic("not implemented")
+func (c *MockClient) Database() string {
+	return c.DatabaseF()
 }
 
-func (m *MockClient) WriteWithParams(b []byte, params client.WriteParams) (int, error) {
-	panic("not implemented")
+func (c *MockClient) Write(ctx context.Context, metrics []telegraf.Metric) error {
+	return c.WriteF(ctx, metrics)
 }
 
-func (m *MockClient) WriteStream(b io.Reader, contentLength int) (int, error) {
-	m.writeStreamCalled++
-	m.contentLength = contentLength
-	return 0, nil
+func (c *MockClient) CreateDatabase(ctx context.Context) error {
+	return c.CreateDatabaseF(ctx)
 }
 
-func (m *MockClient) WriteStreamWithParams(b io.Reader, contentLength int, params client.WriteParams) (int, error) {
-	panic("not implemented")
+func TestDeprecatedURLSupport(t *testing.T) {
+	var actual *influxdb.UDPConfig
+	output := influxdb.InfluxDB{
+		URL: "udp://localhost:8086",
+
+		CreateUDPClientF: func(config *influxdb.UDPConfig) (influxdb.Client, error) {
+			actual = config
+			return &MockClient{}, nil
+		},
+	}
+	err := output.Connect()
+	require.NoError(t, err)
+	require.Equal(t, "udp://localhost:8086", actual.URL.String())
 }
 
-func (m *MockClient) Close() error {
-	panic("not implemented")
+func TestDefaultURL(t *testing.T) {
+	var actual *influxdb.HTTPConfig
+	output := influxdb.InfluxDB{
+		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
+			actual = config
+			return &MockClient{
+				CreateDatabaseF: func(ctx context.Context) error {
+					return nil
+				},
+			}, nil
+		},
+	}
+	err := output.Connect()
+	require.NoError(t, err)
+	require.Equal(t, "http://localhost:8086", actual.URL.String())
+}
+
+func TestConnectUDPConfig(t *testing.T) {
+	var actual *influxdb.UDPConfig
+
+	output := influxdb.InfluxDB{
+		URLs:       []string{"udp://localhost:8086"},
+		UDPPayload: 42,
+
+		CreateUDPClientF: func(config *influxdb.UDPConfig) (influxdb.Client, error) {
+			actual = config
+			return &MockClient{}, nil
+		},
+	}
+	err := output.Connect()
+	require.NoError(t, err)
+
+	require.Equal(t, "udp://localhost:8086", actual.URL.String())
+	require.Equal(t, 42, actual.MaxPayloadSize)
+	require.NotNil(t, actual.Serializer)
+}
+
+func TestConnectHTTPConfig(t *testing.T) {
+	var actual *influxdb.HTTPConfig
+
+	output := influxdb.InfluxDB{
+		URLs:             []string{"http://localhost:8089"},
+		Database:         "telegraf",
+		RetentionPolicy:  "default",
+		WriteConsistency: "any",
+		Timeout:          internal.Duration{Duration: 5 * time.Second},
+		Username:         "guy",
+		Password:         "smiley",
+		UserAgent:        "telegraf",
+		HTTPProxy:        "http://localhost:8089",
+		HTTPHeaders: map[string]string{
+			"x": "y",
+		},
+		ContentEncoding:    "gzip",
+		InsecureSkipVerify: true,
+
+		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
+			actual = config
+			return &MockClient{
+				CreateDatabaseF: func(ctx context.Context) error {
+					return nil
+				},
+			}, nil
+		},
+	}
+	err := output.Connect()
+	require.NoError(t, err)
+
+	require.Equal(t, output.URLs[0], actual.URL.String())
+	require.Equal(t, output.UserAgent, actual.UserAgent)
+	require.Equal(t, output.Timeout.Duration, actual.Timeout)
+	require.Equal(t, output.Username, actual.Username)
+	require.Equal(t, output.Password, actual.Password)
+	require.Equal(t, output.HTTPProxy, actual.Proxy.String())
+	require.Equal(t, output.HTTPHeaders, actual.Headers)
+	require.Equal(t, output.ContentEncoding, actual.ContentEncoding)
+	require.Equal(t, output.Database, actual.Database)
+	require.Equal(t, output.RetentionPolicy, actual.RetentionPolicy)
+	require.Equal(t, output.WriteConsistency, actual.Consistency)
+	require.NotNil(t, actual.TLSConfig)
+	require.NotNil(t, actual.Serializer)
+
+	require.Equal(t, output.Database, actual.Database)
 }
diff --git a/plugins/outputs/influxdb/udp.go b/plugins/outputs/influxdb/udp.go
new file mode 100644
index 000000000..5b3f5ce51
--- /dev/null
+++ b/plugins/outputs/influxdb/udp.go
@@ -0,0 +1,116 @@
+package influxdb
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/url"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/serializers"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
+)
+
+const (
+	// DefaultMaxPayloadSize is the maximum length of the UDP data payload
+	DefaultMaxPayloadSize = 512
+)
+
+type Dialer interface {
+	DialContext(ctx context.Context, network, address string) (Conn, error)
+}
+
+type Conn interface {
+	Write(b []byte) (int, error)
+	Close() error
+}
+
+type UDPConfig struct {
+	MaxPayloadSize int
+	URL            *url.URL
+	Serializer     serializers.Serializer
+	Dialer         Dialer
+}
+
+func NewUDPClient(config *UDPConfig) (*udpClient, error) {
+	if config.URL == nil {
+		return nil, ErrMissingURL
+	}
+
+	size := config.MaxPayloadSize
+	if size == 0 {
+		size = DefaultMaxPayloadSize
+	}
+
+	serializer := config.Serializer
+	if serializer == nil {
+		s := influx.NewSerializer()
+		s.SetMaxLineBytes(config.MaxPayloadSize)
+		serializer = s
+	}
+
+	dialer := config.Dialer
+	if dialer == nil {
+		dialer = &netDialer{net.Dialer{}}
+	}
+
+	client := &udpClient{
+		url:        config.URL,
+		serializer: serializer,
+		dialer:     dialer,
+	}
+	return client, nil
+}
+
+type udpClient struct {
+	conn       Conn
+	dialer     Dialer
+	serializer serializers.Serializer
+	url        *url.URL
+}
+
+func (c *udpClient) URL() string {
+	return c.url.String()
+}
+
+func (c *udpClient) Database() string {
+	return ""
+}
+
+func (c *udpClient) Write(ctx context.Context, metrics []telegraf.Metric) error {
+	if c.conn == nil {
+		conn, err := c.dialer.DialContext(ctx, c.url.Scheme, c.url.Host)
+		if err != nil {
+			return fmt.Errorf("error dialing address [%s]: %s", c.url, err)
+		}
+		c.conn = conn
+	}
+
+	for _, metric := range metrics {
+		octets, err := c.serializer.Serialize(metric)
+		if err != nil {
+			return fmt.Errorf("could not serialize metric: %v", err)
+		}
+
+		_, err = c.conn.Write(octets)
+		if err != nil {
+			c.conn.Close()
+			c.conn = nil
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (c *udpClient) CreateDatabase(ctx context.Context) error {
+	return nil
+}
+
+type netDialer struct {
+	net.Dialer
+}
+
+func (d *netDialer) DialContext(ctx context.Context, network, address string) (Conn, error) {
+	return d.Dialer.DialContext(ctx, network, address)
+}
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
new file mode 100644
index 000000000..552e1c0d6
--- /dev/null
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -0,0 +1,241 @@
+package influxdb_test
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"net"
+	"net/url"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/outputs/influxdb"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	metricString = "cpu value=42 0\n"
+)
+
+func getMetric() telegraf.Metric {
+	metric, err := metric.New(
+		"cpu",
+		map[string]string{},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		time.Unix(0, 0),
+	)
+	if err != nil {
+		panic(err)
+	}
+	return metric
+}
+
+func getURL() *url.URL {
+	u, err := url.Parse("udp://localhost:0")
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+type MockConn struct {
+	WriteF func(b []byte) (n int, err error)
+	CloseF func() error
+}
+
+func (c *MockConn) Write(b []byte) (n int, err error) {
+	return c.WriteF(b)
+}
+
+func (c *MockConn) Close() error {
+	return c.CloseF()
+}
+
+type MockDialer struct {
+	DialContextF func(network, address string) (influxdb.Conn, error)
+}
+
+func (d *MockDialer) DialContext(ctx context.Context, network string, address string) (influxdb.Conn, error) {
+	return d.DialContextF(network, address)
+}
+
+type MockSerializer struct {
+	SerializeF func(metric telegraf.Metric) ([]byte, error)
+}
+
+func (s *MockSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
+	return s.SerializeF(metric)
+}
+
+func TestUDP_NewUDPClientNoURL(t *testing.T) {
+	config := &influxdb.UDPConfig{}
+	_, err := influxdb.NewUDPClient(config)
+	require.Equal(t, err, influxdb.ErrMissingURL)
+}
+
+func TestUDP_URL(t *testing.T) {
+	u := getURL()
+	config := &influxdb.UDPConfig{
+		URL: u,
+	}
+
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	require.Equal(t, u.String(), client.URL())
+}
+
+func TestUDP_Simple(t *testing.T) {
+	var buffer bytes.Buffer
+
+	config := &influxdb.UDPConfig{
+		URL: getURL(),
+		Dialer: &MockDialer{
+			DialContextF: func(network, address string) (influxdb.Conn, error) {
+				conn := &MockConn{
+					WriteF: func(b []byte) (n int, err error) {
+						buffer.Write(b)
+						return 0, nil
+					},
+				}
+				return conn, nil
+			},
+		},
+	}
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	err = client.Write(ctx, []telegraf.Metric{
+		getMetric(),
+		getMetric(),
+	})
+	require.NoError(t, err)
+
+	require.Equal(t, metricString+metricString, buffer.String())
+}
+
+func TestUDP_DialError(t *testing.T) {
+	u, err := url.Parse("invalid://127.0.0.1:9999")
+	require.NoError(t, err)
+
+	config := &influxdb.UDPConfig{
+		URL: u,
+		Dialer: &MockDialer{
+			DialContextF: func(network, address string) (influxdb.Conn, error) {
+				return nil, fmt.Errorf(
+					`unsupported scheme [invalid://localhost:9999]: "invalid"`)
+			},
+		},
+	}
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	err = client.Write(ctx, []telegraf.Metric{getMetric()})
+	require.Error(t, err)
+}
+
+func TestUDP_WriteError(t *testing.T) {
+	closed := false
+
+	config := &influxdb.UDPConfig{
+		URL: getURL(),
+		Dialer: &MockDialer{
+			DialContextF: func(network, address string) (influxdb.Conn, error) {
+				conn := &MockConn{
+					WriteF: func(b []byte) (n int, err error) {
+						return 0, fmt.Errorf(
+							"write udp 127.0.0.1:52190->127.0.0.1:9999: write: connection refused")
+					},
+					CloseF: func() error {
+						closed = true
+						return nil
+					},
+				}
+				return conn, nil
+			},
+		},
+	}
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	err = client.Write(ctx, []telegraf.Metric{getMetric()})
+	require.Error(t, err)
+	require.True(t, closed)
+}
+
+func TestUDP_SerializeError(t *testing.T) {
+	config := &influxdb.UDPConfig{
+		URL: getURL(),
+		Dialer: &MockDialer{
+			DialContextF: func(network, address string) (influxdb.Conn, error) {
+				conn := &MockConn{}
+				return conn, nil
+			},
+		},
+		Serializer: &MockSerializer{
+			SerializeF: func(metric telegraf.Metric) ([]byte, error) {
+				return nil, influx.ErrNeedMoreSpace
+			},
+		},
+	}
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	err = client.Write(ctx, []telegraf.Metric{getMetric()})
+	require.Error(t, err)
+	require.Contains(t, err.Error(), influx.ErrNeedMoreSpace.Error())
+}
+
+func TestUDP_WriteWithRealConn(t *testing.T) {
+	conn, err := net.ListenPacket("udp", ":0")
+	require.NoError(t, err)
+
+	metrics := []telegraf.Metric{
+		getMetric(),
+		getMetric(),
+	}
+
+	buf := make([]byte, 200)
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		var total int
+		for _, _ = range metrics {
+			n, _, err := conn.ReadFrom(buf[total:])
+			if err != nil {
+				break
+			}
+			total += n
+		}
+		buf = buf[:total]
+	}()
+
+	addr := conn.LocalAddr()
+	u, err := url.Parse(fmt.Sprintf("%s://%s", addr.Network(), addr))
+	require.NoError(t, err)
+
+	config := &influxdb.UDPConfig{
+		URL: u,
+	}
+	client, err := influxdb.NewUDPClient(config)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	err = client.Write(ctx, metrics)
+	require.NoError(t, err)
+
+	wg.Wait()
+
+	require.Equal(t, metricString+metricString, string(buf))
+}
diff --git a/plugins/outputs/instrumental/instrumental.go b/plugins/outputs/instrumental/instrumental.go
index e10fcbb06..7c52d312b 100644
--- a/plugins/outputs/instrumental/instrumental.go
+++ b/plugins/outputs/instrumental/instrumental.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 	"github.com/influxdata/telegraf/plugins/serializers/graphite"
@@ -93,8 +92,6 @@ func (i *Instrumental) Write(metrics []telegraf.Metric) error {
 
 	var points []string
 	var metricType string
-	var toSerialize telegraf.Metric
-	var newTags map[string]string
 
 	for _, m := range metrics {
 		// Pull the metric_type out of the metric's tags. We don't want the type
@@ -108,18 +105,10 @@ func (i *Instrumental) Write(metrics []telegraf.Metric) error {
 		//
 		//  increment some_prefix.host.tag1.tag2.tag3.counter.field value timestamp
 		//
-		newTags = m.Tags()
-		metricType = newTags["metric_type"]
-		delete(newTags, "metric_type")
+		metricType = m.Tags()["metric_type"]
+		m.RemoveTag("metric_type")
 
-		toSerialize, _ = metric.New(
-			m.Name(),
-			newTags,
-			m.Fields(),
-			m.Time(),
-		)
-
-		buf, err := s.Serialize(toSerialize)
+		buf, err := s.Serialize(m)
 		if err != nil {
 			log.Printf("E! Error serializing a metric to Instrumental: %s", err)
 		}
diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go
index abd3b055f..244e8bd59 100644
--- a/plugins/outputs/librato/librato.go
+++ b/plugins/outputs/librato/librato.go
@@ -187,9 +187,7 @@ func (l *Librato) buildGauges(m telegraf.Metric) ([]*Gauge, error) {
 
 	gauges := []*Gauge{}
 	if m.Time().Unix() == 0 {
-		return gauges, fmt.Errorf(
-			"Measure time must not be zero\n <%s> \n",
-			m.String())
+		return gauges, fmt.Errorf("time was zero %s", m.Name())
 	}
 	metricSource := graphite.InsertField(
 		graphite.SerializeBucketName("", m.Tags(), l.Template, ""),
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 3e2a36e9e..eea7b6088 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -138,8 +138,7 @@ func (m *MQTT) Write(metrics []telegraf.Metric) error {
 
 		buf, err := m.serializer.Serialize(metric)
 		if err != nil {
-			return fmt.Errorf("MQTT Could not serialize metric: %s",
-				metric.String())
+			return err
 		}
 
 		err = m.publish(topic, buf)
diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go
index 51d20117b..c38ad353b 100644
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -125,7 +125,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 	}
 
 	for _, m := range metrics {
-		now := m.UnixNano() / 1000000000
+		now := m.Time().UnixNano() / 1000000000
 		tags := cleanTags(m.Tags())
 
 		for fieldName, value := range m.Fields() {
@@ -170,7 +170,7 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 	defer connection.Close()
 
 	for _, m := range metrics {
-		now := m.UnixNano() / 1000000000
+		now := m.Time().UnixNano() / 1000000000
 		tags := ToLineFormat(cleanTags(m.Tags()))
 
 		for fieldName, value := range m.Fields() {
diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 563e58bbd..1e015c9f0 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -9,9 +9,10 @@ import (
 	"strconv"
 	"strings"
 
+	"time"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/outputs"
-	"time"
 )
 
 type Wavefront struct {
@@ -159,7 +160,7 @@ func buildMetrics(m telegraf.Metric, w *Wavefront) []*MetricPoint {
 
 		metric := &MetricPoint{
 			Metric:    name,
-			Timestamp: m.UnixNano() / 1000000000,
+			Timestamp: m.Time().Unix(),
 		}
 
 		metricValue, buildError := buildValue(value, metric.Metric, w)
diff --git a/plugins/parsers/dropwizard/parser.go b/plugins/parsers/dropwizard/parser.go
index 4c07ca286..a6130acfd 100644
--- a/plugins/parsers/dropwizard/parser.go
+++ b/plugins/parsers/dropwizard/parser.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/templating"
-	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/tidwall/gjson"
 )
 
@@ -195,7 +195,7 @@ func (p *Parser) unmarshalMetrics(buf []byte) (map[string]interface{}, error) {
 	return jsonOut, nil
 }
 
-func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []telegraf.Metric, time time.Time) []telegraf.Metric {
+func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []telegraf.Metric, tm time.Time) []telegraf.Metric {
 
 	switch dwmsTyped := dwms.(type) {
 	case map[string]interface{}:
@@ -240,10 +240,15 @@ func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []te
 			metricsBuffer.WriteString(strings.Join(fields, ","))
 			metricsBuffer.WriteString("\n")
 		}
-		newMetrics, err := metric.ParseWithDefaultTime(metricsBuffer.Bytes(), time)
+
+		handler := influx.NewMetricHandler()
+		handler.SetTimeFunc(func() time.Time { return tm })
+		parser := influx.NewParser(handler)
+		newMetrics, err := parser.Parse(metricsBuffer.Bytes())
 		if err != nil {
 			log.Printf("W! failed to create metric of type '%s': %s\n", metricType, err)
 		}
+
 		return append(metrics, newMetrics...)
 	default:
 		return metrics
diff --git a/plugins/parsers/graphite/parser.go b/plugins/parsers/graphite/parser.go
index 42d617c7d..fc32bd83d 100644
--- a/plugins/parsers/graphite/parser.go
+++ b/plugins/parsers/graphite/parser.go
@@ -89,7 +89,6 @@ func (p *GraphiteParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 		if line == "" {
 			continue
 		}
-
 		metric, err := p.ParseLine(line)
 		if err == nil {
 			metrics = append(metrics, metric)
diff --git a/plugins/parsers/graphite/parser_test.go b/plugins/parsers/graphite/parser_test.go
index c1c25f986..9a6b462f7 100644
--- a/plugins/parsers/graphite/parser_test.go
+++ b/plugins/parsers/graphite/parser_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func BenchmarkParse(b *testing.B) {
@@ -379,7 +380,7 @@ func TestFilterMatchDefault(t *testing.T) {
 	m, err := p.ParseLine("miss.servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchMultipleMeasurement(t *testing.T) {
@@ -397,7 +398,7 @@ func TestFilterMatchMultipleMeasurement(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu.cpu_load.10 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchMultipleMeasurementSeparator(t *testing.T) {
@@ -416,7 +417,7 @@ func TestFilterMatchMultipleMeasurementSeparator(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu.cpu_load.10 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchSingle(t *testing.T) {
@@ -433,7 +434,7 @@ func TestFilterMatchSingle(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestParseNoMatch(t *testing.T) {
@@ -451,7 +452,7 @@ func TestParseNoMatch(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.memory.VmallocChunk 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchWildcard(t *testing.T) {
@@ -469,7 +470,7 @@ func TestFilterMatchWildcard(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchExactBeforeWildcard(t *testing.T) {
@@ -489,7 +490,7 @@ func TestFilterMatchExactBeforeWildcard(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestFilterMatchMostLongestFilter(t *testing.T) {
@@ -508,8 +509,13 @@ func TestFilterMatchMostLongestFilter(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Contains(t, m.String(), ",host=localhost")
-	assert.Contains(t, m.String(), ",resource=cpu")
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
+
+	value, ok = m.GetTag("resource")
+	require.True(t, ok)
+	require.Equal(t, "cpu", value)
 }
 
 func TestFilterMatchMultipleWildcards(t *testing.T) {
@@ -533,7 +539,7 @@ func TestFilterMatchMultipleWildcards(t *testing.T) {
 	m, err := p.ParseLine("servers.server01.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Equal(t, exp.String(), m.String())
+	assert.Equal(t, exp, m)
 }
 
 func TestParseDefaultTags(t *testing.T) {
@@ -549,9 +555,17 @@ func TestParseDefaultTags(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Contains(t, m.String(), ",host=localhost")
-	assert.Contains(t, m.String(), ",region=us-east")
-	assert.Contains(t, m.String(), ",zone=1c")
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
+
+	value, ok = m.GetTag("region")
+	require.True(t, ok)
+	require.Equal(t, "us-east", value)
+
+	value, ok = m.GetTag("zone")
+	require.True(t, ok)
+	require.Equal(t, "1c", value)
 }
 
 func TestParseDefaultTemplateTags(t *testing.T) {
@@ -566,9 +580,17 @@ func TestParseDefaultTemplateTags(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Contains(t, m.String(), ",host=localhost")
-	assert.Contains(t, m.String(), ",region=us-east")
-	assert.Contains(t, m.String(), ",zone=1c")
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
+
+	value, ok = m.GetTag("region")
+	require.True(t, ok)
+	require.Equal(t, "us-east", value)
+
+	value, ok = m.GetTag("zone")
+	require.True(t, ok)
+	require.Equal(t, "1c", value)
 }
 
 func TestParseDefaultTemplateTagsOverridGlobal(t *testing.T) {
@@ -581,11 +603,20 @@ func TestParseDefaultTemplateTagsOverridGlobal(t *testing.T) {
 	}
 
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
+	_ = m
 	assert.NoError(t, err)
 
-	assert.Contains(t, m.String(), ",host=localhost")
-	assert.Contains(t, m.String(), ",region=us-east")
-	assert.Contains(t, m.String(), ",zone=1c")
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
+
+	value, ok = m.GetTag("region")
+	require.True(t, ok)
+	require.Equal(t, "us-east", value)
+
+	value, ok = m.GetTag("zone")
+	require.True(t, ok)
+	require.Equal(t, "1c", value)
 }
 
 func TestParseTemplateWhitespace(t *testing.T) {
@@ -602,9 +633,17 @@ func TestParseTemplateWhitespace(t *testing.T) {
 	m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
 	assert.NoError(t, err)
 
-	assert.Contains(t, m.String(), ",host=localhost")
-	assert.Contains(t, m.String(), ",region=us-east")
-	assert.Contains(t, m.String(), ",zone=1c")
+	value, ok := m.GetTag("host")
+	require.True(t, ok)
+	require.Equal(t, "localhost", value)
+
+	value, ok = m.GetTag("region")
+	require.True(t, ok)
+	require.Equal(t, "us-east", value)
+
+	value, ok = m.GetTag("zone")
+	require.True(t, ok)
+	require.Equal(t, "1c", value)
 }
 
 // Test basic functionality of ApplyTemplate
diff --git a/plugins/parsers/influx/500.metrics b/plugins/parsers/influx/500.metrics
deleted file mode 100644
index 1a77886fa..000000000
--- a/plugins/parsers/influx/500.metrics
+++ /dev/null
@@ -1,500 +0,0 @@
-ctr,host=tars,some=tag-0 n=3i 1476437629342569532
-ctr,host=tars,some=tag-1 n=3i 1476437629342569532
-ctr,host=tars,some=tag-2 n=3i 1476437629342569532
-ctr,host=tars,some=tag-3 n=3i 1476437629342569532
-ctr,host=tars,some=tag-4 n=3i 1476437629342569532
-ctr,host=tars,some=tag-5 n=3i 1476437629342569532
-ctr,host=tars,some=tag-6 n=3i 1476437629342569532
-ctr,host=tars,some=tag-7 n=3i 1476437629342569532
-ctr,host=tars,some=tag-8 n=3i 1476437629342569532
-ctr,host=tars,some=tag-9 n=3i 1476437629342569532
-ctr,host=tars,some=tag-10 n=3i 1476437629342569532
-ctr,host=tars,some=tag-11 n=3i 1476437629342569532
-ctr,host=tars,some=tag-12 n=3i 1476437629342569532
-ctr,host=tars,some=tag-13 n=3i 1476437629342569532
-ctr,host=tars,some=tag-14 n=3i 1476437629342569532
-ctr,host=tars,some=tag-15 n=3i 1476437629342569532
-ctr,host=tars,some=tag-16 n=3i 1476437629342569532
-ctr,host=tars,some=tag-17 n=3i 1476437629342569532
-ctr,host=tars,some=tag-18 n=3i 1476437629342569532
-ctr,host=tars,some=tag-19 n=3i 1476437629342569532
-ctr,host=tars,some=tag-20 n=3i 1476437629342569532
-ctr,host=tars,some=tag-21 n=3i 1476437629342569532
-ctr,host=tars,some=tag-22 n=3i 1476437629342569532
-ctr,host=tars,some=tag-23 n=3i 1476437629342569532
-ctr,host=tars,some=tag-24 n=3i 1476437629342569532
-ctr,host=tars,some=tag-25 n=3i 1476437629342569532
-ctr,host=tars,some=tag-26 n=3i 1476437629342569532
-ctr,host=tars,some=tag-27 n=3i 1476437629342569532
-ctr,host=tars,some=tag-28 n=3i 1476437629342569532
-ctr,host=tars,some=tag-29 n=3i 1476437629342569532
-ctr,host=tars,some=tag-30 n=3i 1476437629342569532
-ctr,host=tars,some=tag-31 n=2i 1476437629342569532
-ctr,host=tars,some=tag-32 n=2i 1476437629342569532
-ctr,host=tars,some=tag-33 n=2i 1476437629342569532
-ctr,host=tars,some=tag-34 n=2i 1476437629342569532
-ctr,host=tars,some=tag-35 n=2i 1476437629342569532
-ctr,host=tars,some=tag-36 n=2i 1476437629342569532
-ctr,host=tars,some=tag-37 n=2i 1476437629342569532
-ctr,host=tars,some=tag-38 n=2i 1476437629342569532
-ctr,host=tars,some=tag-39 n=2i 1476437629342569532
-ctr,host=tars,some=tag-40 n=2i 1476437629342569532
-ctr,host=tars,some=tag-41 n=2i 1476437629342569532
-ctr,host=tars,some=tag-42 n=2i 1476437629342569532
-ctr,host=tars,some=tag-43 n=2i 1476437629342569532
-ctr,host=tars,some=tag-44 n=2i 1476437629342569532
-ctr,host=tars,some=tag-45 n=2i 1476437629342569532
-ctr,host=tars,some=tag-46 n=2i 1476437629342569532
-ctr,host=tars,some=tag-47 n=2i 1476437629342569532
-ctr,host=tars,some=tag-48 n=2i 1476437629342569532
-ctr,host=tars,some=tag-49 n=2i 1476437629342569532
-ctr,host=tars,some=tag-50 n=2i 1476437629342569532
-ctr,host=tars,some=tag-51 n=2i 1476437629342569532
-ctr,host=tars,some=tag-52 n=2i 1476437629342569532
-ctr,host=tars,some=tag-53 n=2i 1476437629342569532
-ctr,host=tars,some=tag-54 n=2i 1476437629342569532
-ctr,host=tars,some=tag-55 n=2i 1476437629342569532
-ctr,host=tars,some=tag-56 n=2i 1476437629342569532
-ctr,host=tars,some=tag-57 n=2i 1476437629342569532
-ctr,host=tars,some=tag-58 n=2i 1476437629342569532
-ctr,host=tars,some=tag-59 n=2i 1476437629342569532
-ctr,host=tars,some=tag-60 n=2i 1476437629342569532
-ctr,host=tars,some=tag-61 n=2i 1476437629342569532
-ctr,host=tars,some=tag-62 n=2i 1476437629342569532
-ctr,host=tars,some=tag-63 n=2i 1476437629342569532
-ctr,host=tars,some=tag-64 n=2i 1476437629342569532
-ctr,host=tars,some=tag-65 n=2i 1476437629342569532
-ctr,host=tars,some=tag-66 n=2i 1476437629342569532
-ctr,host=tars,some=tag-67 n=2i 1476437629342569532
-ctr,host=tars,some=tag-68 n=2i 1476437629342569532
-ctr,host=tars,some=tag-69 n=2i 1476437629342569532
-ctr,host=tars,some=tag-70 n=2i 1476437629342569532
-ctr,host=tars,some=tag-71 n=2i 1476437629342569532
-ctr,host=tars,some=tag-72 n=2i 1476437629342569532
-ctr,host=tars,some=tag-73 n=2i 1476437629342569532
-ctr,host=tars,some=tag-74 n=2i 1476437629342569532
-ctr,host=tars,some=tag-75 n=2i 1476437629342569532
-ctr,host=tars,some=tag-76 n=2i 1476437629342569532
-ctr,host=tars,some=tag-77 n=2i 1476437629342569532
-ctr,host=tars,some=tag-78 n=2i 1476437629342569532
-ctr,host=tars,some=tag-79 n=2i 1476437629342569532
-ctr,host=tars,some=tag-80 n=2i 1476437629342569532
-ctr,host=tars,some=tag-81 n=2i 1476437629342569532
-ctr,host=tars,some=tag-82 n=2i 1476437629342569532
-ctr,host=tars,some=tag-83 n=2i 1476437629342569532
-ctr,host=tars,some=tag-84 n=2i 1476437629342569532
-ctr,host=tars,some=tag-85 n=2i 1476437629342569532
-ctr,host=tars,some=tag-86 n=2i 1476437629342569532
-ctr,host=tars,some=tag-87 n=2i 1476437629342569532
-ctr,host=tars,some=tag-88 n=2i 1476437629342569532
-ctr,host=tars,some=tag-89 n=2i 1476437629342569532
-ctr,host=tars,some=tag-90 n=2i 1476437629342569532
-ctr,host=tars,some=tag-91 n=2i 1476437629342569532
-ctr,host=tars,some=tag-92 n=2i 1476437629342569532
-ctr,host=tars,some=tag-93 n=2i 1476437629342569532
-ctr,host=tars,some=tag-94 n=2i 1476437629342569532
-ctr,host=tars,some=tag-95 n=2i 1476437629342569532
-ctr,host=tars,some=tag-96 n=2i 1476437629342569532
-ctr,host=tars,some=tag-97 n=2i 1476437629342569532
-ctr,host=tars,some=tag-98 n=2i 1476437629342569532
-ctr,host=tars,some=tag-99 n=2i 1476437629342569532
-ctr,host=tars,some=tag-100 n=2i 1476437629342569532
-ctr,host=tars,some=tag-101 n=2i 1476437629342569532
-ctr,host=tars,some=tag-102 n=2i 1476437629342569532
-ctr,host=tars,some=tag-103 n=2i 1476437629342569532
-ctr,host=tars,some=tag-104 n=2i 1476437629342569532
-ctr,host=tars,some=tag-105 n=2i 1476437629342569532
-ctr,host=tars,some=tag-106 n=2i 1476437629342569532
-ctr,host=tars,some=tag-107 n=2i 1476437629342569532
-ctr,host=tars,some=tag-108 n=2i 1476437629342569532
-ctr,host=tars,some=tag-109 n=2i 1476437629342569532
-ctr,host=tars,some=tag-110 n=2i 1476437629342569532
-ctr,host=tars,some=tag-111 n=2i 1476437629342569532
-ctr,host=tars,some=tag-112 n=2i 1476437629342569532
-ctr,host=tars,some=tag-113 n=2i 1476437629342569532
-ctr,host=tars,some=tag-114 n=2i 1476437629342569532
-ctr,host=tars,some=tag-115 n=2i 1476437629342569532
-ctr,host=tars,some=tag-116 n=2i 1476437629342569532
-ctr,host=tars,some=tag-117 n=2i 1476437629342569532
-ctr,host=tars,some=tag-118 n=2i 1476437629342569532
-ctr,host=tars,some=tag-119 n=2i 1476437629342569532
-ctr,host=tars,some=tag-120 n=2i 1476437629342569532
-ctr,host=tars,some=tag-121 n=2i 1476437629342569532
-ctr,host=tars,some=tag-122 n=2i 1476437629342569532
-ctr,host=tars,some=tag-123 n=2i 1476437629342569532
-ctr,host=tars,some=tag-124 n=2i 1476437629342569532
-ctr,host=tars,some=tag-125 n=2i 1476437629342569532
-ctr,host=tars,some=tag-126 n=2i 1476437629342569532
-ctr,host=tars,some=tag-127 n=2i 1476437629342569532
-ctr,host=tars,some=tag-128 n=2i 1476437629342569532
-ctr,host=tars,some=tag-129 n=2i 1476437629342569532
-ctr,host=tars,some=tag-130 n=2i 1476437629342569532
-ctr,host=tars,some=tag-131 n=2i 1476437629342569532
-ctr,host=tars,some=tag-132 n=2i 1476437629342569532
-ctr,host=tars,some=tag-133 n=2i 1476437629342569532
-ctr,host=tars,some=tag-134 n=2i 1476437629342569532
-ctr,host=tars,some=tag-135 n=2i 1476437629342569532
-ctr,host=tars,some=tag-136 n=2i 1476437629342569532
-ctr,host=tars,some=tag-137 n=2i 1476437629342569532
-ctr,host=tars,some=tag-138 n=2i 1476437629342569532
-ctr,host=tars,some=tag-139 n=2i 1476437629342569532
-ctr,host=tars,some=tag-140 n=2i 1476437629342569532
-ctr,host=tars,some=tag-141 n=2i 1476437629342569532
-ctr,host=tars,some=tag-142 n=2i 1476437629342569532
-ctr,host=tars,some=tag-143 n=2i 1476437629342569532
-ctr,host=tars,some=tag-144 n=2i 1476437629342569532
-ctr,host=tars,some=tag-145 n=2i 1476437629342569532
-ctr,host=tars,some=tag-146 n=2i 1476437629342569532
-ctr,host=tars,some=tag-147 n=2i 1476437629342569532
-ctr,host=tars,some=tag-148 n=2i 1476437629342569532
-ctr,host=tars,some=tag-149 n=2i 1476437629342569532
-ctr,host=tars,some=tag-150 n=2i 1476437629342569532
-ctr,host=tars,some=tag-151 n=2i 1476437629342569532
-ctr,host=tars,some=tag-152 n=2i 1476437629342569532
-ctr,host=tars,some=tag-153 n=2i 1476437629342569532
-ctr,host=tars,some=tag-154 n=2i 1476437629342569532
-ctr,host=tars,some=tag-155 n=2i 1476437629342569532
-ctr,host=tars,some=tag-156 n=2i 1476437629342569532
-ctr,host=tars,some=tag-157 n=2i 1476437629342569532
-ctr,host=tars,some=tag-158 n=2i 1476437629342569532
-ctr,host=tars,some=tag-159 n=2i 1476437629342569532
-ctr,host=tars,some=tag-160 n=2i 1476437629342569532
-ctr,host=tars,some=tag-161 n=2i 1476437629342569532
-ctr,host=tars,some=tag-162 n=2i 1476437629342569532
-ctr,host=tars,some=tag-163 n=2i 1476437629342569532
-ctr,host=tars,some=tag-164 n=2i 1476437629342569532
-ctr,host=tars,some=tag-165 n=2i 1476437629342569532
-ctr,host=tars,some=tag-166 n=2i 1476437629342569532
-ctr,host=tars,some=tag-167 n=2i 1476437629342569532
-ctr,host=tars,some=tag-168 n=2i 1476437629342569532
-ctr,host=tars,some=tag-169 n=2i 1476437629342569532
-ctr,host=tars,some=tag-170 n=2i 1476437629342569532
-ctr,host=tars,some=tag-171 n=2i 1476437629342569532
-ctr,host=tars,some=tag-172 n=2i 1476437629342569532
-ctr,host=tars,some=tag-173 n=2i 1476437629342569532
-ctr,host=tars,some=tag-174 n=2i 1476437629342569532
-ctr,host=tars,some=tag-175 n=2i 1476437629342569532
-ctr,host=tars,some=tag-176 n=2i 1476437629342569532
-ctr,host=tars,some=tag-177 n=2i 1476437629342569532
-ctr,host=tars,some=tag-178 n=2i 1476437629342569532
-ctr,host=tars,some=tag-179 n=2i 1476437629342569532
-ctr,host=tars,some=tag-180 n=2i 1476437629342569532
-ctr,host=tars,some=tag-181 n=2i 1476437629342569532
-ctr,host=tars,some=tag-182 n=2i 1476437629342569532
-ctr,host=tars,some=tag-183 n=2i 1476437629342569532
-ctr,host=tars,some=tag-184 n=2i 1476437629342569532
-ctr,host=tars,some=tag-185 n=2i 1476437629342569532
-ctr,host=tars,some=tag-186 n=2i 1476437629342569532
-ctr,host=tars,some=tag-187 n=2i 1476437629342569532
-ctr,host=tars,some=tag-188 n=2i 1476437629342569532
-ctr,host=tars,some=tag-189 n=2i 1476437629342569532
-ctr,host=tars,some=tag-190 n=2i 1476437629342569532
-ctr,host=tars,some=tag-191 n=2i 1476437629342569532
-ctr,host=tars,some=tag-192 n=2i 1476437629342569532
-ctr,host=tars,some=tag-193 n=2i 1476437629342569532
-ctr,host=tars,some=tag-194 n=2i 1476437629342569532
-ctr,host=tars,some=tag-195 n=2i 1476437629342569532
-ctr,host=tars,some=tag-196 n=2i 1476437629342569532
-ctr,host=tars,some=tag-197 n=2i 1476437629342569532
-ctr,host=tars,some=tag-198 n=2i 1476437629342569532
-ctr,host=tars,some=tag-199 n=2i 1476437629342569532
-ctr,host=tars,some=tag-200 n=2i 1476437629342569532
-ctr,host=tars,some=tag-201 n=2i 1476437629342569532
-ctr,host=tars,some=tag-202 n=2i 1476437629342569532
-ctr,host=tars,some=tag-203 n=2i 1476437629342569532
-ctr,host=tars,some=tag-204 n=2i 1476437629342569532
-ctr,host=tars,some=tag-205 n=2i 1476437629342569532
-ctr,host=tars,some=tag-206 n=2i 1476437629342569532
-ctr,host=tars,some=tag-207 n=2i 1476437629342569532
-ctr,host=tars,some=tag-208 n=2i 1476437629342569532
-ctr,host=tars,some=tag-209 n=2i 1476437629342569532
-ctr,host=tars,some=tag-210 n=2i 1476437629342569532
-ctr,host=tars,some=tag-211 n=2i 1476437629342569532
-ctr,host=tars,some=tag-212 n=2i 1476437629342569532
-ctr,host=tars,some=tag-213 n=2i 1476437629342569532
-ctr,host=tars,some=tag-214 n=2i 1476437629342569532
-ctr,host=tars,some=tag-215 n=2i 1476437629342569532
-ctr,host=tars,some=tag-216 n=2i 1476437629342569532
-ctr,host=tars,some=tag-217 n=2i 1476437629342569532
-ctr,host=tars,some=tag-218 n=2i 1476437629342569532
-ctr,host=tars,some=tag-219 n=2i 1476437629342569532
-ctr,host=tars,some=tag-220 n=2i 1476437629342569532
-ctr,host=tars,some=tag-221 n=2i 1476437629342569532
-ctr,host=tars,some=tag-222 n=2i 1476437629342569532
-ctr,host=tars,some=tag-223 n=2i 1476437629342569532
-ctr,host=tars,some=tag-224 n=2i 1476437629342569532
-ctr,host=tars,some=tag-225 n=2i 1476437629342569532
-ctr,host=tars,some=tag-226 n=2i 1476437629342569532
-ctr,host=tars,some=tag-227 n=2i 1476437629342569532
-ctr,host=tars,some=tag-228 n=2i 1476437629342569532
-ctr,host=tars,some=tag-229 n=2i 1476437629342569532
-ctr,host=tars,some=tag-230 n=2i 1476437629342569532
-ctr,host=tars,some=tag-231 n=2i 1476437629342569532
-ctr,host=tars,some=tag-232 n=2i 1476437629342569532
-ctr,host=tars,some=tag-233 n=2i 1476437629342569532
-ctr,host=tars,some=tag-234 n=2i 1476437629342569532
-ctr,host=tars,some=tag-235 n=2i 1476437629342569532
-ctr,host=tars,some=tag-236 n=2i 1476437629342569532
-ctr,host=tars,some=tag-237 n=2i 1476437629342569532
-ctr,host=tars,some=tag-238 n=2i 1476437629342569532
-ctr,host=tars,some=tag-239 n=2i 1476437629342569532
-ctr,host=tars,some=tag-240 n=2i 1476437629342569532
-ctr,host=tars,some=tag-241 n=2i 1476437629342569532
-ctr,host=tars,some=tag-242 n=2i 1476437629342569532
-ctr,host=tars,some=tag-243 n=2i 1476437629342569532
-ctr,host=tars,some=tag-244 n=2i 1476437629342569532
-ctr,host=tars,some=tag-245 n=2i 1476437629342569532
-ctr,host=tars,some=tag-246 n=2i 1476437629342569532
-ctr,host=tars,some=tag-247 n=2i 1476437629342569532
-ctr,host=tars,some=tag-248 n=2i 1476437629342569532
-ctr,host=tars,some=tag-249 n=2i 1476437629342569532
-ctr,host=tars,some=tag-250 n=2i 1476437629342569532
-ctr,host=tars,some=tag-251 n=1i 1476437629342569532
-ctr,host=tars,some=tag-252 n=1i 1476437629342569532
-ctr,host=tars,some=tag-253 n=1i 1476437629342569532
-ctr,host=tars,some=tag-254 n=1i 1476437629342569532
-ctr,host=tars,some=tag-255 n=1i 1476437629342569532
-ctr,host=tars,some=tag-256 n=1i 1476437629342569532
-ctr,host=tars,some=tag-257 n=1i 1476437629342569532
-ctr,host=tars,some=tag-258 n=1i 1476437629342569532
-ctr,host=tars,some=tag-259 n=1i 1476437629342569532
-ctr,host=tars,some=tag-260 n=1i 1476437629342569532
-ctr,host=tars,some=tag-261 n=1i 1476437629342569532
-ctr,host=tars,some=tag-262 n=1i 1476437629342569532
-ctr,host=tars,some=tag-263 n=1i 1476437629342569532
-ctr,host=tars,some=tag-264 n=1i 1476437629342569532
-ctr,host=tars,some=tag-265 n=1i 1476437629342569532
-ctr,host=tars,some=tag-266 n=1i 1476437629342569532
-ctr,host=tars,some=tag-267 n=1i 1476437629342569532
-ctr,host=tars,some=tag-268 n=1i 1476437629342569532
-ctr,host=tars,some=tag-269 n=1i 1476437629342569532
-ctr,host=tars,some=tag-270 n=1i 1476437629342569532
-ctr,host=tars,some=tag-271 n=1i 1476437629342569532
-ctr,host=tars,some=tag-272 n=1i 1476437629342569532
-ctr,host=tars,some=tag-273 n=1i 1476437629342569532
-ctr,host=tars,some=tag-274 n=1i 1476437629342569532
-ctr,host=tars,some=tag-275 n=1i 1476437629342569532
-ctr,host=tars,some=tag-276 n=1i 1476437629342569532
-ctr,host=tars,some=tag-277 n=1i 1476437629342569532
-ctr,host=tars,some=tag-278 n=1i 1476437629342569532
-ctr,host=tars,some=tag-279 n=1i 1476437629342569532
-ctr,host=tars,some=tag-280 n=1i 1476437629342569532
-ctr,host=tars,some=tag-281 n=1i 1476437629342569532
-ctr,host=tars,some=tag-282 n=1i 1476437629342569532
-ctr,host=tars,some=tag-283 n=1i 1476437629342569532
-ctr,host=tars,some=tag-284 n=1i 1476437629342569532
-ctr,host=tars,some=tag-285 n=1i 1476437629342569532
-ctr,host=tars,some=tag-286 n=1i 1476437629342569532
-ctr,host=tars,some=tag-287 n=1i 1476437629342569532
-ctr,host=tars,some=tag-288 n=1i 1476437629342569532
-ctr,host=tars,some=tag-289 n=1i 1476437629342569532
-ctr,host=tars,some=tag-290 n=1i 1476437629342569532
-ctr,host=tars,some=tag-291 n=1i 1476437629342569532
-ctr,host=tars,some=tag-292 n=1i 1476437629342569532
-ctr,host=tars,some=tag-293 n=1i 1476437629342569532
-ctr,host=tars,some=tag-294 n=1i 1476437629342569532
-ctr,host=tars,some=tag-295 n=1i 1476437629342569532
-ctr,host=tars,some=tag-296 n=1i 1476437629342569532
-ctr,host=tars,some=tag-297 n=1i 1476437629342569532
-ctr,host=tars,some=tag-298 n=1i 1476437629342569532
-ctr,host=tars,some=tag-299 n=1i 1476437629342569532
-ctr,host=tars,some=tag-300 n=1i 1476437629342569532
-ctr,host=tars,some=tag-301 n=1i 1476437629342569532
-ctr,host=tars,some=tag-302 n=1i 1476437629342569532
-ctr,host=tars,some=tag-303 n=1i 1476437629342569532
-ctr,host=tars,some=tag-304 n=1i 1476437629342569532
-ctr,host=tars,some=tag-305 n=1i 1476437629342569532
-ctr,host=tars,some=tag-306 n=1i 1476437629342569532
-ctr,host=tars,some=tag-307 n=1i 1476437629342569532
-ctr,host=tars,some=tag-308 n=1i 1476437629342569532
-ctr,host=tars,some=tag-309 n=1i 1476437629342569532
-ctr,host=tars,some=tag-310 n=1i 1476437629342569532
-ctr,host=tars,some=tag-311 n=1i 1476437629342569532
-ctr,host=tars,some=tag-312 n=0i 1476437629342569532
-ctr,host=tars,some=tag-313 n=0i 1476437629342569532
-ctr,host=tars,some=tag-314 n=0i 1476437629342569532
-ctr,host=tars,some=tag-315 n=0i 1476437629342569532
-ctr,host=tars,some=tag-316 n=0i 1476437629342569532
-ctr,host=tars,some=tag-317 n=0i 1476437629342569532
-ctr,host=tars,some=tag-318 n=0i 1476437629342569532
-ctr,host=tars,some=tag-319 n=0i 1476437629342569532
-ctr,host=tars,some=tag-320 n=0i 1476437629342523514
-ctr,host=tars,some=tag-321 n=0i 1476437629342523514
-ctr,host=tars,some=tag-322 n=0i 1476437629342523514
-ctr,host=tars,some=tag-323 n=0i 1476437629342523514
-ctr,host=tars,some=tag-324 n=0i 1476437629342523514
-ctr,host=tars,some=tag-325 n=0i 1476437629342569532
-ctr,host=tars,some=tag-326 n=0i 1476437629342523514
-ctr,host=tars,some=tag-327 n=0i 1476437629342523514
-ctr,host=tars,some=tag-328 n=0i 1476437629342523514
-ctr,host=tars,some=tag-329 n=0i 1476437629342523514
-ctr,host=tars,some=tag-330 n=0i 1476437629342569532
-ctr,host=tars,some=tag-331 n=0i 1476437629342569532
-ctr,host=tars,some=tag-332 n=0i 1476437629342569532
-ctr,host=tars,some=tag-333 n=0i 1476437629342569532
-ctr,host=tars,some=tag-334 n=0i 1476437629342569532
-ctr,host=tars,some=tag-335 n=0i 1476437629342569532
-ctr,host=tars,some=tag-336 n=0i 1476437629342569532
-ctr,host=tars,some=tag-337 n=0i 1476437629342569532
-ctr,host=tars,some=tag-338 n=0i 1476437629342523514
-ctr,host=tars,some=tag-339 n=0i 1476437629342523514
-ctr,host=tars,some=tag-340 n=0i 1476437629342523514
-ctr,host=tars,some=tag-341 n=0i 1476437629342569532
-ctr,host=tars,some=tag-342 n=1i 1476437629342569532
-ctr,host=tars,some=tag-343 n=1i 1476437629342569532
-ctr,host=tars,some=tag-344 n=1i 1476437629342569532
-ctr,host=tars,some=tag-345 n=1i 1476437629342569532
-ctr,host=tars,some=tag-346 n=1i 1476437629342569532
-ctr,host=tars,some=tag-347 n=1i 1476437629342569532
-ctr,host=tars,some=tag-348 n=1i 1476437629342569532
-ctr,host=tars,some=tag-349 n=1i 1476437629342569532
-ctr,host=tars,some=tag-350 n=1i 1476437629342569532
-ctr,host=tars,some=tag-351 n=1i 1476437629342569532
-ctr,host=tars,some=tag-352 n=0i 1476437629342569532
-ctr,host=tars,some=tag-353 n=0i 1476437629342569532
-ctr,host=tars,some=tag-354 n=0i 1476437629342569532
-ctr,host=tars,some=tag-355 n=0i 1476437629342569532
-ctr,host=tars,some=tag-356 n=0i 1476437629342569532
-ctr,host=tars,some=tag-357 n=0i 1476437629342523514
-ctr,host=tars,some=tag-358 n=0i 1476437629342569532
-ctr,host=tars,some=tag-359 n=0i 1476437629342569532
-ctr,host=tars,some=tag-360 n=0i 1476437629342569532
-ctr,host=tars,some=tag-361 n=0i 1476437629342569532
-ctr,host=tars,some=tag-362 n=0i 1476437629342569532
-ctr,host=tars,some=tag-363 n=0i 1476437629342569532
-ctr,host=tars,some=tag-364 n=0i 1476437629342569532
-ctr,host=tars,some=tag-365 n=0i 1476437629342569532
-ctr,host=tars,some=tag-366 n=0i 1476437629342569532
-ctr,host=tars,some=tag-367 n=0i 1476437629342569532
-ctr,host=tars,some=tag-368 n=0i 1476437629342523514
-ctr,host=tars,some=tag-369 n=0i 1476437629342569532
-ctr,host=tars,some=tag-370 n=0i 1476437629342569532
-ctr,host=tars,some=tag-371 n=0i 1476437629342569532
-ctr,host=tars,some=tag-372 n=0i 1476437629342523514
-ctr,host=tars,some=tag-373 n=0i 1476437629342523514
-ctr,host=tars,some=tag-374 n=0i 1476437629342569532
-ctr,host=tars,some=tag-375 n=0i 1476437629342569532
-ctr,host=tars,some=tag-376 n=0i 1476437629342523514
-ctr,host=tars,some=tag-377 n=0i 1476437629342523514
-ctr,host=tars,some=tag-378 n=0i 1476437629342523514
-ctr,host=tars,some=tag-379 n=0i 1476437629342523514
-ctr,host=tars,some=tag-380 n=0i 1476437629342523514
-ctr,host=tars,some=tag-381 n=0i 1476437629342523514
-ctr,host=tars,some=tag-382 n=0i 1476437629342523514
-ctr,host=tars,some=tag-383 n=0i 1476437629342523514
-ctr,host=tars,some=tag-384 n=0i 1476437629342569532
-ctr,host=tars,some=tag-385 n=0i 1476437629342569532
-ctr,host=tars,some=tag-386 n=0i 1476437629342569532
-ctr,host=tars,some=tag-387 n=0i 1476437629342569532
-ctr,host=tars,some=tag-388 n=0i 1476437629342569532
-ctr,host=tars,some=tag-389 n=0i 1476437629342569532
-ctr,host=tars,some=tag-390 n=0i 1476437629342569532
-ctr,host=tars,some=tag-391 n=0i 1476437629342569532
-ctr,host=tars,some=tag-392 n=0i 1476437629342569532
-ctr,host=tars,some=tag-393 n=0i 1476437629342569532
-ctr,host=tars,some=tag-394 n=0i 1476437629342569532
-ctr,host=tars,some=tag-395 n=0i 1476437629342523514
-ctr,host=tars,some=tag-396 n=0i 1476437629342523514
-ctr,host=tars,some=tag-397 n=0i 1476437629342523514
-ctr,host=tars,some=tag-398 n=0i 1476437629342523514
-ctr,host=tars,some=tag-399 n=0i 1476437629342523514
-ctr,host=tars,some=tag-400 n=0i 1476437629342523514
-ctr,host=tars,some=tag-401 n=0i 1476437629342523514
-ctr,host=tars,some=tag-402 n=0i 1476437629342569532
-ctr,host=tars,some=tag-403 n=0i 1476437629342569532
-ctr,host=tars,some=tag-404 n=0i 1476437629342523514
-ctr,host=tars,some=tag-405 n=0i 1476437629342569532
-ctr,host=tars,some=tag-406 n=0i 1476437629342523514
-ctr,host=tars,some=tag-407 n=0i 1476437629342523514
-ctr,host=tars,some=tag-408 n=0i 1476437629342569532
-ctr,host=tars,some=tag-409 n=0i 1476437629342569532
-ctr,host=tars,some=tag-410 n=0i 1476437629342523514
-ctr,host=tars,some=tag-411 n=0i 1476437629342523514
-ctr,host=tars,some=tag-412 n=0i 1476437629342569532
-ctr,host=tars,some=tag-413 n=0i 1476437629342523514
-ctr,host=tars,some=tag-414 n=0i 1476437629342523514
-ctr,host=tars,some=tag-415 n=0i 1476437629342523514
-ctr,host=tars,some=tag-416 n=0i 1476437629342569532
-ctr,host=tars,some=tag-417 n=0i 1476437629342569532
-ctr,host=tars,some=tag-418 n=0i 1476437629342569532
-ctr,host=tars,some=tag-419 n=0i 1476437629342523514
-ctr,host=tars,some=tag-420 n=0i 1476437629342523514
-ctr,host=tars,some=tag-421 n=0i 1476437629342569532
-ctr,host=tars,some=tag-422 n=0i 1476437629342569532
-ctr,host=tars,some=tag-423 n=0i 1476437629342523514
-ctr,host=tars,some=tag-424 n=0i 1476437629342523514
-ctr,host=tars,some=tag-425 n=0i 1476437629342523514
-ctr,host=tars,some=tag-426 n=1i 1476437629342569532
-ctr,host=tars,some=tag-427 n=1i 1476437629342569532
-ctr,host=tars,some=tag-428 n=1i 1476437629342569532
-ctr,host=tars,some=tag-429 n=1i 1476437629342569532
-ctr,host=tars,some=tag-430 n=1i 1476437629342569532
-ctr,host=tars,some=tag-431 n=1i 1476437629342569532
-ctr,host=tars,some=tag-432 n=1i 1476437629342569532
-ctr,host=tars,some=tag-433 n=1i 1476437629342569532
-ctr,host=tars,some=tag-434 n=1i 1476437629342569532
-ctr,host=tars,some=tag-435 n=1i 1476437629342569532
-ctr,host=tars,some=tag-436 n=0i 1476437629342569532
-ctr,host=tars,some=tag-437 n=0i 1476437629342569532
-ctr,host=tars,some=tag-438 n=0i 1476437629342523514
-ctr,host=tars,some=tag-439 n=0i 1476437629342569532
-ctr,host=tars,some=tag-440 n=0i 1476437629342569532
-ctr,host=tars,some=tag-441 n=0i 1476437629342523514
-ctr,host=tars,some=tag-442 n=0i 1476437629342569532
-ctr,host=tars,some=tag-443 n=0i 1476437629342569532
-ctr,host=tars,some=tag-444 n=0i 1476437629342523514
-ctr,host=tars,some=tag-445 n=0i 1476437629342569532
-ctr,host=tars,some=tag-446 n=0i 1476437629342523514
-ctr,host=tars,some=tag-447 n=0i 1476437629342569532
-ctr,host=tars,some=tag-448 n=0i 1476437629342523514
-ctr,host=tars,some=tag-449 n=0i 1476437629342523514
-ctr,host=tars,some=tag-450 n=0i 1476437629342523514
-ctr,host=tars,some=tag-451 n=0i 1476437629342523514
-ctr,host=tars,some=tag-452 n=0i 1476437629342523514
-ctr,host=tars,some=tag-453 n=0i 1476437629342569532
-ctr,host=tars,some=tag-454 n=0i 1476437629342569532
-ctr,host=tars,some=tag-455 n=0i 1476437629342569532
-ctr,host=tars,some=tag-456 n=0i 1476437629342569532
-ctr,host=tars,some=tag-457 n=0i 1476437629342569532
-ctr,host=tars,some=tag-458 n=0i 1476437629342569532
-ctr,host=tars,some=tag-459 n=0i 1476437629342569532
-ctr,host=tars,some=tag-460 n=0i 1476437629342569532
-ctr,host=tars,some=tag-461 n=0i 1476437629342523514
-ctr,host=tars,some=tag-462 n=0i 1476437629342569532
-ctr,host=tars,some=tag-463 n=0i 1476437629342569532
-ctr,host=tars,some=tag-464 n=0i 1476437629342523514
-ctr,host=tars,some=tag-465 n=0i 1476437629342523514
-ctr,host=tars,some=tag-466 n=0i 1476437629342569532
-ctr,host=tars,some=tag-467 n=0i 1476437629342569532
-ctr,host=tars,some=tag-468 n=0i 1476437629342569532
-ctr,host=tars,some=tag-469 n=2i 1476437629342569532
-ctr,host=tars,some=tag-470 n=2i 1476437629342569532
-ctr,host=tars,some=tag-471 n=2i 1476437629342569532
-ctr,host=tars,some=tag-472 n=2i 1476437629342569532
-ctr,host=tars,some=tag-473 n=2i 1476437629342569532
-ctr,host=tars,some=tag-474 n=2i 1476437629342569532
-ctr,host=tars,some=tag-475 n=2i 1476437629342569532
-ctr,host=tars,some=tag-476 n=2i 1476437629342569532
-ctr,host=tars,some=tag-477 n=2i 1476437629342569532
-ctr,host=tars,some=tag-478 n=2i 1476437629342569532
-ctr,host=tars,some=tag-479 n=2i 1476437629342569532
-ctr,host=tars,some=tag-480 n=2i 1476437629342569532
-ctr,host=tars,some=tag-481 n=2i 1476437629342569532
-ctr,host=tars,some=tag-482 n=2i 1476437629342569532
-ctr,host=tars,some=tag-483 n=2i 1476437629342569532
-ctr,host=tars,some=tag-484 n=2i 1476437629342569532
-ctr,host=tars,some=tag-485 n=2i 1476437629342569532
-ctr,host=tars,some=tag-486 n=2i 1476437629342569532
-ctr,host=tars,some=tag-487 n=2i 1476437629342569532
-ctr,host=tars,some=tag-488 n=1i 1476437629342569532
-ctr,host=tars,some=tag-489 n=1i 1476437629342569532
-ctr,host=tars,some=tag-490 n=2i 1476437629342569532
-ctr,host=tars,some=tag-491 n=2i 1476437629342569532
-ctr,host=tars,some=tag-492 n=2i 1476437629342569532
-ctr,host=tars,some=tag-493 n=2i 1476437629342569532
-ctr,host=tars,some=tag-494 n=2i 1476437629342569532
-ctr,host=tars,some=tag-495 n=2i 1476437629342569532
-ctr,host=tars,some=tag-496 n=2i 1476437629342569532
-ctr,host=tars,some=tag-497 n=2i 1476437629342569532
-ctr,host=tars,some=tag-498 n=1i 1476437629342569532
-ctr,host=tars,some=tag-499 n=1i 1476437629342569532
diff --git a/metric/inline_strconv_parse.go b/plugins/parsers/influx/escape.go
similarity index 53%
rename from metric/inline_strconv_parse.go
rename to plugins/parsers/influx/escape.go
index 7b77140fb..bf47fa8c5 100644
--- a/metric/inline_strconv_parse.go
+++ b/plugins/parsers/influx/escape.go
@@ -1,11 +1,62 @@
-package metric
+package influx
 
 import (
+	"bytes"
 	"reflect"
 	"strconv"
+	"strings"
 	"unsafe"
 )
 
+const (
+	escapes            = " ,="
+	nameEscapes        = " ,"
+	stringFieldEscapes = `\"`
+)
+
+var (
+	unescaper = strings.NewReplacer(
+		`\,`, `,`,
+		`\"`, `"`, // ???
+		`\ `, ` `,
+		`\=`, `=`,
+	)
+
+	nameUnescaper = strings.NewReplacer(
+		`\,`, `,`,
+		`\ `, ` `,
+	)
+
+	stringFieldUnescaper = strings.NewReplacer(
+		`\"`, `"`,
+		`\\`, `\`,
+	)
+)
+
+func unescape(b []byte) string {
+	if bytes.ContainsAny(b, escapes) {
+		return unescaper.Replace(unsafeBytesToString(b))
+	} else {
+		return string(b)
+	}
+}
+
+func nameUnescape(b []byte) string {
+	if bytes.ContainsAny(b, nameEscapes) {
+		return nameUnescaper.Replace(unsafeBytesToString(b))
+	} else {
+		return string(b)
+	}
+}
+
+func stringFieldUnescape(b []byte) string {
+	if bytes.ContainsAny(b, stringFieldEscapes) {
+		return stringFieldUnescaper.Replace(unsafeBytesToString(b))
+	} else {
+		return string(b)
+	}
+}
+
 // parseIntBytes is a zero-alloc wrapper around strconv.ParseInt.
 func parseIntBytes(b []byte, base int, bitSize int) (i int64, err error) {
 	s := unsafeBytesToString(b)
diff --git a/plugins/parsers/influx/handler.go b/plugins/parsers/influx/handler.go
new file mode 100644
index 000000000..27d6f942d
--- /dev/null
+++ b/plugins/parsers/influx/handler.go
@@ -0,0 +1,95 @@
+package influx
+
+import (
+	"bytes"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/prometheus/common/log"
+)
+
+type MetricHandler struct {
+	builder   *metric.Builder
+	metrics   []telegraf.Metric
+	precision time.Duration
+}
+
+func NewMetricHandler() *MetricHandler {
+	return &MetricHandler{
+		builder:   metric.NewBuilder(),
+		precision: time.Nanosecond,
+	}
+}
+
+func (h *MetricHandler) SetTimeFunc(f metric.TimeFunc) {
+	h.builder.TimeFunc = f
+}
+
+func (h *MetricHandler) SetPrecision(factor time.Duration) {
+	h.precision = factor
+}
+
+func (h *MetricHandler) Metric() (telegraf.Metric, error) {
+	return h.builder.Metric()
+}
+
+func (h *MetricHandler) SetMeasurement(name []byte) {
+	h.builder.SetName(nameUnescape(name))
+}
+
+func (h *MetricHandler) AddTag(key []byte, value []byte) {
+	tk := unescape(key)
+	tv := unescape(value)
+	h.builder.AddTag(tk, tv)
+}
+
+func (h *MetricHandler) AddInt(key []byte, value []byte) {
+	fk := unescape(key)
+	fv, err := parseIntBytes(bytes.TrimSuffix(value, []byte("i")), 10, 64)
+	if err != nil {
+		log.Errorf("E! Received unparseable int value: %q", value)
+		return
+	}
+	h.builder.AddField(fk, fv)
+}
+
+func (h *MetricHandler) AddFloat(key []byte, value []byte) {
+	fk := unescape(key)
+	fv, err := parseFloatBytes(value, 64)
+	if err != nil {
+		log.Errorf("E! Received unparseable float value: %q", value)
+		return
+	}
+	h.builder.AddField(fk, fv)
+}
+
+func (h *MetricHandler) AddString(key []byte, value []byte) {
+	fk := unescape(key)
+	fv := stringFieldUnescape(value)
+	h.builder.AddField(fk, fv)
+}
+
+func (h *MetricHandler) AddBool(key []byte, value []byte) {
+	fk := unescape(key)
+	fv, err := parseBoolBytes(value)
+	if err != nil {
+		log.Errorf("E! Received unparseable boolean value: %q", value)
+		return
+	}
+	h.builder.AddField(fk, fv)
+}
+
+func (h *MetricHandler) SetTimestamp(tm []byte) {
+	v, err := parseIntBytes(tm, 10, 64)
+	if err != nil {
+		log.Errorf("E! Received unparseable timestamp: %q", tm)
+		return
+	}
+	ns := v * int64(h.precision)
+	h.builder.SetTime(time.Unix(0, ns))
+}
+
+func (h *MetricHandler) Reset() {
+	h.builder.Reset()
+}
diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
new file mode 100644
index 000000000..958587135
--- /dev/null
+++ b/plugins/parsers/influx/machine.go
@@ -0,0 +1,21171 @@
+
+//line plugins/parsers/influx/machine.go.rl:1
+package influx
+
+import (
+	"errors"
+)
+
+var (
+	ErrNameParse = errors.New("expected measurement name")
+	ErrFieldParse = errors.New("expected field")
+	ErrTagParse = errors.New("expected tag")
+	ErrTimestampParse = errors.New("expected timestamp")
+	ErrParse = errors.New("parse error")
+)
+
+
+//line plugins/parsers/influx/machine.go.rl:214
+
+
+
+//line plugins/parsers/influx/machine.go:23
+const LineProtocol_start int = 1
+const LineProtocol_first_final int = 191
+const LineProtocol_error int = 0
+
+const LineProtocol_en_main int = 1
+const LineProtocol_en_discard_line int = 187
+const LineProtocol_en_align int = 188
+
+
+//line plugins/parsers/influx/machine.go.rl:217
+
+type machine struct {
+	data       []byte
+	cs         int
+	p, pe, eof int
+	pb         int
+	handler    Handler
+	err        error
+}
+
+func NewMachine(handler Handler) *machine {
+	m := &machine{
+		handler: handler,
+	}
+
+	
+//line plugins/parsers/influx/machine.go.rl:233
+	
+//line plugins/parsers/influx/machine.go.rl:234
+	
+//line plugins/parsers/influx/machine.go.rl:235
+	
+//line plugins/parsers/influx/machine.go.rl:236
+	
+//line plugins/parsers/influx/machine.go.rl:237
+	
+//line plugins/parsers/influx/machine.go:60
+	{
+	 m.cs = LineProtocol_start
+	}
+
+//line plugins/parsers/influx/machine.go.rl:238
+
+	return m
+}
+
+func (m *machine) SetData(data []byte) {
+	m.data = data
+	m.p = 0
+	m.pb = 0
+	m.pe = len(data)
+	m.eof = len(data)
+	m.err = nil
+
+	
+//line plugins/parsers/influx/machine.go:79
+	{
+	 m.cs = LineProtocol_start
+	}
+
+//line plugins/parsers/influx/machine.go.rl:251
+	m.cs = LineProtocol_en_align
+}
+
+// ParseLine parses a line of input and returns true if more data can be
+// parsed.
+func (m *machine) ParseLine() bool {
+	if m.data == nil || m.p >= m.pe {
+		m.err = nil
+		return false
+	}
+
+	m.err = nil
+	var key []byte
+	var yield bool
+
+	
+//line plugins/parsers/influx/machine.go:101
+	{
+	if ( m.p) == ( m.pe) {
+		goto _test_eof
+	}
+	goto _resume
+
+_again:
+	switch  m.cs {
+	case 1:
+		goto st1
+	case 2:
+		goto st2
+	case 3:
+		goto st3
+	case 4:
+		goto st4
+	case 0:
+		goto st0
+	case 5:
+		goto st5
+	case 6:
+		goto st6
+	case 7:
+		goto st7
+	case 191:
+		goto st191
+	case 192:
+		goto st192
+	case 193:
+		goto st193
+	case 8:
+		goto st8
+	case 194:
+		goto st194
+	case 195:
+		goto st195
+	case 196:
+		goto st196
+	case 197:
+		goto st197
+	case 198:
+		goto st198
+	case 199:
+		goto st199
+	case 200:
+		goto st200
+	case 201:
+		goto st201
+	case 202:
+		goto st202
+	case 203:
+		goto st203
+	case 204:
+		goto st204
+	case 205:
+		goto st205
+	case 206:
+		goto st206
+	case 207:
+		goto st207
+	case 208:
+		goto st208
+	case 209:
+		goto st209
+	case 210:
+		goto st210
+	case 211:
+		goto st211
+	case 212:
+		goto st212
+	case 213:
+		goto st213
+	case 9:
+		goto st9
+	case 10:
+		goto st10
+	case 11:
+		goto st11
+	case 12:
+		goto st12
+	case 214:
+		goto st214
+	case 215:
+		goto st215
+	case 13:
+		goto st13
+	case 14:
+		goto st14
+	case 216:
+		goto st216
+	case 217:
+		goto st217
+	case 218:
+		goto st218
+	case 219:
+		goto st219
+	case 15:
+		goto st15
+	case 16:
+		goto st16
+	case 17:
+		goto st17
+	case 220:
+		goto st220
+	case 18:
+		goto st18
+	case 19:
+		goto st19
+	case 20:
+		goto st20
+	case 221:
+		goto st221
+	case 21:
+		goto st21
+	case 22:
+		goto st22
+	case 222:
+		goto st222
+	case 223:
+		goto st223
+	case 23:
+		goto st23
+	case 24:
+		goto st24
+	case 25:
+		goto st25
+	case 26:
+		goto st26
+	case 27:
+		goto st27
+	case 28:
+		goto st28
+	case 29:
+		goto st29
+	case 30:
+		goto st30
+	case 31:
+		goto st31
+	case 32:
+		goto st32
+	case 33:
+		goto st33
+	case 34:
+		goto st34
+	case 35:
+		goto st35
+	case 36:
+		goto st36
+	case 37:
+		goto st37
+	case 38:
+		goto st38
+	case 39:
+		goto st39
+	case 40:
+		goto st40
+	case 41:
+		goto st41
+	case 224:
+		goto st224
+	case 225:
+		goto st225
+	case 42:
+		goto st42
+	case 226:
+		goto st226
+	case 227:
+		goto st227
+	case 228:
+		goto st228
+	case 229:
+		goto st229
+	case 230:
+		goto st230
+	case 231:
+		goto st231
+	case 232:
+		goto st232
+	case 233:
+		goto st233
+	case 234:
+		goto st234
+	case 235:
+		goto st235
+	case 236:
+		goto st236
+	case 237:
+		goto st237
+	case 238:
+		goto st238
+	case 239:
+		goto st239
+	case 240:
+		goto st240
+	case 241:
+		goto st241
+	case 242:
+		goto st242
+	case 243:
+		goto st243
+	case 244:
+		goto st244
+	case 245:
+		goto st245
+	case 43:
+		goto st43
+	case 246:
+		goto st246
+	case 247:
+		goto st247
+	case 248:
+		goto st248
+	case 44:
+		goto st44
+	case 249:
+		goto st249
+	case 250:
+		goto st250
+	case 251:
+		goto st251
+	case 252:
+		goto st252
+	case 253:
+		goto st253
+	case 254:
+		goto st254
+	case 255:
+		goto st255
+	case 256:
+		goto st256
+	case 257:
+		goto st257
+	case 258:
+		goto st258
+	case 259:
+		goto st259
+	case 260:
+		goto st260
+	case 261:
+		goto st261
+	case 262:
+		goto st262
+	case 263:
+		goto st263
+	case 264:
+		goto st264
+	case 265:
+		goto st265
+	case 266:
+		goto st266
+	case 267:
+		goto st267
+	case 268:
+		goto st268
+	case 45:
+		goto st45
+	case 46:
+		goto st46
+	case 47:
+		goto st47
+	case 269:
+		goto st269
+	case 48:
+		goto st48
+	case 49:
+		goto st49
+	case 50:
+		goto st50
+	case 51:
+		goto st51
+	case 270:
+		goto st270
+	case 271:
+		goto st271
+	case 52:
+		goto st52
+	case 272:
+		goto st272
+	case 53:
+		goto st53
+	case 273:
+		goto st273
+	case 274:
+		goto st274
+	case 275:
+		goto st275
+	case 276:
+		goto st276
+	case 54:
+		goto st54
+	case 55:
+		goto st55
+	case 56:
+		goto st56
+	case 277:
+		goto st277
+	case 57:
+		goto st57
+	case 58:
+		goto st58
+	case 59:
+		goto st59
+	case 278:
+		goto st278
+	case 60:
+		goto st60
+	case 61:
+		goto st61
+	case 279:
+		goto st279
+	case 280:
+		goto st280
+	case 62:
+		goto st62
+	case 63:
+		goto st63
+	case 281:
+		goto st281
+	case 282:
+		goto st282
+	case 64:
+		goto st64
+	case 65:
+		goto st65
+	case 283:
+		goto st283
+	case 284:
+		goto st284
+	case 285:
+		goto st285
+	case 286:
+		goto st286
+	case 66:
+		goto st66
+	case 67:
+		goto st67
+	case 68:
+		goto st68
+	case 287:
+		goto st287
+	case 69:
+		goto st69
+	case 70:
+		goto st70
+	case 71:
+		goto st71
+	case 288:
+		goto st288
+	case 72:
+		goto st72
+	case 73:
+		goto st73
+	case 289:
+		goto st289
+	case 290:
+		goto st290
+	case 74:
+		goto st74
+	case 75:
+		goto st75
+	case 76:
+		goto st76
+	case 77:
+		goto st77
+	case 78:
+		goto st78
+	case 79:
+		goto st79
+	case 291:
+		goto st291
+	case 292:
+		goto st292
+	case 293:
+		goto st293
+	case 294:
+		goto st294
+	case 80:
+		goto st80
+	case 295:
+		goto st295
+	case 296:
+		goto st296
+	case 297:
+		goto st297
+	case 298:
+		goto st298
+	case 81:
+		goto st81
+	case 299:
+		goto st299
+	case 300:
+		goto st300
+	case 301:
+		goto st301
+	case 302:
+		goto st302
+	case 303:
+		goto st303
+	case 304:
+		goto st304
+	case 305:
+		goto st305
+	case 306:
+		goto st306
+	case 307:
+		goto st307
+	case 308:
+		goto st308
+	case 309:
+		goto st309
+	case 310:
+		goto st310
+	case 311:
+		goto st311
+	case 312:
+		goto st312
+	case 313:
+		goto st313
+	case 314:
+		goto st314
+	case 315:
+		goto st315
+	case 316:
+		goto st316
+	case 82:
+		goto st82
+	case 83:
+		goto st83
+	case 84:
+		goto st84
+	case 85:
+		goto st85
+	case 86:
+		goto st86
+	case 87:
+		goto st87
+	case 88:
+		goto st88
+	case 89:
+		goto st89
+	case 90:
+		goto st90
+	case 91:
+		goto st91
+	case 92:
+		goto st92
+	case 93:
+		goto st93
+	case 94:
+		goto st94
+	case 317:
+		goto st317
+	case 318:
+		goto st318
+	case 95:
+		goto st95
+	case 319:
+		goto st319
+	case 320:
+		goto st320
+	case 321:
+		goto st321
+	case 322:
+		goto st322
+	case 323:
+		goto st323
+	case 324:
+		goto st324
+	case 325:
+		goto st325
+	case 326:
+		goto st326
+	case 327:
+		goto st327
+	case 328:
+		goto st328
+	case 329:
+		goto st329
+	case 330:
+		goto st330
+	case 331:
+		goto st331
+	case 332:
+		goto st332
+	case 333:
+		goto st333
+	case 334:
+		goto st334
+	case 335:
+		goto st335
+	case 336:
+		goto st336
+	case 337:
+		goto st337
+	case 338:
+		goto st338
+	case 96:
+		goto st96
+	case 97:
+		goto st97
+	case 339:
+		goto st339
+	case 340:
+		goto st340
+	case 98:
+		goto st98
+	case 341:
+		goto st341
+	case 342:
+		goto st342
+	case 343:
+		goto st343
+	case 344:
+		goto st344
+	case 345:
+		goto st345
+	case 346:
+		goto st346
+	case 347:
+		goto st347
+	case 348:
+		goto st348
+	case 349:
+		goto st349
+	case 350:
+		goto st350
+	case 351:
+		goto st351
+	case 352:
+		goto st352
+	case 353:
+		goto st353
+	case 354:
+		goto st354
+	case 355:
+		goto st355
+	case 356:
+		goto st356
+	case 357:
+		goto st357
+	case 358:
+		goto st358
+	case 359:
+		goto st359
+	case 360:
+		goto st360
+	case 99:
+		goto st99
+	case 361:
+		goto st361
+	case 362:
+		goto st362
+	case 100:
+		goto st100
+	case 101:
+		goto st101
+	case 102:
+		goto st102
+	case 103:
+		goto st103
+	case 363:
+		goto st363
+	case 364:
+		goto st364
+	case 104:
+		goto st104
+	case 105:
+		goto st105
+	case 365:
+		goto st365
+	case 366:
+		goto st366
+	case 367:
+		goto st367
+	case 368:
+		goto st368
+	case 106:
+		goto st106
+	case 107:
+		goto st107
+	case 108:
+		goto st108
+	case 369:
+		goto st369
+	case 109:
+		goto st109
+	case 110:
+		goto st110
+	case 111:
+		goto st111
+	case 370:
+		goto st370
+	case 112:
+		goto st112
+	case 113:
+		goto st113
+	case 371:
+		goto st371
+	case 372:
+		goto st372
+	case 114:
+		goto st114
+	case 115:
+		goto st115
+	case 116:
+		goto st116
+	case 117:
+		goto st117
+	case 118:
+		goto st118
+	case 119:
+		goto st119
+	case 120:
+		goto st120
+	case 121:
+		goto st121
+	case 122:
+		goto st122
+	case 123:
+		goto st123
+	case 124:
+		goto st124
+	case 125:
+		goto st125
+	case 373:
+		goto st373
+	case 374:
+		goto st374
+	case 375:
+		goto st375
+	case 126:
+		goto st126
+	case 376:
+		goto st376
+	case 377:
+		goto st377
+	case 378:
+		goto st378
+	case 379:
+		goto st379
+	case 380:
+		goto st380
+	case 381:
+		goto st381
+	case 382:
+		goto st382
+	case 383:
+		goto st383
+	case 384:
+		goto st384
+	case 385:
+		goto st385
+	case 386:
+		goto st386
+	case 387:
+		goto st387
+	case 388:
+		goto st388
+	case 389:
+		goto st389
+	case 390:
+		goto st390
+	case 391:
+		goto st391
+	case 392:
+		goto st392
+	case 393:
+		goto st393
+	case 394:
+		goto st394
+	case 395:
+		goto st395
+	case 396:
+		goto st396
+	case 397:
+		goto st397
+	case 127:
+		goto st127
+	case 398:
+		goto st398
+	case 399:
+		goto st399
+	case 400:
+		goto st400
+	case 401:
+		goto st401
+	case 128:
+		goto st128
+	case 402:
+		goto st402
+	case 403:
+		goto st403
+	case 404:
+		goto st404
+	case 405:
+		goto st405
+	case 406:
+		goto st406
+	case 407:
+		goto st407
+	case 408:
+		goto st408
+	case 409:
+		goto st409
+	case 410:
+		goto st410
+	case 411:
+		goto st411
+	case 412:
+		goto st412
+	case 413:
+		goto st413
+	case 414:
+		goto st414
+	case 415:
+		goto st415
+	case 416:
+		goto st416
+	case 417:
+		goto st417
+	case 418:
+		goto st418
+	case 419:
+		goto st419
+	case 420:
+		goto st420
+	case 421:
+		goto st421
+	case 129:
+		goto st129
+	case 130:
+		goto st130
+	case 131:
+		goto st131
+	case 422:
+		goto st422
+	case 423:
+		goto st423
+	case 132:
+		goto st132
+	case 424:
+		goto st424
+	case 425:
+		goto st425
+	case 426:
+		goto st426
+	case 427:
+		goto st427
+	case 428:
+		goto st428
+	case 429:
+		goto st429
+	case 430:
+		goto st430
+	case 431:
+		goto st431
+	case 432:
+		goto st432
+	case 433:
+		goto st433
+	case 434:
+		goto st434
+	case 435:
+		goto st435
+	case 436:
+		goto st436
+	case 437:
+		goto st437
+	case 438:
+		goto st438
+	case 439:
+		goto st439
+	case 440:
+		goto st440
+	case 441:
+		goto st441
+	case 442:
+		goto st442
+	case 443:
+		goto st443
+	case 133:
+		goto st133
+	case 444:
+		goto st444
+	case 445:
+		goto st445
+	case 446:
+		goto st446
+	case 134:
+		goto st134
+	case 447:
+		goto st447
+	case 448:
+		goto st448
+	case 449:
+		goto st449
+	case 450:
+		goto st450
+	case 451:
+		goto st451
+	case 452:
+		goto st452
+	case 453:
+		goto st453
+	case 454:
+		goto st454
+	case 455:
+		goto st455
+	case 456:
+		goto st456
+	case 457:
+		goto st457
+	case 458:
+		goto st458
+	case 459:
+		goto st459
+	case 460:
+		goto st460
+	case 461:
+		goto st461
+	case 462:
+		goto st462
+	case 463:
+		goto st463
+	case 464:
+		goto st464
+	case 465:
+		goto st465
+	case 466:
+		goto st466
+	case 467:
+		goto st467
+	case 468:
+		goto st468
+	case 135:
+		goto st135
+	case 469:
+		goto st469
+	case 470:
+		goto st470
+	case 471:
+		goto st471
+	case 472:
+		goto st472
+	case 473:
+		goto st473
+	case 474:
+		goto st474
+	case 475:
+		goto st475
+	case 476:
+		goto st476
+	case 477:
+		goto st477
+	case 478:
+		goto st478
+	case 479:
+		goto st479
+	case 480:
+		goto st480
+	case 481:
+		goto st481
+	case 482:
+		goto st482
+	case 483:
+		goto st483
+	case 484:
+		goto st484
+	case 485:
+		goto st485
+	case 486:
+		goto st486
+	case 487:
+		goto st487
+	case 488:
+		goto st488
+	case 489:
+		goto st489
+	case 490:
+		goto st490
+	case 136:
+		goto st136
+	case 137:
+		goto st137
+	case 138:
+		goto st138
+	case 139:
+		goto st139
+	case 491:
+		goto st491
+	case 492:
+		goto st492
+	case 140:
+		goto st140
+	case 493:
+		goto st493
+	case 141:
+		goto st141
+	case 494:
+		goto st494
+	case 495:
+		goto st495
+	case 496:
+		goto st496
+	case 497:
+		goto st497
+	case 142:
+		goto st142
+	case 143:
+		goto st143
+	case 144:
+		goto st144
+	case 498:
+		goto st498
+	case 145:
+		goto st145
+	case 146:
+		goto st146
+	case 147:
+		goto st147
+	case 499:
+		goto st499
+	case 148:
+		goto st148
+	case 149:
+		goto st149
+	case 500:
+		goto st500
+	case 501:
+		goto st501
+	case 150:
+		goto st150
+	case 151:
+		goto st151
+	case 502:
+		goto st502
+	case 503:
+		goto st503
+	case 504:
+		goto st504
+	case 152:
+		goto st152
+	case 505:
+		goto st505
+	case 506:
+		goto st506
+	case 507:
+		goto st507
+	case 508:
+		goto st508
+	case 509:
+		goto st509
+	case 510:
+		goto st510
+	case 511:
+		goto st511
+	case 512:
+		goto st512
+	case 513:
+		goto st513
+	case 514:
+		goto st514
+	case 515:
+		goto st515
+	case 516:
+		goto st516
+	case 517:
+		goto st517
+	case 518:
+		goto st518
+	case 519:
+		goto st519
+	case 520:
+		goto st520
+	case 521:
+		goto st521
+	case 522:
+		goto st522
+	case 523:
+		goto st523
+	case 524:
+		goto st524
+	case 525:
+		goto st525
+	case 153:
+		goto st153
+	case 154:
+		goto st154
+	case 526:
+		goto st526
+	case 527:
+		goto st527
+	case 528:
+		goto st528
+	case 529:
+		goto st529
+	case 155:
+		goto st155
+	case 156:
+		goto st156
+	case 157:
+		goto st157
+	case 530:
+		goto st530
+	case 158:
+		goto st158
+	case 159:
+		goto st159
+	case 160:
+		goto st160
+	case 531:
+		goto st531
+	case 161:
+		goto st161
+	case 162:
+		goto st162
+	case 532:
+		goto st532
+	case 533:
+		goto st533
+	case 163:
+		goto st163
+	case 164:
+		goto st164
+	case 165:
+		goto st165
+	case 534:
+		goto st534
+	case 535:
+		goto st535
+	case 166:
+		goto st166
+	case 536:
+		goto st536
+	case 537:
+		goto st537
+	case 167:
+		goto st167
+	case 538:
+		goto st538
+	case 539:
+		goto st539
+	case 540:
+		goto st540
+	case 541:
+		goto st541
+	case 168:
+		goto st168
+	case 169:
+		goto st169
+	case 170:
+		goto st170
+	case 542:
+		goto st542
+	case 171:
+		goto st171
+	case 172:
+		goto st172
+	case 173:
+		goto st173
+	case 543:
+		goto st543
+	case 174:
+		goto st174
+	case 175:
+		goto st175
+	case 544:
+		goto st544
+	case 545:
+		goto st545
+	case 176:
+		goto st176
+	case 546:
+		goto st546
+	case 547:
+		goto st547
+	case 177:
+		goto st177
+	case 178:
+		goto st178
+	case 548:
+		goto st548
+	case 549:
+		goto st549
+	case 550:
+		goto st550
+	case 179:
+		goto st179
+	case 180:
+		goto st180
+	case 181:
+		goto st181
+	case 551:
+		goto st551
+	case 182:
+		goto st182
+	case 183:
+		goto st183
+	case 184:
+		goto st184
+	case 552:
+		goto st552
+	case 185:
+		goto st185
+	case 186:
+		goto st186
+	case 553:
+		goto st553
+	case 554:
+		goto st554
+	case 187:
+		goto st187
+	case 555:
+		goto st555
+	case 188:
+		goto st188
+	case 556:
+		goto st556
+	case 557:
+		goto st557
+	case 189:
+		goto st189
+	case 190:
+		goto st190
+	}
+
+	if ( m.p)++; ( m.p) == ( m.pe) {
+		goto _test_eof
+	}
+_resume:
+	switch  m.cs {
+	case 1:
+		goto st_case_1
+	case 2:
+		goto st_case_2
+	case 3:
+		goto st_case_3
+	case 4:
+		goto st_case_4
+	case 0:
+		goto st_case_0
+	case 5:
+		goto st_case_5
+	case 6:
+		goto st_case_6
+	case 7:
+		goto st_case_7
+	case 191:
+		goto st_case_191
+	case 192:
+		goto st_case_192
+	case 193:
+		goto st_case_193
+	case 8:
+		goto st_case_8
+	case 194:
+		goto st_case_194
+	case 195:
+		goto st_case_195
+	case 196:
+		goto st_case_196
+	case 197:
+		goto st_case_197
+	case 198:
+		goto st_case_198
+	case 199:
+		goto st_case_199
+	case 200:
+		goto st_case_200
+	case 201:
+		goto st_case_201
+	case 202:
+		goto st_case_202
+	case 203:
+		goto st_case_203
+	case 204:
+		goto st_case_204
+	case 205:
+		goto st_case_205
+	case 206:
+		goto st_case_206
+	case 207:
+		goto st_case_207
+	case 208:
+		goto st_case_208
+	case 209:
+		goto st_case_209
+	case 210:
+		goto st_case_210
+	case 211:
+		goto st_case_211
+	case 212:
+		goto st_case_212
+	case 213:
+		goto st_case_213
+	case 9:
+		goto st_case_9
+	case 10:
+		goto st_case_10
+	case 11:
+		goto st_case_11
+	case 12:
+		goto st_case_12
+	case 214:
+		goto st_case_214
+	case 215:
+		goto st_case_215
+	case 13:
+		goto st_case_13
+	case 14:
+		goto st_case_14
+	case 216:
+		goto st_case_216
+	case 217:
+		goto st_case_217
+	case 218:
+		goto st_case_218
+	case 219:
+		goto st_case_219
+	case 15:
+		goto st_case_15
+	case 16:
+		goto st_case_16
+	case 17:
+		goto st_case_17
+	case 220:
+		goto st_case_220
+	case 18:
+		goto st_case_18
+	case 19:
+		goto st_case_19
+	case 20:
+		goto st_case_20
+	case 221:
+		goto st_case_221
+	case 21:
+		goto st_case_21
+	case 22:
+		goto st_case_22
+	case 222:
+		goto st_case_222
+	case 223:
+		goto st_case_223
+	case 23:
+		goto st_case_23
+	case 24:
+		goto st_case_24
+	case 25:
+		goto st_case_25
+	case 26:
+		goto st_case_26
+	case 27:
+		goto st_case_27
+	case 28:
+		goto st_case_28
+	case 29:
+		goto st_case_29
+	case 30:
+		goto st_case_30
+	case 31:
+		goto st_case_31
+	case 32:
+		goto st_case_32
+	case 33:
+		goto st_case_33
+	case 34:
+		goto st_case_34
+	case 35:
+		goto st_case_35
+	case 36:
+		goto st_case_36
+	case 37:
+		goto st_case_37
+	case 38:
+		goto st_case_38
+	case 39:
+		goto st_case_39
+	case 40:
+		goto st_case_40
+	case 41:
+		goto st_case_41
+	case 224:
+		goto st_case_224
+	case 225:
+		goto st_case_225
+	case 42:
+		goto st_case_42
+	case 226:
+		goto st_case_226
+	case 227:
+		goto st_case_227
+	case 228:
+		goto st_case_228
+	case 229:
+		goto st_case_229
+	case 230:
+		goto st_case_230
+	case 231:
+		goto st_case_231
+	case 232:
+		goto st_case_232
+	case 233:
+		goto st_case_233
+	case 234:
+		goto st_case_234
+	case 235:
+		goto st_case_235
+	case 236:
+		goto st_case_236
+	case 237:
+		goto st_case_237
+	case 238:
+		goto st_case_238
+	case 239:
+		goto st_case_239
+	case 240:
+		goto st_case_240
+	case 241:
+		goto st_case_241
+	case 242:
+		goto st_case_242
+	case 243:
+		goto st_case_243
+	case 244:
+		goto st_case_244
+	case 245:
+		goto st_case_245
+	case 43:
+		goto st_case_43
+	case 246:
+		goto st_case_246
+	case 247:
+		goto st_case_247
+	case 248:
+		goto st_case_248
+	case 44:
+		goto st_case_44
+	case 249:
+		goto st_case_249
+	case 250:
+		goto st_case_250
+	case 251:
+		goto st_case_251
+	case 252:
+		goto st_case_252
+	case 253:
+		goto st_case_253
+	case 254:
+		goto st_case_254
+	case 255:
+		goto st_case_255
+	case 256:
+		goto st_case_256
+	case 257:
+		goto st_case_257
+	case 258:
+		goto st_case_258
+	case 259:
+		goto st_case_259
+	case 260:
+		goto st_case_260
+	case 261:
+		goto st_case_261
+	case 262:
+		goto st_case_262
+	case 263:
+		goto st_case_263
+	case 264:
+		goto st_case_264
+	case 265:
+		goto st_case_265
+	case 266:
+		goto st_case_266
+	case 267:
+		goto st_case_267
+	case 268:
+		goto st_case_268
+	case 45:
+		goto st_case_45
+	case 46:
+		goto st_case_46
+	case 47:
+		goto st_case_47
+	case 269:
+		goto st_case_269
+	case 48:
+		goto st_case_48
+	case 49:
+		goto st_case_49
+	case 50:
+		goto st_case_50
+	case 51:
+		goto st_case_51
+	case 270:
+		goto st_case_270
+	case 271:
+		goto st_case_271
+	case 52:
+		goto st_case_52
+	case 272:
+		goto st_case_272
+	case 53:
+		goto st_case_53
+	case 273:
+		goto st_case_273
+	case 274:
+		goto st_case_274
+	case 275:
+		goto st_case_275
+	case 276:
+		goto st_case_276
+	case 54:
+		goto st_case_54
+	case 55:
+		goto st_case_55
+	case 56:
+		goto st_case_56
+	case 277:
+		goto st_case_277
+	case 57:
+		goto st_case_57
+	case 58:
+		goto st_case_58
+	case 59:
+		goto st_case_59
+	case 278:
+		goto st_case_278
+	case 60:
+		goto st_case_60
+	case 61:
+		goto st_case_61
+	case 279:
+		goto st_case_279
+	case 280:
+		goto st_case_280
+	case 62:
+		goto st_case_62
+	case 63:
+		goto st_case_63
+	case 281:
+		goto st_case_281
+	case 282:
+		goto st_case_282
+	case 64:
+		goto st_case_64
+	case 65:
+		goto st_case_65
+	case 283:
+		goto st_case_283
+	case 284:
+		goto st_case_284
+	case 285:
+		goto st_case_285
+	case 286:
+		goto st_case_286
+	case 66:
+		goto st_case_66
+	case 67:
+		goto st_case_67
+	case 68:
+		goto st_case_68
+	case 287:
+		goto st_case_287
+	case 69:
+		goto st_case_69
+	case 70:
+		goto st_case_70
+	case 71:
+		goto st_case_71
+	case 288:
+		goto st_case_288
+	case 72:
+		goto st_case_72
+	case 73:
+		goto st_case_73
+	case 289:
+		goto st_case_289
+	case 290:
+		goto st_case_290
+	case 74:
+		goto st_case_74
+	case 75:
+		goto st_case_75
+	case 76:
+		goto st_case_76
+	case 77:
+		goto st_case_77
+	case 78:
+		goto st_case_78
+	case 79:
+		goto st_case_79
+	case 291:
+		goto st_case_291
+	case 292:
+		goto st_case_292
+	case 293:
+		goto st_case_293
+	case 294:
+		goto st_case_294
+	case 80:
+		goto st_case_80
+	case 295:
+		goto st_case_295
+	case 296:
+		goto st_case_296
+	case 297:
+		goto st_case_297
+	case 298:
+		goto st_case_298
+	case 81:
+		goto st_case_81
+	case 299:
+		goto st_case_299
+	case 300:
+		goto st_case_300
+	case 301:
+		goto st_case_301
+	case 302:
+		goto st_case_302
+	case 303:
+		goto st_case_303
+	case 304:
+		goto st_case_304
+	case 305:
+		goto st_case_305
+	case 306:
+		goto st_case_306
+	case 307:
+		goto st_case_307
+	case 308:
+		goto st_case_308
+	case 309:
+		goto st_case_309
+	case 310:
+		goto st_case_310
+	case 311:
+		goto st_case_311
+	case 312:
+		goto st_case_312
+	case 313:
+		goto st_case_313
+	case 314:
+		goto st_case_314
+	case 315:
+		goto st_case_315
+	case 316:
+		goto st_case_316
+	case 82:
+		goto st_case_82
+	case 83:
+		goto st_case_83
+	case 84:
+		goto st_case_84
+	case 85:
+		goto st_case_85
+	case 86:
+		goto st_case_86
+	case 87:
+		goto st_case_87
+	case 88:
+		goto st_case_88
+	case 89:
+		goto st_case_89
+	case 90:
+		goto st_case_90
+	case 91:
+		goto st_case_91
+	case 92:
+		goto st_case_92
+	case 93:
+		goto st_case_93
+	case 94:
+		goto st_case_94
+	case 317:
+		goto st_case_317
+	case 318:
+		goto st_case_318
+	case 95:
+		goto st_case_95
+	case 319:
+		goto st_case_319
+	case 320:
+		goto st_case_320
+	case 321:
+		goto st_case_321
+	case 322:
+		goto st_case_322
+	case 323:
+		goto st_case_323
+	case 324:
+		goto st_case_324
+	case 325:
+		goto st_case_325
+	case 326:
+		goto st_case_326
+	case 327:
+		goto st_case_327
+	case 328:
+		goto st_case_328
+	case 329:
+		goto st_case_329
+	case 330:
+		goto st_case_330
+	case 331:
+		goto st_case_331
+	case 332:
+		goto st_case_332
+	case 333:
+		goto st_case_333
+	case 334:
+		goto st_case_334
+	case 335:
+		goto st_case_335
+	case 336:
+		goto st_case_336
+	case 337:
+		goto st_case_337
+	case 338:
+		goto st_case_338
+	case 96:
+		goto st_case_96
+	case 97:
+		goto st_case_97
+	case 339:
+		goto st_case_339
+	case 340:
+		goto st_case_340
+	case 98:
+		goto st_case_98
+	case 341:
+		goto st_case_341
+	case 342:
+		goto st_case_342
+	case 343:
+		goto st_case_343
+	case 344:
+		goto st_case_344
+	case 345:
+		goto st_case_345
+	case 346:
+		goto st_case_346
+	case 347:
+		goto st_case_347
+	case 348:
+		goto st_case_348
+	case 349:
+		goto st_case_349
+	case 350:
+		goto st_case_350
+	case 351:
+		goto st_case_351
+	case 352:
+		goto st_case_352
+	case 353:
+		goto st_case_353
+	case 354:
+		goto st_case_354
+	case 355:
+		goto st_case_355
+	case 356:
+		goto st_case_356
+	case 357:
+		goto st_case_357
+	case 358:
+		goto st_case_358
+	case 359:
+		goto st_case_359
+	case 360:
+		goto st_case_360
+	case 99:
+		goto st_case_99
+	case 361:
+		goto st_case_361
+	case 362:
+		goto st_case_362
+	case 100:
+		goto st_case_100
+	case 101:
+		goto st_case_101
+	case 102:
+		goto st_case_102
+	case 103:
+		goto st_case_103
+	case 363:
+		goto st_case_363
+	case 364:
+		goto st_case_364
+	case 104:
+		goto st_case_104
+	case 105:
+		goto st_case_105
+	case 365:
+		goto st_case_365
+	case 366:
+		goto st_case_366
+	case 367:
+		goto st_case_367
+	case 368:
+		goto st_case_368
+	case 106:
+		goto st_case_106
+	case 107:
+		goto st_case_107
+	case 108:
+		goto st_case_108
+	case 369:
+		goto st_case_369
+	case 109:
+		goto st_case_109
+	case 110:
+		goto st_case_110
+	case 111:
+		goto st_case_111
+	case 370:
+		goto st_case_370
+	case 112:
+		goto st_case_112
+	case 113:
+		goto st_case_113
+	case 371:
+		goto st_case_371
+	case 372:
+		goto st_case_372
+	case 114:
+		goto st_case_114
+	case 115:
+		goto st_case_115
+	case 116:
+		goto st_case_116
+	case 117:
+		goto st_case_117
+	case 118:
+		goto st_case_118
+	case 119:
+		goto st_case_119
+	case 120:
+		goto st_case_120
+	case 121:
+		goto st_case_121
+	case 122:
+		goto st_case_122
+	case 123:
+		goto st_case_123
+	case 124:
+		goto st_case_124
+	case 125:
+		goto st_case_125
+	case 373:
+		goto st_case_373
+	case 374:
+		goto st_case_374
+	case 375:
+		goto st_case_375
+	case 126:
+		goto st_case_126
+	case 376:
+		goto st_case_376
+	case 377:
+		goto st_case_377
+	case 378:
+		goto st_case_378
+	case 379:
+		goto st_case_379
+	case 380:
+		goto st_case_380
+	case 381:
+		goto st_case_381
+	case 382:
+		goto st_case_382
+	case 383:
+		goto st_case_383
+	case 384:
+		goto st_case_384
+	case 385:
+		goto st_case_385
+	case 386:
+		goto st_case_386
+	case 387:
+		goto st_case_387
+	case 388:
+		goto st_case_388
+	case 389:
+		goto st_case_389
+	case 390:
+		goto st_case_390
+	case 391:
+		goto st_case_391
+	case 392:
+		goto st_case_392
+	case 393:
+		goto st_case_393
+	case 394:
+		goto st_case_394
+	case 395:
+		goto st_case_395
+	case 396:
+		goto st_case_396
+	case 397:
+		goto st_case_397
+	case 127:
+		goto st_case_127
+	case 398:
+		goto st_case_398
+	case 399:
+		goto st_case_399
+	case 400:
+		goto st_case_400
+	case 401:
+		goto st_case_401
+	case 128:
+		goto st_case_128
+	case 402:
+		goto st_case_402
+	case 403:
+		goto st_case_403
+	case 404:
+		goto st_case_404
+	case 405:
+		goto st_case_405
+	case 406:
+		goto st_case_406
+	case 407:
+		goto st_case_407
+	case 408:
+		goto st_case_408
+	case 409:
+		goto st_case_409
+	case 410:
+		goto st_case_410
+	case 411:
+		goto st_case_411
+	case 412:
+		goto st_case_412
+	case 413:
+		goto st_case_413
+	case 414:
+		goto st_case_414
+	case 415:
+		goto st_case_415
+	case 416:
+		goto st_case_416
+	case 417:
+		goto st_case_417
+	case 418:
+		goto st_case_418
+	case 419:
+		goto st_case_419
+	case 420:
+		goto st_case_420
+	case 421:
+		goto st_case_421
+	case 129:
+		goto st_case_129
+	case 130:
+		goto st_case_130
+	case 131:
+		goto st_case_131
+	case 422:
+		goto st_case_422
+	case 423:
+		goto st_case_423
+	case 132:
+		goto st_case_132
+	case 424:
+		goto st_case_424
+	case 425:
+		goto st_case_425
+	case 426:
+		goto st_case_426
+	case 427:
+		goto st_case_427
+	case 428:
+		goto st_case_428
+	case 429:
+		goto st_case_429
+	case 430:
+		goto st_case_430
+	case 431:
+		goto st_case_431
+	case 432:
+		goto st_case_432
+	case 433:
+		goto st_case_433
+	case 434:
+		goto st_case_434
+	case 435:
+		goto st_case_435
+	case 436:
+		goto st_case_436
+	case 437:
+		goto st_case_437
+	case 438:
+		goto st_case_438
+	case 439:
+		goto st_case_439
+	case 440:
+		goto st_case_440
+	case 441:
+		goto st_case_441
+	case 442:
+		goto st_case_442
+	case 443:
+		goto st_case_443
+	case 133:
+		goto st_case_133
+	case 444:
+		goto st_case_444
+	case 445:
+		goto st_case_445
+	case 446:
+		goto st_case_446
+	case 134:
+		goto st_case_134
+	case 447:
+		goto st_case_447
+	case 448:
+		goto st_case_448
+	case 449:
+		goto st_case_449
+	case 450:
+		goto st_case_450
+	case 451:
+		goto st_case_451
+	case 452:
+		goto st_case_452
+	case 453:
+		goto st_case_453
+	case 454:
+		goto st_case_454
+	case 455:
+		goto st_case_455
+	case 456:
+		goto st_case_456
+	case 457:
+		goto st_case_457
+	case 458:
+		goto st_case_458
+	case 459:
+		goto st_case_459
+	case 460:
+		goto st_case_460
+	case 461:
+		goto st_case_461
+	case 462:
+		goto st_case_462
+	case 463:
+		goto st_case_463
+	case 464:
+		goto st_case_464
+	case 465:
+		goto st_case_465
+	case 466:
+		goto st_case_466
+	case 467:
+		goto st_case_467
+	case 468:
+		goto st_case_468
+	case 135:
+		goto st_case_135
+	case 469:
+		goto st_case_469
+	case 470:
+		goto st_case_470
+	case 471:
+		goto st_case_471
+	case 472:
+		goto st_case_472
+	case 473:
+		goto st_case_473
+	case 474:
+		goto st_case_474
+	case 475:
+		goto st_case_475
+	case 476:
+		goto st_case_476
+	case 477:
+		goto st_case_477
+	case 478:
+		goto st_case_478
+	case 479:
+		goto st_case_479
+	case 480:
+		goto st_case_480
+	case 481:
+		goto st_case_481
+	case 482:
+		goto st_case_482
+	case 483:
+		goto st_case_483
+	case 484:
+		goto st_case_484
+	case 485:
+		goto st_case_485
+	case 486:
+		goto st_case_486
+	case 487:
+		goto st_case_487
+	case 488:
+		goto st_case_488
+	case 489:
+		goto st_case_489
+	case 490:
+		goto st_case_490
+	case 136:
+		goto st_case_136
+	case 137:
+		goto st_case_137
+	case 138:
+		goto st_case_138
+	case 139:
+		goto st_case_139
+	case 491:
+		goto st_case_491
+	case 492:
+		goto st_case_492
+	case 140:
+		goto st_case_140
+	case 493:
+		goto st_case_493
+	case 141:
+		goto st_case_141
+	case 494:
+		goto st_case_494
+	case 495:
+		goto st_case_495
+	case 496:
+		goto st_case_496
+	case 497:
+		goto st_case_497
+	case 142:
+		goto st_case_142
+	case 143:
+		goto st_case_143
+	case 144:
+		goto st_case_144
+	case 498:
+		goto st_case_498
+	case 145:
+		goto st_case_145
+	case 146:
+		goto st_case_146
+	case 147:
+		goto st_case_147
+	case 499:
+		goto st_case_499
+	case 148:
+		goto st_case_148
+	case 149:
+		goto st_case_149
+	case 500:
+		goto st_case_500
+	case 501:
+		goto st_case_501
+	case 150:
+		goto st_case_150
+	case 151:
+		goto st_case_151
+	case 502:
+		goto st_case_502
+	case 503:
+		goto st_case_503
+	case 504:
+		goto st_case_504
+	case 152:
+		goto st_case_152
+	case 505:
+		goto st_case_505
+	case 506:
+		goto st_case_506
+	case 507:
+		goto st_case_507
+	case 508:
+		goto st_case_508
+	case 509:
+		goto st_case_509
+	case 510:
+		goto st_case_510
+	case 511:
+		goto st_case_511
+	case 512:
+		goto st_case_512
+	case 513:
+		goto st_case_513
+	case 514:
+		goto st_case_514
+	case 515:
+		goto st_case_515
+	case 516:
+		goto st_case_516
+	case 517:
+		goto st_case_517
+	case 518:
+		goto st_case_518
+	case 519:
+		goto st_case_519
+	case 520:
+		goto st_case_520
+	case 521:
+		goto st_case_521
+	case 522:
+		goto st_case_522
+	case 523:
+		goto st_case_523
+	case 524:
+		goto st_case_524
+	case 525:
+		goto st_case_525
+	case 153:
+		goto st_case_153
+	case 154:
+		goto st_case_154
+	case 526:
+		goto st_case_526
+	case 527:
+		goto st_case_527
+	case 528:
+		goto st_case_528
+	case 529:
+		goto st_case_529
+	case 155:
+		goto st_case_155
+	case 156:
+		goto st_case_156
+	case 157:
+		goto st_case_157
+	case 530:
+		goto st_case_530
+	case 158:
+		goto st_case_158
+	case 159:
+		goto st_case_159
+	case 160:
+		goto st_case_160
+	case 531:
+		goto st_case_531
+	case 161:
+		goto st_case_161
+	case 162:
+		goto st_case_162
+	case 532:
+		goto st_case_532
+	case 533:
+		goto st_case_533
+	case 163:
+		goto st_case_163
+	case 164:
+		goto st_case_164
+	case 165:
+		goto st_case_165
+	case 534:
+		goto st_case_534
+	case 535:
+		goto st_case_535
+	case 166:
+		goto st_case_166
+	case 536:
+		goto st_case_536
+	case 537:
+		goto st_case_537
+	case 167:
+		goto st_case_167
+	case 538:
+		goto st_case_538
+	case 539:
+		goto st_case_539
+	case 540:
+		goto st_case_540
+	case 541:
+		goto st_case_541
+	case 168:
+		goto st_case_168
+	case 169:
+		goto st_case_169
+	case 170:
+		goto st_case_170
+	case 542:
+		goto st_case_542
+	case 171:
+		goto st_case_171
+	case 172:
+		goto st_case_172
+	case 173:
+		goto st_case_173
+	case 543:
+		goto st_case_543
+	case 174:
+		goto st_case_174
+	case 175:
+		goto st_case_175
+	case 544:
+		goto st_case_544
+	case 545:
+		goto st_case_545
+	case 176:
+		goto st_case_176
+	case 546:
+		goto st_case_546
+	case 547:
+		goto st_case_547
+	case 177:
+		goto st_case_177
+	case 178:
+		goto st_case_178
+	case 548:
+		goto st_case_548
+	case 549:
+		goto st_case_549
+	case 550:
+		goto st_case_550
+	case 179:
+		goto st_case_179
+	case 180:
+		goto st_case_180
+	case 181:
+		goto st_case_181
+	case 551:
+		goto st_case_551
+	case 182:
+		goto st_case_182
+	case 183:
+		goto st_case_183
+	case 184:
+		goto st_case_184
+	case 552:
+		goto st_case_552
+	case 185:
+		goto st_case_185
+	case 186:
+		goto st_case_186
+	case 553:
+		goto st_case_553
+	case 554:
+		goto st_case_554
+	case 187:
+		goto st_case_187
+	case 555:
+		goto st_case_555
+	case 188:
+		goto st_case_188
+	case 556:
+		goto st_case_556
+	case 557:
+		goto st_case_557
+	case 189:
+		goto st_case_189
+	case 190:
+		goto st_case_190
+	}
+	goto st_out
+	st1:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof1
+		}
+	st_case_1:
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr1
+		case 35:
+			goto tr1
+		case 44:
+			goto tr1
+		case 92:
+			goto tr2
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr1
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr1
+		}
+		goto tr0
+tr0:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st2
+	st2:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof2
+		}
+	st_case_2:
+//line plugins/parsers/influx/machine.go:2386
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+tr4:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st3
+tr58:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st3
+	st3:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof3
+		}
+	st_case_3:
+//line plugins/parsers/influx/machine.go:2422
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr11
+		case 13:
+			goto tr5
+		case 32:
+			goto st3
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st3
+		}
+		goto tr9
+tr9:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st4
+	st4:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof4
+		}
+	st_case_4:
+//line plugins/parsers/influx/machine.go:2454
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr5
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr1:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr5:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr31:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr50:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr59:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr99:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr201:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr210:
+	 m.cs = 0
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++; goto _out }
+
+	goto _again
+//line plugins/parsers/influx/machine.go:2658
+st_case_0:
+	st0:
+		 m.cs = 0
+		goto _out
+tr14:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st5
+	st5:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof5
+		}
+	st_case_5:
+//line plugins/parsers/influx/machine.go:2674
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st6
+		case 45:
+			goto tr17
+		case 46:
+			goto tr18
+		case 48:
+			goto tr19
+		case 70:
+			goto tr21
+		case 84:
+			goto tr22
+		case 102:
+			goto tr23
+		case 116:
+			goto tr24
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto tr20
+		}
+		goto tr5
+	st6:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof6
+		}
+	st_case_6:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr26
+		case 92:
+			goto tr27
+		}
+		goto tr25
+tr25:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st7
+	st7:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof7
+		}
+	st_case_7:
+//line plugins/parsers/influx/machine.go:2720
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		goto st7
+tr26:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st191
+tr29:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st191
+	st191:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof191
+		}
+	st_case_191:
+//line plugins/parsers/influx/machine.go:2749
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto st9
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st192
+		}
+		goto tr99
+tr355:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st192
+tr361:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st192
+tr364:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st192
+	st192:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof192
+		}
+	st_case_192:
+//line plugins/parsers/influx/machine.go:2787
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 45:
+			goto tr332
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr333
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st192
+		}
+		goto tr31
+tr330:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr335:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr356:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr362:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr365:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+	st193:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof193
+		}
+	st_case_193:
+//line plugins/parsers/influx/machine.go:2873
+		goto tr1
+tr332:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st8
+	st8:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof8
+		}
+	st_case_8:
+//line plugins/parsers/influx/machine.go:2886
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st194
+		}
+		goto tr31
+tr333:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st194
+	st194:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof194
+		}
+	st_case_194:
+//line plugins/parsers/influx/machine.go:2902
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st196
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+tr334:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st195
+	st195:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof195
+		}
+	st_case_195:
+//line plugins/parsers/influx/machine.go:2931
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto tr1
+	st196:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof196
+		}
+	st_case_196:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st197
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st197:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof197
+		}
+	st_case_197:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st198
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st198:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof198
+		}
+	st_case_198:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st199
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st199:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof199
+		}
+	st_case_199:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st200
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st200:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof200
+		}
+	st_case_200:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st201
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st201:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof201
+		}
+	st_case_201:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st202
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st202:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof202
+		}
+	st_case_202:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st203
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st203:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof203
+		}
+	st_case_203:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st204
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st204:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof204
+		}
+	st_case_204:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st205
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st205:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof205
+		}
+	st_case_205:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st206
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st206:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof206
+		}
+	st_case_206:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st207
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st207:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof207
+		}
+	st_case_207:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st208
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st208:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof208
+		}
+	st_case_208:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st209
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st209:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof209
+		}
+	st_case_209:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st210
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st210:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof210
+		}
+	st_case_210:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st211
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st211:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof211
+		}
+	st_case_211:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st212
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st212:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof212
+		}
+	st_case_212:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st213
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto tr31
+	st213:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof213
+		}
+	st_case_213:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr334
+		}
+		goto tr31
+tr357:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st9
+tr363:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st9
+tr366:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st9
+	st9:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof9
+		}
+	st_case_9:
+//line plugins/parsers/influx/machine.go:3358
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr5
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto tr9
+tr12:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st10
+	st10:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof10
+		}
+	st_case_10:
+//line plugins/parsers/influx/machine.go:3389
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr27:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st11
+	st11:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof11
+		}
+	st_case_11:
+//line plugins/parsers/influx/machine.go:3410
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st7
+		case 92:
+			goto st7
+		}
+		goto tr5
+tr17:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st12
+	st12:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof12
+		}
+	st_case_12:
+//line plugins/parsers/influx/machine.go:3429
+		if ( m.data)[( m.p)] == 48 {
+			goto st214
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st218
+		}
+		goto tr5
+tr19:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st214
+	st214:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof214
+		}
+	st_case_214:
+//line plugins/parsers/influx/machine.go:3448
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 13:
+			goto tr356
+		case 32:
+			goto tr355
+		case 44:
+			goto tr357
+		case 46:
+			goto st215
+		case 69:
+			goto st13
+		case 101:
+			goto st13
+		case 105:
+			goto st217
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr355
+		}
+		goto tr99
+tr18:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st215
+	st215:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof215
+		}
+	st_case_215:
+//line plugins/parsers/influx/machine.go:3482
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 13:
+			goto tr356
+		case 32:
+			goto tr355
+		case 44:
+			goto tr357
+		case 69:
+			goto st13
+		case 101:
+			goto st13
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st215
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr355
+		}
+		goto tr99
+	st13:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof13
+		}
+	st_case_13:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st14
+		case 43:
+			goto st14
+		case 45:
+			goto st14
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st216
+		}
+		goto tr5
+	st14:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof14
+		}
+	st_case_14:
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st216
+		}
+		goto tr5
+	st216:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof216
+		}
+	st_case_216:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 13:
+			goto tr356
+		case 32:
+			goto tr355
+		case 44:
+			goto tr357
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st216
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr355
+		}
+		goto tr99
+	st217:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof217
+		}
+	st_case_217:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr363
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr361
+		}
+		goto tr99
+tr20:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st218
+	st218:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof218
+		}
+	st_case_218:
+//line plugins/parsers/influx/machine.go:3586
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 13:
+			goto tr356
+		case 32:
+			goto tr355
+		case 44:
+			goto tr357
+		case 46:
+			goto st215
+		case 69:
+			goto st13
+		case 101:
+			goto st13
+		case 105:
+			goto st217
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st218
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr355
+		}
+		goto tr99
+tr21:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st219
+	st219:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof219
+		}
+	st_case_219:
+//line plugins/parsers/influx/machine.go:3625
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 13:
+			goto tr365
+		case 32:
+			goto tr364
+		case 44:
+			goto tr366
+		case 65:
+			goto st15
+		case 97:
+			goto st18
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr364
+		}
+		goto tr99
+	st15:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof15
+		}
+	st_case_15:
+		if ( m.data)[( m.p)] == 76 {
+			goto st16
+		}
+		goto tr5
+	st16:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof16
+		}
+	st_case_16:
+		if ( m.data)[( m.p)] == 83 {
+			goto st17
+		}
+		goto tr5
+	st17:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof17
+		}
+	st_case_17:
+		if ( m.data)[( m.p)] == 69 {
+			goto st220
+		}
+		goto tr5
+	st220:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof220
+		}
+	st_case_220:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 13:
+			goto tr365
+		case 32:
+			goto tr364
+		case 44:
+			goto tr366
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr364
+		}
+		goto tr99
+	st18:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof18
+		}
+	st_case_18:
+		if ( m.data)[( m.p)] == 108 {
+			goto st19
+		}
+		goto tr5
+	st19:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof19
+		}
+	st_case_19:
+		if ( m.data)[( m.p)] == 115 {
+			goto st20
+		}
+		goto tr5
+	st20:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof20
+		}
+	st_case_20:
+		if ( m.data)[( m.p)] == 101 {
+			goto st220
+		}
+		goto tr5
+tr22:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st221
+	st221:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof221
+		}
+	st_case_221:
+//line plugins/parsers/influx/machine.go:3728
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 13:
+			goto tr365
+		case 32:
+			goto tr364
+		case 44:
+			goto tr366
+		case 82:
+			goto st21
+		case 114:
+			goto st22
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr364
+		}
+		goto tr99
+	st21:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof21
+		}
+	st_case_21:
+		if ( m.data)[( m.p)] == 85 {
+			goto st17
+		}
+		goto tr5
+	st22:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof22
+		}
+	st_case_22:
+		if ( m.data)[( m.p)] == 117 {
+			goto st20
+		}
+		goto tr5
+tr23:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st222
+	st222:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof222
+		}
+	st_case_222:
+//line plugins/parsers/influx/machine.go:3776
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 13:
+			goto tr365
+		case 32:
+			goto tr364
+		case 44:
+			goto tr366
+		case 97:
+			goto st18
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr364
+		}
+		goto tr99
+tr24:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st223
+	st223:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof223
+		}
+	st_case_223:
+//line plugins/parsers/influx/machine.go:3804
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 13:
+			goto tr365
+		case 32:
+			goto tr364
+		case 44:
+			goto tr366
+		case 114:
+			goto st22
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr364
+		}
+		goto tr99
+tr11:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st23
+	st23:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof23
+		}
+	st_case_23:
+//line plugins/parsers/influx/machine.go:3832
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr11
+		case 13:
+			goto tr5
+		case 32:
+			goto st3
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st3
+		}
+		goto tr9
+tr6:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st24
+	st24:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof24
+		}
+	st_case_24:
+//line plugins/parsers/influx/machine.go:3864
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr43
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 61:
+			goto st2
+		case 92:
+			goto tr44
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto tr42
+tr42:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st25
+	st25:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof25
+		}
+	st_case_25:
+//line plugins/parsers/influx/machine.go:3896
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr46
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st25
+tr46:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st26
+tr43:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st26
+	st26:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof26
+		}
+	st_case_26:
+//line plugins/parsers/influx/machine.go:3938
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr43
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto tr44
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto tr42
+tr7:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st27
+tr61:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st27
+	st27:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof27
+		}
+	st_case_27:
+//line plugins/parsers/influx/machine.go:3976
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr50
+		case 44:
+			goto tr50
+		case 61:
+			goto tr50
+		case 92:
+			goto tr51
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr50
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr50
+		}
+		goto tr49
+tr49:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st28
+	st28:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof28
+		}
+	st_case_28:
+//line plugins/parsers/influx/machine.go:4007
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr50
+		case 44:
+			goto tr50
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr50
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr50
+		}
+		goto st28
+tr53:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+	goto st29
+	st29:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof29
+		}
+	st_case_29:
+//line plugins/parsers/influx/machine.go:4038
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr50
+		case 44:
+			goto tr50
+		case 61:
+			goto tr50
+		case 92:
+			goto tr56
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr50
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr50
+		}
+		goto tr55
+tr55:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st30
+	st30:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof30
+		}
+	st_case_30:
+//line plugins/parsers/influx/machine.go:4069
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+tr60:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st31
+	st31:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof31
+		}
+	st_case_31:
+//line plugins/parsers/influx/machine.go:4101
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr64
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto tr65
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto tr63
+tr63:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st32
+	st32:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof32
+		}
+	st_case_32:
+//line plugins/parsers/influx/machine.go:4133
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr67
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st32
+tr67:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st33
+tr64:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st33
+	st33:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof33
+		}
+	st_case_33:
+//line plugins/parsers/influx/machine.go:4175
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr64
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto tr65
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto tr63
+tr65:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st34
+	st34:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof34
+		}
+	st_case_34:
+//line plugins/parsers/influx/machine.go:4207
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st32
+tr56:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st35
+	st35:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof35
+		}
+	st_case_35:
+//line plugins/parsers/influx/machine.go:4228
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr50
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr50
+		}
+		goto st30
+tr51:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st36
+	st36:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof36
+		}
+	st_case_36:
+//line plugins/parsers/influx/machine.go:4249
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr50
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr50
+		}
+		goto st28
+tr47:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st37
+	st37:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof37
+		}
+	st_case_37:
+//line plugins/parsers/influx/machine.go:4270
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 34:
+			goto st38
+		case 44:
+			goto tr7
+		case 45:
+			goto tr70
+		case 46:
+			goto tr71
+		case 48:
+			goto tr72
+		case 70:
+			goto tr74
+		case 84:
+			goto tr75
+		case 92:
+			goto st129
+		case 102:
+			goto tr76
+		case 116:
+			goto tr77
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr73
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+	st38:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof38
+		}
+	st_case_38:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr25
+		case 11:
+			goto tr80
+		case 13:
+			goto tr25
+		case 32:
+			goto tr79
+		case 34:
+			goto tr81
+		case 44:
+			goto tr82
+		case 92:
+			goto tr83
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr79
+		}
+		goto tr78
+tr78:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st39
+	st39:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof39
+		}
+	st_case_39:
+//line plugins/parsers/influx/machine.go:4346
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+tr85:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st40
+tr79:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st40
+tr229:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st40
+	st40:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof40
+		}
+	st_case_40:
+//line plugins/parsers/influx/machine.go:4394
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr92
+		case 13:
+			goto st7
+		case 32:
+			goto st40
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st40
+		}
+		goto tr90
+tr90:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st41
+	st41:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof41
+		}
+	st_case_41:
+//line plugins/parsers/influx/machine.go:4428
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st41
+tr93:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st224
+tr96:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st224
+tr112:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st224
+	st224:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof224
+		}
+	st_case_224:
+//line plugins/parsers/influx/machine.go:4481
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st225
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto st9
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st192
+		}
+		goto st4
+	st225:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof225
+		}
+	st_case_225:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st225
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto tr99
+		case 45:
+			goto tr372
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr373
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st192
+		}
+		goto st4
+tr372:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st42
+	st42:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof42
+		}
+	st_case_42:
+//line plugins/parsers/influx/machine.go:4545
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr99
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr99
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st226
+			}
+		default:
+			goto tr99
+		}
+		goto st4
+tr373:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st226
+	st226:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof226
+		}
+	st_case_226:
+//line plugins/parsers/influx/machine.go:4580
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st228
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+tr374:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st227
+	st227:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof227
+		}
+	st_case_227:
+//line plugins/parsers/influx/machine.go:4617
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st227
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st4
+	st228:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof228
+		}
+	st_case_228:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st229
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st229:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof229
+		}
+	st_case_229:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st230
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st230:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof230
+		}
+	st_case_230:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st231
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st231:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof231
+		}
+	st_case_231:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st232
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st232:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof232
+		}
+	st_case_232:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st233
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st233:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof233
+		}
+	st_case_233:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st234
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st234:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof234
+		}
+	st_case_234:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st235
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st235:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof235
+		}
+	st_case_235:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st236
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st236:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof236
+		}
+	st_case_236:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st237
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st237:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof237
+		}
+	st_case_237:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st238
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st238:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof238
+		}
+	st_case_238:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st239
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st239:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof239
+		}
+	st_case_239:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st240
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st240:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof240
+		}
+	st_case_240:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st241
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st241:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof241
+		}
+	st_case_241:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st242
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st242:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof242
+		}
+	st_case_242:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st243
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st243:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof243
+		}
+	st_case_243:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st244
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st244:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof244
+		}
+	st_case_244:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st245
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st245:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof245
+		}
+	st_case_245:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr374
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr334
+		}
+		goto st4
+tr97:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st43
+	st43:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof43
+		}
+	st_case_43:
+//line plugins/parsers/influx/machine.go:5184
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr101
+		case 45:
+			goto tr102
+		case 46:
+			goto tr103
+		case 48:
+			goto tr104
+		case 70:
+			goto tr106
+		case 84:
+			goto tr107
+		case 92:
+			goto st11
+		case 102:
+			goto tr108
+		case 116:
+			goto tr109
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto tr105
+		}
+		goto st7
+tr101:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st246
+	st246:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof246
+		}
+	st_case_246:
+//line plugins/parsers/influx/machine.go:5220
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr395
+		case 13:
+			goto tr395
+		case 32:
+			goto tr394
+		case 34:
+			goto tr26
+		case 44:
+			goto tr396
+		case 92:
+			goto tr27
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr394
+		}
+		goto tr25
+tr394:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st247
+tr423:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st247
+tr429:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st247
+tr432:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st247
+	st247:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof247
+		}
+	st_case_247:
+//line plugins/parsers/influx/machine.go:5268
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 13:
+			goto tr398
+		case 32:
+			goto st247
+		case 34:
+			goto tr29
+		case 45:
+			goto tr399
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr400
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st247
+		}
+		goto st7
+tr398:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr402:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr424:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr430:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr433:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr395:
+	 m.cs = 248
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+	st248:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof248
+		}
+	st_case_248:
+//line plugins/parsers/influx/machine.go:5371
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		goto st7
+tr399:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st44
+	st44:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof44
+		}
+	st_case_44:
+//line plugins/parsers/influx/machine.go:5390
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st249
+		}
+		goto st7
+tr400:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st249
+	st249:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof249
+		}
+	st_case_249:
+//line plugins/parsers/influx/machine.go:5412
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st251
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+tr401:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st250
+	st250:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof250
+		}
+	st_case_250:
+//line plugins/parsers/influx/machine.go:5445
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 13:
+			goto tr398
+		case 32:
+			goto st250
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st250
+		}
+		goto st7
+	st251:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof251
+		}
+	st_case_251:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st252
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st252:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof252
+		}
+	st_case_252:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st253
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st253:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof253
+		}
+	st_case_253:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st254
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st254:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof254
+		}
+	st_case_254:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st255
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st255:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof255
+		}
+	st_case_255:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st256
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st256:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof256
+		}
+	st_case_256:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st257
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st257:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof257
+		}
+	st_case_257:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st258
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st258:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof258
+		}
+	st_case_258:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st259
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st259:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof259
+		}
+	st_case_259:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st260
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st260:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof260
+		}
+	st_case_260:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st261
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st261:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof261
+		}
+	st_case_261:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st262
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st262:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof262
+		}
+	st_case_262:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st263
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st263:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof263
+		}
+	st_case_263:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st264
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st264:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof264
+		}
+	st_case_264:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st265
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st265:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof265
+		}
+	st_case_265:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st266
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st266:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof266
+		}
+	st_case_266:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st267
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st267:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof267
+		}
+	st_case_267:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st268
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st7
+	st268:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof268
+		}
+	st_case_268:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr401
+		}
+		goto st7
+tr396:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st45
+tr439:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st45
+tr443:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st45
+tr444:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st45
+	st45:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof45
+		}
+	st_case_45:
+//line plugins/parsers/influx/machine.go:5954
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr112
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr113
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr111
+tr111:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st46
+	st46:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof46
+		}
+	st_case_46:
+//line plugins/parsers/influx/machine.go:5987
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr115
+		case 92:
+			goto st74
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st46
+tr115:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st47
+	st47:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof47
+		}
+	st_case_47:
+//line plugins/parsers/influx/machine.go:6020
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr117
+		case 45:
+			goto tr102
+		case 46:
+			goto tr103
+		case 48:
+			goto tr104
+		case 70:
+			goto tr106
+		case 84:
+			goto tr107
+		case 92:
+			goto st11
+		case 102:
+			goto tr108
+		case 116:
+			goto tr109
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto tr105
+		}
+		goto st7
+tr117:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st269
+	st269:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof269
+		}
+	st_case_269:
+//line plugins/parsers/influx/machine.go:6056
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr395
+		case 13:
+			goto tr395
+		case 32:
+			goto tr394
+		case 34:
+			goto tr26
+		case 44:
+			goto tr422
+		case 92:
+			goto tr27
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr394
+		}
+		goto tr25
+tr422:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st48
+tr425:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st48
+tr431:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st48
+tr434:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st48
+	st48:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof48
+		}
+	st_case_48:
+//line plugins/parsers/influx/machine.go:6104
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr119
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr118
+tr118:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st49
+	st49:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof49
+		}
+	st_case_49:
+//line plugins/parsers/influx/machine.go:6137
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr121
+		case 92:
+			goto st62
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st49
+tr121:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st50
+	st50:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof50
+		}
+	st_case_50:
+//line plugins/parsers/influx/machine.go:6170
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr117
+		case 45:
+			goto tr123
+		case 46:
+			goto tr124
+		case 48:
+			goto tr125
+		case 70:
+			goto tr127
+		case 84:
+			goto tr128
+		case 92:
+			goto st11
+		case 102:
+			goto tr129
+		case 116:
+			goto tr130
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto tr126
+		}
+		goto st7
+tr123:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st51
+	st51:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof51
+		}
+	st_case_51:
+//line plugins/parsers/influx/machine.go:6206
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 48:
+			goto st270
+		case 92:
+			goto st11
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st275
+		}
+		goto st7
+tr125:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st270
+	st270:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof270
+		}
+	st_case_270:
+//line plugins/parsers/influx/machine.go:6230
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr425
+		case 46:
+			goto st271
+		case 69:
+			goto st52
+		case 92:
+			goto st11
+		case 101:
+			goto st52
+		case 105:
+			goto st274
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr423
+		}
+		goto st7
+tr124:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st271
+	st271:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof271
+		}
+	st_case_271:
+//line plugins/parsers/influx/machine.go:6268
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr425
+		case 69:
+			goto st52
+		case 92:
+			goto st11
+		case 101:
+			goto st52
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st271
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+	st52:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof52
+		}
+	st_case_52:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr133
+		case 43:
+			goto st53
+		case 45:
+			goto st53
+		case 92:
+			goto st11
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st273
+		}
+		goto st7
+tr133:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st272
+	st272:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof272
+		}
+	st_case_272:
+//line plugins/parsers/influx/machine.go:6326
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto st9
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st216
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st192
+		}
+		goto tr99
+	st53:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof53
+		}
+	st_case_53:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st273
+		}
+		goto st7
+	st273:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof273
+		}
+	st_case_273:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr425
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st273
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+	st274:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof274
+		}
+	st_case_274:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr430
+		case 13:
+			goto tr430
+		case 32:
+			goto tr429
+		case 34:
+			goto tr29
+		case 44:
+			goto tr431
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr429
+		}
+		goto st7
+tr126:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st275
+	st275:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof275
+		}
+	st_case_275:
+//line plugins/parsers/influx/machine.go:6423
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr425
+		case 46:
+			goto st271
+		case 69:
+			goto st52
+		case 92:
+			goto st11
+		case 101:
+			goto st52
+		case 105:
+			goto st274
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st275
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+tr127:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st276
+	st276:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof276
+		}
+	st_case_276:
+//line plugins/parsers/influx/machine.go:6466
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 65:
+			goto st54
+		case 92:
+			goto st11
+		case 97:
+			goto st57
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st54:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof54
+		}
+	st_case_54:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 76:
+			goto st55
+		case 92:
+			goto st11
+		}
+		goto st7
+	st55:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof55
+		}
+	st_case_55:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 83:
+			goto st56
+		case 92:
+			goto st11
+		}
+		goto st7
+	st56:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof56
+		}
+	st_case_56:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 69:
+			goto st277
+		case 92:
+			goto st11
+		}
+		goto st7
+	st277:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof277
+		}
+	st_case_277:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st57:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof57
+		}
+	st_case_57:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 108:
+			goto st58
+		}
+		goto st7
+	st58:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof58
+		}
+	st_case_58:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 115:
+			goto st59
+		}
+		goto st7
+	st59:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof59
+		}
+	st_case_59:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 101:
+			goto st277
+		}
+		goto st7
+tr128:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st278
+	st278:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof278
+		}
+	st_case_278:
+//line plugins/parsers/influx/machine.go:6607
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 82:
+			goto st60
+		case 92:
+			goto st11
+		case 114:
+			goto st61
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st60:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof60
+		}
+	st_case_60:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 85:
+			goto st56
+		case 92:
+			goto st11
+		}
+		goto st7
+	st61:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof61
+		}
+	st_case_61:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st59
+		}
+		goto st7
+tr129:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st279
+	st279:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof279
+		}
+	st_case_279:
+//line plugins/parsers/influx/machine.go:6669
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 92:
+			goto st11
+		case 97:
+			goto st57
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+tr130:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st280
+	st280:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof280
+		}
+	st_case_280:
+//line plugins/parsers/influx/machine.go:6701
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 92:
+			goto st11
+		case 114:
+			goto st61
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+tr119:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st62
+	st62:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof62
+		}
+	st_case_62:
+//line plugins/parsers/influx/machine.go:6733
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st49
+		case 92:
+			goto st49
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr102:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st63
+	st63:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof63
+		}
+	st_case_63:
+//line plugins/parsers/influx/machine.go:6760
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 48:
+			goto st281
+		case 92:
+			goto st11
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st285
+		}
+		goto st7
+tr104:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st281
+	st281:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof281
+		}
+	st_case_281:
+//line plugins/parsers/influx/machine.go:6784
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr439
+		case 46:
+			goto st282
+		case 69:
+			goto st64
+		case 92:
+			goto st11
+		case 101:
+			goto st64
+		case 105:
+			goto st284
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr423
+		}
+		goto st7
+tr103:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st282
+	st282:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof282
+		}
+	st_case_282:
+//line plugins/parsers/influx/machine.go:6822
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr439
+		case 69:
+			goto st64
+		case 92:
+			goto st11
+		case 101:
+			goto st64
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st282
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+	st64:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof64
+		}
+	st_case_64:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr133
+		case 43:
+			goto st65
+		case 45:
+			goto st65
+		case 92:
+			goto st11
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st283
+		}
+		goto st7
+	st65:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof65
+		}
+	st_case_65:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st283
+		}
+		goto st7
+	st283:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof283
+		}
+	st_case_283:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr439
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st283
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+	st284:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof284
+		}
+	st_case_284:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr430
+		case 13:
+			goto tr430
+		case 32:
+			goto tr429
+		case 34:
+			goto tr29
+		case 44:
+			goto tr443
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr429
+		}
+		goto st7
+tr105:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st285
+	st285:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof285
+		}
+	st_case_285:
+//line plugins/parsers/influx/machine.go:6946
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 13:
+			goto tr424
+		case 32:
+			goto tr423
+		case 34:
+			goto tr29
+		case 44:
+			goto tr439
+		case 46:
+			goto st282
+		case 69:
+			goto st64
+		case 92:
+			goto st11
+		case 101:
+			goto st64
+		case 105:
+			goto st284
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st285
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr423
+		}
+		goto st7
+tr106:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st286
+	st286:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof286
+		}
+	st_case_286:
+//line plugins/parsers/influx/machine.go:6989
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr444
+		case 65:
+			goto st66
+		case 92:
+			goto st11
+		case 97:
+			goto st69
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st66:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof66
+		}
+	st_case_66:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 76:
+			goto st67
+		case 92:
+			goto st11
+		}
+		goto st7
+	st67:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof67
+		}
+	st_case_67:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 83:
+			goto st68
+		case 92:
+			goto st11
+		}
+		goto st7
+	st68:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof68
+		}
+	st_case_68:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 69:
+			goto st287
+		case 92:
+			goto st11
+		}
+		goto st7
+	st287:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof287
+		}
+	st_case_287:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr444
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st69:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof69
+		}
+	st_case_69:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 108:
+			goto st70
+		}
+		goto st7
+	st70:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof70
+		}
+	st_case_70:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 115:
+			goto st71
+		}
+		goto st7
+	st71:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof71
+		}
+	st_case_71:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 101:
+			goto st287
+		}
+		goto st7
+tr107:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st288
+	st288:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof288
+		}
+	st_case_288:
+//line plugins/parsers/influx/machine.go:7130
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr444
+		case 82:
+			goto st72
+		case 92:
+			goto st11
+		case 114:
+			goto st73
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+	st72:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof72
+		}
+	st_case_72:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 85:
+			goto st68
+		case 92:
+			goto st11
+		}
+		goto st7
+	st73:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof73
+		}
+	st_case_73:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st71
+		}
+		goto st7
+tr108:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st289
+	st289:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof289
+		}
+	st_case_289:
+//line plugins/parsers/influx/machine.go:7192
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr444
+		case 92:
+			goto st11
+		case 97:
+			goto st69
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+tr109:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st290
+	st290:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof290
+		}
+	st_case_290:
+//line plugins/parsers/influx/machine.go:7224
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 13:
+			goto tr433
+		case 32:
+			goto tr432
+		case 34:
+			goto tr29
+		case 44:
+			goto tr444
+		case 92:
+			goto st11
+		case 114:
+			goto st73
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr432
+		}
+		goto st7
+tr113:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st74
+	st74:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof74
+		}
+	st_case_74:
+//line plugins/parsers/influx/machine.go:7256
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st46
+		case 92:
+			goto st46
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr94:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st75
+	st75:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof75
+		}
+	st_case_75:
+//line plugins/parsers/influx/machine.go:7283
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st41
+		case 92:
+			goto st41
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr92:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st76
+	st76:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof76
+		}
+	st_case_76:
+//line plugins/parsers/influx/machine.go:7310
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr92
+		case 13:
+			goto st7
+		case 32:
+			goto st40
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st40
+		}
+		goto tr90
+tr86:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st77
+tr80:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st77
+	st77:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof77
+		}
+	st_case_77:
+//line plugins/parsers/influx/machine.go:7354
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr151
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 61:
+			goto st39
+		case 92:
+			goto tr153
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto tr150
+tr150:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st78
+	st78:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof78
+		}
+	st_case_78:
+//line plugins/parsers/influx/machine.go:7388
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr155
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st78
+tr155:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st79
+tr151:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st79
+	st79:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof79
+		}
+	st_case_79:
+//line plugins/parsers/influx/machine.go:7432
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr151
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto tr153
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto tr150
+tr152:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st291
+tr156:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st291
+	st291:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof291
+		}
+	st_case_291:
+//line plugins/parsers/influx/machine.go:7476
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr450
+		case 13:
+			goto tr330
+		case 32:
+			goto tr449
+		case 44:
+			goto tr451
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr449
+		}
+		goto st25
+tr449:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st292
+tr481:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st292
+tr533:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st292
+tr539:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st292
+tr542:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st292
+tr747:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st292
+tr763:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st292
+tr766:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st292
+	st292:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof292
+		}
+	st_case_292:
+//line plugins/parsers/influx/machine.go:7574
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr453
+		case 13:
+			goto tr330
+		case 32:
+			goto st292
+		case 44:
+			goto tr99
+		case 45:
+			goto tr372
+		case 61:
+			goto tr99
+		case 92:
+			goto tr12
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr373
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st292
+		}
+		goto tr9
+tr453:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st293
+	st293:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof293
+		}
+	st_case_293:
+//line plugins/parsers/influx/machine.go:7613
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr453
+		case 13:
+			goto tr330
+		case 32:
+			goto st292
+		case 44:
+			goto tr99
+		case 45:
+			goto tr372
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr373
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st292
+		}
+		goto tr9
+tr450:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st294
+tr454:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st294
+	st294:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof294
+		}
+	st_case_294:
+//line plugins/parsers/influx/machine.go:7662
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr454
+		case 13:
+			goto tr330
+		case 32:
+			goto tr449
+		case 44:
+			goto tr7
+		case 45:
+			goto tr455
+		case 61:
+			goto tr47
+		case 92:
+			goto tr44
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr456
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr449
+		}
+		goto tr42
+tr455:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st80
+	st80:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof80
+		}
+	st_case_80:
+//line plugins/parsers/influx/machine.go:7701
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr99
+		case 11:
+			goto tr46
+		case 13:
+			goto tr99
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st295
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st25
+tr456:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st295
+	st295:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof295
+		}
+	st_case_295:
+//line plugins/parsers/influx/machine.go:7738
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st299
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+tr462:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st296
+tr490:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st296
+tr457:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st296
+tr487:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st296
+	st296:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof296
+		}
+	st_case_296:
+//line plugins/parsers/influx/machine.go:7801
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr461
+		case 13:
+			goto tr330
+		case 32:
+			goto st296
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st296
+		}
+		goto tr9
+tr461:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st297
+	st297:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof297
+		}
+	st_case_297:
+//line plugins/parsers/influx/machine.go:7833
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr461
+		case 13:
+			goto tr330
+		case 32:
+			goto st296
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st296
+		}
+		goto tr9
+tr463:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st298
+tr458:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st298
+	st298:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof298
+		}
+	st_case_298:
+//line plugins/parsers/influx/machine.go:7879
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr463
+		case 13:
+			goto tr330
+		case 32:
+			goto tr462
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto tr44
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr462
+		}
+		goto tr42
+tr44:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st81
+	st81:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof81
+		}
+	st_case_81:
+//line plugins/parsers/influx/machine.go:7911
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st25
+	st299:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof299
+		}
+	st_case_299:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st300
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st300:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof300
+		}
+	st_case_300:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st301
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st301:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof301
+		}
+	st_case_301:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st302
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st302:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof302
+		}
+	st_case_302:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st303
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st303:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof303
+		}
+	st_case_303:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st304
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st304:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof304
+		}
+	st_case_304:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st305
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st305:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof305
+		}
+	st_case_305:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st306
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st306:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof306
+		}
+	st_case_306:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st307
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st307:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof307
+		}
+	st_case_307:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st308
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st308:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof308
+		}
+	st_case_308:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st309
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st309:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof309
+		}
+	st_case_309:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st310
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st310:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof310
+		}
+	st_case_310:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st311
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st311:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof311
+		}
+	st_case_311:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st312
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st312:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof312
+		}
+	st_case_312:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st313
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st313:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof313
+		}
+	st_case_313:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st314
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st314:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof314
+		}
+	st_case_314:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st315
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st315:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof315
+		}
+	st_case_315:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st316
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr457
+		}
+		goto st25
+	st316:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof316
+		}
+	st_case_316:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr458
+		case 13:
+			goto tr335
+		case 32:
+			goto tr457
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr457
+		}
+		goto st25
+tr451:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st82
+tr483:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st82
+tr535:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st82
+tr541:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st82
+tr544:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st82
+tr749:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st82
+tr765:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st82
+tr768:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st82
+	st82:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof82
+		}
+	st_case_82:
+//line plugins/parsers/influx/machine.go:8533
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr59
+		case 44:
+			goto tr59
+		case 61:
+			goto tr59
+		case 92:
+			goto tr161
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto tr160
+tr160:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st83
+	st83:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof83
+		}
+	st_case_83:
+//line plugins/parsers/influx/machine.go:8564
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr59
+		case 44:
+			goto tr59
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st83
+tr163:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st84
+	st84:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof84
+		}
+	st_case_84:
+//line plugins/parsers/influx/machine.go:8599
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr59
+		case 34:
+			goto tr165
+		case 44:
+			goto tr59
+		case 45:
+			goto tr166
+		case 46:
+			goto tr167
+		case 48:
+			goto tr168
+		case 61:
+			goto tr59
+		case 70:
+			goto tr170
+		case 84:
+			goto tr171
+		case 92:
+			goto tr56
+		case 102:
+			goto tr172
+		case 116:
+			goto tr173
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr169
+			}
+		default:
+			goto tr59
+		}
+		goto tr55
+tr165:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st85
+	st85:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof85
+		}
+	st_case_85:
+//line plugins/parsers/influx/machine.go:8650
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr25
+		case 11:
+			goto tr176
+		case 13:
+			goto tr25
+		case 32:
+			goto tr175
+		case 34:
+			goto tr177
+		case 44:
+			goto tr178
+		case 61:
+			goto tr25
+		case 92:
+			goto tr179
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr175
+		}
+		goto tr174
+tr174:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st86
+	st86:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof86
+		}
+	st_case_86:
+//line plugins/parsers/influx/machine.go:8684
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+tr181:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st87
+tr175:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st87
+	st87:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof87
+		}
+	st_case_87:
+//line plugins/parsers/influx/machine.go:8728
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr188
+		case 13:
+			goto st7
+		case 32:
+			goto st87
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st87
+		}
+		goto tr186
+tr186:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st88
+	st88:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof88
+		}
+	st_case_88:
+//line plugins/parsers/influx/machine.go:8762
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st88
+tr191:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st89
+	st89:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof89
+		}
+	st_case_89:
+//line plugins/parsers/influx/machine.go:8795
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto tr101
+		case 45:
+			goto tr123
+		case 46:
+			goto tr124
+		case 48:
+			goto tr125
+		case 70:
+			goto tr127
+		case 84:
+			goto tr128
+		case 92:
+			goto st11
+		case 102:
+			goto tr129
+		case 116:
+			goto tr130
+		}
+		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto tr126
+		}
+		goto st7
+tr189:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st90
+	st90:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof90
+		}
+	st_case_90:
+//line plugins/parsers/influx/machine.go:8831
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st88
+		case 92:
+			goto st88
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr188:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st91
+	st91:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof91
+		}
+	st_case_91:
+//line plugins/parsers/influx/machine.go:8858
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr188
+		case 13:
+			goto st7
+		case 32:
+			goto st87
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st87
+		}
+		goto tr186
+tr182:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st92
+tr176:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st92
+	st92:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof92
+		}
+	st_case_92:
+//line plugins/parsers/influx/machine.go:8902
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr194
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto tr196
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto tr193
+tr193:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st93
+	st93:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof93
+		}
+	st_case_93:
+//line plugins/parsers/influx/machine.go:8936
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr198
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st93
+tr198:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st94
+tr194:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st94
+	st94:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof94
+		}
+	st_case_94:
+//line plugins/parsers/influx/machine.go:8980
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr194
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto tr196
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto tr193
+tr195:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st317
+tr199:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st317
+	st317:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof317
+		}
+	st_case_317:
+//line plugins/parsers/influx/machine.go:9024
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr482
+		case 13:
+			goto tr330
+		case 32:
+			goto tr481
+		case 44:
+			goto tr483
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr481
+		}
+		goto st32
+tr482:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st318
+tr484:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st318
+	st318:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof318
+		}
+	st_case_318:
+//line plugins/parsers/influx/machine.go:9066
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr484
+		case 13:
+			goto tr330
+		case 32:
+			goto tr481
+		case 44:
+			goto tr61
+		case 45:
+			goto tr485
+		case 61:
+			goto tr14
+		case 92:
+			goto tr65
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr486
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr481
+		}
+		goto tr63
+tr485:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st95
+	st95:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof95
+		}
+	st_case_95:
+//line plugins/parsers/influx/machine.go:9105
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr201
+		case 11:
+			goto tr67
+		case 13:
+			goto tr201
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st319
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr58
+		}
+		goto st32
+tr486:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st319
+	st319:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof319
+		}
+	st_case_319:
+//line plugins/parsers/influx/machine.go:9142
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st321
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+tr491:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st320
+tr488:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st320
+	st320:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof320
+		}
+	st_case_320:
+//line plugins/parsers/influx/machine.go:9193
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr491
+		case 13:
+			goto tr330
+		case 32:
+			goto tr490
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto tr65
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr490
+		}
+		goto tr63
+	st321:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof321
+		}
+	st_case_321:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st322
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st322:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof322
+		}
+	st_case_322:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st323
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st323:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof323
+		}
+	st_case_323:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st324
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st324:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof324
+		}
+	st_case_324:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st325
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st325:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof325
+		}
+	st_case_325:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st326
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st326:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof326
+		}
+	st_case_326:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st327
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st327:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof327
+		}
+	st_case_327:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st328
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st328:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof328
+		}
+	st_case_328:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st329
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st329:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof329
+		}
+	st_case_329:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st330
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st330:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof330
+		}
+	st_case_330:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st331
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st331:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof331
+		}
+	st_case_331:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st332
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st332:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof332
+		}
+	st_case_332:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st333
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st333:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof333
+		}
+	st_case_333:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st334
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st334:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof334
+		}
+	st_case_334:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st335
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st335:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof335
+		}
+	st_case_335:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st336
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st336:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof336
+		}
+	st_case_336:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st337
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st337:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof337
+		}
+	st_case_337:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st338
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr487
+		}
+		goto st32
+	st338:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof338
+		}
+	st_case_338:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr488
+		case 13:
+			goto tr335
+		case 32:
+			goto tr487
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr487
+		}
+		goto st32
+tr184:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st96
+tr178:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st96
+	st96:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof96
+		}
+	st_case_96:
+//line plugins/parsers/influx/machine.go:9770
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr204
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr205
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr203
+tr203:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st97
+	st97:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof97
+		}
+	st_case_97:
+//line plugins/parsers/influx/machine.go:9803
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr207
+		case 44:
+			goto st7
+		case 61:
+			goto tr208
+		case 92:
+			goto st101
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st97
+tr204:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st339
+tr207:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st339
+	st339:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof339
+		}
+	st_case_339:
+//line plugins/parsers/influx/machine.go:9846
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st340
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto st9
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st192
+		}
+		goto st28
+	st340:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof340
+		}
+	st_case_340:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st340
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto tr210
+		case 45:
+			goto tr510
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr511
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st192
+		}
+		goto st28
+tr510:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st98
+	st98:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof98
+		}
+	st_case_98:
+//line plugins/parsers/influx/machine.go:9910
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr210
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr210
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st341
+			}
+		default:
+			goto tr210
+		}
+		goto st28
+tr511:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st341
+	st341:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof341
+		}
+	st_case_341:
+//line plugins/parsers/influx/machine.go:9945
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st343
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+tr512:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st342
+	st342:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof342
+		}
+	st_case_342:
+//line plugins/parsers/influx/machine.go:9982
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st342
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr50
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st28
+	st343:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof343
+		}
+	st_case_343:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st344
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st344:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof344
+		}
+	st_case_344:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st345
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st345:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof345
+		}
+	st_case_345:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st346
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st346:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof346
+		}
+	st_case_346:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st347
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st347:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof347
+		}
+	st_case_347:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st348
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st348:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof348
+		}
+	st_case_348:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st349
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st349:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof349
+		}
+	st_case_349:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st350
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st350:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof350
+		}
+	st_case_350:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st351
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st351:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof351
+		}
+	st_case_351:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st352
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st352:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof352
+		}
+	st_case_352:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st353
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st353:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof353
+		}
+	st_case_353:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st354
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st354:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof354
+		}
+	st_case_354:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st355
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st355:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof355
+		}
+	st_case_355:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st356
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st356:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof356
+		}
+	st_case_356:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st357
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st357:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof357
+		}
+	st_case_357:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st358
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st358:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof358
+		}
+	st_case_358:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st359
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st359:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof359
+		}
+	st_case_359:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st360
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st360:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof360
+		}
+	st_case_360:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr512
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr334
+		}
+		goto st28
+tr208:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+	goto st99
+	st99:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof99
+		}
+	st_case_99:
+//line plugins/parsers/influx/machine.go:10549
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr177
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr179
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr174
+tr177:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st361
+tr183:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st361
+	st361:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof361
+		}
+	st_case_361:
+//line plugins/parsers/influx/machine.go:10592
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr532
+		case 13:
+			goto tr330
+		case 32:
+			goto tr481
+		case 44:
+			goto tr483
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr481
+		}
+		goto st30
+tr532:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st362
+tr534:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st362
+tr540:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st362
+tr543:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st362
+	st362:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof362
+		}
+	st_case_362:
+//line plugins/parsers/influx/machine.go:10654
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr484
+		case 13:
+			goto tr330
+		case 32:
+			goto tr481
+		case 44:
+			goto tr61
+		case 45:
+			goto tr485
+		case 61:
+			goto tr201
+		case 92:
+			goto tr65
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr486
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr481
+		}
+		goto tr63
+tr179:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st100
+	st100:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof100
+		}
+	st_case_100:
+//line plugins/parsers/influx/machine.go:10693
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st86
+		case 92:
+			goto st86
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st30
+tr205:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st101
+	st101:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof101
+		}
+	st_case_101:
+//line plugins/parsers/influx/machine.go:10720
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st97
+		case 92:
+			goto st97
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st28
+tr196:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st102
+	st102:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof102
+		}
+	st_case_102:
+//line plugins/parsers/influx/machine.go:10747
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st93
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st32
+tr166:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st103
+	st103:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof103
+		}
+	st_case_103:
+//line plugins/parsers/influx/machine.go:10774
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 48:
+			goto st363
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st367
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr58
+		}
+		goto st30
+tr168:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st363
+	st363:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof363
+		}
+	st_case_363:
+//line plugins/parsers/influx/machine.go:10813
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr534
+		case 13:
+			goto tr356
+		case 32:
+			goto tr533
+		case 44:
+			goto tr535
+		case 46:
+			goto st364
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		case 105:
+			goto st366
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr533
+		}
+		goto st30
+tr167:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st364
+	st364:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof364
+		}
+	st_case_364:
+//line plugins/parsers/influx/machine.go:10853
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr534
+		case 13:
+			goto tr356
+		case 32:
+			goto tr533
+		case 44:
+			goto tr535
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st364
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr533
+		}
+		goto st30
+	st104:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof104
+		}
+	st_case_104:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 34:
+			goto st105
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr58
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		default:
+			goto st105
+		}
+		goto st30
+	st105:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof105
+		}
+	st_case_105:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr58
+		}
+		goto st30
+	st365:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof365
+		}
+	st_case_365:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr534
+		case 13:
+			goto tr356
+		case 32:
+			goto tr533
+		case 44:
+			goto tr535
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr533
+		}
+		goto st30
+	st366:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof366
+		}
+	st_case_366:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr540
+		case 13:
+			goto tr362
+		case 32:
+			goto tr539
+		case 44:
+			goto tr541
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr539
+		}
+		goto st30
+tr169:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st367
+	st367:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof367
+		}
+	st_case_367:
+//line plugins/parsers/influx/machine.go:11015
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr534
+		case 13:
+			goto tr356
+		case 32:
+			goto tr533
+		case 44:
+			goto tr535
+		case 46:
+			goto st364
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		case 105:
+			goto st366
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st367
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr533
+		}
+		goto st30
+tr170:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st368
+	st368:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof368
+		}
+	st_case_368:
+//line plugins/parsers/influx/machine.go:11060
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr543
+		case 13:
+			goto tr365
+		case 32:
+			goto tr542
+		case 44:
+			goto tr544
+		case 61:
+			goto tr201
+		case 65:
+			goto st106
+		case 92:
+			goto st35
+		case 97:
+			goto st109
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr542
+		}
+		goto st30
+	st106:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof106
+		}
+	st_case_106:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 76:
+			goto st107
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st107:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof107
+		}
+	st_case_107:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 83:
+			goto st108
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st108:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof108
+		}
+	st_case_108:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 69:
+			goto st369
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st369:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof369
+		}
+	st_case_369:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr543
+		case 13:
+			goto tr365
+		case 32:
+			goto tr542
+		case 44:
+			goto tr544
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr542
+		}
+		goto st30
+	st109:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof109
+		}
+	st_case_109:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		case 108:
+			goto st110
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st110:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof110
+		}
+	st_case_110:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		case 115:
+			goto st111
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st111:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof111
+		}
+	st_case_111:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		case 101:
+			goto st369
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+tr171:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st370
+	st370:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof370
+		}
+	st_case_370:
+//line plugins/parsers/influx/machine.go:11283
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr543
+		case 13:
+			goto tr365
+		case 32:
+			goto tr542
+		case 44:
+			goto tr544
+		case 61:
+			goto tr201
+		case 82:
+			goto st112
+		case 92:
+			goto st35
+		case 114:
+			goto st113
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr542
+		}
+		goto st30
+	st112:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof112
+		}
+	st_case_112:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 85:
+			goto st108
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+	st113:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof113
+		}
+	st_case_113:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr59
+		case 11:
+			goto tr60
+		case 13:
+			goto tr59
+		case 32:
+			goto tr58
+		case 44:
+			goto tr61
+		case 61:
+			goto tr59
+		case 92:
+			goto st35
+		case 117:
+			goto st111
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr58
+		}
+		goto st30
+tr172:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st371
+	st371:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof371
+		}
+	st_case_371:
+//line plugins/parsers/influx/machine.go:11373
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr543
+		case 13:
+			goto tr365
+		case 32:
+			goto tr542
+		case 44:
+			goto tr544
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		case 97:
+			goto st109
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr542
+		}
+		goto st30
+tr173:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st372
+	st372:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof372
+		}
+	st_case_372:
+//line plugins/parsers/influx/machine.go:11407
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr543
+		case 13:
+			goto tr365
+		case 32:
+			goto tr542
+		case 44:
+			goto tr544
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		case 114:
+			goto st113
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr542
+		}
+		goto st30
+tr161:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st114
+	st114:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof114
+		}
+	st_case_114:
+//line plugins/parsers/influx/machine.go:11441
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st83
+tr88:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st115
+tr82:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st115
+tr231:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st115
+	st115:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof115
+		}
+	st_case_115:
+//line plugins/parsers/influx/machine.go:11478
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr204
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr222
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr221
+tr221:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st116
+	st116:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof116
+		}
+	st_case_116:
+//line plugins/parsers/influx/machine.go:11511
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr207
+		case 44:
+			goto st7
+		case 61:
+			goto tr224
+		case 92:
+			goto st124
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st116
+tr224:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+	goto st117
+	st117:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof117
+		}
+	st_case_117:
+//line plugins/parsers/influx/machine.go:11544
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr177
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr227
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr226
+tr226:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st118
+	st118:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof118
+		}
+	st_case_118:
+//line plugins/parsers/influx/machine.go:11577
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+tr230:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st119
+	st119:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof119
+		}
+	st_case_119:
+//line plugins/parsers/influx/machine.go:11611
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr234
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto tr235
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto tr233
+tr233:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st120
+	st120:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof120
+		}
+	st_case_120:
+//line plugins/parsers/influx/machine.go:11645
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr237
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st120
+tr237:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st121
+tr234:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st121
+	st121:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof121
+		}
+	st_case_121:
+//line plugins/parsers/influx/machine.go:11689
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr234
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto tr235
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto tr233
+tr235:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st122
+	st122:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof122
+		}
+	st_case_122:
+//line plugins/parsers/influx/machine.go:11723
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st120
+		case 92:
+			goto st120
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st32
+tr227:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st123
+	st123:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof123
+		}
+	st_case_123:
+//line plugins/parsers/influx/machine.go:11750
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st118
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st30
+tr222:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st124
+	st124:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof124
+		}
+	st_case_124:
+//line plugins/parsers/influx/machine.go:11777
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st116
+		case 92:
+			goto st116
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st28
+tr157:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st125
+	st125:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof125
+		}
+	st_case_125:
+//line plugins/parsers/influx/machine.go:11804
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr239
+		case 44:
+			goto tr88
+		case 45:
+			goto tr240
+		case 46:
+			goto tr241
+		case 48:
+			goto tr242
+		case 70:
+			goto tr244
+		case 84:
+			goto tr245
+		case 92:
+			goto st164
+		case 102:
+			goto tr246
+		case 116:
+			goto tr247
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr243
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr85
+		}
+		goto st39
+tr239:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st373
+	st373:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof373
+		}
+	st_case_373:
+//line plugins/parsers/influx/machine.go:11855
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr395
+		case 11:
+			goto tr550
+		case 13:
+			goto tr395
+		case 32:
+			goto tr549
+		case 34:
+			goto tr81
+		case 44:
+			goto tr551
+		case 92:
+			goto tr83
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr549
+		}
+		goto tr78
+tr576:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st374
+tr549:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st374
+tr705:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st374
+tr699:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st374
+tr731:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st374
+tr734:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st374
+tr741:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st374
+tr750:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st374
+tr753:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st374
+	st374:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof374
+		}
+	st_case_374:
+//line plugins/parsers/influx/machine.go:11963
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr553
+		case 13:
+			goto tr398
+		case 32:
+			goto st374
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr554
+		case 61:
+			goto st7
+		case 92:
+			goto tr94
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr555
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st374
+		}
+		goto tr90
+tr553:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st375
+	st375:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof375
+		}
+	st_case_375:
+//line plugins/parsers/influx/machine.go:12004
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr553
+		case 13:
+			goto tr398
+		case 32:
+			goto st374
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr554
+		case 61:
+			goto tr97
+		case 92:
+			goto tr94
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr555
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st374
+		}
+		goto tr90
+tr554:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st126
+	st126:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof126
+		}
+	st_case_126:
+//line plugins/parsers/influx/machine.go:12045
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st376
+			}
+		default:
+			goto st7
+		}
+		goto st41
+tr555:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st376
+	st376:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof376
+		}
+	st_case_376:
+//line plugins/parsers/influx/machine.go:12082
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st378
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+tr556:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st377
+	st377:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof377
+		}
+	st_case_377:
+//line plugins/parsers/influx/machine.go:12121
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto st377
+		case 13:
+			goto tr398
+		case 32:
+			goto st250
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st250
+		}
+		goto st41
+	st378:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof378
+		}
+	st_case_378:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st379
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st379:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof379
+		}
+	st_case_379:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st380
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st380:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof380
+		}
+	st_case_380:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st381
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st381:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof381
+		}
+	st_case_381:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st382
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st382:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof382
+		}
+	st_case_382:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st383:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof383
+		}
+	st_case_383:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st384
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st384:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof384
+		}
+	st_case_384:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st385
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st385:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof385
+		}
+	st_case_385:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st386
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st386:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof386
+		}
+	st_case_386:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st387
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st387:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof387
+		}
+	st_case_387:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st388
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st388:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof388
+		}
+	st_case_388:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st389
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st389:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof389
+		}
+	st_case_389:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st390
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st390:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof390
+		}
+	st_case_390:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st391
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st391:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof391
+		}
+	st_case_391:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st392
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st392:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof392
+		}
+	st_case_392:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st393
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st393:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof393
+		}
+	st_case_393:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st394
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st394:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof394
+		}
+	st_case_394:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st395
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st41
+	st395:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof395
+		}
+	st_case_395:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr556
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr401
+		}
+		goto st41
+tr550:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st396
+tr742:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st396
+tr751:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st396
+tr754:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st396
+	st396:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof396
+		}
+	st_case_396:
+//line plugins/parsers/influx/machine.go:12760
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr577
+		case 13:
+			goto tr398
+		case 32:
+			goto tr576
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 45:
+			goto tr578
+		case 61:
+			goto st39
+		case 92:
+			goto tr153
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr579
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr576
+		}
+		goto tr150
+tr577:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st397
+	st397:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof397
+		}
+	st_case_397:
+//line plugins/parsers/influx/machine.go:12805
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr577
+		case 13:
+			goto tr398
+		case 32:
+			goto tr576
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 45:
+			goto tr578
+		case 61:
+			goto tr157
+		case 92:
+			goto tr153
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr579
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr576
+		}
+		goto tr150
+tr578:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st127
+	st127:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof127
+		}
+	st_case_127:
+//line plugins/parsers/influx/machine.go:12846
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr155
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st398
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr85
+		}
+		goto st78
+tr579:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st398
+	st398:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof398
+		}
+	st_case_398:
+//line plugins/parsers/influx/machine.go:12885
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st402
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+tr585:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st399
+tr712:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st399
+tr580:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st399
+tr709:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st399
+	st399:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof399
+		}
+	st_case_399:
+//line plugins/parsers/influx/machine.go:12950
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr584
+		case 13:
+			goto tr398
+		case 32:
+			goto st399
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st399
+		}
+		goto tr90
+tr584:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st400
+	st400:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof400
+		}
+	st_case_400:
+//line plugins/parsers/influx/machine.go:12984
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr584
+		case 13:
+			goto tr398
+		case 32:
+			goto st399
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st399
+		}
+		goto tr90
+tr586:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st401
+tr581:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st401
+	st401:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof401
+		}
+	st_case_401:
+//line plugins/parsers/influx/machine.go:13032
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr586
+		case 13:
+			goto tr398
+		case 32:
+			goto tr585
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto tr153
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr585
+		}
+		goto tr150
+tr153:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st128
+	st128:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof128
+		}
+	st_case_128:
+//line plugins/parsers/influx/machine.go:13066
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st78
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st25
+	st402:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof402
+		}
+	st_case_402:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st403
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st403:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof403
+		}
+	st_case_403:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st404
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st404:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof404
+		}
+	st_case_404:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st405
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st405:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof405
+		}
+	st_case_405:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st406
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st406:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof406
+		}
+	st_case_406:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st407
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st407:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof407
+		}
+	st_case_407:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st408
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st408:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof408
+		}
+	st_case_408:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st409
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st409:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof409
+		}
+	st_case_409:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st410
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st410:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof410
+		}
+	st_case_410:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st411
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st411:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof411
+		}
+	st_case_411:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st412
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st412:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof412
+		}
+	st_case_412:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st413
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st413:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof413
+		}
+	st_case_413:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st414
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st414:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof414
+		}
+	st_case_414:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st415
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st415:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof415
+		}
+	st_case_415:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st416
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st416:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof416
+		}
+	st_case_416:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st417
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st417:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof417
+		}
+	st_case_417:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st418
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st418:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof418
+		}
+	st_case_418:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st419
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr580
+		}
+		goto st78
+	st419:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof419
+		}
+	st_case_419:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr581
+		case 13:
+			goto tr402
+		case 32:
+			goto tr580
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr580
+		}
+		goto st78
+tr81:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st420
+tr87:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st420
+	st420:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof420
+		}
+	st_case_420:
+//line plugins/parsers/influx/machine.go:13674
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr604
+		case 13:
+			goto tr330
+		case 32:
+			goto tr449
+		case 44:
+			goto tr451
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr449
+		}
+		goto st2
+tr604:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st421
+tr748:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st421
+tr764:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st421
+tr767:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st421
+	st421:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof421
+		}
+	st_case_421:
+//line plugins/parsers/influx/machine.go:13734
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr454
+		case 13:
+			goto tr330
+		case 32:
+			goto tr449
+		case 44:
+			goto tr7
+		case 45:
+			goto tr455
+		case 61:
+			goto st2
+		case 92:
+			goto tr44
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr456
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr449
+		}
+		goto tr42
+tr2:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st129
+	st129:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof129
+		}
+	st_case_129:
+//line plugins/parsers/influx/machine.go:13773
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr1
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr1
+		}
+		goto st2
+tr551:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st130
+tr701:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st130
+tr733:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st130
+tr736:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st130
+tr743:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st130
+tr752:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st130
+tr755:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st130
+	st130:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof130
+		}
+	st_case_130:
+//line plugins/parsers/influx/machine.go:13858
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr251
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr252
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr250
+tr250:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st131
+	st131:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof131
+		}
+	st_case_131:
+//line plugins/parsers/influx/machine.go:13891
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr254
+		case 44:
+			goto st7
+		case 61:
+			goto tr255
+		case 92:
+			goto st163
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st131
+tr251:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st422
+tr254:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st422
+	st422:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof422
+		}
+	st_case_422:
+//line plugins/parsers/influx/machine.go:13934
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st423
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto st9
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st192
+		}
+		goto st83
+	st423:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof423
+		}
+	st_case_423:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st423
+		case 13:
+			goto tr330
+		case 32:
+			goto st192
+		case 44:
+			goto tr201
+		case 45:
+			goto tr606
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr607
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st192
+		}
+		goto st83
+tr606:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st132
+	st132:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof132
+		}
+	st_case_132:
+//line plugins/parsers/influx/machine.go:13998
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr201
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr201
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st424
+			}
+		default:
+			goto tr201
+		}
+		goto st83
+tr607:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st424
+	st424:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof424
+		}
+	st_case_424:
+//line plugins/parsers/influx/machine.go:14033
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st426
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+tr608:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st425
+	st425:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof425
+		}
+	st_case_425:
+//line plugins/parsers/influx/machine.go:14070
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st425
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr59
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st83
+	st426:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof426
+		}
+	st_case_426:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st427
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st427:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof427
+		}
+	st_case_427:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st428
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st428:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof428
+		}
+	st_case_428:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st429
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st429:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof429
+		}
+	st_case_429:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st430
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st430:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof430
+		}
+	st_case_430:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st431
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st431:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof431
+		}
+	st_case_431:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st432
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st432:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof432
+		}
+	st_case_432:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st433
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st433:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof433
+		}
+	st_case_433:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st434
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st434:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof434
+		}
+	st_case_434:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st435
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st435:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof435
+		}
+	st_case_435:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st436
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st436:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof436
+		}
+	st_case_436:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st437
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st437:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof437
+		}
+	st_case_437:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st438
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st438:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof438
+		}
+	st_case_438:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st439
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st439:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof439
+		}
+	st_case_439:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st440
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st440:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof440
+		}
+	st_case_440:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st441
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st441:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof441
+		}
+	st_case_441:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st442
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st442:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof442
+		}
+	st_case_442:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st443
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st443:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof443
+		}
+	st_case_443:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr608
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr334
+		}
+		goto st83
+tr255:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st133
+	st133:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof133
+		}
+	st_case_133:
+//line plugins/parsers/influx/machine.go:14641
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr258
+		case 44:
+			goto st7
+		case 45:
+			goto tr259
+		case 46:
+			goto tr260
+		case 48:
+			goto tr261
+		case 61:
+			goto st7
+		case 70:
+			goto tr263
+		case 84:
+			goto tr264
+		case 92:
+			goto tr227
+		case 102:
+			goto tr265
+		case 116:
+			goto tr266
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr262
+			}
+		default:
+			goto st7
+		}
+		goto tr226
+tr258:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st444
+	st444:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof444
+		}
+	st_case_444:
+//line plugins/parsers/influx/machine.go:14696
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr395
+		case 11:
+			goto tr629
+		case 13:
+			goto tr395
+		case 32:
+			goto tr628
+		case 34:
+			goto tr177
+		case 44:
+			goto tr630
+		case 61:
+			goto tr25
+		case 92:
+			goto tr179
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr628
+		}
+		goto tr174
+tr655:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st445
+tr628:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st445
+tr683:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st445
+tr689:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st445
+tr692:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st445
+	st445:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof445
+		}
+	st_case_445:
+//line plugins/parsers/influx/machine.go:14770
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr632
+		case 13:
+			goto tr398
+		case 32:
+			goto st445
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr633
+		case 61:
+			goto st7
+		case 92:
+			goto tr189
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr634
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st445
+		}
+		goto tr186
+tr632:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st446
+	st446:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof446
+		}
+	st_case_446:
+//line plugins/parsers/influx/machine.go:14811
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr632
+		case 13:
+			goto tr398
+		case 32:
+			goto st445
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr633
+		case 61:
+			goto tr191
+		case 92:
+			goto tr189
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr634
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st445
+		}
+		goto tr186
+tr633:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st134
+	st134:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof134
+		}
+	st_case_134:
+//line plugins/parsers/influx/machine.go:14852
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st447
+			}
+		default:
+			goto st7
+		}
+		goto st88
+tr634:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st447
+	st447:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof447
+		}
+	st_case_447:
+//line plugins/parsers/influx/machine.go:14889
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st449
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+tr635:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st448
+	st448:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof448
+		}
+	st_case_448:
+//line plugins/parsers/influx/machine.go:14928
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto st448
+		case 13:
+			goto tr398
+		case 32:
+			goto st250
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st250
+		}
+		goto st88
+	st449:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof449
+		}
+	st_case_449:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st450
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st450:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof450
+		}
+	st_case_450:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st451
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st451:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof451
+		}
+	st_case_451:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st452
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st452:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof452
+		}
+	st_case_452:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st453
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st453:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof453
+		}
+	st_case_453:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st454
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st454:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof454
+		}
+	st_case_454:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st455
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st455:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof455
+		}
+	st_case_455:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st456
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st456:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof456
+		}
+	st_case_456:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st457
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st457:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof457
+		}
+	st_case_457:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st458
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st458:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof458
+		}
+	st_case_458:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st459
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st459:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof459
+		}
+	st_case_459:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st460
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st460:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof460
+		}
+	st_case_460:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st461
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st461:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof461
+		}
+	st_case_461:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st462
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st462:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof462
+		}
+	st_case_462:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st463
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st463:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof463
+		}
+	st_case_463:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st464
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st464:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof464
+		}
+	st_case_464:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st465
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st465:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof465
+		}
+	st_case_465:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st466
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr401
+		}
+		goto st88
+	st466:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof466
+		}
+	st_case_466:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr635
+		case 13:
+			goto tr402
+		case 32:
+			goto tr401
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr401
+		}
+		goto st88
+tr629:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st467
+tr684:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st467
+tr690:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st467
+tr693:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st467
+	st467:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof467
+		}
+	st_case_467:
+//line plugins/parsers/influx/machine.go:15567
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr656
+		case 13:
+			goto tr398
+		case 32:
+			goto tr655
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 45:
+			goto tr657
+		case 61:
+			goto st7
+		case 92:
+			goto tr196
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr658
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr655
+		}
+		goto tr193
+tr656:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st468
+	st468:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof468
+		}
+	st_case_468:
+//line plugins/parsers/influx/machine.go:15612
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr656
+		case 13:
+			goto tr398
+		case 32:
+			goto tr655
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 45:
+			goto tr657
+		case 61:
+			goto tr191
+		case 92:
+			goto tr196
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr658
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr655
+		}
+		goto tr193
+tr657:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st135
+	st135:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof135
+		}
+	st_case_135:
+//line plugins/parsers/influx/machine.go:15653
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr198
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st469
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr181
+		}
+		goto st93
+tr658:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st469
+	st469:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof469
+		}
+	st_case_469:
+//line plugins/parsers/influx/machine.go:15692
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st473
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+tr664:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st470
+tr659:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st470
+	st470:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof470
+		}
+	st_case_470:
+//line plugins/parsers/influx/machine.go:15741
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr663
+		case 13:
+			goto tr398
+		case 32:
+			goto st470
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st470
+		}
+		goto tr186
+tr663:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st471
+	st471:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof471
+		}
+	st_case_471:
+//line plugins/parsers/influx/machine.go:15775
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr663
+		case 13:
+			goto tr398
+		case 32:
+			goto st470
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st470
+		}
+		goto tr186
+tr665:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st472
+tr660:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st472
+	st472:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof472
+		}
+	st_case_472:
+//line plugins/parsers/influx/machine.go:15823
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr665
+		case 13:
+			goto tr398
+		case 32:
+			goto tr664
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto tr196
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr664
+		}
+		goto tr193
+	st473:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof473
+		}
+	st_case_473:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st474
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st474:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof474
+		}
+	st_case_474:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st475
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st475:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof475
+		}
+	st_case_475:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st476
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st476:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof476
+		}
+	st_case_476:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st477
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st477:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof477
+		}
+	st_case_477:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st478
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st478:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof478
+		}
+	st_case_478:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st479
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st479:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof479
+		}
+	st_case_479:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st480
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st480:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof480
+		}
+	st_case_480:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st481
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st481:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof481
+		}
+	st_case_481:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st482
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st482:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof482
+		}
+	st_case_482:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st483
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st483:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof483
+		}
+	st_case_483:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st484
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st484:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof484
+		}
+	st_case_484:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st485
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st485:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof485
+		}
+	st_case_485:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st486
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st486:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof486
+		}
+	st_case_486:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st487
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st487:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof487
+		}
+	st_case_487:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st488
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st488:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof488
+		}
+	st_case_488:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st489
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st489:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof489
+		}
+	st_case_489:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st490
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr659
+		}
+		goto st93
+	st490:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof490
+		}
+	st_case_490:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr660
+		case 13:
+			goto tr402
+		case 32:
+			goto tr659
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr659
+		}
+		goto st93
+tr630:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st136
+tr685:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st136
+tr691:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st136
+tr694:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st136
+	st136:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof136
+		}
+	st_case_136:
+//line plugins/parsers/influx/machine.go:16462
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr251
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr270
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto tr269
+tr269:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st137
+	st137:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof137
+		}
+	st_case_137:
+//line plugins/parsers/influx/machine.go:16495
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr254
+		case 44:
+			goto st7
+		case 61:
+			goto tr272
+		case 92:
+			goto st150
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st7
+		}
+		goto st137
+tr272:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st138
+	st138:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof138
+		}
+	st_case_138:
+//line plugins/parsers/influx/machine.go:16532
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st7
+		case 34:
+			goto tr258
+		case 44:
+			goto st7
+		case 45:
+			goto tr274
+		case 46:
+			goto tr275
+		case 48:
+			goto tr276
+		case 61:
+			goto st7
+		case 70:
+			goto tr278
+		case 84:
+			goto tr279
+		case 92:
+			goto tr179
+		case 102:
+			goto tr280
+		case 116:
+			goto tr281
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto st7
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr277
+			}
+		default:
+			goto st7
+		}
+		goto tr174
+tr274:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st139
+	st139:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof139
+		}
+	st_case_139:
+//line plugins/parsers/influx/machine.go:16583
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 48:
+			goto st491
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st496
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr181
+		}
+		goto st86
+tr276:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st491
+	st491:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof491
+		}
+	st_case_491:
+//line plugins/parsers/influx/machine.go:16624
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr684
+		case 13:
+			goto tr424
+		case 32:
+			goto tr683
+		case 34:
+			goto tr183
+		case 44:
+			goto tr685
+		case 46:
+			goto st492
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		case 105:
+			goto st495
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr683
+		}
+		goto st86
+tr275:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st492
+	st492:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof492
+		}
+	st_case_492:
+//line plugins/parsers/influx/machine.go:16666
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr684
+		case 13:
+			goto tr424
+		case 32:
+			goto tr683
+		case 34:
+			goto tr183
+		case 44:
+			goto tr685
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st492
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr683
+		}
+		goto st86
+	st140:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof140
+		}
+	st_case_140:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr284
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr181
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st494
+			}
+		default:
+			goto st141
+		}
+		goto st86
+tr284:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st493
+	st493:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof493
+		}
+	st_case_493:
+//line plugins/parsers/influx/machine.go:16745
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr532
+		case 13:
+			goto tr330
+		case 32:
+			goto tr481
+		case 44:
+			goto tr483
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr481
+		}
+		goto st30
+	st141:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof141
+		}
+	st_case_141:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st494
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr181
+		}
+		goto st86
+	st494:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof494
+		}
+	st_case_494:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr684
+		case 13:
+			goto tr424
+		case 32:
+			goto tr683
+		case 34:
+			goto tr183
+		case 44:
+			goto tr685
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st494
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr683
+		}
+		goto st86
+	st495:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof495
+		}
+	st_case_495:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr430
+		case 11:
+			goto tr690
+		case 13:
+			goto tr430
+		case 32:
+			goto tr689
+		case 34:
+			goto tr183
+		case 44:
+			goto tr691
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr689
+		}
+		goto st86
+tr277:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st496
+	st496:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof496
+		}
+	st_case_496:
+//line plugins/parsers/influx/machine.go:16873
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr684
+		case 13:
+			goto tr424
+		case 32:
+			goto tr683
+		case 34:
+			goto tr183
+		case 44:
+			goto tr685
+		case 46:
+			goto st492
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		case 105:
+			goto st495
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st496
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr683
+		}
+		goto st86
+tr278:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st497
+	st497:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof497
+		}
+	st_case_497:
+//line plugins/parsers/influx/machine.go:16920
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr693
+		case 13:
+			goto tr433
+		case 32:
+			goto tr692
+		case 34:
+			goto tr183
+		case 44:
+			goto tr694
+		case 61:
+			goto st7
+		case 65:
+			goto st142
+		case 92:
+			goto st100
+		case 97:
+			goto st145
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr692
+		}
+		goto st86
+	st142:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof142
+		}
+	st_case_142:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 76:
+			goto st143
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st143:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof143
+		}
+	st_case_143:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 83:
+			goto st144
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st144:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof144
+		}
+	st_case_144:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 69:
+			goto st498
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st498:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof498
+		}
+	st_case_498:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr693
+		case 13:
+			goto tr433
+		case 32:
+			goto tr692
+		case 34:
+			goto tr183
+		case 44:
+			goto tr694
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr692
+		}
+		goto st86
+	st145:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof145
+		}
+	st_case_145:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 108:
+			goto st146
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st146:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof146
+		}
+	st_case_146:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 115:
+			goto st147
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st147:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof147
+		}
+	st_case_147:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 101:
+			goto st498
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+tr279:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st499
+	st499:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof499
+		}
+	st_case_499:
+//line plugins/parsers/influx/machine.go:17159
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr693
+		case 13:
+			goto tr433
+		case 32:
+			goto tr692
+		case 34:
+			goto tr183
+		case 44:
+			goto tr694
+		case 61:
+			goto st7
+		case 82:
+			goto st148
+		case 92:
+			goto st100
+		case 114:
+			goto st149
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr692
+		}
+		goto st86
+	st148:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof148
+		}
+	st_case_148:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 85:
+			goto st144
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+	st149:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof149
+		}
+	st_case_149:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr182
+		case 13:
+			goto st7
+		case 32:
+			goto tr181
+		case 34:
+			goto tr183
+		case 44:
+			goto tr184
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 117:
+			goto st147
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr181
+		}
+		goto st86
+tr280:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st500
+	st500:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof500
+		}
+	st_case_500:
+//line plugins/parsers/influx/machine.go:17255
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr693
+		case 13:
+			goto tr433
+		case 32:
+			goto tr692
+		case 34:
+			goto tr183
+		case 44:
+			goto tr694
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 97:
+			goto st145
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr692
+		}
+		goto st86
+tr281:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st501
+	st501:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof501
+		}
+	st_case_501:
+//line plugins/parsers/influx/machine.go:17291
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr693
+		case 13:
+			goto tr433
+		case 32:
+			goto tr692
+		case 34:
+			goto tr183
+		case 44:
+			goto tr694
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 114:
+			goto st149
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr692
+		}
+		goto st86
+tr270:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st150
+	st150:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof150
+		}
+	st_case_150:
+//line plugins/parsers/influx/machine.go:17327
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st137
+		case 92:
+			goto st137
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st83
+tr259:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st151
+	st151:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof151
+		}
+	st_case_151:
+//line plugins/parsers/influx/machine.go:17354
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 48:
+			goto st502
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st528
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr229
+		}
+		goto st118
+tr261:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st502
+	st502:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof502
+		}
+	st_case_502:
+//line plugins/parsers/influx/machine.go:17395
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr700
+		case 13:
+			goto tr424
+		case 32:
+			goto tr699
+		case 34:
+			goto tr183
+		case 44:
+			goto tr701
+		case 46:
+			goto st525
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		case 105:
+			goto st527
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr699
+		}
+		goto st118
+tr700:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st503
+tr732:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st503
+tr735:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+	goto st503
+	st503:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof503
+		}
+	st_case_503:
+//line plugins/parsers/influx/machine.go:17461
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr706
+		case 13:
+			goto tr398
+		case 32:
+			goto tr705
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 45:
+			goto tr707
+		case 61:
+			goto st7
+		case 92:
+			goto tr235
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr708
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr705
+		}
+		goto tr233
+tr706:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st504
+	st504:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof504
+		}
+	st_case_504:
+//line plugins/parsers/influx/machine.go:17506
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr706
+		case 13:
+			goto tr398
+		case 32:
+			goto tr705
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 45:
+			goto tr707
+		case 61:
+			goto tr97
+		case 92:
+			goto tr235
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr708
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr705
+		}
+		goto tr233
+tr707:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st152
+	st152:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof152
+		}
+	st_case_152:
+//line plugins/parsers/influx/machine.go:17547
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr237
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st505
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr229
+		}
+		goto st120
+tr708:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st505
+	st505:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof505
+		}
+	st_case_505:
+//line plugins/parsers/influx/machine.go:17586
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st507
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+tr713:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st506
+tr710:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st506
+	st506:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof506
+		}
+	st_case_506:
+//line plugins/parsers/influx/machine.go:17639
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr398
+		case 11:
+			goto tr713
+		case 13:
+			goto tr398
+		case 32:
+			goto tr712
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto tr235
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr712
+		}
+		goto tr233
+	st507:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof507
+		}
+	st_case_507:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st508
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st508:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof508
+		}
+	st_case_508:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st509
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st509:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof509
+		}
+	st_case_509:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st510
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st510:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof510
+		}
+	st_case_510:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st511
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st511:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof511
+		}
+	st_case_511:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st512
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st512:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof512
+		}
+	st_case_512:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st513
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st513:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof513
+		}
+	st_case_513:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st514
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st514:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof514
+		}
+	st_case_514:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st515
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st515:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof515
+		}
+	st_case_515:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st516
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st516:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof516
+		}
+	st_case_516:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st517
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st517:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof517
+		}
+	st_case_517:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st518
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st518:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof518
+		}
+	st_case_518:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st519
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st519:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof519
+		}
+	st_case_519:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st520
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st520:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof520
+		}
+	st_case_520:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st521
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st521:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof521
+		}
+	st_case_521:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st522
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st522:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof522
+		}
+	st_case_522:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st523
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st523:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof523
+		}
+	st_case_523:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st524
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr709
+		}
+		goto st120
+	st524:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof524
+		}
+	st_case_524:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr402
+		case 11:
+			goto tr710
+		case 13:
+			goto tr402
+		case 32:
+			goto tr709
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr709
+		}
+		goto st120
+tr260:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st525
+	st525:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof525
+		}
+	st_case_525:
+//line plugins/parsers/influx/machine.go:18244
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr700
+		case 13:
+			goto tr424
+		case 32:
+			goto tr699
+		case 34:
+			goto tr183
+		case 44:
+			goto tr701
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st525
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr699
+		}
+		goto st118
+	st153:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof153
+		}
+	st_case_153:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr284
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr229
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st526
+			}
+		default:
+			goto st154
+		}
+		goto st118
+	st154:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof154
+		}
+	st_case_154:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st526
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr229
+		}
+		goto st118
+	st526:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof526
+		}
+	st_case_526:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr700
+		case 13:
+			goto tr424
+		case 32:
+			goto tr699
+		case 34:
+			goto tr183
+		case 44:
+			goto tr701
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st526
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr699
+		}
+		goto st118
+	st527:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof527
+		}
+	st_case_527:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr430
+		case 11:
+			goto tr732
+		case 13:
+			goto tr430
+		case 32:
+			goto tr731
+		case 34:
+			goto tr183
+		case 44:
+			goto tr733
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr731
+		}
+		goto st118
+tr262:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st528
+	st528:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof528
+		}
+	st_case_528:
+//line plugins/parsers/influx/machine.go:18414
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr700
+		case 13:
+			goto tr424
+		case 32:
+			goto tr699
+		case 34:
+			goto tr183
+		case 44:
+			goto tr701
+		case 46:
+			goto st525
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		case 105:
+			goto st527
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st528
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr699
+		}
+		goto st118
+tr263:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st529
+	st529:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof529
+		}
+	st_case_529:
+//line plugins/parsers/influx/machine.go:18461
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr735
+		case 13:
+			goto tr433
+		case 32:
+			goto tr734
+		case 34:
+			goto tr183
+		case 44:
+			goto tr736
+		case 61:
+			goto st7
+		case 65:
+			goto st155
+		case 92:
+			goto st123
+		case 97:
+			goto st158
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr734
+		}
+		goto st118
+	st155:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof155
+		}
+	st_case_155:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 76:
+			goto st156
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st156:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof156
+		}
+	st_case_156:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 83:
+			goto st157
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st157:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof157
+		}
+	st_case_157:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 69:
+			goto st530
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st530:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof530
+		}
+	st_case_530:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr735
+		case 13:
+			goto tr433
+		case 32:
+			goto tr734
+		case 34:
+			goto tr183
+		case 44:
+			goto tr736
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr734
+		}
+		goto st118
+	st158:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof158
+		}
+	st_case_158:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 108:
+			goto st159
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st159:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof159
+		}
+	st_case_159:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 115:
+			goto st160
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st160:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof160
+		}
+	st_case_160:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 101:
+			goto st530
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+tr264:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st531
+	st531:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof531
+		}
+	st_case_531:
+//line plugins/parsers/influx/machine.go:18700
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr735
+		case 13:
+			goto tr433
+		case 32:
+			goto tr734
+		case 34:
+			goto tr183
+		case 44:
+			goto tr736
+		case 61:
+			goto st7
+		case 82:
+			goto st161
+		case 92:
+			goto st123
+		case 114:
+			goto st162
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr734
+		}
+		goto st118
+	st161:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof161
+		}
+	st_case_161:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 85:
+			goto st157
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+	st162:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof162
+		}
+	st_case_162:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr230
+		case 13:
+			goto st7
+		case 32:
+			goto tr229
+		case 34:
+			goto tr183
+		case 44:
+			goto tr231
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 117:
+			goto st160
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr229
+		}
+		goto st118
+tr265:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st532
+	st532:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof532
+		}
+	st_case_532:
+//line plugins/parsers/influx/machine.go:18796
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr735
+		case 13:
+			goto tr433
+		case 32:
+			goto tr734
+		case 34:
+			goto tr183
+		case 44:
+			goto tr736
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 97:
+			goto st158
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr734
+		}
+		goto st118
+tr266:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st533
+	st533:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof533
+		}
+	st_case_533:
+//line plugins/parsers/influx/machine.go:18832
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr735
+		case 13:
+			goto tr433
+		case 32:
+			goto tr734
+		case 34:
+			goto tr183
+		case 44:
+			goto tr736
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 114:
+			goto st162
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr734
+		}
+		goto st118
+tr252:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st163
+	st163:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof163
+		}
+	st_case_163:
+//line plugins/parsers/influx/machine.go:18868
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st131
+		case 92:
+			goto st131
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr59
+		}
+		goto st83
+tr83:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st164
+	st164:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof164
+		}
+	st_case_164:
+//line plugins/parsers/influx/machine.go:18895
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st39
+		case 92:
+			goto st39
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st2
+tr240:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st165
+	st165:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof165
+		}
+	st_case_165:
+//line plugins/parsers/influx/machine.go:18922
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 48:
+			goto st534
+		case 92:
+			goto st164
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st540
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr85
+		}
+		goto st39
+tr242:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st534
+	st534:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof534
+		}
+	st_case_534:
+//line plugins/parsers/influx/machine.go:18961
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr742
+		case 13:
+			goto tr424
+		case 32:
+			goto tr741
+		case 34:
+			goto tr87
+		case 44:
+			goto tr743
+		case 46:
+			goto st535
+		case 69:
+			goto st166
+		case 92:
+			goto st164
+		case 101:
+			goto st166
+		case 105:
+			goto st539
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr741
+		}
+		goto st39
+tr241:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st535
+	st535:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof535
+		}
+	st_case_535:
+//line plugins/parsers/influx/machine.go:19001
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr742
+		case 13:
+			goto tr424
+		case 32:
+			goto tr741
+		case 34:
+			goto tr87
+		case 44:
+			goto tr743
+		case 69:
+			goto st166
+		case 92:
+			goto st164
+		case 101:
+			goto st166
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st535
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr741
+		}
+		goto st39
+	st166:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof166
+		}
+	st_case_166:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr304
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr85
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st538
+			}
+		default:
+			goto st167
+		}
+		goto st39
+tr304:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddString(key, m.text())
+
+	goto st536
+	st536:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof536
+		}
+	st_case_536:
+//line plugins/parsers/influx/machine.go:19076
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr604
+		case 13:
+			goto tr330
+		case 32:
+			goto tr449
+		case 44:
+			goto tr451
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr449
+		}
+		goto st2
+	st537:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof537
+		}
+	st_case_537:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr748
+		case 13:
+			goto tr356
+		case 32:
+			goto tr747
+		case 44:
+			goto tr749
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr747
+		}
+		goto st2
+	st167:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof167
+		}
+	st_case_167:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st538
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr85
+		}
+		goto st39
+	st538:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof538
+		}
+	st_case_538:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr742
+		case 13:
+			goto tr424
+		case 32:
+			goto tr741
+		case 34:
+			goto tr87
+		case 44:
+			goto tr743
+		case 92:
+			goto st164
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st538
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr741
+		}
+		goto st39
+	st539:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof539
+		}
+	st_case_539:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr430
+		case 11:
+			goto tr751
+		case 13:
+			goto tr430
+		case 32:
+			goto tr750
+		case 34:
+			goto tr87
+		case 44:
+			goto tr752
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr750
+		}
+		goto st39
+tr243:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st540
+	st540:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof540
+		}
+	st_case_540:
+//line plugins/parsers/influx/machine.go:19224
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr424
+		case 11:
+			goto tr742
+		case 13:
+			goto tr424
+		case 32:
+			goto tr741
+		case 34:
+			goto tr87
+		case 44:
+			goto tr743
+		case 46:
+			goto st535
+		case 69:
+			goto st166
+		case 92:
+			goto st164
+		case 101:
+			goto st166
+		case 105:
+			goto st539
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st540
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr741
+		}
+		goto st39
+tr244:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st541
+	st541:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof541
+		}
+	st_case_541:
+//line plugins/parsers/influx/machine.go:19269
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr754
+		case 13:
+			goto tr433
+		case 32:
+			goto tr753
+		case 34:
+			goto tr87
+		case 44:
+			goto tr755
+		case 65:
+			goto st168
+		case 92:
+			goto st164
+		case 97:
+			goto st171
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr753
+		}
+		goto st39
+	st168:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof168
+		}
+	st_case_168:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 76:
+			goto st169
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st169:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof169
+		}
+	st_case_169:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 83:
+			goto st170
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st170:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof170
+		}
+	st_case_170:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 69:
+			goto st542
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st542:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof542
+		}
+	st_case_542:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr754
+		case 13:
+			goto tr433
+		case 32:
+			goto tr753
+		case 34:
+			goto tr87
+		case 44:
+			goto tr755
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr753
+		}
+		goto st39
+	st171:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof171
+		}
+	st_case_171:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		case 108:
+			goto st172
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st172:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof172
+		}
+	st_case_172:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		case 115:
+			goto st173
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st173:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof173
+		}
+	st_case_173:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		case 101:
+			goto st542
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+tr245:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st543
+	st543:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof543
+		}
+	st_case_543:
+//line plugins/parsers/influx/machine.go:19492
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr754
+		case 13:
+			goto tr433
+		case 32:
+			goto tr753
+		case 34:
+			goto tr87
+		case 44:
+			goto tr755
+		case 82:
+			goto st174
+		case 92:
+			goto st164
+		case 114:
+			goto st175
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr753
+		}
+		goto st39
+	st174:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof174
+		}
+	st_case_174:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 85:
+			goto st170
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+	st175:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof175
+		}
+	st_case_175:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st7
+		case 11:
+			goto tr86
+		case 13:
+			goto st7
+		case 32:
+			goto tr85
+		case 34:
+			goto tr87
+		case 44:
+			goto tr88
+		case 92:
+			goto st164
+		case 117:
+			goto st173
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr85
+		}
+		goto st39
+tr246:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st544
+	st544:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof544
+		}
+	st_case_544:
+//line plugins/parsers/influx/machine.go:19582
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr754
+		case 13:
+			goto tr433
+		case 32:
+			goto tr753
+		case 34:
+			goto tr87
+		case 44:
+			goto tr755
+		case 92:
+			goto st164
+		case 97:
+			goto st171
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr753
+		}
+		goto st39
+tr247:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st545
+	st545:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof545
+		}
+	st_case_545:
+//line plugins/parsers/influx/machine.go:19616
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr433
+		case 11:
+			goto tr754
+		case 13:
+			goto tr433
+		case 32:
+			goto tr753
+		case 34:
+			goto tr87
+		case 44:
+			goto tr755
+		case 92:
+			goto st164
+		case 114:
+			goto st175
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr753
+		}
+		goto st39
+tr70:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st176
+	st176:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof176
+		}
+	st_case_176:
+//line plugins/parsers/influx/machine.go:19650
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 48:
+			goto st546
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st549
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+tr72:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st546
+	st546:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof546
+		}
+	st_case_546:
+//line plugins/parsers/influx/machine.go:19687
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr748
+		case 13:
+			goto tr356
+		case 32:
+			goto tr747
+		case 44:
+			goto tr749
+		case 46:
+			goto st547
+		case 69:
+			goto st177
+		case 92:
+			goto st129
+		case 101:
+			goto st177
+		case 105:
+			goto st548
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr747
+		}
+		goto st2
+tr71:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st547
+	st547:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof547
+		}
+	st_case_547:
+//line plugins/parsers/influx/machine.go:19725
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr748
+		case 13:
+			goto tr356
+		case 32:
+			goto tr747
+		case 44:
+			goto tr749
+		case 69:
+			goto st177
+		case 92:
+			goto st129
+		case 101:
+			goto st177
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st547
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr747
+		}
+		goto st2
+	st177:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof177
+		}
+	st_case_177:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 34:
+			goto st178
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr4
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		default:
+			goto st178
+		}
+		goto st2
+	st178:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof178
+		}
+	st_case_178:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+	st548:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof548
+		}
+	st_case_548:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr764
+		case 13:
+			goto tr362
+		case 32:
+			goto tr763
+		case 44:
+			goto tr765
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr763
+		}
+		goto st2
+tr73:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st549
+	st549:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof549
+		}
+	st_case_549:
+//line plugins/parsers/influx/machine.go:19849
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr748
+		case 13:
+			goto tr356
+		case 32:
+			goto tr747
+		case 44:
+			goto tr749
+		case 46:
+			goto st547
+		case 69:
+			goto st177
+		case 92:
+			goto st129
+		case 101:
+			goto st177
+		case 105:
+			goto st548
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st549
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr747
+		}
+		goto st2
+tr74:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st550
+	st550:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof550
+		}
+	st_case_550:
+//line plugins/parsers/influx/machine.go:19892
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr767
+		case 13:
+			goto tr365
+		case 32:
+			goto tr766
+		case 44:
+			goto tr768
+		case 65:
+			goto st179
+		case 92:
+			goto st129
+		case 97:
+			goto st182
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr766
+		}
+		goto st2
+	st179:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof179
+		}
+	st_case_179:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 76:
+			goto st180
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st180:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof180
+		}
+	st_case_180:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 83:
+			goto st181
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st181:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof181
+		}
+	st_case_181:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 69:
+			goto st551
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st551:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof551
+		}
+	st_case_551:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr767
+		case 13:
+			goto tr365
+		case 32:
+			goto tr766
+		case 44:
+			goto tr768
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr766
+		}
+		goto st2
+	st182:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof182
+		}
+	st_case_182:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		case 108:
+			goto st183
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st183:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof183
+		}
+	st_case_183:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		case 115:
+			goto st184
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st184:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof184
+		}
+	st_case_184:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		case 101:
+			goto st551
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+tr75:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st552
+	st552:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof552
+		}
+	st_case_552:
+//line plugins/parsers/influx/machine.go:20099
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr767
+		case 13:
+			goto tr365
+		case 32:
+			goto tr766
+		case 44:
+			goto tr768
+		case 82:
+			goto st185
+		case 92:
+			goto st129
+		case 114:
+			goto st186
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr766
+		}
+		goto st2
+	st185:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof185
+		}
+	st_case_185:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 85:
+			goto st181
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st186:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof186
+		}
+	st_case_186:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st129
+		case 117:
+			goto st184
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+tr76:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st553
+	st553:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof553
+		}
+	st_case_553:
+//line plugins/parsers/influx/machine.go:20183
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr767
+		case 13:
+			goto tr365
+		case 32:
+			goto tr766
+		case 44:
+			goto tr768
+		case 92:
+			goto st129
+		case 97:
+			goto st182
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr766
+		}
+		goto st2
+tr77:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st554
+	st554:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof554
+		}
+	st_case_554:
+//line plugins/parsers/influx/machine.go:20215
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr365
+		case 11:
+			goto tr767
+		case 13:
+			goto tr365
+		case 32:
+			goto tr766
+		case 44:
+			goto tr768
+		case 92:
+			goto st129
+		case 114:
+			goto st186
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr766
+		}
+		goto st2
+	st187:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof187
+		}
+	st_case_187:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr322
+		case 13:
+			goto tr322
+		}
+		goto st187
+tr322:
+//line plugins/parsers/influx/machine.go.rl:68
+
+	{goto st188 }
+
+	goto st555
+	st555:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof555
+		}
+	st_case_555:
+//line plugins/parsers/influx/machine.go:20259
+		goto st0
+	st188:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof188
+		}
+	st_case_188:
+		switch ( m.data)[( m.p)] {
+		case 11:
+			goto tr325
+		case 32:
+			goto st188
+		case 35:
+			goto st189
+		case 44:
+			goto st0
+		case 92:
+			goto st190
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto st188
+		}
+		goto tr323
+tr323:
+//line plugins/parsers/influx/machine.go.rl:63
+
+	( m.p)--
+
+	{goto st1 }
+
+	goto st556
+	st556:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof556
+		}
+	st_case_556:
+//line plugins/parsers/influx/machine.go:20295
+		goto st0
+tr325:
+//line plugins/parsers/influx/machine.go.rl:63
+
+	( m.p)--
+
+	{goto st1 }
+
+	goto st557
+	st557:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof557
+		}
+	st_case_557:
+//line plugins/parsers/influx/machine.go:20310
+		switch ( m.data)[( m.p)] {
+		case 11:
+			goto tr325
+		case 32:
+			goto st188
+		case 35:
+			goto st189
+		case 44:
+			goto st0
+		case 92:
+			goto st190
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto st188
+		}
+		goto tr323
+	st189:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof189
+		}
+	st_case_189:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st188
+		case 13:
+			goto st188
+		}
+		goto st189
+	st190:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof190
+		}
+	st_case_190:
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st0
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st0
+		}
+		goto tr323
+	st_out:
+	_test_eof1:  m.cs = 1; goto _test_eof
+	_test_eof2:  m.cs = 2; goto _test_eof
+	_test_eof3:  m.cs = 3; goto _test_eof
+	_test_eof4:  m.cs = 4; goto _test_eof
+	_test_eof5:  m.cs = 5; goto _test_eof
+	_test_eof6:  m.cs = 6; goto _test_eof
+	_test_eof7:  m.cs = 7; goto _test_eof
+	_test_eof191:  m.cs = 191; goto _test_eof
+	_test_eof192:  m.cs = 192; goto _test_eof
+	_test_eof193:  m.cs = 193; goto _test_eof
+	_test_eof8:  m.cs = 8; goto _test_eof
+	_test_eof194:  m.cs = 194; goto _test_eof
+	_test_eof195:  m.cs = 195; goto _test_eof
+	_test_eof196:  m.cs = 196; goto _test_eof
+	_test_eof197:  m.cs = 197; goto _test_eof
+	_test_eof198:  m.cs = 198; goto _test_eof
+	_test_eof199:  m.cs = 199; goto _test_eof
+	_test_eof200:  m.cs = 200; goto _test_eof
+	_test_eof201:  m.cs = 201; goto _test_eof
+	_test_eof202:  m.cs = 202; goto _test_eof
+	_test_eof203:  m.cs = 203; goto _test_eof
+	_test_eof204:  m.cs = 204; goto _test_eof
+	_test_eof205:  m.cs = 205; goto _test_eof
+	_test_eof206:  m.cs = 206; goto _test_eof
+	_test_eof207:  m.cs = 207; goto _test_eof
+	_test_eof208:  m.cs = 208; goto _test_eof
+	_test_eof209:  m.cs = 209; goto _test_eof
+	_test_eof210:  m.cs = 210; goto _test_eof
+	_test_eof211:  m.cs = 211; goto _test_eof
+	_test_eof212:  m.cs = 212; goto _test_eof
+	_test_eof213:  m.cs = 213; goto _test_eof
+	_test_eof9:  m.cs = 9; goto _test_eof
+	_test_eof10:  m.cs = 10; goto _test_eof
+	_test_eof11:  m.cs = 11; goto _test_eof
+	_test_eof12:  m.cs = 12; goto _test_eof
+	_test_eof214:  m.cs = 214; goto _test_eof
+	_test_eof215:  m.cs = 215; goto _test_eof
+	_test_eof13:  m.cs = 13; goto _test_eof
+	_test_eof14:  m.cs = 14; goto _test_eof
+	_test_eof216:  m.cs = 216; goto _test_eof
+	_test_eof217:  m.cs = 217; goto _test_eof
+	_test_eof218:  m.cs = 218; goto _test_eof
+	_test_eof219:  m.cs = 219; goto _test_eof
+	_test_eof15:  m.cs = 15; goto _test_eof
+	_test_eof16:  m.cs = 16; goto _test_eof
+	_test_eof17:  m.cs = 17; goto _test_eof
+	_test_eof220:  m.cs = 220; goto _test_eof
+	_test_eof18:  m.cs = 18; goto _test_eof
+	_test_eof19:  m.cs = 19; goto _test_eof
+	_test_eof20:  m.cs = 20; goto _test_eof
+	_test_eof221:  m.cs = 221; goto _test_eof
+	_test_eof21:  m.cs = 21; goto _test_eof
+	_test_eof22:  m.cs = 22; goto _test_eof
+	_test_eof222:  m.cs = 222; goto _test_eof
+	_test_eof223:  m.cs = 223; goto _test_eof
+	_test_eof23:  m.cs = 23; goto _test_eof
+	_test_eof24:  m.cs = 24; goto _test_eof
+	_test_eof25:  m.cs = 25; goto _test_eof
+	_test_eof26:  m.cs = 26; goto _test_eof
+	_test_eof27:  m.cs = 27; goto _test_eof
+	_test_eof28:  m.cs = 28; goto _test_eof
+	_test_eof29:  m.cs = 29; goto _test_eof
+	_test_eof30:  m.cs = 30; goto _test_eof
+	_test_eof31:  m.cs = 31; goto _test_eof
+	_test_eof32:  m.cs = 32; goto _test_eof
+	_test_eof33:  m.cs = 33; goto _test_eof
+	_test_eof34:  m.cs = 34; goto _test_eof
+	_test_eof35:  m.cs = 35; goto _test_eof
+	_test_eof36:  m.cs = 36; goto _test_eof
+	_test_eof37:  m.cs = 37; goto _test_eof
+	_test_eof38:  m.cs = 38; goto _test_eof
+	_test_eof39:  m.cs = 39; goto _test_eof
+	_test_eof40:  m.cs = 40; goto _test_eof
+	_test_eof41:  m.cs = 41; goto _test_eof
+	_test_eof224:  m.cs = 224; goto _test_eof
+	_test_eof225:  m.cs = 225; goto _test_eof
+	_test_eof42:  m.cs = 42; goto _test_eof
+	_test_eof226:  m.cs = 226; goto _test_eof
+	_test_eof227:  m.cs = 227; goto _test_eof
+	_test_eof228:  m.cs = 228; goto _test_eof
+	_test_eof229:  m.cs = 229; goto _test_eof
+	_test_eof230:  m.cs = 230; goto _test_eof
+	_test_eof231:  m.cs = 231; goto _test_eof
+	_test_eof232:  m.cs = 232; goto _test_eof
+	_test_eof233:  m.cs = 233; goto _test_eof
+	_test_eof234:  m.cs = 234; goto _test_eof
+	_test_eof235:  m.cs = 235; goto _test_eof
+	_test_eof236:  m.cs = 236; goto _test_eof
+	_test_eof237:  m.cs = 237; goto _test_eof
+	_test_eof238:  m.cs = 238; goto _test_eof
+	_test_eof239:  m.cs = 239; goto _test_eof
+	_test_eof240:  m.cs = 240; goto _test_eof
+	_test_eof241:  m.cs = 241; goto _test_eof
+	_test_eof242:  m.cs = 242; goto _test_eof
+	_test_eof243:  m.cs = 243; goto _test_eof
+	_test_eof244:  m.cs = 244; goto _test_eof
+	_test_eof245:  m.cs = 245; goto _test_eof
+	_test_eof43:  m.cs = 43; goto _test_eof
+	_test_eof246:  m.cs = 246; goto _test_eof
+	_test_eof247:  m.cs = 247; goto _test_eof
+	_test_eof248:  m.cs = 248; goto _test_eof
+	_test_eof44:  m.cs = 44; goto _test_eof
+	_test_eof249:  m.cs = 249; goto _test_eof
+	_test_eof250:  m.cs = 250; goto _test_eof
+	_test_eof251:  m.cs = 251; goto _test_eof
+	_test_eof252:  m.cs = 252; goto _test_eof
+	_test_eof253:  m.cs = 253; goto _test_eof
+	_test_eof254:  m.cs = 254; goto _test_eof
+	_test_eof255:  m.cs = 255; goto _test_eof
+	_test_eof256:  m.cs = 256; goto _test_eof
+	_test_eof257:  m.cs = 257; goto _test_eof
+	_test_eof258:  m.cs = 258; goto _test_eof
+	_test_eof259:  m.cs = 259; goto _test_eof
+	_test_eof260:  m.cs = 260; goto _test_eof
+	_test_eof261:  m.cs = 261; goto _test_eof
+	_test_eof262:  m.cs = 262; goto _test_eof
+	_test_eof263:  m.cs = 263; goto _test_eof
+	_test_eof264:  m.cs = 264; goto _test_eof
+	_test_eof265:  m.cs = 265; goto _test_eof
+	_test_eof266:  m.cs = 266; goto _test_eof
+	_test_eof267:  m.cs = 267; goto _test_eof
+	_test_eof268:  m.cs = 268; goto _test_eof
+	_test_eof45:  m.cs = 45; goto _test_eof
+	_test_eof46:  m.cs = 46; goto _test_eof
+	_test_eof47:  m.cs = 47; goto _test_eof
+	_test_eof269:  m.cs = 269; goto _test_eof
+	_test_eof48:  m.cs = 48; goto _test_eof
+	_test_eof49:  m.cs = 49; goto _test_eof
+	_test_eof50:  m.cs = 50; goto _test_eof
+	_test_eof51:  m.cs = 51; goto _test_eof
+	_test_eof270:  m.cs = 270; goto _test_eof
+	_test_eof271:  m.cs = 271; goto _test_eof
+	_test_eof52:  m.cs = 52; goto _test_eof
+	_test_eof272:  m.cs = 272; goto _test_eof
+	_test_eof53:  m.cs = 53; goto _test_eof
+	_test_eof273:  m.cs = 273; goto _test_eof
+	_test_eof274:  m.cs = 274; goto _test_eof
+	_test_eof275:  m.cs = 275; goto _test_eof
+	_test_eof276:  m.cs = 276; goto _test_eof
+	_test_eof54:  m.cs = 54; goto _test_eof
+	_test_eof55:  m.cs = 55; goto _test_eof
+	_test_eof56:  m.cs = 56; goto _test_eof
+	_test_eof277:  m.cs = 277; goto _test_eof
+	_test_eof57:  m.cs = 57; goto _test_eof
+	_test_eof58:  m.cs = 58; goto _test_eof
+	_test_eof59:  m.cs = 59; goto _test_eof
+	_test_eof278:  m.cs = 278; goto _test_eof
+	_test_eof60:  m.cs = 60; goto _test_eof
+	_test_eof61:  m.cs = 61; goto _test_eof
+	_test_eof279:  m.cs = 279; goto _test_eof
+	_test_eof280:  m.cs = 280; goto _test_eof
+	_test_eof62:  m.cs = 62; goto _test_eof
+	_test_eof63:  m.cs = 63; goto _test_eof
+	_test_eof281:  m.cs = 281; goto _test_eof
+	_test_eof282:  m.cs = 282; goto _test_eof
+	_test_eof64:  m.cs = 64; goto _test_eof
+	_test_eof65:  m.cs = 65; goto _test_eof
+	_test_eof283:  m.cs = 283; goto _test_eof
+	_test_eof284:  m.cs = 284; goto _test_eof
+	_test_eof285:  m.cs = 285; goto _test_eof
+	_test_eof286:  m.cs = 286; goto _test_eof
+	_test_eof66:  m.cs = 66; goto _test_eof
+	_test_eof67:  m.cs = 67; goto _test_eof
+	_test_eof68:  m.cs = 68; goto _test_eof
+	_test_eof287:  m.cs = 287; goto _test_eof
+	_test_eof69:  m.cs = 69; goto _test_eof
+	_test_eof70:  m.cs = 70; goto _test_eof
+	_test_eof71:  m.cs = 71; goto _test_eof
+	_test_eof288:  m.cs = 288; goto _test_eof
+	_test_eof72:  m.cs = 72; goto _test_eof
+	_test_eof73:  m.cs = 73; goto _test_eof
+	_test_eof289:  m.cs = 289; goto _test_eof
+	_test_eof290:  m.cs = 290; goto _test_eof
+	_test_eof74:  m.cs = 74; goto _test_eof
+	_test_eof75:  m.cs = 75; goto _test_eof
+	_test_eof76:  m.cs = 76; goto _test_eof
+	_test_eof77:  m.cs = 77; goto _test_eof
+	_test_eof78:  m.cs = 78; goto _test_eof
+	_test_eof79:  m.cs = 79; goto _test_eof
+	_test_eof291:  m.cs = 291; goto _test_eof
+	_test_eof292:  m.cs = 292; goto _test_eof
+	_test_eof293:  m.cs = 293; goto _test_eof
+	_test_eof294:  m.cs = 294; goto _test_eof
+	_test_eof80:  m.cs = 80; goto _test_eof
+	_test_eof295:  m.cs = 295; goto _test_eof
+	_test_eof296:  m.cs = 296; goto _test_eof
+	_test_eof297:  m.cs = 297; goto _test_eof
+	_test_eof298:  m.cs = 298; goto _test_eof
+	_test_eof81:  m.cs = 81; goto _test_eof
+	_test_eof299:  m.cs = 299; goto _test_eof
+	_test_eof300:  m.cs = 300; goto _test_eof
+	_test_eof301:  m.cs = 301; goto _test_eof
+	_test_eof302:  m.cs = 302; goto _test_eof
+	_test_eof303:  m.cs = 303; goto _test_eof
+	_test_eof304:  m.cs = 304; goto _test_eof
+	_test_eof305:  m.cs = 305; goto _test_eof
+	_test_eof306:  m.cs = 306; goto _test_eof
+	_test_eof307:  m.cs = 307; goto _test_eof
+	_test_eof308:  m.cs = 308; goto _test_eof
+	_test_eof309:  m.cs = 309; goto _test_eof
+	_test_eof310:  m.cs = 310; goto _test_eof
+	_test_eof311:  m.cs = 311; goto _test_eof
+	_test_eof312:  m.cs = 312; goto _test_eof
+	_test_eof313:  m.cs = 313; goto _test_eof
+	_test_eof314:  m.cs = 314; goto _test_eof
+	_test_eof315:  m.cs = 315; goto _test_eof
+	_test_eof316:  m.cs = 316; goto _test_eof
+	_test_eof82:  m.cs = 82; goto _test_eof
+	_test_eof83:  m.cs = 83; goto _test_eof
+	_test_eof84:  m.cs = 84; goto _test_eof
+	_test_eof85:  m.cs = 85; goto _test_eof
+	_test_eof86:  m.cs = 86; goto _test_eof
+	_test_eof87:  m.cs = 87; goto _test_eof
+	_test_eof88:  m.cs = 88; goto _test_eof
+	_test_eof89:  m.cs = 89; goto _test_eof
+	_test_eof90:  m.cs = 90; goto _test_eof
+	_test_eof91:  m.cs = 91; goto _test_eof
+	_test_eof92:  m.cs = 92; goto _test_eof
+	_test_eof93:  m.cs = 93; goto _test_eof
+	_test_eof94:  m.cs = 94; goto _test_eof
+	_test_eof317:  m.cs = 317; goto _test_eof
+	_test_eof318:  m.cs = 318; goto _test_eof
+	_test_eof95:  m.cs = 95; goto _test_eof
+	_test_eof319:  m.cs = 319; goto _test_eof
+	_test_eof320:  m.cs = 320; goto _test_eof
+	_test_eof321:  m.cs = 321; goto _test_eof
+	_test_eof322:  m.cs = 322; goto _test_eof
+	_test_eof323:  m.cs = 323; goto _test_eof
+	_test_eof324:  m.cs = 324; goto _test_eof
+	_test_eof325:  m.cs = 325; goto _test_eof
+	_test_eof326:  m.cs = 326; goto _test_eof
+	_test_eof327:  m.cs = 327; goto _test_eof
+	_test_eof328:  m.cs = 328; goto _test_eof
+	_test_eof329:  m.cs = 329; goto _test_eof
+	_test_eof330:  m.cs = 330; goto _test_eof
+	_test_eof331:  m.cs = 331; goto _test_eof
+	_test_eof332:  m.cs = 332; goto _test_eof
+	_test_eof333:  m.cs = 333; goto _test_eof
+	_test_eof334:  m.cs = 334; goto _test_eof
+	_test_eof335:  m.cs = 335; goto _test_eof
+	_test_eof336:  m.cs = 336; goto _test_eof
+	_test_eof337:  m.cs = 337; goto _test_eof
+	_test_eof338:  m.cs = 338; goto _test_eof
+	_test_eof96:  m.cs = 96; goto _test_eof
+	_test_eof97:  m.cs = 97; goto _test_eof
+	_test_eof339:  m.cs = 339; goto _test_eof
+	_test_eof340:  m.cs = 340; goto _test_eof
+	_test_eof98:  m.cs = 98; goto _test_eof
+	_test_eof341:  m.cs = 341; goto _test_eof
+	_test_eof342:  m.cs = 342; goto _test_eof
+	_test_eof343:  m.cs = 343; goto _test_eof
+	_test_eof344:  m.cs = 344; goto _test_eof
+	_test_eof345:  m.cs = 345; goto _test_eof
+	_test_eof346:  m.cs = 346; goto _test_eof
+	_test_eof347:  m.cs = 347; goto _test_eof
+	_test_eof348:  m.cs = 348; goto _test_eof
+	_test_eof349:  m.cs = 349; goto _test_eof
+	_test_eof350:  m.cs = 350; goto _test_eof
+	_test_eof351:  m.cs = 351; goto _test_eof
+	_test_eof352:  m.cs = 352; goto _test_eof
+	_test_eof353:  m.cs = 353; goto _test_eof
+	_test_eof354:  m.cs = 354; goto _test_eof
+	_test_eof355:  m.cs = 355; goto _test_eof
+	_test_eof356:  m.cs = 356; goto _test_eof
+	_test_eof357:  m.cs = 357; goto _test_eof
+	_test_eof358:  m.cs = 358; goto _test_eof
+	_test_eof359:  m.cs = 359; goto _test_eof
+	_test_eof360:  m.cs = 360; goto _test_eof
+	_test_eof99:  m.cs = 99; goto _test_eof
+	_test_eof361:  m.cs = 361; goto _test_eof
+	_test_eof362:  m.cs = 362; goto _test_eof
+	_test_eof100:  m.cs = 100; goto _test_eof
+	_test_eof101:  m.cs = 101; goto _test_eof
+	_test_eof102:  m.cs = 102; goto _test_eof
+	_test_eof103:  m.cs = 103; goto _test_eof
+	_test_eof363:  m.cs = 363; goto _test_eof
+	_test_eof364:  m.cs = 364; goto _test_eof
+	_test_eof104:  m.cs = 104; goto _test_eof
+	_test_eof105:  m.cs = 105; goto _test_eof
+	_test_eof365:  m.cs = 365; goto _test_eof
+	_test_eof366:  m.cs = 366; goto _test_eof
+	_test_eof367:  m.cs = 367; goto _test_eof
+	_test_eof368:  m.cs = 368; goto _test_eof
+	_test_eof106:  m.cs = 106; goto _test_eof
+	_test_eof107:  m.cs = 107; goto _test_eof
+	_test_eof108:  m.cs = 108; goto _test_eof
+	_test_eof369:  m.cs = 369; goto _test_eof
+	_test_eof109:  m.cs = 109; goto _test_eof
+	_test_eof110:  m.cs = 110; goto _test_eof
+	_test_eof111:  m.cs = 111; goto _test_eof
+	_test_eof370:  m.cs = 370; goto _test_eof
+	_test_eof112:  m.cs = 112; goto _test_eof
+	_test_eof113:  m.cs = 113; goto _test_eof
+	_test_eof371:  m.cs = 371; goto _test_eof
+	_test_eof372:  m.cs = 372; goto _test_eof
+	_test_eof114:  m.cs = 114; goto _test_eof
+	_test_eof115:  m.cs = 115; goto _test_eof
+	_test_eof116:  m.cs = 116; goto _test_eof
+	_test_eof117:  m.cs = 117; goto _test_eof
+	_test_eof118:  m.cs = 118; goto _test_eof
+	_test_eof119:  m.cs = 119; goto _test_eof
+	_test_eof120:  m.cs = 120; goto _test_eof
+	_test_eof121:  m.cs = 121; goto _test_eof
+	_test_eof122:  m.cs = 122; goto _test_eof
+	_test_eof123:  m.cs = 123; goto _test_eof
+	_test_eof124:  m.cs = 124; goto _test_eof
+	_test_eof125:  m.cs = 125; goto _test_eof
+	_test_eof373:  m.cs = 373; goto _test_eof
+	_test_eof374:  m.cs = 374; goto _test_eof
+	_test_eof375:  m.cs = 375; goto _test_eof
+	_test_eof126:  m.cs = 126; goto _test_eof
+	_test_eof376:  m.cs = 376; goto _test_eof
+	_test_eof377:  m.cs = 377; goto _test_eof
+	_test_eof378:  m.cs = 378; goto _test_eof
+	_test_eof379:  m.cs = 379; goto _test_eof
+	_test_eof380:  m.cs = 380; goto _test_eof
+	_test_eof381:  m.cs = 381; goto _test_eof
+	_test_eof382:  m.cs = 382; goto _test_eof
+	_test_eof383:  m.cs = 383; goto _test_eof
+	_test_eof384:  m.cs = 384; goto _test_eof
+	_test_eof385:  m.cs = 385; goto _test_eof
+	_test_eof386:  m.cs = 386; goto _test_eof
+	_test_eof387:  m.cs = 387; goto _test_eof
+	_test_eof388:  m.cs = 388; goto _test_eof
+	_test_eof389:  m.cs = 389; goto _test_eof
+	_test_eof390:  m.cs = 390; goto _test_eof
+	_test_eof391:  m.cs = 391; goto _test_eof
+	_test_eof392:  m.cs = 392; goto _test_eof
+	_test_eof393:  m.cs = 393; goto _test_eof
+	_test_eof394:  m.cs = 394; goto _test_eof
+	_test_eof395:  m.cs = 395; goto _test_eof
+	_test_eof396:  m.cs = 396; goto _test_eof
+	_test_eof397:  m.cs = 397; goto _test_eof
+	_test_eof127:  m.cs = 127; goto _test_eof
+	_test_eof398:  m.cs = 398; goto _test_eof
+	_test_eof399:  m.cs = 399; goto _test_eof
+	_test_eof400:  m.cs = 400; goto _test_eof
+	_test_eof401:  m.cs = 401; goto _test_eof
+	_test_eof128:  m.cs = 128; goto _test_eof
+	_test_eof402:  m.cs = 402; goto _test_eof
+	_test_eof403:  m.cs = 403; goto _test_eof
+	_test_eof404:  m.cs = 404; goto _test_eof
+	_test_eof405:  m.cs = 405; goto _test_eof
+	_test_eof406:  m.cs = 406; goto _test_eof
+	_test_eof407:  m.cs = 407; goto _test_eof
+	_test_eof408:  m.cs = 408; goto _test_eof
+	_test_eof409:  m.cs = 409; goto _test_eof
+	_test_eof410:  m.cs = 410; goto _test_eof
+	_test_eof411:  m.cs = 411; goto _test_eof
+	_test_eof412:  m.cs = 412; goto _test_eof
+	_test_eof413:  m.cs = 413; goto _test_eof
+	_test_eof414:  m.cs = 414; goto _test_eof
+	_test_eof415:  m.cs = 415; goto _test_eof
+	_test_eof416:  m.cs = 416; goto _test_eof
+	_test_eof417:  m.cs = 417; goto _test_eof
+	_test_eof418:  m.cs = 418; goto _test_eof
+	_test_eof419:  m.cs = 419; goto _test_eof
+	_test_eof420:  m.cs = 420; goto _test_eof
+	_test_eof421:  m.cs = 421; goto _test_eof
+	_test_eof129:  m.cs = 129; goto _test_eof
+	_test_eof130:  m.cs = 130; goto _test_eof
+	_test_eof131:  m.cs = 131; goto _test_eof
+	_test_eof422:  m.cs = 422; goto _test_eof
+	_test_eof423:  m.cs = 423; goto _test_eof
+	_test_eof132:  m.cs = 132; goto _test_eof
+	_test_eof424:  m.cs = 424; goto _test_eof
+	_test_eof425:  m.cs = 425; goto _test_eof
+	_test_eof426:  m.cs = 426; goto _test_eof
+	_test_eof427:  m.cs = 427; goto _test_eof
+	_test_eof428:  m.cs = 428; goto _test_eof
+	_test_eof429:  m.cs = 429; goto _test_eof
+	_test_eof430:  m.cs = 430; goto _test_eof
+	_test_eof431:  m.cs = 431; goto _test_eof
+	_test_eof432:  m.cs = 432; goto _test_eof
+	_test_eof433:  m.cs = 433; goto _test_eof
+	_test_eof434:  m.cs = 434; goto _test_eof
+	_test_eof435:  m.cs = 435; goto _test_eof
+	_test_eof436:  m.cs = 436; goto _test_eof
+	_test_eof437:  m.cs = 437; goto _test_eof
+	_test_eof438:  m.cs = 438; goto _test_eof
+	_test_eof439:  m.cs = 439; goto _test_eof
+	_test_eof440:  m.cs = 440; goto _test_eof
+	_test_eof441:  m.cs = 441; goto _test_eof
+	_test_eof442:  m.cs = 442; goto _test_eof
+	_test_eof443:  m.cs = 443; goto _test_eof
+	_test_eof133:  m.cs = 133; goto _test_eof
+	_test_eof444:  m.cs = 444; goto _test_eof
+	_test_eof445:  m.cs = 445; goto _test_eof
+	_test_eof446:  m.cs = 446; goto _test_eof
+	_test_eof134:  m.cs = 134; goto _test_eof
+	_test_eof447:  m.cs = 447; goto _test_eof
+	_test_eof448:  m.cs = 448; goto _test_eof
+	_test_eof449:  m.cs = 449; goto _test_eof
+	_test_eof450:  m.cs = 450; goto _test_eof
+	_test_eof451:  m.cs = 451; goto _test_eof
+	_test_eof452:  m.cs = 452; goto _test_eof
+	_test_eof453:  m.cs = 453; goto _test_eof
+	_test_eof454:  m.cs = 454; goto _test_eof
+	_test_eof455:  m.cs = 455; goto _test_eof
+	_test_eof456:  m.cs = 456; goto _test_eof
+	_test_eof457:  m.cs = 457; goto _test_eof
+	_test_eof458:  m.cs = 458; goto _test_eof
+	_test_eof459:  m.cs = 459; goto _test_eof
+	_test_eof460:  m.cs = 460; goto _test_eof
+	_test_eof461:  m.cs = 461; goto _test_eof
+	_test_eof462:  m.cs = 462; goto _test_eof
+	_test_eof463:  m.cs = 463; goto _test_eof
+	_test_eof464:  m.cs = 464; goto _test_eof
+	_test_eof465:  m.cs = 465; goto _test_eof
+	_test_eof466:  m.cs = 466; goto _test_eof
+	_test_eof467:  m.cs = 467; goto _test_eof
+	_test_eof468:  m.cs = 468; goto _test_eof
+	_test_eof135:  m.cs = 135; goto _test_eof
+	_test_eof469:  m.cs = 469; goto _test_eof
+	_test_eof470:  m.cs = 470; goto _test_eof
+	_test_eof471:  m.cs = 471; goto _test_eof
+	_test_eof472:  m.cs = 472; goto _test_eof
+	_test_eof473:  m.cs = 473; goto _test_eof
+	_test_eof474:  m.cs = 474; goto _test_eof
+	_test_eof475:  m.cs = 475; goto _test_eof
+	_test_eof476:  m.cs = 476; goto _test_eof
+	_test_eof477:  m.cs = 477; goto _test_eof
+	_test_eof478:  m.cs = 478; goto _test_eof
+	_test_eof479:  m.cs = 479; goto _test_eof
+	_test_eof480:  m.cs = 480; goto _test_eof
+	_test_eof481:  m.cs = 481; goto _test_eof
+	_test_eof482:  m.cs = 482; goto _test_eof
+	_test_eof483:  m.cs = 483; goto _test_eof
+	_test_eof484:  m.cs = 484; goto _test_eof
+	_test_eof485:  m.cs = 485; goto _test_eof
+	_test_eof486:  m.cs = 486; goto _test_eof
+	_test_eof487:  m.cs = 487; goto _test_eof
+	_test_eof488:  m.cs = 488; goto _test_eof
+	_test_eof489:  m.cs = 489; goto _test_eof
+	_test_eof490:  m.cs = 490; goto _test_eof
+	_test_eof136:  m.cs = 136; goto _test_eof
+	_test_eof137:  m.cs = 137; goto _test_eof
+	_test_eof138:  m.cs = 138; goto _test_eof
+	_test_eof139:  m.cs = 139; goto _test_eof
+	_test_eof491:  m.cs = 491; goto _test_eof
+	_test_eof492:  m.cs = 492; goto _test_eof
+	_test_eof140:  m.cs = 140; goto _test_eof
+	_test_eof493:  m.cs = 493; goto _test_eof
+	_test_eof141:  m.cs = 141; goto _test_eof
+	_test_eof494:  m.cs = 494; goto _test_eof
+	_test_eof495:  m.cs = 495; goto _test_eof
+	_test_eof496:  m.cs = 496; goto _test_eof
+	_test_eof497:  m.cs = 497; goto _test_eof
+	_test_eof142:  m.cs = 142; goto _test_eof
+	_test_eof143:  m.cs = 143; goto _test_eof
+	_test_eof144:  m.cs = 144; goto _test_eof
+	_test_eof498:  m.cs = 498; goto _test_eof
+	_test_eof145:  m.cs = 145; goto _test_eof
+	_test_eof146:  m.cs = 146; goto _test_eof
+	_test_eof147:  m.cs = 147; goto _test_eof
+	_test_eof499:  m.cs = 499; goto _test_eof
+	_test_eof148:  m.cs = 148; goto _test_eof
+	_test_eof149:  m.cs = 149; goto _test_eof
+	_test_eof500:  m.cs = 500; goto _test_eof
+	_test_eof501:  m.cs = 501; goto _test_eof
+	_test_eof150:  m.cs = 150; goto _test_eof
+	_test_eof151:  m.cs = 151; goto _test_eof
+	_test_eof502:  m.cs = 502; goto _test_eof
+	_test_eof503:  m.cs = 503; goto _test_eof
+	_test_eof504:  m.cs = 504; goto _test_eof
+	_test_eof152:  m.cs = 152; goto _test_eof
+	_test_eof505:  m.cs = 505; goto _test_eof
+	_test_eof506:  m.cs = 506; goto _test_eof
+	_test_eof507:  m.cs = 507; goto _test_eof
+	_test_eof508:  m.cs = 508; goto _test_eof
+	_test_eof509:  m.cs = 509; goto _test_eof
+	_test_eof510:  m.cs = 510; goto _test_eof
+	_test_eof511:  m.cs = 511; goto _test_eof
+	_test_eof512:  m.cs = 512; goto _test_eof
+	_test_eof513:  m.cs = 513; goto _test_eof
+	_test_eof514:  m.cs = 514; goto _test_eof
+	_test_eof515:  m.cs = 515; goto _test_eof
+	_test_eof516:  m.cs = 516; goto _test_eof
+	_test_eof517:  m.cs = 517; goto _test_eof
+	_test_eof518:  m.cs = 518; goto _test_eof
+	_test_eof519:  m.cs = 519; goto _test_eof
+	_test_eof520:  m.cs = 520; goto _test_eof
+	_test_eof521:  m.cs = 521; goto _test_eof
+	_test_eof522:  m.cs = 522; goto _test_eof
+	_test_eof523:  m.cs = 523; goto _test_eof
+	_test_eof524:  m.cs = 524; goto _test_eof
+	_test_eof525:  m.cs = 525; goto _test_eof
+	_test_eof153:  m.cs = 153; goto _test_eof
+	_test_eof154:  m.cs = 154; goto _test_eof
+	_test_eof526:  m.cs = 526; goto _test_eof
+	_test_eof527:  m.cs = 527; goto _test_eof
+	_test_eof528:  m.cs = 528; goto _test_eof
+	_test_eof529:  m.cs = 529; goto _test_eof
+	_test_eof155:  m.cs = 155; goto _test_eof
+	_test_eof156:  m.cs = 156; goto _test_eof
+	_test_eof157:  m.cs = 157; goto _test_eof
+	_test_eof530:  m.cs = 530; goto _test_eof
+	_test_eof158:  m.cs = 158; goto _test_eof
+	_test_eof159:  m.cs = 159; goto _test_eof
+	_test_eof160:  m.cs = 160; goto _test_eof
+	_test_eof531:  m.cs = 531; goto _test_eof
+	_test_eof161:  m.cs = 161; goto _test_eof
+	_test_eof162:  m.cs = 162; goto _test_eof
+	_test_eof532:  m.cs = 532; goto _test_eof
+	_test_eof533:  m.cs = 533; goto _test_eof
+	_test_eof163:  m.cs = 163; goto _test_eof
+	_test_eof164:  m.cs = 164; goto _test_eof
+	_test_eof165:  m.cs = 165; goto _test_eof
+	_test_eof534:  m.cs = 534; goto _test_eof
+	_test_eof535:  m.cs = 535; goto _test_eof
+	_test_eof166:  m.cs = 166; goto _test_eof
+	_test_eof536:  m.cs = 536; goto _test_eof
+	_test_eof537:  m.cs = 537; goto _test_eof
+	_test_eof167:  m.cs = 167; goto _test_eof
+	_test_eof538:  m.cs = 538; goto _test_eof
+	_test_eof539:  m.cs = 539; goto _test_eof
+	_test_eof540:  m.cs = 540; goto _test_eof
+	_test_eof541:  m.cs = 541; goto _test_eof
+	_test_eof168:  m.cs = 168; goto _test_eof
+	_test_eof169:  m.cs = 169; goto _test_eof
+	_test_eof170:  m.cs = 170; goto _test_eof
+	_test_eof542:  m.cs = 542; goto _test_eof
+	_test_eof171:  m.cs = 171; goto _test_eof
+	_test_eof172:  m.cs = 172; goto _test_eof
+	_test_eof173:  m.cs = 173; goto _test_eof
+	_test_eof543:  m.cs = 543; goto _test_eof
+	_test_eof174:  m.cs = 174; goto _test_eof
+	_test_eof175:  m.cs = 175; goto _test_eof
+	_test_eof544:  m.cs = 544; goto _test_eof
+	_test_eof545:  m.cs = 545; goto _test_eof
+	_test_eof176:  m.cs = 176; goto _test_eof
+	_test_eof546:  m.cs = 546; goto _test_eof
+	_test_eof547:  m.cs = 547; goto _test_eof
+	_test_eof177:  m.cs = 177; goto _test_eof
+	_test_eof178:  m.cs = 178; goto _test_eof
+	_test_eof548:  m.cs = 548; goto _test_eof
+	_test_eof549:  m.cs = 549; goto _test_eof
+	_test_eof550:  m.cs = 550; goto _test_eof
+	_test_eof179:  m.cs = 179; goto _test_eof
+	_test_eof180:  m.cs = 180; goto _test_eof
+	_test_eof181:  m.cs = 181; goto _test_eof
+	_test_eof551:  m.cs = 551; goto _test_eof
+	_test_eof182:  m.cs = 182; goto _test_eof
+	_test_eof183:  m.cs = 183; goto _test_eof
+	_test_eof184:  m.cs = 184; goto _test_eof
+	_test_eof552:  m.cs = 552; goto _test_eof
+	_test_eof185:  m.cs = 185; goto _test_eof
+	_test_eof186:  m.cs = 186; goto _test_eof
+	_test_eof553:  m.cs = 553; goto _test_eof
+	_test_eof554:  m.cs = 554; goto _test_eof
+	_test_eof187:  m.cs = 187; goto _test_eof
+	_test_eof555:  m.cs = 555; goto _test_eof
+	_test_eof188:  m.cs = 188; goto _test_eof
+	_test_eof556:  m.cs = 556; goto _test_eof
+	_test_eof557:  m.cs = 557; goto _test_eof
+	_test_eof189:  m.cs = 189; goto _test_eof
+	_test_eof190:  m.cs = 190; goto _test_eof
+
+	_test_eof: {}
+	if ( m.p) == ( m.eof) {
+		switch  m.cs {
+		case 191, 192, 193, 195, 224, 225, 227, 246, 247, 248, 250, 269, 272, 291, 292, 293, 294, 296, 297, 298, 317, 318, 320, 339, 340, 342, 361, 362, 373, 374, 375, 377, 396, 397, 399, 400, 401, 420, 421, 422, 423, 425, 444, 445, 446, 448, 467, 468, 470, 471, 472, 493, 503, 504, 506, 536, 556, 557:
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 1, 129:
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 37, 38, 39, 40, 41, 43, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, 87, 88, 89, 90, 91, 125, 128, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186:
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 27, 28, 29, 35, 36:
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 8:
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 217, 274, 284, 366, 495, 527, 539, 548:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 214, 215, 216, 218, 270, 271, 273, 275, 281, 282, 283, 285, 363, 364, 365, 367, 491, 492, 494, 496, 502, 525, 526, 528, 534, 535, 537, 538, 540, 546, 547, 549:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddFloat(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 219, 220, 221, 222, 223, 276, 277, 278, 279, 280, 286, 287, 288, 289, 290, 368, 369, 370, 371, 372, 497, 498, 499, 500, 501, 529, 530, 531, 532, 533, 541, 542, 543, 544, 545, 550, 551, 552, 553, 554:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddBool(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 226, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 249, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 295, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 319, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 341, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 376, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 398, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 424, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 447, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 469, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 505, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.SetTimestamp(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 42, 44, 80, 126, 127, 134:
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 30, 31, 32, 33, 34, 82, 83, 84, 85, 86, 92, 93, 94, 96, 97, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 130, 131, 133, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163:
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 98:
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 95, 132, 135, 152:
+//line plugins/parsers/influx/machine.go.rl:42
+
+	m.err = ErrTagParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:35
+
+	m.err = ErrFieldParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:49
+
+	m.err = ErrTimestampParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go.rl:56
+
+	m.err = ErrParse
+	( m.p)--
+
+	 m.cs = 187;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+//line plugins/parsers/influx/machine.go:21134
+		}
+	}
+
+	_out: {}
+	}
+
+//line plugins/parsers/influx/machine.go.rl:267
+
+	// Even if there was an error, return true. On the next call to this
+	// function we will attempt to scan to the next line of input and recover.
+	if m.err != nil {
+		return true
+	}
+
+	// Don't check the error state in the case that we just yielded, because
+	// the yield indicates we just completed parsing a line.
+	if !yield && m.cs == LineProtocol_error {
+		m.err = ErrParse
+		return true
+	}
+
+	return true
+}
+
+// Err returns the error that occurred on the last call to ParseLine.  If the
+// result is nil, then the line was parsed successfully.
+func (m *machine) Err() error {
+	return m.err
+}
+
+// Position returns the current position into the input.
+func (m *machine) Position() int {
+	return m.p
+}
+
+func (m *machine) text() []byte {
+	return m.data[m.pb:m.p]
+}
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
new file mode 100644
index 000000000..2edc5b8c8
--- /dev/null
+++ b/plugins/parsers/influx/machine.go.rl
@@ -0,0 +1,297 @@
+package influx
+
+import (
+	"errors"
+)
+
+var (
+	ErrNameParse = errors.New("expected measurement name")
+	ErrFieldParse = errors.New("expected field")
+	ErrTagParse = errors.New("expected tag")
+	ErrTimestampParse = errors.New("expected timestamp")
+	ErrParse = errors.New("parse error")
+)
+
+%%{
+machine LineProtocol;
+
+action begin {
+	m.pb = m.p
+}
+
+action yield {
+	yield = true
+	fnext align;
+	fbreak;
+}
+
+action name_error {
+	m.err = ErrNameParse
+	fhold;
+	fnext discard_line;
+	fbreak;
+}
+
+action field_error {
+	m.err = ErrFieldParse
+	fhold;
+	fnext discard_line;
+	fbreak;
+}
+
+action tagset_error {
+	m.err = ErrTagParse
+	fhold;
+	fnext discard_line;
+	fbreak;
+}
+
+action timestamp_error {
+	m.err = ErrTimestampParse
+	fhold;
+	fnext discard_line;
+	fbreak;
+}
+
+action parse_error {
+	m.err = ErrParse
+	fhold;
+	fnext discard_line;
+	fbreak;
+}
+
+action hold_recover {
+	fhold;
+	fgoto main;
+}
+
+action discard {
+	fgoto align;
+}
+
+action name {
+	m.handler.SetMeasurement(m.text())
+}
+
+action tagkey {
+	key = m.text()
+}
+
+action tagvalue {
+	m.handler.AddTag(key, m.text())
+}
+
+action fieldkey {
+	key = m.text()
+}
+
+action integer {
+	m.handler.AddInt(key, m.text())
+}
+
+action float {
+	m.handler.AddFloat(key, m.text())
+}
+
+action bool {
+	m.handler.AddBool(key, m.text())
+}
+
+action string {
+	m.handler.AddString(key, m.text())
+}
+
+action timestamp {
+	m.handler.SetTimestamp(m.text())
+}
+
+ws =
+	[\t\v\f ];
+
+non_zero_digit =
+	[1-9];
+
+integer =
+	'-'? ( digit | ( non_zero_digit digit* ) );
+
+number =
+	( integer ( '.' digit* )? ) | ( '.' digit* );
+
+scientific =
+	number 'e'i ["\-+"]? digit+;
+
+timestamp =
+	('-'? digit{1,19}) >begin %timestamp;
+
+fieldkeychar =
+	[^\t\n\f\r ,=\\] | ( '\\' [^\t\n\f\r] );
+
+fieldkey =
+	fieldkeychar+ >begin %fieldkey;
+
+fieldfloat =
+	(scientific | number) >begin %float;
+
+fieldinteger =
+	(integer 'i') >begin %integer;
+
+false =
+	"false" | "FALSE" | "False" | "F" | "f";
+
+true =
+	"true" | "TRUE" | "True" | "T" | "t";
+
+fieldbool =
+	(true | false) >begin %bool;
+
+fieldstringchar =
+	[^\\"] | '\\' [\\"];
+
+fieldstring =
+	fieldstringchar* >begin %string;
+
+fieldstringquoted =
+	'"' fieldstring '"';
+
+fieldvalue = fieldinteger | fieldfloat | fieldstringquoted | fieldbool;
+
+field =
+	fieldkey '=' fieldvalue;
+
+fieldset =
+	field ( ',' field )*;
+
+tagchar =
+	[^\t\n\f\r ,=\\] | ( '\\' [^\t\n\f\r] );
+
+tagkey =
+	tagchar+ >begin %tagkey;
+
+tagvalue =
+	tagchar+ >begin %tagvalue;
+
+tagset =
+	(',' (tagkey '=' tagvalue) $err(tagset_error))*;
+
+measurement_chars =
+	[^\t\n\f\r ,\\] | ( '\\' [^\t\n\f\r] );
+
+measurement_start =
+	measurement_chars - '#';
+
+measurement =
+	(measurement_start measurement_chars*) >begin %name;
+
+newline =
+	[\r\n];
+
+comment =
+	'#' (any -- newline)* newline;
+
+eol =
+	ws* newline? >yield %eof(yield);
+
+line =
+	measurement
+	tagset
+	(ws+ fieldset) $err(field_error)
+	(ws+ timestamp)? $err(timestamp_error)
+	eol;
+
+# The main machine parses a single line of line protocol.
+main := line $err(parse_error);
+
+# The discard_line machine discards the current line.  Useful for recovering
+# on the next line when an error occurs.
+discard_line :=
+	(any - newline)* newline @discard;
+
+# The align machine scans forward to the start of the next line.  This machine
+# is used to skip over whitespace and comments, keeping this logic out of the
+# main machine.
+align :=
+	(space* comment)* space* measurement_start @hold_recover %eof(yield);
+}%%
+
+%% write data;
+
+type machine struct {
+	data       []byte
+	cs         int
+	p, pe, eof int
+	pb         int
+	handler    Handler
+	err        error
+}
+
+func NewMachine(handler Handler) *machine {
+	m := &machine{
+		handler: handler,
+	}
+
+	%% access m.;
+	%% variable p m.p;
+	%% variable pe m.pe;
+	%% variable eof m.eof;
+	%% variable data m.data;
+	%% write init;
+
+	return m
+}
+
+func (m *machine) SetData(data []byte) {
+	m.data = data
+	m.p = 0
+	m.pb = 0
+	m.pe = len(data)
+	m.eof = len(data)
+	m.err = nil
+
+	%% write init;
+	m.cs = LineProtocol_en_align
+}
+
+// ParseLine parses a line of input and returns true if more data can be
+// parsed.
+func (m *machine) ParseLine() bool {
+	if m.data == nil || m.p >= m.pe {
+		m.err = nil
+		return false
+	}
+
+	m.err = nil
+	var key []byte
+	var yield bool
+
+	%% write exec;
+
+	// Even if there was an error, return true. On the next call to this
+	// function we will attempt to scan to the next line of input and recover.
+	if m.err != nil {
+		return true
+	}
+
+	// Don't check the error state in the case that we just yielded, because
+	// the yield indicates we just completed parsing a line.
+	if !yield && m.cs == LineProtocol_error {
+		m.err = ErrParse
+		return true
+	}
+
+	return true
+}
+
+// Err returns the error that occurred on the last call to ParseLine.  If the
+// result is nil, then the line was parsed successfully.
+func (m *machine) Err() error {
+	return m.err
+}
+
+// Position returns the current position into the input.
+func (m *machine) Position() int {
+	return m.p
+}
+
+func (m *machine) text() []byte {
+	return m.data[m.pb:m.p]
+}
diff --git a/plugins/parsers/influx/machine_test.go b/plugins/parsers/influx/machine_test.go
new file mode 100644
index 000000000..3b8bcdf8b
--- /dev/null
+++ b/plugins/parsers/influx/machine_test.go
@@ -0,0 +1,1312 @@
+package influx
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type TestingHandler struct {
+	results []Result
+}
+
+func (h *TestingHandler) SetMeasurement(name []byte) {
+	mname := Result{
+		Name:  Measurement,
+		Value: name,
+	}
+	h.results = append(h.results, mname)
+}
+
+func (h *TestingHandler) AddTag(key []byte, value []byte) {
+	tagkey := Result{
+		Name:  TagKey,
+		Value: key,
+	}
+	tagvalue := Result{
+		Name:  TagValue,
+		Value: value,
+	}
+	h.results = append(h.results, tagkey, tagvalue)
+}
+
+func (h *TestingHandler) AddInt(key []byte, value []byte) {
+	fieldkey := Result{
+		Name:  FieldKey,
+		Value: key,
+	}
+	fieldvalue := Result{
+		Name:  FieldInt,
+		Value: value,
+	}
+	h.results = append(h.results, fieldkey, fieldvalue)
+}
+
+func (h *TestingHandler) AddFloat(key []byte, value []byte) {
+	fieldkey := Result{
+		Name:  FieldKey,
+		Value: key,
+	}
+	fieldvalue := Result{
+		Name:  FieldFloat,
+		Value: value,
+	}
+	h.results = append(h.results, fieldkey, fieldvalue)
+}
+
+func (h *TestingHandler) AddString(key []byte, value []byte) {
+	fieldkey := Result{
+		Name:  FieldKey,
+		Value: key,
+	}
+	fieldvalue := Result{
+		Name:  FieldString,
+		Value: value,
+	}
+	h.results = append(h.results, fieldkey, fieldvalue)
+}
+
+func (h *TestingHandler) AddBool(key []byte, value []byte) {
+	fieldkey := Result{
+		Name:  FieldKey,
+		Value: key,
+	}
+	fieldvalue := Result{
+		Name:  FieldBool,
+		Value: value,
+	}
+	h.results = append(h.results, fieldkey, fieldvalue)
+}
+
+func (h *TestingHandler) SetTimestamp(tm []byte) {
+	timestamp := Result{
+		Name:  Timestamp,
+		Value: tm,
+	}
+	h.results = append(h.results, timestamp)
+}
+
+func (h *TestingHandler) Reset() {
+}
+
+func (h *TestingHandler) Results() []Result {
+	return h.results
+}
+
+func (h *TestingHandler) AddError(err error) {
+	e := Result{
+		err: err,
+	}
+	h.results = append(h.results, e)
+}
+
+type BenchmarkingHandler struct {
+}
+
+func (h *BenchmarkingHandler) SetMeasurement(name []byte) {
+}
+
+func (h *BenchmarkingHandler) AddTag(key []byte, value []byte) {
+}
+
+func (h *BenchmarkingHandler) AddInt(key []byte, value []byte) {
+}
+
+func (h *BenchmarkingHandler) AddFloat(key []byte, value []byte) {
+}
+
+func (h *BenchmarkingHandler) AddString(key []byte, value []byte) {
+}
+
+func (h *BenchmarkingHandler) AddBool(key []byte, value []byte) {
+}
+
+func (h *BenchmarkingHandler) SetTimestamp(tm []byte) {
+}
+
+func (h *BenchmarkingHandler) Reset() {
+}
+
+type TokenType int
+
+const (
+	NoMatch TokenType = iota
+	Measurement
+	TagKey
+	TagValue
+	FieldKey
+	FieldString
+	FieldInt
+	FieldUint
+	FieldFloat
+	FieldBool
+	Timestamp
+	EOL
+	EOF
+	Punc
+	WhiteSpace
+)
+
+func (t TokenType) String() string {
+	switch t {
+	case NoMatch:
+		return "NoMatch"
+	case Measurement:
+		return "Measurement"
+	case TagKey:
+		return "TagKey"
+	case TagValue:
+		return "TagValue"
+	case FieldKey:
+		return "FieldKey"
+	case FieldInt:
+		return "FieldInt"
+	case FieldUint:
+		return "FieldUint"
+	case FieldFloat:
+		return "FieldFloat"
+	case FieldString:
+		return "FieldString"
+	case FieldBool:
+		return "FieldBool"
+	case Timestamp:
+		return "Timestamp"
+	case EOL:
+		return "EOL"
+	case EOF:
+		return "EOF"
+	case Punc:
+		return "Punc"
+	case WhiteSpace:
+		return "WhiteSpace"
+	default:
+		panic("Unknown TokenType")
+	}
+}
+
+type Token struct {
+	Name  TokenType
+	Value []byte
+}
+
+func (t Token) String() string {
+	return fmt.Sprintf("(%s %q)", t.Name, t.Value)
+}
+
+type Result struct {
+	Name  TokenType
+	Value []byte
+	err   error
+}
+
+func (r Result) String() string {
+	return fmt.Sprintf("(%s, %q, %v)", r.Name, r.Value, r.err)
+}
+
+var tests = []struct {
+	name    string
+	input   []byte
+	results []Result
+	err     error
+}{
+	{
+		name:    "empty string",
+		input:   []byte(""),
+		results: nil,
+	},
+	{
+		name:  "minimal",
+		input: []byte("cpu value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "newline",
+		input: []byte("cpu value=42\n"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "minimal with timestamp",
+		input: []byte("cpu value=42 1516241192000000000"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  Timestamp,
+				Value: []byte("1516241192000000000"),
+			},
+		},
+	},
+	{
+		name:  "measurement escape non-special",
+		input: []byte(`c\pu value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte(`c\pu`),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "measurement escaped trailing backslash",
+		input: []byte(`cpu\\ value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte(`cpu\\`),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "single char measurement",
+		input: []byte("c value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("c"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "escape backslash in measurement",
+		input: []byte(`cp\\u value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte(`cp\\u`),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "measurement escape space",
+		input: []byte(`cpu\ abc value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte(`cpu\ abc`),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "scientific float",
+		input: []byte("cpu value=42e0"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42e0"),
+			},
+		},
+	},
+	{
+		name:  "scientific float negative mantissa",
+		input: []byte("cpu value=-42e0"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("-42e0"),
+			},
+		},
+	},
+	{
+		name:  "scientific float negative exponent",
+		input: []byte("cpu value=42e-1"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42e-1"),
+			},
+		},
+	},
+	{
+		name:  "scientific float big e",
+		input: []byte("cpu value=42E0"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42E0"),
+			},
+		},
+	},
+	{
+		name:  "scientific float missing exponent",
+		input: []byte("cpu value=42E"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "float with decimal",
+		input: []byte("cpu value=42.2"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42.2"),
+			},
+		},
+	},
+	{
+		name:  "negative float",
+		input: []byte("cpu value=-42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("-42"),
+			},
+		},
+	},
+	{
+		name:  "float without integer digits",
+		input: []byte("cpu value=.42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte(".42"),
+			},
+		},
+	},
+	{
+		name:  "multiple fields",
+		input: []byte("cpu x=42,y=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("x"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("y"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "integer field",
+		input: []byte("cpu value=42i"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldInt,
+				Value: []byte("42i"),
+			},
+		},
+	},
+	{
+		name:  "negative integer field",
+		input: []byte("cpu value=-42i"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldInt,
+				Value: []byte("-42i"),
+			},
+		},
+	},
+	{
+		name:  "zero integer field",
+		input: []byte("cpu value=0i"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldInt,
+				Value: []byte("0i"),
+			},
+		},
+	},
+	{
+		name:  "negative zero integer field",
+		input: []byte("cpu value=-0i"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldInt,
+				Value: []byte("-0i"),
+			},
+		},
+	},
+	{
+		name:  "invalid field",
+		input: []byte("cpu value=howdy"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "string field",
+		input: []byte(`cpu value="42"`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldString,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "bool field",
+		input: []byte(`cpu value=true`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldBool,
+				Value: []byte("true"),
+			},
+		},
+	},
+	{
+		name:  "tag",
+		input: []byte(`cpu,host=localhost value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte("host"),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("localhost"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "tag key escape space",
+		input: []byte(`cpu,h\ ost=localhost value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte(`h\ ost`),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("localhost"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "tag key escape comma",
+		input: []byte(`cpu,h\,ost=localhost value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte(`h\,ost`),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("localhost"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "tag key escape equal",
+		input: []byte(`cpu,h\=ost=localhost value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte(`h\=ost`),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("localhost"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "multiple tags",
+		input: []byte(`cpu,host=localhost,cpu=cpu0 value=42`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte("host"),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("localhost"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("cpu0"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "tag invalid missing separator",
+		input: []byte("cpu,xyzzy value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "tag invalid missing value",
+		input: []byte("cpu,xyzzy= value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "tag invalid unescaped space",
+		input: []byte("cpu,h ost=localhost value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "tag invalid unescaped comma",
+		input: []byte("cpu,h,ost=localhost value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "tag invalid unescaped equals",
+		input: []byte("cpu,h=ost=localhost value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "timestamp negative",
+		input: []byte("cpu value=42 -1"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  Timestamp,
+				Value: []byte("-1"),
+			},
+		},
+	},
+	{
+		name:  "timestamp zero",
+		input: []byte("cpu value=42 0"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  Timestamp,
+				Value: []byte("0"),
+			},
+		},
+	},
+	{
+		name:  "multiline",
+		input: []byte("cpu value=42\n\n\ncpu value=43\n"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("43"),
+			},
+		},
+	},
+	{
+		name:  "error recovery",
+		input: []byte("cpu value=howdy\ncpu\ncpu value=42\n"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "line whitespace",
+		input: []byte("   cpu   value=42  1516241192000000000  \n\n cpu value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				Name:  Timestamp,
+				Value: []byte("1516241192000000000"),
+			},
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "leading newline",
+		input: []byte("\ncpu value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "invalid missing field value",
+		input: []byte("cpu value="),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid eof field key",
+		input: []byte("cpu value"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid measurement only",
+		input: []byte("cpu"),
+		results: []Result{
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid measurement only eol",
+		input: []byte("cpu\n"),
+		results: []Result{
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid missing tag",
+		input: []byte("cpu, value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrTagParse,
+			},
+		},
+	},
+	{
+		name:  "invalid missing field",
+		input: []byte("cpu,x=y "),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  TagKey,
+				Value: []byte("x"),
+			},
+			Result{
+				Name:  TagValue,
+				Value: []byte("y"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid too many fields",
+		input: []byte("cpu value=42 value=43"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				err: ErrTimestampParse,
+			},
+		},
+	},
+	{
+		name:  "invalid timestamp too long",
+		input: []byte("cpu value=42 12345678901234567890"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				err: ErrTimestampParse,
+			},
+		},
+	},
+	{
+		name:  "invalid open string field",
+		input: []byte(`cpu value="42 12345678901234567890`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid field value",
+		input: []byte(`cpu value=howdy`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
+	{
+		name:  "invalid quoted timestamp",
+		input: []byte(`cpu value=42 "12345678901234567890"`),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+			Result{
+				err: ErrTimestampParse,
+			},
+		},
+	},
+	{
+		name:  "commented line",
+		input: []byte("# blah blah\ncpu value=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "end with comment",
+		input: []byte("cpu value=42\n# blah blah"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "end with comment and whitespace",
+		input: []byte("cpu value=42\n# blah blah\n\n  "),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+	{
+		name:  "unicode",
+		input: []byte("cpu ☺=42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("☺"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("42"),
+			},
+		},
+	},
+}
+
+func TestMachine(t *testing.T) {
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := &TestingHandler{}
+			fsm := NewMachine(handler)
+			fsm.SetData(tt.input)
+
+			count := 0
+			for fsm.ParseLine() {
+				if fsm.Err() != nil {
+					handler.AddError(fsm.Err())
+				}
+				count++
+				if count > 20 {
+					break
+				}
+			}
+
+			if fsm.Err() != nil {
+				handler.AddError(fsm.Err())
+			}
+
+			results := handler.Results()
+			require.Equal(t, tt.results, results)
+		})
+	}
+}
+
+func BenchmarkMachine(b *testing.B) {
+	for _, tt := range tests {
+		b.Run(tt.name, func(b *testing.B) {
+			handler := &BenchmarkingHandler{}
+			fsm := NewMachine(handler)
+
+			for n := 0; n < b.N; n++ {
+				fsm.SetData(tt.input)
+
+				for fsm.ParseLine() {
+				}
+			}
+		})
+	}
+}
+
+func TestMachineProcstat(t *testing.T) {
+	input := []byte("procstat,exe=bash,process_name=bash voluntary_context_switches=42i,memory_rss=5103616i,rlimit_memory_data_hard=2147483647i,cpu_time_user=0.02,rlimit_file_locks_soft=2147483647i,pid=29417i,cpu_time_nice=0,rlimit_memory_locked_soft=65536i,read_count=259i,rlimit_memory_vms_hard=2147483647i,memory_swap=0i,rlimit_num_fds_soft=1024i,rlimit_nice_priority_hard=0i,cpu_time_soft_irq=0,cpu_time=0i,rlimit_memory_locked_hard=65536i,realtime_priority=0i,signals_pending=0i,nice_priority=20i,cpu_time_idle=0,memory_stack=139264i,memory_locked=0i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,cpu_time_guest=0,cpu_time_guest_nice=0,rlimit_memory_data_soft=2147483647i,read_bytes=0i,rlimit_cpu_time_soft=2147483647i,involuntary_context_switches=2i,write_bytes=106496i,cpu_time_system=0,cpu_time_irq=0,cpu_usage=0,memory_vms=21659648i,memory_data=1576960i,rlimit_memory_stack_hard=2147483647i,num_threads=1i,cpu_time_stolen=0,rlimit_memory_rss_soft=2147483647i,rlimit_realtime_priority_soft=0i,num_fds=4i,write_count=35i,rlimit_signals_pending_soft=78994i,cpu_time_steal=0,rlimit_num_fds_hard=4096i,rlimit_file_locks_hard=2147483647i,rlimit_cpu_time_hard=2147483647i,rlimit_signals_pending_hard=78994i,rlimit_nice_priority_soft=0i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_realtime_priority_hard=0i 1517620624000000000")
+	handler := &TestingHandler{}
+	fsm := NewMachine(handler)
+	fsm.SetData(input)
+	for fsm.ParseLine() {
+	}
+}
+
+func BenchmarkMachineProcstat(b *testing.B) {
+	input := []byte("procstat,exe=bash,process_name=bash voluntary_context_switches=42i,memory_rss=5103616i,rlimit_memory_data_hard=2147483647i,cpu_time_user=0.02,rlimit_file_locks_soft=2147483647i,pid=29417i,cpu_time_nice=0,rlimit_memory_locked_soft=65536i,read_count=259i,rlimit_memory_vms_hard=2147483647i,memory_swap=0i,rlimit_num_fds_soft=1024i,rlimit_nice_priority_hard=0i,cpu_time_soft_irq=0,cpu_time=0i,rlimit_memory_locked_hard=65536i,realtime_priority=0i,signals_pending=0i,nice_priority=20i,cpu_time_idle=0,memory_stack=139264i,memory_locked=0i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,cpu_time_guest=0,cpu_time_guest_nice=0,rlimit_memory_data_soft=2147483647i,read_bytes=0i,rlimit_cpu_time_soft=2147483647i,involuntary_context_switches=2i,write_bytes=106496i,cpu_time_system=0,cpu_time_irq=0,cpu_usage=0,memory_vms=21659648i,memory_data=1576960i,rlimit_memory_stack_hard=2147483647i,num_threads=1i,cpu_time_stolen=0,rlimit_memory_rss_soft=2147483647i,rlimit_realtime_priority_soft=0i,num_fds=4i,write_count=35i,rlimit_signals_pending_soft=78994i,cpu_time_steal=0,rlimit_num_fds_hard=4096i,rlimit_file_locks_hard=2147483647i,rlimit_cpu_time_hard=2147483647i,rlimit_signals_pending_hard=78994i,rlimit_nice_priority_soft=0i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_realtime_priority_hard=0i 1517620624000000000")
+	handler := &BenchmarkingHandler{}
+	fsm := NewMachine(handler)
+	for n := 0; n < b.N; n++ {
+		fsm.SetData(input)
+		for fsm.ParseLine() {
+		}
+	}
+}
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 0abb330e8..273877d30 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -1,64 +1,112 @@
 package influx
 
 import (
-	"bytes"
+	"errors"
 	"fmt"
-	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
 )
 
-// InfluxParser is an object for Parsing incoming metrics.
-type InfluxParser struct {
-	// DefaultTags will be added to every parsed metric
-	DefaultTags map[string]string
+const (
+	maxErrorBufferSize = 1024
+)
+
+var (
+	ErrNoMetric = errors.New("no metric in line")
+)
+
+type Handler interface {
+	SetMeasurement(name []byte)
+	AddTag(key []byte, value []byte)
+	AddInt(key []byte, value []byte)
+	AddFloat(key []byte, value []byte)
+	AddString(key []byte, value []byte)
+	AddBool(key []byte, value []byte)
+	SetTimestamp(tm []byte)
+	Reset()
 }
 
-func (p *InfluxParser) ParseWithDefaultTimePrecision(buf []byte, t time.Time, precision string) ([]telegraf.Metric, error) {
-	if !bytes.HasSuffix(buf, []byte("\n")) {
-		buf = append(buf, '\n')
+type ParseError struct {
+	Offset int
+	msg    string
+	buf    string
+}
+
+func (e *ParseError) Error() string {
+	buffer := e.buf
+	if len(buffer) > maxErrorBufferSize {
+		buffer = buffer[:maxErrorBufferSize] + "..."
 	}
-	// parse even if the buffer begins with a newline
-	buf = bytes.TrimPrefix(buf, []byte("\n"))
-	metrics, err := metric.ParseWithDefaultTimePrecision(buf, t, precision)
-	if len(p.DefaultTags) > 0 {
-		for _, m := range metrics {
-			for k, v := range p.DefaultTags {
-				// only set the default tag if it doesn't already exist:
-				if !m.HasTag(k) {
-					m.AddTag(k, v)
-				}
+	return fmt.Sprintf("metric parse error: %s at offset %d: %q", e.msg, e.Offset, buffer)
+}
+
+type Parser struct {
+	DefaultTags map[string]string
+
+	*machine
+	handler *MetricHandler
+}
+
+func NewParser(handler *MetricHandler) *Parser {
+	return &Parser{
+		machine: NewMachine(handler),
+		handler: handler,
+	}
+}
+
+func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
+	metrics := make([]telegraf.Metric, 0)
+	p.machine.SetData(input)
+
+	for p.machine.ParseLine() {
+		err := p.machine.Err()
+		if err != nil {
+			return nil, &ParseError{
+				Offset: p.machine.Position(),
+				msg:    err.Error(),
+				buf:    string(input),
 			}
 		}
+
+		metric, err := p.handler.Metric()
+		if err != nil {
+			return nil, err
+		}
+		p.handler.Reset()
+		metrics = append(metrics, metric)
 	}
-	return metrics, err
+
+	p.applyDefaultTags(metrics)
+	return metrics, nil
 }
 
-// Parse returns a slice of Metrics from a text representation of a
-// metric (in line-protocol format)
-// with each metric separated by newlines. If any metrics fail to parse,
-// a non-nil error will be returned in addition to the metrics that parsed
-// successfully.
-func (p *InfluxParser) Parse(buf []byte) ([]telegraf.Metric, error) {
-	return p.ParseWithDefaultTimePrecision(buf, time.Now(), "")
-}
-
-func (p *InfluxParser) ParseLine(line string) (telegraf.Metric, error) {
+func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	metrics, err := p.Parse([]byte(line + "\n"))
-
 	if err != nil {
 		return nil, err
 	}
 
 	if len(metrics) < 1 {
-		return nil, fmt.Errorf(
-			"Can not parse the line: %s, for data format: influx ", line)
+		return nil, ErrNoMetric
 	}
 
 	return metrics[0], nil
 }
 
-func (p *InfluxParser) SetDefaultTags(tags map[string]string) {
+func (p *Parser) SetDefaultTags(tags map[string]string) {
 	p.DefaultTags = tags
 }
+
+func (p *Parser) applyDefaultTags(metrics []telegraf.Metric) {
+	if len(p.DefaultTags) == 0 {
+		return
+	}
+
+	for _, m := range metrics {
+		for k, v := range p.DefaultTags {
+			if !m.HasTag(k) {
+				m.AddTag(k, v)
+			}
+		}
+	}
+}
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 959fc0982..28d57cfee 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -1,294 +1,488 @@
 package influx
 
 import (
-	"fmt"
-	"io/ioutil"
 	"testing"
 	"time"
 
 	"github.com/influxdata/telegraf"
-
-	"github.com/stretchr/testify/assert"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/require"
 )
 
-var (
-	ms         []telegraf.Metric
-	writer     = ioutil.Discard
-	metrics500 []byte
-	exptime    = time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).UnixNano()
-)
-
-const (
-	validInflux          = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
-	negativeFloat        = "cpu_load_short,cpu=cpu0 value=-13.4 1257894000000000000\n"
-	validInfluxNewline   = "\ncpu_load_short,cpu=cpu0 value=10 1257894000000000000\n"
-	validInfluxNoNewline = "cpu_load_short,cpu=cpu0 value=10 1257894000000000000"
-	invalidInflux        = "I don't think this is line protocol\n"
-	invalidInflux2       = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
-	invalidInflux3       = `name text="unescaped "quote" ",value=1 1498077493081000000`
-	invalidInflux4       = `name text="unbalanced "quote" 1498077493081000000`
-)
-
-const influxMulti = `
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-`
-
-const influxMultiSomeInvalid = `
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu3, host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-cpu,cpu=cpu4 , usage_idle=99,usage_busy=1
-cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
-`
-
-func TestParseValidInflux(t *testing.T) {
-	parser := InfluxParser{}
-
-	metrics, err := parser.Parse([]byte(validInflux))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "cpu_load_short", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(10),
-	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metrics[0].Tags())
-	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
-
-	metrics, err = parser.Parse([]byte(validInfluxNewline))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "cpu_load_short", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(10),
-	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metrics[0].Tags())
-	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
-
-	metrics, err = parser.Parse([]byte(validInfluxNoNewline))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "cpu_load_short", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(10),
-	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metrics[0].Tags())
-	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
-
-	metrics, err = parser.Parse([]byte(negativeFloat))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 1)
-	assert.Equal(t, "cpu_load_short", metrics[0].Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(-13.4),
-	}, metrics[0].Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metrics[0].Tags())
-	assert.Equal(t, exptime, metrics[0].Time().UnixNano())
-}
-
-func TestParseLineValidInflux(t *testing.T) {
-	parser := InfluxParser{}
-
-	metric, err := parser.ParseLine(validInflux)
-	assert.NoError(t, err)
-	assert.Equal(t, "cpu_load_short", metric.Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(10),
-	}, metric.Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metric.Tags())
-	assert.Equal(t, exptime, metric.Time().UnixNano())
-
-	metric, err = parser.ParseLine(validInfluxNewline)
-	assert.NoError(t, err)
-	assert.Equal(t, "cpu_load_short", metric.Name())
-	assert.Equal(t, map[string]interface{}{
-		"value": float64(10),
-	}, metric.Fields())
-	assert.Equal(t, map[string]string{
-		"cpu": "cpu0",
-	}, metric.Tags())
-	assert.Equal(t, exptime, metric.Time().UnixNano())
-}
-
-func TestParseMultipleValid(t *testing.T) {
-	parser := InfluxParser{}
-
-	metrics, err := parser.Parse([]byte(influxMulti))
-	assert.NoError(t, err)
-	assert.Len(t, metrics, 7)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "cpu", metric.Name())
-		assert.Equal(t, map[string]string{
-			"datacenter": "us-east",
-			"host":       "foo",
-		}, metrics[0].Tags())
-		assert.Equal(t, map[string]interface{}{
-			"usage_idle": float64(99),
-			"usage_busy": float64(1),
-		}, metrics[0].Fields())
-	}
-}
-
-func TestParseSomeValid(t *testing.T) {
-	parser := InfluxParser{}
-
-	metrics, err := parser.Parse([]byte(influxMultiSomeInvalid))
-	assert.Error(t, err)
-	assert.Len(t, metrics, 4)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "cpu", metric.Name())
-		assert.Equal(t, map[string]string{
-			"datacenter": "us-east",
-			"host":       "foo",
-		}, metrics[0].Tags())
-		assert.Equal(t, map[string]interface{}{
-			"usage_idle": float64(99),
-			"usage_busy": float64(1),
-		}, metrics[0].Fields())
-	}
-}
-
-// Test that default tags are applied.
-func TestParseDefaultTags(t *testing.T) {
-	parser := InfluxParser{
-		DefaultTags: map[string]string{
-			"tag": "default",
-		},
-	}
-
-	metrics, err := parser.Parse([]byte(influxMultiSomeInvalid))
-	assert.Error(t, err)
-	assert.Len(t, metrics, 4)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "cpu", metric.Name())
-		assert.Equal(t, map[string]string{
-			"datacenter": "us-east",
-			"host":       "foo",
-			"tag":        "default",
-		}, metric.Tags())
-		assert.Equal(t, map[string]interface{}{
-			"usage_idle": float64(99),
-			"usage_busy": float64(1),
-		}, metric.Fields())
-	}
-}
-
-// Verify that metric tags will override default tags
-func TestParseDefaultTagsOverride(t *testing.T) {
-	parser := InfluxParser{
-		DefaultTags: map[string]string{
-			"host": "default",
-		},
-	}
-
-	metrics, err := parser.Parse([]byte(influxMultiSomeInvalid))
-	assert.Error(t, err)
-	assert.Len(t, metrics, 4)
-
-	for _, metric := range metrics {
-		assert.Equal(t, "cpu", metric.Name())
-		assert.Equal(t, map[string]string{
-			"datacenter": "us-east",
-			"host":       "foo",
-		}, metrics[0].Tags())
-		assert.Equal(t, map[string]interface{}{
-			"usage_idle": float64(99),
-			"usage_busy": float64(1),
-		}, metrics[0].Fields())
-	}
-}
-
-func TestParseInvalidInflux(t *testing.T) {
-	parser := InfluxParser{}
-
-	_, err := parser.Parse([]byte(invalidInflux))
-	assert.Error(t, err)
-	_, err = parser.Parse([]byte(invalidInflux2))
-	assert.Error(t, err)
-	_, err = parser.Parse([]byte(invalidInflux3))
-	assert.Error(t, err)
-	fmt.Printf("%+v\n", err) // output for debug
-	_, err = parser.Parse([]byte(invalidInflux4))
-	assert.Error(t, err)
-
-	_, err = parser.ParseLine(invalidInflux)
-	assert.Error(t, err)
-	_, err = parser.ParseLine(invalidInflux2)
-	assert.Error(t, err)
-	_, err = parser.ParseLine(invalidInflux3)
-	assert.Error(t, err)
-	_, err = parser.ParseLine(invalidInflux4)
-	assert.Error(t, err)
-
-}
-
-func BenchmarkSingle(b *testing.B) {
-	parser := InfluxParser{}
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		_, err := parser.Parse([]byte("cpu value=42\n"))
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-func BenchmarkParse(b *testing.B) {
-	var err error
-	parser := InfluxParser{}
-	for n := 0; n < b.N; n++ {
-		// parse:
-		ms, err = parser.Parse(metrics500)
-		if err != nil {
-			panic(err)
-		}
-		if len(ms) != 500 {
-			panic("500 metrics not parsed!!")
-		}
-	}
-}
-
-func BenchmarkParseAddTagWrite(b *testing.B) {
-	var err error
-	parser := InfluxParser{}
-	for n := 0; n < b.N; n++ {
-		ms, err = parser.Parse(metrics500)
-		if err != nil {
-			panic(err)
-		}
-		if len(ms) != 500 {
-			panic("500 metrics not parsed!!")
-		}
-		for _, tmp := range ms {
-			tmp.AddTag("host", "localhost")
-			writer.Write(tmp.Serialize())
-		}
-	}
-}
-
-func init() {
-	var err error
-	metrics500, err = ioutil.ReadFile("500.metrics")
+func Metric(v telegraf.Metric, err error) telegraf.Metric {
 	if err != nil {
 		panic(err)
 	}
+	return v
+}
+
+var DefaultTime = func() time.Time {
+	return time.Unix(42, 0)
+}
+
+var ptests = []struct {
+	name    string
+	input   []byte
+	metrics []telegraf.Metric
+	err     error
+}{
+	{
+		name:  "minimal",
+		input: []byte("cpu value=42 0"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "minimal with newline",
+		input: []byte("cpu value=42 0\n"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "measurement escape space",
+		input: []byte(`c\ pu value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"c pu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "measurement escape comma",
+		input: []byte(`c\,pu value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"c,pu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "tags",
+		input: []byte(`cpu,cpu=cpu0,host=localhost value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"cpu":  "cpu0",
+						"host": "localhost",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "tags escape unescapable",
+		input: []byte(`cpu,ho\st=localhost value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						`ho\st`: "localhost",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "tags escape equals",
+		input: []byte(`cpu,ho\=st=localhost value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"ho=st": "localhost",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "tags escape comma",
+		input: []byte(`cpu,ho\,st=localhost value=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"ho,st": "localhost",
+					},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field key escape not escapable",
+		input: []byte(`cpu va\lue=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`va\lue`: 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field key escape equals",
+		input: []byte(`cpu va\=lue=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`va=lue`: 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field key escape comma",
+		input: []byte(`cpu va\,lue=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`va,lue`: 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field key escape space",
+		input: []byte(`cpu va\ lue=42`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`va lue`: 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field int",
+		input: []byte("cpu value=42i"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field boolean",
+		input: []byte("cpu value=true"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": true,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field string",
+		input: []byte(`cpu value="42"`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": "42",
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field string escape quote",
+		input: []byte(`cpu value="how\"dy"`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`value`: `how"dy`,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field string escape backslash",
+		input: []byte(`cpu value="how\\dy"`),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						`value`: `how\dy`,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "default timestamp",
+		input: []byte("cpu value=42"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "multiple lines",
+		input: []byte("cpu value=42\ncpu value=42"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:    "invalid measurement only",
+		input:   []byte("cpu"),
+		metrics: nil,
+		err: &ParseError{
+			Offset: 3,
+			msg:    ErrFieldParse.Error(),
+			buf:    "cpu",
+		},
+	},
+	{
+		name:  "procstat",
+		input: []byte("procstat,exe=bash,process_name=bash voluntary_context_switches=42i,memory_rss=5103616i,rlimit_memory_data_hard=2147483647i,cpu_time_user=0.02,rlimit_file_locks_soft=2147483647i,pid=29417i,cpu_time_nice=0,rlimit_memory_locked_soft=65536i,read_count=259i,rlimit_memory_vms_hard=2147483647i,memory_swap=0i,rlimit_num_fds_soft=1024i,rlimit_nice_priority_hard=0i,cpu_time_soft_irq=0,cpu_time=0i,rlimit_memory_locked_hard=65536i,realtime_priority=0i,signals_pending=0i,nice_priority=20i,cpu_time_idle=0,memory_stack=139264i,memory_locked=0i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,cpu_time_guest=0,cpu_time_guest_nice=0,rlimit_memory_data_soft=2147483647i,read_bytes=0i,rlimit_cpu_time_soft=2147483647i,involuntary_context_switches=2i,write_bytes=106496i,cpu_time_system=0,cpu_time_irq=0,cpu_usage=0,memory_vms=21659648i,memory_data=1576960i,rlimit_memory_stack_hard=2147483647i,num_threads=1i,cpu_time_stolen=0,rlimit_memory_rss_soft=2147483647i,rlimit_realtime_priority_soft=0i,num_fds=4i,write_count=35i,rlimit_signals_pending_soft=78994i,cpu_time_steal=0,rlimit_num_fds_hard=4096i,rlimit_file_locks_hard=2147483647i,rlimit_cpu_time_hard=2147483647i,rlimit_signals_pending_hard=78994i,rlimit_nice_priority_soft=0i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_realtime_priority_hard=0i 1517620624000000000"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"procstat",
+					map[string]string{
+						"exe":          "bash",
+						"process_name": "bash",
+					},
+					map[string]interface{}{
+						"cpu_time":                      0,
+						"cpu_time_guest":                float64(0),
+						"cpu_time_guest_nice":           float64(0),
+						"cpu_time_idle":                 float64(0),
+						"cpu_time_iowait":               float64(0),
+						"cpu_time_irq":                  float64(0),
+						"cpu_time_nice":                 float64(0),
+						"cpu_time_soft_irq":             float64(0),
+						"cpu_time_steal":                float64(0),
+						"cpu_time_stolen":               float64(0),
+						"cpu_time_system":               float64(0),
+						"cpu_time_user":                 float64(0.02),
+						"cpu_usage":                     float64(0),
+						"involuntary_context_switches":  2,
+						"memory_data":                   1576960,
+						"memory_locked":                 0,
+						"memory_rss":                    5103616,
+						"memory_stack":                  139264,
+						"memory_swap":                   0,
+						"memory_vms":                    21659648,
+						"nice_priority":                 20,
+						"num_fds":                       4,
+						"num_threads":                   1,
+						"pid":                           29417,
+						"read_bytes":                    0,
+						"read_count":                    259,
+						"realtime_priority":             0,
+						"rlimit_cpu_time_hard":          2147483647,
+						"rlimit_cpu_time_soft":          2147483647,
+						"rlimit_file_locks_hard":        2147483647,
+						"rlimit_file_locks_soft":        2147483647,
+						"rlimit_memory_data_hard":       2147483647,
+						"rlimit_memory_data_soft":       2147483647,
+						"rlimit_memory_locked_hard":     65536,
+						"rlimit_memory_locked_soft":     65536,
+						"rlimit_memory_rss_hard":        2147483647,
+						"rlimit_memory_rss_soft":        2147483647,
+						"rlimit_memory_stack_hard":      2147483647,
+						"rlimit_memory_stack_soft":      8388608,
+						"rlimit_memory_vms_hard":        2147483647,
+						"rlimit_memory_vms_soft":        2147483647,
+						"rlimit_nice_priority_hard":     0,
+						"rlimit_nice_priority_soft":     0,
+						"rlimit_num_fds_hard":           4096,
+						"rlimit_num_fds_soft":           1024,
+						"rlimit_realtime_priority_hard": 0,
+						"rlimit_realtime_priority_soft": 0,
+						"rlimit_signals_pending_hard":   78994,
+						"rlimit_signals_pending_soft":   78994,
+						"signals_pending":               0,
+						"voluntary_context_switches":    42,
+						"write_bytes":                   106496,
+						"write_count":                   35,
+					},
+					time.Unix(0, 1517620624000000000),
+				),
+			),
+		},
+		err: nil,
+	},
+}
+
+func TestParser(t *testing.T) {
+	for _, tt := range ptests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := NewMetricHandler()
+			handler.SetTimeFunc(DefaultTime)
+			parser := NewParser(handler)
+
+			metrics, err := parser.Parse(tt.input)
+			require.Equal(t, tt.err, err)
+
+			require.Equal(t, len(tt.metrics), len(metrics))
+			for i, expected := range tt.metrics {
+				require.Equal(t, expected.Name(), metrics[i].Name())
+				require.Equal(t, expected.Tags(), metrics[i].Tags())
+				require.Equal(t, expected.Fields(), metrics[i].Fields())
+				require.Equal(t, expected.Time(), metrics[i].Time())
+			}
+		})
+	}
+}
+
+func BenchmarkParser(b *testing.B) {
+	for _, tt := range ptests {
+		b.Run(tt.name, func(b *testing.B) {
+			handler := NewMetricHandler()
+			parser := NewParser(handler)
+			for n := 0; n < b.N; n++ {
+				metrics, err := parser.Parse(tt.input)
+				_ = err
+				_ = metrics
+			}
+		})
+	}
 }
diff --git a/plugins/parsers/nagios/parser.go b/plugins/parsers/nagios/parser.go
index 621a3514c..4d5f7f008 100644
--- a/plugins/parsers/nagios/parser.go
+++ b/plugins/parsers/nagios/parser.go
@@ -2,6 +2,7 @@ package nagios
 
 import (
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 
@@ -72,23 +73,41 @@ func (p *NagiosParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 		fieldName := string(perf[0][1])
 		tags := make(map[string]string)
 		if perf[0][3] != nil {
-			tags["unit"] = string(perf[0][3])
+			str := string(perf[0][3])
+			if str != "" {
+				tags["unit"] = str
+			}
 		}
 		fields := make(map[string]interface{})
-		fields["value"] = perf[0][2]
+		f, err := strconv.ParseFloat(string(perf[0][2]), 64)
+		if err == nil {
+			fields["value"] = f
+		}
 		// TODO should we set empty field
 		// if metric if there is no data ?
 		if perf[0][4] != nil {
-			fields["warning"] = perf[0][4]
+			f, err := strconv.ParseFloat(string(perf[0][4]), 64)
+			if err == nil {
+				fields["warning"] = f
+			}
 		}
 		if perf[0][5] != nil {
-			fields["critical"] = perf[0][5]
+			f, err := strconv.ParseFloat(string(perf[0][5]), 64)
+			if err == nil {
+				fields["critical"] = f
+			}
 		}
 		if perf[0][6] != nil {
-			fields["min"] = perf[0][6]
+			f, err := strconv.ParseFloat(string(perf[0][6]), 64)
+			if err == nil {
+				fields["min"] = f
+			}
 		}
 		if perf[0][7] != nil {
-			fields["max"] = perf[0][7]
+			f, err := strconv.ParseFloat(string(perf[0][7]), 64)
+			if err == nil {
+				fields["max"] = f
+			}
 		}
 		// Create metric
 		metric, err := metric.New(fieldName, tags, fields, time.Now().UTC())
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index fbeca17e8..177726dbb 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -134,7 +134,8 @@ func NewNagiosParser() (Parser, error) {
 }
 
 func NewInfluxParser() (Parser, error) {
-	return &influx.InfluxParser{}, nil
+	handler := influx.NewMetricHandler()
+	return influx.NewParser(handler), nil
 }
 
 func NewGraphiteParser(
diff --git a/plugins/processors/override/override.go b/plugins/processors/override/override.go
index 46a2f84db..7f8798806 100644
--- a/plugins/processors/override/override.go
+++ b/plugins/processors/override/override.go
@@ -37,10 +37,10 @@ func (p *Override) Apply(in ...telegraf.Metric) []telegraf.Metric {
 			metric.SetName(p.NameOverride)
 		}
 		if len(p.NamePrefix) > 0 {
-			metric.SetPrefix(p.NamePrefix)
+			metric.AddPrefix(p.NamePrefix)
 		}
 		if len(p.NameSuffix) > 0 {
-			metric.SetSuffix(p.NameSuffix)
+			metric.AddSuffix(p.NameSuffix)
 		}
 		for key, value := range p.Tags {
 			metric.AddTag(key, value)
diff --git a/plugins/processors/printer/printer.go b/plugins/processors/printer/printer.go
index a65a104e6..363e9a21d 100644
--- a/plugins/processors/printer/printer.go
+++ b/plugins/processors/printer/printer.go
@@ -5,9 +5,12 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/processors"
+	"github.com/influxdata/telegraf/plugins/serializers"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
 )
 
 type Printer struct {
+	serializer serializers.Serializer
 }
 
 var sampleConfig = `
@@ -23,13 +26,19 @@ func (p *Printer) Description() string {
 
 func (p *Printer) Apply(in ...telegraf.Metric) []telegraf.Metric {
 	for _, metric := range in {
-		fmt.Println(metric.String())
+		octets, err := p.serializer.Serialize(metric)
+		if err != nil {
+			continue
+		}
+		fmt.Println(octets)
 	}
 	return in
 }
 
 func init() {
 	processors.Add("printer", func() telegraf.Processor {
-		return &Printer{}
+		return &Printer{
+			serializer: influx.NewSerializer(),
+		}
 	})
 }
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index f88305ab4..ee390d17f 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -35,7 +35,7 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	out := []byte{}
 
 	// Convert UnixNano to Unix timestamps
-	timestamp := metric.UnixNano() / 1000000000
+	timestamp := metric.Time().UnixNano() / 1000000000
 
 	bucket := SerializeBucketName(metric.Name(), metric.Tags(), s.Template, s.Prefix)
 	if bucket == "" {
diff --git a/plugins/serializers/influx/escape.go b/plugins/serializers/influx/escape.go
new file mode 100644
index 000000000..2040b5eed
--- /dev/null
+++ b/plugins/serializers/influx/escape.go
@@ -0,0 +1,52 @@
+package influx
+
+import "strings"
+
+const (
+	escapes            = " ,="
+	nameEscapes        = " ,"
+	stringFieldEscapes = `\"`
+)
+
+var (
+	escaper = strings.NewReplacer(
+		`,`, `\,`,
+		`"`, `\"`, // ???
+		` `, `\ `,
+		`=`, `\=`,
+	)
+
+	nameEscaper = strings.NewReplacer(
+		`,`, `\,`,
+		` `, `\ `,
+	)
+
+	stringFieldEscaper = strings.NewReplacer(
+		`"`, `\"`,
+		`\`, `\\`,
+	)
+)
+
+func escape(s string) string {
+	if strings.ContainsAny(s, escapes) {
+		return escaper.Replace(s)
+	} else {
+		return s
+	}
+}
+
+func nameEscape(s string) string {
+	if strings.ContainsAny(s, nameEscapes) {
+		return nameEscaper.Replace(s)
+	} else {
+		return s
+	}
+}
+
+func stringFieldEscape(s string) string {
+	if strings.ContainsAny(s, stringFieldEscapes) {
+		return stringFieldEscaper.Replace(s)
+	} else {
+		return s
+	}
+}
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 459a8a74b..51aed0d09 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -1,12 +1,277 @@
 package influx
 
 import (
+	"bytes"
+	"errors"
+	"io"
+	"math"
+	"sort"
+	"strconv"
+
 	"github.com/influxdata/telegraf"
 )
 
-type InfluxSerializer struct {
+const MaxInt = int(^uint(0) >> 1)
+
+type FieldSortOrder int
+
+const (
+	NoSortFields FieldSortOrder = iota
+	SortFields
+)
+
+var (
+	ErrNeedMoreSpace    = errors.New("need more space")
+	ErrInvalidName      = errors.New("invalid name")
+	ErrInvalidFieldKey  = errors.New("invalid field key")
+	ErrInvalidFieldType = errors.New("invalid field type")
+	ErrFieldIsNaN       = errors.New("is NaN")
+	ErrFieldIsInf       = errors.New("is Inf")
+	ErrNoFields         = errors.New("no fields")
+)
+
+// Serializer is a serializer for line protocol.
+type Serializer struct {
+	maxLineBytes   int
+	bytesWritten   int
+	fieldSortOrder FieldSortOrder
+
+	buf    bytes.Buffer
+	header []byte
+	footer []byte
+	pair   []byte
 }
 
-func (s *InfluxSerializer) Serialize(m telegraf.Metric) ([]byte, error) {
-	return m.Serialize(), nil
+func NewSerializer() *Serializer {
+	serializer := &Serializer{
+		fieldSortOrder: NoSortFields,
+
+		header: make([]byte, 0, 50),
+		footer: make([]byte, 0, 21),
+		pair:   make([]byte, 0, 50),
+	}
+	return serializer
+}
+
+func (s *Serializer) SetMaxLineBytes(bytes int) {
+	s.maxLineBytes = bytes
+}
+
+func (s *Serializer) SetFieldSortOrder(order FieldSortOrder) {
+	s.fieldSortOrder = order
+}
+
+// Serialize writes the telegraf.Metric to a byte slice.  May produce multiple
+// lines of output if longer than maximum line length.  Lines are terminated
+// with a newline (LF) char.
+func (s *Serializer) Serialize(m telegraf.Metric) ([]byte, error) {
+	s.buf.Reset()
+	err := s.writeMetric(&s.buf, m)
+	if err != nil {
+		return nil, err
+	}
+
+	out := make([]byte, s.buf.Len())
+	copy(out, s.buf.Bytes())
+	return out, nil
+}
+
+func (s *Serializer) Write(w io.Writer, m telegraf.Metric) (int, error) {
+	err := s.writeMetric(w, m)
+	return s.bytesWritten, err
+}
+
+func (s *Serializer) writeString(w io.Writer, str string) error {
+	n, err := io.WriteString(w, str)
+	s.bytesWritten += n
+	return err
+}
+
+func (s *Serializer) write(w io.Writer, b []byte) error {
+	n, err := w.Write(b)
+	s.bytesWritten += n
+	return err
+}
+
+func (s *Serializer) buildHeader(m telegraf.Metric) error {
+	s.header = s.header[:0]
+
+	name := nameEscape(m.Name())
+	if name == "" {
+		return ErrInvalidName
+	}
+
+	s.header = append(s.header, name...)
+
+	for _, tag := range m.TagList() {
+		key := escape(tag.Key)
+		value := escape(tag.Value)
+
+		// Some keys and values are not encodeable as line protocol, such as
+		// those with a trailing '\' or empty strings.
+		if key == "" || value == "" {
+			continue
+		}
+
+		s.header = append(s.header, ',')
+		s.header = append(s.header, key...)
+		s.header = append(s.header, '=')
+		s.header = append(s.header, value...)
+	}
+
+	s.header = append(s.header, ' ')
+	return nil
+}
+
+func (s *Serializer) buildFooter(m telegraf.Metric) {
+	s.footer = s.footer[:0]
+	s.footer = append(s.footer, ' ')
+	s.footer = strconv.AppendInt(s.footer, m.Time().UnixNano(), 10)
+	s.footer = append(s.footer, '\n')
+}
+
+func (s *Serializer) buildFieldPair(key string, value interface{}) error {
+	s.pair = s.pair[:0]
+	key = escape(key)
+
+	// Some keys are not encodeable as line protocol, such as those with a
+	// trailing '\' or empty strings.
+	if key == "" {
+		return ErrInvalidFieldKey
+	}
+
+	s.pair = append(s.pair, key...)
+	s.pair = append(s.pair, '=')
+	pair, err := appendFieldValue(s.pair, value)
+	if err != nil {
+		return err
+	}
+	s.pair = pair
+	return nil
+}
+
+func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
+	var err error
+
+	err = s.buildHeader(m)
+	if err != nil {
+		return err
+	}
+
+	s.buildFooter(m)
+
+	if s.fieldSortOrder == SortFields {
+		sort.Slice(m.FieldList(), func(i, j int) bool {
+			return m.FieldList()[i].Key < m.FieldList()[j].Key
+		})
+	}
+
+	pairsLen := 0
+	firstField := true
+	for _, field := range m.FieldList() {
+		err = s.buildFieldPair(field.Key, field.Value)
+		if err != nil {
+			continue
+		}
+
+		bytesNeeded := len(s.header) + pairsLen + len(s.pair) + len(s.footer)
+
+		// Additional length needed for field separator `,`
+		if !firstField {
+			bytesNeeded += 1
+		}
+
+		if s.maxLineBytes > 0 && bytesNeeded > s.maxLineBytes {
+			// Need at least one field per line
+			if firstField {
+				return ErrNeedMoreSpace
+			}
+
+			err = s.write(w, s.footer)
+			if err != nil {
+				return err
+			}
+
+			bytesNeeded = len(s.header) + len(s.pair) + len(s.footer)
+
+			if s.maxLineBytes > 0 && bytesNeeded > s.maxLineBytes {
+				return ErrNeedMoreSpace
+			}
+
+			err = s.write(w, s.header)
+			if err != nil {
+				return err
+			}
+
+			s.write(w, s.pair)
+			pairsLen += len(s.pair)
+			firstField = false
+			continue
+		}
+
+		if firstField {
+			err = s.write(w, s.header)
+			if err != nil {
+				return err
+			}
+		} else {
+			err = s.writeString(w, ",")
+			if err != nil {
+				return err
+			}
+		}
+
+		s.write(w, s.pair)
+
+		pairsLen += len(s.pair)
+		firstField = false
+	}
+
+	if firstField {
+		return ErrNoFields
+	}
+
+	return s.write(w, s.footer)
+
+}
+
+func appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
+	switch v := value.(type) {
+	case int64:
+		return appendIntField(buf, v), nil
+	case float64:
+		if math.IsNaN(v) {
+			return nil, ErrFieldIsNaN
+		}
+
+		if math.IsInf(v, 0) {
+			return nil, ErrFieldIsInf
+		}
+
+		return appendFloatField(buf, v), nil
+	case string:
+		return appendStringField(buf, v), nil
+	case bool:
+		return appendBoolField(buf, v), nil
+	}
+	return buf, ErrInvalidFieldType
+}
+
+func appendIntField(buf []byte, value int64) []byte {
+	return append(strconv.AppendInt(buf, value, 10), 'i')
+}
+
+func appendFloatField(buf []byte, value float64) []byte {
+	return strconv.AppendFloat(buf, value, 'g', -1, 64)
+}
+
+func appendBoolField(buf []byte, value bool) []byte {
+	return strconv.AppendBool(buf, value)
+}
+
+func appendStringField(buf []byte, value string) []byte {
+	buf = append(buf, '"')
+	buf = append(buf, stringFieldEscape(value)...)
+	buf = append(buf, '"')
+	return buf
 }
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index 7ced52103..2795cfb38 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -1,72 +1,330 @@
 package influx
 
 import (
-	"fmt"
-	"strings"
+	"math"
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/require"
 )
 
-func TestSerializeMetricFloat(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"cpu": "cpu0",
+func MustMetric(v telegraf.Metric, err error) telegraf.Metric {
+	if err != nil {
+		panic(err)
 	}
-	fields := map[string]interface{}{
-		"usage_idle": float64(91.5),
-	}
-	m, err := metric.New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	s := InfluxSerializer{}
-	buf, _ := s.Serialize(m)
-	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
-	assert.NoError(t, err)
-
-	expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=91.5 %d", now.UnixNano())}
-	assert.Equal(t, expS, mS)
+	return v
 }
 
-func TestSerializeMetricInt(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"cpu": "cpu0",
-	}
-	fields := map[string]interface{}{
-		"usage_idle": int64(90),
-	}
-	m, err := metric.New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	s := InfluxSerializer{}
-	buf, _ := s.Serialize(m)
-	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
-	assert.NoError(t, err)
-
-	expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=90i %d", now.UnixNano())}
-	assert.Equal(t, expS, mS)
+var tests = []struct {
+	name     string
+	maxBytes int
+	input    telegraf.Metric
+	output   []byte
+	err      error
+}{
+	{
+		name: "minimal",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": 42.0,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=42 0\n"),
+	},
+	{
+		name: "multiple tags",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{
+					"host": "localhost",
+					"cpu":  "CPU0",
+				},
+				map[string]interface{}{
+					"value": 42.0,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu,cpu=CPU0,host=localhost value=42 0\n"),
+	},
+	{
+		name: "multiple fields",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"x": 42.0,
+					"y": 42.0,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu x=42,y=42 0\n"),
+	},
+	{
+		name: "float NaN",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"x": math.NaN(),
+					"y": 42,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu y=42i 0\n"),
+	},
+	{
+		name: "float NaN only",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": math.NaN(),
+				},
+				time.Unix(0, 0),
+			),
+		),
+		err: ErrNoFields,
+	},
+	{
+		name: "float Inf",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": math.Inf(1),
+					"y":     42,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu y=42i 0\n"),
+	},
+	{
+		name: "integer field",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": 42,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=42i 0\n"),
+	},
+	{
+		name: "bool field",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": true,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=true 0\n"),
+	},
+	{
+		name: "string field",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": "howdy",
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=\"howdy\" 0\n"),
+	},
+	{
+		name: "timestamp",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": 42.0,
+				},
+				time.Unix(1519194109, 42),
+			),
+		),
+		output: []byte("cpu value=42 1519194109000000042\n"),
+	},
+	{
+		name:     "split fields exact",
+		maxBytes: 33,
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"abc": 123,
+					"def": 456,
+				},
+				time.Unix(1519194109, 42),
+			),
+		),
+		output: []byte("cpu abc=123i 1519194109000000042\ncpu def=456i 1519194109000000042\n"),
+	},
+	{
+		name:     "split fields extra",
+		maxBytes: 34,
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"abc": 123,
+					"def": 456,
+				},
+				time.Unix(1519194109, 42),
+			),
+		),
+		output: []byte("cpu abc=123i 1519194109000000042\ncpu def=456i 1519194109000000042\n"),
+	},
+	{
+		name:     "need more space",
+		maxBytes: 32,
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"abc": 123,
+					"def": 456,
+				},
+				time.Unix(1519194109, 42),
+			),
+		),
+		output: nil,
+		err:    ErrNeedMoreSpace,
+	},
+	{
+		name: "no fields",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{},
+				time.Unix(0, 0),
+			),
+		),
+		err: ErrNoFields,
+	},
+	{
+		name: "procstat",
+		input: MustMetric(
+			metric.New(
+				"procstat",
+				map[string]string{
+					"exe":          "bash",
+					"process_name": "bash",
+				},
+				map[string]interface{}{
+					"cpu_time":                      0,
+					"cpu_time_guest":                float64(0),
+					"cpu_time_guest_nice":           float64(0),
+					"cpu_time_idle":                 float64(0),
+					"cpu_time_iowait":               float64(0),
+					"cpu_time_irq":                  float64(0),
+					"cpu_time_nice":                 float64(0),
+					"cpu_time_soft_irq":             float64(0),
+					"cpu_time_steal":                float64(0),
+					"cpu_time_stolen":               float64(0),
+					"cpu_time_system":               float64(0),
+					"cpu_time_user":                 float64(0.02),
+					"cpu_usage":                     float64(0),
+					"involuntary_context_switches":  2,
+					"memory_data":                   1576960,
+					"memory_locked":                 0,
+					"memory_rss":                    5103616,
+					"memory_stack":                  139264,
+					"memory_swap":                   0,
+					"memory_vms":                    21659648,
+					"nice_priority":                 20,
+					"num_fds":                       4,
+					"num_threads":                   1,
+					"pid":                           29417,
+					"read_bytes":                    0,
+					"read_count":                    259,
+					"realtime_priority":             0,
+					"rlimit_cpu_time_hard":          2147483647,
+					"rlimit_cpu_time_soft":          2147483647,
+					"rlimit_file_locks_hard":        2147483647,
+					"rlimit_file_locks_soft":        2147483647,
+					"rlimit_memory_data_hard":       2147483647,
+					"rlimit_memory_data_soft":       2147483647,
+					"rlimit_memory_locked_hard":     65536,
+					"rlimit_memory_locked_soft":     65536,
+					"rlimit_memory_rss_hard":        2147483647,
+					"rlimit_memory_rss_soft":        2147483647,
+					"rlimit_memory_stack_hard":      2147483647,
+					"rlimit_memory_stack_soft":      8388608,
+					"rlimit_memory_vms_hard":        2147483647,
+					"rlimit_memory_vms_soft":        2147483647,
+					"rlimit_nice_priority_hard":     0,
+					"rlimit_nice_priority_soft":     0,
+					"rlimit_num_fds_hard":           4096,
+					"rlimit_num_fds_soft":           1024,
+					"rlimit_realtime_priority_hard": 0,
+					"rlimit_realtime_priority_soft": 0,
+					"rlimit_signals_pending_hard":   78994,
+					"rlimit_signals_pending_soft":   78994,
+					"signals_pending":               0,
+					"voluntary_context_switches":    42,
+					"write_bytes":                   106496,
+					"write_count":                   35,
+				},
+				time.Unix(0, 1517620624000000000),
+			),
+		),
+		output: []byte("procstat,exe=bash,process_name=bash cpu_time=0i,cpu_time_guest=0,cpu_time_guest_nice=0,cpu_time_idle=0,cpu_time_iowait=0,cpu_time_irq=0,cpu_time_nice=0,cpu_time_soft_irq=0,cpu_time_steal=0,cpu_time_stolen=0,cpu_time_system=0,cpu_time_user=0.02,cpu_usage=0,involuntary_context_switches=2i,memory_data=1576960i,memory_locked=0i,memory_rss=5103616i,memory_stack=139264i,memory_swap=0i,memory_vms=21659648i,nice_priority=20i,num_fds=4i,num_threads=1i,pid=29417i,read_bytes=0i,read_count=259i,realtime_priority=0i,rlimit_cpu_time_hard=2147483647i,rlimit_cpu_time_soft=2147483647i,rlimit_file_locks_hard=2147483647i,rlimit_file_locks_soft=2147483647i,rlimit_memory_data_hard=2147483647i,rlimit_memory_data_soft=2147483647i,rlimit_memory_locked_hard=65536i,rlimit_memory_locked_soft=65536i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_rss_soft=2147483647i,rlimit_memory_stack_hard=2147483647i,rlimit_memory_stack_soft=8388608i,rlimit_memory_vms_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_nice_priority_hard=0i,rlimit_nice_priority_soft=0i,rlimit_num_fds_hard=4096i,rlimit_num_fds_soft=1024i,rlimit_realtime_priority_hard=0i,rlimit_realtime_priority_soft=0i,rlimit_signals_pending_hard=78994i,rlimit_signals_pending_soft=78994i,signals_pending=0i,voluntary_context_switches=42i,write_bytes=106496i,write_count=35i 1517620624000000000\n"),
+	},
 }
 
-func TestSerializeMetricString(t *testing.T) {
-	now := time.Now()
-	tags := map[string]string{
-		"cpu": "cpu0",
+func TestSerializer(t *testing.T) {
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			serializer := NewSerializer()
+			serializer.SetMaxLineBytes(tt.maxBytes)
+			serializer.SetFieldSortOrder(SortFields)
+			output, err := serializer.Serialize(tt.input)
+			require.Equal(t, tt.err, err)
+			require.Equal(t, string(tt.output), string(output))
+		})
+	}
+}
+
+func BenchmarkSerializer(b *testing.B) {
+	for _, tt := range tests {
+		b.Run(tt.name, func(b *testing.B) {
+			serializer := NewSerializer()
+			serializer.SetMaxLineBytes(tt.maxBytes)
+			for n := 0; n < b.N; n++ {
+				output, err := serializer.Serialize(tt.input)
+				_ = err
+				_ = output
+			}
+		})
 	}
-	fields := map[string]interface{}{
-		"usage_idle": "foobar",
-	}
-	m, err := metric.New("cpu", tags, fields, now)
-	assert.NoError(t, err)
-
-	s := InfluxSerializer{}
-	buf, _ := s.Serialize(m)
-	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
-	assert.NoError(t, err)
-
-	expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=\"foobar\" %d", now.UnixNano())}
-	assert.Equal(t, expS, mS)
 }
diff --git a/plugins/serializers/influx/reader.go b/plugins/serializers/influx/reader.go
new file mode 100644
index 000000000..590e2fafd
--- /dev/null
+++ b/plugins/serializers/influx/reader.go
@@ -0,0 +1,58 @@
+package influx
+
+import (
+	"bytes"
+	"io"
+
+	"github.com/influxdata/telegraf"
+)
+
+// reader is an io.Reader for line protocol.
+type reader struct {
+	metrics    []telegraf.Metric
+	serializer *Serializer
+	offset     int
+	buf        *bytes.Buffer
+}
+
+// NewReader creates a new reader over the given metrics.
+func NewReader(metrics []telegraf.Metric, serializer *Serializer) io.Reader {
+	return &reader{
+		metrics:    metrics,
+		serializer: serializer,
+		offset:     0,
+		buf:        bytes.NewBuffer(make([]byte, 0, serializer.maxLineBytes)),
+	}
+}
+
+// SetMetrics changes the metrics to be read.
+func (r *reader) SetMetrics(metrics []telegraf.Metric) {
+	r.metrics = metrics
+	r.offset = 0
+	r.buf.Reset()
+}
+
+// Read reads up to len(p) bytes of the current metric into p, each call will
+// only serialize at most one metric so the number of bytes read may be less
+// than p.  Subsequent calls to Read will read the next metric until all are
+// emitted.  If a metric cannot be serialized, an error will be returned, you
+// may resume with the next metric by calling Read again.  When all metrics
+// are emitted the err is io.EOF.
+func (r *reader) Read(p []byte) (int, error) {
+	if r.buf.Len() > 0 {
+		return r.buf.Read(p)
+	}
+
+	if r.offset >= len(r.metrics) {
+		return 0, io.EOF
+	}
+
+	_, err := r.serializer.Write(r.buf, r.metrics[r.offset])
+	r.offset += 1
+	if err != nil {
+		r.buf.Reset()
+		return 0, err
+	}
+
+	return r.buf.Read(p)
+}
diff --git a/plugins/serializers/influx/reader_test.go b/plugins/serializers/influx/reader_test.go
new file mode 100644
index 000000000..5dca21595
--- /dev/null
+++ b/plugins/serializers/influx/reader_test.go
@@ -0,0 +1,135 @@
+package influx
+
+import (
+	"bytes"
+	"io"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/require"
+)
+
+func TestReader(t *testing.T) {
+	tests := []struct {
+		name         string
+		maxLineBytes int
+		bufferSize   int
+		input        []telegraf.Metric
+		expected     []byte
+	}{
+		{
+			name:         "minimal",
+			maxLineBytes: 4096,
+			bufferSize:   20,
+			input: []telegraf.Metric{
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+			},
+			expected: []byte("cpu value=42 0\n"),
+		},
+		{
+			name:         "multiple lines",
+			maxLineBytes: 4096,
+			bufferSize:   20,
+			input: []telegraf.Metric{
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+			},
+			expected: []byte("cpu value=42 0\ncpu value=42 0\n"),
+		},
+		{
+			name:         "exact fit",
+			maxLineBytes: 4096,
+			bufferSize:   15,
+			input: []telegraf.Metric{
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+			},
+			expected: []byte("cpu value=42 0\n"),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			serializer := NewSerializer()
+			serializer.SetMaxLineBytes(tt.maxLineBytes)
+			serializer.SetFieldSortOrder(SortFields)
+			reader := NewReader(tt.input, serializer)
+
+			data := new(bytes.Buffer)
+			readbuf := make([]byte, tt.bufferSize)
+
+			total := 0
+			for {
+				n, err := reader.Read(readbuf)
+				total += n
+				if err == io.EOF {
+					break
+				}
+
+				data.Write(readbuf[:n])
+				require.NoError(t, err)
+			}
+			require.Equal(t, tt.expected, data.Bytes())
+			require.Equal(t, len(tt.expected), total)
+		})
+	}
+}
+
+func TestZeroLengthBufferNoError(t *testing.T) {
+	m := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 42.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+	serializer := NewSerializer()
+	serializer.SetFieldSortOrder(SortFields)
+	reader := NewReader([]telegraf.Metric{m}, serializer)
+
+	readbuf := make([]byte, 0)
+
+	n, err := reader.Read(readbuf)
+	require.NoError(t, err)
+	require.Equal(t, 0, n)
+}
diff --git a/plugins/serializers/json/json.go b/plugins/serializers/json/json.go
index 452364c95..f988bf40e 100644
--- a/plugins/serializers/json/json.go
+++ b/plugins/serializers/json/json.go
@@ -22,7 +22,7 @@ func (s *JsonSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	m["tags"] = metric.Tags()
 	m["fields"] = metric.Fields()
 	m["name"] = metric.Name()
-	m["timestamp"] = metric.UnixNano() / units_nanoseconds
+	m["timestamp"] = metric.Time().UnixNano() / units_nanoseconds
 	serialized, err := ejson.Marshal(m)
 	if err != nil {
 		return []byte{}, err
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 368f6f449..3389ec59c 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -33,6 +33,13 @@ type Config struct {
 	// Dataformat can be one of: influx, graphite, or json
 	DataFormat string
 
+	// Maximum line length in bytes; influx format only
+	InfluxMaxLineBytes int
+
+	// Sort field keys, set to true only when debugging as it less performant
+	// than unsorted fields; influx format only
+	InfluxSortFields bool
+
 	// Prefix to add to all measurements, only supports Graphite
 	Prefix string
 
@@ -50,7 +57,7 @@ func NewSerializer(config *Config) (Serializer, error) {
 	var serializer Serializer
 	switch config.DataFormat {
 	case "influx":
-		serializer, err = NewInfluxSerializer()
+		serializer, err = NewInfluxSerializerConfig(config)
 	case "graphite":
 		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template)
 	case "json":
@@ -65,8 +72,19 @@ func NewJsonSerializer(timestampUnits time.Duration) (Serializer, error) {
 	return &json.JsonSerializer{TimestampUnits: timestampUnits}, nil
 }
 
+func NewInfluxSerializerConfig(config *Config) (Serializer, error) {
+	var sort influx.FieldSortOrder
+	if config.InfluxSortFields {
+		sort = influx.SortFields
+	}
+	s := influx.NewSerializer()
+	s.SetMaxLineBytes(config.InfluxMaxLineBytes)
+	s.SetFieldSortOrder(sort)
+	return s, nil
+}
+
 func NewInfluxSerializer() (Serializer, error) {
-	return &influx.InfluxSerializer{}, nil
+	return influx.NewSerializer(), nil
 }
 
 func NewGraphiteSerializer(prefix, template string) (Serializer, error) {

From 36b8220181c4462a8b794d15265cac7f5d87d3c7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 27 Mar 2018 17:44:13 -0700
Subject: [PATCH 1013/1302] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f5c9c06a..8564a3d46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,8 @@
 - [#3880](https://github.com/influxdata/telegraf/pull/3880): Added config flag to skip collection of network protocol metrics.
 - [#3927](https://github.com/influxdata/telegraf/pull/3927): Add TLS support to kapacitor input.
 - [#3496](https://github.com/influxdata/telegraf/pull/3496): Add HTTP basic auth support to the http_listener input.
+- [#3452](https://github.com/influxdata/telegraf/issues/3452): Tags in output InfluxDB Line Protocol are now sorted.
+- [#3631](https://github.com/influxdata/telegraf/issues/3631): InfluxDB Line Protocol parser now accepts DOS line endings.
 
 ### Bugfixes
 
@@ -93,6 +95,7 @@
 - [#3973](https://github.com/influxdata/telegraf/issues/3873): Fix socket_listener setting ReadBufferSize on tcp sockets.
 - [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
 - [#3868](https://github.com/influxdata/telegraf/issues/3868): Fix cannot unmarshal object error in DC/OS input.
+- [#3648](https://github.com/influxdata/telegraf/issues/3648): Fix InfluxDB output not able to reconnect when server address changes.
 
 ## v1.5.3 [2018-03-14]
 

From cc97b48ca8a616392da1c6e66c9b4a0c62bb1f69 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 27 Mar 2018 17:59:57 -0700
Subject: [PATCH 1014/1302] Add support for skipping database creation (#3941)

---
 plugins/outputs/influxdb/README.md   |  5 +++
 plugins/outputs/influxdb/influxdb.go | 58 +++++++++++++++-------------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 9547292ed..aafe83da7 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -17,6 +17,11 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ## The target database for metrics; will be created as needed.
   # database = "telegraf"
 
+  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
+  ## Telegraf with a user without permissions to create databases or when the
+  ## database already exists.
+  # skip_database_creation = false
+
   ## Name of existing retention policy to write to.  Empty string writes to
   ## the default retention policy.
   # retention_policy = ""
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 04a4c6987..5f38263b8 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -31,19 +31,20 @@ type Client interface {
 
 // InfluxDB struct is the primary data structure for the plugin
 type InfluxDB struct {
-	URL              string   // url deprecated in 0.1.9; use urls
-	URLs             []string `toml:"urls"`
-	Username         string
-	Password         string
-	Database         string
-	UserAgent        string
-	RetentionPolicy  string
-	WriteConsistency string
-	Timeout          internal.Duration
-	UDPPayload       int               `toml:"udp_payload"`
-	HTTPProxy        string            `toml:"http_proxy"`
-	HTTPHeaders      map[string]string `toml:"http_headers"`
-	ContentEncoding  string            `toml:"content_encoding"`
+	URL                  string   // url deprecated in 0.1.9; use urls
+	URLs                 []string `toml:"urls"`
+	Username             string
+	Password             string
+	Database             string
+	UserAgent            string
+	RetentionPolicy      string
+	WriteConsistency     string
+	Timeout              internal.Duration
+	UDPPayload           int               `toml:"udp_payload"`
+	HTTPProxy            string            `toml:"http_proxy"`
+	HTTPHeaders          map[string]string `toml:"http_headers"`
+	ContentEncoding      string            `toml:"content_encoding"`
+	SkipDatabaseCreation bool              `toml:"skip_database_creation"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -75,6 +76,11 @@ var sampleConfig = `
   ## The target database for metrics; will be created as needed.
   # database = "telegraf"
 
+  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
+  ## Telegraf with a user without permissions to create databases or when the
+  ## database already exists.
+  # skip_database_creation = false
+
   ## Name of existing retention policy to write to.  Empty string writes to
   ## the default retention policy.
   # retention_policy = ""
@@ -194,11 +200,13 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 
 		switch apiError := err.(type) {
 		case APIError:
-			if apiError.Type == DatabaseNotFound {
-				err := client.CreateDatabase(ctx)
-				if err != nil {
-					log.Printf("E! [outputs.influxdb] when writing to [%s]: database %q not found and failed to recreate",
-						client.URL(), client.Database())
+			if !i.SkipDatabaseCreation {
+				if apiError.Type == DatabaseNotFound {
+					err := client.CreateDatabase(ctx)
+					if err != nil {
+						log.Printf("E! [outputs.influxdb] when writing to [%s]: database %q not found and failed to recreate",
+							client.URL(), client.Database())
+					}
 				}
 			}
 		}
@@ -252,16 +260,12 @@ func (i *InfluxDB) httpClient(ctx context.Context, url *url.URL, proxy *url.URL)
 		return nil, fmt.Errorf("error creating HTTP client [%s]: %v", url, err)
 	}
 
-	err = c.CreateDatabase(ctx)
-	if err != nil {
-		if err, ok := err.(APIError); ok {
-			if err.StatusCode == 503 {
-				return c, nil
-			}
+	if !i.SkipDatabaseCreation {
+		err = c.CreateDatabase(ctx)
+		if err != nil {
+			log.Printf("W! [outputs.influxdb] when writing to [%s]: database %q creation failed: %v",
+				c.URL(), c.Database(), err)
 		}
-
-		log.Printf("W! [outputs.influxdb] when writing to [%s]: database %q creation failed: %v",
-			c.URL(), c.Database(), err)
 	}
 
 	return c, nil

From b0b18df0bf7efeb95dda88b47ddd51e5ea4cb21c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 27 Mar 2018 18:07:37 -0700
Subject: [PATCH 1015/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8564a3d46..c7add5ec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@
 - [#3496](https://github.com/influxdata/telegraf/pull/3496): Add HTTP basic auth support to the http_listener input.
 - [#3452](https://github.com/influxdata/telegraf/issues/3452): Tags in output InfluxDB Line Protocol are now sorted.
 - [#3631](https://github.com/influxdata/telegraf/issues/3631): InfluxDB Line Protocol parser now accepts DOS line endings.
+- [#2496](https://github.com/influxdata/telegraf/issues/2496): An option has been added to skip database creation in the InfluxDB output.
 
 ### Bugfixes
 

From 43bd23e5556ba947758cd23af0364ce808add059 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 27 Mar 2018 18:36:08 -0700
Subject: [PATCH 1016/1302] Add support for connecting to InfluxDB over a unix
 domain socket (#3942)

---
 plugins/outputs/influxdb/http.go      | 47 +++++++++++++---
 plugins/outputs/influxdb/http_test.go | 80 +++++++++++++++++++++++++++
 plugins/outputs/influxdb/influxdb.go  |  3 +-
 3 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
index 852784f0d..fdbb5bd8c 100644
--- a/plugins/outputs/influxdb/http.go
+++ b/plugins/outputs/influxdb/http.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"net"
 	"net/http"
 	"net/url"
 	"path"
@@ -164,14 +165,32 @@ func NewHTTPClient(config *HTTPConfig) (*httpClient, error) {
 		config.Consistency)
 	queryURL := makeQueryURL(config.URL)
 
+	var transport *http.Transport
+	switch config.URL.Scheme {
+	case "http", "https":
+		transport = &http.Transport{
+			Proxy:           proxy,
+			TLSClientConfig: config.TLSConfig,
+		}
+	case "unix":
+		transport = &http.Transport{
+			Dial: func(_, _ string) (net.Conn, error) {
+				return net.DialTimeout(
+					config.URL.Scheme,
+					config.URL.Path,
+					defaultRequestTimeout,
+				)
+			},
+		}
+	default:
+		return nil, fmt.Errorf("unsupported scheme %q", config.URL.Scheme)
+	}
+
 	client := &httpClient{
 		serializer: serializer,
 		client: &http.Client{
-			Timeout: timeout,
-			Transport: &http.Transport{
-				Proxy:           proxy,
-				TLSClientConfig: config.TLSConfig,
-			},
+			Timeout:   timeout,
+			Transport: transport,
 		},
 		database:        database,
 		url:             config.URL,
@@ -392,13 +411,27 @@ func makeWriteURL(loc *url.URL, db, rp, consistency string) string {
 	}
 
 	u := *loc
-	u.Path = path.Join(u.Path, "write")
+	switch u.Scheme {
+	case "unix":
+		u.Scheme = "http"
+		u.Host = "127.0.0.1"
+		u.Path = "/write"
+	case "http":
+		u.Path = path.Join(u.Path, "write")
+	}
 	u.RawQuery = params.Encode()
 	return u.String()
 }
 
 func makeQueryURL(loc *url.URL) string {
 	u := *loc
-	u.Path = path.Join(u.Path, "query")
+	switch u.Scheme {
+	case "unix":
+		u.Scheme = "http"
+		u.Host = "127.0.0.1"
+		u.Path = "/query"
+	case "http":
+		u.Path = path.Join(u.Path, "query")
+	}
 	return u.String()
 }
diff --git a/plugins/outputs/influxdb/http_test.go b/plugins/outputs/influxdb/http_test.go
index d6463c050..e84957fcf 100644
--- a/plugins/outputs/influxdb/http_test.go
+++ b/plugins/outputs/influxdb/http_test.go
@@ -7,9 +7,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
+	"path"
 	"strings"
 	"testing"
 	"time"
@@ -556,3 +559,80 @@ func TestHTTP_WriteContentEncodingGzip(t *testing.T) {
 	err = client.Write(ctx, metrics)
 	require.NoError(t, err)
 }
+
+func TestHTTP_UnixSocket(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf-test")
+	if err != nil {
+		require.NoError(t, err)
+	}
+	defer os.RemoveAll(tmpdir)
+
+	sock := path.Join(tmpdir, "test.sock")
+	listener, err := net.Listen("unix", sock)
+	require.NoError(t, err)
+
+	ts := httptest.NewUnstartedServer(http.NotFoundHandler())
+	ts.Listener = listener
+	ts.Start()
+	defer ts.Close()
+
+	x, _ := url.Parse("unix://" + sock)
+	fmt.Println(x)
+
+	successResponse := []byte(`{"results": [{"statement_id": 0}]}`)
+
+	tests := []struct {
+		name             string
+		config           *influxdb.HTTPConfig
+		database         string
+		queryHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+		writeHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+		errFunc          func(t *testing.T, err error)
+	}{
+		{
+			name: "success",
+			config: &influxdb.HTTPConfig{
+				URL:      &url.URL{Scheme: "unix", Path: sock},
+				Database: "xyzzy",
+			},
+			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, `CREATE DATABASE "xyzzy"`, r.FormValue("q"))
+				w.WriteHeader(http.StatusOK)
+				w.Write(successResponse)
+			},
+			writeHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusNoContent)
+				w.Write(successResponse)
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				switch r.URL.Path {
+				case "/query":
+					tt.queryHandlerFunc(t, w, r)
+					return
+				case "/write":
+					tt.queryHandlerFunc(t, w, r)
+					return
+				default:
+					w.WriteHeader(http.StatusNotFound)
+					return
+				}
+			})
+
+			ctx := context.Background()
+
+			client, err := influxdb.NewHTTPClient(tt.config)
+			require.NoError(t, err)
+			err = client.CreateDatabase(ctx)
+			if tt.errFunc != nil {
+				tt.errFunc(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 5f38263b8..2e6e0d9c6 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -70,6 +70,7 @@ var sampleConfig = `
   ##
   ## Multiple URLs can be specified for a single cluster, only ONE of the
   ## urls will be written to each interval.
+  # urls = ["unix:///var/run/influxdb.sock"]
   # urls = ["udp://127.0.0.1:8089"]
   # urls = ["http://127.0.0.1:8086"]
 
@@ -157,7 +158,7 @@ func (i *InfluxDB) Connect() error {
 			}
 
 			i.clients = append(i.clients, c)
-		case "http", "https":
+		case "http", "https", "unix":
 			c, err := i.httpClient(ctx, u, proxy)
 			if err != nil {
 				return err

From 8a73dc05c034e34efad1930a25e86d9bc8226f34 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 27 Mar 2018 18:38:39 -0700
Subject: [PATCH 1017/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7add5ec3..8729d9368 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
 - [#3452](https://github.com/influxdata/telegraf/issues/3452): Tags in output InfluxDB Line Protocol are now sorted.
 - [#3631](https://github.com/influxdata/telegraf/issues/3631): InfluxDB Line Protocol parser now accepts DOS line endings.
 - [#2496](https://github.com/influxdata/telegraf/issues/2496): An option has been added to skip database creation in the InfluxDB output.
+- [#3366](https://github.com/influxdata/telegraf/issues/3366): Add support for connecting to InfluxDB over a unix domain socket.
 
 ### Bugfixes
 

From 5be119827494ac3f33f2fae1b3c619592d7dc642 Mon Sep 17 00:00:00 2001
From: rabhis <rsabhilashkurup@gmail.com>
Date: Wed, 28 Mar 2018 21:00:56 +0000
Subject: [PATCH 1018/1302] Reconnect AMQP consumer to broker (#3947)

---
 plugins/inputs/amqp_consumer/amqp_consumer.go | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index ee1b9aee1..c96272fa7 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -145,23 +145,25 @@ func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
 	go a.process(msgs, acc)
 
 	go func() {
-		err := <-a.conn.NotifyClose(make(chan *amqp.Error))
-		if err == nil {
-			return
-		}
-
-		log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
 		for {
-			msgs, err := a.connect(amqpConf)
-			if err != nil {
-				log.Printf("E! AMQP connection failed: %s", err)
-				time.Sleep(10 * time.Second)
-				continue
+			err := <-a.conn.NotifyClose(make(chan *amqp.Error))
+			if err == nil {
+				break
 			}
 
-			a.wg.Add(1)
-			go a.process(msgs, acc)
-			break
+			log.Printf("I! AMQP consumer connection closed: %s; trying to reconnect", err)
+			for {
+				msgs, err := a.connect(amqpConf)
+				if err != nil {
+					log.Printf("E! AMQP connection failed: %s", err)
+					time.Sleep(10 * time.Second)
+					continue
+				}
+
+				a.wg.Add(1)
+				go a.process(msgs, acc)
+				break
+			}
 		}
 	}()
 

From ef112e6ee72df1789d30864ebe9e9900237e18e7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 28 Mar 2018 14:32:40 -0700
Subject: [PATCH 1019/1302] Revert to 'f' formatting for floats in line
 protocol

Using 'g' with -1 precision switches over to scientific notation for too
small of numbers, and setting a larger precision results in larger than
desired representations.
---
 plugins/serializers/influx/influx.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 51aed0d09..59d7662aa 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -262,7 +262,7 @@ func appendIntField(buf []byte, value int64) []byte {
 }
 
 func appendFloatField(buf []byte, value float64) []byte {
-	return strconv.AppendFloat(buf, value, 'g', -1, 64)
+	return strconv.AppendFloat(buf, value, 'f', -1, 64)
 }
 
 func appendBoolField(buf []byte, value bool) []byte {

From a320f91516066b48f96c5063bb1ccb041989faeb Mon Sep 17 00:00:00 2001
From: Matt <matt@theaddisons.us>
Date: Wed, 28 Mar 2018 19:43:25 -0400
Subject: [PATCH 1020/1302] Add line protocol uint64 support (#3946)

---
 Makefile                                  |     8 +-
 metric/metric.go                          |    21 +-
 metric/uint_support.go                    |     7 +
 plugins/parsers/influx/escape.go          |     6 +
 plugins/parsers/influx/handler.go         |    10 +
 plugins/parsers/influx/machine.go         | 14607 +++++++++++---------
 plugins/parsers/influx/machine.go.rl      |    12 +-
 plugins/parsers/influx/machine_test.go    |    15 +
 plugins/parsers/influx/parser.go          |     1 +
 plugins/parsers/influx/parser_test.go     |    57 +
 plugins/serializers/influx/influx.go      |     6 +
 plugins/serializers/influx/influx_test.go |    50 +
 12 files changed, 8046 insertions(+), 6754 deletions(-)
 create mode 100644 metric/uint_support.go

diff --git a/Makefile b/Makefile
index 3e4b4f019..ffa3be0bf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
 GOFILES ?= $(shell git ls-files '*.go')
 GOFMT ?= $(shell gofmt -l $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
+BUILDFLAGS ?= 
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
@@ -35,7 +36,7 @@ deps:
 	gdm restore
 
 telegraf:
-	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
+	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" $(BUILDFLAGS) ./cmd/telegraf/telegraf.go
 
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
@@ -61,6 +62,9 @@ fmtcheck:
 	fi
 	@echo '[INFO] done.'
 
+uint64:
+	BUILDFLAGS="-tags uint64" $(MAKE) all
+
 lint:
 	golint ./...
 
@@ -99,4 +103,4 @@ docker-image:
 plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 	ragel -Z -G2 $^ -o $@
 
-.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck
+.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64
diff --git a/metric/metric.go b/metric/metric.go
index 06e705a66..7c8ca1134 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -11,6 +11,16 @@ import (
 
 const MaxInt = int(^uint(0) >> 1)
 
+// enableUint64Support will enable uint64 support if set to true.
+var enableUint64Support = false
+
+// EnableUintSupport manually enables uint support for convertValue.
+// This function will be removed in the future and only exists for unit tests during the
+// transition.
+func EnableUintSupport() {
+	enableUint64Support = true
+}
+
 type metric struct {
 	name   string
 	tags   []*telegraf.Tag
@@ -265,11 +275,14 @@ func convertField(v interface{}) interface{} {
 			return int64(MaxInt)
 		}
 	case uint64:
-		if v <= uint64(MaxInt) {
-			return int64(v)
-		} else {
-			return int64(MaxInt)
+		if enableUint64Support == false {
+			if v <= uint64(MaxInt) {
+				return int64(v)
+			} else {
+				return int64(MaxInt)
+			}
 		}
+		return uint64(v)
 	case []byte:
 		return string(v)
 	case int32:
diff --git a/metric/uint_support.go b/metric/uint_support.go
new file mode 100644
index 000000000..98383fb23
--- /dev/null
+++ b/metric/uint_support.go
@@ -0,0 +1,7 @@
+// +build uint64
+
+package metric
+
+func init() {
+	EnableUintSupport()
+}
diff --git a/plugins/parsers/influx/escape.go b/plugins/parsers/influx/escape.go
index bf47fa8c5..01e42a8d5 100644
--- a/plugins/parsers/influx/escape.go
+++ b/plugins/parsers/influx/escape.go
@@ -63,6 +63,12 @@ func parseIntBytes(b []byte, base int, bitSize int) (i int64, err error) {
 	return strconv.ParseInt(s, base, bitSize)
 }
 
+// parseUintBytes is a zero-alloc wrapper around strconv.ParseUint.
+func parseUintBytes(b []byte, base int, bitSize int) (i uint64, err error) {
+	s := unsafeBytesToString(b)
+	return strconv.ParseUint(s, base, bitSize)
+}
+
 // parseFloatBytes is a zero-alloc wrapper around strconv.ParseFloat.
 func parseFloatBytes(b []byte, bitSize int) (float64, error) {
 	s := unsafeBytesToString(b)
diff --git a/plugins/parsers/influx/handler.go b/plugins/parsers/influx/handler.go
index 27d6f942d..8c17cf9cf 100644
--- a/plugins/parsers/influx/handler.go
+++ b/plugins/parsers/influx/handler.go
@@ -54,6 +54,16 @@ func (h *MetricHandler) AddInt(key []byte, value []byte) {
 	h.builder.AddField(fk, fv)
 }
 
+func (h *MetricHandler) AddUint(key []byte, value []byte) {
+	fk := unescape(key)
+	fv, err := parseUintBytes(bytes.TrimSuffix(value, []byte("u")), 10, 64)
+	if err != nil {
+		log.Errorf("E! Received unparseable uint value: %q", value)
+		return
+	}
+	h.builder.AddField(fk, fv)
+}
+
 func (h *MetricHandler) AddFloat(key []byte, value []byte) {
 	fk := unescape(key)
 	fv, err := parseFloatBytes(value, 64)
diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
index 958587135..678790b06 100644
--- a/plugins/parsers/influx/machine.go
+++ b/plugins/parsers/influx/machine.go
@@ -15,7 +15,7 @@ var (
 )
 
 
-//line plugins/parsers/influx/machine.go.rl:214
+//line plugins/parsers/influx/machine.go.rl:224
 
 
 
@@ -29,7 +29,7 @@ const LineProtocol_en_discard_line int = 187
 const LineProtocol_en_align int = 188
 
 
-//line plugins/parsers/influx/machine.go.rl:217
+//line plugins/parsers/influx/machine.go.rl:227
 
 type machine struct {
 	data       []byte
@@ -46,22 +46,22 @@ func NewMachine(handler Handler) *machine {
 	}
 
 	
-//line plugins/parsers/influx/machine.go.rl:233
+//line plugins/parsers/influx/machine.go.rl:243
 	
-//line plugins/parsers/influx/machine.go.rl:234
+//line plugins/parsers/influx/machine.go.rl:244
 	
-//line plugins/parsers/influx/machine.go.rl:235
+//line plugins/parsers/influx/machine.go.rl:245
 	
-//line plugins/parsers/influx/machine.go.rl:236
+//line plugins/parsers/influx/machine.go.rl:246
 	
-//line plugins/parsers/influx/machine.go.rl:237
+//line plugins/parsers/influx/machine.go.rl:247
 	
 //line plugins/parsers/influx/machine.go:60
 	{
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:238
+//line plugins/parsers/influx/machine.go.rl:248
 
 	return m
 }
@@ -80,7 +80,7 @@ func (m *machine) SetData(data []byte) {
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:251
+//line plugins/parsers/influx/machine.go.rl:261
 	m.cs = LineProtocol_en_align
 }
 
@@ -194,30 +194,36 @@ _again:
 		goto st218
 	case 219:
 		goto st219
+	case 220:
+		goto st220
+	case 221:
+		goto st221
+	case 222:
+		goto st222
 	case 15:
 		goto st15
 	case 16:
 		goto st16
 	case 17:
 		goto st17
-	case 220:
-		goto st220
+	case 223:
+		goto st223
 	case 18:
 		goto st18
 	case 19:
 		goto st19
 	case 20:
 		goto st20
-	case 221:
-		goto st221
+	case 224:
+		goto st224
 	case 21:
 		goto st21
 	case 22:
 		goto st22
-	case 222:
-		goto st222
-	case 223:
-		goto st223
+	case 225:
+		goto st225
+	case 226:
+		goto st226
 	case 23:
 		goto st23
 	case 24:
@@ -256,18 +262,12 @@ _again:
 		goto st40
 	case 41:
 		goto st41
-	case 224:
-		goto st224
-	case 225:
-		goto st225
-	case 42:
-		goto st42
-	case 226:
-		goto st226
 	case 227:
 		goto st227
 	case 228:
 		goto st228
+	case 42:
+		goto st42
 	case 229:
 		goto st229
 	case 230:
@@ -302,22 +302,22 @@ _again:
 		goto st244
 	case 245:
 		goto st245
-	case 43:
-		goto st43
 	case 246:
 		goto st246
 	case 247:
 		goto st247
 	case 248:
 		goto st248
-	case 44:
-		goto st44
+	case 43:
+		goto st43
 	case 249:
 		goto st249
 	case 250:
 		goto st250
 	case 251:
 		goto st251
+	case 44:
+		goto st44
 	case 252:
 		goto st252
 	case 253:
@@ -352,14 +352,20 @@ _again:
 		goto st267
 	case 268:
 		goto st268
+	case 269:
+		goto st269
+	case 270:
+		goto st270
+	case 271:
+		goto st271
 	case 45:
 		goto st45
 	case 46:
 		goto st46
 	case 47:
 		goto st47
-	case 269:
-		goto st269
+	case 272:
+		goto st272
 	case 48:
 		goto st48
 	case 49:
@@ -368,92 +374,104 @@ _again:
 		goto st50
 	case 51:
 		goto st51
-	case 270:
-		goto st270
-	case 271:
-		goto st271
-	case 52:
-		goto st52
-	case 272:
-		goto st272
-	case 53:
-		goto st53
 	case 273:
 		goto st273
 	case 274:
 		goto st274
+	case 52:
+		goto st52
 	case 275:
 		goto st275
+	case 53:
+		goto st53
 	case 276:
 		goto st276
+	case 277:
+		goto st277
+	case 278:
+		goto st278
+	case 279:
+		goto st279
+	case 280:
+		goto st280
+	case 281:
+		goto st281
+	case 282:
+		goto st282
 	case 54:
 		goto st54
 	case 55:
 		goto st55
 	case 56:
 		goto st56
-	case 277:
-		goto st277
+	case 283:
+		goto st283
 	case 57:
 		goto st57
 	case 58:
 		goto st58
 	case 59:
 		goto st59
-	case 278:
-		goto st278
+	case 284:
+		goto st284
 	case 60:
 		goto st60
 	case 61:
 		goto st61
-	case 279:
-		goto st279
-	case 280:
-		goto st280
-	case 62:
-		goto st62
-	case 63:
-		goto st63
-	case 281:
-		goto st281
-	case 282:
-		goto st282
-	case 64:
-		goto st64
-	case 65:
-		goto st65
-	case 283:
-		goto st283
-	case 284:
-		goto st284
 	case 285:
 		goto st285
 	case 286:
 		goto st286
+	case 62:
+		goto st62
+	case 63:
+		goto st63
+	case 287:
+		goto st287
+	case 288:
+		goto st288
+	case 64:
+		goto st64
+	case 65:
+		goto st65
+	case 289:
+		goto st289
+	case 290:
+		goto st290
+	case 291:
+		goto st291
+	case 292:
+		goto st292
+	case 293:
+		goto st293
+	case 294:
+		goto st294
+	case 295:
+		goto st295
 	case 66:
 		goto st66
 	case 67:
 		goto st67
 	case 68:
 		goto st68
-	case 287:
-		goto st287
+	case 296:
+		goto st296
 	case 69:
 		goto st69
 	case 70:
 		goto st70
 	case 71:
 		goto st71
-	case 288:
-		goto st288
+	case 297:
+		goto st297
 	case 72:
 		goto st72
 	case 73:
 		goto st73
-	case 289:
-		goto st289
-	case 290:
-		goto st290
+	case 298:
+		goto st298
+	case 299:
+		goto st299
 	case 74:
 		goto st74
 	case 75:
@@ -466,28 +484,6 @@ _again:
 		goto st78
 	case 79:
 		goto st79
-	case 291:
-		goto st291
-	case 292:
-		goto st292
-	case 293:
-		goto st293
-	case 294:
-		goto st294
-	case 80:
-		goto st80
-	case 295:
-		goto st295
-	case 296:
-		goto st296
-	case 297:
-		goto st297
-	case 298:
-		goto st298
-	case 81:
-		goto st81
-	case 299:
-		goto st299
 	case 300:
 		goto st300
 	case 301:
@@ -496,6 +492,8 @@ _again:
 		goto st302
 	case 303:
 		goto st303
+	case 80:
+		goto st80
 	case 304:
 		goto st304
 	case 305:
@@ -504,6 +502,8 @@ _again:
 		goto st306
 	case 307:
 		goto st307
+	case 81:
+		goto st81
 	case 308:
 		goto st308
 	case 309:
@@ -522,6 +522,24 @@ _again:
 		goto st315
 	case 316:
 		goto st316
+	case 317:
+		goto st317
+	case 318:
+		goto st318
+	case 319:
+		goto st319
+	case 320:
+		goto st320
+	case 321:
+		goto st321
+	case 322:
+		goto st322
+	case 323:
+		goto st323
+	case 324:
+		goto st324
+	case 325:
+		goto st325
 	case 82:
 		goto st82
 	case 83:
@@ -548,30 +566,12 @@ _again:
 		goto st93
 	case 94:
 		goto st94
-	case 317:
-		goto st317
-	case 318:
-		goto st318
-	case 95:
-		goto st95
-	case 319:
-		goto st319
-	case 320:
-		goto st320
-	case 321:
-		goto st321
-	case 322:
-		goto st322
-	case 323:
-		goto st323
-	case 324:
-		goto st324
-	case 325:
-		goto st325
 	case 326:
 		goto st326
 	case 327:
 		goto st327
+	case 95:
+		goto st95
 	case 328:
 		goto st328
 	case 329:
@@ -594,16 +594,10 @@ _again:
 		goto st337
 	case 338:
 		goto st338
-	case 96:
-		goto st96
-	case 97:
-		goto st97
 	case 339:
 		goto st339
 	case 340:
 		goto st340
-	case 98:
-		goto st98
 	case 341:
 		goto st341
 	case 342:
@@ -618,10 +612,16 @@ _again:
 		goto st346
 	case 347:
 		goto st347
+	case 96:
+		goto st96
+	case 97:
+		goto st97
 	case 348:
 		goto st348
 	case 349:
 		goto st349
+	case 98:
+		goto st98
 	case 350:
 		goto st350
 	case 351:
@@ -644,28 +644,14 @@ _again:
 		goto st359
 	case 360:
 		goto st360
-	case 99:
-		goto st99
 	case 361:
 		goto st361
 	case 362:
 		goto st362
-	case 100:
-		goto st100
-	case 101:
-		goto st101
-	case 102:
-		goto st102
-	case 103:
-		goto st103
 	case 363:
 		goto st363
 	case 364:
 		goto st364
-	case 104:
-		goto st104
-	case 105:
-		goto st105
 	case 365:
 		goto st365
 	case 366:
@@ -674,30 +660,68 @@ _again:
 		goto st367
 	case 368:
 		goto st368
+	case 369:
+		goto st369
+	case 99:
+		goto st99
+	case 370:
+		goto st370
+	case 371:
+		goto st371
+	case 100:
+		goto st100
+	case 101:
+		goto st101
+	case 102:
+		goto st102
+	case 103:
+		goto st103
+	case 372:
+		goto st372
+	case 373:
+		goto st373
+	case 104:
+		goto st104
+	case 105:
+		goto st105
+	case 374:
+		goto st374
+	case 375:
+		goto st375
+	case 376:
+		goto st376
+	case 377:
+		goto st377
+	case 378:
+		goto st378
+	case 379:
+		goto st379
+	case 380:
+		goto st380
 	case 106:
 		goto st106
 	case 107:
 		goto st107
 	case 108:
 		goto st108
-	case 369:
-		goto st369
+	case 381:
+		goto st381
 	case 109:
 		goto st109
 	case 110:
 		goto st110
 	case 111:
 		goto st111
-	case 370:
-		goto st370
+	case 382:
+		goto st382
 	case 112:
 		goto st112
 	case 113:
 		goto st113
-	case 371:
-		goto st371
-	case 372:
-		goto st372
+	case 383:
+		goto st383
+	case 384:
+		goto st384
 	case 114:
 		goto st114
 	case 115:
@@ -722,38 +746,14 @@ _again:
 		goto st124
 	case 125:
 		goto st125
-	case 373:
-		goto st373
-	case 374:
-		goto st374
-	case 375:
-		goto st375
-	case 126:
-		goto st126
-	case 376:
-		goto st376
-	case 377:
-		goto st377
-	case 378:
-		goto st378
-	case 379:
-		goto st379
-	case 380:
-		goto st380
-	case 381:
-		goto st381
-	case 382:
-		goto st382
-	case 383:
-		goto st383
-	case 384:
-		goto st384
 	case 385:
 		goto st385
 	case 386:
 		goto st386
 	case 387:
 		goto st387
+	case 126:
+		goto st126
 	case 388:
 		goto st388
 	case 389:
@@ -774,8 +774,6 @@ _again:
 		goto st396
 	case 397:
 		goto st397
-	case 127:
-		goto st127
 	case 398:
 		goto st398
 	case 399:
@@ -784,8 +782,6 @@ _again:
 		goto st400
 	case 401:
 		goto st401
-	case 128:
-		goto st128
 	case 402:
 		goto st402
 	case 403:
@@ -802,6 +798,8 @@ _again:
 		goto st408
 	case 409:
 		goto st409
+	case 127:
+		goto st127
 	case 410:
 		goto st410
 	case 411:
@@ -810,6 +808,8 @@ _again:
 		goto st412
 	case 413:
 		goto st413
+	case 128:
+		goto st128
 	case 414:
 		goto st414
 	case 415:
@@ -826,18 +826,10 @@ _again:
 		goto st420
 	case 421:
 		goto st421
-	case 129:
-		goto st129
-	case 130:
-		goto st130
-	case 131:
-		goto st131
 	case 422:
 		goto st422
 	case 423:
 		goto st423
-	case 132:
-		goto st132
 	case 424:
 		goto st424
 	case 425:
@@ -858,10 +850,18 @@ _again:
 		goto st432
 	case 433:
 		goto st433
+	case 129:
+		goto st129
+	case 130:
+		goto st130
+	case 131:
+		goto st131
 	case 434:
 		goto st434
 	case 435:
 		goto st435
+	case 132:
+		goto st132
 	case 436:
 		goto st436
 	case 437:
@@ -878,16 +878,12 @@ _again:
 		goto st442
 	case 443:
 		goto st443
-	case 133:
-		goto st133
 	case 444:
 		goto st444
 	case 445:
 		goto st445
 	case 446:
 		goto st446
-	case 134:
-		goto st134
 	case 447:
 		goto st447
 	case 448:
@@ -906,12 +902,16 @@ _again:
 		goto st454
 	case 455:
 		goto st455
+	case 133:
+		goto st133
 	case 456:
 		goto st456
 	case 457:
 		goto st457
 	case 458:
 		goto st458
+	case 134:
+		goto st134
 	case 459:
 		goto st459
 	case 460:
@@ -932,8 +932,6 @@ _again:
 		goto st467
 	case 468:
 		goto st468
-	case 135:
-		goto st135
 	case 469:
 		goto st469
 	case 470:
@@ -958,6 +956,8 @@ _again:
 		goto st479
 	case 480:
 		goto st480
+	case 135:
+		goto st135
 	case 481:
 		goto st481
 	case 482:
@@ -978,24 +978,12 @@ _again:
 		goto st489
 	case 490:
 		goto st490
-	case 136:
-		goto st136
-	case 137:
-		goto st137
-	case 138:
-		goto st138
-	case 139:
-		goto st139
 	case 491:
 		goto st491
 	case 492:
 		goto st492
-	case 140:
-		goto st140
 	case 493:
 		goto st493
-	case 141:
-		goto st141
 	case 494:
 		goto st494
 	case 495:
@@ -1004,44 +992,34 @@ _again:
 		goto st496
 	case 497:
 		goto st497
-	case 142:
-		goto st142
-	case 143:
-		goto st143
-	case 144:
-		goto st144
 	case 498:
 		goto st498
-	case 145:
-		goto st145
-	case 146:
-		goto st146
-	case 147:
-		goto st147
 	case 499:
 		goto st499
-	case 148:
-		goto st148
-	case 149:
-		goto st149
 	case 500:
 		goto st500
 	case 501:
 		goto st501
-	case 150:
-		goto st150
-	case 151:
-		goto st151
 	case 502:
 		goto st502
+	case 136:
+		goto st136
+	case 137:
+		goto st137
+	case 138:
+		goto st138
+	case 139:
+		goto st139
 	case 503:
 		goto st503
 	case 504:
 		goto st504
-	case 152:
-		goto st152
+	case 140:
+		goto st140
 	case 505:
 		goto st505
+	case 141:
+		goto st141
 	case 506:
 		goto st506
 	case 507:
@@ -1056,20 +1034,42 @@ _again:
 		goto st511
 	case 512:
 		goto st512
+	case 142:
+		goto st142
+	case 143:
+		goto st143
+	case 144:
+		goto st144
 	case 513:
 		goto st513
+	case 145:
+		goto st145
+	case 146:
+		goto st146
+	case 147:
+		goto st147
 	case 514:
 		goto st514
+	case 148:
+		goto st148
+	case 149:
+		goto st149
 	case 515:
 		goto st515
 	case 516:
 		goto st516
+	case 150:
+		goto st150
+	case 151:
+		goto st151
 	case 517:
 		goto st517
 	case 518:
 		goto st518
 	case 519:
 		goto st519
+	case 152:
+		goto st152
 	case 520:
 		goto st520
 	case 521:
@@ -1082,10 +1082,6 @@ _again:
 		goto st524
 	case 525:
 		goto st525
-	case 153:
-		goto st153
-	case 154:
-		goto st154
 	case 526:
 		goto st526
 	case 527:
@@ -1094,130 +1090,182 @@ _again:
 		goto st528
 	case 529:
 		goto st529
-	case 155:
-		goto st155
-	case 156:
-		goto st156
-	case 157:
-		goto st157
 	case 530:
 		goto st530
-	case 158:
-		goto st158
-	case 159:
-		goto st159
-	case 160:
-		goto st160
 	case 531:
 		goto st531
-	case 161:
-		goto st161
-	case 162:
-		goto st162
 	case 532:
 		goto st532
 	case 533:
 		goto st533
-	case 163:
-		goto st163
-	case 164:
-		goto st164
-	case 165:
-		goto st165
 	case 534:
 		goto st534
 	case 535:
 		goto st535
-	case 166:
-		goto st166
 	case 536:
 		goto st536
 	case 537:
 		goto st537
-	case 167:
-		goto st167
 	case 538:
 		goto st538
 	case 539:
 		goto st539
 	case 540:
 		goto st540
+	case 153:
+		goto st153
+	case 154:
+		goto st154
 	case 541:
 		goto st541
+	case 542:
+		goto st542
+	case 543:
+		goto st543
+	case 544:
+		goto st544
+	case 545:
+		goto st545
+	case 546:
+		goto st546
+	case 547:
+		goto st547
+	case 155:
+		goto st155
+	case 156:
+		goto st156
+	case 157:
+		goto st157
+	case 548:
+		goto st548
+	case 158:
+		goto st158
+	case 159:
+		goto st159
+	case 160:
+		goto st160
+	case 549:
+		goto st549
+	case 161:
+		goto st161
+	case 162:
+		goto st162
+	case 550:
+		goto st550
+	case 551:
+		goto st551
+	case 163:
+		goto st163
+	case 164:
+		goto st164
+	case 165:
+		goto st165
+	case 552:
+		goto st552
+	case 553:
+		goto st553
+	case 166:
+		goto st166
+	case 554:
+		goto st554
+	case 555:
+		goto st555
+	case 167:
+		goto st167
+	case 556:
+		goto st556
+	case 557:
+		goto st557
+	case 558:
+		goto st558
+	case 559:
+		goto st559
+	case 560:
+		goto st560
+	case 561:
+		goto st561
+	case 562:
+		goto st562
 	case 168:
 		goto st168
 	case 169:
 		goto st169
 	case 170:
 		goto st170
-	case 542:
-		goto st542
+	case 563:
+		goto st563
 	case 171:
 		goto st171
 	case 172:
 		goto st172
 	case 173:
 		goto st173
-	case 543:
-		goto st543
+	case 564:
+		goto st564
 	case 174:
 		goto st174
 	case 175:
 		goto st175
-	case 544:
-		goto st544
-	case 545:
-		goto st545
+	case 565:
+		goto st565
+	case 566:
+		goto st566
 	case 176:
 		goto st176
-	case 546:
-		goto st546
-	case 547:
-		goto st547
+	case 567:
+		goto st567
+	case 568:
+		goto st568
 	case 177:
 		goto st177
 	case 178:
 		goto st178
-	case 548:
-		goto st548
-	case 549:
-		goto st549
-	case 550:
-		goto st550
+	case 569:
+		goto st569
+	case 570:
+		goto st570
+	case 571:
+		goto st571
+	case 572:
+		goto st572
+	case 573:
+		goto st573
+	case 574:
+		goto st574
 	case 179:
 		goto st179
 	case 180:
 		goto st180
 	case 181:
 		goto st181
-	case 551:
-		goto st551
+	case 575:
+		goto st575
 	case 182:
 		goto st182
 	case 183:
 		goto st183
 	case 184:
 		goto st184
-	case 552:
-		goto st552
+	case 576:
+		goto st576
 	case 185:
 		goto st185
 	case 186:
 		goto st186
-	case 553:
-		goto st553
-	case 554:
-		goto st554
+	case 577:
+		goto st577
+	case 578:
+		goto st578
 	case 187:
 		goto st187
-	case 555:
-		goto st555
+	case 579:
+		goto st579
 	case 188:
 		goto st188
-	case 556:
-		goto st556
-	case 557:
-		goto st557
+	case 580:
+		goto st580
+	case 581:
+		goto st581
 	case 189:
 		goto st189
 	case 190:
@@ -1317,30 +1365,36 @@ _resume:
 		goto st_case_218
 	case 219:
 		goto st_case_219
+	case 220:
+		goto st_case_220
+	case 221:
+		goto st_case_221
+	case 222:
+		goto st_case_222
 	case 15:
 		goto st_case_15
 	case 16:
 		goto st_case_16
 	case 17:
 		goto st_case_17
-	case 220:
-		goto st_case_220
+	case 223:
+		goto st_case_223
 	case 18:
 		goto st_case_18
 	case 19:
 		goto st_case_19
 	case 20:
 		goto st_case_20
-	case 221:
-		goto st_case_221
+	case 224:
+		goto st_case_224
 	case 21:
 		goto st_case_21
 	case 22:
 		goto st_case_22
-	case 222:
-		goto st_case_222
-	case 223:
-		goto st_case_223
+	case 225:
+		goto st_case_225
+	case 226:
+		goto st_case_226
 	case 23:
 		goto st_case_23
 	case 24:
@@ -1379,18 +1433,12 @@ _resume:
 		goto st_case_40
 	case 41:
 		goto st_case_41
-	case 224:
-		goto st_case_224
-	case 225:
-		goto st_case_225
-	case 42:
-		goto st_case_42
-	case 226:
-		goto st_case_226
 	case 227:
 		goto st_case_227
 	case 228:
 		goto st_case_228
+	case 42:
+		goto st_case_42
 	case 229:
 		goto st_case_229
 	case 230:
@@ -1425,22 +1473,22 @@ _resume:
 		goto st_case_244
 	case 245:
 		goto st_case_245
-	case 43:
-		goto st_case_43
 	case 246:
 		goto st_case_246
 	case 247:
 		goto st_case_247
 	case 248:
 		goto st_case_248
-	case 44:
-		goto st_case_44
+	case 43:
+		goto st_case_43
 	case 249:
 		goto st_case_249
 	case 250:
 		goto st_case_250
 	case 251:
 		goto st_case_251
+	case 44:
+		goto st_case_44
 	case 252:
 		goto st_case_252
 	case 253:
@@ -1475,14 +1523,20 @@ _resume:
 		goto st_case_267
 	case 268:
 		goto st_case_268
+	case 269:
+		goto st_case_269
+	case 270:
+		goto st_case_270
+	case 271:
+		goto st_case_271
 	case 45:
 		goto st_case_45
 	case 46:
 		goto st_case_46
 	case 47:
 		goto st_case_47
-	case 269:
-		goto st_case_269
+	case 272:
+		goto st_case_272
 	case 48:
 		goto st_case_48
 	case 49:
@@ -1491,92 +1545,104 @@ _resume:
 		goto st_case_50
 	case 51:
 		goto st_case_51
-	case 270:
-		goto st_case_270
-	case 271:
-		goto st_case_271
-	case 52:
-		goto st_case_52
-	case 272:
-		goto st_case_272
-	case 53:
-		goto st_case_53
 	case 273:
 		goto st_case_273
 	case 274:
 		goto st_case_274
+	case 52:
+		goto st_case_52
 	case 275:
 		goto st_case_275
+	case 53:
+		goto st_case_53
 	case 276:
 		goto st_case_276
+	case 277:
+		goto st_case_277
+	case 278:
+		goto st_case_278
+	case 279:
+		goto st_case_279
+	case 280:
+		goto st_case_280
+	case 281:
+		goto st_case_281
+	case 282:
+		goto st_case_282
 	case 54:
 		goto st_case_54
 	case 55:
 		goto st_case_55
 	case 56:
 		goto st_case_56
-	case 277:
-		goto st_case_277
+	case 283:
+		goto st_case_283
 	case 57:
 		goto st_case_57
 	case 58:
 		goto st_case_58
 	case 59:
 		goto st_case_59
-	case 278:
-		goto st_case_278
+	case 284:
+		goto st_case_284
 	case 60:
 		goto st_case_60
 	case 61:
 		goto st_case_61
-	case 279:
-		goto st_case_279
-	case 280:
-		goto st_case_280
-	case 62:
-		goto st_case_62
-	case 63:
-		goto st_case_63
-	case 281:
-		goto st_case_281
-	case 282:
-		goto st_case_282
-	case 64:
-		goto st_case_64
-	case 65:
-		goto st_case_65
-	case 283:
-		goto st_case_283
-	case 284:
-		goto st_case_284
 	case 285:
 		goto st_case_285
 	case 286:
 		goto st_case_286
+	case 62:
+		goto st_case_62
+	case 63:
+		goto st_case_63
+	case 287:
+		goto st_case_287
+	case 288:
+		goto st_case_288
+	case 64:
+		goto st_case_64
+	case 65:
+		goto st_case_65
+	case 289:
+		goto st_case_289
+	case 290:
+		goto st_case_290
+	case 291:
+		goto st_case_291
+	case 292:
+		goto st_case_292
+	case 293:
+		goto st_case_293
+	case 294:
+		goto st_case_294
+	case 295:
+		goto st_case_295
 	case 66:
 		goto st_case_66
 	case 67:
 		goto st_case_67
 	case 68:
 		goto st_case_68
-	case 287:
-		goto st_case_287
+	case 296:
+		goto st_case_296
 	case 69:
 		goto st_case_69
 	case 70:
 		goto st_case_70
 	case 71:
 		goto st_case_71
-	case 288:
-		goto st_case_288
+	case 297:
+		goto st_case_297
 	case 72:
 		goto st_case_72
 	case 73:
 		goto st_case_73
-	case 289:
-		goto st_case_289
-	case 290:
-		goto st_case_290
+	case 298:
+		goto st_case_298
+	case 299:
+		goto st_case_299
 	case 74:
 		goto st_case_74
 	case 75:
@@ -1589,28 +1655,6 @@ _resume:
 		goto st_case_78
 	case 79:
 		goto st_case_79
-	case 291:
-		goto st_case_291
-	case 292:
-		goto st_case_292
-	case 293:
-		goto st_case_293
-	case 294:
-		goto st_case_294
-	case 80:
-		goto st_case_80
-	case 295:
-		goto st_case_295
-	case 296:
-		goto st_case_296
-	case 297:
-		goto st_case_297
-	case 298:
-		goto st_case_298
-	case 81:
-		goto st_case_81
-	case 299:
-		goto st_case_299
 	case 300:
 		goto st_case_300
 	case 301:
@@ -1619,6 +1663,8 @@ _resume:
 		goto st_case_302
 	case 303:
 		goto st_case_303
+	case 80:
+		goto st_case_80
 	case 304:
 		goto st_case_304
 	case 305:
@@ -1627,6 +1673,8 @@ _resume:
 		goto st_case_306
 	case 307:
 		goto st_case_307
+	case 81:
+		goto st_case_81
 	case 308:
 		goto st_case_308
 	case 309:
@@ -1645,6 +1693,24 @@ _resume:
 		goto st_case_315
 	case 316:
 		goto st_case_316
+	case 317:
+		goto st_case_317
+	case 318:
+		goto st_case_318
+	case 319:
+		goto st_case_319
+	case 320:
+		goto st_case_320
+	case 321:
+		goto st_case_321
+	case 322:
+		goto st_case_322
+	case 323:
+		goto st_case_323
+	case 324:
+		goto st_case_324
+	case 325:
+		goto st_case_325
 	case 82:
 		goto st_case_82
 	case 83:
@@ -1671,30 +1737,12 @@ _resume:
 		goto st_case_93
 	case 94:
 		goto st_case_94
-	case 317:
-		goto st_case_317
-	case 318:
-		goto st_case_318
-	case 95:
-		goto st_case_95
-	case 319:
-		goto st_case_319
-	case 320:
-		goto st_case_320
-	case 321:
-		goto st_case_321
-	case 322:
-		goto st_case_322
-	case 323:
-		goto st_case_323
-	case 324:
-		goto st_case_324
-	case 325:
-		goto st_case_325
 	case 326:
 		goto st_case_326
 	case 327:
 		goto st_case_327
+	case 95:
+		goto st_case_95
 	case 328:
 		goto st_case_328
 	case 329:
@@ -1717,16 +1765,10 @@ _resume:
 		goto st_case_337
 	case 338:
 		goto st_case_338
-	case 96:
-		goto st_case_96
-	case 97:
-		goto st_case_97
 	case 339:
 		goto st_case_339
 	case 340:
 		goto st_case_340
-	case 98:
-		goto st_case_98
 	case 341:
 		goto st_case_341
 	case 342:
@@ -1741,10 +1783,16 @@ _resume:
 		goto st_case_346
 	case 347:
 		goto st_case_347
+	case 96:
+		goto st_case_96
+	case 97:
+		goto st_case_97
 	case 348:
 		goto st_case_348
 	case 349:
 		goto st_case_349
+	case 98:
+		goto st_case_98
 	case 350:
 		goto st_case_350
 	case 351:
@@ -1767,28 +1815,14 @@ _resume:
 		goto st_case_359
 	case 360:
 		goto st_case_360
-	case 99:
-		goto st_case_99
 	case 361:
 		goto st_case_361
 	case 362:
 		goto st_case_362
-	case 100:
-		goto st_case_100
-	case 101:
-		goto st_case_101
-	case 102:
-		goto st_case_102
-	case 103:
-		goto st_case_103
 	case 363:
 		goto st_case_363
 	case 364:
 		goto st_case_364
-	case 104:
-		goto st_case_104
-	case 105:
-		goto st_case_105
 	case 365:
 		goto st_case_365
 	case 366:
@@ -1797,30 +1831,68 @@ _resume:
 		goto st_case_367
 	case 368:
 		goto st_case_368
+	case 369:
+		goto st_case_369
+	case 99:
+		goto st_case_99
+	case 370:
+		goto st_case_370
+	case 371:
+		goto st_case_371
+	case 100:
+		goto st_case_100
+	case 101:
+		goto st_case_101
+	case 102:
+		goto st_case_102
+	case 103:
+		goto st_case_103
+	case 372:
+		goto st_case_372
+	case 373:
+		goto st_case_373
+	case 104:
+		goto st_case_104
+	case 105:
+		goto st_case_105
+	case 374:
+		goto st_case_374
+	case 375:
+		goto st_case_375
+	case 376:
+		goto st_case_376
+	case 377:
+		goto st_case_377
+	case 378:
+		goto st_case_378
+	case 379:
+		goto st_case_379
+	case 380:
+		goto st_case_380
 	case 106:
 		goto st_case_106
 	case 107:
 		goto st_case_107
 	case 108:
 		goto st_case_108
-	case 369:
-		goto st_case_369
+	case 381:
+		goto st_case_381
 	case 109:
 		goto st_case_109
 	case 110:
 		goto st_case_110
 	case 111:
 		goto st_case_111
-	case 370:
-		goto st_case_370
+	case 382:
+		goto st_case_382
 	case 112:
 		goto st_case_112
 	case 113:
 		goto st_case_113
-	case 371:
-		goto st_case_371
-	case 372:
-		goto st_case_372
+	case 383:
+		goto st_case_383
+	case 384:
+		goto st_case_384
 	case 114:
 		goto st_case_114
 	case 115:
@@ -1845,38 +1917,14 @@ _resume:
 		goto st_case_124
 	case 125:
 		goto st_case_125
-	case 373:
-		goto st_case_373
-	case 374:
-		goto st_case_374
-	case 375:
-		goto st_case_375
-	case 126:
-		goto st_case_126
-	case 376:
-		goto st_case_376
-	case 377:
-		goto st_case_377
-	case 378:
-		goto st_case_378
-	case 379:
-		goto st_case_379
-	case 380:
-		goto st_case_380
-	case 381:
-		goto st_case_381
-	case 382:
-		goto st_case_382
-	case 383:
-		goto st_case_383
-	case 384:
-		goto st_case_384
 	case 385:
 		goto st_case_385
 	case 386:
 		goto st_case_386
 	case 387:
 		goto st_case_387
+	case 126:
+		goto st_case_126
 	case 388:
 		goto st_case_388
 	case 389:
@@ -1897,8 +1945,6 @@ _resume:
 		goto st_case_396
 	case 397:
 		goto st_case_397
-	case 127:
-		goto st_case_127
 	case 398:
 		goto st_case_398
 	case 399:
@@ -1907,8 +1953,6 @@ _resume:
 		goto st_case_400
 	case 401:
 		goto st_case_401
-	case 128:
-		goto st_case_128
 	case 402:
 		goto st_case_402
 	case 403:
@@ -1925,6 +1969,8 @@ _resume:
 		goto st_case_408
 	case 409:
 		goto st_case_409
+	case 127:
+		goto st_case_127
 	case 410:
 		goto st_case_410
 	case 411:
@@ -1933,6 +1979,8 @@ _resume:
 		goto st_case_412
 	case 413:
 		goto st_case_413
+	case 128:
+		goto st_case_128
 	case 414:
 		goto st_case_414
 	case 415:
@@ -1949,18 +1997,10 @@ _resume:
 		goto st_case_420
 	case 421:
 		goto st_case_421
-	case 129:
-		goto st_case_129
-	case 130:
-		goto st_case_130
-	case 131:
-		goto st_case_131
 	case 422:
 		goto st_case_422
 	case 423:
 		goto st_case_423
-	case 132:
-		goto st_case_132
 	case 424:
 		goto st_case_424
 	case 425:
@@ -1981,10 +2021,18 @@ _resume:
 		goto st_case_432
 	case 433:
 		goto st_case_433
+	case 129:
+		goto st_case_129
+	case 130:
+		goto st_case_130
+	case 131:
+		goto st_case_131
 	case 434:
 		goto st_case_434
 	case 435:
 		goto st_case_435
+	case 132:
+		goto st_case_132
 	case 436:
 		goto st_case_436
 	case 437:
@@ -2001,16 +2049,12 @@ _resume:
 		goto st_case_442
 	case 443:
 		goto st_case_443
-	case 133:
-		goto st_case_133
 	case 444:
 		goto st_case_444
 	case 445:
 		goto st_case_445
 	case 446:
 		goto st_case_446
-	case 134:
-		goto st_case_134
 	case 447:
 		goto st_case_447
 	case 448:
@@ -2029,12 +2073,16 @@ _resume:
 		goto st_case_454
 	case 455:
 		goto st_case_455
+	case 133:
+		goto st_case_133
 	case 456:
 		goto st_case_456
 	case 457:
 		goto st_case_457
 	case 458:
 		goto st_case_458
+	case 134:
+		goto st_case_134
 	case 459:
 		goto st_case_459
 	case 460:
@@ -2055,8 +2103,6 @@ _resume:
 		goto st_case_467
 	case 468:
 		goto st_case_468
-	case 135:
-		goto st_case_135
 	case 469:
 		goto st_case_469
 	case 470:
@@ -2081,6 +2127,8 @@ _resume:
 		goto st_case_479
 	case 480:
 		goto st_case_480
+	case 135:
+		goto st_case_135
 	case 481:
 		goto st_case_481
 	case 482:
@@ -2101,24 +2149,12 @@ _resume:
 		goto st_case_489
 	case 490:
 		goto st_case_490
-	case 136:
-		goto st_case_136
-	case 137:
-		goto st_case_137
-	case 138:
-		goto st_case_138
-	case 139:
-		goto st_case_139
 	case 491:
 		goto st_case_491
 	case 492:
 		goto st_case_492
-	case 140:
-		goto st_case_140
 	case 493:
 		goto st_case_493
-	case 141:
-		goto st_case_141
 	case 494:
 		goto st_case_494
 	case 495:
@@ -2127,44 +2163,34 @@ _resume:
 		goto st_case_496
 	case 497:
 		goto st_case_497
-	case 142:
-		goto st_case_142
-	case 143:
-		goto st_case_143
-	case 144:
-		goto st_case_144
 	case 498:
 		goto st_case_498
-	case 145:
-		goto st_case_145
-	case 146:
-		goto st_case_146
-	case 147:
-		goto st_case_147
 	case 499:
 		goto st_case_499
-	case 148:
-		goto st_case_148
-	case 149:
-		goto st_case_149
 	case 500:
 		goto st_case_500
 	case 501:
 		goto st_case_501
-	case 150:
-		goto st_case_150
-	case 151:
-		goto st_case_151
 	case 502:
 		goto st_case_502
+	case 136:
+		goto st_case_136
+	case 137:
+		goto st_case_137
+	case 138:
+		goto st_case_138
+	case 139:
+		goto st_case_139
 	case 503:
 		goto st_case_503
 	case 504:
 		goto st_case_504
-	case 152:
-		goto st_case_152
+	case 140:
+		goto st_case_140
 	case 505:
 		goto st_case_505
+	case 141:
+		goto st_case_141
 	case 506:
 		goto st_case_506
 	case 507:
@@ -2179,20 +2205,42 @@ _resume:
 		goto st_case_511
 	case 512:
 		goto st_case_512
+	case 142:
+		goto st_case_142
+	case 143:
+		goto st_case_143
+	case 144:
+		goto st_case_144
 	case 513:
 		goto st_case_513
+	case 145:
+		goto st_case_145
+	case 146:
+		goto st_case_146
+	case 147:
+		goto st_case_147
 	case 514:
 		goto st_case_514
+	case 148:
+		goto st_case_148
+	case 149:
+		goto st_case_149
 	case 515:
 		goto st_case_515
 	case 516:
 		goto st_case_516
+	case 150:
+		goto st_case_150
+	case 151:
+		goto st_case_151
 	case 517:
 		goto st_case_517
 	case 518:
 		goto st_case_518
 	case 519:
 		goto st_case_519
+	case 152:
+		goto st_case_152
 	case 520:
 		goto st_case_520
 	case 521:
@@ -2205,10 +2253,6 @@ _resume:
 		goto st_case_524
 	case 525:
 		goto st_case_525
-	case 153:
-		goto st_case_153
-	case 154:
-		goto st_case_154
 	case 526:
 		goto st_case_526
 	case 527:
@@ -2217,130 +2261,182 @@ _resume:
 		goto st_case_528
 	case 529:
 		goto st_case_529
-	case 155:
-		goto st_case_155
-	case 156:
-		goto st_case_156
-	case 157:
-		goto st_case_157
 	case 530:
 		goto st_case_530
-	case 158:
-		goto st_case_158
-	case 159:
-		goto st_case_159
-	case 160:
-		goto st_case_160
 	case 531:
 		goto st_case_531
-	case 161:
-		goto st_case_161
-	case 162:
-		goto st_case_162
 	case 532:
 		goto st_case_532
 	case 533:
 		goto st_case_533
-	case 163:
-		goto st_case_163
-	case 164:
-		goto st_case_164
-	case 165:
-		goto st_case_165
 	case 534:
 		goto st_case_534
 	case 535:
 		goto st_case_535
-	case 166:
-		goto st_case_166
 	case 536:
 		goto st_case_536
 	case 537:
 		goto st_case_537
-	case 167:
-		goto st_case_167
 	case 538:
 		goto st_case_538
 	case 539:
 		goto st_case_539
 	case 540:
 		goto st_case_540
+	case 153:
+		goto st_case_153
+	case 154:
+		goto st_case_154
 	case 541:
 		goto st_case_541
+	case 542:
+		goto st_case_542
+	case 543:
+		goto st_case_543
+	case 544:
+		goto st_case_544
+	case 545:
+		goto st_case_545
+	case 546:
+		goto st_case_546
+	case 547:
+		goto st_case_547
+	case 155:
+		goto st_case_155
+	case 156:
+		goto st_case_156
+	case 157:
+		goto st_case_157
+	case 548:
+		goto st_case_548
+	case 158:
+		goto st_case_158
+	case 159:
+		goto st_case_159
+	case 160:
+		goto st_case_160
+	case 549:
+		goto st_case_549
+	case 161:
+		goto st_case_161
+	case 162:
+		goto st_case_162
+	case 550:
+		goto st_case_550
+	case 551:
+		goto st_case_551
+	case 163:
+		goto st_case_163
+	case 164:
+		goto st_case_164
+	case 165:
+		goto st_case_165
+	case 552:
+		goto st_case_552
+	case 553:
+		goto st_case_553
+	case 166:
+		goto st_case_166
+	case 554:
+		goto st_case_554
+	case 555:
+		goto st_case_555
+	case 167:
+		goto st_case_167
+	case 556:
+		goto st_case_556
+	case 557:
+		goto st_case_557
+	case 558:
+		goto st_case_558
+	case 559:
+		goto st_case_559
+	case 560:
+		goto st_case_560
+	case 561:
+		goto st_case_561
+	case 562:
+		goto st_case_562
 	case 168:
 		goto st_case_168
 	case 169:
 		goto st_case_169
 	case 170:
 		goto st_case_170
-	case 542:
-		goto st_case_542
+	case 563:
+		goto st_case_563
 	case 171:
 		goto st_case_171
 	case 172:
 		goto st_case_172
 	case 173:
 		goto st_case_173
-	case 543:
-		goto st_case_543
+	case 564:
+		goto st_case_564
 	case 174:
 		goto st_case_174
 	case 175:
 		goto st_case_175
-	case 544:
-		goto st_case_544
-	case 545:
-		goto st_case_545
+	case 565:
+		goto st_case_565
+	case 566:
+		goto st_case_566
 	case 176:
 		goto st_case_176
-	case 546:
-		goto st_case_546
-	case 547:
-		goto st_case_547
+	case 567:
+		goto st_case_567
+	case 568:
+		goto st_case_568
 	case 177:
 		goto st_case_177
 	case 178:
 		goto st_case_178
-	case 548:
-		goto st_case_548
-	case 549:
-		goto st_case_549
-	case 550:
-		goto st_case_550
+	case 569:
+		goto st_case_569
+	case 570:
+		goto st_case_570
+	case 571:
+		goto st_case_571
+	case 572:
+		goto st_case_572
+	case 573:
+		goto st_case_573
+	case 574:
+		goto st_case_574
 	case 179:
 		goto st_case_179
 	case 180:
 		goto st_case_180
 	case 181:
 		goto st_case_181
-	case 551:
-		goto st_case_551
+	case 575:
+		goto st_case_575
 	case 182:
 		goto st_case_182
 	case 183:
 		goto st_case_183
 	case 184:
 		goto st_case_184
-	case 552:
-		goto st_case_552
+	case 576:
+		goto st_case_576
 	case 185:
 		goto st_case_185
 	case 186:
 		goto st_case_186
-	case 553:
-		goto st_case_553
-	case 554:
-		goto st_case_554
+	case 577:
+		goto st_case_577
+	case 578:
+		goto st_case_578
 	case 187:
 		goto st_case_187
-	case 555:
-		goto st_case_555
+	case 579:
+		goto st_case_579
 	case 188:
 		goto st_case_188
-	case 556:
-		goto st_case_556
-	case 557:
-		goto st_case_557
+	case 580:
+		goto st_case_580
+	case 581:
+		goto st_case_581
 	case 189:
 		goto st_case_189
 	case 190:
@@ -2382,7 +2478,7 @@ tr0:
 			goto _test_eof2
 		}
 	st_case_2:
-//line plugins/parsers/influx/machine.go:2386
+//line plugins/parsers/influx/machine.go:2482
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2418,7 +2514,7 @@ tr58:
 			goto _test_eof3
 		}
 	st_case_3:
-//line plugins/parsers/influx/machine.go:2422
+//line plugins/parsers/influx/machine.go:2518
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2450,7 +2546,7 @@ tr9:
 			goto _test_eof4
 		}
 	st_case_4:
-//line plugins/parsers/influx/machine.go:2454
+//line plugins/parsers/influx/machine.go:2550
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -2654,7 +2750,7 @@ tr210:
 	{( m.p)++; goto _out }
 
 	goto _again
-//line plugins/parsers/influx/machine.go:2658
+//line plugins/parsers/influx/machine.go:2754
 st_case_0:
 	st0:
 		 m.cs = 0
@@ -2670,7 +2766,7 @@ tr14:
 			goto _test_eof5
 		}
 	st_case_5:
-//line plugins/parsers/influx/machine.go:2674
+//line plugins/parsers/influx/machine.go:2770
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st6
@@ -2716,7 +2812,7 @@ tr25:
 			goto _test_eof7
 		}
 	st_case_7:
-//line plugins/parsers/influx/machine.go:2720
+//line plugins/parsers/influx/machine.go:2816
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -2729,13 +2825,13 @@ tr26:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
 	goto st191
 tr29:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
@@ -2745,7 +2841,7 @@ tr29:
 			goto _test_eof191
 		}
 	st_case_191:
-//line plugins/parsers/influx/machine.go:2749
+//line plugins/parsers/influx/machine.go:2845
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2761,7 +2857,7 @@ tr29:
 		}
 		goto tr99
 tr355:
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
@@ -2772,8 +2868,14 @@ tr361:
 	m.handler.AddInt(key, m.text())
 
 	goto st192
-tr364:
-//line plugins/parsers/influx/machine.go.rl:96
+tr365:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st192
+tr369:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -2783,7 +2885,7 @@ tr364:
 			goto _test_eof192
 		}
 	st_case_192:
-//line plugins/parsers/influx/machine.go:2787
+//line plugins/parsers/influx/machine.go:2889
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2814,7 +2916,7 @@ tr330:
 	goto _again
 tr335:
 	 m.cs = 193
-//line plugins/parsers/influx/machine.go.rl:104
+//line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
 
@@ -2827,7 +2929,7 @@ tr335:
 	goto _again
 tr356:
 	 m.cs = 193
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
@@ -2851,9 +2953,22 @@ tr362:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr365:
+tr366:
 	 m.cs = 193
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr370:
+	 m.cs = 193
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -2869,7 +2984,7 @@ tr365:
 			goto _test_eof193
 		}
 	st_case_193:
-//line plugins/parsers/influx/machine.go:2873
+//line plugins/parsers/influx/machine.go:2988
 		goto tr1
 tr332:
 //line plugins/parsers/influx/machine.go.rl:18
@@ -2882,7 +2997,7 @@ tr332:
 			goto _test_eof8
 		}
 	st_case_8:
-//line plugins/parsers/influx/machine.go:2886
+//line plugins/parsers/influx/machine.go:3001
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 			goto st194
 		}
@@ -2898,7 +3013,7 @@ tr333:
 			goto _test_eof194
 		}
 	st_case_194:
-//line plugins/parsers/influx/machine.go:2902
+//line plugins/parsers/influx/machine.go:3017
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -2917,7 +3032,7 @@ tr333:
 		}
 		goto tr31
 tr334:
-//line plugins/parsers/influx/machine.go.rl:104
+//line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
 
@@ -2927,7 +3042,7 @@ tr334:
 			goto _test_eof195
 		}
 	st_case_195:
-//line plugins/parsers/influx/machine.go:2931
+//line plugins/parsers/influx/machine.go:3046
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -3332,7 +3447,7 @@ tr334:
 		}
 		goto tr31
 tr357:
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
@@ -3343,8 +3458,14 @@ tr363:
 	m.handler.AddInt(key, m.text())
 
 	goto st9
-tr366:
-//line plugins/parsers/influx/machine.go.rl:96
+tr367:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st9
+tr371:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -3354,7 +3475,7 @@ tr366:
 			goto _test_eof9
 		}
 	st_case_9:
-//line plugins/parsers/influx/machine.go:3358
+//line plugins/parsers/influx/machine.go:3479
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -3385,7 +3506,7 @@ tr12:
 			goto _test_eof10
 		}
 	st_case_10:
-//line plugins/parsers/influx/machine.go:3389
+//line plugins/parsers/influx/machine.go:3510
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -3406,7 +3527,7 @@ tr27:
 			goto _test_eof11
 		}
 	st_case_11:
-//line plugins/parsers/influx/machine.go:3410
+//line plugins/parsers/influx/machine.go:3531
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st7
@@ -3425,7 +3546,7 @@ tr17:
 			goto _test_eof12
 		}
 	st_case_12:
-//line plugins/parsers/influx/machine.go:3429
+//line plugins/parsers/influx/machine.go:3550
 		if ( m.data)[( m.p)] == 48 {
 			goto st214
 		}
@@ -3433,18 +3554,11 @@ tr17:
 			goto st218
 		}
 		goto tr5
-tr19:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st214
 	st214:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof214
 		}
 	st_case_214:
-//line plugins/parsers/influx/machine.go:3448
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3478,7 +3592,7 @@ tr18:
 			goto _test_eof215
 		}
 	st_case_215:
-//line plugins/parsers/influx/machine.go:3482
+//line plugins/parsers/influx/machine.go:3596
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3571,18 +3685,11 @@ tr18:
 			goto tr361
 		}
 		goto tr99
-tr20:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st218
 	st218:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof218
 		}
 	st_case_218:
-//line plugins/parsers/influx/machine.go:3586
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3610,7 +3717,7 @@ tr20:
 			goto tr355
 		}
 		goto tr99
-tr21:
+tr19:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -3621,23 +3728,119 @@ tr21:
 			goto _test_eof219
 		}
 	st_case_219:
-//line plugins/parsers/influx/machine.go:3625
+//line plugins/parsers/influx/machine.go:3732
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr356
 		case 13:
-			goto tr365
+			goto tr356
 		case 32:
-			goto tr364
+			goto tr355
 		case 44:
+			goto tr357
+		case 46:
+			goto st215
+		case 69:
+			goto st13
+		case 101:
+			goto st13
+		case 105:
+			goto st217
+		case 117:
+			goto st220
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr355
+		}
+		goto tr99
+	st220:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof220
+		}
+	st_case_220:
+		switch ( m.data)[( m.p)] {
+		case 10:
 			goto tr366
+		case 13:
+			goto tr366
+		case 32:
+			goto tr365
+		case 44:
+			goto tr367
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr365
+		}
+		goto tr99
+tr20:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st221
+	st221:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof221
+		}
+	st_case_221:
+//line plugins/parsers/influx/machine.go:3787
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 13:
+			goto tr356
+		case 32:
+			goto tr355
+		case 44:
+			goto tr357
+		case 46:
+			goto st215
+		case 69:
+			goto st13
+		case 101:
+			goto st13
+		case 105:
+			goto st217
+		case 117:
+			goto st220
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st221
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr355
+		}
+		goto tr99
+tr21:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st222
+	st222:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof222
+		}
+	st_case_222:
+//line plugins/parsers/influx/machine.go:3828
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr370
+		case 13:
+			goto tr370
+		case 32:
+			goto tr369
+		case 44:
+			goto tr371
 		case 65:
 			goto st15
 		case 97:
 			goto st18
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr364
+			goto tr369
 		}
 		goto tr99
 	st15:
@@ -3664,26 +3867,26 @@ tr21:
 		}
 	st_case_17:
 		if ( m.data)[( m.p)] == 69 {
-			goto st220
+			goto st223
 		}
 		goto tr5
-	st220:
+	st223:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof220
+			goto _test_eof223
 		}
-	st_case_220:
+	st_case_223:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr364
+			goto tr369
 		case 44:
-			goto tr366
+			goto tr371
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr364
+			goto tr369
 		}
 		goto tr99
 	st18:
@@ -3710,7 +3913,7 @@ tr21:
 		}
 	st_case_20:
 		if ( m.data)[( m.p)] == 101 {
-			goto st220
+			goto st223
 		}
 		goto tr5
 tr22:
@@ -3718,29 +3921,29 @@ tr22:
 
 	m.pb = m.p
 
-	goto st221
-	st221:
+	goto st224
+	st224:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof221
+			goto _test_eof224
 		}
-	st_case_221:
-//line plugins/parsers/influx/machine.go:3728
+	st_case_224:
+//line plugins/parsers/influx/machine.go:3931
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr364
+			goto tr369
 		case 44:
-			goto tr366
+			goto tr371
 		case 82:
 			goto st21
 		case 114:
 			goto st22
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr364
+			goto tr369
 		}
 		goto tr99
 	st21:
@@ -3766,27 +3969,27 @@ tr23:
 
 	m.pb = m.p
 
-	goto st222
-	st222:
+	goto st225
+	st225:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof222
+			goto _test_eof225
 		}
-	st_case_222:
-//line plugins/parsers/influx/machine.go:3776
+	st_case_225:
+//line plugins/parsers/influx/machine.go:3979
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr364
+			goto tr369
 		case 44:
-			goto tr366
+			goto tr371
 		case 97:
 			goto st18
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr364
+			goto tr369
 		}
 		goto tr99
 tr24:
@@ -3794,27 +3997,27 @@ tr24:
 
 	m.pb = m.p
 
-	goto st223
-	st223:
+	goto st226
+	st226:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof223
+			goto _test_eof226
 		}
-	st_case_223:
-//line plugins/parsers/influx/machine.go:3804
+	st_case_226:
+//line plugins/parsers/influx/machine.go:4007
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr364
+			goto tr369
 		case 44:
-			goto tr366
+			goto tr371
 		case 114:
 			goto st22
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr364
+			goto tr369
 		}
 		goto tr99
 tr11:
@@ -3828,7 +4031,7 @@ tr11:
 			goto _test_eof23
 		}
 	st_case_23:
-//line plugins/parsers/influx/machine.go:3832
+//line plugins/parsers/influx/machine.go:4035
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -3860,7 +4063,7 @@ tr6:
 			goto _test_eof24
 		}
 	st_case_24:
-//line plugins/parsers/influx/machine.go:3864
+//line plugins/parsers/influx/machine.go:4067
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -3892,7 +4095,7 @@ tr42:
 			goto _test_eof25
 		}
 	st_case_25:
-//line plugins/parsers/influx/machine.go:3896
+//line plugins/parsers/influx/machine.go:4099
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -3934,7 +4137,7 @@ tr43:
 			goto _test_eof26
 		}
 	st_case_26:
-//line plugins/parsers/influx/machine.go:3938
+//line plugins/parsers/influx/machine.go:4141
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -3972,7 +4175,7 @@ tr61:
 			goto _test_eof27
 		}
 	st_case_27:
-//line plugins/parsers/influx/machine.go:3976
+//line plugins/parsers/influx/machine.go:4179
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4003,7 +4206,7 @@ tr49:
 			goto _test_eof28
 		}
 	st_case_28:
-//line plugins/parsers/influx/machine.go:4007
+//line plugins/parsers/influx/machine.go:4210
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4034,7 +4237,7 @@ tr53:
 			goto _test_eof29
 		}
 	st_case_29:
-//line plugins/parsers/influx/machine.go:4038
+//line plugins/parsers/influx/machine.go:4241
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4065,7 +4268,7 @@ tr55:
 			goto _test_eof30
 		}
 	st_case_30:
-//line plugins/parsers/influx/machine.go:4069
+//line plugins/parsers/influx/machine.go:4272
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4097,7 +4300,7 @@ tr60:
 			goto _test_eof31
 		}
 	st_case_31:
-//line plugins/parsers/influx/machine.go:4101
+//line plugins/parsers/influx/machine.go:4304
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4129,7 +4332,7 @@ tr63:
 			goto _test_eof32
 		}
 	st_case_32:
-//line plugins/parsers/influx/machine.go:4133
+//line plugins/parsers/influx/machine.go:4336
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4171,7 +4374,7 @@ tr64:
 			goto _test_eof33
 		}
 	st_case_33:
-//line plugins/parsers/influx/machine.go:4175
+//line plugins/parsers/influx/machine.go:4378
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4203,7 +4406,7 @@ tr65:
 			goto _test_eof34
 		}
 	st_case_34:
-//line plugins/parsers/influx/machine.go:4207
+//line plugins/parsers/influx/machine.go:4410
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4224,7 +4427,7 @@ tr56:
 			goto _test_eof35
 		}
 	st_case_35:
-//line plugins/parsers/influx/machine.go:4228
+//line plugins/parsers/influx/machine.go:4431
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4245,7 +4448,7 @@ tr51:
 			goto _test_eof36
 		}
 	st_case_36:
-//line plugins/parsers/influx/machine.go:4249
+//line plugins/parsers/influx/machine.go:4452
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4266,7 +4469,7 @@ tr47:
 			goto _test_eof37
 		}
 	st_case_37:
-//line plugins/parsers/influx/machine.go:4270
+//line plugins/parsers/influx/machine.go:4473
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4342,7 +4545,7 @@ tr78:
 			goto _test_eof39
 		}
 	st_case_39:
-//line plugins/parsers/influx/machine.go:4346
+//line plugins/parsers/influx/machine.go:4549
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -4390,7 +4593,7 @@ tr229:
 			goto _test_eof40
 		}
 	st_case_40:
-//line plugins/parsers/influx/machine.go:4394
+//line plugins/parsers/influx/machine.go:4597
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -4424,7 +4627,7 @@ tr90:
 			goto _test_eof41
 		}
 	st_case_41:
-//line plugins/parsers/influx/machine.go:4428
+//line plugins/parsers/influx/machine.go:4631
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -4451,19 +4654,19 @@ tr93:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st224
+	goto st227
 tr96:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st224
+	goto st227
 tr112:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
@@ -4471,18 +4674,18 @@ tr112:
 
 	m.pb = m.p
 
-	goto st224
-	st224:
+	goto st227
+	st227:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof224
+			goto _test_eof227
 		}
-	st_case_224:
-//line plugins/parsers/influx/machine.go:4481
+	st_case_227:
+//line plugins/parsers/influx/machine.go:4684
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st225
+			goto st228
 		case 13:
 			goto tr330
 		case 32:
@@ -4498,16 +4701,16 @@ tr112:
 			goto st192
 		}
 		goto st4
-	st225:
+	st228:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof225
+			goto _test_eof228
 		}
-	st_case_225:
+	st_case_228:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st225
+			goto st228
 		case 13:
 			goto tr330
 		case 32:
@@ -4515,7 +4718,7 @@ tr112:
 		case 44:
 			goto tr99
 		case 45:
-			goto tr372
+			goto tr377
 		case 61:
 			goto tr14
 		case 92:
@@ -4524,13 +4727,13 @@ tr112:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr373
+				goto tr378
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st192
 		}
 		goto st4
-tr372:
+tr377:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4541,7 +4744,7 @@ tr372:
 			goto _test_eof42
 		}
 	st_case_42:
-//line plugins/parsers/influx/machine.go:4545
+//line plugins/parsers/influx/machine.go:4748
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr99
@@ -4559,151 +4762,29 @@ tr372:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st226
+				goto st229
 			}
 		default:
 			goto tr99
 		}
 		goto st4
-tr373:
+tr378:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st226
-	st226:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof226
-		}
-	st_case_226:
-//line plugins/parsers/influx/machine.go:4580
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr374
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st228
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-tr374:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st227
-	st227:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof227
-		}
-	st_case_227:
-//line plugins/parsers/influx/machine.go:4617
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st227
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr5
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st4
-	st228:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof228
-		}
-	st_case_228:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr374
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st229
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
+	goto st229
 	st229:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof229
 		}
 	st_case_229:
+//line plugins/parsers/influx/machine.go:4783
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st230
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st230:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof230
-		}
-	st_case_230:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4724,6 +4805,38 @@ tr374:
 			goto tr334
 		}
 		goto st4
+tr379:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st230
+	st230:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof230
+		}
+	st_case_230:
+//line plugins/parsers/influx/machine.go:4820
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st230
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st4
 	st231:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof231
@@ -4733,7 +4846,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4763,7 +4876,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4793,7 +4906,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4823,7 +4936,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4853,7 +4966,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4883,7 +4996,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4913,7 +5026,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4943,7 +5056,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -4973,7 +5086,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5003,7 +5116,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5033,7 +5146,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5063,7 +5176,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5093,7 +5206,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5123,7 +5236,7 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5153,7 +5266,97 @@ tr374:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr374
+			goto tr379
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st246
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st246:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof246
+		}
+	st_case_246:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr379
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st247
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st247:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof247
+		}
+	st_case_247:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr379
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr99
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st248
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st4
+	st248:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof248
+		}
+	st_case_248:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr379
 		case 13:
 			goto tr335
 		case 32:
@@ -5180,7 +5383,7 @@ tr97:
 			goto _test_eof43
 		}
 	st_case_43:
-//line plugins/parsers/influx/machine.go:5184
+//line plugins/parsers/influx/machine.go:5387
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr101
@@ -5206,90 +5409,96 @@ tr97:
 		}
 		goto st7
 tr101:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st246
-	st246:
+	goto st249
+	st249:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof246
+			goto _test_eof249
 		}
-	st_case_246:
-//line plugins/parsers/influx/machine.go:5220
+	st_case_249:
+//line plugins/parsers/influx/machine.go:5423
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr395
+			goto tr400
 		case 13:
-			goto tr395
+			goto tr400
 		case 32:
-			goto tr394
+			goto tr399
 		case 34:
 			goto tr26
 		case 44:
-			goto tr396
+			goto tr401
 		case 92:
 			goto tr27
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr394
+			goto tr399
 		}
 		goto tr25
-tr394:
+tr399:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st247
-tr423:
-//line plugins/parsers/influx/machine.go.rl:92
+	goto st250
+tr428:
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st247
-tr429:
+	goto st250
+tr434:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
-	goto st247
-tr432:
-//line plugins/parsers/influx/machine.go.rl:96
+	goto st250
+tr438:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st250
+tr442:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st247
-	st247:
+	goto st250
+	st250:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof247
+			goto _test_eof250
 		}
-	st_case_247:
-//line plugins/parsers/influx/machine.go:5268
+	st_case_250:
+//line plugins/parsers/influx/machine.go:5477
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto st247
+			goto st250
 		case 34:
 			goto tr29
 		case 45:
-			goto tr399
+			goto tr404
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr400
+				goto tr405
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st247
+			goto st250
 		}
 		goto st7
-tr398:
-	 m.cs = 248
+tr403:
+	 m.cs = 251
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
@@ -5297,9 +5506,9 @@ tr398:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr402:
-	 m.cs = 248
-//line plugins/parsers/influx/machine.go.rl:104
+tr407:
+	 m.cs = 251
+//line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
 
@@ -5310,9 +5519,9 @@ tr402:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr424:
-	 m.cs = 248
-//line plugins/parsers/influx/machine.go.rl:92
+tr429:
+	 m.cs = 251
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
@@ -5323,8 +5532,8 @@ tr424:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr430:
-	 m.cs = 248
+tr435:
+	 m.cs = 251
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -5336,9 +5545,22 @@ tr430:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr433:
-	 m.cs = 248
-//line plugins/parsers/influx/machine.go.rl:96
+tr439:
+	 m.cs = 251
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr443:
+	 m.cs = 251
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -5349,8 +5571,8 @@ tr433:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr395:
-	 m.cs = 248
+tr400:
+	 m.cs = 251
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -5362,12 +5584,12 @@ tr395:
 	{( m.p)++; goto _out }
 
 	goto _again
-	st248:
+	st251:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof248
+			goto _test_eof251
 		}
-	st_case_248:
-//line plugins/parsers/influx/machine.go:5371
+	st_case_251:
+//line plugins/parsers/influx/machine.go:5593
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -5375,7 +5597,7 @@ tr395:
 			goto st11
 		}
 		goto st7
-tr399:
+tr404:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -5386,7 +5608,7 @@ tr399:
 			goto _test_eof44
 		}
 	st_case_44:
-//line plugins/parsers/influx/machine.go:5390
+//line plugins/parsers/influx/machine.go:5612
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -5394,134 +5616,28 @@ tr399:
 			goto st11
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st249
+			goto st252
 		}
 		goto st7
-tr400:
+tr405:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st249
-	st249:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof249
-		}
-	st_case_249:
-//line plugins/parsers/influx/machine.go:5412
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st251
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st7
-tr401:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st250
-	st250:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof250
-		}
-	st_case_250:
-//line plugins/parsers/influx/machine.go:5445
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 13:
-			goto tr398
-		case 32:
-			goto st250
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st250
-		}
-		goto st7
-	st251:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof251
-		}
-	st_case_251:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st252
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st7
+	goto st252
 	st252:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof252
 		}
 	st_case_252:
+//line plugins/parsers/influx/machine.go:5634
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st253
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st7
-	st253:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof253
-		}
-	st_case_253:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5533,7 +5649,35 @@ tr401:
 				goto st254
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
+		}
+		goto st7
+tr406:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st253
+	st253:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof253
+		}
+	st_case_253:
+//line plugins/parsers/influx/machine.go:5667
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 13:
+			goto tr403
+		case 32:
+			goto st253
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st253
 		}
 		goto st7
 	st254:
@@ -5543,11 +5687,11 @@ tr401:
 	st_case_254:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5559,7 +5703,7 @@ tr401:
 				goto st255
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st255:
@@ -5569,11 +5713,11 @@ tr401:
 	st_case_255:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5585,7 +5729,7 @@ tr401:
 				goto st256
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st256:
@@ -5595,11 +5739,11 @@ tr401:
 	st_case_256:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5611,7 +5755,7 @@ tr401:
 				goto st257
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st257:
@@ -5621,11 +5765,11 @@ tr401:
 	st_case_257:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5637,7 +5781,7 @@ tr401:
 				goto st258
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st258:
@@ -5647,11 +5791,11 @@ tr401:
 	st_case_258:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5663,7 +5807,7 @@ tr401:
 				goto st259
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st259:
@@ -5673,11 +5817,11 @@ tr401:
 	st_case_259:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5689,7 +5833,7 @@ tr401:
 				goto st260
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st260:
@@ -5699,11 +5843,11 @@ tr401:
 	st_case_260:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5715,7 +5859,7 @@ tr401:
 				goto st261
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st261:
@@ -5725,11 +5869,11 @@ tr401:
 	st_case_261:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5741,7 +5885,7 @@ tr401:
 				goto st262
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st262:
@@ -5751,11 +5895,11 @@ tr401:
 	st_case_262:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5767,7 +5911,7 @@ tr401:
 				goto st263
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st263:
@@ -5777,11 +5921,11 @@ tr401:
 	st_case_263:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5793,7 +5937,7 @@ tr401:
 				goto st264
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st264:
@@ -5803,11 +5947,11 @@ tr401:
 	st_case_264:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5819,7 +5963,7 @@ tr401:
 				goto st265
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st265:
@@ -5829,11 +5973,11 @@ tr401:
 	st_case_265:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5845,7 +5989,7 @@ tr401:
 				goto st266
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st266:
@@ -5855,11 +5999,11 @@ tr401:
 	st_case_266:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5871,7 +6015,7 @@ tr401:
 				goto st267
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st267:
@@ -5881,11 +6025,11 @@ tr401:
 	st_case_267:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
@@ -5897,7 +6041,7 @@ tr401:
 				goto st268
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st7
 	st268:
@@ -5907,40 +6051,124 @@ tr401:
 	st_case_268:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st269
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st7
+	st269:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof269
+		}
+	st_case_269:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st270
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st7
+	st270:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof270
+		}
+	st_case_270:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st271
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st7
+	st271:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof271
+		}
+	st_case_271:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr401
+			goto tr406
 		}
 		goto st7
-tr396:
+tr401:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st45
-tr439:
-//line plugins/parsers/influx/machine.go.rl:92
+tr449:
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st45
-tr443:
+tr453:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st45
-tr444:
-//line plugins/parsers/influx/machine.go.rl:96
+tr455:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st45
+tr457:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -5950,7 +6178,7 @@ tr444:
 			goto _test_eof45
 		}
 	st_case_45:
-//line plugins/parsers/influx/machine.go:5954
+//line plugins/parsers/influx/machine.go:6182
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -5983,7 +6211,7 @@ tr111:
 			goto _test_eof46
 		}
 	st_case_46:
-//line plugins/parsers/influx/machine.go:5987
+//line plugins/parsers/influx/machine.go:6215
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6016,7 +6244,7 @@ tr115:
 			goto _test_eof47
 		}
 	st_case_47:
-//line plugins/parsers/influx/machine.go:6020
+//line plugins/parsers/influx/machine.go:6248
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr117
@@ -6042,55 +6270,61 @@ tr115:
 		}
 		goto st7
 tr117:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st269
-	st269:
+	goto st272
+	st272:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof269
+			goto _test_eof272
 		}
-	st_case_269:
-//line plugins/parsers/influx/machine.go:6056
+	st_case_272:
+//line plugins/parsers/influx/machine.go:6284
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr395
+			goto tr400
 		case 13:
-			goto tr395
+			goto tr400
 		case 32:
-			goto tr394
+			goto tr399
 		case 34:
 			goto tr26
 		case 44:
-			goto tr422
+			goto tr427
 		case 92:
 			goto tr27
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr394
+			goto tr399
 		}
 		goto tr25
-tr422:
+tr427:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st48
-tr425:
-//line plugins/parsers/influx/machine.go.rl:92
+tr430:
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st48
-tr431:
+tr436:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st48
-tr434:
-//line plugins/parsers/influx/machine.go.rl:96
+tr440:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st48
+tr444:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -6100,7 +6334,7 @@ tr434:
 			goto _test_eof48
 		}
 	st_case_48:
-//line plugins/parsers/influx/machine.go:6104
+//line plugins/parsers/influx/machine.go:6338
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6133,7 +6367,7 @@ tr118:
 			goto _test_eof49
 		}
 	st_case_49:
-//line plugins/parsers/influx/machine.go:6137
+//line plugins/parsers/influx/machine.go:6371
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6166,7 +6400,7 @@ tr121:
 			goto _test_eof50
 		}
 	st_case_50:
-//line plugins/parsers/influx/machine.go:6170
+//line plugins/parsers/influx/machine.go:6404
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr117
@@ -6202,44 +6436,37 @@ tr123:
 			goto _test_eof51
 		}
 	st_case_51:
-//line plugins/parsers/influx/machine.go:6206
+//line plugins/parsers/influx/machine.go:6440
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
 		case 48:
-			goto st270
+			goto st273
 		case 92:
 			goto st11
 		}
 		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st275
+			goto st278
 		}
 		goto st7
-tr125:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st270
-	st270:
+	st273:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof270
+			goto _test_eof273
 		}
-	st_case_270:
-//line plugins/parsers/influx/machine.go:6230
+	st_case_273:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr425
+			goto tr430
 		case 46:
-			goto st271
+			goto st274
 		case 69:
 			goto st52
 		case 92:
@@ -6247,10 +6474,10 @@ tr125:
 		case 101:
 			goto st52
 		case 105:
-			goto st274
+			goto st277
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr423
+			goto tr428
 		}
 		goto st7
 tr124:
@@ -6258,24 +6485,24 @@ tr124:
 
 	m.pb = m.p
 
-	goto st271
-	st271:
+	goto st274
+	st274:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof271
+			goto _test_eof274
 		}
-	st_case_271:
-//line plugins/parsers/influx/machine.go:6268
+	st_case_274:
+//line plugins/parsers/influx/machine.go:6495
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr425
+			goto tr430
 		case 69:
 			goto st52
 		case 92:
@@ -6286,10 +6513,10 @@ tr124:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st271
+				goto st274
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
 		}
 		goto st7
 	st52:
@@ -6308,21 +6535,21 @@ tr124:
 			goto st11
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st273
+			goto st276
 		}
 		goto st7
 tr133:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st272
-	st272:
+	goto st275
+	st275:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof272
+			goto _test_eof275
 		}
-	st_case_272:
-//line plugins/parsers/influx/machine.go:6326
+	st_case_275:
+//line plugins/parsers/influx/machine.go:6553
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -6354,85 +6581,78 @@ tr133:
 			goto st11
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st273
+			goto st276
 		}
 		goto st7
-	st273:
+	st276:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof273
+			goto _test_eof276
 		}
-	st_case_273:
+	st_case_276:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr425
+			goto tr430
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st273
+				goto st276
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
 		}
 		goto st7
-	st274:
+	st277:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof274
+			goto _test_eof277
 		}
-	st_case_274:
+	st_case_277:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr430
+			goto tr435
 		case 13:
-			goto tr430
+			goto tr435
 		case 32:
-			goto tr429
+			goto tr434
 		case 34:
 			goto tr29
 		case 44:
-			goto tr431
+			goto tr436
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr429
+			goto tr434
 		}
 		goto st7
-tr126:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st275
-	st275:
+	st278:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof275
+			goto _test_eof278
 		}
-	st_case_275:
-//line plugins/parsers/influx/machine.go:6423
+	st_case_278:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr425
+			goto tr430
 		case 46:
-			goto st271
+			goto st274
 		case 69:
 			goto st52
 		case 92:
@@ -6440,15 +6660,123 @@ tr126:
 		case 101:
 			goto st52
 		case 105:
-			goto st274
+			goto st277
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st275
+				goto st278
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
+		}
+		goto st7
+tr125:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st279
+	st279:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof279
+		}
+	st_case_279:
+//line plugins/parsers/influx/machine.go:6686
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 13:
+			goto tr429
+		case 32:
+			goto tr428
+		case 34:
+			goto tr29
+		case 44:
+			goto tr430
+		case 46:
+			goto st274
+		case 69:
+			goto st52
+		case 92:
+			goto st11
+		case 101:
+			goto st52
+		case 105:
+			goto st277
+		case 117:
+			goto st280
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr428
+		}
+		goto st7
+	st280:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof280
+		}
+	st_case_280:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr439
+		case 13:
+			goto tr439
+		case 32:
+			goto tr438
+		case 34:
+			goto tr29
+		case 44:
+			goto tr440
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr438
+		}
+		goto st7
+tr126:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st281
+	st281:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof281
+		}
+	st_case_281:
+//line plugins/parsers/influx/machine.go:6749
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 13:
+			goto tr429
+		case 32:
+			goto tr428
+		case 34:
+			goto tr29
+		case 44:
+			goto tr430
+		case 46:
+			goto st274
+		case 69:
+			goto st52
+		case 92:
+			goto st11
+		case 101:
+			goto st52
+		case 105:
+			goto st277
+		case 117:
+			goto st280
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st281
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr428
 		}
 		goto st7
 tr127:
@@ -6456,24 +6784,24 @@ tr127:
 
 	m.pb = m.p
 
-	goto st276
-	st276:
+	goto st282
+	st282:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof276
+			goto _test_eof282
 		}
-	st_case_276:
-//line plugins/parsers/influx/machine.go:6466
+	st_case_282:
+//line plugins/parsers/influx/machine.go:6794
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr434
+			goto tr444
 		case 65:
 			goto st54
 		case 92:
@@ -6482,7 +6810,7 @@ tr127:
 			goto st57
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st54:
@@ -6522,32 +6850,32 @@ tr127:
 		case 34:
 			goto tr29
 		case 69:
-			goto st277
+			goto st283
 		case 92:
 			goto st11
 		}
 		goto st7
-	st277:
+	st283:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof277
+			goto _test_eof283
 		}
-	st_case_277:
+	st_case_283:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr434
+			goto tr444
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st57:
@@ -6589,7 +6917,7 @@ tr127:
 		case 92:
 			goto st11
 		case 101:
-			goto st277
+			goto st283
 		}
 		goto st7
 tr128:
@@ -6597,24 +6925,24 @@ tr128:
 
 	m.pb = m.p
 
-	goto st278
-	st278:
+	goto st284
+	st284:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof278
+			goto _test_eof284
 		}
-	st_case_278:
-//line plugins/parsers/influx/machine.go:6607
+	st_case_284:
+//line plugins/parsers/influx/machine.go:6935
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr434
+			goto tr444
 		case 82:
 			goto st60
 		case 92:
@@ -6623,7 +6951,7 @@ tr128:
 			goto st61
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st60:
@@ -6659,31 +6987,31 @@ tr129:
 
 	m.pb = m.p
 
-	goto st279
-	st279:
+	goto st285
+	st285:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof279
+			goto _test_eof285
 		}
-	st_case_279:
-//line plugins/parsers/influx/machine.go:6669
+	st_case_285:
+//line plugins/parsers/influx/machine.go:6997
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr434
+			goto tr444
 		case 92:
 			goto st11
 		case 97:
 			goto st57
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 tr130:
@@ -6691,31 +7019,31 @@ tr130:
 
 	m.pb = m.p
 
-	goto st280
-	st280:
+	goto st286
+	st286:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof280
+			goto _test_eof286
 		}
-	st_case_280:
-//line plugins/parsers/influx/machine.go:6701
+	st_case_286:
+//line plugins/parsers/influx/machine.go:7029
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr434
+			goto tr444
 		case 92:
 			goto st11
 		case 114:
 			goto st61
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 tr119:
@@ -6729,7 +7057,7 @@ tr119:
 			goto _test_eof62
 		}
 	st_case_62:
-//line plugins/parsers/influx/machine.go:6733
+//line plugins/parsers/influx/machine.go:7061
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st49
@@ -6756,44 +7084,37 @@ tr102:
 			goto _test_eof63
 		}
 	st_case_63:
-//line plugins/parsers/influx/machine.go:6760
+//line plugins/parsers/influx/machine.go:7088
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
 		case 48:
-			goto st281
+			goto st287
 		case 92:
 			goto st11
 		}
 		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st285
+			goto st291
 		}
 		goto st7
-tr104:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st281
-	st281:
+	st287:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof281
+			goto _test_eof287
 		}
-	st_case_281:
-//line plugins/parsers/influx/machine.go:6784
+	st_case_287:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr439
+			goto tr449
 		case 46:
-			goto st282
+			goto st288
 		case 69:
 			goto st64
 		case 92:
@@ -6801,10 +7122,10 @@ tr104:
 		case 101:
 			goto st64
 		case 105:
-			goto st284
+			goto st290
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr423
+			goto tr428
 		}
 		goto st7
 tr103:
@@ -6812,24 +7133,24 @@ tr103:
 
 	m.pb = m.p
 
-	goto st282
-	st282:
+	goto st288
+	st288:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof282
+			goto _test_eof288
 		}
-	st_case_282:
-//line plugins/parsers/influx/machine.go:6822
+	st_case_288:
+//line plugins/parsers/influx/machine.go:7143
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr439
+			goto tr449
 		case 69:
 			goto st64
 		case 92:
@@ -6840,10 +7161,10 @@ tr103:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st282
+				goto st288
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
 		}
 		goto st7
 	st64:
@@ -6862,7 +7183,7 @@ tr103:
 			goto st11
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st283
+			goto st289
 		}
 		goto st7
 	st65:
@@ -6877,85 +7198,78 @@ tr103:
 			goto st11
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st283
+			goto st289
 		}
 		goto st7
-	st283:
+	st289:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof283
+			goto _test_eof289
 		}
-	st_case_283:
+	st_case_289:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr439
+			goto tr449
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st283
+				goto st289
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
 		}
 		goto st7
-	st284:
+	st290:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof284
+			goto _test_eof290
 		}
-	st_case_284:
+	st_case_290:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr430
+			goto tr435
 		case 13:
-			goto tr430
+			goto tr435
 		case 32:
-			goto tr429
+			goto tr434
 		case 34:
 			goto tr29
 		case 44:
-			goto tr443
+			goto tr453
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr429
+			goto tr434
 		}
 		goto st7
-tr105:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st285
-	st285:
+	st291:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof285
+			goto _test_eof291
 		}
-	st_case_285:
-//line plugins/parsers/influx/machine.go:6946
+	st_case_291:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr423
+			goto tr428
 		case 34:
 			goto tr29
 		case 44:
-			goto tr439
+			goto tr449
 		case 46:
-			goto st282
+			goto st288
 		case 69:
 			goto st64
 		case 92:
@@ -6963,15 +7277,123 @@ tr105:
 		case 101:
 			goto st64
 		case 105:
-			goto st284
+			goto st290
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st285
+				goto st291
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr423
+			goto tr428
+		}
+		goto st7
+tr104:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st292
+	st292:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof292
+		}
+	st_case_292:
+//line plugins/parsers/influx/machine.go:7303
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 13:
+			goto tr429
+		case 32:
+			goto tr428
+		case 34:
+			goto tr29
+		case 44:
+			goto tr449
+		case 46:
+			goto st288
+		case 69:
+			goto st64
+		case 92:
+			goto st11
+		case 101:
+			goto st64
+		case 105:
+			goto st290
+		case 117:
+			goto st293
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr428
+		}
+		goto st7
+	st293:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof293
+		}
+	st_case_293:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr439
+		case 13:
+			goto tr439
+		case 32:
+			goto tr438
+		case 34:
+			goto tr29
+		case 44:
+			goto tr455
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr438
+		}
+		goto st7
+tr105:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st294
+	st294:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof294
+		}
+	st_case_294:
+//line plugins/parsers/influx/machine.go:7366
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 13:
+			goto tr429
+		case 32:
+			goto tr428
+		case 34:
+			goto tr29
+		case 44:
+			goto tr449
+		case 46:
+			goto st288
+		case 69:
+			goto st64
+		case 92:
+			goto st11
+		case 101:
+			goto st64
+		case 105:
+			goto st290
+		case 117:
+			goto st293
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st294
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr428
 		}
 		goto st7
 tr106:
@@ -6979,24 +7401,24 @@ tr106:
 
 	m.pb = m.p
 
-	goto st286
-	st286:
+	goto st295
+	st295:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof286
+			goto _test_eof295
 		}
-	st_case_286:
-//line plugins/parsers/influx/machine.go:6989
+	st_case_295:
+//line plugins/parsers/influx/machine.go:7411
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr457
 		case 65:
 			goto st66
 		case 92:
@@ -7005,7 +7427,7 @@ tr106:
 			goto st69
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st66:
@@ -7045,32 +7467,32 @@ tr106:
 		case 34:
 			goto tr29
 		case 69:
-			goto st287
+			goto st296
 		case 92:
 			goto st11
 		}
 		goto st7
-	st287:
+	st296:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof287
+			goto _test_eof296
 		}
-	st_case_287:
+	st_case_296:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr457
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st69:
@@ -7112,7 +7534,7 @@ tr106:
 		case 92:
 			goto st11
 		case 101:
-			goto st287
+			goto st296
 		}
 		goto st7
 tr107:
@@ -7120,24 +7542,24 @@ tr107:
 
 	m.pb = m.p
 
-	goto st288
-	st288:
+	goto st297
+	st297:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof288
+			goto _test_eof297
 		}
-	st_case_288:
-//line plugins/parsers/influx/machine.go:7130
+	st_case_297:
+//line plugins/parsers/influx/machine.go:7552
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr457
 		case 82:
 			goto st72
 		case 92:
@@ -7146,7 +7568,7 @@ tr107:
 			goto st73
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 	st72:
@@ -7182,31 +7604,31 @@ tr108:
 
 	m.pb = m.p
 
-	goto st289
-	st289:
+	goto st298
+	st298:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof289
+			goto _test_eof298
 		}
-	st_case_289:
-//line plugins/parsers/influx/machine.go:7192
+	st_case_298:
+//line plugins/parsers/influx/machine.go:7614
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr457
 		case 92:
 			goto st11
 		case 97:
 			goto st69
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 tr109:
@@ -7214,31 +7636,31 @@ tr109:
 
 	m.pb = m.p
 
-	goto st290
-	st290:
+	goto st299
+	st299:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof290
+			goto _test_eof299
 		}
-	st_case_290:
-//line plugins/parsers/influx/machine.go:7224
+	st_case_299:
+//line plugins/parsers/influx/machine.go:7646
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr432
+			goto tr442
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr457
 		case 92:
 			goto st11
 		case 114:
 			goto st73
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr432
+			goto tr442
 		}
 		goto st7
 tr113:
@@ -7252,7 +7674,7 @@ tr113:
 			goto _test_eof74
 		}
 	st_case_74:
-//line plugins/parsers/influx/machine.go:7256
+//line plugins/parsers/influx/machine.go:7678
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st46
@@ -7279,7 +7701,7 @@ tr94:
 			goto _test_eof75
 		}
 	st_case_75:
-//line plugins/parsers/influx/machine.go:7283
+//line plugins/parsers/influx/machine.go:7705
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st41
@@ -7306,7 +7728,7 @@ tr92:
 			goto _test_eof76
 		}
 	st_case_76:
-//line plugins/parsers/influx/machine.go:7310
+//line plugins/parsers/influx/machine.go:7732
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7350,7 +7772,7 @@ tr80:
 			goto _test_eof77
 		}
 	st_case_77:
-//line plugins/parsers/influx/machine.go:7354
+//line plugins/parsers/influx/machine.go:7776
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7384,7 +7806,7 @@ tr150:
 			goto _test_eof78
 		}
 	st_case_78:
-//line plugins/parsers/influx/machine.go:7388
+//line plugins/parsers/influx/machine.go:7810
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7428,7 +7850,7 @@ tr151:
 			goto _test_eof79
 		}
 	st_case_79:
-//line plugins/parsers/influx/machine.go:7432
+//line plugins/parsers/influx/machine.go:7854
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7456,66 +7878,66 @@ tr152:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st291
+	goto st300
 tr156:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st291
-	st291:
+	goto st300
+	st300:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof291
+			goto _test_eof300
 		}
-	st_case_291:
-//line plugins/parsers/influx/machine.go:7476
+	st_case_300:
+//line plugins/parsers/influx/machine.go:7898
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr450
+			goto tr463
 		case 13:
 			goto tr330
 		case 32:
-			goto tr449
+			goto tr462
 		case 44:
-			goto tr451
+			goto tr464
 		case 61:
 			goto tr47
 		case 92:
 			goto st81
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr449
+			goto tr462
 		}
 		goto st25
-tr449:
+tr462:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st292
-tr481:
+	goto st301
+tr494:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st292
-tr533:
+	goto st301
+tr546:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st292
-tr539:
+	goto st301
+tr552:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -7524,28 +7946,38 @@ tr539:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st292
-tr542:
+	goto st301
+tr556:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st301
+tr560:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st292
-tr747:
+	goto st301
+tr775:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st292
-tr763:
+	goto st301
+tr796:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -7554,36 +7986,46 @@ tr763:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st292
-tr766:
+	goto st301
+tr800:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st301
+tr804:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st292
-	st292:
+	goto st301
+	st301:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof292
+			goto _test_eof301
 		}
-	st_case_292:
-//line plugins/parsers/influx/machine.go:7574
+	st_case_301:
+//line plugins/parsers/influx/machine.go:8016
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr453
+			goto tr466
 		case 13:
 			goto tr330
 		case 32:
-			goto st292
+			goto st301
 		case 44:
 			goto tr99
 		case 45:
-			goto tr372
+			goto tr377
 		case 61:
 			goto tr99
 		case 92:
@@ -7592,37 +8034,37 @@ tr766:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr373
+				goto tr378
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st292
+			goto st301
 		}
 		goto tr9
-tr453:
+tr466:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st293
-	st293:
+	goto st302
+	st302:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof293
+			goto _test_eof302
 		}
-	st_case_293:
-//line plugins/parsers/influx/machine.go:7613
+	st_case_302:
+//line plugins/parsers/influx/machine.go:8055
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr453
+			goto tr466
 		case 13:
 			goto tr330
 		case 32:
-			goto st292
+			goto st301
 		case 44:
 			goto tr99
 		case 45:
-			goto tr372
+			goto tr377
 		case 61:
 			goto tr14
 		case 92:
@@ -7631,19 +8073,19 @@ tr453:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr373
+				goto tr378
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st292
+			goto st301
 		}
 		goto tr9
-tr450:
+tr463:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st294
-tr454:
+	goto st303
+tr467:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -7652,26 +8094,26 @@ tr454:
 
 	m.pb = m.p
 
-	goto st294
-	st294:
+	goto st303
+	st303:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof294
+			goto _test_eof303
 		}
-	st_case_294:
-//line plugins/parsers/influx/machine.go:7662
+	st_case_303:
+//line plugins/parsers/influx/machine.go:8104
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr454
+			goto tr467
 		case 13:
 			goto tr330
 		case 32:
-			goto tr449
+			goto tr462
 		case 44:
 			goto tr7
 		case 45:
-			goto tr455
+			goto tr468
 		case 61:
 			goto tr47
 		case 92:
@@ -7680,13 +8122,13 @@ tr454:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr456
+				goto tr469
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr449
+			goto tr462
 		}
 		goto tr42
-tr455:
+tr468:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -7697,7 +8139,7 @@ tr455:
 			goto _test_eof80
 		}
 	st_case_80:
-//line plugins/parsers/influx/machine.go:7701
+//line plugins/parsers/influx/machine.go:8143
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr99
@@ -7717,460 +8159,33 @@ tr455:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st295
+				goto st304
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st25
-tr456:
+tr469:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st295
-	st295:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof295
-		}
-	st_case_295:
-//line plugins/parsers/influx/machine.go:7738
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st299
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-tr462:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st296
-tr490:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st296
-tr457:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st296
-tr487:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st296
-	st296:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof296
-		}
-	st_case_296:
-//line plugins/parsers/influx/machine.go:7801
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr461
-		case 13:
-			goto tr330
-		case 32:
-			goto st296
-		case 44:
-			goto tr5
-		case 61:
-			goto tr5
-		case 92:
-			goto tr12
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st296
-		}
-		goto tr9
-tr461:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st297
-	st297:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof297
-		}
-	st_case_297:
-//line plugins/parsers/influx/machine.go:7833
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr461
-		case 13:
-			goto tr330
-		case 32:
-			goto st296
-		case 44:
-			goto tr5
-		case 61:
-			goto tr14
-		case 92:
-			goto tr12
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st296
-		}
-		goto tr9
-tr463:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st298
-tr458:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st298
-	st298:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof298
-		}
-	st_case_298:
-//line plugins/parsers/influx/machine.go:7879
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr463
-		case 13:
-			goto tr330
-		case 32:
-			goto tr462
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto tr44
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr462
-		}
-		goto tr42
-tr44:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st81
-	st81:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof81
-		}
-	st_case_81:
-//line plugins/parsers/influx/machine.go:7911
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st25
-	st299:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof299
-		}
-	st_case_299:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st300
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st300:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof300
-		}
-	st_case_300:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st301
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st301:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof301
-		}
-	st_case_301:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st302
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st302:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof302
-		}
-	st_case_302:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st303
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st303:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof303
-		}
-	st_case_303:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st304
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
+	goto st304
 	st304:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof304
 		}
 	st_case_304:
+//line plugins/parsers/influx/machine.go:8180
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st305
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st305:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof305
-		}
-	st_case_305:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st306
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st306:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof306
-		}
-	st_case_306:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st307
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr457
-		}
-		goto st25
-	st307:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof307
-		}
-	st_case_307:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr458
-		case 13:
-			goto tr335
-		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8184,7 +8199,164 @@ tr44:
 				goto st308
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
+		}
+		goto st25
+tr475:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st305
+tr503:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st305
+tr470:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st305
+tr500:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st305
+	st305:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof305
+		}
+	st_case_305:
+//line plugins/parsers/influx/machine.go:8243
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr474
+		case 13:
+			goto tr330
+		case 32:
+			goto st305
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st305
+		}
+		goto tr9
+tr474:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st306
+	st306:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof306
+		}
+	st_case_306:
+//line plugins/parsers/influx/machine.go:8275
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr474
+		case 13:
+			goto tr330
+		case 32:
+			goto st305
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st305
+		}
+		goto tr9
+tr476:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st307
+tr471:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st307
+	st307:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof307
+		}
+	st_case_307:
+//line plugins/parsers/influx/machine.go:8321
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr476
+		case 13:
+			goto tr330
+		case 32:
+			goto tr475
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto tr44
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr475
+		}
+		goto tr42
+tr44:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st81
+	st81:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof81
+		}
+	st_case_81:
+//line plugins/parsers/influx/machine.go:8353
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
 		}
 		goto st25
 	st308:
@@ -8196,11 +8368,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8214,7 +8386,7 @@ tr44:
 				goto st309
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st309:
@@ -8226,11 +8398,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8244,7 +8416,7 @@ tr44:
 				goto st310
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st310:
@@ -8256,11 +8428,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8274,7 +8446,7 @@ tr44:
 				goto st311
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st311:
@@ -8286,11 +8458,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8304,7 +8476,7 @@ tr44:
 				goto st312
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st312:
@@ -8316,11 +8488,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8334,7 +8506,7 @@ tr44:
 				goto st313
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st313:
@@ -8346,11 +8518,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8364,7 +8536,7 @@ tr44:
 				goto st314
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st314:
@@ -8376,11 +8548,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8394,7 +8566,7 @@ tr44:
 				goto st315
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st315:
@@ -8406,11 +8578,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8424,7 +8596,7 @@ tr44:
 				goto st316
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr457
+			goto tr470
 		}
 		goto st25
 	st316:
@@ -8436,11 +8608,281 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr458
+			goto tr471
 		case 13:
 			goto tr335
 		case 32:
-			goto tr457
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st317
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st317:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof317
+		}
+	st_case_317:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st318
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st318:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof318
+		}
+	st_case_318:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st319
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st319:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof319
+		}
+	st_case_319:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st320
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st320:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof320
+		}
+	st_case_320:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st321
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st321:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof321
+		}
+	st_case_321:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st322
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st322:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof322
+		}
+	st_case_322:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st323
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st323:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof323
+		}
+	st_case_323:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st324
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st324:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof324
+		}
+	st_case_324:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st325
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr470
+		}
+		goto st25
+	st325:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof325
+		}
+	st_case_325:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr471
+		case 13:
+			goto tr335
+		case 32:
+			goto tr470
 		case 44:
 			goto tr7
 		case 61:
@@ -8449,32 +8891,32 @@ tr44:
 			goto st81
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr457
+			goto tr470
 		}
 		goto st25
-tr451:
+tr464:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
 	goto st82
-tr483:
+tr496:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
 	goto st82
-tr535:
+tr548:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st82
-tr541:
+tr554:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8484,27 +8926,37 @@ tr541:
 	m.handler.AddInt(key, m.text())
 
 	goto st82
-tr544:
+tr558:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st82
+tr562:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
 	goto st82
-tr749:
+tr777:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st82
-tr765:
+tr798:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8514,12 +8966,22 @@ tr765:
 	m.handler.AddInt(key, m.text())
 
 	goto st82
-tr768:
+tr802:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st82
+tr806:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -8529,7 +8991,7 @@ tr768:
 			goto _test_eof82
 		}
 	st_case_82:
-//line plugins/parsers/influx/machine.go:8533
+//line plugins/parsers/influx/machine.go:8995
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -8560,7 +9022,7 @@ tr160:
 			goto _test_eof83
 		}
 	st_case_83:
-//line plugins/parsers/influx/machine.go:8564
+//line plugins/parsers/influx/machine.go:9026
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -8595,7 +9057,7 @@ tr163:
 			goto _test_eof84
 		}
 	st_case_84:
-//line plugins/parsers/influx/machine.go:8599
+//line plugins/parsers/influx/machine.go:9061
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -8646,7 +9108,7 @@ tr165:
 			goto _test_eof85
 		}
 	st_case_85:
-//line plugins/parsers/influx/machine.go:8650
+//line plugins/parsers/influx/machine.go:9112
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr25
@@ -8680,7 +9142,7 @@ tr174:
 			goto _test_eof86
 		}
 	st_case_86:
-//line plugins/parsers/influx/machine.go:8684
+//line plugins/parsers/influx/machine.go:9146
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -8724,7 +9186,7 @@ tr175:
 			goto _test_eof87
 		}
 	st_case_87:
-//line plugins/parsers/influx/machine.go:8728
+//line plugins/parsers/influx/machine.go:9190
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -8758,7 +9220,7 @@ tr186:
 			goto _test_eof88
 		}
 	st_case_88:
-//line plugins/parsers/influx/machine.go:8762
+//line plugins/parsers/influx/machine.go:9224
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -8791,7 +9253,7 @@ tr191:
 			goto _test_eof89
 		}
 	st_case_89:
-//line plugins/parsers/influx/machine.go:8795
+//line plugins/parsers/influx/machine.go:9257
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr101
@@ -8827,7 +9289,7 @@ tr189:
 			goto _test_eof90
 		}
 	st_case_90:
-//line plugins/parsers/influx/machine.go:8831
+//line plugins/parsers/influx/machine.go:9293
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st88
@@ -8854,7 +9316,7 @@ tr188:
 			goto _test_eof91
 		}
 	st_case_91:
-//line plugins/parsers/influx/machine.go:8858
+//line plugins/parsers/influx/machine.go:9320
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -8898,7 +9360,7 @@ tr176:
 			goto _test_eof92
 		}
 	st_case_92:
-//line plugins/parsers/influx/machine.go:8902
+//line plugins/parsers/influx/machine.go:9364
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -8932,7 +9394,7 @@ tr193:
 			goto _test_eof93
 		}
 	st_case_93:
-//line plugins/parsers/influx/machine.go:8936
+//line plugins/parsers/influx/machine.go:9398
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -8976,7 +9438,7 @@ tr194:
 			goto _test_eof94
 		}
 	st_case_94:
-//line plugins/parsers/influx/machine.go:8980
+//line plugins/parsers/influx/machine.go:9442
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9004,50 +9466,50 @@ tr195:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st317
+	goto st326
 tr199:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st317
-	st317:
+	goto st326
+	st326:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof317
+			goto _test_eof326
 		}
-	st_case_317:
-//line plugins/parsers/influx/machine.go:9024
+	st_case_326:
+//line plugins/parsers/influx/machine.go:9486
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr482
+			goto tr495
 		case 13:
 			goto tr330
 		case 32:
-			goto tr481
+			goto tr494
 		case 44:
-			goto tr483
+			goto tr496
 		case 61:
 			goto tr14
 		case 92:
 			goto st34
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr481
+			goto tr494
 		}
 		goto st32
-tr482:
+tr495:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st318
-tr484:
+	goto st327
+tr497:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9056,26 +9518,26 @@ tr484:
 
 	m.pb = m.p
 
-	goto st318
-	st318:
+	goto st327
+	st327:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof318
+			goto _test_eof327
 		}
-	st_case_318:
-//line plugins/parsers/influx/machine.go:9066
+	st_case_327:
+//line plugins/parsers/influx/machine.go:9528
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr484
+			goto tr497
 		case 13:
 			goto tr330
 		case 32:
-			goto tr481
+			goto tr494
 		case 44:
 			goto tr61
 		case 45:
-			goto tr485
+			goto tr498
 		case 61:
 			goto tr14
 		case 92:
@@ -9084,13 +9546,13 @@ tr484:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr486
+				goto tr499
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr481
+			goto tr494
 		}
 		goto tr63
-tr485:
+tr498:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9101,7 +9563,7 @@ tr485:
 			goto _test_eof95
 		}
 	st_case_95:
-//line plugins/parsers/influx/machine.go:9105
+//line plugins/parsers/influx/machine.go:9567
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr201
@@ -9121,349 +9583,33 @@ tr485:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st319
+				goto st328
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st32
-tr486:
+tr499:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st319
-	st319:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof319
-		}
-	st_case_319:
-//line plugins/parsers/influx/machine.go:9142
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st321
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-tr491:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st320
-tr488:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st320
-	st320:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof320
-		}
-	st_case_320:
-//line plugins/parsers/influx/machine.go:9193
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr491
-		case 13:
-			goto tr330
-		case 32:
-			goto tr490
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto tr65
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr490
-		}
-		goto tr63
-	st321:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof321
-		}
-	st_case_321:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st322
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st322:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof322
-		}
-	st_case_322:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st323
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st323:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof323
-		}
-	st_case_323:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st324
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st324:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof324
-		}
-	st_case_324:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st325
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st325:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof325
-		}
-	st_case_325:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st326
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st326:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof326
-		}
-	st_case_326:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st327
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st327:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof327
-		}
-	st_case_327:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st328
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
+	goto st328
 	st328:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof328
 		}
 	st_case_328:
+//line plugins/parsers/influx/machine.go:9604
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st329
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st32
-	st329:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof329
-		}
-	st_case_329:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr488
-		case 13:
-			goto tr335
-		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9477,9 +9623,55 @@ tr488:
 				goto st330
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
+tr504:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st329
+tr501:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st329
+	st329:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof329
+		}
+	st_case_329:
+//line plugins/parsers/influx/machine.go:9655
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr504
+		case 13:
+			goto tr330
+		case 32:
+			goto tr503
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto tr65
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr503
+		}
+		goto tr63
 	st330:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof330
@@ -9489,11 +9681,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9507,7 +9699,7 @@ tr488:
 				goto st331
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st331:
@@ -9519,11 +9711,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9537,7 +9729,7 @@ tr488:
 				goto st332
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st332:
@@ -9549,11 +9741,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9567,7 +9759,7 @@ tr488:
 				goto st333
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st333:
@@ -9579,11 +9771,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9597,7 +9789,7 @@ tr488:
 				goto st334
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st334:
@@ -9609,11 +9801,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9627,7 +9819,7 @@ tr488:
 				goto st335
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st335:
@@ -9639,11 +9831,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9657,7 +9849,7 @@ tr488:
 				goto st336
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st336:
@@ -9669,11 +9861,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9687,7 +9879,7 @@ tr488:
 				goto st337
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st337:
@@ -9699,11 +9891,11 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9717,7 +9909,7 @@ tr488:
 				goto st338
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr487
+			goto tr500
 		}
 		goto st32
 	st338:
@@ -9729,11 +9921,281 @@ tr488:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr488
+			goto tr501
 		case 13:
 			goto tr335
 		case 32:
-			goto tr487
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st339
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st339:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof339
+		}
+	st_case_339:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st340
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st340:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof340
+		}
+	st_case_340:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st341
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st341:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof341
+		}
+	st_case_341:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st342
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st342:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof342
+		}
+	st_case_342:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st343
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st343:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof343
+		}
+	st_case_343:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st344
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st344:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof344
+		}
+	st_case_344:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st345
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st345:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof345
+		}
+	st_case_345:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st346
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st346:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof346
+		}
+	st_case_346:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st347
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr500
+		}
+		goto st32
+	st347:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof347
+		}
+	st_case_347:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr501
+		case 13:
+			goto tr335
+		case 32:
+			goto tr500
 		case 44:
 			goto tr61
 		case 61:
@@ -9742,7 +10204,7 @@ tr488:
 			goto st34
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr487
+			goto tr500
 		}
 		goto st32
 tr184:
@@ -9766,7 +10228,7 @@ tr178:
 			goto _test_eof96
 		}
 	st_case_96:
-//line plugins/parsers/influx/machine.go:9770
+//line plugins/parsers/influx/machine.go:10232
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -9799,7 +10261,7 @@ tr203:
 			goto _test_eof97
 		}
 	st_case_97:
-//line plugins/parsers/influx/machine.go:9803
+//line plugins/parsers/influx/machine.go:10265
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -9826,28 +10288,28 @@ tr204:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st339
+	goto st348
 tr207:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st339
-	st339:
+	goto st348
+	st348:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof339
+			goto _test_eof348
 		}
-	st_case_339:
-//line plugins/parsers/influx/machine.go:9846
+	st_case_348:
+//line plugins/parsers/influx/machine.go:10308
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st340
+			goto st349
 		case 13:
 			goto tr330
 		case 32:
@@ -9863,16 +10325,16 @@ tr207:
 			goto st192
 		}
 		goto st28
-	st340:
+	st349:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof340
+			goto _test_eof349
 		}
-	st_case_340:
+	st_case_349:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st340
+			goto st349
 		case 13:
 			goto tr330
 		case 32:
@@ -9880,7 +10342,7 @@ tr207:
 		case 44:
 			goto tr210
 		case 45:
-			goto tr510
+			goto tr523
 		case 61:
 			goto tr53
 		case 92:
@@ -9889,13 +10351,13 @@ tr207:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr511
+				goto tr524
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st192
 		}
 		goto st28
-tr510:
+tr523:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9906,7 +10368,7 @@ tr510:
 			goto _test_eof98
 		}
 	st_case_98:
-//line plugins/parsers/influx/machine.go:9910
+//line plugins/parsers/influx/machine.go:10372
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr210
@@ -9924,331 +10386,29 @@ tr510:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st341
+				goto st350
 			}
 		default:
 			goto tr210
 		}
 		goto st28
-tr511:
+tr524:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st341
-	st341:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof341
-		}
-	st_case_341:
-//line plugins/parsers/influx/machine.go:9945
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st343
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-tr512:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st342
-	st342:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof342
-		}
-	st_case_342:
-//line plugins/parsers/influx/machine.go:9982
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st342
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr50
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st28
-	st343:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof343
-		}
-	st_case_343:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st344
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st344:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof344
-		}
-	st_case_344:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st345
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st345:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof345
-		}
-	st_case_345:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st346
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st346:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof346
-		}
-	st_case_346:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st347
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st347:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof347
-		}
-	st_case_347:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st348
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st348:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof348
-		}
-	st_case_348:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st349
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st349:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof349
-		}
-	st_case_349:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st350
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
+	goto st350
 	st350:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof350
 		}
 	st_case_350:
+//line plugins/parsers/influx/machine.go:10407
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st351
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st351:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof351
-		}
-	st_case_351:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10269,6 +10429,38 @@ tr512:
 			goto tr334
 		}
 		goto st28
+tr525:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st351
+	st351:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof351
+		}
+	st_case_351:
+//line plugins/parsers/influx/machine.go:10444
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st351
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr50
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st28
 	st352:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof352
@@ -10278,7 +10470,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10308,7 +10500,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10338,7 +10530,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10368,7 +10560,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10398,7 +10590,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10428,7 +10620,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10458,7 +10650,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10488,7 +10680,7 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10518,7 +10710,277 @@ tr512:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr512
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st361
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st361:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof361
+		}
+	st_case_361:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st362
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st362:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof362
+		}
+	st_case_362:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st363
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st363:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof363
+		}
+	st_case_363:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st364
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st364:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof364
+		}
+	st_case_364:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st365:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof365
+		}
+	st_case_365:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st366
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st366:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof366
+		}
+	st_case_366:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st367
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st367:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof367
+		}
+	st_case_367:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st368
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st368:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof368
+		}
+	st_case_368:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st369
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+	st369:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof369
+		}
+	st_case_369:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr525
 		case 13:
 			goto tr335
 		case 32:
@@ -10545,7 +11007,7 @@ tr208:
 			goto _test_eof99
 		}
 	st_case_99:
-//line plugins/parsers/influx/machine.go:10549
+//line plugins/parsers/influx/machine.go:11011
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -10572,60 +11034,60 @@ tr177:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st361
+	goto st370
 tr183:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st361
-	st361:
+	goto st370
+	st370:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof361
+			goto _test_eof370
 		}
-	st_case_361:
-//line plugins/parsers/influx/machine.go:10592
+	st_case_370:
+//line plugins/parsers/influx/machine.go:11054
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr532
+			goto tr545
 		case 13:
 			goto tr330
 		case 32:
-			goto tr481
+			goto tr494
 		case 44:
-			goto tr483
+			goto tr496
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr481
+			goto tr494
 		}
 		goto st30
-tr532:
+tr545:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st362
-tr534:
+	goto st371
+tr547:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st362
-tr540:
+	goto st371
+tr553:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -10634,36 +11096,46 @@ tr540:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st362
-tr543:
+	goto st371
+tr557:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st371
+tr561:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st362
-	st362:
+	goto st371
+	st371:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof362
+			goto _test_eof371
 		}
-	st_case_362:
-//line plugins/parsers/influx/machine.go:10654
+	st_case_371:
+//line plugins/parsers/influx/machine.go:11126
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr484
+			goto tr497
 		case 13:
 			goto tr330
 		case 32:
-			goto tr481
+			goto tr494
 		case 44:
 			goto tr61
 		case 45:
-			goto tr485
+			goto tr498
 		case 61:
 			goto tr201
 		case 92:
@@ -10672,10 +11144,10 @@ tr543:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr486
+				goto tr499
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr481
+			goto tr494
 		}
 		goto tr63
 tr179:
@@ -10689,7 +11161,7 @@ tr179:
 			goto _test_eof100
 		}
 	st_case_100:
-//line plugins/parsers/influx/machine.go:10693
+//line plugins/parsers/influx/machine.go:11165
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st86
@@ -10716,7 +11188,7 @@ tr205:
 			goto _test_eof101
 		}
 	st_case_101:
-//line plugins/parsers/influx/machine.go:10720
+//line plugins/parsers/influx/machine.go:11192
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st97
@@ -10743,7 +11215,7 @@ tr196:
 			goto _test_eof102
 		}
 	st_case_102:
-//line plugins/parsers/influx/machine.go:10747
+//line plugins/parsers/influx/machine.go:11219
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st93
@@ -10770,7 +11242,7 @@ tr166:
 			goto _test_eof103
 		}
 	st_case_103:
-//line plugins/parsers/influx/machine.go:10774
+//line plugins/parsers/influx/machine.go:11246
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -10783,7 +11255,7 @@ tr166:
 		case 44:
 			goto tr61
 		case 48:
-			goto st363
+			goto st372
 		case 61:
 			goto tr59
 		case 92:
@@ -10792,37 +11264,30 @@ tr166:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st367
+				goto st376
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st30
-tr168:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st363
-	st363:
+	st372:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof363
+			goto _test_eof372
 		}
-	st_case_363:
-//line plugins/parsers/influx/machine.go:10813
+	st_case_372:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr534
+			goto tr547
 		case 13:
 			goto tr356
 		case 32:
-			goto tr533
+			goto tr546
 		case 44:
-			goto tr535
+			goto tr548
 		case 46:
-			goto st364
+			goto st373
 		case 61:
 			goto tr201
 		case 69:
@@ -10832,10 +11297,10 @@ tr168:
 		case 101:
 			goto st104
 		case 105:
-			goto st366
+			goto st375
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr533
+			goto tr546
 		}
 		goto st30
 tr167:
@@ -10843,24 +11308,24 @@ tr167:
 
 	m.pb = m.p
 
-	goto st364
-	st364:
+	goto st373
+	st373:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof364
+			goto _test_eof373
 		}
-	st_case_364:
-//line plugins/parsers/influx/machine.go:10853
+	st_case_373:
+//line plugins/parsers/influx/machine.go:11318
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr534
+			goto tr547
 		case 13:
 			goto tr356
 		case 32:
-			goto tr533
+			goto tr546
 		case 44:
-			goto tr535
+			goto tr548
 		case 61:
 			goto tr201
 		case 69:
@@ -10873,10 +11338,10 @@ tr167:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st364
+				goto st373
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr533
+			goto tr546
 		}
 		goto st30
 	st104:
@@ -10909,7 +11374,7 @@ tr167:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
+				goto st374
 			}
 		default:
 			goto st105
@@ -10939,28 +11404,28 @@ tr167:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
+				goto st374
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st30
-	st365:
+	st374:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof365
+			goto _test_eof374
 		}
-	st_case_365:
+	st_case_374:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr534
+			goto tr547
 		case 13:
 			goto tr356
 		case 32:
-			goto tr533
+			goto tr546
 		case 44:
-			goto tr535
+			goto tr548
 		case 61:
 			goto tr201
 		case 92:
@@ -10969,62 +11434,55 @@ tr167:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
+				goto st374
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr533
+			goto tr546
 		}
 		goto st30
-	st366:
+	st375:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof366
+			goto _test_eof375
 		}
-	st_case_366:
+	st_case_375:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr362
 		case 11:
-			goto tr540
+			goto tr553
 		case 13:
 			goto tr362
 		case 32:
-			goto tr539
+			goto tr552
 		case 44:
-			goto tr541
+			goto tr554
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr539
+			goto tr552
 		}
 		goto st30
-tr169:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st367
-	st367:
+	st376:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof367
+			goto _test_eof376
 		}
-	st_case_367:
-//line plugins/parsers/influx/machine.go:11015
+	st_case_376:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr534
+			goto tr547
 		case 13:
 			goto tr356
 		case 32:
-			goto tr533
+			goto tr546
 		case 44:
-			goto tr535
+			goto tr548
 		case 46:
-			goto st364
+			goto st373
 		case 61:
 			goto tr201
 		case 69:
@@ -11034,15 +11492,129 @@ tr169:
 		case 101:
 			goto st104
 		case 105:
-			goto st366
+			goto st375
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st367
+				goto st376
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr533
+			goto tr546
+		}
+		goto st30
+tr168:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st377
+	st377:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof377
+		}
+	st_case_377:
+//line plugins/parsers/influx/machine.go:11518
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr547
+		case 13:
+			goto tr356
+		case 32:
+			goto tr546
+		case 44:
+			goto tr548
+		case 46:
+			goto st373
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		case 105:
+			goto st375
+		case 117:
+			goto st378
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr546
+		}
+		goto st30
+	st378:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof378
+		}
+	st_case_378:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr366
+		case 11:
+			goto tr557
+		case 13:
+			goto tr366
+		case 32:
+			goto tr556
+		case 44:
+			goto tr558
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr556
+		}
+		goto st30
+tr169:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st379
+	st379:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof379
+		}
+	st_case_379:
+//line plugins/parsers/influx/machine.go:11585
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr547
+		case 13:
+			goto tr356
+		case 32:
+			goto tr546
+		case 44:
+			goto tr548
+		case 46:
+			goto st373
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		case 105:
+			goto st375
+		case 117:
+			goto st378
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st379
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr546
 		}
 		goto st30
 tr170:
@@ -11050,24 +11622,24 @@ tr170:
 
 	m.pb = m.p
 
-	goto st368
-	st368:
+	goto st380
+	st380:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof368
+			goto _test_eof380
 		}
-	st_case_368:
-//line plugins/parsers/influx/machine.go:11060
+	st_case_380:
+//line plugins/parsers/influx/machine.go:11632
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr543
+			goto tr561
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr542
+			goto tr560
 		case 44:
-			goto tr544
+			goto tr562
 		case 61:
 			goto tr201
 		case 65:
@@ -11078,7 +11650,7 @@ tr170:
 			goto st109
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr542
+			goto tr560
 		}
 		goto st30
 	st106:
@@ -11154,7 +11726,7 @@ tr170:
 		case 61:
 			goto tr59
 		case 69:
-			goto st369
+			goto st381
 		case 92:
 			goto st35
 		}
@@ -11162,29 +11734,29 @@ tr170:
 			goto tr58
 		}
 		goto st30
-	st369:
+	st381:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof369
+			goto _test_eof381
 		}
-	st_case_369:
+	st_case_381:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr543
+			goto tr561
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr542
+			goto tr560
 		case 44:
-			goto tr544
+			goto tr562
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr542
+			goto tr560
 		}
 		goto st30
 	st109:
@@ -11262,7 +11834,7 @@ tr170:
 		case 92:
 			goto st35
 		case 101:
-			goto st369
+			goto st381
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr58
@@ -11273,24 +11845,24 @@ tr171:
 
 	m.pb = m.p
 
-	goto st370
-	st370:
+	goto st382
+	st382:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof370
+			goto _test_eof382
 		}
-	st_case_370:
-//line plugins/parsers/influx/machine.go:11283
+	st_case_382:
+//line plugins/parsers/influx/machine.go:11855
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr543
+			goto tr561
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr542
+			goto tr560
 		case 44:
-			goto tr544
+			goto tr562
 		case 61:
 			goto tr201
 		case 82:
@@ -11301,7 +11873,7 @@ tr171:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr542
+			goto tr560
 		}
 		goto st30
 	st112:
@@ -11363,24 +11935,24 @@ tr172:
 
 	m.pb = m.p
 
-	goto st371
-	st371:
+	goto st383
+	st383:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof371
+			goto _test_eof383
 		}
-	st_case_371:
-//line plugins/parsers/influx/machine.go:11373
+	st_case_383:
+//line plugins/parsers/influx/machine.go:11945
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr543
+			goto tr561
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr542
+			goto tr560
 		case 44:
-			goto tr544
+			goto tr562
 		case 61:
 			goto tr201
 		case 92:
@@ -11389,7 +11961,7 @@ tr172:
 			goto st109
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr542
+			goto tr560
 		}
 		goto st30
 tr173:
@@ -11397,24 +11969,24 @@ tr173:
 
 	m.pb = m.p
 
-	goto st372
-	st372:
+	goto st384
+	st384:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof372
+			goto _test_eof384
 		}
-	st_case_372:
-//line plugins/parsers/influx/machine.go:11407
+	st_case_384:
+//line plugins/parsers/influx/machine.go:11979
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr543
+			goto tr561
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr542
+			goto tr560
 		case 44:
-			goto tr544
+			goto tr562
 		case 61:
 			goto tr201
 		case 92:
@@ -11423,7 +11995,7 @@ tr173:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr542
+			goto tr560
 		}
 		goto st30
 tr161:
@@ -11437,7 +12009,7 @@ tr161:
 			goto _test_eof114
 		}
 	st_case_114:
-//line plugins/parsers/influx/machine.go:11441
+//line plugins/parsers/influx/machine.go:12013
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -11474,7 +12046,7 @@ tr231:
 			goto _test_eof115
 		}
 	st_case_115:
-//line plugins/parsers/influx/machine.go:11478
+//line plugins/parsers/influx/machine.go:12050
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -11507,7 +12079,7 @@ tr221:
 			goto _test_eof116
 		}
 	st_case_116:
-//line plugins/parsers/influx/machine.go:11511
+//line plugins/parsers/influx/machine.go:12083
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -11540,7 +12112,7 @@ tr224:
 			goto _test_eof117
 		}
 	st_case_117:
-//line plugins/parsers/influx/machine.go:11544
+//line plugins/parsers/influx/machine.go:12116
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -11573,7 +12145,7 @@ tr226:
 			goto _test_eof118
 		}
 	st_case_118:
-//line plugins/parsers/influx/machine.go:11577
+//line plugins/parsers/influx/machine.go:12149
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -11607,7 +12179,7 @@ tr230:
 			goto _test_eof119
 		}
 	st_case_119:
-//line plugins/parsers/influx/machine.go:11611
+//line plugins/parsers/influx/machine.go:12183
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -11641,7 +12213,7 @@ tr233:
 			goto _test_eof120
 		}
 	st_case_120:
-//line plugins/parsers/influx/machine.go:11645
+//line plugins/parsers/influx/machine.go:12217
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -11685,7 +12257,7 @@ tr234:
 			goto _test_eof121
 		}
 	st_case_121:
-//line plugins/parsers/influx/machine.go:11689
+//line plugins/parsers/influx/machine.go:12261
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -11719,7 +12291,7 @@ tr235:
 			goto _test_eof122
 		}
 	st_case_122:
-//line plugins/parsers/influx/machine.go:11723
+//line plugins/parsers/influx/machine.go:12295
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st120
@@ -11746,7 +12318,7 @@ tr227:
 			goto _test_eof123
 		}
 	st_case_123:
-//line plugins/parsers/influx/machine.go:11750
+//line plugins/parsers/influx/machine.go:12322
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st118
@@ -11773,7 +12345,7 @@ tr222:
 			goto _test_eof124
 		}
 	st_case_124:
-//line plugins/parsers/influx/machine.go:11777
+//line plugins/parsers/influx/machine.go:12349
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st116
@@ -11800,7 +12372,7 @@ tr157:
 			goto _test_eof125
 		}
 	st_case_125:
-//line plugins/parsers/influx/machine.go:11804
+//line plugins/parsers/influx/machine.go:12376
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -11841,44 +12413,44 @@ tr157:
 		}
 		goto st39
 tr239:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st373
-	st373:
+	goto st385
+	st385:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof373
+			goto _test_eof385
 		}
-	st_case_373:
-//line plugins/parsers/influx/machine.go:11855
+	st_case_385:
+//line plugins/parsers/influx/machine.go:12427
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr395
+			goto tr400
 		case 11:
-			goto tr550
+			goto tr568
 		case 13:
-			goto tr395
+			goto tr400
 		case 32:
-			goto tr549
+			goto tr567
 		case 34:
 			goto tr81
 		case 44:
-			goto tr551
+			goto tr569
 		case 92:
 			goto tr83
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr549
+			goto tr567
 		}
 		goto tr78
-tr576:
+tr594:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st374
-tr549:
+	goto st386
+tr567:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -11887,24 +12459,24 @@ tr549:
 
 	m.pb = m.p
 
-	goto st374
-tr705:
+	goto st386
+tr728:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st374
-tr699:
+	goto st386
+tr722:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st374
-tr731:
+	goto st386
+tr754:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11913,28 +12485,38 @@ tr731:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st374
-tr734:
+	goto st386
+tr758:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st386
+tr762:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st374
-tr741:
+	goto st386
+tr769:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st374
-tr750:
+	goto st386
+tr778:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -11943,38 +12525,48 @@ tr750:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st374
-tr753:
+	goto st386
+tr782:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st386
+tr786:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st374
-	st374:
+	goto st386
+	st386:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof374
+			goto _test_eof386
 		}
-	st_case_374:
-//line plugins/parsers/influx/machine.go:11963
+	st_case_386:
+//line plugins/parsers/influx/machine.go:12555
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr553
+			goto tr571
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto st374
+			goto st386
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr554
+			goto tr572
 		case 61:
 			goto st7
 		case 92:
@@ -11983,39 +12575,39 @@ tr753:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr555
+				goto tr573
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st374
+			goto st386
 		}
 		goto tr90
-tr553:
+tr571:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st375
-	st375:
+	goto st387
+	st387:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof375
+			goto _test_eof387
 		}
-	st_case_375:
-//line plugins/parsers/influx/machine.go:12004
+	st_case_387:
+//line plugins/parsers/influx/machine.go:12596
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr553
+			goto tr571
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto st374
+			goto st386
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr554
+			goto tr572
 		case 61:
 			goto tr97
 		case 92:
@@ -12024,13 +12616,13 @@ tr553:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr555
+				goto tr573
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st374
+			goto st386
 		}
 		goto tr90
-tr554:
+tr572:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12041,7 +12633,7 @@ tr554:
 			goto _test_eof126
 		}
 	st_case_126:
-//line plugins/parsers/influx/machine.go:12045
+//line plugins/parsers/influx/machine.go:12637
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -12061,451 +12653,33 @@ tr554:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st376
+				goto st388
 			}
 		default:
 			goto st7
 		}
 		goto st41
-tr555:
+tr573:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st376
-	st376:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof376
-		}
-	st_case_376:
-//line plugins/parsers/influx/machine.go:12082
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st378
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-tr556:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st377
-	st377:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof377
-		}
-	st_case_377:
-//line plugins/parsers/influx/machine.go:12121
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto st377
-		case 13:
-			goto tr398
-		case 32:
-			goto st250
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st250
-		}
-		goto st41
-	st378:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof378
-		}
-	st_case_378:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st379
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st379:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof379
-		}
-	st_case_379:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st380
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st380:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof380
-		}
-	st_case_380:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st381
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st381:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof381
-		}
-	st_case_381:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st382
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st382:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof382
-		}
-	st_case_382:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st383
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st383:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof383
-		}
-	st_case_383:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st384
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st384:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof384
-		}
-	st_case_384:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st385
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st385:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof385
-		}
-	st_case_385:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st386
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st386:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof386
-		}
-	st_case_386:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st387
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st387:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof387
-		}
-	st_case_387:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st388
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
+	goto st388
 	st388:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof388
 		}
 	st_case_388:
+//line plugins/parsers/influx/machine.go:12674
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st389
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st41
-	st389:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof389
-		}
-	st_case_389:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr556
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12521,7 +12695,41 @@ tr556:
 				goto st390
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
+		}
+		goto st41
+tr574:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st389
+	st389:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof389
+		}
+	st_case_389:
+//line plugins/parsers/influx/machine.go:12713
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto st389
+		case 13:
+			goto tr403
+		case 32:
+			goto st253
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st253
 		}
 		goto st41
 	st390:
@@ -12531,13 +12739,13 @@ tr556:
 	st_case_390:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12553,7 +12761,7 @@ tr556:
 				goto st391
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st41
 	st391:
@@ -12563,13 +12771,13 @@ tr556:
 	st_case_391:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12585,7 +12793,7 @@ tr556:
 				goto st392
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st41
 	st392:
@@ -12595,13 +12803,13 @@ tr556:
 	st_case_392:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12617,7 +12825,7 @@ tr556:
 				goto st393
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st41
 	st393:
@@ -12627,13 +12835,13 @@ tr556:
 	st_case_393:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12649,7 +12857,7 @@ tr556:
 				goto st394
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st41
 	st394:
@@ -12659,13 +12867,13 @@ tr556:
 	st_case_394:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12681,7 +12889,7 @@ tr556:
 				goto st395
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st41
 	st395:
@@ -12691,13 +12899,397 @@ tr556:
 	st_case_395:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr556
+			goto tr574
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st396
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st396:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof396
+		}
+	st_case_396:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st397
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st397:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof397
+		}
+	st_case_397:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st398
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st398:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof398
+		}
+	st_case_398:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st399
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st399:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof399
+		}
+	st_case_399:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st400
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st400:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof400
+		}
+	st_case_400:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st401
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st401:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof401
+		}
+	st_case_401:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st402
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st402:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof402
+		}
+	st_case_402:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st403
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st403:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof403
+		}
+	st_case_403:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st404
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st404:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof404
+		}
+	st_case_404:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st405
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st405:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof405
+		}
+	st_case_405:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st406
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st406:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof406
+		}
+	st_case_406:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st407
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st41
+	st407:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof407
+		}
+	st_case_407:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr574
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -12708,10 +13300,10 @@ tr556:
 			goto st75
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr401
+			goto tr406
 		}
 		goto st41
-tr550:
+tr568:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12720,18 +13312,18 @@ tr550:
 
 	m.pb = m.p
 
-	goto st396
-tr742:
+	goto st408
+tr770:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st396
-tr751:
+	goto st408
+tr779:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12740,38 +13332,48 @@ tr751:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st396
-tr754:
+	goto st408
+tr783:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st408
+tr787:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st396
-	st396:
+	goto st408
+	st408:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof396
+			goto _test_eof408
 		}
-	st_case_396:
-//line plugins/parsers/influx/machine.go:12760
+	st_case_408:
+//line plugins/parsers/influx/machine.go:13362
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr577
+			goto tr595
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr576
+			goto tr594
 		case 34:
 			goto tr152
 		case 44:
 			goto tr88
 		case 45:
-			goto tr578
+			goto tr596
 		case 61:
 			goto st39
 		case 92:
@@ -12780,13 +13382,13 @@ tr754:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr579
+				goto tr597
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr576
+			goto tr594
 		}
 		goto tr150
-tr577:
+tr595:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12795,28 +13397,28 @@ tr577:
 
 	m.pb = m.p
 
-	goto st397
-	st397:
+	goto st409
+	st409:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof397
+			goto _test_eof409
 		}
-	st_case_397:
-//line plugins/parsers/influx/machine.go:12805
+	st_case_409:
+//line plugins/parsers/influx/machine.go:13407
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr577
+			goto tr595
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr576
+			goto tr594
 		case 34:
 			goto tr152
 		case 44:
 			goto tr88
 		case 45:
-			goto tr578
+			goto tr596
 		case 61:
 			goto tr157
 		case 92:
@@ -12825,13 +13427,13 @@ tr577:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr579
+				goto tr597
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr576
+			goto tr594
 		}
 		goto tr150
-tr578:
+tr596:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12842,7 +13444,7 @@ tr578:
 			goto _test_eof127
 		}
 	st_case_127:
-//line plugins/parsers/influx/machine.go:12846
+//line plugins/parsers/influx/machine.go:13448
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12864,586 +13466,33 @@ tr578:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st398
+				goto st410
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr85
 		}
 		goto st78
-tr579:
+tr597:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st398
-	st398:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof398
-		}
-	st_case_398:
-//line plugins/parsers/influx/machine.go:12885
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st402
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-tr585:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st399
-tr712:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st399
-tr580:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st399
-tr709:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st399
-	st399:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof399
-		}
-	st_case_399:
-//line plugins/parsers/influx/machine.go:12950
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr584
-		case 13:
-			goto tr398
-		case 32:
-			goto st399
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr94
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st399
-		}
-		goto tr90
-tr584:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st400
-	st400:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof400
-		}
-	st_case_400:
-//line plugins/parsers/influx/machine.go:12984
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr584
-		case 13:
-			goto tr398
-		case 32:
-			goto st399
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto tr94
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st399
-		}
-		goto tr90
-tr586:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st401
-tr581:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st401
-	st401:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof401
-		}
-	st_case_401:
-//line plugins/parsers/influx/machine.go:13032
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr586
-		case 13:
-			goto tr398
-		case 32:
-			goto tr585
-		case 34:
-			goto tr152
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto tr153
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr585
-		}
-		goto tr150
-tr153:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st128
-	st128:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof128
-		}
-	st_case_128:
-//line plugins/parsers/influx/machine.go:13066
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st78
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st25
-	st402:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof402
-		}
-	st_case_402:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st403
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st403:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof403
-		}
-	st_case_403:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st404
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st404:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof404
-		}
-	st_case_404:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st405
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st405:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof405
-		}
-	st_case_405:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st406
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st406:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof406
-		}
-	st_case_406:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st407
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st407:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof407
-		}
-	st_case_407:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st408
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st408:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof408
-		}
-	st_case_408:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st409
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st409:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof409
-		}
-	st_case_409:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st410
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
+	goto st410
 	st410:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof410
 		}
 	st_case_410:
+//line plugins/parsers/influx/machine.go:13487
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st411
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st411:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof411
-		}
-	st_case_411:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st412
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st412:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof412
-		}
-	st_case_412:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st413
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr580
-		}
-		goto st78
-	st413:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof413
-		}
-	st_case_413:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr581
-		case 13:
-			goto tr402
-		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13459,9 +13508,178 @@ tr153:
 				goto st414
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
+tr603:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st411
+tr735:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st411
+tr598:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st411
+tr732:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st411
+	st411:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof411
+		}
+	st_case_411:
+//line plugins/parsers/influx/machine.go:13552
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr602
+		case 13:
+			goto tr403
+		case 32:
+			goto st411
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st411
+		}
+		goto tr90
+tr602:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st412
+	st412:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof412
+		}
+	st_case_412:
+//line plugins/parsers/influx/machine.go:13586
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr602
+		case 13:
+			goto tr403
+		case 32:
+			goto st411
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto tr94
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st411
+		}
+		goto tr90
+tr604:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st413
+tr599:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st413
+	st413:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof413
+		}
+	st_case_413:
+//line plugins/parsers/influx/machine.go:13634
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr604
+		case 13:
+			goto tr403
+		case 32:
+			goto tr603
+		case 34:
+			goto tr152
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto tr153
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr603
+		}
+		goto tr150
+tr153:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st128
+	st128:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof128
+		}
+	st_case_128:
+//line plugins/parsers/influx/machine.go:13668
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st78
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st25
 	st414:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof414
@@ -13469,13 +13687,13 @@ tr153:
 	st_case_414:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13491,7 +13709,7 @@ tr153:
 				goto st415
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
 	st415:
@@ -13501,13 +13719,13 @@ tr153:
 	st_case_415:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13523,7 +13741,7 @@ tr153:
 				goto st416
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
 	st416:
@@ -13533,13 +13751,13 @@ tr153:
 	st_case_416:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13555,7 +13773,7 @@ tr153:
 				goto st417
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
 	st417:
@@ -13565,13 +13783,13 @@ tr153:
 	st_case_417:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13587,7 +13805,7 @@ tr153:
 				goto st418
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
 	st418:
@@ -13597,13 +13815,13 @@ tr153:
 	st_case_418:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13619,7 +13837,7 @@ tr153:
 				goto st419
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr580
+			goto tr598
 		}
 		goto st78
 	st419:
@@ -13629,13 +13847,397 @@ tr153:
 	st_case_419:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr581
+			goto tr599
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr580
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st420
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st420:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof420
+		}
+	st_case_420:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st421
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st421:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof421
+		}
+	st_case_421:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st422
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st422:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof422
+		}
+	st_case_422:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st423
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st423:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof423
+		}
+	st_case_423:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st424
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st424:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof424
+		}
+	st_case_424:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st425
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st425:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof425
+		}
+	st_case_425:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st426
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st426:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof426
+		}
+	st_case_426:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st427
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st427:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof427
+		}
+	st_case_427:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st428
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st428:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof428
+		}
+	st_case_428:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st429
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st429:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof429
+		}
+	st_case_429:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st430
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st430:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof430
+		}
+	st_case_430:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st431
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr598
+		}
+		goto st78
+	st431:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof431
+		}
+	st_case_431:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr599
+		case 13:
+			goto tr407
+		case 32:
+			goto tr598
 		case 34:
 			goto tr156
 		case 44:
@@ -13646,7 +14248,7 @@ tr153:
 			goto st128
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr580
+			goto tr598
 		}
 		goto st78
 tr81:
@@ -13654,58 +14256,58 @@ tr81:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st420
+	goto st432
 tr87:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st420
-	st420:
+	goto st432
+	st432:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof420
+			goto _test_eof432
 		}
-	st_case_420:
-//line plugins/parsers/influx/machine.go:13674
+	st_case_432:
+//line plugins/parsers/influx/machine.go:14276
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr604
+			goto tr622
 		case 13:
 			goto tr330
 		case 32:
-			goto tr449
+			goto tr462
 		case 44:
-			goto tr451
+			goto tr464
 		case 92:
 			goto st129
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr449
+			goto tr462
 		}
 		goto st2
-tr604:
+tr622:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st421
-tr748:
+	goto st433
+tr776:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st421
-tr764:
+	goto st433
+tr797:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13714,36 +14316,46 @@ tr764:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st421
-tr767:
+	goto st433
+tr801:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st433
+tr805:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st421
-	st421:
+	goto st433
+	st433:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof421
+			goto _test_eof433
 		}
-	st_case_421:
-//line plugins/parsers/influx/machine.go:13734
+	st_case_433:
+//line plugins/parsers/influx/machine.go:14346
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr454
+			goto tr467
 		case 13:
 			goto tr330
 		case 32:
-			goto tr449
+			goto tr462
 		case 44:
 			goto tr7
 		case 45:
-			goto tr455
+			goto tr468
 		case 61:
 			goto st2
 		case 92:
@@ -13752,10 +14364,10 @@ tr767:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr456
+				goto tr469
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr449
+			goto tr462
 		}
 		goto tr42
 tr2:
@@ -13769,7 +14381,7 @@ tr2:
 			goto _test_eof129
 		}
 	st_case_129:
-//line plugins/parsers/influx/machine.go:13773
+//line plugins/parsers/influx/machine.go:14385
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -13779,7 +14391,7 @@ tr2:
 			goto tr1
 		}
 		goto st2
-tr551:
+tr569:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13789,17 +14401,17 @@ tr551:
 	m.pb = m.p
 
 	goto st130
-tr701:
+tr724:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st130
-tr733:
+tr756:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -13809,27 +14421,37 @@ tr733:
 	m.handler.AddInt(key, m.text())
 
 	goto st130
-tr736:
+tr760:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st130
+tr764:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
 	goto st130
-tr743:
+tr771:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st130
-tr752:
+tr780:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13839,12 +14461,22 @@ tr752:
 	m.handler.AddInt(key, m.text())
 
 	goto st130
-tr755:
+tr784:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st130
+tr788:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -13854,7 +14486,7 @@ tr755:
 			goto _test_eof130
 		}
 	st_case_130:
-//line plugins/parsers/influx/machine.go:13858
+//line plugins/parsers/influx/machine.go:14490
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -13887,7 +14519,7 @@ tr250:
 			goto _test_eof131
 		}
 	st_case_131:
-//line plugins/parsers/influx/machine.go:13891
+//line plugins/parsers/influx/machine.go:14523
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -13914,28 +14546,28 @@ tr251:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st422
+	goto st434
 tr254:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st422
-	st422:
+	goto st434
+	st434:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof422
+			goto _test_eof434
 		}
-	st_case_422:
-//line plugins/parsers/influx/machine.go:13934
+	st_case_434:
+//line plugins/parsers/influx/machine.go:14566
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st423
+			goto st435
 		case 13:
 			goto tr330
 		case 32:
@@ -13951,16 +14583,16 @@ tr254:
 			goto st192
 		}
 		goto st83
-	st423:
+	st435:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof423
+			goto _test_eof435
 		}
-	st_case_423:
+	st_case_435:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st423
+			goto st435
 		case 13:
 			goto tr330
 		case 32:
@@ -13968,7 +14600,7 @@ tr254:
 		case 44:
 			goto tr201
 		case 45:
-			goto tr606
+			goto tr624
 		case 61:
 			goto tr163
 		case 92:
@@ -13977,13 +14609,13 @@ tr254:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr607
+				goto tr625
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st192
 		}
 		goto st83
-tr606:
+tr624:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13994,7 +14626,7 @@ tr606:
 			goto _test_eof132
 		}
 	st_case_132:
-//line plugins/parsers/influx/machine.go:13998
+//line plugins/parsers/influx/machine.go:14630
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr201
@@ -14012,421 +14644,29 @@ tr606:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st424
+				goto st436
 			}
 		default:
 			goto tr201
 		}
 		goto st83
-tr607:
+tr625:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st424
-	st424:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof424
-		}
-	st_case_424:
-//line plugins/parsers/influx/machine.go:14033
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st426
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-tr608:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st425
-	st425:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof425
-		}
-	st_case_425:
-//line plugins/parsers/influx/machine.go:14070
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st425
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr59
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st83
-	st426:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof426
-		}
-	st_case_426:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st427
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st427:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof427
-		}
-	st_case_427:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st428
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st428:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof428
-		}
-	st_case_428:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st429
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st429:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof429
-		}
-	st_case_429:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st430
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st430:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof430
-		}
-	st_case_430:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st431
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st431:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof431
-		}
-	st_case_431:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st432
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st432:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof432
-		}
-	st_case_432:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st433
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st433:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof433
-		}
-	st_case_433:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st434
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st434:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof434
-		}
-	st_case_434:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st435
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st435:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof435
-		}
-	st_case_435:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st436
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
+	goto st436
 	st436:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof436
 		}
 	st_case_436:
+//line plugins/parsers/influx/machine.go:14665
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st437
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st437:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof437
-		}
-	st_case_437:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14447,6 +14687,38 @@ tr608:
 			goto tr334
 		}
 		goto st83
+tr626:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st437
+	st437:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof437
+		}
+	st_case_437:
+//line plugins/parsers/influx/machine.go:14702
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st437
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr59
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st83
 	st438:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof438
@@ -14456,7 +14728,7 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14486,7 +14758,7 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14516,7 +14788,7 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14546,7 +14818,7 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14576,7 +14848,7 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14606,7 +14878,367 @@ tr608:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr608
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st444
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st444:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof444
+		}
+	st_case_444:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st445
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st445:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof445
+		}
+	st_case_445:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st446
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st446:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof446
+		}
+	st_case_446:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st447
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st447:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof447
+		}
+	st_case_447:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st448
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st448:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof448
+		}
+	st_case_448:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st449
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st449:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof449
+		}
+	st_case_449:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st450
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st450:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof450
+		}
+	st_case_450:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st451
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st451:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof451
+		}
+	st_case_451:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st452
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st452:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof452
+		}
+	st_case_452:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st453
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st453:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof453
+		}
+	st_case_453:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st454
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st454:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof454
+		}
+	st_case_454:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st455
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+	st455:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof455
+		}
+	st_case_455:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr626
 		case 13:
 			goto tr335
 		case 32:
@@ -14637,7 +15269,7 @@ tr255:
 			goto _test_eof133
 		}
 	st_case_133:
-//line plugins/parsers/influx/machine.go:14641
+//line plugins/parsers/influx/machine.go:15273
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -14682,46 +15314,46 @@ tr258:
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st444
-	st444:
+	goto st456
+	st456:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof444
+			goto _test_eof456
 		}
-	st_case_444:
-//line plugins/parsers/influx/machine.go:14696
+	st_case_456:
+//line plugins/parsers/influx/machine.go:15328
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr395
+			goto tr400
 		case 11:
-			goto tr629
+			goto tr647
 		case 13:
-			goto tr395
+			goto tr400
 		case 32:
-			goto tr628
+			goto tr646
 		case 34:
 			goto tr177
 		case 44:
-			goto tr630
+			goto tr648
 		case 61:
 			goto tr25
 		case 92:
 			goto tr179
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr628
+			goto tr646
 		}
 		goto tr174
-tr655:
+tr673:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st445
-tr628:
+	goto st457
+tr646:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14730,18 +15362,18 @@ tr628:
 
 	m.pb = m.p
 
-	goto st445
-tr683:
+	goto st457
+tr701:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st445
-tr689:
+	goto st457
+tr707:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14750,38 +15382,48 @@ tr689:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st445
-tr692:
+	goto st457
+tr711:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st457
+tr715:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st445
-	st445:
+	goto st457
+	st457:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof445
+			goto _test_eof457
 		}
-	st_case_445:
-//line plugins/parsers/influx/machine.go:14770
+	st_case_457:
+//line plugins/parsers/influx/machine.go:15412
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr632
+			goto tr650
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto st445
+			goto st457
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr633
+			goto tr651
 		case 61:
 			goto st7
 		case 92:
@@ -14790,39 +15432,39 @@ tr692:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr634
+				goto tr652
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st445
+			goto st457
 		}
 		goto tr186
-tr632:
+tr650:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st446
-	st446:
+	goto st458
+	st458:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof446
+			goto _test_eof458
 		}
-	st_case_446:
-//line plugins/parsers/influx/machine.go:14811
+	st_case_458:
+//line plugins/parsers/influx/machine.go:15453
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr632
+			goto tr650
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto st445
+			goto st457
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr633
+			goto tr651
 		case 61:
 			goto tr191
 		case 92:
@@ -14831,13 +15473,13 @@ tr632:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr634
+				goto tr652
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st445
+			goto st457
 		}
 		goto tr186
-tr633:
+tr651:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -14848,7 +15490,7 @@ tr633:
 			goto _test_eof134
 		}
 	st_case_134:
-//line plugins/parsers/influx/machine.go:14852
+//line plugins/parsers/influx/machine.go:15494
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -14868,451 +15510,33 @@ tr633:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st447
+				goto st459
 			}
 		default:
 			goto st7
 		}
 		goto st88
-tr634:
+tr652:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st447
-	st447:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof447
-		}
-	st_case_447:
-//line plugins/parsers/influx/machine.go:14889
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st449
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-tr635:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st448
-	st448:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof448
-		}
-	st_case_448:
-//line plugins/parsers/influx/machine.go:14928
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto st448
-		case 13:
-			goto tr398
-		case 32:
-			goto st250
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st250
-		}
-		goto st88
-	st449:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof449
-		}
-	st_case_449:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st450
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st450:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof450
-		}
-	st_case_450:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st451
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st451:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof451
-		}
-	st_case_451:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st452
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st452:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof452
-		}
-	st_case_452:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st453
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st453:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof453
-		}
-	st_case_453:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st454
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st454:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof454
-		}
-	st_case_454:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st455
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st455:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof455
-		}
-	st_case_455:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st456
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st456:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof456
-		}
-	st_case_456:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st457
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st457:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof457
-		}
-	st_case_457:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st458
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st458:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof458
-		}
-	st_case_458:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st459
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
+	goto st459
 	st459:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof459
 		}
 	st_case_459:
+//line plugins/parsers/influx/machine.go:15531
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st460
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr401
-		}
-		goto st88
-	st460:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof460
-		}
-	st_case_460:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr635
-		case 13:
-			goto tr402
-		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15328,7 +15552,41 @@ tr635:
 				goto st461
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
+		}
+		goto st88
+tr653:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st460
+	st460:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof460
+		}
+	st_case_460:
+//line plugins/parsers/influx/machine.go:15570
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto st460
+		case 13:
+			goto tr403
+		case 32:
+			goto st253
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st253
 		}
 		goto st88
 	st461:
@@ -15338,13 +15596,13 @@ tr635:
 	st_case_461:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15360,7 +15618,7 @@ tr635:
 				goto st462
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st88
 	st462:
@@ -15370,13 +15628,13 @@ tr635:
 	st_case_462:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15392,7 +15650,7 @@ tr635:
 				goto st463
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st88
 	st463:
@@ -15402,13 +15660,13 @@ tr635:
 	st_case_463:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15424,7 +15682,7 @@ tr635:
 				goto st464
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st88
 	st464:
@@ -15434,13 +15692,13 @@ tr635:
 	st_case_464:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15456,7 +15714,7 @@ tr635:
 				goto st465
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st88
 	st465:
@@ -15466,13 +15724,13 @@ tr635:
 	st_case_465:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15488,7 +15746,7 @@ tr635:
 				goto st466
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr401
+			goto tr406
 		}
 		goto st88
 	st466:
@@ -15498,13 +15756,397 @@ tr635:
 	st_case_466:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr635
+			goto tr653
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr401
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st467
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st467:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof467
+		}
+	st_case_467:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st468
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st468:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof468
+		}
+	st_case_468:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st469
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st469:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof469
+		}
+	st_case_469:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st470
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st470:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof470
+		}
+	st_case_470:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st471
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st471:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof471
+		}
+	st_case_471:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st472
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st472:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof472
+		}
+	st_case_472:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st473
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st473:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof473
+		}
+	st_case_473:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st474
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st474:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof474
+		}
+	st_case_474:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st475
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st475:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof475
+		}
+	st_case_475:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st476
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st476:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof476
+		}
+	st_case_476:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st477
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st477:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof477
+		}
+	st_case_477:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st478
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr406
+		}
+		goto st88
+	st478:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof478
+		}
+	st_case_478:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr653
+		case 13:
+			goto tr407
+		case 32:
+			goto tr406
 		case 34:
 			goto tr96
 		case 44:
@@ -15515,10 +16157,10 @@ tr635:
 			goto st90
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr401
+			goto tr406
 		}
 		goto st88
-tr629:
+tr647:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15527,18 +16169,18 @@ tr629:
 
 	m.pb = m.p
 
-	goto st467
-tr684:
+	goto st479
+tr702:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st467
-tr690:
+	goto st479
+tr708:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15547,38 +16189,48 @@ tr690:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st467
-tr693:
+	goto st479
+tr712:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st479
+tr716:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st467
-	st467:
+	goto st479
+	st479:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof467
+			goto _test_eof479
 		}
-	st_case_467:
-//line plugins/parsers/influx/machine.go:15567
+	st_case_479:
+//line plugins/parsers/influx/machine.go:16219
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr656
+			goto tr674
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr655
+			goto tr673
 		case 34:
 			goto tr195
 		case 44:
 			goto tr184
 		case 45:
-			goto tr657
+			goto tr675
 		case 61:
 			goto st7
 		case 92:
@@ -15587,13 +16239,13 @@ tr693:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr658
+				goto tr676
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr655
+			goto tr673
 		}
 		goto tr193
-tr656:
+tr674:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15602,28 +16254,28 @@ tr656:
 
 	m.pb = m.p
 
-	goto st468
-	st468:
+	goto st480
+	st480:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof468
+			goto _test_eof480
 		}
-	st_case_468:
-//line plugins/parsers/influx/machine.go:15612
+	st_case_480:
+//line plugins/parsers/influx/machine.go:16264
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr656
+			goto tr674
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr655
+			goto tr673
 		case 34:
 			goto tr195
 		case 44:
 			goto tr184
 		case 45:
-			goto tr657
+			goto tr675
 		case 61:
 			goto tr191
 		case 92:
@@ -15632,13 +16284,13 @@ tr656:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr658
+				goto tr676
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr655
+			goto tr673
 		}
 		goto tr193
-tr657:
+tr675:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -15649,7 +16301,7 @@ tr657:
 			goto _test_eof135
 		}
 	st_case_135:
-//line plugins/parsers/influx/machine.go:15653
+//line plugins/parsers/influx/machine.go:16305
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -15671,543 +16323,33 @@ tr657:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st469
+				goto st481
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr181
 		}
 		goto st93
-tr658:
+tr676:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st469
-	st469:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof469
-		}
-	st_case_469:
-//line plugins/parsers/influx/machine.go:15692
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st473
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-tr664:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st470
-tr659:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st470
-	st470:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof470
-		}
-	st_case_470:
-//line plugins/parsers/influx/machine.go:15741
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr663
-		case 13:
-			goto tr398
-		case 32:
-			goto st470
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr189
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st470
-		}
-		goto tr186
-tr663:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st471
-	st471:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof471
-		}
-	st_case_471:
-//line plugins/parsers/influx/machine.go:15775
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr663
-		case 13:
-			goto tr398
-		case 32:
-			goto st470
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto tr189
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st470
-		}
-		goto tr186
-tr665:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st472
-tr660:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st472
-	st472:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof472
-		}
-	st_case_472:
-//line plugins/parsers/influx/machine.go:15823
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr665
-		case 13:
-			goto tr398
-		case 32:
-			goto tr664
-		case 34:
-			goto tr195
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto tr196
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr664
-		}
-		goto tr193
-	st473:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof473
-		}
-	st_case_473:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st474
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st474:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof474
-		}
-	st_case_474:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st475
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st475:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof475
-		}
-	st_case_475:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st476
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st476:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof476
-		}
-	st_case_476:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st477
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st477:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof477
-		}
-	st_case_477:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st478
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st478:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof478
-		}
-	st_case_478:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st479
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st479:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof479
-		}
-	st_case_479:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st480
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st480:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof480
-		}
-	st_case_480:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st481
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
+	goto st481
 	st481:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof481
 		}
 	st_case_481:
+//line plugins/parsers/influx/machine.go:16344
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st482
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st482:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof482
-		}
-	st_case_482:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st483
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st483:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof483
-		}
-	st_case_483:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st484
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr659
-		}
-		goto st93
-	st484:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof484
-		}
-	st_case_484:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr660
-		case 13:
-			goto tr402
-		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16223,9 +16365,135 @@ tr660:
 				goto st485
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
+tr682:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st482
+tr677:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st482
+	st482:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof482
+		}
+	st_case_482:
+//line plugins/parsers/influx/machine.go:16393
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr681
+		case 13:
+			goto tr403
+		case 32:
+			goto st482
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st482
+		}
+		goto tr186
+tr681:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st483
+	st483:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof483
+		}
+	st_case_483:
+//line plugins/parsers/influx/machine.go:16427
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr681
+		case 13:
+			goto tr403
+		case 32:
+			goto st482
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto tr189
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st482
+		}
+		goto tr186
+tr683:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st484
+tr678:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st484
+	st484:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof484
+		}
+	st_case_484:
+//line plugins/parsers/influx/machine.go:16475
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr683
+		case 13:
+			goto tr403
+		case 32:
+			goto tr682
+		case 34:
+			goto tr195
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto tr196
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr682
+		}
+		goto tr193
 	st485:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof485
@@ -16233,13 +16501,13 @@ tr660:
 	st_case_485:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16255,7 +16523,7 @@ tr660:
 				goto st486
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
 	st486:
@@ -16265,13 +16533,13 @@ tr660:
 	st_case_486:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16287,7 +16555,7 @@ tr660:
 				goto st487
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
 	st487:
@@ -16297,13 +16565,13 @@ tr660:
 	st_case_487:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16319,7 +16587,7 @@ tr660:
 				goto st488
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
 	st488:
@@ -16329,13 +16597,13 @@ tr660:
 	st_case_488:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16351,7 +16619,7 @@ tr660:
 				goto st489
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
 	st489:
@@ -16361,13 +16629,13 @@ tr660:
 	st_case_489:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16383,7 +16651,7 @@ tr660:
 				goto st490
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr659
+			goto tr677
 		}
 		goto st93
 	st490:
@@ -16393,13 +16661,397 @@ tr660:
 	st_case_490:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr660
+			goto tr678
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr659
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st491
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st491:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof491
+		}
+	st_case_491:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st492
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st492:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof492
+		}
+	st_case_492:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st493
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st493:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof493
+		}
+	st_case_493:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st494
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st494:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof494
+		}
+	st_case_494:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st495
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st495:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof495
+		}
+	st_case_495:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st496
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st496:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof496
+		}
+	st_case_496:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st497
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st497:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof497
+		}
+	st_case_497:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st498
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st498:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof498
+		}
+	st_case_498:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st499
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st499:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof499
+		}
+	st_case_499:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st500
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st500:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof500
+		}
+	st_case_500:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st501
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st501:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof501
+		}
+	st_case_501:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st502
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr677
+		}
+		goto st93
+	st502:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof502
+		}
+	st_case_502:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr678
+		case 13:
+			goto tr407
+		case 32:
+			goto tr677
 		case 34:
 			goto tr199
 		case 44:
@@ -16410,10 +17062,10 @@ tr660:
 			goto st102
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr659
+			goto tr677
 		}
 		goto st93
-tr630:
+tr648:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16423,17 +17075,17 @@ tr630:
 	m.pb = m.p
 
 	goto st136
-tr685:
+tr703:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st136
-tr691:
+tr709:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16443,12 +17095,22 @@ tr691:
 	m.handler.AddInt(key, m.text())
 
 	goto st136
-tr694:
+tr713:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st136
+tr717:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -16458,7 +17120,7 @@ tr694:
 			goto _test_eof136
 		}
 	st_case_136:
-//line plugins/parsers/influx/machine.go:16462
+//line plugins/parsers/influx/machine.go:17124
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -16491,7 +17153,7 @@ tr269:
 			goto _test_eof137
 		}
 	st_case_137:
-//line plugins/parsers/influx/machine.go:16495
+//line plugins/parsers/influx/machine.go:17157
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -16528,7 +17190,7 @@ tr272:
 			goto _test_eof138
 		}
 	st_case_138:
-//line plugins/parsers/influx/machine.go:16532
+//line plugins/parsers/influx/machine.go:17194
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -16579,7 +17241,7 @@ tr274:
 			goto _test_eof139
 		}
 	st_case_139:
-//line plugins/parsers/influx/machine.go:16583
+//line plugins/parsers/influx/machine.go:17245
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -16594,7 +17256,7 @@ tr274:
 		case 44:
 			goto tr184
 		case 48:
-			goto st491
+			goto st503
 		case 61:
 			goto st7
 		case 92:
@@ -16603,39 +17265,32 @@ tr274:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st496
+				goto st508
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr181
 		}
 		goto st86
-tr276:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st491
-	st491:
+	st503:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof491
+			goto _test_eof503
 		}
-	st_case_491:
-//line plugins/parsers/influx/machine.go:16624
+	st_case_503:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr684
+			goto tr702
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr683
+			goto tr701
 		case 34:
 			goto tr183
 		case 44:
-			goto tr685
+			goto tr703
 		case 46:
-			goto st492
+			goto st504
 		case 61:
 			goto st7
 		case 69:
@@ -16645,10 +17300,10 @@ tr276:
 		case 101:
 			goto st140
 		case 105:
-			goto st495
+			goto st507
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr683
+			goto tr701
 		}
 		goto st86
 tr275:
@@ -16656,26 +17311,26 @@ tr275:
 
 	m.pb = m.p
 
-	goto st492
-	st492:
+	goto st504
+	st504:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof492
+			goto _test_eof504
 		}
-	st_case_492:
-//line plugins/parsers/influx/machine.go:16666
+	st_case_504:
+//line plugins/parsers/influx/machine.go:17321
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr684
+			goto tr702
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr683
+			goto tr701
 		case 34:
 			goto tr183
 		case 44:
-			goto tr685
+			goto tr703
 		case 61:
 			goto st7
 		case 69:
@@ -16688,10 +17343,10 @@ tr275:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st492
+				goto st504
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr683
+			goto tr701
 		}
 		goto st86
 	st140:
@@ -16724,35 +17379,35 @@ tr275:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st494
+				goto st506
 			}
 		default:
 			goto st141
 		}
 		goto st86
 tr284:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st493
-	st493:
+	goto st505
+	st505:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof493
+			goto _test_eof505
 		}
-	st_case_493:
-//line plugins/parsers/influx/machine.go:16745
+	st_case_505:
+//line plugins/parsers/influx/machine.go:17400
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr532
+			goto tr545
 		case 13:
 			goto tr330
 		case 32:
-			goto tr481
+			goto tr494
 		case 44:
-			goto tr483
+			goto tr496
 		case 61:
 			goto tr201
 		case 92:
@@ -16761,10 +17416,10 @@ tr284:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
+				goto st374
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr481
+			goto tr494
 		}
 		goto st30
 	st141:
@@ -16793,30 +17448,30 @@ tr284:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st494
+				goto st506
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr181
 		}
 		goto st86
-	st494:
+	st506:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof494
+			goto _test_eof506
 		}
-	st_case_494:
+	st_case_506:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr684
+			goto tr702
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr683
+			goto tr701
 		case 34:
 			goto tr183
 		case 44:
-			goto tr685
+			goto tr703
 		case 61:
 			goto st7
 		case 92:
@@ -16825,66 +17480,59 @@ tr284:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st494
+				goto st506
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr683
+			goto tr701
 		}
 		goto st86
-	st495:
+	st507:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof495
+			goto _test_eof507
 		}
-	st_case_495:
+	st_case_507:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr430
+			goto tr435
 		case 11:
-			goto tr690
+			goto tr708
 		case 13:
-			goto tr430
+			goto tr435
 		case 32:
-			goto tr689
+			goto tr707
 		case 34:
 			goto tr183
 		case 44:
-			goto tr691
+			goto tr709
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr689
+			goto tr707
 		}
 		goto st86
-tr277:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st496
-	st496:
+	st508:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof496
+			goto _test_eof508
 		}
-	st_case_496:
-//line plugins/parsers/influx/machine.go:16873
+	st_case_508:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr684
+			goto tr702
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr683
+			goto tr701
 		case 34:
 			goto tr183
 		case 44:
-			goto tr685
+			goto tr703
 		case 46:
-			goto st492
+			goto st504
 		case 61:
 			goto st7
 		case 69:
@@ -16894,15 +17542,135 @@ tr277:
 		case 101:
 			goto st140
 		case 105:
-			goto st495
+			goto st507
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st496
+				goto st508
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr683
+			goto tr701
+		}
+		goto st86
+tr276:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st509
+	st509:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof509
+		}
+	st_case_509:
+//line plugins/parsers/influx/machine.go:17568
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr702
+		case 13:
+			goto tr429
+		case 32:
+			goto tr701
+		case 34:
+			goto tr183
+		case 44:
+			goto tr703
+		case 46:
+			goto st504
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		case 105:
+			goto st507
+		case 117:
+			goto st510
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr701
+		}
+		goto st86
+	st510:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof510
+		}
+	st_case_510:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr439
+		case 11:
+			goto tr712
+		case 13:
+			goto tr439
+		case 32:
+			goto tr711
+		case 34:
+			goto tr183
+		case 44:
+			goto tr713
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr711
+		}
+		goto st86
+tr277:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st511
+	st511:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof511
+		}
+	st_case_511:
+//line plugins/parsers/influx/machine.go:17639
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr702
+		case 13:
+			goto tr429
+		case 32:
+			goto tr701
+		case 34:
+			goto tr183
+		case 44:
+			goto tr703
+		case 46:
+			goto st504
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		case 105:
+			goto st507
+		case 117:
+			goto st510
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st511
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr701
 		}
 		goto st86
 tr278:
@@ -16910,26 +17678,26 @@ tr278:
 
 	m.pb = m.p
 
-	goto st497
-	st497:
+	goto st512
+	st512:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof497
+			goto _test_eof512
 		}
-	st_case_497:
-//line plugins/parsers/influx/machine.go:16920
+	st_case_512:
+//line plugins/parsers/influx/machine.go:17688
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr693
+			goto tr716
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr692
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr694
+			goto tr717
 		case 61:
 			goto st7
 		case 65:
@@ -16940,7 +17708,7 @@ tr278:
 			goto st145
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr692
+			goto tr715
 		}
 		goto st86
 	st142:
@@ -17022,7 +17790,7 @@ tr278:
 		case 61:
 			goto st7
 		case 69:
-			goto st498
+			goto st513
 		case 92:
 			goto st100
 		}
@@ -17030,31 +17798,31 @@ tr278:
 			goto tr181
 		}
 		goto st86
-	st498:
+	st513:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof498
+			goto _test_eof513
 		}
-	st_case_498:
+	st_case_513:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr693
+			goto tr716
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr692
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr694
+			goto tr717
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr692
+			goto tr715
 		}
 		goto st86
 	st145:
@@ -17138,7 +17906,7 @@ tr278:
 		case 92:
 			goto st100
 		case 101:
-			goto st498
+			goto st513
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr181
@@ -17149,26 +17917,26 @@ tr279:
 
 	m.pb = m.p
 
-	goto st499
-	st499:
+	goto st514
+	st514:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof499
+			goto _test_eof514
 		}
-	st_case_499:
-//line plugins/parsers/influx/machine.go:17159
+	st_case_514:
+//line plugins/parsers/influx/machine.go:17927
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr693
+			goto tr716
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr692
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr694
+			goto tr717
 		case 61:
 			goto st7
 		case 82:
@@ -17179,7 +17947,7 @@ tr279:
 			goto st149
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr692
+			goto tr715
 		}
 		goto st86
 	st148:
@@ -17245,26 +18013,26 @@ tr280:
 
 	m.pb = m.p
 
-	goto st500
-	st500:
+	goto st515
+	st515:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof500
+			goto _test_eof515
 		}
-	st_case_500:
-//line plugins/parsers/influx/machine.go:17255
+	st_case_515:
+//line plugins/parsers/influx/machine.go:18023
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr693
+			goto tr716
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr692
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr694
+			goto tr717
 		case 61:
 			goto st7
 		case 92:
@@ -17273,7 +18041,7 @@ tr280:
 			goto st145
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr692
+			goto tr715
 		}
 		goto st86
 tr281:
@@ -17281,26 +18049,26 @@ tr281:
 
 	m.pb = m.p
 
-	goto st501
-	st501:
+	goto st516
+	st516:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof501
+			goto _test_eof516
 		}
-	st_case_501:
-//line plugins/parsers/influx/machine.go:17291
+	st_case_516:
+//line plugins/parsers/influx/machine.go:18059
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr693
+			goto tr716
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr692
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr694
+			goto tr717
 		case 61:
 			goto st7
 		case 92:
@@ -17309,7 +18077,7 @@ tr281:
 			goto st149
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr692
+			goto tr715
 		}
 		goto st86
 tr270:
@@ -17323,7 +18091,7 @@ tr270:
 			goto _test_eof150
 		}
 	st_case_150:
-//line plugins/parsers/influx/machine.go:17327
+//line plugins/parsers/influx/machine.go:18095
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st137
@@ -17350,7 +18118,7 @@ tr259:
 			goto _test_eof151
 		}
 	st_case_151:
-//line plugins/parsers/influx/machine.go:17354
+//line plugins/parsers/influx/machine.go:18122
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -17365,7 +18133,7 @@ tr259:
 		case 44:
 			goto tr231
 		case 48:
-			goto st502
+			goto st517
 		case 61:
 			goto st7
 		case 92:
@@ -17374,39 +18142,32 @@ tr259:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st528
+				goto st543
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr229
 		}
 		goto st118
-tr261:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st502
-	st502:
+	st517:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof502
+			goto _test_eof517
 		}
-	st_case_502:
-//line plugins/parsers/influx/machine.go:17395
+	st_case_517:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr700
+			goto tr723
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr699
+			goto tr722
 		case 34:
 			goto tr183
 		case 44:
-			goto tr701
+			goto tr724
 		case 46:
-			goto st525
+			goto st540
 		case 61:
 			goto st7
 		case 69:
@@ -17416,23 +18177,23 @@ tr261:
 		case 101:
 			goto st153
 		case 105:
-			goto st527
+			goto st542
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr699
+			goto tr722
 		}
 		goto st118
-tr700:
+tr723:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:92
+//line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st503
-tr732:
+	goto st518
+tr755:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17441,38 +18202,48 @@ tr732:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st503
-tr735:
+	goto st518
+tr759:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st518
+tr763:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st503
-	st503:
+	goto st518
+	st518:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof503
+			goto _test_eof518
 		}
-	st_case_503:
-//line plugins/parsers/influx/machine.go:17461
+	st_case_518:
+//line plugins/parsers/influx/machine.go:18232
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr706
+			goto tr729
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr705
+			goto tr728
 		case 34:
 			goto tr195
 		case 44:
 			goto tr231
 		case 45:
-			goto tr707
+			goto tr730
 		case 61:
 			goto st7
 		case 92:
@@ -17481,13 +18252,13 @@ tr735:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr708
+				goto tr731
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr705
+			goto tr728
 		}
 		goto tr233
-tr706:
+tr729:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17496,28 +18267,28 @@ tr706:
 
 	m.pb = m.p
 
-	goto st504
-	st504:
+	goto st519
+	st519:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof504
+			goto _test_eof519
 		}
-	st_case_504:
-//line plugins/parsers/influx/machine.go:17506
+	st_case_519:
+//line plugins/parsers/influx/machine.go:18277
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr398
+			goto tr403
 		case 11:
-			goto tr706
+			goto tr729
 		case 13:
-			goto tr398
+			goto tr403
 		case 32:
-			goto tr705
+			goto tr728
 		case 34:
 			goto tr195
 		case 44:
 			goto tr231
 		case 45:
-			goto tr707
+			goto tr730
 		case 61:
 			goto tr97
 		case 92:
@@ -17526,13 +18297,13 @@ tr706:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr708
+				goto tr731
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr705
+			goto tr728
 		}
 		goto tr233
-tr707:
+tr730:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -17543,7 +18314,7 @@ tr707:
 			goto _test_eof152
 		}
 	st_case_152:
-//line plugins/parsers/influx/machine.go:17547
+//line plugins/parsers/influx/machine.go:18318
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -17565,561 +18336,33 @@ tr707:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st505
+				goto st520
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr229
 		}
 		goto st120
-tr708:
+tr731:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st505
-	st505:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof505
-		}
-	st_case_505:
-//line plugins/parsers/influx/machine.go:17586
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st507
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-tr713:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st506
-tr710:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st506
-	st506:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof506
-		}
-	st_case_506:
-//line plugins/parsers/influx/machine.go:17639
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr398
-		case 11:
-			goto tr713
-		case 13:
-			goto tr398
-		case 32:
-			goto tr712
-		case 34:
-			goto tr195
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto tr235
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr712
-		}
-		goto tr233
-	st507:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof507
-		}
-	st_case_507:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st508
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st508:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof508
-		}
-	st_case_508:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st509
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st509:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof509
-		}
-	st_case_509:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st510
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st510:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof510
-		}
-	st_case_510:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st511
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st511:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof511
-		}
-	st_case_511:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st512
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st512:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof512
-		}
-	st_case_512:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st513
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st513:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof513
-		}
-	st_case_513:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st514
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st514:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof514
-		}
-	st_case_514:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st515
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st515:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof515
-		}
-	st_case_515:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st516
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st516:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof516
-		}
-	st_case_516:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st517
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st517:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof517
-		}
-	st_case_517:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st518
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st518:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof518
-		}
-	st_case_518:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st519
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st519:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof519
-		}
-	st_case_519:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st520
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
+	goto st520
 	st520:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof520
 		}
 	st_case_520:
+//line plugins/parsers/influx/machine.go:18357
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr710
+			goto tr733
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr709
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st521
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr709
-		}
-		goto st120
-	st521:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof521
-		}
-	st_case_521:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr402
-		case 11:
-			goto tr710
-		case 13:
-			goto tr402
-		case 32:
-			goto tr709
+			goto tr732
 		case 34:
 			goto tr199
 		case 44:
@@ -18135,9 +18378,57 @@ tr710:
 				goto st522
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr709
+			goto tr732
 		}
 		goto st120
+tr736:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st521
+tr733:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st521
+	st521:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof521
+		}
+	st_case_521:
+//line plugins/parsers/influx/machine.go:18410
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr403
+		case 11:
+			goto tr736
+		case 13:
+			goto tr403
+		case 32:
+			goto tr735
+		case 34:
+			goto tr195
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto tr235
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr735
+		}
+		goto tr233
 	st522:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof522
@@ -18145,13 +18436,13 @@ tr710:
 	st_case_522:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr710
+			goto tr733
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr709
+			goto tr732
 		case 34:
 			goto tr199
 		case 44:
@@ -18167,7 +18458,7 @@ tr710:
 				goto st523
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr709
+			goto tr732
 		}
 		goto st120
 	st523:
@@ -18177,13 +18468,13 @@ tr710:
 	st_case_523:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr710
+			goto tr733
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr709
+			goto tr732
 		case 34:
 			goto tr199
 		case 44:
@@ -18199,7 +18490,7 @@ tr710:
 				goto st524
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr709
+			goto tr732
 		}
 		goto st120
 	st524:
@@ -18209,13 +18500,493 @@ tr710:
 	st_case_524:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr402
+			goto tr407
 		case 11:
-			goto tr710
+			goto tr733
 		case 13:
-			goto tr402
+			goto tr407
 		case 32:
-			goto tr709
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st525
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st525:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof525
+		}
+	st_case_525:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st526
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st526:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof526
+		}
+	st_case_526:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st527
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st527:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof527
+		}
+	st_case_527:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st528
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st528:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof528
+		}
+	st_case_528:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st529
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st529:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof529
+		}
+	st_case_529:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st530
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st530:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof530
+		}
+	st_case_530:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st531
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st531:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof531
+		}
+	st_case_531:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st532
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st532:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof532
+		}
+	st_case_532:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st533
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st533:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof533
+		}
+	st_case_533:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st534
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st534:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof534
+		}
+	st_case_534:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st535
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st535:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof535
+		}
+	st_case_535:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st536
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st536:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof536
+		}
+	st_case_536:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st537:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof537
+		}
+	st_case_537:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st538
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st538:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof538
+		}
+	st_case_538:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st539
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr732
+		}
+		goto st120
+	st539:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof539
+		}
+	st_case_539:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr407
+		case 11:
+			goto tr733
+		case 13:
+			goto tr407
+		case 32:
+			goto tr732
 		case 34:
 			goto tr199
 		case 44:
@@ -18226,7 +18997,7 @@ tr710:
 			goto st122
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr709
+			goto tr732
 		}
 		goto st120
 tr260:
@@ -18234,26 +19005,26 @@ tr260:
 
 	m.pb = m.p
 
-	goto st525
-	st525:
+	goto st540
+	st540:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof525
+			goto _test_eof540
 		}
-	st_case_525:
-//line plugins/parsers/influx/machine.go:18244
+	st_case_540:
+//line plugins/parsers/influx/machine.go:19015
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr700
+			goto tr723
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr699
+			goto tr722
 		case 34:
 			goto tr183
 		case 44:
-			goto tr701
+			goto tr724
 		case 61:
 			goto st7
 		case 69:
@@ -18266,10 +19037,10 @@ tr260:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st525
+				goto st540
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr699
+			goto tr722
 		}
 		goto st118
 	st153:
@@ -18302,7 +19073,7 @@ tr260:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st526
+				goto st541
 			}
 		default:
 			goto st154
@@ -18334,30 +19105,30 @@ tr260:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st526
+				goto st541
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr229
 		}
 		goto st118
-	st526:
+	st541:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof526
+			goto _test_eof541
 		}
-	st_case_526:
+	st_case_541:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr700
+			goto tr723
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr699
+			goto tr722
 		case 34:
 			goto tr183
 		case 44:
-			goto tr701
+			goto tr724
 		case 61:
 			goto st7
 		case 92:
@@ -18366,66 +19137,59 @@ tr260:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st526
+				goto st541
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr699
+			goto tr722
 		}
 		goto st118
-	st527:
+	st542:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof527
+			goto _test_eof542
 		}
-	st_case_527:
+	st_case_542:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr430
+			goto tr435
 		case 11:
-			goto tr732
+			goto tr755
 		case 13:
-			goto tr430
+			goto tr435
 		case 32:
-			goto tr731
+			goto tr754
 		case 34:
 			goto tr183
 		case 44:
-			goto tr733
+			goto tr756
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr731
+			goto tr754
 		}
 		goto st118
-tr262:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st528
-	st528:
+	st543:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof528
+			goto _test_eof543
 		}
-	st_case_528:
-//line plugins/parsers/influx/machine.go:18414
+	st_case_543:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr700
+			goto tr723
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr699
+			goto tr722
 		case 34:
 			goto tr183
 		case 44:
-			goto tr701
+			goto tr724
 		case 46:
-			goto st525
+			goto st540
 		case 61:
 			goto st7
 		case 69:
@@ -18435,15 +19199,135 @@ tr262:
 		case 101:
 			goto st153
 		case 105:
-			goto st527
+			goto st542
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st528
+				goto st543
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr699
+			goto tr722
+		}
+		goto st118
+tr261:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st544
+	st544:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof544
+		}
+	st_case_544:
+//line plugins/parsers/influx/machine.go:19225
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr723
+		case 13:
+			goto tr429
+		case 32:
+			goto tr722
+		case 34:
+			goto tr183
+		case 44:
+			goto tr724
+		case 46:
+			goto st540
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		case 105:
+			goto st542
+		case 117:
+			goto st545
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr722
+		}
+		goto st118
+	st545:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof545
+		}
+	st_case_545:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr439
+		case 11:
+			goto tr759
+		case 13:
+			goto tr439
+		case 32:
+			goto tr758
+		case 34:
+			goto tr183
+		case 44:
+			goto tr760
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr758
+		}
+		goto st118
+tr262:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st546
+	st546:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof546
+		}
+	st_case_546:
+//line plugins/parsers/influx/machine.go:19296
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr723
+		case 13:
+			goto tr429
+		case 32:
+			goto tr722
+		case 34:
+			goto tr183
+		case 44:
+			goto tr724
+		case 46:
+			goto st540
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		case 105:
+			goto st542
+		case 117:
+			goto st545
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st546
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr722
 		}
 		goto st118
 tr263:
@@ -18451,26 +19335,26 @@ tr263:
 
 	m.pb = m.p
 
-	goto st529
-	st529:
+	goto st547
+	st547:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof529
+			goto _test_eof547
 		}
-	st_case_529:
-//line plugins/parsers/influx/machine.go:18461
+	st_case_547:
+//line plugins/parsers/influx/machine.go:19345
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr735
+			goto tr763
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr734
+			goto tr762
 		case 34:
 			goto tr183
 		case 44:
-			goto tr736
+			goto tr764
 		case 61:
 			goto st7
 		case 65:
@@ -18481,7 +19365,7 @@ tr263:
 			goto st158
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr734
+			goto tr762
 		}
 		goto st118
 	st155:
@@ -18563,7 +19447,7 @@ tr263:
 		case 61:
 			goto st7
 		case 69:
-			goto st530
+			goto st548
 		case 92:
 			goto st123
 		}
@@ -18571,31 +19455,31 @@ tr263:
 			goto tr229
 		}
 		goto st118
-	st530:
+	st548:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof530
+			goto _test_eof548
 		}
-	st_case_530:
+	st_case_548:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr735
+			goto tr763
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr734
+			goto tr762
 		case 34:
 			goto tr183
 		case 44:
-			goto tr736
+			goto tr764
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr734
+			goto tr762
 		}
 		goto st118
 	st158:
@@ -18679,7 +19563,7 @@ tr263:
 		case 92:
 			goto st123
 		case 101:
-			goto st530
+			goto st548
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr229
@@ -18690,26 +19574,26 @@ tr264:
 
 	m.pb = m.p
 
-	goto st531
-	st531:
+	goto st549
+	st549:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof531
+			goto _test_eof549
 		}
-	st_case_531:
-//line plugins/parsers/influx/machine.go:18700
+	st_case_549:
+//line plugins/parsers/influx/machine.go:19584
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr735
+			goto tr763
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr734
+			goto tr762
 		case 34:
 			goto tr183
 		case 44:
-			goto tr736
+			goto tr764
 		case 61:
 			goto st7
 		case 82:
@@ -18720,7 +19604,7 @@ tr264:
 			goto st162
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr734
+			goto tr762
 		}
 		goto st118
 	st161:
@@ -18786,26 +19670,26 @@ tr265:
 
 	m.pb = m.p
 
-	goto st532
-	st532:
+	goto st550
+	st550:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof532
+			goto _test_eof550
 		}
-	st_case_532:
-//line plugins/parsers/influx/machine.go:18796
+	st_case_550:
+//line plugins/parsers/influx/machine.go:19680
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr735
+			goto tr763
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr734
+			goto tr762
 		case 34:
 			goto tr183
 		case 44:
-			goto tr736
+			goto tr764
 		case 61:
 			goto st7
 		case 92:
@@ -18814,7 +19698,7 @@ tr265:
 			goto st158
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr734
+			goto tr762
 		}
 		goto st118
 tr266:
@@ -18822,26 +19706,26 @@ tr266:
 
 	m.pb = m.p
 
-	goto st533
-	st533:
+	goto st551
+	st551:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof533
+			goto _test_eof551
 		}
-	st_case_533:
-//line plugins/parsers/influx/machine.go:18832
+	st_case_551:
+//line plugins/parsers/influx/machine.go:19716
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr735
+			goto tr763
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr734
+			goto tr762
 		case 34:
 			goto tr183
 		case 44:
-			goto tr736
+			goto tr764
 		case 61:
 			goto st7
 		case 92:
@@ -18850,7 +19734,7 @@ tr266:
 			goto st162
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr734
+			goto tr762
 		}
 		goto st118
 tr252:
@@ -18864,7 +19748,7 @@ tr252:
 			goto _test_eof163
 		}
 	st_case_163:
-//line plugins/parsers/influx/machine.go:18868
+//line plugins/parsers/influx/machine.go:19752
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st131
@@ -18891,7 +19775,7 @@ tr83:
 			goto _test_eof164
 		}
 	st_case_164:
-//line plugins/parsers/influx/machine.go:18895
+//line plugins/parsers/influx/machine.go:19779
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st39
@@ -18918,7 +19802,7 @@ tr240:
 			goto _test_eof165
 		}
 	st_case_165:
-//line plugins/parsers/influx/machine.go:18922
+//line plugins/parsers/influx/machine.go:19806
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -18933,46 +19817,39 @@ tr240:
 		case 44:
 			goto tr88
 		case 48:
-			goto st534
+			goto st552
 		case 92:
 			goto st164
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
+				goto st558
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr85
 		}
 		goto st39
-tr242:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st534
-	st534:
+	st552:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof534
+			goto _test_eof552
 		}
-	st_case_534:
-//line plugins/parsers/influx/machine.go:18961
+	st_case_552:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr742
+			goto tr770
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr741
+			goto tr769
 		case 34:
 			goto tr87
 		case 44:
-			goto tr743
+			goto tr771
 		case 46:
-			goto st535
+			goto st553
 		case 69:
 			goto st166
 		case 92:
@@ -18980,10 +19857,10 @@ tr242:
 		case 101:
 			goto st166
 		case 105:
-			goto st539
+			goto st557
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr741
+			goto tr769
 		}
 		goto st39
 tr241:
@@ -18991,26 +19868,26 @@ tr241:
 
 	m.pb = m.p
 
-	goto st535
-	st535:
+	goto st553
+	st553:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof535
+			goto _test_eof553
 		}
-	st_case_535:
-//line plugins/parsers/influx/machine.go:19001
+	st_case_553:
+//line plugins/parsers/influx/machine.go:19878
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr742
+			goto tr770
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr741
+			goto tr769
 		case 34:
 			goto tr87
 		case 44:
-			goto tr743
+			goto tr771
 		case 69:
 			goto st166
 		case 92:
@@ -19021,10 +19898,10 @@ tr241:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st535
+				goto st553
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr741
+			goto tr769
 		}
 		goto st39
 	st166:
@@ -19055,73 +19932,73 @@ tr241:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st538
+				goto st556
 			}
 		default:
 			goto st167
 		}
 		goto st39
 tr304:
-//line plugins/parsers/influx/machine.go.rl:100
+//line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st536
-	st536:
+	goto st554
+	st554:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof536
+			goto _test_eof554
 		}
-	st_case_536:
-//line plugins/parsers/influx/machine.go:19076
+	st_case_554:
+//line plugins/parsers/influx/machine.go:19953
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr604
+			goto tr622
 		case 13:
 			goto tr330
 		case 32:
-			goto tr449
+			goto tr462
 		case 44:
-			goto tr451
+			goto tr464
 		case 92:
 			goto st129
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
+				goto st555
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr449
+			goto tr462
 		}
 		goto st2
-	st537:
+	st555:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof537
+			goto _test_eof555
 		}
-	st_case_537:
+	st_case_555:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr748
+			goto tr776
 		case 13:
 			goto tr356
 		case 32:
-			goto tr747
+			goto tr775
 		case 44:
-			goto tr749
+			goto tr777
 		case 92:
 			goto st129
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
+				goto st555
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr747
+			goto tr775
 		}
 		goto st2
 	st167:
@@ -19148,94 +20025,87 @@ tr304:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st538
+				goto st556
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr85
 		}
 		goto st39
-	st538:
+	st556:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof538
+			goto _test_eof556
 		}
-	st_case_538:
+	st_case_556:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr742
+			goto tr770
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr741
+			goto tr769
 		case 34:
 			goto tr87
 		case 44:
-			goto tr743
+			goto tr771
 		case 92:
 			goto st164
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st538
+				goto st556
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr741
+			goto tr769
 		}
 		goto st39
-	st539:
+	st557:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof539
+			goto _test_eof557
 		}
-	st_case_539:
+	st_case_557:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr430
+			goto tr435
 		case 11:
-			goto tr751
+			goto tr779
 		case 13:
-			goto tr430
+			goto tr435
 		case 32:
-			goto tr750
+			goto tr778
 		case 34:
 			goto tr87
 		case 44:
-			goto tr752
+			goto tr780
 		case 92:
 			goto st164
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr750
+			goto tr778
 		}
 		goto st39
-tr243:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st540
-	st540:
+	st558:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof540
+			goto _test_eof558
 		}
-	st_case_540:
-//line plugins/parsers/influx/machine.go:19224
+	st_case_558:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr424
+			goto tr429
 		case 11:
-			goto tr742
+			goto tr770
 		case 13:
-			goto tr424
+			goto tr429
 		case 32:
-			goto tr741
+			goto tr769
 		case 34:
 			goto tr87
 		case 44:
-			goto tr743
+			goto tr771
 		case 46:
-			goto st535
+			goto st553
 		case 69:
 			goto st166
 		case 92:
@@ -19243,15 +20113,129 @@ tr243:
 		case 101:
 			goto st166
 		case 105:
-			goto st539
+			goto st557
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
+				goto st558
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr741
+			goto tr769
+		}
+		goto st39
+tr242:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st559
+	st559:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof559
+		}
+	st_case_559:
+//line plugins/parsers/influx/machine.go:20139
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr770
+		case 13:
+			goto tr429
+		case 32:
+			goto tr769
+		case 34:
+			goto tr87
+		case 44:
+			goto tr771
+		case 46:
+			goto st553
+		case 69:
+			goto st166
+		case 92:
+			goto st164
+		case 101:
+			goto st166
+		case 105:
+			goto st557
+		case 117:
+			goto st560
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr769
+		}
+		goto st39
+	st560:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof560
+		}
+	st_case_560:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr439
+		case 11:
+			goto tr783
+		case 13:
+			goto tr439
+		case 32:
+			goto tr782
+		case 34:
+			goto tr87
+		case 44:
+			goto tr784
+		case 92:
+			goto st164
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr782
+		}
+		goto st39
+tr243:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st561
+	st561:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof561
+		}
+	st_case_561:
+//line plugins/parsers/influx/machine.go:20206
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr429
+		case 11:
+			goto tr770
+		case 13:
+			goto tr429
+		case 32:
+			goto tr769
+		case 34:
+			goto tr87
+		case 44:
+			goto tr771
+		case 46:
+			goto st553
+		case 69:
+			goto st166
+		case 92:
+			goto st164
+		case 101:
+			goto st166
+		case 105:
+			goto st557
+		case 117:
+			goto st560
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st561
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr769
 		}
 		goto st39
 tr244:
@@ -19259,26 +20243,26 @@ tr244:
 
 	m.pb = m.p
 
-	goto st541
-	st541:
+	goto st562
+	st562:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof541
+			goto _test_eof562
 		}
-	st_case_541:
-//line plugins/parsers/influx/machine.go:19269
+	st_case_562:
+//line plugins/parsers/influx/machine.go:20253
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr754
+			goto tr787
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr753
+			goto tr786
 		case 34:
 			goto tr87
 		case 44:
-			goto tr755
+			goto tr788
 		case 65:
 			goto st168
 		case 92:
@@ -19287,7 +20271,7 @@ tr244:
 			goto st171
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr753
+			goto tr786
 		}
 		goto st39
 	st168:
@@ -19363,7 +20347,7 @@ tr244:
 		case 44:
 			goto tr88
 		case 69:
-			goto st542
+			goto st563
 		case 92:
 			goto st164
 		}
@@ -19371,29 +20355,29 @@ tr244:
 			goto tr85
 		}
 		goto st39
-	st542:
+	st563:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof542
+			goto _test_eof563
 		}
-	st_case_542:
+	st_case_563:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr754
+			goto tr787
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr753
+			goto tr786
 		case 34:
 			goto tr87
 		case 44:
-			goto tr755
+			goto tr788
 		case 92:
 			goto st164
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr753
+			goto tr786
 		}
 		goto st39
 	st171:
@@ -19471,7 +20455,7 @@ tr244:
 		case 92:
 			goto st164
 		case 101:
-			goto st542
+			goto st563
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr85
@@ -19482,26 +20466,26 @@ tr245:
 
 	m.pb = m.p
 
-	goto st543
-	st543:
+	goto st564
+	st564:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof543
+			goto _test_eof564
 		}
-	st_case_543:
-//line plugins/parsers/influx/machine.go:19492
+	st_case_564:
+//line plugins/parsers/influx/machine.go:20476
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr754
+			goto tr787
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr753
+			goto tr786
 		case 34:
 			goto tr87
 		case 44:
-			goto tr755
+			goto tr788
 		case 82:
 			goto st174
 		case 92:
@@ -19510,7 +20494,7 @@ tr245:
 			goto st175
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr753
+			goto tr786
 		}
 		goto st39
 	st174:
@@ -19572,33 +20556,33 @@ tr246:
 
 	m.pb = m.p
 
-	goto st544
-	st544:
+	goto st565
+	st565:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof544
+			goto _test_eof565
 		}
-	st_case_544:
-//line plugins/parsers/influx/machine.go:19582
+	st_case_565:
+//line plugins/parsers/influx/machine.go:20566
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr754
+			goto tr787
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr753
+			goto tr786
 		case 34:
 			goto tr87
 		case 44:
-			goto tr755
+			goto tr788
 		case 92:
 			goto st164
 		case 97:
 			goto st171
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr753
+			goto tr786
 		}
 		goto st39
 tr247:
@@ -19606,33 +20590,33 @@ tr247:
 
 	m.pb = m.p
 
-	goto st545
-	st545:
+	goto st566
+	st566:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof545
+			goto _test_eof566
 		}
-	st_case_545:
-//line plugins/parsers/influx/machine.go:19616
+	st_case_566:
+//line plugins/parsers/influx/machine.go:20600
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr433
+			goto tr443
 		case 11:
-			goto tr754
+			goto tr787
 		case 13:
-			goto tr433
+			goto tr443
 		case 32:
-			goto tr753
+			goto tr786
 		case 34:
 			goto tr87
 		case 44:
-			goto tr755
+			goto tr788
 		case 92:
 			goto st164
 		case 114:
 			goto st175
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr753
+			goto tr786
 		}
 		goto st39
 tr70:
@@ -19646,7 +20630,7 @@ tr70:
 			goto _test_eof176
 		}
 	st_case_176:
-//line plugins/parsers/influx/machine.go:19650
+//line plugins/parsers/influx/machine.go:20634
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -19659,44 +20643,37 @@ tr70:
 		case 44:
 			goto tr7
 		case 48:
-			goto st546
+			goto st567
 		case 92:
 			goto st129
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st549
+				goto st570
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-tr72:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st546
-	st546:
+	st567:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof546
+			goto _test_eof567
 		}
-	st_case_546:
-//line plugins/parsers/influx/machine.go:19687
+	st_case_567:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr748
+			goto tr776
 		case 13:
 			goto tr356
 		case 32:
-			goto tr747
+			goto tr775
 		case 44:
-			goto tr749
+			goto tr777
 		case 46:
-			goto st547
+			goto st568
 		case 69:
 			goto st177
 		case 92:
@@ -19704,10 +20681,10 @@ tr72:
 		case 101:
 			goto st177
 		case 105:
-			goto st548
+			goto st569
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr747
+			goto tr775
 		}
 		goto st2
 tr71:
@@ -19715,24 +20692,24 @@ tr71:
 
 	m.pb = m.p
 
-	goto st547
-	st547:
+	goto st568
+	st568:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof547
+			goto _test_eof568
 		}
-	st_case_547:
-//line plugins/parsers/influx/machine.go:19725
+	st_case_568:
+//line plugins/parsers/influx/machine.go:20702
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr748
+			goto tr776
 		case 13:
 			goto tr356
 		case 32:
-			goto tr747
+			goto tr775
 		case 44:
-			goto tr749
+			goto tr777
 		case 69:
 			goto st177
 		case 92:
@@ -19743,10 +20720,10 @@ tr71:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st547
+				goto st568
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr747
+			goto tr775
 		}
 		goto st2
 	st177:
@@ -19777,7 +20754,7 @@ tr71:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
+				goto st555
 			}
 		default:
 			goto st178
@@ -19805,60 +20782,53 @@ tr71:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
+				goto st555
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-	st548:
+	st569:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof548
+			goto _test_eof569
 		}
-	st_case_548:
+	st_case_569:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr362
 		case 11:
-			goto tr764
+			goto tr797
 		case 13:
 			goto tr362
 		case 32:
-			goto tr763
+			goto tr796
 		case 44:
-			goto tr765
+			goto tr798
 		case 92:
 			goto st129
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr763
+			goto tr796
 		}
 		goto st2
-tr73:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st549
-	st549:
+	st570:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof549
+			goto _test_eof570
 		}
-	st_case_549:
-//line plugins/parsers/influx/machine.go:19849
+	st_case_570:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr748
+			goto tr776
 		case 13:
 			goto tr356
 		case 32:
-			goto tr747
+			goto tr775
 		case 44:
-			goto tr749
+			goto tr777
 		case 46:
-			goto st547
+			goto st568
 		case 69:
 			goto st177
 		case 92:
@@ -19866,15 +20836,123 @@ tr73:
 		case 101:
 			goto st177
 		case 105:
-			goto st548
+			goto st569
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st549
+				goto st570
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr747
+			goto tr775
+		}
+		goto st2
+tr72:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st571
+	st571:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof571
+		}
+	st_case_571:
+//line plugins/parsers/influx/machine.go:20862
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr776
+		case 13:
+			goto tr356
+		case 32:
+			goto tr775
+		case 44:
+			goto tr777
+		case 46:
+			goto st568
+		case 69:
+			goto st177
+		case 92:
+			goto st129
+		case 101:
+			goto st177
+		case 105:
+			goto st569
+		case 117:
+			goto st572
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr775
+		}
+		goto st2
+	st572:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof572
+		}
+	st_case_572:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr366
+		case 11:
+			goto tr801
+		case 13:
+			goto tr366
+		case 32:
+			goto tr800
+		case 44:
+			goto tr802
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr800
+		}
+		goto st2
+tr73:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st573
+	st573:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof573
+		}
+	st_case_573:
+//line plugins/parsers/influx/machine.go:20925
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr776
+		case 13:
+			goto tr356
+		case 32:
+			goto tr775
+		case 44:
+			goto tr777
+		case 46:
+			goto st568
+		case 69:
+			goto st177
+		case 92:
+			goto st129
+		case 101:
+			goto st177
+		case 105:
+			goto st569
+		case 117:
+			goto st572
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st573
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr775
 		}
 		goto st2
 tr74:
@@ -19882,24 +20960,24 @@ tr74:
 
 	m.pb = m.p
 
-	goto st550
-	st550:
+	goto st574
+	st574:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof550
+			goto _test_eof574
 		}
-	st_case_550:
-//line plugins/parsers/influx/machine.go:19892
+	st_case_574:
+//line plugins/parsers/influx/machine.go:20970
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr767
+			goto tr805
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr766
+			goto tr804
 		case 44:
-			goto tr768
+			goto tr806
 		case 65:
 			goto st179
 		case 92:
@@ -19908,7 +20986,7 @@ tr74:
 			goto st182
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr766
+			goto tr804
 		}
 		goto st2
 	st179:
@@ -19978,7 +21056,7 @@ tr74:
 		case 44:
 			goto tr7
 		case 69:
-			goto st551
+			goto st575
 		case 92:
 			goto st129
 		}
@@ -19986,27 +21064,27 @@ tr74:
 			goto tr4
 		}
 		goto st2
-	st551:
+	st575:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof551
+			goto _test_eof575
 		}
-	st_case_551:
+	st_case_575:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr767
+			goto tr805
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr766
+			goto tr804
 		case 44:
-			goto tr768
+			goto tr806
 		case 92:
 			goto st129
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr766
+			goto tr804
 		}
 		goto st2
 	st182:
@@ -20078,7 +21156,7 @@ tr74:
 		case 92:
 			goto st129
 		case 101:
-			goto st551
+			goto st575
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
@@ -20089,24 +21167,24 @@ tr75:
 
 	m.pb = m.p
 
-	goto st552
-	st552:
+	goto st576
+	st576:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof552
+			goto _test_eof576
 		}
-	st_case_552:
-//line plugins/parsers/influx/machine.go:20099
+	st_case_576:
+//line plugins/parsers/influx/machine.go:21177
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr767
+			goto tr805
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr766
+			goto tr804
 		case 44:
-			goto tr768
+			goto tr806
 		case 82:
 			goto st185
 		case 92:
@@ -20115,7 +21193,7 @@ tr75:
 			goto st186
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr766
+			goto tr804
 		}
 		goto st2
 	st185:
@@ -20173,31 +21251,31 @@ tr76:
 
 	m.pb = m.p
 
-	goto st553
-	st553:
+	goto st577
+	st577:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof553
+			goto _test_eof577
 		}
-	st_case_553:
-//line plugins/parsers/influx/machine.go:20183
+	st_case_577:
+//line plugins/parsers/influx/machine.go:21261
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr767
+			goto tr805
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr766
+			goto tr804
 		case 44:
-			goto tr768
+			goto tr806
 		case 92:
 			goto st129
 		case 97:
 			goto st182
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr766
+			goto tr804
 		}
 		goto st2
 tr77:
@@ -20205,31 +21283,31 @@ tr77:
 
 	m.pb = m.p
 
-	goto st554
-	st554:
+	goto st578
+	st578:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof554
+			goto _test_eof578
 		}
-	st_case_554:
-//line plugins/parsers/influx/machine.go:20215
+	st_case_578:
+//line plugins/parsers/influx/machine.go:21293
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr365
+			goto tr370
 		case 11:
-			goto tr767
+			goto tr805
 		case 13:
-			goto tr365
+			goto tr370
 		case 32:
-			goto tr766
+			goto tr804
 		case 44:
-			goto tr768
+			goto tr806
 		case 92:
 			goto st129
 		case 114:
 			goto st186
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr766
+			goto tr804
 		}
 		goto st2
 	st187:
@@ -20249,13 +21327,13 @@ tr322:
 
 	{goto st188 }
 
-	goto st555
-	st555:
+	goto st579
+	st579:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof555
+			goto _test_eof579
 		}
-	st_case_555:
-//line plugins/parsers/influx/machine.go:20259
+	st_case_579:
+//line plugins/parsers/influx/machine.go:21337
 		goto st0
 	st188:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -20285,13 +21363,13 @@ tr323:
 
 	{goto st1 }
 
-	goto st556
-	st556:
+	goto st580
+	st580:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof556
+			goto _test_eof580
 		}
-	st_case_556:
-//line plugins/parsers/influx/machine.go:20295
+	st_case_580:
+//line plugins/parsers/influx/machine.go:21373
 		goto st0
 tr325:
 //line plugins/parsers/influx/machine.go.rl:63
@@ -20300,13 +21378,13 @@ tr325:
 
 	{goto st1 }
 
-	goto st557
-	st557:
+	goto st581
+	st581:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof557
+			goto _test_eof581
 		}
-	st_case_557:
-//line plugins/parsers/influx/machine.go:20310
+	st_case_581:
+//line plugins/parsers/influx/machine.go:21388
 		switch ( m.data)[( m.p)] {
 		case 11:
 			goto tr325
@@ -20393,18 +21471,21 @@ tr325:
 	_test_eof217:  m.cs = 217; goto _test_eof
 	_test_eof218:  m.cs = 218; goto _test_eof
 	_test_eof219:  m.cs = 219; goto _test_eof
+	_test_eof220:  m.cs = 220; goto _test_eof
+	_test_eof221:  m.cs = 221; goto _test_eof
+	_test_eof222:  m.cs = 222; goto _test_eof
 	_test_eof15:  m.cs = 15; goto _test_eof
 	_test_eof16:  m.cs = 16; goto _test_eof
 	_test_eof17:  m.cs = 17; goto _test_eof
-	_test_eof220:  m.cs = 220; goto _test_eof
+	_test_eof223:  m.cs = 223; goto _test_eof
 	_test_eof18:  m.cs = 18; goto _test_eof
 	_test_eof19:  m.cs = 19; goto _test_eof
 	_test_eof20:  m.cs = 20; goto _test_eof
-	_test_eof221:  m.cs = 221; goto _test_eof
+	_test_eof224:  m.cs = 224; goto _test_eof
 	_test_eof21:  m.cs = 21; goto _test_eof
 	_test_eof22:  m.cs = 22; goto _test_eof
-	_test_eof222:  m.cs = 222; goto _test_eof
-	_test_eof223:  m.cs = 223; goto _test_eof
+	_test_eof225:  m.cs = 225; goto _test_eof
+	_test_eof226:  m.cs = 226; goto _test_eof
 	_test_eof23:  m.cs = 23; goto _test_eof
 	_test_eof24:  m.cs = 24; goto _test_eof
 	_test_eof25:  m.cs = 25; goto _test_eof
@@ -20424,12 +21505,9 @@ tr325:
 	_test_eof39:  m.cs = 39; goto _test_eof
 	_test_eof40:  m.cs = 40; goto _test_eof
 	_test_eof41:  m.cs = 41; goto _test_eof
-	_test_eof224:  m.cs = 224; goto _test_eof
-	_test_eof225:  m.cs = 225; goto _test_eof
-	_test_eof42:  m.cs = 42; goto _test_eof
-	_test_eof226:  m.cs = 226; goto _test_eof
 	_test_eof227:  m.cs = 227; goto _test_eof
 	_test_eof228:  m.cs = 228; goto _test_eof
+	_test_eof42:  m.cs = 42; goto _test_eof
 	_test_eof229:  m.cs = 229; goto _test_eof
 	_test_eof230:  m.cs = 230; goto _test_eof
 	_test_eof231:  m.cs = 231; goto _test_eof
@@ -20447,14 +21525,14 @@ tr325:
 	_test_eof243:  m.cs = 243; goto _test_eof
 	_test_eof244:  m.cs = 244; goto _test_eof
 	_test_eof245:  m.cs = 245; goto _test_eof
-	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof246:  m.cs = 246; goto _test_eof
 	_test_eof247:  m.cs = 247; goto _test_eof
 	_test_eof248:  m.cs = 248; goto _test_eof
-	_test_eof44:  m.cs = 44; goto _test_eof
+	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof249:  m.cs = 249; goto _test_eof
 	_test_eof250:  m.cs = 250; goto _test_eof
 	_test_eof251:  m.cs = 251; goto _test_eof
+	_test_eof44:  m.cs = 44; goto _test_eof
 	_test_eof252:  m.cs = 252; goto _test_eof
 	_test_eof253:  m.cs = 253; goto _test_eof
 	_test_eof254:  m.cs = 254; goto _test_eof
@@ -20472,82 +21550,82 @@ tr325:
 	_test_eof266:  m.cs = 266; goto _test_eof
 	_test_eof267:  m.cs = 267; goto _test_eof
 	_test_eof268:  m.cs = 268; goto _test_eof
+	_test_eof269:  m.cs = 269; goto _test_eof
+	_test_eof270:  m.cs = 270; goto _test_eof
+	_test_eof271:  m.cs = 271; goto _test_eof
 	_test_eof45:  m.cs = 45; goto _test_eof
 	_test_eof46:  m.cs = 46; goto _test_eof
 	_test_eof47:  m.cs = 47; goto _test_eof
-	_test_eof269:  m.cs = 269; goto _test_eof
+	_test_eof272:  m.cs = 272; goto _test_eof
 	_test_eof48:  m.cs = 48; goto _test_eof
 	_test_eof49:  m.cs = 49; goto _test_eof
 	_test_eof50:  m.cs = 50; goto _test_eof
 	_test_eof51:  m.cs = 51; goto _test_eof
-	_test_eof270:  m.cs = 270; goto _test_eof
-	_test_eof271:  m.cs = 271; goto _test_eof
-	_test_eof52:  m.cs = 52; goto _test_eof
-	_test_eof272:  m.cs = 272; goto _test_eof
-	_test_eof53:  m.cs = 53; goto _test_eof
 	_test_eof273:  m.cs = 273; goto _test_eof
 	_test_eof274:  m.cs = 274; goto _test_eof
+	_test_eof52:  m.cs = 52; goto _test_eof
 	_test_eof275:  m.cs = 275; goto _test_eof
+	_test_eof53:  m.cs = 53; goto _test_eof
 	_test_eof276:  m.cs = 276; goto _test_eof
+	_test_eof277:  m.cs = 277; goto _test_eof
+	_test_eof278:  m.cs = 278; goto _test_eof
+	_test_eof279:  m.cs = 279; goto _test_eof
+	_test_eof280:  m.cs = 280; goto _test_eof
+	_test_eof281:  m.cs = 281; goto _test_eof
+	_test_eof282:  m.cs = 282; goto _test_eof
 	_test_eof54:  m.cs = 54; goto _test_eof
 	_test_eof55:  m.cs = 55; goto _test_eof
 	_test_eof56:  m.cs = 56; goto _test_eof
-	_test_eof277:  m.cs = 277; goto _test_eof
+	_test_eof283:  m.cs = 283; goto _test_eof
 	_test_eof57:  m.cs = 57; goto _test_eof
 	_test_eof58:  m.cs = 58; goto _test_eof
 	_test_eof59:  m.cs = 59; goto _test_eof
-	_test_eof278:  m.cs = 278; goto _test_eof
+	_test_eof284:  m.cs = 284; goto _test_eof
 	_test_eof60:  m.cs = 60; goto _test_eof
 	_test_eof61:  m.cs = 61; goto _test_eof
-	_test_eof279:  m.cs = 279; goto _test_eof
-	_test_eof280:  m.cs = 280; goto _test_eof
-	_test_eof62:  m.cs = 62; goto _test_eof
-	_test_eof63:  m.cs = 63; goto _test_eof
-	_test_eof281:  m.cs = 281; goto _test_eof
-	_test_eof282:  m.cs = 282; goto _test_eof
-	_test_eof64:  m.cs = 64; goto _test_eof
-	_test_eof65:  m.cs = 65; goto _test_eof
-	_test_eof283:  m.cs = 283; goto _test_eof
-	_test_eof284:  m.cs = 284; goto _test_eof
 	_test_eof285:  m.cs = 285; goto _test_eof
 	_test_eof286:  m.cs = 286; goto _test_eof
+	_test_eof62:  m.cs = 62; goto _test_eof
+	_test_eof63:  m.cs = 63; goto _test_eof
+	_test_eof287:  m.cs = 287; goto _test_eof
+	_test_eof288:  m.cs = 288; goto _test_eof
+	_test_eof64:  m.cs = 64; goto _test_eof
+	_test_eof65:  m.cs = 65; goto _test_eof
+	_test_eof289:  m.cs = 289; goto _test_eof
+	_test_eof290:  m.cs = 290; goto _test_eof
+	_test_eof291:  m.cs = 291; goto _test_eof
+	_test_eof292:  m.cs = 292; goto _test_eof
+	_test_eof293:  m.cs = 293; goto _test_eof
+	_test_eof294:  m.cs = 294; goto _test_eof
+	_test_eof295:  m.cs = 295; goto _test_eof
 	_test_eof66:  m.cs = 66; goto _test_eof
 	_test_eof67:  m.cs = 67; goto _test_eof
 	_test_eof68:  m.cs = 68; goto _test_eof
-	_test_eof287:  m.cs = 287; goto _test_eof
+	_test_eof296:  m.cs = 296; goto _test_eof
 	_test_eof69:  m.cs = 69; goto _test_eof
 	_test_eof70:  m.cs = 70; goto _test_eof
 	_test_eof71:  m.cs = 71; goto _test_eof
-	_test_eof288:  m.cs = 288; goto _test_eof
+	_test_eof297:  m.cs = 297; goto _test_eof
 	_test_eof72:  m.cs = 72; goto _test_eof
 	_test_eof73:  m.cs = 73; goto _test_eof
-	_test_eof289:  m.cs = 289; goto _test_eof
-	_test_eof290:  m.cs = 290; goto _test_eof
+	_test_eof298:  m.cs = 298; goto _test_eof
+	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof74:  m.cs = 74; goto _test_eof
 	_test_eof75:  m.cs = 75; goto _test_eof
 	_test_eof76:  m.cs = 76; goto _test_eof
 	_test_eof77:  m.cs = 77; goto _test_eof
 	_test_eof78:  m.cs = 78; goto _test_eof
 	_test_eof79:  m.cs = 79; goto _test_eof
-	_test_eof291:  m.cs = 291; goto _test_eof
-	_test_eof292:  m.cs = 292; goto _test_eof
-	_test_eof293:  m.cs = 293; goto _test_eof
-	_test_eof294:  m.cs = 294; goto _test_eof
-	_test_eof80:  m.cs = 80; goto _test_eof
-	_test_eof295:  m.cs = 295; goto _test_eof
-	_test_eof296:  m.cs = 296; goto _test_eof
-	_test_eof297:  m.cs = 297; goto _test_eof
-	_test_eof298:  m.cs = 298; goto _test_eof
-	_test_eof81:  m.cs = 81; goto _test_eof
-	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof300:  m.cs = 300; goto _test_eof
 	_test_eof301:  m.cs = 301; goto _test_eof
 	_test_eof302:  m.cs = 302; goto _test_eof
 	_test_eof303:  m.cs = 303; goto _test_eof
+	_test_eof80:  m.cs = 80; goto _test_eof
 	_test_eof304:  m.cs = 304; goto _test_eof
 	_test_eof305:  m.cs = 305; goto _test_eof
 	_test_eof306:  m.cs = 306; goto _test_eof
 	_test_eof307:  m.cs = 307; goto _test_eof
+	_test_eof81:  m.cs = 81; goto _test_eof
 	_test_eof308:  m.cs = 308; goto _test_eof
 	_test_eof309:  m.cs = 309; goto _test_eof
 	_test_eof310:  m.cs = 310; goto _test_eof
@@ -20557,6 +21635,15 @@ tr325:
 	_test_eof314:  m.cs = 314; goto _test_eof
 	_test_eof315:  m.cs = 315; goto _test_eof
 	_test_eof316:  m.cs = 316; goto _test_eof
+	_test_eof317:  m.cs = 317; goto _test_eof
+	_test_eof318:  m.cs = 318; goto _test_eof
+	_test_eof319:  m.cs = 319; goto _test_eof
+	_test_eof320:  m.cs = 320; goto _test_eof
+	_test_eof321:  m.cs = 321; goto _test_eof
+	_test_eof322:  m.cs = 322; goto _test_eof
+	_test_eof323:  m.cs = 323; goto _test_eof
+	_test_eof324:  m.cs = 324; goto _test_eof
+	_test_eof325:  m.cs = 325; goto _test_eof
 	_test_eof82:  m.cs = 82; goto _test_eof
 	_test_eof83:  m.cs = 83; goto _test_eof
 	_test_eof84:  m.cs = 84; goto _test_eof
@@ -20570,18 +21657,9 @@ tr325:
 	_test_eof92:  m.cs = 92; goto _test_eof
 	_test_eof93:  m.cs = 93; goto _test_eof
 	_test_eof94:  m.cs = 94; goto _test_eof
-	_test_eof317:  m.cs = 317; goto _test_eof
-	_test_eof318:  m.cs = 318; goto _test_eof
-	_test_eof95:  m.cs = 95; goto _test_eof
-	_test_eof319:  m.cs = 319; goto _test_eof
-	_test_eof320:  m.cs = 320; goto _test_eof
-	_test_eof321:  m.cs = 321; goto _test_eof
-	_test_eof322:  m.cs = 322; goto _test_eof
-	_test_eof323:  m.cs = 323; goto _test_eof
-	_test_eof324:  m.cs = 324; goto _test_eof
-	_test_eof325:  m.cs = 325; goto _test_eof
 	_test_eof326:  m.cs = 326; goto _test_eof
 	_test_eof327:  m.cs = 327; goto _test_eof
+	_test_eof95:  m.cs = 95; goto _test_eof
 	_test_eof328:  m.cs = 328; goto _test_eof
 	_test_eof329:  m.cs = 329; goto _test_eof
 	_test_eof330:  m.cs = 330; goto _test_eof
@@ -20593,11 +21671,8 @@ tr325:
 	_test_eof336:  m.cs = 336; goto _test_eof
 	_test_eof337:  m.cs = 337; goto _test_eof
 	_test_eof338:  m.cs = 338; goto _test_eof
-	_test_eof96:  m.cs = 96; goto _test_eof
-	_test_eof97:  m.cs = 97; goto _test_eof
 	_test_eof339:  m.cs = 339; goto _test_eof
 	_test_eof340:  m.cs = 340; goto _test_eof
-	_test_eof98:  m.cs = 98; goto _test_eof
 	_test_eof341:  m.cs = 341; goto _test_eof
 	_test_eof342:  m.cs = 342; goto _test_eof
 	_test_eof343:  m.cs = 343; goto _test_eof
@@ -20605,8 +21680,11 @@ tr325:
 	_test_eof345:  m.cs = 345; goto _test_eof
 	_test_eof346:  m.cs = 346; goto _test_eof
 	_test_eof347:  m.cs = 347; goto _test_eof
+	_test_eof96:  m.cs = 96; goto _test_eof
+	_test_eof97:  m.cs = 97; goto _test_eof
 	_test_eof348:  m.cs = 348; goto _test_eof
 	_test_eof349:  m.cs = 349; goto _test_eof
+	_test_eof98:  m.cs = 98; goto _test_eof
 	_test_eof350:  m.cs = 350; goto _test_eof
 	_test_eof351:  m.cs = 351; goto _test_eof
 	_test_eof352:  m.cs = 352; goto _test_eof
@@ -20618,33 +21696,45 @@ tr325:
 	_test_eof358:  m.cs = 358; goto _test_eof
 	_test_eof359:  m.cs = 359; goto _test_eof
 	_test_eof360:  m.cs = 360; goto _test_eof
-	_test_eof99:  m.cs = 99; goto _test_eof
 	_test_eof361:  m.cs = 361; goto _test_eof
 	_test_eof362:  m.cs = 362; goto _test_eof
-	_test_eof100:  m.cs = 100; goto _test_eof
-	_test_eof101:  m.cs = 101; goto _test_eof
-	_test_eof102:  m.cs = 102; goto _test_eof
-	_test_eof103:  m.cs = 103; goto _test_eof
 	_test_eof363:  m.cs = 363; goto _test_eof
 	_test_eof364:  m.cs = 364; goto _test_eof
-	_test_eof104:  m.cs = 104; goto _test_eof
-	_test_eof105:  m.cs = 105; goto _test_eof
 	_test_eof365:  m.cs = 365; goto _test_eof
 	_test_eof366:  m.cs = 366; goto _test_eof
 	_test_eof367:  m.cs = 367; goto _test_eof
 	_test_eof368:  m.cs = 368; goto _test_eof
+	_test_eof369:  m.cs = 369; goto _test_eof
+	_test_eof99:  m.cs = 99; goto _test_eof
+	_test_eof370:  m.cs = 370; goto _test_eof
+	_test_eof371:  m.cs = 371; goto _test_eof
+	_test_eof100:  m.cs = 100; goto _test_eof
+	_test_eof101:  m.cs = 101; goto _test_eof
+	_test_eof102:  m.cs = 102; goto _test_eof
+	_test_eof103:  m.cs = 103; goto _test_eof
+	_test_eof372:  m.cs = 372; goto _test_eof
+	_test_eof373:  m.cs = 373; goto _test_eof
+	_test_eof104:  m.cs = 104; goto _test_eof
+	_test_eof105:  m.cs = 105; goto _test_eof
+	_test_eof374:  m.cs = 374; goto _test_eof
+	_test_eof375:  m.cs = 375; goto _test_eof
+	_test_eof376:  m.cs = 376; goto _test_eof
+	_test_eof377:  m.cs = 377; goto _test_eof
+	_test_eof378:  m.cs = 378; goto _test_eof
+	_test_eof379:  m.cs = 379; goto _test_eof
+	_test_eof380:  m.cs = 380; goto _test_eof
 	_test_eof106:  m.cs = 106; goto _test_eof
 	_test_eof107:  m.cs = 107; goto _test_eof
 	_test_eof108:  m.cs = 108; goto _test_eof
-	_test_eof369:  m.cs = 369; goto _test_eof
+	_test_eof381:  m.cs = 381; goto _test_eof
 	_test_eof109:  m.cs = 109; goto _test_eof
 	_test_eof110:  m.cs = 110; goto _test_eof
 	_test_eof111:  m.cs = 111; goto _test_eof
-	_test_eof370:  m.cs = 370; goto _test_eof
+	_test_eof382:  m.cs = 382; goto _test_eof
 	_test_eof112:  m.cs = 112; goto _test_eof
 	_test_eof113:  m.cs = 113; goto _test_eof
-	_test_eof371:  m.cs = 371; goto _test_eof
-	_test_eof372:  m.cs = 372; goto _test_eof
+	_test_eof383:  m.cs = 383; goto _test_eof
+	_test_eof384:  m.cs = 384; goto _test_eof
 	_test_eof114:  m.cs = 114; goto _test_eof
 	_test_eof115:  m.cs = 115; goto _test_eof
 	_test_eof116:  m.cs = 116; goto _test_eof
@@ -20657,22 +21747,10 @@ tr325:
 	_test_eof123:  m.cs = 123; goto _test_eof
 	_test_eof124:  m.cs = 124; goto _test_eof
 	_test_eof125:  m.cs = 125; goto _test_eof
-	_test_eof373:  m.cs = 373; goto _test_eof
-	_test_eof374:  m.cs = 374; goto _test_eof
-	_test_eof375:  m.cs = 375; goto _test_eof
-	_test_eof126:  m.cs = 126; goto _test_eof
-	_test_eof376:  m.cs = 376; goto _test_eof
-	_test_eof377:  m.cs = 377; goto _test_eof
-	_test_eof378:  m.cs = 378; goto _test_eof
-	_test_eof379:  m.cs = 379; goto _test_eof
-	_test_eof380:  m.cs = 380; goto _test_eof
-	_test_eof381:  m.cs = 381; goto _test_eof
-	_test_eof382:  m.cs = 382; goto _test_eof
-	_test_eof383:  m.cs = 383; goto _test_eof
-	_test_eof384:  m.cs = 384; goto _test_eof
 	_test_eof385:  m.cs = 385; goto _test_eof
 	_test_eof386:  m.cs = 386; goto _test_eof
 	_test_eof387:  m.cs = 387; goto _test_eof
+	_test_eof126:  m.cs = 126; goto _test_eof
 	_test_eof388:  m.cs = 388; goto _test_eof
 	_test_eof389:  m.cs = 389; goto _test_eof
 	_test_eof390:  m.cs = 390; goto _test_eof
@@ -20683,12 +21761,10 @@ tr325:
 	_test_eof395:  m.cs = 395; goto _test_eof
 	_test_eof396:  m.cs = 396; goto _test_eof
 	_test_eof397:  m.cs = 397; goto _test_eof
-	_test_eof127:  m.cs = 127; goto _test_eof
 	_test_eof398:  m.cs = 398; goto _test_eof
 	_test_eof399:  m.cs = 399; goto _test_eof
 	_test_eof400:  m.cs = 400; goto _test_eof
 	_test_eof401:  m.cs = 401; goto _test_eof
-	_test_eof128:  m.cs = 128; goto _test_eof
 	_test_eof402:  m.cs = 402; goto _test_eof
 	_test_eof403:  m.cs = 403; goto _test_eof
 	_test_eof404:  m.cs = 404; goto _test_eof
@@ -20697,10 +21773,12 @@ tr325:
 	_test_eof407:  m.cs = 407; goto _test_eof
 	_test_eof408:  m.cs = 408; goto _test_eof
 	_test_eof409:  m.cs = 409; goto _test_eof
+	_test_eof127:  m.cs = 127; goto _test_eof
 	_test_eof410:  m.cs = 410; goto _test_eof
 	_test_eof411:  m.cs = 411; goto _test_eof
 	_test_eof412:  m.cs = 412; goto _test_eof
 	_test_eof413:  m.cs = 413; goto _test_eof
+	_test_eof128:  m.cs = 128; goto _test_eof
 	_test_eof414:  m.cs = 414; goto _test_eof
 	_test_eof415:  m.cs = 415; goto _test_eof
 	_test_eof416:  m.cs = 416; goto _test_eof
@@ -20709,12 +21787,8 @@ tr325:
 	_test_eof419:  m.cs = 419; goto _test_eof
 	_test_eof420:  m.cs = 420; goto _test_eof
 	_test_eof421:  m.cs = 421; goto _test_eof
-	_test_eof129:  m.cs = 129; goto _test_eof
-	_test_eof130:  m.cs = 130; goto _test_eof
-	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof422:  m.cs = 422; goto _test_eof
 	_test_eof423:  m.cs = 423; goto _test_eof
-	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof424:  m.cs = 424; goto _test_eof
 	_test_eof425:  m.cs = 425; goto _test_eof
 	_test_eof426:  m.cs = 426; goto _test_eof
@@ -20725,8 +21799,12 @@ tr325:
 	_test_eof431:  m.cs = 431; goto _test_eof
 	_test_eof432:  m.cs = 432; goto _test_eof
 	_test_eof433:  m.cs = 433; goto _test_eof
+	_test_eof129:  m.cs = 129; goto _test_eof
+	_test_eof130:  m.cs = 130; goto _test_eof
+	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof434:  m.cs = 434; goto _test_eof
 	_test_eof435:  m.cs = 435; goto _test_eof
+	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof436:  m.cs = 436; goto _test_eof
 	_test_eof437:  m.cs = 437; goto _test_eof
 	_test_eof438:  m.cs = 438; goto _test_eof
@@ -20735,11 +21813,9 @@ tr325:
 	_test_eof441:  m.cs = 441; goto _test_eof
 	_test_eof442:  m.cs = 442; goto _test_eof
 	_test_eof443:  m.cs = 443; goto _test_eof
-	_test_eof133:  m.cs = 133; goto _test_eof
 	_test_eof444:  m.cs = 444; goto _test_eof
 	_test_eof445:  m.cs = 445; goto _test_eof
 	_test_eof446:  m.cs = 446; goto _test_eof
-	_test_eof134:  m.cs = 134; goto _test_eof
 	_test_eof447:  m.cs = 447; goto _test_eof
 	_test_eof448:  m.cs = 448; goto _test_eof
 	_test_eof449:  m.cs = 449; goto _test_eof
@@ -20749,9 +21825,11 @@ tr325:
 	_test_eof453:  m.cs = 453; goto _test_eof
 	_test_eof454:  m.cs = 454; goto _test_eof
 	_test_eof455:  m.cs = 455; goto _test_eof
+	_test_eof133:  m.cs = 133; goto _test_eof
 	_test_eof456:  m.cs = 456; goto _test_eof
 	_test_eof457:  m.cs = 457; goto _test_eof
 	_test_eof458:  m.cs = 458; goto _test_eof
+	_test_eof134:  m.cs = 134; goto _test_eof
 	_test_eof459:  m.cs = 459; goto _test_eof
 	_test_eof460:  m.cs = 460; goto _test_eof
 	_test_eof461:  m.cs = 461; goto _test_eof
@@ -20762,7 +21840,6 @@ tr325:
 	_test_eof466:  m.cs = 466; goto _test_eof
 	_test_eof467:  m.cs = 467; goto _test_eof
 	_test_eof468:  m.cs = 468; goto _test_eof
-	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof469:  m.cs = 469; goto _test_eof
 	_test_eof470:  m.cs = 470; goto _test_eof
 	_test_eof471:  m.cs = 471; goto _test_eof
@@ -20775,6 +21852,7 @@ tr325:
 	_test_eof478:  m.cs = 478; goto _test_eof
 	_test_eof479:  m.cs = 479; goto _test_eof
 	_test_eof480:  m.cs = 480; goto _test_eof
+	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof481:  m.cs = 481; goto _test_eof
 	_test_eof482:  m.cs = 482; goto _test_eof
 	_test_eof483:  m.cs = 483; goto _test_eof
@@ -20785,38 +21863,27 @@ tr325:
 	_test_eof488:  m.cs = 488; goto _test_eof
 	_test_eof489:  m.cs = 489; goto _test_eof
 	_test_eof490:  m.cs = 490; goto _test_eof
-	_test_eof136:  m.cs = 136; goto _test_eof
-	_test_eof137:  m.cs = 137; goto _test_eof
-	_test_eof138:  m.cs = 138; goto _test_eof
-	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof491:  m.cs = 491; goto _test_eof
 	_test_eof492:  m.cs = 492; goto _test_eof
-	_test_eof140:  m.cs = 140; goto _test_eof
 	_test_eof493:  m.cs = 493; goto _test_eof
-	_test_eof141:  m.cs = 141; goto _test_eof
 	_test_eof494:  m.cs = 494; goto _test_eof
 	_test_eof495:  m.cs = 495; goto _test_eof
 	_test_eof496:  m.cs = 496; goto _test_eof
 	_test_eof497:  m.cs = 497; goto _test_eof
-	_test_eof142:  m.cs = 142; goto _test_eof
-	_test_eof143:  m.cs = 143; goto _test_eof
-	_test_eof144:  m.cs = 144; goto _test_eof
 	_test_eof498:  m.cs = 498; goto _test_eof
-	_test_eof145:  m.cs = 145; goto _test_eof
-	_test_eof146:  m.cs = 146; goto _test_eof
-	_test_eof147:  m.cs = 147; goto _test_eof
 	_test_eof499:  m.cs = 499; goto _test_eof
-	_test_eof148:  m.cs = 148; goto _test_eof
-	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof500:  m.cs = 500; goto _test_eof
 	_test_eof501:  m.cs = 501; goto _test_eof
-	_test_eof150:  m.cs = 150; goto _test_eof
-	_test_eof151:  m.cs = 151; goto _test_eof
 	_test_eof502:  m.cs = 502; goto _test_eof
+	_test_eof136:  m.cs = 136; goto _test_eof
+	_test_eof137:  m.cs = 137; goto _test_eof
+	_test_eof138:  m.cs = 138; goto _test_eof
+	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof503:  m.cs = 503; goto _test_eof
 	_test_eof504:  m.cs = 504; goto _test_eof
-	_test_eof152:  m.cs = 152; goto _test_eof
+	_test_eof140:  m.cs = 140; goto _test_eof
 	_test_eof505:  m.cs = 505; goto _test_eof
+	_test_eof141:  m.cs = 141; goto _test_eof
 	_test_eof506:  m.cs = 506; goto _test_eof
 	_test_eof507:  m.cs = 507; goto _test_eof
 	_test_eof508:  m.cs = 508; goto _test_eof
@@ -20824,94 +21891,129 @@ tr325:
 	_test_eof510:  m.cs = 510; goto _test_eof
 	_test_eof511:  m.cs = 511; goto _test_eof
 	_test_eof512:  m.cs = 512; goto _test_eof
+	_test_eof142:  m.cs = 142; goto _test_eof
+	_test_eof143:  m.cs = 143; goto _test_eof
+	_test_eof144:  m.cs = 144; goto _test_eof
 	_test_eof513:  m.cs = 513; goto _test_eof
+	_test_eof145:  m.cs = 145; goto _test_eof
+	_test_eof146:  m.cs = 146; goto _test_eof
+	_test_eof147:  m.cs = 147; goto _test_eof
 	_test_eof514:  m.cs = 514; goto _test_eof
+	_test_eof148:  m.cs = 148; goto _test_eof
+	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof515:  m.cs = 515; goto _test_eof
 	_test_eof516:  m.cs = 516; goto _test_eof
+	_test_eof150:  m.cs = 150; goto _test_eof
+	_test_eof151:  m.cs = 151; goto _test_eof
 	_test_eof517:  m.cs = 517; goto _test_eof
 	_test_eof518:  m.cs = 518; goto _test_eof
 	_test_eof519:  m.cs = 519; goto _test_eof
+	_test_eof152:  m.cs = 152; goto _test_eof
 	_test_eof520:  m.cs = 520; goto _test_eof
 	_test_eof521:  m.cs = 521; goto _test_eof
 	_test_eof522:  m.cs = 522; goto _test_eof
 	_test_eof523:  m.cs = 523; goto _test_eof
 	_test_eof524:  m.cs = 524; goto _test_eof
 	_test_eof525:  m.cs = 525; goto _test_eof
-	_test_eof153:  m.cs = 153; goto _test_eof
-	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof526:  m.cs = 526; goto _test_eof
 	_test_eof527:  m.cs = 527; goto _test_eof
 	_test_eof528:  m.cs = 528; goto _test_eof
 	_test_eof529:  m.cs = 529; goto _test_eof
-	_test_eof155:  m.cs = 155; goto _test_eof
-	_test_eof156:  m.cs = 156; goto _test_eof
-	_test_eof157:  m.cs = 157; goto _test_eof
 	_test_eof530:  m.cs = 530; goto _test_eof
-	_test_eof158:  m.cs = 158; goto _test_eof
-	_test_eof159:  m.cs = 159; goto _test_eof
-	_test_eof160:  m.cs = 160; goto _test_eof
 	_test_eof531:  m.cs = 531; goto _test_eof
-	_test_eof161:  m.cs = 161; goto _test_eof
-	_test_eof162:  m.cs = 162; goto _test_eof
 	_test_eof532:  m.cs = 532; goto _test_eof
 	_test_eof533:  m.cs = 533; goto _test_eof
-	_test_eof163:  m.cs = 163; goto _test_eof
-	_test_eof164:  m.cs = 164; goto _test_eof
-	_test_eof165:  m.cs = 165; goto _test_eof
 	_test_eof534:  m.cs = 534; goto _test_eof
 	_test_eof535:  m.cs = 535; goto _test_eof
-	_test_eof166:  m.cs = 166; goto _test_eof
 	_test_eof536:  m.cs = 536; goto _test_eof
 	_test_eof537:  m.cs = 537; goto _test_eof
-	_test_eof167:  m.cs = 167; goto _test_eof
 	_test_eof538:  m.cs = 538; goto _test_eof
 	_test_eof539:  m.cs = 539; goto _test_eof
 	_test_eof540:  m.cs = 540; goto _test_eof
+	_test_eof153:  m.cs = 153; goto _test_eof
+	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof541:  m.cs = 541; goto _test_eof
+	_test_eof542:  m.cs = 542; goto _test_eof
+	_test_eof543:  m.cs = 543; goto _test_eof
+	_test_eof544:  m.cs = 544; goto _test_eof
+	_test_eof545:  m.cs = 545; goto _test_eof
+	_test_eof546:  m.cs = 546; goto _test_eof
+	_test_eof547:  m.cs = 547; goto _test_eof
+	_test_eof155:  m.cs = 155; goto _test_eof
+	_test_eof156:  m.cs = 156; goto _test_eof
+	_test_eof157:  m.cs = 157; goto _test_eof
+	_test_eof548:  m.cs = 548; goto _test_eof
+	_test_eof158:  m.cs = 158; goto _test_eof
+	_test_eof159:  m.cs = 159; goto _test_eof
+	_test_eof160:  m.cs = 160; goto _test_eof
+	_test_eof549:  m.cs = 549; goto _test_eof
+	_test_eof161:  m.cs = 161; goto _test_eof
+	_test_eof162:  m.cs = 162; goto _test_eof
+	_test_eof550:  m.cs = 550; goto _test_eof
+	_test_eof551:  m.cs = 551; goto _test_eof
+	_test_eof163:  m.cs = 163; goto _test_eof
+	_test_eof164:  m.cs = 164; goto _test_eof
+	_test_eof165:  m.cs = 165; goto _test_eof
+	_test_eof552:  m.cs = 552; goto _test_eof
+	_test_eof553:  m.cs = 553; goto _test_eof
+	_test_eof166:  m.cs = 166; goto _test_eof
+	_test_eof554:  m.cs = 554; goto _test_eof
+	_test_eof555:  m.cs = 555; goto _test_eof
+	_test_eof167:  m.cs = 167; goto _test_eof
+	_test_eof556:  m.cs = 556; goto _test_eof
+	_test_eof557:  m.cs = 557; goto _test_eof
+	_test_eof558:  m.cs = 558; goto _test_eof
+	_test_eof559:  m.cs = 559; goto _test_eof
+	_test_eof560:  m.cs = 560; goto _test_eof
+	_test_eof561:  m.cs = 561; goto _test_eof
+	_test_eof562:  m.cs = 562; goto _test_eof
 	_test_eof168:  m.cs = 168; goto _test_eof
 	_test_eof169:  m.cs = 169; goto _test_eof
 	_test_eof170:  m.cs = 170; goto _test_eof
-	_test_eof542:  m.cs = 542; goto _test_eof
+	_test_eof563:  m.cs = 563; goto _test_eof
 	_test_eof171:  m.cs = 171; goto _test_eof
 	_test_eof172:  m.cs = 172; goto _test_eof
 	_test_eof173:  m.cs = 173; goto _test_eof
-	_test_eof543:  m.cs = 543; goto _test_eof
+	_test_eof564:  m.cs = 564; goto _test_eof
 	_test_eof174:  m.cs = 174; goto _test_eof
 	_test_eof175:  m.cs = 175; goto _test_eof
-	_test_eof544:  m.cs = 544; goto _test_eof
-	_test_eof545:  m.cs = 545; goto _test_eof
+	_test_eof565:  m.cs = 565; goto _test_eof
+	_test_eof566:  m.cs = 566; goto _test_eof
 	_test_eof176:  m.cs = 176; goto _test_eof
-	_test_eof546:  m.cs = 546; goto _test_eof
-	_test_eof547:  m.cs = 547; goto _test_eof
+	_test_eof567:  m.cs = 567; goto _test_eof
+	_test_eof568:  m.cs = 568; goto _test_eof
 	_test_eof177:  m.cs = 177; goto _test_eof
 	_test_eof178:  m.cs = 178; goto _test_eof
-	_test_eof548:  m.cs = 548; goto _test_eof
-	_test_eof549:  m.cs = 549; goto _test_eof
-	_test_eof550:  m.cs = 550; goto _test_eof
+	_test_eof569:  m.cs = 569; goto _test_eof
+	_test_eof570:  m.cs = 570; goto _test_eof
+	_test_eof571:  m.cs = 571; goto _test_eof
+	_test_eof572:  m.cs = 572; goto _test_eof
+	_test_eof573:  m.cs = 573; goto _test_eof
+	_test_eof574:  m.cs = 574; goto _test_eof
 	_test_eof179:  m.cs = 179; goto _test_eof
 	_test_eof180:  m.cs = 180; goto _test_eof
 	_test_eof181:  m.cs = 181; goto _test_eof
-	_test_eof551:  m.cs = 551; goto _test_eof
+	_test_eof575:  m.cs = 575; goto _test_eof
 	_test_eof182:  m.cs = 182; goto _test_eof
 	_test_eof183:  m.cs = 183; goto _test_eof
 	_test_eof184:  m.cs = 184; goto _test_eof
-	_test_eof552:  m.cs = 552; goto _test_eof
+	_test_eof576:  m.cs = 576; goto _test_eof
 	_test_eof185:  m.cs = 185; goto _test_eof
 	_test_eof186:  m.cs = 186; goto _test_eof
-	_test_eof553:  m.cs = 553; goto _test_eof
-	_test_eof554:  m.cs = 554; goto _test_eof
+	_test_eof577:  m.cs = 577; goto _test_eof
+	_test_eof578:  m.cs = 578; goto _test_eof
 	_test_eof187:  m.cs = 187; goto _test_eof
-	_test_eof555:  m.cs = 555; goto _test_eof
+	_test_eof579:  m.cs = 579; goto _test_eof
 	_test_eof188:  m.cs = 188; goto _test_eof
-	_test_eof556:  m.cs = 556; goto _test_eof
-	_test_eof557:  m.cs = 557; goto _test_eof
+	_test_eof580:  m.cs = 580; goto _test_eof
+	_test_eof581:  m.cs = 581; goto _test_eof
 	_test_eof189:  m.cs = 189; goto _test_eof
 	_test_eof190:  m.cs = 190; goto _test_eof
 
 	_test_eof: {}
 	if ( m.p) == ( m.eof) {
 		switch  m.cs {
-		case 191, 192, 193, 195, 224, 225, 227, 246, 247, 248, 250, 269, 272, 291, 292, 293, 294, 296, 297, 298, 317, 318, 320, 339, 340, 342, 361, 362, 373, 374, 375, 377, 396, 397, 399, 400, 401, 420, 421, 422, 423, 425, 444, 445, 446, 448, 467, 468, 470, 471, 472, 493, 503, 504, 506, 536, 556, 557:
+		case 191, 192, 193, 195, 227, 228, 230, 249, 250, 251, 253, 272, 275, 300, 301, 302, 303, 305, 306, 307, 326, 327, 329, 348, 349, 351, 370, 371, 385, 386, 387, 389, 408, 409, 411, 412, 413, 432, 433, 434, 435, 437, 456, 457, 458, 460, 479, 480, 482, 483, 484, 505, 518, 519, 521, 554, 580, 581:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
@@ -20978,7 +22080,7 @@ tr325:
 	 m.cs = 187;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 217, 274, 284, 366, 495, 527, 539, 548:
+		case 217, 277, 290, 375, 507, 542, 557, 569:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -20989,9 +22091,20 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 214, 215, 216, 218, 270, 271, 273, 275, 281, 282, 283, 285, 363, 364, 365, 367, 491, 492, 494, 496, 502, 525, 526, 528, 534, 535, 537, 538, 540, 546, 547, 549:
+		case 220, 280, 293, 378, 510, 545, 560, 572:
 //line plugins/parsers/influx/machine.go.rl:92
 
+	m.handler.AddUint(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 188;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 214, 215, 216, 218, 219, 221, 273, 274, 276, 278, 279, 281, 287, 288, 289, 291, 292, 294, 372, 373, 374, 376, 377, 379, 503, 504, 506, 508, 509, 511, 517, 540, 541, 543, 544, 546, 552, 553, 555, 556, 558, 559, 561, 567, 568, 570, 571, 573:
+//line plugins/parsers/influx/machine.go.rl:96
+
 	m.handler.AddFloat(key, m.text())
 
 //line plugins/parsers/influx/machine.go.rl:22
@@ -21000,8 +22113,8 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 219, 220, 221, 222, 223, 276, 277, 278, 279, 280, 286, 287, 288, 289, 290, 368, 369, 370, 371, 372, 497, 498, 499, 500, 501, 529, 530, 531, 532, 533, 541, 542, 543, 544, 545, 550, 551, 552, 553, 554:
-//line plugins/parsers/influx/machine.go.rl:96
+		case 222, 223, 224, 225, 226, 282, 283, 284, 285, 286, 295, 296, 297, 298, 299, 380, 381, 382, 383, 384, 512, 513, 514, 515, 516, 547, 548, 549, 550, 551, 562, 563, 564, 565, 566, 574, 575, 576, 577, 578:
+//line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
@@ -21011,8 +22124,8 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 226, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 249, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 295, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 319, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 341, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 376, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 398, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 424, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 447, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 469, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 505, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524:
-//line plugins/parsers/influx/machine.go.rl:104
+		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 229, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 252, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 304, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 328, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 350, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 388, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 410, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 436, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 459, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 481, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 520, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539:
+//line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
 
@@ -21130,14 +22243,14 @@ tr325:
 	 m.cs = 187;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-//line plugins/parsers/influx/machine.go:21134
+//line plugins/parsers/influx/machine.go:22247
 		}
 	}
 
 	_out: {}
 	}
 
-//line plugins/parsers/influx/machine.go.rl:267
+//line plugins/parsers/influx/machine.go.rl:277
 
 	// Even if there was an error, return true. On the next call to this
 	// function we will attempt to scan to the next line of input and recover.
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
index 2edc5b8c8..fea50af83 100644
--- a/plugins/parsers/influx/machine.go.rl
+++ b/plugins/parsers/influx/machine.go.rl
@@ -89,6 +89,10 @@ action integer {
 	m.handler.AddInt(key, m.text())
 }
 
+action unsigned {
+	m.handler.AddUint(key, m.text())
+}
+
 action float {
 	m.handler.AddFloat(key, m.text())
 }
@@ -114,6 +118,9 @@ non_zero_digit =
 integer =
 	'-'? ( digit | ( non_zero_digit digit* ) );
 
+unsigned =
+	( digit | ( non_zero_digit digit* ) );
+
 number =
 	( integer ( '.' digit* )? ) | ( '.' digit* );
 
@@ -135,6 +142,9 @@ fieldfloat =
 fieldinteger =
 	(integer 'i') >begin %integer;
 
+fieldunsigned = 
+	(unsigned 'u') >begin %unsigned;
+
 false =
 	"false" | "FALSE" | "False" | "F" | "f";
 
@@ -153,7 +163,7 @@ fieldstring =
 fieldstringquoted =
 	'"' fieldstring '"';
 
-fieldvalue = fieldinteger | fieldfloat | fieldstringquoted | fieldbool;
+fieldvalue = fieldinteger | fieldunsigned | fieldfloat | fieldstringquoted | fieldbool;
 
 field =
 	fieldkey '=' fieldvalue;
diff --git a/plugins/parsers/influx/machine_test.go b/plugins/parsers/influx/machine_test.go
index 3b8bcdf8b..ad51ff3a7 100644
--- a/plugins/parsers/influx/machine_test.go
+++ b/plugins/parsers/influx/machine_test.go
@@ -43,6 +43,18 @@ func (h *TestingHandler) AddInt(key []byte, value []byte) {
 	h.results = append(h.results, fieldkey, fieldvalue)
 }
 
+func (h *TestingHandler) AddUint(key []byte, value []byte) {
+	fieldkey := Result{
+		Name:  FieldKey,
+		Value: key,
+	}
+	fieldvalue := Result{
+		Name:  FieldUint,
+		Value: value,
+	}
+	h.results = append(h.results, fieldkey, fieldvalue)
+}
+
 func (h *TestingHandler) AddFloat(key []byte, value []byte) {
 	fieldkey := Result{
 		Name:  FieldKey,
@@ -113,6 +125,9 @@ func (h *BenchmarkingHandler) AddTag(key []byte, value []byte) {
 func (h *BenchmarkingHandler) AddInt(key []byte, value []byte) {
 }
 
+func (h *BenchmarkingHandler) AddUint(key []byte, value []byte) {
+}
+
 func (h *BenchmarkingHandler) AddFloat(key []byte, value []byte) {
 }
 
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 273877d30..8aacb873f 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -19,6 +19,7 @@ type Handler interface {
 	SetMeasurement(name []byte)
 	AddTag(key []byte, value []byte)
 	AddInt(key []byte, value []byte)
+	AddUint(key []byte, value []byte)
 	AddFloat(key []byte, value []byte)
 	AddString(key []byte, value []byte)
 	AddBool(key []byte, value []byte)
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 28d57cfee..b57eacfa0 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -16,6 +16,12 @@ func Metric(v telegraf.Metric, err error) telegraf.Metric {
 	return v
 }
 
+const (
+	Uint64Overflow uint64 = 9223372036854775808
+	Uint64Max      uint64 = 18446744073709551615
+	Uint64Test     uint64 = 42
+)
+
 var DefaultTime = func() time.Time {
 	return time.Unix(42, 0)
 }
@@ -256,6 +262,57 @@ var ptests = []struct {
 		},
 		err: nil,
 	},
+	{
+		name:  "field uint",
+		input: []byte("cpu value=42u"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": Uint64Test,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field uint int overflow",
+		input: []byte("cpu value=9223372036854775808u"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": Uint64Overflow,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field uint maximum",
+		input: []byte("cpu value=18446744073709551615u"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": Uint64Max,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
 	{
 		name:  "field boolean",
 		input: []byte("cpu value=true"),
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 59d7662aa..321380013 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -237,6 +237,8 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 
 func appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
 	switch v := value.(type) {
+	case uint64:
+		return appendUintField(buf, v), nil
 	case int64:
 		return appendIntField(buf, v), nil
 	case float64:
@@ -257,6 +259,10 @@ func appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
 	return buf, ErrInvalidFieldType
 }
 
+func appendUintField(buf []byte, value uint64) []byte {
+	return append(strconv.AppendUint(buf, value, 10), 'u')
+}
+
 func appendIntField(buf []byte, value int64) []byte {
 	return append(strconv.AppendInt(buf, value, 10), 'i')
 }
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index 2795cfb38..eaf55a9e2 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -11,12 +11,20 @@ import (
 )
 
 func MustMetric(v telegraf.Metric, err error) telegraf.Metric {
+	// Force uint support to be enabled for testing.
+	metric.EnableUintSupport()
 	if err != nil {
 		panic(err)
 	}
 	return v
 }
 
+const (
+	Uint64Overflow uint64 = 9223372036854775808
+	Uint64Max      uint64 = 18446744073709551615
+	Uint64Test     uint64 = 42
+)
+
 var tests = []struct {
 	name     string
 	maxBytes int
@@ -128,6 +136,48 @@ var tests = []struct {
 		),
 		output: []byte("cpu value=42i 0\n"),
 	},
+	{
+		name: "uint field",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": Uint64Test,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=42u 0\n"),
+	},
+	{
+		name: "uint field int64 overflow",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": Uint64Overflow,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=9223372036854775808u 0\n"),
+	},
+	{
+		name: "uint field uint64 max",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": Uint64Max,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=18446744073709551615u 0\n"),
+	},
 	{
 		name: "bool field",
 		input: MustMetric(

From 04b9afff682366df7f142e62593c33866be1512f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 29 Mar 2018 12:42:25 -0700
Subject: [PATCH 1021/1302] Add TLS support to zookeeper input (#3949)

---
 CHANGELOG.md                          |   1 +
 plugins/inputs/zookeeper/README.md    | 116 +++++++++++++++-----------
 plugins/inputs/zookeeper/zookeeper.go |  73 ++++++++++++++--
 3 files changed, 134 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8729d9368..c79f2bf73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
 - [#3631](https://github.com/influxdata/telegraf/issues/3631): InfluxDB Line Protocol parser now accepts DOS line endings.
 - [#2496](https://github.com/influxdata/telegraf/issues/2496): An option has been added to skip database creation in the InfluxDB output.
 - [#3366](https://github.com/influxdata/telegraf/issues/3366): Add support for connecting to InfluxDB over a unix domain socket.
+- [#3946](https://github.com/influxdata/telegraf/pull/3946): Add optional unsigned integer support to the influx data format.
 
 ### Bugfixes
 
diff --git a/plugins/inputs/zookeeper/README.md b/plugins/inputs/zookeeper/README.md
index 80281a87d..99abbc227 100644
--- a/plugins/inputs/zookeeper/README.md
+++ b/plugins/inputs/zookeeper/README.md
@@ -1,35 +1,11 @@
-## Telegraf Plugin: Zookeeper
-
-#### Description
+## Zookeeper Input Plugin
 
 The zookeeper plugin collects variables outputted from the 'mntr' command
 [Zookeeper Admin](https://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html).
 
-```
-echo mntr | nc localhost 2181
+### Configuration
 
-              zk_version  3.4.0
-              zk_avg_latency  0
-              zk_max_latency  0
-              zk_min_latency  0
-              zk_packets_received 70
-              zk_packets_sent 69
-              zk_outstanding_requests 0
-              zk_server_state leader
-              zk_znode_count   4
-              zk_watch_count  0
-              zk_ephemerals_count 0
-              zk_approximate_data_size    27
-              zk_followers    4                   - only exposed by the Leader
-              zk_synced_followers 4               - only exposed by the Leader
-              zk_pending_syncs    0               - only exposed by the Leader
-              zk_open_file_descriptor_count 23    - only available on Unix platforms
-              zk_max_file_descriptor_count 1024   - only available on Unix platforms
-```
-
-## Configuration
-
-```
+```toml
 # Reads 'mntr' stats from one or many zookeeper servers
 [[inputs.zookeeper]]
   ## An array of address to gather stats about. Specify an ip or hostname
@@ -38,28 +14,72 @@ echo mntr | nc localhost 2181
   ## If no servers are specified, then localhost is used as the host.
   ## If no port is specified, 2181 is used
   servers = [":2181"]
+
+  ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+  # timeout = "5s"
+
+  ## Optional SSL Config
+  # enable_ssl = true
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
 ```
 
-## InfluxDB Measurement:
+### Metrics:
+
+Exact field names are based on Zookeeper response and may vary between
+configuration, platform, and version.
+
+- zookeeper
+  - tags:
+    - server
+    - port
+    - state
+  - fields:
+    - approximate_data_size (integer)
+    - avg_latency (integer)
+    - ephemerals_count (integer)
+    - max_file_descriptor_count (integer)
+    - max_latency (integer)
+    - min_latency (integer)
+    - num_alive_connections (integer)
+    - open_file_descriptor_count (integer)
+    - outstanding_requests (integer)
+    - packets_received (integer)
+    - packets_sent (integer)
+    - version (string)
+    - watch_count (integer)
+    - znode_count (integer)
+    - followers (integer, leader only)
+    - synced_followers (integer, leader only)
+    - pending_syncs (integer, leader only)
+
+### Debugging:
+
+If you have any issues please check the direct Zookeeper output using netcat:
+```sh
+$ echo mntr | nc localhost 2181
+zk_version      3.4.9-3--1, built on Thu, 01 Jun 2017 16:26:44 -0700
+zk_avg_latency  0
+zk_max_latency  0
+zk_min_latency  0
+zk_packets_received     8
+zk_packets_sent 7
+zk_num_alive_connections        1
+zk_outstanding_requests 0
+zk_server_state standalone
+zk_znode_count  129
+zk_watch_count  0
+zk_ephemerals_count     0
+zk_approximate_data_size        10044
+zk_open_file_descriptor_count   44
+zk_max_file_descriptor_count    4096
+```
+
+### Example Output
 
 ```
-M zookeeper
-  T host
-  T port
-  T state
-  
-  F approximate_data_size        integer
-  F avg_latency                  integer
-  F ephemerals_count             integer
-  F max_file_descriptor_count    integer
-  F max_latency                  integer
-  F min_latency                  integer
-  F num_alive_connections        integer
-  F open_file_descriptor_count   integer
-  F outstanding_requests         integer
-  F packets_received             integer
-  F packets_sent                 integer
-  F version                      string
-  F watch_count                  integer
-  F znode_count                  integer
-```
\ No newline at end of file
+zookeeper,server=localhost,port=2181,state=standalone ephemerals_count=0i,approximate_data_size=10044i,open_file_descriptor_count=44i,max_latency=0i,packets_received=7i,outstanding_requests=0i,znode_count=129i,max_file_descriptor_count=4096i,version="3.4.9-3--1",avg_latency=0i,packets_sent=6i,num_alive_connections=1i,watch_count=0i,min_latency=0i 1522351112000000000
+```
diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go
index 904ea7c15..1c60e368a 100644
--- a/plugins/inputs/zookeeper/zookeeper.go
+++ b/plugins/inputs/zookeeper/zookeeper.go
@@ -2,21 +2,33 @@ package zookeeper
 
 import (
 	"bufio"
+	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
-	"os"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // Zookeeper is a zookeeper plugin
 type Zookeeper struct {
 	Servers []string
+	Timeout internal.Duration
+
+	EnableSSL          bool   `toml:"enable_ssl"`
+	SSLCA              string `toml:"ssl_ca"`
+	SSLCert            string `toml:"ssl_cert"`
+	SSLKey             string `toml:"ssl_key"`
+	InsecureSkipVerify bool   `toml:"insecure_skip_verify"`
+
+	initialized bool
+	tlsConfig   *tls.Config
 }
 
 var sampleConfig = `
@@ -26,9 +38,20 @@ var sampleConfig = `
   ## If no servers are specified, then localhost is used as the host.
   ## If no port is specified, 2181 is used
   servers = [":2181"]
+
+  ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+  # timeout = "5s"
+
+  ## Optional SSL Config
+  # enable_ssl = true
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
 `
 
-var defaultTimeout = time.Second * time.Duration(5)
+var defaultTimeout = 5 * time.Second
 
 // SampleConfig returns sample configuration message
 func (z *Zookeeper) SampleConfig() string {
@@ -40,34 +63,68 @@ func (z *Zookeeper) Description() string {
 	return `Reads 'mntr' stats from one or many zookeeper servers`
 }
 
+func (z *Zookeeper) dial(ctx context.Context, addr string) (net.Conn, error) {
+	var dialer net.Dialer
+	if z.EnableSSL {
+		deadline, ok := ctx.Deadline()
+		if ok {
+			dialer.Deadline = deadline
+		}
+		return tls.DialWithDialer(&dialer, "tcp", addr, z.tlsConfig)
+	} else {
+		return dialer.DialContext(ctx, "tcp", addr)
+	}
+}
+
 // Gather reads stats from all configured servers accumulates stats
 func (z *Zookeeper) Gather(acc telegraf.Accumulator) error {
+	ctx := context.Background()
+
+	if !z.initialized {
+		tlsConfig, err := internal.GetTLSConfig(
+			z.SSLCert, z.SSLKey, z.SSLCA, z.InsecureSkipVerify)
+		if err != nil {
+			return err
+		}
+		z.tlsConfig = tlsConfig
+		z.initialized = true
+	}
+
+	if z.Timeout.Duration < 1*time.Second {
+		z.Timeout.Duration = defaultTimeout
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, z.Timeout.Duration)
+	defer cancel()
+
 	if len(z.Servers) == 0 {
 		z.Servers = []string{":2181"}
 	}
 
 	for _, serverAddress := range z.Servers {
-		acc.AddError(z.gatherServer(serverAddress, acc))
+		acc.AddError(z.gatherServer(ctx, serverAddress, acc))
 	}
 	return nil
 }
 
-func (z *Zookeeper) gatherServer(address string, acc telegraf.Accumulator) error {
+func (z *Zookeeper) gatherServer(ctx context.Context, address string, acc telegraf.Accumulator) error {
 	var zookeeper_state string
 	_, _, err := net.SplitHostPort(address)
 	if err != nil {
 		address = address + ":2181"
 	}
 
-	c, err := net.DialTimeout("tcp", address, defaultTimeout)
+	c, err := z.dial(ctx, address)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
 		return err
 	}
 	defer c.Close()
 
-	// Extend connection
-	c.SetDeadline(time.Now().Add(defaultTimeout))
+	// Apply deadline to connection
+	deadline, ok := ctx.Deadline()
+	if ok {
+		c.SetDeadline(deadline)
+	}
 
 	fmt.Fprintf(c, "%s\n", "mntr")
 	rdr := bufio.NewReader(c)

From c2108fcf09507e6805c11d098917b5a0f208e9d3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 29 Mar 2018 12:44:33 -0700
Subject: [PATCH 1022/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c79f2bf73..7e69425bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
 - [#2496](https://github.com/influxdata/telegraf/issues/2496): An option has been added to skip database creation in the InfluxDB output.
 - [#3366](https://github.com/influxdata/telegraf/issues/3366): Add support for connecting to InfluxDB over a unix domain socket.
 - [#3946](https://github.com/influxdata/telegraf/pull/3946): Add optional unsigned integer support to the influx data format.
+- [#3811](https://github.com/influxdata/telegraf/pull/3811): Add TLS support to zookeeper input.
 
 ### Bugfixes
 

From b99cd14129ddbb7c3dbcf490d008b2eec525b9a9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 29 Mar 2018 13:31:43 -0700
Subject: [PATCH 1023/1302] Add influx uint support as a runtime option (#3948)

---
 Makefile                                  |  5 +--
 docs/DATA_FORMATS_OUTPUT.md               | 28 +++++++++---
 internal/config/config.go                 | 13 ++++++
 metric/metric.go                          | 31 ++-----------
 plugins/outputs/influxdb/README.md        |  6 +++
 plugins/outputs/influxdb/http.go          |  3 +-
 plugins/outputs/influxdb/influxdb.go      | 10 +++++
 plugins/parsers/influx/handler.go         | 10 ++---
 plugins/parsers/influx/parser_test.go     | 52 ++++++++++++++++------
 plugins/serializers/influx/influx.go      | 31 ++++++++++---
 plugins/serializers/influx/influx_test.go | 53 ++++++++++++++---------
 plugins/serializers/registry.go           | 10 +++++
 12 files changed, 168 insertions(+), 84 deletions(-)

diff --git a/Makefile b/Makefile
index ffa3be0bf..b9832fb6a 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ deps:
 	gdm restore
 
 telegraf:
-	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" $(BUILDFLAGS) ./cmd/telegraf/telegraf.go
+	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
 
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
@@ -62,9 +62,6 @@ fmtcheck:
 	fi
 	@echo '[INFO] done.'
 
-uint64:
-	BUILDFLAGS="-tags uint64" $(MAKE) all
-
 lint:
 	golint ./...
 
diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 136780381..5716b0aec 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -2,12 +2,12 @@
 
 Telegraf is able to serialize metrics into the following output data formats:
 
-1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#influx)
-1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#json)
-1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite)
+1. [InfluxDB Line Protocol](#influx)
+1. [JSON](#json)
+1. [Graphite](#graphite)
 
 Telegraf metrics, like InfluxDB
-[points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
+[points](https://docs.influxdata.com/influxdb/latest/concepts/glossary/#point),
 are a combination of four basic parts:
 
 1. Measurement Name
@@ -49,8 +49,10 @@ I'll go over below.
 
 # Influx:
 
-There are no additional configuration options for InfluxDB line-protocol. The
-metrics are serialized directly into InfluxDB line-protocol.
+The `influx` format outputs data as
+[InfluxDB Line Protocol](https://docs.influxdata.com/influxdb/latest/write_protocols/line_protocol_tutorial/).
+This is the recommended format to use unless another format is required for
+interoperability.
 
 ### Influx Configuration:
 
@@ -64,6 +66,20 @@ metrics are serialized directly into InfluxDB line-protocol.
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
+
+  ## Maximum line length in bytes.  Useful only for debugging.
+  # influx_max_line_bytes = 0
+
+  ## When true, fields will be output in ascending lexical order.  Enabling
+  ## this option will result in decreased performance and is only recommended
+  ## when you need predictable ordering while debugging.
+  # influx_sort_fields = false
+
+  ## When true, Telegraf will output unsigned integers as unsigned values,
+  ## i.e.: `42u`.  You will need a version of InfluxDB supporting unsigned
+  ## integer values.  Enabling this option will result in field type errors if
+  ## existing data has been written.
+  # influx_uint_support = false
 ```
 
 # Graphite:
diff --git a/internal/config/config.go b/internal/config/config.go
index db1e1f82b..fe8cac5ae 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1391,6 +1391,18 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	if node, ok := tbl.Fields["influx_uint_support"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Boolean); ok {
+				var err error
+				c.InfluxUintSupport, err = b.Boolean()
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+
 	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1409,6 +1421,7 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 
 	delete(tbl.Fields, "influx_max_line_bytes")
 	delete(tbl.Fields, "influx_sort_fields")
+	delete(tbl.Fields, "influx_uint_support")
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")
diff --git a/metric/metric.go b/metric/metric.go
index 7c8ca1134..23c48697f 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -9,18 +9,6 @@ import (
 	"github.com/influxdata/telegraf"
 )
 
-const MaxInt = int(^uint(0) >> 1)
-
-// enableUint64Support will enable uint64 support if set to true.
-var enableUint64Support = false
-
-// EnableUintSupport manually enables uint support for convertValue.
-// This function will be removed in the future and only exists for unit tests during the
-// transition.
-func EnableUintSupport() {
-	enableUint64Support = true
-}
-
 type metric struct {
 	name   string
 	tags   []*telegraf.Tag
@@ -269,19 +257,8 @@ func convertField(v interface{}) interface{} {
 	case int:
 		return int64(v)
 	case uint:
-		if v <= uint(MaxInt) {
-			return int64(v)
-		} else {
-			return int64(MaxInt)
-		}
+		return uint64(v)
 	case uint64:
-		if enableUint64Support == false {
-			if v <= uint64(MaxInt) {
-				return int64(v)
-			} else {
-				return int64(MaxInt)
-			}
-		}
 		return uint64(v)
 	case []byte:
 		return string(v)
@@ -292,11 +269,11 @@ func convertField(v interface{}) interface{} {
 	case int8:
 		return int64(v)
 	case uint32:
-		return int64(v)
+		return uint64(v)
 	case uint16:
-		return int64(v)
+		return uint64(v)
 	case uint8:
-		return int64(v)
+		return uint64(v)
 	case float32:
 		return float64(v)
 	default:
diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index aafe83da7..bac25cf53 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -59,4 +59,10 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
   ## compress body or "identity" to apply no encoding.
   # content_encoding = "identity"
+
+  ## When true, Telegraf will output unsigned integers as unsigned values,
+  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
+  ## integer values.  Enabling this option will result in field type errors if
+  ## existing data has been written.
+  # influx_uint_support = false
 ```
diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
index fdbb5bd8c..f32054f40 100644
--- a/plugins/outputs/influxdb/http.go
+++ b/plugins/outputs/influxdb/http.go
@@ -102,7 +102,8 @@ type HTTPConfig struct {
 	RetentionPolicy string
 	Consistency     string
 
-	Serializer *influx.Serializer
+	InfluxUintSupport bool `toml:"influx_uint_support"`
+	Serializer        *influx.Serializer
 }
 
 type httpClient struct {
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 2e6e0d9c6..3d1a895a2 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -45,6 +45,7 @@ type InfluxDB struct {
 	HTTPHeaders          map[string]string `toml:"http_headers"`
 	ContentEncoding      string            `toml:"content_encoding"`
 	SkipDatabaseCreation bool              `toml:"skip_database_creation"`
+	InfluxUintSupport    bool              `toml:"influx_uint_support"`
 
 	// Path to CA file
 	SSLCA string `toml:"ssl_ca"`
@@ -119,6 +120,12 @@ var sampleConfig = `
   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
   ## compress body or "identity" to apply no encoding.
   # content_encoding = "identity"
+
+  ## When true, Telegraf will output unsigned integers as unsigned values,
+  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
+  ## integer values.  Enabling this option will result in field type errors if
+  ## existing data has been written.
+  # influx_uint_support = false
 `
 
 func (i *InfluxDB) Connect() error {
@@ -135,6 +142,9 @@ func (i *InfluxDB) Connect() error {
 	}
 
 	i.serializer = influx.NewSerializer()
+	if i.InfluxUintSupport {
+		i.serializer.SetFieldTypeSupport(influx.UintSupport)
+	}
 
 	for _, u := range urls {
 		u, err := url.Parse(u)
diff --git a/plugins/parsers/influx/handler.go b/plugins/parsers/influx/handler.go
index 8c17cf9cf..a75883797 100644
--- a/plugins/parsers/influx/handler.go
+++ b/plugins/parsers/influx/handler.go
@@ -48,7 +48,7 @@ func (h *MetricHandler) AddInt(key []byte, value []byte) {
 	fk := unescape(key)
 	fv, err := parseIntBytes(bytes.TrimSuffix(value, []byte("i")), 10, 64)
 	if err != nil {
-		log.Errorf("E! Received unparseable int value: %q", value)
+		log.Errorf("E! Received unparseable int value: %q: %v", value, err)
 		return
 	}
 	h.builder.AddField(fk, fv)
@@ -58,7 +58,7 @@ func (h *MetricHandler) AddUint(key []byte, value []byte) {
 	fk := unescape(key)
 	fv, err := parseUintBytes(bytes.TrimSuffix(value, []byte("u")), 10, 64)
 	if err != nil {
-		log.Errorf("E! Received unparseable uint value: %q", value)
+		log.Errorf("E! Received unparseable uint value: %q: %v", value, err)
 		return
 	}
 	h.builder.AddField(fk, fv)
@@ -68,7 +68,7 @@ func (h *MetricHandler) AddFloat(key []byte, value []byte) {
 	fk := unescape(key)
 	fv, err := parseFloatBytes(value, 64)
 	if err != nil {
-		log.Errorf("E! Received unparseable float value: %q", value)
+		log.Errorf("E! Received unparseable float value: %q: %v", value, err)
 		return
 	}
 	h.builder.AddField(fk, fv)
@@ -84,7 +84,7 @@ func (h *MetricHandler) AddBool(key []byte, value []byte) {
 	fk := unescape(key)
 	fv, err := parseBoolBytes(value)
 	if err != nil {
-		log.Errorf("E! Received unparseable boolean value: %q", value)
+		log.Errorf("E! Received unparseable boolean value: %q: %v", value, err)
 		return
 	}
 	h.builder.AddField(fk, fv)
@@ -93,7 +93,7 @@ func (h *MetricHandler) AddBool(key []byte, value []byte) {
 func (h *MetricHandler) SetTimestamp(tm []byte) {
 	v, err := parseIntBytes(tm, 10, 64)
 	if err != nil {
-		log.Errorf("E! Received unparseable timestamp: %q", tm)
+		log.Errorf("E! Received unparseable timestamp: %q: %v", tm, err)
 		return
 	}
 	ns := v * int64(h.precision)
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index b57eacfa0..59d4d7f16 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -16,12 +16,6 @@ func Metric(v telegraf.Metric, err error) telegraf.Metric {
 	return v
 }
 
-const (
-	Uint64Overflow uint64 = 9223372036854775808
-	Uint64Max      uint64 = 18446744073709551615
-	Uint64Test     uint64 = 42
-)
-
 var DefaultTime = func() time.Time {
 	return time.Unix(42, 0)
 }
@@ -262,6 +256,38 @@ var ptests = []struct {
 		},
 		err: nil,
 	},
+	{
+		name:  "field int overflow dropped",
+		input: []byte("cpu value=9223372036854775808i"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "field int max value",
+		input: []byte("cpu value=9223372036854775807i"),
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 9223372036854775807,
+					},
+					time.Unix(42, 0),
+				),
+			),
+		},
+		err: nil,
+	},
 	{
 		name:  "field uint",
 		input: []byte("cpu value=42u"),
@@ -271,7 +297,7 @@ var ptests = []struct {
 					"cpu",
 					map[string]string{},
 					map[string]interface{}{
-						"value": Uint64Test,
+						"value": uint64(42),
 					},
 					time.Unix(42, 0),
 				),
@@ -280,16 +306,14 @@ var ptests = []struct {
 		err: nil,
 	},
 	{
-		name:  "field uint int overflow",
-		input: []byte("cpu value=9223372036854775808u"),
+		name:  "field uint overflow dropped",
+		input: []byte("cpu value=18446744073709551616u"),
 		metrics: []telegraf.Metric{
 			Metric(
 				metric.New(
 					"cpu",
 					map[string]string{},
-					map[string]interface{}{
-						"value": Uint64Overflow,
-					},
+					map[string]interface{}{},
 					time.Unix(42, 0),
 				),
 			),
@@ -297,7 +321,7 @@ var ptests = []struct {
 		err: nil,
 	},
 	{
-		name:  "field uint maximum",
+		name:  "field uint max value",
 		input: []byte("cpu value=18446744073709551615u"),
 		metrics: []telegraf.Metric{
 			Metric(
@@ -305,7 +329,7 @@ var ptests = []struct {
 					"cpu",
 					map[string]string{},
 					map[string]interface{}{
-						"value": Uint64Max,
+						"value": uint64(18446744073709551615),
 					},
 					time.Unix(42, 0),
 				),
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 321380013..7d68ed3df 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -20,6 +20,12 @@ const (
 	SortFields
 )
 
+type FieldTypeSupport int
+
+const (
+	UintSupport FieldTypeSupport = 1 << iota
+)
+
 var (
 	ErrNeedMoreSpace    = errors.New("need more space")
 	ErrInvalidName      = errors.New("invalid name")
@@ -32,9 +38,10 @@ var (
 
 // Serializer is a serializer for line protocol.
 type Serializer struct {
-	maxLineBytes   int
-	bytesWritten   int
-	fieldSortOrder FieldSortOrder
+	maxLineBytes     int
+	bytesWritten     int
+	fieldSortOrder   FieldSortOrder
+	fieldTypeSupport FieldTypeSupport
 
 	buf    bytes.Buffer
 	header []byte
@@ -61,6 +68,10 @@ func (s *Serializer) SetFieldSortOrder(order FieldSortOrder) {
 	s.fieldSortOrder = order
 }
 
+func (s *Serializer) SetFieldTypeSupport(typeSupport FieldTypeSupport) {
+	s.fieldTypeSupport = typeSupport
+}
+
 // Serialize writes the telegraf.Metric to a byte slice.  May produce multiple
 // lines of output if longer than maximum line length.  Lines are terminated
 // with a newline (LF) char.
@@ -142,7 +153,7 @@ func (s *Serializer) buildFieldPair(key string, value interface{}) error {
 
 	s.pair = append(s.pair, key...)
 	s.pair = append(s.pair, '=')
-	pair, err := appendFieldValue(s.pair, value)
+	pair, err := s.appendFieldValue(s.pair, value)
 	if err != nil {
 		return err
 	}
@@ -235,10 +246,18 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 
 }
 
-func appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
+func (s *Serializer) appendFieldValue(buf []byte, value interface{}) ([]byte, error) {
 	switch v := value.(type) {
 	case uint64:
-		return appendUintField(buf, v), nil
+		if s.fieldTypeSupport&UintSupport != 0 {
+			return appendUintField(buf, v), nil
+		} else {
+			if v <= uint64(MaxInt) {
+				return appendIntField(buf, int64(v)), nil
+			} else {
+				return appendIntField(buf, int64(MaxInt)), nil
+			}
+		}
 	case int64:
 		return appendIntField(buf, v), nil
 	case float64:
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index eaf55a9e2..e31516462 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -11,26 +11,19 @@ import (
 )
 
 func MustMetric(v telegraf.Metric, err error) telegraf.Metric {
-	// Force uint support to be enabled for testing.
-	metric.EnableUintSupport()
 	if err != nil {
 		panic(err)
 	}
 	return v
 }
 
-const (
-	Uint64Overflow uint64 = 9223372036854775808
-	Uint64Max      uint64 = 18446744073709551615
-	Uint64Test     uint64 = 42
-)
-
 var tests = []struct {
-	name     string
-	maxBytes int
-	input    telegraf.Metric
-	output   []byte
-	err      error
+	name        string
+	maxBytes    int
+	typeSupport FieldTypeSupport
+	input       telegraf.Metric
+	output      []byte
+	err         error
 }{
 	{
 		name: "minimal",
@@ -143,40 +136,56 @@ var tests = []struct {
 				"cpu",
 				map[string]string{},
 				map[string]interface{}{
-					"value": Uint64Test,
+					"value": uint64(42),
 				},
 				time.Unix(0, 0),
 			),
 		),
-		output: []byte("cpu value=42u 0\n"),
+		output:      []byte("cpu value=42u 0\n"),
+		typeSupport: UintSupport,
 	},
 	{
-		name: "uint field int64 overflow",
+		name: "uint field max value",
 		input: MustMetric(
 			metric.New(
 				"cpu",
 				map[string]string{},
 				map[string]interface{}{
-					"value": Uint64Overflow,
+					"value": uint64(18446744073709551615),
 				},
 				time.Unix(0, 0),
 			),
 		),
-		output: []byte("cpu value=9223372036854775808u 0\n"),
+		output:      []byte("cpu value=18446744073709551615u 0\n"),
+		typeSupport: UintSupport,
 	},
 	{
-		name: "uint field uint64 max",
+		name: "uint field no uint support",
 		input: MustMetric(
 			metric.New(
 				"cpu",
 				map[string]string{},
 				map[string]interface{}{
-					"value": Uint64Max,
+					"value": uint64(42),
 				},
 				time.Unix(0, 0),
 			),
 		),
-		output: []byte("cpu value=18446744073709551615u 0\n"),
+		output: []byte("cpu value=42i 0\n"),
+	},
+	{
+		name: "uint field no uint support overflow",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": uint64(18446744073709551615),
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=9223372036854775807i 0\n"),
 	},
 	{
 		name: "bool field",
@@ -358,6 +367,7 @@ func TestSerializer(t *testing.T) {
 			serializer := NewSerializer()
 			serializer.SetMaxLineBytes(tt.maxBytes)
 			serializer.SetFieldSortOrder(SortFields)
+			serializer.SetFieldTypeSupport(tt.typeSupport)
 			output, err := serializer.Serialize(tt.input)
 			require.Equal(t, tt.err, err)
 			require.Equal(t, string(tt.output), string(output))
@@ -370,6 +380,7 @@ func BenchmarkSerializer(b *testing.B) {
 		b.Run(tt.name, func(b *testing.B) {
 			serializer := NewSerializer()
 			serializer.SetMaxLineBytes(tt.maxBytes)
+			serializer.SetFieldTypeSupport(tt.typeSupport)
 			for n := 0; n < b.N; n++ {
 				output, err := serializer.Serialize(tt.input)
 				_ = err
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 3389ec59c..431112b20 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -40,6 +40,9 @@ type Config struct {
 	// than unsorted fields; influx format only
 	InfluxSortFields bool
 
+	// Support unsigned integer output; influx format only
+	InfluxUintSupport bool
+
 	// Prefix to add to all measurements, only supports Graphite
 	Prefix string
 
@@ -77,9 +80,16 @@ func NewInfluxSerializerConfig(config *Config) (Serializer, error) {
 	if config.InfluxSortFields {
 		sort = influx.SortFields
 	}
+
+	var typeSupport influx.FieldTypeSupport
+	if config.InfluxUintSupport {
+		typeSupport = typeSupport + influx.UintSupport
+	}
+
 	s := influx.NewSerializer()
 	s.SetMaxLineBytes(config.InfluxMaxLineBytes)
 	s.SetFieldSortOrder(sort)
+	s.SetFieldTypeSupport(typeSupport)
 	return s, nil
 }
 

From 0c1293ad5e4fc9a0386d777d29deed960794918e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 29 Mar 2018 13:32:05 -0700
Subject: [PATCH 1024/1302] Add MmapStats when using rocksdb storage engine
 (#3930)

---
 plugins/inputs/mongodb/mongodb_data.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 4eab5b185..5114e0ad7 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -135,7 +135,7 @@ func (d *MongodbData) AddDefaultStats() {
 	}
 	d.addStat(statLine, DefaultClusterStats)
 	d.addStat(statLine, DefaultShardStats)
-	if d.StatLine.StorageEngine == "mmapv1" {
+	if d.StatLine.StorageEngine == "mmapv1" || d.StatLine.StorageEngine == "rocksdb" {
 		d.addStat(statLine, MmapStats)
 	} else if d.StatLine.StorageEngine == "wiredTiger" {
 		for key, value := range WiredTigerStats {

From 38ec968b0b7a45bf3b923c92751802c19d032703 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 29 Mar 2018 16:40:03 -0700
Subject: [PATCH 1025/1302] Move Handler interface into machine where it is
 used

---
 plugins/parsers/influx/machine.go    | 491 ++++++++++++++-------------
 plugins/parsers/influx/machine.go.rl |  11 +
 plugins/parsers/influx/parser.go     |  12 -
 3 files changed, 262 insertions(+), 252 deletions(-)

diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
index 678790b06..292fada28 100644
--- a/plugins/parsers/influx/machine.go
+++ b/plugins/parsers/influx/machine.go
@@ -31,6 +31,17 @@ const LineProtocol_en_align int = 188
 
 //line plugins/parsers/influx/machine.go.rl:227
 
+type Handler interface {
+	SetMeasurement(name []byte)
+	AddTag(key []byte, value []byte)
+	AddInt(key []byte, value []byte)
+	AddUint(key []byte, value []byte)
+	AddFloat(key []byte, value []byte)
+	AddString(key []byte, value []byte)
+	AddBool(key []byte, value []byte)
+	SetTimestamp(tm []byte)
+}
+
 type machine struct {
 	data       []byte
 	cs         int
@@ -46,22 +57,22 @@ func NewMachine(handler Handler) *machine {
 	}
 
 	
-//line plugins/parsers/influx/machine.go.rl:243
+//line plugins/parsers/influx/machine.go.rl:254
 	
-//line plugins/parsers/influx/machine.go.rl:244
+//line plugins/parsers/influx/machine.go.rl:255
 	
-//line plugins/parsers/influx/machine.go.rl:245
+//line plugins/parsers/influx/machine.go.rl:256
 	
-//line plugins/parsers/influx/machine.go.rl:246
+//line plugins/parsers/influx/machine.go.rl:257
 	
-//line plugins/parsers/influx/machine.go.rl:247
+//line plugins/parsers/influx/machine.go.rl:258
 	
-//line plugins/parsers/influx/machine.go:60
+//line plugins/parsers/influx/machine.go:71
 	{
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:248
+//line plugins/parsers/influx/machine.go.rl:259
 
 	return m
 }
@@ -75,12 +86,12 @@ func (m *machine) SetData(data []byte) {
 	m.err = nil
 
 	
-//line plugins/parsers/influx/machine.go:79
+//line plugins/parsers/influx/machine.go:90
 	{
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:261
+//line plugins/parsers/influx/machine.go.rl:272
 	m.cs = LineProtocol_en_align
 }
 
@@ -97,7 +108,7 @@ func (m *machine) ParseLine() bool {
 	var yield bool
 
 	
-//line plugins/parsers/influx/machine.go:101
+//line plugins/parsers/influx/machine.go:112
 	{
 	if ( m.p) == ( m.pe) {
 		goto _test_eof
@@ -2478,7 +2489,7 @@ tr0:
 			goto _test_eof2
 		}
 	st_case_2:
-//line plugins/parsers/influx/machine.go:2482
+//line plugins/parsers/influx/machine.go:2493
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2514,7 +2525,7 @@ tr58:
 			goto _test_eof3
 		}
 	st_case_3:
-//line plugins/parsers/influx/machine.go:2518
+//line plugins/parsers/influx/machine.go:2529
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2546,7 +2557,7 @@ tr9:
 			goto _test_eof4
 		}
 	st_case_4:
-//line plugins/parsers/influx/machine.go:2550
+//line plugins/parsers/influx/machine.go:2561
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -2750,7 +2761,7 @@ tr210:
 	{( m.p)++; goto _out }
 
 	goto _again
-//line plugins/parsers/influx/machine.go:2754
+//line plugins/parsers/influx/machine.go:2765
 st_case_0:
 	st0:
 		 m.cs = 0
@@ -2766,7 +2777,7 @@ tr14:
 			goto _test_eof5
 		}
 	st_case_5:
-//line plugins/parsers/influx/machine.go:2770
+//line plugins/parsers/influx/machine.go:2781
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st6
@@ -2812,7 +2823,7 @@ tr25:
 			goto _test_eof7
 		}
 	st_case_7:
-//line plugins/parsers/influx/machine.go:2816
+//line plugins/parsers/influx/machine.go:2827
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -2841,7 +2852,7 @@ tr29:
 			goto _test_eof191
 		}
 	st_case_191:
-//line plugins/parsers/influx/machine.go:2845
+//line plugins/parsers/influx/machine.go:2856
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2885,7 +2896,7 @@ tr369:
 			goto _test_eof192
 		}
 	st_case_192:
-//line plugins/parsers/influx/machine.go:2889
+//line plugins/parsers/influx/machine.go:2900
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2984,7 +2995,7 @@ tr370:
 			goto _test_eof193
 		}
 	st_case_193:
-//line plugins/parsers/influx/machine.go:2988
+//line plugins/parsers/influx/machine.go:2999
 		goto tr1
 tr332:
 //line plugins/parsers/influx/machine.go.rl:18
@@ -2997,7 +3008,7 @@ tr332:
 			goto _test_eof8
 		}
 	st_case_8:
-//line plugins/parsers/influx/machine.go:3001
+//line plugins/parsers/influx/machine.go:3012
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 			goto st194
 		}
@@ -3013,7 +3024,7 @@ tr333:
 			goto _test_eof194
 		}
 	st_case_194:
-//line plugins/parsers/influx/machine.go:3017
+//line plugins/parsers/influx/machine.go:3028
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -3042,7 +3053,7 @@ tr334:
 			goto _test_eof195
 		}
 	st_case_195:
-//line plugins/parsers/influx/machine.go:3046
+//line plugins/parsers/influx/machine.go:3057
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -3475,7 +3486,7 @@ tr371:
 			goto _test_eof9
 		}
 	st_case_9:
-//line plugins/parsers/influx/machine.go:3479
+//line plugins/parsers/influx/machine.go:3490
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -3506,7 +3517,7 @@ tr12:
 			goto _test_eof10
 		}
 	st_case_10:
-//line plugins/parsers/influx/machine.go:3510
+//line plugins/parsers/influx/machine.go:3521
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -3527,7 +3538,7 @@ tr27:
 			goto _test_eof11
 		}
 	st_case_11:
-//line plugins/parsers/influx/machine.go:3531
+//line plugins/parsers/influx/machine.go:3542
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st7
@@ -3546,7 +3557,7 @@ tr17:
 			goto _test_eof12
 		}
 	st_case_12:
-//line plugins/parsers/influx/machine.go:3550
+//line plugins/parsers/influx/machine.go:3561
 		if ( m.data)[( m.p)] == 48 {
 			goto st214
 		}
@@ -3592,7 +3603,7 @@ tr18:
 			goto _test_eof215
 		}
 	st_case_215:
-//line plugins/parsers/influx/machine.go:3596
+//line plugins/parsers/influx/machine.go:3607
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3728,7 +3739,7 @@ tr19:
 			goto _test_eof219
 		}
 	st_case_219:
-//line plugins/parsers/influx/machine.go:3732
+//line plugins/parsers/influx/machine.go:3743
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3783,7 +3794,7 @@ tr20:
 			goto _test_eof221
 		}
 	st_case_221:
-//line plugins/parsers/influx/machine.go:3787
+//line plugins/parsers/influx/machine.go:3798
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3824,7 +3835,7 @@ tr21:
 			goto _test_eof222
 		}
 	st_case_222:
-//line plugins/parsers/influx/machine.go:3828
+//line plugins/parsers/influx/machine.go:3839
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -3927,7 +3938,7 @@ tr22:
 			goto _test_eof224
 		}
 	st_case_224:
-//line plugins/parsers/influx/machine.go:3931
+//line plugins/parsers/influx/machine.go:3942
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -3975,7 +3986,7 @@ tr23:
 			goto _test_eof225
 		}
 	st_case_225:
-//line plugins/parsers/influx/machine.go:3979
+//line plugins/parsers/influx/machine.go:3990
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -4003,7 +4014,7 @@ tr24:
 			goto _test_eof226
 		}
 	st_case_226:
-//line plugins/parsers/influx/machine.go:4007
+//line plugins/parsers/influx/machine.go:4018
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -4031,7 +4042,7 @@ tr11:
 			goto _test_eof23
 		}
 	st_case_23:
-//line plugins/parsers/influx/machine.go:4035
+//line plugins/parsers/influx/machine.go:4046
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4063,7 +4074,7 @@ tr6:
 			goto _test_eof24
 		}
 	st_case_24:
-//line plugins/parsers/influx/machine.go:4067
+//line plugins/parsers/influx/machine.go:4078
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4095,7 +4106,7 @@ tr42:
 			goto _test_eof25
 		}
 	st_case_25:
-//line plugins/parsers/influx/machine.go:4099
+//line plugins/parsers/influx/machine.go:4110
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4137,7 +4148,7 @@ tr43:
 			goto _test_eof26
 		}
 	st_case_26:
-//line plugins/parsers/influx/machine.go:4141
+//line plugins/parsers/influx/machine.go:4152
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4175,7 +4186,7 @@ tr61:
 			goto _test_eof27
 		}
 	st_case_27:
-//line plugins/parsers/influx/machine.go:4179
+//line plugins/parsers/influx/machine.go:4190
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4206,7 +4217,7 @@ tr49:
 			goto _test_eof28
 		}
 	st_case_28:
-//line plugins/parsers/influx/machine.go:4210
+//line plugins/parsers/influx/machine.go:4221
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4237,7 +4248,7 @@ tr53:
 			goto _test_eof29
 		}
 	st_case_29:
-//line plugins/parsers/influx/machine.go:4241
+//line plugins/parsers/influx/machine.go:4252
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4268,7 +4279,7 @@ tr55:
 			goto _test_eof30
 		}
 	st_case_30:
-//line plugins/parsers/influx/machine.go:4272
+//line plugins/parsers/influx/machine.go:4283
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4300,7 +4311,7 @@ tr60:
 			goto _test_eof31
 		}
 	st_case_31:
-//line plugins/parsers/influx/machine.go:4304
+//line plugins/parsers/influx/machine.go:4315
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4332,7 +4343,7 @@ tr63:
 			goto _test_eof32
 		}
 	st_case_32:
-//line plugins/parsers/influx/machine.go:4336
+//line plugins/parsers/influx/machine.go:4347
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4374,7 +4385,7 @@ tr64:
 			goto _test_eof33
 		}
 	st_case_33:
-//line plugins/parsers/influx/machine.go:4378
+//line plugins/parsers/influx/machine.go:4389
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4406,7 +4417,7 @@ tr65:
 			goto _test_eof34
 		}
 	st_case_34:
-//line plugins/parsers/influx/machine.go:4410
+//line plugins/parsers/influx/machine.go:4421
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4427,7 +4438,7 @@ tr56:
 			goto _test_eof35
 		}
 	st_case_35:
-//line plugins/parsers/influx/machine.go:4431
+//line plugins/parsers/influx/machine.go:4442
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4448,7 +4459,7 @@ tr51:
 			goto _test_eof36
 		}
 	st_case_36:
-//line plugins/parsers/influx/machine.go:4452
+//line plugins/parsers/influx/machine.go:4463
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4469,7 +4480,7 @@ tr47:
 			goto _test_eof37
 		}
 	st_case_37:
-//line plugins/parsers/influx/machine.go:4473
+//line plugins/parsers/influx/machine.go:4484
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4545,7 +4556,7 @@ tr78:
 			goto _test_eof39
 		}
 	st_case_39:
-//line plugins/parsers/influx/machine.go:4549
+//line plugins/parsers/influx/machine.go:4560
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -4593,7 +4604,7 @@ tr229:
 			goto _test_eof40
 		}
 	st_case_40:
-//line plugins/parsers/influx/machine.go:4597
+//line plugins/parsers/influx/machine.go:4608
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -4627,7 +4638,7 @@ tr90:
 			goto _test_eof41
 		}
 	st_case_41:
-//line plugins/parsers/influx/machine.go:4631
+//line plugins/parsers/influx/machine.go:4642
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -4680,7 +4691,7 @@ tr112:
 			goto _test_eof227
 		}
 	st_case_227:
-//line plugins/parsers/influx/machine.go:4684
+//line plugins/parsers/influx/machine.go:4695
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -4744,7 +4755,7 @@ tr377:
 			goto _test_eof42
 		}
 	st_case_42:
-//line plugins/parsers/influx/machine.go:4748
+//line plugins/parsers/influx/machine.go:4759
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr99
@@ -4779,7 +4790,7 @@ tr378:
 			goto _test_eof229
 		}
 	st_case_229:
-//line plugins/parsers/influx/machine.go:4783
+//line plugins/parsers/influx/machine.go:4794
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -4816,7 +4827,7 @@ tr379:
 			goto _test_eof230
 		}
 	st_case_230:
-//line plugins/parsers/influx/machine.go:4820
+//line plugins/parsers/influx/machine.go:4831
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -5383,7 +5394,7 @@ tr97:
 			goto _test_eof43
 		}
 	st_case_43:
-//line plugins/parsers/influx/machine.go:5387
+//line plugins/parsers/influx/machine.go:5398
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr101
@@ -5419,7 +5430,7 @@ tr101:
 			goto _test_eof249
 		}
 	st_case_249:
-//line plugins/parsers/influx/machine.go:5423
+//line plugins/parsers/influx/machine.go:5434
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr400
@@ -5473,7 +5484,7 @@ tr442:
 			goto _test_eof250
 		}
 	st_case_250:
-//line plugins/parsers/influx/machine.go:5477
+//line plugins/parsers/influx/machine.go:5488
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -5589,7 +5600,7 @@ tr400:
 			goto _test_eof251
 		}
 	st_case_251:
-//line plugins/parsers/influx/machine.go:5593
+//line plugins/parsers/influx/machine.go:5604
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -5608,7 +5619,7 @@ tr404:
 			goto _test_eof44
 		}
 	st_case_44:
-//line plugins/parsers/influx/machine.go:5612
+//line plugins/parsers/influx/machine.go:5623
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -5630,7 +5641,7 @@ tr405:
 			goto _test_eof252
 		}
 	st_case_252:
-//line plugins/parsers/influx/machine.go:5634
+//line plugins/parsers/influx/machine.go:5645
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -5663,7 +5674,7 @@ tr406:
 			goto _test_eof253
 		}
 	st_case_253:
-//line plugins/parsers/influx/machine.go:5667
+//line plugins/parsers/influx/machine.go:5678
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -6178,7 +6189,7 @@ tr457:
 			goto _test_eof45
 		}
 	st_case_45:
-//line plugins/parsers/influx/machine.go:6182
+//line plugins/parsers/influx/machine.go:6193
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6211,7 +6222,7 @@ tr111:
 			goto _test_eof46
 		}
 	st_case_46:
-//line plugins/parsers/influx/machine.go:6215
+//line plugins/parsers/influx/machine.go:6226
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6244,7 +6255,7 @@ tr115:
 			goto _test_eof47
 		}
 	st_case_47:
-//line plugins/parsers/influx/machine.go:6248
+//line plugins/parsers/influx/machine.go:6259
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr117
@@ -6280,7 +6291,7 @@ tr117:
 			goto _test_eof272
 		}
 	st_case_272:
-//line plugins/parsers/influx/machine.go:6284
+//line plugins/parsers/influx/machine.go:6295
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr400
@@ -6334,7 +6345,7 @@ tr444:
 			goto _test_eof48
 		}
 	st_case_48:
-//line plugins/parsers/influx/machine.go:6338
+//line plugins/parsers/influx/machine.go:6349
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6367,7 +6378,7 @@ tr118:
 			goto _test_eof49
 		}
 	st_case_49:
-//line plugins/parsers/influx/machine.go:6371
+//line plugins/parsers/influx/machine.go:6382
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -6400,7 +6411,7 @@ tr121:
 			goto _test_eof50
 		}
 	st_case_50:
-//line plugins/parsers/influx/machine.go:6404
+//line plugins/parsers/influx/machine.go:6415
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr117
@@ -6436,7 +6447,7 @@ tr123:
 			goto _test_eof51
 		}
 	st_case_51:
-//line plugins/parsers/influx/machine.go:6440
+//line plugins/parsers/influx/machine.go:6451
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -6491,7 +6502,7 @@ tr124:
 			goto _test_eof274
 		}
 	st_case_274:
-//line plugins/parsers/influx/machine.go:6495
+//line plugins/parsers/influx/machine.go:6506
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -6549,7 +6560,7 @@ tr133:
 			goto _test_eof275
 		}
 	st_case_275:
-//line plugins/parsers/influx/machine.go:6553
+//line plugins/parsers/influx/machine.go:6564
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -6682,7 +6693,7 @@ tr125:
 			goto _test_eof279
 		}
 	st_case_279:
-//line plugins/parsers/influx/machine.go:6686
+//line plugins/parsers/influx/machine.go:6697
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -6745,7 +6756,7 @@ tr126:
 			goto _test_eof281
 		}
 	st_case_281:
-//line plugins/parsers/influx/machine.go:6749
+//line plugins/parsers/influx/machine.go:6760
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -6790,7 +6801,7 @@ tr127:
 			goto _test_eof282
 		}
 	st_case_282:
-//line plugins/parsers/influx/machine.go:6794
+//line plugins/parsers/influx/machine.go:6805
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -6931,7 +6942,7 @@ tr128:
 			goto _test_eof284
 		}
 	st_case_284:
-//line plugins/parsers/influx/machine.go:6935
+//line plugins/parsers/influx/machine.go:6946
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -6993,7 +7004,7 @@ tr129:
 			goto _test_eof285
 		}
 	st_case_285:
-//line plugins/parsers/influx/machine.go:6997
+//line plugins/parsers/influx/machine.go:7008
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7025,7 +7036,7 @@ tr130:
 			goto _test_eof286
 		}
 	st_case_286:
-//line plugins/parsers/influx/machine.go:7029
+//line plugins/parsers/influx/machine.go:7040
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7057,7 +7068,7 @@ tr119:
 			goto _test_eof62
 		}
 	st_case_62:
-//line plugins/parsers/influx/machine.go:7061
+//line plugins/parsers/influx/machine.go:7072
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st49
@@ -7084,7 +7095,7 @@ tr102:
 			goto _test_eof63
 		}
 	st_case_63:
-//line plugins/parsers/influx/machine.go:7088
+//line plugins/parsers/influx/machine.go:7099
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr29
@@ -7139,7 +7150,7 @@ tr103:
 			goto _test_eof288
 		}
 	st_case_288:
-//line plugins/parsers/influx/machine.go:7143
+//line plugins/parsers/influx/machine.go:7154
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -7299,7 +7310,7 @@ tr104:
 			goto _test_eof292
 		}
 	st_case_292:
-//line plugins/parsers/influx/machine.go:7303
+//line plugins/parsers/influx/machine.go:7314
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -7362,7 +7373,7 @@ tr105:
 			goto _test_eof294
 		}
 	st_case_294:
-//line plugins/parsers/influx/machine.go:7366
+//line plugins/parsers/influx/machine.go:7377
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -7407,7 +7418,7 @@ tr106:
 			goto _test_eof295
 		}
 	st_case_295:
-//line plugins/parsers/influx/machine.go:7411
+//line plugins/parsers/influx/machine.go:7422
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7548,7 +7559,7 @@ tr107:
 			goto _test_eof297
 		}
 	st_case_297:
-//line plugins/parsers/influx/machine.go:7552
+//line plugins/parsers/influx/machine.go:7563
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7610,7 +7621,7 @@ tr108:
 			goto _test_eof298
 		}
 	st_case_298:
-//line plugins/parsers/influx/machine.go:7614
+//line plugins/parsers/influx/machine.go:7625
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7642,7 +7653,7 @@ tr109:
 			goto _test_eof299
 		}
 	st_case_299:
-//line plugins/parsers/influx/machine.go:7646
+//line plugins/parsers/influx/machine.go:7657
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -7674,7 +7685,7 @@ tr113:
 			goto _test_eof74
 		}
 	st_case_74:
-//line plugins/parsers/influx/machine.go:7678
+//line plugins/parsers/influx/machine.go:7689
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st46
@@ -7701,7 +7712,7 @@ tr94:
 			goto _test_eof75
 		}
 	st_case_75:
-//line plugins/parsers/influx/machine.go:7705
+//line plugins/parsers/influx/machine.go:7716
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st41
@@ -7728,7 +7739,7 @@ tr92:
 			goto _test_eof76
 		}
 	st_case_76:
-//line plugins/parsers/influx/machine.go:7732
+//line plugins/parsers/influx/machine.go:7743
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7772,7 +7783,7 @@ tr80:
 			goto _test_eof77
 		}
 	st_case_77:
-//line plugins/parsers/influx/machine.go:7776
+//line plugins/parsers/influx/machine.go:7787
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7806,7 +7817,7 @@ tr150:
 			goto _test_eof78
 		}
 	st_case_78:
-//line plugins/parsers/influx/machine.go:7810
+//line plugins/parsers/influx/machine.go:7821
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7850,7 +7861,7 @@ tr151:
 			goto _test_eof79
 		}
 	st_case_79:
-//line plugins/parsers/influx/machine.go:7854
+//line plugins/parsers/influx/machine.go:7865
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -7894,7 +7905,7 @@ tr156:
 			goto _test_eof300
 		}
 	st_case_300:
-//line plugins/parsers/influx/machine.go:7898
+//line plugins/parsers/influx/machine.go:7909
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8012,7 +8023,7 @@ tr804:
 			goto _test_eof301
 		}
 	st_case_301:
-//line plugins/parsers/influx/machine.go:8016
+//line plugins/parsers/influx/machine.go:8027
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8051,7 +8062,7 @@ tr466:
 			goto _test_eof302
 		}
 	st_case_302:
-//line plugins/parsers/influx/machine.go:8055
+//line plugins/parsers/influx/machine.go:8066
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8100,7 +8111,7 @@ tr467:
 			goto _test_eof303
 		}
 	st_case_303:
-//line plugins/parsers/influx/machine.go:8104
+//line plugins/parsers/influx/machine.go:8115
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8139,7 +8150,7 @@ tr468:
 			goto _test_eof80
 		}
 	st_case_80:
-//line plugins/parsers/influx/machine.go:8143
+//line plugins/parsers/influx/machine.go:8154
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr99
@@ -8176,7 +8187,7 @@ tr469:
 			goto _test_eof304
 		}
 	st_case_304:
-//line plugins/parsers/influx/machine.go:8180
+//line plugins/parsers/influx/machine.go:8191
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -8239,7 +8250,7 @@ tr500:
 			goto _test_eof305
 		}
 	st_case_305:
-//line plugins/parsers/influx/machine.go:8243
+//line plugins/parsers/influx/machine.go:8254
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8271,7 +8282,7 @@ tr474:
 			goto _test_eof306
 		}
 	st_case_306:
-//line plugins/parsers/influx/machine.go:8275
+//line plugins/parsers/influx/machine.go:8286
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8317,7 +8328,7 @@ tr471:
 			goto _test_eof307
 		}
 	st_case_307:
-//line plugins/parsers/influx/machine.go:8321
+//line plugins/parsers/influx/machine.go:8332
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -8349,7 +8360,7 @@ tr44:
 			goto _test_eof81
 		}
 	st_case_81:
-//line plugins/parsers/influx/machine.go:8353
+//line plugins/parsers/influx/machine.go:8364
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -8991,7 +9002,7 @@ tr806:
 			goto _test_eof82
 		}
 	st_case_82:
-//line plugins/parsers/influx/machine.go:8995
+//line plugins/parsers/influx/machine.go:9006
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9022,7 +9033,7 @@ tr160:
 			goto _test_eof83
 		}
 	st_case_83:
-//line plugins/parsers/influx/machine.go:9026
+//line plugins/parsers/influx/machine.go:9037
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9057,7 +9068,7 @@ tr163:
 			goto _test_eof84
 		}
 	st_case_84:
-//line plugins/parsers/influx/machine.go:9061
+//line plugins/parsers/influx/machine.go:9072
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9108,7 +9119,7 @@ tr165:
 			goto _test_eof85
 		}
 	st_case_85:
-//line plugins/parsers/influx/machine.go:9112
+//line plugins/parsers/influx/machine.go:9123
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr25
@@ -9142,7 +9153,7 @@ tr174:
 			goto _test_eof86
 		}
 	st_case_86:
-//line plugins/parsers/influx/machine.go:9146
+//line plugins/parsers/influx/machine.go:9157
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9186,7 +9197,7 @@ tr175:
 			goto _test_eof87
 		}
 	st_case_87:
-//line plugins/parsers/influx/machine.go:9190
+//line plugins/parsers/influx/machine.go:9201
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9220,7 +9231,7 @@ tr186:
 			goto _test_eof88
 		}
 	st_case_88:
-//line plugins/parsers/influx/machine.go:9224
+//line plugins/parsers/influx/machine.go:9235
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -9253,7 +9264,7 @@ tr191:
 			goto _test_eof89
 		}
 	st_case_89:
-//line plugins/parsers/influx/machine.go:9257
+//line plugins/parsers/influx/machine.go:9268
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto tr101
@@ -9289,7 +9300,7 @@ tr189:
 			goto _test_eof90
 		}
 	st_case_90:
-//line plugins/parsers/influx/machine.go:9293
+//line plugins/parsers/influx/machine.go:9304
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st88
@@ -9316,7 +9327,7 @@ tr188:
 			goto _test_eof91
 		}
 	st_case_91:
-//line plugins/parsers/influx/machine.go:9320
+//line plugins/parsers/influx/machine.go:9331
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9360,7 +9371,7 @@ tr176:
 			goto _test_eof92
 		}
 	st_case_92:
-//line plugins/parsers/influx/machine.go:9364
+//line plugins/parsers/influx/machine.go:9375
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9394,7 +9405,7 @@ tr193:
 			goto _test_eof93
 		}
 	st_case_93:
-//line plugins/parsers/influx/machine.go:9398
+//line plugins/parsers/influx/machine.go:9409
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9438,7 +9449,7 @@ tr194:
 			goto _test_eof94
 		}
 	st_case_94:
-//line plugins/parsers/influx/machine.go:9442
+//line plugins/parsers/influx/machine.go:9453
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -9482,7 +9493,7 @@ tr199:
 			goto _test_eof326
 		}
 	st_case_326:
-//line plugins/parsers/influx/machine.go:9486
+//line plugins/parsers/influx/machine.go:9497
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -9524,7 +9535,7 @@ tr497:
 			goto _test_eof327
 		}
 	st_case_327:
-//line plugins/parsers/influx/machine.go:9528
+//line plugins/parsers/influx/machine.go:9539
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -9563,7 +9574,7 @@ tr498:
 			goto _test_eof95
 		}
 	st_case_95:
-//line plugins/parsers/influx/machine.go:9567
+//line plugins/parsers/influx/machine.go:9578
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr201
@@ -9600,7 +9611,7 @@ tr499:
 			goto _test_eof328
 		}
 	st_case_328:
-//line plugins/parsers/influx/machine.go:9604
+//line plugins/parsers/influx/machine.go:9615
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -9651,7 +9662,7 @@ tr501:
 			goto _test_eof329
 		}
 	st_case_329:
-//line plugins/parsers/influx/machine.go:9655
+//line plugins/parsers/influx/machine.go:9666
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -10228,7 +10239,7 @@ tr178:
 			goto _test_eof96
 		}
 	st_case_96:
-//line plugins/parsers/influx/machine.go:10232
+//line plugins/parsers/influx/machine.go:10243
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -10261,7 +10272,7 @@ tr203:
 			goto _test_eof97
 		}
 	st_case_97:
-//line plugins/parsers/influx/machine.go:10265
+//line plugins/parsers/influx/machine.go:10276
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -10304,7 +10315,7 @@ tr207:
 			goto _test_eof348
 		}
 	st_case_348:
-//line plugins/parsers/influx/machine.go:10308
+//line plugins/parsers/influx/machine.go:10319
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -10368,7 +10379,7 @@ tr523:
 			goto _test_eof98
 		}
 	st_case_98:
-//line plugins/parsers/influx/machine.go:10372
+//line plugins/parsers/influx/machine.go:10383
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr210
@@ -10403,7 +10414,7 @@ tr524:
 			goto _test_eof350
 		}
 	st_case_350:
-//line plugins/parsers/influx/machine.go:10407
+//line plugins/parsers/influx/machine.go:10418
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -10440,7 +10451,7 @@ tr525:
 			goto _test_eof351
 		}
 	st_case_351:
-//line plugins/parsers/influx/machine.go:10444
+//line plugins/parsers/influx/machine.go:10455
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -11007,7 +11018,7 @@ tr208:
 			goto _test_eof99
 		}
 	st_case_99:
-//line plugins/parsers/influx/machine.go:11011
+//line plugins/parsers/influx/machine.go:11022
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -11050,7 +11061,7 @@ tr183:
 			goto _test_eof370
 		}
 	st_case_370:
-//line plugins/parsers/influx/machine.go:11054
+//line plugins/parsers/influx/machine.go:11065
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -11122,7 +11133,7 @@ tr561:
 			goto _test_eof371
 		}
 	st_case_371:
-//line plugins/parsers/influx/machine.go:11126
+//line plugins/parsers/influx/machine.go:11137
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -11161,7 +11172,7 @@ tr179:
 			goto _test_eof100
 		}
 	st_case_100:
-//line plugins/parsers/influx/machine.go:11165
+//line plugins/parsers/influx/machine.go:11176
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st86
@@ -11188,7 +11199,7 @@ tr205:
 			goto _test_eof101
 		}
 	st_case_101:
-//line plugins/parsers/influx/machine.go:11192
+//line plugins/parsers/influx/machine.go:11203
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st97
@@ -11215,7 +11226,7 @@ tr196:
 			goto _test_eof102
 		}
 	st_case_102:
-//line plugins/parsers/influx/machine.go:11219
+//line plugins/parsers/influx/machine.go:11230
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st93
@@ -11242,7 +11253,7 @@ tr166:
 			goto _test_eof103
 		}
 	st_case_103:
-//line plugins/parsers/influx/machine.go:11246
+//line plugins/parsers/influx/machine.go:11257
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -11314,7 +11325,7 @@ tr167:
 			goto _test_eof373
 		}
 	st_case_373:
-//line plugins/parsers/influx/machine.go:11318
+//line plugins/parsers/influx/machine.go:11329
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -11514,7 +11525,7 @@ tr168:
 			goto _test_eof377
 		}
 	st_case_377:
-//line plugins/parsers/influx/machine.go:11518
+//line plugins/parsers/influx/machine.go:11529
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -11581,7 +11592,7 @@ tr169:
 			goto _test_eof379
 		}
 	st_case_379:
-//line plugins/parsers/influx/machine.go:11585
+//line plugins/parsers/influx/machine.go:11596
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -11628,7 +11639,7 @@ tr170:
 			goto _test_eof380
 		}
 	st_case_380:
-//line plugins/parsers/influx/machine.go:11632
+//line plugins/parsers/influx/machine.go:11643
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -11851,7 +11862,7 @@ tr171:
 			goto _test_eof382
 		}
 	st_case_382:
-//line plugins/parsers/influx/machine.go:11855
+//line plugins/parsers/influx/machine.go:11866
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -11941,7 +11952,7 @@ tr172:
 			goto _test_eof383
 		}
 	st_case_383:
-//line plugins/parsers/influx/machine.go:11945
+//line plugins/parsers/influx/machine.go:11956
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -11975,7 +11986,7 @@ tr173:
 			goto _test_eof384
 		}
 	st_case_384:
-//line plugins/parsers/influx/machine.go:11979
+//line plugins/parsers/influx/machine.go:11990
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -12009,7 +12020,7 @@ tr161:
 			goto _test_eof114
 		}
 	st_case_114:
-//line plugins/parsers/influx/machine.go:12013
+//line plugins/parsers/influx/machine.go:12024
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -12046,7 +12057,7 @@ tr231:
 			goto _test_eof115
 		}
 	st_case_115:
-//line plugins/parsers/influx/machine.go:12050
+//line plugins/parsers/influx/machine.go:12061
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -12079,7 +12090,7 @@ tr221:
 			goto _test_eof116
 		}
 	st_case_116:
-//line plugins/parsers/influx/machine.go:12083
+//line plugins/parsers/influx/machine.go:12094
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -12112,7 +12123,7 @@ tr224:
 			goto _test_eof117
 		}
 	st_case_117:
-//line plugins/parsers/influx/machine.go:12116
+//line plugins/parsers/influx/machine.go:12127
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -12145,7 +12156,7 @@ tr226:
 			goto _test_eof118
 		}
 	st_case_118:
-//line plugins/parsers/influx/machine.go:12149
+//line plugins/parsers/influx/machine.go:12160
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12179,7 +12190,7 @@ tr230:
 			goto _test_eof119
 		}
 	st_case_119:
-//line plugins/parsers/influx/machine.go:12183
+//line plugins/parsers/influx/machine.go:12194
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12213,7 +12224,7 @@ tr233:
 			goto _test_eof120
 		}
 	st_case_120:
-//line plugins/parsers/influx/machine.go:12217
+//line plugins/parsers/influx/machine.go:12228
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12257,7 +12268,7 @@ tr234:
 			goto _test_eof121
 		}
 	st_case_121:
-//line plugins/parsers/influx/machine.go:12261
+//line plugins/parsers/influx/machine.go:12272
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12291,7 +12302,7 @@ tr235:
 			goto _test_eof122
 		}
 	st_case_122:
-//line plugins/parsers/influx/machine.go:12295
+//line plugins/parsers/influx/machine.go:12306
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st120
@@ -12318,7 +12329,7 @@ tr227:
 			goto _test_eof123
 		}
 	st_case_123:
-//line plugins/parsers/influx/machine.go:12322
+//line plugins/parsers/influx/machine.go:12333
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st118
@@ -12345,7 +12356,7 @@ tr222:
 			goto _test_eof124
 		}
 	st_case_124:
-//line plugins/parsers/influx/machine.go:12349
+//line plugins/parsers/influx/machine.go:12360
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st116
@@ -12372,7 +12383,7 @@ tr157:
 			goto _test_eof125
 		}
 	st_case_125:
-//line plugins/parsers/influx/machine.go:12376
+//line plugins/parsers/influx/machine.go:12387
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -12423,7 +12434,7 @@ tr239:
 			goto _test_eof385
 		}
 	st_case_385:
-//line plugins/parsers/influx/machine.go:12427
+//line plugins/parsers/influx/machine.go:12438
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr400
@@ -12551,7 +12562,7 @@ tr786:
 			goto _test_eof386
 		}
 	st_case_386:
-//line plugins/parsers/influx/machine.go:12555
+//line plugins/parsers/influx/machine.go:12566
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -12592,7 +12603,7 @@ tr571:
 			goto _test_eof387
 		}
 	st_case_387:
-//line plugins/parsers/influx/machine.go:12596
+//line plugins/parsers/influx/machine.go:12607
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -12633,7 +12644,7 @@ tr572:
 			goto _test_eof126
 		}
 	st_case_126:
-//line plugins/parsers/influx/machine.go:12637
+//line plugins/parsers/influx/machine.go:12648
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -12670,7 +12681,7 @@ tr573:
 			goto _test_eof388
 		}
 	st_case_388:
-//line plugins/parsers/influx/machine.go:12674
+//line plugins/parsers/influx/machine.go:12685
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -12709,7 +12720,7 @@ tr574:
 			goto _test_eof389
 		}
 	st_case_389:
-//line plugins/parsers/influx/machine.go:12713
+//line plugins/parsers/influx/machine.go:12724
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13358,7 +13369,7 @@ tr787:
 			goto _test_eof408
 		}
 	st_case_408:
-//line plugins/parsers/influx/machine.go:13362
+//line plugins/parsers/influx/machine.go:13373
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13403,7 +13414,7 @@ tr595:
 			goto _test_eof409
 		}
 	st_case_409:
-//line plugins/parsers/influx/machine.go:13407
+//line plugins/parsers/influx/machine.go:13418
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13444,7 +13455,7 @@ tr596:
 			goto _test_eof127
 		}
 	st_case_127:
-//line plugins/parsers/influx/machine.go:13448
+//line plugins/parsers/influx/machine.go:13459
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -13483,7 +13494,7 @@ tr597:
 			goto _test_eof410
 		}
 	st_case_410:
-//line plugins/parsers/influx/machine.go:13487
+//line plugins/parsers/influx/machine.go:13498
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -13548,7 +13559,7 @@ tr732:
 			goto _test_eof411
 		}
 	st_case_411:
-//line plugins/parsers/influx/machine.go:13552
+//line plugins/parsers/influx/machine.go:13563
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13582,7 +13593,7 @@ tr602:
 			goto _test_eof412
 		}
 	st_case_412:
-//line plugins/parsers/influx/machine.go:13586
+//line plugins/parsers/influx/machine.go:13597
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13630,7 +13641,7 @@ tr599:
 			goto _test_eof413
 		}
 	st_case_413:
-//line plugins/parsers/influx/machine.go:13634
+//line plugins/parsers/influx/machine.go:13645
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -13664,7 +13675,7 @@ tr153:
 			goto _test_eof128
 		}
 	st_case_128:
-//line plugins/parsers/influx/machine.go:13668
+//line plugins/parsers/influx/machine.go:13679
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st78
@@ -14272,7 +14283,7 @@ tr87:
 			goto _test_eof432
 		}
 	st_case_432:
-//line plugins/parsers/influx/machine.go:14276
+//line plugins/parsers/influx/machine.go:14287
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -14342,7 +14353,7 @@ tr805:
 			goto _test_eof433
 		}
 	st_case_433:
-//line plugins/parsers/influx/machine.go:14346
+//line plugins/parsers/influx/machine.go:14357
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -14381,7 +14392,7 @@ tr2:
 			goto _test_eof129
 		}
 	st_case_129:
-//line plugins/parsers/influx/machine.go:14385
+//line plugins/parsers/influx/machine.go:14396
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -14486,7 +14497,7 @@ tr788:
 			goto _test_eof130
 		}
 	st_case_130:
-//line plugins/parsers/influx/machine.go:14490
+//line plugins/parsers/influx/machine.go:14501
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -14519,7 +14530,7 @@ tr250:
 			goto _test_eof131
 		}
 	st_case_131:
-//line plugins/parsers/influx/machine.go:14523
+//line plugins/parsers/influx/machine.go:14534
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -14562,7 +14573,7 @@ tr254:
 			goto _test_eof434
 		}
 	st_case_434:
-//line plugins/parsers/influx/machine.go:14566
+//line plugins/parsers/influx/machine.go:14577
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -14626,7 +14637,7 @@ tr624:
 			goto _test_eof132
 		}
 	st_case_132:
-//line plugins/parsers/influx/machine.go:14630
+//line plugins/parsers/influx/machine.go:14641
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr201
@@ -14661,7 +14672,7 @@ tr625:
 			goto _test_eof436
 		}
 	st_case_436:
-//line plugins/parsers/influx/machine.go:14665
+//line plugins/parsers/influx/machine.go:14676
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -14698,7 +14709,7 @@ tr626:
 			goto _test_eof437
 		}
 	st_case_437:
-//line plugins/parsers/influx/machine.go:14702
+//line plugins/parsers/influx/machine.go:14713
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -15269,7 +15280,7 @@ tr255:
 			goto _test_eof133
 		}
 	st_case_133:
-//line plugins/parsers/influx/machine.go:15273
+//line plugins/parsers/influx/machine.go:15284
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -15324,7 +15335,7 @@ tr258:
 			goto _test_eof456
 		}
 	st_case_456:
-//line plugins/parsers/influx/machine.go:15328
+//line plugins/parsers/influx/machine.go:15339
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr400
@@ -15408,7 +15419,7 @@ tr715:
 			goto _test_eof457
 		}
 	st_case_457:
-//line plugins/parsers/influx/machine.go:15412
+//line plugins/parsers/influx/machine.go:15423
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -15449,7 +15460,7 @@ tr650:
 			goto _test_eof458
 		}
 	st_case_458:
-//line plugins/parsers/influx/machine.go:15453
+//line plugins/parsers/influx/machine.go:15464
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -15490,7 +15501,7 @@ tr651:
 			goto _test_eof134
 		}
 	st_case_134:
-//line plugins/parsers/influx/machine.go:15494
+//line plugins/parsers/influx/machine.go:15505
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -15527,7 +15538,7 @@ tr652:
 			goto _test_eof459
 		}
 	st_case_459:
-//line plugins/parsers/influx/machine.go:15531
+//line plugins/parsers/influx/machine.go:15542
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -15566,7 +15577,7 @@ tr653:
 			goto _test_eof460
 		}
 	st_case_460:
-//line plugins/parsers/influx/machine.go:15570
+//line plugins/parsers/influx/machine.go:15581
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -16215,7 +16226,7 @@ tr716:
 			goto _test_eof479
 		}
 	st_case_479:
-//line plugins/parsers/influx/machine.go:16219
+//line plugins/parsers/influx/machine.go:16230
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -16260,7 +16271,7 @@ tr674:
 			goto _test_eof480
 		}
 	st_case_480:
-//line plugins/parsers/influx/machine.go:16264
+//line plugins/parsers/influx/machine.go:16275
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -16301,7 +16312,7 @@ tr675:
 			goto _test_eof135
 		}
 	st_case_135:
-//line plugins/parsers/influx/machine.go:16305
+//line plugins/parsers/influx/machine.go:16316
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -16340,7 +16351,7 @@ tr676:
 			goto _test_eof481
 		}
 	st_case_481:
-//line plugins/parsers/influx/machine.go:16344
+//line plugins/parsers/influx/machine.go:16355
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -16389,7 +16400,7 @@ tr677:
 			goto _test_eof482
 		}
 	st_case_482:
-//line plugins/parsers/influx/machine.go:16393
+//line plugins/parsers/influx/machine.go:16404
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -16423,7 +16434,7 @@ tr681:
 			goto _test_eof483
 		}
 	st_case_483:
-//line plugins/parsers/influx/machine.go:16427
+//line plugins/parsers/influx/machine.go:16438
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -16471,7 +16482,7 @@ tr678:
 			goto _test_eof484
 		}
 	st_case_484:
-//line plugins/parsers/influx/machine.go:16475
+//line plugins/parsers/influx/machine.go:16486
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -17120,7 +17131,7 @@ tr717:
 			goto _test_eof136
 		}
 	st_case_136:
-//line plugins/parsers/influx/machine.go:17124
+//line plugins/parsers/influx/machine.go:17135
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -17153,7 +17164,7 @@ tr269:
 			goto _test_eof137
 		}
 	st_case_137:
-//line plugins/parsers/influx/machine.go:17157
+//line plugins/parsers/influx/machine.go:17168
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -17190,7 +17201,7 @@ tr272:
 			goto _test_eof138
 		}
 	st_case_138:
-//line plugins/parsers/influx/machine.go:17194
+//line plugins/parsers/influx/machine.go:17205
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto st7
@@ -17241,7 +17252,7 @@ tr274:
 			goto _test_eof139
 		}
 	st_case_139:
-//line plugins/parsers/influx/machine.go:17245
+//line plugins/parsers/influx/machine.go:17256
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -17317,7 +17328,7 @@ tr275:
 			goto _test_eof504
 		}
 	st_case_504:
-//line plugins/parsers/influx/machine.go:17321
+//line plugins/parsers/influx/machine.go:17332
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -17396,7 +17407,7 @@ tr284:
 			goto _test_eof505
 		}
 	st_case_505:
-//line plugins/parsers/influx/machine.go:17400
+//line plugins/parsers/influx/machine.go:17411
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -17564,7 +17575,7 @@ tr276:
 			goto _test_eof509
 		}
 	st_case_509:
-//line plugins/parsers/influx/machine.go:17568
+//line plugins/parsers/influx/machine.go:17579
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -17635,7 +17646,7 @@ tr277:
 			goto _test_eof511
 		}
 	st_case_511:
-//line plugins/parsers/influx/machine.go:17639
+//line plugins/parsers/influx/machine.go:17650
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -17684,7 +17695,7 @@ tr278:
 			goto _test_eof512
 		}
 	st_case_512:
-//line plugins/parsers/influx/machine.go:17688
+//line plugins/parsers/influx/machine.go:17699
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -17923,7 +17934,7 @@ tr279:
 			goto _test_eof514
 		}
 	st_case_514:
-//line plugins/parsers/influx/machine.go:17927
+//line plugins/parsers/influx/machine.go:17938
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -18019,7 +18030,7 @@ tr280:
 			goto _test_eof515
 		}
 	st_case_515:
-//line plugins/parsers/influx/machine.go:18023
+//line plugins/parsers/influx/machine.go:18034
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -18055,7 +18066,7 @@ tr281:
 			goto _test_eof516
 		}
 	st_case_516:
-//line plugins/parsers/influx/machine.go:18059
+//line plugins/parsers/influx/machine.go:18070
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -18091,7 +18102,7 @@ tr270:
 			goto _test_eof150
 		}
 	st_case_150:
-//line plugins/parsers/influx/machine.go:18095
+//line plugins/parsers/influx/machine.go:18106
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st137
@@ -18118,7 +18129,7 @@ tr259:
 			goto _test_eof151
 		}
 	st_case_151:
-//line plugins/parsers/influx/machine.go:18122
+//line plugins/parsers/influx/machine.go:18133
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -18228,7 +18239,7 @@ tr763:
 			goto _test_eof518
 		}
 	st_case_518:
-//line plugins/parsers/influx/machine.go:18232
+//line plugins/parsers/influx/machine.go:18243
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -18273,7 +18284,7 @@ tr729:
 			goto _test_eof519
 		}
 	st_case_519:
-//line plugins/parsers/influx/machine.go:18277
+//line plugins/parsers/influx/machine.go:18288
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -18314,7 +18325,7 @@ tr730:
 			goto _test_eof152
 		}
 	st_case_152:
-//line plugins/parsers/influx/machine.go:18318
+//line plugins/parsers/influx/machine.go:18329
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -18353,7 +18364,7 @@ tr731:
 			goto _test_eof520
 		}
 	st_case_520:
-//line plugins/parsers/influx/machine.go:18357
+//line plugins/parsers/influx/machine.go:18368
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr407
@@ -18406,7 +18417,7 @@ tr733:
 			goto _test_eof521
 		}
 	st_case_521:
-//line plugins/parsers/influx/machine.go:18410
+//line plugins/parsers/influx/machine.go:18421
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr403
@@ -19011,7 +19022,7 @@ tr260:
 			goto _test_eof540
 		}
 	st_case_540:
-//line plugins/parsers/influx/machine.go:19015
+//line plugins/parsers/influx/machine.go:19026
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -19221,7 +19232,7 @@ tr261:
 			goto _test_eof544
 		}
 	st_case_544:
-//line plugins/parsers/influx/machine.go:19225
+//line plugins/parsers/influx/machine.go:19236
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -19292,7 +19303,7 @@ tr262:
 			goto _test_eof546
 		}
 	st_case_546:
-//line plugins/parsers/influx/machine.go:19296
+//line plugins/parsers/influx/machine.go:19307
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -19341,7 +19352,7 @@ tr263:
 			goto _test_eof547
 		}
 	st_case_547:
-//line plugins/parsers/influx/machine.go:19345
+//line plugins/parsers/influx/machine.go:19356
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -19580,7 +19591,7 @@ tr264:
 			goto _test_eof549
 		}
 	st_case_549:
-//line plugins/parsers/influx/machine.go:19584
+//line plugins/parsers/influx/machine.go:19595
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -19676,7 +19687,7 @@ tr265:
 			goto _test_eof550
 		}
 	st_case_550:
-//line plugins/parsers/influx/machine.go:19680
+//line plugins/parsers/influx/machine.go:19691
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -19712,7 +19723,7 @@ tr266:
 			goto _test_eof551
 		}
 	st_case_551:
-//line plugins/parsers/influx/machine.go:19716
+//line plugins/parsers/influx/machine.go:19727
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -19748,7 +19759,7 @@ tr252:
 			goto _test_eof163
 		}
 	st_case_163:
-//line plugins/parsers/influx/machine.go:19752
+//line plugins/parsers/influx/machine.go:19763
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st131
@@ -19775,7 +19786,7 @@ tr83:
 			goto _test_eof164
 		}
 	st_case_164:
-//line plugins/parsers/influx/machine.go:19779
+//line plugins/parsers/influx/machine.go:19790
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st39
@@ -19802,7 +19813,7 @@ tr240:
 			goto _test_eof165
 		}
 	st_case_165:
-//line plugins/parsers/influx/machine.go:19806
+//line plugins/parsers/influx/machine.go:19817
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto st7
@@ -19874,7 +19885,7 @@ tr241:
 			goto _test_eof553
 		}
 	st_case_553:
-//line plugins/parsers/influx/machine.go:19878
+//line plugins/parsers/influx/machine.go:19889
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -19949,7 +19960,7 @@ tr304:
 			goto _test_eof554
 		}
 	st_case_554:
-//line plugins/parsers/influx/machine.go:19953
+//line plugins/parsers/influx/machine.go:19964
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -20135,7 +20146,7 @@ tr242:
 			goto _test_eof559
 		}
 	st_case_559:
-//line plugins/parsers/influx/machine.go:20139
+//line plugins/parsers/influx/machine.go:20150
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -20202,7 +20213,7 @@ tr243:
 			goto _test_eof561
 		}
 	st_case_561:
-//line plugins/parsers/influx/machine.go:20206
+//line plugins/parsers/influx/machine.go:20217
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr429
@@ -20249,7 +20260,7 @@ tr244:
 			goto _test_eof562
 		}
 	st_case_562:
-//line plugins/parsers/influx/machine.go:20253
+//line plugins/parsers/influx/machine.go:20264
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -20472,7 +20483,7 @@ tr245:
 			goto _test_eof564
 		}
 	st_case_564:
-//line plugins/parsers/influx/machine.go:20476
+//line plugins/parsers/influx/machine.go:20487
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -20562,7 +20573,7 @@ tr246:
 			goto _test_eof565
 		}
 	st_case_565:
-//line plugins/parsers/influx/machine.go:20566
+//line plugins/parsers/influx/machine.go:20577
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -20596,7 +20607,7 @@ tr247:
 			goto _test_eof566
 		}
 	st_case_566:
-//line plugins/parsers/influx/machine.go:20600
+//line plugins/parsers/influx/machine.go:20611
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr443
@@ -20630,7 +20641,7 @@ tr70:
 			goto _test_eof176
 		}
 	st_case_176:
-//line plugins/parsers/influx/machine.go:20634
+//line plugins/parsers/influx/machine.go:20645
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -20698,7 +20709,7 @@ tr71:
 			goto _test_eof568
 		}
 	st_case_568:
-//line plugins/parsers/influx/machine.go:20702
+//line plugins/parsers/influx/machine.go:20713
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -20858,7 +20869,7 @@ tr72:
 			goto _test_eof571
 		}
 	st_case_571:
-//line plugins/parsers/influx/machine.go:20862
+//line plugins/parsers/influx/machine.go:20873
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -20921,7 +20932,7 @@ tr73:
 			goto _test_eof573
 		}
 	st_case_573:
-//line plugins/parsers/influx/machine.go:20925
+//line plugins/parsers/influx/machine.go:20936
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -20966,7 +20977,7 @@ tr74:
 			goto _test_eof574
 		}
 	st_case_574:
-//line plugins/parsers/influx/machine.go:20970
+//line plugins/parsers/influx/machine.go:20981
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -21173,7 +21184,7 @@ tr75:
 			goto _test_eof576
 		}
 	st_case_576:
-//line plugins/parsers/influx/machine.go:21177
+//line plugins/parsers/influx/machine.go:21188
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -21257,7 +21268,7 @@ tr76:
 			goto _test_eof577
 		}
 	st_case_577:
-//line plugins/parsers/influx/machine.go:21261
+//line plugins/parsers/influx/machine.go:21272
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -21289,7 +21300,7 @@ tr77:
 			goto _test_eof578
 		}
 	st_case_578:
-//line plugins/parsers/influx/machine.go:21293
+//line plugins/parsers/influx/machine.go:21304
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -21333,7 +21344,7 @@ tr322:
 			goto _test_eof579
 		}
 	st_case_579:
-//line plugins/parsers/influx/machine.go:21337
+//line plugins/parsers/influx/machine.go:21348
 		goto st0
 	st188:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -21369,7 +21380,7 @@ tr323:
 			goto _test_eof580
 		}
 	st_case_580:
-//line plugins/parsers/influx/machine.go:21373
+//line plugins/parsers/influx/machine.go:21384
 		goto st0
 tr325:
 //line plugins/parsers/influx/machine.go.rl:63
@@ -21384,7 +21395,7 @@ tr325:
 			goto _test_eof581
 		}
 	st_case_581:
-//line plugins/parsers/influx/machine.go:21388
+//line plugins/parsers/influx/machine.go:21399
 		switch ( m.data)[( m.p)] {
 		case 11:
 			goto tr325
@@ -22243,14 +22254,14 @@ tr325:
 	 m.cs = 187;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-//line plugins/parsers/influx/machine.go:22247
+//line plugins/parsers/influx/machine.go:22258
 		}
 	}
 
 	_out: {}
 	}
 
-//line plugins/parsers/influx/machine.go.rl:277
+//line plugins/parsers/influx/machine.go.rl:288
 
 	// Even if there was an error, return true. On the next call to this
 	// function we will attempt to scan to the next line of input and recover.
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
index fea50af83..e5c888689 100644
--- a/plugins/parsers/influx/machine.go.rl
+++ b/plugins/parsers/influx/machine.go.rl
@@ -225,6 +225,17 @@ align :=
 
 %% write data;
 
+type Handler interface {
+	SetMeasurement(name []byte)
+	AddTag(key []byte, value []byte)
+	AddInt(key []byte, value []byte)
+	AddUint(key []byte, value []byte)
+	AddFloat(key []byte, value []byte)
+	AddString(key []byte, value []byte)
+	AddBool(key []byte, value []byte)
+	SetTimestamp(tm []byte)
+}
+
 type machine struct {
 	data       []byte
 	cs         int
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 8aacb873f..98f9cf65f 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -15,18 +15,6 @@ var (
 	ErrNoMetric = errors.New("no metric in line")
 )
 
-type Handler interface {
-	SetMeasurement(name []byte)
-	AddTag(key []byte, value []byte)
-	AddInt(key []byte, value []byte)
-	AddUint(key []byte, value []byte)
-	AddFloat(key []byte, value []byte)
-	AddString(key []byte, value []byte)
-	AddBool(key []byte, value []byte)
-	SetTimestamp(tm []byte)
-	Reset()
-}
-
 type ParseError struct {
 	Offset int
 	msg    string

From 6d585beedf53c5c4cf825d3b008a77dc136b1b4d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 30 Mar 2018 11:10:49 -0700
Subject: [PATCH 1026/1302] Fix http_proxy variable name in http_response
 plugin

---
 plugins/inputs/http_response/README.md        | 3 +++
 plugins/inputs/http_response/http_response.go | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 127a4530b..69b477ed4 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -10,6 +10,9 @@ This input plugin checks HTTP/HTTPS connections.
   ## Server address (default http://localhost)
   # address = "http://localhost"
 
+  ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
+  # http_proxy = "http://localhost:8888"
+
   ## Set response_timeout (default 5 seconds)
   # response_timeout = "5s"
 
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index b0f1009fc..9dcf9394a 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -22,7 +22,7 @@ import (
 // HTTPResponse struct
 type HTTPResponse struct {
 	Address             string
-	Proxy               string
+	HTTPProxy           string `toml:"http_proxy"`
 	Body                string
 	Method              string
 	ResponseTimeout     internal.Duration
@@ -120,7 +120,7 @@ func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
 	}
 	client := &http.Client{
 		Transport: &http.Transport{
-			Proxy:             getProxyFunc(h.Proxy),
+			Proxy:             getProxyFunc(h.HTTPProxy),
 			DisableKeepAlives: true,
 			TLSClientConfig:   tlsCfg,
 		},

From 971debb582a762c4bac2ae5ada1650678f5c8294 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 30 Mar 2018 13:17:48 -0700
Subject: [PATCH 1027/1302] Add filters for container state to docker input
 (#3950)

---
 plugins/inputs/docker/README.md      |  5 ++
 plugins/inputs/docker/docker.go      | 47 +++++++++++++++-
 plugins/inputs/docker/docker_test.go | 83 ++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 7e9907588..b833ff264 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -31,6 +31,11 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/)
   container_name_include = []
   container_name_exclude = []
 
+  ## Container states to include and exclude. Globs accepted.
+  ## When empty only containers in the "running" state will be captured.
+  # container_state_include = []
+  # container_state_exclude = []
+
   ## Timeout for docker list, info, and stats commands
   timeout = "5s"
 
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index 7178eb497..de7723893 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
@@ -25,7 +26,7 @@ import (
 // Docker object
 type Docker struct {
 	Endpoint       string
-	ContainerNames []string
+	ContainerNames []string // deprecated in 1.4; use container_name_include
 
 	GatherServices bool `toml:"gather_services"`
 
@@ -39,6 +40,9 @@ type Docker struct {
 	ContainerInclude []string `toml:"container_name_include"`
 	ContainerExclude []string `toml:"container_name_exclude"`
 
+	ContainerStateInclude []string `toml:"container_state_include"`
+	ContainerStateExclude []string `toml:"container_state_exclude"`
+
 	SSLCA              string `toml:"ssl_ca"`
 	SSLCert            string `toml:"ssl_cert"`
 	SSLKey             string `toml:"ssl_key"`
@@ -53,6 +57,7 @@ type Docker struct {
 	filtersCreated  bool
 	labelFilter     filter.Filter
 	containerFilter filter.Filter
+	stateFilter     filter.Filter
 }
 
 // KB, MB, GB, TB, PB...human friendly
@@ -67,7 +72,8 @@ const (
 )
 
 var (
-	sizeRegex = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
+	sizeRegex       = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
+	containerStates = []string{"created", "restarting", "running", "removing", "paused", "exited", "dead"}
 )
 
 var sampleConfig = `
@@ -87,6 +93,11 @@ var sampleConfig = `
   container_name_include = []
   container_name_exclude = []
 
+  ## Container states to include and exclude. Globs accepted.
+  ## When empty only containers in the "running" state will be captured.
+  # container_state_include = []
+  # container_state_exclude = []
+
   ## Timeout for docker list, info, and stats commands
   timeout = "5s"
 
@@ -148,6 +159,10 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		if err != nil {
 			return err
 		}
+		err = d.createContainerStateFilters()
+		if err != nil {
+			return err
+		}
 		d.filtersCreated = true
 	}
 
@@ -164,8 +179,22 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
+	filterArgs := filters.NewArgs()
+	for _, state := range containerStates {
+		if d.stateFilter.Match(state) {
+			filterArgs.Add("status", state)
+		}
+	}
+
+	// All container states were excluded
+	if filterArgs.Len() == 0 {
+		return nil
+	}
+
 	// List containers
-	opts := types.ContainerListOptions{}
+	opts := types.ContainerListOptions{
+		Filters: filterArgs,
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
 	defer cancel()
 	containers, err := d.client.ContainerList(ctx, opts)
@@ -768,6 +797,18 @@ func (d *Docker) createLabelFilters() error {
 	return nil
 }
 
+func (d *Docker) createContainerStateFilters() error {
+	if len(d.ContainerStateInclude) == 0 && len(d.ContainerStateExclude) == 0 {
+		d.ContainerStateInclude = []string{"running"}
+	}
+	filter, err := filter.NewIncludeExcludeFilter(d.ContainerStateInclude, d.ContainerStateExclude)
+	if err != nil {
+		return err
+	}
+	d.stateFilter = filter
+	return nil
+}
+
 func init() {
 	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 088c94597..0bc5d33d4 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -3,6 +3,7 @@ package docker
 import (
 	"context"
 	"crypto/tls"
+	"sort"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
@@ -711,3 +712,85 @@ func TestDockerGatherSwarmInfo(t *testing.T) {
 		},
 	)
 }
+
+func TestContainerStateFilter(t *testing.T) {
+	var tests = []struct {
+		name     string
+		include  []string
+		exclude  []string
+		expected map[string][]string
+	}{
+		{
+			name: "default",
+			expected: map[string][]string{
+				"status": []string{"running"},
+			},
+		},
+		{
+			name:    "include running",
+			include: []string{"running"},
+			expected: map[string][]string{
+				"status": []string{"running"},
+			},
+		},
+		{
+			name:    "include glob",
+			include: []string{"r*"},
+			expected: map[string][]string{
+				"status": []string{"restarting", "running", "removing"},
+			},
+		},
+		{
+			name:    "include all",
+			include: []string{"*"},
+			expected: map[string][]string{
+				"status": []string{"created", "restarting", "running", "removing", "paused", "exited", "dead"},
+			},
+		},
+		{
+			name:    "exclude all",
+			exclude: []string{"*"},
+			expected: map[string][]string{
+				"status": []string{},
+			},
+		},
+		{
+			name:    "exclude all",
+			include: []string{"*"},
+			exclude: []string{"exited"},
+			expected: map[string][]string{
+				"status": []string{"created", "restarting", "running", "removing", "paused", "dead"},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var acc testutil.Accumulator
+
+			newClientFunc := func(host string, tlsConfig *tls.Config) (Client, error) {
+				client := baseClient
+				client.ContainerListF = func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
+					for k, v := range tt.expected {
+						actual := options.Filters.Get(k)
+						sort.Strings(actual)
+						sort.Strings(v)
+						require.Equal(t, v, actual)
+					}
+
+					return nil, nil
+				}
+				return &client, nil
+			}
+
+			d := Docker{
+				newClient:             newClientFunc,
+				ContainerStateInclude: tt.include,
+				ContainerStateExclude: tt.exclude,
+			}
+
+			err := d.Gather(&acc)
+			require.NoError(t, err)
+		})
+	}
+}

From 461c0dccd89a8b88b3a7f4b158a9392943e35e5e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 30 Mar 2018 13:20:07 -0700
Subject: [PATCH 1028/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e69425bb..f27a03fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,7 @@
 - [#3366](https://github.com/influxdata/telegraf/issues/3366): Add support for connecting to InfluxDB over a unix domain socket.
 - [#3946](https://github.com/influxdata/telegraf/pull/3946): Add optional unsigned integer support to the influx data format.
 - [#3811](https://github.com/influxdata/telegraf/pull/3811): Add TLS support to zookeeper input.
+- [#2737](https://github.com/influxdata/telegraf/issues/2737): Add filters for container state to docker input.
 
 ### Bugfixes
 

From a971ffb88003d6f49bf1789ca7df95aa538d2be0 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Fri, 30 Mar 2018 16:22:24 -0400
Subject: [PATCH 1029/1302] Remove host tag from Database IO v2 Query (#3953)

---
 plugins/inputs/sqlserver/sqlserver.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index f17574a9e..5196cc33c 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -351,7 +351,6 @@ EXEC(@SQL)
 const sqlDatabaseIOV2 = `SELECT
 'sqlserver_database_io' As [measurement],
 REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
-SERVERPROPERTY('ServerName') AS [host],
 DB_NAME([vfs].[database_id]) [database_name],
 vfs.io_stall_read_ms AS read_latency_ms,
 vfs.num_of_reads AS reads,

From 7e3ec16e158d4be9f43c496cf074a7f322b3e7e5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 30 Mar 2018 16:57:35 -0700
Subject: [PATCH 1030/1302] Allow empty string field values

---
 metric/metric.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/metric/metric.go b/metric/metric.go
index 23c48697f..0af445c2d 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -247,11 +247,7 @@ func convertField(v interface{}) interface{} {
 	case int64:
 		return v
 	case string:
-		if v == "" {
-			return nil
-		} else {
-			return v
-		}
+		return v
 	case bool:
 		return v
 	case int:

From 64b239663c321bc99e63c24733a8765c23e45067 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 12:52:23 -0700
Subject: [PATCH 1031/1302] Add mutex to influx parser

---
 plugins/parsers/influx/parser.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 98f9cf65f..53acd5eff 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -3,6 +3,7 @@ package influx
 import (
 	"errors"
 	"fmt"
+	"sync"
 
 	"github.com/influxdata/telegraf"
 )
@@ -32,6 +33,7 @@ func (e *ParseError) Error() string {
 type Parser struct {
 	DefaultTags map[string]string
 
+	sync.Mutex
 	*machine
 	handler *MetricHandler
 }
@@ -44,6 +46,8 @@ func NewParser(handler *MetricHandler) *Parser {
 }
 
 func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
+	p.Lock()
+	defer p.Unlock()
 	metrics := make([]telegraf.Metric, 0)
 	p.machine.SetData(input)
 

From 82448a9dd13632acf2539b8b4a0ea51786c55016 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 2 Apr 2018 13:10:43 -0700
Subject: [PATCH 1032/1302] Add metric_version option to mysql input (#3954)

---
 CHANGELOG.md                     |  22 ++--
 plugins/inputs/mysql/README.md   |  93 ++++++++++++++-
 plugins/inputs/mysql/mysql.go    | 158 ++++++++++++++++++++++---
 plugins/inputs/mysql/v1/mysql.go | 195 +++++++++++++++++++++++++++++++
 4 files changed, 435 insertions(+), 33 deletions(-)
 create mode 100644 plugins/inputs/mysql/v1/mysql.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f27a03fe5..51d9faaa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,16 @@
 
 ### Release Notes
 
-- The `mysql` input plugin has been updated to convert values to the
-  correct data type.  This may cause a `field type error` when inserting into
-  InfluxDB due the change of types.  It is recommended to drop the `mysql`,
-  `mysql_variables`, and `mysql_innodb`:
-  ```
-  DROP MEASUREMENT mysql
-  DROP MEASUREMENT mysql_variables
-  DROP MEASUREMENT mysql_innodb
-  ```
+- The `mysql` input plugin has been updated fix a number of type convertion
+  issues.  This may cause a `field type error` when inserting into InfluxDB due
+  the change of types.
+
+  To address this we have introduced a new `metric_version` option to control
+  enabling the new format.  For in depth recommendations on upgrading please
+  reference the [mysql plugin documentation](./plugins/inputs/mysql/README.md#metric-version).
+
+  It is encouraged to migrate to the new model when possible as the old version
+  is deprecated and will be removed in a future version.
 
 - The `postgresql` plugins now defaults to using a persistent connection to the database.
   In environments where TCP connections are terminated the `max_lifetime`
@@ -26,7 +27,8 @@
   is set.  It is encouraged to enable this option when possible as the old
   ordering is deprecated.
 
-- The `httpjson` is now deprecated, please migrate to the new `http` input.
+- The new `http` input configured with `data_format = "json"` can perform the
+  same task as the, now deprecated, `httpjson` input.
 
 
 ### New Inputs
diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index fb9a18eab..588e7c076 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -1,4 +1,4 @@
-# MySQL Input plugin
+# MySQL Input Plugin
 
 This plugin gathers the statistic data from MySQL server
 
@@ -18,9 +18,9 @@ This plugin gathers the statistic data from MySQL server
 * File events statistics
 * Table schema statistics
 
-## Configuration
+### Configuration
 
-```
+```toml
 # Read metrics from one or many mysql servers
 [[inputs.mysql]]
   ## specify servers via a url matching:
@@ -81,14 +81,97 @@ This plugin gathers the statistic data from MySQL server
   #
   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
   interval_slow                             = "30m"
-  
+
   ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
   ssl_ca = "/etc/telegraf/ca.pem"
   ssl_cert = "/etc/telegraf/cert.pem"
   ssl_key = "/etc/telegraf/key.pem"
 ```
 
-## Measurements & Fields
+#### Metric Version
+
+When `metric_version = 2`, a variety of field type issues are corrected as well
+as naming inconsistencies.  If you have existing data on the original version
+enabling this feature will cause a `field type error` when inserted into
+InfluxDB due to the change of types.  For this reason, you should keep the
+`metric_version` unset until you are ready to migrate to the new format.
+
+If preserving your old data is not required you may wish to drop conflicting
+measurements:
+```
+DROP SERIES from mysql
+DROP SERIES from mysql_variables
+DROP SERIES from mysql_innodb
+```
+
+Otherwise, migration can be performed using the following steps:
+
+1. Duplicate your `mysql` plugin configuration and add a `name_suffix` and
+`metric_version = 2`, this will result in collection using both the old and new
+style concurrently:
+   ```toml
+   [[inputs.mysql]]
+     servers = ["tcp(127.0.0.1:3306)/"]
+
+   [[inputs.mysql]]
+     name_override = "_2"
+     metric_version = 2
+
+     servers = ["tcp(127.0.0.1:3306)/"]
+   ```
+
+2. Upgrade all affected Telegraf clients to version >=1.6.
+
+   New measurements will be created with the `name_suffix`, for example::
+   - `mysql_v2`
+   - `mysql_variables_v2`
+
+3. Update charts, alerts, and other supporting code to the new format.
+4. You can now remove the old `mysql` plugin configuration and remove old
+   measurements.
+
+If you wish to remove the `name_suffix` you may use Kapacitor to copy the
+historical data to the default name.  Do this only after retiring the old
+measurement name.
+
+1. Use the techinique described above to write to multiple locations:
+   ```toml
+   [[inputs.mysql]]
+     servers = ["tcp(127.0.0.1:3306)/"]
+     metric_version = 2
+
+   [[inputs.mysql]]
+     name_override = "_2"
+     metric_version = 2
+
+     servers = ["tcp(127.0.0.1:3306)/"]
+   ```
+2. Create a TICKScript to copy the historical data:
+   ```
+   dbrp "telegraf"."autogen"
+
+   batch
+       |query('''
+           SELECT * FROM "telegraf"."autogen"."mysql_v2"
+       ''')
+           .period(5m)
+           .every(5m)
+           |influxDBOut()
+                   .database('telegraf')
+                   .retentionPolicy('autogen')
+                   .measurement('mysql')
+   ```
+3. Define a task for your script:
+   ```sh
+   kapacitor define copy-measurement -tick copy-measurement.task
+   ```
+4. Run the task over the data you would like to migrate:
+   ```sh
+   kapacitor replay-live batch -start 2018-03-30T20:00:00Z -stop 2018-04-01T12:00:00Z -rec-time -task copy-measurement
+   ```
+5. Verify copied data and repeat for other measurements.
+
+### Metrics:
 * Global statuses - all numeric and boolean values of `SHOW GLOBAL STATUSES`
 * Global variables - all numeric and boolean values of `SHOW GLOBAL VARIABLES`
 * Slave status - metrics from `SHOW SLAVE STATUS` the metrics are gathered when
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index d15f46101..a2be5848f 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -13,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/mysql/v1"
 
 	"github.com/go-sql-driver/mysql"
 )
@@ -40,6 +41,7 @@ type Mysql struct {
 	SSLCA                               string   `toml:"ssl_ca"`
 	SSLCert                             string   `toml:"ssl_cert"`
 	SSLKey                              string   `toml:"ssl_key"`
+	MetricVersion                       int      `toml:"metric_version"`
 }
 
 var sampleConfig = `
@@ -52,6 +54,20 @@ var sampleConfig = `
   #
   ## If no servers are specified, then localhost is used as the host.
   servers = ["tcp(127.0.0.1:3306)/"]
+
+  ## Selects the metric output format.
+  ##
+  ## This option exists to maintain backwards compatibility, if you have
+  ## existing metrics do not set or change this value until you are ready to
+  ## migrate to the new format.
+  ##
+  ## If you do not have existing metrics from this plugin set to the latest
+  ## version.
+  ##
+  ## Telegraf >=1.6: metric_version = 2
+  ##           <1.6: metric_version = 1 (or unset)
+  metric_version = 2
+
   ## the limits for metrics form perf_events_statements
   perf_events_statements_digest_text_limit  = 120
   perf_events_statements_limit              = 250
@@ -541,7 +557,7 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accu
 			fields[key] = string(val)
 			tags[key] = string(val)
 		}
-		if value, ok := parseValue(val); ok {
+		if value, ok := m.parseValue(val); ok {
 			fields[key] = value
 		}
 		// Send 20 fields at a time
@@ -593,7 +609,7 @@ func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc telegraf.Accumu
 		// range over columns, and try to parse values
 		for i, col := range cols {
 			col = strings.ToLower(col)
-			if value, ok := parseValue(*vals[i].(*sql.RawBytes)); ok {
+			if value, ok := m.parseValue(*vals[i].(*sql.RawBytes)); ok {
 				fields["slave_"+col] = value
 			}
 		}
@@ -662,10 +678,75 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accum
 			return err
 		}
 
-		key = strings.ToLower(key)
+		if m.MetricVersion < 2 {
+			var found bool
+			for _, mapped := range v1.Mappings {
+				if strings.HasPrefix(key, mapped.OnServer) {
+					// convert numeric values to integer
+					i, _ := strconv.Atoi(string(val))
+					fields[mapped.InExport+key[len(mapped.OnServer):]] = i
+					found = true
+				}
+			}
+			// Send 20 fields at a time
+			if len(fields) >= 20 {
+				acc.AddFields("mysql", fields, tags)
+				fields = make(map[string]interface{})
+			}
+			if found {
+				continue
+			}
 
-		if value, ok := parseValue(val); ok {
-			fields[key] = value
+			// search for specific values
+			switch key {
+			case "Queries":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["queries"] = i
+				}
+			case "Questions":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["questions"] = i
+				}
+			case "Slow_queries":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["slow_queries"] = i
+				}
+			case "Connections":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["connections"] = i
+				}
+			case "Syncs":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["syncs"] = i
+				}
+			case "Uptime":
+				i, err := strconv.ParseInt(string(val), 10, 64)
+				if err != nil {
+					acc.AddError(fmt.Errorf("E! Error mysql: parsing %s int value (%s)", key, err))
+				} else {
+					fields["uptime"] = i
+				}
+			}
+		} else {
+			key = strings.ToLower(key)
+			if value, ok := m.parseValue(val); ok {
+				fields[key] = value
+			}
 		}
 
 		// Send 20 fields at a time
@@ -820,7 +901,11 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.
 	for s, c := range stateCounts {
 		fields[newNamespace("threads", s)] = c
 	}
-	acc.AddFields("mysql_process_list", fields, tags)
+	if m.MetricVersion < 2 {
+		acc.AddFields("mysql_info_schema", fields, tags)
+	} else {
+		acc.AddFields("mysql_process_list", fields, tags)
+	}
 	return nil
 }
 
@@ -1033,7 +1118,11 @@ func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc tel
 		fields["auto_increment_column"] = incValue
 		fields["auto_increment_column_max"] = maxInt
 
-		acc.AddFields("mysql_table_schema", fields, tags)
+		if m.MetricVersion < 2 {
+			acc.AddFields("mysql_info_schema", fields, tags)
+		} else {
+			acc.AddFields("mysql_table_schema", fields, tags)
+		}
 	}
 	return nil
 }
@@ -1059,7 +1148,7 @@ func (m *Mysql) gatherInnoDBMetrics(db *sql.DB, serv string, acc telegraf.Accumu
 			return err
 		}
 		key = strings.ToLower(key)
-		if value, ok := parseValue(val); ok {
+		if value, ok := m.parseValue(val); ok {
 			fields[key] = value
 		}
 		// Send 20 fields at a time
@@ -1430,17 +1519,37 @@ func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc telegraf.Accumula
 			tags["schema"] = tableSchema
 			tags["table"] = tableName
 
-			acc.AddFields("mysql_table_schema",
-				map[string]interface{}{"rows": tableRows}, tags)
+			if m.MetricVersion < 2 {
+				acc.AddFields(newNamespace("info_schema", "table_rows"),
+					map[string]interface{}{"value": tableRows}, tags)
 
-			acc.AddFields("mysql_table_schema",
-				map[string]interface{}{"data_length": dataLength}, tags)
+				dlTags := copyTags(tags)
+				dlTags["component"] = "data_length"
+				acc.AddFields(newNamespace("info_schema", "table_size", "data_length"),
+					map[string]interface{}{"value": dataLength}, dlTags)
 
-			acc.AddFields("mysql_table_schema",
-				map[string]interface{}{"index_length": indexLength}, tags)
+				ilTags := copyTags(tags)
+				ilTags["component"] = "index_length"
+				acc.AddFields(newNamespace("info_schema", "table_size", "index_length"),
+					map[string]interface{}{"value": indexLength}, ilTags)
 
-			acc.AddFields("mysql_table_schema",
-				map[string]interface{}{"data_free": dataFree}, tags)
+				dfTags := copyTags(tags)
+				dfTags["component"] = "data_free"
+				acc.AddFields(newNamespace("info_schema", "table_size", "data_free"),
+					map[string]interface{}{"value": dataFree}, dfTags)
+			} else {
+				acc.AddFields("mysql_table_schema",
+					map[string]interface{}{"rows": tableRows}, tags)
+
+				acc.AddFields("mysql_table_schema",
+					map[string]interface{}{"data_length": dataLength}, tags)
+
+				acc.AddFields("mysql_table_schema",
+					map[string]interface{}{"index_length": indexLength}, tags)
+
+				acc.AddFields("mysql_table_schema",
+					map[string]interface{}{"data_free": dataFree}, tags)
+			}
 
 			versionTags := copyTags(tags)
 			versionTags["type"] = tableType
@@ -1448,13 +1557,26 @@ func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc telegraf.Accumula
 			versionTags["row_format"] = rowFormat
 			versionTags["create_options"] = createOptions
 
-			acc.AddFields("mysql_table_schema_version",
-				map[string]interface{}{"table_version": version}, versionTags)
+			if m.MetricVersion < 2 {
+				acc.AddFields(newNamespace("info_schema", "table_version"),
+					map[string]interface{}{"value": version}, versionTags)
+			} else {
+				acc.AddFields("mysql_table_schema_version",
+					map[string]interface{}{"table_version": version}, versionTags)
+			}
 		}
 	}
 	return nil
 }
 
+func (m *Mysql) parseValue(value sql.RawBytes) (interface{}, bool) {
+	if m.MetricVersion < 2 {
+		return v1.ParseValue(value)
+	} else {
+		return parseValue(value)
+	}
+}
+
 // parseValue can be used to convert values such as "ON","OFF","Yes","No" to 0,1
 func parseValue(value sql.RawBytes) (interface{}, bool) {
 	if bytes.EqualFold(value, []byte("YES")) || bytes.Compare(value, []byte("ON")) == 0 {
diff --git a/plugins/inputs/mysql/v1/mysql.go b/plugins/inputs/mysql/v1/mysql.go
new file mode 100644
index 000000000..6f6062d14
--- /dev/null
+++ b/plugins/inputs/mysql/v1/mysql.go
@@ -0,0 +1,195 @@
+package v1
+
+import (
+	"bytes"
+	"database/sql"
+	"strconv"
+)
+
+type Mapping struct {
+	OnServer string
+	InExport string
+}
+
+var Mappings = []*Mapping{
+	{
+		OnServer: "Aborted_",
+		InExport: "aborted_",
+	},
+	{
+		OnServer: "Bytes_",
+		InExport: "bytes_",
+	},
+	{
+		OnServer: "Com_",
+		InExport: "commands_",
+	},
+	{
+		OnServer: "Created_",
+		InExport: "created_",
+	},
+	{
+		OnServer: "Handler_",
+		InExport: "handler_",
+	},
+	{
+		OnServer: "Innodb_",
+		InExport: "innodb_",
+	},
+	{
+		OnServer: "Key_",
+		InExport: "key_",
+	},
+	{
+		OnServer: "Open_",
+		InExport: "open_",
+	},
+	{
+		OnServer: "Opened_",
+		InExport: "opened_",
+	},
+	{
+		OnServer: "Qcache_",
+		InExport: "qcache_",
+	},
+	{
+		OnServer: "Table_",
+		InExport: "table_",
+	},
+	{
+		OnServer: "Tokudb_",
+		InExport: "tokudb_",
+	},
+	{
+		OnServer: "Threads_",
+		InExport: "threads_",
+	},
+	{
+		OnServer: "Access_",
+		InExport: "access_",
+	},
+	{
+		OnServer: "Aria__",
+		InExport: "aria_",
+	},
+	{
+		OnServer: "Binlog__",
+		InExport: "binlog_",
+	},
+	{
+		OnServer: "Busy_",
+		InExport: "busy_",
+	},
+	{
+		OnServer: "Connection_",
+		InExport: "connection_",
+	},
+	{
+		OnServer: "Delayed_",
+		InExport: "delayed_",
+	},
+	{
+		OnServer: "Empty_",
+		InExport: "empty_",
+	},
+	{
+		OnServer: "Executed_",
+		InExport: "executed_",
+	},
+	{
+		OnServer: "Executed_",
+		InExport: "executed_",
+	},
+	{
+		OnServer: "Feature_",
+		InExport: "feature_",
+	},
+	{
+		OnServer: "Flush_",
+		InExport: "flush_",
+	},
+	{
+		OnServer: "Last_",
+		InExport: "last_",
+	},
+	{
+		OnServer: "Master_",
+		InExport: "master_",
+	},
+	{
+		OnServer: "Max_",
+		InExport: "max_",
+	},
+	{
+		OnServer: "Memory_",
+		InExport: "memory_",
+	},
+	{
+		OnServer: "Not_",
+		InExport: "not_",
+	},
+	{
+		OnServer: "Performance_",
+		InExport: "performance_",
+	},
+	{
+		OnServer: "Prepared_",
+		InExport: "prepared_",
+	},
+	{
+		OnServer: "Rows_",
+		InExport: "rows_",
+	},
+	{
+		OnServer: "Rpl_",
+		InExport: "rpl_",
+	},
+	{
+		OnServer: "Select_",
+		InExport: "select_",
+	},
+	{
+		OnServer: "Slave_",
+		InExport: "slave_",
+	},
+	{
+		OnServer: "Slow_",
+		InExport: "slow_",
+	},
+	{
+		OnServer: "Sort_",
+		InExport: "sort_",
+	},
+	{
+		OnServer: "Subquery_",
+		InExport: "subquery_",
+	},
+	{
+		OnServer: "Tc_",
+		InExport: "tc_",
+	},
+	{
+		OnServer: "Threadpool_",
+		InExport: "threadpool_",
+	},
+	{
+		OnServer: "wsrep_",
+		InExport: "wsrep_",
+	},
+	{
+		OnServer: "Uptime_",
+		InExport: "uptime_",
+	},
+}
+
+func ParseValue(value sql.RawBytes) (float64, bool) {
+	if bytes.Compare(value, []byte("Yes")) == 0 || bytes.Compare(value, []byte("ON")) == 0 {
+		return 1, true
+	}
+
+	if bytes.Compare(value, []byte("No")) == 0 || bytes.Compare(value, []byte("OFF")) == 0 {
+		return 0, true
+	}
+	n, err := strconv.ParseFloat(string(value), 64)
+	return n, err == nil
+}

From 109c1a4344c95763a4be1f0ba0fbaf9f17cd3504 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 13:47:50 -0700
Subject: [PATCH 1033/1302] Update gopsutil version to v2.18.03

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 1b1b4be37..495a77d47 100644
--- a/Godeps
+++ b/Godeps
@@ -66,7 +66,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil 5776ff9c7c5d063d574ef53d740f75c68b448e53
+github.com/shirou/gopsutil fc04d2dd9a512906a2604242b35275179e250eda
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From 19c102cf4bc6296c4ae14611d46a78f1c9285869 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 2 Apr 2018 13:55:10 -0700
Subject: [PATCH 1034/1302] Fix parsing of dos line endings in smart input
 (#3960)

---
 plugins/inputs/smart/smart.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/smart/smart.go b/plugins/inputs/smart/smart.go
index bc130363b..46912d487 100644
--- a/plugins/inputs/smart/smart.go
+++ b/plugins/inputs/smart/smart.go
@@ -1,6 +1,7 @@
 package smart
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
 	"path"
@@ -202,7 +203,10 @@ func gatherDisk(acc telegraf.Accumulator, usesudo, attributes bool, smartctl, no
 	device_fields := make(map[string]interface{})
 	device_fields["exit_status"] = exitStatus
 
-	for _, line := range strings.Split(outStr, "\n") {
+	scanner := bufio.NewScanner(strings.NewReader(outStr))
+
+	for scanner.Scan() {
+		line := scanner.Text()
 
 		model := modelInInfo.FindStringSubmatch(line)
 		if len(model) > 1 {

From 0aad487cabbb841ea7a50e594565ae56176a3677 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 14:13:15 -0700
Subject: [PATCH 1035/1302] Fix go vet and use go test -race

---
 .circleci/config.yml                          |  3 +-
 Makefile                                      | 15 ++----
 .../http_response/http_response_test.go       | 46 +++++++++----------
 3 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea5a789d4..b55b22383 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,8 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: 'make ci-test'
+      - run: 'make deps'
+      - run: 'make test-ci'
   release:
     <<: *defaults
     steps:
diff --git a/Makefile b/Makefile
index b9832fb6a..8b10519a8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,16 +20,9 @@ ifdef VERSION
 endif
 
 all:
-	$(MAKE) fmtcheck
 	$(MAKE) deps
 	$(MAKE) telegraf
 
-ci-test:
-	$(MAKE) deps
-	$(MAKE) fmtcheck
-	$(MAKE) vet
-	$(MAKE) test
-
 deps:
 	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
@@ -62,9 +55,6 @@ fmtcheck:
 	fi
 	@echo '[INFO] done.'
 
-lint:
-	golint ./...
-
 test-windows:
 	go test ./plugins/inputs/ping/...
 	go test ./plugins/inputs/win_perf_counters/...
@@ -82,7 +72,10 @@ vet:
 		exit 1; \
 	fi
 
-test-all: vet
+test-ci: fmtcheck vet
+	go test -short./...
+
+test-all: fmtcheck vet
 	go test ./...
 
 package:
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index c12d6c0f0..7d3780cec 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 // Receives a list with fields that are expected to be absent
-func checkAbsentFields(t *testing.T, fields []string, acc testutil.Accumulator) {
+func checkAbsentFields(t *testing.T, fields []string, acc *testutil.Accumulator) {
 	for _, field := range fields {
 		ok := acc.HasField("http_response", field)
 		require.False(t, ok)
@@ -24,7 +24,7 @@ func checkAbsentFields(t *testing.T, fields []string, acc testutil.Accumulator)
 }
 
 // Receives a list with tags that are expected to be absent
-func checkAbsentTags(t *testing.T, tags []string, acc testutil.Accumulator) {
+func checkAbsentTags(t *testing.T, tags []string, acc *testutil.Accumulator) {
 	for _, tag := range tags {
 		ok := acc.HasTag("http_response", tag)
 		require.False(t, ok)
@@ -33,7 +33,7 @@ func checkAbsentTags(t *testing.T, tags []string, acc testutil.Accumulator) {
 
 // Receives a dictionary and with expected fields and their values. If a value is nil, it will only check
 // that the field exists, but not its contents
-func checkFields(t *testing.T, fields map[string]interface{}, acc testutil.Accumulator) {
+func checkFields(t *testing.T, fields map[string]interface{}, acc *testutil.Accumulator) {
 	for key, field := range fields {
 		switch v := field.(type) {
 		case int:
@@ -60,7 +60,7 @@ func checkFields(t *testing.T, fields map[string]interface{}, acc testutil.Accum
 
 // Receives a dictionary and with expected tags and their values. If a value is nil, it will only check
 // that the tag exists, but not its contents
-func checkTags(t *testing.T, tags map[string]interface{}, acc testutil.Accumulator) {
+func checkTags(t *testing.T, tags map[string]interface{}, acc *testutil.Accumulator) {
 	for key, tag := range tags {
 		switch v := tag.(type) {
 		case string:
@@ -118,7 +118,7 @@ func setUpTestMux() http.Handler {
 	return mux
 }
 
-func checkOutput(t *testing.T, acc testutil.Accumulator, presentFields map[string]interface{}, presentTags map[string]interface{}, absentFields []string, absentTags []string) {
+func checkOutput(t *testing.T, acc *testutil.Accumulator, presentFields map[string]interface{}, presentTags map[string]interface{}, absentFields []string, absentTags []string) {
 	if presentFields != nil {
 		checkFields(t, presentFields, acc)
 	}
@@ -171,7 +171,7 @@ func TestHeaders(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields := []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestFields(t *testing.T) {
@@ -207,7 +207,7 @@ func TestFields(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields := []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestRedirects(t *testing.T) {
@@ -242,7 +242,7 @@ func TestRedirects(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields := []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/badredirect",
@@ -269,10 +269,10 @@ func TestRedirects(t *testing.T) {
 	}
 	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
 	absentTags := []string{"status_code"}
-	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
 
 	expectedFields = map[string]interface{}{"result_type": "connection_failed"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
 }
 
 func TestMethod(t *testing.T) {
@@ -307,7 +307,7 @@ func TestMethod(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields := []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/mustbepostmethod",
@@ -336,7 +336,7 @@ func TestMethod(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields = []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 
 	//check that lowercase methods work correctly
 	h = &HTTPResponse{
@@ -366,7 +366,7 @@ func TestMethod(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields = []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestBody(t *testing.T) {
@@ -401,7 +401,7 @@ func TestBody(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields := []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 
 	h = &HTTPResponse{
 		Address:         ts.URL + "/musthaveabody",
@@ -428,7 +428,7 @@ func TestBody(t *testing.T) {
 		"result":      "success",
 	}
 	absentFields = []string{"response_string_match"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
 }
 
 func TestStringMatch(t *testing.T) {
@@ -464,7 +464,7 @@ func TestStringMatch(t *testing.T) {
 		"status_code": "200",
 		"result":      "success",
 	}
-	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestStringMatchJson(t *testing.T) {
@@ -500,7 +500,7 @@ func TestStringMatchJson(t *testing.T) {
 		"status_code": "200",
 		"result":      "success",
 	}
-	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestStringMatchFail(t *testing.T) {
@@ -537,7 +537,7 @@ func TestStringMatchFail(t *testing.T) {
 		"status_code": "200",
 		"result":      "response_string_mismatch",
 	}
-	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestTimeout(t *testing.T) {
@@ -574,7 +574,7 @@ func TestTimeout(t *testing.T) {
 	}
 	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
 	absentTags := []string{"status_code"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
 }
 
 func TestPluginErrors(t *testing.T) {
@@ -601,7 +601,7 @@ func TestPluginErrors(t *testing.T) {
 
 	absentFields := []string{"http_response_code", "response_time", "response_string_match", "result_type", "result_code"}
 	absentTags := []string{"status_code", "result", "server", "method"}
-	checkOutput(t, acc, nil, nil, absentFields, absentTags)
+	checkOutput(t, &acc, nil, nil, absentFields, absentTags)
 
 	// Attempt to read empty body test
 	h = &HTTPResponse{
@@ -630,7 +630,7 @@ func TestPluginErrors(t *testing.T) {
 		"status_code": "301",
 		"result":      "body_read_error",
 	}
-	checkOutput(t, acc, expectedFields, expectedTags, nil, nil)
+	checkOutput(t, &acc, expectedFields, expectedTags, nil, nil)
 }
 
 func TestNetworkErrors(t *testing.T) {
@@ -658,7 +658,7 @@ func TestNetworkErrors(t *testing.T) {
 	}
 	absentFields := []string{"http_response_code", "response_time", "response_string_match"}
 	absentTags := []string{"status_code"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
 
 	// Connecton failed
 	h = &HTTPResponse{
@@ -684,5 +684,5 @@ func TestNetworkErrors(t *testing.T) {
 	}
 	absentFields = []string{"http_response_code", "response_time", "response_string_match"}
 	absentTags = []string{"status_code"}
-	checkOutput(t, acc, expectedFields, expectedTags, absentFields, absentTags)
+	checkOutput(t, &acc, expectedFields, expectedTags, absentFields, absentTags)
 }

From 9d2f3fcbb9e67ef415bd06e56431e15a1d39f664 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 14:31:36 -0700
Subject: [PATCH 1036/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51d9faaa0..e6962e788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
 - [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
 - [#3868](https://github.com/influxdata/telegraf/issues/3868): Fix cannot unmarshal object error in DC/OS input.
 - [#3648](https://github.com/influxdata/telegraf/issues/3648): Fix InfluxDB output not able to reconnect when server address changes.
+- [#3960](https://github.com/influxdata/telegraf/issues/3960): Fix parsing of dos line endings in the smart input.
 
 ## v1.5.3 [2018-03-14]
 

From bcaaeda49c1e5054c3214a7b1e7edcd6a88bfbdc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 2 Apr 2018 14:32:33 -0700
Subject: [PATCH 1037/1302] Fix precision truncation when no timestamp included
 (#3961)

---
 metric/builder.go                             |  6 +-
 plugins/inputs/http_listener/http_listener.go | 10 +++-
 .../http_listener/http_listener_test.go       | 28 +++++++++
 plugins/parsers/influx/handler.go             |  5 +-
 plugins/parsers/influx/parser_test.go         | 59 +++++++++++++++++--
 5 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/metric/builder.go b/metric/builder.go
index d80f566fb..c579046df 100644
--- a/metric/builder.go
+++ b/metric/builder.go
@@ -10,13 +10,15 @@ type TimeFunc func() time.Time
 
 type Builder struct {
 	TimeFunc
+	TimePrecision time.Duration
 
 	*metric
 }
 
 func NewBuilder() *Builder {
 	b := &Builder{
-		TimeFunc: time.Now,
+		TimeFunc:      time.Now,
+		TimePrecision: 1 * time.Nanosecond,
 	}
 	b.Reset()
 	return b
@@ -44,7 +46,7 @@ func (b *Builder) Reset() {
 
 func (b *Builder) Metric() (telegraf.Metric, error) {
 	if b.tm.IsZero() {
-		b.tm = b.TimeFunc()
+		b.tm = b.TimeFunc().Truncate(b.TimePrecision)
 	}
 
 	return b.metric, nil
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index cccd39472..bda4ce463 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -33,6 +33,8 @@ const (
 	DEFAULT_MAX_LINE_SIZE = 64 * 1024
 )
 
+type TimeFunc func() time.Time
+
 type HTTPListener struct {
 	ServiceAddress string
 	ReadTimeout    internal.Duration
@@ -48,6 +50,8 @@ type HTTPListener struct {
 	BasicUsername string
 	BasicPassword string
 
+	TimeFunc
+
 	mu sync.Mutex
 	wg sync.WaitGroup
 
@@ -241,7 +245,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 		tooLarge(res)
 		return
 	}
-	now := time.Now()
+	now := h.TimeFunc()
 
 	precision := req.URL.Query().Get("precision")
 
@@ -340,7 +344,8 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 }
 
 func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
-	h.handler.SetPrecision(getPrecisionMultiplier(precision))
+	h.handler.SetTimePrecision(getPrecisionMultiplier(precision))
+	h.handler.SetTimeFunc(func() time.Time { return t })
 	metrics, err := h.parser.Parse(b)
 	if err != nil {
 		return err
@@ -437,6 +442,7 @@ func init() {
 	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
 			ServiceAddress: ":8186",
+			TimeFunc:       time.Now,
 		}
 	})
 }
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 0b8b7a450..7f6ab406c 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -119,6 +119,7 @@ var (
 func newTestHTTPListener() *HTTPListener {
 	listener := &HTTPListener{
 		ServiceAddress: "localhost:0",
+		TimeFunc:       time.Now,
 	}
 	return listener
 }
@@ -170,6 +171,7 @@ func newTestHTTPSListener() *HTTPListener {
 		TlsAllowedCacerts: allowedCAFiles,
 		TlsCert:           serviceCertFile,
 		TlsKey:            serviceKeyFile,
+		TimeFunc:          time.Now,
 	}
 
 	return listener
@@ -340,6 +342,7 @@ func TestWriteHTTPMaxLineSizeIncrease(t *testing.T) {
 	listener := &HTTPListener{
 		ServiceAddress: "localhost:0",
 		MaxLineSize:    128 * 1000,
+		TimeFunc:       time.Now,
 	}
 
 	acc := &testutil.Accumulator{}
@@ -357,6 +360,7 @@ func TestWriteHTTPVerySmallMaxBody(t *testing.T) {
 	listener := &HTTPListener{
 		ServiceAddress: "localhost:0",
 		MaxBodySize:    4096,
+		TimeFunc:       time.Now,
 	}
 
 	acc := &testutil.Accumulator{}
@@ -373,6 +377,7 @@ func TestWriteHTTPVerySmallMaxLineSize(t *testing.T) {
 	listener := &HTTPListener{
 		ServiceAddress: "localhost:0",
 		MaxLineSize:    70,
+		TimeFunc:       time.Now,
 	}
 
 	acc := &testutil.Accumulator{}
@@ -399,6 +404,7 @@ func TestWriteHTTPLargeLinesSkipped(t *testing.T) {
 	listener := &HTTPListener{
 		ServiceAddress: "localhost:0",
 		MaxLineSize:    100,
+		TimeFunc:       time.Now,
 	}
 
 	acc := &testutil.Accumulator{}
@@ -566,5 +572,27 @@ func TestWriteWithPrecision(t *testing.T) {
 	require.Equal(t, time.Unix(0, 1422568543000000000), acc.Metrics[0].Time)
 }
 
+func TestWriteWithPrecisionNoTimestamp(t *testing.T) {
+	listener := newTestHTTPListener()
+	listener.TimeFunc = func() time.Time {
+		return time.Unix(42, 123456789)
+	}
+
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	msg := "xyzzy value=42\n"
+	resp, err := http.Post(
+		createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg)))
+	require.NoError(t, err)
+	resp.Body.Close()
+	require.EqualValues(t, 204, resp.StatusCode)
+
+	acc.Wait(1)
+	require.Equal(t, 1, len(acc.Metrics))
+	require.Equal(t, time.Unix(42, 0), acc.Metrics[0].Time)
+}
+
 const hugeMetric = `super_long_metric,foo=bar clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i,clients=1i,connected_slaves=0i,evicted_keys=0i,expired_keys=0i,instantaneous_ops_per_sec=0i,keyspace_hitrate=0,keyspace_hits=0i,keyspace_misses=2i,latest_fork_usec=0i,master_repl_offset=0i,mem_fragmentation_ratio=3.58,pubsub_channels=0i,pubsub_patterns=0i,rdb_changes_since_last_save=0i,repl_backlog_active=0i,repl_backlog_histlen=0i,repl_backlog_size=1048576i,sync_full=0i,sync_partial_err=0i,sync_partial_ok=0i,total_commands_processed=4i,total_connections_received=2i,uptime=869i,used_cpu_sys=0.07,used_cpu_sys_children=0,used_cpu_user=0.1,used_cpu_user_children=0,used_memory=502048i,used_memory_lua=33792i,used_memory_peak=501128i,used_memory_rss=1798144i
 `
diff --git a/plugins/parsers/influx/handler.go b/plugins/parsers/influx/handler.go
index a75883797..af7445a53 100644
--- a/plugins/parsers/influx/handler.go
+++ b/plugins/parsers/influx/handler.go
@@ -26,8 +26,9 @@ func (h *MetricHandler) SetTimeFunc(f metric.TimeFunc) {
 	h.builder.TimeFunc = f
 }
 
-func (h *MetricHandler) SetPrecision(factor time.Duration) {
-	h.precision = factor
+func (h *MetricHandler) SetTimePrecision(precision time.Duration) {
+	h.builder.TimePrecision = precision
+	h.precision = precision
 }
 
 func (h *MetricHandler) Metric() (telegraf.Metric, error) {
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 59d4d7f16..594e6b766 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -21,10 +21,12 @@ var DefaultTime = func() time.Time {
 }
 
 var ptests = []struct {
-	name    string
-	input   []byte
-	metrics []telegraf.Metric
-	err     error
+	name      string
+	input     []byte
+	timeFunc  func() time.Time
+	precision time.Duration
+	metrics   []telegraf.Metric
+	err       error
 }{
 	{
 		name:  "minimal",
@@ -406,7 +408,7 @@ var ptests = []struct {
 		err: nil,
 	},
 	{
-		name:  "default timestamp",
+		name:  "no timestamp",
 		input: []byte("cpu value=42"),
 		metrics: []telegraf.Metric{
 			Metric(
@@ -422,6 +424,47 @@ var ptests = []struct {
 		},
 		err: nil,
 	},
+	{
+		name:  "no timestamp full precision",
+		input: []byte("cpu value=42"),
+		timeFunc: func() time.Time {
+			return time.Unix(42, 123456789)
+		},
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 123456789),
+				),
+			),
+		},
+		err: nil,
+	},
+	{
+		name:  "no timestamp partial precision",
+		input: []byte("cpu value=42"),
+		timeFunc: func() time.Time {
+			return time.Unix(42, 123456789)
+		},
+		precision: 1 * time.Millisecond,
+		metrics: []telegraf.Metric{
+			Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(42, 123000000),
+				),
+			),
+		},
+		err: nil,
+	},
 	{
 		name:  "multiple lines",
 		input: []byte("cpu value=42\ncpu value=42"),
@@ -538,6 +581,12 @@ func TestParser(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			handler := NewMetricHandler()
 			handler.SetTimeFunc(DefaultTime)
+			if tt.timeFunc != nil {
+				handler.SetTimeFunc(tt.timeFunc)
+			}
+			if tt.precision > 0 {
+				handler.SetTimePrecision(tt.precision)
+			}
 			parser := NewParser(handler)
 
 			metrics, err := parser.Parse(tt.input)

From f4c0aac898b0e3b5cd3bea2c70f99fd20dc5c08b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 14:34:25 -0700
Subject: [PATCH 1038/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6962e788..7a7c1274a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,7 +103,8 @@
 - [#1575](https://github.com/influxdata/telegraf/issues/1575): Add tag for target url to phpfpm input.
 - [#3868](https://github.com/influxdata/telegraf/issues/3868): Fix cannot unmarshal object error in DC/OS input.
 - [#3648](https://github.com/influxdata/telegraf/issues/3648): Fix InfluxDB output not able to reconnect when server address changes.
-- [#3960](https://github.com/influxdata/telegraf/issues/3960): Fix parsing of dos line endings in the smart input.
+- [#3957](https://github.com/influxdata/telegraf/issues/3957): Fix parsing of dos line endings in the smart input.
+- [#3754](https://github.com/influxdata/telegraf/issues/3754): Fix precision truncation when no timestamp included.
 
 ## v1.5.3 [2018-03-14]
 

From 7b23287e20908dcc43a04bccd971e94eb13aa691 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 14:40:51 -0700
Subject: [PATCH 1039/1302] Update sample telegraf.conf

---
 etc/telegraf.conf | 131 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 101 insertions(+), 30 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 8b78ed331..da826a1c7 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -82,31 +82,42 @@
 #                            OUTPUT PLUGINS                                   #
 ###############################################################################
 
-# Configuration for influxdb server to send metrics to
+# Configuration for sending metrics to InfluxDB
 [[outputs.influxdb]]
   ## The full HTTP or UDP URL for your InfluxDB instance.
   ##
-  ## Multiple urls can be specified as part of the same cluster,
-  ## this means that only ONE of the urls will be written to each interval.
-  # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
-  urls = ["http://127.0.0.1:8086"] # required
-  ## The target database for metrics (telegraf will create it if not exists).
-  database = "telegraf" # required
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  # urls = ["unix:///var/run/influxdb.sock"]
+  # urls = ["udp://127.0.0.1:8089"]
+  # urls = ["http://127.0.0.1:8086"]
+
+  ## The target database for metrics; will be created as needed.
+  # database = "telegraf"
+
+  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
+  ## Telegraf with a user without permissions to create databases or when the
+  ## database already exists.
+  # skip_database_creation = false
 
   ## Name of existing retention policy to write to.  Empty string writes to
   ## the default retention policy.
-  retention_policy = ""
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
-  write_consistency = "any"
+  # retention_policy = ""
 
-  ## Write timeout (for the InfluxDB client), formatted as a string.
-  ## If not provided, will default to 5s. 0s means no timeout (not recommended).
-  timeout = "5s"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  # write_consistency = "any"
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## HTTP Basic Auth
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
-  ## Set the user agent for HTTP POSTs (can be useful for log differentiation)
+
+  ## HTTP User-Agent
   # user_agent = "telegraf"
-  ## Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+
+  ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
   ## Optional SSL Config
@@ -116,14 +127,22 @@
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## HTTP Proxy Config
+  ## HTTP Proxy override, if unset values the standard proxy environment
+  ## variables are consulted to determine which proxy, if any, should be used.
   # http_proxy = "http://corporate.proxy:3128"
 
-  ## Optional HTTP headers
+  ## Additional HTTP headers
   # http_headers = {"X-Special-Header" = "Special-Value"}
 
-  ## Compress each HTTP request payload using GZIP.
-  # content_encoding = "gzip"
+  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "identity"
+
+  ## When true, Telegraf will output unsigned integers as unsigned values,
+  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
+  ## integer values.  Enabling this option will result in field type errors if
+  ## existing data has been written.
+  # influx_uint_support = false
 
 
 # # Configuration for Amon Server to send metrics to.
@@ -1087,19 +1106,28 @@
 
 # # Gather health check statuses from services registered in Consul
 # [[inputs.consul]]
-#   ## Most of these values defaults to the one configured on a Consul's agent level.
-#   ## Optional Consul server address (default: "localhost")
+#   ## Consul server address
 #   # address = "localhost"
-#   ## Optional URI scheme for the Consul server (default: "http")
+#
+#   ## URI scheme for the Consul server, one of "http", "https"
 #   # scheme = "http"
-#   ## Optional ACL token used in every request (default: "")
+#
+#   ## ACL token used in every request
 #   # token = ""
-#   ## Optional username used for request HTTP Basic Authentication (default: "")
+#
+#   ## HTTP Basic Authentication username and password.
 #   # username = ""
-#   ## Optional password used for HTTP Basic Authentication (default: "")
 #   # password = ""
-#   ## Optional data centre to query the health checks from (default: "")
+#
+#   ## Data centre to query the health checks from
 #   # datacentre = ""
+#
+#   ## SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
 
 
 # # Read metrics from one or many couchbase clusters
@@ -1222,6 +1250,11 @@
 #   container_name_include = []
 #   container_name_exclude = []
 #
+#   ## Container states to include and exclude. Globs accepted.
+#   ## When empty only containers in the "running" state will be captured.
+#   # container_state_include = []
+#   # container_state_exclude = []
+#
 #   ## Timeout for docker list, info, and stats commands
 #   timeout = "5s"
 #
@@ -1291,7 +1324,7 @@
 #
 #   ## node_stats is a list of sub-stats that you want to have gathered. Valid options
 #   ## are "indices", "os", "process", "jvm", "thread_pool", "fs", "transport", "http",
-#   ## "breakers". Per default, all stats are gathered.
+#   ## "breaker". Per default, all stats are gathered.
 #   # node_stats = ["jvm", "http"]
 #
 #   ## Optional SSL Config
@@ -1790,6 +1823,13 @@
 #
 #   ## Time limit for http requests
 #   timeout = "5s"
+#
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Get kernel statistics from /proc/vmstat
@@ -1941,6 +1981,20 @@
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]
+#
+#   ## Selects the metric output format.
+#   ##
+#   ## This option exists to maintain backwards compatibility, if you have
+#   ## existing metrics do not set or change this value until you are ready to
+#   ## migrate to the new format.
+#   ##
+#   ## If you do not have existing metrics from this plugin set to the latest
+#   ## version.
+#   ##
+#   ## Telegraf >=1.6: metric_version = 2
+#   ##           <1.6: metric_version = 1 (or unset)
+#   metric_version = 2
+#
 #   ## the limits for metrics form perf_events_statements
 #   perf_events_statements_digest_text_limit  = 120
 #   perf_events_statements_limit              = 250
@@ -2013,6 +2067,12 @@
 #   ## regardless of status.
 #   ##
 #   # interfaces = ["eth0"]
+#   ##
+#   ## On linux systems telegraf also collects protocol stats.
+#   ## Setting ignore_protocol_stats to true will skip reporting of protocol metrics.
+#   ##
+#   # ignore_protocol_stats = false
+#   ##
 
 
 # # TCP or UDP 'ping' given url and collect response time in seconds
@@ -2624,7 +2684,7 @@
 #   ## - MemoryClerk
 #   ## - VolumeSpace
 #   ## - PerformanceMetrics
-#   # exclude_query = [ 'PerformanceCounters','WaitStatsCatagorized' ]
+#   # exclude_query = [ 'DatabaseIO' ]
 
 
 # # Sysstat metrics collector
@@ -2797,6 +2857,17 @@
 #   ## If no servers are specified, then localhost is used as the host.
 #   ## If no port is specified, 2181 is used
 #   servers = [":2181"]
+#
+#   ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+#   # timeout = "5s"
+#
+#   ## Optional SSL Config
+#   # enable_ssl = true
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
 
 
 
@@ -2865,8 +2936,8 @@
 #
 #   ## Optional username and password to accept for HTTP basic authentication.
 #   ## You probably want to make sure you have TLS configured above for this.
-#   basic_username = "foobar"
-#   basic_password = "barfoo"
+#   # basic_username = "foobar"
+#   # basic_password = "barfoo"
 
 
 # # Read metrics from Kafka topic(s)

From 413cf6dd23c80d4c6800ee5ef9a8327819609b39 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 2 Apr 2018 14:44:09 -0700
Subject: [PATCH 1040/1302] Set next version to 1.7 on master

---
 cmd/telegraf/telegraf.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 4abfd0a3e..e13683fc4 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -57,7 +57,7 @@ var fService = flag.String("service", "",
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
-	nextVersion = "1.6.0"
+	nextVersion = "1.7.0"
 	version     string
 	commit      string
 	branch      string

From 265d0e6d845b4a998e3610435c5ff689a05bc0ef Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 2 Apr 2018 16:18:33 -0700
Subject: [PATCH 1041/1302] Fix bug preventing database from being recreated
 (#3962)

---
 plugins/outputs/influxdb/influxdb.go      |  2 +-
 plugins/outputs/influxdb/influxdb_test.go | 62 ++++++++++++++++++++---
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 3d1a895a2..12aa76ec4 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -210,7 +210,7 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 		}
 
 		switch apiError := err.(type) {
-		case APIError:
+		case *APIError:
 			if !i.SkipDatabaseCreation {
 				if apiError.Type == DatabaseNotFound {
 					err := client.CreateDatabase(ctx)
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index 3e9824ad0..c0a46995c 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -2,11 +2,13 @@ package influxdb_test
 
 import (
 	"context"
+	"net/http"
 	"testing"
 	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs/influxdb"
 	"github.com/stretchr/testify/require"
 )
@@ -37,7 +39,7 @@ func (c *MockClient) CreateDatabase(ctx context.Context) error {
 func TestDeprecatedURLSupport(t *testing.T) {
 	var actual *influxdb.UDPConfig
 	output := influxdb.InfluxDB{
-		URL: "udp://localhost:8086",
+		URL: "udp://localhost:8089",
 
 		CreateUDPClientF: func(config *influxdb.UDPConfig) (influxdb.Client, error) {
 			actual = config
@@ -46,7 +48,7 @@ func TestDeprecatedURLSupport(t *testing.T) {
 	}
 	err := output.Connect()
 	require.NoError(t, err)
-	require.Equal(t, "udp://localhost:8086", actual.URL.String())
+	require.Equal(t, "udp://localhost:8089", actual.URL.String())
 }
 
 func TestDefaultURL(t *testing.T) {
@@ -70,7 +72,7 @@ func TestConnectUDPConfig(t *testing.T) {
 	var actual *influxdb.UDPConfig
 
 	output := influxdb.InfluxDB{
-		URLs:       []string{"udp://localhost:8086"},
+		URLs:       []string{"udp://localhost:8089"},
 		UDPPayload: 42,
 
 		CreateUDPClientF: func(config *influxdb.UDPConfig) (influxdb.Client, error) {
@@ -81,7 +83,7 @@ func TestConnectUDPConfig(t *testing.T) {
 	err := output.Connect()
 	require.NoError(t, err)
 
-	require.Equal(t, "udp://localhost:8086", actual.URL.String())
+	require.Equal(t, "udp://localhost:8089", actual.URL.String())
 	require.Equal(t, 42, actual.MaxPayloadSize)
 	require.NotNil(t, actual.Serializer)
 }
@@ -90,7 +92,7 @@ func TestConnectHTTPConfig(t *testing.T) {
 	var actual *influxdb.HTTPConfig
 
 	output := influxdb.InfluxDB{
-		URLs:             []string{"http://localhost:8089"},
+		URLs:             []string{"http://localhost:8086"},
 		Database:         "telegraf",
 		RetentionPolicy:  "default",
 		WriteConsistency: "any",
@@ -98,7 +100,7 @@ func TestConnectHTTPConfig(t *testing.T) {
 		Username:         "guy",
 		Password:         "smiley",
 		UserAgent:        "telegraf",
-		HTTPProxy:        "http://localhost:8089",
+		HTTPProxy:        "http://localhost:8086",
 		HTTPHeaders: map[string]string{
 			"x": "y",
 		},
@@ -133,3 +135,51 @@ func TestConnectHTTPConfig(t *testing.T) {
 
 	require.Equal(t, output.Database, actual.Database)
 }
+
+func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) {
+	var createDatabaseCalled bool
+
+	output := influxdb.InfluxDB{
+		URLs: []string{"http://localhost:8086"},
+
+		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
+			return &MockClient{
+				CreateDatabaseF: func(ctx context.Context) error {
+					createDatabaseCalled = true
+					return nil
+				},
+				WriteF: func(ctx context.Context, metrics []telegraf.Metric) error {
+					return &influxdb.APIError{
+						StatusCode:  http.StatusNotFound,
+						Title:       "404 Not Found",
+						Description: `database not found "telegraf"`,
+						Type:        influxdb.DatabaseNotFound,
+					}
+				},
+				URLF: func() string {
+					return "http://localhost:8086"
+
+				},
+			}, nil
+		},
+	}
+
+	err := output.Connect()
+	require.NoError(t, err)
+
+	m, err := metric.New(
+		"cpu",
+		map[string]string{},
+		map[string]interface{}{
+			"value": 42.0,
+		},
+		time.Unix(0, 0),
+	)
+	require.NoError(t, err)
+	metrics := []telegraf.Metric{m}
+
+	createDatabaseCalled = false
+	err = output.Write(metrics)
+	// We only have one URL, so we expect an error
+	require.Error(t, err)
+}

From a50acadc44bbab42d2952d44b2a6ed2f127b346d Mon Sep 17 00:00:00 2001
From: Scott Anderson <sanderson@users.noreply.github.com>
Date: Wed, 4 Apr 2018 15:42:58 -0600
Subject: [PATCH 1042/1302] Add details about why not all logstash patterns are
 supported (#3971)

---
 plugins/inputs/logparser/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 2febb8194..6c35a685a 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -108,10 +108,11 @@ CUSTOM time layouts must be within quotes and be the representation of the
 "reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`
 See https://golang.org/pkg/time/#Parse for more details.
 
-Telegraf has many of its own
-[built-in patterns](./grok/patterns/influx-patterns),
-as well as supporting
+Telegraf has many of its own [built-in patterns](./grok/patterns/influx-patterns),
+as well as support for most of
 [logstash's builtin patterns](https://github.com/logstash-plugins/logstash-patterns-core/blob/master/patterns/grok-patterns).
+_Golang regular expressions do not support lookahead or lookbehind.
+logstash patterns that depend on these are not supported._
 
 If you need help building patterns to match your logs,
 you will find the https://grokdebug.herokuapp.com application quite useful!

From beeab2c50963f60c89deefdec409324cf0012352 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Apr 2018 16:56:44 -0700
Subject: [PATCH 1043/1302] Sort field names when running --test

---
 internal/models/running_input.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/models/running_input.go b/internal/models/running_input.go
index 9cf4f6136..ffe0b5f59 100644
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -77,6 +77,7 @@ func (r *RunningInput) MakeMetric(
 
 	if r.trace && m != nil {
 		s := influx.NewSerializer()
+		s.SetFieldSortOrder(influx.SortFields)
 		octets, err := s.Serialize(m)
 		if err == nil {
 			fmt.Print("> " + string(octets))

From caf860bc88cf58da7a2d03048d4b06e7828e5521 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Apr 2018 16:57:07 -0700
Subject: [PATCH 1044/1302] Don't print name of plugin or interval size during
 --test

---
 agent/agent.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index 2183ba42c..f5f23cd05 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -203,11 +203,6 @@ func (a *Agent) Test() error {
 		input.SetTrace(true)
 		input.SetDefaultTags(a.Config.Tags)
 
-		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name())
-		if input.Config.Interval != 0 {
-			fmt.Printf("* Internal: %s\n", input.Config.Interval)
-		}
-
 		if err := input.Input.Gather(acc); err != nil {
 			return err
 		}
@@ -217,7 +212,6 @@ func (a *Agent) Test() error {
 		switch input.Name() {
 		case "inputs.cpu", "inputs.mongodb", "inputs.procstat":
 			time.Sleep(500 * time.Millisecond)
-			fmt.Printf("* Plugin: %s, Collection 2\n", input.Name())
 			if err := input.Input.Gather(acc); err != nil {
 				return err
 			}

From a9afd2f030733bcb018b413de485cb98d149f310 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Apr 2018 16:29:42 -0700
Subject: [PATCH 1045/1302] Add config-directory documentation for Windows
 service

---
 cmd/telegraf/telegraf.go |  8 ++++----
 docs/WINDOWS_SERVICE.md  | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index e13683fc4..c02dce88b 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -365,7 +365,7 @@ func main() {
 			DisplayName: "Telegraf Data Collector Service",
 			Description: "Collects data using a series of plugins and publishes it to" +
 				"another series of plugins.",
-			Arguments: []string{"-config", "C:\\Program Files\\Telegraf\\telegraf.conf"},
+			Arguments: []string{"--config", "C:\\Program Files\\Telegraf\\telegraf.conf"},
 		}
 
 		prg := &program{
@@ -378,14 +378,14 @@ func main() {
 		if err != nil {
 			log.Fatal("E! " + err.Error())
 		}
-		// Handle the -service flag here to prevent any issues with tooling that
+		// Handle the --service flag here to prevent any issues with tooling that
 		// may not have an interactive session, e.g. installing from Ansible.
 		if *fService != "" {
 			if *fConfig != "" {
-				(*svcConfig).Arguments = []string{"-config", *fConfig}
+				(*svcConfig).Arguments = []string{"--config", *fConfig}
 			}
 			if *fConfigDirectory != "" {
-				(*svcConfig).Arguments = append((*svcConfig).Arguments, "-config-directory", *fConfigDirectory)
+				(*svcConfig).Arguments = append((*svcConfig).Arguments, "--config-directory", *fConfigDirectory)
 			}
 			err := service.Control(s, *fService)
 			if err != nil {
diff --git a/docs/WINDOWS_SERVICE.md b/docs/WINDOWS_SERVICE.md
index 2b4d4f0e2..886887d52 100644
--- a/docs/WINDOWS_SERVICE.md
+++ b/docs/WINDOWS_SERVICE.md
@@ -5,7 +5,7 @@ the general steps to set it up.
 
 1. Obtain the telegraf windows distribution
 2. Create the directory `C:\Program Files\Telegraf` (if you install in a different
-   location simply specify the `-config` parameter with the desired location)
+   location simply specify the `--config` parameter with the desired location)
 3. Place the telegraf.exe and the telegraf.conf config file into `C:\Program Files\Telegraf`
 4. To install the service into the Windows Service Manager, run the following in PowerShell as an administrator (If necessary, you can wrap any spaces in the file paths in double quotes ""):
 
@@ -26,6 +26,15 @@ the general steps to set it up.
    > net start telegraf
    ```
 
+## Config Directory
+
+You can also specify a `--config-directory` for the service to use:
+1. Create a directory for config snippets: `C:\Program Files\Telegraf\telegraf.d`
+2. Include the `--config-directory` option when registering the service:
+   ```
+   > C:\"Program Files"\Telegraf\telegraf.exe --service install --config C:\"Program Files"\Telegraf\telegraf.conf --config-directory C:\"Program Files"\Telegraf\telegraf.d
+   ```
+
 ## Other supported operations
 
 Telegraf can manage its own service through the --service flag:
@@ -37,7 +46,6 @@ Telegraf can manage its own service through the --service flag:
 | `telegraf.exe --service start`     | Start the telegraf service    |
 | `telegraf.exe --service stop`      | Stop the telegraf service     |
 
-
 Troubleshooting  common error #1067
 
 When installing as service in Windows, always double check to specify full path of the config file, otherwise windows service will fail to start

From 4551b4c5d20b3c93673b5991144b2e98b0b20a39 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 4 Apr 2018 18:35:05 -0700
Subject: [PATCH 1046/1302] Enable ntpq tests on Windows (#3972)

---
 Makefile                         | 1 +
 plugins/inputs/ntpq/ntpq_test.go | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8b10519a8..9ca4fc458 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ test-windows:
 	go test ./plugins/inputs/win_perf_counters/...
 	go test ./plugins/inputs/win_services/...
 	go test ./plugins/inputs/procstat/...
+	go test ./plugins/inputs/ntpq/...
 
 # vet runs the Go source code static analysis tool `vet` to find
 # any common errors.
diff --git a/plugins/inputs/ntpq/ntpq_test.go b/plugins/inputs/ntpq/ntpq_test.go
index 33277221d..47b8cf8f4 100644
--- a/plugins/inputs/ntpq/ntpq_test.go
+++ b/plugins/inputs/ntpq/ntpq_test.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 package ntpq
 
 import (

From 627f0e5d9d961205c6d7b5247c0d3e2aca4c7b7b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Apr 2018 19:00:28 -0700
Subject: [PATCH 1047/1302] Use automatic extension naming when running go
 build

---
 .gitignore | 1 +
 Makefile   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 66a7c7c0a..c584e6c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /build
 /telegraf
+/telegraf.exe
 /telegraf.gz
diff --git a/Makefile b/Makefile
index 9ca4fc458..d8a82050a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,6 @@ else
 PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
 endif
 
-TELEGRAF := telegraf$(shell go tool dist env | grep -q 'GOOS=.windows.' && echo .exe)
-
 LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
 ifdef VERSION
 	LDFLAGS += -X main.version=$(VERSION)
@@ -29,7 +27,7 @@ deps:
 	gdm restore
 
 telegraf:
-	go build -i -o $(TELEGRAF) -ldflags "$(LDFLAGS)" ./cmd/telegraf/telegraf.go
+	go build -i -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf

From c160b5622924b11aef68cf2402d10c06fb74ce1c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Apr 2018 21:53:20 -0700
Subject: [PATCH 1048/1302] Fix build.py next_version

---
 scripts/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.py b/scripts/build.py
index fbf3c8590..209ced781 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -95,7 +95,7 @@ supported_packages = {
     "freebsd": [ "tar" ]
 }
 
-next_version = '1.5.0'
+next_version = '1.7.0'
 
 ################
 #### Telegraf Functions

From bf915fa79c127e57044e490fe8b52f32babec2c4 Mon Sep 17 00:00:00 2001
From: Jeff Ashton <JeffAshton@users.noreply.github.com>
Date: Thu, 5 Apr 2018 13:50:32 -0400
Subject: [PATCH 1049/1302] Fix https in InfluxDB output (#3976)

---
 plugins/outputs/influxdb/http.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
index f32054f40..4f3d57e63 100644
--- a/plugins/outputs/influxdb/http.go
+++ b/plugins/outputs/influxdb/http.go
@@ -418,6 +418,7 @@ func makeWriteURL(loc *url.URL, db, rp, consistency string) string {
 		u.Host = "127.0.0.1"
 		u.Path = "/write"
 	case "http":
+	case "https":
 		u.Path = path.Join(u.Path, "write")
 	}
 	u.RawQuery = params.Encode()
@@ -432,6 +433,7 @@ func makeQueryURL(loc *url.URL) string {
 		u.Host = "127.0.0.1"
 		u.Path = "/query"
 	case "http":
+	case "https":
 		u.Path = path.Join(u.Path, "query")
 	}
 	return u.String()

From df78133bf3d20edaf20fb565559a0b4109b09779 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Apr 2018 11:08:31 -0700
Subject: [PATCH 1050/1302] Log error if scheme is unsupported

---
 plugins/outputs/influxdb/http.go      | 28 +++++++++++++++++----------
 plugins/outputs/influxdb/http_test.go | 14 +++++++++++---
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
index 4f3d57e63..164261feb 100644
--- a/plugins/outputs/influxdb/http.go
+++ b/plugins/outputs/influxdb/http.go
@@ -159,12 +159,18 @@ func NewHTTPClient(config *HTTPConfig) (*httpClient, error) {
 		serializer = influx.NewSerializer()
 	}
 
-	writeURL := makeWriteURL(
+	writeURL, err := makeWriteURL(
 		config.URL,
 		database,
 		config.RetentionPolicy,
 		config.Consistency)
-	queryURL := makeQueryURL(config.URL)
+	if err != nil {
+		return nil, err
+	}
+	queryURL, err := makeQueryURL(config.URL)
+	if err != nil {
+		return nil, err
+	}
 
 	var transport *http.Transport
 	switch config.URL.Scheme {
@@ -399,7 +405,7 @@ func (c *httpClient) addHeaders(req *http.Request) {
 	}
 }
 
-func makeWriteURL(loc *url.URL, db, rp, consistency string) string {
+func makeWriteURL(loc *url.URL, db, rp, consistency string) (string, error) {
 	params := url.Values{}
 	params.Set("db", db)
 
@@ -417,24 +423,26 @@ func makeWriteURL(loc *url.URL, db, rp, consistency string) string {
 		u.Scheme = "http"
 		u.Host = "127.0.0.1"
 		u.Path = "/write"
-	case "http":
-	case "https":
+	case "http", "https":
 		u.Path = path.Join(u.Path, "write")
+	default:
+		return "", fmt.Errorf("unsupported scheme: %q", loc.Scheme)
 	}
 	u.RawQuery = params.Encode()
-	return u.String()
+	return u.String(), nil
 }
 
-func makeQueryURL(loc *url.URL) string {
+func makeQueryURL(loc *url.URL) (string, error) {
 	u := *loc
 	switch u.Scheme {
 	case "unix":
 		u.Scheme = "http"
 		u.Host = "127.0.0.1"
 		u.Path = "/query"
-	case "http":
-	case "https":
+	case "http", "https":
 		u.Path = path.Join(u.Path, "query")
+	default:
+		return "", fmt.Errorf("unsupported scheme: %q", loc.Scheme)
 	}
-	return u.String()
+	return u.String(), nil
 }
diff --git a/plugins/outputs/influxdb/http_test.go b/plugins/outputs/influxdb/http_test.go
index e84957fcf..30cc1f8b6 100644
--- a/plugins/outputs/influxdb/http_test.go
+++ b/plugins/outputs/influxdb/http_test.go
@@ -46,6 +46,17 @@ func TestHTTP_MinimalConfig(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestHTTP_UnsupportedScheme(t *testing.T) {
+	config := &influxdb.HTTPConfig{
+		URL: &url.URL{
+			Scheme: "foo",
+			Host:   "localhost",
+		},
+	}
+	_, err := influxdb.NewHTTPClient(config)
+	require.Error(t, err)
+}
+
 func TestHTTP_CreateDatabase(t *testing.T) {
 	ts := httptest.NewServer(http.NotFoundHandler())
 	defer ts.Close()
@@ -576,9 +587,6 @@ func TestHTTP_UnixSocket(t *testing.T) {
 	ts.Start()
 	defer ts.Close()
 
-	x, _ := url.Parse("unix://" + sock)
-	fmt.Println(x)
-
 	successResponse := []byte(`{"results": [{"statement_id": 0}]}`)
 
 	tests := []struct {

From efdf36746c481c264bf55be6829dd8460cee52e4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 5 Apr 2018 11:15:20 -0700
Subject: [PATCH 1051/1302] Update gosnmp revision (#3973)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 495a77d47..7c504a0b8 100644
--- a/Godeps
+++ b/Godeps
@@ -70,7 +70,7 @@ github.com/shirou/gopsutil fc04d2dd9a512906a2604242b35275179e250eda
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15
+github.com/soniah/gosnmp f15472a4cd6f6ea7929e4c7d9f163c49f059924f
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
 github.com/stretchr/objx facf9a85c22f48d2f52f2380e4efce1768749a89

From 252101b7c6f340347e7d25dd5b1c24534e4c24fe Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 5 Apr 2018 11:19:01 -0700
Subject: [PATCH 1052/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a7c1274a..29db21b0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,7 @@
 - [#3648](https://github.com/influxdata/telegraf/issues/3648): Fix InfluxDB output not able to reconnect when server address changes.
 - [#3957](https://github.com/influxdata/telegraf/issues/3957): Fix parsing of dos line endings in the smart input.
 - [#3754](https://github.com/influxdata/telegraf/issues/3754): Fix precision truncation when no timestamp included.
+- [#3655](https://github.com/influxdata/telegraf/issues/3655): Fix SNMPv3 connection with Cisco ASA 5515 in snmp input.
 
 ## v1.5.3 [2018-03-14]
 

From 7177e0473f93732efde9b50542b19f6ccf057f51 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 5 Apr 2018 16:38:41 -0700
Subject: [PATCH 1053/1302] Fix conversion of unsigned ints in prometheus
 output (#3978)

---
 .../prometheus_client/prometheus_client.go    |  6 ++++++
 .../prometheus_client_test.go                 | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 5b416b72e..b82c72cf0 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -352,6 +352,8 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 				switch fv := fv.(type) {
 				case int64:
 					value = float64(fv)
+				case uint64:
+					value = float64(fv)
 				case float64:
 					value = fv
 				default:
@@ -391,6 +393,8 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 				switch fv := fv.(type) {
 				case int64:
 					value = float64(fv)
+				case uint64:
+					value = float64(fv)
 				case float64:
 					value = fv
 				default:
@@ -427,6 +431,8 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 				switch fv := fv.(type) {
 				case int64:
 					value = float64(fv)
+				case uint64:
+					value = float64(fv)
 				case float64:
 					value = fv
 				default:
diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
index 05bd5264a..bd2398a23 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -151,6 +151,16 @@ func TestWrite_Counters(t *testing.T) {
 			metricName: "foo_other",
 			valueType:  telegraf.Counter,
 		},
+		{
+			name: "uint64 fields are output",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"value": uint64(42)},
+				valueType:   telegraf.Counter,
+			},
+			metricName: "foo",
+			valueType:  telegraf.Counter,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -239,6 +249,16 @@ func TestWrite_Gauge(t *testing.T) {
 			metricName: "foo_other",
 			valueType:  telegraf.Gauge,
 		},
+		{
+			name: "uint64 fields are output",
+			args: args{
+				measurement: "foo",
+				fields:      map[string]interface{}{"value": uint64(42)},
+				valueType:   telegraf.Counter,
+			},
+			metricName: "foo",
+			valueType:  telegraf.Counter,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

From 00203fa889d217dc5e9015a154eb81c2e1694bba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 6 Apr 2018 13:17:24 -0700
Subject: [PATCH 1054/1302] Export all vars defined in /etc/default/telegraf
 (#3981)

This keeps the format of this file the same between systemd and
sysvinit.
---
 scripts/init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/init.sh b/scripts/init.sh
index e05fd79ee..668dc549e 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -34,7 +34,9 @@ fi
 DEFAULT=/etc/default/telegraf
 
 if [ -r $DEFAULT ]; then
+    set -o allexport
     source $DEFAULT
+    set +o allexport
 fi
 
 if [ -z "$STDOUT" ]; then

From 43a044542e2d7595b03ce195ca955604b1d149d0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 6 Apr 2018 13:19:02 -0700
Subject: [PATCH 1055/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29db21b0d..cce40fd35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,6 +106,7 @@
 - [#3957](https://github.com/influxdata/telegraf/issues/3957): Fix parsing of dos line endings in the smart input.
 - [#3754](https://github.com/influxdata/telegraf/issues/3754): Fix precision truncation when no timestamp included.
 - [#3655](https://github.com/influxdata/telegraf/issues/3655): Fix SNMPv3 connection with Cisco ASA 5515 in snmp input.
+- [#3981](https://github.com/influxdata/telegraf/pull/3981): Export all vars defined in /etc/default/telegraf.
 
 ## v1.5.3 [2018-03-14]
 

From ff40da6019a2094facb3cde74a401a4aaa8edb2a Mon Sep 17 00:00:00 2001
From: Mark Wilkinson - m82labs <mark@m82labs.com>
Date: Fri, 6 Apr 2018 17:58:33 -0400
Subject: [PATCH 1056/1302] Use explicit casts to avoid datatype issues (#3980)

---
 plugins/inputs/sqlserver/sqlserver.go | 216 +++++++++++++-------------
 1 file changed, 106 insertions(+), 110 deletions(-)

diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go
index 5196cc33c..41a8b7ec7 100644
--- a/plugins/inputs/sqlserver/sqlserver.go
+++ b/plugins/inputs/sqlserver/sqlserver.go
@@ -397,9 +397,7 @@ CROSS APPLY (
 OPTION( RECOMPILE );
 `
 
-const sqlPerformanceCountersV2 string = `DECLARE @DynamicPerf NVARCHAR(MAX) = ''
-
-SET @DynamicPerf += REPLACE('
+const sqlPerformanceCountersV2 string = `
 DECLARE @PCounters TABLE
 (
 	object_name nvarchar(128),
@@ -409,140 +407,120 @@ DECLARE @PCounters TABLE
 	cntr_type INT,
 	Primary Key(object_name, counter_name, instance_name)
 );
-
 INSERT	INTO @PCounters
 SELECT	DISTINCT
 		RTrim(spi.object_name) object_name,
 		RTrim(spi.counter_name) counter_name,
 		RTrim(spi.instance_name) instance_name,
-		spi.cntr_value,
+		CAST(spi.cntr_value AS BIGINT) AS cntr_value,
 		spi.cntr_type
 FROM	sys.dm_os_performance_counters AS spi
 WHERE	(
 		counter_name IN (
-			"SQL Compilations/sec",
-			"SQL Re-Compilations/sec",
-			"User Connections",
-			"Batch Requests/sec",
-			"Logouts/sec",
-			"Logins/sec",
-			"Processes blocked",
-			"Latch Waits/sec",
-			"Full Scans/sec",
-			"Index Searches/sec",
-			"Page Splits/sec",
-			"Page Lookups/sec",
-			"Page Reads/sec",
-			"Page Writes/sec",
-			"Readahead Pages/sec",
-			"Lazy Writes/sec",
-			"Checkpoint Pages/sec",
-			"Page life expectancy",
-			"Log File(s) Size (KB)",
-			"Log File(s) Used Size (KB)",
-			"Data File(s) Size (KB)",
-			"Transactions/sec",
-			"Write Transactions/sec",
-			"Active Temp Tables",
-			"Temp Tables Creation Rate",
-			"Temp Tables For Destruction",
-			"Free Space in tempdb (KB)",
-			"Version Store Size (KB)",
-			"Memory Grants Pending",
-			"Free list stalls/sec",
-			"Buffer cache hit ratio",
-			"Buffer cache hit ratio base",
-			"Backup/Restore Throughput/sec",
-			"Total Server Memory (KB)",
-			"Target Server Memory (KB)"
+			'SQL Compilations/sec',
+			'SQL Re-Compilations/sec',
+			'User Connections',
+			'Batch Requests/sec',
+			'Logouts/sec',
+			'Logins/sec',
+			'Processes blocked',
+			'Latch Waits/sec',
+			'Full Scans/sec',
+			'Index Searches/sec',
+			'Page Splits/sec',
+			'Page Lookups/sec',
+			'Page Reads/sec',
+			'Page Writes/sec',
+			'Readahead Pages/sec',
+			'Lazy Writes/sec',
+			'Checkpoint Pages/sec',
+			'Page life expectancy',
+			'Log File(s) Size (KB)',
+			'Log File(s) Used Size (KB)',
+			'Data File(s) Size (KB)',
+			'Transactions/sec',
+			'Write Transactions/sec',
+			'Active Temp Tables',
+			'Temp Tables Creation Rate',
+			'Temp Tables For Destruction',
+			'Free Space in tempdb (KB)',
+			'Version Store Size (KB)',
+			'Memory Grants Pending',
+			'Free list stalls/sec',
+			'Buffer cache hit ratio',
+			'Buffer cache hit ratio base',
+			'Backup/Restore Throughput/sec',
+			'Total Server Memory (KB)',
+			'Target Server Memory (KB)'
 		)
 		) OR (
-			instance_name IN ("_Total","Column store object pool")
+			instance_name IN ('_Total','Column store object pool')
 			AND counter_name IN (
-				"Log Flushes/sec",
-				"Log Flush Wait Time",
-				"Lock Timeouts/sec",
-				"Number of Deadlocks/sec",
-				"Lock Waits/sec",
-				"Latch Waits/sec",
-				"Memory broker clerk size",
-				"Log Bytes Flushed/sec",
-				"Bytes Sent to Replica/sec",
-				"Log Send Queue",
-				"Bytes Sent to Transport/sec",
-				"Sends to Replica/sec",
-				"Bytes Sent to Transport/sec",
-				"Sends to Transport/sec",
-				"Bytes Received from Replica/sec",
-				"Receives from Replica/sec",
-				"Flow Control Time (ms/sec)",
-				"Flow Control/sec",
-				"Resent Messages/sec",
-				"Redone Bytes/sec",
-				"XTP Memory Used (KB)"
+				'Log Flushes/sec',
+				'Log Flush Wait Time',
+				'Lock Timeouts/sec',
+				'Number of Deadlocks/sec',
+				'Lock Waits/sec',
+				'Latch Waits/sec',
+				'Memory broker clerk size',
+				'Log Bytes Flushed/sec',
+				'Bytes Sent to Replica/sec',
+				'Log Send Queue',
+				'Bytes Sent to Transport/sec',
+				'Sends to Replica/sec',
+				'Bytes Sent to Transport/sec',
+				'Sends to Transport/sec',
+				'Bytes Received from Replica/sec',
+				'Receives from Replica/sec',
+				'Flow Control Time (ms/sec)',
+				'Flow Control/sec',
+				'Resent Messages/sec',
+				'Redone Bytes/sec',
+				'XTP Memory Used (KB)'
 			) OR ( 
 				counter_name IN (
-					"Log Bytes Received/sec",
-					"Log Apply Pending Queue",
-					"Redone Bytes/sec",
-					"Recovery Queue",
-					"Log Apply Ready Queue"
+					'Log Bytes Received/sec',
+					'Log Apply Pending Queue',
+					'Redone Bytes/sec',
+					'Recovery Queue',
+					'Log Apply Ready Queue'
 				)
-				AND instance_name = "_Total"
+				AND instance_name = '_Total'
 			)
 		) OR (
-			counter_name IN ("Transaction Delay")
+			counter_name IN ('Transaction Delay')
 		) OR (
 			counter_name IN (
-				"CPU usage %",
-				"CPU usage % base",
-				"Queued requests",
-				"Requests completed/sec",
-				"Blocked tasks"
+				'CPU usage %',
+				'CPU usage % base',
+				'Queued requests',
+				'Requests completed/sec',
+				'Blocked tasks'
 			)
 		) OR (
 			counter_name IN (
-				"Active memory grant amount (KB)",
-				"Disk Read Bytes/sec",
-				"Disk Read IO Throttled/sec",
-				"Disk Read IO/sec",
-				"Disk Write Bytes/sec",
-				"Disk Write IO Throttled/sec",
-				"Disk Write IO/sec",
-				"Used memory (KB)"
+				'Active memory grant amount (KB)',
+				'Disk Read Bytes/sec',
+				'Disk Read IO Throttled/sec',
+				'Disk Read IO/sec',
+				'Disk Write Bytes/sec',
+				'Disk Write IO Throttled/sec',
+				'Disk Write IO/sec',
+				'Used memory (KB)'
 			)
 		) OR  (
-			object_name LIKE "%User Settable%"
-			OR object_name LIKE "%SQL Errors%"
+			object_name LIKE '%User Settable%'
+			OR object_name LIKE '%SQL Errors%'
 		)
-'
-,'"','''')
 
-SET @DynamicPerf += REPLACE('
-SELECT	"sqlserver_performance" AS [measurement],
-		REPLACE(@@SERVERNAME,"\",":") AS [sql_instance],
-		pc.object_name AS [object],
-		pc.counter_name AS [counter],
-		CASE pc.instance_name WHEN "_Total" THEN "Total" ELSE ISNULL(pc.instance_name,"") END AS [instance],
-		CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS [value]
-FROM	@PCounters AS pc
-		LEFT OUTER JOIN @PCounters AS pc1
-			ON (
-				pc.counter_name = REPLACE(pc1.counter_name," base","")
-				OR pc.counter_name = REPLACE(pc1.counter_name," base"," (ms)")
-			)
-			AND pc.object_name = pc1.object_name
-			AND pc.instance_name = pc1.instance_name
-			AND pc1.counter_name LIKE "%base"
-WHERE	pc.counter_name NOT LIKE "% base"
-UNION ALL
+DECLARE @SQL NVARCHAR(MAX)
+SET  @SQL = REPLACE('
 SELECT
-"sqlserver_performance" As [measurement],
-REPLACE(@@SERVERNAME,"\",":") AS [sql_instance],
 "SQLServer:Workload Group Stats" AS object,
 counter,
 instance,
-vs.value
+CAST(vs.value AS BIGINT) AS value,
+1
 FROM
 (
     SELECT 
@@ -561,11 +539,29 @@ FROM
 ) AS rg
 UNPIVOT (
     value FOR counter IN ( [Request Count], [Queued Request Count], [CPU Limit Violation Count], [CPU Usage (time)], ' + CASE WHEN SERVERPROPERTY('ProductMajorVersion') > 10 THEN '[Premptive CPU Usage (time)], ' ELSE '' END + '[Lock Wait Count], [Lock Wait Time], [Reduced Memory Grant Count] )
-) AS vs
-OPTION(RECOMPILE);'
+) AS vs'
 ,'"','''')
 
-EXEC(@DynamicPerf)
+INSERT INTO @PCounters
+EXEC( @SQL )
+
+SELECT	'sqlserver_performance' AS [measurement],
+		REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
+		pc.object_name AS [object],
+		pc.counter_name AS [counter],
+		CASE pc.instance_name WHEN '_Total' THEN 'Total' ELSE ISNULL(pc.instance_name,'') END AS [instance],
+		CAST(CASE WHEN pc.cntr_type = 537003264 AND pc1.cntr_value > 0 THEN (pc.cntr_value * 1.0) / (pc1.cntr_value * 1.0) * 100 ELSE pc.cntr_value END AS float(10)) AS [value]
+FROM	@PCounters AS pc
+		LEFT OUTER JOIN @PCounters AS pc1
+			ON (
+				pc.counter_name = REPLACE(pc1.counter_name,' base','')
+				OR pc.counter_name = REPLACE(pc1.counter_name,' base',' (ms)')
+			)
+			AND pc.object_name = pc1.object_name
+			AND pc.instance_name = pc1.instance_name
+			AND pc1.counter_name LIKE '%base'
+WHERE	pc.counter_name NOT LIKE '% base'
+OPTION(RECOMPILE);
 `
 
 const sqlWaitStatsCategorizedV2 string = `SELECT

From fb6390e7ab6a3f66ec0d2fdaef408391f7dc50f0 Mon Sep 17 00:00:00 2001
From: alekseyp <aleksey.potaneyko@gmail.com>
Date: Fri, 6 Apr 2018 19:20:36 -0400
Subject: [PATCH 1057/1302] Fix typo in phpfpm README (#3985)

---
 plugins/inputs/phpfpm/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/phpfpm/README.md b/plugins/inputs/phpfpm/README.md
index aed41ada6..531edae24 100644
--- a/plugins/inputs/phpfpm/README.md
+++ b/plugins/inputs/phpfpm/README.md
@@ -24,7 +24,7 @@ Get phpfpm stats using either HTTP status page or fpm socket.
   ##       "fcgi://10.0.0.12:9000/status"
   ##       "cgi://10.0.10.12:9001/status"
   ##
-  ## Example of multiple gathering from local socket and remove host
+  ## Example of multiple gathering from local socket and remote host
   ## urls = ["http://192.168.1.20/status", "/tmp/fpm.sock"]
   urls = ["http://localhost/status"]
 ```

From 01ede2ea0b1c92463adfd5dd0877beed875ac25d Mon Sep 17 00:00:00 2001
From: Matvey Kruglov <kubuzzzz@gmail.com>
Date: Sat, 7 Apr 2018 02:34:47 +0300
Subject: [PATCH 1058/1302] Add repl_oplog_window_s metric to mongodb input
 (#3964)

---
 plugins/inputs/mongodb/README.md            |  1 +
 plugins/inputs/mongodb/mongodb_data.go      |  1 +
 plugins/inputs/mongodb/mongodb_data_test.go |  1 +
 plugins/inputs/mongodb/mongodb_server.go    | 38 +++++++++++++++++++++
 plugins/inputs/mongodb/mongostat.go         |  8 +++++
 5 files changed, 49 insertions(+)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 5ddf4e2b2..4dce129c9 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -56,6 +56,7 @@ and create a single measurement containing values e.g.
  * ttl_deletes_per_sec
  * ttl_passes_per_sec
  * repl_lag
+ * repl_oplog_window_s
  * jumbo_chunks (only if mongos or mongo config)
 
 If gather_db_stats is set to true, it will also collect per database stats exposed by db.stats()
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 5114e0ad7..2c45f7ea2 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -60,6 +60,7 @@ var DefaultReplStats = map[string]string{
 	"member_status":         "NodeType",
 	"state":                 "NodeState",
 	"repl_lag":              "ReplLag",
+	"repl_oplog_window_s":   "OplogTimeDiff",
 }
 
 var DefaultClusterStats = map[string]string{
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 9a12be6a5..e51b4e404 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -162,6 +162,7 @@ func TestStateTag(t *testing.T) {
 		"repl_queries_per_sec":  int64(0),
 		"repl_updates_per_sec":  int64(0),
 		"repl_lag":              int64(0),
+		"repl_oplog_window_s":   int64(0),
 		"resident_megabytes":    int64(0),
 		"updates_per_sec":       int64(0),
 		"vsize_megabytes":       int64(0),
diff --git a/plugins/inputs/mongodb/mongodb_server.go b/plugins/inputs/mongodb/mongodb_server.go
index 51eb48a71..d85d41746 100644
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -22,6 +22,41 @@ func (s *Server) getDefaultTags() map[string]string {
 	return tags
 }
 
+type oplogEntry struct {
+	Timestamp bson.MongoTimestamp `bson:"ts"`
+}
+
+func (s *Server) gatherOplogStats() *OplogStats {
+	stats := &OplogStats{}
+	localdb := s.Session.DB("local")
+
+	op_first := oplogEntry{}
+	op_last := oplogEntry{}
+	query := bson.M{"ts": bson.M{"$exists": true}}
+
+	for _, collection_name := range []string{"oplog.rs", "oplog.$main"} {
+		if err := localdb.C(collection_name).Find(query).Sort("$natural").Limit(1).One(&op_first); err != nil {
+			if err == mgo.ErrNotFound {
+				continue
+			}
+			log.Println("E! Error getting first oplog entry (" + err.Error() + ")")
+			return stats
+		}
+		if err := localdb.C(collection_name).Find(query).Sort("-$natural").Limit(1).One(&op_last); err != nil {
+			if err == mgo.ErrNotFound {
+				continue
+			}
+			log.Println("E! Error getting last oplog entry (" + err.Error() + ")")
+			return stats
+		}
+	}
+
+	op_first_time := time.Unix(int64(op_first.Timestamp>>32), 0)
+	op_last_time := time.Unix(int64(op_last.Timestamp>>32), 0)
+	stats.TimeDiff = int64(op_last_time.Sub(op_first_time).Seconds())
+	return stats
+}
+
 func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error {
 	s.Session.SetMode(mgo.Eventual, true)
 	s.Session.SetSocketTimeout(0)
@@ -66,6 +101,8 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		log.Println("E! Error getting database shard stats (" + err.Error() + ")")
 	}
 
+	oplogStats := s.gatherOplogStats()
+
 	result_db_stats := &DbStats{}
 	if gatherDbStats == true {
 		names := []string{}
@@ -99,6 +136,7 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		ClusterStatus: result_cluster,
 		DbStats:       result_db_stats,
 		ShardStats:    resultShards,
+		OplogStats:    oplogStats,
 	}
 
 	defer func() {
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index daf5a4504..76b2b50d5 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -35,6 +35,7 @@ type MongoStatus struct {
 	ClusterStatus *ClusterStatus
 	DbStats       *DbStats
 	ShardStats    *ShardStats
+	OplogStats    *OplogStats
 }
 
 type ServerStatus struct {
@@ -102,6 +103,11 @@ type ReplSetStatus struct {
 	MyState int64           `bson:"myState"`
 }
 
+// OplogStatus stores information from getReplicationInfo
+type OplogStats struct {
+	TimeDiff int64
+}
+
 // ReplSetMember stores information related to a replica set member
 type ReplSetMember struct {
 	Name       string    `bson:"name"`
@@ -442,6 +448,7 @@ type StatLine struct {
 	// Replicated Opcounter fields
 	InsertR, QueryR, UpdateR, DeleteR, GetMoreR, CommandR int64
 	ReplLag                                               int64
+	OplogTimeDiff                                         int64
 	Flushes                                               int64
 	Mapped, Virtual, Resident, NonMapped                  int64
 	Faults                                                int64
@@ -772,6 +779,7 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 
 	newClusterStat := *newMongo.ClusterStatus
 	returnVal.JumboChunksCount = newClusterStat.JumboChunksCount
+	returnVal.OplogTimeDiff = newMongo.OplogStats.TimeDiff
 
 	newDbStats := *newMongo.DbStats
 	for _, db := range newDbStats.Dbs {

From fe31ce9d7dee5ac0f8f3a9514b95b14ce7e50a61 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 3 Apr 2018 16:58:56 -0700
Subject: [PATCH 1059/1302] Modernize mongodb docs

---
 plugins/inputs/mongodb/README.md  | 92 ++++++++++++++++++++++++++-----
 plugins/inputs/mongodb/mongodb.go |  4 +-
 2 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 4dce129c9..2bbf6ebfa 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -1,6 +1,6 @@
-# Telegraf plugin: MongoDB
+# MongoDB Input Plugin
 
-#### Configuration
+### Configuration:
 
 ```toml
 [[inputs.mongodb]]
@@ -10,7 +10,9 @@
   ##   mongodb://user:auth_key@10.10.3.30:27017,
   ##   mongodb://10.10.3.33:18832,
   servers = ["mongodb://127.0.0.1:27017"]
-  gather_perdb_stats = false
+
+  ## When true, collect per database stats
+  # gather_perdb_stats = false
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -27,7 +29,58 @@ command the you will get this error on telegraf
 Error in input [mongodb]: not authorized on admin to execute command { serverStatus: 1, recordStats: 0 }
 ```
 
-#### Description
+### Metrics:
+
+- mongodb
+  - tags:
+    - hostname
+  - fields:
+    - active_reads (integer)
+    - active_writes (integer)
+    - commands_per_sec (integer)
+    - deletes_per_sec (integer)
+    - flushes_per_sec (integer)
+    - getmores_per_sec (integer)
+    - inserts_per_sec (integer)
+    - jumbo_chunks (integer)
+    - member_status (string)
+    - net_in_bytes (integer)
+    - net_out_bytes (integer)
+    - open_connections (integer)
+    - percent_cache_dirty (float)
+    - percent_cache_used (float)
+    - queries_per_sec (integer)
+    - queued_reads (integer)
+    - queued_writes (integer)
+    - repl_commands_per_sec (integer)
+    - repl_deletes_per_sec (integer)
+    - repl_getmores_per_sec (integer)
+    - repl_inserts_per_sec (integer)
+    - repl_lag (integer)
+    - repl_queries_per_sec (integer)
+    - repl_updates_per_sec (integer)
+    - resident_megabytes (integer)
+    - state (string)
+    - total_available (integer)
+    - total_created (integer)
+    - total_in_use (integer)
+    - total_refreshing (integer)
+    - ttl_deletes_per_sec (integer)
+    - ttl_passes_per_sec (integer)
+    - updates_per_sec (integer)
+    - vsize_megabytes (integer)
+    - wtcache_app_threads_page_read_count (integer)
+    - wtcache_app_threads_page_read_time (integer)
+    - wtcache_app_threads_page_write_count (integer)
+    - wtcache_bytes_read_into (integer)
+    - wtcache_bytes_written_from (integer)
+    - wtcache_current_bytes (integer)
+    - wtcache_max_bytes_configured (integer)
+    - wtcache_pages_evicted_by_app_thread (integer)
+    - wtcache_pages_queued_for_eviction (integer)
+    - wtcache_server_evicting_pages (integer)
+    - wtcache_tracked_dirty_bytes (integer)
+    - wtcache_worker_thread_evictingpages (integer)
 
 The telegraf plugin collects mongodb stats exposed by serverStatus and few more
 and create a single measurement containing values e.g.
@@ -58,15 +111,24 @@ and create a single measurement containing values e.g.
  * repl_lag
  * repl_oplog_window_s
  * jumbo_chunks (only if mongos or mongo config)
+- mongodb_db_stats
+  - tags:
+    - db_name
+    - hostname
+  - fields:
+    - avg_obj_size (float)
+    - collections (integer)
+    - data_size (integer)
+    - index_size (integer)
+    - indexes (integer)
+    - num_extents (integer)
+    - objects (integer)
+    - ok (integer)
+    - storage_size (integer)
+    - type (string)
 
-If gather_db_stats is set to true, it will also collect per database stats exposed by db.stats()
-creating another measurement called mongodb_db_stats and containing values:
- * collections
- * objects
- * avg_obj_size
- * data_size
- * storage_size
- * num_extents
- * indexes
- * index_size
- * ok
+### Example Output:
+```
+mongodb,hostname=127.0.0.1:27017 active_reads=0i,active_writes=0i,commands_per_sec=6i,deletes_per_sec=0i,flushes_per_sec=0i,getmores_per_sec=1i,inserts_per_sec=0i,jumbo_chunks=0i,member_status="PRI",net_in_bytes=851i,net_out_bytes=23904i,open_connections=6i,percent_cache_dirty=0,percent_cache_used=0,queries_per_sec=2i,queued_reads=0i,queued_writes=0i,repl_commands_per_sec=0i,repl_deletes_per_sec=0i,repl_getmores_per_sec=0i,repl_inserts_per_sec=0i,repl_lag=0i,repl_queries_per_sec=0i,repl_updates_per_sec=0i,resident_megabytes=67i,state="PRIMARY",total_available=0i,total_created=0i,total_in_use=0i,total_refreshing=0i,ttl_deletes_per_sec=0i,ttl_passes_per_sec=0i,updates_per_sec=0i,vsize_megabytes=729i,wtcache_app_threads_page_read_count=4i,wtcache_app_threads_page_read_time=18i,wtcache_app_threads_page_write_count=6i,wtcache_bytes_read_into=10075i,wtcache_bytes_written_from=115711i,wtcache_current_bytes=86038i,wtcache_max_bytes_configured=1073741824i,wtcache_pages_evicted_by_app_thread=0i,wtcache_pages_queued_for_eviction=0i,wtcache_server_evicting_pages=0i,wtcache_tracked_dirty_bytes=0i,wtcache_worker_thread_evictingpages=0i 1522798796000000000
+mongodb_db_stats,db_name=local,hostname=127.0.0.1:27017 avg_obj_size=818.625,collections=5i,data_size=6549i,index_size=86016i,indexes=4i,num_extents=0i,objects=8i,ok=1i,storage_size=118784i,type="db_stat" 1522799074000000000
+```
diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index 8db9451b0..d53166479 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -45,7 +45,9 @@ var sampleConfig = `
   ##   mongodb://user:auth_key@10.10.3.30:27017,
   ##   mongodb://10.10.3.33:18832,
   servers = ["mongodb://127.0.0.1:27017"]
-  gather_perdb_stats = false
+
+  ## When true, collect per database stats
+  # gather_perdb_stats = false
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"

From caac2242762f53375a47920d6267475a078b04f3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Apr 2018 10:35:32 -0700
Subject: [PATCH 1060/1302] Add details about MongoDB permissions

---
 plugins/inputs/mongodb/README.md | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 2bbf6ebfa..c4c308f2f 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -21,10 +21,20 @@
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
 ```
-This connection uri may be different based on your environment and mongodb
-setup. If the user doesn't have the required privilege to execute serverStatus
-command the you will get this error on telegraf
 
+#### Permissions:
+
+If your MongoDB instance has access control enabled you will need to connect
+as a user with sufficient rights.
+
+With MongoDB 3.4 and higher, the `clusterMonitor` role can be used.  In
+version 3.2 you may also need these additional permissions:
+```
+> db.grantRolesToUser("user", [{role: "read", actions: "find", db: "local"}])
+```
+
+If the user is missing required privileges you may see an error in the
+Telegraf logs similar to:
 ```
 Error in input [mongodb]: not authorized on admin to execute command { serverStatus: 1, recordStats: 0 }
 ```

From a28de4b5cd7b6597a1b644a8b21f0b1d33515bba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 6 Apr 2018 16:45:07 -0700
Subject: [PATCH 1061/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cce40fd35..8d6ecd97e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.7 [unreleased]
+### Features
+
+- [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_s metric to mongodb input.
+
 ## v1.6 [unreleased]
 
 ### Release Notes

From e4f8a82ee6b20fc612e464a611b55ea9b00276cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 9 Apr 2018 15:29:52 -0700
Subject: [PATCH 1062/1302] Fix newline escaping in line protocol (#3992)

---
 plugins/parsers/influx/machine.go         | 10300 ++++++++++----------
 plugins/parsers/influx/machine.go.rl      |     4 +-
 plugins/parsers/influx/machine_test.go    |    16 +
 plugins/serializers/influx/escape.go      |    22 +-
 plugins/serializers/influx/influx_test.go |    44 +
 5 files changed, 5302 insertions(+), 5084 deletions(-)

diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
index 292fada28..b4fd170a1 100644
--- a/plugins/parsers/influx/machine.go
+++ b/plugins/parsers/influx/machine.go
@@ -325,10 +325,10 @@ _again:
 		goto st249
 	case 250:
 		goto st250
-	case 251:
-		goto st251
 	case 44:
 		goto st44
+	case 251:
+		goto st251
 	case 252:
 		goto st252
 	case 253:
@@ -367,16 +367,14 @@ _again:
 		goto st269
 	case 270:
 		goto st270
-	case 271:
-		goto st271
 	case 45:
 		goto st45
 	case 46:
 		goto st46
 	case 47:
 		goto st47
-	case 272:
-		goto st272
+	case 271:
+		goto st271
 	case 48:
 		goto st48
 	case 49:
@@ -385,16 +383,18 @@ _again:
 		goto st50
 	case 51:
 		goto st51
+	case 272:
+		goto st272
 	case 273:
 		goto st273
-	case 274:
-		goto st274
 	case 52:
 		goto st52
-	case 275:
-		goto st275
+	case 274:
+		goto st274
 	case 53:
 		goto st53
+	case 275:
+		goto st275
 	case 276:
 		goto st276
 	case 277:
@@ -407,44 +407,44 @@ _again:
 		goto st280
 	case 281:
 		goto st281
-	case 282:
-		goto st282
 	case 54:
 		goto st54
 	case 55:
 		goto st55
 	case 56:
 		goto st56
-	case 283:
-		goto st283
+	case 282:
+		goto st282
 	case 57:
 		goto st57
 	case 58:
 		goto st58
 	case 59:
 		goto st59
-	case 284:
-		goto st284
+	case 283:
+		goto st283
 	case 60:
 		goto st60
 	case 61:
 		goto st61
+	case 284:
+		goto st284
 	case 285:
 		goto st285
-	case 286:
-		goto st286
 	case 62:
 		goto st62
 	case 63:
 		goto st63
+	case 286:
+		goto st286
 	case 287:
 		goto st287
-	case 288:
-		goto st288
 	case 64:
 		goto st64
 	case 65:
 		goto st65
+	case 288:
+		goto st288
 	case 289:
 		goto st289
 	case 290:
@@ -457,32 +457,30 @@ _again:
 		goto st293
 	case 294:
 		goto st294
-	case 295:
-		goto st295
 	case 66:
 		goto st66
 	case 67:
 		goto st67
 	case 68:
 		goto st68
-	case 296:
-		goto st296
+	case 295:
+		goto st295
 	case 69:
 		goto st69
 	case 70:
 		goto st70
 	case 71:
 		goto st71
-	case 297:
-		goto st297
+	case 296:
+		goto st296
 	case 72:
 		goto st72
 	case 73:
 		goto st73
+	case 297:
+		goto st297
 	case 298:
 		goto st298
-	case 299:
-		goto st299
 	case 74:
 		goto st74
 	case 75:
@@ -495,26 +493,28 @@ _again:
 		goto st78
 	case 79:
 		goto st79
+	case 299:
+		goto st299
 	case 300:
 		goto st300
 	case 301:
 		goto st301
 	case 302:
 		goto st302
-	case 303:
-		goto st303
 	case 80:
 		goto st80
+	case 303:
+		goto st303
 	case 304:
 		goto st304
 	case 305:
 		goto st305
 	case 306:
 		goto st306
-	case 307:
-		goto st307
 	case 81:
 		goto st81
+	case 307:
+		goto st307
 	case 308:
 		goto st308
 	case 309:
@@ -549,8 +549,6 @@ _again:
 		goto st323
 	case 324:
 		goto st324
-	case 325:
-		goto st325
 	case 82:
 		goto st82
 	case 83:
@@ -577,12 +575,14 @@ _again:
 		goto st93
 	case 94:
 		goto st94
+	case 325:
+		goto st325
 	case 326:
 		goto st326
-	case 327:
-		goto st327
 	case 95:
 		goto st95
+	case 327:
+		goto st327
 	case 328:
 		goto st328
 	case 329:
@@ -621,18 +621,18 @@ _again:
 		goto st345
 	case 346:
 		goto st346
-	case 347:
-		goto st347
 	case 96:
 		goto st96
 	case 97:
 		goto st97
+	case 347:
+		goto st347
 	case 348:
 		goto st348
-	case 349:
-		goto st349
 	case 98:
 		goto st98
+	case 349:
+		goto st349
 	case 350:
 		goto st350
 	case 351:
@@ -671,14 +671,12 @@ _again:
 		goto st367
 	case 368:
 		goto st368
-	case 369:
-		goto st369
 	case 99:
 		goto st99
+	case 369:
+		goto st369
 	case 370:
 		goto st370
-	case 371:
-		goto st371
 	case 100:
 		goto st100
 	case 101:
@@ -687,14 +685,16 @@ _again:
 		goto st102
 	case 103:
 		goto st103
+	case 371:
+		goto st371
 	case 372:
 		goto st372
-	case 373:
-		goto st373
 	case 104:
 		goto st104
 	case 105:
 		goto st105
+	case 373:
+		goto st373
 	case 374:
 		goto st374
 	case 375:
@@ -707,32 +707,30 @@ _again:
 		goto st378
 	case 379:
 		goto st379
-	case 380:
-		goto st380
 	case 106:
 		goto st106
 	case 107:
 		goto st107
 	case 108:
 		goto st108
-	case 381:
-		goto st381
+	case 380:
+		goto st380
 	case 109:
 		goto st109
 	case 110:
 		goto st110
 	case 111:
 		goto st111
-	case 382:
-		goto st382
+	case 381:
+		goto st381
 	case 112:
 		goto st112
 	case 113:
 		goto st113
+	case 382:
+		goto st382
 	case 383:
 		goto st383
-	case 384:
-		goto st384
 	case 114:
 		goto st114
 	case 115:
@@ -757,14 +755,16 @@ _again:
 		goto st124
 	case 125:
 		goto st125
+	case 384:
+		goto st384
 	case 385:
 		goto st385
 	case 386:
 		goto st386
-	case 387:
-		goto st387
 	case 126:
 		goto st126
+	case 387:
+		goto st387
 	case 388:
 		goto st388
 	case 389:
@@ -807,20 +807,20 @@ _again:
 		goto st407
 	case 408:
 		goto st408
-	case 409:
-		goto st409
 	case 127:
 		goto st127
+	case 409:
+		goto st409
 	case 410:
 		goto st410
 	case 411:
 		goto st411
 	case 412:
 		goto st412
-	case 413:
-		goto st413
 	case 128:
 		goto st128
+	case 413:
+		goto st413
 	case 414:
 		goto st414
 	case 415:
@@ -859,20 +859,20 @@ _again:
 		goto st431
 	case 432:
 		goto st432
-	case 433:
-		goto st433
 	case 129:
 		goto st129
 	case 130:
 		goto st130
 	case 131:
 		goto st131
+	case 433:
+		goto st433
 	case 434:
 		goto st434
-	case 435:
-		goto st435
 	case 132:
 		goto st132
+	case 435:
+		goto st435
 	case 436:
 		goto st436
 	case 437:
@@ -911,18 +911,18 @@ _again:
 		goto st453
 	case 454:
 		goto st454
-	case 455:
-		goto st455
 	case 133:
 		goto st133
+	case 455:
+		goto st455
 	case 456:
 		goto st456
 	case 457:
 		goto st457
-	case 458:
-		goto st458
 	case 134:
 		goto st134
+	case 458:
+		goto st458
 	case 459:
 		goto st459
 	case 460:
@@ -965,10 +965,10 @@ _again:
 		goto st478
 	case 479:
 		goto st479
-	case 480:
-		goto st480
 	case 135:
 		goto st135
+	case 480:
+		goto st480
 	case 481:
 		goto st481
 	case 482:
@@ -1011,8 +1011,6 @@ _again:
 		goto st500
 	case 501:
 		goto st501
-	case 502:
-		goto st502
 	case 136:
 		goto st136
 	case 137:
@@ -1021,16 +1019,18 @@ _again:
 		goto st138
 	case 139:
 		goto st139
+	case 502:
+		goto st502
 	case 503:
 		goto st503
-	case 504:
-		goto st504
 	case 140:
 		goto st140
-	case 505:
-		goto st505
+	case 504:
+		goto st504
 	case 141:
 		goto st141
+	case 505:
+		goto st505
 	case 506:
 		goto st506
 	case 507:
@@ -1043,44 +1043,44 @@ _again:
 		goto st510
 	case 511:
 		goto st511
-	case 512:
-		goto st512
 	case 142:
 		goto st142
 	case 143:
 		goto st143
 	case 144:
 		goto st144
-	case 513:
-		goto st513
+	case 512:
+		goto st512
 	case 145:
 		goto st145
 	case 146:
 		goto st146
 	case 147:
 		goto st147
-	case 514:
-		goto st514
+	case 513:
+		goto st513
 	case 148:
 		goto st148
 	case 149:
 		goto st149
+	case 514:
+		goto st514
 	case 515:
 		goto st515
-	case 516:
-		goto st516
 	case 150:
 		goto st150
 	case 151:
 		goto st151
+	case 516:
+		goto st516
 	case 517:
 		goto st517
 	case 518:
 		goto st518
-	case 519:
-		goto st519
 	case 152:
 		goto st152
+	case 519:
+		goto st519
 	case 520:
 		goto st520
 	case 521:
@@ -1121,12 +1121,12 @@ _again:
 		goto st538
 	case 539:
 		goto st539
-	case 540:
-		goto st540
 	case 153:
 		goto st153
 	case 154:
 		goto st154
+	case 540:
+		goto st540
 	case 541:
 		goto st541
 	case 542:
@@ -1139,50 +1139,50 @@ _again:
 		goto st545
 	case 546:
 		goto st546
-	case 547:
-		goto st547
 	case 155:
 		goto st155
 	case 156:
 		goto st156
 	case 157:
 		goto st157
-	case 548:
-		goto st548
+	case 547:
+		goto st547
 	case 158:
 		goto st158
 	case 159:
 		goto st159
 	case 160:
 		goto st160
-	case 549:
-		goto st549
+	case 548:
+		goto st548
 	case 161:
 		goto st161
 	case 162:
 		goto st162
+	case 549:
+		goto st549
 	case 550:
 		goto st550
-	case 551:
-		goto st551
 	case 163:
 		goto st163
 	case 164:
 		goto st164
 	case 165:
 		goto st165
+	case 551:
+		goto st551
 	case 552:
 		goto st552
-	case 553:
-		goto st553
 	case 166:
 		goto st166
+	case 553:
+		goto st553
 	case 554:
 		goto st554
-	case 555:
-		goto st555
 	case 167:
 		goto st167
+	case 555:
+		goto st555
 	case 556:
 		goto st556
 	case 557:
@@ -1195,42 +1195,42 @@ _again:
 		goto st560
 	case 561:
 		goto st561
-	case 562:
-		goto st562
 	case 168:
 		goto st168
 	case 169:
 		goto st169
 	case 170:
 		goto st170
-	case 563:
-		goto st563
+	case 562:
+		goto st562
 	case 171:
 		goto st171
 	case 172:
 		goto st172
 	case 173:
 		goto st173
-	case 564:
-		goto st564
+	case 563:
+		goto st563
 	case 174:
 		goto st174
 	case 175:
 		goto st175
+	case 564:
+		goto st564
 	case 565:
 		goto st565
-	case 566:
-		goto st566
 	case 176:
 		goto st176
+	case 566:
+		goto st566
 	case 567:
 		goto st567
-	case 568:
-		goto st568
 	case 177:
 		goto st177
 	case 178:
 		goto st178
+	case 568:
+		goto st568
 	case 569:
 		goto st569
 	case 570:
@@ -1241,42 +1241,40 @@ _again:
 		goto st572
 	case 573:
 		goto st573
-	case 574:
-		goto st574
 	case 179:
 		goto st179
 	case 180:
 		goto st180
 	case 181:
 		goto st181
-	case 575:
-		goto st575
+	case 574:
+		goto st574
 	case 182:
 		goto st182
 	case 183:
 		goto st183
 	case 184:
 		goto st184
-	case 576:
-		goto st576
+	case 575:
+		goto st575
 	case 185:
 		goto st185
 	case 186:
 		goto st186
+	case 576:
+		goto st576
 	case 577:
 		goto st577
-	case 578:
-		goto st578
 	case 187:
 		goto st187
-	case 579:
-		goto st579
+	case 578:
+		goto st578
 	case 188:
 		goto st188
+	case 579:
+		goto st579
 	case 580:
 		goto st580
-	case 581:
-		goto st581
 	case 189:
 		goto st189
 	case 190:
@@ -1496,10 +1494,10 @@ _resume:
 		goto st_case_249
 	case 250:
 		goto st_case_250
-	case 251:
-		goto st_case_251
 	case 44:
 		goto st_case_44
+	case 251:
+		goto st_case_251
 	case 252:
 		goto st_case_252
 	case 253:
@@ -1538,16 +1536,14 @@ _resume:
 		goto st_case_269
 	case 270:
 		goto st_case_270
-	case 271:
-		goto st_case_271
 	case 45:
 		goto st_case_45
 	case 46:
 		goto st_case_46
 	case 47:
 		goto st_case_47
-	case 272:
-		goto st_case_272
+	case 271:
+		goto st_case_271
 	case 48:
 		goto st_case_48
 	case 49:
@@ -1556,16 +1552,18 @@ _resume:
 		goto st_case_50
 	case 51:
 		goto st_case_51
+	case 272:
+		goto st_case_272
 	case 273:
 		goto st_case_273
-	case 274:
-		goto st_case_274
 	case 52:
 		goto st_case_52
-	case 275:
-		goto st_case_275
+	case 274:
+		goto st_case_274
 	case 53:
 		goto st_case_53
+	case 275:
+		goto st_case_275
 	case 276:
 		goto st_case_276
 	case 277:
@@ -1578,44 +1576,44 @@ _resume:
 		goto st_case_280
 	case 281:
 		goto st_case_281
-	case 282:
-		goto st_case_282
 	case 54:
 		goto st_case_54
 	case 55:
 		goto st_case_55
 	case 56:
 		goto st_case_56
-	case 283:
-		goto st_case_283
+	case 282:
+		goto st_case_282
 	case 57:
 		goto st_case_57
 	case 58:
 		goto st_case_58
 	case 59:
 		goto st_case_59
-	case 284:
-		goto st_case_284
+	case 283:
+		goto st_case_283
 	case 60:
 		goto st_case_60
 	case 61:
 		goto st_case_61
+	case 284:
+		goto st_case_284
 	case 285:
 		goto st_case_285
-	case 286:
-		goto st_case_286
 	case 62:
 		goto st_case_62
 	case 63:
 		goto st_case_63
+	case 286:
+		goto st_case_286
 	case 287:
 		goto st_case_287
-	case 288:
-		goto st_case_288
 	case 64:
 		goto st_case_64
 	case 65:
 		goto st_case_65
+	case 288:
+		goto st_case_288
 	case 289:
 		goto st_case_289
 	case 290:
@@ -1628,32 +1626,30 @@ _resume:
 		goto st_case_293
 	case 294:
 		goto st_case_294
-	case 295:
-		goto st_case_295
 	case 66:
 		goto st_case_66
 	case 67:
 		goto st_case_67
 	case 68:
 		goto st_case_68
-	case 296:
-		goto st_case_296
+	case 295:
+		goto st_case_295
 	case 69:
 		goto st_case_69
 	case 70:
 		goto st_case_70
 	case 71:
 		goto st_case_71
-	case 297:
-		goto st_case_297
+	case 296:
+		goto st_case_296
 	case 72:
 		goto st_case_72
 	case 73:
 		goto st_case_73
+	case 297:
+		goto st_case_297
 	case 298:
 		goto st_case_298
-	case 299:
-		goto st_case_299
 	case 74:
 		goto st_case_74
 	case 75:
@@ -1666,26 +1662,28 @@ _resume:
 		goto st_case_78
 	case 79:
 		goto st_case_79
+	case 299:
+		goto st_case_299
 	case 300:
 		goto st_case_300
 	case 301:
 		goto st_case_301
 	case 302:
 		goto st_case_302
-	case 303:
-		goto st_case_303
 	case 80:
 		goto st_case_80
+	case 303:
+		goto st_case_303
 	case 304:
 		goto st_case_304
 	case 305:
 		goto st_case_305
 	case 306:
 		goto st_case_306
-	case 307:
-		goto st_case_307
 	case 81:
 		goto st_case_81
+	case 307:
+		goto st_case_307
 	case 308:
 		goto st_case_308
 	case 309:
@@ -1720,8 +1718,6 @@ _resume:
 		goto st_case_323
 	case 324:
 		goto st_case_324
-	case 325:
-		goto st_case_325
 	case 82:
 		goto st_case_82
 	case 83:
@@ -1748,12 +1744,14 @@ _resume:
 		goto st_case_93
 	case 94:
 		goto st_case_94
+	case 325:
+		goto st_case_325
 	case 326:
 		goto st_case_326
-	case 327:
-		goto st_case_327
 	case 95:
 		goto st_case_95
+	case 327:
+		goto st_case_327
 	case 328:
 		goto st_case_328
 	case 329:
@@ -1792,18 +1790,18 @@ _resume:
 		goto st_case_345
 	case 346:
 		goto st_case_346
-	case 347:
-		goto st_case_347
 	case 96:
 		goto st_case_96
 	case 97:
 		goto st_case_97
+	case 347:
+		goto st_case_347
 	case 348:
 		goto st_case_348
-	case 349:
-		goto st_case_349
 	case 98:
 		goto st_case_98
+	case 349:
+		goto st_case_349
 	case 350:
 		goto st_case_350
 	case 351:
@@ -1842,14 +1840,12 @@ _resume:
 		goto st_case_367
 	case 368:
 		goto st_case_368
-	case 369:
-		goto st_case_369
 	case 99:
 		goto st_case_99
+	case 369:
+		goto st_case_369
 	case 370:
 		goto st_case_370
-	case 371:
-		goto st_case_371
 	case 100:
 		goto st_case_100
 	case 101:
@@ -1858,14 +1854,16 @@ _resume:
 		goto st_case_102
 	case 103:
 		goto st_case_103
+	case 371:
+		goto st_case_371
 	case 372:
 		goto st_case_372
-	case 373:
-		goto st_case_373
 	case 104:
 		goto st_case_104
 	case 105:
 		goto st_case_105
+	case 373:
+		goto st_case_373
 	case 374:
 		goto st_case_374
 	case 375:
@@ -1878,32 +1876,30 @@ _resume:
 		goto st_case_378
 	case 379:
 		goto st_case_379
-	case 380:
-		goto st_case_380
 	case 106:
 		goto st_case_106
 	case 107:
 		goto st_case_107
 	case 108:
 		goto st_case_108
-	case 381:
-		goto st_case_381
+	case 380:
+		goto st_case_380
 	case 109:
 		goto st_case_109
 	case 110:
 		goto st_case_110
 	case 111:
 		goto st_case_111
-	case 382:
-		goto st_case_382
+	case 381:
+		goto st_case_381
 	case 112:
 		goto st_case_112
 	case 113:
 		goto st_case_113
+	case 382:
+		goto st_case_382
 	case 383:
 		goto st_case_383
-	case 384:
-		goto st_case_384
 	case 114:
 		goto st_case_114
 	case 115:
@@ -1928,14 +1924,16 @@ _resume:
 		goto st_case_124
 	case 125:
 		goto st_case_125
+	case 384:
+		goto st_case_384
 	case 385:
 		goto st_case_385
 	case 386:
 		goto st_case_386
-	case 387:
-		goto st_case_387
 	case 126:
 		goto st_case_126
+	case 387:
+		goto st_case_387
 	case 388:
 		goto st_case_388
 	case 389:
@@ -1978,20 +1976,20 @@ _resume:
 		goto st_case_407
 	case 408:
 		goto st_case_408
-	case 409:
-		goto st_case_409
 	case 127:
 		goto st_case_127
+	case 409:
+		goto st_case_409
 	case 410:
 		goto st_case_410
 	case 411:
 		goto st_case_411
 	case 412:
 		goto st_case_412
-	case 413:
-		goto st_case_413
 	case 128:
 		goto st_case_128
+	case 413:
+		goto st_case_413
 	case 414:
 		goto st_case_414
 	case 415:
@@ -2030,20 +2028,20 @@ _resume:
 		goto st_case_431
 	case 432:
 		goto st_case_432
-	case 433:
-		goto st_case_433
 	case 129:
 		goto st_case_129
 	case 130:
 		goto st_case_130
 	case 131:
 		goto st_case_131
+	case 433:
+		goto st_case_433
 	case 434:
 		goto st_case_434
-	case 435:
-		goto st_case_435
 	case 132:
 		goto st_case_132
+	case 435:
+		goto st_case_435
 	case 436:
 		goto st_case_436
 	case 437:
@@ -2082,18 +2080,18 @@ _resume:
 		goto st_case_453
 	case 454:
 		goto st_case_454
-	case 455:
-		goto st_case_455
 	case 133:
 		goto st_case_133
+	case 455:
+		goto st_case_455
 	case 456:
 		goto st_case_456
 	case 457:
 		goto st_case_457
-	case 458:
-		goto st_case_458
 	case 134:
 		goto st_case_134
+	case 458:
+		goto st_case_458
 	case 459:
 		goto st_case_459
 	case 460:
@@ -2136,10 +2134,10 @@ _resume:
 		goto st_case_478
 	case 479:
 		goto st_case_479
-	case 480:
-		goto st_case_480
 	case 135:
 		goto st_case_135
+	case 480:
+		goto st_case_480
 	case 481:
 		goto st_case_481
 	case 482:
@@ -2182,8 +2180,6 @@ _resume:
 		goto st_case_500
 	case 501:
 		goto st_case_501
-	case 502:
-		goto st_case_502
 	case 136:
 		goto st_case_136
 	case 137:
@@ -2192,16 +2188,18 @@ _resume:
 		goto st_case_138
 	case 139:
 		goto st_case_139
+	case 502:
+		goto st_case_502
 	case 503:
 		goto st_case_503
-	case 504:
-		goto st_case_504
 	case 140:
 		goto st_case_140
-	case 505:
-		goto st_case_505
+	case 504:
+		goto st_case_504
 	case 141:
 		goto st_case_141
+	case 505:
+		goto st_case_505
 	case 506:
 		goto st_case_506
 	case 507:
@@ -2214,44 +2212,44 @@ _resume:
 		goto st_case_510
 	case 511:
 		goto st_case_511
-	case 512:
-		goto st_case_512
 	case 142:
 		goto st_case_142
 	case 143:
 		goto st_case_143
 	case 144:
 		goto st_case_144
-	case 513:
-		goto st_case_513
+	case 512:
+		goto st_case_512
 	case 145:
 		goto st_case_145
 	case 146:
 		goto st_case_146
 	case 147:
 		goto st_case_147
-	case 514:
-		goto st_case_514
+	case 513:
+		goto st_case_513
 	case 148:
 		goto st_case_148
 	case 149:
 		goto st_case_149
+	case 514:
+		goto st_case_514
 	case 515:
 		goto st_case_515
-	case 516:
-		goto st_case_516
 	case 150:
 		goto st_case_150
 	case 151:
 		goto st_case_151
+	case 516:
+		goto st_case_516
 	case 517:
 		goto st_case_517
 	case 518:
 		goto st_case_518
-	case 519:
-		goto st_case_519
 	case 152:
 		goto st_case_152
+	case 519:
+		goto st_case_519
 	case 520:
 		goto st_case_520
 	case 521:
@@ -2292,12 +2290,12 @@ _resume:
 		goto st_case_538
 	case 539:
 		goto st_case_539
-	case 540:
-		goto st_case_540
 	case 153:
 		goto st_case_153
 	case 154:
 		goto st_case_154
+	case 540:
+		goto st_case_540
 	case 541:
 		goto st_case_541
 	case 542:
@@ -2310,50 +2308,50 @@ _resume:
 		goto st_case_545
 	case 546:
 		goto st_case_546
-	case 547:
-		goto st_case_547
 	case 155:
 		goto st_case_155
 	case 156:
 		goto st_case_156
 	case 157:
 		goto st_case_157
-	case 548:
-		goto st_case_548
+	case 547:
+		goto st_case_547
 	case 158:
 		goto st_case_158
 	case 159:
 		goto st_case_159
 	case 160:
 		goto st_case_160
-	case 549:
-		goto st_case_549
+	case 548:
+		goto st_case_548
 	case 161:
 		goto st_case_161
 	case 162:
 		goto st_case_162
+	case 549:
+		goto st_case_549
 	case 550:
 		goto st_case_550
-	case 551:
-		goto st_case_551
 	case 163:
 		goto st_case_163
 	case 164:
 		goto st_case_164
 	case 165:
 		goto st_case_165
+	case 551:
+		goto st_case_551
 	case 552:
 		goto st_case_552
-	case 553:
-		goto st_case_553
 	case 166:
 		goto st_case_166
+	case 553:
+		goto st_case_553
 	case 554:
 		goto st_case_554
-	case 555:
-		goto st_case_555
 	case 167:
 		goto st_case_167
+	case 555:
+		goto st_case_555
 	case 556:
 		goto st_case_556
 	case 557:
@@ -2366,42 +2364,42 @@ _resume:
 		goto st_case_560
 	case 561:
 		goto st_case_561
-	case 562:
-		goto st_case_562
 	case 168:
 		goto st_case_168
 	case 169:
 		goto st_case_169
 	case 170:
 		goto st_case_170
-	case 563:
-		goto st_case_563
+	case 562:
+		goto st_case_562
 	case 171:
 		goto st_case_171
 	case 172:
 		goto st_case_172
 	case 173:
 		goto st_case_173
-	case 564:
-		goto st_case_564
+	case 563:
+		goto st_case_563
 	case 174:
 		goto st_case_174
 	case 175:
 		goto st_case_175
+	case 564:
+		goto st_case_564
 	case 565:
 		goto st_case_565
-	case 566:
-		goto st_case_566
 	case 176:
 		goto st_case_176
+	case 566:
+		goto st_case_566
 	case 567:
 		goto st_case_567
-	case 568:
-		goto st_case_568
 	case 177:
 		goto st_case_177
 	case 178:
 		goto st_case_178
+	case 568:
+		goto st_case_568
 	case 569:
 		goto st_case_569
 	case 570:
@@ -2412,42 +2410,40 @@ _resume:
 		goto st_case_572
 	case 573:
 		goto st_case_573
-	case 574:
-		goto st_case_574
 	case 179:
 		goto st_case_179
 	case 180:
 		goto st_case_180
 	case 181:
 		goto st_case_181
-	case 575:
-		goto st_case_575
+	case 574:
+		goto st_case_574
 	case 182:
 		goto st_case_182
 	case 183:
 		goto st_case_183
 	case 184:
 		goto st_case_184
-	case 576:
-		goto st_case_576
+	case 575:
+		goto st_case_575
 	case 185:
 		goto st_case_185
 	case 186:
 		goto st_case_186
+	case 576:
+		goto st_case_576
 	case 577:
 		goto st_case_577
-	case 578:
-		goto st_case_578
 	case 187:
 		goto st_case_187
-	case 579:
-		goto st_case_579
+	case 578:
+		goto st_case_578
 	case 188:
 		goto st_case_188
+	case 579:
+		goto st_case_579
 	case 580:
 		goto st_case_580
-	case 581:
-		goto st_case_581
 	case 189:
 		goto st_case_189
 	case 190:
@@ -2489,7 +2485,7 @@ tr0:
 			goto _test_eof2
 		}
 	st_case_2:
-//line plugins/parsers/influx/machine.go:2493
+//line plugins/parsers/influx/machine.go:2489
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2525,7 +2521,7 @@ tr58:
 			goto _test_eof3
 		}
 	st_case_3:
-//line plugins/parsers/influx/machine.go:2529
+//line plugins/parsers/influx/machine.go:2525
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2557,7 +2553,7 @@ tr9:
 			goto _test_eof4
 		}
 	st_case_4:
-//line plugins/parsers/influx/machine.go:2561
+//line plugins/parsers/influx/machine.go:2557
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -2761,7 +2757,7 @@ tr210:
 	{( m.p)++; goto _out }
 
 	goto _again
-//line plugins/parsers/influx/machine.go:2765
+//line plugins/parsers/influx/machine.go:2761
 st_case_0:
 	st0:
 		 m.cs = 0
@@ -2777,7 +2773,7 @@ tr14:
 			goto _test_eof5
 		}
 	st_case_5:
-//line plugins/parsers/influx/machine.go:2781
+//line plugins/parsers/influx/machine.go:2777
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st6
@@ -2806,11 +2802,16 @@ tr14:
 		}
 	st_case_6:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr26
 		case 92:
 			goto tr27
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto tr25
 tr25:
 //line plugins/parsers/influx/machine.go.rl:18
@@ -2823,13 +2824,18 @@ tr25:
 			goto _test_eof7
 		}
 	st_case_7:
-//line plugins/parsers/influx/machine.go:2827
+//line plugins/parsers/influx/machine.go:2828
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 tr26:
 //line plugins/parsers/influx/machine.go.rl:18
@@ -2852,7 +2858,7 @@ tr29:
 			goto _test_eof191
 		}
 	st_case_191:
-//line plugins/parsers/influx/machine.go:2856
+//line plugins/parsers/influx/machine.go:2862
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2896,7 +2902,7 @@ tr369:
 			goto _test_eof192
 		}
 	st_case_192:
-//line plugins/parsers/influx/machine.go:2900
+//line plugins/parsers/influx/machine.go:2906
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -2995,7 +3001,7 @@ tr370:
 			goto _test_eof193
 		}
 	st_case_193:
-//line plugins/parsers/influx/machine.go:2999
+//line plugins/parsers/influx/machine.go:3005
 		goto tr1
 tr332:
 //line plugins/parsers/influx/machine.go.rl:18
@@ -3008,7 +3014,7 @@ tr332:
 			goto _test_eof8
 		}
 	st_case_8:
-//line plugins/parsers/influx/machine.go:3012
+//line plugins/parsers/influx/machine.go:3018
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 			goto st194
 		}
@@ -3024,7 +3030,7 @@ tr333:
 			goto _test_eof194
 		}
 	st_case_194:
-//line plugins/parsers/influx/machine.go:3028
+//line plugins/parsers/influx/machine.go:3034
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -3053,7 +3059,7 @@ tr334:
 			goto _test_eof195
 		}
 	st_case_195:
-//line plugins/parsers/influx/machine.go:3057
+//line plugins/parsers/influx/machine.go:3063
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -3486,7 +3492,7 @@ tr371:
 			goto _test_eof9
 		}
 	st_case_9:
-//line plugins/parsers/influx/machine.go:3490
+//line plugins/parsers/influx/machine.go:3496
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -3517,7 +3523,7 @@ tr12:
 			goto _test_eof10
 		}
 	st_case_10:
-//line plugins/parsers/influx/machine.go:3521
+//line plugins/parsers/influx/machine.go:3527
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -3538,7 +3544,7 @@ tr27:
 			goto _test_eof11
 		}
 	st_case_11:
-//line plugins/parsers/influx/machine.go:3542
+//line plugins/parsers/influx/machine.go:3548
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st7
@@ -3557,7 +3563,7 @@ tr17:
 			goto _test_eof12
 		}
 	st_case_12:
-//line plugins/parsers/influx/machine.go:3561
+//line plugins/parsers/influx/machine.go:3567
 		if ( m.data)[( m.p)] == 48 {
 			goto st214
 		}
@@ -3603,7 +3609,7 @@ tr18:
 			goto _test_eof215
 		}
 	st_case_215:
-//line plugins/parsers/influx/machine.go:3607
+//line plugins/parsers/influx/machine.go:3613
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3739,7 +3745,7 @@ tr19:
 			goto _test_eof219
 		}
 	st_case_219:
-//line plugins/parsers/influx/machine.go:3743
+//line plugins/parsers/influx/machine.go:3749
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3794,7 +3800,7 @@ tr20:
 			goto _test_eof221
 		}
 	st_case_221:
-//line plugins/parsers/influx/machine.go:3798
+//line plugins/parsers/influx/machine.go:3804
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
@@ -3835,7 +3841,7 @@ tr21:
 			goto _test_eof222
 		}
 	st_case_222:
-//line plugins/parsers/influx/machine.go:3839
+//line plugins/parsers/influx/machine.go:3845
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -3938,7 +3944,7 @@ tr22:
 			goto _test_eof224
 		}
 	st_case_224:
-//line plugins/parsers/influx/machine.go:3942
+//line plugins/parsers/influx/machine.go:3948
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -3986,7 +3992,7 @@ tr23:
 			goto _test_eof225
 		}
 	st_case_225:
-//line plugins/parsers/influx/machine.go:3990
+//line plugins/parsers/influx/machine.go:3996
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -4014,7 +4020,7 @@ tr24:
 			goto _test_eof226
 		}
 	st_case_226:
-//line plugins/parsers/influx/machine.go:4018
+//line plugins/parsers/influx/machine.go:4024
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
@@ -4042,7 +4048,7 @@ tr11:
 			goto _test_eof23
 		}
 	st_case_23:
-//line plugins/parsers/influx/machine.go:4046
+//line plugins/parsers/influx/machine.go:4052
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4074,7 +4080,7 @@ tr6:
 			goto _test_eof24
 		}
 	st_case_24:
-//line plugins/parsers/influx/machine.go:4078
+//line plugins/parsers/influx/machine.go:4084
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4106,7 +4112,7 @@ tr42:
 			goto _test_eof25
 		}
 	st_case_25:
-//line plugins/parsers/influx/machine.go:4110
+//line plugins/parsers/influx/machine.go:4116
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4148,7 +4154,7 @@ tr43:
 			goto _test_eof26
 		}
 	st_case_26:
-//line plugins/parsers/influx/machine.go:4152
+//line plugins/parsers/influx/machine.go:4158
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4186,7 +4192,7 @@ tr61:
 			goto _test_eof27
 		}
 	st_case_27:
-//line plugins/parsers/influx/machine.go:4190
+//line plugins/parsers/influx/machine.go:4196
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4217,7 +4223,7 @@ tr49:
 			goto _test_eof28
 		}
 	st_case_28:
-//line plugins/parsers/influx/machine.go:4221
+//line plugins/parsers/influx/machine.go:4227
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4248,7 +4254,7 @@ tr53:
 			goto _test_eof29
 		}
 	st_case_29:
-//line plugins/parsers/influx/machine.go:4252
+//line plugins/parsers/influx/machine.go:4258
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr50
@@ -4279,7 +4285,7 @@ tr55:
 			goto _test_eof30
 		}
 	st_case_30:
-//line plugins/parsers/influx/machine.go:4283
+//line plugins/parsers/influx/machine.go:4289
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4311,7 +4317,7 @@ tr60:
 			goto _test_eof31
 		}
 	st_case_31:
-//line plugins/parsers/influx/machine.go:4315
+//line plugins/parsers/influx/machine.go:4321
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4343,7 +4349,7 @@ tr63:
 			goto _test_eof32
 		}
 	st_case_32:
-//line plugins/parsers/influx/machine.go:4347
+//line plugins/parsers/influx/machine.go:4353
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4385,7 +4391,7 @@ tr64:
 			goto _test_eof33
 		}
 	st_case_33:
-//line plugins/parsers/influx/machine.go:4389
+//line plugins/parsers/influx/machine.go:4395
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -4417,7 +4423,7 @@ tr65:
 			goto _test_eof34
 		}
 	st_case_34:
-//line plugins/parsers/influx/machine.go:4421
+//line plugins/parsers/influx/machine.go:4427
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4438,7 +4444,7 @@ tr56:
 			goto _test_eof35
 		}
 	st_case_35:
-//line plugins/parsers/influx/machine.go:4442
+//line plugins/parsers/influx/machine.go:4448
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4459,7 +4465,7 @@ tr51:
 			goto _test_eof36
 		}
 	st_case_36:
-//line plugins/parsers/influx/machine.go:4463
+//line plugins/parsers/influx/machine.go:4469
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4480,7 +4486,7 @@ tr47:
 			goto _test_eof37
 		}
 	st_case_37:
-//line plugins/parsers/influx/machine.go:4484
+//line plugins/parsers/influx/machine.go:4490
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4526,12 +4532,12 @@ tr47:
 		}
 	st_case_38:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr25
+		case 9:
+			goto tr79
 		case 11:
 			goto tr80
-		case 13:
-			goto tr25
+		case 12:
+			goto tr4
 		case 32:
 			goto tr79
 		case 34:
@@ -4541,8 +4547,8 @@ tr47:
 		case 92:
 			goto tr83
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr79
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr78
 tr78:
@@ -4556,14 +4562,14 @@ tr78:
 			goto _test_eof39
 		}
 	st_case_39:
-//line plugins/parsers/influx/machine.go:4560
+//line plugins/parsers/influx/machine.go:4566
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -4573,8 +4579,8 @@ tr78:
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 tr85:
@@ -4604,14 +4610,14 @@ tr229:
 			goto _test_eof40
 		}
 	st_case_40:
-//line plugins/parsers/influx/machine.go:4608
+//line plugins/parsers/influx/machine.go:4614
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto st40
 		case 11:
 			goto tr92
-		case 13:
-			goto st7
+		case 12:
+			goto st3
 		case 32:
 			goto st40
 		case 34:
@@ -4623,8 +4629,8 @@ tr229:
 		case 92:
 			goto tr94
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st40
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr90
 tr90:
@@ -4638,8 +4644,12 @@ tr90:
 			goto _test_eof41
 		}
 	st_case_41:
-//line plugins/parsers/influx/machine.go:4642
+//line plugins/parsers/influx/machine.go:4648
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -4651,13 +4661,8 @@ tr90:
 		case 92:
 			goto st75
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st41
 tr93:
@@ -4691,7 +4696,7 @@ tr112:
 			goto _test_eof227
 		}
 	st_case_227:
-//line plugins/parsers/influx/machine.go:4695
+//line plugins/parsers/influx/machine.go:4700
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -4755,7 +4760,7 @@ tr377:
 			goto _test_eof42
 		}
 	st_case_42:
-//line plugins/parsers/influx/machine.go:4759
+//line plugins/parsers/influx/machine.go:4764
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr99
@@ -4790,7 +4795,7 @@ tr378:
 			goto _test_eof229
 		}
 	st_case_229:
-//line plugins/parsers/influx/machine.go:4794
+//line plugins/parsers/influx/machine.go:4799
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
@@ -4827,7 +4832,7 @@ tr379:
 			goto _test_eof230
 		}
 	st_case_230:
-//line plugins/parsers/influx/machine.go:4831
+//line plugins/parsers/influx/machine.go:4836
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -5394,8 +5399,10 @@ tr97:
 			goto _test_eof43
 		}
 	st_case_43:
-//line plugins/parsers/influx/machine.go:5398
+//line plugins/parsers/influx/machine.go:5403
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr101
 		case 45:
@@ -5415,8 +5422,13 @@ tr97:
 		case 116:
 			goto tr109
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto tr105
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr105
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 tr101:
@@ -5430,22 +5442,24 @@ tr101:
 			goto _test_eof249
 		}
 	st_case_249:
-//line plugins/parsers/influx/machine.go:5434
+//line plugins/parsers/influx/machine.go:5446
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr400
+			goto tr330
+		case 12:
+			goto st192
 		case 13:
-			goto tr400
+			goto tr330
 		case 32:
 			goto tr399
 		case 34:
 			goto tr26
 		case 44:
-			goto tr401
+			goto tr400
 		case 92:
 			goto tr27
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
 			goto tr399
 		}
 		goto tr25
@@ -5455,25 +5469,25 @@ tr399:
 	m.pb = m.p
 
 	goto st250
-tr428:
+tr425:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st250
-tr434:
+tr430:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st250
-tr438:
+tr433:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st250
-tr442:
+tr436:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -5484,131 +5498,33 @@ tr442:
 			goto _test_eof250
 		}
 	st_case_250:
-//line plugins/parsers/influx/machine.go:5488
+//line plugins/parsers/influx/machine.go:5502
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr403
+			goto tr330
+		case 12:
+			goto st192
 		case 13:
-			goto tr403
+			goto tr330
 		case 32:
 			goto st250
 		case 34:
 			goto tr29
 		case 45:
-			goto tr404
+			goto tr402
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr405
+				goto tr403
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st250
 		}
 		goto st7
-tr403:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr407:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr429:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr435:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr439:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr443:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-tr400:
-	 m.cs = 251
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:22
-
-	yield = true
-	 m.cs = 188;
-	{( m.p)++; goto _out }
-
-	goto _again
-	st251:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof251
-		}
-	st_case_251:
-//line plugins/parsers/influx/machine.go:5604
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		goto st7
-tr404:
+tr402:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -5619,76 +5535,115 @@ tr404:
 			goto _test_eof44
 		}
 	st_case_44:
-//line plugins/parsers/influx/machine.go:5623
+//line plugins/parsers/influx/machine.go:5539
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr99
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st252
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st251
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr99
 		}
 		goto st7
-tr405:
+tr403:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st251
+	st251:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof251
+		}
+	st_case_251:
+//line plugins/parsers/influx/machine.go:5568
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 12:
+			goto tr334
+		case 13:
+			goto tr335
+		case 32:
+			goto tr404
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st253
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr404
+		}
+		goto st7
+tr404:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st252
 	st252:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof252
 		}
 	st_case_252:
-//line plugins/parsers/influx/machine.go:5645
+//line plugins/parsers/influx/machine.go:5603
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr330
+		case 12:
+			goto st195
 		case 13:
-			goto tr407
+			goto tr330
 		case 32:
-			goto tr406
+			goto st252
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto st252
+		}
+		goto st7
+	st253:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof253
+		}
+	st_case_253:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 12:
+			goto tr334
+		case 13:
+			goto tr335
+		case 32:
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st254
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
-		}
-		goto st7
-tr406:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st253
-	st253:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof253
-		}
-	st_case_253:
-//line plugins/parsers/influx/machine.go:5678
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 13:
-			goto tr403
-		case 32:
-			goto st253
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st253
+			goto tr404
 		}
 		goto st7
 	st254:
@@ -5698,23 +5653,25 @@ tr406:
 	st_case_254:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st255
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st255:
@@ -5724,23 +5681,25 @@ tr406:
 	st_case_255:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st256
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st256:
@@ -5750,23 +5709,25 @@ tr406:
 	st_case_256:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st257
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st257:
@@ -5776,23 +5737,25 @@ tr406:
 	st_case_257:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st258
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st258:
@@ -5802,23 +5765,25 @@ tr406:
 	st_case_258:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st259
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st259:
@@ -5828,23 +5793,25 @@ tr406:
 	st_case_259:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st260
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st260:
@@ -5854,23 +5821,25 @@ tr406:
 	st_case_260:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st261
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st261:
@@ -5880,23 +5849,25 @@ tr406:
 	st_case_261:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st262
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st262:
@@ -5906,23 +5877,25 @@ tr406:
 	st_case_262:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st263
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st263:
@@ -5932,23 +5905,25 @@ tr406:
 	st_case_263:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st264
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st264:
@@ -5958,23 +5933,25 @@ tr406:
 	st_case_264:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st265
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st265:
@@ -5984,23 +5961,25 @@ tr406:
 	st_case_265:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st266
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st266:
@@ -6010,23 +5989,25 @@ tr406:
 	st_case_266:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st267
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st267:
@@ -6036,23 +6017,25 @@ tr406:
 	st_case_267:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st268
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st268:
@@ -6062,23 +6045,25 @@ tr406:
 	st_case_268:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st269
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st269:
@@ -6088,23 +6073,25 @@ tr406:
 	st_case_269:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st270
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+			goto tr404
 		}
 		goto st7
 	st270:
@@ -6114,71 +6101,47 @@ tr406:
 	st_case_270:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr407
+			goto tr335
+		case 12:
+			goto tr334
 		case 13:
-			goto tr407
+			goto tr335
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st271
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr404
 		}
 		goto st7
-	st271:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof271
-		}
-	st_case_271:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 13:
-			goto tr407
-		case 32:
-			goto tr406
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr406
-		}
-		goto st7
-tr401:
+tr400:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st45
-tr449:
+tr442:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st45
-tr453:
+tr446:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st45
-tr455:
+tr448:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st45
-tr457:
+tr450:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -6189,8 +6152,12 @@ tr457:
 			goto _test_eof45
 		}
 	st_case_45:
-//line plugins/parsers/influx/machine.go:6193
+//line plugins/parsers/influx/machine.go:6156
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -6202,13 +6169,8 @@ tr457:
 		case 92:
 			goto tr113
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr111
 tr111:
@@ -6222,8 +6184,12 @@ tr111:
 			goto _test_eof46
 		}
 	st_case_46:
-//line plugins/parsers/influx/machine.go:6226
+//line plugins/parsers/influx/machine.go:6188
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -6235,13 +6201,8 @@ tr111:
 		case 92:
 			goto st74
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st46
 tr115:
@@ -6255,8 +6216,10 @@ tr115:
 			goto _test_eof47
 		}
 	st_case_47:
-//line plugins/parsers/influx/machine.go:6259
+//line plugins/parsers/influx/machine.go:6220
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr117
 		case 45:
@@ -6276,8 +6239,13 @@ tr115:
 		case 116:
 			goto tr109
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto tr105
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr105
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 tr117:
@@ -6285,56 +6253,58 @@ tr117:
 
 	m.handler.AddString(key, m.text())
 
-	goto st272
-	st272:
+	goto st271
+	st271:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof272
+			goto _test_eof271
 		}
-	st_case_272:
-//line plugins/parsers/influx/machine.go:6295
+	st_case_271:
+//line plugins/parsers/influx/machine.go:6263
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr400
+			goto tr330
+		case 12:
+			goto st192
 		case 13:
-			goto tr400
+			goto tr330
 		case 32:
 			goto tr399
 		case 34:
 			goto tr26
 		case 44:
-			goto tr427
+			goto tr424
 		case 92:
 			goto tr27
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
 			goto tr399
 		}
 		goto tr25
-tr427:
+tr424:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st48
-tr430:
+tr426:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st48
-tr436:
+tr431:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st48
-tr440:
+tr434:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st48
-tr444:
+tr437:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -6345,8 +6315,12 @@ tr444:
 			goto _test_eof48
 		}
 	st_case_48:
-//line plugins/parsers/influx/machine.go:6349
+//line plugins/parsers/influx/machine.go:6319
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -6358,13 +6332,8 @@ tr444:
 		case 92:
 			goto tr119
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr118
 tr118:
@@ -6378,8 +6347,12 @@ tr118:
 			goto _test_eof49
 		}
 	st_case_49:
-//line plugins/parsers/influx/machine.go:6382
+//line plugins/parsers/influx/machine.go:6351
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -6391,13 +6364,8 @@ tr118:
 		case 92:
 			goto st62
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st49
 tr121:
@@ -6411,8 +6379,10 @@ tr121:
 			goto _test_eof50
 		}
 	st_case_50:
-//line plugins/parsers/influx/machine.go:6415
+//line plugins/parsers/influx/machine.go:6383
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr117
 		case 45:
@@ -6432,8 +6402,13 @@ tr121:
 		case 116:
 			goto tr130
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto tr126
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr126
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 tr123:
@@ -6447,37 +6422,46 @@ tr123:
 			goto _test_eof51
 		}
 	st_case_51:
-//line plugins/parsers/influx/machine.go:6451
+//line plugins/parsers/influx/machine.go:6426
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 48:
-			goto st273
+			goto st272
 		case 92:
 			goto st11
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st278
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st277
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
-	st273:
+	st272:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof273
+			goto _test_eof272
 		}
-	st_case_273:
+	st_case_272:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr430
+			goto tr426
 		case 46:
-			goto st274
+			goto st273
 		case 69:
 			goto st52
 		case 92:
@@ -6485,10 +6469,10 @@ tr123:
 		case 101:
 			goto st52
 		case 105:
-			goto st277
+			goto st276
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr425
 		}
 		goto st7
 tr124:
@@ -6496,24 +6480,26 @@ tr124:
 
 	m.pb = m.p
 
-	goto st274
-	st274:
+	goto st273
+	st273:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof274
+			goto _test_eof273
 		}
-	st_case_274:
-//line plugins/parsers/influx/machine.go:6506
+	st_case_273:
+//line plugins/parsers/influx/machine.go:6490
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr430
+			goto tr426
 		case 69:
 			goto st52
 		case 92:
@@ -6522,12 +6508,12 @@ tr124:
 			goto st52
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st274
+				goto st273
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+			goto tr425
 		}
 		goto st7
 	st52:
@@ -6536,6 +6522,8 @@ tr124:
 		}
 	st_case_52:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr133
 		case 43:
@@ -6545,8 +6533,13 @@ tr124:
 		case 92:
 			goto st11
 		}
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st276
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st275
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 tr133:
@@ -6554,13 +6547,13 @@ tr133:
 
 	m.handler.AddString(key, m.text())
 
-	goto st275
-	st275:
+	goto st274
+	st274:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof275
+			goto _test_eof274
 		}
-	st_case_275:
-//line plugins/parsers/influx/machine.go:6564
+	st_case_274:
+//line plugins/parsers/influx/machine.go:6557
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
@@ -6586,13 +6579,50 @@ tr133:
 		}
 	st_case_53:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st276
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st275
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+	st275:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof275
+		}
+	st_case_275:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 12:
+			goto tr355
+		case 13:
+			goto tr356
+		case 32:
+			goto tr425
+		case 34:
+			goto tr29
+		case 44:
+			goto tr426
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st275
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr425
 		}
 		goto st7
 	st276:
@@ -6602,25 +6632,22 @@ tr133:
 	st_case_276:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr362
+		case 12:
+			goto tr361
 		case 13:
-			goto tr429
+			goto tr362
 		case 32:
-			goto tr428
+			goto tr430
 		case 34:
 			goto tr29
 		case 44:
-			goto tr430
+			goto tr431
 		case 92:
 			goto st11
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st276
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr430
 		}
 		goto st7
 	st277:
@@ -6630,40 +6657,19 @@ tr133:
 	st_case_277:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr435
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr435
+			goto tr356
 		case 32:
-			goto tr434
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr436
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr434
-		}
-		goto st7
-	st278:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof278
-		}
-	st_case_278:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
-		case 13:
-			goto tr429
-		case 32:
-			goto tr428
-		case 34:
-			goto tr29
-		case 44:
-			goto tr430
+			goto tr426
 		case 46:
-			goto st274
+			goto st273
 		case 69:
 			goto st52
 		case 92:
@@ -6671,15 +6677,15 @@ tr133:
 		case 101:
 			goto st52
 		case 105:
-			goto st277
+			goto st276
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st278
+				goto st277
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+			goto tr425
 		}
 		goto st7
 tr125:
@@ -6687,26 +6693,28 @@ tr125:
 
 	m.pb = m.p
 
-	goto st279
-	st279:
+	goto st278
+	st278:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof279
+			goto _test_eof278
 		}
-	st_case_279:
-//line plugins/parsers/influx/machine.go:6697
+	st_case_278:
+//line plugins/parsers/influx/machine.go:6703
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr430
+			goto tr426
 		case 46:
-			goto st274
+			goto st273
 		case 69:
 			goto st52
 		case 92:
@@ -6714,38 +6722,87 @@ tr125:
 		case 101:
 			goto st52
 		case 105:
-			goto st277
+			goto st276
 		case 117:
-			goto st280
+			goto st279
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr425
 		}
 		goto st7
+	st279:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof279
+		}
+	st_case_279:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr366
+		case 12:
+			goto tr365
+		case 13:
+			goto tr366
+		case 32:
+			goto tr433
+		case 34:
+			goto tr29
+		case 44:
+			goto tr434
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr433
+		}
+		goto st7
+tr126:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st280
 	st280:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof280
 		}
 	st_case_280:
+//line plugins/parsers/influx/machine.go:6770
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr439
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr439
+			goto tr356
 		case 32:
-			goto tr438
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr440
+			goto tr426
+		case 46:
+			goto st273
+		case 69:
+			goto st52
 		case 92:
 			goto st11
+		case 101:
+			goto st52
+		case 105:
+			goto st276
+		case 117:
+			goto st279
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr438
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st280
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr425
 		}
 		goto st7
-tr126:
+tr127:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -6756,63 +6813,20 @@ tr126:
 			goto _test_eof281
 		}
 	st_case_281:
-//line plugins/parsers/influx/machine.go:6760
+//line plugins/parsers/influx/machine.go:6817
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr429
+			goto tr370
 		case 32:
-			goto tr428
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr430
-		case 46:
-			goto st274
-		case 69:
-			goto st52
-		case 92:
-			goto st11
-		case 101:
-			goto st52
-		case 105:
-			goto st277
-		case 117:
-			goto st280
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st281
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr428
-		}
-		goto st7
-tr127:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st282
-	st282:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof282
-		}
-	st_case_282:
-//line plugins/parsers/influx/machine.go:6805
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 13:
-			goto tr443
-		case 32:
-			goto tr442
-		case 34:
-			goto tr29
-		case 44:
-			goto tr444
+			goto tr437
 		case 65:
 			goto st54
 		case 92:
@@ -6820,8 +6834,8 @@ tr127:
 		case 97:
 			goto st57
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 	st54:
@@ -6830,6 +6844,8 @@ tr127:
 		}
 	st_case_54:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 76:
@@ -6837,6 +6853,9 @@ tr127:
 		case 92:
 			goto st11
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st55:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -6844,6 +6863,8 @@ tr127:
 		}
 	st_case_55:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 83:
@@ -6851,6 +6872,9 @@ tr127:
 		case 92:
 			goto st11
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st56:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -6858,35 +6882,42 @@ tr127:
 		}
 	st_case_56:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 69:
-			goto st283
+			goto st282
 		case 92:
 			goto st11
 		}
-		goto st7
-	st283:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof283
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
-	st_case_283:
+		goto st7
+	st282:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof282
+		}
+	st_case_282:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
+			goto tr437
 		case 92:
 			goto st11
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 	st57:
@@ -6895,6 +6926,8 @@ tr127:
 		}
 	st_case_57:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
@@ -6902,6 +6935,9 @@ tr127:
 		case 108:
 			goto st58
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st58:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -6909,6 +6945,8 @@ tr127:
 		}
 	st_case_58:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
@@ -6916,6 +6954,9 @@ tr127:
 		case 115:
 			goto st59
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st59:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -6923,12 +6964,17 @@ tr127:
 		}
 	st_case_59:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		case 101:
-			goto st283
+			goto st282
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st7
 tr128:
@@ -6936,64 +6982,110 @@ tr128:
 
 	m.pb = m.p
 
+	goto st283
+	st283:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof283
+		}
+	st_case_283:
+//line plugins/parsers/influx/machine.go:6992
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr370
+		case 12:
+			goto tr369
+		case 13:
+			goto tr370
+		case 32:
+			goto tr436
+		case 34:
+			goto tr29
+		case 44:
+			goto tr437
+		case 82:
+			goto st60
+		case 92:
+			goto st11
+		case 114:
+			goto st61
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
+		}
+		goto st7
+	st60:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof60
+		}
+	st_case_60:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 85:
+			goto st56
+		case 92:
+			goto st11
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+	st61:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof61
+		}
+	st_case_61:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st59
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+tr129:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st284
 	st284:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof284
 		}
 	st_case_284:
-//line plugins/parsers/influx/machine.go:6946
+//line plugins/parsers/influx/machine.go:7066
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
-		case 82:
-			goto st60
+			goto tr437
 		case 92:
 			goto st11
-		case 114:
-			goto st61
+		case 97:
+			goto st57
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
-	st60:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof60
-		}
-	st_case_60:
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto tr29
-		case 85:
-			goto st56
-		case 92:
-			goto st11
-		}
-		goto st7
-	st61:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof61
-		}
-	st_case_61:
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		case 117:
-			goto st59
-		}
-		goto st7
-tr129:
+tr130:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -7004,57 +7096,27 @@ tr129:
 			goto _test_eof285
 		}
 	st_case_285:
-//line plugins/parsers/influx/machine.go:7008
+//line plugins/parsers/influx/machine.go:7100
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr444
-		case 92:
-			goto st11
-		case 97:
-			goto st57
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
-		}
-		goto st7
-tr130:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st286
-	st286:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof286
-		}
-	st_case_286:
-//line plugins/parsers/influx/machine.go:7040
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 13:
-			goto tr443
-		case 32:
-			goto tr442
-		case 34:
-			goto tr29
-		case 44:
-			goto tr444
+			goto tr437
 		case 92:
 			goto st11
 		case 114:
 			goto st61
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 tr119:
@@ -7068,7 +7130,7 @@ tr119:
 			goto _test_eof62
 		}
 	st_case_62:
-//line plugins/parsers/influx/machine.go:7072
+//line plugins/parsers/influx/machine.go:7134
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st49
@@ -7095,37 +7157,46 @@ tr102:
 			goto _test_eof63
 		}
 	st_case_63:
-//line plugins/parsers/influx/machine.go:7099
+//line plugins/parsers/influx/machine.go:7161
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 48:
-			goto st287
+			goto st286
 		case 92:
 			goto st11
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st291
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st290
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
-	st287:
+	st286:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof287
+			goto _test_eof286
 		}
-	st_case_287:
+	st_case_286:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr449
+			goto tr442
 		case 46:
-			goto st288
+			goto st287
 		case 69:
 			goto st64
 		case 92:
@@ -7133,10 +7204,10 @@ tr102:
 		case 101:
 			goto st64
 		case 105:
-			goto st290
+			goto st289
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr425
 		}
 		goto st7
 tr103:
@@ -7144,24 +7215,26 @@ tr103:
 
 	m.pb = m.p
 
-	goto st288
-	st288:
+	goto st287
+	st287:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof288
+			goto _test_eof287
 		}
-	st_case_288:
-//line plugins/parsers/influx/machine.go:7154
+	st_case_287:
+//line plugins/parsers/influx/machine.go:7225
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr449
+			goto tr442
 		case 69:
 			goto st64
 		case 92:
@@ -7170,12 +7243,12 @@ tr103:
 			goto st64
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st288
+				goto st287
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+			goto tr425
 		}
 		goto st7
 	st64:
@@ -7184,6 +7257,8 @@ tr103:
 		}
 	st_case_64:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr133
 		case 43:
@@ -7193,8 +7268,13 @@ tr103:
 		case 92:
 			goto st11
 		}
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st289
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st288
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 	st65:
@@ -7203,13 +7283,50 @@ tr103:
 		}
 	st_case_65:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st289
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st288
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+	st288:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof288
+		}
+	st_case_288:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 12:
+			goto tr355
+		case 13:
+			goto tr356
+		case 32:
+			goto tr425
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st288
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr425
 		}
 		goto st7
 	st289:
@@ -7219,25 +7336,22 @@ tr103:
 	st_case_289:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr362
+		case 12:
+			goto tr361
 		case 13:
-			goto tr429
+			goto tr362
 		case 32:
-			goto tr428
+			goto tr430
 		case 34:
 			goto tr29
 		case 44:
-			goto tr449
+			goto tr446
 		case 92:
 			goto st11
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st289
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr430
 		}
 		goto st7
 	st290:
@@ -7247,40 +7361,19 @@ tr103:
 	st_case_290:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr435
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr435
+			goto tr356
 		case 32:
-			goto tr434
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr434
-		}
-		goto st7
-	st291:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof291
-		}
-	st_case_291:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
-		case 13:
-			goto tr429
-		case 32:
-			goto tr428
-		case 34:
-			goto tr29
-		case 44:
-			goto tr449
+			goto tr442
 		case 46:
-			goto st288
+			goto st287
 		case 69:
 			goto st64
 		case 92:
@@ -7288,15 +7381,15 @@ tr103:
 		case 101:
 			goto st64
 		case 105:
-			goto st290
+			goto st289
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st291
+				goto st290
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr428
+			goto tr425
 		}
 		goto st7
 tr104:
@@ -7304,26 +7397,28 @@ tr104:
 
 	m.pb = m.p
 
-	goto st292
-	st292:
+	goto st291
+	st291:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof292
+			goto _test_eof291
 		}
-	st_case_292:
-//line plugins/parsers/influx/machine.go:7314
+	st_case_291:
+//line plugins/parsers/influx/machine.go:7407
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr429
+			goto tr356
 		case 32:
-			goto tr428
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr449
+			goto tr442
 		case 46:
-			goto st288
+			goto st287
 		case 69:
 			goto st64
 		case 92:
@@ -7331,38 +7426,87 @@ tr104:
 		case 101:
 			goto st64
 		case 105:
-			goto st290
+			goto st289
 		case 117:
-			goto st293
+			goto st292
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr428
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr425
 		}
 		goto st7
+	st292:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof292
+		}
+	st_case_292:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr366
+		case 12:
+			goto tr365
+		case 13:
+			goto tr366
+		case 32:
+			goto tr433
+		case 34:
+			goto tr29
+		case 44:
+			goto tr448
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr433
+		}
+		goto st7
+tr105:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st293
 	st293:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof293
 		}
 	st_case_293:
+//line plugins/parsers/influx/machine.go:7474
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr439
+			goto tr356
+		case 12:
+			goto tr355
 		case 13:
-			goto tr439
+			goto tr356
 		case 32:
-			goto tr438
+			goto tr425
 		case 34:
 			goto tr29
 		case 44:
-			goto tr455
+			goto tr442
+		case 46:
+			goto st287
+		case 69:
+			goto st64
 		case 92:
 			goto st11
+		case 101:
+			goto st64
+		case 105:
+			goto st289
+		case 117:
+			goto st292
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr438
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st293
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr425
 		}
 		goto st7
-tr105:
+tr106:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -7373,63 +7517,20 @@ tr105:
 			goto _test_eof294
 		}
 	st_case_294:
-//line plugins/parsers/influx/machine.go:7377
+//line plugins/parsers/influx/machine.go:7521
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr429
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr429
+			goto tr370
 		case 32:
-			goto tr428
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr449
-		case 46:
-			goto st288
-		case 69:
-			goto st64
-		case 92:
-			goto st11
-		case 101:
-			goto st64
-		case 105:
-			goto st290
-		case 117:
-			goto st293
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st294
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr428
-		}
-		goto st7
-tr106:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st295
-	st295:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof295
-		}
-	st_case_295:
-//line plugins/parsers/influx/machine.go:7422
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 13:
-			goto tr443
-		case 32:
-			goto tr442
-		case 34:
-			goto tr29
-		case 44:
-			goto tr457
+			goto tr450
 		case 65:
 			goto st66
 		case 92:
@@ -7437,8 +7538,8 @@ tr106:
 		case 97:
 			goto st69
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 	st66:
@@ -7447,6 +7548,8 @@ tr106:
 		}
 	st_case_66:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 76:
@@ -7454,6 +7557,9 @@ tr106:
 		case 92:
 			goto st11
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st67:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -7461,6 +7567,8 @@ tr106:
 		}
 	st_case_67:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 83:
@@ -7468,6 +7576,9 @@ tr106:
 		case 92:
 			goto st11
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st68:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -7475,35 +7586,42 @@ tr106:
 		}
 	st_case_68:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 69:
-			goto st296
+			goto st295
 		case 92:
 			goto st11
 		}
-		goto st7
-	st296:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof296
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
-	st_case_296:
+		goto st7
+	st295:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof295
+		}
+	st_case_295:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr457
+			goto tr450
 		case 92:
 			goto st11
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 	st69:
@@ -7512,6 +7630,8 @@ tr106:
 		}
 	st_case_69:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
@@ -7519,6 +7639,9 @@ tr106:
 		case 108:
 			goto st70
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st70:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -7526,6 +7649,8 @@ tr106:
 		}
 	st_case_70:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
@@ -7533,6 +7658,9 @@ tr106:
 		case 115:
 			goto st71
 		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
 		goto st7
 	st71:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -7540,12 +7668,17 @@ tr106:
 		}
 	st_case_71:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		case 101:
-			goto st296
+			goto st295
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st7
 tr107:
@@ -7553,64 +7686,110 @@ tr107:
 
 	m.pb = m.p
 
+	goto st296
+	st296:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof296
+		}
+	st_case_296:
+//line plugins/parsers/influx/machine.go:7696
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr370
+		case 12:
+			goto tr369
+		case 13:
+			goto tr370
+		case 32:
+			goto tr436
+		case 34:
+			goto tr29
+		case 44:
+			goto tr450
+		case 82:
+			goto st72
+		case 92:
+			goto st11
+		case 114:
+			goto st73
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
+		}
+		goto st7
+	st72:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof72
+		}
+	st_case_72:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 85:
+			goto st68
+		case 92:
+			goto st11
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+	st73:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof73
+		}
+	st_case_73:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st71
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+tr108:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st297
 	st297:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof297
 		}
 	st_case_297:
-//line plugins/parsers/influx/machine.go:7563
+//line plugins/parsers/influx/machine.go:7770
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr457
-		case 82:
-			goto st72
+			goto tr450
 		case 92:
 			goto st11
-		case 114:
-			goto st73
+		case 97:
+			goto st69
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
-	st72:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof72
-		}
-	st_case_72:
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto tr29
-		case 85:
-			goto st68
-		case 92:
-			goto st11
-		}
-		goto st7
-	st73:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof73
-		}
-	st_case_73:
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		case 117:
-			goto st71
-		}
-		goto st7
-tr108:
+tr109:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -7621,57 +7800,27 @@ tr108:
 			goto _test_eof298
 		}
 	st_case_298:
-//line plugins/parsers/influx/machine.go:7625
+//line plugins/parsers/influx/machine.go:7804
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr443
+			goto tr370
+		case 12:
+			goto tr369
 		case 13:
-			goto tr443
+			goto tr370
 		case 32:
-			goto tr442
+			goto tr436
 		case 34:
 			goto tr29
 		case 44:
-			goto tr457
-		case 92:
-			goto st11
-		case 97:
-			goto st69
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
-		}
-		goto st7
-tr109:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st299
-	st299:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof299
-		}
-	st_case_299:
-//line plugins/parsers/influx/machine.go:7657
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 13:
-			goto tr443
-		case 32:
-			goto tr442
-		case 34:
-			goto tr29
-		case 44:
-			goto tr457
+			goto tr450
 		case 92:
 			goto st11
 		case 114:
 			goto st73
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr442
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr436
 		}
 		goto st7
 tr113:
@@ -7685,7 +7834,7 @@ tr113:
 			goto _test_eof74
 		}
 	st_case_74:
-//line plugins/parsers/influx/machine.go:7689
+//line plugins/parsers/influx/machine.go:7838
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st46
@@ -7712,7 +7861,7 @@ tr94:
 			goto _test_eof75
 		}
 	st_case_75:
-//line plugins/parsers/influx/machine.go:7716
+//line plugins/parsers/influx/machine.go:7865
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st41
@@ -7739,14 +7888,14 @@ tr92:
 			goto _test_eof76
 		}
 	st_case_76:
-//line plugins/parsers/influx/machine.go:7743
+//line plugins/parsers/influx/machine.go:7892
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto st40
 		case 11:
 			goto tr92
-		case 13:
-			goto st7
+		case 12:
+			goto st3
 		case 32:
 			goto st40
 		case 34:
@@ -7758,8 +7907,8 @@ tr92:
 		case 92:
 			goto tr94
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st40
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr90
 tr86:
@@ -7783,14 +7932,14 @@ tr80:
 			goto _test_eof77
 		}
 	st_case_77:
-//line plugins/parsers/influx/machine.go:7787
+//line plugins/parsers/influx/machine.go:7936
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr151
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -7802,8 +7951,8 @@ tr80:
 		case 92:
 			goto tr153
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr150
 tr150:
@@ -7817,14 +7966,14 @@ tr150:
 			goto _test_eof78
 		}
 	st_case_78:
-//line plugins/parsers/influx/machine.go:7821
+//line plugins/parsers/influx/machine.go:7970
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr155
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -7836,8 +7985,8 @@ tr150:
 		case 92:
 			goto st128
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st78
 tr155:
@@ -7861,14 +8010,14 @@ tr151:
 			goto _test_eof79
 		}
 	st_case_79:
-//line plugins/parsers/influx/machine.go:7865
+//line plugins/parsers/influx/machine.go:8014
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr151
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -7880,8 +8029,8 @@ tr151:
 		case 92:
 			goto tr153
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr150
 tr152:
@@ -7893,146 +8042,146 @@ tr152:
 
 	m.handler.AddString(key, m.text())
 
-	goto st300
+	goto st299
 tr156:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
+	goto st299
+	st299:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof299
+		}
+	st_case_299:
+//line plugins/parsers/influx/machine.go:8058
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr456
+		case 13:
+			goto tr330
+		case 32:
+			goto tr455
+		case 44:
+			goto tr457
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr455
+		}
+		goto st25
+tr455:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st300
+tr487:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st300
+tr539:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st300
+tr545:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st300
+tr549:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st300
+tr553:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st300
+tr764:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st300
+tr773:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st300
+tr778:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st300
+tr783:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
 	goto st300
 	st300:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof300
 		}
 	st_case_300:
-//line plugins/parsers/influx/machine.go:7909
+//line plugins/parsers/influx/machine.go:8176
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr463
+			goto tr459
 		case 13:
 			goto tr330
 		case 32:
-			goto tr462
-		case 44:
-			goto tr464
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr462
-		}
-		goto st25
-tr462:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st301
-tr494:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st301
-tr546:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st301
-tr552:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st301
-tr556:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st301
-tr560:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st301
-tr775:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st301
-tr796:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st301
-tr800:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st301
-tr804:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st301
-	st301:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof301
-		}
-	st_case_301:
-//line plugins/parsers/influx/machine.go:8027
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr466
-		case 13:
-			goto tr330
-		case 32:
-			goto st301
+			goto st300
 		case 44:
 			goto tr99
 		case 45:
@@ -8048,30 +8197,30 @@ tr804:
 				goto tr378
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st301
+			goto st300
 		}
 		goto tr9
-tr466:
+tr459:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st302
-	st302:
+	goto st301
+	st301:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof302
+			goto _test_eof301
 		}
-	st_case_302:
-//line plugins/parsers/influx/machine.go:8066
+	st_case_301:
+//line plugins/parsers/influx/machine.go:8215
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr466
+			goto tr459
 		case 13:
 			goto tr330
 		case 32:
-			goto st301
+			goto st300
 		case 44:
 			goto tr99
 		case 45:
@@ -8087,16 +8236,16 @@ tr466:
 				goto tr378
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st301
+			goto st300
 		}
 		goto tr9
-tr463:
+tr456:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st303
-tr467:
+	goto st302
+tr460:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8105,26 +8254,26 @@ tr467:
 
 	m.pb = m.p
 
-	goto st303
-	st303:
+	goto st302
+	st302:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof303
+			goto _test_eof302
 		}
-	st_case_303:
-//line plugins/parsers/influx/machine.go:8115
+	st_case_302:
+//line plugins/parsers/influx/machine.go:8264
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr467
+			goto tr460
 		case 13:
 			goto tr330
 		case 32:
-			goto tr462
+			goto tr455
 		case 44:
 			goto tr7
 		case 45:
-			goto tr468
+			goto tr461
 		case 61:
 			goto tr47
 		case 92:
@@ -8133,13 +8282,13 @@ tr467:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr469
+				goto tr462
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr462
+			goto tr455
 		}
 		goto tr42
-tr468:
+tr461:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -8150,7 +8299,7 @@ tr468:
 			goto _test_eof80
 		}
 	st_case_80:
-//line plugins/parsers/influx/machine.go:8154
+//line plugins/parsers/influx/machine.go:8303
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr99
@@ -8170,33 +8319,33 @@ tr468:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st304
+				goto st303
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st25
-tr469:
+tr462:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st304
-	st304:
+	goto st303
+	st303:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof304
+			goto _test_eof303
 		}
-	st_case_304:
-//line plugins/parsers/influx/machine.go:8191
+	st_case_303:
+//line plugins/parsers/influx/machine.go:8340
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8207,25 +8356,25 @@ tr469:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st308
+				goto st307
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
-tr475:
+tr468:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st305
-tr503:
+	goto st304
+tr496:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st305
-tr470:
+	goto st304
+tr463:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8234,8 +8383,8 @@ tr470:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st305
-tr500:
+	goto st304
+tr493:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8244,22 +8393,22 @@ tr500:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st305
-	st305:
+	goto st304
+	st304:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof305
+			goto _test_eof304
 		}
-	st_case_305:
-//line plugins/parsers/influx/machine.go:8254
+	st_case_304:
+//line plugins/parsers/influx/machine.go:8403
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr474
+			goto tr467
 		case 13:
 			goto tr330
 		case 32:
-			goto st305
+			goto st304
 		case 44:
 			goto tr5
 		case 61:
@@ -8268,30 +8417,30 @@ tr500:
 			goto tr12
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st305
+			goto st304
 		}
 		goto tr9
-tr474:
+tr467:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st306
-	st306:
+	goto st305
+	st305:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof306
+			goto _test_eof305
 		}
-	st_case_306:
-//line plugins/parsers/influx/machine.go:8286
+	st_case_305:
+//line plugins/parsers/influx/machine.go:8435
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr474
+			goto tr467
 		case 13:
 			goto tr330
 		case 32:
-			goto st305
+			goto st304
 		case 44:
 			goto tr5
 		case 61:
@@ -8300,10 +8449,10 @@ tr474:
 			goto tr12
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st305
+			goto st304
 		}
 		goto tr9
-tr476:
+tr469:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8312,8 +8461,8 @@ tr476:
 
 	m.pb = m.p
 
-	goto st307
-tr471:
+	goto st306
+tr464:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8322,22 +8471,22 @@ tr471:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st307
-	st307:
+	goto st306
+	st306:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof307
+			goto _test_eof306
 		}
-	st_case_307:
-//line plugins/parsers/influx/machine.go:8332
+	st_case_306:
+//line plugins/parsers/influx/machine.go:8481
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr476
+			goto tr469
 		case 13:
 			goto tr330
 		case 32:
-			goto tr475
+			goto tr468
 		case 44:
 			goto tr7
 		case 61:
@@ -8346,7 +8495,7 @@ tr471:
 			goto tr44
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr475
+			goto tr468
 		}
 		goto tr42
 tr44:
@@ -8360,7 +8509,7 @@ tr44:
 			goto _test_eof81
 		}
 	st_case_81:
-//line plugins/parsers/influx/machine.go:8364
+//line plugins/parsers/influx/machine.go:8513
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -8370,6 +8519,36 @@ tr44:
 			goto tr5
 		}
 		goto st25
+	st307:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof307
+		}
+	st_case_307:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr464
+		case 13:
+			goto tr335
+		case 32:
+			goto tr463
+		case 44:
+			goto tr7
+		case 61:
+			goto tr47
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st308
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr463
+		}
+		goto st25
 	st308:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof308
@@ -8379,11 +8558,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8397,7 +8576,7 @@ tr44:
 				goto st309
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st309:
@@ -8409,11 +8588,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8427,7 +8606,7 @@ tr44:
 				goto st310
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st310:
@@ -8439,11 +8618,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8457,7 +8636,7 @@ tr44:
 				goto st311
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st311:
@@ -8469,11 +8648,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8487,7 +8666,7 @@ tr44:
 				goto st312
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st312:
@@ -8499,11 +8678,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8517,7 +8696,7 @@ tr44:
 				goto st313
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st313:
@@ -8529,11 +8708,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8547,7 +8726,7 @@ tr44:
 				goto st314
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st314:
@@ -8559,11 +8738,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8577,7 +8756,7 @@ tr44:
 				goto st315
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st315:
@@ -8589,11 +8768,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8607,7 +8786,7 @@ tr44:
 				goto st316
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st316:
@@ -8619,11 +8798,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8637,7 +8816,7 @@ tr44:
 				goto st317
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st317:
@@ -8649,11 +8828,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8667,7 +8846,7 @@ tr44:
 				goto st318
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st318:
@@ -8679,11 +8858,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8697,7 +8876,7 @@ tr44:
 				goto st319
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st319:
@@ -8709,11 +8888,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8727,7 +8906,7 @@ tr44:
 				goto st320
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st320:
@@ -8739,11 +8918,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8757,7 +8936,7 @@ tr44:
 				goto st321
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st321:
@@ -8769,11 +8948,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8787,7 +8966,7 @@ tr44:
 				goto st322
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st322:
@@ -8799,11 +8978,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8817,7 +8996,7 @@ tr44:
 				goto st323
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st323:
@@ -8829,11 +9008,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8847,7 +9026,7 @@ tr44:
 				goto st324
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr470
+			goto tr463
 		}
 		goto st25
 	st324:
@@ -8859,41 +9038,11 @@ tr44:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr471
+			goto tr464
 		case 13:
 			goto tr335
 		case 32:
-			goto tr470
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st325
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr470
-		}
-		goto st25
-	st325:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof325
-		}
-	st_case_325:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr471
-		case 13:
-			goto tr335
-		case 32:
-			goto tr470
+			goto tr463
 		case 44:
 			goto tr7
 		case 61:
@@ -8902,22 +9051,22 @@ tr44:
 			goto st81
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr470
+			goto tr463
 		}
 		goto st25
-tr464:
+tr457:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
 	goto st82
-tr496:
+tr489:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
 	goto st82
-tr548:
+tr541:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8927,7 +9076,7 @@ tr548:
 	m.handler.AddFloat(key, m.text())
 
 	goto st82
-tr554:
+tr547:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8937,7 +9086,7 @@ tr554:
 	m.handler.AddInt(key, m.text())
 
 	goto st82
-tr558:
+tr551:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8947,7 +9096,7 @@ tr558:
 	m.handler.AddUint(key, m.text())
 
 	goto st82
-tr562:
+tr555:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8957,7 +9106,7 @@ tr562:
 	m.handler.AddBool(key, m.text())
 
 	goto st82
-tr777:
+tr770:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8967,7 +9116,7 @@ tr777:
 	m.handler.AddFloat(key, m.text())
 
 	goto st82
-tr798:
+tr793:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8977,7 +9126,7 @@ tr798:
 	m.handler.AddInt(key, m.text())
 
 	goto st82
-tr802:
+tr796:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8987,7 +9136,7 @@ tr802:
 	m.handler.AddUint(key, m.text())
 
 	goto st82
-tr806:
+tr799:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9002,7 +9151,7 @@ tr806:
 			goto _test_eof82
 		}
 	st_case_82:
-//line plugins/parsers/influx/machine.go:9006
+//line plugins/parsers/influx/machine.go:9155
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9033,7 +9182,7 @@ tr160:
 			goto _test_eof83
 		}
 	st_case_83:
-//line plugins/parsers/influx/machine.go:9037
+//line plugins/parsers/influx/machine.go:9186
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9068,7 +9217,7 @@ tr163:
 			goto _test_eof84
 		}
 	st_case_84:
-//line plugins/parsers/influx/machine.go:9072
+//line plugins/parsers/influx/machine.go:9221
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr59
@@ -9119,14 +9268,14 @@ tr165:
 			goto _test_eof85
 		}
 	st_case_85:
-//line plugins/parsers/influx/machine.go:9123
+//line plugins/parsers/influx/machine.go:9272
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr25
+		case 9:
+			goto tr175
 		case 11:
 			goto tr176
-		case 13:
-			goto tr25
+		case 12:
+			goto tr58
 		case 32:
 			goto tr175
 		case 34:
@@ -9138,8 +9287,8 @@ tr165:
 		case 92:
 			goto tr179
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr175
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr174
 tr174:
@@ -9153,14 +9302,14 @@ tr174:
 			goto _test_eof86
 		}
 	st_case_86:
-//line plugins/parsers/influx/machine.go:9157
+//line plugins/parsers/influx/machine.go:9306
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -9172,8 +9321,8 @@ tr174:
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 tr181:
@@ -9197,14 +9346,14 @@ tr175:
 			goto _test_eof87
 		}
 	st_case_87:
-//line plugins/parsers/influx/machine.go:9201
+//line plugins/parsers/influx/machine.go:9350
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto st87
 		case 11:
 			goto tr188
-		case 13:
-			goto st7
+		case 12:
+			goto st3
 		case 32:
 			goto st87
 		case 34:
@@ -9216,8 +9365,8 @@ tr175:
 		case 92:
 			goto tr189
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st87
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr186
 tr186:
@@ -9231,8 +9380,12 @@ tr186:
 			goto _test_eof88
 		}
 	st_case_88:
-//line plugins/parsers/influx/machine.go:9235
+//line plugins/parsers/influx/machine.go:9384
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
 			goto st7
 		case 34:
@@ -9244,13 +9397,8 @@ tr186:
 		case 92:
 			goto st90
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st88
 tr191:
@@ -9264,8 +9412,10 @@ tr191:
 			goto _test_eof89
 		}
 	st_case_89:
-//line plugins/parsers/influx/machine.go:9268
+//line plugins/parsers/influx/machine.go:9416
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
 			goto tr101
 		case 45:
@@ -9285,8 +9435,13 @@ tr191:
 		case 116:
 			goto tr130
 		}
-		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto tr126
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr126
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
 tr189:
@@ -9300,7 +9455,7 @@ tr189:
 			goto _test_eof90
 		}
 	st_case_90:
-//line plugins/parsers/influx/machine.go:9304
+//line plugins/parsers/influx/machine.go:9459
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st88
@@ -9327,14 +9482,14 @@ tr188:
 			goto _test_eof91
 		}
 	st_case_91:
-//line plugins/parsers/influx/machine.go:9331
+//line plugins/parsers/influx/machine.go:9486
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto st87
 		case 11:
 			goto tr188
-		case 13:
-			goto st7
+		case 12:
+			goto st3
 		case 32:
 			goto st87
 		case 34:
@@ -9346,8 +9501,8 @@ tr188:
 		case 92:
 			goto tr189
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st87
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto tr186
 tr182:
@@ -9371,14 +9526,14 @@ tr176:
 			goto _test_eof92
 		}
 	st_case_92:
-//line plugins/parsers/influx/machine.go:9375
+//line plugins/parsers/influx/machine.go:9530
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr194
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -9390,8 +9545,8 @@ tr176:
 		case 92:
 			goto tr196
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr193
 tr193:
@@ -9405,14 +9560,14 @@ tr193:
 			goto _test_eof93
 		}
 	st_case_93:
-//line plugins/parsers/influx/machine.go:9409
+//line plugins/parsers/influx/machine.go:9564
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr198
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -9424,8 +9579,8 @@ tr193:
 		case 92:
 			goto st102
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st93
 tr198:
@@ -9449,14 +9604,14 @@ tr194:
 			goto _test_eof94
 		}
 	st_case_94:
-//line plugins/parsers/influx/machine.go:9453
+//line plugins/parsers/influx/machine.go:9608
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr194
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -9468,8 +9623,8 @@ tr194:
 		case 92:
 			goto tr196
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr193
 tr195:
@@ -9481,46 +9636,46 @@ tr195:
 
 	m.handler.AddString(key, m.text())
 
-	goto st326
+	goto st325
 tr199:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st326
-	st326:
+	goto st325
+	st325:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof326
+			goto _test_eof325
 		}
-	st_case_326:
-//line plugins/parsers/influx/machine.go:9497
+	st_case_325:
+//line plugins/parsers/influx/machine.go:9652
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr495
+			goto tr488
 		case 13:
 			goto tr330
 		case 32:
-			goto tr494
+			goto tr487
 		case 44:
-			goto tr496
+			goto tr489
 		case 61:
 			goto tr14
 		case 92:
 			goto st34
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr494
+			goto tr487
 		}
 		goto st32
-tr495:
+tr488:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st327
-tr497:
+	goto st326
+tr490:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9529,26 +9684,26 @@ tr497:
 
 	m.pb = m.p
 
-	goto st327
-	st327:
+	goto st326
+	st326:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof327
+			goto _test_eof326
 		}
-	st_case_327:
-//line plugins/parsers/influx/machine.go:9539
+	st_case_326:
+//line plugins/parsers/influx/machine.go:9694
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr497
+			goto tr490
 		case 13:
 			goto tr330
 		case 32:
-			goto tr494
+			goto tr487
 		case 44:
 			goto tr61
 		case 45:
-			goto tr498
+			goto tr491
 		case 61:
 			goto tr14
 		case 92:
@@ -9557,13 +9712,13 @@ tr497:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr499
+				goto tr492
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr494
+			goto tr487
 		}
 		goto tr63
-tr498:
+tr491:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9574,7 +9729,7 @@ tr498:
 			goto _test_eof95
 		}
 	st_case_95:
-//line plugins/parsers/influx/machine.go:9578
+//line plugins/parsers/influx/machine.go:9733
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr201
@@ -9594,33 +9749,109 @@ tr498:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st328
+				goto st327
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st32
-tr499:
+tr492:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st327
+	st327:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof327
+		}
+	st_case_327:
+//line plugins/parsers/influx/machine.go:9770
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr494
+		case 13:
+			goto tr335
+		case 32:
+			goto tr493
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto st34
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st329
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr493
+		}
+		goto st32
+tr497:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st328
+tr494:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st328
 	st328:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof328
 		}
 	st_case_328:
-//line plugins/parsers/influx/machine.go:9615
+//line plugins/parsers/influx/machine.go:9821
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr497
+		case 13:
+			goto tr330
+		case 32:
+			goto tr496
+		case 44:
+			goto tr61
+		case 61:
+			goto tr14
+		case 92:
+			goto tr65
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr496
+		}
+		goto tr63
+	st329:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof329
+		}
+	st_case_329:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9634,55 +9865,9 @@ tr499:
 				goto st330
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
-tr504:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st329
-tr501:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st329
-	st329:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof329
-		}
-	st_case_329:
-//line plugins/parsers/influx/machine.go:9666
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr504
-		case 13:
-			goto tr330
-		case 32:
-			goto tr503
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto tr65
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr503
-		}
-		goto tr63
 	st330:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof330
@@ -9692,11 +9877,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9710,7 +9895,7 @@ tr501:
 				goto st331
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st331:
@@ -9722,11 +9907,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9740,7 +9925,7 @@ tr501:
 				goto st332
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st332:
@@ -9752,11 +9937,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9770,7 +9955,7 @@ tr501:
 				goto st333
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st333:
@@ -9782,11 +9967,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9800,7 +9985,7 @@ tr501:
 				goto st334
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st334:
@@ -9812,11 +9997,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9830,7 +10015,7 @@ tr501:
 				goto st335
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st335:
@@ -9842,11 +10027,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9860,7 +10045,7 @@ tr501:
 				goto st336
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st336:
@@ -9872,11 +10057,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9890,7 +10075,7 @@ tr501:
 				goto st337
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st337:
@@ -9902,11 +10087,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9920,7 +10105,7 @@ tr501:
 				goto st338
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st338:
@@ -9932,11 +10117,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9950,7 +10135,7 @@ tr501:
 				goto st339
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st339:
@@ -9962,11 +10147,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -9980,7 +10165,7 @@ tr501:
 				goto st340
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st340:
@@ -9992,11 +10177,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10010,7 +10195,7 @@ tr501:
 				goto st341
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st341:
@@ -10022,11 +10207,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10040,7 +10225,7 @@ tr501:
 				goto st342
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st342:
@@ -10052,11 +10237,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10070,7 +10255,7 @@ tr501:
 				goto st343
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st343:
@@ -10082,11 +10267,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10100,7 +10285,7 @@ tr501:
 				goto st344
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st344:
@@ -10112,11 +10297,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10130,7 +10315,7 @@ tr501:
 				goto st345
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st345:
@@ -10142,11 +10327,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10160,7 +10345,7 @@ tr501:
 				goto st346
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr500
+			goto tr493
 		}
 		goto st32
 	st346:
@@ -10172,41 +10357,11 @@ tr501:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr501
+			goto tr494
 		case 13:
 			goto tr335
 		case 32:
-			goto tr500
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st347
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr500
-		}
-		goto st32
-	st347:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof347
-		}
-	st_case_347:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr501
-		case 13:
-			goto tr335
-		case 32:
-			goto tr500
+			goto tr493
 		case 44:
 			goto tr61
 		case 61:
@@ -10215,7 +10370,7 @@ tr501:
 			goto st34
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr500
+			goto tr493
 		}
 		goto st32
 tr184:
@@ -10239,8 +10394,12 @@ tr178:
 			goto _test_eof96
 		}
 	st_case_96:
-//line plugins/parsers/influx/machine.go:10243
+//line plugins/parsers/influx/machine.go:10398
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -10252,13 +10411,8 @@ tr178:
 		case 92:
 			goto tr205
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr203
 tr203:
@@ -10272,8 +10426,12 @@ tr203:
 			goto _test_eof97
 		}
 	st_case_97:
-//line plugins/parsers/influx/machine.go:10276
+//line plugins/parsers/influx/machine.go:10430
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -10285,13 +10443,8 @@ tr203:
 		case 92:
 			goto st101
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st97
 tr204:
@@ -10303,24 +10456,24 @@ tr204:
 
 	m.handler.AddString(key, m.text())
 
-	goto st348
+	goto st347
 tr207:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st348
-	st348:
+	goto st347
+	st347:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof348
+			goto _test_eof347
 		}
-	st_case_348:
-//line plugins/parsers/influx/machine.go:10319
+	st_case_347:
+//line plugins/parsers/influx/machine.go:10472
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st349
+			goto st348
 		case 13:
 			goto tr330
 		case 32:
@@ -10336,16 +10489,16 @@ tr207:
 			goto st192
 		}
 		goto st28
-	st349:
+	st348:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof349
+			goto _test_eof348
 		}
-	st_case_349:
+	st_case_348:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st349
+			goto st348
 		case 13:
 			goto tr330
 		case 32:
@@ -10353,7 +10506,7 @@ tr207:
 		case 44:
 			goto tr210
 		case 45:
-			goto tr523
+			goto tr516
 		case 61:
 			goto tr53
 		case 92:
@@ -10362,13 +10515,13 @@ tr207:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr524
+				goto tr517
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st192
 		}
 		goto st28
-tr523:
+tr516:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10379,7 +10532,7 @@ tr523:
 			goto _test_eof98
 		}
 	st_case_98:
-//line plugins/parsers/influx/machine.go:10383
+//line plugins/parsers/influx/machine.go:10536
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr210
@@ -10397,29 +10550,91 @@ tr523:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st350
+				goto st349
 			}
 		default:
 			goto tr210
 		}
 		goto st28
-tr524:
+tr517:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st349
+	st349:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof349
+		}
+	st_case_349:
+//line plugins/parsers/influx/machine.go:10571
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr518
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr210
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st351
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st28
+tr518:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st350
 	st350:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof350
 		}
 	st_case_350:
-//line plugins/parsers/influx/machine.go:10418
+//line plugins/parsers/influx/machine.go:10608
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st350
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr50
+		case 61:
+			goto tr53
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st28
+	st351:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof351
+		}
+	st_case_351:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10440,38 +10655,6 @@ tr524:
 			goto tr334
 		}
 		goto st28
-tr525:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st351
-	st351:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof351
-		}
-	st_case_351:
-//line plugins/parsers/influx/machine.go:10455
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st351
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr50
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st28
 	st352:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof352
@@ -10481,7 +10664,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10511,7 +10694,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10541,7 +10724,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10571,7 +10754,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10601,7 +10784,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10631,7 +10814,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10661,7 +10844,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10691,7 +10874,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10721,7 +10904,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10751,7 +10934,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10781,7 +10964,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10811,7 +10994,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10841,7 +11024,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10871,7 +11054,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10901,7 +11084,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10931,7 +11114,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -10961,37 +11144,7 @@ tr525:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr525
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st369
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st369:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof369
-		}
-	st_case_369:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr525
+			goto tr518
 		case 13:
 			goto tr335
 		case 32:
@@ -11018,8 +11171,12 @@ tr208:
 			goto _test_eof99
 		}
 	st_case_99:
-//line plugins/parsers/influx/machine.go:11022
+//line plugins/parsers/influx/machine.go:11175
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -11031,13 +11188,8 @@ tr208:
 		case 92:
 			goto tr179
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr174
 tr177:
@@ -11049,46 +11201,46 @@ tr177:
 
 	m.handler.AddString(key, m.text())
 
-	goto st370
+	goto st369
 tr183:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st370
-	st370:
+	goto st369
+	st369:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof370
+			goto _test_eof369
 		}
-	st_case_370:
-//line plugins/parsers/influx/machine.go:11065
+	st_case_369:
+//line plugins/parsers/influx/machine.go:11217
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr545
+			goto tr538
 		case 13:
 			goto tr330
 		case 32:
-			goto tr494
+			goto tr487
 		case 44:
-			goto tr496
+			goto tr489
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr494
+			goto tr487
 		}
 		goto st30
-tr545:
+tr538:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st371
-tr547:
+	goto st370
+tr540:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11097,8 +11249,8 @@ tr547:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st371
-tr553:
+	goto st370
+tr546:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11107,8 +11259,8 @@ tr553:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st371
-tr557:
+	goto st370
+tr550:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11117,8 +11269,8 @@ tr557:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st371
-tr561:
+	goto st370
+tr554:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11127,26 +11279,26 @@ tr561:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st371
-	st371:
+	goto st370
+	st370:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof371
+			goto _test_eof370
 		}
-	st_case_371:
-//line plugins/parsers/influx/machine.go:11137
+	st_case_370:
+//line plugins/parsers/influx/machine.go:11289
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr497
+			goto tr490
 		case 13:
 			goto tr330
 		case 32:
-			goto tr494
+			goto tr487
 		case 44:
 			goto tr61
 		case 45:
-			goto tr498
+			goto tr491
 		case 61:
 			goto tr201
 		case 92:
@@ -11155,10 +11307,10 @@ tr561:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr499
+				goto tr492
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr494
+			goto tr487
 		}
 		goto tr63
 tr179:
@@ -11172,7 +11324,7 @@ tr179:
 			goto _test_eof100
 		}
 	st_case_100:
-//line plugins/parsers/influx/machine.go:11176
+//line plugins/parsers/influx/machine.go:11328
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st86
@@ -11199,7 +11351,7 @@ tr205:
 			goto _test_eof101
 		}
 	st_case_101:
-//line plugins/parsers/influx/machine.go:11203
+//line plugins/parsers/influx/machine.go:11355
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st97
@@ -11226,7 +11378,7 @@ tr196:
 			goto _test_eof102
 		}
 	st_case_102:
-//line plugins/parsers/influx/machine.go:11230
+//line plugins/parsers/influx/machine.go:11382
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st93
@@ -11253,7 +11405,7 @@ tr166:
 			goto _test_eof103
 		}
 	st_case_103:
-//line plugins/parsers/influx/machine.go:11257
+//line plugins/parsers/influx/machine.go:11409
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr59
@@ -11266,7 +11418,7 @@ tr166:
 		case 44:
 			goto tr61
 		case 48:
-			goto st372
+			goto st371
 		case 61:
 			goto tr59
 		case 92:
@@ -11275,30 +11427,30 @@ tr166:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st376
+				goto st375
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st30
-	st372:
+	st371:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof372
+			goto _test_eof371
 		}
-	st_case_372:
+	st_case_371:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr547
+			goto tr540
 		case 13:
 			goto tr356
 		case 32:
-			goto tr546
+			goto tr539
 		case 44:
-			goto tr548
+			goto tr541
 		case 46:
-			goto st373
+			goto st372
 		case 61:
 			goto tr201
 		case 69:
@@ -11308,10 +11460,10 @@ tr166:
 		case 101:
 			goto st104
 		case 105:
-			goto st375
+			goto st374
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr546
+			goto tr539
 		}
 		goto st30
 tr167:
@@ -11319,24 +11471,24 @@ tr167:
 
 	m.pb = m.p
 
-	goto st373
-	st373:
+	goto st372
+	st372:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof373
+			goto _test_eof372
 		}
-	st_case_373:
-//line plugins/parsers/influx/machine.go:11329
+	st_case_372:
+//line plugins/parsers/influx/machine.go:11481
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr547
+			goto tr540
 		case 13:
 			goto tr356
 		case 32:
-			goto tr546
+			goto tr539
 		case 44:
-			goto tr548
+			goto tr541
 		case 61:
 			goto tr201
 		case 69:
@@ -11349,10 +11501,10 @@ tr167:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st373
+				goto st372
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr546
+			goto tr539
 		}
 		goto st30
 	st104:
@@ -11385,7 +11537,7 @@ tr167:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st374
+				goto st373
 			}
 		default:
 			goto st105
@@ -11415,12 +11567,42 @@ tr167:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st374
+				goto st373
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr58
 		}
 		goto st30
+	st373:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof373
+		}
+	st_case_373:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr540
+		case 13:
+			goto tr356
+		case 32:
+			goto tr539
+		case 44:
+			goto tr541
+		case 61:
+			goto tr201
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st373
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr539
+		}
+		goto st30
 	st374:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof374
@@ -11428,27 +11610,22 @@ tr167:
 	st_case_374:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr362
 		case 11:
-			goto tr547
-		case 13:
-			goto tr356
-		case 32:
 			goto tr546
+		case 13:
+			goto tr362
+		case 32:
+			goto tr545
 		case 44:
-			goto tr548
+			goto tr547
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st374
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr546
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr545
 		}
 		goto st30
 	st375:
@@ -11456,44 +11633,19 @@ tr167:
 			goto _test_eof375
 		}
 	st_case_375:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
-		case 11:
-			goto tr553
-		case 13:
-			goto tr362
-		case 32:
-			goto tr552
-		case 44:
-			goto tr554
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr552
-		}
-		goto st30
-	st376:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof376
-		}
-	st_case_376:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr547
+			goto tr540
 		case 13:
 			goto tr356
 		case 32:
-			goto tr546
+			goto tr539
 		case 44:
-			goto tr548
+			goto tr541
 		case 46:
-			goto st373
+			goto st372
 		case 61:
 			goto tr201
 		case 69:
@@ -11503,15 +11655,15 @@ tr167:
 		case 101:
 			goto st104
 		case 105:
-			goto st375
+			goto st374
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st376
+				goto st375
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr546
+			goto tr539
 		}
 		goto st30
 tr168:
@@ -11519,26 +11671,26 @@ tr168:
 
 	m.pb = m.p
 
-	goto st377
-	st377:
+	goto st376
+	st376:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof377
+			goto _test_eof376
 		}
-	st_case_377:
-//line plugins/parsers/influx/machine.go:11529
+	st_case_376:
+//line plugins/parsers/influx/machine.go:11681
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr547
+			goto tr540
 		case 13:
 			goto tr356
 		case 32:
-			goto tr546
+			goto tr539
 		case 44:
-			goto tr548
+			goto tr541
 		case 46:
-			goto st373
+			goto st372
 		case 61:
 			goto tr201
 		case 69:
@@ -11548,37 +11700,37 @@ tr168:
 		case 101:
 			goto st104
 		case 105:
-			goto st375
+			goto st374
 		case 117:
-			goto st378
+			goto st377
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr546
+			goto tr539
 		}
 		goto st30
-	st378:
+	st377:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof378
+			goto _test_eof377
 		}
-	st_case_378:
+	st_case_377:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr366
 		case 11:
-			goto tr557
+			goto tr550
 		case 13:
 			goto tr366
 		case 32:
-			goto tr556
+			goto tr549
 		case 44:
-			goto tr558
+			goto tr551
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr556
+			goto tr549
 		}
 		goto st30
 tr169:
@@ -11586,71 +11738,71 @@ tr169:
 
 	m.pb = m.p
 
+	goto st378
+	st378:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof378
+		}
+	st_case_378:
+//line plugins/parsers/influx/machine.go:11748
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr356
+		case 11:
+			goto tr540
+		case 13:
+			goto tr356
+		case 32:
+			goto tr539
+		case 44:
+			goto tr541
+		case 46:
+			goto st372
+		case 61:
+			goto tr201
+		case 69:
+			goto st104
+		case 92:
+			goto st35
+		case 101:
+			goto st104
+		case 105:
+			goto st374
+		case 117:
+			goto st377
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st378
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr539
+		}
+		goto st30
+tr170:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st379
 	st379:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof379
 		}
 	st_case_379:
-//line plugins/parsers/influx/machine.go:11596
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr547
-		case 13:
-			goto tr356
-		case 32:
-			goto tr546
-		case 44:
-			goto tr548
-		case 46:
-			goto st373
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		case 105:
-			goto st375
-		case 117:
-			goto st378
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st379
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr546
-		}
-		goto st30
-tr170:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st380
-	st380:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof380
-		}
-	st_case_380:
-//line plugins/parsers/influx/machine.go:11643
+//line plugins/parsers/influx/machine.go:11795
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr561
+			goto tr554
 		case 13:
 			goto tr370
 		case 32:
-			goto tr560
+			goto tr553
 		case 44:
-			goto tr562
+			goto tr555
 		case 61:
 			goto tr201
 		case 65:
@@ -11661,7 +11813,7 @@ tr170:
 			goto st109
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr560
+			goto tr553
 		}
 		goto st30
 	st106:
@@ -11737,7 +11889,7 @@ tr170:
 		case 61:
 			goto tr59
 		case 69:
-			goto st381
+			goto st380
 		case 92:
 			goto st35
 		}
@@ -11745,29 +11897,29 @@ tr170:
 			goto tr58
 		}
 		goto st30
-	st381:
+	st380:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof381
+			goto _test_eof380
 		}
-	st_case_381:
+	st_case_380:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr561
+			goto tr554
 		case 13:
 			goto tr370
 		case 32:
-			goto tr560
+			goto tr553
 		case 44:
-			goto tr562
+			goto tr555
 		case 61:
 			goto tr201
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr560
+			goto tr553
 		}
 		goto st30
 	st109:
@@ -11845,7 +11997,7 @@ tr170:
 		case 92:
 			goto st35
 		case 101:
-			goto st381
+			goto st380
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr58
@@ -11856,24 +12008,24 @@ tr171:
 
 	m.pb = m.p
 
-	goto st382
-	st382:
+	goto st381
+	st381:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof382
+			goto _test_eof381
 		}
-	st_case_382:
-//line plugins/parsers/influx/machine.go:11866
+	st_case_381:
+//line plugins/parsers/influx/machine.go:12018
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr561
+			goto tr554
 		case 13:
 			goto tr370
 		case 32:
-			goto tr560
+			goto tr553
 		case 44:
-			goto tr562
+			goto tr555
 		case 61:
 			goto tr201
 		case 82:
@@ -11884,7 +12036,7 @@ tr171:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr560
+			goto tr553
 		}
 		goto st30
 	st112:
@@ -11946,24 +12098,24 @@ tr172:
 
 	m.pb = m.p
 
-	goto st383
-	st383:
+	goto st382
+	st382:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof383
+			goto _test_eof382
 		}
-	st_case_383:
-//line plugins/parsers/influx/machine.go:11956
+	st_case_382:
+//line plugins/parsers/influx/machine.go:12108
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr561
+			goto tr554
 		case 13:
 			goto tr370
 		case 32:
-			goto tr560
+			goto tr553
 		case 44:
-			goto tr562
+			goto tr555
 		case 61:
 			goto tr201
 		case 92:
@@ -11972,7 +12124,7 @@ tr172:
 			goto st109
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr560
+			goto tr553
 		}
 		goto st30
 tr173:
@@ -11980,24 +12132,24 @@ tr173:
 
 	m.pb = m.p
 
-	goto st384
-	st384:
+	goto st383
+	st383:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof384
+			goto _test_eof383
 		}
-	st_case_384:
-//line plugins/parsers/influx/machine.go:11990
+	st_case_383:
+//line plugins/parsers/influx/machine.go:12142
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr561
+			goto tr554
 		case 13:
 			goto tr370
 		case 32:
-			goto tr560
+			goto tr553
 		case 44:
-			goto tr562
+			goto tr555
 		case 61:
 			goto tr201
 		case 92:
@@ -12006,7 +12158,7 @@ tr173:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr560
+			goto tr553
 		}
 		goto st30
 tr161:
@@ -12020,7 +12172,7 @@ tr161:
 			goto _test_eof114
 		}
 	st_case_114:
-//line plugins/parsers/influx/machine.go:12024
+//line plugins/parsers/influx/machine.go:12176
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -12057,8 +12209,12 @@ tr231:
 			goto _test_eof115
 		}
 	st_case_115:
-//line plugins/parsers/influx/machine.go:12061
+//line plugins/parsers/influx/machine.go:12213
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -12070,13 +12226,8 @@ tr231:
 		case 92:
 			goto tr222
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr221
 tr221:
@@ -12090,8 +12241,12 @@ tr221:
 			goto _test_eof116
 		}
 	st_case_116:
-//line plugins/parsers/influx/machine.go:12094
+//line plugins/parsers/influx/machine.go:12245
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -12103,13 +12258,8 @@ tr221:
 		case 92:
 			goto st124
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st116
 tr224:
@@ -12123,8 +12273,12 @@ tr224:
 			goto _test_eof117
 		}
 	st_case_117:
-//line plugins/parsers/influx/machine.go:12127
+//line plugins/parsers/influx/machine.go:12277
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -12136,13 +12290,8 @@ tr224:
 		case 92:
 			goto tr227
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr226
 tr226:
@@ -12156,14 +12305,14 @@ tr226:
 			goto _test_eof118
 		}
 	st_case_118:
-//line plugins/parsers/influx/machine.go:12160
+//line plugins/parsers/influx/machine.go:12309
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -12175,8 +12324,8 @@ tr226:
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 tr230:
@@ -12190,14 +12339,14 @@ tr230:
 			goto _test_eof119
 		}
 	st_case_119:
-//line plugins/parsers/influx/machine.go:12194
+//line plugins/parsers/influx/machine.go:12343
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr234
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -12209,8 +12358,8 @@ tr230:
 		case 92:
 			goto tr235
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr233
 tr233:
@@ -12224,14 +12373,14 @@ tr233:
 			goto _test_eof120
 		}
 	st_case_120:
-//line plugins/parsers/influx/machine.go:12228
+//line plugins/parsers/influx/machine.go:12377
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr237
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -12243,8 +12392,8 @@ tr233:
 		case 92:
 			goto st122
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st120
 tr237:
@@ -12268,14 +12417,14 @@ tr234:
 			goto _test_eof121
 		}
 	st_case_121:
-//line plugins/parsers/influx/machine.go:12272
+//line plugins/parsers/influx/machine.go:12421
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr234
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -12287,8 +12436,8 @@ tr234:
 		case 92:
 			goto tr235
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr233
 tr235:
@@ -12302,7 +12451,7 @@ tr235:
 			goto _test_eof122
 		}
 	st_case_122:
-//line plugins/parsers/influx/machine.go:12306
+//line plugins/parsers/influx/machine.go:12455
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st120
@@ -12329,7 +12478,7 @@ tr227:
 			goto _test_eof123
 		}
 	st_case_123:
-//line plugins/parsers/influx/machine.go:12333
+//line plugins/parsers/influx/machine.go:12482
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st118
@@ -12356,7 +12505,7 @@ tr222:
 			goto _test_eof124
 		}
 	st_case_124:
-//line plugins/parsers/influx/machine.go:12360
+//line plugins/parsers/influx/machine.go:12509
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st116
@@ -12383,14 +12532,14 @@ tr157:
 			goto _test_eof125
 		}
 	st_case_125:
-//line plugins/parsers/influx/machine.go:12387
+//line plugins/parsers/influx/machine.go:12536
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -12415,12 +12564,12 @@ tr157:
 			goto tr247
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto tr243
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr85
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
 		}
 		goto st39
 tr239:
@@ -12428,40 +12577,40 @@ tr239:
 
 	m.handler.AddString(key, m.text())
 
-	goto st385
-	st385:
+	goto st384
+	st384:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof385
+			goto _test_eof384
 		}
-	st_case_385:
-//line plugins/parsers/influx/machine.go:12438
+	st_case_384:
+//line plugins/parsers/influx/machine.go:12587
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr400
+		case 9:
+			goto tr560
 		case 11:
-			goto tr568
-		case 13:
-			goto tr400
+			goto tr561
+		case 12:
+			goto tr455
 		case 32:
-			goto tr567
+			goto tr560
 		case 34:
 			goto tr81
 		case 44:
-			goto tr569
+			goto tr562
 		case 92:
 			goto tr83
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr567
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr78
-tr594:
+tr587:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st386
-tr567:
+	goto st385
+tr560:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12470,14 +12619,14 @@ tr567:
 
 	m.pb = m.p
 
-	goto st386
-tr728:
+	goto st385
+tr721:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st386
-tr722:
+	goto st385
+tr715:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12486,8 +12635,8 @@ tr722:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st386
-tr754:
+	goto st385
+tr747:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12496,8 +12645,8 @@ tr754:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st386
-tr758:
+	goto st385
+tr751:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12506,18 +12655,18 @@ tr758:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st386
+	goto st385
+tr755:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st385
 tr762:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st386
-tr769:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12526,8 +12675,8 @@ tr769:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st386
-tr778:
+	goto st385
+tr771:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12536,8 +12685,8 @@ tr778:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st386
-tr782:
+	goto st385
+tr776:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12546,8 +12695,8 @@ tr782:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st386
-tr786:
+	goto st385
+tr781:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12556,84 +12705,84 @@ tr786:
 
 	m.handler.AddBool(key, m.text())
 
+	goto st385
+	st385:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof385
+		}
+	st_case_385:
+//line plugins/parsers/influx/machine.go:12715
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st385
+		case 11:
+			goto tr564
+		case 12:
+			goto st300
+		case 32:
+			goto st385
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr565
+		case 61:
+			goto st7
+		case 92:
+			goto tr94
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr566
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
+		}
+		goto tr90
+tr564:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st386
 	st386:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof386
 		}
 	st_case_386:
-//line plugins/parsers/influx/machine.go:12566
+//line plugins/parsers/influx/machine.go:12756
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto st385
 		case 11:
-			goto tr571
-		case 13:
-			goto tr403
+			goto tr564
+		case 12:
+			goto st300
 		case 32:
-			goto st386
+			goto st385
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr572
-		case 61:
-			goto st7
-		case 92:
-			goto tr94
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr573
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st386
-		}
-		goto tr90
-tr571:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st387
-	st387:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof387
-		}
-	st_case_387:
-//line plugins/parsers/influx/machine.go:12607
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto tr571
-		case 13:
-			goto tr403
-		case 32:
-			goto st386
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr572
+			goto tr565
 		case 61:
 			goto tr97
 		case 92:
 			goto tr94
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr573
+				goto tr566
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st386
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr90
-tr572:
+tr565:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12644,8 +12793,12 @@ tr572:
 			goto _test_eof126
 		}
 	st_case_126:
-//line plugins/parsers/influx/machine.go:12648
+//line plugins/parsers/influx/machine.go:12797
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr99
 		case 32:
 			goto st7
 		case 34:
@@ -12658,39 +12811,101 @@ tr572:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto st7
-			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st388
+				goto st387
 			}
-		default:
-			goto st7
+		case ( m.data)[( m.p)] >= 12:
+			goto tr99
 		}
 		goto st41
-tr573:
+tr566:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st387
+	st387:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof387
+		}
+	st_case_387:
+//line plugins/parsers/influx/machine.go:12834
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr404
+		case 11:
+			goto tr567
+		case 12:
+			goto tr334
+		case 32:
+			goto tr404
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st389
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st41
+tr567:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st388
 	st388:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof388
 		}
 	st_case_388:
-//line plugins/parsers/influx/machine.go:12685
+//line plugins/parsers/influx/machine.go:12873
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto st252
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto st388
+		case 12:
+			goto st195
 		case 32:
-			goto tr406
+			goto st252
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr97
+		case 92:
+			goto st75
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
+		}
+		goto st41
+	st389:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof389
+		}
+	st_case_389:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr404
+		case 11:
+			goto tr567
+		case 12:
+			goto tr334
+		case 32:
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12701,46 +12916,12 @@ tr573:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st390
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
-		}
-		goto st41
-tr574:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st389
-	st389:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof389
-		}
-	st_case_389:
-//line plugins/parsers/influx/machine.go:12724
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto st389
-		case 13:
-			goto tr403
-		case 32:
-			goto st253
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st253
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st390:
@@ -12749,14 +12930,14 @@ tr574:
 		}
 	st_case_390:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12767,12 +12948,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st391
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st391:
@@ -12781,14 +12962,14 @@ tr574:
 		}
 	st_case_391:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12799,12 +12980,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st392
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st392:
@@ -12813,14 +12994,14 @@ tr574:
 		}
 	st_case_392:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12831,12 +13012,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st393
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st393:
@@ -12845,14 +13026,14 @@ tr574:
 		}
 	st_case_393:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12863,12 +13044,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st394
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st394:
@@ -12877,14 +13058,14 @@ tr574:
 		}
 	st_case_394:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12895,12 +13076,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st395
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st395:
@@ -12909,14 +13090,14 @@ tr574:
 		}
 	st_case_395:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12927,12 +13108,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st396
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st396:
@@ -12941,14 +13122,14 @@ tr574:
 		}
 	st_case_396:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12959,12 +13140,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st397
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st397:
@@ -12973,14 +13154,14 @@ tr574:
 		}
 	st_case_397:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -12991,12 +13172,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st398
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st398:
@@ -13005,14 +13186,14 @@ tr574:
 		}
 	st_case_398:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13023,12 +13204,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st399
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st399:
@@ -13037,14 +13218,14 @@ tr574:
 		}
 	st_case_399:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13055,12 +13236,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st400
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st400:
@@ -13069,14 +13250,14 @@ tr574:
 		}
 	st_case_400:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13087,12 +13268,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st401
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st401:
@@ -13101,14 +13282,14 @@ tr574:
 		}
 	st_case_401:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13119,12 +13300,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st402
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st402:
@@ -13133,14 +13314,14 @@ tr574:
 		}
 	st_case_402:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13151,12 +13332,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st403
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st403:
@@ -13165,14 +13346,14 @@ tr574:
 		}
 	st_case_403:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13183,12 +13364,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st404
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st404:
@@ -13197,14 +13378,14 @@ tr574:
 		}
 	st_case_404:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13215,12 +13396,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st405
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st405:
@@ -13229,14 +13410,14 @@ tr574:
 		}
 	st_case_405:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13247,12 +13428,12 @@ tr574:
 			goto st75
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st406
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st41
 	st406:
@@ -13261,14 +13442,14 @@ tr574:
 		}
 	st_case_406:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr574
-		case 13:
-			goto tr407
+			goto tr567
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -13278,43 +13459,11 @@ tr574:
 		case 92:
 			goto st75
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st407
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr335
 		}
 		goto st41
-	st407:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof407
-		}
-	st_case_407:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 11:
-			goto tr574
-		case 13:
-			goto tr407
-		case 32:
-			goto tr406
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr406
-		}
-		goto st41
-tr568:
+tr561:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13323,8 +13472,8 @@ tr568:
 
 	m.pb = m.p
 
-	goto st408
-tr770:
+	goto st407
+tr763:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13333,8 +13482,8 @@ tr770:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st408
-tr779:
+	goto st407
+tr772:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13343,8 +13492,8 @@ tr779:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st408
-tr783:
+	goto st407
+tr777:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13353,8 +13502,8 @@ tr783:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st408
-tr787:
+	goto st407
+tr782:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13363,43 +13512,43 @@ tr787:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st408
-	st408:
+	goto st407
+	st407:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof408
+			goto _test_eof407
 		}
-	st_case_408:
-//line plugins/parsers/influx/machine.go:13373
+	st_case_407:
+//line plugins/parsers/influx/machine.go:13522
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr587
 		case 11:
-			goto tr595
-		case 13:
-			goto tr403
+			goto tr588
+		case 12:
+			goto tr455
 		case 32:
-			goto tr594
+			goto tr587
 		case 34:
 			goto tr152
 		case 44:
 			goto tr88
 		case 45:
-			goto tr596
+			goto tr589
 		case 61:
 			goto st39
 		case 92:
 			goto tr153
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr597
+				goto tr590
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr594
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr150
-tr595:
+tr588:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13408,43 +13557,43 @@ tr595:
 
 	m.pb = m.p
 
-	goto st409
-	st409:
+	goto st408
+	st408:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof409
+			goto _test_eof408
 		}
-	st_case_409:
-//line plugins/parsers/influx/machine.go:13418
+	st_case_408:
+//line plugins/parsers/influx/machine.go:13567
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr587
 		case 11:
-			goto tr595
-		case 13:
-			goto tr403
+			goto tr588
+		case 12:
+			goto tr455
 		case 32:
-			goto tr594
+			goto tr587
 		case 34:
 			goto tr152
 		case 44:
 			goto tr88
 		case 45:
-			goto tr596
+			goto tr589
 		case 61:
 			goto tr157
 		case 92:
 			goto tr153
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr597
+				goto tr590
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr594
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr150
-tr596:
+tr589:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13455,14 +13604,14 @@ tr596:
 			goto _test_eof127
 		}
 	st_case_127:
-//line plugins/parsers/influx/machine.go:13459
+//line plugins/parsers/influx/machine.go:13608
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr155
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -13475,100 +13624,100 @@ tr596:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st410
+				goto st409
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr85
+		case ( m.data)[( m.p)] >= 10:
+			goto tr99
 		}
 		goto st78
-tr597:
+tr590:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st409
+	st409:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof409
+		}
+	st_case_409:
+//line plugins/parsers/influx/machine.go:13647
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr591
+		case 11:
+			goto tr592
+		case 12:
+			goto tr463
+		case 32:
+			goto tr591
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st413
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st78
+tr596:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st410
+tr728:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st410
+tr591:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st410
+tr725:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st410
 	st410:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof410
 		}
 	st_case_410:
-//line plugins/parsers/influx/machine.go:13498
+//line plugins/parsers/influx/machine.go:13712
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto st410
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr595
+		case 12:
+			goto st304
 		case 32:
-			goto tr598
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st414
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
-		}
-		goto st78
-tr603:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st411
-tr735:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st411
-tr598:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st411
-tr732:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st411
-	st411:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof411
-		}
-	st_case_411:
-//line plugins/parsers/influx/machine.go:13563
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto tr602
-		case 13:
-			goto tr403
-		case 32:
-			goto st411
+			goto st410
 		case 34:
 			goto tr93
 		case 44:
@@ -13578,31 +13727,31 @@ tr732:
 		case 92:
 			goto tr94
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st411
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr90
-tr602:
+tr595:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st412
-	st412:
+	goto st411
+	st411:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof412
+			goto _test_eof411
 		}
-	st_case_412:
-//line plugins/parsers/influx/machine.go:13597
+	st_case_411:
+//line plugins/parsers/influx/machine.go:13746
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto st410
 		case 11:
-			goto tr602
-		case 13:
-			goto tr403
+			goto tr595
+		case 12:
+			goto st304
 		case 32:
-			goto st411
+			goto st410
 		case 34:
 			goto tr93
 		case 44:
@@ -13612,11 +13761,11 @@ tr602:
 		case 92:
 			goto tr94
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st411
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr90
-tr604:
+tr597:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13625,8 +13774,8 @@ tr604:
 
 	m.pb = m.p
 
-	goto st413
-tr599:
+	goto st412
+tr592:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13635,22 +13784,22 @@ tr599:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st413
-	st413:
+	goto st412
+	st412:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof413
+			goto _test_eof412
 		}
-	st_case_413:
-//line plugins/parsers/influx/machine.go:13645
+	st_case_412:
+//line plugins/parsers/influx/machine.go:13794
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr596
 		case 11:
-			goto tr604
-		case 13:
-			goto tr403
+			goto tr597
+		case 12:
+			goto tr468
 		case 32:
-			goto tr603
+			goto tr596
 		case 34:
 			goto tr152
 		case 44:
@@ -13660,8 +13809,8 @@ tr599:
 		case 92:
 			goto tr153
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr603
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr150
 tr153:
@@ -13675,7 +13824,7 @@ tr153:
 			goto _test_eof128
 		}
 	st_case_128:
-//line plugins/parsers/influx/machine.go:13679
+//line plugins/parsers/influx/machine.go:13828
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st78
@@ -13691,20 +13840,20 @@ tr153:
 			goto tr5
 		}
 		goto st25
-	st414:
+	st413:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof414
+			goto _test_eof413
 		}
-	st_case_414:
+	st_case_413:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13715,12 +13864,44 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st414
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st78
+	st414:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof414
+		}
+	st_case_414:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr591
+		case 11:
+			goto tr592
+		case 12:
+			goto tr463
+		case 32:
+			goto tr591
+		case 34:
+			goto tr156
+		case 44:
+			goto tr88
+		case 61:
+			goto tr157
+		case 92:
+			goto st128
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st415
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st415:
@@ -13729,14 +13910,14 @@ tr153:
 		}
 	st_case_415:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13747,12 +13928,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st416
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st416:
@@ -13761,14 +13942,14 @@ tr153:
 		}
 	st_case_416:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13779,12 +13960,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st417
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st417:
@@ -13793,14 +13974,14 @@ tr153:
 		}
 	st_case_417:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13811,12 +13992,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st418
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st418:
@@ -13825,14 +14006,14 @@ tr153:
 		}
 	st_case_418:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13843,12 +14024,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st419
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st419:
@@ -13857,14 +14038,14 @@ tr153:
 		}
 	st_case_419:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13875,12 +14056,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st420
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st420:
@@ -13889,14 +14070,14 @@ tr153:
 		}
 	st_case_420:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13907,12 +14088,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st421
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st421:
@@ -13921,14 +14102,14 @@ tr153:
 		}
 	st_case_421:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13939,12 +14120,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st422
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st422:
@@ -13953,14 +14134,14 @@ tr153:
 		}
 	st_case_422:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -13971,12 +14152,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st423
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st423:
@@ -13985,14 +14166,14 @@ tr153:
 		}
 	st_case_423:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14003,12 +14184,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st424
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st424:
@@ -14017,14 +14198,14 @@ tr153:
 		}
 	st_case_424:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14035,12 +14216,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st425
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st425:
@@ -14049,14 +14230,14 @@ tr153:
 		}
 	st_case_425:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14067,12 +14248,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st426
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st426:
@@ -14081,14 +14262,14 @@ tr153:
 		}
 	st_case_426:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14099,12 +14280,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st427
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st427:
@@ -14113,14 +14294,14 @@ tr153:
 		}
 	st_case_427:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14131,12 +14312,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st428
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st428:
@@ -14145,14 +14326,14 @@ tr153:
 		}
 	st_case_428:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14163,12 +14344,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st429
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st429:
@@ -14177,14 +14358,14 @@ tr153:
 		}
 	st_case_429:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14195,12 +14376,12 @@ tr153:
 			goto st128
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st430
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st78
 	st430:
@@ -14209,14 +14390,14 @@ tr153:
 		}
 	st_case_430:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr591
 		case 11:
-			goto tr599
-		case 13:
-			goto tr407
+			goto tr592
+		case 12:
+			goto tr463
 		case 32:
-			goto tr598
+			goto tr591
 		case 34:
 			goto tr156
 		case 44:
@@ -14226,40 +14407,8 @@ tr153:
 		case 92:
 			goto st128
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st431
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr598
-		}
-		goto st78
-	st431:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof431
-		}
-	st_case_431:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 11:
-			goto tr599
-		case 13:
-			goto tr407
-		case 32:
-			goto tr598
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr598
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr335
 		}
 		goto st78
 tr81:
@@ -14271,44 +14420,44 @@ tr81:
 
 	m.handler.AddString(key, m.text())
 
-	goto st432
+	goto st431
 tr87:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st432
-	st432:
+	goto st431
+	st431:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof432
+			goto _test_eof431
 		}
-	st_case_432:
-//line plugins/parsers/influx/machine.go:14287
+	st_case_431:
+//line plugins/parsers/influx/machine.go:14436
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr622
+			goto tr615
 		case 13:
 			goto tr330
 		case 32:
-			goto tr462
+			goto tr455
 		case 44:
-			goto tr464
+			goto tr457
 		case 92:
 			goto st129
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr462
+			goto tr455
 		}
 		goto st2
-tr622:
+tr615:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st433
-tr776:
+	goto st432
+tr769:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14317,8 +14466,8 @@ tr776:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st433
-tr797:
+	goto st432
+tr792:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14327,8 +14476,8 @@ tr797:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st433
-tr801:
+	goto st432
+tr795:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14337,8 +14486,8 @@ tr801:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st433
-tr805:
+	goto st432
+tr798:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14347,26 +14496,26 @@ tr805:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st433
-	st433:
+	goto st432
+	st432:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof433
+			goto _test_eof432
 		}
-	st_case_433:
-//line plugins/parsers/influx/machine.go:14357
+	st_case_432:
+//line plugins/parsers/influx/machine.go:14506
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr467
+			goto tr460
 		case 13:
 			goto tr330
 		case 32:
-			goto tr462
+			goto tr455
 		case 44:
 			goto tr7
 		case 45:
-			goto tr468
+			goto tr461
 		case 61:
 			goto st2
 		case 92:
@@ -14375,10 +14524,10 @@ tr805:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr469
+				goto tr462
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr462
+			goto tr455
 		}
 		goto tr42
 tr2:
@@ -14392,7 +14541,7 @@ tr2:
 			goto _test_eof129
 		}
 	st_case_129:
-//line plugins/parsers/influx/machine.go:14396
+//line plugins/parsers/influx/machine.go:14545
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -14402,7 +14551,7 @@ tr2:
 			goto tr1
 		}
 		goto st2
-tr569:
+tr562:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14412,7 +14561,7 @@ tr569:
 	m.pb = m.p
 
 	goto st130
-tr724:
+tr717:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14422,7 +14571,7 @@ tr724:
 	m.handler.AddFloat(key, m.text())
 
 	goto st130
-tr756:
+tr749:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14432,7 +14581,7 @@ tr756:
 	m.handler.AddInt(key, m.text())
 
 	goto st130
-tr760:
+tr753:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14442,7 +14591,7 @@ tr760:
 	m.handler.AddUint(key, m.text())
 
 	goto st130
-tr764:
+tr757:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14452,7 +14601,7 @@ tr764:
 	m.handler.AddBool(key, m.text())
 
 	goto st130
-tr771:
+tr765:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14462,7 +14611,7 @@ tr771:
 	m.handler.AddFloat(key, m.text())
 
 	goto st130
-tr780:
+tr774:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14472,7 +14621,7 @@ tr780:
 	m.handler.AddInt(key, m.text())
 
 	goto st130
-tr784:
+tr779:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14482,7 +14631,7 @@ tr784:
 	m.handler.AddUint(key, m.text())
 
 	goto st130
-tr788:
+tr784:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14497,8 +14646,12 @@ tr788:
 			goto _test_eof130
 		}
 	st_case_130:
-//line plugins/parsers/influx/machine.go:14501
+//line plugins/parsers/influx/machine.go:14650
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -14510,13 +14663,8 @@ tr788:
 		case 92:
 			goto tr252
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr250
 tr250:
@@ -14530,8 +14678,12 @@ tr250:
 			goto _test_eof131
 		}
 	st_case_131:
-//line plugins/parsers/influx/machine.go:14534
+//line plugins/parsers/influx/machine.go:14682
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -14543,13 +14695,8 @@ tr250:
 		case 92:
 			goto st163
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st131
 tr251:
@@ -14561,24 +14708,24 @@ tr251:
 
 	m.handler.AddString(key, m.text())
 
-	goto st434
+	goto st433
 tr254:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st434
-	st434:
+	goto st433
+	st433:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof434
+			goto _test_eof433
 		}
-	st_case_434:
-//line plugins/parsers/influx/machine.go:14577
+	st_case_433:
+//line plugins/parsers/influx/machine.go:14724
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st435
+			goto st434
 		case 13:
 			goto tr330
 		case 32:
@@ -14594,16 +14741,16 @@ tr254:
 			goto st192
 		}
 		goto st83
-	st435:
+	st434:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof435
+			goto _test_eof434
 		}
-	st_case_435:
+	st_case_434:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto st435
+			goto st434
 		case 13:
 			goto tr330
 		case 32:
@@ -14611,7 +14758,7 @@ tr254:
 		case 44:
 			goto tr201
 		case 45:
-			goto tr624
+			goto tr617
 		case 61:
 			goto tr163
 		case 92:
@@ -14620,13 +14767,13 @@ tr254:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr625
+				goto tr618
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto st192
 		}
 		goto st83
-tr624:
+tr617:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -14637,7 +14784,7 @@ tr624:
 			goto _test_eof132
 		}
 	st_case_132:
-//line plugins/parsers/influx/machine.go:14641
+//line plugins/parsers/influx/machine.go:14788
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr201
@@ -14655,29 +14802,91 @@ tr624:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st436
+				goto st435
 			}
 		default:
 			goto tr201
 		}
 		goto st83
-tr625:
+tr618:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st435
+	st435:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof435
+		}
+	st_case_435:
+//line plugins/parsers/influx/machine.go:14823
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr335
+		case 11:
+			goto tr619
+		case 13:
+			goto tr335
+		case 32:
+			goto tr334
+		case 44:
+			goto tr201
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st437
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr334
+		}
+		goto st83
+tr619:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st436
 	st436:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof436
 		}
 	st_case_436:
-//line plugins/parsers/influx/machine.go:14676
+//line plugins/parsers/influx/machine.go:14860
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto st436
+		case 13:
+			goto tr330
+		case 32:
+			goto st195
+		case 44:
+			goto tr59
+		case 61:
+			goto tr163
+		case 92:
+			goto st114
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st195
+		}
+		goto st83
+	st437:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof437
+		}
+	st_case_437:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14698,38 +14907,6 @@ tr625:
 			goto tr334
 		}
 		goto st83
-tr626:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st437
-	st437:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof437
-		}
-	st_case_437:
-//line plugins/parsers/influx/machine.go:14713
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st437
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr59
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st83
 	st438:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof438
@@ -14739,7 +14916,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14769,7 +14946,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14799,7 +14976,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14829,7 +15006,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14859,7 +15036,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14889,7 +15066,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14919,7 +15096,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14949,7 +15126,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -14979,7 +15156,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15009,7 +15186,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15039,7 +15216,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15069,7 +15246,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15099,7 +15276,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15129,7 +15306,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15159,7 +15336,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15189,7 +15366,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15219,37 +15396,7 @@ tr626:
 		case 10:
 			goto tr335
 		case 11:
-			goto tr626
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st455
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st455:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof455
-		}
-	st_case_455:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr626
+			goto tr619
 		case 13:
 			goto tr335
 		case 32:
@@ -15280,8 +15427,12 @@ tr255:
 			goto _test_eof133
 		}
 	st_case_133:
-//line plugins/parsers/influx/machine.go:15284
+//line plugins/parsers/influx/machine.go:15431
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -15308,16 +15459,12 @@ tr255:
 			goto tr266
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto st7
-			}
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto tr262
 			}
-		default:
-			goto st7
+		case ( m.data)[( m.p)] >= 12:
+			goto tr59
 		}
 		goto tr226
 tr258:
@@ -15329,42 +15476,42 @@ tr258:
 
 	m.handler.AddString(key, m.text())
 
-	goto st456
-	st456:
+	goto st455
+	st455:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof456
+			goto _test_eof455
 		}
-	st_case_456:
-//line plugins/parsers/influx/machine.go:15339
+	st_case_455:
+//line plugins/parsers/influx/machine.go:15486
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr400
+		case 9:
+			goto tr639
 		case 11:
-			goto tr647
-		case 13:
-			goto tr400
+			goto tr640
+		case 12:
+			goto tr487
 		case 32:
-			goto tr646
+			goto tr639
 		case 34:
 			goto tr177
 		case 44:
-			goto tr648
+			goto tr641
 		case 61:
 			goto tr25
 		case 92:
 			goto tr179
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr646
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr174
-tr673:
+tr666:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st457
-tr646:
+	goto st456
+tr639:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15373,8 +15520,8 @@ tr646:
 
 	m.pb = m.p
 
-	goto st457
-tr701:
+	goto st456
+tr694:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15383,8 +15530,8 @@ tr701:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st457
-tr707:
+	goto st456
+tr700:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15393,8 +15540,8 @@ tr707:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st457
-tr711:
+	goto st456
+tr704:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15403,8 +15550,8 @@ tr711:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st457
-tr715:
+	goto st456
+tr708:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15413,84 +15560,84 @@ tr715:
 
 	m.handler.AddBool(key, m.text())
 
+	goto st456
+	st456:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof456
+		}
+	st_case_456:
+//line plugins/parsers/influx/machine.go:15570
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st456
+		case 11:
+			goto tr643
+		case 12:
+			goto st300
+		case 32:
+			goto st456
+		case 34:
+			goto tr93
+		case 44:
+			goto st7
+		case 45:
+			goto tr644
+		case 61:
+			goto st7
+		case 92:
+			goto tr189
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr645
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
+		}
+		goto tr186
+tr643:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st457
 	st457:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof457
 		}
 	st_case_457:
-//line plugins/parsers/influx/machine.go:15423
+//line plugins/parsers/influx/machine.go:15611
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto st456
 		case 11:
-			goto tr650
-		case 13:
-			goto tr403
+			goto tr643
+		case 12:
+			goto st300
 		case 32:
-			goto st457
+			goto st456
 		case 34:
 			goto tr93
 		case 44:
 			goto st7
 		case 45:
-			goto tr651
-		case 61:
-			goto st7
-		case 92:
-			goto tr189
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr652
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st457
-		}
-		goto tr186
-tr650:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st458
-	st458:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof458
-		}
-	st_case_458:
-//line plugins/parsers/influx/machine.go:15464
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto tr650
-		case 13:
-			goto tr403
-		case 32:
-			goto st457
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr651
+			goto tr644
 		case 61:
 			goto tr191
 		case 92:
 			goto tr189
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr652
+				goto tr645
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st457
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr186
-tr651:
+tr644:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -15501,8 +15648,12 @@ tr651:
 			goto _test_eof134
 		}
 	st_case_134:
-//line plugins/parsers/influx/machine.go:15505
+//line plugins/parsers/influx/machine.go:15652
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr99
 		case 32:
 			goto st7
 		case 34:
@@ -15515,39 +15666,101 @@ tr651:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto st7
-			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st459
+				goto st458
 			}
-		default:
-			goto st7
+		case ( m.data)[( m.p)] >= 12:
+			goto tr99
 		}
 		goto st88
-tr652:
+tr645:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st458
+	st458:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof458
+		}
+	st_case_458:
+//line plugins/parsers/influx/machine.go:15689
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr404
+		case 11:
+			goto tr646
+		case 12:
+			goto tr334
+		case 32:
+			goto tr404
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st460
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st88
+tr646:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st459
 	st459:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof459
 		}
 	st_case_459:
-//line plugins/parsers/influx/machine.go:15542
+//line plugins/parsers/influx/machine.go:15728
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto st252
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto st459
+		case 12:
+			goto st195
 		case 32:
-			goto tr406
+			goto st252
+		case 34:
+			goto tr96
+		case 44:
+			goto st7
+		case 61:
+			goto tr191
+		case 92:
+			goto st90
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
+		}
+		goto st88
+	st460:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof460
+		}
+	st_case_460:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr404
+		case 11:
+			goto tr646
+		case 12:
+			goto tr334
+		case 32:
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15558,46 +15771,12 @@ tr652:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st461
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
-		}
-		goto st88
-tr653:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st460
-	st460:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof460
-		}
-	st_case_460:
-//line plugins/parsers/influx/machine.go:15581
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto st460
-		case 13:
-			goto tr403
-		case 32:
-			goto st253
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st253
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st461:
@@ -15606,14 +15785,14 @@ tr653:
 		}
 	st_case_461:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15624,12 +15803,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st462
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st462:
@@ -15638,14 +15817,14 @@ tr653:
 		}
 	st_case_462:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15656,12 +15835,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st463
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st463:
@@ -15670,14 +15849,14 @@ tr653:
 		}
 	st_case_463:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15688,12 +15867,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st464
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st464:
@@ -15702,14 +15881,14 @@ tr653:
 		}
 	st_case_464:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15720,12 +15899,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st465
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st465:
@@ -15734,14 +15913,14 @@ tr653:
 		}
 	st_case_465:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15752,12 +15931,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st466
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st466:
@@ -15766,14 +15945,14 @@ tr653:
 		}
 	st_case_466:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15784,12 +15963,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st467
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st467:
@@ -15798,14 +15977,14 @@ tr653:
 		}
 	st_case_467:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15816,12 +15995,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st468
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st468:
@@ -15830,14 +16009,14 @@ tr653:
 		}
 	st_case_468:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15848,12 +16027,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st469
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st469:
@@ -15862,14 +16041,14 @@ tr653:
 		}
 	st_case_469:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15880,12 +16059,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st470
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st470:
@@ -15894,14 +16073,14 @@ tr653:
 		}
 	st_case_470:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15912,12 +16091,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st471
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st471:
@@ -15926,14 +16105,14 @@ tr653:
 		}
 	st_case_471:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15944,12 +16123,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st472
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st472:
@@ -15958,14 +16137,14 @@ tr653:
 		}
 	st_case_472:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -15976,12 +16155,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st473
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st473:
@@ -15990,14 +16169,14 @@ tr653:
 		}
 	st_case_473:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -16008,12 +16187,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st474
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st474:
@@ -16022,14 +16201,14 @@ tr653:
 		}
 	st_case_474:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -16040,12 +16219,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st475
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st475:
@@ -16054,14 +16233,14 @@ tr653:
 		}
 	st_case_475:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -16072,12 +16251,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st476
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st476:
@@ -16086,14 +16265,14 @@ tr653:
 		}
 	st_case_476:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -16104,12 +16283,12 @@ tr653:
 			goto st90
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st477
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st88
 	st477:
@@ -16118,14 +16297,14 @@ tr653:
 		}
 	st_case_477:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr404
 		case 11:
-			goto tr653
-		case 13:
-			goto tr407
+			goto tr646
+		case 12:
+			goto tr334
 		case 32:
-			goto tr406
+			goto tr404
 		case 34:
 			goto tr96
 		case 44:
@@ -16135,43 +16314,11 @@ tr653:
 		case 92:
 			goto st90
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st478
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr406
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr335
 		}
 		goto st88
-	st478:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof478
-		}
-	st_case_478:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 11:
-			goto tr653
-		case 13:
-			goto tr407
-		case 32:
-			goto tr406
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr406
-		}
-		goto st88
-tr647:
+tr640:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16180,8 +16327,8 @@ tr647:
 
 	m.pb = m.p
 
-	goto st479
-tr702:
+	goto st478
+tr695:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16190,8 +16337,8 @@ tr702:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st479
-tr708:
+	goto st478
+tr701:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16200,8 +16347,8 @@ tr708:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st479
-tr712:
+	goto st478
+tr705:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16210,8 +16357,8 @@ tr712:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st479
-tr716:
+	goto st478
+tr709:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16220,43 +16367,43 @@ tr716:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st479
-	st479:
+	goto st478
+	st478:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof479
+			goto _test_eof478
 		}
-	st_case_479:
-//line plugins/parsers/influx/machine.go:16230
+	st_case_478:
+//line plugins/parsers/influx/machine.go:16377
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr666
 		case 11:
-			goto tr674
-		case 13:
-			goto tr403
+			goto tr667
+		case 12:
+			goto tr487
 		case 32:
-			goto tr673
+			goto tr666
 		case 34:
 			goto tr195
 		case 44:
 			goto tr184
 		case 45:
-			goto tr675
+			goto tr668
 		case 61:
 			goto st7
 		case 92:
 			goto tr196
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr676
+				goto tr669
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr673
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr193
-tr674:
+tr667:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16265,43 +16412,43 @@ tr674:
 
 	m.pb = m.p
 
-	goto st480
-	st480:
+	goto st479
+	st479:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof480
+			goto _test_eof479
 		}
-	st_case_480:
-//line plugins/parsers/influx/machine.go:16275
+	st_case_479:
+//line plugins/parsers/influx/machine.go:16422
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr666
 		case 11:
-			goto tr674
-		case 13:
-			goto tr403
+			goto tr667
+		case 12:
+			goto tr487
 		case 32:
-			goto tr673
+			goto tr666
 		case 34:
 			goto tr195
 		case 44:
 			goto tr184
 		case 45:
-			goto tr675
+			goto tr668
 		case 61:
 			goto tr191
 		case 92:
 			goto tr196
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr676
+				goto tr669
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr673
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr193
-tr675:
+tr668:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -16312,14 +16459,14 @@ tr675:
 			goto _test_eof135
 		}
 	st_case_135:
-//line plugins/parsers/influx/machine.go:16316
+//line plugins/parsers/influx/machine.go:16463
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr198
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -16332,67 +16479,101 @@ tr675:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st481
+				goto st480
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr181
+		case ( m.data)[( m.p)] >= 10:
+			goto tr201
 		}
 		goto st93
-tr676:
+tr669:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st480
+	st480:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof480
+		}
+	st_case_480:
+//line plugins/parsers/influx/machine.go:16502
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr670
+		case 11:
+			goto tr671
+		case 12:
+			goto tr493
+		case 32:
+			goto tr670
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st484
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st93
+tr675:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st481
+tr670:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
 	goto st481
 	st481:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof481
 		}
 	st_case_481:
-//line plugins/parsers/influx/machine.go:16355
+//line plugins/parsers/influx/machine.go:16551
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto st481
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr674
+		case 12:
+			goto st304
 		case 32:
-			goto tr677
+			goto st481
 		case 34:
-			goto tr199
+			goto tr93
 		case 44:
-			goto tr184
+			goto st7
 		case 61:
-			goto tr191
+			goto st7
 		case 92:
-			goto st102
+			goto tr189
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st485
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
-		goto st93
-tr682:
-//line plugins/parsers/influx/machine.go.rl:80
+		goto tr186
+tr674:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	m.handler.AddTag(key, m.text())
-
-	goto st482
-tr677:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
+	m.pb = m.p
 
 	goto st482
 	st482:
@@ -16400,50 +16581,16 @@ tr677:
 			goto _test_eof482
 		}
 	st_case_482:
-//line plugins/parsers/influx/machine.go:16404
+//line plugins/parsers/influx/machine.go:16585
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto st481
 		case 11:
-			goto tr681
-		case 13:
-			goto tr403
+			goto tr674
+		case 12:
+			goto st304
 		case 32:
-			goto st482
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr189
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st482
-		}
-		goto tr186
-tr681:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st483
-	st483:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof483
-		}
-	st_case_483:
-//line plugins/parsers/influx/machine.go:16438
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
-		case 11:
-			goto tr681
-		case 13:
-			goto tr403
-		case 32:
-			goto st482
+			goto st481
 		case 34:
 			goto tr93
 		case 44:
@@ -16453,11 +16600,11 @@ tr681:
 		case 92:
 			goto tr189
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st482
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr186
-tr683:
+tr676:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16466,8 +16613,8 @@ tr683:
 
 	m.pb = m.p
 
-	goto st484
-tr678:
+	goto st483
+tr671:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16476,22 +16623,22 @@ tr678:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st484
-	st484:
+	goto st483
+	st483:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof484
+			goto _test_eof483
 		}
-	st_case_484:
-//line plugins/parsers/influx/machine.go:16486
+	st_case_483:
+//line plugins/parsers/influx/machine.go:16633
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr675
 		case 11:
-			goto tr683
-		case 13:
-			goto tr403
+			goto tr676
+		case 12:
+			goto tr496
 		case 32:
-			goto tr682
+			goto tr675
 		case 34:
 			goto tr195
 		case 44:
@@ -16501,24 +16648,24 @@ tr678:
 		case 92:
 			goto tr196
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr682
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr193
-	st485:
+	st484:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof485
+			goto _test_eof484
 		}
-	st_case_485:
+	st_case_484:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16529,12 +16676,44 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st485
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st93
+	st485:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof485
+		}
+	st_case_485:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr670
+		case 11:
+			goto tr671
+		case 12:
+			goto tr493
+		case 32:
+			goto tr670
+		case 34:
+			goto tr199
+		case 44:
+			goto tr184
+		case 61:
+			goto tr191
+		case 92:
+			goto st102
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st486
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st486:
@@ -16543,14 +16722,14 @@ tr678:
 		}
 	st_case_486:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16561,12 +16740,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st487
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st487:
@@ -16575,14 +16754,14 @@ tr678:
 		}
 	st_case_487:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16593,12 +16772,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st488
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st488:
@@ -16607,14 +16786,14 @@ tr678:
 		}
 	st_case_488:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16625,12 +16804,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st489
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st489:
@@ -16639,14 +16818,14 @@ tr678:
 		}
 	st_case_489:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16657,12 +16836,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st490
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st490:
@@ -16671,14 +16850,14 @@ tr678:
 		}
 	st_case_490:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16689,12 +16868,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st491
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st491:
@@ -16703,14 +16882,14 @@ tr678:
 		}
 	st_case_491:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16721,12 +16900,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st492
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st492:
@@ -16735,14 +16914,14 @@ tr678:
 		}
 	st_case_492:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16753,12 +16932,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st493
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st493:
@@ -16767,14 +16946,14 @@ tr678:
 		}
 	st_case_493:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16785,12 +16964,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st494
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st494:
@@ -16799,14 +16978,14 @@ tr678:
 		}
 	st_case_494:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16817,12 +16996,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st495
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st495:
@@ -16831,14 +17010,14 @@ tr678:
 		}
 	st_case_495:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16849,12 +17028,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st496
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st496:
@@ -16863,14 +17042,14 @@ tr678:
 		}
 	st_case_496:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16881,12 +17060,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st497
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st497:
@@ -16895,14 +17074,14 @@ tr678:
 		}
 	st_case_497:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16913,12 +17092,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st498
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st498:
@@ -16927,14 +17106,14 @@ tr678:
 		}
 	st_case_498:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16945,12 +17124,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st499
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st499:
@@ -16959,14 +17138,14 @@ tr678:
 		}
 	st_case_499:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -16977,12 +17156,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st500
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st500:
@@ -16991,14 +17170,14 @@ tr678:
 		}
 	st_case_500:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -17009,12 +17188,12 @@ tr678:
 			goto st102
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st501
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st93
 	st501:
@@ -17023,14 +17202,14 @@ tr678:
 		}
 	st_case_501:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr670
 		case 11:
-			goto tr678
-		case 13:
-			goto tr407
+			goto tr671
+		case 12:
+			goto tr493
 		case 32:
-			goto tr677
+			goto tr670
 		case 34:
 			goto tr199
 		case 44:
@@ -17040,43 +17219,11 @@ tr678:
 		case 92:
 			goto st102
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st502
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr677
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr335
 		}
 		goto st93
-	st502:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof502
-		}
-	st_case_502:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 11:
-			goto tr678
-		case 13:
-			goto tr407
-		case 32:
-			goto tr677
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr677
-		}
-		goto st93
-tr648:
+tr641:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17086,7 +17233,7 @@ tr648:
 	m.pb = m.p
 
 	goto st136
-tr703:
+tr696:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17096,7 +17243,7 @@ tr703:
 	m.handler.AddFloat(key, m.text())
 
 	goto st136
-tr709:
+tr702:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17106,7 +17253,7 @@ tr709:
 	m.handler.AddInt(key, m.text())
 
 	goto st136
-tr713:
+tr706:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17116,7 +17263,7 @@ tr713:
 	m.handler.AddUint(key, m.text())
 
 	goto st136
-tr717:
+tr710:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17131,8 +17278,12 @@ tr717:
 			goto _test_eof136
 		}
 	st_case_136:
-//line plugins/parsers/influx/machine.go:17135
+//line plugins/parsers/influx/machine.go:17282
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -17144,13 +17295,8 @@ tr717:
 		case 92:
 			goto tr270
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto tr269
 tr269:
@@ -17164,8 +17310,12 @@ tr269:
 			goto _test_eof137
 		}
 	st_case_137:
-//line plugins/parsers/influx/machine.go:17168
+//line plugins/parsers/influx/machine.go:17314
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -17177,13 +17327,8 @@ tr269:
 		case 92:
 			goto st150
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto st7
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st7
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st137
 tr272:
@@ -17201,8 +17346,12 @@ tr272:
 			goto _test_eof138
 		}
 	st_case_138:
-//line plugins/parsers/influx/machine.go:17205
+//line plugins/parsers/influx/machine.go:17350
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr59
 		case 32:
 			goto st7
 		case 34:
@@ -17229,16 +17378,12 @@ tr272:
 			goto tr281
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto st7
-			}
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto tr277
 			}
-		default:
-			goto st7
+		case ( m.data)[( m.p)] >= 12:
+			goto tr59
 		}
 		goto tr174
 tr274:
@@ -17252,14 +17397,14 @@ tr274:
 			goto _test_eof139
 		}
 	st_case_139:
-//line plugins/parsers/influx/machine.go:17256
+//line plugins/parsers/influx/machine.go:17401
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17267,41 +17412,41 @@ tr274:
 		case 44:
 			goto tr184
 		case 48:
-			goto st503
+			goto st502
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st508
+				goto st507
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr181
+		case ( m.data)[( m.p)] >= 10:
+			goto tr59
 		}
 		goto st86
-	st503:
+	st502:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof503
+			goto _test_eof502
 		}
-	st_case_503:
+	st_case_502:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr694
 		case 11:
-			goto tr702
-		case 13:
-			goto tr429
+			goto tr695
+		case 12:
+			goto tr539
 		case 32:
-			goto tr701
+			goto tr694
 		case 34:
 			goto tr183
 		case 44:
-			goto tr703
+			goto tr696
 		case 46:
-			goto st504
+			goto st503
 		case 61:
 			goto st7
 		case 69:
@@ -17311,10 +17456,10 @@ tr274:
 		case 101:
 			goto st140
 		case 105:
-			goto st507
+			goto st506
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr701
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st86
 tr275:
@@ -17322,26 +17467,26 @@ tr275:
 
 	m.pb = m.p
 
-	goto st504
-	st504:
+	goto st503
+	st503:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof504
+			goto _test_eof503
 		}
-	st_case_504:
-//line plugins/parsers/influx/machine.go:17332
+	st_case_503:
+//line plugins/parsers/influx/machine.go:17477
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr694
 		case 11:
-			goto tr702
-		case 13:
-			goto tr429
+			goto tr695
+		case 12:
+			goto tr539
 		case 32:
-			goto tr701
+			goto tr694
 		case 34:
 			goto tr183
 		case 44:
-			goto tr703
+			goto tr696
 		case 61:
 			goto st7
 		case 69:
@@ -17352,12 +17497,12 @@ tr275:
 			goto st140
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st504
+				goto st503
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr701
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st86
 	st140:
@@ -17366,12 +17511,12 @@ tr275:
 		}
 	st_case_140:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17385,12 +17530,12 @@ tr275:
 		}
 		switch {
 		case ( m.data)[( m.p)] < 43:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-				goto tr181
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st506
+				goto st505
 			}
 		default:
 			goto st141
@@ -17401,24 +17546,24 @@ tr284:
 
 	m.handler.AddString(key, m.text())
 
-	goto st505
-	st505:
+	goto st504
+	st504:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof505
+			goto _test_eof504
 		}
-	st_case_505:
-//line plugins/parsers/influx/machine.go:17411
+	st_case_504:
+//line plugins/parsers/influx/machine.go:17556
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr330
 		case 11:
-			goto tr545
+			goto tr538
 		case 13:
 			goto tr330
 		case 32:
-			goto tr494
+			goto tr487
 		case 44:
-			goto tr496
+			goto tr489
 		case 61:
 			goto tr201
 		case 92:
@@ -17427,10 +17572,10 @@ tr284:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st374
+				goto st373
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr494
+			goto tr487
 		}
 		goto st30
 	st141:
@@ -17439,12 +17584,12 @@ tr284:
 		}
 	st_case_141:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17457,12 +17602,44 @@ tr284:
 			goto st100
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st506
+				goto st505
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr181
+		case ( m.data)[( m.p)] >= 10:
+			goto tr59
+		}
+		goto st86
+	st505:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof505
+		}
+	st_case_505:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr694
+		case 11:
+			goto tr695
+		case 12:
+			goto tr539
+		case 32:
+			goto tr694
+		case 34:
+			goto tr183
+		case 44:
+			goto tr696
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st505
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st86
 	st506:
@@ -17471,30 +17648,25 @@ tr284:
 		}
 	st_case_506:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr700
 		case 11:
-			goto tr702
-		case 13:
-			goto tr429
-		case 32:
 			goto tr701
+		case 12:
+			goto tr545
+		case 32:
+			goto tr700
 		case 34:
 			goto tr183
 		case 44:
-			goto tr703
+			goto tr702
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st506
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr701
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr362
 		}
 		goto st86
 	st507:
@@ -17503,47 +17675,20 @@ tr284:
 		}
 	st_case_507:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr435
+		case 9:
+			goto tr694
 		case 11:
-			goto tr708
-		case 13:
-			goto tr435
+			goto tr695
+		case 12:
+			goto tr539
 		case 32:
-			goto tr707
+			goto tr694
 		case 34:
 			goto tr183
 		case 44:
-			goto tr709
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr707
-		}
-		goto st86
-	st508:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof508
-		}
-	st_case_508:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
-		case 11:
-			goto tr702
-		case 13:
-			goto tr429
-		case 32:
-			goto tr701
-		case 34:
-			goto tr183
-		case 44:
-			goto tr703
+			goto tr696
 		case 46:
-			goto st504
+			goto st503
 		case 61:
 			goto st7
 		case 69:
@@ -17553,15 +17698,15 @@ tr284:
 		case 101:
 			goto st140
 		case 105:
-			goto st507
+			goto st506
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st508
+				goto st507
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr701
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st86
 tr276:
@@ -17569,28 +17714,28 @@ tr276:
 
 	m.pb = m.p
 
-	goto st509
-	st509:
+	goto st508
+	st508:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof509
+			goto _test_eof508
 		}
-	st_case_509:
-//line plugins/parsers/influx/machine.go:17579
+	st_case_508:
+//line plugins/parsers/influx/machine.go:17724
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr694
 		case 11:
-			goto tr702
-		case 13:
-			goto tr429
+			goto tr695
+		case 12:
+			goto tr539
 		case 32:
-			goto tr701
+			goto tr694
 		case 34:
 			goto tr183
 		case 44:
-			goto tr703
+			goto tr696
 		case 46:
-			goto st504
+			goto st503
 		case 61:
 			goto st7
 		case 69:
@@ -17600,39 +17745,39 @@ tr276:
 		case 101:
 			goto st140
 		case 105:
-			goto st507
+			goto st506
 		case 117:
-			goto st510
+			goto st509
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr701
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st86
-	st510:
+	st509:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof510
+			goto _test_eof509
 		}
-	st_case_510:
+	st_case_509:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr439
+		case 9:
+			goto tr704
 		case 11:
-			goto tr712
-		case 13:
-			goto tr439
+			goto tr705
+		case 12:
+			goto tr549
 		case 32:
-			goto tr711
+			goto tr704
 		case 34:
 			goto tr183
 		case 44:
-			goto tr713
+			goto tr706
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr711
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr366
 		}
 		goto st86
 tr277:
@@ -17640,75 +17785,75 @@ tr277:
 
 	m.pb = m.p
 
+	goto st510
+	st510:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof510
+		}
+	st_case_510:
+//line plugins/parsers/influx/machine.go:17795
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr694
+		case 11:
+			goto tr695
+		case 12:
+			goto tr539
+		case 32:
+			goto tr694
+		case 34:
+			goto tr183
+		case 44:
+			goto tr696
+		case 46:
+			goto st503
+		case 61:
+			goto st7
+		case 69:
+			goto st140
+		case 92:
+			goto st100
+		case 101:
+			goto st140
+		case 105:
+			goto st506
+		case 117:
+			goto st509
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st510
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
+		}
+		goto st86
+tr278:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st511
 	st511:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof511
 		}
 	st_case_511:
-//line plugins/parsers/influx/machine.go:17650
+//line plugins/parsers/influx/machine.go:17844
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr708
 		case 11:
-			goto tr702
-		case 13:
-			goto tr429
+			goto tr709
+		case 12:
+			goto tr553
 		case 32:
-			goto tr701
+			goto tr708
 		case 34:
 			goto tr183
 		case 44:
-			goto tr703
-		case 46:
-			goto st504
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
-		case 105:
-			goto st507
-		case 117:
-			goto st510
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st511
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr701
-		}
-		goto st86
-tr278:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st512
-	st512:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof512
-		}
-	st_case_512:
-//line plugins/parsers/influx/machine.go:17699
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr716
-		case 13:
-			goto tr443
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
+			goto tr710
 		case 61:
 			goto st7
 		case 65:
@@ -17718,8 +17863,8 @@ tr278:
 		case 97:
 			goto st145
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr715
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st86
 	st142:
@@ -17728,12 +17873,12 @@ tr278:
 		}
 	st_case_142:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17747,8 +17892,8 @@ tr278:
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 	st143:
@@ -17757,12 +17902,12 @@ tr278:
 		}
 	st_case_143:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17776,8 +17921,8 @@ tr278:
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 	st144:
@@ -17786,12 +17931,12 @@ tr278:
 		}
 	st_case_144:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17801,39 +17946,39 @@ tr278:
 		case 61:
 			goto st7
 		case 69:
-			goto st513
+			goto st512
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
-	st513:
+	st512:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof513
+			goto _test_eof512
 		}
-	st_case_513:
+	st_case_512:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr708
 		case 11:
-			goto tr716
-		case 13:
-			goto tr443
+			goto tr709
+		case 12:
+			goto tr553
 		case 32:
-			goto tr715
+			goto tr708
 		case 34:
 			goto tr183
 		case 44:
-			goto tr717
+			goto tr710
 		case 61:
 			goto st7
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr715
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st86
 	st145:
@@ -17842,12 +17987,12 @@ tr278:
 		}
 	st_case_145:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17861,8 +18006,8 @@ tr278:
 		case 108:
 			goto st146
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 	st146:
@@ -17871,12 +18016,12 @@ tr278:
 		}
 	st_case_146:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17890,8 +18035,8 @@ tr278:
 		case 115:
 			goto st147
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 	st147:
@@ -17900,12 +18045,12 @@ tr278:
 		}
 	st_case_147:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17917,10 +18062,10 @@ tr278:
 		case 92:
 			goto st100
 		case 101:
-			goto st513
+			goto st512
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 tr279:
@@ -17928,26 +18073,26 @@ tr279:
 
 	m.pb = m.p
 
-	goto st514
-	st514:
+	goto st513
+	st513:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof514
+			goto _test_eof513
 		}
-	st_case_514:
-//line plugins/parsers/influx/machine.go:17938
+	st_case_513:
+//line plugins/parsers/influx/machine.go:18083
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr708
 		case 11:
-			goto tr716
-		case 13:
-			goto tr443
+			goto tr709
+		case 12:
+			goto tr553
 		case 32:
-			goto tr715
+			goto tr708
 		case 34:
 			goto tr183
 		case 44:
-			goto tr717
+			goto tr710
 		case 61:
 			goto st7
 		case 82:
@@ -17957,8 +18102,8 @@ tr279:
 		case 114:
 			goto st149
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr715
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st86
 	st148:
@@ -17967,12 +18112,12 @@ tr279:
 		}
 	st_case_148:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -17986,8 +18131,8 @@ tr279:
 		case 92:
 			goto st100
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 	st149:
@@ -17996,12 +18141,12 @@ tr279:
 		}
 	st_case_149:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr181
 		case 11:
 			goto tr182
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr181
 		case 34:
@@ -18015,8 +18160,8 @@ tr279:
 		case 117:
 			goto st147
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr181
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st86
 tr280:
@@ -18024,62 +18169,62 @@ tr280:
 
 	m.pb = m.p
 
+	goto st514
+	st514:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof514
+		}
+	st_case_514:
+//line plugins/parsers/influx/machine.go:18179
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr708
+		case 11:
+			goto tr709
+		case 12:
+			goto tr553
+		case 32:
+			goto tr708
+		case 34:
+			goto tr183
+		case 44:
+			goto tr710
+		case 61:
+			goto st7
+		case 92:
+			goto st100
+		case 97:
+			goto st145
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
+		}
+		goto st86
+tr281:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st515
 	st515:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof515
 		}
 	st_case_515:
-//line plugins/parsers/influx/machine.go:18034
+//line plugins/parsers/influx/machine.go:18215
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr708
 		case 11:
-			goto tr716
-		case 13:
-			goto tr443
+			goto tr709
+		case 12:
+			goto tr553
 		case 32:
-			goto tr715
+			goto tr708
 		case 34:
 			goto tr183
 		case 44:
-			goto tr717
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 97:
-			goto st145
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr715
-		}
-		goto st86
-tr281:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st516
-	st516:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof516
-		}
-	st_case_516:
-//line plugins/parsers/influx/machine.go:18070
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr716
-		case 13:
-			goto tr443
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
+			goto tr710
 		case 61:
 			goto st7
 		case 92:
@@ -18087,8 +18232,8 @@ tr281:
 		case 114:
 			goto st149
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr715
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st86
 tr270:
@@ -18102,7 +18247,7 @@ tr270:
 			goto _test_eof150
 		}
 	st_case_150:
-//line plugins/parsers/influx/machine.go:18106
+//line plugins/parsers/influx/machine.go:18251
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st137
@@ -18129,14 +18274,14 @@ tr259:
 			goto _test_eof151
 		}
 	st_case_151:
-//line plugins/parsers/influx/machine.go:18133
+//line plugins/parsers/influx/machine.go:18278
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -18144,41 +18289,41 @@ tr259:
 		case 44:
 			goto tr231
 		case 48:
-			goto st517
+			goto st516
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st543
+				goto st542
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr229
+		case ( m.data)[( m.p)] >= 10:
+			goto tr59
 		}
 		goto st118
-	st517:
+	st516:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof517
+			goto _test_eof516
 		}
-	st_case_517:
+	st_case_516:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr715
 		case 11:
-			goto tr723
-		case 13:
-			goto tr429
+			goto tr716
+		case 12:
+			goto tr539
 		case 32:
-			goto tr722
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr724
+			goto tr717
 		case 46:
-			goto st540
+			goto st539
 		case 61:
 			goto st7
 		case 69:
@@ -18188,13 +18333,13 @@ tr259:
 		case 101:
 			goto st153
 		case 105:
-			goto st542
+			goto st541
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr722
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st118
-tr723:
+tr716:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18203,8 +18348,8 @@ tr723:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st518
-tr755:
+	goto st517
+tr748:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18213,8 +18358,8 @@ tr755:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st518
-tr759:
+	goto st517
+tr752:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18223,8 +18368,8 @@ tr759:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st518
-tr763:
+	goto st517
+tr756:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18233,43 +18378,43 @@ tr763:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st518
-	st518:
+	goto st517
+	st517:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof518
+			goto _test_eof517
 		}
-	st_case_518:
-//line plugins/parsers/influx/machine.go:18243
+	st_case_517:
+//line plugins/parsers/influx/machine.go:18388
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr721
 		case 11:
-			goto tr729
-		case 13:
-			goto tr403
+			goto tr722
+		case 12:
+			goto tr487
 		case 32:
-			goto tr728
+			goto tr721
 		case 34:
 			goto tr195
 		case 44:
 			goto tr231
 		case 45:
-			goto tr730
+			goto tr723
 		case 61:
 			goto st7
 		case 92:
 			goto tr235
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr731
+				goto tr724
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr728
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr233
-tr729:
+tr722:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18278,43 +18423,43 @@ tr729:
 
 	m.pb = m.p
 
-	goto st519
-	st519:
+	goto st518
+	st518:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof519
+			goto _test_eof518
 		}
-	st_case_519:
-//line plugins/parsers/influx/machine.go:18288
+	st_case_518:
+//line plugins/parsers/influx/machine.go:18433
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr721
 		case 11:
-			goto tr729
-		case 13:
-			goto tr403
+			goto tr722
+		case 12:
+			goto tr487
 		case 32:
-			goto tr728
+			goto tr721
 		case 34:
 			goto tr195
 		case 44:
 			goto tr231
 		case 45:
-			goto tr730
+			goto tr723
 		case 61:
 			goto tr97
 		case 92:
 			goto tr235
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr731
+				goto tr724
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr728
+		case ( m.data)[( m.p)] >= 10:
+			goto tr330
 		}
 		goto tr233
-tr730:
+tr723:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -18325,14 +18470,14 @@ tr730:
 			goto _test_eof152
 		}
 	st_case_152:
-//line plugins/parsers/influx/machine.go:18329
+//line plugins/parsers/influx/machine.go:18474
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr237
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -18345,35 +18490,35 @@ tr730:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st520
+				goto st519
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr229
+		case ( m.data)[( m.p)] >= 10:
+			goto tr201
 		}
 		goto st120
-tr731:
+tr724:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st520
-	st520:
+	goto st519
+	st519:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof520
+			goto _test_eof519
 		}
-	st_case_520:
-//line plugins/parsers/influx/machine.go:18368
+	st_case_519:
+//line plugins/parsers/influx/machine.go:18513
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18384,15 +18529,15 @@ tr731:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st522
+				goto st521
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
-tr736:
+tr729:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18401,8 +18546,8 @@ tr736:
 
 	m.pb = m.p
 
-	goto st521
-tr733:
+	goto st520
+tr726:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18411,22 +18556,22 @@ tr733:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st521
-	st521:
+	goto st520
+	st520:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof521
+			goto _test_eof520
 		}
-	st_case_521:
-//line plugins/parsers/influx/machine.go:18421
+	st_case_520:
+//line plugins/parsers/influx/machine.go:18566
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr403
+		case 9:
+			goto tr728
 		case 11:
-			goto tr736
-		case 13:
-			goto tr403
+			goto tr729
+		case 12:
+			goto tr496
 		case 32:
-			goto tr735
+			goto tr728
 		case 34:
 			goto tr195
 		case 44:
@@ -18436,24 +18581,24 @@ tr733:
 		case 92:
 			goto tr235
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr735
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr330
 		}
 		goto tr233
-	st522:
+	st521:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof522
+			goto _test_eof521
 		}
-	st_case_522:
+	st_case_521:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18464,12 +18609,44 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st522
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
+		}
+		goto st120
+	st522:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof522
+		}
+	st_case_522:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr725
+		case 11:
+			goto tr726
+		case 12:
+			goto tr493
+		case 32:
+			goto tr725
+		case 34:
+			goto tr199
+		case 44:
+			goto tr231
+		case 61:
+			goto tr97
+		case 92:
+			goto st122
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st523
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st523:
@@ -18478,14 +18655,14 @@ tr733:
 		}
 	st_case_523:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18496,12 +18673,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st524
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st524:
@@ -18510,14 +18687,14 @@ tr733:
 		}
 	st_case_524:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18528,12 +18705,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st525
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st525:
@@ -18542,14 +18719,14 @@ tr733:
 		}
 	st_case_525:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18560,12 +18737,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st526
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st526:
@@ -18574,14 +18751,14 @@ tr733:
 		}
 	st_case_526:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18592,12 +18769,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st527
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st527:
@@ -18606,14 +18783,14 @@ tr733:
 		}
 	st_case_527:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18624,12 +18801,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st528
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st528:
@@ -18638,14 +18815,14 @@ tr733:
 		}
 	st_case_528:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18656,12 +18833,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st529
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st529:
@@ -18670,14 +18847,14 @@ tr733:
 		}
 	st_case_529:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18688,12 +18865,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st530
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st530:
@@ -18702,14 +18879,14 @@ tr733:
 		}
 	st_case_530:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18720,12 +18897,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st531
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st531:
@@ -18734,14 +18911,14 @@ tr733:
 		}
 	st_case_531:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18752,12 +18929,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st532
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st532:
@@ -18766,14 +18943,14 @@ tr733:
 		}
 	st_case_532:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18784,12 +18961,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st533
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st533:
@@ -18798,14 +18975,14 @@ tr733:
 		}
 	st_case_533:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18816,12 +18993,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st534
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st534:
@@ -18830,14 +19007,14 @@ tr733:
 		}
 	st_case_534:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18848,12 +19025,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st535
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st535:
@@ -18862,14 +19039,14 @@ tr733:
 		}
 	st_case_535:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18880,12 +19057,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st536
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st536:
@@ -18894,14 +19071,14 @@ tr733:
 		}
 	st_case_536:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18912,12 +19089,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st537
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st537:
@@ -18926,14 +19103,14 @@ tr733:
 		}
 	st_case_537:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18944,12 +19121,12 @@ tr733:
 			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st538
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
+		case ( m.data)[( m.p)] >= 10:
+			goto tr335
 		}
 		goto st120
 	st538:
@@ -18958,14 +19135,14 @@ tr733:
 		}
 	st_case_538:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
+		case 9:
+			goto tr725
 		case 11:
-			goto tr733
-		case 13:
-			goto tr407
+			goto tr726
+		case 12:
+			goto tr493
 		case 32:
-			goto tr732
+			goto tr725
 		case 34:
 			goto tr199
 		case 44:
@@ -18975,40 +19152,8 @@ tr733:
 		case 92:
 			goto st122
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st539
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr732
-		}
-		goto st120
-	st539:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof539
-		}
-	st_case_539:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr407
-		case 11:
-			goto tr733
-		case 13:
-			goto tr407
-		case 32:
-			goto tr732
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr732
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr335
 		}
 		goto st120
 tr260:
@@ -19016,26 +19161,26 @@ tr260:
 
 	m.pb = m.p
 
-	goto st540
-	st540:
+	goto st539
+	st539:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof540
+			goto _test_eof539
 		}
-	st_case_540:
-//line plugins/parsers/influx/machine.go:19026
+	st_case_539:
+//line plugins/parsers/influx/machine.go:19171
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr715
 		case 11:
-			goto tr723
-		case 13:
-			goto tr429
+			goto tr716
+		case 12:
+			goto tr539
 		case 32:
-			goto tr722
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr724
+			goto tr717
 		case 61:
 			goto st7
 		case 69:
@@ -19046,12 +19191,12 @@ tr260:
 			goto st153
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
+				goto st539
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr722
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st118
 	st153:
@@ -19060,12 +19205,12 @@ tr260:
 		}
 	st_case_153:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19079,12 +19224,12 @@ tr260:
 		}
 		switch {
 		case ( m.data)[( m.p)] < 43:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-				goto tr229
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr59
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st541
+				goto st540
 			}
 		default:
 			goto st154
@@ -19096,12 +19241,12 @@ tr260:
 		}
 	st_case_154:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19114,12 +19259,44 @@ tr260:
 			goto st123
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st541
+				goto st540
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr229
+		case ( m.data)[( m.p)] >= 10:
+			goto tr59
+		}
+		goto st118
+	st540:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof540
+		}
+	st_case_540:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr715
+		case 11:
+			goto tr716
+		case 12:
+			goto tr539
+		case 32:
+			goto tr715
+		case 34:
+			goto tr183
+		case 44:
+			goto tr717
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st540
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st118
 	st541:
@@ -19128,30 +19305,25 @@ tr260:
 		}
 	st_case_541:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr747
 		case 11:
-			goto tr723
-		case 13:
-			goto tr429
+			goto tr748
+		case 12:
+			goto tr545
 		case 32:
-			goto tr722
+			goto tr747
 		case 34:
 			goto tr183
 		case 44:
-			goto tr724
+			goto tr749
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st541
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr722
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr362
 		}
 		goto st118
 	st542:
@@ -19160,47 +19332,20 @@ tr260:
 		}
 	st_case_542:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr435
+		case 9:
+			goto tr715
 		case 11:
-			goto tr755
-		case 13:
-			goto tr435
+			goto tr716
+		case 12:
+			goto tr539
 		case 32:
-			goto tr754
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr756
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr754
-		}
-		goto st118
-	st543:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof543
-		}
-	st_case_543:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
-		case 11:
-			goto tr723
-		case 13:
-			goto tr429
-		case 32:
-			goto tr722
-		case 34:
-			goto tr183
-		case 44:
-			goto tr724
+			goto tr717
 		case 46:
-			goto st540
+			goto st539
 		case 61:
 			goto st7
 		case 69:
@@ -19210,15 +19355,15 @@ tr260:
 		case 101:
 			goto st153
 		case 105:
-			goto st542
+			goto st541
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st543
+				goto st542
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr722
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st118
 tr261:
@@ -19226,28 +19371,28 @@ tr261:
 
 	m.pb = m.p
 
-	goto st544
-	st544:
+	goto st543
+	st543:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof544
+			goto _test_eof543
 		}
-	st_case_544:
-//line plugins/parsers/influx/machine.go:19236
+	st_case_543:
+//line plugins/parsers/influx/machine.go:19381
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr715
 		case 11:
-			goto tr723
-		case 13:
-			goto tr429
+			goto tr716
+		case 12:
+			goto tr539
 		case 32:
-			goto tr722
+			goto tr715
 		case 34:
 			goto tr183
 		case 44:
-			goto tr724
+			goto tr717
 		case 46:
-			goto st540
+			goto st539
 		case 61:
 			goto st7
 		case 69:
@@ -19257,39 +19402,39 @@ tr261:
 		case 101:
 			goto st153
 		case 105:
-			goto st542
+			goto st541
 		case 117:
-			goto st545
+			goto st544
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr722
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st118
-	st545:
+	st544:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof545
+			goto _test_eof544
 		}
-	st_case_545:
+	st_case_544:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr439
+		case 9:
+			goto tr751
 		case 11:
-			goto tr759
-		case 13:
-			goto tr439
+			goto tr752
+		case 12:
+			goto tr549
 		case 32:
-			goto tr758
+			goto tr751
 		case 34:
 			goto tr183
 		case 44:
-			goto tr760
+			goto tr753
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr758
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr366
 		}
 		goto st118
 tr262:
@@ -19297,75 +19442,75 @@ tr262:
 
 	m.pb = m.p
 
+	goto st545
+	st545:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof545
+		}
+	st_case_545:
+//line plugins/parsers/influx/machine.go:19452
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr715
+		case 11:
+			goto tr716
+		case 12:
+			goto tr539
+		case 32:
+			goto tr715
+		case 34:
+			goto tr183
+		case 44:
+			goto tr717
+		case 46:
+			goto st539
+		case 61:
+			goto st7
+		case 69:
+			goto st153
+		case 92:
+			goto st123
+		case 101:
+			goto st153
+		case 105:
+			goto st541
+		case 117:
+			goto st544
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st545
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
+		}
+		goto st118
+tr263:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st546
 	st546:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof546
 		}
 	st_case_546:
-//line plugins/parsers/influx/machine.go:19307
+//line plugins/parsers/influx/machine.go:19501
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr755
 		case 11:
-			goto tr723
-		case 13:
-			goto tr429
+			goto tr756
+		case 12:
+			goto tr553
 		case 32:
-			goto tr722
+			goto tr755
 		case 34:
 			goto tr183
 		case 44:
-			goto tr724
-		case 46:
-			goto st540
-		case 61:
-			goto st7
-		case 69:
-			goto st153
-		case 92:
-			goto st123
-		case 101:
-			goto st153
-		case 105:
-			goto st542
-		case 117:
-			goto st545
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st546
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr722
-		}
-		goto st118
-tr263:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st547
-	st547:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof547
-		}
-	st_case_547:
-//line plugins/parsers/influx/machine.go:19356
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr763
-		case 13:
-			goto tr443
-		case 32:
-			goto tr762
-		case 34:
-			goto tr183
-		case 44:
-			goto tr764
+			goto tr757
 		case 61:
 			goto st7
 		case 65:
@@ -19375,8 +19520,8 @@ tr263:
 		case 97:
 			goto st158
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr762
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st118
 	st155:
@@ -19385,12 +19530,12 @@ tr263:
 		}
 	st_case_155:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19404,8 +19549,8 @@ tr263:
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 	st156:
@@ -19414,12 +19559,12 @@ tr263:
 		}
 	st_case_156:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19433,8 +19578,8 @@ tr263:
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 	st157:
@@ -19443,12 +19588,12 @@ tr263:
 		}
 	st_case_157:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19458,39 +19603,39 @@ tr263:
 		case 61:
 			goto st7
 		case 69:
-			goto st548
+			goto st547
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
-	st548:
+	st547:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof548
+			goto _test_eof547
 		}
-	st_case_548:
+	st_case_547:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr755
 		case 11:
-			goto tr763
-		case 13:
-			goto tr443
+			goto tr756
+		case 12:
+			goto tr553
 		case 32:
-			goto tr762
+			goto tr755
 		case 34:
 			goto tr183
 		case 44:
-			goto tr764
+			goto tr757
 		case 61:
 			goto st7
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr762
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st118
 	st158:
@@ -19499,12 +19644,12 @@ tr263:
 		}
 	st_case_158:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19518,8 +19663,8 @@ tr263:
 		case 108:
 			goto st159
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 	st159:
@@ -19528,12 +19673,12 @@ tr263:
 		}
 	st_case_159:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19547,8 +19692,8 @@ tr263:
 		case 115:
 			goto st160
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 	st160:
@@ -19557,12 +19702,12 @@ tr263:
 		}
 	st_case_160:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19574,10 +19719,10 @@ tr263:
 		case 92:
 			goto st123
 		case 101:
-			goto st548
+			goto st547
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 tr264:
@@ -19585,26 +19730,26 @@ tr264:
 
 	m.pb = m.p
 
-	goto st549
-	st549:
+	goto st548
+	st548:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof549
+			goto _test_eof548
 		}
-	st_case_549:
-//line plugins/parsers/influx/machine.go:19595
+	st_case_548:
+//line plugins/parsers/influx/machine.go:19740
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr755
 		case 11:
-			goto tr763
-		case 13:
-			goto tr443
+			goto tr756
+		case 12:
+			goto tr553
 		case 32:
-			goto tr762
+			goto tr755
 		case 34:
 			goto tr183
 		case 44:
-			goto tr764
+			goto tr757
 		case 61:
 			goto st7
 		case 82:
@@ -19614,8 +19759,8 @@ tr264:
 		case 114:
 			goto st162
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr762
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st118
 	st161:
@@ -19624,12 +19769,12 @@ tr264:
 		}
 	st_case_161:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19643,8 +19788,8 @@ tr264:
 		case 92:
 			goto st123
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 	st162:
@@ -19653,12 +19798,12 @@ tr264:
 		}
 	st_case_162:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr229
 		case 11:
 			goto tr230
-		case 13:
-			goto st7
+		case 12:
+			goto tr58
 		case 32:
 			goto tr229
 		case 34:
@@ -19672,8 +19817,8 @@ tr264:
 		case 117:
 			goto st160
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr229
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr59
 		}
 		goto st118
 tr265:
@@ -19681,62 +19826,62 @@ tr265:
 
 	m.pb = m.p
 
+	goto st549
+	st549:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof549
+		}
+	st_case_549:
+//line plugins/parsers/influx/machine.go:19836
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr755
+		case 11:
+			goto tr756
+		case 12:
+			goto tr553
+		case 32:
+			goto tr755
+		case 34:
+			goto tr183
+		case 44:
+			goto tr757
+		case 61:
+			goto st7
+		case 92:
+			goto st123
+		case 97:
+			goto st158
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
+		}
+		goto st118
+tr266:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st550
 	st550:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof550
 		}
 	st_case_550:
-//line plugins/parsers/influx/machine.go:19691
+//line plugins/parsers/influx/machine.go:19872
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr755
 		case 11:
-			goto tr763
-		case 13:
-			goto tr443
+			goto tr756
+		case 12:
+			goto tr553
 		case 32:
-			goto tr762
+			goto tr755
 		case 34:
 			goto tr183
 		case 44:
-			goto tr764
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		case 97:
-			goto st158
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr762
-		}
-		goto st118
-tr266:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st551
-	st551:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof551
-		}
-	st_case_551:
-//line plugins/parsers/influx/machine.go:19727
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr763
-		case 13:
-			goto tr443
-		case 32:
-			goto tr762
-		case 34:
-			goto tr183
-		case 44:
-			goto tr764
+			goto tr757
 		case 61:
 			goto st7
 		case 92:
@@ -19744,8 +19889,8 @@ tr266:
 		case 114:
 			goto st162
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr762
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st118
 tr252:
@@ -19759,7 +19904,7 @@ tr252:
 			goto _test_eof163
 		}
 	st_case_163:
-//line plugins/parsers/influx/machine.go:19763
+//line plugins/parsers/influx/machine.go:19908
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st131
@@ -19786,7 +19931,7 @@ tr83:
 			goto _test_eof164
 		}
 	st_case_164:
-//line plugins/parsers/influx/machine.go:19790
+//line plugins/parsers/influx/machine.go:19935
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st39
@@ -19813,14 +19958,14 @@ tr240:
 			goto _test_eof165
 		}
 	st_case_165:
-//line plugins/parsers/influx/machine.go:19817
+//line plugins/parsers/influx/machine.go:19962
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -19828,39 +19973,39 @@ tr240:
 		case 44:
 			goto tr88
 		case 48:
-			goto st552
+			goto st551
 		case 92:
 			goto st164
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st558
+				goto st557
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr85
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
 		}
 		goto st39
-	st552:
+	st551:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof552
+			goto _test_eof551
 		}
-	st_case_552:
+	st_case_551:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr762
 		case 11:
-			goto tr770
-		case 13:
-			goto tr429
+			goto tr763
+		case 12:
+			goto tr764
 		case 32:
-			goto tr769
+			goto tr762
 		case 34:
 			goto tr87
 		case 44:
-			goto tr771
+			goto tr765
 		case 46:
-			goto st553
+			goto st552
 		case 69:
 			goto st166
 		case 92:
@@ -19868,10 +20013,10 @@ tr240:
 		case 101:
 			goto st166
 		case 105:
-			goto st557
+			goto st556
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr769
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st39
 tr241:
@@ -19879,26 +20024,26 @@ tr241:
 
 	m.pb = m.p
 
-	goto st553
-	st553:
+	goto st552
+	st552:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof553
+			goto _test_eof552
 		}
-	st_case_553:
-//line plugins/parsers/influx/machine.go:19889
+	st_case_552:
+//line plugins/parsers/influx/machine.go:20034
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr762
 		case 11:
-			goto tr770
-		case 13:
-			goto tr429
+			goto tr763
+		case 12:
+			goto tr764
 		case 32:
-			goto tr769
+			goto tr762
 		case 34:
 			goto tr87
 		case 44:
-			goto tr771
+			goto tr765
 		case 69:
 			goto st166
 		case 92:
@@ -19907,12 +20052,12 @@ tr241:
 			goto st166
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st553
+				goto st552
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr769
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st39
 	st166:
@@ -19921,12 +20066,12 @@ tr241:
 		}
 	st_case_166:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -19938,12 +20083,12 @@ tr241:
 		}
 		switch {
 		case ( m.data)[( m.p)] < 43:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-				goto tr85
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st556
+				goto st555
 			}
 		default:
 			goto st167
@@ -19954,62 +20099,62 @@ tr304:
 
 	m.handler.AddString(key, m.text())
 
-	goto st554
+	goto st553
+	st553:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof553
+		}
+	st_case_553:
+//line plugins/parsers/influx/machine.go:20109
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr330
+		case 11:
+			goto tr615
+		case 13:
+			goto tr330
+		case 32:
+			goto tr455
+		case 44:
+			goto tr457
+		case 92:
+			goto st129
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st554
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr455
+		}
+		goto st2
 	st554:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof554
 		}
 	st_case_554:
-//line plugins/parsers/influx/machine.go:19964
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr356
 		case 11:
-			goto tr622
+			goto tr769
 		case 13:
-			goto tr330
+			goto tr356
 		case 32:
-			goto tr462
+			goto tr764
 		case 44:
-			goto tr464
+			goto tr770
 		case 92:
 			goto st129
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
+				goto st554
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr462
-		}
-		goto st2
-	st555:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof555
-		}
-	st_case_555:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr776
-		case 13:
-			goto tr356
-		case 32:
-			goto tr775
-		case 44:
-			goto tr777
-		case 92:
-			goto st129
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr775
+			goto tr764
 		}
 		goto st2
 	st167:
@@ -20018,12 +20163,12 @@ tr304:
 		}
 	st_case_167:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20034,12 +20179,42 @@ tr304:
 			goto st164
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st556
+				goto st555
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr85
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
+		}
+		goto st39
+	st555:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof555
+		}
+	st_case_555:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr762
+		case 11:
+			goto tr763
+		case 12:
+			goto tr764
+		case 32:
+			goto tr762
+		case 34:
+			goto tr87
+		case 44:
+			goto tr765
+		case 92:
+			goto st164
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st555
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st39
 	st556:
@@ -20048,28 +20223,23 @@ tr304:
 		}
 	st_case_556:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr771
 		case 11:
-			goto tr770
-		case 13:
-			goto tr429
+			goto tr772
+		case 12:
+			goto tr773
 		case 32:
-			goto tr769
+			goto tr771
 		case 34:
 			goto tr87
 		case 44:
-			goto tr771
+			goto tr774
 		case 92:
 			goto st164
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st556
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr769
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr362
 		}
 		goto st39
 	st557:
@@ -20078,45 +20248,20 @@ tr304:
 		}
 	st_case_557:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr435
+		case 9:
+			goto tr762
 		case 11:
-			goto tr779
-		case 13:
-			goto tr435
+			goto tr763
+		case 12:
+			goto tr764
 		case 32:
-			goto tr778
+			goto tr762
 		case 34:
 			goto tr87
 		case 44:
-			goto tr780
-		case 92:
-			goto st164
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr778
-		}
-		goto st39
-	st558:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof558
-		}
-	st_case_558:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
-		case 11:
-			goto tr770
-		case 13:
-			goto tr429
-		case 32:
-			goto tr769
-		case 34:
-			goto tr87
-		case 44:
-			goto tr771
+			goto tr765
 		case 46:
-			goto st553
+			goto st552
 		case 69:
 			goto st166
 		case 92:
@@ -20124,15 +20269,15 @@ tr304:
 		case 101:
 			goto st166
 		case 105:
-			goto st557
+			goto st556
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st558
+				goto st557
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr769
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st39
 tr242:
@@ -20140,28 +20285,28 @@ tr242:
 
 	m.pb = m.p
 
-	goto st559
-	st559:
+	goto st558
+	st558:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof559
+			goto _test_eof558
 		}
-	st_case_559:
-//line plugins/parsers/influx/machine.go:20150
+	st_case_558:
+//line plugins/parsers/influx/machine.go:20295
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr762
 		case 11:
-			goto tr770
-		case 13:
-			goto tr429
+			goto tr763
+		case 12:
+			goto tr764
 		case 32:
-			goto tr769
+			goto tr762
 		case 34:
 			goto tr87
 		case 44:
-			goto tr771
+			goto tr765
 		case 46:
-			goto st553
+			goto st552
 		case 69:
 			goto st166
 		case 92:
@@ -20169,40 +20314,87 @@ tr242:
 		case 101:
 			goto st166
 		case 105:
-			goto st557
+			goto st556
 		case 117:
-			goto st560
+			goto st559
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr769
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr356
 		}
 		goto st39
+	st559:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof559
+		}
+	st_case_559:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr776
+		case 11:
+			goto tr777
+		case 12:
+			goto tr778
+		case 32:
+			goto tr776
+		case 34:
+			goto tr87
+		case 44:
+			goto tr779
+		case 92:
+			goto st164
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr366
+		}
+		goto st39
+tr243:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st560
 	st560:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof560
 		}
 	st_case_560:
+//line plugins/parsers/influx/machine.go:20362
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr439
+		case 9:
+			goto tr762
 		case 11:
-			goto tr783
-		case 13:
-			goto tr439
+			goto tr763
+		case 12:
+			goto tr764
 		case 32:
-			goto tr782
+			goto tr762
 		case 34:
 			goto tr87
 		case 44:
-			goto tr784
+			goto tr765
+		case 46:
+			goto st552
+		case 69:
+			goto st166
 		case 92:
 			goto st164
+		case 101:
+			goto st166
+		case 105:
+			goto st556
+		case 117:
+			goto st559
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr782
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st560
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr356
 		}
 		goto st39
-tr243:
+tr244:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -20213,67 +20405,20 @@ tr243:
 			goto _test_eof561
 		}
 	st_case_561:
-//line plugins/parsers/influx/machine.go:20217
+//line plugins/parsers/influx/machine.go:20409
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr429
+		case 9:
+			goto tr781
 		case 11:
-			goto tr770
-		case 13:
-			goto tr429
+			goto tr782
+		case 12:
+			goto tr783
 		case 32:
-			goto tr769
+			goto tr781
 		case 34:
 			goto tr87
 		case 44:
-			goto tr771
-		case 46:
-			goto st553
-		case 69:
-			goto st166
-		case 92:
-			goto st164
-		case 101:
-			goto st166
-		case 105:
-			goto st557
-		case 117:
-			goto st560
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st561
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr769
-		}
-		goto st39
-tr244:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st562
-	st562:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof562
-		}
-	st_case_562:
-//line plugins/parsers/influx/machine.go:20264
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr787
-		case 13:
-			goto tr443
-		case 32:
-			goto tr786
-		case 34:
-			goto tr87
-		case 44:
-			goto tr788
+			goto tr784
 		case 65:
 			goto st168
 		case 92:
@@ -20281,8 +20426,8 @@ tr244:
 		case 97:
 			goto st171
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr786
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st39
 	st168:
@@ -20291,12 +20436,12 @@ tr244:
 		}
 	st_case_168:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20308,8 +20453,8 @@ tr244:
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 	st169:
@@ -20318,12 +20463,12 @@ tr244:
 		}
 	st_case_169:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20335,8 +20480,8 @@ tr244:
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 	st170:
@@ -20345,12 +20490,12 @@ tr244:
 		}
 	st_case_170:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20358,37 +20503,37 @@ tr244:
 		case 44:
 			goto tr88
 		case 69:
-			goto st563
+			goto st562
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
-	st563:
+	st562:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof563
+			goto _test_eof562
 		}
-	st_case_563:
+	st_case_562:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr781
 		case 11:
-			goto tr787
-		case 13:
-			goto tr443
+			goto tr782
+		case 12:
+			goto tr783
 		case 32:
-			goto tr786
+			goto tr781
 		case 34:
 			goto tr87
 		case 44:
-			goto tr788
+			goto tr784
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr786
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st39
 	st171:
@@ -20397,12 +20542,12 @@ tr244:
 		}
 	st_case_171:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20414,8 +20559,8 @@ tr244:
 		case 108:
 			goto st172
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 	st172:
@@ -20424,12 +20569,12 @@ tr244:
 		}
 	st_case_172:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20441,8 +20586,8 @@ tr244:
 		case 115:
 			goto st173
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 	st173:
@@ -20451,12 +20596,12 @@ tr244:
 		}
 	st_case_173:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20466,10 +20611,10 @@ tr244:
 		case 92:
 			goto st164
 		case 101:
-			goto st563
+			goto st562
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 tr245:
@@ -20477,26 +20622,26 @@ tr245:
 
 	m.pb = m.p
 
-	goto st564
-	st564:
+	goto st563
+	st563:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof564
+			goto _test_eof563
 		}
-	st_case_564:
-//line plugins/parsers/influx/machine.go:20487
+	st_case_563:
+//line plugins/parsers/influx/machine.go:20632
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr781
 		case 11:
-			goto tr787
-		case 13:
-			goto tr443
+			goto tr782
+		case 12:
+			goto tr783
 		case 32:
-			goto tr786
+			goto tr781
 		case 34:
 			goto tr87
 		case 44:
-			goto tr788
+			goto tr784
 		case 82:
 			goto st174
 		case 92:
@@ -20504,8 +20649,8 @@ tr245:
 		case 114:
 			goto st175
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr786
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st39
 	st174:
@@ -20514,12 +20659,12 @@ tr245:
 		}
 	st_case_174:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20531,8 +20676,8 @@ tr245:
 		case 92:
 			goto st164
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 	st175:
@@ -20541,12 +20686,12 @@ tr245:
 		}
 	st_case_175:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto st7
+		case 9:
+			goto tr85
 		case 11:
 			goto tr86
-		case 13:
-			goto st7
+		case 12:
+			goto tr4
 		case 32:
 			goto tr85
 		case 34:
@@ -20558,8 +20703,8 @@ tr245:
 		case 117:
 			goto st173
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr85
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st39
 tr246:
@@ -20567,67 +20712,67 @@ tr246:
 
 	m.pb = m.p
 
+	goto st564
+	st564:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof564
+		}
+	st_case_564:
+//line plugins/parsers/influx/machine.go:20722
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr781
+		case 11:
+			goto tr782
+		case 12:
+			goto tr783
+		case 32:
+			goto tr781
+		case 34:
+			goto tr87
+		case 44:
+			goto tr784
+		case 92:
+			goto st164
+		case 97:
+			goto st171
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
+		}
+		goto st39
+tr247:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st565
 	st565:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof565
 		}
 	st_case_565:
-//line plugins/parsers/influx/machine.go:20577
+//line plugins/parsers/influx/machine.go:20756
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
+		case 9:
+			goto tr781
 		case 11:
-			goto tr787
-		case 13:
-			goto tr443
+			goto tr782
+		case 12:
+			goto tr783
 		case 32:
-			goto tr786
+			goto tr781
 		case 34:
 			goto tr87
 		case 44:
-			goto tr788
-		case 92:
-			goto st164
-		case 97:
-			goto st171
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr786
-		}
-		goto st39
-tr247:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st566
-	st566:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof566
-		}
-	st_case_566:
-//line plugins/parsers/influx/machine.go:20611
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr443
-		case 11:
-			goto tr787
-		case 13:
-			goto tr443
-		case 32:
-			goto tr786
-		case 34:
-			goto tr87
-		case 44:
-			goto tr788
+			goto tr784
 		case 92:
 			goto st164
 		case 114:
 			goto st175
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr786
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr370
 		}
 		goto st39
 tr70:
@@ -20641,7 +20786,7 @@ tr70:
 			goto _test_eof176
 		}
 	st_case_176:
-//line plugins/parsers/influx/machine.go:20645
+//line plugins/parsers/influx/machine.go:20790
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -20654,37 +20799,37 @@ tr70:
 		case 44:
 			goto tr7
 		case 48:
-			goto st567
+			goto st566
 		case 92:
 			goto st129
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st570
+				goto st569
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-	st567:
+	st566:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof567
+			goto _test_eof566
 		}
-	st_case_567:
+	st_case_566:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr776
+			goto tr769
 		case 13:
 			goto tr356
 		case 32:
-			goto tr775
+			goto tr764
 		case 44:
-			goto tr777
+			goto tr770
 		case 46:
-			goto st568
+			goto st567
 		case 69:
 			goto st177
 		case 92:
@@ -20692,10 +20837,10 @@ tr70:
 		case 101:
 			goto st177
 		case 105:
-			goto st569
+			goto st568
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr775
+			goto tr764
 		}
 		goto st2
 tr71:
@@ -20703,24 +20848,24 @@ tr71:
 
 	m.pb = m.p
 
-	goto st568
-	st568:
+	goto st567
+	st567:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof568
+			goto _test_eof567
 		}
-	st_case_568:
-//line plugins/parsers/influx/machine.go:20713
+	st_case_567:
+//line plugins/parsers/influx/machine.go:20858
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr776
+			goto tr769
 		case 13:
 			goto tr356
 		case 32:
-			goto tr775
+			goto tr764
 		case 44:
-			goto tr777
+			goto tr770
 		case 69:
 			goto st177
 		case 92:
@@ -20731,10 +20876,10 @@ tr71:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st568
+				goto st567
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr775
+			goto tr764
 		}
 		goto st2
 	st177:
@@ -20765,7 +20910,7 @@ tr71:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
+				goto st554
 			}
 		default:
 			goto st178
@@ -20793,53 +20938,53 @@ tr71:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
+				goto st554
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
+	st568:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof568
+		}
+	st_case_568:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr792
+		case 13:
+			goto tr362
+		case 32:
+			goto tr773
+		case 44:
+			goto tr793
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr773
+		}
+		goto st2
 	st569:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof569
 		}
 	st_case_569:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
-		case 11:
-			goto tr797
-		case 13:
-			goto tr362
-		case 32:
-			goto tr796
-		case 44:
-			goto tr798
-		case 92:
-			goto st129
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr796
-		}
-		goto st2
-	st570:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof570
-		}
-	st_case_570:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr776
+			goto tr769
 		case 13:
 			goto tr356
 		case 32:
-			goto tr775
+			goto tr764
 		case 44:
-			goto tr777
+			goto tr770
 		case 46:
-			goto st568
+			goto st567
 		case 69:
 			goto st177
 		case 92:
@@ -20847,15 +20992,15 @@ tr71:
 		case 101:
 			goto st177
 		case 105:
-			goto st569
+			goto st568
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st570
+				goto st569
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr775
+			goto tr764
 		}
 		goto st2
 tr72:
@@ -20863,26 +21008,26 @@ tr72:
 
 	m.pb = m.p
 
-	goto st571
-	st571:
+	goto st570
+	st570:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof571
+			goto _test_eof570
 		}
-	st_case_571:
-//line plugins/parsers/influx/machine.go:20873
+	st_case_570:
+//line plugins/parsers/influx/machine.go:21018
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr356
 		case 11:
-			goto tr776
+			goto tr769
 		case 13:
 			goto tr356
 		case 32:
-			goto tr775
+			goto tr764
 		case 44:
-			goto tr777
+			goto tr770
 		case 46:
-			goto st568
+			goto st567
 		case 69:
 			goto st177
 		case 92:
@@ -20890,38 +21035,83 @@ tr72:
 		case 101:
 			goto st177
 		case 105:
-			goto st569
+			goto st568
 		case 117:
-			goto st572
+			goto st571
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr775
+			goto tr764
 		}
 		goto st2
+	st571:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof571
+		}
+	st_case_571:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr366
+		case 11:
+			goto tr795
+		case 13:
+			goto tr366
+		case 32:
+			goto tr778
+		case 44:
+			goto tr796
+		case 92:
+			goto st129
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr778
+		}
+		goto st2
+tr73:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st572
 	st572:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof572
 		}
 	st_case_572:
+//line plugins/parsers/influx/machine.go:21081
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr366
+			goto tr356
 		case 11:
-			goto tr801
+			goto tr769
 		case 13:
-			goto tr366
+			goto tr356
 		case 32:
-			goto tr800
+			goto tr764
 		case 44:
-			goto tr802
+			goto tr770
+		case 46:
+			goto st567
+		case 69:
+			goto st177
 		case 92:
 			goto st129
+		case 101:
+			goto st177
+		case 105:
+			goto st568
+		case 117:
+			goto st571
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr800
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st572
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr764
 		}
 		goto st2
-tr73:
+tr74:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -20932,63 +21122,18 @@ tr73:
 			goto _test_eof573
 		}
 	st_case_573:
-//line plugins/parsers/influx/machine.go:20936
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr776
-		case 13:
-			goto tr356
-		case 32:
-			goto tr775
-		case 44:
-			goto tr777
-		case 46:
-			goto st568
-		case 69:
-			goto st177
-		case 92:
-			goto st129
-		case 101:
-			goto st177
-		case 105:
-			goto st569
-		case 117:
-			goto st572
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st573
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr775
-		}
-		goto st2
-tr74:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st574
-	st574:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof574
-		}
-	st_case_574:
-//line plugins/parsers/influx/machine.go:20981
+//line plugins/parsers/influx/machine.go:21126
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr805
+			goto tr798
 		case 13:
 			goto tr370
 		case 32:
-			goto tr804
+			goto tr783
 		case 44:
-			goto tr806
+			goto tr799
 		case 65:
 			goto st179
 		case 92:
@@ -20997,7 +21142,7 @@ tr74:
 			goto st182
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr804
+			goto tr783
 		}
 		goto st2
 	st179:
@@ -21067,7 +21212,7 @@ tr74:
 		case 44:
 			goto tr7
 		case 69:
-			goto st575
+			goto st574
 		case 92:
 			goto st129
 		}
@@ -21075,27 +21220,27 @@ tr74:
 			goto tr4
 		}
 		goto st2
-	st575:
+	st574:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof575
+			goto _test_eof574
 		}
-	st_case_575:
+	st_case_574:
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr805
+			goto tr798
 		case 13:
 			goto tr370
 		case 32:
-			goto tr804
+			goto tr783
 		case 44:
-			goto tr806
+			goto tr799
 		case 92:
 			goto st129
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr804
+			goto tr783
 		}
 		goto st2
 	st182:
@@ -21167,7 +21312,7 @@ tr74:
 		case 92:
 			goto st129
 		case 101:
-			goto st575
+			goto st574
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
@@ -21178,24 +21323,24 @@ tr75:
 
 	m.pb = m.p
 
-	goto st576
-	st576:
+	goto st575
+	st575:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof576
+			goto _test_eof575
 		}
-	st_case_576:
-//line plugins/parsers/influx/machine.go:21188
+	st_case_575:
+//line plugins/parsers/influx/machine.go:21333
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr805
+			goto tr798
 		case 13:
 			goto tr370
 		case 32:
-			goto tr804
+			goto tr783
 		case 44:
-			goto tr806
+			goto tr799
 		case 82:
 			goto st185
 		case 92:
@@ -21204,7 +21349,7 @@ tr75:
 			goto st186
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr804
+			goto tr783
 		}
 		goto st2
 	st185:
@@ -21262,31 +21407,31 @@ tr76:
 
 	m.pb = m.p
 
-	goto st577
-	st577:
+	goto st576
+	st576:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof577
+			goto _test_eof576
 		}
-	st_case_577:
-//line plugins/parsers/influx/machine.go:21272
+	st_case_576:
+//line plugins/parsers/influx/machine.go:21417
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr805
+			goto tr798
 		case 13:
 			goto tr370
 		case 32:
-			goto tr804
+			goto tr783
 		case 44:
-			goto tr806
+			goto tr799
 		case 92:
 			goto st129
 		case 97:
 			goto st182
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr804
+			goto tr783
 		}
 		goto st2
 tr77:
@@ -21294,31 +21439,31 @@ tr77:
 
 	m.pb = m.p
 
-	goto st578
-	st578:
+	goto st577
+	st577:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof578
+			goto _test_eof577
 		}
-	st_case_578:
-//line plugins/parsers/influx/machine.go:21304
+	st_case_577:
+//line plugins/parsers/influx/machine.go:21449
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr370
 		case 11:
-			goto tr805
+			goto tr798
 		case 13:
 			goto tr370
 		case 32:
-			goto tr804
+			goto tr783
 		case 44:
-			goto tr806
+			goto tr799
 		case 92:
 			goto st129
 		case 114:
 			goto st186
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr804
+			goto tr783
 		}
 		goto st2
 	st187:
@@ -21338,13 +21483,13 @@ tr322:
 
 	{goto st188 }
 
-	goto st579
-	st579:
+	goto st578
+	st578:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof579
+			goto _test_eof578
 		}
-	st_case_579:
-//line plugins/parsers/influx/machine.go:21348
+	st_case_578:
+//line plugins/parsers/influx/machine.go:21493
 		goto st0
 	st188:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -21374,13 +21519,13 @@ tr323:
 
 	{goto st1 }
 
-	goto st580
-	st580:
+	goto st579
+	st579:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof580
+			goto _test_eof579
 		}
-	st_case_580:
-//line plugins/parsers/influx/machine.go:21384
+	st_case_579:
+//line plugins/parsers/influx/machine.go:21529
 		goto st0
 tr325:
 //line plugins/parsers/influx/machine.go.rl:63
@@ -21389,13 +21534,13 @@ tr325:
 
 	{goto st1 }
 
-	goto st581
-	st581:
+	goto st580
+	st580:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof581
+			goto _test_eof580
 		}
-	st_case_581:
-//line plugins/parsers/influx/machine.go:21399
+	st_case_580:
+//line plugins/parsers/influx/machine.go:21544
 		switch ( m.data)[( m.p)] {
 		case 11:
 			goto tr325
@@ -21542,8 +21687,8 @@ tr325:
 	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof249:  m.cs = 249; goto _test_eof
 	_test_eof250:  m.cs = 250; goto _test_eof
-	_test_eof251:  m.cs = 251; goto _test_eof
 	_test_eof44:  m.cs = 44; goto _test_eof
+	_test_eof251:  m.cs = 251; goto _test_eof
 	_test_eof252:  m.cs = 252; goto _test_eof
 	_test_eof253:  m.cs = 253; goto _test_eof
 	_test_eof254:  m.cs = 254; goto _test_eof
@@ -21563,80 +21708,80 @@ tr325:
 	_test_eof268:  m.cs = 268; goto _test_eof
 	_test_eof269:  m.cs = 269; goto _test_eof
 	_test_eof270:  m.cs = 270; goto _test_eof
-	_test_eof271:  m.cs = 271; goto _test_eof
 	_test_eof45:  m.cs = 45; goto _test_eof
 	_test_eof46:  m.cs = 46; goto _test_eof
 	_test_eof47:  m.cs = 47; goto _test_eof
-	_test_eof272:  m.cs = 272; goto _test_eof
+	_test_eof271:  m.cs = 271; goto _test_eof
 	_test_eof48:  m.cs = 48; goto _test_eof
 	_test_eof49:  m.cs = 49; goto _test_eof
 	_test_eof50:  m.cs = 50; goto _test_eof
 	_test_eof51:  m.cs = 51; goto _test_eof
+	_test_eof272:  m.cs = 272; goto _test_eof
 	_test_eof273:  m.cs = 273; goto _test_eof
-	_test_eof274:  m.cs = 274; goto _test_eof
 	_test_eof52:  m.cs = 52; goto _test_eof
-	_test_eof275:  m.cs = 275; goto _test_eof
+	_test_eof274:  m.cs = 274; goto _test_eof
 	_test_eof53:  m.cs = 53; goto _test_eof
+	_test_eof275:  m.cs = 275; goto _test_eof
 	_test_eof276:  m.cs = 276; goto _test_eof
 	_test_eof277:  m.cs = 277; goto _test_eof
 	_test_eof278:  m.cs = 278; goto _test_eof
 	_test_eof279:  m.cs = 279; goto _test_eof
 	_test_eof280:  m.cs = 280; goto _test_eof
 	_test_eof281:  m.cs = 281; goto _test_eof
-	_test_eof282:  m.cs = 282; goto _test_eof
 	_test_eof54:  m.cs = 54; goto _test_eof
 	_test_eof55:  m.cs = 55; goto _test_eof
 	_test_eof56:  m.cs = 56; goto _test_eof
-	_test_eof283:  m.cs = 283; goto _test_eof
+	_test_eof282:  m.cs = 282; goto _test_eof
 	_test_eof57:  m.cs = 57; goto _test_eof
 	_test_eof58:  m.cs = 58; goto _test_eof
 	_test_eof59:  m.cs = 59; goto _test_eof
-	_test_eof284:  m.cs = 284; goto _test_eof
+	_test_eof283:  m.cs = 283; goto _test_eof
 	_test_eof60:  m.cs = 60; goto _test_eof
 	_test_eof61:  m.cs = 61; goto _test_eof
+	_test_eof284:  m.cs = 284; goto _test_eof
 	_test_eof285:  m.cs = 285; goto _test_eof
-	_test_eof286:  m.cs = 286; goto _test_eof
 	_test_eof62:  m.cs = 62; goto _test_eof
 	_test_eof63:  m.cs = 63; goto _test_eof
+	_test_eof286:  m.cs = 286; goto _test_eof
 	_test_eof287:  m.cs = 287; goto _test_eof
-	_test_eof288:  m.cs = 288; goto _test_eof
 	_test_eof64:  m.cs = 64; goto _test_eof
 	_test_eof65:  m.cs = 65; goto _test_eof
+	_test_eof288:  m.cs = 288; goto _test_eof
 	_test_eof289:  m.cs = 289; goto _test_eof
 	_test_eof290:  m.cs = 290; goto _test_eof
 	_test_eof291:  m.cs = 291; goto _test_eof
 	_test_eof292:  m.cs = 292; goto _test_eof
 	_test_eof293:  m.cs = 293; goto _test_eof
 	_test_eof294:  m.cs = 294; goto _test_eof
-	_test_eof295:  m.cs = 295; goto _test_eof
 	_test_eof66:  m.cs = 66; goto _test_eof
 	_test_eof67:  m.cs = 67; goto _test_eof
 	_test_eof68:  m.cs = 68; goto _test_eof
-	_test_eof296:  m.cs = 296; goto _test_eof
+	_test_eof295:  m.cs = 295; goto _test_eof
 	_test_eof69:  m.cs = 69; goto _test_eof
 	_test_eof70:  m.cs = 70; goto _test_eof
 	_test_eof71:  m.cs = 71; goto _test_eof
-	_test_eof297:  m.cs = 297; goto _test_eof
+	_test_eof296:  m.cs = 296; goto _test_eof
 	_test_eof72:  m.cs = 72; goto _test_eof
 	_test_eof73:  m.cs = 73; goto _test_eof
+	_test_eof297:  m.cs = 297; goto _test_eof
 	_test_eof298:  m.cs = 298; goto _test_eof
-	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof74:  m.cs = 74; goto _test_eof
 	_test_eof75:  m.cs = 75; goto _test_eof
 	_test_eof76:  m.cs = 76; goto _test_eof
 	_test_eof77:  m.cs = 77; goto _test_eof
 	_test_eof78:  m.cs = 78; goto _test_eof
 	_test_eof79:  m.cs = 79; goto _test_eof
+	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof300:  m.cs = 300; goto _test_eof
 	_test_eof301:  m.cs = 301; goto _test_eof
 	_test_eof302:  m.cs = 302; goto _test_eof
-	_test_eof303:  m.cs = 303; goto _test_eof
 	_test_eof80:  m.cs = 80; goto _test_eof
+	_test_eof303:  m.cs = 303; goto _test_eof
 	_test_eof304:  m.cs = 304; goto _test_eof
 	_test_eof305:  m.cs = 305; goto _test_eof
 	_test_eof306:  m.cs = 306; goto _test_eof
-	_test_eof307:  m.cs = 307; goto _test_eof
 	_test_eof81:  m.cs = 81; goto _test_eof
+	_test_eof307:  m.cs = 307; goto _test_eof
 	_test_eof308:  m.cs = 308; goto _test_eof
 	_test_eof309:  m.cs = 309; goto _test_eof
 	_test_eof310:  m.cs = 310; goto _test_eof
@@ -21654,7 +21799,6 @@ tr325:
 	_test_eof322:  m.cs = 322; goto _test_eof
 	_test_eof323:  m.cs = 323; goto _test_eof
 	_test_eof324:  m.cs = 324; goto _test_eof
-	_test_eof325:  m.cs = 325; goto _test_eof
 	_test_eof82:  m.cs = 82; goto _test_eof
 	_test_eof83:  m.cs = 83; goto _test_eof
 	_test_eof84:  m.cs = 84; goto _test_eof
@@ -21668,9 +21812,10 @@ tr325:
 	_test_eof92:  m.cs = 92; goto _test_eof
 	_test_eof93:  m.cs = 93; goto _test_eof
 	_test_eof94:  m.cs = 94; goto _test_eof
+	_test_eof325:  m.cs = 325; goto _test_eof
 	_test_eof326:  m.cs = 326; goto _test_eof
-	_test_eof327:  m.cs = 327; goto _test_eof
 	_test_eof95:  m.cs = 95; goto _test_eof
+	_test_eof327:  m.cs = 327; goto _test_eof
 	_test_eof328:  m.cs = 328; goto _test_eof
 	_test_eof329:  m.cs = 329; goto _test_eof
 	_test_eof330:  m.cs = 330; goto _test_eof
@@ -21690,12 +21835,12 @@ tr325:
 	_test_eof344:  m.cs = 344; goto _test_eof
 	_test_eof345:  m.cs = 345; goto _test_eof
 	_test_eof346:  m.cs = 346; goto _test_eof
-	_test_eof347:  m.cs = 347; goto _test_eof
 	_test_eof96:  m.cs = 96; goto _test_eof
 	_test_eof97:  m.cs = 97; goto _test_eof
+	_test_eof347:  m.cs = 347; goto _test_eof
 	_test_eof348:  m.cs = 348; goto _test_eof
-	_test_eof349:  m.cs = 349; goto _test_eof
 	_test_eof98:  m.cs = 98; goto _test_eof
+	_test_eof349:  m.cs = 349; goto _test_eof
 	_test_eof350:  m.cs = 350; goto _test_eof
 	_test_eof351:  m.cs = 351; goto _test_eof
 	_test_eof352:  m.cs = 352; goto _test_eof
@@ -21715,37 +21860,36 @@ tr325:
 	_test_eof366:  m.cs = 366; goto _test_eof
 	_test_eof367:  m.cs = 367; goto _test_eof
 	_test_eof368:  m.cs = 368; goto _test_eof
-	_test_eof369:  m.cs = 369; goto _test_eof
 	_test_eof99:  m.cs = 99; goto _test_eof
+	_test_eof369:  m.cs = 369; goto _test_eof
 	_test_eof370:  m.cs = 370; goto _test_eof
-	_test_eof371:  m.cs = 371; goto _test_eof
 	_test_eof100:  m.cs = 100; goto _test_eof
 	_test_eof101:  m.cs = 101; goto _test_eof
 	_test_eof102:  m.cs = 102; goto _test_eof
 	_test_eof103:  m.cs = 103; goto _test_eof
+	_test_eof371:  m.cs = 371; goto _test_eof
 	_test_eof372:  m.cs = 372; goto _test_eof
-	_test_eof373:  m.cs = 373; goto _test_eof
 	_test_eof104:  m.cs = 104; goto _test_eof
 	_test_eof105:  m.cs = 105; goto _test_eof
+	_test_eof373:  m.cs = 373; goto _test_eof
 	_test_eof374:  m.cs = 374; goto _test_eof
 	_test_eof375:  m.cs = 375; goto _test_eof
 	_test_eof376:  m.cs = 376; goto _test_eof
 	_test_eof377:  m.cs = 377; goto _test_eof
 	_test_eof378:  m.cs = 378; goto _test_eof
 	_test_eof379:  m.cs = 379; goto _test_eof
-	_test_eof380:  m.cs = 380; goto _test_eof
 	_test_eof106:  m.cs = 106; goto _test_eof
 	_test_eof107:  m.cs = 107; goto _test_eof
 	_test_eof108:  m.cs = 108; goto _test_eof
-	_test_eof381:  m.cs = 381; goto _test_eof
+	_test_eof380:  m.cs = 380; goto _test_eof
 	_test_eof109:  m.cs = 109; goto _test_eof
 	_test_eof110:  m.cs = 110; goto _test_eof
 	_test_eof111:  m.cs = 111; goto _test_eof
-	_test_eof382:  m.cs = 382; goto _test_eof
+	_test_eof381:  m.cs = 381; goto _test_eof
 	_test_eof112:  m.cs = 112; goto _test_eof
 	_test_eof113:  m.cs = 113; goto _test_eof
+	_test_eof382:  m.cs = 382; goto _test_eof
 	_test_eof383:  m.cs = 383; goto _test_eof
-	_test_eof384:  m.cs = 384; goto _test_eof
 	_test_eof114:  m.cs = 114; goto _test_eof
 	_test_eof115:  m.cs = 115; goto _test_eof
 	_test_eof116:  m.cs = 116; goto _test_eof
@@ -21758,10 +21902,11 @@ tr325:
 	_test_eof123:  m.cs = 123; goto _test_eof
 	_test_eof124:  m.cs = 124; goto _test_eof
 	_test_eof125:  m.cs = 125; goto _test_eof
+	_test_eof384:  m.cs = 384; goto _test_eof
 	_test_eof385:  m.cs = 385; goto _test_eof
 	_test_eof386:  m.cs = 386; goto _test_eof
-	_test_eof387:  m.cs = 387; goto _test_eof
 	_test_eof126:  m.cs = 126; goto _test_eof
+	_test_eof387:  m.cs = 387; goto _test_eof
 	_test_eof388:  m.cs = 388; goto _test_eof
 	_test_eof389:  m.cs = 389; goto _test_eof
 	_test_eof390:  m.cs = 390; goto _test_eof
@@ -21783,13 +21928,13 @@ tr325:
 	_test_eof406:  m.cs = 406; goto _test_eof
 	_test_eof407:  m.cs = 407; goto _test_eof
 	_test_eof408:  m.cs = 408; goto _test_eof
-	_test_eof409:  m.cs = 409; goto _test_eof
 	_test_eof127:  m.cs = 127; goto _test_eof
+	_test_eof409:  m.cs = 409; goto _test_eof
 	_test_eof410:  m.cs = 410; goto _test_eof
 	_test_eof411:  m.cs = 411; goto _test_eof
 	_test_eof412:  m.cs = 412; goto _test_eof
-	_test_eof413:  m.cs = 413; goto _test_eof
 	_test_eof128:  m.cs = 128; goto _test_eof
+	_test_eof413:  m.cs = 413; goto _test_eof
 	_test_eof414:  m.cs = 414; goto _test_eof
 	_test_eof415:  m.cs = 415; goto _test_eof
 	_test_eof416:  m.cs = 416; goto _test_eof
@@ -21809,13 +21954,13 @@ tr325:
 	_test_eof430:  m.cs = 430; goto _test_eof
 	_test_eof431:  m.cs = 431; goto _test_eof
 	_test_eof432:  m.cs = 432; goto _test_eof
-	_test_eof433:  m.cs = 433; goto _test_eof
 	_test_eof129:  m.cs = 129; goto _test_eof
 	_test_eof130:  m.cs = 130; goto _test_eof
 	_test_eof131:  m.cs = 131; goto _test_eof
+	_test_eof433:  m.cs = 433; goto _test_eof
 	_test_eof434:  m.cs = 434; goto _test_eof
-	_test_eof435:  m.cs = 435; goto _test_eof
 	_test_eof132:  m.cs = 132; goto _test_eof
+	_test_eof435:  m.cs = 435; goto _test_eof
 	_test_eof436:  m.cs = 436; goto _test_eof
 	_test_eof437:  m.cs = 437; goto _test_eof
 	_test_eof438:  m.cs = 438; goto _test_eof
@@ -21835,12 +21980,12 @@ tr325:
 	_test_eof452:  m.cs = 452; goto _test_eof
 	_test_eof453:  m.cs = 453; goto _test_eof
 	_test_eof454:  m.cs = 454; goto _test_eof
-	_test_eof455:  m.cs = 455; goto _test_eof
 	_test_eof133:  m.cs = 133; goto _test_eof
+	_test_eof455:  m.cs = 455; goto _test_eof
 	_test_eof456:  m.cs = 456; goto _test_eof
 	_test_eof457:  m.cs = 457; goto _test_eof
-	_test_eof458:  m.cs = 458; goto _test_eof
 	_test_eof134:  m.cs = 134; goto _test_eof
+	_test_eof458:  m.cs = 458; goto _test_eof
 	_test_eof459:  m.cs = 459; goto _test_eof
 	_test_eof460:  m.cs = 460; goto _test_eof
 	_test_eof461:  m.cs = 461; goto _test_eof
@@ -21862,8 +22007,8 @@ tr325:
 	_test_eof477:  m.cs = 477; goto _test_eof
 	_test_eof478:  m.cs = 478; goto _test_eof
 	_test_eof479:  m.cs = 479; goto _test_eof
-	_test_eof480:  m.cs = 480; goto _test_eof
 	_test_eof135:  m.cs = 135; goto _test_eof
+	_test_eof480:  m.cs = 480; goto _test_eof
 	_test_eof481:  m.cs = 481; goto _test_eof
 	_test_eof482:  m.cs = 482; goto _test_eof
 	_test_eof483:  m.cs = 483; goto _test_eof
@@ -21885,41 +22030,41 @@ tr325:
 	_test_eof499:  m.cs = 499; goto _test_eof
 	_test_eof500:  m.cs = 500; goto _test_eof
 	_test_eof501:  m.cs = 501; goto _test_eof
-	_test_eof502:  m.cs = 502; goto _test_eof
 	_test_eof136:  m.cs = 136; goto _test_eof
 	_test_eof137:  m.cs = 137; goto _test_eof
 	_test_eof138:  m.cs = 138; goto _test_eof
 	_test_eof139:  m.cs = 139; goto _test_eof
+	_test_eof502:  m.cs = 502; goto _test_eof
 	_test_eof503:  m.cs = 503; goto _test_eof
-	_test_eof504:  m.cs = 504; goto _test_eof
 	_test_eof140:  m.cs = 140; goto _test_eof
-	_test_eof505:  m.cs = 505; goto _test_eof
+	_test_eof504:  m.cs = 504; goto _test_eof
 	_test_eof141:  m.cs = 141; goto _test_eof
+	_test_eof505:  m.cs = 505; goto _test_eof
 	_test_eof506:  m.cs = 506; goto _test_eof
 	_test_eof507:  m.cs = 507; goto _test_eof
 	_test_eof508:  m.cs = 508; goto _test_eof
 	_test_eof509:  m.cs = 509; goto _test_eof
 	_test_eof510:  m.cs = 510; goto _test_eof
 	_test_eof511:  m.cs = 511; goto _test_eof
-	_test_eof512:  m.cs = 512; goto _test_eof
 	_test_eof142:  m.cs = 142; goto _test_eof
 	_test_eof143:  m.cs = 143; goto _test_eof
 	_test_eof144:  m.cs = 144; goto _test_eof
-	_test_eof513:  m.cs = 513; goto _test_eof
+	_test_eof512:  m.cs = 512; goto _test_eof
 	_test_eof145:  m.cs = 145; goto _test_eof
 	_test_eof146:  m.cs = 146; goto _test_eof
 	_test_eof147:  m.cs = 147; goto _test_eof
-	_test_eof514:  m.cs = 514; goto _test_eof
+	_test_eof513:  m.cs = 513; goto _test_eof
 	_test_eof148:  m.cs = 148; goto _test_eof
 	_test_eof149:  m.cs = 149; goto _test_eof
+	_test_eof514:  m.cs = 514; goto _test_eof
 	_test_eof515:  m.cs = 515; goto _test_eof
-	_test_eof516:  m.cs = 516; goto _test_eof
 	_test_eof150:  m.cs = 150; goto _test_eof
 	_test_eof151:  m.cs = 151; goto _test_eof
+	_test_eof516:  m.cs = 516; goto _test_eof
 	_test_eof517:  m.cs = 517; goto _test_eof
 	_test_eof518:  m.cs = 518; goto _test_eof
-	_test_eof519:  m.cs = 519; goto _test_eof
 	_test_eof152:  m.cs = 152; goto _test_eof
+	_test_eof519:  m.cs = 519; goto _test_eof
 	_test_eof520:  m.cs = 520; goto _test_eof
 	_test_eof521:  m.cs = 521; goto _test_eof
 	_test_eof522:  m.cs = 522; goto _test_eof
@@ -21940,91 +22085,90 @@ tr325:
 	_test_eof537:  m.cs = 537; goto _test_eof
 	_test_eof538:  m.cs = 538; goto _test_eof
 	_test_eof539:  m.cs = 539; goto _test_eof
-	_test_eof540:  m.cs = 540; goto _test_eof
 	_test_eof153:  m.cs = 153; goto _test_eof
 	_test_eof154:  m.cs = 154; goto _test_eof
+	_test_eof540:  m.cs = 540; goto _test_eof
 	_test_eof541:  m.cs = 541; goto _test_eof
 	_test_eof542:  m.cs = 542; goto _test_eof
 	_test_eof543:  m.cs = 543; goto _test_eof
 	_test_eof544:  m.cs = 544; goto _test_eof
 	_test_eof545:  m.cs = 545; goto _test_eof
 	_test_eof546:  m.cs = 546; goto _test_eof
-	_test_eof547:  m.cs = 547; goto _test_eof
 	_test_eof155:  m.cs = 155; goto _test_eof
 	_test_eof156:  m.cs = 156; goto _test_eof
 	_test_eof157:  m.cs = 157; goto _test_eof
-	_test_eof548:  m.cs = 548; goto _test_eof
+	_test_eof547:  m.cs = 547; goto _test_eof
 	_test_eof158:  m.cs = 158; goto _test_eof
 	_test_eof159:  m.cs = 159; goto _test_eof
 	_test_eof160:  m.cs = 160; goto _test_eof
-	_test_eof549:  m.cs = 549; goto _test_eof
+	_test_eof548:  m.cs = 548; goto _test_eof
 	_test_eof161:  m.cs = 161; goto _test_eof
 	_test_eof162:  m.cs = 162; goto _test_eof
+	_test_eof549:  m.cs = 549; goto _test_eof
 	_test_eof550:  m.cs = 550; goto _test_eof
-	_test_eof551:  m.cs = 551; goto _test_eof
 	_test_eof163:  m.cs = 163; goto _test_eof
 	_test_eof164:  m.cs = 164; goto _test_eof
 	_test_eof165:  m.cs = 165; goto _test_eof
+	_test_eof551:  m.cs = 551; goto _test_eof
 	_test_eof552:  m.cs = 552; goto _test_eof
-	_test_eof553:  m.cs = 553; goto _test_eof
 	_test_eof166:  m.cs = 166; goto _test_eof
+	_test_eof553:  m.cs = 553; goto _test_eof
 	_test_eof554:  m.cs = 554; goto _test_eof
-	_test_eof555:  m.cs = 555; goto _test_eof
 	_test_eof167:  m.cs = 167; goto _test_eof
+	_test_eof555:  m.cs = 555; goto _test_eof
 	_test_eof556:  m.cs = 556; goto _test_eof
 	_test_eof557:  m.cs = 557; goto _test_eof
 	_test_eof558:  m.cs = 558; goto _test_eof
 	_test_eof559:  m.cs = 559; goto _test_eof
 	_test_eof560:  m.cs = 560; goto _test_eof
 	_test_eof561:  m.cs = 561; goto _test_eof
-	_test_eof562:  m.cs = 562; goto _test_eof
 	_test_eof168:  m.cs = 168; goto _test_eof
 	_test_eof169:  m.cs = 169; goto _test_eof
 	_test_eof170:  m.cs = 170; goto _test_eof
-	_test_eof563:  m.cs = 563; goto _test_eof
+	_test_eof562:  m.cs = 562; goto _test_eof
 	_test_eof171:  m.cs = 171; goto _test_eof
 	_test_eof172:  m.cs = 172; goto _test_eof
 	_test_eof173:  m.cs = 173; goto _test_eof
-	_test_eof564:  m.cs = 564; goto _test_eof
+	_test_eof563:  m.cs = 563; goto _test_eof
 	_test_eof174:  m.cs = 174; goto _test_eof
 	_test_eof175:  m.cs = 175; goto _test_eof
+	_test_eof564:  m.cs = 564; goto _test_eof
 	_test_eof565:  m.cs = 565; goto _test_eof
-	_test_eof566:  m.cs = 566; goto _test_eof
 	_test_eof176:  m.cs = 176; goto _test_eof
+	_test_eof566:  m.cs = 566; goto _test_eof
 	_test_eof567:  m.cs = 567; goto _test_eof
-	_test_eof568:  m.cs = 568; goto _test_eof
 	_test_eof177:  m.cs = 177; goto _test_eof
 	_test_eof178:  m.cs = 178; goto _test_eof
+	_test_eof568:  m.cs = 568; goto _test_eof
 	_test_eof569:  m.cs = 569; goto _test_eof
 	_test_eof570:  m.cs = 570; goto _test_eof
 	_test_eof571:  m.cs = 571; goto _test_eof
 	_test_eof572:  m.cs = 572; goto _test_eof
 	_test_eof573:  m.cs = 573; goto _test_eof
-	_test_eof574:  m.cs = 574; goto _test_eof
 	_test_eof179:  m.cs = 179; goto _test_eof
 	_test_eof180:  m.cs = 180; goto _test_eof
 	_test_eof181:  m.cs = 181; goto _test_eof
-	_test_eof575:  m.cs = 575; goto _test_eof
+	_test_eof574:  m.cs = 574; goto _test_eof
 	_test_eof182:  m.cs = 182; goto _test_eof
 	_test_eof183:  m.cs = 183; goto _test_eof
 	_test_eof184:  m.cs = 184; goto _test_eof
-	_test_eof576:  m.cs = 576; goto _test_eof
+	_test_eof575:  m.cs = 575; goto _test_eof
 	_test_eof185:  m.cs = 185; goto _test_eof
 	_test_eof186:  m.cs = 186; goto _test_eof
+	_test_eof576:  m.cs = 576; goto _test_eof
 	_test_eof577:  m.cs = 577; goto _test_eof
-	_test_eof578:  m.cs = 578; goto _test_eof
 	_test_eof187:  m.cs = 187; goto _test_eof
-	_test_eof579:  m.cs = 579; goto _test_eof
+	_test_eof578:  m.cs = 578; goto _test_eof
 	_test_eof188:  m.cs = 188; goto _test_eof
+	_test_eof579:  m.cs = 579; goto _test_eof
 	_test_eof580:  m.cs = 580; goto _test_eof
-	_test_eof581:  m.cs = 581; goto _test_eof
 	_test_eof189:  m.cs = 189; goto _test_eof
 	_test_eof190:  m.cs = 190; goto _test_eof
 
 	_test_eof: {}
 	if ( m.p) == ( m.eof) {
 		switch  m.cs {
-		case 191, 192, 193, 195, 227, 228, 230, 249, 250, 251, 253, 272, 275, 300, 301, 302, 303, 305, 306, 307, 326, 327, 329, 348, 349, 351, 370, 371, 385, 386, 387, 389, 408, 409, 411, 412, 413, 432, 433, 434, 435, 437, 456, 457, 458, 460, 479, 480, 482, 483, 484, 505, 518, 519, 521, 554, 580, 581:
+		case 191, 192, 193, 195, 227, 228, 230, 249, 250, 252, 271, 274, 299, 300, 301, 302, 304, 305, 306, 325, 326, 328, 347, 348, 350, 369, 370, 384, 385, 386, 388, 407, 408, 410, 411, 412, 431, 432, 433, 434, 436, 455, 456, 457, 459, 478, 479, 481, 482, 483, 504, 517, 518, 520, 553, 579, 580:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
@@ -22091,7 +22235,7 @@ tr325:
 	 m.cs = 187;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 217, 277, 290, 375, 507, 542, 557, 569:
+		case 217, 276, 289, 374, 506, 541, 556, 568:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -22102,7 +22246,7 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 220, 280, 293, 378, 510, 545, 560, 572:
+		case 220, 279, 292, 377, 509, 544, 559, 571:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
@@ -22113,7 +22257,7 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 214, 215, 216, 218, 219, 221, 273, 274, 276, 278, 279, 281, 287, 288, 289, 291, 292, 294, 372, 373, 374, 376, 377, 379, 503, 504, 506, 508, 509, 511, 517, 540, 541, 543, 544, 546, 552, 553, 555, 556, 558, 559, 561, 567, 568, 570, 571, 573:
+		case 214, 215, 216, 218, 219, 221, 272, 273, 275, 277, 278, 280, 286, 287, 288, 290, 291, 293, 371, 372, 373, 375, 376, 378, 502, 503, 505, 507, 508, 510, 516, 539, 540, 542, 543, 545, 551, 552, 554, 555, 557, 558, 560, 566, 567, 569, 570, 572:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
@@ -22124,7 +22268,7 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 222, 223, 224, 225, 226, 282, 283, 284, 285, 286, 295, 296, 297, 298, 299, 380, 381, 382, 383, 384, 512, 513, 514, 515, 516, 547, 548, 549, 550, 551, 562, 563, 564, 565, 566, 574, 575, 576, 577, 578:
+		case 222, 223, 224, 225, 226, 281, 282, 283, 284, 285, 294, 295, 296, 297, 298, 379, 380, 381, 382, 383, 511, 512, 513, 514, 515, 546, 547, 548, 549, 550, 561, 562, 563, 564, 565, 573, 574, 575, 576, 577:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -22135,7 +22279,7 @@ tr325:
 	 m.cs = 188;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 229, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 252, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 304, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 328, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 350, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 388, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 410, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 436, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 459, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 481, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 520, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539:
+		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 229, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 251, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 303, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 327, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 349, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 387, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 409, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 435, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 458, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 480, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 519, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538:
 //line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
@@ -22254,7 +22398,7 @@ tr325:
 	 m.cs = 187;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-//line plugins/parsers/influx/machine.go:22258
+//line plugins/parsers/influx/machine.go:22402
 		}
 	}
 
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
index e5c888689..335f4f66a 100644
--- a/plugins/parsers/influx/machine.go.rl
+++ b/plugins/parsers/influx/machine.go.rl
@@ -142,7 +142,7 @@ fieldfloat =
 fieldinteger =
 	(integer 'i') >begin %integer;
 
-fieldunsigned = 
+fieldunsigned =
 	(unsigned 'u') >begin %unsigned;
 
 false =
@@ -155,7 +155,7 @@ fieldbool =
 	(true | false) >begin %bool;
 
 fieldstringchar =
-	[^\\"] | '\\' [\\"];
+	[^\n\f\r\\"] | '\\' [\\"];
 
 fieldstring =
 	fieldstringchar* >begin %string;
diff --git a/plugins/parsers/influx/machine_test.go b/plugins/parsers/influx/machine_test.go
index ad51ff3a7..a3eec7a07 100644
--- a/plugins/parsers/influx/machine_test.go
+++ b/plugins/parsers/influx/machine_test.go
@@ -1154,6 +1154,22 @@ var tests = []struct {
 			},
 		},
 	},
+	{
+		name:  "invalid newline in string field",
+		input: []byte("cpu value=\"4\n2\""),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
 	{
 		name:  "invalid field value",
 		input: []byte(`cpu value=howdy`),
diff --git a/plugins/serializers/influx/escape.go b/plugins/serializers/influx/escape.go
index 2040b5eed..27caa6bb3 100644
--- a/plugins/serializers/influx/escape.go
+++ b/plugins/serializers/influx/escape.go
@@ -3,30 +3,42 @@ package influx
 import "strings"
 
 const (
-	escapes            = " ,="
-	nameEscapes        = " ,"
-	stringFieldEscapes = `\"`
+	escapes            = "\t\n\f\r ,="
+	nameEscapes        = "\t\n\f\r ,"
+	stringFieldEscapes = "\t\n\f\r\\\""
 )
 
 var (
 	escaper = strings.NewReplacer(
+		"\t", `\t`,
+		"\n", `\n`,
+		"\f", `\f`,
+		"\r", `\r`,
 		`,`, `\,`,
-		`"`, `\"`, // ???
 		` `, `\ `,
 		`=`, `\=`,
 	)
 
 	nameEscaper = strings.NewReplacer(
+		"\t", `\t`,
+		"\n", `\n`,
+		"\f", `\f`,
+		"\r", `\r`,
 		`,`, `\,`,
 		` `, `\ `,
 	)
 
 	stringFieldEscaper = strings.NewReplacer(
+		"\t", `\t`,
+		"\n", `\n`,
+		"\f", `\f`,
+		"\r", `\r`,
 		`"`, `\"`,
 		`\`, `\\`,
 	)
 )
 
+// Escape a tagkey, tagvalue, or fieldkey
 func escape(s string) string {
 	if strings.ContainsAny(s, escapes) {
 		return escaper.Replace(s)
@@ -35,6 +47,7 @@ func escape(s string) string {
 	}
 }
 
+// Escape a measurement name
 func nameEscape(s string) string {
 	if strings.ContainsAny(s, nameEscapes) {
 		return nameEscaper.Replace(s)
@@ -43,6 +56,7 @@ func nameEscape(s string) string {
 	}
 }
 
+// Escape a string field
 func stringFieldEscape(s string) string {
 	if strings.ContainsAny(s, stringFieldEscapes) {
 		return stringFieldEscaper.Replace(s)
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index e31516462..655e9aaf9 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -261,6 +261,50 @@ var tests = []struct {
 		),
 		output: []byte("cpu abc=123i 1519194109000000042\ncpu def=456i 1519194109000000042\n"),
 	},
+	{
+		name: "name newline",
+		input: MustMetric(
+			metric.New(
+				"c\npu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": 42,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("c\\npu value=42i 0\n"),
+	},
+	{
+		name: "tag newline",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{
+					"host": "x\ny",
+				},
+				map[string]interface{}{
+					"value": 42,
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu,host=x\\ny value=42i 0\n"),
+	},
+	{
+		name: "string newline",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": "x\ny",
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=\"x\\ny\" 0\n"),
+	},
 	{
 		name:     "need more space",
 		maxBytes: 32,

From 1890efbb70448642bcebfddda7f77cccfda0c8aa Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Apr 2018 17:04:31 -0700
Subject: [PATCH 1063/1302] Rename repl_oplog_window_s to repl_oplog_window_sec

To match existing metric style.
---
 plugins/inputs/mongodb/README.md            | 30 +--------------------
 plugins/inputs/mongodb/mongodb_data.go      |  2 +-
 plugins/inputs/mongodb/mongodb_data_test.go |  2 +-
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index c4c308f2f..e831d6418 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -69,6 +69,7 @@ Error in input [mongodb]: not authorized on admin to execute command { serverSta
     - repl_lag (integer)
     - repl_queries_per_sec (integer)
     - repl_updates_per_sec (integer)
+    - repl_oplog_window_sec (integer)
     - resident_megabytes (integer)
     - state (string)
     - total_available (integer)
@@ -92,35 +93,6 @@ Error in input [mongodb]: not authorized on admin to execute command { serverSta
     - wtcache_tracked_dirty_bytes (integer)
     - wtcache_worker_thread_evictingpages (integer)
 
-The telegraf plugin collects mongodb stats exposed by serverStatus and few more
-and create a single measurement containing values e.g.
- * active_reads
- * active_writes
- * commands_per_sec
- * deletes_per_sec
- * flushes_per_sec
- * getmores_per_sec
- * inserts_per_sec
- * net_in_bytes
- * net_out_bytes
- * open_connections
- * percent_cache_dirty
- * percent_cache_used
- * queries_per_sec
- * queued_reads
- * queued_writes
- * resident_megabytes
- * updates_per_sec
- * vsize_megabytes
- * total_in_use
- * total_available
- * total_created
- * total_refreshing
- * ttl_deletes_per_sec
- * ttl_passes_per_sec
- * repl_lag
- * repl_oplog_window_s
- * jumbo_chunks (only if mongos or mongo config)
 - mongodb_db_stats
   - tags:
     - db_name
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 2c45f7ea2..17d49b1c7 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -60,7 +60,7 @@ var DefaultReplStats = map[string]string{
 	"member_status":         "NodeType",
 	"state":                 "NodeState",
 	"repl_lag":              "ReplLag",
-	"repl_oplog_window_s":   "OplogTimeDiff",
+	"repl_oplog_window_sec": "OplogTimeDiff",
 }
 
 var DefaultClusterStats = map[string]string{
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index e51b4e404..79a9a6c59 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -162,7 +162,7 @@ func TestStateTag(t *testing.T) {
 		"repl_queries_per_sec":  int64(0),
 		"repl_updates_per_sec":  int64(0),
 		"repl_lag":              int64(0),
-		"repl_oplog_window_s":   int64(0),
+		"repl_oplog_window_sec": int64(0),
 		"resident_megabytes":    int64(0),
 		"updates_per_sec":       int64(0),
 		"vsize_megabytes":       int64(0),

From 0223b22b3e98e5323936e2f641ed3db2ecc96d48 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Apr 2018 17:06:34 -0700
Subject: [PATCH 1064/1302] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d6ecd97e..611e973e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## v1.7 [unreleased]
 ### Features
 
-- [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_s metric to mongodb input.
+- [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
 
 ## v1.6 [unreleased]
 

From af68975e2f56ee819642a9df25c9799b9457d64e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 9 Apr 2018 19:30:18 -0700
Subject: [PATCH 1065/1302] Document that InfluxDB input metrics vary with
 version

---
 plugins/inputs/influxdb/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/inputs/influxdb/README.md b/plugins/inputs/influxdb/README.md
index 29fd4dc04..852393165 100644
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -33,6 +33,9 @@ InfluxDB-formatted endpoints. See below for more information.
 
 ### Measurements & Fields
 
+**Note:** The measurements and fields are dynamically built from the InfluxDB source,
+and may vary between versions.
+
 - influxdb
   - n_shards
 - influxdb_database

From 64a23c0b18232d99ba301017ecfd88360d9abd0f Mon Sep 17 00:00:00 2001
From: Boris Schrijver <bschrijver@schubergphilis.com>
Date: Wed, 11 Apr 2018 00:35:58 +0200
Subject: [PATCH 1066/1302] Fix make test-ci run (#4002)

---
 Makefile                                  | 8 ++++----
 plugins/outputs/influxdb/influxdb_test.go | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d8a82050a..5dd0f5171 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
 GOFILES ?= $(shell git ls-files '*.go')
 GOFMT ?= $(shell gofmt -l $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
-BUILDFLAGS ?= 
+BUILDFLAGS ?=
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
@@ -44,7 +44,7 @@ fmt:
 
 fmtcheck:
 	@echo '[INFO] running gofmt to identify incorrectly formatted code...'
-	@if [ ! -z $(GOFMT) ]; then \
+	@if [ ! -z "$(GOFMT)" ]; then \
 		echo "[ERROR] gofmt has found errors in the following files:"  ; \
 		echo "$(GOFMT)" ; \
 		echo "" ;\
@@ -64,7 +64,7 @@ test-windows:
 # any common errors.
 vet:
 	@echo 'go vet $$(go list ./... | grep -v ./plugins/parsers/influx)'
-	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -eq 1 ]; then \
+	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -ne 0 ]; then \
 		echo ""; \
 		echo "go vet has found suspicious constructs. Please remediate any reported errors"; \
 		echo "to fix them before submitting code for review."; \
@@ -72,7 +72,7 @@ vet:
 	fi
 
 test-ci: fmtcheck vet
-	go test -short./...
+	go test -short ./...
 
 test-all: fmtcheck vet
 	go test ./...
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index c0a46995c..eeef97618 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -137,15 +137,12 @@ func TestConnectHTTPConfig(t *testing.T) {
 }
 
 func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) {
-	var createDatabaseCalled bool
-
 	output := influxdb.InfluxDB{
 		URLs: []string{"http://localhost:8086"},
 
 		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
 			return &MockClient{
 				CreateDatabaseF: func(ctx context.Context) error {
-					createDatabaseCalled = true
 					return nil
 				},
 				WriteF: func(ctx context.Context, metrics []telegraf.Metric) error {
@@ -178,7 +175,6 @@ func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) {
 	require.NoError(t, err)
 	metrics := []telegraf.Metric{m}
 
-	createDatabaseCalled = false
 	err = output.Write(metrics)
 	// We only have one URL, so we expect an error
 	require.Error(t, err)

From 32f56140a3bd6ce27cd7c2e9fc81017e758f9477 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake@gnu.space>
Date: Tue, 10 Apr 2018 20:10:29 -0400
Subject: [PATCH 1067/1302] Add per-host shard metrics in mongodb input (#3819)

---
 plugins/inputs/mongodb/README.md            | 10 +++++
 plugins/inputs/mongodb/mongodb_data.go      | 42 +++++++++++++++++++--
 plugins/inputs/mongodb/mongodb_data_test.go | 36 ++++++++++++++++++
 plugins/inputs/mongodb/mongodb_server.go    |  1 +
 plugins/inputs/mongodb/mongostat.go         | 36 ++++++++++++++++++
 5 files changed, 121 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index e831d6418..48c01a590 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -109,8 +109,18 @@ Error in input [mongodb]: not authorized on admin to execute command { serverSta
     - storage_size (integer)
     - type (string)
 
+- mongodb_shard_stats
+  - tags:
+    - hostname
+  - fields:
+    - in_use (integer)
+    - available (integer)
+    - created (integer)
+    - refreshing (integer)
+
 ### Example Output:
 ```
 mongodb,hostname=127.0.0.1:27017 active_reads=0i,active_writes=0i,commands_per_sec=6i,deletes_per_sec=0i,flushes_per_sec=0i,getmores_per_sec=1i,inserts_per_sec=0i,jumbo_chunks=0i,member_status="PRI",net_in_bytes=851i,net_out_bytes=23904i,open_connections=6i,percent_cache_dirty=0,percent_cache_used=0,queries_per_sec=2i,queued_reads=0i,queued_writes=0i,repl_commands_per_sec=0i,repl_deletes_per_sec=0i,repl_getmores_per_sec=0i,repl_inserts_per_sec=0i,repl_lag=0i,repl_queries_per_sec=0i,repl_updates_per_sec=0i,resident_megabytes=67i,state="PRIMARY",total_available=0i,total_created=0i,total_in_use=0i,total_refreshing=0i,ttl_deletes_per_sec=0i,ttl_passes_per_sec=0i,updates_per_sec=0i,vsize_megabytes=729i,wtcache_app_threads_page_read_count=4i,wtcache_app_threads_page_read_time=18i,wtcache_app_threads_page_write_count=6i,wtcache_bytes_read_into=10075i,wtcache_bytes_written_from=115711i,wtcache_current_bytes=86038i,wtcache_max_bytes_configured=1073741824i,wtcache_pages_evicted_by_app_thread=0i,wtcache_pages_queued_for_eviction=0i,wtcache_server_evicting_pages=0i,wtcache_tracked_dirty_bytes=0i,wtcache_worker_thread_evictingpages=0i 1522798796000000000
 mongodb_db_stats,db_name=local,hostname=127.0.0.1:27017 avg_obj_size=818.625,collections=5i,data_size=6549i,index_size=86016i,indexes=4i,num_extents=0i,objects=8i,ok=1i,storage_size=118784i,type="db_stat" 1522799074000000000
+mongodb_shard_stats,hostname=127.0.0.1:27017,in_use=3i,available=3i,created=4i,refreshing=0i 1522799074000000000
 ```
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 17d49b1c7..9b4aa7580 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -9,10 +9,11 @@ import (
 )
 
 type MongodbData struct {
-	StatLine *StatLine
-	Fields   map[string]interface{}
-	Tags     map[string]string
-	DbData   []DbData
+	StatLine      *StatLine
+	Fields        map[string]interface{}
+	Tags          map[string]string
+	DbData        []DbData
+	ShardHostData []DbData
 }
 
 type DbData struct {
@@ -74,6 +75,13 @@ var DefaultShardStats = map[string]string{
 	"total_refreshing": "TotalRefreshing",
 }
 
+var ShardHostStats = map[string]string{
+	"in_use":     "InUse",
+	"available":  "Available",
+	"created":    "Created",
+	"refreshing": "Refreshing",
+}
+
 var MmapStats = map[string]string{
 	"mapped_megabytes":     "Mapped",
 	"non-mapped_megabytes": "NonMapped",
@@ -128,6 +136,22 @@ func (d *MongodbData) AddDbStats() {
 	}
 }
 
+func (d *MongodbData) AddShardHostStats() {
+	for host, hostStat := range d.StatLine.ShardHostStatsLines {
+		hostStatLine := reflect.ValueOf(&hostStat).Elem()
+		newDbData := &DbData{
+			Name:   host,
+			Fields: make(map[string]interface{}),
+		}
+		newDbData.Fields["type"] = "shard_host_stat"
+		for k, v := range ShardHostStats {
+			val := hostStatLine.FieldByName(v).Interface()
+			newDbData.Fields[k] = val
+		}
+		d.ShardHostData = append(d.ShardHostData, *newDbData)
+	}
+}
+
 func (d *MongodbData) AddDefaultStats() {
 	statLine := reflect.ValueOf(d.StatLine).Elem()
 	d.addStat(statLine, DefaultStats)
@@ -179,4 +203,14 @@ func (d *MongodbData) flush(acc telegraf.Accumulator) {
 		)
 		db.Fields = make(map[string]interface{})
 	}
+	for _, host := range d.ShardHostData {
+		d.Tags["hostname"] = host.Name
+		acc.AddFields(
+			"mongodb_shard_stats",
+			host.Fields,
+			d.Tags,
+			d.StatLine.Time,
+		)
+		host.Fields = make(map[string]interface{})
+	}
 }
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 79a9a6c59..9a5793f71 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -120,6 +120,42 @@ func TestAddShardStats(t *testing.T) {
 	}
 }
 
+func TestAddShardHostStats(t *testing.T) {
+	expectedHosts := []string{"hostA", "hostB"}
+	hostStatLines := map[string]ShardHostStatLine{}
+	for _, host := range expectedHosts {
+		hostStatLines[host] = ShardHostStatLine{
+			InUse:      0,
+			Available:  0,
+			Created:    0,
+			Refreshing: 0,
+		}
+	}
+
+	d := NewMongodbData(
+		&StatLine{
+			ShardHostStatsLines: hostStatLines,
+		},
+		map[string]string{}, // Use empty tags, so we don't break existing tests
+	)
+
+	var acc testutil.Accumulator
+	d.AddShardHostStats()
+	d.flush(&acc)
+
+	var hostsFound []string
+	for host, _ := range hostStatLines {
+		for key, _ := range ShardHostStats {
+			assert.True(t, acc.HasInt64Field("mongodb_shard_stats", key))
+		}
+
+		assert.True(t, acc.HasTag("mongodb_shard_stats", "hostname"))
+		hostsFound = append(hostsFound, host)
+	}
+
+	assert.Equal(t, hostsFound, expectedHosts)
+}
+
 func TestStateTag(t *testing.T) {
 	d := NewMongodbData(
 		&StatLine{
diff --git a/plugins/inputs/mongodb/mongodb_server.go b/plugins/inputs/mongodb/mongodb_server.go
index d85d41746..1d9db9181 100644
--- a/plugins/inputs/mongodb/mongodb_server.go
+++ b/plugins/inputs/mongodb/mongodb_server.go
@@ -156,6 +156,7 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error
 		)
 		data.AddDefaultStats()
 		data.AddDbStats()
+		data.AddShardHostStats()
 		data.flush(acc)
 	}
 	return nil
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index 76b2b50d5..92f2bb2f9 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -125,12 +125,27 @@ type WiredTiger struct {
 
 // ShardStats stores information from shardConnPoolStats.
 type ShardStats struct {
+	ShardStatsData `bson:",inline"`
+	Hosts          map[string]ShardHostStatsData `bson:"hosts"`
+}
+
+// ShardStatsData is the total Shard Stats from shardConnPoolStats database command.
+type ShardStatsData struct {
 	TotalInUse      int64 `bson:"totalInUse"`
 	TotalAvailable  int64 `bson:"totalAvailable"`
 	TotalCreated    int64 `bson:"totalCreated"`
 	TotalRefreshing int64 `bson:"totalRefreshing"`
 }
 
+// ShardHostStatsData is the host-specific stats
+// from shardConnPoolStats database command.
+type ShardHostStatsData struct {
+	InUse      int64 `bson:"inUse"`
+	Available  int64 `bson:"available"`
+	Created    int64 `bson:"created"`
+	Refreshing int64 `bson:"refreshing"`
+}
+
 type ConcurrentTransactions struct {
 	Write ConcurrentTransStats `bson:"write"`
 	Read  ConcurrentTransStats `bson:"read"`
@@ -469,6 +484,9 @@ type StatLine struct {
 
 	// Shard stats
 	TotalInUse, TotalAvailable, TotalCreated, TotalRefreshing int64
+
+	// Shard Hosts stats field
+	ShardHostStatsLines map[string]ShardHostStatLine
 }
 
 type DbStatLine struct {
@@ -484,6 +502,13 @@ type DbStatLine struct {
 	Ok          int64
 }
 
+type ShardHostStatLine struct {
+	InUse      int64
+	Available  int64
+	Created    int64
+	Refreshing int64
+}
+
 func parseLocks(stat ServerStatus) map[string]LockUsage {
 	returnVal := map[string]LockUsage{}
 	for namespace, lockInfo := range stat.Locks {
@@ -809,6 +834,17 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 	returnVal.TotalAvailable = newShardStats.TotalAvailable
 	returnVal.TotalCreated = newShardStats.TotalCreated
 	returnVal.TotalRefreshing = newShardStats.TotalRefreshing
+	returnVal.ShardHostStatsLines = map[string]ShardHostStatLine{}
+	for host, stats := range newShardStats.Hosts {
+		shardStatLine := &ShardHostStatLine{
+			InUse:      stats.InUse,
+			Available:  stats.Available,
+			Created:    stats.Created,
+			Refreshing: stats.Refreshing,
+		}
+
+		returnVal.ShardHostStatsLines[host] = *shardStatLine
+	}
 
 	return returnVal
 }

From 34416e0da831b2c3ad8dfedbb19bda7cd6cf2a5b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Apr 2018 17:11:25 -0700
Subject: [PATCH 1068/1302] Updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 611e973e1..6bdd27298 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ### Features
 
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
+- [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
 
 ## v1.6 [unreleased]
 

From 387bae9b9f68125284a7bba4d2053129b1be3552 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Apr 2018 17:24:40 -0700
Subject: [PATCH 1069/1302] Fix host ordering in mongodb unit tests

---
 plugins/inputs/mongodb/mongodb_data_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 9a5793f71..21541dd95 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"sort"
 	"testing"
 	"time"
 
@@ -152,7 +153,8 @@ func TestAddShardHostStats(t *testing.T) {
 		assert.True(t, acc.HasTag("mongodb_shard_stats", "hostname"))
 		hostsFound = append(hostsFound, host)
 	}
-
+	sort.Strings(hostsFound)
+	sort.Strings(expectedHosts)
 	assert.Equal(t, hostsFound, expectedHosts)
 }
 

From 93e2381f422489da38776a3ebd948ff8c6df3b11 Mon Sep 17 00:00:00 2001
From: Pierrick Brossin <dynek@users.noreply.github.com>
Date: Wed, 11 Apr 2018 03:04:59 +0200
Subject: [PATCH 1070/1302] Add Fibaro input plugin (#2741)

---
 README.md                            |   1 +
 plugins/inputs/all/all.go            |   1 +
 plugins/inputs/fibaro/README.md      |  53 +++++++
 plugins/inputs/fibaro/fibaro.go      | 202 ++++++++++++++++++++++++++
 plugins/inputs/fibaro/fibaro_test.go | 204 +++++++++++++++++++++++++++
 5 files changed, 461 insertions(+)
 create mode 100644 plugins/inputs/fibaro/README.md
 create mode 100644 plugins/inputs/fibaro/fibaro.go
 create mode 100644 plugins/inputs/fibaro/fibaro_test.go

diff --git a/README.md b/README.md
index d7d2a3599..0d64cab73 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ configuration options.
 * [elasticsearch](./plugins/inputs/elasticsearch)
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
+* [fibaro](./plugins/inputs/fibaro)
 * [filestat](./plugins/inputs/filestat)
 * [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index d58002089..e3264ef8b 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -24,6 +24,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/elasticsearch"
 	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fail2ban"
+	_ "github.com/influxdata/telegraf/plugins/inputs/fibaro"
 	_ "github.com/influxdata/telegraf/plugins/inputs/filestat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/fluentd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/graylog"
diff --git a/plugins/inputs/fibaro/README.md b/plugins/inputs/fibaro/README.md
new file mode 100644
index 000000000..512accc76
--- /dev/null
+++ b/plugins/inputs/fibaro/README.md
@@ -0,0 +1,53 @@
+# Fibaro Input Plugin
+
+The Fibaro plugin makes HTTP calls to the Fibaro controller API to gather values of hooked devices.  
+Those values could be true (1) or false (0) for switches, percentage for dimmers, temperature, etc.
+
+
+### Configuration:
+
+```toml
+# Read devices value(s) from a Fibaro controller
+[[inputs.fibaro]]
+  ## Required Fibaro controller address/hostname.
+  ## Note: at the time of writing this plugin, Fibaro only implemented http - no https available
+  url = "http://<controller>:80"
+
+  ## Required credentials to access the API (http://<controller/api/<component>)
+  username = "<username>"
+  password = "<password>"
+
+  ## Amount of time allowed to complete the HTTP request
+  # timeout = "5s"
+```
+
+
+### Tags:
+
+	section: section's name
+	room: room's name
+	name: device's name
+	type: device's type
+
+
+### Fields:
+
+	value float
+	value2 float (when available from device)
+
+### Example Output:
+
+```
+fibaro,host=vm1,name=Escaliers,room=Dégagement,section=Pièces\ communes,type=com.fibaro.binarySwitch value=0 1523351010000000000
+fibaro,host=vm1,name=Porte\ fenêtre,room=Salon,section=Pièces\ communes,type=com.fibaro.FGRM222 value=99,value2=99 1523351010000000000
+fibaro,host=vm1,name=LED\ îlot\ central,room=Cuisine,section=Cuisine,type=com.fibaro.binarySwitch value=0 1523351010000000000
+fibaro,host=vm1,name=Détérioration,room=Entrée,section=Pièces\ communes,type=com.fibaro.heatDetector value=0 1523351010000000000
+fibaro,host=vm1,name=Température,room=Cave,section=Cave,type=com.fibaro.temperatureSensor value=17.87 1523351010000000000
+fibaro,host=vm1,name=Présence,room=Garde-manger,section=Cuisine,type=com.fibaro.FGMS001 value=1 1523351010000000000
+fibaro,host=vm1,name=Luminosité,room=Garde-manger,section=Cuisine,type=com.fibaro.lightSensor value=92 1523351010000000000
+fibaro,host=vm1,name=Etat,room=Garage,section=Extérieur,type=com.fibaro.doorSensor value=0 1523351010000000000
+fibaro,host=vm1,name=CO2\ (ppm),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=880 1523351010000000000
+fibaro,host=vm1,name=Humidité\ (%),room=Salon,section=Pièces\ communes,type=com.fibaro.humiditySensor value=53 1523351010000000000
+fibaro,host=vm1,name=Pression\ (mb),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=1006.9 1523351010000000000
+fibaro,host=vm1,name=Bruit\ (db),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=58 1523351010000000000
+```
diff --git a/plugins/inputs/fibaro/fibaro.go b/plugins/inputs/fibaro/fibaro.go
new file mode 100644
index 000000000..d532c454e
--- /dev/null
+++ b/plugins/inputs/fibaro/fibaro.go
@@ -0,0 +1,202 @@
+package fibaro
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const sampleConfig = `
+  ## Required Fibaro controller address/hostname.
+  ## Note: at the time of writing this plugin, Fibaro only implemented http - no https available
+  url = "http://<controller>:80"
+
+  ## Required credentials to access the API (http://<controller/api/<component>)
+  username = "<username>"
+  password = "<password>"
+
+  ## Amount of time allowed to complete the HTTP request
+  # timeout = "5s"
+`
+
+const description = "Read devices value(s) from a Fibaro controller"
+
+// Fibaro contains connection information
+type Fibaro struct {
+	URL string
+
+	// HTTP Basic Auth Credentials
+	Username string
+	Password string
+
+	Timeout internal.Duration
+
+	client *http.Client
+}
+
+// LinkRoomsSections links rooms to sections
+type LinkRoomsSections struct {
+	Name      string
+	SectionID uint16
+}
+
+// Sections contains sections informations
+type Sections struct {
+	ID   uint16 `json:"id"`
+	Name string `json:"name"`
+}
+
+// Rooms contains rooms informations
+type Rooms struct {
+	ID        uint16 `json:"id"`
+	Name      string `json:"name"`
+	SectionID uint16 `json:"sectionID"`
+}
+
+// Devices contains devices informations
+type Devices struct {
+	ID         uint16 `json:"id"`
+	Name       string `json:"name"`
+	RoomID     uint16 `json:"roomID"`
+	Type       string `json:"type"`
+	Enabled    bool   `json:"enabled"`
+	Properties struct {
+		Dead   interface{} `json:"dead"`
+		Value  interface{} `json:"value"`
+		Value2 interface{} `json:"value2"`
+	} `json:"properties"`
+}
+
+// Description returns a string explaining the purpose of this plugin
+func (f *Fibaro) Description() string { return description }
+
+// SampleConfig returns text explaining how plugin should be configured
+func (f *Fibaro) SampleConfig() string { return sampleConfig }
+
+// getJSON connects, authenticates and reads JSON payload returned by Fibaro box
+func (f *Fibaro) getJSON(path string, dataStruct interface{}) error {
+	var requestURL = f.URL + path
+
+	req, err := http.NewRequest("GET", requestURL, nil)
+	if err != nil {
+		return err
+	}
+
+	req.SetBasicAuth(f.Username, f.Password)
+	resp, err := f.client.Do(req)
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		err = fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
+			requestURL,
+			resp.StatusCode,
+			http.StatusText(resp.StatusCode),
+			http.StatusOK,
+			http.StatusText(http.StatusOK))
+		return err
+	}
+
+	defer resp.Body.Close()
+
+	dec := json.NewDecoder(resp.Body)
+	err = dec.Decode(&dataStruct)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Gather fetches all required information to output metrics
+func (f *Fibaro) Gather(acc telegraf.Accumulator) error {
+
+	if f.client == nil {
+		f.client = &http.Client{
+			Transport: &http.Transport{
+				Proxy: http.ProxyFromEnvironment,
+			},
+			Timeout: f.Timeout.Duration,
+		}
+	}
+
+	var tmpSections []Sections
+	err := f.getJSON("/api/sections", &tmpSections)
+	if err != nil {
+		return err
+	}
+	sections := map[uint16]string{}
+	for _, v := range tmpSections {
+		sections[v.ID] = v.Name
+	}
+
+	var tmpRooms []Rooms
+	err = f.getJSON("/api/rooms", &tmpRooms)
+	if err != nil {
+		return err
+	}
+	rooms := map[uint16]LinkRoomsSections{}
+	for _, v := range tmpRooms {
+		rooms[v.ID] = LinkRoomsSections{Name: v.Name, SectionID: v.SectionID}
+	}
+
+	var devices []Devices
+	err = f.getJSON("/api/devices", &devices)
+	if err != nil {
+		return err
+	}
+
+	for _, device := range devices {
+		// skip device in some cases
+		if device.RoomID == 0 ||
+			device.Enabled == false ||
+			device.Properties.Dead == "true" ||
+			device.Type == "com.fibaro.zwaveDevice" {
+			continue
+		}
+
+		tags := map[string]string{
+			"section": sections[rooms[device.RoomID].SectionID],
+			"room":    rooms[device.RoomID].Name,
+			"name":    device.Name,
+			"type":    device.Type,
+		}
+		fields := make(map[string]interface{})
+
+		if device.Properties.Value != nil {
+			value := device.Properties.Value
+			switch value {
+			case "true":
+				value = "1"
+			case "false":
+				value = "0"
+			}
+
+			if fValue, err := strconv.ParseFloat(value.(string), 64); err == nil {
+				fields["value"] = fValue
+			}
+		}
+
+		if device.Properties.Value2 != nil {
+			if fValue, err := strconv.ParseFloat(device.Properties.Value2.(string), 64); err == nil {
+				fields["value2"] = fValue
+			}
+		}
+
+		acc.AddFields("fibaro", fields, tags)
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("fibaro", func() telegraf.Input {
+		return &Fibaro{}
+	})
+}
diff --git a/plugins/inputs/fibaro/fibaro_test.go b/plugins/inputs/fibaro/fibaro_test.go
new file mode 100644
index 000000000..111f4c872
--- /dev/null
+++ b/plugins/inputs/fibaro/fibaro_test.go
@@ -0,0 +1,204 @@
+package fibaro
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const sectionsJSON = `
+    [
+        {
+            "id": 1,
+            "name": "Section 1",
+            "sortOrder": 1
+        },
+        {
+            "id": 2,
+            "name": "Section 2",
+            "sortOrder": 2
+        },
+        {
+            "id": 3,
+            "name": "Section 3",
+            "sortOrder": 3
+        }
+    ]`
+
+const roomsJSON = `
+    [
+        {
+            "id": 1,
+            "name": "Room 1",
+            "sectionID": 1,
+            "icon": "room_1",
+            "sortOrder": 1
+        },
+        {
+            "id": 2,
+            "name": "Room 2",
+            "sectionID": 2,
+            "icon": "room_2",
+            "sortOrder": 2
+        },
+        {
+            "id": 3,
+            "name": "Room 3",
+            "sectionID": 3,
+            "icon": "room_3",
+            "sortOrder": 3
+        },
+        {
+            "id": 4,
+            "name": "Room 4",
+            "sectionID": 3,
+            "icon": "room_4",
+            "sortOrder": 4
+        }
+    ]`
+
+const devicesJSON = `
+    [
+        {
+            "id": 1,
+            "name": "Device 1",
+            "roomID": 1,
+            "type": "com.fibaro.binarySwitch",
+            "enabled": true,
+            "properties": {
+                "dead": "false",
+                "value": "false"
+            },
+            "sortOrder": 1
+        },
+        {
+            "id": 2,
+            "name": "Device 2",
+            "roomID": 2,
+            "type": "com.fibaro.binarySwitch",
+            "enabled": true,
+            "properties": {
+                "dead": "false",
+                "value": "true"
+            },
+            "sortOrder": 2
+        },
+        {
+            "id": 3,
+            "name": "Device 3",
+            "roomID": 3,
+            "type": "com.fibaro.multilevelSwitch",
+            "enabled": true,
+            "properties": {
+                "dead": "false",
+                "value": "67"
+            },
+            "sortOrder": 3
+        },
+        {
+            "id": 4,
+            "name": "Device 4",
+            "roomID": 4,
+            "type": "com.fibaro.temperatureSensor",
+            "enabled": true,
+            "properties": {
+                "dead": "false",
+                "value": "22.80"
+            },
+            "sortOrder": 4
+        },
+        {
+            "id": 5,
+            "name": "Device 5",
+            "roomID": 4,
+            "type": "com.fibaro.FGRM222",
+            "enabled": true,
+            "properties": {
+                "dead": "false",
+                "value": "50",
+                "value2": "75"
+            },
+            "sortOrder": 5
+        }
+    ]`
+
+// TestUnauthorized validates that 401 (wrong credentials) is managed properly
+func TestUnauthorized(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusUnauthorized)
+	}))
+	defer ts.Close()
+
+	a := Fibaro{
+		URL:      ts.URL,
+		Username: "user",
+		Password: "pass",
+		client:   &http.Client{},
+	}
+
+	var acc testutil.Accumulator
+	err := acc.GatherError(a.Gather)
+	require.Error(t, err)
+}
+
+// TestJSONSuccess validates that module works OK with valid JSON payloads
+func TestJSONSuccess(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		payload := ""
+		switch r.URL.Path {
+		case "/api/sections":
+			payload = sectionsJSON
+		case "/api/rooms":
+			payload = roomsJSON
+		case "/api/devices":
+			payload = devicesJSON
+		}
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprintln(w, payload)
+	}))
+	defer ts.Close()
+
+	a := Fibaro{
+		URL:      ts.URL,
+		Username: "user",
+		Password: "pass",
+		client:   &http.Client{},
+	}
+
+	var acc testutil.Accumulator
+	err := acc.GatherError(a.Gather)
+	require.NoError(t, err)
+
+	// Gather should add 5 metrics
+	assert.Equal(t, uint64(5), acc.NMetrics())
+
+	// Ensure fields / values are correct - Device 1
+	tags := map[string]string{"section": "Section 1", "room": "Room 1", "name": "Device 1", "type": "com.fibaro.binarySwitch"}
+	fields := map[string]interface{}{"value": float64(0)}
+	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
+
+	// Ensure fields / values are correct - Device 2
+	tags = map[string]string{"section": "Section 2", "room": "Room 2", "name": "Device 2", "type": "com.fibaro.binarySwitch"}
+	fields = map[string]interface{}{"value": float64(1)}
+	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
+
+	// Ensure fields / values are correct - Device 3
+	tags = map[string]string{"section": "Section 3", "room": "Room 3", "name": "Device 3", "type": "com.fibaro.multilevelSwitch"}
+	fields = map[string]interface{}{"value": float64(67)}
+	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
+
+	// Ensure fields / values are correct - Device 4
+	tags = map[string]string{"section": "Section 3", "room": "Room 4", "name": "Device 4", "type": "com.fibaro.temperatureSensor"}
+	fields = map[string]interface{}{"value": float64(22.8)}
+	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
+
+	// Ensure fields / values are correct - Device 5
+	tags = map[string]string{"section": "Section 3", "room": "Room 4", "name": "Device 5", "type": "com.fibaro.FGRM222"}
+	fields = map[string]interface{}{"value": float64(50), "value2": float64(75)}
+	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
+}

From 15f19375e7645310e5ce62934f96de6da48aa4a5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Apr 2018 18:14:27 -0700
Subject: [PATCH 1071/1302] Typesetting changes to fibaro README

---
 plugins/inputs/fibaro/README.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/fibaro/README.md b/plugins/inputs/fibaro/README.md
index 512accc76..e81acad86 100644
--- a/plugins/inputs/fibaro/README.md
+++ b/plugins/inputs/fibaro/README.md
@@ -1,9 +1,8 @@
 # Fibaro Input Plugin
 
-The Fibaro plugin makes HTTP calls to the Fibaro controller API to gather values of hooked devices.  
+The Fibaro plugin makes HTTP calls to the Fibaro controller API to gather values of hooked devices.
 Those values could be true (1) or false (0) for switches, percentage for dimmers, temperature, etc.
 
-
 ### Configuration:
 
 ```toml
@@ -21,19 +20,18 @@ Those values could be true (1) or false (0) for switches, percentage for dimmers
   # timeout = "5s"
 ```
 
+### Metrics:
 
-### Tags:
+- fibaro
+  - tags:
+    - section (section name)
+    - room (room name)
+    - name (device name)
+    - type (device type)
+  - fields:
+    - value (float)
+    - value2 (float, when available from device)
 
-	section: section's name
-	room: room's name
-	name: device's name
-	type: device's type
-
-
-### Fields:
-
-	value float
-	value2 float (when available from device)
 
 ### Example Output:
 

From 7b8f12b37712d7d773e5ec0b41604816c9cc39a4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Apr 2018 18:15:02 -0700
Subject: [PATCH 1072/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bdd27298..1dedb02ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 ## v1.7 [unreleased]
+
+### New Inputs
+
+- [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
+
 ### Features
 
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.

From 55cfc383f3e178ee7a325c41368d8d957842b2ef Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 10 Apr 2018 18:16:21 -0700
Subject: [PATCH 1073/1302] Allow grok pattern to contain newlines (#4005)

---
 plugins/inputs/logparser/grok/grok.go      |  1 +
 plugins/inputs/logparser/grok/grok_test.go | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 66715ef37..47d4ecdf5 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -132,6 +132,7 @@ func (p *Parser) Compile() error {
 	// "custom patterns"
 	p.namedPatterns = make([]string, 0, len(p.Patterns))
 	for i, pattern := range p.Patterns {
+		pattern = strings.TrimSpace(pattern)
 		if pattern == "" {
 			continue
 		}
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index e5e124b9c..a585140f6 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -958,3 +958,15 @@ func TestTimezoneLocalCompileFileAndParse(t *testing.T) {
 	assert.Equal(t, map[string]string{}, metricB.Tags())
 	assert.Equal(t, time.Date(2016, time.June, 4, 12, 41, 45, 0, time.Local).UnixNano(), metricB.Time().UnixNano())
 }
+
+func TestNewlineInPatterns(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{`
+			%{SYSLOGTIMESTAMP:timestamp}
+		`},
+	}
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("Apr 10 05:11:57")
+	require.NoError(t, err)
+	require.NotNil(t, m)
+}

From 10c7324d74ff1f6961ca7844c870792842e2c763 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Apr 2018 18:18:27 -0700
Subject: [PATCH 1074/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dedb02ac..fd85c4b0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
 - [#3754](https://github.com/influxdata/telegraf/issues/3754): Fix precision truncation when no timestamp included.
 - [#3655](https://github.com/influxdata/telegraf/issues/3655): Fix SNMPv3 connection with Cisco ASA 5515 in snmp input.
 - [#3981](https://github.com/influxdata/telegraf/pull/3981): Export all vars defined in /etc/default/telegraf.
+- [#4004](https://github.com/influxdata/telegraf/issues/4004): Allow grok pattern to contain newlines.
 
 ## v1.5.3 [2018-03-14]
 

From 3f4e1af2225da92b417f7249bfd9709efdb2f378 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 11 Apr 2018 16:44:55 -0700
Subject: [PATCH 1075/1302] Add --console and --service to usage message in
 Windows (#3993)

---
 cmd/telegraf/telegraf.go      | 42 ---------------------------
 cmd/telegraf/usage.go         | 45 +++++++++++++++++++++++++++++
 cmd/telegraf/usage_windows.go | 54 +++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 42 deletions(-)
 create mode 100644 cmd/telegraf/usage.go
 create mode 100644 cmd/telegraf/usage_windows.go

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index c02dce88b..c38d88c3f 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -73,48 +73,6 @@ func init() {
 	}
 }
 
-const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
-
-Usage:
-
-  telegraf [commands|flags]
-
-The commands & flags are:
-
-  config              print out full sample configuration to stdout
-  version             print the version to stdout
-
-  --config <file>     configuration file to load
-  --test              gather metrics once, print them to stdout, and exit
-  --config-directory  directory containing additional *.conf files
-  --input-filter      filter the input plugins to enable, separator is :
-  --output-filter     filter the output plugins to enable, separator is :
-  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
-  --debug             print metrics as they're generated to stdout
-  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
-  --quiet             run in quiet mode
-
-Examples:
-
-  # generate a telegraf config file:
-  telegraf config > telegraf.conf
-
-  # generate config with only cpu input & influxdb output plugins defined
-  telegraf --input-filter cpu --output-filter influxdb config
-
-  # run a single telegraf collection, outputing metrics to stdout
-  telegraf --config telegraf.conf --test
-
-  # run telegraf with all plugins defined in config file
-  telegraf --config telegraf.conf
-
-  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
-  telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
-
-  # run telegraf with pprof
-  telegraf --config telegraf.conf --pprof-addr localhost:6060
-`
-
 var stop chan struct{}
 
 func reloadLoop(
diff --git a/cmd/telegraf/usage.go b/cmd/telegraf/usage.go
new file mode 100644
index 000000000..2d36ede94
--- /dev/null
+++ b/cmd/telegraf/usage.go
@@ -0,0 +1,45 @@
+// +build !windows
+
+package main
+
+const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
+
+Usage:
+
+  telegraf [commands|flags]
+
+The commands & flags are:
+
+  config              print out full sample configuration to stdout
+  version             print the version to stdout
+
+  --config <file>     configuration file to load
+  --test              gather metrics once, print them to stdout, and exit
+  --config-directory  directory containing additional *.conf files
+  --input-filter      filter the input plugins to enable, separator is :
+  --output-filter     filter the output plugins to enable, separator is :
+  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
+  --debug             print metrics as they're generated to stdout
+  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
+  --quiet             run in quiet mode
+
+Examples:
+
+  # generate a telegraf config file:
+  telegraf config > telegraf.conf
+
+  # generate config with only cpu input & influxdb output plugins defined
+  telegraf --input-filter cpu --output-filter influxdb config
+
+  # run a single telegraf collection, outputing metrics to stdout
+  telegraf --config telegraf.conf --test
+
+  # run telegraf with all plugins defined in config file
+  telegraf --config telegraf.conf
+
+  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
+  telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
+
+  # run telegraf with pprof
+  telegraf --config telegraf.conf --pprof-addr localhost:6060
+`
diff --git a/cmd/telegraf/usage_windows.go b/cmd/telegraf/usage_windows.go
new file mode 100644
index 000000000..b09435b9a
--- /dev/null
+++ b/cmd/telegraf/usage_windows.go
@@ -0,0 +1,54 @@
+// +build windows
+
+package main
+
+const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
+
+Usage:
+
+  telegraf [commands|flags]
+
+The commands & flags are:
+
+  config              print out full sample configuration to stdout
+  version             print the version to stdout
+
+  --config <file>     configuration file to load
+  --test              gather metrics once, print them to stdout, and exit
+  --config-directory  directory containing additional *.conf files
+  --input-filter      filter the input plugins to enable, separator is :
+  --output-filter     filter the output plugins to enable, separator is :
+  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
+  --debug             print metrics as they're generated to stdout
+  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
+  --quiet             run in quiet mode
+
+  --console           run as console application
+  --service           operate on service, one of: install, uninstall, start, stop
+
+Examples:
+
+  # generate a telegraf config file:
+  telegraf config > telegraf.conf
+
+  # generate config with only cpu input & influxdb output plugins defined
+  telegraf --input-filter cpu --output-filter influxdb config
+
+  # run a single telegraf collection, outputing metrics to stdout
+  telegraf --config telegraf.conf --test
+
+  # run telegraf with all plugins defined in config file
+  telegraf --config telegraf.conf
+
+  # run telegraf, enabling the cpu & memory input, and influxdb output plugins
+  telegraf --config telegraf.conf --input-filter cpu:mem --output-filter influxdb
+
+  # run telegraf with pprof
+  telegraf --config telegraf.conf --pprof-addr localhost:6060
+
+  # run telegraf without service controller
+  telegraf --console install --config "C:\Program Files\Telegraf\telegraf.conf"
+
+  # install telegraf service
+  telegraf --service install --config "C:\Program Files\Telegraf\telegraf.conf"
+`

From 2c19d74829b00cab1b698dcc17251e71bd4cf521 Mon Sep 17 00:00:00 2001
From: jvassev <jvassev@gmail.com>
Date: Thu, 12 Apr 2018 02:51:19 +0300
Subject: [PATCH 1076/1302] Prevent loading config twice in K8S (#3999)

When config dir is mounted from configmap, filepath.Walk() finds the same
.conf file twice as 20-acme.conf is a link to ..data/20-acme.conf for example.

This patch skips all folder names starting with '..' which is pretty
uncommon and mainly used by Kubernetes mounts.
---
 internal/config/config.go                                   | 6 ++++++
 .../subconfig/..4984_10_04_08_28_06.119/invalid-config.conf | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 internal/config/testdata/subconfig/..4984_10_04_08_28_06.119/invalid-config.conf

diff --git a/internal/config/config.go b/internal/config/config.go
index fe8cac5ae..4c6ed5624 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -519,7 +519,13 @@ func (c *Config) LoadDirectory(path string) error {
 			log.Printf("W! Telegraf is not permitted to read %s", thispath)
 			return nil
 		}
+
 		if info.IsDir() {
+			if strings.HasPrefix(info.Name(), "..") {
+				// skip Kubernetes mounts, prevening loading the same config twice
+				return filepath.SkipDir
+			}
+
 			return nil
 		}
 		name := info.Name()
diff --git a/internal/config/testdata/subconfig/..4984_10_04_08_28_06.119/invalid-config.conf b/internal/config/testdata/subconfig/..4984_10_04_08_28_06.119/invalid-config.conf
new file mode 100644
index 000000000..aee9abdfe
--- /dev/null
+++ b/internal/config/testdata/subconfig/..4984_10_04_08_28_06.119/invalid-config.conf
@@ -0,0 +1,4 @@
+# This invalid config file should be skipped during testing
+# as it is an ..data folder
+
+[[outputs.influxdb

From 0a02363c03550d6af26eb4cfae676aded3609108 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 11 Apr 2018 16:52:40 -0700
Subject: [PATCH 1077/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd85c4b0f..76fff6f58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
 - [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
+- [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
 
 ## v1.6 [unreleased]
 

From 8d516d26e9b42a8adda9378cb857185e8378fcf9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Apr 2018 14:34:55 -0700
Subject: [PATCH 1078/1302] Fix MQTT sample config

---
 plugins/outputs/mqtt/README.md | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/outputs/mqtt/README.md b/plugins/outputs/mqtt/README.md
index 562149b9b..21987c30c 100644
--- a/plugins/outputs/mqtt/README.md
+++ b/plugins/outputs/mqtt/README.md
@@ -2,38 +2,36 @@
 
 This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt Producer.
 
-```
+```toml
 [[outputs.mqtt]]
   ## URLs of mqtt brokers
   servers = ["localhost:1883"]
-  
+
   ## topic for producer messages
-  topic = "telegraf"
-  
+  topic_prefix = "telegraf"
+
   ## QoS policy for messages
   qos = 2
-  
+
   ## username and password to connect MQTT server.
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
-   
+
   ## client ID, if not set a random ID is generated
   # client_id = ""
-    
+
   ## Timeout for write operations. default: 5s
   # timeout = "5s"
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
   # ssl_key = "/etc/telegraf/key.pem"
-  
+
   ## Use SSL but skip chain & host verification
   # insecure_skip_verify = false
-  
+
   ## Data format to output.
   data_format = "influx"
-
-
 ```
 
 ### Required parameters:

From e4009234e9a25e4ebf32ed3e473a11a66aa59bc2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 12 Apr 2018 18:09:31 -0700
Subject: [PATCH 1079/1302] Fix HashID conflicts in pathological cases

Use "\n" as delimiter as it cannot occur in the series name.
---
 metric/metric.go      |  3 +++
 metric/metric_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/metric/metric.go b/metric/metric.go
index 0af445c2d..2c8fdb9c9 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -232,9 +232,12 @@ func (m *metric) IsAggregate() bool {
 func (m *metric) HashID() uint64 {
 	h := fnv.New64a()
 	h.Write([]byte(m.name))
+	h.Write([]byte("\n"))
 	for _, tag := range m.tags {
 		h.Write([]byte(tag.Key))
+		h.Write([]byte("\n"))
 		h.Write([]byte(tag.Value))
+		h.Write([]byte("\n"))
 	}
 	return h.Sum64()
 }
diff --git a/metric/metric_test.go b/metric/metric_test.go
index 31f1729d8..1fecf2e44 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -267,6 +267,32 @@ func TestHashID_Consistency(t *testing.T) {
 	assert.Equal(t, m2.HashID(), m3.HashID())
 }
 
+func TestHashID_Delimiting(t *testing.T) {
+	m1, _ := New(
+		"cpu",
+		map[string]string{
+			"a": "x",
+			"b": "y",
+			"c": "z",
+		},
+		map[string]interface{}{
+			"value": float64(1),
+		},
+		time.Now(),
+	)
+	m2, _ := New(
+		"cpu",
+		map[string]string{
+			"a": "xbycz",
+		},
+		map[string]interface{}{
+			"value": float64(1),
+		},
+		time.Now(),
+	)
+	assert.NotEqual(t, m1.HashID(), m2.HashID())
+}
+
 func TestSetName(t *testing.T) {
 	m := baseMetric()
 	m.SetName("foo")

From 04ab9a4fe447ea2960e69dc01f30e6fb037d697f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Apr 2018 12:04:31 -0700
Subject: [PATCH 1080/1302] Set 1.6 release date in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76fff6f58..622ea0e3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 - [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
 - [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
 
-## v1.6 [unreleased]
+## v1.6 [2018-04-16]
 
 ### Release Notes
 

From c8d2ba2bc8bffffc04b30223c5b84d0c53538fd1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Apr 2018 18:52:52 -0700
Subject: [PATCH 1081/1302] Remove RateLimiter tests due to race conditions

These tests are fundamentally racy, removing to improve reliability of
test cases.
---
 internal/limiter/limiter_test.go | 54 --------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 internal/limiter/limiter_test.go

diff --git a/internal/limiter/limiter_test.go b/internal/limiter/limiter_test.go
deleted file mode 100644
index 83c9d86f1..000000000
--- a/internal/limiter/limiter_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package limiter
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRateLimiter(t *testing.T) {
-	r := NewRateLimiter(5, time.Second)
-	ticker := time.NewTicker(time.Millisecond * 75)
-
-	// test that we can only get 5 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-r.C:
-			counter++
-		case <-ticker.C:
-			break outer
-		}
-	}
-
-	assert.Equal(t, 5, counter)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}
-
-func TestRateLimiterMultipleIterations(t *testing.T) {
-	r := NewRateLimiter(5, time.Millisecond*50)
-	ticker := time.NewTicker(time.Millisecond * 250)
-
-	// test that we can get 15 receives from the rate limiter
-	counter := 0
-outer:
-	for {
-		select {
-		case <-ticker.C:
-			break outer
-		case <-r.C:
-			counter++
-		}
-	}
-
-	assert.True(t, counter > 10)
-	r.Stop()
-	// verify that the Stop function closes the channel.
-	_, ok := <-r.C
-	assert.False(t, ok)
-}

From bcf1cf59c134c887a0a3d8f4cd480a7d370147be Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 13:35:27 -0700
Subject: [PATCH 1082/1302] Fix docs about outputs and fieldpass/fielddrop

This has been allowed since 1.1.0
---
 docs/CONFIGURATION.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index b1ae47bf1..39825376d 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -153,11 +153,11 @@ The inverse of `namepass`.  If a match is found the point is discarded. This
 is tested on points after they have passed the `namepass` test.
 * **fieldpass**:
 An array of glob pattern strings.  Only fields whose field key matches a
-pattern in this list are emitted.  Not available for outputs.
+pattern in this list are emitted.
 * **fielddrop**:
 The inverse of `fieldpass`.  Fields with a field key matching one of the
 patterns will be discarded from the point.  This is tested on points after
-they have passed the `fieldpass` test.  Not available for outputs.
+they have passed the `fieldpass` test.
 * **tagpass**:
 A table mapping tag keys to arrays of glob pattern strings.  Only points
 that contain a tag key in the table and a tag value matching one of its

From 3046f957d50abb6ff8a9e768c3d93a751e940985 Mon Sep 17 00:00:00 2001
From: Jack Zampolin <jack.zampolin@gmail.com>
Date: Tue, 17 Apr 2018 13:40:55 -0700
Subject: [PATCH 1083/1302] Add nvidia_smi input to monitor nvidia GPUs (#4026)

---
 plugins/inputs/all/all.go                    |   1 +
 plugins/inputs/nvidia_smi/README.md          |  47 ++++++
 plugins/inputs/nvidia_smi/nvidia_smi.go      | 149 +++++++++++++++++++
 plugins/inputs/nvidia_smi/nvidia_smi_test.go |  35 +++++
 4 files changed, 232 insertions(+)
 create mode 100644 plugins/inputs/nvidia_smi/README.md
 create mode 100644 plugins/inputs/nvidia_smi/nvidia_smi.go
 create mode 100644 plugins/inputs/nvidia_smi/nvidia_smi_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index e3264ef8b..440d1e9a5 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -65,6 +65,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/nsq_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ntpq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nvidia_smi"
 	_ "github.com/influxdata/telegraf/plugins/inputs/openldap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/opensmtpd"
 	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
diff --git a/plugins/inputs/nvidia_smi/README.md b/plugins/inputs/nvidia_smi/README.md
new file mode 100644
index 000000000..84b8527f2
--- /dev/null
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -0,0 +1,47 @@
+# `nvidia-smi` Input Plugin
+
+This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvidia-system-management-interface) binary to pull GPU stats including memory and GPU usage, temp and other.
+
+### Configuration
+
+```toml
+# Pulls statistics from nvidia GPUs attached to the host
+[[inputs.nvidia_smi]]
+## Optional: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+# bin_path = /usr/bin/nvidia-smi
+
+## Optional: timeout for GPU polling
+# timeout = 5s
+```
+
+### Metrics
+- measurement: `nvidia_smi`
+  - tags
+    - `name` (type of GPU e.g. `GeForce GTX 170 Ti`)
+    - `compute_mode` (The compute mode of the GPU e.g. `Default`)
+    - `index` (The port index where the GPU is connected to the motherboard e.g. `1`)
+    - `pstate` (Overclocking state for the GPU e.g. `P0`)
+    - `uuid` (A unique identifier for the GPU e.g. `GPU-f9ba66fc-a7f5-94c5-da19-019ef2f9c665`)
+  - fields
+    - `fan_speed` (integer, percentage)
+    - `memory_free` (integer, KB)
+    - `memory_used` (integer, KB)
+    - `memory_total` (integer, KB)
+    - `temperature_gpu` (integer, degrees C)
+    - `utilization_gpu` (integer, percentage)
+    - `utilization_memory` (integer, percentage)
+
+### Sample Query
+
+The below query could be used to alert on the average temperature of the your GPUs over the last minute
+
+```
+SELECT mean("temperature_gpu") FROM "nvidia_smi" WHERE time > now() - 5m GROUP BY time(1m), "index", "name", "host"
+```
+
+### Example Output
+```
+nvidia_smi,compute_mode=Default,host=8218cf,index=0,name=GeForce\ GTX\ 1070,pstate=P2,uuid=GPU-823bc202-6279-6f2c-d729-868a30f14d96 fan_speed=100i,memory_free=7563i,memory_total=8112i,memory_used=549i,temperature_gpu=53i,utilization_gpu=100i,utilization_memory=90i 1523991122000000000
+nvidia_smi,compute_mode=Default,host=8218cf,index=1,name=GeForce\ GTX\ 1080,pstate=P2,uuid=GPU-f9ba66fc-a7f5-94c5-da19-019ef2f9c665 fan_speed=100i,memory_free=7557i,memory_total=8114i,memory_used=557i,temperature_gpu=50i,utilization_gpu=100i,utilization_memory=85i 1523991122000000000
+nvidia_smi,compute_mode=Default,host=8218cf,index=2,name=GeForce\ GTX\ 1080,pstate=P2,uuid=GPU-d4cfc28d-0481-8d07-b81a-ddfc63d74adf fan_speed=100i,memory_free=7557i,memory_total=8114i,memory_used=557i,temperature_gpu=58i,utilization_gpu=100i,utilization_memory=86i 1523991122000000000
+```
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go
new file mode 100644
index 000000000..0cf9bd9e7
--- /dev/null
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -0,0 +1,149 @@
+package nvidia_smi
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+var (
+	measurement = "nvidia_smi"
+	metrics     = "fan.speed,memory.total,memory.used,memory.free,pstate,temperature.gpu,name,uuid,compute_mode,utilization.gpu,utilization.memory,index"
+	metricNames = [][]string{
+		[]string{"fan_speed", "field"},
+		[]string{"memory_total", "field"},
+		[]string{"memory_used", "field"},
+		[]string{"memory_free", "field"},
+		[]string{"pstate", "tag"},
+		[]string{"temperature_gpu", "field"},
+		[]string{"name", "tag"},
+		[]string{"uuid", "tag"},
+		[]string{"compute_mode", "tag"},
+		[]string{"utilization_gpu", "field"},
+		[]string{"utilization_memory", "field"},
+		[]string{"index", "tag"},
+	}
+)
+
+// NvidiaSMI holds the methods for this plugin
+type NvidiaSMI struct {
+	BinPath string
+	Timeout time.Duration
+
+	metrics string
+}
+
+// Description returns the description of the NvidiaSMI plugin
+func (smi *NvidiaSMI) Description() string {
+	return "Pulls statistics from nvidia GPUs attached to the host"
+}
+
+// SampleConfig returns the sample configuration for the NvidiaSMI plugin
+func (smi *NvidiaSMI) SampleConfig() string {
+	return `
+## Optional: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+# bin_path = /usr/bin/nvidia-smi
+
+## Optional: timeout for GPU polling
+# timeout = 5s
+`
+}
+
+// Gather implements the telegraf interface
+func (smi *NvidiaSMI) Gather(acc telegraf.Accumulator) error {
+
+	if _, err := os.Stat(smi.BinPath); os.IsNotExist(err) {
+		return fmt.Errorf("nvidia-smi binary not at path %s, cannot gather GPU data", smi.BinPath)
+	}
+
+	data, err := smi.pollSMI()
+	if err != nil {
+		return err
+	}
+
+	err = gatherNvidiaSMI(data, acc)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("nvidia_smi", func() telegraf.Input {
+		return &NvidiaSMI{
+			BinPath: "/usr/bin/nvidia-smi",
+			Timeout: 5 * time.Second,
+			metrics: metrics,
+		}
+	})
+}
+
+func (smi *NvidiaSMI) pollSMI() (string, error) {
+	// Construct and execute metrics query
+	opts := []string{"--format=noheader,nounits,csv", fmt.Sprintf("--query-gpu=%s", smi.metrics)}
+	ret, err := internal.CombinedOutputTimeout(exec.Command(smi.BinPath, opts...), smi.Timeout)
+	if err != nil {
+		return "", err
+	}
+	return string(ret), nil
+}
+
+func gatherNvidiaSMI(ret string, acc telegraf.Accumulator) error {
+	// First split the lines up and handle each one
+	scanner := bufio.NewScanner(strings.NewReader(ret))
+	for scanner.Scan() {
+		tags, fields, err := parseLine(scanner.Text())
+		if err != nil {
+			return err
+		}
+		acc.AddFields(measurement, fields, tags)
+	}
+
+	if err := scanner.Err(); err != nil {
+		return fmt.Errorf("Error scanning text %s", ret)
+	}
+
+	return nil
+}
+
+func parseLine(line string) (map[string]string, map[string]interface{}, error) {
+	tags := make(map[string]string, 0)
+	fields := make(map[string]interface{}, 0)
+
+	// Next split up the comma delimited metrics
+	met := strings.Split(line, ",")
+
+	// Make sure there are as many metrics in the line as there were queried.
+	if len(met) == len(metricNames) {
+		for i, m := range metricNames {
+
+			// First handle the tags
+			if m[1] == "tag" {
+				tags[m[0]] = strings.TrimSpace(met[i])
+				continue
+			}
+
+			// Then parse the integers out of the fields
+			out, err := strconv.ParseInt(strings.TrimSpace(met[i]), 10, 64)
+			if err != nil {
+				return tags, fields, err
+			}
+			fields[m[0]] = out
+		}
+
+		// Return the tags and fields
+		return tags, fields, nil
+	}
+
+	// If the line is empty return an emptyline error
+	return tags, fields, fmt.Errorf("Different number of metrics returned (%d) than expeced (%d)", len(met), len(metricNames))
+}
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi_test.go b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
new file mode 100644
index 000000000..62ddee3b8
--- /dev/null
+++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
@@ -0,0 +1,35 @@
+package nvidia_smi
+
+import (
+	"testing"
+)
+
+func TestParseLineStandard(t *testing.T) {
+	line := "85, 8114, 553, 7561, P2, 61, GeForce GTX 1070 Ti, GPU-d1911b8a-f5c8-5e66-057c-486561269de8, Default, 100, 93, 1\n"
+	tags, fields, err := parseLine(line)
+	if err != nil {
+		t.Fail()
+	}
+	if tags["name"] != "GeForce GTX 1070 Ti" {
+		t.Fail()
+	}
+	if temp, ok := fields["temperature_gpu"].(int); ok && temp == 61 {
+		t.Fail()
+	}
+}
+
+func TestParseLineEmptyLine(t *testing.T) {
+	line := "\n"
+	_, _, err := parseLine(line)
+	if err == nil {
+		t.Fail()
+	}
+}
+
+func TestParseLineBad(t *testing.T) {
+	line := "the quick brown fox jumped over the lazy dog"
+	_, _, err := parseLine(line)
+	if err == nil {
+		t.Fail()
+	}
+}

From 3b3d16273d901fbe8f759b6ea3b532b0d337cdd8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 13:43:36 -0700
Subject: [PATCH 1084/1302] Update changelog adding nvidia_smi

---
 CHANGELOG.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 622ea0e3b..67776116d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### New Inputs
 
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
+- [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
 
 ### Features
 
diff --git a/README.md b/README.md
index 0d64cab73..63f3373e5 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,7 @@ configuration options.
 * [nsq](./plugins/inputs/nsq)
 * [nstat](./plugins/inputs/nstat)
 * [ntpq](./plugins/inputs/ntpq)
+* [nvidia_smi](./plugins/inputs/nvidia_smi)
 * [openldap](./plugins/inputs/openldap)
 * [opensmtpd](./plugins/inputs/opensmtpd)
 * [pf](./plugins/inputs/pf)

From 1e1d9e8acb23471a42a80dc81733358b1e6b3196 Mon Sep 17 00:00:00 2001
From: James Maidment <james@maidment.org>
Date: Tue, 17 Apr 2018 18:43:10 -0400
Subject: [PATCH 1085/1302] Update mem values to gauge (#4034)

---
 plugins/inputs/system/memory.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go
index 490c56f89..3cb95610e 100644
--- a/plugins/inputs/system/memory.go
+++ b/plugins/inputs/system/memory.go
@@ -37,7 +37,7 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
 		"used_percent":      100 * float64(vm.Used) / float64(vm.Total),
 		"available_percent": 100 * float64(vm.Available) / float64(vm.Total),
 	}
-	acc.AddCounter("mem", fields, nil)
+	acc.AddGauge("mem", fields, nil)
 
 	return nil
 }

From 7c592558d8341256d8213c21b68132140f03617c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 15:45:49 -0700
Subject: [PATCH 1086/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67776116d..b0239a179 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@
 - [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
 - [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
 
+## v1.6.1 [unreleased]
+
+### Bugfixes
+- [#3835](https://github.com/influxdata/telegraf/issues/3835): Report mem input fields as gauges instead counters.
+
 ## v1.6 [2018-04-16]
 
 ### Release Notes

From 0b4f4b089f8723d2a3cc885df4d8e8d8c70bf088 Mon Sep 17 00:00:00 2001
From: Bob Shannon <bobmshannon@users.noreply.github.com>
Date: Tue, 17 Apr 2018 20:02:04 -0400
Subject: [PATCH 1087/1302] Add TLS support to socket_writer and
 socket_listener plugins (#4021)

---
 internal/internal.go                          | 51 +++++++++++++++++--
 plugins/inputs/socket_listener/README.md      |  7 +++
 .../inputs/socket_listener/socket_listener.go | 49 +++++++++++++++---
 .../socket_listener/socket_listener_test.go   | 48 +++++++++++++++++
 .../inputs/socket_listener/testdata/ca.pem    | 31 +++++++++++
 .../socket_listener/testdata/client.key       | 27 ++++++++++
 .../socket_listener/testdata/client.pem       | 24 +++++++++
 .../socket_listener/testdata/server.key       | 27 ++++++++++
 .../socket_listener/testdata/server.pem       | 25 +++++++++
 plugins/outputs/socket_writer/README.md       |  7 +++
 .../outputs/socket_writer/socket_writer.go    | 32 ++++++++++--
 11 files changed, 314 insertions(+), 14 deletions(-)
 create mode 100644 plugins/inputs/socket_listener/testdata/ca.pem
 create mode 100644 plugins/inputs/socket_listener/testdata/client.key
 create mode 100644 plugins/inputs/socket_listener/testdata/client.pem
 create mode 100644 plugins/inputs/socket_listener/testdata/server.key
 create mode 100644 plugins/inputs/socket_listener/testdata/server.pem

diff --git a/internal/internal.go b/internal/internal.go
index aae7aa773..3227832c9 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -112,9 +112,10 @@ func RandomString(n int) string {
 	return string(bytes)
 }
 
-// GetTLSConfig gets a tls.Config object from the given certs, key, and CA files.
-// you must give the full path to the files.
-// If all files are blank and InsecureSkipVerify=false, returns a nil pointer.
+// GetTLSConfig gets a tls.Config object from the given certs, key, and CA files
+// for use with a client.
+// The full path to each file must be provided.
+// Returns a nil pointer if all files are blank and InsecureSkipVerify=false.
 func GetTLSConfig(
 	SSLCert, SSLKey, SSLCA string,
 	InsecureSkipVerify bool,
@@ -155,6 +156,50 @@ func GetTLSConfig(
 	return t, nil
 }
 
+// GetServerTLSConfig gets a tls.Config object from the given certs, key, and one or more CA files
+// for use with a server.
+// The full path to each file must be provided.
+// Returns a nil pointer if all files are blank.
+func GetServerTLSConfig(
+	TLSCert, TLSKey string,
+	TLSAllowedCACerts []string,
+) (*tls.Config, error) {
+	if TLSCert == "" && TLSKey == "" && len(TLSAllowedCACerts) == 0 {
+		return nil, nil
+	}
+
+	t := &tls.Config{}
+
+	if len(TLSAllowedCACerts) != 0 {
+		caCertPool := x509.NewCertPool()
+		for _, cert := range TLSAllowedCACerts {
+			c, err := ioutil.ReadFile(cert)
+			if err != nil {
+				return nil, errors.New(fmt.Sprintf("Could not load TLS CA: %s",
+					err))
+			}
+			caCertPool.AppendCertsFromPEM(c)
+		}
+		t.ClientCAs = caCertPool
+		t.ClientAuth = tls.RequireAndVerifyClientCert
+	}
+
+	if TLSCert != "" && TLSKey != "" {
+		cert, err := tls.LoadX509KeyPair(TLSCert, TLSKey)
+		if err != nil {
+			return nil, errors.New(fmt.Sprintf(
+				"Could not load TLS client key/certificate from %s:%s: %s",
+				TLSKey, TLSCert, err))
+		}
+
+		t.Certificates = []tls.Certificate{cert}
+	}
+
+	t.BuildNameToCertificate()
+
+	return t, nil
+}
+
 // SnakeCase converts the given string to snake case following the Golang format:
 // acronyms are converted to lower-case and preceded by an underscore.
 func SnakeCase(in string) string {
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
index 698f3aeee..ff73b1fbb 100644
--- a/plugins/inputs/socket_listener/README.md
+++ b/plugins/inputs/socket_listener/README.md
@@ -35,6 +35,13 @@ This is a sample configuration for the plugin.
   ## 0 (default) is unlimited.
   # read_timeout = "30s"
 
+  ## Optional TLS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key  = "/etc/telegraf/key.pem"
+  ## Enables client authentication if set.
+  # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+
   ## Maximum socket buffer size in bytes.
   ## For stream sockets, once the buffer fills up, the sender will start backing up.
   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 2ad6c4264..011a1edb4 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -12,6 +12,7 @@ import (
 
 	"time"
 
+	"crypto/tls"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -122,9 +123,9 @@ func (ssl *streamSocketListener) read(c net.Conn) {
 	}
 
 	if err := scnr.Err(); err != nil {
-		if err, ok := err.(net.Error); ok && err.Timeout() {
+		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
 			log.Printf("D! Timeout in plugin [input.socket_listener]: %s", err)
-		} else if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+		} else if netErr != nil && !strings.HasSuffix(err.Error(), ": use of closed network connection") {
 			ssl.AddError(err)
 		}
 	}
@@ -159,11 +160,14 @@ func (psl *packetSocketListener) listen() {
 }
 
 type SocketListener struct {
-	ServiceAddress  string
-	MaxConnections  int
-	ReadBufferSize  int
-	ReadTimeout     *internal.Duration
-	KeepAlivePeriod *internal.Duration
+	ServiceAddress    string             `toml:"service_address"`
+	MaxConnections    int                `toml:"max_connections"`
+	ReadBufferSize    int                `toml:"read_buffer_size"`
+	ReadTimeout       *internal.Duration `toml:"read_timeout"`
+	TLSAllowedCACerts []string           `toml:"tls_allowed_cacerts"`
+	TLSCert           string             `toml:"tls_cert"`
+	TLSKey            string             `toml:"tls_key"`
+	KeepAlivePeriod   *internal.Duration `toml:"keep_alive_period"`
 
 	parsers.Parser
 	telegraf.Accumulator
@@ -198,6 +202,13 @@ func (sl *SocketListener) SampleConfig() string {
   ## 0 (default) is unlimited.
   # read_timeout = "30s"
 
+  ## Optional TLS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key  = "/etc/telegraf/key.pem"
+  ## Enables client authentication if set.
+  # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+
   ## Maximum socket buffer size in bytes.
   ## For stream sockets, once the buffer fills up, the sender will start backing up.
   ## For datagram sockets, once the buffer fills up, metrics will start dropping.
@@ -242,7 +253,21 @@ func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
 
 	switch spl[0] {
 	case "tcp", "tcp4", "tcp6", "unix", "unixpacket":
-		l, err := net.Listen(spl[0], spl[1])
+		var (
+			err error
+			l   net.Listener
+		)
+
+		tlsCfg, err := internal.GetServerTLSConfig(sl.TLSCert, sl.TLSKey, sl.TLSAllowedCACerts)
+		if err != nil {
+			return nil
+		}
+
+		if tlsCfg == nil {
+			l, err = net.Listen(spl[0], spl[1])
+		} else {
+			l, err = tls.Listen(spl[0], spl[1], tlsCfg)
+		}
 		if err != nil {
 			return err
 		}
@@ -313,6 +338,14 @@ func (uc unixCloser) Close() error {
 	return err
 }
 
+func (uc unixCloser) Accept() (net.Conn, error) {
+	return uc.closer.(net.Listener).Accept()
+}
+
+func (uc unixCloser) Addr() net.Addr {
+	return uc.closer.(net.Listener).Addr()
+}
+
 func init() {
 	inputs.Add("socket_listener", func() telegraf.Input { return newSocketListener() })
 }
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index 4e8335699..b647e724f 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -2,12 +2,14 @@ package socket_listener
 
 import (
 	"bytes"
+	"crypto/tls"
 	"log"
 	"net"
 	"os"
 	"testing"
 	"time"
 
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -25,6 +27,52 @@ func testEmptyLog(t *testing.T) func() {
 	}
 }
 
+func TestSocketListener_tcp_tls(t *testing.T) {
+	defer testEmptyLog(t)()
+
+	sl := newSocketListener()
+	sl.ServiceAddress = "tcp://127.0.0.1:0"
+	sl.TLSCert = "testdata/server.pem"
+	sl.TLSKey = "testdata/server.key"
+	sl.TLSAllowedCACerts = []string{"testdata/ca.pem"}
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+	defer sl.Stop()
+
+	tlsCfg, err := internal.GetTLSConfig("testdata/client.pem", "testdata/client.key", "testdata/ca.pem", true)
+	require.NoError(t, err)
+
+	secureClient, err := tls.Dial("tcp", sl.Closer.(net.Listener).Addr().String(), tlsCfg)
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, secureClient)
+}
+
+func TestSocketListener_unix_tls(t *testing.T) {
+	defer testEmptyLog(t)()
+
+	sl := newSocketListener()
+	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.TLSCert = "testdata/server.pem"
+	sl.TLSKey = "testdata/server.key"
+	sl.TLSAllowedCACerts = []string{"testdata/ca.pem"}
+
+	acc := &testutil.Accumulator{}
+	err := sl.Start(acc)
+	require.NoError(t, err)
+	defer sl.Stop()
+
+	tlsCfg, err := internal.GetTLSConfig("testdata/client.pem", "testdata/client.key", "testdata/ca.pem", true)
+	require.NoError(t, err)
+
+	secureClient, err := tls.Dial("unix", "/tmp/telegraf_test.sock", tlsCfg)
+	require.NoError(t, err)
+
+	testSocketListener(t, sl, secureClient)
+}
+
 func TestSocketListener_tcp(t *testing.T) {
 	defer testEmptyLog(t)()
 
diff --git a/plugins/inputs/socket_listener/testdata/ca.pem b/plugins/inputs/socket_listener/testdata/ca.pem
new file mode 100644
index 000000000..d3b6d9a14
--- /dev/null
+++ b/plugins/inputs/socket_listener/testdata/ca.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFVTCCAz2gAwIBAgIJAOhLvwv6zUf+MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsG
+A1UECgwEVGVzdDAeFw0xODA0MTcwNDIwNDZaFw0yMTAyMDQwNDIwNDZaMEExCzAJ
+BgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEN
+MAsGA1UECgwEVGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKwE
+Xy814CDH03G3Fg2/XSpYZXVMzwp6oq/bUe3iLhkOpA6C4+j07AxAAa22qEPlvYkb
+W7oxVJiL0ih1od2FeAxvroBTmjG54j/Syb8OeQsZaJLNp1rRmwYGBIVi284ScaIc
+dn+2bfmfpSLjK3SbU5XygtwIE3gh/B7x02UJRNJmJ1faRT2CfTeg/56xnTE4bcR5
+HRrlojoN5laJngowLWAEAvWljCR8oge+ciNYB3xoK8Hgc9+WgTy95G1RBCNkaFFI
+73nrcHl6dGOH9UgIqfbHJYxNEarI3o/JAr8DIBS0W4r8r4aY4JQ4LoN3bg4mLHQq
+THKkVW5hyBeWe47qmlL0m4F6/+mzVi95NAWG2BQDCZJAWJNc+PbSRHi81838m7ff
+O4rixd/F53LUUas8/zVca3vtv+XjOHZzIQLIy1bM4MhzpHlRcSmS9kqxxZ3S70e3
+ZIWFdM0iRrtlBbJeoHIJRDpgPRYIWdRc6XotljTTi6/lN4Bj/0NK4E3iONcDsscN
+kiqEHRAWZ4ptCqdVPgYR0S096Fx6OaC3ASODE0Cjb18ylZQRsQi8TiYSihGzuoio
+wJwSLdIifDbbSUkjT1384cA/HsOjFQ9xHXYa6cQnAg3TUZyG1lAMJyFWYke+rxmG
+srfL/EtIzgbzmEOC5anQjA2pdgUO9Pk2SinJaMApAgMBAAGjUDBOMB0GA1UdDgQW
+BBQNJctDLjj8bVKNCYANaOcboPQnmzAfBgNVHSMEGDAWgBQNJctDLjj8bVKNCYAN
+aOcboPQnmzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQATSr26Kc8g
+3l2zuccoKWM57DQcgRmzSYwEOKA2jn3FWmrAdwozEIkLaTK0OXz0zh2dZxh9V3GR
+w0WFCynbGNy/9s33MSi+zIWJOU/MZvt6zGE5CTcTgZ+u5IZyvSubMkPcwQi3Yvcg
+AHmWzpF42kT2J5C5MfrSU65hrhPX7hT/CUoV3gN7oxFzj+/ED4kgNorO8SUUJCmq
+DJNFbjgsD63EhnvAhn1AeM35GmKdl2enEKqcZsRkE4ZLpU7ibrThEm1aOQuJUtHk
+gDAx49QMdQpWnxWxnfoiwpLu7ufR7ls8O9oA8ZJux/SVHEmtkOdRsuMtY5MElFZg
+dANlQsdFWDko4ixaxFYzppuPNnRlqjGNnaEFJrNc2KR0Dxgmp28Yh2VyLd4r3fLT
+nLVBYF8KzFchUdXYYPNBXwAf/N52jGfugDx8snLxOfzxoUZ4y64qMCpYhntGgBJ1
+Rrk2trcn3Dw19gi8p3ylbdoz/Ch1INDDrO35pd0bZpcwASc/UNU72W5v2kGL0H7o
+nJzgtrqeHcoIzNBmBhHlMlnTF5GMfrYGsf5d30KyKv7UL6qJTvT641dpKpB/FFrk
+y3AQbKmKRDI+aVzeOlwdy/eJAwt7FikD4bR9GZ4PBX9n9jd4u/PHZNfxtgzplqo1
+oy7kJv0cB/vRKOblmn/vPUfTFtAX7M3GkQ==
+-----END CERTIFICATE-----
diff --git a/plugins/inputs/socket_listener/testdata/client.key b/plugins/inputs/socket_listener/testdata/client.key
new file mode 100644
index 000000000..285a27478
--- /dev/null
+++ b/plugins/inputs/socket_listener/testdata/client.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAmRuY+9Gg5V4e9hCd2mYek1jKeoaZijz89EPvox78XzoGdxPf
+RoukUcTVS9VWN7HyJBjRA9P+KuHI9dX47skxyxH53uXZvRmGQAJBY4cE07JHvGkZ
+eK1heXoWlBzYtivckha7bLBfn1ttAzcFCblUfJdzsn9XDuC4Jfn4oSaKn1o8Rzy1
+KRvyLgvsYxMA/XzhyBzVMyoUOulye7EZx4f+AwSNmNHD4OgtxxPofrrMOtXZ2tC6
+xNOexIZXbsB9dyrUW+4pWXYaadU7fl2V+arAJj+NVxV+3tmGGjmd1MiIypPx6BbP
+g7xH20nJ/Y0U6V7gklZpYO1i84RbtR/kqBgi9QIDAQABAoIBAEONJJM+KyHnw/tG
+246HbcgO7c7fYhDW1bgj3S/4NNsC6+VP1Dv40nftQzphFtgd37rDZDyvJL3gvlyQ
+mnMoO5rgBIGuocHH6C6HkDgMUznft7zOFhnjTVVeY2XX0FmXwoqGEw1iR940ZUV8
+2fEvXrJV1AsWGeALj9PZlTPsoE6rv5sUk9Lh3wCD73m7GSg7DzBRE+6bBze8Lmwn
+ZzTvmimhgPJw8LR5rRpYbDbhAJLAfgA7/yPgYEPxA/ffry6Ba4epj8tVNUNOAcOf
+PURF+uuIF7RceI2PkdvoNuQyVR5oxQUPUfidfVK5ClUmnHECSgb/FFnYC+nU2vSi
+IAnmC6ECgYEAyrUFHyxxuIQAiinjBxa0OQ3ynvMxDnF/+zvWe8536Y61lz9dblKb
+0xvFhpOEMfiG/zFdZdWJ+xdq7VQVNMHu4USoskG8sZs5zImMTu50kuDNln7xYqVf
+SUuN1U7cp7JouI1qkZAOsytPfAgZN/83hLObd07lAvL44jKYaHVeMmkCgYEAwVxZ
+wKXpboHwQawA+4ubsnZ36IlOk21/+FlGJiDg/LB643BS+QhgVNxuB2gL1gOCYkhl
+6BBcIhWMvZOIIo5uwnv4fQ+WfFwntU9POFViZgbZvkitQtorB7MXc/NU2BDrNYx2
+TBCiRn/9BaZ4fziW8I3Fx3xQ3rKDBXrexmrJQq0CgYEAvYGQYT12r47Qxlo0gcsL
+AA/3E/y9jwgzItglQ6eZ2ULup5C4s0wNm8Zp2s+Mlf8HjgpDi9Gf5ptU/r1N+f2Y
+awd6QvRMCSraVUr+Xkh1uV7rNNhGqPd75pT460OH7EtRtb+XsrAf3gcOjyEvGnfC
+GpCjNl4OobwvS6ELdRTM1IkCgYAHUGX4uo3k5zdeVJJI8ZP3ITIR8retLfQsQbw8
+jvvTsx1C4ynQT7fNHfVvhEkGVGWnMBPivlOt2mDTfvQkUnzwEF5q5J8NnzLFUfWu
+LNSnBVVRNFCRec0s4mJduXOZJLKw+No0sGBjCE5a21wte8eB2+sCS7qHYftAxtAM
+c1eflQKBgQDGTFsMvpM8BEPTreinTllFBdjeYchcdY/Ov9DZ3mMVopjAWRD81MKM
+zM1RCqwLkgv9FvF79B1FLJ1Inr8e/XIGdcrhE1a4sZdIWdqTWQ4xFrlDgxCquq66
+da09WVBRdvq2kVLAMaBViH2/GP1G4ZV9a8+JHuWKj+Arrr52Qeazjw==
+-----END RSA PRIVATE KEY-----
diff --git a/plugins/inputs/socket_listener/testdata/client.pem b/plugins/inputs/socket_listener/testdata/client.pem
new file mode 100644
index 000000000..d741e6518
--- /dev/null
+++ b/plugins/inputs/socket_listener/testdata/client.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEEjCCAfoCCQCmcronmMSqXTANBgkqhkiG9w0BAQsFADBBMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoM
+BFRlc3QwHhcNMTgwNDE3MDQyNDMwWhcNNDUwOTAyMDQyNDMwWjBVMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xITAfBgNV
+BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAJkbmPvRoOVeHvYQndpmHpNYynqGmYo8/PRD76Me/F86BncT
+30aLpFHE1UvVVjex8iQY0QPT/irhyPXV+O7JMcsR+d7l2b0ZhkACQWOHBNOyR7xp
+GXitYXl6FpQc2LYr3JIWu2ywX59bbQM3BQm5VHyXc7J/Vw7guCX5+KEmip9aPEc8
+tSkb8i4L7GMTAP184cgc1TMqFDrpcnuxGceH/gMEjZjRw+DoLccT6H66zDrV2drQ
+usTTnsSGV27AfXcq1FvuKVl2GmnVO35dlfmqwCY/jVcVft7Zhho5ndTIiMqT8egW
+z4O8R9tJyf2NFOle4JJWaWDtYvOEW7Uf5KgYIvUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAgEACJkccOvBavtagiMQc9OLsbo0PkHv7Qk9uTm5Sg9+LjLGUsu+3WLjAAmj
+YScHyGbvQzXlwpgo8JuwY0lMNoPfwGuydlJPfOBCbaoAqFp6Vpc/E49J9YovCsqa
+2HJUJeuxpf6SiH1Vc1SECjzwzKo03t8ul7t7SNVqA0r9fV4I936FlJOeQ4d5U+Wv
+H7c2LmAqbHi2Mwf+m+W6ziOvzp+szspcP2gJDX7hsKEtIlqmHYm2bzZ4fsCuU9xN
+3quewBVQUOuParO632yaLgzpGmfzzxLmCPO84lxarJKCxjHG2Q2l30TO/wA44m+r
+Wd17HpCT3PkCDG5eSNCSnYqfLm8DE1hLGfHiXxKmrgU94q4wvwVGOlcYa+CQeP9Q
+ZW3Tj0Axz0Mqlg1iLLo12+Z/yocSY2nFnFntBFT4qBKNCeD0xH3PxC0HJdK66xBv
+MVDE/OE2hBtTTts+vC9yjx4W8thtMSA4VCOgtt5sHjt3ZekiYYh5VZK47Bx/a0uc
+8CouRdyppWyPp/cNC+PcGW3YnXpAkxe/bSY/qgfK5kmbeOf+HzvZAIwAH/d9VK0g
+AoLNp46eP6U2E2lVvtc/HJ1C/gsiC/1TSIq/kBbYtuIJjhhH3u6IVet7WSD22Akv
+o5gOpcoKwy8IPDRC5lJEAAVYUKt7ORo2en3OVg6I4FaQmeBFp5s=
+-----END CERTIFICATE-----
diff --git a/plugins/inputs/socket_listener/testdata/server.key b/plugins/inputs/socket_listener/testdata/server.key
new file mode 100644
index 000000000..4ad8e642f
--- /dev/null
+++ b/plugins/inputs/socket_listener/testdata/server.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAzkEDLijGOqXNQPAqUjOz5TLuM28SENauknLtcfIyEN/N6PwZ
+re5DjokxtDPp+c9yP/9qtn7+dBfdUXg2Mu7HQz8lAKniir2ZH+axkjp5LUE6vYJd
+I1W8lOOc0kXDjozBetgriE0jkgc3v9oDBbLhN5waKR86jpQaNkfnI7/4U3yrlymK
+yaT3uD6L1ldUJubdQ/xc1HxdmX8VewBnkK1urYyiRbju2iL9YmtSM72yWXvFsD1O
+I4fP/XuiaymicBmXKL4cu6KYdfn1qeLAV3U35xG597M031WmR5o67rc63sqs+Q//
+V3dbGqnFXRMkLhoOnuKK0DD28ujY1kctbNQWVQIDAQABAoIBAHFxFJy41H7BXulO
+rxhTU6jGoHktqBQW4CGwkKTRf3QEhK6WqlEd8Y5eKzZgL1q1HLPSehEyPCYCUjpT
+EgxlhLeZ7XI1/mIs8iG3swconimj7Pj60Nt0dqq1njWRJYQsKua0Kw1m0B+rVKBy
++qKRxondlA32HTD6iIg+eAUTuzO/KzimZcyL9hiT/g6aN9k0H5+qURi8dO7VV8fD
+zvP8Y+oOGLwW2ccp+ZjFQizjTOkL4lgldr0hsGQXZJNHL94fA7jPdAxAUbnTicMJ
+oXM++L3eCwIVabipGxxlqCMj9Dn8yfbQvRGzP2e76QDeROYZHX4osH6vLcZEjx9i
+tJ4J+ekCgYEA82kKzkSKmFo4gZxnqAywlfZ2X2PADuMmHdqdiDFwt54orlMlKf/b
+wVSvN/djLXwvFHuyzFmJeMFSHKFkYVTOsh8kPSETAIGkcJEMHD3viYn7DwjkQudY
+vB/FpBWSiDT0T7qDUCzW3iMbx/JvTUSp7uO4ZuwOu6t6v3PEZwIChQ8CgYEA2Ov9
+FXHmm7sS54HgvZd6Wk8zLMLIDnyMmECjtYOasJ9c40yQHpRlXsb+Dzn/2xhMMwth
+Bln2hIiJ/e+G0bzFu4x0cItRPOQeRNyz5Pal8EsATeUwcX4KRKOZaUpDkV6XV1L0
+r/HSk/wed+90B74sGoJY1qsFflOATIUVs7SIllsCgYEAwhGSB/sl9WqZet1U1+um
+LyqeHlfNnREGJu9Sgm/Iyt1S2gp4qw/QCkiWmyym6nEEqHQnjj4lGR4pdaJIAkI3
+ulSR9BsWp2S10voSicHn5eUZQld4hs8lNHiwf66jce2mjJrMb3QQrHOZhsWIcDa6
+tjjhoU28QWzrJRIMGYTEtYkCgYA17NSJlDsj06mra5oXB6Ue9jlekz1wfH3nC4qn
+AQRfi/5ncw0QzQs2OHnIBz8XlD69IcMI9SxXXioPuo/la+wr54q6v6d+X6c2rzb5
+YGd4CO0WcDdOv2qGDbWBezi41q8AwlqZsqAKsc5ROnG5ywjjviufkfxXnyJx41O1
+zNd3qQKBgGEy+EwUXD5iGeQxdCDnd6iVu14SoBscHO5SpIeDu3DIhnu+7gPq2VMg
+Vp9j/iNVtEA3HyYCOeXc2rz9Di1wwt3YijED4birLAkC5YW6YB9rmLMfCNc1EyLh
+BKAkUQN3D+XCN4pXdbKvbkOcfYRUHoD+pPBjRYH020OtPBUc6Wkl
+-----END RSA PRIVATE KEY-----
diff --git a/plugins/inputs/socket_listener/testdata/server.pem b/plugins/inputs/socket_listener/testdata/server.pem
new file mode 100644
index 000000000..96cfa0b00
--- /dev/null
+++ b/plugins/inputs/socket_listener/testdata/server.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAg4CCQCmcronmMSqXDANBgkqhkiG9w0BAQsFADBBMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoM
+BFRlc3QwHhcNMTgwNDE3MDQyNDAwWhcNNDUwOTAyMDQyNDAwWjBpMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xITAfBgNV
+BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJMTI3LjAuMC4x
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkEDLijGOqXNQPAqUjOz
+5TLuM28SENauknLtcfIyEN/N6PwZre5DjokxtDPp+c9yP/9qtn7+dBfdUXg2Mu7H
+Qz8lAKniir2ZH+axkjp5LUE6vYJdI1W8lOOc0kXDjozBetgriE0jkgc3v9oDBbLh
+N5waKR86jpQaNkfnI7/4U3yrlymKyaT3uD6L1ldUJubdQ/xc1HxdmX8VewBnkK1u
+rYyiRbju2iL9YmtSM72yWXvFsD1OI4fP/XuiaymicBmXKL4cu6KYdfn1qeLAV3U3
+5xG597M031WmR5o67rc63sqs+Q//V3dbGqnFXRMkLhoOnuKK0DD28ujY1kctbNQW
+VQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQCVgzqFrehoRAMFLMEL8avfokYtsSYc
+50Yug4Es0ISo/PRWGeUnv8k1inyE3Y1iR/gbN5n/yjLXJKEflan6BuqGuukfr2eA
+fRdDCyPvzQLABdxCx2n6ByQFxj92z82tizf35R2OMuHHWzTckta+7s5EvxwIiUsd
+rUuXp+0ltJzlYYW9xTGFiJO9hAbRgMgZiwL8F7ayic8GmLQ1eRK/DfKDCOH3afeX
+MNN5FulgjqNyhXHF33vwgIJynGDg2JEhkWjB1DkUAxll0+SMQoYyVGZVrQSGbGw1
+JhOLc8C8bTzfK3qcJDuyldvjiut+To+lpu76R0u0+sn+wxQFL1uCWuAbMJgGsJgM
+ARavu2XDeae9X+e8MgJuN1FYS3tihBplPjMJD3UYRybRvHAvQh26BZ7Ch3JNSNST
+AL2l5T7JKU+XaWWeo+crV+AnGIJyqyh9Su/n97PEoZoEMGH4Kcl/n/w2Jms60+5s
+K0FK2OGNL42ddUfQiVL9CwYQQo70hydjsIo1x8S6+tSFLMAAysQEToSjfAA6qxDu
+fgGVMuIYHo0rSkpTVsHVwru08Z5o4m+XDAK0iHalZ4knKsO0lJ+9l7vFnQHlzwt7
+JTjDhnyOKWPIANeWf3PrHPWE7kKpFVBqFBzOvWLJuxDu5NlgLo1PFahsahTqB9bz
+qwUyMg/oYWnwqw==
+-----END CERTIFICATE-----
diff --git a/plugins/outputs/socket_writer/README.md b/plugins/outputs/socket_writer/README.md
index e8b5a0174..8e28c5f88 100644
--- a/plugins/outputs/socket_writer/README.md
+++ b/plugins/outputs/socket_writer/README.md
@@ -19,6 +19,13 @@ It can output data in any of the [supported output formats](https://github.com/i
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Period between keep alive probes.
   ## Only applies to TCP sockets.
   ## 0 disables keep alive probes.
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 503130c62..855df4a8f 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"strings"
 
+	"crypto/tls"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -13,8 +14,12 @@ import (
 )
 
 type SocketWriter struct {
-	Address         string
-	KeepAlivePeriod *internal.Duration
+	Address            string
+	KeepAlivePeriod    *internal.Duration
+	SSLCA              string
+	SSLCert            string
+	SSLKey             string
+	InsecureSkipVerify bool
 
 	serializers.Serializer
 
@@ -39,6 +44,13 @@ func (sw *SocketWriter) SampleConfig() string {
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
+  ## Optional SSL Config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  ## Use SSL but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Period between keep alive probes.
   ## Only applies to TCP sockets.
   ## 0 disables keep alive probes.
@@ -58,12 +70,26 @@ func (sw *SocketWriter) SetSerializer(s serializers.Serializer) {
 }
 
 func (sw *SocketWriter) Connect() error {
+	var (
+		c   net.Conn
+		err error
+	)
+
 	spl := strings.SplitN(sw.Address, "://", 2)
 	if len(spl) != 2 {
 		return fmt.Errorf("invalid address: %s", sw.Address)
 	}
 
-	c, err := net.Dial(spl[0], spl[1])
+	tlsCfg, err := internal.GetTLSConfig(sw.SSLCert, sw.SSLKey, sw.SSLCA, sw.InsecureSkipVerify)
+	if err != nil {
+		return err
+	}
+
+	if tlsCfg == nil {
+		c, err = net.Dial(spl[0], spl[1])
+	} else {
+		c, err = tls.Dial(spl[0], spl[1], tlsCfg)
+	}
 	if err != nil {
 		return err
 	}

From 058510464ceea6c7ae0b9ad255aed3fb1c5e44cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 17:03:18 -0700
Subject: [PATCH 1088/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0239a179..a0701f01e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
 - [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
 - [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
+- [#4021](https://github.com/influxdata/telegraf/pull/4021): Add TLS support to socket_writer and socket_listener plugins.
 
 ## v1.6.1 [unreleased]
 

From 9ef902f4a1ce52ad63f7a41545a0d4909de319d0 Mon Sep 17 00:00:00 2001
From: Matt <matt@theaddisons.us>
Date: Tue, 17 Apr 2018 20:34:39 -0400
Subject: [PATCH 1089/1302] Add snmp input option to strip non fixed length
 index suffixes (#4025)

---
 plugins/inputs/snmp/README.md    |  3 +++
 plugins/inputs/snmp/snmp.go      | 14 ++++++++++++++
 plugins/inputs/snmp/snmp_test.go |  7 +++++++
 3 files changed, 24 insertions(+)

diff --git a/plugins/inputs/snmp/README.md b/plugins/inputs/snmp/README.md
index 42181d6a8..dab28e9b0 100644
--- a/plugins/inputs/snmp/README.md
+++ b/plugins/inputs/snmp/README.md
@@ -141,6 +141,9 @@ OID to get. May be a numeric or textual OID.
 * `oid_index_suffix`:
 The OID sub-identifier to strip off so that the index can be matched against other fields in the table.
 
+* `oid_index_length`:
+Specifies the length of the index after the supplied table OID (in OID path segments). Truncates the index after this point to remove non-fixed value or length index suffixes.
+
 * `name`:
 Output field/tag name.
 If not specified, it defaults to the value of `oid`. If `oid` is numeric, an attempt to translate the numeric OID into a texual OID will be made.
diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 7d3cb7298..9dcce12ad 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -237,6 +237,8 @@ type Field struct {
 	Oid string
 	// OidIndexSuffix is the trailing sub-identifier on a table record OID that will be stripped off to get the record's index.
 	OidIndexSuffix string
+	// OidIndexLength specifies the length of the index in OID path segments. It can be used to remove sub-identifiers that vary in content or length.
+	OidIndexLength int
 	// IsTag controls whether this OID is output as a tag or a value.
 	IsTag bool
 	// Conversion controls any type conversion that is done on the value.
@@ -462,6 +464,18 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
 					}
 					idx = idx[:len(idx)-len(f.OidIndexSuffix)]
 				}
+				if f.OidIndexLength != 0 {
+					i := f.OidIndexLength + 1 // leading separator
+					idx = strings.Map(func(r rune) rune {
+						if r == '.' {
+							i -= 1
+						}
+						if i < 1 {
+							return -1
+						}
+						return r
+					}, idx)
+				}
 
 				fv, err := fieldConvert(f.Conversion, ent.Value)
 				if err != nil {
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index 497461485..6ab28c335 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -453,6 +453,11 @@ func TestTableBuild_walk(t *testing.T) {
 				Oid:            ".1.0.0.2.1.5",
 				OidIndexSuffix: ".9.9",
 			},
+			{
+				Name:           "myfield5",
+				Oid:            ".1.0.0.2.1.5",
+				OidIndexLength: 1,
+			},
 		},
 	}
 
@@ -469,6 +474,7 @@ func TestTableBuild_walk(t *testing.T) {
 			"myfield2": 1,
 			"myfield3": float64(0.123),
 			"myfield4": 11,
+			"myfield5": 11,
 		},
 	}
 	rtr2 := RTableRow{
@@ -480,6 +486,7 @@ func TestTableBuild_walk(t *testing.T) {
 			"myfield2": 2,
 			"myfield3": float64(0.456),
 			"myfield4": 22,
+			"myfield5": 22,
 		},
 	}
 	rtr3 := RTableRow{

From da5b46e7701e19d8dd518177cb96cd073b861448 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 17:36:35 -0700
Subject: [PATCH 1090/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0701f01e..86836b3bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#3819](https://github.com/influxdata/telegraf/pull/3819): Add per-host shard metrics in mongodb input.
 - [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
 - [#4021](https://github.com/influxdata/telegraf/pull/4021): Add TLS support to socket_writer and socket_listener plugins.
+- [#4025](https://github.com/influxdata/telegraf/pull/4025): Add snmp input option to strip non fixed length index suffixes.
 
 ## v1.6.1 [unreleased]
 

From 1486ae25c025706f915abe7638367453c878165a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 17:48:30 -0700
Subject: [PATCH 1091/1302] Tidy up last change to socket listener/writer

---
 plugins/inputs/socket_listener/socket_listener.go | 9 +--------
 plugins/outputs/socket_writer/socket_writer.go    | 7 ++-----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 011a1edb4..076e1f4b8 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"crypto/tls"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -338,14 +339,6 @@ func (uc unixCloser) Close() error {
 	return err
 }
 
-func (uc unixCloser) Accept() (net.Conn, error) {
-	return uc.closer.(net.Listener).Accept()
-}
-
-func (uc unixCloser) Addr() net.Addr {
-	return uc.closer.(net.Listener).Addr()
-}
-
 func init() {
 	inputs.Add("socket_listener", func() telegraf.Input { return newSocketListener() })
 }
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 855df4a8f..382aad266 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"crypto/tls"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -70,11 +71,6 @@ func (sw *SocketWriter) SetSerializer(s serializers.Serializer) {
 }
 
 func (sw *SocketWriter) Connect() error {
-	var (
-		c   net.Conn
-		err error
-	)
-
 	spl := strings.SplitN(sw.Address, "://", 2)
 	if len(spl) != 2 {
 		return fmt.Errorf("invalid address: %s", sw.Address)
@@ -85,6 +81,7 @@ func (sw *SocketWriter) Connect() error {
 		return err
 	}
 
+	var c net.Conn
 	if tlsCfg == nil {
 		c, err = net.Dial(spl[0], spl[1])
 	} else {

From dd2c60e6208602bc2024c6c10f81d7bc32d2eeba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Apr 2018 12:13:25 -0700
Subject: [PATCH 1092/1302] Fix graphite serialization of unsigned ints (#4033)

---
 plugins/serializers/graphite/graphite.go      | 44 ++++++++++++++-----
 plugins/serializers/graphite/graphite_test.go | 16 +++++++
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index ee390d17f..0f7fcd8f5 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -2,8 +2,10 @@ package graphite
 
 import (
 	"fmt"
+	"math"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/influxdata/telegraf"
@@ -43,20 +45,14 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	}
 
 	for fieldName, value := range metric.Fields() {
-		switch v := value.(type) {
-		case string:
+		fieldValue := formatValue(value)
+		if fieldValue == "" {
 			continue
-		case bool:
-			if v {
-				value = 1
-			} else {
-				value = 0
-			}
 		}
-		metricString := fmt.Sprintf("%s %#v %d\n",
+		metricString := fmt.Sprintf("%s %s %d\n",
 			// insert "field" section of template
 			sanitize(InsertField(bucket, fieldName)),
-			value,
+			fieldValue,
 			timestamp)
 		point := []byte(metricString)
 		out = append(out, point...)
@@ -64,6 +60,34 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	return out, nil
 }
 
+func formatValue(value interface{}) string {
+	switch v := value.(type) {
+	case string:
+		return ""
+	case bool:
+		if v {
+			return "1"
+		} else {
+			return "0"
+		}
+	case uint64:
+		return strconv.FormatUint(v, 10)
+	case int64:
+		return strconv.FormatInt(v, 10)
+	case float64:
+		if math.IsNaN(v) {
+			return ""
+		}
+
+		if math.IsInf(v, 0) {
+			return ""
+		}
+		return strconv.FormatFloat(v, 'f', -1, 64)
+	}
+
+	return ""
+}
+
 // SerializeBucketName will take the given measurement name and tags and
 // produce a graphite bucket. It will use the GraphiteSerializer.Template
 // to generate this, or DEFAULT_TEMPLATE.
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index 94792112f..e08f47593 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -218,6 +218,22 @@ func TestSerializeValueBoolean(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeValueUnsigned(t *testing.T) {
+	now := time.Unix(0, 0)
+	tags := map[string]string{}
+	fields := map[string]interface{}{
+		"free": uint64(42),
+	}
+	m, err := metric.New("mem", tags, fields, now)
+	require.NoError(t, err)
+
+	s := GraphiteSerializer{}
+	buf, err := s.Serialize(m)
+	require.NoError(t, err)
+
+	require.Equal(t, buf, []byte(".mem.free 42 0\n"))
+}
+
 // test that fields with spaces get fixed.
 func TestSerializeFieldWithSpaces(t *testing.T) {
 	now := time.Now()

From 571ce86d10f888797b18a3c12d0971b6871c9daf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Apr 2018 12:14:58 -0700
Subject: [PATCH 1093/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86836b3bf..3a394a74c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,9 @@
 ## v1.6.1 [unreleased]
 
 ### Bugfixes
+
 - [#3835](https://github.com/influxdata/telegraf/issues/3835): Report mem input fields as gauges instead counters.
+- [#4030](https://github.com/influxdata/telegraf/issues/4030): Fix graphite outputs unsigned integers in wrong format.
 
 ## v1.6 [2018-04-16]
 

From 78d4a95ce662d867e48ff2901a0702f1cf678096 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Apr 2018 16:14:06 -0700
Subject: [PATCH 1094/1302] Test using Go 1.8-1.10; official builds with 1.10
 (#4041)

---
 .circleci/config.yml                 | 83 +++++++++++++++++++++++-----
 appveyor.yml                         |  4 +-
 plugins/inputs/statsd/statsd_test.go | 14 ++---
 plugins/inputs/zipkin/zipkin.go      |  7 ++-
 plugins/inputs/zipkin/zipkin_test.go |  4 ++
 plugins/outputs/influxdb/udp_test.go |  2 +-
 6 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b55b22383..c4f376e0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,46 +1,101 @@
 ---
-defaults: &defaults
-  docker:
-    - image: 'circleci/golang:1.9.4'
-  working_directory: '/go/src/github.com/influxdata/telegraf'
+defaults:
+  defaults: &defaults
+    working_directory: '/go/src/github.com/influxdata/telegraf'
+  go-1_8: &go-1_8
+    docker:
+      - image: 'circleci/golang:1.8.7'
+  go-1_9: &go-1_9
+    docker:
+      - image: 'circleci/golang:1.9.5'
+  go-1_10: &go-1_10
+    docker:
+      - image: 'circleci/golang:1.10.1'
+
 version: 2
 jobs:
-  build:
-    <<: *defaults
+  deps:
+    <<: [ *defaults, *go-1_10 ]
     steps:
       - checkout
       - run: 'make deps'
+      - persist_to_workspace:
+          root: '/go/src'
+          paths:
+            - '*'
+  test-go-1.8:
+    <<: [ *defaults, *go-1_8 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'make test-ci'
+  test-go-1.9:
+    <<: [ *defaults, *go-1_9 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'make test-ci'
+  test-go-1.10:
+    <<: [ *defaults, *go-1_10 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
       - run: 'make test-ci'
   release:
-    <<: *defaults
+    <<: [ *defaults, *go-1_10 ]
     steps:
-      - checkout
+      - attach_workspace:
+          at: '/go/src'
       - run: './scripts/release.sh'
       - store_artifacts:
           path: './artifacts'
           destination: '.'
   nightly:
-    <<: *defaults
+    <<: [ *defaults, *go-1_10 ]
     steps:
-      - checkout
+      - attach_workspace:
+          at: '/go/src'
       - run: './scripts/release.sh'
       - store_artifacts:
           path: './artifacts'
           destination: '.'
+
 workflows:
   version: 2
   build_and_release:
     jobs:
-      - 'build'
+      - 'deps'
+      - 'test-go-1.8':
+          requires:
+            - 'deps'
+      - 'test-go-1.9':
+          requires:
+            - 'deps'
+      - 'test-go-1.10':
+          requires:
+            - 'deps'
       - 'release':
           requires:
-            - 'build'
+            - 'test-go-1.8'
+            - 'test-go-1.9'
+            - 'test-go-1.10'
   nightly:
     jobs:
-      - 'build'
+      - 'deps'
+      - 'test-go-1.8':
+          requires:
+            - 'deps'
+      - 'test-go-1.9':
+          requires:
+            - 'deps'
+      - 'test-go-1.9':
+          requires:
+            - 'deps'
       - 'nightly':
           requires:
-            - 'build'
+            - 'test-go-1.8'
+            - 'test-go-1.9'
+            - 'test-go-1.10'
     triggers:
       - schedule:
           cron: "0 18 * * *"
diff --git a/appveyor.yml b/appveyor.yml
index 91f86cbb5..7b464f6e0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,11 +13,11 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.9.4.msi" curl -o "C:\Cache\go1.9.4.msi" https://storage.googleapis.com/golang/go1.9.4.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.10.1.msi" curl -o "C:\Cache\go1.10.1.msi" https://storage.googleapis.com/golang/go1.10.1.windows-amd64.msi
   - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
   - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.9.4.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.10.1.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version
diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go
index a9161e5ba..3fbc45640 100644
--- a/plugins/inputs/statsd/statsd_test.go
+++ b/plugins/inputs/statsd/statsd_test.go
@@ -59,7 +59,7 @@ func TestConcurrentConns(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
+	time.Sleep(time.Millisecond * 250)
 	_, err := net.Dial("tcp", "127.0.0.1:8125")
 	assert.NoError(t, err)
 	_, err = net.Dial("tcp", "127.0.0.1:8125")
@@ -72,7 +72,7 @@ func TestConcurrentConns(t *testing.T) {
 	assert.NoError(t, err)
 	_, err = conn.Write([]byte(testMsg))
 	assert.NoError(t, err)
-	time.Sleep(time.Millisecond * 10)
+	time.Sleep(time.Millisecond * 100)
 	assert.Zero(t, acc.NFields())
 }
 
@@ -89,7 +89,7 @@ func TestConcurrentConns1(t *testing.T) {
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
-	time.Sleep(time.Millisecond * 25)
+	time.Sleep(time.Millisecond * 250)
 	_, err := net.Dial("tcp", "127.0.0.1:8125")
 	assert.NoError(t, err)
 
@@ -100,7 +100,7 @@ func TestConcurrentConns1(t *testing.T) {
 	assert.NoError(t, err)
 	_, err = conn.Write([]byte(testMsg))
 	assert.NoError(t, err)
-	time.Sleep(time.Millisecond * 10)
+	time.Sleep(time.Millisecond * 100)
 	assert.Zero(t, acc.NFields())
 }
 
@@ -116,7 +116,7 @@ func TestCloseConcurrentConns(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 
-	time.Sleep(time.Millisecond * 25)
+	time.Sleep(time.Millisecond * 250)
 	_, err := net.Dial("tcp", "127.0.0.1:8125")
 	assert.NoError(t, err)
 	_, err = net.Dial("tcp", "127.0.0.1:8125")
@@ -141,7 +141,7 @@ func BenchmarkUDP(b *testing.B) {
 			panic(err)
 		}
 
-		time.Sleep(time.Millisecond * 25)
+		time.Sleep(time.Millisecond * 250)
 		conn, err := net.Dial("udp", "127.0.0.1:8125")
 		if err != nil {
 			panic(err)
@@ -172,7 +172,7 @@ func BenchmarkTCP(b *testing.B) {
 			panic(err)
 		}
 
-		time.Sleep(time.Millisecond * 25)
+		time.Sleep(time.Millisecond * 250)
 		conn, err := net.Dial("tcp", "127.0.0.1:8125")
 		if err != nil {
 			panic(err)
diff --git a/plugins/inputs/zipkin/zipkin.go b/plugins/inputs/zipkin/zipkin.go
index 02d82fac0..18a63dccd 100644
--- a/plugins/inputs/zipkin/zipkin.go
+++ b/plugins/inputs/zipkin/zipkin.go
@@ -29,6 +29,11 @@ const (
 	DefaultShutdownTimeout = 5
 )
 
+var (
+	// DefaultNetwork is the network to listen on; use only in tests.
+	DefaultNetwork = "tcp"
+)
+
 // Recorder represents a type which can record zipkin trace data as well as
 // any accompanying errors, and process that data.
 type Recorder interface {
@@ -94,7 +99,7 @@ func (z *Zipkin) Start(acc telegraf.Accumulator) error {
 	}
 
 	addr := ":" + strconv.Itoa(z.Port)
-	ln, err := net.Listen("tcp", addr)
+	ln, err := net.Listen(DefaultNetwork, addr)
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/zipkin/zipkin_test.go b/plugins/inputs/zipkin/zipkin_test.go
index b14fb3aca..b71e5bf4e 100644
--- a/plugins/inputs/zipkin/zipkin_test.go
+++ b/plugins/inputs/zipkin/zipkin_test.go
@@ -557,6 +557,10 @@ func TestZipkinPlugin(t *testing.T) {
 		},
 	}
 
+	// Workaround for Go 1.8
+	// https://github.com/golang/go/issues/18806
+	DefaultNetwork = "tcp4"
+
 	z := &Zipkin{
 		Path: "/api/v1/spans",
 		Port: 0,
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
index 552e1c0d6..fd05c6905 100644
--- a/plugins/outputs/influxdb/udp_test.go
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -197,7 +197,7 @@ func TestUDP_SerializeError(t *testing.T) {
 }
 
 func TestUDP_WriteWithRealConn(t *testing.T) {
-	conn, err := net.ListenPacket("udp", ":0")
+	conn, err := net.ListenPacket("udp", "127.0.0.0:0")
 	require.NoError(t, err)
 
 	metrics := []telegraf.Metric{

From 9e4a330ee50fee0fab2f7290ff2641cc5e373fcb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Apr 2018 16:55:02 -0700
Subject: [PATCH 1095/1302] Update github.com/gorilla/mux version (#4042)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 7c504a0b8..16b46d792 100644
--- a/Godeps
+++ b/Godeps
@@ -26,7 +26,7 @@ github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
 github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
-github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea
+github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996
 github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478

From 120be7e87bd6809858bbb0d313f0fb602d5125cb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 18 Apr 2018 16:55:18 -0700
Subject: [PATCH 1096/1302] Report available fields if utmp is unreadable
 (#4043)

---
 plugins/inputs/system/SYSTEM_README.md | 37 ++++++++++++--------------
 plugins/inputs/system/system.go        | 29 +++++++++++---------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/plugins/inputs/system/SYSTEM_README.md b/plugins/inputs/system/SYSTEM_README.md
index 09290832c..bea9bd2d9 100644
--- a/plugins/inputs/system/SYSTEM_README.md
+++ b/plugins/inputs/system/SYSTEM_README.md
@@ -1,8 +1,7 @@
 # System Input Plugin
 
 The system plugin gathers general stats on system load, uptime,
-and number of users logged in. It is basically equivalent
-to the unix `uptime` command.
+and number of users logged in. It is similar to the unix `uptime` command.
 
 ### Configuration:
 
@@ -11,29 +10,27 @@ to the unix `uptime` command.
 [[inputs.system]]
   # no configuration
 ```
+#### Permissions:
 
-### Measurements & Fields:
+The `n_users` field requires read access to `/var/run/utmp`, and may require
+the `telegraf` user to be added to the `utmp` group on some systems.
+
+### Metrics:
 
 - system
-    - load1 (float)
-    - load15 (float)
-    - load5 (float)
-    - n_users (integer)
-    - n_cpus (integer)
-    - uptime (integer, seconds)
-    - uptime_format (string)
-
-### Tags:
-
-None
+  - fields:
+	- load1 (float)
+	- load15 (float)
+	- load5 (float)
+	- n_users (integer)
+	- n_cpus (integer)
+	- uptime (integer, seconds)
+	- uptime_format (string)
 
 ### Example Output:
 
 ```
-$ telegraf --config ~/ws/telegraf.conf --input-filter system --test
-* Plugin: system, Collection 1
-* Plugin: inputs.system, Collection 1
-> system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
-> system,host=tyrion uptime=1249632i 1483964144000000000
-> system,host=tyrion uptime_format="14 days, 11:07" 1483964144000000000
+system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
+system,host=tyrion uptime=1249632i 1483964144000000000
+system,host=tyrion uptime_format="14 days, 11:07" 1483964144000000000
 ```
diff --git a/plugins/inputs/system/system.go b/plugins/inputs/system/system.go
index 980e2fa38..fd204d6af 100644
--- a/plugins/inputs/system/system.go
+++ b/plugins/inputs/system/system.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"os"
 	"runtime"
 	"strings"
 
@@ -28,23 +29,27 @@ func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 
+	fields := map[string]interface{}{
+		"load1":  loadavg.Load1,
+		"load5":  loadavg.Load5,
+		"load15": loadavg.Load15,
+		"n_cpus": runtime.NumCPU(),
+	}
+
+	users, err := host.Users()
+	if err == nil {
+		fields["n_users"] = len(users)
+	} else if !os.IsPermission(err) {
+		return err
+	}
+
+	acc.AddGauge("system", fields, nil)
+
 	hostinfo, err := host.Info()
 	if err != nil {
 		return err
 	}
 
-	users, err := host.Users()
-	if err != nil {
-		return err
-	}
-
-	acc.AddGauge("system", map[string]interface{}{
-		"load1":   loadavg.Load1,
-		"load5":   loadavg.Load5,
-		"load15":  loadavg.Load15,
-		"n_users": len(users),
-		"n_cpus":  runtime.NumCPU(),
-	}, nil)
 	acc.AddCounter("system", map[string]interface{}{
 		"uptime": hostinfo.Uptime,
 	}, nil)

From 42fee824f89dfea69235f0be94566dfd653b73ff Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 18 Apr 2018 16:57:15 -0700
Subject: [PATCH 1097/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a394a74c..702e483b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 - [#3835](https://github.com/influxdata/telegraf/issues/3835): Report mem input fields as gauges instead counters.
 - [#4030](https://github.com/influxdata/telegraf/issues/4030): Fix graphite outputs unsigned integers in wrong format.
+- [#4043](https://github.com/influxdata/telegraf/issues/4043): Report available fields if utmp is unreadable.
 
 ## v1.6 [2018-04-16]
 

From 29b37e67c28eecc1a0cb9ae83db746d67addd290 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 19 Apr 2018 16:24:31 -0700
Subject: [PATCH 1098/1302] Allow metrics to be unserializable in influx.Reader
 (#4047)

Metrics that are unserializable will be logged at debug level, but the
rest of the batch will be sent.  Unserializable metrics can occur during
normal operation such as if you remove all fields from a metric or the
metric cannot fit within the line size limit.
---
 plugins/serializers/influx/influx.go      | 43 ++++++++++++-----
 plugins/serializers/influx/reader.go      | 26 +++++++++--
 plugins/serializers/influx/reader_test.go | 56 +++++++++++++++++++++++
 3 files changed, 108 insertions(+), 17 deletions(-)

diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 7d68ed3df..926bfcb34 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -2,8 +2,9 @@ package influx
 
 import (
 	"bytes"
-	"errors"
+	"fmt"
 	"io"
+	"log"
 	"math"
 	"sort"
 	"strconv"
@@ -26,14 +27,28 @@ const (
 	UintSupport FieldTypeSupport = 1 << iota
 )
 
+// MetricError is an error causing a metric to be unserializable.
+type MetricError struct {
+	s string
+}
+
+func (e MetricError) Error() string {
+	return e.s
+}
+
+// FieldError is an error causing a field to be unserializable.
+type FieldError struct {
+	s string
+}
+
+func (e FieldError) Error() string {
+	return e.s
+}
+
 var (
-	ErrNeedMoreSpace    = errors.New("need more space")
-	ErrInvalidName      = errors.New("invalid name")
-	ErrInvalidFieldKey  = errors.New("invalid field key")
-	ErrInvalidFieldType = errors.New("invalid field type")
-	ErrFieldIsNaN       = errors.New("is NaN")
-	ErrFieldIsInf       = errors.New("is Inf")
-	ErrNoFields         = errors.New("no fields")
+	ErrNeedMoreSpace = &MetricError{"need more space"}
+	ErrInvalidName   = &MetricError{"invalid name"}
+	ErrNoFields      = &MetricError{"no serializable fields"}
 )
 
 // Serializer is a serializer for line protocol.
@@ -148,7 +163,7 @@ func (s *Serializer) buildFieldPair(key string, value interface{}) error {
 	// Some keys are not encodeable as line protocol, such as those with a
 	// trailing '\' or empty strings.
 	if key == "" {
-		return ErrInvalidFieldKey
+		return &FieldError{"invalid field key"}
 	}
 
 	s.pair = append(s.pair, key...)
@@ -182,6 +197,9 @@ func (s *Serializer) writeMetric(w io.Writer, m telegraf.Metric) error {
 	for _, field := range m.FieldList() {
 		err = s.buildFieldPair(field.Key, field.Value)
 		if err != nil {
+			log.Printf(
+				"D! [serializers.influx] could not serialize field %q: %v; discarding field",
+				field.Key, err)
 			continue
 		}
 
@@ -262,11 +280,11 @@ func (s *Serializer) appendFieldValue(buf []byte, value interface{}) ([]byte, er
 		return appendIntField(buf, v), nil
 	case float64:
 		if math.IsNaN(v) {
-			return nil, ErrFieldIsNaN
+			return nil, &FieldError{"is NaN"}
 		}
 
 		if math.IsInf(v, 0) {
-			return nil, ErrFieldIsInf
+			return nil, &FieldError{"is Inf"}
 		}
 
 		return appendFloatField(buf, v), nil
@@ -274,8 +292,9 @@ func (s *Serializer) appendFieldValue(buf []byte, value interface{}) ([]byte, er
 		return appendStringField(buf, v), nil
 	case bool:
 		return appendBoolField(buf, v), nil
+	default:
+		return buf, &FieldError{fmt.Sprintf("invalid value type: %T", v)}
 	}
-	return buf, ErrInvalidFieldType
 }
 
 func appendUintField(buf []byte, value uint64) []byte {
diff --git a/plugins/serializers/influx/reader.go b/plugins/serializers/influx/reader.go
index 590e2fafd..4a755c88d 100644
--- a/plugins/serializers/influx/reader.go
+++ b/plugins/serializers/influx/reader.go
@@ -2,7 +2,9 @@ package influx
 
 import (
 	"bytes"
+	"fmt"
 	"io"
+	"log"
 
 	"github.com/influxdata/telegraf"
 )
@@ -47,11 +49,25 @@ func (r *reader) Read(p []byte) (int, error) {
 		return 0, io.EOF
 	}
 
-	_, err := r.serializer.Write(r.buf, r.metrics[r.offset])
-	r.offset += 1
-	if err != nil {
-		r.buf.Reset()
-		return 0, err
+	for _, metric := range r.metrics[r.offset:] {
+		_, err := r.serializer.Write(r.buf, metric)
+		r.offset += 1
+		if err != nil {
+			r.buf.Reset()
+			switch err.(type) {
+			case *MetricError:
+				// Since we are serializing an array of metrics, don't fail
+				// the entire batch just because of one unserializable metric.
+				log.Printf(
+					"D! [serializers.influx] could not serialize metric %q: %v; discarding metric",
+					metric.Name(), err)
+				continue
+			default:
+				fmt.Println(err)
+				return 0, err
+			}
+		}
+		break
 	}
 
 	return r.buf.Read(p)
diff --git a/plugins/serializers/influx/reader_test.go b/plugins/serializers/influx/reader_test.go
index 5dca21595..642b71b1c 100644
--- a/plugins/serializers/influx/reader_test.go
+++ b/plugins/serializers/influx/reader_test.go
@@ -83,6 +83,62 @@ func TestReader(t *testing.T) {
 			},
 			expected: []byte("cpu value=42 0\n"),
 		},
+		{
+			name:         "continue on failed metrics",
+			maxLineBytes: 4096,
+			bufferSize:   15,
+			input: []telegraf.Metric{
+				MustMetric(
+					metric.New(
+						"",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+			},
+			expected: []byte("cpu value=42 0\n"),
+		},
+		{
+			name:         "last metric failed regression",
+			maxLineBytes: 4096,
+			bufferSize:   15,
+			input: []telegraf.Metric{
+				MustMetric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+				MustMetric(
+					metric.New(
+						"",
+						map[string]string{},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						time.Unix(0, 0),
+					),
+				),
+			},
+			expected: []byte("cpu value=42 0\n"),
+		},
 	}
 
 	for _, tt := range tests {

From 00e3363d45fad18054cf147d5376f36edee0d014 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 19 Apr 2018 16:56:46 -0700
Subject: [PATCH 1099/1302] Add only valid field types in cassandra input
 (#4048)

---
 plugins/inputs/cassandra/cassandra.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index 7dabe3b1b..541edf16c 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type JolokiaClient interface {
@@ -60,7 +61,8 @@ func newCassandraMetric(host string, metric string,
 func addValuesAsFields(values map[string]interface{}, fields map[string]interface{},
 	mname string) {
 	for k, v := range values {
-		if v != nil {
+		switch v.(type) {
+		case int64, float64, string, bool:
 			fields[mname+"_"+k] = v
 		}
 	}
@@ -117,7 +119,7 @@ func (j javaMetric) addTagsFields(out map[string]interface{}) {
 		switch t := values.(type) {
 		case map[string]interface{}:
 			addValuesAsFields(values.(map[string]interface{}), fields, attribute)
-		case interface{}:
+		case int64, float64, string, bool:
 			fields[attribute] = t
 		}
 		j.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)

From 3a8ca4d08d475a31f8ff7f8e05079dd1b5f7db60 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 19 Apr 2018 16:58:59 -0700
Subject: [PATCH 1100/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 702e483b6..8f285ccf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#3835](https://github.com/influxdata/telegraf/issues/3835): Report mem input fields as gauges instead counters.
 - [#4030](https://github.com/influxdata/telegraf/issues/4030): Fix graphite outputs unsigned integers in wrong format.
 - [#4043](https://github.com/influxdata/telegraf/issues/4043): Report available fields if utmp is unreadable.
+- [#4039](https://github.com/influxdata/telegraf/issues/4039): Fix potential "no fields" error writing to outputs.
 
 ## v1.6 [2018-04-16]
 

From eacf11fcd8732c73246d9630bbe9ed2d829882b8 Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <lpic10@users.noreply.github.com>
Date: Fri, 20 Apr 2018 22:32:19 +0100
Subject: [PATCH 1101/1302] Update gopsutils to include fixes for #4037 and
 #3750 (#4045)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 16b46d792..79e0c98f4 100644
--- a/Godeps
+++ b/Godeps
@@ -66,7 +66,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil fc04d2dd9a512906a2604242b35275179e250eda
+github.com/shirou/gopsutil a5c2888e464b14fa882c2a059e0f95716bd45cf1
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From fe4d3cd1176c7bdb5ebddb4573fc9ede1668309c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 20 Apr 2018 14:56:28 -0700
Subject: [PATCH 1102/1302] Fix ints being capped at 32-bits on 32-bit archs
 (#4054)

---
 plugins/parsers/influx/parser_test.go     |  2 +-
 plugins/serializers/influx/influx.go      |  6 +++---
 plugins/serializers/influx/influx_test.go | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 594e6b766..a885a7712 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -282,7 +282,7 @@ var ptests = []struct {
 					"cpu",
 					map[string]string{},
 					map[string]interface{}{
-						"value": 9223372036854775807,
+						"value": int64(9223372036854775807),
 					},
 					time.Unix(42, 0),
 				),
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 926bfcb34..819701c2e 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -12,7 +12,7 @@ import (
 	"github.com/influxdata/telegraf"
 )
 
-const MaxInt = int(^uint(0) >> 1)
+const MaxInt64 = int64(^uint64(0) >> 1)
 
 type FieldSortOrder int
 
@@ -270,10 +270,10 @@ func (s *Serializer) appendFieldValue(buf []byte, value interface{}) ([]byte, er
 		if s.fieldTypeSupport&UintSupport != 0 {
 			return appendUintField(buf, v), nil
 		} else {
-			if v <= uint64(MaxInt) {
+			if v <= uint64(MaxInt64) {
 				return appendIntField(buf, int64(v)), nil
 			} else {
-				return appendIntField(buf, int64(MaxInt)), nil
+				return appendIntField(buf, int64(MaxInt64)), nil
 			}
 		}
 	case int64:
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index 655e9aaf9..dca56dcf7 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -129,6 +129,20 @@ var tests = []struct {
 		),
 		output: []byte("cpu value=42i 0\n"),
 	},
+	{
+		name: "integer field 64-bit",
+		input: MustMetric(
+			metric.New(
+				"cpu",
+				map[string]string{},
+				map[string]interface{}{
+					"value": int64(123456789012345),
+				},
+				time.Unix(0, 0),
+			),
+		),
+		output: []byte("cpu value=123456789012345i 0\n"),
+	},
 	{
 		name: "uint field",
 		input: MustMetric(

From 13937d511dc048f5159ff8f7b863cdce82bbf655 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 20 Apr 2018 15:05:39 -0700
Subject: [PATCH 1103/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f285ccf1..445569b38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@
 - [#4030](https://github.com/influxdata/telegraf/issues/4030): Fix graphite outputs unsigned integers in wrong format.
 - [#4043](https://github.com/influxdata/telegraf/issues/4043): Report available fields if utmp is unreadable.
 - [#4039](https://github.com/influxdata/telegraf/issues/4039): Fix potential "no fields" error writing to outputs.
+- [#4037](https://github.com/influxdata/telegraf/issues/4037): Fix uptime reporting in system input when ran inside docker.
+- [#3750](https://github.com/influxdata/telegraf/issues/3750): Fix mem input "cannot allocate memory" error on FreeBSD based systems.
 
 ## v1.6 [2018-04-16]
 

From 648d7ae92241c6b8d6fa33e0ab6955438b7cece3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 20 Apr 2018 15:10:22 -0700
Subject: [PATCH 1104/1302] Run 32-bit tests in CircleCI

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c4f376e0d..49bac606a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,7 @@ jobs:
       - attach_workspace:
           at: '/go/src'
       - run: 'make test-ci'
+      - run: 'GOARCH=386 make test-ci'
   release:
     <<: [ *defaults, *go-1_10 ]
     steps:

From ee9a2f73a1dd8cca607d11f546b7281b03b70452 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 20 Apr 2018 18:39:31 -0700
Subject: [PATCH 1105/1302] Fix duplicate tags when overriding tag (#4056)

---
 metric/metric.go      | 1 +
 metric/metric_test.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/metric/metric.go b/metric/metric.go
index 2c8fdb9c9..3249b56ad 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -123,6 +123,7 @@ func (m *metric) AddTag(key, value string) {
 
 		if key == tag.Key {
 			tag.Value = value
+			return
 		}
 
 		m.tags = append(m.tags, nil)
diff --git a/metric/metric_test.go b/metric/metric_test.go
index 1fecf2e44..47d44f3ef 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -63,6 +63,7 @@ func TestAddTagOverwrites(t *testing.T) {
 	value, ok := m.GetTag("host")
 	require.True(t, ok)
 	require.Equal(t, "example.org", value)
+	require.Equal(t, 1, len(m.TagList()))
 }
 
 func TestRemoveTagNoEffectOnMissingTags(t *testing.T) {

From 638853be05d64462fe3aec50defa87d4bcd53f89 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 20 Apr 2018 18:49:55 -0700
Subject: [PATCH 1106/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 445569b38..357010f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - [#4039](https://github.com/influxdata/telegraf/issues/4039): Fix potential "no fields" error writing to outputs.
 - [#4037](https://github.com/influxdata/telegraf/issues/4037): Fix uptime reporting in system input when ran inside docker.
 - [#3750](https://github.com/influxdata/telegraf/issues/3750): Fix mem input "cannot allocate memory" error on FreeBSD based systems.
+- [#4056](https://github.com/influxdata/telegraf/pull/4056): Fix duplicate tags when overriding an existing tag.
 
 ## v1.6 [2018-04-16]
 

From c7b3667ac4d0d4786c58e1172de5be7fe72ed379 Mon Sep 17 00:00:00 2001
From: Fred Cox <mcfedr@gmail.com>
Date: Mon, 23 Apr 2018 23:27:29 +0300
Subject: [PATCH 1107/1302] Add server argument as first argument in unbound
 input (#4062)

---
 plugins/inputs/unbound/unbound.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
index 6bed9ea75..798879664 100644
--- a/plugins/inputs/unbound/unbound.go
+++ b/plugins/inputs/unbound/unbound.go
@@ -87,7 +87,7 @@ func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Serv
 			server = server + "@" + port
 		}
 
-		cmdArgs = append(cmdArgs, "-s", server)
+		cmdArgs = append([]string{"-s", server}, cmdArgs...)
 	}
 
 	cmd := exec.Command(cmdName, cmdArgs...)
@@ -101,7 +101,7 @@ func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Serv
 	cmd.Stdout = &out
 	err := internal.RunTimeout(cmd, Timeout.Duration)
 	if err != nil {
-		return &out, fmt.Errorf("error running unbound-control: %s", err)
+		return &out, fmt.Errorf("error running unbound-control: %s (%s %v)", err, cmdName, cmdArgs)
 	}
 
 	return &out, nil

From bf0c59f56cd99e2feea687f6f78f895fa1d72742 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 23 Apr 2018 13:29:12 -0700
Subject: [PATCH 1108/1302] Return errors in mongodb SSL/TLS configuration
 (#4066)

---
 plugins/inputs/mongodb/mongodb.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index d53166479..e6b811e54 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -151,6 +151,9 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 		} else {
 			tlsConfig, err = internal.GetTLSConfig(
 				m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+			if err != nil {
+				return err
+			}
 		}
 
 		// If configured to use TLS, add a dial function

From a3500cc33a59266fd442cfe4cd7199569b9c0a4a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 23 Apr 2018 13:29:49 -0700
Subject: [PATCH 1109/1302] Fix handling of floats with multiple leading zeroes
 (#4065)

---
 plugins/parsers/influx/machine.go      | 30658 ++++++++++++-----------
 plugins/parsers/influx/machine.go.rl   |     2 +-
 plugins/parsers/influx/machine_test.go |    49 +
 3 files changed, 15712 insertions(+), 14997 deletions(-)

diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
index b4fd170a1..f2931096a 100644
--- a/plugins/parsers/influx/machine.go
+++ b/plugins/parsers/influx/machine.go
@@ -21,12 +21,12 @@ var (
 
 //line plugins/parsers/influx/machine.go:23
 const LineProtocol_start int = 1
-const LineProtocol_first_final int = 191
+const LineProtocol_first_final int = 199
 const LineProtocol_error int = 0
 
 const LineProtocol_en_main int = 1
-const LineProtocol_en_discard_line int = 187
-const LineProtocol_en_align int = 188
+const LineProtocol_en_discard_line int = 195
+const LineProtocol_en_align int = 196
 
 
 //line plugins/parsers/influx/machine.go.rl:227
@@ -133,30 +133,14 @@ _again:
 		goto st6
 	case 7:
 		goto st7
-	case 191:
-		goto st191
-	case 192:
-		goto st192
-	case 193:
-		goto st193
-	case 8:
-		goto st8
-	case 194:
-		goto st194
-	case 195:
-		goto st195
-	case 196:
-		goto st196
-	case 197:
-		goto st197
-	case 198:
-		goto st198
 	case 199:
 		goto st199
 	case 200:
 		goto st200
 	case 201:
 		goto st201
+	case 8:
+		goto st8
 	case 202:
 		goto st202
 	case 203:
@@ -181,22 +165,10 @@ _again:
 		goto st212
 	case 213:
 		goto st213
-	case 9:
-		goto st9
-	case 10:
-		goto st10
-	case 11:
-		goto st11
-	case 12:
-		goto st12
 	case 214:
 		goto st214
 	case 215:
 		goto st215
-	case 13:
-		goto st13
-	case 14:
-		goto st14
 	case 216:
 		goto st216
 	case 217:
@@ -209,34 +181,64 @@ _again:
 		goto st220
 	case 221:
 		goto st221
+	case 9:
+		goto st9
+	case 10:
+		goto st10
+	case 11:
+		goto st11
+	case 12:
+		goto st12
+	case 13:
+		goto st13
 	case 222:
 		goto st222
+	case 14:
+		goto st14
 	case 15:
 		goto st15
-	case 16:
-		goto st16
-	case 17:
-		goto st17
 	case 223:
 		goto st223
-	case 18:
-		goto st18
-	case 19:
-		goto st19
-	case 20:
-		goto st20
 	case 224:
 		goto st224
-	case 21:
-		goto st21
-	case 22:
-		goto st22
 	case 225:
 		goto st225
 	case 226:
 		goto st226
+	case 227:
+		goto st227
+	case 228:
+		goto st228
+	case 229:
+		goto st229
+	case 230:
+		goto st230
+	case 231:
+		goto st231
+	case 16:
+		goto st16
+	case 17:
+		goto st17
+	case 18:
+		goto st18
+	case 232:
+		goto st232
+	case 19:
+		goto st19
+	case 20:
+		goto st20
+	case 21:
+		goto st21
+	case 233:
+		goto st233
+	case 22:
+		goto st22
 	case 23:
 		goto st23
+	case 234:
+		goto st234
+	case 235:
+		goto st235
 	case 24:
 		goto st24
 	case 25:
@@ -273,30 +275,14 @@ _again:
 		goto st40
 	case 41:
 		goto st41
-	case 227:
-		goto st227
-	case 228:
-		goto st228
 	case 42:
 		goto st42
-	case 229:
-		goto st229
-	case 230:
-		goto st230
-	case 231:
-		goto st231
-	case 232:
-		goto st232
-	case 233:
-		goto st233
-	case 234:
-		goto st234
-	case 235:
-		goto st235
 	case 236:
 		goto st236
 	case 237:
 		goto st237
+	case 43:
+		goto st43
 	case 238:
 		goto st238
 	case 239:
@@ -319,14 +305,10 @@ _again:
 		goto st247
 	case 248:
 		goto st248
-	case 43:
-		goto st43
 	case 249:
 		goto st249
 	case 250:
 		goto st250
-	case 44:
-		goto st44
 	case 251:
 		goto st251
 	case 252:
@@ -341,10 +323,14 @@ _again:
 		goto st256
 	case 257:
 		goto st257
+	case 44:
+		goto st44
 	case 258:
 		goto st258
 	case 259:
 		goto st259
+	case 45:
+		goto st45
 	case 260:
 		goto st260
 	case 261:
@@ -367,32 +353,14 @@ _again:
 		goto st269
 	case 270:
 		goto st270
-	case 45:
-		goto st45
-	case 46:
-		goto st46
-	case 47:
-		goto st47
 	case 271:
 		goto st271
-	case 48:
-		goto st48
-	case 49:
-		goto st49
-	case 50:
-		goto st50
-	case 51:
-		goto st51
 	case 272:
 		goto st272
 	case 273:
 		goto st273
-	case 52:
-		goto st52
 	case 274:
 		goto st274
-	case 53:
-		goto st53
 	case 275:
 		goto st275
 	case 276:
@@ -403,46 +371,42 @@ _again:
 		goto st278
 	case 279:
 		goto st279
+	case 46:
+		goto st46
+	case 47:
+		goto st47
+	case 48:
+		goto st48
 	case 280:
 		goto st280
+	case 49:
+		goto st49
+	case 50:
+		goto st50
+	case 51:
+		goto st51
+	case 52:
+		goto st52
+	case 53:
+		goto st53
 	case 281:
 		goto st281
 	case 54:
 		goto st54
-	case 55:
-		goto st55
-	case 56:
-		goto st56
 	case 282:
 		goto st282
-	case 57:
-		goto st57
-	case 58:
-		goto st58
-	case 59:
-		goto st59
+	case 55:
+		goto st55
 	case 283:
 		goto st283
-	case 60:
-		goto st60
-	case 61:
-		goto st61
 	case 284:
 		goto st284
 	case 285:
 		goto st285
-	case 62:
-		goto st62
-	case 63:
-		goto st63
 	case 286:
 		goto st286
 	case 287:
 		goto st287
-	case 64:
-		goto st64
-	case 65:
-		goto st65
 	case 288:
 		goto st288
 	case 289:
@@ -451,48 +415,46 @@ _again:
 		goto st290
 	case 291:
 		goto st291
+	case 56:
+		goto st56
+	case 57:
+		goto st57
+	case 58:
+		goto st58
 	case 292:
 		goto st292
+	case 59:
+		goto st59
+	case 60:
+		goto st60
+	case 61:
+		goto st61
 	case 293:
 		goto st293
+	case 62:
+		goto st62
+	case 63:
+		goto st63
 	case 294:
 		goto st294
+	case 295:
+		goto st295
+	case 64:
+		goto st64
+	case 65:
+		goto st65
 	case 66:
 		goto st66
+	case 296:
+		goto st296
 	case 67:
 		goto st67
 	case 68:
 		goto st68
-	case 295:
-		goto st295
-	case 69:
-		goto st69
-	case 70:
-		goto st70
-	case 71:
-		goto st71
-	case 296:
-		goto st296
-	case 72:
-		goto st72
-	case 73:
-		goto st73
 	case 297:
 		goto st297
 	case 298:
 		goto st298
-	case 74:
-		goto st74
-	case 75:
-		goto st75
-	case 76:
-		goto st76
-	case 77:
-		goto st77
-	case 78:
-		goto st78
-	case 79:
-		goto st79
 	case 299:
 		goto st299
 	case 300:
@@ -501,24 +463,48 @@ _again:
 		goto st301
 	case 302:
 		goto st302
-	case 80:
-		goto st80
 	case 303:
 		goto st303
 	case 304:
 		goto st304
 	case 305:
 		goto st305
+	case 69:
+		goto st69
+	case 70:
+		goto st70
+	case 71:
+		goto st71
 	case 306:
 		goto st306
-	case 81:
-		goto st81
+	case 72:
+		goto st72
+	case 73:
+		goto st73
+	case 74:
+		goto st74
 	case 307:
 		goto st307
+	case 75:
+		goto st75
+	case 76:
+		goto st76
 	case 308:
 		goto st308
 	case 309:
 		goto st309
+	case 77:
+		goto st77
+	case 78:
+		goto st78
+	case 79:
+		goto st79
+	case 80:
+		goto st80
+	case 81:
+		goto st81
+	case 82:
+		goto st82
 	case 310:
 		goto st310
 	case 311:
@@ -527,6 +513,8 @@ _again:
 		goto st312
 	case 313:
 		goto st313
+	case 83:
+		goto st83
 	case 314:
 		goto st314
 	case 315:
@@ -535,6 +523,8 @@ _again:
 		goto st316
 	case 317:
 		goto st317
+	case 84:
+		goto st84
 	case 318:
 		goto st318
 	case 319:
@@ -549,12 +539,28 @@ _again:
 		goto st323
 	case 324:
 		goto st324
-	case 82:
-		goto st82
-	case 83:
-		goto st83
-	case 84:
-		goto st84
+	case 325:
+		goto st325
+	case 326:
+		goto st326
+	case 327:
+		goto st327
+	case 328:
+		goto st328
+	case 329:
+		goto st329
+	case 330:
+		goto st330
+	case 331:
+		goto st331
+	case 332:
+		goto st332
+	case 333:
+		goto st333
+	case 334:
+		goto st334
+	case 335:
+		goto st335
 	case 85:
 		goto st85
 	case 86:
@@ -575,34 +581,18 @@ _again:
 		goto st93
 	case 94:
 		goto st94
-	case 325:
-		goto st325
-	case 326:
-		goto st326
 	case 95:
 		goto st95
-	case 327:
-		goto st327
-	case 328:
-		goto st328
-	case 329:
-		goto st329
-	case 330:
-		goto st330
-	case 331:
-		goto st331
-	case 332:
-		goto st332
-	case 333:
-		goto st333
-	case 334:
-		goto st334
-	case 335:
-		goto st335
+	case 96:
+		goto st96
+	case 97:
+		goto st97
 	case 336:
 		goto st336
 	case 337:
 		goto st337
+	case 98:
+		goto st98
 	case 338:
 		goto st338
 	case 339:
@@ -621,16 +611,10 @@ _again:
 		goto st345
 	case 346:
 		goto st346
-	case 96:
-		goto st96
-	case 97:
-		goto st97
 	case 347:
 		goto st347
 	case 348:
 		goto st348
-	case 98:
-		goto st98
 	case 349:
 		goto st349
 	case 350:
@@ -649,10 +633,16 @@ _again:
 		goto st356
 	case 357:
 		goto st357
+	case 99:
+		goto st99
+	case 100:
+		goto st100
 	case 358:
 		goto st358
 	case 359:
 		goto st359
+	case 101:
+		goto st101
 	case 360:
 		goto st360
 	case 361:
@@ -671,28 +661,14 @@ _again:
 		goto st367
 	case 368:
 		goto st368
-	case 99:
-		goto st99
 	case 369:
 		goto st369
 	case 370:
 		goto st370
-	case 100:
-		goto st100
-	case 101:
-		goto st101
-	case 102:
-		goto st102
-	case 103:
-		goto st103
 	case 371:
 		goto st371
 	case 372:
 		goto st372
-	case 104:
-		goto st104
-	case 105:
-		goto st105
 	case 373:
 		goto st373
 	case 374:
@@ -707,38 +683,70 @@ _again:
 		goto st378
 	case 379:
 		goto st379
+	case 102:
+		goto st102
+	case 380:
+		goto st380
+	case 381:
+		goto st381
+	case 103:
+		goto st103
+	case 104:
+		goto st104
+	case 105:
+		goto st105
 	case 106:
 		goto st106
 	case 107:
 		goto st107
+	case 382:
+		goto st382
 	case 108:
 		goto st108
-	case 380:
-		goto st380
 	case 109:
 		goto st109
+	case 383:
+		goto st383
+	case 384:
+		goto st384
+	case 385:
+		goto st385
+	case 386:
+		goto st386
+	case 387:
+		goto st387
+	case 388:
+		goto st388
+	case 389:
+		goto st389
+	case 390:
+		goto st390
+	case 391:
+		goto st391
 	case 110:
 		goto st110
 	case 111:
 		goto st111
-	case 381:
-		goto st381
 	case 112:
 		goto st112
+	case 392:
+		goto st392
 	case 113:
 		goto st113
-	case 382:
-		goto st382
-	case 383:
-		goto st383
 	case 114:
 		goto st114
 	case 115:
 		goto st115
+	case 393:
+		goto st393
 	case 116:
 		goto st116
 	case 117:
 		goto st117
+	case 394:
+		goto st394
+	case 395:
+		goto st395
 	case 118:
 		goto st118
 	case 119:
@@ -755,38 +763,22 @@ _again:
 		goto st124
 	case 125:
 		goto st125
-	case 384:
-		goto st384
-	case 385:
-		goto st385
-	case 386:
-		goto st386
 	case 126:
 		goto st126
-	case 387:
-		goto st387
-	case 388:
-		goto st388
-	case 389:
-		goto st389
-	case 390:
-		goto st390
-	case 391:
-		goto st391
-	case 392:
-		goto st392
-	case 393:
-		goto st393
-	case 394:
-		goto st394
-	case 395:
-		goto st395
+	case 127:
+		goto st127
+	case 128:
+		goto st128
+	case 129:
+		goto st129
 	case 396:
 		goto st396
 	case 397:
 		goto st397
 	case 398:
 		goto st398
+	case 130:
+		goto st130
 	case 399:
 		goto st399
 	case 400:
@@ -807,8 +799,6 @@ _again:
 		goto st407
 	case 408:
 		goto st408
-	case 127:
-		goto st127
 	case 409:
 		goto st409
 	case 410:
@@ -817,8 +807,6 @@ _again:
 		goto st411
 	case 412:
 		goto st412
-	case 128:
-		goto st128
 	case 413:
 		goto st413
 	case 414:
@@ -835,6 +823,8 @@ _again:
 		goto st419
 	case 420:
 		goto st420
+	case 131:
+		goto st131
 	case 421:
 		goto st421
 	case 422:
@@ -843,6 +833,8 @@ _again:
 		goto st423
 	case 424:
 		goto st424
+	case 132:
+		goto st132
 	case 425:
 		goto st425
 	case 426:
@@ -859,18 +851,10 @@ _again:
 		goto st431
 	case 432:
 		goto st432
-	case 129:
-		goto st129
-	case 130:
-		goto st130
-	case 131:
-		goto st131
 	case 433:
 		goto st433
 	case 434:
 		goto st434
-	case 132:
-		goto st132
 	case 435:
 		goto st435
 	case 436:
@@ -891,10 +875,18 @@ _again:
 		goto st443
 	case 444:
 		goto st444
+	case 133:
+		goto st133
+	case 134:
+		goto st134
+	case 135:
+		goto st135
 	case 445:
 		goto st445
 	case 446:
 		goto st446
+	case 136:
+		goto st136
 	case 447:
 		goto st447
 	case 448:
@@ -911,16 +903,12 @@ _again:
 		goto st453
 	case 454:
 		goto st454
-	case 133:
-		goto st133
 	case 455:
 		goto st455
 	case 456:
 		goto st456
 	case 457:
 		goto st457
-	case 134:
-		goto st134
 	case 458:
 		goto st458
 	case 459:
@@ -939,12 +927,16 @@ _again:
 		goto st465
 	case 466:
 		goto st466
+	case 137:
+		goto st137
 	case 467:
 		goto st467
 	case 468:
 		goto st468
 	case 469:
 		goto st469
+	case 138:
+		goto st138
 	case 470:
 		goto st470
 	case 471:
@@ -965,8 +957,6 @@ _again:
 		goto st478
 	case 479:
 		goto st479
-	case 135:
-		goto st135
 	case 480:
 		goto st480
 	case 481:
@@ -991,6 +981,8 @@ _again:
 		goto st490
 	case 491:
 		goto st491
+	case 139:
+		goto st139
 	case 492:
 		goto st492
 	case 493:
@@ -1011,24 +1003,12 @@ _again:
 		goto st500
 	case 501:
 		goto st501
-	case 136:
-		goto st136
-	case 137:
-		goto st137
-	case 138:
-		goto st138
-	case 139:
-		goto st139
 	case 502:
 		goto st502
 	case 503:
 		goto st503
-	case 140:
-		goto st140
 	case 504:
 		goto st504
-	case 141:
-		goto st141
 	case 505:
 		goto st505
 	case 506:
@@ -1043,42 +1023,34 @@ _again:
 		goto st510
 	case 511:
 		goto st511
+	case 512:
+		goto st512
+	case 513:
+		goto st513
+	case 140:
+		goto st140
+	case 141:
+		goto st141
 	case 142:
 		goto st142
 	case 143:
 		goto st143
 	case 144:
 		goto st144
-	case 512:
-		goto st512
-	case 145:
-		goto st145
-	case 146:
-		goto st146
-	case 147:
-		goto st147
-	case 513:
-		goto st513
-	case 148:
-		goto st148
-	case 149:
-		goto st149
 	case 514:
 		goto st514
+	case 145:
+		goto st145
 	case 515:
 		goto st515
-	case 150:
-		goto st150
-	case 151:
-		goto st151
+	case 146:
+		goto st146
 	case 516:
 		goto st516
 	case 517:
 		goto st517
 	case 518:
 		goto st518
-	case 152:
-		goto st152
 	case 519:
 		goto st519
 	case 520:
@@ -1091,20 +1063,44 @@ _again:
 		goto st523
 	case 524:
 		goto st524
+	case 147:
+		goto st147
+	case 148:
+		goto st148
+	case 149:
+		goto st149
 	case 525:
 		goto st525
+	case 150:
+		goto st150
+	case 151:
+		goto st151
+	case 152:
+		goto st152
 	case 526:
 		goto st526
+	case 153:
+		goto st153
+	case 154:
+		goto st154
 	case 527:
 		goto st527
 	case 528:
 		goto st528
+	case 155:
+		goto st155
+	case 156:
+		goto st156
+	case 157:
+		goto st157
 	case 529:
 		goto st529
 	case 530:
 		goto st530
 	case 531:
 		goto st531
+	case 158:
+		goto st158
 	case 532:
 		goto st532
 	case 533:
@@ -1121,10 +1117,6 @@ _again:
 		goto st538
 	case 539:
 		goto st539
-	case 153:
-		goto st153
-	case 154:
-		goto st154
 	case 540:
 		goto st540
 	case 541:
@@ -1139,48 +1131,26 @@ _again:
 		goto st545
 	case 546:
 		goto st546
-	case 155:
-		goto st155
-	case 156:
-		goto st156
-	case 157:
-		goto st157
 	case 547:
 		goto st547
-	case 158:
-		goto st158
-	case 159:
-		goto st159
-	case 160:
-		goto st160
 	case 548:
 		goto st548
-	case 161:
-		goto st161
-	case 162:
-		goto st162
 	case 549:
 		goto st549
 	case 550:
 		goto st550
-	case 163:
-		goto st163
-	case 164:
-		goto st164
-	case 165:
-		goto st165
 	case 551:
 		goto st551
+	case 159:
+		goto st159
+	case 160:
+		goto st160
 	case 552:
 		goto st552
-	case 166:
-		goto st166
 	case 553:
 		goto st553
 	case 554:
 		goto st554
-	case 167:
-		goto st167
 	case 555:
 		goto st555
 	case 556:
@@ -1193,42 +1163,48 @@ _again:
 		goto st559
 	case 560:
 		goto st560
+	case 161:
+		goto st161
+	case 162:
+		goto st162
+	case 163:
+		goto st163
 	case 561:
 		goto st561
+	case 164:
+		goto st164
+	case 165:
+		goto st165
+	case 166:
+		goto st166
+	case 562:
+		goto st562
+	case 167:
+		goto st167
 	case 168:
 		goto st168
+	case 563:
+		goto st563
+	case 564:
+		goto st564
 	case 169:
 		goto st169
 	case 170:
 		goto st170
-	case 562:
-		goto st562
 	case 171:
 		goto st171
 	case 172:
 		goto st172
-	case 173:
-		goto st173
-	case 563:
-		goto st563
-	case 174:
-		goto st174
-	case 175:
-		goto st175
-	case 564:
-		goto st564
 	case 565:
 		goto st565
-	case 176:
-		goto st176
+	case 173:
+		goto st173
 	case 566:
 		goto st566
 	case 567:
 		goto st567
-	case 177:
-		goto st177
-	case 178:
-		goto st178
+	case 174:
+		goto st174
 	case 568:
 		goto st568
 	case 569:
@@ -1241,44 +1217,100 @@ _again:
 		goto st572
 	case 573:
 		goto st573
+	case 574:
+		goto st574
+	case 575:
+		goto st575
+	case 576:
+		goto st576
+	case 175:
+		goto st175
+	case 176:
+		goto st176
+	case 177:
+		goto st177
+	case 577:
+		goto st577
+	case 178:
+		goto st178
 	case 179:
 		goto st179
 	case 180:
 		goto st180
-	case 181:
-		goto st181
-	case 574:
-		goto st574
-	case 182:
-		goto st182
-	case 183:
-		goto st183
-	case 184:
-		goto st184
-	case 575:
-		goto st575
-	case 185:
-		goto st185
-	case 186:
-		goto st186
-	case 576:
-		goto st576
-	case 577:
-		goto st577
-	case 187:
-		goto st187
 	case 578:
 		goto st578
-	case 188:
-		goto st188
+	case 181:
+		goto st181
+	case 182:
+		goto st182
 	case 579:
 		goto st579
 	case 580:
 		goto st580
+	case 183:
+		goto st183
+	case 184:
+		goto st184
+	case 581:
+		goto st581
+	case 185:
+		goto st185
+	case 186:
+		goto st186
+	case 582:
+		goto st582
+	case 583:
+		goto st583
+	case 584:
+		goto st584
+	case 585:
+		goto st585
+	case 586:
+		goto st586
+	case 587:
+		goto st587
+	case 588:
+		goto st588
+	case 589:
+		goto st589
+	case 187:
+		goto st187
+	case 188:
+		goto st188
 	case 189:
 		goto st189
+	case 590:
+		goto st590
 	case 190:
 		goto st190
+	case 191:
+		goto st191
+	case 192:
+		goto st192
+	case 591:
+		goto st591
+	case 193:
+		goto st193
+	case 194:
+		goto st194
+	case 592:
+		goto st592
+	case 593:
+		goto st593
+	case 195:
+		goto st195
+	case 594:
+		goto st594
+	case 196:
+		goto st196
+	case 595:
+		goto st595
+	case 596:
+		goto st596
+	case 197:
+		goto st197
+	case 198:
+		goto st198
 	}
 
 	if ( m.p)++; ( m.p) == ( m.pe) {
@@ -1302,30 +1334,14 @@ _resume:
 		goto st_case_6
 	case 7:
 		goto st_case_7
-	case 191:
-		goto st_case_191
-	case 192:
-		goto st_case_192
-	case 193:
-		goto st_case_193
-	case 8:
-		goto st_case_8
-	case 194:
-		goto st_case_194
-	case 195:
-		goto st_case_195
-	case 196:
-		goto st_case_196
-	case 197:
-		goto st_case_197
-	case 198:
-		goto st_case_198
 	case 199:
 		goto st_case_199
 	case 200:
 		goto st_case_200
 	case 201:
 		goto st_case_201
+	case 8:
+		goto st_case_8
 	case 202:
 		goto st_case_202
 	case 203:
@@ -1350,22 +1366,10 @@ _resume:
 		goto st_case_212
 	case 213:
 		goto st_case_213
-	case 9:
-		goto st_case_9
-	case 10:
-		goto st_case_10
-	case 11:
-		goto st_case_11
-	case 12:
-		goto st_case_12
 	case 214:
 		goto st_case_214
 	case 215:
 		goto st_case_215
-	case 13:
-		goto st_case_13
-	case 14:
-		goto st_case_14
 	case 216:
 		goto st_case_216
 	case 217:
@@ -1378,34 +1382,64 @@ _resume:
 		goto st_case_220
 	case 221:
 		goto st_case_221
+	case 9:
+		goto st_case_9
+	case 10:
+		goto st_case_10
+	case 11:
+		goto st_case_11
+	case 12:
+		goto st_case_12
+	case 13:
+		goto st_case_13
 	case 222:
 		goto st_case_222
+	case 14:
+		goto st_case_14
 	case 15:
 		goto st_case_15
-	case 16:
-		goto st_case_16
-	case 17:
-		goto st_case_17
 	case 223:
 		goto st_case_223
-	case 18:
-		goto st_case_18
-	case 19:
-		goto st_case_19
-	case 20:
-		goto st_case_20
 	case 224:
 		goto st_case_224
-	case 21:
-		goto st_case_21
-	case 22:
-		goto st_case_22
 	case 225:
 		goto st_case_225
 	case 226:
 		goto st_case_226
+	case 227:
+		goto st_case_227
+	case 228:
+		goto st_case_228
+	case 229:
+		goto st_case_229
+	case 230:
+		goto st_case_230
+	case 231:
+		goto st_case_231
+	case 16:
+		goto st_case_16
+	case 17:
+		goto st_case_17
+	case 18:
+		goto st_case_18
+	case 232:
+		goto st_case_232
+	case 19:
+		goto st_case_19
+	case 20:
+		goto st_case_20
+	case 21:
+		goto st_case_21
+	case 233:
+		goto st_case_233
+	case 22:
+		goto st_case_22
 	case 23:
 		goto st_case_23
+	case 234:
+		goto st_case_234
+	case 235:
+		goto st_case_235
 	case 24:
 		goto st_case_24
 	case 25:
@@ -1442,30 +1476,14 @@ _resume:
 		goto st_case_40
 	case 41:
 		goto st_case_41
-	case 227:
-		goto st_case_227
-	case 228:
-		goto st_case_228
 	case 42:
 		goto st_case_42
-	case 229:
-		goto st_case_229
-	case 230:
-		goto st_case_230
-	case 231:
-		goto st_case_231
-	case 232:
-		goto st_case_232
-	case 233:
-		goto st_case_233
-	case 234:
-		goto st_case_234
-	case 235:
-		goto st_case_235
 	case 236:
 		goto st_case_236
 	case 237:
 		goto st_case_237
+	case 43:
+		goto st_case_43
 	case 238:
 		goto st_case_238
 	case 239:
@@ -1488,14 +1506,10 @@ _resume:
 		goto st_case_247
 	case 248:
 		goto st_case_248
-	case 43:
-		goto st_case_43
 	case 249:
 		goto st_case_249
 	case 250:
 		goto st_case_250
-	case 44:
-		goto st_case_44
 	case 251:
 		goto st_case_251
 	case 252:
@@ -1510,10 +1524,14 @@ _resume:
 		goto st_case_256
 	case 257:
 		goto st_case_257
+	case 44:
+		goto st_case_44
 	case 258:
 		goto st_case_258
 	case 259:
 		goto st_case_259
+	case 45:
+		goto st_case_45
 	case 260:
 		goto st_case_260
 	case 261:
@@ -1536,32 +1554,14 @@ _resume:
 		goto st_case_269
 	case 270:
 		goto st_case_270
-	case 45:
-		goto st_case_45
-	case 46:
-		goto st_case_46
-	case 47:
-		goto st_case_47
 	case 271:
 		goto st_case_271
-	case 48:
-		goto st_case_48
-	case 49:
-		goto st_case_49
-	case 50:
-		goto st_case_50
-	case 51:
-		goto st_case_51
 	case 272:
 		goto st_case_272
 	case 273:
 		goto st_case_273
-	case 52:
-		goto st_case_52
 	case 274:
 		goto st_case_274
-	case 53:
-		goto st_case_53
 	case 275:
 		goto st_case_275
 	case 276:
@@ -1572,46 +1572,42 @@ _resume:
 		goto st_case_278
 	case 279:
 		goto st_case_279
+	case 46:
+		goto st_case_46
+	case 47:
+		goto st_case_47
+	case 48:
+		goto st_case_48
 	case 280:
 		goto st_case_280
+	case 49:
+		goto st_case_49
+	case 50:
+		goto st_case_50
+	case 51:
+		goto st_case_51
+	case 52:
+		goto st_case_52
+	case 53:
+		goto st_case_53
 	case 281:
 		goto st_case_281
 	case 54:
 		goto st_case_54
-	case 55:
-		goto st_case_55
-	case 56:
-		goto st_case_56
 	case 282:
 		goto st_case_282
-	case 57:
-		goto st_case_57
-	case 58:
-		goto st_case_58
-	case 59:
-		goto st_case_59
+	case 55:
+		goto st_case_55
 	case 283:
 		goto st_case_283
-	case 60:
-		goto st_case_60
-	case 61:
-		goto st_case_61
 	case 284:
 		goto st_case_284
 	case 285:
 		goto st_case_285
-	case 62:
-		goto st_case_62
-	case 63:
-		goto st_case_63
 	case 286:
 		goto st_case_286
 	case 287:
 		goto st_case_287
-	case 64:
-		goto st_case_64
-	case 65:
-		goto st_case_65
 	case 288:
 		goto st_case_288
 	case 289:
@@ -1620,48 +1616,46 @@ _resume:
 		goto st_case_290
 	case 291:
 		goto st_case_291
+	case 56:
+		goto st_case_56
+	case 57:
+		goto st_case_57
+	case 58:
+		goto st_case_58
 	case 292:
 		goto st_case_292
+	case 59:
+		goto st_case_59
+	case 60:
+		goto st_case_60
+	case 61:
+		goto st_case_61
 	case 293:
 		goto st_case_293
+	case 62:
+		goto st_case_62
+	case 63:
+		goto st_case_63
 	case 294:
 		goto st_case_294
+	case 295:
+		goto st_case_295
+	case 64:
+		goto st_case_64
+	case 65:
+		goto st_case_65
 	case 66:
 		goto st_case_66
+	case 296:
+		goto st_case_296
 	case 67:
 		goto st_case_67
 	case 68:
 		goto st_case_68
-	case 295:
-		goto st_case_295
-	case 69:
-		goto st_case_69
-	case 70:
-		goto st_case_70
-	case 71:
-		goto st_case_71
-	case 296:
-		goto st_case_296
-	case 72:
-		goto st_case_72
-	case 73:
-		goto st_case_73
 	case 297:
 		goto st_case_297
 	case 298:
 		goto st_case_298
-	case 74:
-		goto st_case_74
-	case 75:
-		goto st_case_75
-	case 76:
-		goto st_case_76
-	case 77:
-		goto st_case_77
-	case 78:
-		goto st_case_78
-	case 79:
-		goto st_case_79
 	case 299:
 		goto st_case_299
 	case 300:
@@ -1670,24 +1664,48 @@ _resume:
 		goto st_case_301
 	case 302:
 		goto st_case_302
-	case 80:
-		goto st_case_80
 	case 303:
 		goto st_case_303
 	case 304:
 		goto st_case_304
 	case 305:
 		goto st_case_305
+	case 69:
+		goto st_case_69
+	case 70:
+		goto st_case_70
+	case 71:
+		goto st_case_71
 	case 306:
 		goto st_case_306
-	case 81:
-		goto st_case_81
+	case 72:
+		goto st_case_72
+	case 73:
+		goto st_case_73
+	case 74:
+		goto st_case_74
 	case 307:
 		goto st_case_307
+	case 75:
+		goto st_case_75
+	case 76:
+		goto st_case_76
 	case 308:
 		goto st_case_308
 	case 309:
 		goto st_case_309
+	case 77:
+		goto st_case_77
+	case 78:
+		goto st_case_78
+	case 79:
+		goto st_case_79
+	case 80:
+		goto st_case_80
+	case 81:
+		goto st_case_81
+	case 82:
+		goto st_case_82
 	case 310:
 		goto st_case_310
 	case 311:
@@ -1696,6 +1714,8 @@ _resume:
 		goto st_case_312
 	case 313:
 		goto st_case_313
+	case 83:
+		goto st_case_83
 	case 314:
 		goto st_case_314
 	case 315:
@@ -1704,6 +1724,8 @@ _resume:
 		goto st_case_316
 	case 317:
 		goto st_case_317
+	case 84:
+		goto st_case_84
 	case 318:
 		goto st_case_318
 	case 319:
@@ -1718,12 +1740,28 @@ _resume:
 		goto st_case_323
 	case 324:
 		goto st_case_324
-	case 82:
-		goto st_case_82
-	case 83:
-		goto st_case_83
-	case 84:
-		goto st_case_84
+	case 325:
+		goto st_case_325
+	case 326:
+		goto st_case_326
+	case 327:
+		goto st_case_327
+	case 328:
+		goto st_case_328
+	case 329:
+		goto st_case_329
+	case 330:
+		goto st_case_330
+	case 331:
+		goto st_case_331
+	case 332:
+		goto st_case_332
+	case 333:
+		goto st_case_333
+	case 334:
+		goto st_case_334
+	case 335:
+		goto st_case_335
 	case 85:
 		goto st_case_85
 	case 86:
@@ -1744,34 +1782,18 @@ _resume:
 		goto st_case_93
 	case 94:
 		goto st_case_94
-	case 325:
-		goto st_case_325
-	case 326:
-		goto st_case_326
 	case 95:
 		goto st_case_95
-	case 327:
-		goto st_case_327
-	case 328:
-		goto st_case_328
-	case 329:
-		goto st_case_329
-	case 330:
-		goto st_case_330
-	case 331:
-		goto st_case_331
-	case 332:
-		goto st_case_332
-	case 333:
-		goto st_case_333
-	case 334:
-		goto st_case_334
-	case 335:
-		goto st_case_335
+	case 96:
+		goto st_case_96
+	case 97:
+		goto st_case_97
 	case 336:
 		goto st_case_336
 	case 337:
 		goto st_case_337
+	case 98:
+		goto st_case_98
 	case 338:
 		goto st_case_338
 	case 339:
@@ -1790,16 +1812,10 @@ _resume:
 		goto st_case_345
 	case 346:
 		goto st_case_346
-	case 96:
-		goto st_case_96
-	case 97:
-		goto st_case_97
 	case 347:
 		goto st_case_347
 	case 348:
 		goto st_case_348
-	case 98:
-		goto st_case_98
 	case 349:
 		goto st_case_349
 	case 350:
@@ -1818,10 +1834,16 @@ _resume:
 		goto st_case_356
 	case 357:
 		goto st_case_357
+	case 99:
+		goto st_case_99
+	case 100:
+		goto st_case_100
 	case 358:
 		goto st_case_358
 	case 359:
 		goto st_case_359
+	case 101:
+		goto st_case_101
 	case 360:
 		goto st_case_360
 	case 361:
@@ -1840,28 +1862,14 @@ _resume:
 		goto st_case_367
 	case 368:
 		goto st_case_368
-	case 99:
-		goto st_case_99
 	case 369:
 		goto st_case_369
 	case 370:
 		goto st_case_370
-	case 100:
-		goto st_case_100
-	case 101:
-		goto st_case_101
-	case 102:
-		goto st_case_102
-	case 103:
-		goto st_case_103
 	case 371:
 		goto st_case_371
 	case 372:
 		goto st_case_372
-	case 104:
-		goto st_case_104
-	case 105:
-		goto st_case_105
 	case 373:
 		goto st_case_373
 	case 374:
@@ -1876,38 +1884,70 @@ _resume:
 		goto st_case_378
 	case 379:
 		goto st_case_379
+	case 102:
+		goto st_case_102
+	case 380:
+		goto st_case_380
+	case 381:
+		goto st_case_381
+	case 103:
+		goto st_case_103
+	case 104:
+		goto st_case_104
+	case 105:
+		goto st_case_105
 	case 106:
 		goto st_case_106
 	case 107:
 		goto st_case_107
+	case 382:
+		goto st_case_382
 	case 108:
 		goto st_case_108
-	case 380:
-		goto st_case_380
 	case 109:
 		goto st_case_109
+	case 383:
+		goto st_case_383
+	case 384:
+		goto st_case_384
+	case 385:
+		goto st_case_385
+	case 386:
+		goto st_case_386
+	case 387:
+		goto st_case_387
+	case 388:
+		goto st_case_388
+	case 389:
+		goto st_case_389
+	case 390:
+		goto st_case_390
+	case 391:
+		goto st_case_391
 	case 110:
 		goto st_case_110
 	case 111:
 		goto st_case_111
-	case 381:
-		goto st_case_381
 	case 112:
 		goto st_case_112
+	case 392:
+		goto st_case_392
 	case 113:
 		goto st_case_113
-	case 382:
-		goto st_case_382
-	case 383:
-		goto st_case_383
 	case 114:
 		goto st_case_114
 	case 115:
 		goto st_case_115
+	case 393:
+		goto st_case_393
 	case 116:
 		goto st_case_116
 	case 117:
 		goto st_case_117
+	case 394:
+		goto st_case_394
+	case 395:
+		goto st_case_395
 	case 118:
 		goto st_case_118
 	case 119:
@@ -1924,38 +1964,22 @@ _resume:
 		goto st_case_124
 	case 125:
 		goto st_case_125
-	case 384:
-		goto st_case_384
-	case 385:
-		goto st_case_385
-	case 386:
-		goto st_case_386
 	case 126:
 		goto st_case_126
-	case 387:
-		goto st_case_387
-	case 388:
-		goto st_case_388
-	case 389:
-		goto st_case_389
-	case 390:
-		goto st_case_390
-	case 391:
-		goto st_case_391
-	case 392:
-		goto st_case_392
-	case 393:
-		goto st_case_393
-	case 394:
-		goto st_case_394
-	case 395:
-		goto st_case_395
+	case 127:
+		goto st_case_127
+	case 128:
+		goto st_case_128
+	case 129:
+		goto st_case_129
 	case 396:
 		goto st_case_396
 	case 397:
 		goto st_case_397
 	case 398:
 		goto st_case_398
+	case 130:
+		goto st_case_130
 	case 399:
 		goto st_case_399
 	case 400:
@@ -1976,8 +2000,6 @@ _resume:
 		goto st_case_407
 	case 408:
 		goto st_case_408
-	case 127:
-		goto st_case_127
 	case 409:
 		goto st_case_409
 	case 410:
@@ -1986,8 +2008,6 @@ _resume:
 		goto st_case_411
 	case 412:
 		goto st_case_412
-	case 128:
-		goto st_case_128
 	case 413:
 		goto st_case_413
 	case 414:
@@ -2004,6 +2024,8 @@ _resume:
 		goto st_case_419
 	case 420:
 		goto st_case_420
+	case 131:
+		goto st_case_131
 	case 421:
 		goto st_case_421
 	case 422:
@@ -2012,6 +2034,8 @@ _resume:
 		goto st_case_423
 	case 424:
 		goto st_case_424
+	case 132:
+		goto st_case_132
 	case 425:
 		goto st_case_425
 	case 426:
@@ -2028,18 +2052,10 @@ _resume:
 		goto st_case_431
 	case 432:
 		goto st_case_432
-	case 129:
-		goto st_case_129
-	case 130:
-		goto st_case_130
-	case 131:
-		goto st_case_131
 	case 433:
 		goto st_case_433
 	case 434:
 		goto st_case_434
-	case 132:
-		goto st_case_132
 	case 435:
 		goto st_case_435
 	case 436:
@@ -2060,10 +2076,18 @@ _resume:
 		goto st_case_443
 	case 444:
 		goto st_case_444
+	case 133:
+		goto st_case_133
+	case 134:
+		goto st_case_134
+	case 135:
+		goto st_case_135
 	case 445:
 		goto st_case_445
 	case 446:
 		goto st_case_446
+	case 136:
+		goto st_case_136
 	case 447:
 		goto st_case_447
 	case 448:
@@ -2080,16 +2104,12 @@ _resume:
 		goto st_case_453
 	case 454:
 		goto st_case_454
-	case 133:
-		goto st_case_133
 	case 455:
 		goto st_case_455
 	case 456:
 		goto st_case_456
 	case 457:
 		goto st_case_457
-	case 134:
-		goto st_case_134
 	case 458:
 		goto st_case_458
 	case 459:
@@ -2108,12 +2128,16 @@ _resume:
 		goto st_case_465
 	case 466:
 		goto st_case_466
+	case 137:
+		goto st_case_137
 	case 467:
 		goto st_case_467
 	case 468:
 		goto st_case_468
 	case 469:
 		goto st_case_469
+	case 138:
+		goto st_case_138
 	case 470:
 		goto st_case_470
 	case 471:
@@ -2134,8 +2158,6 @@ _resume:
 		goto st_case_478
 	case 479:
 		goto st_case_479
-	case 135:
-		goto st_case_135
 	case 480:
 		goto st_case_480
 	case 481:
@@ -2160,6 +2182,8 @@ _resume:
 		goto st_case_490
 	case 491:
 		goto st_case_491
+	case 139:
+		goto st_case_139
 	case 492:
 		goto st_case_492
 	case 493:
@@ -2180,24 +2204,12 @@ _resume:
 		goto st_case_500
 	case 501:
 		goto st_case_501
-	case 136:
-		goto st_case_136
-	case 137:
-		goto st_case_137
-	case 138:
-		goto st_case_138
-	case 139:
-		goto st_case_139
 	case 502:
 		goto st_case_502
 	case 503:
 		goto st_case_503
-	case 140:
-		goto st_case_140
 	case 504:
 		goto st_case_504
-	case 141:
-		goto st_case_141
 	case 505:
 		goto st_case_505
 	case 506:
@@ -2212,42 +2224,34 @@ _resume:
 		goto st_case_510
 	case 511:
 		goto st_case_511
+	case 512:
+		goto st_case_512
+	case 513:
+		goto st_case_513
+	case 140:
+		goto st_case_140
+	case 141:
+		goto st_case_141
 	case 142:
 		goto st_case_142
 	case 143:
 		goto st_case_143
 	case 144:
 		goto st_case_144
-	case 512:
-		goto st_case_512
-	case 145:
-		goto st_case_145
-	case 146:
-		goto st_case_146
-	case 147:
-		goto st_case_147
-	case 513:
-		goto st_case_513
-	case 148:
-		goto st_case_148
-	case 149:
-		goto st_case_149
 	case 514:
 		goto st_case_514
+	case 145:
+		goto st_case_145
 	case 515:
 		goto st_case_515
-	case 150:
-		goto st_case_150
-	case 151:
-		goto st_case_151
+	case 146:
+		goto st_case_146
 	case 516:
 		goto st_case_516
 	case 517:
 		goto st_case_517
 	case 518:
 		goto st_case_518
-	case 152:
-		goto st_case_152
 	case 519:
 		goto st_case_519
 	case 520:
@@ -2260,20 +2264,44 @@ _resume:
 		goto st_case_523
 	case 524:
 		goto st_case_524
+	case 147:
+		goto st_case_147
+	case 148:
+		goto st_case_148
+	case 149:
+		goto st_case_149
 	case 525:
 		goto st_case_525
+	case 150:
+		goto st_case_150
+	case 151:
+		goto st_case_151
+	case 152:
+		goto st_case_152
 	case 526:
 		goto st_case_526
+	case 153:
+		goto st_case_153
+	case 154:
+		goto st_case_154
 	case 527:
 		goto st_case_527
 	case 528:
 		goto st_case_528
+	case 155:
+		goto st_case_155
+	case 156:
+		goto st_case_156
+	case 157:
+		goto st_case_157
 	case 529:
 		goto st_case_529
 	case 530:
 		goto st_case_530
 	case 531:
 		goto st_case_531
+	case 158:
+		goto st_case_158
 	case 532:
 		goto st_case_532
 	case 533:
@@ -2290,10 +2318,6 @@ _resume:
 		goto st_case_538
 	case 539:
 		goto st_case_539
-	case 153:
-		goto st_case_153
-	case 154:
-		goto st_case_154
 	case 540:
 		goto st_case_540
 	case 541:
@@ -2308,48 +2332,26 @@ _resume:
 		goto st_case_545
 	case 546:
 		goto st_case_546
-	case 155:
-		goto st_case_155
-	case 156:
-		goto st_case_156
-	case 157:
-		goto st_case_157
 	case 547:
 		goto st_case_547
-	case 158:
-		goto st_case_158
-	case 159:
-		goto st_case_159
-	case 160:
-		goto st_case_160
 	case 548:
 		goto st_case_548
-	case 161:
-		goto st_case_161
-	case 162:
-		goto st_case_162
 	case 549:
 		goto st_case_549
 	case 550:
 		goto st_case_550
-	case 163:
-		goto st_case_163
-	case 164:
-		goto st_case_164
-	case 165:
-		goto st_case_165
 	case 551:
 		goto st_case_551
+	case 159:
+		goto st_case_159
+	case 160:
+		goto st_case_160
 	case 552:
 		goto st_case_552
-	case 166:
-		goto st_case_166
 	case 553:
 		goto st_case_553
 	case 554:
 		goto st_case_554
-	case 167:
-		goto st_case_167
 	case 555:
 		goto st_case_555
 	case 556:
@@ -2362,42 +2364,48 @@ _resume:
 		goto st_case_559
 	case 560:
 		goto st_case_560
+	case 161:
+		goto st_case_161
+	case 162:
+		goto st_case_162
+	case 163:
+		goto st_case_163
 	case 561:
 		goto st_case_561
+	case 164:
+		goto st_case_164
+	case 165:
+		goto st_case_165
+	case 166:
+		goto st_case_166
+	case 562:
+		goto st_case_562
+	case 167:
+		goto st_case_167
 	case 168:
 		goto st_case_168
+	case 563:
+		goto st_case_563
+	case 564:
+		goto st_case_564
 	case 169:
 		goto st_case_169
 	case 170:
 		goto st_case_170
-	case 562:
-		goto st_case_562
 	case 171:
 		goto st_case_171
 	case 172:
 		goto st_case_172
-	case 173:
-		goto st_case_173
-	case 563:
-		goto st_case_563
-	case 174:
-		goto st_case_174
-	case 175:
-		goto st_case_175
-	case 564:
-		goto st_case_564
 	case 565:
 		goto st_case_565
-	case 176:
-		goto st_case_176
+	case 173:
+		goto st_case_173
 	case 566:
 		goto st_case_566
 	case 567:
 		goto st_case_567
-	case 177:
-		goto st_case_177
-	case 178:
-		goto st_case_178
+	case 174:
+		goto st_case_174
 	case 568:
 		goto st_case_568
 	case 569:
@@ -2410,44 +2418,100 @@ _resume:
 		goto st_case_572
 	case 573:
 		goto st_case_573
+	case 574:
+		goto st_case_574
+	case 575:
+		goto st_case_575
+	case 576:
+		goto st_case_576
+	case 175:
+		goto st_case_175
+	case 176:
+		goto st_case_176
+	case 177:
+		goto st_case_177
+	case 577:
+		goto st_case_577
+	case 178:
+		goto st_case_178
 	case 179:
 		goto st_case_179
 	case 180:
 		goto st_case_180
-	case 181:
-		goto st_case_181
-	case 574:
-		goto st_case_574
-	case 182:
-		goto st_case_182
-	case 183:
-		goto st_case_183
-	case 184:
-		goto st_case_184
-	case 575:
-		goto st_case_575
-	case 185:
-		goto st_case_185
-	case 186:
-		goto st_case_186
-	case 576:
-		goto st_case_576
-	case 577:
-		goto st_case_577
-	case 187:
-		goto st_case_187
 	case 578:
 		goto st_case_578
-	case 188:
-		goto st_case_188
+	case 181:
+		goto st_case_181
+	case 182:
+		goto st_case_182
 	case 579:
 		goto st_case_579
 	case 580:
 		goto st_case_580
+	case 183:
+		goto st_case_183
+	case 184:
+		goto st_case_184
+	case 581:
+		goto st_case_581
+	case 185:
+		goto st_case_185
+	case 186:
+		goto st_case_186
+	case 582:
+		goto st_case_582
+	case 583:
+		goto st_case_583
+	case 584:
+		goto st_case_584
+	case 585:
+		goto st_case_585
+	case 586:
+		goto st_case_586
+	case 587:
+		goto st_case_587
+	case 588:
+		goto st_case_588
+	case 589:
+		goto st_case_589
+	case 187:
+		goto st_case_187
+	case 188:
+		goto st_case_188
 	case 189:
 		goto st_case_189
+	case 590:
+		goto st_case_590
 	case 190:
 		goto st_case_190
+	case 191:
+		goto st_case_191
+	case 192:
+		goto st_case_192
+	case 591:
+		goto st_case_591
+	case 193:
+		goto st_case_193
+	case 194:
+		goto st_case_194
+	case 592:
+		goto st_case_592
+	case 593:
+		goto st_case_593
+	case 195:
+		goto st_case_195
+	case 594:
+		goto st_case_594
+	case 196:
+		goto st_case_196
+	case 595:
+		goto st_case_595
+	case 596:
+		goto st_case_596
+	case 197:
+		goto st_case_197
+	case 198:
+		goto st_case_198
 	}
 	goto st_out
 	st1:
@@ -2485,7 +2549,7 @@ tr0:
 			goto _test_eof2
 		}
 	st_case_2:
-//line plugins/parsers/influx/machine.go:2489
+//line plugins/parsers/influx/machine.go:2553
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2498,7 +2562,7 @@ tr0:
 		case 44:
 			goto tr7
 		case 92:
-			goto st129
+			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
@@ -2510,7 +2574,7 @@ tr4:
 	m.handler.SetMeasurement(m.text())
 
 	goto st3
-tr58:
+tr60:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -2521,7 +2585,7 @@ tr58:
 			goto _test_eof3
 		}
 	st_case_3:
-//line plugins/parsers/influx/machine.go:2525
+//line plugins/parsers/influx/machine.go:2589
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2553,7 +2617,7 @@ tr9:
 			goto _test_eof4
 		}
 	st_case_4:
-//line plugins/parsers/influx/machine.go:2557
+//line plugins/parsers/influx/machine.go:2621
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -2580,7 +2644,7 @@ tr1:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
@@ -2591,7 +2655,7 @@ tr5:
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2599,7 +2663,7 @@ tr5:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
@@ -2610,7 +2674,7 @@ tr31:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2618,18 +2682,18 @@ tr31:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr50:
+tr52:
 	 m.cs = 0
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2637,18 +2701,18 @@ tr50:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr59:
+tr61:
 	 m.cs = 0
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:35
@@ -2656,7 +2720,7 @@ tr59:
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2664,18 +2728,18 @@ tr59:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr99:
+tr101:
 	 m.cs = 0
 //line plugins/parsers/influx/machine.go.rl:35
 
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -2683,7 +2747,7 @@ tr99:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2691,18 +2755,18 @@ tr99:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr201:
+tr207:
 	 m.cs = 0
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:35
@@ -2710,7 +2774,7 @@ tr201:
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -2718,7 +2782,7 @@ tr201:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2726,18 +2790,18 @@ tr201:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr210:
+tr216:
 	 m.cs = 0
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -2745,7 +2809,7 @@ tr210:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -2753,11 +2817,11 @@ tr210:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++; goto _out }
 
 	goto _again
-//line plugins/parsers/influx/machine.go:2761
+//line plugins/parsers/influx/machine.go:2825
 st_case_0:
 	st0:
 		 m.cs = 0
@@ -2773,7 +2837,7 @@ tr14:
 			goto _test_eof5
 		}
 	st_case_5:
-//line plugins/parsers/influx/machine.go:2777
+//line plugins/parsers/influx/machine.go:2841
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st6
@@ -2824,7 +2888,7 @@ tr25:
 			goto _test_eof7
 		}
 	st_case_7:
-//line plugins/parsers/influx/machine.go:2828
+//line plugins/parsers/influx/machine.go:2892
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2846,93 +2910,93 @@ tr26:
 
 	m.handler.AddString(key, m.text())
 
-	goto st191
+	goto st199
 tr29:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st191
-	st191:
+	goto st199
+	st199:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof191
+			goto _test_eof199
 		}
-	st_case_191:
-//line plugins/parsers/influx/machine.go:2862
+	st_case_199:
+//line plugins/parsers/influx/machine.go:2926
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr346
 		case 13:
-			goto tr330
+			goto tr346
 		case 32:
-			goto st192
+			goto st200
 		case 44:
 			goto st9
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st192
+			goto st200
 		}
-		goto tr99
-tr355:
+		goto tr101
+tr371:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st192
-tr361:
+	goto st200
+tr377:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
-	goto st192
-tr365:
+	goto st200
+tr381:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
-	goto st192
-tr369:
+	goto st200
+tr385:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st192
-	st192:
+	goto st200
+	st200:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof192
+			goto _test_eof200
 		}
-	st_case_192:
-//line plugins/parsers/influx/machine.go:2906
+	st_case_200:
+//line plugins/parsers/influx/machine.go:2970
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr346
 		case 13:
-			goto tr330
+			goto tr346
 		case 32:
-			goto st192
+			goto st200
 		case 45:
-			goto tr332
+			goto tr348
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr333
+				goto tr349
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st192
+			goto st200
 		}
 		goto tr31
-tr330:
-	 m.cs = 193
+tr346:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr335:
-	 m.cs = 193
+tr351:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
@@ -2940,12 +3004,12 @@ tr335:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr356:
-	 m.cs = 193
+tr372:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
@@ -2953,12 +3017,12 @@ tr356:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr362:
-	 m.cs = 193
+tr378:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -2966,12 +3030,12 @@ tr362:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr366:
-	 m.cs = 193
+tr382:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
@@ -2979,12 +3043,12 @@ tr366:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-tr370:
-	 m.cs = 193
+tr386:
+	 m.cs = 201
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -2992,18 +3056,18 @@ tr370:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++; goto _out }
 
 	goto _again
-	st193:
+	st201:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof193
+			goto _test_eof201
 		}
-	st_case_193:
-//line plugins/parsers/influx/machine.go:3005
+	st_case_201:
+//line plugins/parsers/influx/machine.go:3069
 		goto tr1
-tr332:
+tr348:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -3014,230 +3078,30 @@ tr332:
 			goto _test_eof8
 		}
 	st_case_8:
-//line plugins/parsers/influx/machine.go:3018
+//line plugins/parsers/influx/machine.go:3082
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st194
+			goto st202
 		}
 		goto tr31
-tr333:
+tr349:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st194
-	st194:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof194
-		}
-	st_case_194:
-//line plugins/parsers/influx/machine.go:3034
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st196
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-tr334:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st195
-	st195:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof195
-		}
-	st_case_195:
-//line plugins/parsers/influx/machine.go:3063
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto tr1
-	st196:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof196
-		}
-	st_case_196:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st197
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st197:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof197
-		}
-	st_case_197:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st198
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st198:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof198
-		}
-	st_case_198:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st199
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st199:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof199
-		}
-	st_case_199:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st200
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st200:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof200
-		}
-	st_case_200:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st201
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st201:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof201
-		}
-	st_case_201:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st202
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
+	goto st202
 	st202:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof202
 		}
 	st_case_202:
+//line plugins/parsers/influx/machine.go:3098
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st203
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto tr31
-	st203:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof203
-		}
-	st_case_203:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3245,9 +3109,33 @@ tr334:
 				goto st204
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
+tr350:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st203
+	st203:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof203
+		}
+	st_case_203:
+//line plugins/parsers/influx/machine.go:3127
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 13:
+			goto tr346
+		case 32:
+			goto st203
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st203
+		}
+		goto tr1
 	st204:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof204
@@ -3255,11 +3143,11 @@ tr334:
 	st_case_204:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3267,7 +3155,7 @@ tr334:
 				goto st205
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st205:
@@ -3277,11 +3165,11 @@ tr334:
 	st_case_205:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3289,7 +3177,7 @@ tr334:
 				goto st206
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st206:
@@ -3299,11 +3187,11 @@ tr334:
 	st_case_206:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3311,7 +3199,7 @@ tr334:
 				goto st207
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st207:
@@ -3321,11 +3209,11 @@ tr334:
 	st_case_207:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3333,7 +3221,7 @@ tr334:
 				goto st208
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st208:
@@ -3343,11 +3231,11 @@ tr334:
 	st_case_208:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3355,7 +3243,7 @@ tr334:
 				goto st209
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st209:
@@ -3365,11 +3253,11 @@ tr334:
 	st_case_209:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3377,7 +3265,7 @@ tr334:
 				goto st210
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st210:
@@ -3387,11 +3275,11 @@ tr334:
 	st_case_210:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3399,7 +3287,7 @@ tr334:
 				goto st211
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st211:
@@ -3409,11 +3297,11 @@ tr334:
 	st_case_211:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3421,7 +3309,7 @@ tr334:
 				goto st212
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st212:
@@ -3431,11 +3319,11 @@ tr334:
 	st_case_212:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3443,7 +3331,7 @@ tr334:
 				goto st213
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto tr31
 	st213:
@@ -3453,35 +3341,211 @@ tr334:
 	st_case_213:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr334
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st214
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
 		goto tr31
-tr357:
+	st214:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof214
+		}
+	st_case_214:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st215
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st215:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof215
+		}
+	st_case_215:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st216
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st216:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof216
+		}
+	st_case_216:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st217
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st217:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof217
+		}
+	st_case_217:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st218
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st218:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof218
+		}
+	st_case_218:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st219
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st219:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof219
+		}
+	st_case_219:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st220
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st220:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof220
+		}
+	st_case_220:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st221
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto tr31
+	st221:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof221
+		}
+	st_case_221:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr350
+		}
+		goto tr31
+tr373:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st9
-tr363:
+tr379:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st9
-tr367:
+tr383:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st9
-tr371:
+tr387:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -3492,7 +3556,7 @@ tr371:
 			goto _test_eof9
 		}
 	st_case_9:
-//line plugins/parsers/influx/machine.go:3496
+//line plugins/parsers/influx/machine.go:3560
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -3523,7 +3587,7 @@ tr12:
 			goto _test_eof10
 		}
 	st_case_10:
-//line plugins/parsers/influx/machine.go:3527
+//line plugins/parsers/influx/machine.go:3591
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -3544,7 +3608,7 @@ tr27:
 			goto _test_eof11
 		}
 	st_case_11:
-//line plugins/parsers/influx/machine.go:3548
+//line plugins/parsers/influx/machine.go:3612
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st7
@@ -3563,327 +3627,84 @@ tr17:
 			goto _test_eof12
 		}
 	st_case_12:
-//line plugins/parsers/influx/machine.go:3567
-		if ( m.data)[( m.p)] == 48 {
-			goto st214
+//line plugins/parsers/influx/machine.go:3631
+		switch ( m.data)[( m.p)] {
+		case 46:
+			goto st13
+		case 48:
+			goto st224
 		}
 		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st218
+			goto st227
 		}
 		goto tr5
-	st214:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof214
-		}
-	st_case_214:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		case 46:
-			goto st215
-		case 69:
-			goto st13
-		case 101:
-			goto st13
-		case 105:
-			goto st217
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr355
-		}
-		goto tr99
 tr18:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st215
-	st215:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof215
-		}
-	st_case_215:
-//line plugins/parsers/influx/machine.go:3613
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		case 69:
-			goto st13
-		case 101:
-			goto st13
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st215
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr355
-		}
-		goto tr99
+	goto st13
 	st13:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof13
 		}
 	st_case_13:
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st14
-		case 43:
-			goto st14
-		case 45:
-			goto st14
-		}
+//line plugins/parsers/influx/machine.go:3653
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st216
+			goto st222
 		}
 		goto tr5
-	st14:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof14
-		}
-	st_case_14:
-		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st216
-		}
-		goto tr5
-	st216:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof216
-		}
-	st_case_216:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st216
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr355
-		}
-		goto tr99
-	st217:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof217
-		}
-	st_case_217:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
-		case 13:
-			goto tr362
-		case 32:
-			goto tr361
-		case 44:
-			goto tr363
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr361
-		}
-		goto tr99
-	st218:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof218
-		}
-	st_case_218:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		case 46:
-			goto st215
-		case 69:
-			goto st13
-		case 101:
-			goto st13
-		case 105:
-			goto st217
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st218
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr355
-		}
-		goto tr99
-tr19:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st219
-	st219:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof219
-		}
-	st_case_219:
-//line plugins/parsers/influx/machine.go:3749
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		case 46:
-			goto st215
-		case 69:
-			goto st13
-		case 101:
-			goto st13
-		case 105:
-			goto st217
-		case 117:
-			goto st220
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr355
-		}
-		goto tr99
-	st220:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof220
-		}
-	st_case_220:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr366
-		case 13:
-			goto tr366
-		case 32:
-			goto tr365
-		case 44:
-			goto tr367
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr365
-		}
-		goto tr99
-tr20:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st221
-	st221:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof221
-		}
-	st_case_221:
-//line plugins/parsers/influx/machine.go:3804
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 13:
-			goto tr356
-		case 32:
-			goto tr355
-		case 44:
-			goto tr357
-		case 46:
-			goto st215
-		case 69:
-			goto st13
-		case 101:
-			goto st13
-		case 105:
-			goto st217
-		case 117:
-			goto st220
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st221
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr355
-		}
-		goto tr99
-tr21:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st222
 	st222:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof222
 		}
 	st_case_222:
-//line plugins/parsers/influx/machine.go:3845
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr372
 		case 13:
-			goto tr370
+			goto tr372
 		case 32:
-			goto tr369
-		case 44:
 			goto tr371
-		case 65:
+		case 44:
+			goto tr373
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st222
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+	st14:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof14
+		}
+	st_case_14:
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st15
+		case 43:
+			goto st15
+		case 45:
 			goto st15
-		case 97:
-			goto st18
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr369
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+			goto st223
 		}
-		goto tr99
+		goto tr5
 	st15:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof15
 		}
 	st_case_15:
-		if ( m.data)[( m.p)] == 76 {
-			goto st16
-		}
-		goto tr5
-	st16:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof16
-		}
-	st_case_16:
-		if ( m.data)[( m.p)] == 83 {
-			goto st17
-		}
-		goto tr5
-	st17:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof17
-		}
-	st_case_17:
-		if ( m.data)[( m.p)] == 69 {
+		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 			goto st223
 		}
 		goto tr5
@@ -3894,33 +3715,319 @@ tr21:
 	st_case_223:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr372
 		case 13:
-			goto tr370
+			goto tr372
 		case 32:
-			goto tr369
+			goto tr371
 		case 44:
+			goto tr373
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st223
+			}
+		case ( m.data)[( m.p)] >= 9:
 			goto tr371
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr369
+		goto tr101
+	st224:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof224
 		}
-		goto tr99
+	st_case_224:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 13:
+			goto tr372
+		case 32:
+			goto tr371
+		case 44:
+			goto tr373
+		case 46:
+			goto st222
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st226
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st225
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+	st225:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof225
+		}
+	st_case_225:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 13:
+			goto tr372
+		case 32:
+			goto tr371
+		case 44:
+			goto tr373
+		case 46:
+			goto st222
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st225
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+	st226:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof226
+		}
+	st_case_226:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr378
+		case 13:
+			goto tr378
+		case 32:
+			goto tr377
+		case 44:
+			goto tr379
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr377
+		}
+		goto tr101
+	st227:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof227
+		}
+	st_case_227:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 13:
+			goto tr372
+		case 32:
+			goto tr371
+		case 44:
+			goto tr373
+		case 46:
+			goto st222
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st226
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st227
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+tr19:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st228
+	st228:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof228
+		}
+	st_case_228:
+//line plugins/parsers/influx/machine.go:3860
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 13:
+			goto tr372
+		case 32:
+			goto tr371
+		case 44:
+			goto tr373
+		case 46:
+			goto st222
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st226
+		case 117:
+			goto st229
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st225
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+	st229:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof229
+		}
+	st_case_229:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr382
+		case 13:
+			goto tr382
+		case 32:
+			goto tr381
+		case 44:
+			goto tr383
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr381
+		}
+		goto tr101
+tr20:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st230
+	st230:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof230
+		}
+	st_case_230:
+//line plugins/parsers/influx/machine.go:3920
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 13:
+			goto tr372
+		case 32:
+			goto tr371
+		case 44:
+			goto tr373
+		case 46:
+			goto st222
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st226
+		case 117:
+			goto st229
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st230
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr371
+		}
+		goto tr101
+tr21:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st231
+	st231:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof231
+		}
+	st_case_231:
+//line plugins/parsers/influx/machine.go:3961
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 13:
+			goto tr386
+		case 32:
+			goto tr385
+		case 44:
+			goto tr387
+		case 65:
+			goto st16
+		case 97:
+			goto st19
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr385
+		}
+		goto tr101
+	st16:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof16
+		}
+	st_case_16:
+		if ( m.data)[( m.p)] == 76 {
+			goto st17
+		}
+		goto tr5
+	st17:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof17
+		}
+	st_case_17:
+		if ( m.data)[( m.p)] == 83 {
+			goto st18
+		}
+		goto tr5
 	st18:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof18
 		}
 	st_case_18:
-		if ( m.data)[( m.p)] == 108 {
-			goto st19
+		if ( m.data)[( m.p)] == 69 {
+			goto st232
 		}
 		goto tr5
+	st232:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof232
+		}
+	st_case_232:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 13:
+			goto tr386
+		case 32:
+			goto tr385
+		case 44:
+			goto tr387
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr385
+		}
+		goto tr101
 	st19:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof19
 		}
 	st_case_19:
-		if ( m.data)[( m.p)] == 115 {
+		if ( m.data)[( m.p)] == 108 {
 			goto st20
 		}
 		goto tr5
@@ -3929,8 +4036,17 @@ tr21:
 			goto _test_eof20
 		}
 	st_case_20:
+		if ( m.data)[( m.p)] == 115 {
+			goto st21
+		}
+		goto tr5
+	st21:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof21
+		}
+	st_case_21:
 		if ( m.data)[( m.p)] == 101 {
-			goto st223
+			goto st232
 		}
 		goto tr5
 tr22:
@@ -3938,47 +4054,47 @@ tr22:
 
 	m.pb = m.p
 
-	goto st224
-	st224:
+	goto st233
+	st233:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof224
+			goto _test_eof233
 		}
-	st_case_224:
-//line plugins/parsers/influx/machine.go:3948
+	st_case_233:
+//line plugins/parsers/influx/machine.go:4064
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr369
+			goto tr385
 		case 44:
-			goto tr371
+			goto tr387
 		case 82:
-			goto st21
-		case 114:
 			goto st22
+		case 114:
+			goto st23
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr369
+			goto tr385
 		}
-		goto tr99
-	st21:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof21
-		}
-	st_case_21:
-		if ( m.data)[( m.p)] == 85 {
-			goto st17
-		}
-		goto tr5
+		goto tr101
 	st22:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof22
 		}
 	st_case_22:
+		if ( m.data)[( m.p)] == 85 {
+			goto st18
+		}
+		goto tr5
+	st23:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof23
+		}
+	st_case_23:
 		if ( m.data)[( m.p)] == 117 {
-			goto st20
+			goto st21
 		}
 		goto tr5
 tr23:
@@ -3986,69 +4102,69 @@ tr23:
 
 	m.pb = m.p
 
-	goto st225
-	st225:
+	goto st234
+	st234:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof225
+			goto _test_eof234
 		}
-	st_case_225:
-//line plugins/parsers/influx/machine.go:3996
+	st_case_234:
+//line plugins/parsers/influx/machine.go:4112
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr369
+			goto tr385
 		case 44:
-			goto tr371
+			goto tr387
 		case 97:
-			goto st18
+			goto st19
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr369
+			goto tr385
 		}
-		goto tr99
+		goto tr101
 tr24:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st226
-	st226:
+	goto st235
+	st235:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof226
+			goto _test_eof235
 		}
-	st_case_226:
-//line plugins/parsers/influx/machine.go:4024
+	st_case_235:
+//line plugins/parsers/influx/machine.go:4140
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr369
+			goto tr385
 		case 44:
-			goto tr371
+			goto tr387
 		case 114:
-			goto st22
+			goto st23
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr369
+			goto tr385
 		}
-		goto tr99
+		goto tr101
 tr11:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st23
-	st23:
+	goto st24
+	st24:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof23
+			goto _test_eof24
 		}
-	st_case_23:
-//line plugins/parsers/influx/machine.go:4052
+	st_case_24:
+//line plugins/parsers/influx/machine.go:4168
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4074,18 +4190,18 @@ tr6:
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st24
-	st24:
+	goto st25
+	st25:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof24
+			goto _test_eof25
 		}
-	st_case_24:
-//line plugins/parsers/influx/machine.go:4084
+	st_case_25:
+//line plugins/parsers/influx/machine.go:4200
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
 		case 11:
-			goto tr43
+			goto tr45
 		case 13:
 			goto tr5
 		case 32:
@@ -4095,55 +4211,13 @@ tr6:
 		case 61:
 			goto st2
 		case 92:
-			goto tr44
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto tr42
-tr42:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st25
-	st25:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof25
-		}
-	st_case_25:
-//line plugins/parsers/influx/machine.go:4116
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
 			goto tr46
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
 		}
-		goto st25
-tr46:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st26
-tr43:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
+		goto tr44
+tr44:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4154,12 +4228,12 @@ tr43:
 			goto _test_eof26
 		}
 	st_case_26:
-//line plugins/parsers/influx/machine.go:4158
+//line plugins/parsers/influx/machine.go:4232
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
 		case 11:
-			goto tr43
+			goto tr48
 		case 13:
 			goto tr5
 		case 32:
@@ -4167,24 +4241,28 @@ tr43:
 		case 44:
 			goto tr7
 		case 61:
-			goto tr47
+			goto tr49
 		case 92:
-			goto tr44
+			goto st84
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
 		}
-		goto tr42
-tr7:
+		goto st26
+tr48:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
 	goto st27
-tr61:
-//line plugins/parsers/influx/machine.go.rl:80
+tr45:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.handler.AddTag(key, m.text())
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
 
 	goto st27
 	st27:
@@ -4192,30 +4270,37 @@ tr61:
 			goto _test_eof27
 		}
 	st_case_27:
-//line plugins/parsers/influx/machine.go:4196
+//line plugins/parsers/influx/machine.go:4274
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr45
+		case 13:
+			goto tr5
 		case 32:
-			goto tr50
+			goto tr4
 		case 44:
-			goto tr50
+			goto tr7
 		case 61:
-			goto tr50
+			goto tr49
 		case 92:
-			goto tr51
+			goto tr46
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr50
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr50
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
 		}
-		goto tr49
-tr49:
-//line plugins/parsers/influx/machine.go.rl:18
+		goto tr44
+tr7:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.pb = m.p
+	m.handler.SetMeasurement(m.text())
+
+	goto st28
+tr63:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
 
 	goto st28
 	st28:
@@ -4223,30 +4308,30 @@ tr49:
 			goto _test_eof28
 		}
 	st_case_28:
-//line plugins/parsers/influx/machine.go:4227
+//line plugins/parsers/influx/machine.go:4312
 		switch ( m.data)[( m.p)] {
 		case 32:
-			goto tr50
+			goto tr52
 		case 44:
-			goto tr50
+			goto tr52
 		case 61:
-			goto tr53
+			goto tr52
 		case 92:
-			goto st36
+			goto tr53
 		}
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr50
+				goto tr52
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr50
+			goto tr52
 		}
-		goto st28
-tr53:
-//line plugins/parsers/influx/machine.go.rl:76
+		goto tr51
+tr51:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	key = m.text()
+	m.pb = m.p
 
 	goto st29
 	st29:
@@ -4254,30 +4339,30 @@ tr53:
 			goto _test_eof29
 		}
 	st_case_29:
-//line plugins/parsers/influx/machine.go:4258
+//line plugins/parsers/influx/machine.go:4343
 		switch ( m.data)[( m.p)] {
 		case 32:
-			goto tr50
+			goto tr52
 		case 44:
-			goto tr50
+			goto tr52
 		case 61:
-			goto tr50
+			goto tr55
 		case 92:
-			goto tr56
+			goto st37
 		}
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr50
+				goto tr52
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr50
+			goto tr52
 		}
-		goto tr55
+		goto st29
 tr55:
-//line plugins/parsers/influx/machine.go.rl:18
+//line plugins/parsers/influx/machine.go.rl:76
 
-	m.pb = m.p
+	key = m.text()
 
 	goto st30
 	st30:
@@ -4285,31 +4370,30 @@ tr55:
 			goto _test_eof30
 		}
 	st_case_30:
-//line plugins/parsers/influx/machine.go:4289
+//line plugins/parsers/influx/machine.go:4374
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
 		case 32:
-			goto tr58
+			goto tr52
 		case 44:
-			goto tr61
+			goto tr52
 		case 61:
-			goto tr59
+			goto tr52
 		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr58
 		}
-		goto st30
-tr60:
-//line plugins/parsers/influx/machine.go.rl:80
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto tr57
+tr57:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	m.handler.AddTag(key, m.text())
+	m.pb = m.p
 
 	goto st31
 	st31:
@@ -4317,31 +4401,31 @@ tr60:
 			goto _test_eof31
 		}
 	st_case_31:
-//line plugins/parsers/influx/machine.go:4321
+//line plugins/parsers/influx/machine.go:4405
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr64
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr59
+			goto tr61
 		case 92:
-			goto tr65
+			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr60
 		}
-		goto tr63
-tr63:
-//line plugins/parsers/influx/machine.go.rl:18
+		goto st31
+tr62:
+//line plugins/parsers/influx/machine.go.rl:80
 
-	m.pb = m.p
+	m.handler.AddTag(key, m.text())
 
 	goto st32
 	st32:
@@ -4349,38 +4433,28 @@ tr63:
 			goto _test_eof32
 		}
 	st_case_32:
-//line plugins/parsers/influx/machine.go:4353
+//line plugins/parsers/influx/machine.go:4437
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr67
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr66
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr14
+			goto tr61
 		case 92:
-			goto st34
+			goto tr67
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr60
 		}
-		goto st32
-tr67:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st33
-tr64:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
+		goto tr65
+tr65:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4391,28 +4465,38 @@ tr64:
 			goto _test_eof33
 		}
 	st_case_33:
-//line plugins/parsers/influx/machine.go:4395
+//line plugins/parsers/influx/machine.go:4469
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr64
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr69
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
 			goto tr14
 		case 92:
-			goto tr65
+			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr60
 		}
-		goto tr63
-tr65:
+		goto st33
+tr69:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st34
+tr66:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4423,17 +4507,28 @@ tr65:
 			goto _test_eof34
 		}
 	st_case_34:
-//line plugins/parsers/influx/machine.go:4427
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+//line plugins/parsers/influx/machine.go:4511
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr61
+		case 11:
+			goto tr66
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto tr67
 		}
-		goto st32
-tr56:
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr60
+		}
+		goto tr65
+tr67:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4444,17 +4539,17 @@ tr56:
 			goto _test_eof35
 		}
 	st_case_35:
-//line plugins/parsers/influx/machine.go:4448
+//line plugins/parsers/influx/machine.go:4543
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr50
+				goto tr61
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr50
+			goto tr61
 		}
-		goto st30
-tr51:
+		goto st33
+tr58:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4465,20 +4560,20 @@ tr51:
 			goto _test_eof36
 		}
 	st_case_36:
-//line plugins/parsers/influx/machine.go:4469
+//line plugins/parsers/influx/machine.go:4564
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr50
+				goto tr52
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr50
+			goto tr52
 		}
-		goto st28
-tr47:
-//line plugins/parsers/influx/machine.go.rl:84
+		goto st31
+tr53:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	key = m.text()
+	m.pb = m.p
 
 	goto st37
 	st37:
@@ -4486,7 +4581,28 @@ tr47:
 			goto _test_eof37
 		}
 	st_case_37:
-//line plugins/parsers/influx/machine.go:4490
+//line plugins/parsers/influx/machine.go:4585
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto st29
+tr49:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st38
+	st38:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof38
+		}
+	st_case_38:
+//line plugins/parsers/influx/machine.go:4606
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4497,259 +4613,143 @@ tr47:
 		case 32:
 			goto tr4
 		case 34:
-			goto st38
+			goto st39
 		case 44:
 			goto tr7
 		case 45:
-			goto tr70
-		case 46:
-			goto tr71
-		case 48:
 			goto tr72
-		case 70:
+		case 46:
+			goto tr73
+		case 48:
 			goto tr74
-		case 84:
-			goto tr75
-		case 92:
-			goto st129
-		case 102:
+		case 70:
 			goto tr76
-		case 116:
+		case 84:
 			goto tr77
+		case 92:
+			goto st133
+		case 102:
+			goto tr78
+		case 116:
+			goto tr79
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr73
+				goto tr75
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-	st38:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof38
-		}
-	st_case_38:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr79
-		case 11:
-			goto tr80
-		case 12:
-			goto tr4
-		case 32:
-			goto tr79
-		case 34:
-			goto tr81
-		case 44:
-			goto tr82
-		case 92:
-			goto tr83
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto tr78
-tr78:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st39
 	st39:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof39
 		}
 	st_case_39:
-//line plugins/parsers/influx/machine.go:4566
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto tr81
 		case 11:
-			goto tr86
+			goto tr82
 		case 12:
 			goto tr4
 		case 32:
-			goto tr85
+			goto tr81
 		case 34:
-			goto tr87
+			goto tr83
 		case 44:
-			goto tr88
+			goto tr84
 		case 92:
-			goto st164
+			goto tr85
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto st39
-tr85:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st40
-tr79:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
+		goto tr80
+tr80:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st40
-tr229:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
 	goto st40
 	st40:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof40
 		}
 	st_case_40:
-//line plugins/parsers/influx/machine.go:4614
+//line plugins/parsers/influx/machine.go:4682
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st40
+			goto tr87
 		case 11:
-			goto tr92
+			goto tr88
 		case 12:
-			goto st3
+			goto tr4
 		case 32:
-			goto st40
+			goto tr87
 		case 34:
-			goto tr93
+			goto tr89
 		case 44:
-			goto st7
-		case 61:
-			goto st7
+			goto tr90
 		case 92:
-			goto tr94
+			goto st170
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto tr90
-tr90:
+		goto st40
+tr87:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st41
+tr81:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st41
+tr237:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
 	goto st41
 	st41:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof41
 		}
 	st_case_41:
-//line plugins/parsers/influx/machine.go:4648
+//line plugins/parsers/influx/machine.go:4730
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr5
+			goto st41
+		case 11:
+			goto tr94
+		case 12:
+			goto st3
 		case 32:
-			goto st7
+			goto st41
 		case 34:
-			goto tr96
+			goto tr95
 		case 44:
 			goto st7
 		case 61:
-			goto tr97
+			goto st7
 		case 92:
-			goto st75
+			goto tr96
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto st41
-tr93:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st227
-tr96:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st227
-tr112:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st227
-	st227:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof227
-		}
-	st_case_227:
-//line plugins/parsers/influx/machine.go:4700
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st228
-		case 13:
-			goto tr330
-		case 32:
-			goto st192
-		case 44:
-			goto st9
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st192
-		}
-		goto st4
-	st228:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof228
-		}
-	st_case_228:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st228
-		case 13:
-			goto tr330
-		case 32:
-			goto st192
-		case 44:
-			goto tr99
-		case 45:
-			goto tr377
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr378
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st192
-		}
-		goto st4
-tr377:
+		goto tr92
+tr92:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4762,275 +4762,75 @@ tr377:
 	st_case_42:
 //line plugins/parsers/influx/machine.go:4764
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
-			goto tr99
+			goto st7
+		case 34:
+			goto tr98
 		case 44:
-			goto tr99
+			goto st7
 		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto tr99
-			}
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st229
-			}
-		default:
 			goto tr99
+		case 92:
+			goto st78
 		}
-		goto st4
-tr378:
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st42
+tr95:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st229
-	st229:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st236
+tr98:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st236
+tr114:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st236
+	st236:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof229
+			goto _test_eof236
 		}
-	st_case_229:
-//line plugins/parsers/influx/machine.go:4799
+	st_case_236:
+//line plugins/parsers/influx/machine.go:4816
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr346
 		case 11:
-			goto tr379
+			goto st237
 		case 13:
-			goto tr335
+			goto tr346
 		case 32:
-			goto tr334
+			goto st200
 		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st231
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-tr379:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st230
-	st230:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof230
-		}
-	st_case_230:
-//line plugins/parsers/influx/machine.go:4836
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st230
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr5
+			goto st9
 		case 61:
 			goto tr14
 		case 92:
 			goto st10
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st4
-	st231:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof231
-		}
-	st_case_231:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st232
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st232:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof232
-		}
-	st_case_232:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st233
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st233:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof233
-		}
-	st_case_233:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st234
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st234:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof234
-		}
-	st_case_234:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st235
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st235:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof235
-		}
-	st_case_235:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st236
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st236:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof236
-		}
-	st_case_236:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st237
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto st200
 		}
 		goto st4
 	st237:
@@ -5040,15 +4840,17 @@ tr379:
 	st_case_237:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr346
 		case 11:
-			goto tr379
+			goto st237
 		case 13:
-			goto tr335
+			goto tr346
 		case 32:
-			goto tr334
+			goto st200
 		case 44:
-			goto tr99
+			goto tr101
+		case 45:
+			goto tr393
 		case 61:
 			goto tr14
 		case 92:
@@ -5057,58 +4859,70 @@ tr379:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st238
+				goto tr394
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto st200
 		}
 		goto st4
+tr393:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st43
+	st43:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof43
+		}
+	st_case_43:
+//line plugins/parsers/influx/machine.go:4880
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr101
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr101
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st238
+			}
+		default:
+			goto tr101
+		}
+		goto st4
+tr394:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st238
 	st238:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof238
 		}
 	st_case_238:
+//line plugins/parsers/influx/machine.go:4915
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st239
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st4
-	st239:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof239
-		}
-	st_case_239:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr379
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5120,7 +4934,39 @@ tr379:
 				goto st240
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
+		}
+		goto st4
+tr395:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st239
+	st239:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof239
+		}
+	st_case_239:
+//line plugins/parsers/influx/machine.go:4952
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st239
+		case 13:
+			goto tr346
+		case 32:
+			goto st203
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st203
 		}
 		goto st4
 	st240:
@@ -5130,15 +4976,15 @@ tr379:
 	st_case_240:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5150,7 +4996,7 @@ tr379:
 				goto st241
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st241:
@@ -5160,15 +5006,15 @@ tr379:
 	st_case_241:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5180,7 +5026,7 @@ tr379:
 				goto st242
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st242:
@@ -5190,15 +5036,15 @@ tr379:
 	st_case_242:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5210,7 +5056,7 @@ tr379:
 				goto st243
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st243:
@@ -5220,15 +5066,15 @@ tr379:
 	st_case_243:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5240,7 +5086,7 @@ tr379:
 				goto st244
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st244:
@@ -5250,15 +5096,15 @@ tr379:
 	st_case_244:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5270,7 +5116,7 @@ tr379:
 				goto st245
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st245:
@@ -5280,15 +5126,15 @@ tr379:
 	st_case_245:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5300,7 +5146,7 @@ tr379:
 				goto st246
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st246:
@@ -5310,15 +5156,15 @@ tr379:
 	st_case_246:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5330,7 +5176,7 @@ tr379:
 				goto st247
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st247:
@@ -5340,15 +5186,15 @@ tr379:
 	st_case_247:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
@@ -5360,7 +5206,7 @@ tr379:
 				goto st248
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr350
 		}
 		goto st4
 	st248:
@@ -5370,254 +5216,149 @@ tr379:
 	st_case_248:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr379
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr350
 		case 44:
-			goto tr99
+			goto tr101
 		case 61:
 			goto tr14
 		case 92:
 			goto st10
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr334
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st249
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
 		goto st4
-tr97:
-//line plugins/parsers/influx/machine.go.rl:84
-
-	key = m.text()
-
-	goto st43
-	st43:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof43
-		}
-	st_case_43:
-//line plugins/parsers/influx/machine.go:5403
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr101
-		case 45:
-			goto tr102
-		case 46:
-			goto tr103
-		case 48:
-			goto tr104
-		case 70:
-			goto tr106
-		case 84:
-			goto tr107
-		case 92:
-			goto st11
-		case 102:
-			goto tr108
-		case 116:
-			goto tr109
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr105
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-tr101:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st249
 	st249:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof249
 		}
 	st_case_249:
-//line plugins/parsers/influx/machine.go:5446
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
-		case 12:
-			goto st192
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr330
+			goto tr351
 		case 32:
-			goto tr399
-		case 34:
-			goto tr26
+			goto tr350
 		case 44:
-			goto tr400
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto tr27
+			goto st10
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr399
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st250
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
-		goto tr25
-tr399:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st250
-tr425:
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st250
-tr430:
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st250
-tr433:
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st250
-tr436:
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st250
+		goto st4
 	st250:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof250
 		}
 	st_case_250:
-//line plugins/parsers/influx/machine.go:5502
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
-		case 12:
-			goto st192
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr330
+			goto tr351
 		case 32:
-			goto st250
-		case 34:
-			goto tr29
-		case 45:
-			goto tr402
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr403
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st250
-		}
-		goto st7
-tr402:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st44
-	st44:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof44
-		}
-	st_case_44:
-//line plugins/parsers/influx/machine.go:5539
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr99
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st251
 			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr99
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
-		goto st7
-tr403:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st251
+		goto st4
 	st251:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof251
 		}
 	st_case_251:
-//line plugins/parsers/influx/machine.go:5568
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st253
+				goto st252
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr350
 		}
-		goto st7
-tr404:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st252
+		goto st4
 	st252:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof252
 		}
 	st_case_252:
-//line plugins/parsers/influx/machine.go:5603
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
-		case 12:
-			goto st195
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr330
+			goto tr351
 		case 32:
-			goto st252
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto st252
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st253
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
-		goto st7
+		goto st4
 	st253:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof253
@@ -5625,27 +5366,29 @@ tr404:
 	st_case_253:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st254
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr350
 		}
-		goto st7
+		goto st4
 	st254:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof254
@@ -5653,27 +5396,29 @@ tr404:
 	st_case_254:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st255
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr350
 		}
-		goto st7
+		goto st4
 	st255:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof255
@@ -5681,27 +5426,29 @@ tr404:
 	st_case_255:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st256
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr350
 		}
-		goto st7
+		goto st4
 	st256:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof256
@@ -5709,27 +5456,29 @@ tr404:
 	st_case_256:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
 		case 92:
-			goto st11
+			goto st10
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st257
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr350
 		}
-		goto st7
+		goto st4
 	st257:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof257
@@ -5737,125 +5486,210 @@ tr404:
 	st_case_257:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
-		case 12:
-			goto tr334
+			goto tr351
+		case 11:
+			goto tr395
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr350
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr350
+		}
+		goto st4
+tr99:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st44
+	st44:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof44
+		}
+	st_case_44:
+//line plugins/parsers/influx/machine.go:5519
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 34:
-			goto tr29
+			goto tr103
+		case 45:
+			goto tr104
+		case 46:
+			goto tr105
+		case 48:
+			goto tr106
+		case 70:
+			goto tr108
+		case 84:
+			goto tr109
 		case 92:
 			goto st11
+		case 102:
+			goto tr110
+		case 116:
+			goto tr111
 		}
 		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st258
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr107
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
 		goto st7
+tr103:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st258
 	st258:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof258
 		}
 	st_case_258:
+//line plugins/parsers/influx/machine.go:5562
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr346
 		case 12:
-			goto tr334
+			goto st200
 		case 13:
-			goto tr335
+			goto tr346
 		case 32:
-			goto tr404
+			goto tr415
 		case 34:
-			goto tr29
+			goto tr26
+		case 44:
+			goto tr416
 		case 92:
-			goto st11
+			goto tr27
 		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st259
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr415
 		}
-		goto st7
+		goto tr25
+tr415:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st259
+tr441:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st259
+tr446:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st259
+tr449:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st259
+tr452:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st259
 	st259:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof259
 		}
 	st_case_259:
+//line plugins/parsers/influx/machine.go:5618
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr346
 		case 12:
-			goto tr334
+			goto st200
 		case 13:
-			goto tr335
+			goto tr346
 		case 32:
-			goto tr404
+			goto st259
 		case 34:
 			goto tr29
+		case 45:
+			goto tr418
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st260
+				goto tr419
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto st259
 		}
 		goto st7
+tr418:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st45
+	st45:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof45
+		}
+	st_case_45:
+//line plugins/parsers/influx/machine.go:5655
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr101
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st260
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr101
+		}
+		goto st7
+tr419:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st260
 	st260:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof260
 		}
 	st_case_260:
+//line plugins/parsers/influx/machine.go:5684
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st261
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr404
-		}
-		goto st7
-	st261:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof261
-		}
-	st_case_261:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 12:
-			goto tr334
-		case 13:
-			goto tr335
-		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -5867,7 +5701,37 @@ tr404:
 				goto st262
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
+		}
+		goto st7
+tr420:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st261
+	st261:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof261
+		}
+	st_case_261:
+//line plugins/parsers/influx/machine.go:5719
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 12:
+			goto st203
+		case 13:
+			goto tr346
+		case 32:
+			goto st261
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto st261
 		}
 		goto st7
 	st262:
@@ -5877,13 +5741,13 @@ tr404:
 	st_case_262:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -5895,7 +5759,7 @@ tr404:
 				goto st263
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st263:
@@ -5905,13 +5769,13 @@ tr404:
 	st_case_263:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -5923,7 +5787,7 @@ tr404:
 				goto st264
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st264:
@@ -5933,13 +5797,13 @@ tr404:
 	st_case_264:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -5951,7 +5815,7 @@ tr404:
 				goto st265
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st265:
@@ -5961,13 +5825,13 @@ tr404:
 	st_case_265:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -5979,7 +5843,7 @@ tr404:
 				goto st266
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st266:
@@ -5989,13 +5853,13 @@ tr404:
 	st_case_266:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -6007,7 +5871,7 @@ tr404:
 				goto st267
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st267:
@@ -6017,13 +5881,13 @@ tr404:
 	st_case_267:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -6035,7 +5899,7 @@ tr404:
 				goto st268
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st268:
@@ -6045,13 +5909,13 @@ tr404:
 	st_case_268:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -6063,7 +5927,7 @@ tr404:
 				goto st269
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st269:
@@ -6073,13 +5937,13 @@ tr404:
 	st_case_269:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
@@ -6091,7 +5955,7 @@ tr404:
 				goto st270
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr404
+			goto tr420
 		}
 		goto st7
 	st270:
@@ -6101,345 +5965,53 @@ tr404:
 	st_case_270:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 12:
-			goto tr334
+			goto tr350
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr404
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr404
-		}
-		goto st7
-tr400:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st45
-tr442:
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st45
-tr446:
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st45
-tr448:
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st45
-tr450:
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st45
-	st45:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof45
-		}
-	st_case_45:
-//line plugins/parsers/influx/machine.go:6156
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr5
-		case 32:
-			goto st7
-		case 34:
-			goto tr112
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr113
-		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto tr111
-tr111:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st46
-	st46:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof46
-		}
-	st_case_46:
-//line plugins/parsers/influx/machine.go:6188
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr5
-		case 32:
-			goto st7
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr115
-		case 92:
-			goto st74
-		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st46
-tr115:
-//line plugins/parsers/influx/machine.go.rl:84
-
-	key = m.text()
-
-	goto st47
-	st47:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof47
-		}
-	st_case_47:
-//line plugins/parsers/influx/machine.go:6220
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr117
-		case 45:
-			goto tr102
-		case 46:
-			goto tr103
-		case 48:
-			goto tr104
-		case 70:
-			goto tr106
-		case 84:
-			goto tr107
-		case 92:
-			goto st11
-		case 102:
-			goto tr108
-		case 116:
-			goto tr109
-		}
 		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr105
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st271
 			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
 		}
 		goto st7
-tr117:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st271
 	st271:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof271
 		}
 	st_case_271:
-//line plugins/parsers/influx/machine.go:6263
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr351
 		case 12:
-			goto st192
+			goto tr350
 		case 13:
-			goto tr330
+			goto tr351
 		case 32:
-			goto tr399
-		case 34:
-			goto tr26
-		case 44:
-			goto tr424
-		case 92:
-			goto tr27
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr399
-		}
-		goto tr25
-tr424:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st48
-tr426:
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st48
-tr431:
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st48
-tr434:
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st48
-tr437:
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st48
-	st48:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof48
-		}
-	st_case_48:
-//line plugins/parsers/influx/machine.go:6319
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr5
-		case 32:
-			goto st7
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr119
-		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto tr118
-tr118:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st49
-	st49:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof49
-		}
-	st_case_49:
-//line plugins/parsers/influx/machine.go:6351
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr5
-		case 32:
-			goto st7
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr121
-		case 92:
-			goto st62
-		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st49
-tr121:
-//line plugins/parsers/influx/machine.go.rl:84
-
-	key = m.text()
-
-	goto st50
-	st50:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof50
-		}
-	st_case_50:
-//line plugins/parsers/influx/machine.go:6383
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr117
-		case 45:
-			goto tr123
-		case 46:
-			goto tr124
-		case 48:
-			goto tr125
-		case 70:
-			goto tr127
-		case 84:
-			goto tr128
-		case 92:
-			goto st11
-		case 102:
-			goto tr129
-		case 116:
-			goto tr130
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr126
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-tr123:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st51
-	st51:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof51
-		}
-	st_case_51:
-//line plugins/parsers/influx/machine.go:6426
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
+			goto tr420
 		case 34:
 			goto tr29
-		case 48:
-			goto st272
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st277
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st272
 			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
 		}
 		goto st7
 	st272:
@@ -6449,63 +6021,17 @@ tr123:
 	st_case_272:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr351
 		case 12:
-			goto tr355
+			goto tr350
 		case 13:
-			goto tr356
+			goto tr351
 		case 32:
-			goto tr425
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr426
-		case 46:
-			goto st273
-		case 69:
-			goto st52
 		case 92:
 			goto st11
-		case 101:
-			goto st52
-		case 105:
-			goto st276
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr425
-		}
-		goto st7
-tr124:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st273
-	st273:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof273
-		}
-	st_case_273:
-//line plugins/parsers/influx/machine.go:6490
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr426
-		case 69:
-			goto st52
-		case 92:
-			goto st11
-		case 101:
-			goto st52
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
@@ -6513,86 +6039,63 @@ tr124:
 				goto st273
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr425
+			goto tr420
 		}
 		goto st7
-	st52:
+	st273:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof52
+			goto _test_eof273
 		}
-	st_case_52:
+	st_case_273:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr5
-		case 34:
-			goto tr133
-		case 43:
-			goto st53
-		case 45:
-			goto st53
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st275
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-tr133:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st274
-	st274:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof274
-		}
-	st_case_274:
-//line plugins/parsers/influx/machine.go:6557
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
+			goto tr351
+		case 12:
+			goto tr350
 		case 13:
-			goto tr330
+			goto tr351
 		case 32:
-			goto st192
-		case 44:
-			goto st9
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st216
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st192
-		}
-		goto tr99
-	st53:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof53
-		}
-	st_case_53:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
+			goto tr420
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		switch {
-		case ( m.data)[( m.p)] > 13:
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st274
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
+		}
+		goto st7
+	st274:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof274
+		}
+	st_case_274:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 12:
+			goto tr350
+		case 13:
+			goto tr351
+		case 32:
+			goto tr420
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st275
 			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
 		}
 		goto st7
 	st275:
@@ -6602,27 +6105,25 @@ tr133:
 	st_case_275:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr351
 		case 12:
-			goto tr355
+			goto tr350
 		case 13:
-			goto tr356
+			goto tr351
 		case 32:
-			goto tr425
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr426
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st275
+				goto st276
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr425
+			goto tr420
 		}
 		goto st7
 	st276:
@@ -6632,22 +6133,25 @@ tr133:
 	st_case_276:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr362
+			goto tr351
 		case 12:
-			goto tr361
+			goto tr350
 		case 13:
-			goto tr362
+			goto tr351
 		case 32:
-			goto tr430
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr431
 		case 92:
 			goto st11
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr430
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st277
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
 		}
 		goto st7
 	st277:
@@ -6657,77 +6161,53 @@ tr133:
 	st_case_277:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr351
 		case 12:
-			goto tr355
+			goto tr350
 		case 13:
-			goto tr356
+			goto tr351
 		case 32:
-			goto tr425
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr426
-		case 46:
-			goto st273
-		case 69:
-			goto st52
 		case 92:
 			goto st11
-		case 101:
-			goto st52
-		case 105:
-			goto st276
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st277
+				goto st278
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr425
+			goto tr420
 		}
 		goto st7
-tr125:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st278
 	st278:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof278
 		}
 	st_case_278:
-//line plugins/parsers/influx/machine.go:6703
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr351
 		case 12:
-			goto tr355
+			goto tr350
 		case 13:
-			goto tr356
+			goto tr351
 		case 32:
-			goto tr425
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr426
-		case 46:
-			goto st273
-		case 69:
-			goto st52
 		case 92:
 			goto st11
-		case 101:
-			goto st52
-		case 105:
-			goto st276
-		case 117:
-			goto st279
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr425
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st279
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr420
 		}
 		goto st7
 	st279:
@@ -6737,105 +6217,410 @@ tr125:
 	st_case_279:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr366
+			goto tr351
 		case 12:
-			goto tr365
+			goto tr350
 		case 13:
-			goto tr366
+			goto tr351
 		case 32:
-			goto tr433
+			goto tr420
 		case 34:
 			goto tr29
-		case 44:
-			goto tr434
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr433
+			goto tr420
 		}
 		goto st7
-tr126:
+tr416:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st46
+tr458:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st46
+tr462:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st46
+tr464:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st46
+tr466:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st46
+	st46:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof46
+		}
+	st_case_46:
+//line plugins/parsers/influx/machine.go:6272
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
+		case 32:
+			goto st7
+		case 34:
+			goto tr114
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr115
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto tr113
+tr113:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st47
+	st47:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof47
+		}
+	st_case_47:
+//line plugins/parsers/influx/machine.go:6304
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
+		case 32:
+			goto st7
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr117
+		case 92:
+			goto st77
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st47
+tr117:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st48
+	st48:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof48
+		}
+	st_case_48:
+//line plugins/parsers/influx/machine.go:6336
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr119
+		case 45:
+			goto tr104
+		case 46:
+			goto tr105
+		case 48:
+			goto tr106
+		case 70:
+			goto tr108
+		case 84:
+			goto tr109
+		case 92:
+			goto st11
+		case 102:
+			goto tr110
+		case 116:
+			goto tr111
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr107
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+tr119:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
 	goto st280
 	st280:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof280
 		}
 	st_case_280:
-//line plugins/parsers/influx/machine.go:6770
+//line plugins/parsers/influx/machine.go:6379
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr346
 		case 12:
-			goto tr355
+			goto st200
 		case 13:
-			goto tr356
+			goto tr346
 		case 32:
-			goto tr425
+			goto tr415
 		case 34:
-			goto tr29
+			goto tr26
 		case 44:
-			goto tr426
-		case 46:
-			goto st273
-		case 69:
-			goto st52
+			goto tr440
 		case 92:
-			goto st11
-		case 101:
-			goto st52
-		case 105:
-			goto st276
-		case 117:
-			goto st279
+			goto tr27
 		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st280
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr425
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr415
 		}
-		goto st7
-tr127:
+		goto tr25
+tr440:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st281
+	goto st49
+tr442:
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st49
+tr447:
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st49
+tr450:
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st49
+tr453:
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st49
+	st49:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof49
+		}
+	st_case_49:
+//line plugins/parsers/influx/machine.go:6435
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
+		case 32:
+			goto st7
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr121
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto tr120
+tr120:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st50
+	st50:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof50
+		}
+	st_case_50:
+//line plugins/parsers/influx/machine.go:6467
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr5
+		case 32:
+			goto st7
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr123
+		case 92:
+			goto st64
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st50
+tr123:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st51
+	st51:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof51
+		}
+	st_case_51:
+//line plugins/parsers/influx/machine.go:6499
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr119
+		case 45:
+			goto tr125
+		case 46:
+			goto tr126
+		case 48:
+			goto tr127
+		case 70:
+			goto tr129
+		case 84:
+			goto tr130
+		case 92:
+			goto st11
+		case 102:
+			goto tr131
+		case 116:
+			goto tr132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr128
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+tr125:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st52
+	st52:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof52
+		}
+	st_case_52:
+//line plugins/parsers/influx/machine.go:6542
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 46:
+			goto st53
+		case 48:
+			goto st284
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st287
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+tr126:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st53
+	st53:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof53
+		}
+	st_case_53:
+//line plugins/parsers/influx/machine.go:6575
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st281
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
 	st281:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof281
 		}
 	st_case_281:
-//line plugins/parsers/influx/machine.go:6817
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr372
 		case 12:
-			goto tr369
+			goto tr371
 		case 13:
-			goto tr370
+			goto tr372
 		case 32:
-			goto tr436
+			goto tr441
 		case 34:
 			goto tr29
 		case 44:
-			goto tr437
-		case 65:
+			goto tr442
+		case 69:
 			goto st54
 		case 92:
 			goto st11
-		case 97:
-			goto st57
+		case 101:
+			goto st54
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st281
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
 		}
 		goto st7
 	st54:
@@ -6847,16 +6632,54 @@ tr127:
 		case 10:
 			goto tr5
 		case 34:
-			goto tr29
-		case 76:
+			goto tr137
+		case 43:
+			goto st55
+		case 45:
 			goto st55
 		case 92:
 			goto st11
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st283
+			}
+		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
+tr137:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st282
+	st282:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof282
+		}
+	st_case_282:
+//line plugins/parsers/influx/machine.go:6664
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 13:
+			goto tr346
+		case 32:
+			goto st200
+		case 44:
+			goto st9
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st223
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st200
+		}
+		goto tr101
 	st55:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof55
@@ -6867,15 +6690,340 @@ tr127:
 			goto tr5
 		case 34:
 			goto tr29
-		case 83:
-			goto st56
 		case 92:
 			goto st11
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st283
+			}
+		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
+	st283:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof283
+		}
+	st_case_283:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st283
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st284:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof284
+		}
+	st_case_284:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 46:
+			goto st281
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st286
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st285
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st285:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof285
+		}
+	st_case_285:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 46:
+			goto st281
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st285
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st286:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof286
+		}
+	st_case_286:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr378
+		case 12:
+			goto tr377
+		case 13:
+			goto tr378
+		case 32:
+			goto tr446
+		case 34:
+			goto tr29
+		case 44:
+			goto tr447
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr446
+		}
+		goto st7
+	st287:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof287
+		}
+	st_case_287:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 46:
+			goto st281
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st286
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st287
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+tr127:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st288
+	st288:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof288
+		}
+	st_case_288:
+//line plugins/parsers/influx/machine.go:6884
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 46:
+			goto st281
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st286
+		case 117:
+			goto st289
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st285
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st289:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof289
+		}
+	st_case_289:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr382
+		case 12:
+			goto tr381
+		case 13:
+			goto tr382
+		case 32:
+			goto tr449
+		case 34:
+			goto tr29
+		case 44:
+			goto tr450
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr449
+		}
+		goto st7
+tr128:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st290
+	st290:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof290
+		}
+	st_case_290:
+//line plugins/parsers/influx/machine.go:6956
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr442
+		case 46:
+			goto st281
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st286
+		case 117:
+			goto st289
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st290
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+tr129:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st291
+	st291:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof291
+		}
+	st_case_291:
+//line plugins/parsers/influx/machine.go:7003
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 65:
+			goto st56
+		case 92:
+			goto st11
+		case 97:
+			goto st59
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
+		}
+		goto st7
 	st56:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof56
@@ -6886,8 +7034,8 @@ tr127:
 			goto tr5
 		case 34:
 			goto tr29
-		case 69:
-			goto st282
+		case 76:
+			goto st57
 		case 92:
 			goto st11
 		}
@@ -6895,31 +7043,6 @@ tr127:
 			goto tr5
 		}
 		goto st7
-	st282:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof282
-		}
-	st_case_282:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 12:
-			goto tr369
-		case 13:
-			goto tr370
-		case 32:
-			goto tr436
-		case 34:
-			goto tr29
-		case 44:
-			goto tr437
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
-		}
-		goto st7
 	st57:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof57
@@ -6930,10 +7053,10 @@ tr127:
 			goto tr5
 		case 34:
 			goto tr29
+		case 83:
+			goto st58
 		case 92:
 			goto st11
-		case 108:
-			goto st58
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -6949,15 +7072,40 @@ tr127:
 			goto tr5
 		case 34:
 			goto tr29
+		case 69:
+			goto st292
 		case 92:
 			goto st11
-		case 115:
-			goto st59
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
 		goto st7
+	st292:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof292
+		}
+	st_case_292:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
+		}
+		goto st7
 	st59:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof59
@@ -6970,49 +7118,13 @@ tr127:
 			goto tr29
 		case 92:
 			goto st11
-		case 101:
-			goto st282
+		case 108:
+			goto st60
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
 		goto st7
-tr128:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st283
-	st283:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof283
-		}
-	st_case_283:
-//line plugins/parsers/influx/machine.go:6992
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 12:
-			goto tr369
-		case 13:
-			goto tr370
-		case 32:
-			goto tr436
-		case 34:
-			goto tr29
-		case 44:
-			goto tr437
-		case 82:
-			goto st60
-		case 92:
-			goto st11
-		case 114:
-			goto st61
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
-		}
-		goto st7
 	st60:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof60
@@ -7023,10 +7135,10 @@ tr128:
 			goto tr5
 		case 34:
 			goto tr29
-		case 85:
-			goto st56
 		case 92:
 			goto st11
+		case 115:
+			goto st61
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7044,469 +7156,88 @@ tr128:
 			goto tr29
 		case 92:
 			goto st11
-		case 117:
-			goto st59
+		case 101:
+			goto st292
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
 		goto st7
-tr129:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st284
-	st284:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof284
-		}
-	st_case_284:
-//line plugins/parsers/influx/machine.go:7066
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 12:
-			goto tr369
-		case 13:
-			goto tr370
-		case 32:
-			goto tr436
-		case 34:
-			goto tr29
-		case 44:
-			goto tr437
-		case 92:
-			goto st11
-		case 97:
-			goto st57
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
-		}
-		goto st7
 tr130:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st285
-	st285:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof285
-		}
-	st_case_285:
-//line plugins/parsers/influx/machine.go:7100
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 12:
-			goto tr369
-		case 13:
-			goto tr370
-		case 32:
-			goto tr436
-		case 34:
-			goto tr29
-		case 44:
-			goto tr437
-		case 92:
-			goto st11
-		case 114:
-			goto st61
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
-		}
-		goto st7
-tr119:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st62
-	st62:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof62
-		}
-	st_case_62:
-//line plugins/parsers/influx/machine.go:7134
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st49
-		case 92:
-			goto st49
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st4
-tr102:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st63
-	st63:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof63
-		}
-	st_case_63:
-//line plugins/parsers/influx/machine.go:7161
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr29
-		case 48:
-			goto st286
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st290
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-	st286:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof286
-		}
-	st_case_286:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st287
-		case 69:
-			goto st64
-		case 92:
-			goto st11
-		case 101:
-			goto st64
-		case 105:
-			goto st289
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr425
-		}
-		goto st7
-tr103:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st287
-	st287:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof287
-		}
-	st_case_287:
-//line plugins/parsers/influx/machine.go:7225
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 69:
-			goto st64
-		case 92:
-			goto st11
-		case 101:
-			goto st64
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st287
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr425
-		}
-		goto st7
-	st64:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof64
-		}
-	st_case_64:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr133
-		case 43:
-			goto st65
-		case 45:
-			goto st65
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st288
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-	st65:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof65
-		}
-	st_case_65:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st288
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
-		}
-		goto st7
-	st288:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof288
-		}
-	st_case_288:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st288
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr425
-		}
-		goto st7
-	st289:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof289
-		}
-	st_case_289:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
-		case 12:
-			goto tr361
-		case 13:
-			goto tr362
-		case 32:
-			goto tr430
-		case 34:
-			goto tr29
-		case 44:
-			goto tr446
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr430
-		}
-		goto st7
-	st290:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof290
-		}
-	st_case_290:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st287
-		case 69:
-			goto st64
-		case 92:
-			goto st11
-		case 101:
-			goto st64
-		case 105:
-			goto st289
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st290
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr425
-		}
-		goto st7
-tr104:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st291
-	st291:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof291
-		}
-	st_case_291:
-//line plugins/parsers/influx/machine.go:7407
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 12:
-			goto tr355
-		case 13:
-			goto tr356
-		case 32:
-			goto tr425
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st287
-		case 69:
-			goto st64
-		case 92:
-			goto st11
-		case 101:
-			goto st64
-		case 105:
-			goto st289
-		case 117:
-			goto st292
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr425
-		}
-		goto st7
-	st292:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof292
-		}
-	st_case_292:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr366
-		case 12:
-			goto tr365
-		case 13:
-			goto tr366
-		case 32:
-			goto tr433
-		case 34:
-			goto tr29
-		case 44:
-			goto tr448
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr433
-		}
-		goto st7
-tr105:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
 	goto st293
 	st293:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof293
 		}
 	st_case_293:
-//line plugins/parsers/influx/machine.go:7474
+//line plugins/parsers/influx/machine.go:7178
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr386
 		case 12:
-			goto tr355
+			goto tr385
 		case 13:
-			goto tr356
+			goto tr386
 		case 32:
-			goto tr425
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr442
-		case 46:
-			goto st287
-		case 69:
-			goto st64
+			goto tr453
+		case 82:
+			goto st62
 		case 92:
 			goto st11
-		case 101:
-			goto st64
-		case 105:
-			goto st289
-		case 117:
-			goto st292
+		case 114:
+			goto st63
 		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st293
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr425
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
 		}
 		goto st7
-tr106:
+	st62:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof62
+		}
+	st_case_62:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 85:
+			goto st58
+		case 92:
+			goto st11
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+	st63:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof63
+		}
+	st_case_63:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st61
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+tr131:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -7517,50 +7248,186 @@ tr106:
 			goto _test_eof294
 		}
 	st_case_294:
-//line plugins/parsers/influx/machine.go:7521
+//line plugins/parsers/influx/machine.go:7252
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 12:
-			goto tr369
+			goto tr385
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr436
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr450
-		case 65:
-			goto st66
+			goto tr453
 		case 92:
 			goto st11
 		case 97:
-			goto st69
+			goto st59
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+			goto tr452
 		}
 		goto st7
+tr132:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st295
+	st295:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof295
+		}
+	st_case_295:
+//line plugins/parsers/influx/machine.go:7286
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 92:
+			goto st11
+		case 114:
+			goto st63
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
+		}
+		goto st7
+tr121:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st64
+	st64:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof64
+		}
+	st_case_64:
+//line plugins/parsers/influx/machine.go:7320
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st50
+		case 92:
+			goto st50
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr104:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st65
+	st65:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof65
+		}
+	st_case_65:
+//line plugins/parsers/influx/machine.go:7347
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 46:
+			goto st66
+		case 48:
+			goto st298
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st301
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
+		}
+		goto st7
+tr105:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st66
 	st66:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof66
 		}
 	st_case_66:
+//line plugins/parsers/influx/machine.go:7380
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
 		case 34:
 			goto tr29
-		case 76:
-			goto st67
 		case 92:
 			goto st11
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st296
+			}
+		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
+	st296:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof296
+		}
+	st_case_296:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st296
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
 	st67:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof67
@@ -7570,13 +7437,20 @@ tr106:
 		case 10:
 			goto tr5
 		case 34:
-			goto tr29
-		case 83:
+			goto tr137
+		case 43:
+			goto st68
+		case 45:
 			goto st68
 		case 92:
 			goto st11
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st297
+			}
+		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
@@ -7590,38 +7464,338 @@ tr106:
 			goto tr5
 		case 34:
 			goto tr29
-		case 69:
-			goto st295
 		case 92:
 			goto st11
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st297
+			}
+		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
-	st295:
+	st297:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof295
+			goto _test_eof297
 		}
-	st_case_295:
+	st_case_297:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr372
 		case 12:
-			goto tr369
+			goto tr371
 		case 13:
-			goto tr370
+			goto tr372
 		case 32:
-			goto tr436
+			goto tr441
 		case 34:
 			goto tr29
 		case 44:
-			goto tr450
+			goto tr458
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st297
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st298:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof298
+		}
+	st_case_298:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 46:
+			goto st296
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st300
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st299
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st299:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof299
+		}
+	st_case_299:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 46:
+			goto st296
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st299
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st300:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof300
+		}
+	st_case_300:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr378
+		case 12:
+			goto tr377
+		case 13:
+			goto tr378
+		case 32:
+			goto tr446
+		case 34:
+			goto tr29
+		case 44:
+			goto tr462
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+			goto tr446
+		}
+		goto st7
+	st301:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof301
+		}
+	st_case_301:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 46:
+			goto st296
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st300
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st301
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+tr106:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st302
+	st302:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof302
+		}
+	st_case_302:
+//line plugins/parsers/influx/machine.go:7658
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 46:
+			goto st296
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st300
+		case 117:
+			goto st303
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st299
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+	st303:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof303
+		}
+	st_case_303:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr382
+		case 12:
+			goto tr381
+		case 13:
+			goto tr382
+		case 32:
+			goto tr449
+		case 34:
+			goto tr29
+		case 44:
+			goto tr464
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr449
+		}
+		goto st7
+tr107:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st304
+	st304:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof304
+		}
+	st_case_304:
+//line plugins/parsers/influx/machine.go:7730
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 12:
+			goto tr371
+		case 13:
+			goto tr372
+		case 32:
+			goto tr441
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 46:
+			goto st296
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st300
+		case 117:
+			goto st303
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st304
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr441
+		}
+		goto st7
+tr108:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st305
+	st305:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof305
+		}
+	st_case_305:
+//line plugins/parsers/influx/machine.go:7777
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr466
+		case 65:
+			goto st69
+		case 92:
+			goto st11
+		case 97:
+			goto st72
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
 		}
 		goto st7
 	st69:
@@ -7634,10 +7808,10 @@ tr106:
 			goto tr5
 		case 34:
 			goto tr29
+		case 76:
+			goto st70
 		case 92:
 			goto st11
-		case 108:
-			goto st70
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7653,10 +7827,10 @@ tr106:
 			goto tr5
 		case 34:
 			goto tr29
+		case 83:
+			goto st71
 		case 92:
 			goto st11
-		case 115:
-			goto st71
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7672,49 +7846,38 @@ tr106:
 			goto tr5
 		case 34:
 			goto tr29
+		case 69:
+			goto st306
 		case 92:
 			goto st11
-		case 101:
-			goto st295
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
 		goto st7
-tr107:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st296
-	st296:
+	st306:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof296
+			goto _test_eof306
 		}
-	st_case_296:
-//line plugins/parsers/influx/machine.go:7696
+	st_case_306:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 12:
-			goto tr369
+			goto tr385
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr436
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr450
-		case 82:
-			goto st72
+			goto tr466
 		case 92:
 			goto st11
-		case 114:
-			goto st73
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+			goto tr452
 		}
 		goto st7
 	st72:
@@ -7727,10 +7890,10 @@ tr107:
 			goto tr5
 		case 34:
 			goto tr29
-		case 85:
-			goto st68
 		case 92:
 			goto st11
+		case 108:
+			goto st73
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7748,45 +7911,30 @@ tr107:
 			goto tr29
 		case 92:
 			goto st11
-		case 117:
-			goto st71
+		case 115:
+			goto st74
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
 		goto st7
-tr108:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st297
-	st297:
+	st74:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof297
+			goto _test_eof74
 		}
-	st_case_297:
-//line plugins/parsers/influx/machine.go:7770
+	st_case_74:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
-		case 12:
-			goto tr369
-		case 13:
-			goto tr370
-		case 32:
-			goto tr436
+			goto tr5
 		case 34:
 			goto tr29
-		case 44:
-			goto tr450
 		case 92:
 			goto st11
-		case 97:
-			goto st69
+		case 101:
+			goto st306
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
 		}
 		goto st7
 tr109:
@@ -7794,52 +7942,187 @@ tr109:
 
 	m.pb = m.p
 
-	goto st298
-	st298:
+	goto st307
+	st307:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof298
+			goto _test_eof307
 		}
-	st_case_298:
-//line plugins/parsers/influx/machine.go:7804
+	st_case_307:
+//line plugins/parsers/influx/machine.go:7952
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 12:
-			goto tr369
+			goto tr385
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr436
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr450
+			goto tr466
+		case 82:
+			goto st75
 		case 92:
 			goto st11
 		case 114:
-			goto st73
+			goto st76
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr436
+			goto tr452
 		}
 		goto st7
-tr113:
+	st75:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof75
+		}
+	st_case_75:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 85:
+			goto st71
+		case 92:
+			goto st11
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+	st76:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof76
+		}
+	st_case_76:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		case 117:
+			goto st74
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st7
+tr110:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st74
-	st74:
+	goto st308
+	st308:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof74
+			goto _test_eof308
 		}
-	st_case_74:
-//line plugins/parsers/influx/machine.go:7838
+	st_case_308:
+//line plugins/parsers/influx/machine.go:8026
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr466
+		case 92:
+			goto st11
+		case 97:
+			goto st72
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
+		}
+		goto st7
+tr111:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st309
+	st309:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof309
+		}
+	st_case_309:
+//line plugins/parsers/influx/machine.go:8060
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 12:
+			goto tr385
+		case 13:
+			goto tr386
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr466
+		case 92:
+			goto st11
+		case 114:
+			goto st76
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr452
+		}
+		goto st7
+tr115:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st77
+	st77:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof77
+		}
+	st_case_77:
+//line plugins/parsers/influx/machine.go:8094
 		switch ( m.data)[( m.p)] {
 		case 34:
-			goto st46
+			goto st47
 		case 92:
-			goto st46
+			goto st47
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st4
+tr96:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st78
+	st78:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof78
+		}
+	st_case_78:
+//line plugins/parsers/influx/machine.go:8121
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st42
+		case 92:
+			goto st42
 		}
 		switch {
 		case ( m.data)[( m.p)] > 10:
@@ -7851,155 +8134,6 @@ tr113:
 		}
 		goto st4
 tr94:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st75
-	st75:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof75
-		}
-	st_case_75:
-//line plugins/parsers/influx/machine.go:7865
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st41
-		case 92:
-			goto st41
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st4
-tr92:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st76
-	st76:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof76
-		}
-	st_case_76:
-//line plugins/parsers/influx/machine.go:7892
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st40
-		case 11:
-			goto tr92
-		case 12:
-			goto st3
-		case 32:
-			goto st40
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto tr94
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto tr90
-tr86:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st77
-tr80:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st77
-	st77:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof77
-		}
-	st_case_77:
-//line plugins/parsers/influx/machine.go:7936
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr151
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr152
-		case 44:
-			goto tr88
-		case 61:
-			goto st39
-		case 92:
-			goto tr153
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto tr150
-tr150:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st78
-	st78:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof78
-		}
-	st_case_78:
-//line plugins/parsers/influx/machine.go:7970
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr155
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st78
-tr155:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st79
-tr151:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -8010,285 +8144,40 @@ tr151:
 			goto _test_eof79
 		}
 	st_case_79:
-//line plugins/parsers/influx/machine.go:8014
+//line plugins/parsers/influx/machine.go:8148
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto st41
 		case 11:
-			goto tr151
+			goto tr94
 		case 12:
-			goto tr4
+			goto st3
 		case 32:
-			goto tr85
+			goto st41
 		case 34:
-			goto tr152
+			goto tr95
 		case 44:
-			goto tr88
+			goto st7
 		case 61:
-			goto tr157
+			goto tr99
 		case 92:
-			goto tr153
+			goto tr96
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto tr150
-tr152:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st299
-tr156:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st299
-	st299:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof299
-		}
-	st_case_299:
-//line plugins/parsers/influx/machine.go:8058
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr456
-		case 13:
-			goto tr330
-		case 32:
-			goto tr455
-		case 44:
-			goto tr457
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr455
-		}
-		goto st25
-tr455:
+		goto tr92
+tr88:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st300
-tr487:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st300
-tr539:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st300
-tr545:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st300
-tr549:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st300
-tr553:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st300
-tr764:
+	goto st80
+tr82:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st300
-tr773:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st300
-tr778:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st300
-tr783:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st300
-	st300:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof300
-		}
-	st_case_300:
-//line plugins/parsers/influx/machine.go:8176
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr459
-		case 13:
-			goto tr330
-		case 32:
-			goto st300
-		case 44:
-			goto tr99
-		case 45:
-			goto tr377
-		case 61:
-			goto tr99
-		case 92:
-			goto tr12
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr378
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st300
-		}
-		goto tr9
-tr459:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st301
-	st301:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof301
-		}
-	st_case_301:
-//line plugins/parsers/influx/machine.go:8215
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr459
-		case 13:
-			goto tr330
-		case 32:
-			goto st300
-		case 44:
-			goto tr99
-		case 45:
-			goto tr377
-		case 61:
-			goto tr14
-		case 92:
-			goto tr12
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr378
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st300
-		}
-		goto tr9
-tr456:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st302
-tr460:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st302
-	st302:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof302
-		}
-	st_case_302:
-//line plugins/parsers/influx/machine.go:8264
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr460
-		case 13:
-			goto tr330
-		case 32:
-			goto tr455
-		case 44:
-			goto tr7
-		case 45:
-			goto tr461
-		case 61:
-			goto tr47
-		case 92:
-			goto tr44
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr462
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr455
-		}
-		goto tr42
-tr461:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -8299,206 +8188,30 @@ tr461:
 			goto _test_eof80
 		}
 	st_case_80:
-//line plugins/parsers/influx/machine.go:8303
+//line plugins/parsers/influx/machine.go:8192
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr99
+		case 9:
+			goto tr87
 		case 11:
-			goto tr46
-		case 13:
-			goto tr99
-		case 32:
+			goto tr157
+		case 12:
 			goto tr4
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st303
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr4
-		}
-		goto st25
-tr462:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st303
-	st303:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof303
-		}
-	st_case_303:
-//line plugins/parsers/influx/machine.go:8340
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
 		case 32:
-			goto tr463
+			goto tr87
+		case 34:
+			goto tr158
 		case 44:
-			goto tr7
+			goto tr90
 		case 61:
-			goto tr47
+			goto st40
 		case 92:
-			goto st81
+			goto tr159
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st307
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-tr468:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st304
-tr496:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st304
-tr463:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st304
-tr493:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st304
-	st304:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof304
-		}
-	st_case_304:
-//line plugins/parsers/influx/machine.go:8403
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr467
-		case 13:
-			goto tr330
-		case 32:
-			goto st304
-		case 44:
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
-		case 61:
-			goto tr5
-		case 92:
-			goto tr12
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st304
-		}
-		goto tr9
-tr467:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st305
-	st305:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof305
-		}
-	st_case_305:
-//line plugins/parsers/influx/machine.go:8435
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr467
-		case 13:
-			goto tr330
-		case 32:
-			goto st304
-		case 44:
-			goto tr5
-		case 61:
-			goto tr14
-		case 92:
-			goto tr12
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st304
-		}
-		goto tr9
-tr469:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st306
-tr464:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st306
-	st306:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof306
-		}
-	st_case_306:
-//line plugins/parsers/influx/machine.go:8481
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr469
-		case 13:
-			goto tr330
-		case 32:
-			goto tr468
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto tr44
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr468
-		}
-		goto tr42
-tr44:
+		goto tr156
+tr156:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -8509,564 +8222,128 @@ tr44:
 			goto _test_eof81
 		}
 	st_case_81:
-//line plugins/parsers/influx/machine.go:8513
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
+//line plugins/parsers/influx/machine.go:8226
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr161
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto st25
-	st307:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof307
-		}
-	st_case_307:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st308
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st308:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof308
-		}
-	st_case_308:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st309
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st309:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof309
-		}
-	st_case_309:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st310
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st310:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof310
-		}
-	st_case_310:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st311
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st311:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof311
-		}
-	st_case_311:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st312
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st312:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof312
-		}
-	st_case_312:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st313
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st313:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof313
-		}
-	st_case_313:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st314
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st314:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof314
-		}
-	st_case_314:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st315
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st315:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof315
-		}
-	st_case_315:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st316
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st316:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof316
-		}
-	st_case_316:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st317
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st317:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof317
-		}
-	st_case_317:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st318
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st318:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof318
-		}
-	st_case_318:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st319
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st319:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof319
-		}
-	st_case_319:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st320
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st320:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof320
-		}
-	st_case_320:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st321
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st321:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof321
-		}
-	st_case_321:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st322
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st322:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof322
-		}
-	st_case_322:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st323
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st323:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof323
-		}
-	st_case_323:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st324
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr463
-		}
-		goto st25
-	st324:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof324
-		}
-	st_case_324:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr464
-		case 13:
-			goto tr335
-		case 32:
-			goto tr463
-		case 44:
-			goto tr7
-		case 61:
-			goto tr47
-		case 92:
-			goto st81
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr463
-		}
-		goto st25
-tr457:
+		goto st81
+tr161:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
 	goto st82
-tr489:
+tr157:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st82
+	st82:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof82
+		}
+	st_case_82:
+//line plugins/parsers/influx/machine.go:8270
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr157
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr158
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto tr159
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto tr156
+tr158:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st310
+tr162:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st310
+	st310:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof310
+		}
+	st_case_310:
+//line plugins/parsers/influx/machine.go:8314
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr472
+		case 13:
+			goto tr346
+		case 32:
+			goto tr471
+		case 44:
+			goto tr473
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr471
+		}
+		goto st26
+tr471:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st311
+tr503:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st82
-tr541:
+	goto st311
+tr555:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9075,8 +8352,8 @@ tr541:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st82
-tr547:
+	goto st311
+tr561:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9085,8 +8362,8 @@ tr547:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st82
-tr551:
+	goto st311
+tr565:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9095,8 +8372,8 @@ tr551:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st82
-tr555:
+	goto st311
+tr569:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9105,8 +8382,8 @@ tr555:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st82
-tr770:
+	goto st311
+tr780:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9115,8 +8392,8 @@ tr770:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st82
-tr793:
+	goto st311
+tr789:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9125,8 +8402,8 @@ tr793:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st82
-tr796:
+	goto st311
+tr794:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9135,7 +8412,7 @@ tr796:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st82
+	goto st311
 tr799:
 //line plugins/parsers/influx/machine.go.rl:72
 
@@ -9145,33 +8422,129 @@ tr799:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st82
-	st82:
+	goto st311
+	st311:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof82
+			goto _test_eof311
 		}
-	st_case_82:
-//line plugins/parsers/influx/machine.go:9155
+	st_case_311:
+//line plugins/parsers/influx/machine.go:8432
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr475
+		case 13:
+			goto tr346
 		case 32:
-			goto tr59
+			goto st311
 		case 44:
-			goto tr59
+			goto tr101
+		case 45:
+			goto tr393
 		case 61:
-			goto tr59
+			goto tr101
 		case 92:
-			goto tr161
+			goto tr12
 		}
 		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr394
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+			goto st311
 		}
-		goto tr160
-tr160:
+		goto tr9
+tr475:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st312
+	st312:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof312
+		}
+	st_case_312:
+//line plugins/parsers/influx/machine.go:8471
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr475
+		case 13:
+			goto tr346
+		case 32:
+			goto st311
+		case 44:
+			goto tr101
+		case 45:
+			goto tr393
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr394
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st311
+		}
+		goto tr9
+tr472:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st313
+tr476:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st313
+	st313:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof313
+		}
+	st_case_313:
+//line plugins/parsers/influx/machine.go:8520
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr476
+		case 13:
+			goto tr346
+		case 32:
+			goto tr471
+		case 44:
+			goto tr7
+		case 45:
+			goto tr477
+		case 61:
+			goto tr49
+		case 92:
+			goto tr46
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr478
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr471
+		}
+		goto tr44
+tr477:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9182,34 +8555,209 @@ tr160:
 			goto _test_eof83
 		}
 	st_case_83:
-//line plugins/parsers/influx/machine.go:9186
+//line plugins/parsers/influx/machine.go:8559
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr101
+		case 11:
+			goto tr48
+		case 13:
+			goto tr101
 		case 32:
-			goto tr59
+			goto tr4
 		case 44:
-			goto tr59
+			goto tr7
 		case 61:
-			goto tr163
+			goto tr49
 		case 92:
-			goto st114
+			goto st84
 		}
 		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st314
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+			goto tr4
 		}
-		goto st83
-tr163:
-//line plugins/parsers/influx/machine.go.rl:76
+		goto st26
+tr478:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	key = m.text()
+	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:84
+	goto st314
+	st314:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof314
+		}
+	st_case_314:
+//line plugins/parsers/influx/machine.go:8596
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st318
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+tr484:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	key = m.text()
+	m.handler.SetMeasurement(m.text())
+
+	goto st315
+tr512:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st315
+tr479:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st315
+tr509:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st315
+	st315:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof315
+		}
+	st_case_315:
+//line plugins/parsers/influx/machine.go:8659
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr483
+		case 13:
+			goto tr346
+		case 32:
+			goto st315
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st315
+		}
+		goto tr9
+tr483:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st316
+	st316:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof316
+		}
+	st_case_316:
+//line plugins/parsers/influx/machine.go:8691
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr483
+		case 13:
+			goto tr346
+		case 32:
+			goto st315
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st315
+		}
+		goto tr9
+tr485:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st317
+tr480:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st317
+	st317:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof317
+		}
+	st_case_317:
+//line plugins/parsers/influx/machine.go:8737
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr485
+		case 13:
+			goto tr346
+		case 32:
+			goto tr484
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto tr46
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr484
+		}
+		goto tr44
+tr46:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
 
 	goto st84
 	st84:
@@ -9217,50 +8765,641 @@ tr163:
 			goto _test_eof84
 		}
 	st_case_84:
-//line plugins/parsers/influx/machine.go:9221
+//line plugins/parsers/influx/machine.go:8769
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st26
+	st318:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof318
+		}
+	st_case_318:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
 		case 32:
-			goto tr59
-		case 34:
-			goto tr165
+			goto tr479
 		case 44:
-			goto tr59
-		case 45:
-			goto tr166
-		case 46:
-			goto tr167
-		case 48:
-			goto tr168
+			goto tr7
 		case 61:
-			goto tr59
-		case 70:
-			goto tr170
-		case 84:
-			goto tr171
+			goto tr49
 		case 92:
-			goto tr56
-		case 102:
-			goto tr172
-		case 116:
-			goto tr173
+			goto st84
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto tr59
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st319
 			}
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr169
-			}
-		default:
-			goto tr59
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
 		}
-		goto tr55
-tr165:
-//line plugins/parsers/influx/machine.go.rl:18
+		goto st26
+	st319:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof319
+		}
+	st_case_319:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st320
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st320:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof320
+		}
+	st_case_320:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st321
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st321:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof321
+		}
+	st_case_321:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st322
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st322:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof322
+		}
+	st_case_322:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st323
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st323:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof323
+		}
+	st_case_323:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st324
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st324:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof324
+		}
+	st_case_324:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st325
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st325:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof325
+		}
+	st_case_325:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st326
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st326:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof326
+		}
+	st_case_326:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st327
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st327:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof327
+		}
+	st_case_327:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st328
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st328:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof328
+		}
+	st_case_328:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st329
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st329:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof329
+		}
+	st_case_329:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st330
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st330:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof330
+		}
+	st_case_330:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st331
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st331:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof331
+		}
+	st_case_331:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st332
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st332:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof332
+		}
+	st_case_332:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st333
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st333:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof333
+		}
+	st_case_333:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st334
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st334:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof334
+		}
+	st_case_334:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st335
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr479
+		}
+		goto st26
+	st335:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof335
+		}
+	st_case_335:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr480
+		case 13:
+			goto tr351
+		case 32:
+			goto tr479
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr479
+		}
+		goto st26
+tr473:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.pb = m.p
+	m.handler.SetMeasurement(m.text())
+
+	goto st85
+tr505:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st85
+tr557:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st85
+tr563:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st85
+tr567:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st85
+tr571:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st85
+tr784:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st85
+tr809:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st85
+tr812:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st85
+tr815:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
 
 	goto st85
 	st85:
@@ -9268,30 +9407,27 @@ tr165:
 			goto _test_eof85
 		}
 	st_case_85:
-//line plugins/parsers/influx/machine.go:9272
+//line plugins/parsers/influx/machine.go:9411
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr175
-		case 11:
-			goto tr176
-		case 12:
-			goto tr58
 		case 32:
-			goto tr175
-		case 34:
-			goto tr177
+			goto tr61
 		case 44:
-			goto tr178
+			goto tr61
 		case 61:
-			goto tr25
+			goto tr61
 		case 92:
-			goto tr179
+			goto tr167
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
-		goto tr174
-tr174:
+		goto tr166
+tr166:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9302,43 +9438,34 @@ tr174:
 			goto _test_eof86
 		}
 	st_case_86:
-//line plugins/parsers/influx/machine.go:9306
+//line plugins/parsers/influx/machine.go:9442
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
 		case 32:
-			goto tr181
-		case 34:
-			goto tr183
+			goto tr61
 		case 44:
-			goto tr184
+			goto tr61
 		case 61:
-			goto st7
+			goto tr169
 		case 92:
-			goto st100
+			goto st118
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
 		goto st86
-tr181:
-//line plugins/parsers/influx/machine.go.rl:80
+tr169:
+//line plugins/parsers/influx/machine.go.rl:76
 
-	m.handler.AddTag(key, m.text())
+	key = m.text()
 
-	goto st87
-tr175:
-//line plugins/parsers/influx/machine.go.rl:80
+//line plugins/parsers/influx/machine.go.rl:84
 
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
+	key = m.text()
 
 	goto st87
 	st87:
@@ -9346,30 +9473,47 @@ tr175:
 			goto _test_eof87
 		}
 	st_case_87:
-//line plugins/parsers/influx/machine.go:9350
+//line plugins/parsers/influx/machine.go:9477
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st87
-		case 11:
-			goto tr188
-		case 12:
-			goto st3
 		case 32:
-			goto st87
+			goto tr61
 		case 34:
-			goto tr93
+			goto tr171
 		case 44:
-			goto st7
+			goto tr61
+		case 45:
+			goto tr172
+		case 46:
+			goto tr173
+		case 48:
+			goto tr174
 		case 61:
-			goto st7
+			goto tr61
+		case 70:
+			goto tr176
+		case 84:
+			goto tr177
 		case 92:
-			goto tr189
+			goto tr58
+		case 102:
+			goto tr178
+		case 116:
+			goto tr179
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr175
+			}
+		default:
+			goto tr61
 		}
-		goto tr186
-tr186:
+		goto tr57
+tr171:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9380,31 +9524,33 @@ tr186:
 			goto _test_eof88
 		}
 	st_case_88:
-//line plugins/parsers/influx/machine.go:9384
+//line plugins/parsers/influx/machine.go:9528
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr5
+			goto tr181
+		case 11:
+			goto tr182
+		case 12:
+			goto tr60
 		case 32:
-			goto st7
+			goto tr181
 		case 34:
-			goto tr96
+			goto tr183
 		case 44:
-			goto st7
+			goto tr184
 		case 61:
-			goto tr191
+			goto tr25
 		case 92:
-			goto st90
+			goto tr185
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st88
-tr191:
-//line plugins/parsers/influx/machine.go.rl:84
+		goto tr180
+tr180:
+//line plugins/parsers/influx/machine.go.rl:18
 
-	key = m.text()
+	m.pb = m.p
 
 	goto st89
 	st89:
@@ -9412,39 +9558,40 @@ tr191:
 			goto _test_eof89
 		}
 	st_case_89:
-//line plugins/parsers/influx/machine.go:9416
+//line plugins/parsers/influx/machine.go:9562
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
 		case 34:
-			goto tr101
-		case 45:
-			goto tr123
-		case 46:
-			goto tr124
-		case 48:
-			goto tr125
-		case 70:
-			goto tr127
-		case 84:
-			goto tr128
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
 		case 92:
-			goto st11
-		case 102:
-			goto tr129
-		case 116:
-			goto tr130
+			goto st103
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr126
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr5
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st7
-tr189:
+		goto st89
+tr187:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st90
+tr181:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9455,23 +9602,30 @@ tr189:
 			goto _test_eof90
 		}
 	st_case_90:
-//line plugins/parsers/influx/machine.go:9459
+//line plugins/parsers/influx/machine.go:9606
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st90
+		case 11:
+			goto tr194
+		case 12:
+			goto st3
+		case 32:
+			goto st90
 		case 34:
-			goto st88
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
 		case 92:
-			goto st88
+			goto tr195
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto st4
-tr188:
+		goto tr192
+tr192:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9482,43 +9636,31 @@ tr188:
 			goto _test_eof91
 		}
 	st_case_91:
-//line plugins/parsers/influx/machine.go:9486
+//line plugins/parsers/influx/machine.go:9640
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st87
-		case 11:
-			goto tr188
-		case 12:
-			goto st3
+			goto st7
+		case 10:
+			goto tr5
 		case 32:
-			goto st87
+			goto st7
 		case 34:
-			goto tr93
+			goto tr98
 		case 44:
 			goto st7
 		case 61:
-			goto tr191
+			goto tr197
 		case 92:
-			goto tr189
+			goto st93
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
 		}
-		goto tr186
-tr182:
-//line plugins/parsers/influx/machine.go.rl:80
+		goto st91
+tr197:
+//line plugins/parsers/influx/machine.go.rl:84
 
-	m.handler.AddTag(key, m.text())
-
-	goto st92
-tr176:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
+	key = m.text()
 
 	goto st92
 	st92:
@@ -9526,30 +9668,39 @@ tr176:
 			goto _test_eof92
 		}
 	st_case_92:
-//line plugins/parsers/influx/machine.go:9530
+//line plugins/parsers/influx/machine.go:9672
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr194
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
+		case 10:
+			goto tr5
 		case 34:
-			goto tr195
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
+			goto tr103
+		case 45:
+			goto tr125
+		case 46:
+			goto tr126
+		case 48:
+			goto tr127
+		case 70:
+			goto tr129
+		case 84:
+			goto tr130
 		case 92:
-			goto tr196
+			goto st11
+		case 102:
+			goto tr131
+		case 116:
+			goto tr132
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr128
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr5
 		}
-		goto tr193
-tr193:
+		goto st7
+tr195:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9560,40 +9711,23 @@ tr193:
 			goto _test_eof93
 		}
 	st_case_93:
-//line plugins/parsers/influx/machine.go:9564
+//line plugins/parsers/influx/machine.go:9715
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr198
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
 		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
+			goto st91
 		case 92:
-			goto st102
+			goto st91
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
 		}
-		goto st93
-tr198:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st94
+		goto st4
 tr194:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9604,121 +9738,40 @@ tr194:
 			goto _test_eof94
 		}
 	st_case_94:
-//line plugins/parsers/influx/machine.go:9608
+//line plugins/parsers/influx/machine.go:9742
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr181
+			goto st90
 		case 11:
 			goto tr194
 		case 12:
-			goto tr58
+			goto st3
 		case 32:
-			goto tr181
+			goto st90
 		case 34:
-			goto tr195
+			goto tr95
 		case 44:
-			goto tr184
+			goto st7
 		case 61:
-			goto tr191
+			goto tr197
 		case 92:
-			goto tr196
+			goto tr195
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+			goto tr5
 		}
-		goto tr193
-tr195:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st325
-tr199:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st325
-	st325:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof325
-		}
-	st_case_325:
-//line plugins/parsers/influx/machine.go:9652
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr488
-		case 13:
-			goto tr330
-		case 32:
-			goto tr487
-		case 44:
-			goto tr489
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr487
-		}
-		goto st32
-tr488:
+		goto tr192
+tr188:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st326
-tr490:
+	goto st95
+tr182:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st326
-	st326:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof326
-		}
-	st_case_326:
-//line plugins/parsers/influx/machine.go:9694
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr490
-		case 13:
-			goto tr330
-		case 32:
-			goto tr487
-		case 44:
-			goto tr61
-		case 45:
-			goto tr491
-		case 61:
-			goto tr14
-		case 92:
-			goto tr65
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr492
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto tr63
-tr491:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9729,661 +9782,30 @@ tr491:
 			goto _test_eof95
 		}
 	st_case_95:
-//line plugins/parsers/influx/machine.go:9733
+//line plugins/parsers/influx/machine.go:9786
 		switch ( m.data)[( m.p)] {
-		case 10:
+		case 9:
+			goto tr187
+		case 11:
+			goto tr200
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
 			goto tr201
-		case 11:
-			goto tr67
-		case 13:
-			goto tr201
-		case 32:
-			goto tr58
 		case 44:
-			goto tr61
+			goto tr190
 		case 61:
-			goto tr14
+			goto st7
 		case 92:
-			goto st34
+			goto tr202
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st327
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr58
-		}
-		goto st32
-tr492:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st327
-	st327:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof327
-		}
-	st_case_327:
-//line plugins/parsers/influx/machine.go:9770
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st329
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-tr497:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st328
-tr494:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st328
-	st328:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof328
-		}
-	st_case_328:
-//line plugins/parsers/influx/machine.go:9821
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr497
-		case 13:
-			goto tr330
-		case 32:
-			goto tr496
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto tr65
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr496
-		}
-		goto tr63
-	st329:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof329
-		}
-	st_case_329:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st330
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st330:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof330
-		}
-	st_case_330:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st331
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st331:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof331
-		}
-	st_case_331:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st332
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st332:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof332
-		}
-	st_case_332:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st333
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st333:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof333
-		}
-	st_case_333:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st334
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st334:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof334
-		}
-	st_case_334:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st335
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st335:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof335
-		}
-	st_case_335:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st336
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st336:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof336
-		}
-	st_case_336:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st337
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st337:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof337
-		}
-	st_case_337:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st338
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st338:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof338
-		}
-	st_case_338:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st339
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st339:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof339
-		}
-	st_case_339:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st340
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st340:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof340
-		}
-	st_case_340:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st341
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st341:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof341
-		}
-	st_case_341:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st342
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st342:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof342
-		}
-	st_case_342:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st343
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st343:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof343
-		}
-	st_case_343:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st344
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st344:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof344
-		}
-	st_case_344:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st345
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st345:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof345
-		}
-	st_case_345:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st346
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr493
-		}
-		goto st32
-	st346:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof346
-		}
-	st_case_346:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr494
-		case 13:
-			goto tr335
-		case 32:
-			goto tr493
-		case 44:
-			goto tr61
-		case 61:
-			goto tr14
-		case 92:
-			goto st34
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr493
-		}
-		goto st32
-tr184:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st96
-tr178:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
+		goto tr199
+tr199:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10394,28 +9816,40 @@ tr178:
 			goto _test_eof96
 		}
 	st_case_96:
-//line plugins/parsers/influx/machine.go:10398
+//line plugins/parsers/influx/machine.go:9820
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr59
-		case 32:
-			goto st7
-		case 34:
+			goto tr187
+		case 11:
 			goto tr204
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
 			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto tr203
-tr203:
+		goto st96
+tr204:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st97
+tr200:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10426,28 +9860,30 @@ tr203:
 			goto _test_eof97
 		}
 	st_case_97:
-//line plugins/parsers/influx/machine.go:10430
+//line plugins/parsers/influx/machine.go:9864
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr59
+			goto tr187
+		case 11:
+			goto tr200
+		case 12:
+			goto tr60
 		case 32:
-			goto st7
+			goto tr187
 		case 34:
-			goto tr207
+			goto tr201
 		case 44:
-			goto st7
+			goto tr190
 		case 61:
-			goto tr208
+			goto tr197
 		case 92:
-			goto st101
+			goto tr202
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st97
-tr204:
+		goto tr199
+tr201:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10456,72 +9892,89 @@ tr204:
 
 	m.handler.AddString(key, m.text())
 
-	goto st347
-tr207:
+	goto st336
+tr205:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st347
-	st347:
+	goto st336
+	st336:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof347
+			goto _test_eof336
 		}
-	st_case_347:
-//line plugins/parsers/influx/machine.go:10472
+	st_case_336:
+//line plugins/parsers/influx/machine.go:9908
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr346
 		case 11:
-			goto st348
+			goto tr504
 		case 13:
-			goto tr330
+			goto tr346
 		case 32:
-			goto st192
+			goto tr503
 		case 44:
-			goto st9
+			goto tr505
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st192
+			goto tr503
 		}
-		goto st28
-	st348:
+		goto st33
+tr504:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st337
+tr506:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st337
+	st337:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof348
+			goto _test_eof337
 		}
-	st_case_348:
+	st_case_337:
+//line plugins/parsers/influx/machine.go:9950
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr330
+			goto tr346
 		case 11:
-			goto st348
+			goto tr506
 		case 13:
-			goto tr330
+			goto tr346
 		case 32:
-			goto st192
+			goto tr503
 		case 44:
-			goto tr210
+			goto tr63
 		case 45:
-			goto tr516
+			goto tr507
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto tr67
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr517
+				goto tr508
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st192
+			goto tr503
 		}
-		goto st28
-tr516:
+		goto tr65
+tr507:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10532,57 +9985,435 @@ tr516:
 			goto _test_eof98
 		}
 	st_case_98:
-//line plugins/parsers/influx/machine.go:10536
+//line plugins/parsers/influx/machine.go:9989
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr207
+		case 11:
+			goto tr69
+		case 13:
+			goto tr207
 		case 32:
-			goto tr210
+			goto tr60
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto tr210
-			}
-		case ( m.data)[( m.p)] > 13:
+		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st349
+				goto st338
 			}
-		default:
-			goto tr210
+		case ( m.data)[( m.p)] >= 9:
+			goto tr60
 		}
-		goto st28
-tr517:
+		goto st33
+tr508:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st349
+	goto st338
+	st338:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof338
+		}
+	st_case_338:
+//line plugins/parsers/influx/machine.go:10026
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st340
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+tr513:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st339
+tr510:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st339
+	st339:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof339
+		}
+	st_case_339:
+//line plugins/parsers/influx/machine.go:10077
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr513
+		case 13:
+			goto tr346
+		case 32:
+			goto tr512
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto tr67
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr512
+		}
+		goto tr65
+	st340:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof340
+		}
+	st_case_340:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st341
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st341:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof341
+		}
+	st_case_341:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st342
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st342:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof342
+		}
+	st_case_342:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st343
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st343:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof343
+		}
+	st_case_343:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st344
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st344:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof344
+		}
+	st_case_344:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st345
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st345:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof345
+		}
+	st_case_345:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st346
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st346:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof346
+		}
+	st_case_346:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st347
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st347:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof347
+		}
+	st_case_347:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st348
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st348:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof348
+		}
+	st_case_348:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st349
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
 	st349:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof349
 		}
 	st_case_349:
-//line plugins/parsers/influx/machine.go:10571
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st350
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr509
+		}
+		goto st33
+	st350:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof350
+		}
+	st_case_350:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr510
+		case 13:
+			goto tr351
+		case 32:
+			goto tr509
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10590,41 +10421,9 @@ tr517:
 				goto st351
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
-tr518:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st350
-	st350:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof350
-		}
-	st_case_350:
-//line plugins/parsers/influx/machine.go:10608
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st350
-		case 13:
-			goto tr330
-		case 32:
-			goto st195
-		case 44:
-			goto tr50
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
-		}
-		goto st28
+		goto st33
 	st351:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof351
@@ -10632,19 +10431,19 @@ tr518:
 	st_case_351:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10652,9 +10451,9 @@ tr518:
 				goto st352
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st352:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof352
@@ -10662,19 +10461,19 @@ tr518:
 	st_case_352:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10682,9 +10481,9 @@ tr518:
 				goto st353
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st353:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof353
@@ -10692,19 +10491,19 @@ tr518:
 	st_case_353:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10712,9 +10511,9 @@ tr518:
 				goto st354
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st354:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof354
@@ -10722,19 +10521,19 @@ tr518:
 	st_case_354:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10742,9 +10541,9 @@ tr518:
 				goto st355
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st355:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof355
@@ -10752,19 +10551,19 @@ tr518:
 	st_case_355:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10772,9 +10571,9 @@ tr518:
 				goto st356
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st356:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof356
@@ -10782,19 +10581,19 @@ tr518:
 	st_case_356:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
+			goto st35
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -10802,9 +10601,9 @@ tr518:
 				goto st357
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+			goto tr509
 		}
-		goto st28
+		goto st33
 	st357:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof357
@@ -10812,358 +10611,38 @@ tr518:
 	st_case_357:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr335
+			goto tr351
 		case 11:
-			goto tr518
+			goto tr510
 		case 13:
-			goto tr335
+			goto tr351
 		case 32:
-			goto tr334
+			goto tr509
 		case 44:
-			goto tr210
+			goto tr63
 		case 61:
-			goto tr53
+			goto tr14
 		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st358
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st358:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof358
-		}
-	st_case_358:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st359
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st359:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof359
-		}
-	st_case_359:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st360
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st360:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof360
-		}
-	st_case_360:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st361
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st361:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof361
-		}
-	st_case_361:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st362
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st362:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof362
-		}
-	st_case_362:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st363
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st363:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof363
-		}
-	st_case_363:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st364
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st364:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof364
-		}
-	st_case_364:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st365:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof365
-		}
-	st_case_365:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st366
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st366:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof366
-		}
-	st_case_366:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st367
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st367:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof367
-		}
-	st_case_367:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st368
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st28
-	st368:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof368
-		}
-	st_case_368:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr518
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr210
-		case 61:
-			goto tr53
-		case 92:
-			goto st36
+			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr334
+			goto tr509
 		}
-		goto st28
-tr208:
-//line plugins/parsers/influx/machine.go.rl:76
+		goto st33
+tr190:
+//line plugins/parsers/influx/machine.go.rl:80
 
-	key = m.text()
+	m.handler.AddTag(key, m.text())
+
+	goto st99
+tr184:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
 
 	goto st99
 	st99:
@@ -11171,149 +10650,28 @@ tr208:
 			goto _test_eof99
 		}
 	st_case_99:
-//line plugins/parsers/influx/machine.go:11175
+//line plugins/parsers/influx/machine.go:10654
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
 		case 10:
-			goto tr59
+			goto tr61
 		case 32:
 			goto st7
 		case 34:
-			goto tr177
+			goto tr210
 		case 44:
 			goto st7
 		case 61:
 			goto st7
 		case 92:
-			goto tr179
+			goto tr211
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto tr174
-tr177:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st369
-tr183:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st369
-	st369:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof369
-		}
-	st_case_369:
-//line plugins/parsers/influx/machine.go:11217
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr538
-		case 13:
-			goto tr330
-		case 32:
-			goto tr487
-		case 44:
-			goto tr489
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr487
-		}
-		goto st30
-tr538:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st370
-tr540:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st370
-tr546:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st370
-tr550:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st370
-tr554:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st370
-	st370:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof370
-		}
-	st_case_370:
-//line plugins/parsers/influx/machine.go:11289
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr490
-		case 13:
-			goto tr330
-		case 32:
-			goto tr487
-		case 44:
 			goto tr61
-		case 45:
-			goto tr491
-		case 61:
-			goto tr201
-		case 92:
-			goto tr65
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr492
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto tr63
-tr179:
+		goto tr209
+tr209:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -11324,23 +10682,102 @@ tr179:
 			goto _test_eof100
 		}
 	st_case_100:
-//line plugins/parsers/influx/machine.go:11328
+//line plugins/parsers/influx/machine.go:10686
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
 		case 34:
-			goto st86
+			goto tr213
+		case 44:
+			goto st7
+		case 61:
+			goto tr214
 		case 92:
-			goto st86
+			goto st104
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st100
+tr210:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st358
+tr213:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st358
+	st358:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof358
+		}
+	st_case_358:
+//line plugins/parsers/influx/machine.go:10728
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st359
+		case 13:
+			goto tr346
+		case 32:
+			goto st200
+		case 44:
+			goto st9
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st200
+		}
+		goto st29
+	st359:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof359
+		}
+	st_case_359:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st359
+		case 13:
+			goto tr346
+		case 32:
+			goto st200
+		case 44:
+			goto tr216
+		case 45:
+			goto tr532
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
 		}
 		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr533
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+			goto st200
 		}
-		goto st30
-tr205:
+		goto st29
+tr532:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -11351,50 +10788,788 @@ tr205:
 			goto _test_eof101
 		}
 	st_case_101:
-//line plugins/parsers/influx/machine.go:11355
+//line plugins/parsers/influx/machine.go:10792
 		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st97
+		case 32:
+			goto tr216
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
 		case 92:
-			goto st97
+			goto st37
 		}
 		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr216
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st360
+			}
+		default:
+			goto tr216
 		}
-		goto st28
-tr196:
+		goto st29
+tr533:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
+	goto st360
+	st360:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof360
+		}
+	st_case_360:
+//line plugins/parsers/influx/machine.go:10827
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st362
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+tr534:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st361
+	st361:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof361
+		}
+	st_case_361:
+//line plugins/parsers/influx/machine.go:10864
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st361
+		case 13:
+			goto tr346
+		case 32:
+			goto st203
+		case 44:
+			goto tr52
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st203
+		}
+		goto st29
+	st362:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof362
+		}
+	st_case_362:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st363
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st363:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof363
+		}
+	st_case_363:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st364
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st364:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof364
+		}
+	st_case_364:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st365
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st365:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof365
+		}
+	st_case_365:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st366
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st366:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof366
+		}
+	st_case_366:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st367
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st367:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof367
+		}
+	st_case_367:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st368
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st368:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof368
+		}
+	st_case_368:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st369
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st369:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof369
+		}
+	st_case_369:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st370
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st370:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof370
+		}
+	st_case_370:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st371
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st371:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof371
+		}
+	st_case_371:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st372
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st372:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof372
+		}
+	st_case_372:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st373
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st373:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof373
+		}
+	st_case_373:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st374
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st374:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof374
+		}
+	st_case_374:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st375
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st375:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof375
+		}
+	st_case_375:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st376
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st376:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof376
+		}
+	st_case_376:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st377
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st377:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof377
+		}
+	st_case_377:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st378
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st378:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof378
+		}
+	st_case_378:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st379
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st29
+	st379:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof379
+		}
+	st_case_379:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr534
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr350
+		}
+		goto st29
+tr214:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
 	goto st102
 	st102:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof102
 		}
 	st_case_102:
-//line plugins/parsers/influx/machine.go:11382
+//line plugins/parsers/influx/machine.go:11431
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
 		case 34:
-			goto st93
+			goto tr183
+		case 44:
+			goto st7
+		case 61:
+			goto st7
 		case 92:
-			goto st93
+			goto tr185
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto tr180
+tr183:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st380
+tr189:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st380
+	st380:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof380
+		}
+	st_case_380:
+//line plugins/parsers/influx/machine.go:11473
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr554
+		case 13:
+			goto tr346
+		case 32:
+			goto tr503
+		case 44:
+			goto tr505
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr503
+		}
+		goto st31
+tr554:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st381
+tr556:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st381
+tr562:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st381
+tr566:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st381
+tr570:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st381
+	st381:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof381
+		}
+	st_case_381:
+//line plugins/parsers/influx/machine.go:11545
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr506
+		case 13:
+			goto tr346
+		case 32:
+			goto tr503
+		case 44:
+			goto tr63
+		case 45:
+			goto tr507
+		case 61:
+			goto tr207
+		case 92:
+			goto tr67
 		}
 		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr508
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+			goto tr503
 		}
-		goto st32
-tr166:
+		goto tr65
+tr185:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -11405,471 +11580,188 @@ tr166:
 			goto _test_eof103
 		}
 	st_case_103:
-//line plugins/parsers/influx/machine.go:11409
+//line plugins/parsers/influx/machine.go:11584
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
-			goto tr61
-		case 48:
-			goto st371
-		case 61:
-			goto tr59
+		case 34:
+			goto st89
 		case 92:
-			goto st35
+			goto st89
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st375
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr58
+			goto tr61
 		}
-		goto st30
-	st371:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof371
-		}
-	st_case_371:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 46:
-			goto st372
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		case 105:
-			goto st374
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr539
-		}
-		goto st30
-tr167:
+		goto st31
+tr211:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st372
-	st372:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof372
-		}
-	st_case_372:
-//line plugins/parsers/influx/machine.go:11481
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st372
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr539
-		}
-		goto st30
+	goto st104
 	st104:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof104
 		}
 	st_case_104:
+//line plugins/parsers/influx/machine.go:11611
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
 		case 34:
-			goto st105
-		case 44:
-			goto tr61
-		case 61:
-			goto tr59
+			goto st100
 		case 92:
-			goto st35
+			goto st100
 		}
 		switch {
-		case ( m.data)[( m.p)] < 43:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-				goto tr58
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
 			}
-		case ( m.data)[( m.p)] > 45:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st373
-			}
-		default:
-			goto st105
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
-		goto st30
+		goto st29
+tr202:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st105
 	st105:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof105
 		}
 	st_case_105:
+//line plugins/parsers/influx/machine.go:11638
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
+		case 34:
+			goto st96
+		case 92:
+			goto st96
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
 			goto tr61
-		case 61:
-			goto tr59
-		case 92:
-			goto st35
 		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st373
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr58
-		}
-		goto st30
-	st373:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof373
-		}
-	st_case_373:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st373
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr539
-		}
-		goto st30
-	st374:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof374
-		}
-	st_case_374:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
-		case 11:
-			goto tr546
-		case 13:
-			goto tr362
-		case 32:
-			goto tr545
-		case 44:
-			goto tr547
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr545
-		}
-		goto st30
-	st375:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof375
-		}
-	st_case_375:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 46:
-			goto st372
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		case 105:
-			goto st374
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st375
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr539
-		}
-		goto st30
-tr168:
+		goto st33
+tr172:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st376
-	st376:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof376
-		}
-	st_case_376:
-//line plugins/parsers/influx/machine.go:11681
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 46:
-			goto st372
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		case 105:
-			goto st374
-		case 117:
-			goto st377
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr539
-		}
-		goto st30
-	st377:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof377
-		}
-	st_case_377:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr366
-		case 11:
-			goto tr550
-		case 13:
-			goto tr366
-		case 32:
-			goto tr549
-		case 44:
-			goto tr551
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr549
-		}
-		goto st30
-tr169:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st378
-	st378:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof378
-		}
-	st_case_378:
-//line plugins/parsers/influx/machine.go:11748
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr540
-		case 13:
-			goto tr356
-		case 32:
-			goto tr539
-		case 44:
-			goto tr541
-		case 46:
-			goto st372
-		case 61:
-			goto tr201
-		case 69:
-			goto st104
-		case 92:
-			goto st35
-		case 101:
-			goto st104
-		case 105:
-			goto st374
-		case 117:
-			goto st377
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st378
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr539
-		}
-		goto st30
-tr170:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st379
-	st379:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof379
-		}
-	st_case_379:
-//line plugins/parsers/influx/machine.go:11795
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 11:
-			goto tr554
-		case 13:
-			goto tr370
-		case 32:
-			goto tr553
-		case 44:
-			goto tr555
-		case 61:
-			goto tr201
-		case 65:
-			goto st106
-		case 92:
-			goto st35
-		case 97:
-			goto st109
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr553
-		}
-		goto st30
+	goto st106
 	st106:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof106
 		}
 	st_case_106:
+//line plugins/parsers/influx/machine.go:11665
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
-		case 61:
-			goto tr59
-		case 76:
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
+		case 46:
 			goto st107
+		case 48:
+			goto st384
+		case 61:
+			goto tr61
 		case 92:
-			goto st35
+			goto st36
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st387
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr60
 		}
-		goto st30
+		goto st31
+tr173:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st107
 	st107:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof107
 		}
 	st_case_107:
+//line plugins/parsers/influx/machine.go:11706
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr59
-		case 83:
+			goto tr61
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st382
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr60
+		}
+		goto st31
+	st382:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof382
+		}
+	st_case_382:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 61:
+			goto tr207
+		case 69:
 			goto st108
 		case 92:
-			goto st35
+			goto st36
+		case 101:
+			goto st108
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st382
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
 		}
-		goto st30
+		goto st31
 	st108:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof108
@@ -11877,51 +11769,35 @@ tr170:
 	st_case_108:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
-		case 61:
-			goto tr59
-		case 69:
-			goto st380
-		case 92:
-			goto st35
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
-		}
-		goto st30
-	st380:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof380
-		}
-	st_case_380:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
 		case 11:
-			goto tr554
+			goto tr62
 		case 13:
-			goto tr370
+			goto tr61
 		case 32:
-			goto tr553
+			goto tr60
+		case 34:
+			goto st109
 		case 44:
-			goto tr555
+			goto tr63
 		case 61:
-			goto tr201
+			goto tr61
 		case 92:
-			goto st35
+			goto st36
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr553
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr60
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		default:
+			goto st109
 		}
-		goto st30
+		goto st31
 	st109:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof109
@@ -11929,26 +11805,351 @@ tr170:
 	st_case_109:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr59
+			goto tr61
 		case 92:
-			goto st35
-		case 108:
-			goto st110
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr60
+		}
+		goto st31
+	st383:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof383
+		}
+	st_case_383:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+	st384:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof384
+		}
+	st_case_384:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 46:
+			goto st382
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st386
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st385
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+	st385:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof385
+		}
+	st_case_385:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 46:
+			goto st382
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st385
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+	st386:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof386
+		}
+	st_case_386:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr378
+		case 11:
+			goto tr562
+		case 13:
+			goto tr378
+		case 32:
+			goto tr561
+		case 44:
+			goto tr563
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr561
 		}
-		goto st30
+		goto st31
+	st387:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof387
+		}
+	st_case_387:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 46:
+			goto st382
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st386
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st387
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+tr174:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st388
+	st388:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof388
+		}
+	st_case_388:
+//line plugins/parsers/influx/machine.go:12010
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 46:
+			goto st382
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st386
+		case 117:
+			goto st389
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st385
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+	st389:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof389
+		}
+	st_case_389:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr382
+		case 11:
+			goto tr566
+		case 13:
+			goto tr382
+		case 32:
+			goto tr565
+		case 44:
+			goto tr567
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr565
+		}
+		goto st31
+tr175:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st390
+	st390:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof390
+		}
+	st_case_390:
+//line plugins/parsers/influx/machine.go:12082
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr556
+		case 13:
+			goto tr372
+		case 32:
+			goto tr555
+		case 44:
+			goto tr557
+		case 46:
+			goto st382
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st386
+		case 117:
+			goto st389
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st390
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr555
+		}
+		goto st31
+tr176:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st391
+	st391:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof391
+		}
+	st_case_391:
+//line plugins/parsers/influx/machine.go:12129
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr570
+		case 13:
+			goto tr386
+		case 32:
+			goto tr569
+		case 44:
+			goto tr571
+		case 61:
+			goto tr207
+		case 65:
+			goto st110
+		case 92:
+			goto st36
+		case 97:
+			goto st113
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr569
+		}
+		goto st31
 	st110:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof110
@@ -11956,26 +12157,26 @@ tr170:
 	st_case_110:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr59
-		case 92:
-			goto st35
-		case 115:
+			goto tr61
+		case 76:
 			goto st111
+		case 92:
+			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr60
 		}
-		goto st30
+		goto st31
 	st111:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof111
@@ -11983,62 +12184,26 @@ tr170:
 	st_case_111:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
-		case 61:
-			goto tr59
-		case 92:
-			goto st35
-		case 101:
-			goto st380
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
-		}
-		goto st30
-tr171:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st381
-	st381:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof381
-		}
-	st_case_381:
-//line plugins/parsers/influx/machine.go:12018
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
 		case 11:
-			goto tr554
+			goto tr62
 		case 13:
-			goto tr370
+			goto tr61
 		case 32:
-			goto tr553
+			goto tr60
 		case 44:
-			goto tr555
+			goto tr63
 		case 61:
-			goto tr201
-		case 82:
+			goto tr61
+		case 83:
 			goto st112
 		case 92:
-			goto st35
-		case 114:
-			goto st113
+			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr553
+			goto tr60
 		}
-		goto st30
+		goto st31
 	st112:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof112
@@ -12046,26 +12211,51 @@ tr171:
 	st_case_112:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
 		case 61:
-			goto tr59
-		case 85:
-			goto st108
+			goto tr61
+		case 69:
+			goto st392
 		case 92:
-			goto st35
+			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
+			goto tr60
 		}
-		goto st30
+		goto st31
+	st392:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof392
+		}
+	st_case_392:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr570
+		case 13:
+			goto tr386
+		case 32:
+			goto tr569
+		case 44:
+			goto tr571
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr569
+		}
+		goto st31
 	st113:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof113
@@ -12073,228 +12263,239 @@ tr171:
 	st_case_113:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr59
-		case 11:
-			goto tr60
-		case 13:
-			goto tr59
-		case 32:
-			goto tr58
-		case 44:
 			goto tr61
-		case 61:
-			goto tr59
-		case 92:
-			goto st35
-		case 117:
-			goto st111
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr58
-		}
-		goto st30
-tr172:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st382
-	st382:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof382
-		}
-	st_case_382:
-//line plugins/parsers/influx/machine.go:12108
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
 		case 11:
-			goto tr554
+			goto tr62
 		case 13:
-			goto tr370
+			goto tr61
 		case 32:
-			goto tr553
+			goto tr60
 		case 44:
-			goto tr555
+			goto tr63
 		case 61:
-			goto tr201
+			goto tr61
 		case 92:
-			goto st35
-		case 97:
-			goto st109
+			goto st36
+		case 108:
+			goto st114
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr553
+			goto tr60
 		}
-		goto st30
-tr173:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st383
-	st383:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof383
-		}
-	st_case_383:
-//line plugins/parsers/influx/machine.go:12142
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 11:
-			goto tr554
-		case 13:
-			goto tr370
-		case 32:
-			goto tr553
-		case 44:
-			goto tr555
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		case 114:
-			goto st113
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr553
-		}
-		goto st30
-tr161:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st114
+		goto st31
 	st114:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof114
 		}
 	st_case_114:
-//line plugins/parsers/influx/machine.go:12176
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
+		case 32:
+			goto tr60
+		case 44:
+			goto tr63
+		case 61:
+			goto tr61
+		case 92:
+			goto st36
+		case 115:
+			goto st115
 		}
-		goto st83
-tr88:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st115
-tr82:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st115
-tr231:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st115
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr60
+		}
+		goto st31
 	st115:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof115
 		}
 	st_case_115:
-//line plugins/parsers/influx/machine.go:12213
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
 		case 10:
-			goto tr59
+			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
 		case 32:
-			goto st7
-		case 34:
-			goto tr204
+			goto tr60
 		case 44:
-			goto st7
+			goto tr63
 		case 61:
-			goto st7
+			goto tr61
 		case 92:
-			goto tr222
+			goto st36
+		case 101:
+			goto st392
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr60
 		}
-		goto tr221
-tr221:
+		goto st31
+tr177:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st116
+	goto st393
+	st393:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof393
+		}
+	st_case_393:
+//line plugins/parsers/influx/machine.go:12352
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr570
+		case 13:
+			goto tr386
+		case 32:
+			goto tr569
+		case 44:
+			goto tr571
+		case 61:
+			goto tr207
+		case 82:
+			goto st116
+		case 92:
+			goto st36
+		case 114:
+			goto st117
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr569
+		}
+		goto st31
 	st116:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof116
 		}
 	st_case_116:
-//line plugins/parsers/influx/machine.go:12245
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
 		case 10:
-			goto tr59
+			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
 		case 32:
-			goto st7
-		case 34:
-			goto tr207
+			goto tr60
 		case 44:
-			goto st7
+			goto tr63
 		case 61:
-			goto tr224
+			goto tr61
+		case 85:
+			goto st112
 		case 92:
-			goto st124
+			goto st36
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr60
 		}
-		goto st116
-tr224:
-//line plugins/parsers/influx/machine.go.rl:76
-
-	key = m.text()
-
-	goto st117
+		goto st31
 	st117:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof117
 		}
 	st_case_117:
-//line plugins/parsers/influx/machine.go:12277
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
 		case 10:
-			goto tr59
+			goto tr61
+		case 11:
+			goto tr62
+		case 13:
+			goto tr61
 		case 32:
-			goto st7
-		case 34:
-			goto tr177
+			goto tr60
 		case 44:
-			goto st7
+			goto tr63
 		case 61:
-			goto st7
+			goto tr61
 		case 92:
-			goto tr227
+			goto st36
+		case 117:
+			goto st115
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr60
 		}
-		goto tr226
-tr226:
+		goto st31
+tr178:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st394
+	st394:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof394
+		}
+	st_case_394:
+//line plugins/parsers/influx/machine.go:12442
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr570
+		case 13:
+			goto tr386
+		case 32:
+			goto tr569
+		case 44:
+			goto tr571
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		case 97:
+			goto st113
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr569
+		}
+		goto st31
+tr179:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st395
+	st395:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof395
+		}
+	st_case_395:
+//line plugins/parsers/influx/machine.go:12476
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr570
+		case 13:
+			goto tr386
+		case 32:
+			goto tr569
+		case 44:
+			goto tr571
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		case 114:
+			goto st117
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr569
+		}
+		goto st31
+tr167:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12305,30 +12506,33 @@ tr226:
 			goto _test_eof118
 		}
 	st_case_118:
-//line plugins/parsers/influx/machine.go:12309
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 92:
-			goto st123
+//line plugins/parsers/influx/machine.go:12510
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-tr230:
+		goto st86
+tr90:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st119
+tr84:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st119
+tr239:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12339,30 +12543,28 @@ tr230:
 			goto _test_eof119
 		}
 	st_case_119:
-//line plugins/parsers/influx/machine.go:12343
+//line plugins/parsers/influx/machine.go:12547
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr229
-		case 11:
-			goto tr234
-		case 12:
-			goto tr58
+			goto st7
+		case 10:
+			goto tr61
 		case 32:
-			goto tr229
+			goto st7
 		case 34:
-			goto tr195
+			goto tr210
 		case 44:
-			goto tr231
+			goto st7
 		case 61:
 			goto st7
 		case 92:
-			goto tr235
+			goto tr230
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto tr233
-tr233:
+		goto tr229
+tr229:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12373,43 +12575,31 @@ tr233:
 			goto _test_eof120
 		}
 	st_case_120:
-//line plugins/parsers/influx/machine.go:12377
+//line plugins/parsers/influx/machine.go:12579
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr229
-		case 11:
-			goto tr237
-		case 12:
-			goto tr58
+			goto st7
+		case 10:
+			goto tr61
 		case 32:
-			goto tr229
+			goto st7
 		case 34:
-			goto tr199
+			goto tr213
 		case 44:
-			goto tr231
+			goto st7
 		case 61:
-			goto tr97
+			goto tr232
 		case 92:
-			goto st122
+			goto st128
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
 		goto st120
-tr237:
-//line plugins/parsers/influx/machine.go.rl:80
+tr232:
+//line plugins/parsers/influx/machine.go.rl:76
 
-	m.handler.AddTag(key, m.text())
-
-	goto st121
-tr234:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
+	key = m.text()
 
 	goto st121
 	st121:
@@ -12417,30 +12607,28 @@ tr234:
 			goto _test_eof121
 		}
 	st_case_121:
-//line plugins/parsers/influx/machine.go:12421
+//line plugins/parsers/influx/machine.go:12611
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr229
-		case 11:
-			goto tr234
-		case 12:
-			goto tr58
+			goto st7
+		case 10:
+			goto tr61
 		case 32:
-			goto tr229
+			goto st7
 		case 34:
-			goto tr195
+			goto tr183
 		case 44:
-			goto tr231
+			goto st7
 		case 61:
-			goto tr97
+			goto st7
 		case 92:
 			goto tr235
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto tr233
-tr235:
+		goto tr234
+tr234:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12451,26 +12639,33 @@ tr235:
 			goto _test_eof122
 		}
 	st_case_122:
-//line plugins/parsers/influx/machine.go:12455
+//line plugins/parsers/influx/machine.go:12643
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
 		case 34:
-			goto st120
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
 		case 92:
-			goto st120
+			goto st127
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st32
-tr227:
-//line plugins/parsers/influx/machine.go.rl:18
+		goto st122
+tr238:
+//line plugins/parsers/influx/machine.go.rl:80
 
-	m.pb = m.p
+	m.handler.AddTag(key, m.text())
 
 	goto st123
 	st123:
@@ -12478,23 +12673,30 @@ tr227:
 			goto _test_eof123
 		}
 	st_case_123:
-//line plugins/parsers/influx/machine.go:12482
+//line plugins/parsers/influx/machine.go:12677
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr242
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
 		case 34:
-			goto st118
+			goto tr201
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
 		case 92:
-			goto st118
+			goto tr243
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st30
-tr222:
+		goto tr241
+tr241:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12505,26 +12707,43 @@ tr222:
 			goto _test_eof124
 		}
 	st_case_124:
-//line plugins/parsers/influx/machine.go:12509
+//line plugins/parsers/influx/machine.go:12711
 		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr245
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
 		case 34:
-			goto st116
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
 		case 92:
-			goto st116
+			goto st126
 		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st28
-tr157:
-//line plugins/parsers/influx/machine.go.rl:84
+		goto st124
+tr245:
+//line plugins/parsers/influx/machine.go.rl:80
 
-	key = m.text()
+	m.handler.AddTag(key, m.text())
+
+	goto st125
+tr242:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
 
 	goto st125
 	st125:
@@ -12532,257 +12751,30 @@ tr157:
 			goto _test_eof125
 		}
 	st_case_125:
-//line plugins/parsers/influx/machine.go:12536
+//line plugins/parsers/influx/machine.go:12755
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto tr237
 		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr239
-		case 44:
-			goto tr88
-		case 45:
-			goto tr240
-		case 46:
-			goto tr241
-		case 48:
 			goto tr242
-		case 70:
-			goto tr244
-		case 84:
-			goto tr245
-		case 92:
-			goto st164
-		case 102:
-			goto tr246
-		case 116:
-			goto tr247
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr243
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr5
-		}
-		goto st39
-tr239:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st384
-	st384:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof384
-		}
-	st_case_384:
-//line plugins/parsers/influx/machine.go:12587
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr560
-		case 11:
-			goto tr561
 		case 12:
-			goto tr455
+			goto tr60
 		case 32:
-			goto tr560
+			goto tr237
 		case 34:
-			goto tr81
+			goto tr201
 		case 44:
-			goto tr562
+			goto tr239
+		case 61:
+			goto tr99
 		case 92:
-			goto tr83
+			goto tr243
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
+			goto tr61
 		}
-		goto tr78
-tr587:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st385
-tr560:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st385
-tr721:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st385
-tr715:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st385
-tr747:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st385
-tr751:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st385
-tr755:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st385
-tr762:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st385
-tr771:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st385
-tr776:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st385
-tr781:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st385
-	st385:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof385
-		}
-	st_case_385:
-//line plugins/parsers/influx/machine.go:12715
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st385
-		case 11:
-			goto tr564
-		case 12:
-			goto st300
-		case 32:
-			goto st385
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr565
-		case 61:
-			goto st7
-		case 92:
-			goto tr94
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr566
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr90
-tr564:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st386
-	st386:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof386
-		}
-	st_case_386:
-//line plugins/parsers/influx/machine.go:12756
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st385
-		case 11:
-			goto tr564
-		case 12:
-			goto st300
-		case 32:
-			goto st385
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr565
-		case 61:
-			goto tr97
-		case 92:
-			goto tr94
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr566
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr90
-tr565:
+		goto tr241
+tr243:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -12793,807 +12785,23 @@ tr565:
 			goto _test_eof126
 		}
 	st_case_126:
-//line plugins/parsers/influx/machine.go:12797
+//line plugins/parsers/influx/machine.go:12789
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr99
-		case 32:
-			goto st7
 		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
+			goto st124
 		case 92:
-			goto st75
+			goto st124
 		}
 		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st387
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
 			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr99
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
-		goto st41
-tr566:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st387
-	st387:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof387
-		}
-	st_case_387:
-//line plugins/parsers/influx/machine.go:12834
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st389
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-tr567:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st388
-	st388:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof388
-		}
-	st_case_388:
-//line plugins/parsers/influx/machine.go:12873
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st252
-		case 11:
-			goto st388
-		case 12:
-			goto st195
-		case 32:
-			goto st252
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto st41
-	st389:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof389
-		}
-	st_case_389:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st390
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st390:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof390
-		}
-	st_case_390:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st391
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st391:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof391
-		}
-	st_case_391:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st392
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st392:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof392
-		}
-	st_case_392:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st393
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st393:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof393
-		}
-	st_case_393:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st394
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st394:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof394
-		}
-	st_case_394:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st395
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st395:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof395
-		}
-	st_case_395:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st396
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st396:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof396
-		}
-	st_case_396:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st397
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st397:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof397
-		}
-	st_case_397:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st398
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st398:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof398
-		}
-	st_case_398:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st399
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st399:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof399
-		}
-	st_case_399:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st400
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st400:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof400
-		}
-	st_case_400:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st401
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st401:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof401
-		}
-	st_case_401:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st402
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st402:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof402
-		}
-	st_case_402:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st403
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st403:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof403
-		}
-	st_case_403:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st404
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st404:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof404
-		}
-	st_case_404:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st405
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st405:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof405
-		}
-	st_case_405:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st406
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st41
-	st406:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof406
-		}
-	st_case_406:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr567
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto st75
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr335
-		}
-		goto st41
-tr561:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st407
-tr763:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st407
-tr772:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st407
-tr777:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st407
-tr782:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st407
-	st407:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof407
-		}
-	st_case_407:
-//line plugins/parsers/influx/machine.go:13522
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr587
-		case 11:
-			goto tr588
-		case 12:
-			goto tr455
-		case 32:
-			goto tr587
-		case 34:
-			goto tr152
-		case 44:
-			goto tr88
-		case 45:
-			goto tr589
-		case 61:
-			goto st39
-		case 92:
-			goto tr153
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr590
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr150
-tr588:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st408
-	st408:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof408
-		}
-	st_case_408:
-//line plugins/parsers/influx/machine.go:13567
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr587
-		case 11:
-			goto tr588
-		case 12:
-			goto tr455
-		case 32:
-			goto tr587
-		case 34:
-			goto tr152
-		case 44:
-			goto tr88
-		case 45:
-			goto tr589
-		case 61:
-			goto tr157
-		case 92:
-			goto tr153
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr590
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr150
-tr589:
+		goto st33
+tr235:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13604,216 +12812,23 @@ tr589:
 			goto _test_eof127
 		}
 	st_case_127:
-//line plugins/parsers/influx/machine.go:13608
+//line plugins/parsers/influx/machine.go:12816
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr155
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
 		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
+			goto st122
 		case 92:
-			goto st128
+			goto st122
 		}
 		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st409
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
 			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr99
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
 		}
-		goto st78
-tr590:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st409
-	st409:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof409
-		}
-	st_case_409:
-//line plugins/parsers/influx/machine.go:13647
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st413
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-tr596:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st410
-tr728:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st410
-tr591:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st410
-tr725:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st410
-	st410:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof410
-		}
-	st_case_410:
-//line plugins/parsers/influx/machine.go:13712
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st410
-		case 11:
-			goto tr595
-		case 12:
-			goto st304
-		case 32:
-			goto st410
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr94
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto tr90
-tr595:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st411
-	st411:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof411
-		}
-	st_case_411:
-//line plugins/parsers/influx/machine.go:13746
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st410
-		case 11:
-			goto tr595
-		case 12:
-			goto st304
-		case 32:
-			goto st410
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 61:
-			goto tr97
-		case 92:
-			goto tr94
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto tr90
-tr597:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st412
-tr592:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st412
-	st412:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof412
-		}
-	st_case_412:
-//line plugins/parsers/influx/machine.go:13794
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr596
-		case 11:
-			goto tr597
-		case 12:
-			goto tr468
-		case 32:
-			goto tr596
-		case 34:
-			goto tr152
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto tr153
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto tr150
-tr153:
+		goto st31
+tr230:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13824,640 +12839,168 @@ tr153:
 			goto _test_eof128
 		}
 	st_case_128:
-//line plugins/parsers/influx/machine.go:13828
+//line plugins/parsers/influx/machine.go:12843
 		switch ( m.data)[( m.p)] {
 		case 34:
-			goto st78
+			goto st120
 		case 92:
-			goto st78
+			goto st120
 		}
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
+				goto tr61
 			}
 		case ( m.data)[( m.p)] >= 9:
+			goto tr61
+		}
+		goto st29
+tr163:
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st129
+	st129:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof129
+		}
+	st_case_129:
+//line plugins/parsers/influx/machine.go:12870
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr247
+		case 44:
+			goto tr90
+		case 45:
+			goto tr248
+		case 46:
+			goto tr249
+		case 48:
+			goto tr250
+		case 70:
+			goto tr252
+		case 84:
+			goto tr253
+		case 92:
+			goto st170
+		case 102:
+			goto tr254
+		case 116:
+			goto tr255
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr251
+			}
+		case ( m.data)[( m.p)] >= 10:
 			goto tr5
 		}
-		goto st25
-	st413:
+		goto st40
+tr247:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st396
+	st396:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof413
+			goto _test_eof396
 		}
-	st_case_413:
+	st_case_396:
+//line plugins/parsers/influx/machine.go:12921
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr591
+			goto tr576
 		case 11:
-			goto tr592
+			goto tr577
 		case 12:
-			goto tr463
+			goto tr471
 		case 32:
-			goto tr591
+			goto tr576
 		case 34:
-			goto tr156
+			goto tr83
 		case 44:
-			goto tr88
-		case 61:
-			goto tr157
+			goto tr578
 		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st414
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st414:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof414
-		}
-	st_case_414:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st415
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st415:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof415
-		}
-	st_case_415:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st416
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st416:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof416
-		}
-	st_case_416:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st417
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st417:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof417
-		}
-	st_case_417:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st418
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st418:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof418
-		}
-	st_case_418:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st419
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st419:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof419
-		}
-	st_case_419:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st420
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st420:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof420
-		}
-	st_case_420:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st421
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st421:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof421
-		}
-	st_case_421:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st422
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st422:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof422
-		}
-	st_case_422:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st423
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st423:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof423
-		}
-	st_case_423:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st424
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st424:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof424
-		}
-	st_case_424:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st425
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st425:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof425
-		}
-	st_case_425:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st426
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st426:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof426
-		}
-	st_case_426:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st427
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st427:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof427
-		}
-	st_case_427:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st428
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st428:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof428
-		}
-	st_case_428:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st429
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st429:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof429
-		}
-	st_case_429:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st430
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st78
-	st430:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof430
-		}
-	st_case_430:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr591
-		case 11:
-			goto tr592
-		case 12:
-			goto tr463
-		case 32:
-			goto tr591
-		case 34:
-			goto tr156
-		case 44:
-			goto tr88
-		case 61:
-			goto tr157
-		case 92:
-			goto st128
+			goto tr85
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr335
+			goto tr346
 		}
-		goto st78
-tr81:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st431
-tr87:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st431
-	st431:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof431
-		}
-	st_case_431:
-//line plugins/parsers/influx/machine.go:14436
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr615
-		case 13:
-			goto tr330
-		case 32:
-			goto tr455
-		case 44:
-			goto tr457
-		case 92:
-			goto st129
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr455
-		}
-		goto st2
-tr615:
+		goto tr80
+tr603:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st432
-tr769:
+	goto st397
+tr576:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st397
+tr735:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st397
+tr731:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st397
+tr763:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st397
+tr767:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st397
+tr771:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st397
+tr778:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14466,8 +13009,8 @@ tr769:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st432
-tr792:
+	goto st397
+tr787:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14476,8 +13019,8 @@ tr792:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st432
-tr795:
+	goto st397
+tr792:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14486,7 +13029,814 @@ tr795:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st432
+	goto st397
+tr797:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st397
+	st397:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof397
+		}
+	st_case_397:
+//line plugins/parsers/influx/machine.go:13049
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st397
+		case 11:
+			goto tr580
+		case 12:
+			goto st311
+		case 32:
+			goto st397
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 45:
+			goto tr581
+		case 61:
+			goto st7
+		case 92:
+			goto tr96
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr582
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr92
+tr580:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st398
+	st398:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof398
+		}
+	st_case_398:
+//line plugins/parsers/influx/machine.go:13090
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st397
+		case 11:
+			goto tr580
+		case 12:
+			goto st311
+		case 32:
+			goto st397
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 45:
+			goto tr581
+		case 61:
+			goto tr99
+		case 92:
+			goto tr96
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr582
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr92
+tr581:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st130
+	st130:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof130
+		}
+	st_case_130:
+//line plugins/parsers/influx/machine.go:13131
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr101
+		case 32:
+			goto st7
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st399
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr101
+		}
+		goto st42
+tr582:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st399
+	st399:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof399
+		}
+	st_case_399:
+//line plugins/parsers/influx/machine.go:13168
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st401
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+tr583:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st400
+	st400:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof400
+		}
+	st_case_400:
+//line plugins/parsers/influx/machine.go:13207
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st261
+		case 11:
+			goto st400
+		case 12:
+			goto st203
+		case 32:
+			goto st261
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto st42
+	st401:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof401
+		}
+	st_case_401:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st402
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st402:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof402
+		}
+	st_case_402:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st403
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st403:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof403
+		}
+	st_case_403:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st404
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st404:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof404
+		}
+	st_case_404:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st405
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st405:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof405
+		}
+	st_case_405:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st406
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st406:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof406
+		}
+	st_case_406:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st407
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st407:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof407
+		}
+	st_case_407:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st408
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st408:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof408
+		}
+	st_case_408:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st409
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st409:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof409
+		}
+	st_case_409:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st410
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st410:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof410
+		}
+	st_case_410:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st411
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st411:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof411
+		}
+	st_case_411:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st412
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st412:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof412
+		}
+	st_case_412:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st413
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st413:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof413
+		}
+	st_case_413:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st414
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st414:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof414
+		}
+	st_case_414:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st415
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st415:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof415
+		}
+	st_case_415:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st416
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st416:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof416
+		}
+	st_case_416:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st417
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st417:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof417
+		}
+	st_case_417:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st418
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st42
+	st418:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof418
+		}
+	st_case_418:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr583
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr351
+		}
+		goto st42
+tr577:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st419
+tr779:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st419
+tr788:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st419
+tr793:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st419
 tr798:
 //line plugins/parsers/influx/machine.go.rl:72
 
@@ -14496,178 +13846,88 @@ tr798:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st432
-	st432:
+	goto st419
+	st419:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof432
+			goto _test_eof419
 		}
-	st_case_432:
-//line plugins/parsers/influx/machine.go:14506
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr460
-		case 13:
-			goto tr330
-		case 32:
-			goto tr455
-		case 44:
-			goto tr7
-		case 45:
-			goto tr461
-		case 61:
-			goto st2
-		case 92:
-			goto tr44
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr462
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr455
-		}
-		goto tr42
-tr2:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st129
-	st129:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof129
-		}
-	st_case_129:
-//line plugins/parsers/influx/machine.go:14545
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr1
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr1
-		}
-		goto st2
-tr562:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st130
-tr717:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st130
-tr749:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st130
-tr753:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st130
-tr757:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st130
-tr765:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st130
-tr774:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st130
-tr779:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st130
-tr784:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st130
-	st130:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof130
-		}
-	st_case_130:
-//line plugins/parsers/influx/machine.go:14650
+	st_case_419:
+//line plugins/parsers/influx/machine.go:13856
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr59
+			goto tr603
+		case 11:
+			goto tr604
+		case 12:
+			goto tr471
 		case 32:
-			goto st7
+			goto tr603
 		case 34:
-			goto tr251
+			goto tr158
 		case 44:
-			goto st7
+			goto tr90
+		case 45:
+			goto tr605
 		case 61:
-			goto st7
+			goto st40
 		case 92:
-			goto tr252
+			goto tr159
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr606
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
 		}
-		goto tr250
-tr250:
+		goto tr156
+tr604:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st420
+	st420:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof420
+		}
+	st_case_420:
+//line plugins/parsers/influx/machine.go:13901
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr603
+		case 11:
+			goto tr604
+		case 12:
+			goto tr471
+		case 32:
+			goto tr603
+		case 34:
+			goto tr158
+		case 44:
+			goto tr90
+		case 45:
+			goto tr605
+		case 61:
+			goto tr163
+		case 92:
+			goto tr159
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr606
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr156
+tr605:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -14678,102 +13938,216 @@ tr250:
 			goto _test_eof131
 		}
 	st_case_131:
-//line plugins/parsers/influx/machine.go:14682
+//line plugins/parsers/influx/machine.go:13942
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr59
+			goto tr87
+		case 11:
+			goto tr161
+		case 12:
+			goto tr4
 		case 32:
-			goto st7
+			goto tr87
 		case 34:
-			goto tr254
+			goto tr162
 		case 44:
-			goto st7
+			goto tr90
 		case 61:
-			goto tr255
+			goto tr163
 		case 92:
-			goto st163
+			goto st132
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st421
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr101
 		}
-		goto st131
-tr251:
+		goto st81
+tr606:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st433
-tr254:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st433
-	st433:
+	goto st421
+	st421:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof433
+			goto _test_eof421
 		}
-	st_case_433:
-//line plugins/parsers/influx/machine.go:14724
+	st_case_421:
+//line plugins/parsers/influx/machine.go:13981
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
+		case 9:
+			goto tr607
 		case 11:
-			goto st434
-		case 13:
-			goto tr330
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto st192
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto st9
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st192
-		}
-		goto st83
-	st434:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof434
-		}
-	st_case_434:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto st434
-		case 13:
-			goto tr330
-		case 32:
-			goto st192
-		case 44:
-			goto tr201
-		case 45:
-			goto tr617
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr618
+				goto st425
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto st192
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
-tr617:
+		goto st81
+tr612:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st422
+tr742:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st422
+tr607:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st422
+tr739:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st422
+	st422:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof422
+		}
+	st_case_422:
+//line plugins/parsers/influx/machine.go:14046
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st422
+		case 11:
+			goto tr611
+		case 12:
+			goto st315
+		case 32:
+			goto st422
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr96
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr92
+tr611:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st423
+	st423:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof423
+		}
+	st_case_423:
+//line plugins/parsers/influx/machine.go:14080
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st422
+		case 11:
+			goto tr611
+		case 12:
+			goto st315
+		case 32:
+			goto st422
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto tr96
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr92
+tr613:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st424
+tr608:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st424
+	st424:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof424
+		}
+	st_case_424:
+//line plugins/parsers/influx/machine.go:14128
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr612
+		case 11:
+			goto tr613
+		case 12:
+			goto tr484
+		case 32:
+			goto tr612
+		case 34:
+			goto tr158
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto tr159
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr156
+tr159:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -14784,690 +14158,594 @@ tr617:
 			goto _test_eof132
 		}
 	st_case_132:
-//line plugins/parsers/influx/machine.go:14788
+//line plugins/parsers/influx/machine.go:14162
 		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st81
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st26
+	st425:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof425
+		}
+	st_case_425:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr201
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] < 12:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
-				goto tr201
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st426
 			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st426:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof426
+		}
+	st_case_426:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st427
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st427:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof427
+		}
+	st_case_427:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st428
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st428:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof428
+		}
+	st_case_428:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st429
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st429:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof429
+		}
+	st_case_429:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st430
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st430:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof430
+		}
+	st_case_430:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st431
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st431:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof431
+		}
+	st_case_431:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st432
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st432:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof432
+		}
+	st_case_432:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st433
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st433:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof433
+		}
+	st_case_433:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st434
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st81
+	st434:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof434
+		}
+	st_case_434:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
+		case 32:
+			goto tr607
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st435
 			}
-		default:
-			goto tr201
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
-tr618:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st435
+		goto st81
 	st435:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof435
 		}
 	st_case_435:
-//line plugins/parsers/influx/machine.go:14823
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st437
+				goto st436
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
-tr619:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st436
+		goto st81
 	st436:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof436
 		}
 	st_case_436:
-//line plugins/parsers/influx/machine.go:14860
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
+		case 9:
+			goto tr607
 		case 11:
-			goto st436
-		case 13:
-			goto tr330
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto st195
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr59
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st195
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st437
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st437:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof437
 		}
 	st_case_437:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st438
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st438:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof438
 		}
 	st_case_438:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st439
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st439:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof439
 		}
 	st_case_439:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st440
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st440:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof440
 		}
 	st_case_440:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st441
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st441:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof441
 		}
 	st_case_441:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
+		case 9:
+			goto tr607
 		case 11:
-			goto tr619
-		case 13:
-			goto tr335
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto tr334
+			goto tr607
+		case 34:
+			goto tr162
 		case 44:
-			goto tr201
+			goto tr90
 		case 61:
 			goto tr163
 		case 92:
-			goto st114
+			goto st132
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st442
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st83
+		goto st81
 	st442:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof442
 		}
 	st_case_442:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st443
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st443:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof443
-		}
-	st_case_443:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st444
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st444:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof444
-		}
-	st_case_444:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st445
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st445:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof445
-		}
-	st_case_445:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st446
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st446:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof446
-		}
-	st_case_446:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st447
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st447:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof447
-		}
-	st_case_447:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st448
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st448:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof448
-		}
-	st_case_448:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st449
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st449:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof449
-		}
-	st_case_449:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st450
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st450:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof450
-		}
-	st_case_450:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st451
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st451:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof451
-		}
-	st_case_451:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st452
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st452:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof452
-		}
-	st_case_452:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st453
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st453:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof453
-		}
-	st_case_453:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st454
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr334
-		}
-		goto st83
-	st454:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof454
-		}
-	st_case_454:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr335
-		case 11:
-			goto tr619
-		case 13:
-			goto tr335
-		case 32:
-			goto tr334
-		case 44:
-			goto tr201
-		case 61:
-			goto tr163
-		case 92:
-			goto st114
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr334
-		}
-		goto st83
-tr255:
-//line plugins/parsers/influx/machine.go.rl:76
-
-	key = m.text()
-
-//line plugins/parsers/influx/machine.go.rl:84
-
-	key = m.text()
-
-	goto st133
-	st133:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof133
-		}
-	st_case_133:
-//line plugins/parsers/influx/machine.go:15431
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st7
-		case 10:
-			goto tr59
+			goto tr607
+		case 11:
+			goto tr608
+		case 12:
+			goto tr479
 		case 32:
-			goto st7
+			goto tr607
 		case 34:
-			goto tr258
+			goto tr162
 		case 44:
-			goto st7
-		case 45:
-			goto tr259
-		case 46:
-			goto tr260
-		case 48:
-			goto tr261
+			goto tr90
 		case 61:
-			goto st7
-		case 70:
-			goto tr263
-		case 84:
-			goto tr264
+			goto tr163
 		case 92:
-			goto tr227
-		case 102:
-			goto tr265
-		case 116:
-			goto tr266
+			goto st132
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr262
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr59
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr351
 		}
-		goto tr226
-tr258:
+		goto st81
+tr83:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -15476,52 +14754,148 @@ tr258:
 
 	m.handler.AddString(key, m.text())
 
-	goto st455
-	st455:
+	goto st443
+tr89:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st443
+	st443:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof455
+			goto _test_eof443
 		}
-	st_case_455:
-//line plugins/parsers/influx/machine.go:15486
+	st_case_443:
+//line plugins/parsers/influx/machine.go:14770
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr639
+		case 10:
+			goto tr346
 		case 11:
-			goto tr640
-		case 12:
-			goto tr487
+			goto tr631
+		case 13:
+			goto tr346
 		case 32:
-			goto tr639
-		case 34:
-			goto tr177
+			goto tr471
 		case 44:
-			goto tr641
-		case 61:
-			goto tr25
+			goto tr473
 		case 92:
-			goto tr179
+			goto st133
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr471
 		}
-		goto tr174
-tr666:
-//line plugins/parsers/influx/machine.go.rl:80
+		goto st2
+tr631:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.handler.AddTag(key, m.text())
+	m.handler.SetMeasurement(m.text())
 
-	goto st456
-tr639:
-//line plugins/parsers/influx/machine.go.rl:80
+	goto st444
+tr783:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.handler.AddTag(key, m.text())
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st444
+tr808:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st444
+tr811:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st444
+tr814:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st444
+	st444:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof444
+		}
+	st_case_444:
+//line plugins/parsers/influx/machine.go:14840
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr476
+		case 13:
+			goto tr346
+		case 32:
+			goto tr471
+		case 44:
+			goto tr7
+		case 45:
+			goto tr477
+		case 61:
+			goto st2
+		case 92:
+			goto tr46
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr478
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr471
+		}
+		goto tr44
+tr2:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st133
+	st133:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof133
+		}
+	st_case_133:
+//line plugins/parsers/influx/machine.go:14879
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr1
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr1
+		}
+		goto st2
+tr578:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
 
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st456
-tr694:
+	goto st134
+tr733:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15530,8 +14904,8 @@ tr694:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st456
-tr700:
+	goto st134
+tr765:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15540,8 +14914,8 @@ tr700:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st456
-tr704:
+	goto st134
+tr769:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15550,8 +14924,8 @@ tr704:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st456
-tr708:
+	goto st134
+tr773:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15560,87 +14934,45 @@ tr708:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st456
-	st456:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof456
-		}
-	st_case_456:
-//line plugins/parsers/influx/machine.go:15570
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st456
-		case 11:
-			goto tr643
-		case 12:
-			goto st300
-		case 32:
-			goto st456
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr644
-		case 61:
-			goto st7
-		case 92:
-			goto tr189
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr645
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr186
-tr643:
-//line plugins/parsers/influx/machine.go.rl:18
+	goto st134
+tr781:
+//line plugins/parsers/influx/machine.go.rl:72
 
-	m.pb = m.p
+	m.handler.SetMeasurement(m.text())
 
-	goto st457
-	st457:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof457
-		}
-	st_case_457:
-//line plugins/parsers/influx/machine.go:15611
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st456
-		case 11:
-			goto tr643
-		case 12:
-			goto st300
-		case 32:
-			goto st456
-		case 34:
-			goto tr93
-		case 44:
-			goto st7
-		case 45:
-			goto tr644
-		case 61:
-			goto tr191
-		case 92:
-			goto tr189
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr645
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr186
-tr644:
-//line plugins/parsers/influx/machine.go.rl:18
+//line plugins/parsers/influx/machine.go.rl:96
 
-	m.pb = m.p
+	m.handler.AddFloat(key, m.text())
+
+	goto st134
+tr790:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st134
+tr795:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st134
+tr800:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
 
 	goto st134
 	st134:
@@ -15648,807 +14980,28 @@ tr644:
 			goto _test_eof134
 		}
 	st_case_134:
-//line plugins/parsers/influx/machine.go:15652
+//line plugins/parsers/influx/machine.go:14984
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
 		case 10:
-			goto tr99
+			goto tr61
 		case 32:
 			goto st7
 		case 34:
-			goto tr96
+			goto tr259
 		case 44:
 			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st458
-			}
-		case ( m.data)[( m.p)] >= 12:
-			goto tr99
-		}
-		goto st88
-tr645:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st458
-	st458:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof458
-		}
-	st_case_458:
-//line plugins/parsers/influx/machine.go:15689
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st460
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-tr646:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st459
-	st459:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof459
-		}
-	st_case_459:
-//line plugins/parsers/influx/machine.go:15728
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st252
-		case 11:
-			goto st459
-		case 12:
-			goto st195
-		case 32:
-			goto st252
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto st88
-	st460:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof460
-		}
-	st_case_460:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st461
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st461:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof461
-		}
-	st_case_461:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st462
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st462:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof462
-		}
-	st_case_462:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st463
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st463:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof463
-		}
-	st_case_463:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st464
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st464:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof464
-		}
-	st_case_464:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st465
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st465:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof465
-		}
-	st_case_465:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st466
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st466:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof466
-		}
-	st_case_466:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st467
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st467:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof467
-		}
-	st_case_467:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st468
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st468:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof468
-		}
-	st_case_468:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st469
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st469:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof469
-		}
-	st_case_469:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st470
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st470:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof470
-		}
-	st_case_470:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st471
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st471:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof471
-		}
-	st_case_471:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st472
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st472:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof472
-		}
-	st_case_472:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st473
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st473:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof473
-		}
-	st_case_473:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st474
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st474:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof474
-		}
-	st_case_474:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st475
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st475:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof475
-		}
-	st_case_475:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st476
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st476:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof476
-		}
-	st_case_476:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st477
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st88
-	st477:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof477
-		}
-	st_case_477:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr404
-		case 11:
-			goto tr646
-		case 12:
-			goto tr334
-		case 32:
-			goto tr404
-		case 34:
-			goto tr96
-		case 44:
-			goto st7
-		case 61:
-			goto tr191
-		case 92:
-			goto st90
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr335
-		}
-		goto st88
-tr640:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st478
-tr695:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st478
-tr701:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st478
-tr705:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st478
-tr709:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st478
-	st478:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof478
-		}
-	st_case_478:
-//line plugins/parsers/influx/machine.go:16377
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr666
-		case 11:
-			goto tr667
-		case 12:
-			goto tr487
-		case 32:
-			goto tr666
-		case 34:
-			goto tr195
-		case 44:
-			goto tr184
-		case 45:
-			goto tr668
 		case 61:
 			goto st7
 		case 92:
-			goto tr196
+			goto tr260
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr669
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto tr193
-tr667:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st479
-	st479:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof479
-		}
-	st_case_479:
-//line plugins/parsers/influx/machine.go:16422
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr666
-		case 11:
-			goto tr667
-		case 12:
-			goto tr487
-		case 32:
-			goto tr666
-		case 34:
-			goto tr195
-		case 44:
-			goto tr184
-		case 45:
-			goto tr668
-		case 61:
-			goto tr191
-		case 92:
-			goto tr196
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr669
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr193
-tr668:
+		goto tr258
+tr258:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -16459,879 +15012,741 @@ tr668:
 			goto _test_eof135
 		}
 	st_case_135:
-//line plugins/parsers/influx/machine.go:16463
+//line plugins/parsers/influx/machine.go:15016
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr181
-		case 11:
-			goto tr198
-		case 12:
-			goto tr58
+			goto st7
+		case 10:
+			goto tr61
 		case 32:
-			goto tr181
+			goto st7
 		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st480
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr201
-		}
-		goto st93
-tr669:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st480
-	st480:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof480
-		}
-	st_case_480:
-//line plugins/parsers/influx/machine.go:16502
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st484
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-tr675:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st481
-tr670:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st481
-	st481:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof481
-		}
-	st_case_481:
-//line plugins/parsers/influx/machine.go:16551
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st481
-		case 11:
-			goto tr674
-		case 12:
-			goto st304
-		case 32:
-			goto st481
-		case 34:
-			goto tr93
+			goto tr262
 		case 44:
 			goto st7
 		case 61:
-			goto st7
+			goto tr263
 		case 92:
-			goto tr189
+			goto st169
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto tr186
-tr674:
+		goto st135
+tr259:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st482
-	st482:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st445
+tr262:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st445
+	st445:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof482
+			goto _test_eof445
 		}
-	st_case_482:
-//line plugins/parsers/influx/machine.go:16585
+	st_case_445:
+//line plugins/parsers/influx/machine.go:15058
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st481
+		case 10:
+			goto tr346
 		case 11:
-			goto tr674
-		case 12:
-			goto st304
+			goto st446
+		case 13:
+			goto tr346
 		case 32:
-			goto st481
-		case 34:
-			goto tr93
+			goto st200
 		case 44:
-			goto st7
+			goto st9
 		case 61:
-			goto tr191
+			goto tr169
 		case 92:
-			goto tr189
+			goto st118
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st200
 		}
-		goto tr186
-tr676:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
+		goto st86
+	st446:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof446
+		}
+	st_case_446:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st446
+		case 13:
+			goto tr346
+		case 32:
+			goto st200
+		case 44:
+			goto tr207
+		case 45:
+			goto tr633
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr634
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st200
+		}
+		goto st86
+tr633:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st483
-tr671:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st483
-	st483:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof483
-		}
-	st_case_483:
-//line plugins/parsers/influx/machine.go:16633
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr675
-		case 11:
-			goto tr676
-		case 12:
-			goto tr496
-		case 32:
-			goto tr675
-		case 34:
-			goto tr195
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto tr196
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
-		}
-		goto tr193
-	st484:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof484
-		}
-	st_case_484:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st485
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st485:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof485
-		}
-	st_case_485:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st486
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st486:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof486
-		}
-	st_case_486:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st487
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st487:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof487
-		}
-	st_case_487:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st488
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st488:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof488
-		}
-	st_case_488:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st489
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st489:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof489
-		}
-	st_case_489:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st490
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st490:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof490
-		}
-	st_case_490:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st491
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st491:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof491
-		}
-	st_case_491:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st492
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st492:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof492
-		}
-	st_case_492:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st493
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st493:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof493
-		}
-	st_case_493:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st494
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st494:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof494
-		}
-	st_case_494:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st495
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st495:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof495
-		}
-	st_case_495:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st496
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st496:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof496
-		}
-	st_case_496:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st497
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st497:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof497
-		}
-	st_case_497:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st498
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st498:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof498
-		}
-	st_case_498:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st499
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st499:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof499
-		}
-	st_case_499:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st500
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st500:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof500
-		}
-	st_case_500:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st501
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st93
-	st501:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof501
-		}
-	st_case_501:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr670
-		case 11:
-			goto tr671
-		case 12:
-			goto tr493
-		case 32:
-			goto tr670
-		case 34:
-			goto tr199
-		case 44:
-			goto tr184
-		case 61:
-			goto tr191
-		case 92:
-			goto st102
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr335
-		}
-		goto st93
-tr641:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st136
-tr696:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st136
-tr702:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st136
-tr706:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st136
-tr710:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
 	goto st136
 	st136:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof136
 		}
 	st_case_136:
-//line plugins/parsers/influx/machine.go:17282
+//line plugins/parsers/influx/machine.go:15122
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
-		case 10:
-			goto tr59
 		case 32:
-			goto st7
-		case 34:
-			goto tr251
+			goto tr207
 		case 44:
-			goto st7
+			goto tr207
 		case 61:
-			goto st7
+			goto tr169
 		case 92:
-			goto tr270
+			goto st118
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] < 12:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 10 {
+				goto tr207
+			}
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st447
+			}
+		default:
+			goto tr207
 		}
-		goto tr269
-tr269:
+		goto st86
+tr634:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st137
-	st137:
+	goto st447
+	st447:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof137
+			goto _test_eof447
 		}
-	st_case_137:
-//line plugins/parsers/influx/machine.go:17314
+	st_case_447:
+//line plugins/parsers/influx/machine.go:15157
 		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st7
 		case 10:
-			goto tr59
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
 		case 32:
-			goto st7
-		case 34:
-			goto tr254
+			goto tr350
 		case 44:
-			goto st7
+			goto tr207
 		case 61:
-			goto tr272
+			goto tr169
 		case 92:
-			goto st150
+			goto st118
 		}
-		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st449
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
 		}
-		goto st137
-tr272:
+		goto st86
+tr635:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st448
+	st448:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof448
+		}
+	st_case_448:
+//line plugins/parsers/influx/machine.go:15194
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto st448
+		case 13:
+			goto tr346
+		case 32:
+			goto st203
+		case 44:
+			goto tr61
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st203
+		}
+		goto st86
+	st449:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof449
+		}
+	st_case_449:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st450
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st450:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof450
+		}
+	st_case_450:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st451
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st451:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof451
+		}
+	st_case_451:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st452
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st452:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof452
+		}
+	st_case_452:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st453
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st453:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof453
+		}
+	st_case_453:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st454
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st454:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof454
+		}
+	st_case_454:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st455
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st455:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof455
+		}
+	st_case_455:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st456
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st456:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof456
+		}
+	st_case_456:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st457
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st457:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof457
+		}
+	st_case_457:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st458
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st458:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof458
+		}
+	st_case_458:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st459
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st459:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof459
+		}
+	st_case_459:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st460
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st460:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof460
+		}
+	st_case_460:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st461
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st461:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof461
+		}
+	st_case_461:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st462
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st462:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof462
+		}
+	st_case_462:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st463
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st463:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof463
+		}
+	st_case_463:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st464
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st464:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof464
+		}
+	st_case_464:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st465
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st465:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof465
+		}
+	st_case_465:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st466
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr350
+		}
+		goto st86
+	st466:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof466
+		}
+	st_case_466:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr351
+		case 11:
+			goto tr635
+		case 13:
+			goto tr351
+		case 32:
+			goto tr350
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr350
+		}
+		goto st86
+tr263:
 //line plugins/parsers/influx/machine.go.rl:76
 
 	key = m.text()
@@ -17340,53 +15755,1034 @@ tr272:
 
 	key = m.text()
 
+	goto st137
+	st137:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof137
+		}
+	st_case_137:
+//line plugins/parsers/influx/machine.go:15765
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
+		case 34:
+			goto tr266
+		case 44:
+			goto st7
+		case 45:
+			goto tr267
+		case 46:
+			goto tr268
+		case 48:
+			goto tr269
+		case 61:
+			goto st7
+		case 70:
+			goto tr271
+		case 84:
+			goto tr272
+		case 92:
+			goto tr235
+		case 102:
+			goto tr273
+		case 116:
+			goto tr274
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr270
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr61
+		}
+		goto tr234
+tr266:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st467
+	st467:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof467
+		}
+	st_case_467:
+//line plugins/parsers/influx/machine.go:15820
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr655
+		case 11:
+			goto tr656
+		case 12:
+			goto tr503
+		case 32:
+			goto tr655
+		case 34:
+			goto tr183
+		case 44:
+			goto tr657
+		case 61:
+			goto tr25
+		case 92:
+			goto tr185
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr180
+tr682:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st468
+tr655:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st468
+tr710:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st468
+tr716:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st468
+tr720:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st468
+tr724:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st468
+	st468:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof468
+		}
+	st_case_468:
+//line plugins/parsers/influx/machine.go:15904
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st468
+		case 11:
+			goto tr659
+		case 12:
+			goto st311
+		case 32:
+			goto st468
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 45:
+			goto tr660
+		case 61:
+			goto st7
+		case 92:
+			goto tr195
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr661
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr192
+tr659:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st469
+	st469:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof469
+		}
+	st_case_469:
+//line plugins/parsers/influx/machine.go:15945
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st468
+		case 11:
+			goto tr659
+		case 12:
+			goto st311
+		case 32:
+			goto st468
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 45:
+			goto tr660
+		case 61:
+			goto tr197
+		case 92:
+			goto tr195
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr661
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr192
+tr660:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
 	goto st138
 	st138:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof138
 		}
 	st_case_138:
-//line plugins/parsers/influx/machine.go:17350
+//line plugins/parsers/influx/machine.go:15986
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
 		case 10:
-			goto tr59
+			goto tr101
 		case 32:
 			goto st7
 		case 34:
-			goto tr258
+			goto tr98
 		case 44:
 			goto st7
-		case 45:
-			goto tr274
-		case 46:
-			goto tr275
-		case 48:
-			goto tr276
 		case 61:
-			goto st7
-		case 70:
-			goto tr278
-		case 84:
-			goto tr279
+			goto tr197
 		case 92:
-			goto tr179
-		case 102:
-			goto tr280
-		case 116:
-			goto tr281
+			goto st93
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr277
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st470
 			}
 		case ( m.data)[( m.p)] >= 12:
-			goto tr59
+			goto tr101
 		}
-		goto tr174
-tr274:
+		goto st91
+tr661:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st470
+	st470:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof470
+		}
+	st_case_470:
+//line plugins/parsers/influx/machine.go:16023
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st472
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+tr662:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st471
+	st471:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof471
+		}
+	st_case_471:
+//line plugins/parsers/influx/machine.go:16062
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st261
+		case 11:
+			goto st471
+		case 12:
+			goto st203
+		case 32:
+			goto st261
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto st91
+	st472:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof472
+		}
+	st_case_472:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st473
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st473:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof473
+		}
+	st_case_473:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st474
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st474:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof474
+		}
+	st_case_474:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st475
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st475:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof475
+		}
+	st_case_475:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st476
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st476:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof476
+		}
+	st_case_476:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st477
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st477:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof477
+		}
+	st_case_477:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st478
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st478:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof478
+		}
+	st_case_478:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st479
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st479:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof479
+		}
+	st_case_479:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st480
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st480:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof480
+		}
+	st_case_480:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st481
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st481:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof481
+		}
+	st_case_481:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st482
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st482:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof482
+		}
+	st_case_482:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st483
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st483:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof483
+		}
+	st_case_483:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st484
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st484:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof484
+		}
+	st_case_484:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st485
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st485:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof485
+		}
+	st_case_485:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st486
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st486:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof486
+		}
+	st_case_486:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st487
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st487:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof487
+		}
+	st_case_487:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st488
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st488:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof488
+		}
+	st_case_488:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st489
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st91
+	st489:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof489
+		}
+	st_case_489:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr420
+		case 11:
+			goto tr662
+		case 12:
+			goto tr350
+		case 32:
+			goto tr420
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr351
+		}
+		goto st91
+tr656:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st490
+tr711:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st490
+tr717:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st490
+tr721:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st490
+tr725:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st490
+	st490:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof490
+		}
+	st_case_490:
+//line plugins/parsers/influx/machine.go:16711
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr682
+		case 11:
+			goto tr683
+		case 12:
+			goto tr503
+		case 32:
+			goto tr682
+		case 34:
+			goto tr201
+		case 44:
+			goto tr190
+		case 45:
+			goto tr684
+		case 61:
+			goto st7
+		case 92:
+			goto tr202
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr685
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr199
+tr683:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st491
+	st491:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof491
+		}
+	st_case_491:
+//line plugins/parsers/influx/machine.go:16756
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr682
+		case 11:
+			goto tr683
+		case 12:
+			goto tr503
+		case 32:
+			goto tr682
+		case 34:
+			goto tr201
+		case 44:
+			goto tr190
+		case 45:
+			goto tr684
+		case 61:
+			goto tr197
+		case 92:
+			goto tr202
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr685
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr199
+tr684:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -17397,1157 +16793,80 @@ tr274:
 			goto _test_eof139
 		}
 	st_case_139:
-//line plugins/parsers/influx/machine.go:17401
+//line plugins/parsers/influx/machine.go:16797
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr181
+			goto tr187
 		case 11:
-			goto tr182
+			goto tr204
 		case 12:
-			goto tr58
+			goto tr60
 		case 32:
-			goto tr181
+			goto tr187
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr184
-		case 48:
-			goto st502
+			goto tr190
 		case 61:
-			goto st7
+			goto tr197
 		case 92:
-			goto st100
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st507
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr59
-		}
-		goto st86
-	st502:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof502
-		}
-	st_case_502:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 46:
-			goto st503
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
-		case 105:
-			goto st506
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
-		}
-		goto st86
-tr275:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st503
-	st503:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof503
-		}
-	st_case_503:
-//line plugins/parsers/influx/machine.go:17477
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
+			goto st105
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st503
+				goto st492
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr207
 		}
-		goto st86
-	st140:
+		goto st96
+tr685:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st492
+	st492:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof140
+			goto _test_eof492
 		}
-	st_case_140:
+	st_case_492:
+//line plugins/parsers/influx/machine.go:16836
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr181
+			goto tr686
 		case 11:
-			goto tr182
+			goto tr687
 		case 12:
-			goto tr58
+			goto tr509
 		case 32:
-			goto tr181
+			goto tr686
 		case 34:
-			goto tr284
+			goto tr205
 		case 44:
-			goto tr184
+			goto tr190
 		case 61:
-			goto st7
+			goto tr197
 		case 92:
-			goto st100
-		}
-		switch {
-		case ( m.data)[( m.p)] < 43:
-			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] > 45:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st505
-			}
-		default:
-			goto st141
-		}
-		goto st86
-tr284:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st504
-	st504:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof504
-		}
-	st_case_504:
-//line plugins/parsers/influx/machine.go:17556
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
-		case 11:
-			goto tr538
-		case 13:
-			goto tr330
-		case 32:
-			goto tr487
-		case 44:
-			goto tr489
-		case 61:
-			goto tr201
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st373
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr487
-		}
-		goto st30
-	st141:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof141
-		}
-	st_case_141:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 92:
-			goto st100
+			goto st105
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st505
+				goto st496
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr59
+			goto tr351
 		}
-		goto st86
-	st505:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof505
-		}
-	st_case_505:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st505
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
-		}
-		goto st86
-	st506:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof506
-		}
-	st_case_506:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr700
-		case 11:
-			goto tr701
-		case 12:
-			goto tr545
-		case 32:
-			goto tr700
-		case 34:
-			goto tr183
-		case 44:
-			goto tr702
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr362
-		}
-		goto st86
-	st507:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof507
-		}
-	st_case_507:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 46:
-			goto st503
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
-		case 105:
-			goto st506
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st507
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
-		}
-		goto st86
-tr276:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st508
-	st508:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof508
-		}
-	st_case_508:
-//line plugins/parsers/influx/machine.go:17724
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 46:
-			goto st503
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
-		case 105:
-			goto st506
-		case 117:
-			goto st509
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
-		}
-		goto st86
-	st509:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof509
-		}
-	st_case_509:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr704
-		case 11:
-			goto tr705
-		case 12:
-			goto tr549
-		case 32:
-			goto tr704
-		case 34:
-			goto tr183
-		case 44:
-			goto tr706
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr366
-		}
-		goto st86
-tr277:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st510
-	st510:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof510
-		}
-	st_case_510:
-//line plugins/parsers/influx/machine.go:17795
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr694
-		case 11:
-			goto tr695
-		case 12:
-			goto tr539
-		case 32:
-			goto tr694
-		case 34:
-			goto tr183
-		case 44:
-			goto tr696
-		case 46:
-			goto st503
-		case 61:
-			goto st7
-		case 69:
-			goto st140
-		case 92:
-			goto st100
-		case 101:
-			goto st140
-		case 105:
-			goto st506
-		case 117:
-			goto st509
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st510
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
-		}
-		goto st86
-tr278:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st511
-	st511:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof511
-		}
-	st_case_511:
-//line plugins/parsers/influx/machine.go:17844
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr708
-		case 11:
-			goto tr709
-		case 12:
-			goto tr553
-		case 32:
-			goto tr708
-		case 34:
-			goto tr183
-		case 44:
-			goto tr710
-		case 61:
-			goto st7
-		case 65:
-			goto st142
-		case 92:
-			goto st100
-		case 97:
-			goto st145
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st86
-	st142:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof142
-		}
-	st_case_142:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 76:
-			goto st143
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st143:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof143
-		}
-	st_case_143:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 83:
-			goto st144
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st144:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof144
-		}
-	st_case_144:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 69:
-			goto st512
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st512:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof512
-		}
-	st_case_512:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr708
-		case 11:
-			goto tr709
-		case 12:
-			goto tr553
-		case 32:
-			goto tr708
-		case 34:
-			goto tr183
-		case 44:
-			goto tr710
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st86
-	st145:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof145
-		}
-	st_case_145:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 108:
-			goto st146
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st146:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof146
-		}
-	st_case_146:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 115:
-			goto st147
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st147:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof147
-		}
-	st_case_147:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 101:
-			goto st512
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-tr279:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st513
-	st513:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof513
-		}
-	st_case_513:
-//line plugins/parsers/influx/machine.go:18083
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr708
-		case 11:
-			goto tr709
-		case 12:
-			goto tr553
-		case 32:
-			goto tr708
-		case 34:
-			goto tr183
-		case 44:
-			goto tr710
-		case 61:
-			goto st7
-		case 82:
-			goto st148
-		case 92:
-			goto st100
-		case 114:
-			goto st149
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st86
-	st148:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof148
-		}
-	st_case_148:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 85:
-			goto st144
-		case 92:
-			goto st100
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-	st149:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof149
-		}
-	st_case_149:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr181
-		case 11:
-			goto tr182
-		case 12:
-			goto tr58
-		case 32:
-			goto tr181
-		case 34:
-			goto tr183
-		case 44:
-			goto tr184
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 117:
-			goto st147
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st86
-tr280:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st514
-	st514:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof514
-		}
-	st_case_514:
-//line plugins/parsers/influx/machine.go:18179
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr708
-		case 11:
-			goto tr709
-		case 12:
-			goto tr553
-		case 32:
-			goto tr708
-		case 34:
-			goto tr183
-		case 44:
-			goto tr710
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 97:
-			goto st145
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st86
-tr281:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st515
-	st515:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof515
-		}
-	st_case_515:
-//line plugins/parsers/influx/machine.go:18215
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr708
-		case 11:
-			goto tr709
-		case 12:
-			goto tr553
-		case 32:
-			goto tr708
-		case 34:
-			goto tr183
-		case 44:
-			goto tr710
-		case 61:
-			goto st7
-		case 92:
-			goto st100
-		case 114:
-			goto st149
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st86
-tr270:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st150
-	st150:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof150
-		}
-	st_case_150:
-//line plugins/parsers/influx/machine.go:18251
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st137
-		case 92:
-			goto st137
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
-		}
-		goto st83
-tr259:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st151
-	st151:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof151
-		}
-	st_case_151:
-//line plugins/parsers/influx/machine.go:18278
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 48:
-			goto st516
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st542
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr59
-		}
-		goto st118
-	st516:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof516
-		}
-	st_case_516:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr715
-		case 11:
-			goto tr716
-		case 12:
-			goto tr539
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
-		case 46:
-			goto st539
-		case 61:
-			goto st7
-		case 69:
-			goto st153
-		case 92:
-			goto st123
-		case 101:
-			goto st153
-		case 105:
-			goto st541
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
-		}
-		goto st118
-tr716:
+		goto st96
+tr691:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-//line plugins/parsers/influx/machine.go.rl:96
-
-	m.handler.AddFloat(key, m.text())
-
-	goto st517
-tr748:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:88
-
-	m.handler.AddInt(key, m.text())
-
-	goto st517
-tr752:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st517
-tr756:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st517
-	st517:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof517
-		}
-	st_case_517:
-//line plugins/parsers/influx/machine.go:18388
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr721
-		case 11:
-			goto tr722
-		case 12:
-			goto tr487
-		case 32:
-			goto tr721
-		case 34:
-			goto tr195
-		case 44:
-			goto tr231
-		case 45:
-			goto tr723
-		case 61:
-			goto st7
-		case 92:
-			goto tr235
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr724
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr233
-tr722:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st518
-	st518:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof518
-		}
-	st_case_518:
-//line plugins/parsers/influx/machine.go:18433
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr721
-		case 11:
-			goto tr722
-		case 12:
-			goto tr487
-		case 32:
-			goto tr721
-		case 34:
-			goto tr195
-		case 44:
-			goto tr231
-		case 45:
-			goto tr723
-		case 61:
-			goto tr97
-		case 92:
-			goto tr235
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr724
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr330
-		}
-		goto tr233
-tr723:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st152
-	st152:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof152
-		}
-	st_case_152:
-//line plugins/parsers/influx/machine.go:18474
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr237
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st519
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr201
-		}
-		goto st120
-tr724:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st519
-	st519:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof519
-		}
-	st_case_519:
-//line plugins/parsers/influx/machine.go:18513
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st521
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-tr729:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st520
-tr726:
+	goto st493
+tr686:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18556,67 +16875,1300 @@ tr726:
 
 	m.handler.SetTimestamp(m.text())
 
-	goto st520
+	goto st493
+	st493:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof493
+		}
+	st_case_493:
+//line plugins/parsers/influx/machine.go:16885
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st493
+		case 11:
+			goto tr690
+		case 12:
+			goto st315
+		case 32:
+			goto st493
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr195
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr192
+tr690:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st494
+	st494:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof494
+		}
+	st_case_494:
+//line plugins/parsers/influx/machine.go:16919
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st493
+		case 11:
+			goto tr690
+		case 12:
+			goto st315
+		case 32:
+			goto st493
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto tr195
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr192
+tr692:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st495
+tr687:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st495
+	st495:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof495
+		}
+	st_case_495:
+//line plugins/parsers/influx/machine.go:16967
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr691
+		case 11:
+			goto tr692
+		case 12:
+			goto tr512
+		case 32:
+			goto tr691
+		case 34:
+			goto tr201
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto tr202
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr199
+	st496:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof496
+		}
+	st_case_496:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st497
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st497:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof497
+		}
+	st_case_497:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st498
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st498:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof498
+		}
+	st_case_498:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st499
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st499:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof499
+		}
+	st_case_499:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st500
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st500:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof500
+		}
+	st_case_500:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st501
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st501:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof501
+		}
+	st_case_501:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st502
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st502:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof502
+		}
+	st_case_502:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st503
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st503:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof503
+		}
+	st_case_503:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st504
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st504:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof504
+		}
+	st_case_504:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st505
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st505:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof505
+		}
+	st_case_505:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st506
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st506:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof506
+		}
+	st_case_506:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st507
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st507:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof507
+		}
+	st_case_507:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st508
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st508:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof508
+		}
+	st_case_508:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st509
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st509:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof509
+		}
+	st_case_509:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st510
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st510:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof510
+		}
+	st_case_510:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st511
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st511:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof511
+		}
+	st_case_511:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st512
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st512:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof512
+		}
+	st_case_512:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st513
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st96
+	st513:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof513
+		}
+	st_case_513:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr686
+		case 11:
+			goto tr687
+		case 12:
+			goto tr509
+		case 32:
+			goto tr686
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr351
+		}
+		goto st96
+tr657:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st140
+tr712:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st140
+tr718:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st140
+tr722:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st140
+tr726:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st140
+	st140:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof140
+		}
+	st_case_140:
+//line plugins/parsers/influx/machine.go:17616
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
+		case 34:
+			goto tr259
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr278
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto tr277
+tr277:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st141
+	st141:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof141
+		}
+	st_case_141:
+//line plugins/parsers/influx/machine.go:17648
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
+		case 34:
+			goto tr262
+		case 44:
+			goto st7
+		case 61:
+			goto tr280
+		case 92:
+			goto st155
+		}
+		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st141
+tr280:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+//line plugins/parsers/influx/machine.go.rl:84
+
+	key = m.text()
+
+	goto st142
+	st142:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof142
+		}
+	st_case_142:
+//line plugins/parsers/influx/machine.go:17684
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st7
+		case 10:
+			goto tr61
+		case 32:
+			goto st7
+		case 34:
+			goto tr266
+		case 44:
+			goto st7
+		case 45:
+			goto tr282
+		case 46:
+			goto tr283
+		case 48:
+			goto tr284
+		case 61:
+			goto st7
+		case 70:
+			goto tr286
+		case 84:
+			goto tr287
+		case 92:
+			goto tr185
+		case 102:
+			goto tr288
+		case 116:
+			goto tr289
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr285
+			}
+		case ( m.data)[( m.p)] >= 12:
+			goto tr61
+		}
+		goto tr180
+tr282:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st143
+	st143:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof143
+		}
+	st_case_143:
+//line plugins/parsers/influx/machine.go:17735
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 46:
+			goto st144
+		case 48:
+			goto st517
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st520
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr61
+		}
+		goto st89
+tr283:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st144
+	st144:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof144
+		}
+	st_case_144:
+//line plugins/parsers/influx/machine.go:17778
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st514
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr61
+		}
+		goto st89
+	st514:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof514
+		}
+	st_case_514:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr710
+		case 11:
+			goto tr711
+		case 12:
+			goto tr555
+		case 32:
+			goto tr710
+		case 34:
+			goto tr189
+		case 44:
+			goto tr712
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st514
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st89
+	st145:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof145
+		}
+	st_case_145:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr294
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st516
+			}
+		default:
+			goto st146
+		}
+		goto st89
+tr294:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st515
+	st515:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof515
+		}
+	st_case_515:
+//line plugins/parsers/influx/machine.go:17889
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr346
+		case 11:
+			goto tr554
+		case 13:
+			goto tr346
+		case 32:
+			goto tr503
+		case 44:
+			goto tr505
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr503
+		}
+		goto st31
+	st146:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof146
+		}
+	st_case_146:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st516
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr61
+		}
+		goto st89
+	st516:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof516
+		}
+	st_case_516:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr710
+		case 11:
+			goto tr711
+		case 12:
+			goto tr555
+		case 32:
+			goto tr710
+		case 34:
+			goto tr189
+		case 44:
+			goto tr712
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st516
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st89
+	st517:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof517
+		}
+	st_case_517:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr710
+		case 11:
+			goto tr711
+		case 12:
+			goto tr555
+		case 32:
+			goto tr710
+		case 34:
+			goto tr189
+		case 44:
+			goto tr712
+		case 46:
+			goto st514
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st519
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st518
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st89
+	st518:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof518
+		}
+	st_case_518:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr710
+		case 11:
+			goto tr711
+		case 12:
+			goto tr555
+		case 32:
+			goto tr710
+		case 34:
+			goto tr189
+		case 44:
+			goto tr712
+		case 46:
+			goto st514
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st518
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st89
+	st519:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof519
+		}
+	st_case_519:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr716
+		case 11:
+			goto tr717
+		case 12:
+			goto tr561
+		case 32:
+			goto tr716
+		case 34:
+			goto tr189
+		case 44:
+			goto tr718
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr378
+		}
+		goto st89
 	st520:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof520
 		}
 	st_case_520:
-//line plugins/parsers/influx/machine.go:18566
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr728
+			goto tr710
 		case 11:
-			goto tr729
+			goto tr711
 		case 12:
-			goto tr496
+			goto tr555
 		case 32:
-			goto tr728
+			goto tr710
 		case 34:
-			goto tr195
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr712
+		case 46:
+			goto st514
 		case 61:
-			goto tr97
+			goto st7
+		case 69:
+			goto st145
 		case 92:
-			goto tr235
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st519
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr330
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st520
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto tr233
+		goto st89
+tr284:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st521
 	st521:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof521
 		}
 	st_case_521:
+//line plugins/parsers/influx/machine.go:18135
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr725
+			goto tr710
 		case 11:
-			goto tr726
+			goto tr711
 		case 12:
-			goto tr493
+			goto tr555
 		case 32:
-			goto tr725
+			goto tr710
 		case 34:
-			goto tr199
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr712
+		case 46:
+			goto st514
 		case 61:
-			goto tr97
+			goto st7
+		case 69:
+			goto st145
 		case 92:
-			goto st122
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st519
+		case 117:
+			goto st522
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st522
+				goto st518
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr335
+			goto tr372
 		}
-		goto st120
+		goto st89
 	st522:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof522
@@ -18624,21 +18176,65 @@ tr726:
 	st_case_522:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr725
+			goto tr720
 		case 11:
-			goto tr726
+			goto tr721
 		case 12:
-			goto tr493
+			goto tr565
 		case 32:
-			goto tr725
+			goto tr720
 		case 34:
-			goto tr199
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr722
 		case 61:
-			goto tr97
+			goto st7
 		case 92:
-			goto st122
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr382
+		}
+		goto st89
+tr285:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st523
+	st523:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof523
+		}
+	st_case_523:
+//line plugins/parsers/influx/machine.go:18211
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr710
+		case 11:
+			goto tr711
+		case 12:
+			goto tr555
+		case 32:
+			goto tr710
+		case 34:
+			goto tr189
+		case 44:
+			goto tr712
+		case 46:
+			goto st514
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st519
+		case 117:
+			goto st522
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -18646,73 +18242,134 @@ tr726:
 				goto st523
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr335
+			goto tr372
 		}
-		goto st120
-	st523:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof523
-		}
-	st_case_523:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st524
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
+		goto st89
+tr286:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st524
 	st524:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof524
 		}
 	st_case_524:
+//line plugins/parsers/influx/machine.go:18260
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr725
+			goto tr724
 		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
 			goto tr725
+		case 12:
+			goto tr569
+		case 32:
+			goto tr724
 		case 34:
-			goto tr199
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr726
 		case 61:
-			goto tr97
+			goto st7
+		case 65:
+			goto st147
 		case 92:
-			goto st122
+			goto st103
+		case 97:
+			goto st150
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st525
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
 		}
-		goto st120
+		goto st89
+	st147:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof147
+		}
+	st_case_147:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 76:
+			goto st148
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+	st148:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof148
+		}
+	st_case_148:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 83:
+			goto st149
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+	st149:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof149
+		}
+	st_case_149:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 69:
+			goto st525
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
 	st525:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof525
@@ -18720,485 +18377,151 @@ tr726:
 	st_case_525:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr725
+			goto tr724
 		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
 			goto tr725
+		case 12:
+			goto tr569
+		case 32:
+			goto tr724
 		case 34:
-			goto tr199
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr726
 		case 61:
-			goto tr97
+			goto st7
 		case 92:
-			goto st122
+			goto st103
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st526
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
 		}
-		goto st120
+		goto st89
+	st150:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof150
+		}
+	st_case_150:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		case 108:
+			goto st151
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+	st151:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof151
+		}
+	st_case_151:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		case 115:
+			goto st152
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+	st152:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof152
+		}
+	st_case_152:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr187
+		case 11:
+			goto tr188
+		case 12:
+			goto tr60
+		case 32:
+			goto tr187
+		case 34:
+			goto tr189
+		case 44:
+			goto tr190
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		case 101:
+			goto st525
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+tr287:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st526
 	st526:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof526
 		}
 	st_case_526:
+//line plugins/parsers/influx/machine.go:18499
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr725
+			goto tr724
 		case 11:
+			goto tr725
+		case 12:
+			goto tr569
+		case 32:
+			goto tr724
+		case 34:
+			goto tr189
+		case 44:
 			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st527
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st527:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof527
-		}
-	st_case_527:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st528
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st528:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof528
-		}
-	st_case_528:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st529
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st529:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof529
-		}
-	st_case_529:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st530
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st530:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof530
-		}
-	st_case_530:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st531
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st531:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof531
-		}
-	st_case_531:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st532
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st532:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof532
-		}
-	st_case_532:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st533
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st533:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof533
-		}
-	st_case_533:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st534
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st534:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof534
-		}
-	st_case_534:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st535
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st535:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof535
-		}
-	st_case_535:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st536
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st536:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof536
-		}
-	st_case_536:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st537:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof537
-		}
-	st_case_537:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st538
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr335
-		}
-		goto st120
-	st538:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof538
-		}
-	st_case_538:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr725
-		case 11:
-			goto tr726
-		case 12:
-			goto tr493
-		case 32:
-			goto tr725
-		case 34:
-			goto tr199
-		case 44:
-			goto tr231
-		case 61:
-			goto tr97
-		case 92:
-			goto st122
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr335
-		}
-		goto st120
-tr260:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st539
-	st539:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof539
-		}
-	st_case_539:
-//line plugins/parsers/influx/machine.go:19171
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr715
-		case 11:
-			goto tr716
-		case 12:
-			goto tr539
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
 		case 61:
 			goto st7
-		case 69:
+		case 82:
 			goto st153
 		case 92:
-			goto st123
-		case 101:
-			goto st153
+			goto st103
+		case 114:
+			goto st154
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st539
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
 		}
-		goto st118
+		goto st89
 	st153:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof153
@@ -19206,35 +18529,28 @@ tr260:
 	st_case_153:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr229
+			goto tr187
 		case 11:
-			goto tr230
+			goto tr188
 		case 12:
-			goto tr58
+			goto tr60
 		case 32:
-			goto tr229
+			goto tr187
 		case 34:
-			goto tr284
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr190
 		case 61:
 			goto st7
+		case 85:
+			goto st149
 		case 92:
-			goto st123
+			goto st103
 		}
-		switch {
-		case ( m.data)[( m.p)] < 43:
-			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] > 45:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
-			}
-		default:
-			goto st154
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
 		}
-		goto st118
+		goto st89
 	st154:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof154
@@ -19242,21 +18558,673 @@ tr260:
 	st_case_154:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr229
+			goto tr187
 		case 11:
-			goto tr230
+			goto tr188
 		case 12:
-			goto tr58
+			goto tr60
 		case 32:
-			goto tr229
+			goto tr187
 		case 34:
-			goto tr183
+			goto tr189
 		case 44:
-			goto tr231
+			goto tr190
 		case 61:
 			goto st7
 		case 92:
-			goto st123
+			goto st103
+		case 117:
+			goto st152
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st89
+tr288:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st527
+	st527:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof527
+		}
+	st_case_527:
+//line plugins/parsers/influx/machine.go:18595
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr724
+		case 11:
+			goto tr725
+		case 12:
+			goto tr569
+		case 32:
+			goto tr724
+		case 34:
+			goto tr189
+		case 44:
+			goto tr726
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		case 97:
+			goto st150
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st89
+tr289:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st528
+	st528:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof528
+		}
+	st_case_528:
+//line plugins/parsers/influx/machine.go:18631
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr724
+		case 11:
+			goto tr725
+		case 12:
+			goto tr569
+		case 32:
+			goto tr724
+		case 34:
+			goto tr189
+		case 44:
+			goto tr726
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		case 114:
+			goto st154
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st89
+tr278:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st155
+	st155:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof155
+		}
+	st_case_155:
+//line plugins/parsers/influx/machine.go:18667
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st141
+		case 92:
+			goto st141
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
+		}
+		goto st86
+tr267:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st156
+	st156:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof156
+		}
+	st_case_156:
+//line plugins/parsers/influx/machine.go:18694
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 46:
+			goto st157
+		case 48:
+			goto st553
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st556
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr61
+		}
+		goto st122
+tr268:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st157
+	st157:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof157
+		}
+	st_case_157:
+//line plugins/parsers/influx/machine.go:18737
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st529
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr61
+		}
+		goto st122
+	st529:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof529
+		}
+	st_case_529:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr731
+		case 11:
+			goto tr732
+		case 12:
+			goto tr555
+		case 32:
+			goto tr731
+		case 34:
+			goto tr189
+		case 44:
+			goto tr733
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st529
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st122
+tr732:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:96
+
+	m.handler.AddFloat(key, m.text())
+
+	goto st530
+tr764:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:88
+
+	m.handler.AddInt(key, m.text())
+
+	goto st530
+tr768:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st530
+tr772:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st530
+	st530:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof530
+		}
+	st_case_530:
+//line plugins/parsers/influx/machine.go:18846
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr735
+		case 11:
+			goto tr736
+		case 12:
+			goto tr503
+		case 32:
+			goto tr735
+		case 34:
+			goto tr201
+		case 44:
+			goto tr239
+		case 45:
+			goto tr737
+		case 61:
+			goto st7
+		case 92:
+			goto tr243
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr738
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr241
+tr736:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st531
+	st531:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof531
+		}
+	st_case_531:
+//line plugins/parsers/influx/machine.go:18891
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr735
+		case 11:
+			goto tr736
+		case 12:
+			goto tr503
+		case 32:
+			goto tr735
+		case 34:
+			goto tr201
+		case 44:
+			goto tr239
+		case 45:
+			goto tr737
+		case 61:
+			goto tr99
+		case 92:
+			goto tr243
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto tr738
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr346
+		}
+		goto tr241
+tr737:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st158
+	st158:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof158
+		}
+	st_case_158:
+//line plugins/parsers/influx/machine.go:18932
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr245
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st532
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr207
+		}
+		goto st124
+tr738:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st532
+	st532:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof532
+		}
+	st_case_532:
+//line plugins/parsers/influx/machine.go:18971
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st534
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+tr743:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st533
+tr740:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st533
+	st533:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof533
+		}
+	st_case_533:
+//line plugins/parsers/influx/machine.go:19024
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr512
+		case 32:
+			goto tr742
+		case 34:
+			goto tr201
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto tr243
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr346
+		}
+		goto tr241
+	st534:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof534
+		}
+	st_case_534:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st535
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+	st535:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof535
+		}
+	st_case_535:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st536
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+	st536:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof536
+		}
+	st_case_536:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st537
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+	st537:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof537
+		}
+	st_case_537:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st538
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+	st538:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof538
+		}
+	st_case_538:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st539
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
+	st539:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof539
+		}
+	st_case_539:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -19264,9 +19232,9 @@ tr260:
 				goto st540
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr59
+			goto tr351
 		}
-		goto st118
+		goto st124
 	st540:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof540
@@ -19274,31 +19242,31 @@ tr260:
 	st_case_540:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr715
+			goto tr739
 		case 11:
-			goto tr716
+			goto tr740
 		case 12:
-			goto tr539
+			goto tr509
 		case 32:
-			goto tr715
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr717
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
+			goto st126
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
+				goto st541
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr351
 		}
-		goto st118
+		goto st124
 	st541:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof541
@@ -19306,56 +19274,21 @@ tr260:
 	st_case_541:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr747
+			goto tr739
 		case 11:
-			goto tr748
+			goto tr740
 		case 12:
-			goto tr545
+			goto tr509
 		case 32:
-			goto tr747
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr749
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr362
-		}
-		goto st118
-	st542:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof542
-		}
-	st_case_542:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr715
-		case 11:
-			goto tr716
-		case 12:
-			goto tr539
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
-		case 46:
-			goto st539
-		case 61:
-			goto st7
-		case 69:
-			goto st153
-		case 92:
-			goto st123
-		case 101:
-			goto st153
-		case 105:
-			goto st541
+			goto st126
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -19363,53 +19296,73 @@ tr260:
 				goto st542
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr351
 		}
-		goto st118
-tr261:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st543
+		goto st124
+	st542:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof542
+		}
+	st_case_542:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st543
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
 	st543:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof543
 		}
 	st_case_543:
-//line plugins/parsers/influx/machine.go:19381
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr715
+			goto tr739
 		case 11:
-			goto tr716
+			goto tr740
 		case 12:
-			goto tr539
+			goto tr509
 		case 32:
-			goto tr715
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr717
-		case 46:
-			goto st539
+			goto tr239
 		case 61:
-			goto st7
-		case 69:
-			goto st153
+			goto tr99
 		case 92:
-			goto st123
-		case 101:
-			goto st153
-		case 105:
-			goto st541
-		case 117:
-			goto st544
+			goto st126
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st544
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st118
+		goto st124
 	st544:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof544
@@ -19417,65 +19370,21 @@ tr261:
 	st_case_544:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr751
+			goto tr739
 		case 11:
-			goto tr752
+			goto tr740
 		case 12:
-			goto tr549
+			goto tr509
 		case 32:
-			goto tr751
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr753
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr366
-		}
-		goto st118
-tr262:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st545
-	st545:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof545
-		}
-	st_case_545:
-//line plugins/parsers/influx/machine.go:19452
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr715
-		case 11:
-			goto tr716
-		case 12:
-			goto tr539
-		case 32:
-			goto tr715
-		case 34:
-			goto tr183
-		case 44:
-			goto tr717
-		case 46:
-			goto st539
-		case 61:
-			goto st7
-		case 69:
-			goto st153
-		case 92:
-			goto st123
-		case 101:
-			goto st153
-		case 105:
-			goto st541
-		case 117:
-			goto st544
+			goto st126
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -19483,134 +19392,73 @@ tr262:
 				goto st545
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr351
 		}
-		goto st118
-tr263:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st546
+		goto st124
+	st545:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof545
+		}
+	st_case_545:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr739
+		case 11:
+			goto tr740
+		case 12:
+			goto tr509
+		case 32:
+			goto tr739
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st546
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
+		}
+		goto st124
 	st546:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof546
 		}
 	st_case_546:
-//line plugins/parsers/influx/machine.go:19501
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr755
+			goto tr739
 		case 11:
-			goto tr756
+			goto tr740
 		case 12:
-			goto tr553
+			goto tr509
 		case 32:
-			goto tr755
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr757
+			goto tr239
 		case 61:
-			goto st7
-		case 65:
-			goto st155
+			goto tr99
 		case 92:
-			goto st123
-		case 97:
-			goto st158
+			goto st126
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st547
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st118
-	st155:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof155
-		}
-	st_case_155:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 76:
-			goto st156
-		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-	st156:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof156
-		}
-	st_case_156:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 83:
-			goto st157
-		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-	st157:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof157
-		}
-	st_case_157:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 69:
-			goto st547
-		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
+		goto st124
 	st547:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof547
@@ -19618,374 +19466,127 @@ tr263:
 	st_case_547:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr755
+			goto tr739
 		case 11:
-			goto tr756
+			goto tr740
 		case 12:
-			goto tr553
+			goto tr509
 		case 32:
-			goto tr755
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr757
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
+			goto st126
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st548
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st118
-	st158:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof158
-		}
-	st_case_158:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		case 108:
-			goto st159
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-	st159:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof159
-		}
-	st_case_159:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		case 115:
-			goto st160
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-	st160:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof160
-		}
-	st_case_160:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		case 101:
-			goto st547
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-tr264:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st548
+		goto st124
 	st548:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof548
 		}
 	st_case_548:
-//line plugins/parsers/influx/machine.go:19740
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr755
+			goto tr739
 		case 11:
-			goto tr756
+			goto tr740
 		case 12:
-			goto tr553
+			goto tr509
 		case 32:
-			goto tr755
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr757
+			goto tr239
 		case 61:
-			goto st7
-		case 82:
-			goto st161
+			goto tr99
 		case 92:
-			goto st123
-		case 114:
-			goto st162
+			goto st126
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st549
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st118
-	st161:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof161
-		}
-	st_case_161:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 85:
-			goto st157
-		case 92:
-			goto st123
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-	st162:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof162
-		}
-	st_case_162:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr229
-		case 11:
-			goto tr230
-		case 12:
-			goto tr58
-		case 32:
-			goto tr229
-		case 34:
-			goto tr183
-		case 44:
-			goto tr231
-		case 61:
-			goto st7
-		case 92:
-			goto st123
-		case 117:
-			goto st160
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr59
-		}
-		goto st118
-tr265:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st549
+		goto st124
 	st549:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof549
 		}
 	st_case_549:
-//line plugins/parsers/influx/machine.go:19836
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr755
+			goto tr739
 		case 11:
-			goto tr756
+			goto tr740
 		case 12:
-			goto tr553
+			goto tr509
 		case 32:
-			goto tr755
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr757
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
-		case 97:
-			goto st158
+			goto st126
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st550
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr351
 		}
-		goto st118
-tr266:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st550
+		goto st124
 	st550:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof550
 		}
 	st_case_550:
-//line plugins/parsers/influx/machine.go:19872
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr755
+			goto tr739
 		case 11:
-			goto tr756
+			goto tr740
 		case 12:
-			goto tr553
+			goto tr509
 		case 32:
-			goto tr755
+			goto tr739
 		case 34:
-			goto tr183
+			goto tr205
 		case 44:
-			goto tr757
+			goto tr239
 		case 61:
-			goto st7
+			goto tr99
 		case 92:
-			goto st123
-		case 114:
-			goto st162
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st118
-tr252:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st163
-	st163:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof163
-		}
-	st_case_163:
-//line plugins/parsers/influx/machine.go:19908
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st131
-		case 92:
-			goto st131
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr59
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr59
-		}
-		goto st83
-tr83:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st164
-	st164:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof164
-		}
-	st_case_164:
-//line plugins/parsers/influx/machine.go:19935
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st39
-		case 92:
-			goto st39
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st2
-tr240:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st165
-	st165:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof165
-		}
-	st_case_165:
-//line plugins/parsers/influx/machine.go:19962
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 48:
-			goto st551
-		case 92:
-			goto st164
+			goto st126
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st557
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st551
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr5
+			goto tr351
 		}
-		goto st39
+		goto st124
 	st551:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof551
@@ -19993,63 +19594,84 @@ tr240:
 	st_case_551:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
+			goto tr739
 		case 11:
-			goto tr763
+			goto tr740
 		case 12:
-			goto tr764
+			goto tr509
 		case 32:
-			goto tr762
+			goto tr739
 		case 34:
-			goto tr87
+			goto tr205
 		case 44:
-			goto tr765
-		case 46:
-			goto st552
-		case 69:
-			goto st166
+			goto tr239
+		case 61:
+			goto tr99
 		case 92:
-			goto st164
-		case 101:
-			goto st166
-		case 105:
-			goto st556
+			goto st126
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
+			goto tr351
 		}
-		goto st39
-tr241:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st552
-	st552:
+		goto st124
+	st159:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof552
+			goto _test_eof159
 		}
-	st_case_552:
-//line plugins/parsers/influx/machine.go:20034
+	st_case_159:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
+			goto tr237
 		case 11:
-			goto tr763
+			goto tr238
 		case 12:
-			goto tr764
+			goto tr60
 		case 32:
-			goto tr762
+			goto tr237
 		case 34:
-			goto tr87
+			goto tr294
 		case 44:
-			goto tr765
-		case 69:
-			goto st166
+			goto tr239
+		case 61:
+			goto st7
 		case 92:
-			goto st164
-		case 101:
-			goto st166
+			goto st127
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st552
+			}
+		default:
+			goto st160
+		}
+		goto st122
+	st160:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof160
+		}
+	st_case_160:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 92:
+			goto st127
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -20057,136 +19679,119 @@ tr241:
 				goto st552
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr61
 		}
-		goto st39
-	st166:
+		goto st122
+	st552:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof166
+			goto _test_eof552
 		}
-	st_case_166:
+	st_case_552:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto tr731
 		case 11:
-			goto tr86
+			goto tr732
 		case 12:
-			goto tr4
+			goto tr555
 		case 32:
-			goto tr85
+			goto tr731
 		case 34:
-			goto tr304
+			goto tr189
 		case 44:
-			goto tr88
+			goto tr733
+		case 61:
+			goto st7
 		case 92:
-			goto st164
+			goto st127
 		}
 		switch {
-		case ( m.data)[( m.p)] < 43:
-			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] > 45:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
+				goto st552
 			}
-		default:
-			goto st167
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st39
-tr304:
-//line plugins/parsers/influx/machine.go.rl:104
-
-	m.handler.AddString(key, m.text())
-
-	goto st553
+		goto st122
 	st553:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof553
 		}
 	st_case_553:
-//line plugins/parsers/influx/machine.go:20109
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr330
+		case 9:
+			goto tr731
 		case 11:
-			goto tr615
-		case 13:
-			goto tr330
+			goto tr732
+		case 12:
+			goto tr555
 		case 32:
-			goto tr455
+			goto tr731
+		case 34:
+			goto tr189
 		case 44:
-			goto tr457
+			goto tr733
+		case 46:
+			goto st529
+		case 61:
+			goto st7
+		case 69:
+			goto st159
 		case 92:
-			goto st129
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st555
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st554
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr455
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
+		goto st122
 	st554:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof554
 		}
 	st_case_554:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr769
-		case 13:
-			goto tr356
-		case 32:
-			goto tr764
-		case 44:
-			goto tr770
-		case 92:
-			goto st129
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr764
-		}
-		goto st2
-	st167:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof167
-		}
-	st_case_167:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto tr731
 		case 11:
-			goto tr86
+			goto tr732
 		case 12:
-			goto tr4
+			goto tr555
 		case 32:
-			goto tr85
+			goto tr731
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr88
+			goto tr733
+		case 46:
+			goto st529
+		case 61:
+			goto st7
+		case 69:
+			goto st159
 		case 92:
-			goto st164
+			goto st127
+		case 101:
+			goto st159
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
+				goto st554
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr5
+			goto tr372
 		}
-		goto st39
+		goto st122
 	st555:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof555
@@ -20194,29 +19799,26 @@ tr304:
 	st_case_555:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
-		case 11:
 			goto tr763
-		case 12:
+		case 11:
 			goto tr764
+		case 12:
+			goto tr561
 		case 32:
-			goto tr762
+			goto tr763
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
 			goto tr765
+		case 61:
+			goto st7
 		case 92:
-			goto st164
+			goto st127
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st555
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr378
 		}
-		goto st39
+		goto st122
 	st556:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof556
@@ -20224,130 +19826,165 @@ tr304:
 	st_case_556:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr731
 		case 11:
-			goto tr772
+			goto tr732
 		case 12:
-			goto tr773
+			goto tr555
 		case 32:
-			goto tr771
+			goto tr731
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr774
+			goto tr733
+		case 46:
+			goto st529
+		case 61:
+			goto st7
+		case 69:
+			goto st159
 		case 92:
-			goto st164
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st555
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr362
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st556
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st39
+		goto st122
+tr269:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st557
 	st557:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof557
 		}
 	st_case_557:
+//line plugins/parsers/influx/machine.go:19874
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
+			goto tr731
 		case 11:
-			goto tr763
+			goto tr732
 		case 12:
-			goto tr764
+			goto tr555
 		case 32:
-			goto tr762
+			goto tr731
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr765
+			goto tr733
 		case 46:
-			goto st552
+			goto st529
+		case 61:
+			goto st7
 		case 69:
-			goto st166
+			goto st159
 		case 92:
-			goto st164
+			goto st127
 		case 101:
-			goto st166
+			goto st159
 		case 105:
-			goto st556
+			goto st555
+		case 117:
+			goto st558
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st557
+				goto st554
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+			goto tr372
 		}
-		goto st39
-tr242:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st558
+		goto st122
 	st558:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof558
 		}
 	st_case_558:
-//line plugins/parsers/influx/machine.go:20295
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
+			goto tr767
 		case 11:
-			goto tr763
+			goto tr768
 		case 12:
-			goto tr764
+			goto tr565
 		case 32:
-			goto tr762
+			goto tr767
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr765
-		case 46:
-			goto st552
-		case 69:
-			goto st166
+			goto tr769
+		case 61:
+			goto st7
 		case 92:
-			goto st164
-		case 101:
-			goto st166
-		case 105:
-			goto st556
-		case 117:
-			goto st559
+			goto st127
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr356
+			goto tr382
 		}
-		goto st39
+		goto st122
+tr270:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st559
 	st559:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof559
 		}
 	st_case_559:
+//line plugins/parsers/influx/machine.go:19950
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr776
+			goto tr731
 		case 11:
-			goto tr777
+			goto tr732
 		case 12:
-			goto tr778
+			goto tr555
 		case 32:
-			goto tr776
+			goto tr731
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr779
+			goto tr733
+		case 46:
+			goto st529
+		case 61:
+			goto st7
+		case 69:
+			goto st159
 		case 92:
-			goto st164
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st555
+		case 117:
+			goto st558
 		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr366
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st559
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st39
-tr243:
+		goto st122
+tr271:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -20358,78 +19995,301 @@ tr243:
 			goto _test_eof560
 		}
 	st_case_560:
-//line plugins/parsers/influx/machine.go:20362
+//line plugins/parsers/influx/machine.go:19999
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr762
+			goto tr771
 		case 11:
-			goto tr763
+			goto tr772
 		case 12:
-			goto tr764
+			goto tr569
 		case 32:
-			goto tr762
+			goto tr771
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr765
-		case 46:
-			goto st552
-		case 69:
-			goto st166
+			goto tr773
+		case 61:
+			goto st7
+		case 65:
+			goto st161
 		case 92:
+			goto st127
+		case 97:
 			goto st164
-		case 101:
-			goto st166
-		case 105:
-			goto st556
-		case 117:
-			goto st559
 		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st560
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr356
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
 		}
-		goto st39
-tr244:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st561
+		goto st122
+	st161:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof161
+		}
+	st_case_161:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 76:
+			goto st162
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
+	st162:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof162
+		}
+	st_case_162:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 83:
+			goto st163
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
+	st163:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof163
+		}
+	st_case_163:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 69:
+			goto st561
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
 	st561:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof561
 		}
 	st_case_561:
-//line plugins/parsers/influx/machine.go:20409
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr781
+			goto tr771
 		case 11:
-			goto tr782
+			goto tr772
 		case 12:
-			goto tr783
+			goto tr569
 		case 32:
-			goto tr781
+			goto tr771
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr784
-		case 65:
-			goto st168
+			goto tr773
+		case 61:
+			goto st7
 		case 92:
-			goto st164
-		case 97:
-			goto st171
+			goto st127
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+			goto tr386
 		}
-		goto st39
+		goto st122
+	st164:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof164
+		}
+	st_case_164:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		case 108:
+			goto st165
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
+	st165:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof165
+		}
+	st_case_165:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		case 115:
+			goto st166
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
+	st166:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof166
+		}
+	st_case_166:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		case 101:
+			goto st561
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
+tr272:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st562
+	st562:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof562
+		}
+	st_case_562:
+//line plugins/parsers/influx/machine.go:20238
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr771
+		case 11:
+			goto tr772
+		case 12:
+			goto tr569
+		case 32:
+			goto tr771
+		case 34:
+			goto tr189
+		case 44:
+			goto tr773
+		case 61:
+			goto st7
+		case 82:
+			goto st167
+		case 92:
+			goto st127
+		case 114:
+			goto st168
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st122
+	st167:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof167
+		}
+	st_case_167:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr237
+		case 11:
+			goto tr238
+		case 12:
+			goto tr60
+		case 32:
+			goto tr237
+		case 34:
+			goto tr189
+		case 44:
+			goto tr239
+		case 61:
+			goto st7
+		case 85:
+			goto st163
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr61
+		}
+		goto st122
 	st168:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof168
@@ -20437,187 +20297,29 @@ tr244:
 	st_case_168:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr85
+			goto tr237
 		case 11:
-			goto tr86
+			goto tr238
 		case 12:
-			goto tr4
+			goto tr60
 		case 32:
-			goto tr85
+			goto tr237
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr88
-		case 76:
-			goto st169
+			goto tr239
+		case 61:
+			goto st7
 		case 92:
-			goto st164
+			goto st127
+		case 117:
+			goto st166
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
+			goto tr61
 		}
-		goto st39
-	st169:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof169
-		}
-	st_case_169:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 83:
-			goto st170
-		case 92:
-			goto st164
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-	st170:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof170
-		}
-	st_case_170:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 69:
-			goto st562
-		case 92:
-			goto st164
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-	st562:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof562
-		}
-	st_case_562:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr781
-		case 11:
-			goto tr782
-		case 12:
-			goto tr783
-		case 32:
-			goto tr781
-		case 34:
-			goto tr87
-		case 44:
-			goto tr784
-		case 92:
-			goto st164
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st39
-	st171:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof171
-		}
-	st_case_171:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 92:
-			goto st164
-		case 108:
-			goto st172
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-	st172:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof172
-		}
-	st_case_172:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 92:
-			goto st164
-		case 115:
-			goto st173
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-	st173:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof173
-		}
-	st_case_173:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 92:
-			goto st164
-		case 101:
-			goto st562
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-tr245:
+		goto st122
+tr273:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -20628,86 +20330,32 @@ tr245:
 			goto _test_eof563
 		}
 	st_case_563:
-//line plugins/parsers/influx/machine.go:20632
+//line plugins/parsers/influx/machine.go:20334
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr781
+			goto tr771
 		case 11:
-			goto tr782
+			goto tr772
 		case 12:
-			goto tr783
+			goto tr569
 		case 32:
-			goto tr781
+			goto tr771
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr784
-		case 82:
-			goto st174
-		case 92:
-			goto st164
-		case 114:
-			goto st175
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st39
-	st174:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof174
-		}
-	st_case_174:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 85:
-			goto st170
+			goto tr773
+		case 61:
+			goto st7
 		case 92:
+			goto st127
+		case 97:
 			goto st164
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
+			goto tr386
 		}
-		goto st39
-	st175:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof175
-		}
-	st_case_175:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr85
-		case 11:
-			goto tr86
-		case 12:
-			goto tr4
-		case 32:
-			goto tr85
-		case 34:
-			goto tr87
-		case 44:
-			goto tr88
-		case 92:
-			goto st164
-		case 117:
-			goto st173
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr5
-		}
-		goto st39
-tr246:
+		goto st122
+tr274:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -20718,160 +20366,256 @@ tr246:
 			goto _test_eof564
 		}
 	st_case_564:
-//line plugins/parsers/influx/machine.go:20722
+//line plugins/parsers/influx/machine.go:20370
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr781
+			goto tr771
 		case 11:
-			goto tr782
+			goto tr772
 		case 12:
-			goto tr783
+			goto tr569
 		case 32:
-			goto tr781
+			goto tr771
 		case 34:
-			goto tr87
+			goto tr189
 		case 44:
-			goto tr784
+			goto tr773
+		case 61:
+			goto st7
 		case 92:
-			goto st164
-		case 97:
-			goto st171
+			goto st127
+		case 114:
+			goto st168
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
+			goto tr386
 		}
-		goto st39
-tr247:
+		goto st122
+tr260:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st565
+	goto st169
+	st169:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof169
+		}
+	st_case_169:
+//line plugins/parsers/influx/machine.go:20406
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st135
+		case 92:
+			goto st135
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr61
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr61
+		}
+		goto st86
+tr85:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st170
+	st170:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof170
+		}
+	st_case_170:
+//line plugins/parsers/influx/machine.go:20433
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st40
+		case 92:
+			goto st40
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st2
+tr248:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st171
+	st171:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof171
+		}
+	st_case_171:
+//line plugins/parsers/influx/machine.go:20460
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 46:
+			goto st172
+		case 48:
+			goto st569
+		case 92:
+			goto st170
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st572
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
+		}
+		goto st40
+tr249:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st172
+	st172:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof172
+		}
+	st_case_172:
+//line plugins/parsers/influx/machine.go:20501
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st565
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
+		}
+		goto st40
 	st565:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof565
 		}
 	st_case_565:
-//line plugins/parsers/influx/machine.go:20756
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr781
+			goto tr778
 		case 11:
-			goto tr782
+			goto tr779
 		case 12:
-			goto tr783
+			goto tr780
 		case 32:
-			goto tr781
+			goto tr778
 		case 34:
-			goto tr87
+			goto tr89
 		case 44:
-			goto tr784
+			goto tr781
+		case 69:
+			goto st173
 		case 92:
-			goto st164
-		case 114:
-			goto st175
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr370
-		}
-		goto st39
-tr70:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st176
-	st176:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof176
-		}
-	st_case_176:
-//line plugins/parsers/influx/machine.go:20790
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 48:
-			goto st566
-		case 92:
-			goto st129
+			goto st170
+		case 101:
+			goto st173
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st569
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st565
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr4
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
+		goto st40
+	st173:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof173
+		}
+	st_case_173:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr318
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		}
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st568
+			}
+		default:
+			goto st174
+		}
+		goto st40
+tr318:
+//line plugins/parsers/influx/machine.go.rl:104
+
+	m.handler.AddString(key, m.text())
+
+	goto st566
 	st566:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof566
 		}
 	st_case_566:
+//line plugins/parsers/influx/machine.go:20606
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr356
+			goto tr346
 		case 11:
-			goto tr769
+			goto tr631
 		case 13:
-			goto tr356
+			goto tr346
 		case 32:
-			goto tr764
+			goto tr471
 		case 44:
-			goto tr770
-		case 46:
-			goto st567
-		case 69:
-			goto st177
+			goto tr473
 		case 92:
-			goto st129
-		case 101:
-			goto st177
-		case 105:
-			goto st568
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr764
-		}
-		goto st2
-tr71:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st567
-	st567:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof567
-		}
-	st_case_567:
-//line plugins/parsers/influx/machine.go:20858
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
-		case 11:
-			goto tr769
-		case 13:
-			goto tr356
-		case 32:
-			goto tr764
-		case 44:
-			goto tr770
-		case 69:
-			goto st177
-		case 92:
-			goto st129
-		case 101:
-			goto st177
+			goto st133
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -20879,239 +20623,235 @@ tr71:
 				goto st567
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr764
+			goto tr471
 		}
 		goto st2
-	st177:
+	st567:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof177
+			goto _test_eof567
 		}
-	st_case_177:
+	st_case_567:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr5
+			goto tr372
 		case 11:
-			goto tr6
+			goto tr783
 		case 13:
-			goto tr5
+			goto tr372
 		case 32:
-			goto tr4
-		case 34:
-			goto st178
+			goto tr780
 		case 44:
-			goto tr7
+			goto tr784
 		case 92:
-			goto st129
-		}
-		switch {
-		case ( m.data)[( m.p)] < 43:
-			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-				goto tr4
-			}
-		case ( m.data)[( m.p)] > 45:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
-			}
-		default:
-			goto st178
-		}
-		goto st2
-	st178:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof178
-		}
-	st_case_178:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 92:
-			goto st129
+			goto st133
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
+				goto st567
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr4
+			goto tr780
 		}
 		goto st2
+	st174:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof174
+		}
+	st_case_174:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st568
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr5
+		}
+		goto st40
 	st568:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof568
 		}
 	st_case_568:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr362
+		case 9:
+			goto tr778
 		case 11:
-			goto tr792
-		case 13:
-			goto tr362
+			goto tr779
+		case 12:
+			goto tr780
 		case 32:
-			goto tr773
+			goto tr778
+		case 34:
+			goto tr89
 		case 44:
-			goto tr793
+			goto tr781
 		case 92:
-			goto st129
+			goto st170
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr773
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st568
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
+		goto st40
 	st569:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof569
 		}
 	st_case_569:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
+		case 9:
+			goto tr778
 		case 11:
-			goto tr769
-		case 13:
-			goto tr356
+			goto tr779
+		case 12:
+			goto tr780
 		case 32:
-			goto tr764
+			goto tr778
+		case 34:
+			goto tr89
 		case 44:
-			goto tr770
+			goto tr781
 		case 46:
-			goto st567
+			goto st565
 		case 69:
-			goto st177
+			goto st173
 		case 92:
-			goto st129
+			goto st170
 		case 101:
-			goto st177
+			goto st173
 		case 105:
-			goto st568
+			goto st571
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st569
+				goto st570
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr764
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
-tr72:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st570
+		goto st40
 	st570:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof570
 		}
 	st_case_570:
-//line plugins/parsers/influx/machine.go:21018
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
+		case 9:
+			goto tr778
 		case 11:
-			goto tr769
-		case 13:
-			goto tr356
+			goto tr779
+		case 12:
+			goto tr780
 		case 32:
-			goto tr764
+			goto tr778
+		case 34:
+			goto tr89
 		case 44:
-			goto tr770
+			goto tr781
 		case 46:
-			goto st567
+			goto st565
 		case 69:
-			goto st177
+			goto st173
 		case 92:
-			goto st129
+			goto st170
 		case 101:
-			goto st177
-		case 105:
-			goto st568
-		case 117:
-			goto st571
+			goto st173
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr764
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st570
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
+		goto st40
 	st571:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof571
 		}
 	st_case_571:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr366
+		case 9:
+			goto tr787
 		case 11:
-			goto tr795
-		case 13:
-			goto tr366
+			goto tr788
+		case 12:
+			goto tr789
 		case 32:
-			goto tr778
+			goto tr787
+		case 34:
+			goto tr89
 		case 44:
-			goto tr796
+			goto tr790
 		case 92:
-			goto st129
+			goto st170
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr778
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr378
 		}
-		goto st2
-tr73:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st572
+		goto st40
 	st572:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof572
 		}
 	st_case_572:
-//line plugins/parsers/influx/machine.go:21081
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr356
+		case 9:
+			goto tr778
 		case 11:
-			goto tr769
-		case 13:
-			goto tr356
+			goto tr779
+		case 12:
+			goto tr780
 		case 32:
-			goto tr764
+			goto tr778
+		case 34:
+			goto tr89
 		case 44:
-			goto tr770
+			goto tr781
 		case 46:
-			goto st567
+			goto st565
 		case 69:
-			goto st177
+			goto st173
 		case 92:
-			goto st129
+			goto st170
 		case 101:
-			goto st177
+			goto st173
 		case 105:
-			goto st568
-		case 117:
 			goto st571
 		}
 		switch {
-		case ( m.data)[( m.p)] > 12:
+		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
 				goto st572
 			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr764
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
-tr74:
+		goto st40
+tr250:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -21122,203 +20862,68 @@ tr74:
 			goto _test_eof573
 		}
 	st_case_573:
-//line plugins/parsers/influx/machine.go:21126
+//line plugins/parsers/influx/machine.go:20866
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
+		case 9:
+			goto tr778
 		case 11:
-			goto tr798
-		case 13:
-			goto tr370
+			goto tr779
+		case 12:
+			goto tr780
 		case 32:
-			goto tr783
+			goto tr778
+		case 34:
+			goto tr89
 		case 44:
-			goto tr799
-		case 65:
-			goto st179
-		case 92:
-			goto st129
-		case 97:
-			goto st182
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr783
-		}
-		goto st2
-	st179:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof179
-		}
-	st_case_179:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 76:
-			goto st180
-		case 92:
-			goto st129
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto st2
-	st180:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof180
-		}
-	st_case_180:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 83:
-			goto st181
-		case 92:
-			goto st129
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto st2
-	st181:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof181
-		}
-	st_case_181:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
+			goto tr781
+		case 46:
+			goto st565
 		case 69:
-			goto st574
+			goto st173
 		case 92:
-			goto st129
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st571
+		case 117:
+			goto st574
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st570
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
 		}
-		goto st2
+		goto st40
 	st574:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof574
 		}
 	st_case_574:
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
+		case 9:
+			goto tr792
 		case 11:
-			goto tr798
-		case 13:
-			goto tr370
+			goto tr793
+		case 12:
+			goto tr794
 		case 32:
-			goto tr783
+			goto tr792
+		case 34:
+			goto tr89
 		case 44:
-			goto tr799
+			goto tr795
 		case 92:
-			goto st129
+			goto st170
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr783
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr382
 		}
-		goto st2
-	st182:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof182
-		}
-	st_case_182:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 92:
-			goto st129
-		case 108:
-			goto st183
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto st2
-	st183:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof183
-		}
-	st_case_183:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 92:
-			goto st129
-		case 115:
-			goto st184
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto st2
-	st184:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof184
-		}
-	st_case_184:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr5
-		case 11:
-			goto tr6
-		case 13:
-			goto tr5
-		case 32:
-			goto tr4
-		case 44:
-			goto tr7
-		case 92:
-			goto st129
-		case 101:
-			goto st574
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
-		}
-		goto st2
-tr75:
+		goto st40
+tr251:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -21329,27 +20934,527 @@ tr75:
 			goto _test_eof575
 		}
 	st_case_575:
-//line plugins/parsers/influx/machine.go:21333
+//line plugins/parsers/influx/machine.go:20938
 		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
+		case 9:
+			goto tr778
+		case 11:
+			goto tr779
+		case 12:
+			goto tr780
+		case 32:
+			goto tr778
+		case 34:
+			goto tr89
+		case 44:
+			goto tr781
+		case 46:
+			goto st565
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st571
+		case 117:
+			goto st574
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st575
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr372
+		}
+		goto st40
+tr252:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st576
+	st576:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof576
+		}
+	st_case_576:
+//line plugins/parsers/influx/machine.go:20985
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr797
 		case 11:
 			goto tr798
-		case 13:
-			goto tr370
-		case 32:
-			goto tr783
-		case 44:
+		case 12:
 			goto tr799
+		case 32:
+			goto tr797
+		case 34:
+			goto tr89
+		case 44:
+			goto tr800
+		case 65:
+			goto st175
+		case 92:
+			goto st170
+		case 97:
+			goto st178
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st40
+	st175:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof175
+		}
+	st_case_175:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 76:
+			goto st176
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st176:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof176
+		}
+	st_case_176:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 83:
+			goto st177
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st177:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof177
+		}
+	st_case_177:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 69:
+			goto st577
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st577:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof577
+		}
+	st_case_577:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr797
+		case 11:
+			goto tr798
+		case 12:
+			goto tr799
+		case 32:
+			goto tr797
+		case 34:
+			goto tr89
+		case 44:
+			goto tr800
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st40
+	st178:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof178
+		}
+	st_case_178:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		case 108:
+			goto st179
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st179:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof179
+		}
+	st_case_179:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		case 115:
+			goto st180
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st180:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof180
+		}
+	st_case_180:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		case 101:
+			goto st577
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+tr253:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st578
+	st578:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof578
+		}
+	st_case_578:
+//line plugins/parsers/influx/machine.go:21208
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr797
+		case 11:
+			goto tr798
+		case 12:
+			goto tr799
+		case 32:
+			goto tr797
+		case 34:
+			goto tr89
+		case 44:
+			goto tr800
 		case 82:
+			goto st181
+		case 92:
+			goto st170
+		case 114:
+			goto st182
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st40
+	st181:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof181
+		}
+	st_case_181:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 85:
+			goto st177
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+	st182:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof182
+		}
+	st_case_182:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr87
+		case 11:
+			goto tr88
+		case 12:
+			goto tr4
+		case 32:
+			goto tr87
+		case 34:
+			goto tr89
+		case 44:
+			goto tr90
+		case 92:
+			goto st170
+		case 117:
+			goto st180
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr5
+		}
+		goto st40
+tr254:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st579
+	st579:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof579
+		}
+	st_case_579:
+//line plugins/parsers/influx/machine.go:21298
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr797
+		case 11:
+			goto tr798
+		case 12:
+			goto tr799
+		case 32:
+			goto tr797
+		case 34:
+			goto tr89
+		case 44:
+			goto tr800
+		case 92:
+			goto st170
+		case 97:
+			goto st178
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st40
+tr255:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st580
+	st580:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof580
+		}
+	st_case_580:
+//line plugins/parsers/influx/machine.go:21332
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr797
+		case 11:
+			goto tr798
+		case 12:
+			goto tr799
+		case 32:
+			goto tr797
+		case 34:
+			goto tr89
+		case 44:
+			goto tr800
+		case 92:
+			goto st170
+		case 114:
+			goto st182
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr386
+		}
+		goto st40
+tr72:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st183
+	st183:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof183
+		}
+	st_case_183:
+//line plugins/parsers/influx/machine.go:21366
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 46:
+			goto st184
+		case 48:
+			goto st582
+		case 92:
+			goto st133
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st585
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+tr73:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st184
+	st184:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof184
+		}
+	st_case_184:
+//line plugins/parsers/influx/machine.go:21405
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st133
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st581
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+	st581:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof581
+		}
+	st_case_581:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 69:
 			goto st185
 		case 92:
-			goto st129
-		case 114:
-			goto st186
+			goto st133
+		case 101:
+			goto st185
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr783
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st581
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
 		}
 		goto st2
 	st185:
@@ -21366,15 +21471,24 @@ tr75:
 			goto tr5
 		case 32:
 			goto tr4
+		case 34:
+			goto st186
 		case 44:
 			goto tr7
-		case 85:
-			goto st181
 		case 92:
-			goto st129
+			goto st133
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
+		switch {
+		case ( m.data)[( m.p)] < 43:
+			if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+				goto tr4
+			}
+		case ( m.data)[( m.p)] > 45:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st567
+			}
+		default:
+			goto st186
 		}
 		goto st2
 	st186:
@@ -21394,12 +21508,257 @@ tr75:
 		case 44:
 			goto tr7
 		case 92:
-			goto st129
-		case 117:
-			goto st184
+			goto st133
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st567
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr4
+		}
+		goto st2
+	st582:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof582
+		}
+	st_case_582:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 46:
+			goto st581
+		case 69:
+			goto st185
+		case 92:
+			goto st133
+		case 101:
+			goto st185
+		case 105:
+			goto st584
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st583
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
+		}
+		goto st2
+	st583:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof583
+		}
+	st_case_583:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 46:
+			goto st581
+		case 69:
+			goto st185
+		case 92:
+			goto st133
+		case 101:
+			goto st185
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st583
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
+		}
+		goto st2
+	st584:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof584
+		}
+	st_case_584:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr378
+		case 11:
+			goto tr808
+		case 13:
+			goto tr378
+		case 32:
+			goto tr789
+		case 44:
+			goto tr809
+		case 92:
+			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr4
+			goto tr789
+		}
+		goto st2
+	st585:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof585
+		}
+	st_case_585:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 46:
+			goto st581
+		case 69:
+			goto st185
+		case 92:
+			goto st133
+		case 101:
+			goto st185
+		case 105:
+			goto st584
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st585
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
+		}
+		goto st2
+tr74:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st586
+	st586:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof586
+		}
+	st_case_586:
+//line plugins/parsers/influx/machine.go:21663
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 46:
+			goto st581
+		case 69:
+			goto st185
+		case 92:
+			goto st133
+		case 101:
+			goto st185
+		case 105:
+			goto st584
+		case 117:
+			goto st587
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st583
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
+		}
+		goto st2
+	st587:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof587
+		}
+	st_case_587:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr382
+		case 11:
+			goto tr811
+		case 13:
+			goto tr382
+		case 32:
+			goto tr794
+		case 44:
+			goto tr812
+		case 92:
+			goto st133
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr794
+		}
+		goto st2
+tr75:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st588
+	st588:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof588
+		}
+	st_case_588:
+//line plugins/parsers/influx/machine.go:21731
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr372
+		case 11:
+			goto tr783
+		case 13:
+			goto tr372
+		case 32:
+			goto tr780
+		case 44:
+			goto tr784
+		case 46:
+			goto st581
+		case 69:
+			goto st185
+		case 92:
+			goto st133
+		case 101:
+			goto st185
+		case 105:
+			goto st584
+		case 117:
+			goto st587
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st588
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr780
 		}
 		goto st2
 tr76:
@@ -21407,63 +21766,33 @@ tr76:
 
 	m.pb = m.p
 
-	goto st576
-	st576:
+	goto st589
+	st589:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof576
+			goto _test_eof589
 		}
-	st_case_576:
-//line plugins/parsers/influx/machine.go:21417
+	st_case_589:
+//line plugins/parsers/influx/machine.go:21776
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr370
+			goto tr386
 		case 11:
-			goto tr798
+			goto tr814
 		case 13:
-			goto tr370
+			goto tr386
 		case 32:
-			goto tr783
-		case 44:
 			goto tr799
+		case 44:
+			goto tr815
+		case 65:
+			goto st187
 		case 92:
-			goto st129
+			goto st133
 		case 97:
-			goto st182
+			goto st190
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr783
-		}
-		goto st2
-tr77:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st577
-	st577:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof577
-		}
-	st_case_577:
-//line plugins/parsers/influx/machine.go:21449
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr370
-		case 11:
-			goto tr798
-		case 13:
-			goto tr370
-		case 32:
-			goto tr783
-		case 44:
 			goto tr799
-		case 92:
-			goto st129
-		case 114:
-			goto st186
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr783
 		}
 		goto st2
 	st187:
@@ -21473,90 +21802,49 @@ tr77:
 	st_case_187:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr322
+			goto tr5
+		case 11:
+			goto tr6
 		case 13:
-			goto tr322
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 76:
+			goto st188
+		case 92:
+			goto st133
 		}
-		goto st187
-tr322:
-//line plugins/parsers/influx/machine.go.rl:68
-
-	{goto st188 }
-
-	goto st578
-	st578:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof578
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
 		}
-	st_case_578:
-//line plugins/parsers/influx/machine.go:21493
-		goto st0
+		goto st2
 	st188:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof188
 		}
 	st_case_188:
 		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
 		case 11:
-			goto tr325
+			goto tr6
+		case 13:
+			goto tr5
 		case 32:
-			goto st188
-		case 35:
-			goto st189
+			goto tr4
 		case 44:
-			goto st0
-		case 92:
-			goto st190
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto st188
-		}
-		goto tr323
-tr323:
-//line plugins/parsers/influx/machine.go.rl:63
-
-	( m.p)--
-
-	{goto st1 }
-
-	goto st579
-	st579:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof579
-		}
-	st_case_579:
-//line plugins/parsers/influx/machine.go:21529
-		goto st0
-tr325:
-//line plugins/parsers/influx/machine.go.rl:63
-
-	( m.p)--
-
-	{goto st1 }
-
-	goto st580
-	st580:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof580
-		}
-	st_case_580:
-//line plugins/parsers/influx/machine.go:21544
-		switch ( m.data)[( m.p)] {
-		case 11:
-			goto tr325
-		case 32:
-			goto st188
-		case 35:
+			goto tr7
+		case 83:
 			goto st189
-		case 44:
-			goto st0
 		case 92:
-			goto st190
+			goto st133
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto st188
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
 		}
-		goto tr323
+		goto st2
 	st189:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof189
@@ -21564,16 +21852,378 @@ tr325:
 	st_case_189:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto st188
+			goto tr5
+		case 11:
+			goto tr6
 		case 13:
-			goto st188
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 69:
+			goto st590
+		case 92:
+			goto st133
 		}
-		goto st189
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st590:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof590
+		}
+	st_case_590:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr814
+		case 13:
+			goto tr386
+		case 32:
+			goto tr799
+		case 44:
+			goto tr815
+		case 92:
+			goto st133
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr799
+		}
+		goto st2
 	st190:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof190
 		}
 	st_case_190:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st133
+		case 108:
+			goto st191
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st191:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof191
+		}
+	st_case_191:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st133
+		case 115:
+			goto st192
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st192:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof192
+		}
+	st_case_192:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st133
+		case 101:
+			goto st590
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+tr77:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st591
+	st591:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof591
+		}
+	st_case_591:
+//line plugins/parsers/influx/machine.go:21983
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr814
+		case 13:
+			goto tr386
+		case 32:
+			goto tr799
+		case 44:
+			goto tr815
+		case 82:
+			goto st193
+		case 92:
+			goto st133
+		case 114:
+			goto st194
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr799
+		}
+		goto st2
+	st193:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof193
+		}
+	st_case_193:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 85:
+			goto st189
+		case 92:
+			goto st133
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+	st194:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof194
+		}
+	st_case_194:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr5
+		case 11:
+			goto tr6
+		case 13:
+			goto tr5
+		case 32:
+			goto tr4
+		case 44:
+			goto tr7
+		case 92:
+			goto st133
+		case 117:
+			goto st192
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr4
+		}
+		goto st2
+tr78:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st592
+	st592:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof592
+		}
+	st_case_592:
+//line plugins/parsers/influx/machine.go:22067
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr814
+		case 13:
+			goto tr386
+		case 32:
+			goto tr799
+		case 44:
+			goto tr815
+		case 92:
+			goto st133
+		case 97:
+			goto st190
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr799
+		}
+		goto st2
+tr79:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st593
+	st593:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof593
+		}
+	st_case_593:
+//line plugins/parsers/influx/machine.go:22099
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr386
+		case 11:
+			goto tr814
+		case 13:
+			goto tr386
+		case 32:
+			goto tr799
+		case 44:
+			goto tr815
+		case 92:
+			goto st133
+		case 114:
+			goto st194
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr799
+		}
+		goto st2
+	st195:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof195
+		}
+	st_case_195:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr338
+		case 13:
+			goto tr338
+		}
+		goto st195
+tr338:
+//line plugins/parsers/influx/machine.go.rl:68
+
+	{goto st196 }
+
+	goto st594
+	st594:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof594
+		}
+	st_case_594:
+//line plugins/parsers/influx/machine.go:22143
+		goto st0
+	st196:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof196
+		}
+	st_case_196:
+		switch ( m.data)[( m.p)] {
+		case 11:
+			goto tr341
+		case 32:
+			goto st196
+		case 35:
+			goto st197
+		case 44:
+			goto st0
+		case 92:
+			goto st198
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto st196
+		}
+		goto tr339
+tr339:
+//line plugins/parsers/influx/machine.go.rl:63
+
+	( m.p)--
+
+	{goto st1 }
+
+	goto st595
+	st595:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof595
+		}
+	st_case_595:
+//line plugins/parsers/influx/machine.go:22179
+		goto st0
+tr341:
+//line plugins/parsers/influx/machine.go.rl:63
+
+	( m.p)--
+
+	{goto st1 }
+
+	goto st596
+	st596:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof596
+		}
+	st_case_596:
+//line plugins/parsers/influx/machine.go:22194
+		switch ( m.data)[( m.p)] {
+		case 11:
+			goto tr341
+		case 32:
+			goto st196
+		case 35:
+			goto st197
+		case 44:
+			goto st0
+		case 92:
+			goto st198
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto st196
+		}
+		goto tr339
+	st197:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof197
+		}
+	st_case_197:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto st196
+		case 13:
+			goto st196
+		}
+		goto st197
+	st198:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof198
+		}
+	st_case_198:
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -21582,7 +22232,7 @@ tr325:
 		case ( m.data)[( m.p)] >= 9:
 			goto st0
 		}
-		goto tr323
+		goto tr339
 	st_out:
 	_test_eof1:  m.cs = 1; goto _test_eof
 	_test_eof2:  m.cs = 2; goto _test_eof
@@ -21591,18 +22241,10 @@ tr325:
 	_test_eof5:  m.cs = 5; goto _test_eof
 	_test_eof6:  m.cs = 6; goto _test_eof
 	_test_eof7:  m.cs = 7; goto _test_eof
-	_test_eof191:  m.cs = 191; goto _test_eof
-	_test_eof192:  m.cs = 192; goto _test_eof
-	_test_eof193:  m.cs = 193; goto _test_eof
-	_test_eof8:  m.cs = 8; goto _test_eof
-	_test_eof194:  m.cs = 194; goto _test_eof
-	_test_eof195:  m.cs = 195; goto _test_eof
-	_test_eof196:  m.cs = 196; goto _test_eof
-	_test_eof197:  m.cs = 197; goto _test_eof
-	_test_eof198:  m.cs = 198; goto _test_eof
 	_test_eof199:  m.cs = 199; goto _test_eof
 	_test_eof200:  m.cs = 200; goto _test_eof
 	_test_eof201:  m.cs = 201; goto _test_eof
+	_test_eof8:  m.cs = 8; goto _test_eof
 	_test_eof202:  m.cs = 202; goto _test_eof
 	_test_eof203:  m.cs = 203; goto _test_eof
 	_test_eof204:  m.cs = 204; goto _test_eof
@@ -21615,34 +22257,43 @@ tr325:
 	_test_eof211:  m.cs = 211; goto _test_eof
 	_test_eof212:  m.cs = 212; goto _test_eof
 	_test_eof213:  m.cs = 213; goto _test_eof
-	_test_eof9:  m.cs = 9; goto _test_eof
-	_test_eof10:  m.cs = 10; goto _test_eof
-	_test_eof11:  m.cs = 11; goto _test_eof
-	_test_eof12:  m.cs = 12; goto _test_eof
 	_test_eof214:  m.cs = 214; goto _test_eof
 	_test_eof215:  m.cs = 215; goto _test_eof
-	_test_eof13:  m.cs = 13; goto _test_eof
-	_test_eof14:  m.cs = 14; goto _test_eof
 	_test_eof216:  m.cs = 216; goto _test_eof
 	_test_eof217:  m.cs = 217; goto _test_eof
 	_test_eof218:  m.cs = 218; goto _test_eof
 	_test_eof219:  m.cs = 219; goto _test_eof
 	_test_eof220:  m.cs = 220; goto _test_eof
 	_test_eof221:  m.cs = 221; goto _test_eof
+	_test_eof9:  m.cs = 9; goto _test_eof
+	_test_eof10:  m.cs = 10; goto _test_eof
+	_test_eof11:  m.cs = 11; goto _test_eof
+	_test_eof12:  m.cs = 12; goto _test_eof
+	_test_eof13:  m.cs = 13; goto _test_eof
 	_test_eof222:  m.cs = 222; goto _test_eof
+	_test_eof14:  m.cs = 14; goto _test_eof
 	_test_eof15:  m.cs = 15; goto _test_eof
-	_test_eof16:  m.cs = 16; goto _test_eof
-	_test_eof17:  m.cs = 17; goto _test_eof
 	_test_eof223:  m.cs = 223; goto _test_eof
-	_test_eof18:  m.cs = 18; goto _test_eof
-	_test_eof19:  m.cs = 19; goto _test_eof
-	_test_eof20:  m.cs = 20; goto _test_eof
 	_test_eof224:  m.cs = 224; goto _test_eof
-	_test_eof21:  m.cs = 21; goto _test_eof
-	_test_eof22:  m.cs = 22; goto _test_eof
 	_test_eof225:  m.cs = 225; goto _test_eof
 	_test_eof226:  m.cs = 226; goto _test_eof
+	_test_eof227:  m.cs = 227; goto _test_eof
+	_test_eof228:  m.cs = 228; goto _test_eof
+	_test_eof229:  m.cs = 229; goto _test_eof
+	_test_eof230:  m.cs = 230; goto _test_eof
+	_test_eof231:  m.cs = 231; goto _test_eof
+	_test_eof16:  m.cs = 16; goto _test_eof
+	_test_eof17:  m.cs = 17; goto _test_eof
+	_test_eof18:  m.cs = 18; goto _test_eof
+	_test_eof232:  m.cs = 232; goto _test_eof
+	_test_eof19:  m.cs = 19; goto _test_eof
+	_test_eof20:  m.cs = 20; goto _test_eof
+	_test_eof21:  m.cs = 21; goto _test_eof
+	_test_eof233:  m.cs = 233; goto _test_eof
+	_test_eof22:  m.cs = 22; goto _test_eof
 	_test_eof23:  m.cs = 23; goto _test_eof
+	_test_eof234:  m.cs = 234; goto _test_eof
+	_test_eof235:  m.cs = 235; goto _test_eof
 	_test_eof24:  m.cs = 24; goto _test_eof
 	_test_eof25:  m.cs = 25; goto _test_eof
 	_test_eof26:  m.cs = 26; goto _test_eof
@@ -21661,18 +22312,10 @@ tr325:
 	_test_eof39:  m.cs = 39; goto _test_eof
 	_test_eof40:  m.cs = 40; goto _test_eof
 	_test_eof41:  m.cs = 41; goto _test_eof
-	_test_eof227:  m.cs = 227; goto _test_eof
-	_test_eof228:  m.cs = 228; goto _test_eof
 	_test_eof42:  m.cs = 42; goto _test_eof
-	_test_eof229:  m.cs = 229; goto _test_eof
-	_test_eof230:  m.cs = 230; goto _test_eof
-	_test_eof231:  m.cs = 231; goto _test_eof
-	_test_eof232:  m.cs = 232; goto _test_eof
-	_test_eof233:  m.cs = 233; goto _test_eof
-	_test_eof234:  m.cs = 234; goto _test_eof
-	_test_eof235:  m.cs = 235; goto _test_eof
 	_test_eof236:  m.cs = 236; goto _test_eof
 	_test_eof237:  m.cs = 237; goto _test_eof
+	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof238:  m.cs = 238; goto _test_eof
 	_test_eof239:  m.cs = 239; goto _test_eof
 	_test_eof240:  m.cs = 240; goto _test_eof
@@ -21684,10 +22327,8 @@ tr325:
 	_test_eof246:  m.cs = 246; goto _test_eof
 	_test_eof247:  m.cs = 247; goto _test_eof
 	_test_eof248:  m.cs = 248; goto _test_eof
-	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof249:  m.cs = 249; goto _test_eof
 	_test_eof250:  m.cs = 250; goto _test_eof
-	_test_eof44:  m.cs = 44; goto _test_eof
 	_test_eof251:  m.cs = 251; goto _test_eof
 	_test_eof252:  m.cs = 252; goto _test_eof
 	_test_eof253:  m.cs = 253; goto _test_eof
@@ -21695,8 +22336,10 @@ tr325:
 	_test_eof255:  m.cs = 255; goto _test_eof
 	_test_eof256:  m.cs = 256; goto _test_eof
 	_test_eof257:  m.cs = 257; goto _test_eof
+	_test_eof44:  m.cs = 44; goto _test_eof
 	_test_eof258:  m.cs = 258; goto _test_eof
 	_test_eof259:  m.cs = 259; goto _test_eof
+	_test_eof45:  m.cs = 45; goto _test_eof
 	_test_eof260:  m.cs = 260; goto _test_eof
 	_test_eof261:  m.cs = 261; goto _test_eof
 	_test_eof262:  m.cs = 262; goto _test_eof
@@ -21708,90 +22351,92 @@ tr325:
 	_test_eof268:  m.cs = 268; goto _test_eof
 	_test_eof269:  m.cs = 269; goto _test_eof
 	_test_eof270:  m.cs = 270; goto _test_eof
-	_test_eof45:  m.cs = 45; goto _test_eof
-	_test_eof46:  m.cs = 46; goto _test_eof
-	_test_eof47:  m.cs = 47; goto _test_eof
 	_test_eof271:  m.cs = 271; goto _test_eof
-	_test_eof48:  m.cs = 48; goto _test_eof
-	_test_eof49:  m.cs = 49; goto _test_eof
-	_test_eof50:  m.cs = 50; goto _test_eof
-	_test_eof51:  m.cs = 51; goto _test_eof
 	_test_eof272:  m.cs = 272; goto _test_eof
 	_test_eof273:  m.cs = 273; goto _test_eof
-	_test_eof52:  m.cs = 52; goto _test_eof
 	_test_eof274:  m.cs = 274; goto _test_eof
-	_test_eof53:  m.cs = 53; goto _test_eof
 	_test_eof275:  m.cs = 275; goto _test_eof
 	_test_eof276:  m.cs = 276; goto _test_eof
 	_test_eof277:  m.cs = 277; goto _test_eof
 	_test_eof278:  m.cs = 278; goto _test_eof
 	_test_eof279:  m.cs = 279; goto _test_eof
+	_test_eof46:  m.cs = 46; goto _test_eof
+	_test_eof47:  m.cs = 47; goto _test_eof
+	_test_eof48:  m.cs = 48; goto _test_eof
 	_test_eof280:  m.cs = 280; goto _test_eof
+	_test_eof49:  m.cs = 49; goto _test_eof
+	_test_eof50:  m.cs = 50; goto _test_eof
+	_test_eof51:  m.cs = 51; goto _test_eof
+	_test_eof52:  m.cs = 52; goto _test_eof
+	_test_eof53:  m.cs = 53; goto _test_eof
 	_test_eof281:  m.cs = 281; goto _test_eof
 	_test_eof54:  m.cs = 54; goto _test_eof
-	_test_eof55:  m.cs = 55; goto _test_eof
-	_test_eof56:  m.cs = 56; goto _test_eof
 	_test_eof282:  m.cs = 282; goto _test_eof
-	_test_eof57:  m.cs = 57; goto _test_eof
-	_test_eof58:  m.cs = 58; goto _test_eof
-	_test_eof59:  m.cs = 59; goto _test_eof
+	_test_eof55:  m.cs = 55; goto _test_eof
 	_test_eof283:  m.cs = 283; goto _test_eof
-	_test_eof60:  m.cs = 60; goto _test_eof
-	_test_eof61:  m.cs = 61; goto _test_eof
 	_test_eof284:  m.cs = 284; goto _test_eof
 	_test_eof285:  m.cs = 285; goto _test_eof
-	_test_eof62:  m.cs = 62; goto _test_eof
-	_test_eof63:  m.cs = 63; goto _test_eof
 	_test_eof286:  m.cs = 286; goto _test_eof
 	_test_eof287:  m.cs = 287; goto _test_eof
-	_test_eof64:  m.cs = 64; goto _test_eof
-	_test_eof65:  m.cs = 65; goto _test_eof
 	_test_eof288:  m.cs = 288; goto _test_eof
 	_test_eof289:  m.cs = 289; goto _test_eof
 	_test_eof290:  m.cs = 290; goto _test_eof
 	_test_eof291:  m.cs = 291; goto _test_eof
+	_test_eof56:  m.cs = 56; goto _test_eof
+	_test_eof57:  m.cs = 57; goto _test_eof
+	_test_eof58:  m.cs = 58; goto _test_eof
 	_test_eof292:  m.cs = 292; goto _test_eof
+	_test_eof59:  m.cs = 59; goto _test_eof
+	_test_eof60:  m.cs = 60; goto _test_eof
+	_test_eof61:  m.cs = 61; goto _test_eof
 	_test_eof293:  m.cs = 293; goto _test_eof
+	_test_eof62:  m.cs = 62; goto _test_eof
+	_test_eof63:  m.cs = 63; goto _test_eof
 	_test_eof294:  m.cs = 294; goto _test_eof
+	_test_eof295:  m.cs = 295; goto _test_eof
+	_test_eof64:  m.cs = 64; goto _test_eof
+	_test_eof65:  m.cs = 65; goto _test_eof
 	_test_eof66:  m.cs = 66; goto _test_eof
+	_test_eof296:  m.cs = 296; goto _test_eof
 	_test_eof67:  m.cs = 67; goto _test_eof
 	_test_eof68:  m.cs = 68; goto _test_eof
-	_test_eof295:  m.cs = 295; goto _test_eof
-	_test_eof69:  m.cs = 69; goto _test_eof
-	_test_eof70:  m.cs = 70; goto _test_eof
-	_test_eof71:  m.cs = 71; goto _test_eof
-	_test_eof296:  m.cs = 296; goto _test_eof
-	_test_eof72:  m.cs = 72; goto _test_eof
-	_test_eof73:  m.cs = 73; goto _test_eof
 	_test_eof297:  m.cs = 297; goto _test_eof
 	_test_eof298:  m.cs = 298; goto _test_eof
-	_test_eof74:  m.cs = 74; goto _test_eof
-	_test_eof75:  m.cs = 75; goto _test_eof
-	_test_eof76:  m.cs = 76; goto _test_eof
-	_test_eof77:  m.cs = 77; goto _test_eof
-	_test_eof78:  m.cs = 78; goto _test_eof
-	_test_eof79:  m.cs = 79; goto _test_eof
 	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof300:  m.cs = 300; goto _test_eof
 	_test_eof301:  m.cs = 301; goto _test_eof
 	_test_eof302:  m.cs = 302; goto _test_eof
-	_test_eof80:  m.cs = 80; goto _test_eof
 	_test_eof303:  m.cs = 303; goto _test_eof
 	_test_eof304:  m.cs = 304; goto _test_eof
 	_test_eof305:  m.cs = 305; goto _test_eof
+	_test_eof69:  m.cs = 69; goto _test_eof
+	_test_eof70:  m.cs = 70; goto _test_eof
+	_test_eof71:  m.cs = 71; goto _test_eof
 	_test_eof306:  m.cs = 306; goto _test_eof
-	_test_eof81:  m.cs = 81; goto _test_eof
+	_test_eof72:  m.cs = 72; goto _test_eof
+	_test_eof73:  m.cs = 73; goto _test_eof
+	_test_eof74:  m.cs = 74; goto _test_eof
 	_test_eof307:  m.cs = 307; goto _test_eof
+	_test_eof75:  m.cs = 75; goto _test_eof
+	_test_eof76:  m.cs = 76; goto _test_eof
 	_test_eof308:  m.cs = 308; goto _test_eof
 	_test_eof309:  m.cs = 309; goto _test_eof
+	_test_eof77:  m.cs = 77; goto _test_eof
+	_test_eof78:  m.cs = 78; goto _test_eof
+	_test_eof79:  m.cs = 79; goto _test_eof
+	_test_eof80:  m.cs = 80; goto _test_eof
+	_test_eof81:  m.cs = 81; goto _test_eof
+	_test_eof82:  m.cs = 82; goto _test_eof
 	_test_eof310:  m.cs = 310; goto _test_eof
 	_test_eof311:  m.cs = 311; goto _test_eof
 	_test_eof312:  m.cs = 312; goto _test_eof
 	_test_eof313:  m.cs = 313; goto _test_eof
+	_test_eof83:  m.cs = 83; goto _test_eof
 	_test_eof314:  m.cs = 314; goto _test_eof
 	_test_eof315:  m.cs = 315; goto _test_eof
 	_test_eof316:  m.cs = 316; goto _test_eof
 	_test_eof317:  m.cs = 317; goto _test_eof
+	_test_eof84:  m.cs = 84; goto _test_eof
 	_test_eof318:  m.cs = 318; goto _test_eof
 	_test_eof319:  m.cs = 319; goto _test_eof
 	_test_eof320:  m.cs = 320; goto _test_eof
@@ -21799,9 +22444,17 @@ tr325:
 	_test_eof322:  m.cs = 322; goto _test_eof
 	_test_eof323:  m.cs = 323; goto _test_eof
 	_test_eof324:  m.cs = 324; goto _test_eof
-	_test_eof82:  m.cs = 82; goto _test_eof
-	_test_eof83:  m.cs = 83; goto _test_eof
-	_test_eof84:  m.cs = 84; goto _test_eof
+	_test_eof325:  m.cs = 325; goto _test_eof
+	_test_eof326:  m.cs = 326; goto _test_eof
+	_test_eof327:  m.cs = 327; goto _test_eof
+	_test_eof328:  m.cs = 328; goto _test_eof
+	_test_eof329:  m.cs = 329; goto _test_eof
+	_test_eof330:  m.cs = 330; goto _test_eof
+	_test_eof331:  m.cs = 331; goto _test_eof
+	_test_eof332:  m.cs = 332; goto _test_eof
+	_test_eof333:  m.cs = 333; goto _test_eof
+	_test_eof334:  m.cs = 334; goto _test_eof
+	_test_eof335:  m.cs = 335; goto _test_eof
 	_test_eof85:  m.cs = 85; goto _test_eof
 	_test_eof86:  m.cs = 86; goto _test_eof
 	_test_eof87:  m.cs = 87; goto _test_eof
@@ -21812,20 +22465,12 @@ tr325:
 	_test_eof92:  m.cs = 92; goto _test_eof
 	_test_eof93:  m.cs = 93; goto _test_eof
 	_test_eof94:  m.cs = 94; goto _test_eof
-	_test_eof325:  m.cs = 325; goto _test_eof
-	_test_eof326:  m.cs = 326; goto _test_eof
 	_test_eof95:  m.cs = 95; goto _test_eof
-	_test_eof327:  m.cs = 327; goto _test_eof
-	_test_eof328:  m.cs = 328; goto _test_eof
-	_test_eof329:  m.cs = 329; goto _test_eof
-	_test_eof330:  m.cs = 330; goto _test_eof
-	_test_eof331:  m.cs = 331; goto _test_eof
-	_test_eof332:  m.cs = 332; goto _test_eof
-	_test_eof333:  m.cs = 333; goto _test_eof
-	_test_eof334:  m.cs = 334; goto _test_eof
-	_test_eof335:  m.cs = 335; goto _test_eof
+	_test_eof96:  m.cs = 96; goto _test_eof
+	_test_eof97:  m.cs = 97; goto _test_eof
 	_test_eof336:  m.cs = 336; goto _test_eof
 	_test_eof337:  m.cs = 337; goto _test_eof
+	_test_eof98:  m.cs = 98; goto _test_eof
 	_test_eof338:  m.cs = 338; goto _test_eof
 	_test_eof339:  m.cs = 339; goto _test_eof
 	_test_eof340:  m.cs = 340; goto _test_eof
@@ -21835,11 +22480,8 @@ tr325:
 	_test_eof344:  m.cs = 344; goto _test_eof
 	_test_eof345:  m.cs = 345; goto _test_eof
 	_test_eof346:  m.cs = 346; goto _test_eof
-	_test_eof96:  m.cs = 96; goto _test_eof
-	_test_eof97:  m.cs = 97; goto _test_eof
 	_test_eof347:  m.cs = 347; goto _test_eof
 	_test_eof348:  m.cs = 348; goto _test_eof
-	_test_eof98:  m.cs = 98; goto _test_eof
 	_test_eof349:  m.cs = 349; goto _test_eof
 	_test_eof350:  m.cs = 350; goto _test_eof
 	_test_eof351:  m.cs = 351; goto _test_eof
@@ -21849,8 +22491,11 @@ tr325:
 	_test_eof355:  m.cs = 355; goto _test_eof
 	_test_eof356:  m.cs = 356; goto _test_eof
 	_test_eof357:  m.cs = 357; goto _test_eof
+	_test_eof99:  m.cs = 99; goto _test_eof
+	_test_eof100:  m.cs = 100; goto _test_eof
 	_test_eof358:  m.cs = 358; goto _test_eof
 	_test_eof359:  m.cs = 359; goto _test_eof
+	_test_eof101:  m.cs = 101; goto _test_eof
 	_test_eof360:  m.cs = 360; goto _test_eof
 	_test_eof361:  m.cs = 361; goto _test_eof
 	_test_eof362:  m.cs = 362; goto _test_eof
@@ -21860,17 +22505,10 @@ tr325:
 	_test_eof366:  m.cs = 366; goto _test_eof
 	_test_eof367:  m.cs = 367; goto _test_eof
 	_test_eof368:  m.cs = 368; goto _test_eof
-	_test_eof99:  m.cs = 99; goto _test_eof
 	_test_eof369:  m.cs = 369; goto _test_eof
 	_test_eof370:  m.cs = 370; goto _test_eof
-	_test_eof100:  m.cs = 100; goto _test_eof
-	_test_eof101:  m.cs = 101; goto _test_eof
-	_test_eof102:  m.cs = 102; goto _test_eof
-	_test_eof103:  m.cs = 103; goto _test_eof
 	_test_eof371:  m.cs = 371; goto _test_eof
 	_test_eof372:  m.cs = 372; goto _test_eof
-	_test_eof104:  m.cs = 104; goto _test_eof
-	_test_eof105:  m.cs = 105; goto _test_eof
 	_test_eof373:  m.cs = 373; goto _test_eof
 	_test_eof374:  m.cs = 374; goto _test_eof
 	_test_eof375:  m.cs = 375; goto _test_eof
@@ -21878,22 +22516,38 @@ tr325:
 	_test_eof377:  m.cs = 377; goto _test_eof
 	_test_eof378:  m.cs = 378; goto _test_eof
 	_test_eof379:  m.cs = 379; goto _test_eof
+	_test_eof102:  m.cs = 102; goto _test_eof
+	_test_eof380:  m.cs = 380; goto _test_eof
+	_test_eof381:  m.cs = 381; goto _test_eof
+	_test_eof103:  m.cs = 103; goto _test_eof
+	_test_eof104:  m.cs = 104; goto _test_eof
+	_test_eof105:  m.cs = 105; goto _test_eof
 	_test_eof106:  m.cs = 106; goto _test_eof
 	_test_eof107:  m.cs = 107; goto _test_eof
+	_test_eof382:  m.cs = 382; goto _test_eof
 	_test_eof108:  m.cs = 108; goto _test_eof
-	_test_eof380:  m.cs = 380; goto _test_eof
 	_test_eof109:  m.cs = 109; goto _test_eof
+	_test_eof383:  m.cs = 383; goto _test_eof
+	_test_eof384:  m.cs = 384; goto _test_eof
+	_test_eof385:  m.cs = 385; goto _test_eof
+	_test_eof386:  m.cs = 386; goto _test_eof
+	_test_eof387:  m.cs = 387; goto _test_eof
+	_test_eof388:  m.cs = 388; goto _test_eof
+	_test_eof389:  m.cs = 389; goto _test_eof
+	_test_eof390:  m.cs = 390; goto _test_eof
+	_test_eof391:  m.cs = 391; goto _test_eof
 	_test_eof110:  m.cs = 110; goto _test_eof
 	_test_eof111:  m.cs = 111; goto _test_eof
-	_test_eof381:  m.cs = 381; goto _test_eof
 	_test_eof112:  m.cs = 112; goto _test_eof
+	_test_eof392:  m.cs = 392; goto _test_eof
 	_test_eof113:  m.cs = 113; goto _test_eof
-	_test_eof382:  m.cs = 382; goto _test_eof
-	_test_eof383:  m.cs = 383; goto _test_eof
 	_test_eof114:  m.cs = 114; goto _test_eof
 	_test_eof115:  m.cs = 115; goto _test_eof
+	_test_eof393:  m.cs = 393; goto _test_eof
 	_test_eof116:  m.cs = 116; goto _test_eof
 	_test_eof117:  m.cs = 117; goto _test_eof
+	_test_eof394:  m.cs = 394; goto _test_eof
+	_test_eof395:  m.cs = 395; goto _test_eof
 	_test_eof118:  m.cs = 118; goto _test_eof
 	_test_eof119:  m.cs = 119; goto _test_eof
 	_test_eof120:  m.cs = 120; goto _test_eof
@@ -21902,22 +22556,14 @@ tr325:
 	_test_eof123:  m.cs = 123; goto _test_eof
 	_test_eof124:  m.cs = 124; goto _test_eof
 	_test_eof125:  m.cs = 125; goto _test_eof
-	_test_eof384:  m.cs = 384; goto _test_eof
-	_test_eof385:  m.cs = 385; goto _test_eof
-	_test_eof386:  m.cs = 386; goto _test_eof
 	_test_eof126:  m.cs = 126; goto _test_eof
-	_test_eof387:  m.cs = 387; goto _test_eof
-	_test_eof388:  m.cs = 388; goto _test_eof
-	_test_eof389:  m.cs = 389; goto _test_eof
-	_test_eof390:  m.cs = 390; goto _test_eof
-	_test_eof391:  m.cs = 391; goto _test_eof
-	_test_eof392:  m.cs = 392; goto _test_eof
-	_test_eof393:  m.cs = 393; goto _test_eof
-	_test_eof394:  m.cs = 394; goto _test_eof
-	_test_eof395:  m.cs = 395; goto _test_eof
+	_test_eof127:  m.cs = 127; goto _test_eof
+	_test_eof128:  m.cs = 128; goto _test_eof
+	_test_eof129:  m.cs = 129; goto _test_eof
 	_test_eof396:  m.cs = 396; goto _test_eof
 	_test_eof397:  m.cs = 397; goto _test_eof
 	_test_eof398:  m.cs = 398; goto _test_eof
+	_test_eof130:  m.cs = 130; goto _test_eof
 	_test_eof399:  m.cs = 399; goto _test_eof
 	_test_eof400:  m.cs = 400; goto _test_eof
 	_test_eof401:  m.cs = 401; goto _test_eof
@@ -21928,12 +22574,10 @@ tr325:
 	_test_eof406:  m.cs = 406; goto _test_eof
 	_test_eof407:  m.cs = 407; goto _test_eof
 	_test_eof408:  m.cs = 408; goto _test_eof
-	_test_eof127:  m.cs = 127; goto _test_eof
 	_test_eof409:  m.cs = 409; goto _test_eof
 	_test_eof410:  m.cs = 410; goto _test_eof
 	_test_eof411:  m.cs = 411; goto _test_eof
 	_test_eof412:  m.cs = 412; goto _test_eof
-	_test_eof128:  m.cs = 128; goto _test_eof
 	_test_eof413:  m.cs = 413; goto _test_eof
 	_test_eof414:  m.cs = 414; goto _test_eof
 	_test_eof415:  m.cs = 415; goto _test_eof
@@ -21942,10 +22586,12 @@ tr325:
 	_test_eof418:  m.cs = 418; goto _test_eof
 	_test_eof419:  m.cs = 419; goto _test_eof
 	_test_eof420:  m.cs = 420; goto _test_eof
+	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof421:  m.cs = 421; goto _test_eof
 	_test_eof422:  m.cs = 422; goto _test_eof
 	_test_eof423:  m.cs = 423; goto _test_eof
 	_test_eof424:  m.cs = 424; goto _test_eof
+	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof425:  m.cs = 425; goto _test_eof
 	_test_eof426:  m.cs = 426; goto _test_eof
 	_test_eof427:  m.cs = 427; goto _test_eof
@@ -21954,12 +22600,8 @@ tr325:
 	_test_eof430:  m.cs = 430; goto _test_eof
 	_test_eof431:  m.cs = 431; goto _test_eof
 	_test_eof432:  m.cs = 432; goto _test_eof
-	_test_eof129:  m.cs = 129; goto _test_eof
-	_test_eof130:  m.cs = 130; goto _test_eof
-	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof433:  m.cs = 433; goto _test_eof
 	_test_eof434:  m.cs = 434; goto _test_eof
-	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof435:  m.cs = 435; goto _test_eof
 	_test_eof436:  m.cs = 436; goto _test_eof
 	_test_eof437:  m.cs = 437; goto _test_eof
@@ -21970,8 +22612,12 @@ tr325:
 	_test_eof442:  m.cs = 442; goto _test_eof
 	_test_eof443:  m.cs = 443; goto _test_eof
 	_test_eof444:  m.cs = 444; goto _test_eof
+	_test_eof133:  m.cs = 133; goto _test_eof
+	_test_eof134:  m.cs = 134; goto _test_eof
+	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof445:  m.cs = 445; goto _test_eof
 	_test_eof446:  m.cs = 446; goto _test_eof
+	_test_eof136:  m.cs = 136; goto _test_eof
 	_test_eof447:  m.cs = 447; goto _test_eof
 	_test_eof448:  m.cs = 448; goto _test_eof
 	_test_eof449:  m.cs = 449; goto _test_eof
@@ -21980,11 +22626,9 @@ tr325:
 	_test_eof452:  m.cs = 452; goto _test_eof
 	_test_eof453:  m.cs = 453; goto _test_eof
 	_test_eof454:  m.cs = 454; goto _test_eof
-	_test_eof133:  m.cs = 133; goto _test_eof
 	_test_eof455:  m.cs = 455; goto _test_eof
 	_test_eof456:  m.cs = 456; goto _test_eof
 	_test_eof457:  m.cs = 457; goto _test_eof
-	_test_eof134:  m.cs = 134; goto _test_eof
 	_test_eof458:  m.cs = 458; goto _test_eof
 	_test_eof459:  m.cs = 459; goto _test_eof
 	_test_eof460:  m.cs = 460; goto _test_eof
@@ -21994,9 +22638,11 @@ tr325:
 	_test_eof464:  m.cs = 464; goto _test_eof
 	_test_eof465:  m.cs = 465; goto _test_eof
 	_test_eof466:  m.cs = 466; goto _test_eof
+	_test_eof137:  m.cs = 137; goto _test_eof
 	_test_eof467:  m.cs = 467; goto _test_eof
 	_test_eof468:  m.cs = 468; goto _test_eof
 	_test_eof469:  m.cs = 469; goto _test_eof
+	_test_eof138:  m.cs = 138; goto _test_eof
 	_test_eof470:  m.cs = 470; goto _test_eof
 	_test_eof471:  m.cs = 471; goto _test_eof
 	_test_eof472:  m.cs = 472; goto _test_eof
@@ -22007,7 +22653,6 @@ tr325:
 	_test_eof477:  m.cs = 477; goto _test_eof
 	_test_eof478:  m.cs = 478; goto _test_eof
 	_test_eof479:  m.cs = 479; goto _test_eof
-	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof480:  m.cs = 480; goto _test_eof
 	_test_eof481:  m.cs = 481; goto _test_eof
 	_test_eof482:  m.cs = 482; goto _test_eof
@@ -22020,6 +22665,7 @@ tr325:
 	_test_eof489:  m.cs = 489; goto _test_eof
 	_test_eof490:  m.cs = 490; goto _test_eof
 	_test_eof491:  m.cs = 491; goto _test_eof
+	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof492:  m.cs = 492; goto _test_eof
 	_test_eof493:  m.cs = 493; goto _test_eof
 	_test_eof494:  m.cs = 494; goto _test_eof
@@ -22030,15 +22676,9 @@ tr325:
 	_test_eof499:  m.cs = 499; goto _test_eof
 	_test_eof500:  m.cs = 500; goto _test_eof
 	_test_eof501:  m.cs = 501; goto _test_eof
-	_test_eof136:  m.cs = 136; goto _test_eof
-	_test_eof137:  m.cs = 137; goto _test_eof
-	_test_eof138:  m.cs = 138; goto _test_eof
-	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof502:  m.cs = 502; goto _test_eof
 	_test_eof503:  m.cs = 503; goto _test_eof
-	_test_eof140:  m.cs = 140; goto _test_eof
 	_test_eof504:  m.cs = 504; goto _test_eof
-	_test_eof141:  m.cs = 141; goto _test_eof
 	_test_eof505:  m.cs = 505; goto _test_eof
 	_test_eof506:  m.cs = 506; goto _test_eof
 	_test_eof507:  m.cs = 507; goto _test_eof
@@ -22046,37 +22686,45 @@ tr325:
 	_test_eof509:  m.cs = 509; goto _test_eof
 	_test_eof510:  m.cs = 510; goto _test_eof
 	_test_eof511:  m.cs = 511; goto _test_eof
+	_test_eof512:  m.cs = 512; goto _test_eof
+	_test_eof513:  m.cs = 513; goto _test_eof
+	_test_eof140:  m.cs = 140; goto _test_eof
+	_test_eof141:  m.cs = 141; goto _test_eof
 	_test_eof142:  m.cs = 142; goto _test_eof
 	_test_eof143:  m.cs = 143; goto _test_eof
 	_test_eof144:  m.cs = 144; goto _test_eof
-	_test_eof512:  m.cs = 512; goto _test_eof
-	_test_eof145:  m.cs = 145; goto _test_eof
-	_test_eof146:  m.cs = 146; goto _test_eof
-	_test_eof147:  m.cs = 147; goto _test_eof
-	_test_eof513:  m.cs = 513; goto _test_eof
-	_test_eof148:  m.cs = 148; goto _test_eof
-	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof514:  m.cs = 514; goto _test_eof
+	_test_eof145:  m.cs = 145; goto _test_eof
 	_test_eof515:  m.cs = 515; goto _test_eof
-	_test_eof150:  m.cs = 150; goto _test_eof
-	_test_eof151:  m.cs = 151; goto _test_eof
+	_test_eof146:  m.cs = 146; goto _test_eof
 	_test_eof516:  m.cs = 516; goto _test_eof
 	_test_eof517:  m.cs = 517; goto _test_eof
 	_test_eof518:  m.cs = 518; goto _test_eof
-	_test_eof152:  m.cs = 152; goto _test_eof
 	_test_eof519:  m.cs = 519; goto _test_eof
 	_test_eof520:  m.cs = 520; goto _test_eof
 	_test_eof521:  m.cs = 521; goto _test_eof
 	_test_eof522:  m.cs = 522; goto _test_eof
 	_test_eof523:  m.cs = 523; goto _test_eof
 	_test_eof524:  m.cs = 524; goto _test_eof
+	_test_eof147:  m.cs = 147; goto _test_eof
+	_test_eof148:  m.cs = 148; goto _test_eof
+	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof525:  m.cs = 525; goto _test_eof
+	_test_eof150:  m.cs = 150; goto _test_eof
+	_test_eof151:  m.cs = 151; goto _test_eof
+	_test_eof152:  m.cs = 152; goto _test_eof
 	_test_eof526:  m.cs = 526; goto _test_eof
+	_test_eof153:  m.cs = 153; goto _test_eof
+	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof527:  m.cs = 527; goto _test_eof
 	_test_eof528:  m.cs = 528; goto _test_eof
+	_test_eof155:  m.cs = 155; goto _test_eof
+	_test_eof156:  m.cs = 156; goto _test_eof
+	_test_eof157:  m.cs = 157; goto _test_eof
 	_test_eof529:  m.cs = 529; goto _test_eof
 	_test_eof530:  m.cs = 530; goto _test_eof
 	_test_eof531:  m.cs = 531; goto _test_eof
+	_test_eof158:  m.cs = 158; goto _test_eof
 	_test_eof532:  m.cs = 532; goto _test_eof
 	_test_eof533:  m.cs = 533; goto _test_eof
 	_test_eof534:  m.cs = 534; goto _test_eof
@@ -22085,8 +22733,6 @@ tr325:
 	_test_eof537:  m.cs = 537; goto _test_eof
 	_test_eof538:  m.cs = 538; goto _test_eof
 	_test_eof539:  m.cs = 539; goto _test_eof
-	_test_eof153:  m.cs = 153; goto _test_eof
-	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof540:  m.cs = 540; goto _test_eof
 	_test_eof541:  m.cs = 541; goto _test_eof
 	_test_eof542:  m.cs = 542; goto _test_eof
@@ -22094,103 +22740,123 @@ tr325:
 	_test_eof544:  m.cs = 544; goto _test_eof
 	_test_eof545:  m.cs = 545; goto _test_eof
 	_test_eof546:  m.cs = 546; goto _test_eof
-	_test_eof155:  m.cs = 155; goto _test_eof
-	_test_eof156:  m.cs = 156; goto _test_eof
-	_test_eof157:  m.cs = 157; goto _test_eof
 	_test_eof547:  m.cs = 547; goto _test_eof
-	_test_eof158:  m.cs = 158; goto _test_eof
-	_test_eof159:  m.cs = 159; goto _test_eof
-	_test_eof160:  m.cs = 160; goto _test_eof
 	_test_eof548:  m.cs = 548; goto _test_eof
-	_test_eof161:  m.cs = 161; goto _test_eof
-	_test_eof162:  m.cs = 162; goto _test_eof
 	_test_eof549:  m.cs = 549; goto _test_eof
 	_test_eof550:  m.cs = 550; goto _test_eof
-	_test_eof163:  m.cs = 163; goto _test_eof
-	_test_eof164:  m.cs = 164; goto _test_eof
-	_test_eof165:  m.cs = 165; goto _test_eof
 	_test_eof551:  m.cs = 551; goto _test_eof
+	_test_eof159:  m.cs = 159; goto _test_eof
+	_test_eof160:  m.cs = 160; goto _test_eof
 	_test_eof552:  m.cs = 552; goto _test_eof
-	_test_eof166:  m.cs = 166; goto _test_eof
 	_test_eof553:  m.cs = 553; goto _test_eof
 	_test_eof554:  m.cs = 554; goto _test_eof
-	_test_eof167:  m.cs = 167; goto _test_eof
 	_test_eof555:  m.cs = 555; goto _test_eof
 	_test_eof556:  m.cs = 556; goto _test_eof
 	_test_eof557:  m.cs = 557; goto _test_eof
 	_test_eof558:  m.cs = 558; goto _test_eof
 	_test_eof559:  m.cs = 559; goto _test_eof
 	_test_eof560:  m.cs = 560; goto _test_eof
+	_test_eof161:  m.cs = 161; goto _test_eof
+	_test_eof162:  m.cs = 162; goto _test_eof
+	_test_eof163:  m.cs = 163; goto _test_eof
 	_test_eof561:  m.cs = 561; goto _test_eof
+	_test_eof164:  m.cs = 164; goto _test_eof
+	_test_eof165:  m.cs = 165; goto _test_eof
+	_test_eof166:  m.cs = 166; goto _test_eof
+	_test_eof562:  m.cs = 562; goto _test_eof
+	_test_eof167:  m.cs = 167; goto _test_eof
 	_test_eof168:  m.cs = 168; goto _test_eof
+	_test_eof563:  m.cs = 563; goto _test_eof
+	_test_eof564:  m.cs = 564; goto _test_eof
 	_test_eof169:  m.cs = 169; goto _test_eof
 	_test_eof170:  m.cs = 170; goto _test_eof
-	_test_eof562:  m.cs = 562; goto _test_eof
 	_test_eof171:  m.cs = 171; goto _test_eof
 	_test_eof172:  m.cs = 172; goto _test_eof
-	_test_eof173:  m.cs = 173; goto _test_eof
-	_test_eof563:  m.cs = 563; goto _test_eof
-	_test_eof174:  m.cs = 174; goto _test_eof
-	_test_eof175:  m.cs = 175; goto _test_eof
-	_test_eof564:  m.cs = 564; goto _test_eof
 	_test_eof565:  m.cs = 565; goto _test_eof
-	_test_eof176:  m.cs = 176; goto _test_eof
+	_test_eof173:  m.cs = 173; goto _test_eof
 	_test_eof566:  m.cs = 566; goto _test_eof
 	_test_eof567:  m.cs = 567; goto _test_eof
-	_test_eof177:  m.cs = 177; goto _test_eof
-	_test_eof178:  m.cs = 178; goto _test_eof
+	_test_eof174:  m.cs = 174; goto _test_eof
 	_test_eof568:  m.cs = 568; goto _test_eof
 	_test_eof569:  m.cs = 569; goto _test_eof
 	_test_eof570:  m.cs = 570; goto _test_eof
 	_test_eof571:  m.cs = 571; goto _test_eof
 	_test_eof572:  m.cs = 572; goto _test_eof
 	_test_eof573:  m.cs = 573; goto _test_eof
+	_test_eof574:  m.cs = 574; goto _test_eof
+	_test_eof575:  m.cs = 575; goto _test_eof
+	_test_eof576:  m.cs = 576; goto _test_eof
+	_test_eof175:  m.cs = 175; goto _test_eof
+	_test_eof176:  m.cs = 176; goto _test_eof
+	_test_eof177:  m.cs = 177; goto _test_eof
+	_test_eof577:  m.cs = 577; goto _test_eof
+	_test_eof178:  m.cs = 178; goto _test_eof
 	_test_eof179:  m.cs = 179; goto _test_eof
 	_test_eof180:  m.cs = 180; goto _test_eof
-	_test_eof181:  m.cs = 181; goto _test_eof
-	_test_eof574:  m.cs = 574; goto _test_eof
-	_test_eof182:  m.cs = 182; goto _test_eof
-	_test_eof183:  m.cs = 183; goto _test_eof
-	_test_eof184:  m.cs = 184; goto _test_eof
-	_test_eof575:  m.cs = 575; goto _test_eof
-	_test_eof185:  m.cs = 185; goto _test_eof
-	_test_eof186:  m.cs = 186; goto _test_eof
-	_test_eof576:  m.cs = 576; goto _test_eof
-	_test_eof577:  m.cs = 577; goto _test_eof
-	_test_eof187:  m.cs = 187; goto _test_eof
 	_test_eof578:  m.cs = 578; goto _test_eof
-	_test_eof188:  m.cs = 188; goto _test_eof
+	_test_eof181:  m.cs = 181; goto _test_eof
+	_test_eof182:  m.cs = 182; goto _test_eof
 	_test_eof579:  m.cs = 579; goto _test_eof
 	_test_eof580:  m.cs = 580; goto _test_eof
+	_test_eof183:  m.cs = 183; goto _test_eof
+	_test_eof184:  m.cs = 184; goto _test_eof
+	_test_eof581:  m.cs = 581; goto _test_eof
+	_test_eof185:  m.cs = 185; goto _test_eof
+	_test_eof186:  m.cs = 186; goto _test_eof
+	_test_eof582:  m.cs = 582; goto _test_eof
+	_test_eof583:  m.cs = 583; goto _test_eof
+	_test_eof584:  m.cs = 584; goto _test_eof
+	_test_eof585:  m.cs = 585; goto _test_eof
+	_test_eof586:  m.cs = 586; goto _test_eof
+	_test_eof587:  m.cs = 587; goto _test_eof
+	_test_eof588:  m.cs = 588; goto _test_eof
+	_test_eof589:  m.cs = 589; goto _test_eof
+	_test_eof187:  m.cs = 187; goto _test_eof
+	_test_eof188:  m.cs = 188; goto _test_eof
 	_test_eof189:  m.cs = 189; goto _test_eof
+	_test_eof590:  m.cs = 590; goto _test_eof
 	_test_eof190:  m.cs = 190; goto _test_eof
+	_test_eof191:  m.cs = 191; goto _test_eof
+	_test_eof192:  m.cs = 192; goto _test_eof
+	_test_eof591:  m.cs = 591; goto _test_eof
+	_test_eof193:  m.cs = 193; goto _test_eof
+	_test_eof194:  m.cs = 194; goto _test_eof
+	_test_eof592:  m.cs = 592; goto _test_eof
+	_test_eof593:  m.cs = 593; goto _test_eof
+	_test_eof195:  m.cs = 195; goto _test_eof
+	_test_eof594:  m.cs = 594; goto _test_eof
+	_test_eof196:  m.cs = 196; goto _test_eof
+	_test_eof595:  m.cs = 595; goto _test_eof
+	_test_eof596:  m.cs = 596; goto _test_eof
+	_test_eof197:  m.cs = 197; goto _test_eof
+	_test_eof198:  m.cs = 198; goto _test_eof
 
 	_test_eof: {}
 	if ( m.p) == ( m.eof) {
 		switch  m.cs {
-		case 191, 192, 193, 195, 227, 228, 230, 249, 250, 252, 271, 274, 299, 300, 301, 302, 304, 305, 306, 325, 326, 328, 347, 348, 350, 369, 370, 384, 385, 386, 388, 407, 408, 410, 411, 412, 431, 432, 433, 434, 436, 455, 456, 457, 459, 478, 479, 481, 482, 483, 504, 517, 518, 520, 553, 579, 580:
+		case 199, 200, 201, 203, 236, 237, 239, 258, 259, 261, 280, 282, 310, 311, 312, 313, 315, 316, 317, 336, 337, 339, 358, 359, 361, 380, 381, 396, 397, 398, 400, 419, 420, 422, 423, 424, 443, 444, 445, 446, 448, 467, 468, 469, 471, 490, 491, 493, 494, 495, 515, 530, 531, 533, 566, 595, 596:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 1, 129:
+		case 1, 133:
 //line plugins/parsers/influx/machine.go.rl:56
 
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 37, 38, 39, 40, 41, 43, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, 87, 88, 89, 90, 91, 125, 128, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186:
+		case 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 38, 39, 40, 41, 42, 44, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 84, 90, 91, 92, 93, 94, 129, 132, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194:
 //line plugins/parsers/influx/machine.go.rl:35
 
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22198,16 +22864,16 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 27, 28, 29, 35, 36:
+		case 28, 29, 30, 36, 37:
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22215,7 +22881,7 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 		case 8:
@@ -22224,7 +22890,7 @@ tr325:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22232,10 +22898,10 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 217, 276, 289, 374, 506, 541, 556, 568:
+		case 226, 286, 300, 386, 519, 555, 571, 584:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -22243,10 +22909,10 @@ tr325:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 220, 279, 292, 377, 509, 544, 559, 571:
+		case 229, 289, 303, 389, 522, 558, 574, 587:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
@@ -22254,10 +22920,10 @@ tr325:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 214, 215, 216, 218, 219, 221, 272, 273, 275, 277, 278, 280, 286, 287, 288, 290, 291, 293, 371, 372, 373, 375, 376, 378, 502, 503, 505, 507, 508, 510, 516, 539, 540, 542, 543, 545, 551, 552, 554, 555, 557, 558, 560, 566, 567, 569, 570, 572:
+		case 222, 223, 224, 225, 227, 228, 230, 281, 283, 284, 285, 287, 288, 290, 296, 297, 298, 299, 301, 302, 304, 382, 383, 384, 385, 387, 388, 390, 514, 516, 517, 518, 520, 521, 523, 529, 552, 553, 554, 556, 557, 559, 565, 567, 568, 569, 570, 572, 573, 575, 581, 582, 583, 585, 586, 588:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
@@ -22265,10 +22931,10 @@ tr325:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 222, 223, 224, 225, 226, 281, 282, 283, 284, 285, 294, 295, 296, 297, 298, 379, 380, 381, 382, 383, 511, 512, 513, 514, 515, 546, 547, 548, 549, 550, 561, 562, 563, 564, 565, 573, 574, 575, 576, 577:
+		case 231, 232, 233, 234, 235, 291, 292, 293, 294, 295, 305, 306, 307, 308, 309, 391, 392, 393, 394, 395, 524, 525, 526, 527, 528, 560, 561, 562, 563, 564, 576, 577, 578, 579, 580, 589, 590, 591, 592, 593:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -22276,10 +22942,10 @@ tr325:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 229, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 251, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 303, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 327, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 349, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 387, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 409, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 435, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 458, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 480, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 519, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538:
+		case 202, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 238, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 260, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 314, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 338, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 360, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 399, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 421, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 447, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 470, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 492, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 532, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551:
 //line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
@@ -22287,16 +22953,16 @@ tr325:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
-	 m.cs = 188;
+	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 42, 44, 80, 126, 127, 134:
+		case 43, 45, 83, 130, 131, 138:
 //line plugins/parsers/influx/machine.go.rl:35
 
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -22304,7 +22970,7 @@ tr325:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22312,16 +22978,16 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 30, 31, 32, 33, 34, 82, 83, 84, 85, 86, 92, 93, 94, 96, 97, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 130, 131, 133, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163:
+		case 31, 32, 33, 34, 35, 85, 86, 87, 88, 89, 95, 96, 97, 99, 100, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 134, 135, 137, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169:
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:35
@@ -22329,7 +22995,7 @@ tr325:
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22337,16 +23003,16 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 98:
+		case 101:
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -22354,7 +23020,7 @@ tr325:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22362,16 +23028,16 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 95, 132, 135, 152:
+		case 98, 136, 139, 158:
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:35
@@ -22379,7 +23045,7 @@ tr325:
 	m.err = ErrFieldParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:49
@@ -22387,7 +23053,7 @@ tr325:
 	m.err = ErrTimestampParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
 //line plugins/parsers/influx/machine.go.rl:56
@@ -22395,10 +23061,10 @@ tr325:
 	m.err = ErrParse
 	( m.p)--
 
-	 m.cs = 187;
+	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-//line plugins/parsers/influx/machine.go:22402
+//line plugins/parsers/influx/machine.go:23068
 		}
 	}
 
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
index 335f4f66a..df65a05d9 100644
--- a/plugins/parsers/influx/machine.go.rl
+++ b/plugins/parsers/influx/machine.go.rl
@@ -122,7 +122,7 @@ unsigned =
 	( digit | ( non_zero_digit digit* ) );
 
 number =
-	( integer ( '.' digit* )? ) | ( '.' digit* );
+	'-'? (digit+ ('.' digit*)? | '.' digit+);
 
 scientific =
 	number 'e'i ["\-+"]? digit+;
diff --git a/plugins/parsers/influx/machine_test.go b/plugins/parsers/influx/machine_test.go
index a3eec7a07..6aabcb69a 100644
--- a/plugins/parsers/influx/machine_test.go
+++ b/plugins/parsers/influx/machine_test.go
@@ -517,6 +517,55 @@ var tests = []struct {
 			},
 		},
 	},
+	{
+		name:  "float without integer digits negative",
+		input: []byte("cpu value=-.42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("-.42"),
+			},
+		},
+	},
+	{
+		name:  "float with multiple leading 0",
+		input: []byte("cpu value=00.42"),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				Name:  FieldKey,
+				Value: []byte("value"),
+			},
+			Result{
+				Name:  FieldFloat,
+				Value: []byte("00.42"),
+			},
+		},
+	},
+	{
+		name:  "invalid float with only dot",
+		input: []byte("cpu value=."),
+		results: []Result{
+			Result{
+				Name:  Measurement,
+				Value: []byte("cpu"),
+			},
+			Result{
+				err: ErrFieldParse,
+			},
+		},
+	},
 	{
 		name:  "multiple fields",
 		input: []byte("cpu x=42,y=42"),

From 86a3b8cad40ddda9a2df3636e319d7cb95f1a667 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 23 Apr 2018 13:32:04 -0700
Subject: [PATCH 1110/1302] Update changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 357010f1e..d35fd20d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 - [#4021](https://github.com/influxdata/telegraf/pull/4021): Add TLS support to socket_writer and socket_listener plugins.
 - [#4025](https://github.com/influxdata/telegraf/pull/4025): Add snmp input option to strip non fixed length index suffixes.
 
-## v1.6.1 [unreleased]
+## v1.6.1 [2018-04-23]
 
 ### Bugfixes
 
@@ -24,6 +24,9 @@
 - [#4037](https://github.com/influxdata/telegraf/issues/4037): Fix uptime reporting in system input when ran inside docker.
 - [#3750](https://github.com/influxdata/telegraf/issues/3750): Fix mem input "cannot allocate memory" error on FreeBSD based systems.
 - [#4056](https://github.com/influxdata/telegraf/pull/4056): Fix duplicate tags when overriding an existing tag.
+- [#4062](https://github.com/influxdata/telegraf/pull/4062): Add server argument as first argument in unbound input.
+- [#4063](https://github.com/influxdata/telegraf/issues/4063): Fix handling of floats with multiple leading zeroes.
+- [#4064](https://github.com/influxdata/telegraf/issues/4064): Return errors in mongodb SSL/TLS configuration.
 
 ## v1.6 [2018-04-16]
 

From 911f0e4b579696eb9ee640e747da9fd5fd6f9a32 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 23 Apr 2018 15:06:26 -0700
Subject: [PATCH 1111/1302] Deprecate the cassandra input plugin (#4050)

---
 CHANGELOG.md                                  |  7 ++
 README.md                                     |  6 +-
 plugins/inputs/cassandra/README.md            |  3 +
 plugins/inputs/cassandra/cassandra.go         | 17 +++-
 plugins/inputs/jolokia2/README.md             | 16 +++-
 .../inputs/jolokia2/examples/cassandra.conf   | 85 +++++++++++++++++++
 plugins/inputs/jolokia2/jolokia_proxy.go      |  8 +-
 7 files changed, 131 insertions(+), 11 deletions(-)
 create mode 100644 plugins/inputs/jolokia2/examples/cassandra.conf

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d35fd20d6..e04b4625b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## v1.7 [unreleased]
 
+### Release Notes
+
+- The `cassandra` input plugin has been deprecated in favor of the `jolokia2`
+  input plugin which is much more configurable and more performant.  There is
+  an [example configuration](./plugins/inputs/jolokia2/examples) to help you
+  get started.
+
 ### New Inputs
 
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
diff --git a/README.md b/README.md
index 63f3373e5..d1691698a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ and writing metrics.
 
 Design goals are to have a minimal memory footprint with a plugin system so
 that developers in the community can easily add support for collecting metrics
-from local or remote services.
+.  For an example configuration referencet from local or remote services.
 
 Telegraf is plugin-driven and has the concept of 4 distinct plugins:
 
@@ -130,7 +130,7 @@ configuration options.
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
 * [bond](./plugins/inputs/bond)
-* [cassandra](./plugins/inputs/cassandra)
+* [cassandra](./plugins/inputs/cassandra) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [ceph](./plugins/inputs/ceph)
 * [cgroup](./plugins/inputs/cgroup)
 * [chrony](./plugins/inputs/chrony)
@@ -163,7 +163,7 @@ configuration options.
 * [iptables](./plugins/inputs/iptables)
 * [ipset](./plugins/inputs/ipset)
 * [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
-* [jolokia2](./plugins/inputs/jolokia2)
+* [jolokia2](./plugins/inputs/jolokia2) (java, cassandra, kafka)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
diff --git a/plugins/inputs/cassandra/README.md b/plugins/inputs/cassandra/README.md
index edcef08c4..2f3fd928b 100644
--- a/plugins/inputs/cassandra/README.md
+++ b/plugins/inputs/cassandra/README.md
@@ -1,5 +1,8 @@
+
 # Telegraf plugin: Cassandra
 
+### **Deprecated in version 1.7**: Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin with the [cassandra.conf](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/cassandra.conf) example configuration.
+
 #### Plugin arguments:
 - **context** string: Context root used for jolokia url
 - **servers** []string: List of servers with the format "<user:passwd@><host>:port"
diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index 541edf16c..6f6f86e32 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -174,7 +175,11 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 
 func (j *Cassandra) SampleConfig() string {
 	return `
-  # This is the context root used to compose the jolokia url
+  ## DEPRECATED: The cassandra plugin has been deprecated.  Please use the
+  ## jolokia2 plugin instead.
+  ##
+  ## see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
+
   context = "/jolokia/read"
   ## List of cassandra servers exposing jolokia read service
   servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
@@ -258,6 +263,16 @@ func parseServerTokens(server string) map[string]string {
 	return serverTokens
 }
 
+func (c *Cassandra) Start(acc telegraf.Accumulator) error {
+	log.Println("W! DEPRECATED: The cassandra plugin has been deprecated. " +
+		"Please use the jolokia2 plugin instead. " +
+		"https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2")
+	return nil
+}
+
+func (c *Cassandra) Stop() {
+}
+
 func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 	context := c.Context
 	servers := c.Servers
diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 0ab985e5b..15fbb233f 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -2,7 +2,9 @@
 
 The [Jolokia](http://jolokia.org) _agent_ and _proxy_ input plugins collect JMX metrics from an HTTP endpoint using Jolokia's [JSON-over-HTTP protocol](https://jolokia.org/reference/html/protocol.html).
 
-## Jolokia Agent Configuration
+### Configuration:
+
+#### Jolokia Agent Configuration
 
 The `jolokia2_agent` input plugin reads JMX metrics from one or more [Jolokia agent](https://jolokia.org/agent/jvm.html) REST endpoints.
 
@@ -32,7 +34,7 @@ Optionally, specify SSL options for communicating with agents:
     paths = ["Uptime"]
 ```
 
-## Jolokia Proxy Configuration
+#### Jolokia Proxy Configuration
 
 The `jolokia2_proxy` input plugin reads JMX metrics from one or more _targets_ by interacting with a [Jolokia proxy](https://jolokia.org/features/proxy.html) REST endpoint.
 
@@ -77,7 +79,7 @@ Optionally, specify SSL options for communicating with proxies:
     paths = ["Uptime"]
 ```
 
-## Jolokia Metric Configuration
+#### Jolokia Metric Configuration
 
 Each `metric` declaration generates a Jolokia request to fetch telemetry from a JMX MBean.
 
@@ -167,3 +169,11 @@ Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configuration
 | `default_field_separator` | `.`           | A character to use to join Mbean attributes when creating fields. |
 | `default_field_prefix`    | _None_        | A string to prepend to the field names produced by all `metric` declarations. |
 | `default_tag_prefix`      | _None_        | A string to prepend to the tag names produced by all `metric` declarations. |
+
+### Example Configurations:
+
+- [Java JVM](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/java.conf)
+- [Kafka](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/kafka.conf)
+- [Cassandra](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/cassandra.conf)
+
+Please help improve this list and contribute new configuration files by opening an issue or pull request.
diff --git a/plugins/inputs/jolokia2/examples/cassandra.conf b/plugins/inputs/jolokia2/examples/cassandra.conf
new file mode 100644
index 000000000..3a419a6df
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/cassandra.conf
@@ -0,0 +1,85 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "java_"
+
+  [[inputs.jolokia2_agent.metrics]]
+    name  = "Memory"
+    mbean = "java.lang:type=Memory"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "GarbageCollector"
+    mbean = "java.lang:name=*,type=GarbageCollector"
+    tag_keys = ["name"]
+
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "cassandra_"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "Cache"
+    mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=Cache"
+    tag_keys = ["name", "scope"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "Client"
+    mbean = "org.apache.cassandra.metrics:name=*,type=Client"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "ClientRequestMetrics"
+    mbean = "org.apache.cassandra.metrics:name=*,type=ClientRequestMetrics"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "ClientRequest"
+    mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=ClientRequest"
+    tag_keys = ["name", "scope"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "ColumnFamily"
+    mbean = "org.apache.cassandra.metrics:keyspace=*,name=*,scope=*,type=ColumnFamily"
+    tag_keys = ["keyspace", "name", "scope"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "CommitLog"
+    mbean = "org.apache.cassandra.metrics:name=*,type=CommitLog"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "Compaction"
+    mbean = "org.apache.cassandra.metrics:name=*,type=Compaction"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "CQL"
+    mbean = "org.apache.cassandra.metrics:name=*,type=CQL"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "DroppedMessage"
+    mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=DroppedMessage"
+    tag_keys = ["name", "scope"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "FileCache"
+    mbean = "org.apache.cassandra.metrics:name=*,type=FileCache"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "ReadRepair"
+    mbean = "org.apache.cassandra.metrics:name=*,type=ReadRepair"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "HintedHandoffManager"
+    mbean = "org.apache.cassandra.metrics:type=HintedHandoffManager"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "Storage"
+    mbean = "org.apache.cassandra.metrics:name=*,type=Storage"
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "ThreadPools"
+    mbean = "org.apache.cassandra.metrics:name=*,path=*,scope=*,type=ThreadPools"
+    tag_keys = ["name", "path", "scope"]
diff --git a/plugins/inputs/jolokia2/jolokia_proxy.go b/plugins/inputs/jolokia2/jolokia_proxy.go
index f19a74e84..c9474871f 100644
--- a/plugins/inputs/jolokia2/jolokia_proxy.go
+++ b/plugins/inputs/jolokia2/jolokia_proxy.go
@@ -56,13 +56,13 @@ func (jp *JolokiaProxy) SampleConfig() string {
   ## Add proxy targets to query
   # default_target_username = ""
   # default_target_password = ""
-  [[inputs.jolokia_proxy.target]]
+  [[inputs.jolokia2_proxy.target]]
     url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
-	# username = ""
-	# password = ""
+    # username = ""
+    # password = ""
 
   ## Add metrics to read
-  [[inputs.jolokia_proxy.metric]]
+  [[inputs.jolokia2_proxy.metric]]
     name  = "java_runtime"
     mbean = "java.lang:type=Runtime"
     paths = ["Uptime"]

From f639f994b540fdd2dd150cb03cf1e639b120b3fe Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 23 Apr 2018 15:08:04 -0700
Subject: [PATCH 1112/1302] Ignore writer error in file output (#4055)

---
 plugins/outputs/file/file.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go
index 3a763b792..5f2bf042f 100644
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -13,7 +13,7 @@ import (
 type File struct {
 	Files []string
 
-	writer  io.Writer
+	writers []io.Writer
 	closers []io.Closer
 
 	serializer serializers.Serializer
@@ -35,15 +35,13 @@ func (f *File) SetSerializer(serializer serializers.Serializer) {
 }
 
 func (f *File) Connect() error {
-	writers := []io.Writer{}
-
 	if len(f.Files) == 0 {
 		f.Files = []string{"stdout"}
 	}
 
 	for _, file := range f.Files {
 		if file == "stdout" {
-			writers = append(writers, os.Stdout)
+			f.writers = append(f.writers, os.Stdout)
 		} else {
 			var of *os.File
 			var err error
@@ -56,11 +54,10 @@ func (f *File) Connect() error {
 			if err != nil {
 				return err
 			}
-			writers = append(writers, of)
+			f.writers = append(f.writers, of)
 			f.closers = append(f.closers, of)
 		}
 	}
-	f.writer = io.MultiWriter(writers...)
 	return nil
 }
 
@@ -90,17 +87,21 @@ func (f *File) Write(metrics []telegraf.Metric) error {
 		return nil
 	}
 
+	var writeErr error = nil
 	for _, metric := range metrics {
 		b, err := f.serializer.Serialize(metric)
 		if err != nil {
 			return fmt.Errorf("failed to serialize message: %s", err)
 		}
-		_, err = f.writer.Write(b)
-		if err != nil {
-			return fmt.Errorf("failed to write message: %s, %s", b, err)
+
+		for _, writer := range f.writers {
+			_, err = writer.Write(b)
+			if err != nil && writer != os.Stdout {
+				writeErr = fmt.Errorf("E! failed to write message: %s, %s", b, err)
+			}
 		}
 	}
-	return nil
+	return writeErr
 }
 
 func init() {

From 9f4752ba123d9c50180b54248cc1448f1948bb87 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 23 Apr 2018 15:09:04 -0700
Subject: [PATCH 1113/1302] Add docker input server version (#4035)

---
 plugins/inputs/docker/README.md          | 204 +++++++++++------------
 plugins/inputs/docker/client.go          |   2 +-
 plugins/inputs/docker/docker.go          |  29 ++--
 plugins/inputs/docker/docker_test.go     |  12 +-
 plugins/inputs/docker/docker_testdata.go |   1 +
 testutil/accumulator.go                  |  13 +-
 6 files changed, 132 insertions(+), 129 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index b833ff264..b93b4a036 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -4,12 +4,11 @@ The docker plugin uses the Docker Engine API to gather metrics on running
 docker containers.
 
 The docker plugin uses the [Official Docker Client](https://github.com/moby/moby/tree/master/client)
-to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.20/).
-[Library Documentation](https://godoc.org/github.com/moby/moby/client)
+to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.24/).
 
 ### Configuration:
 
-```
+```toml
 # Read metrics about docker containers
 [[inputs.docker]]
   ## Docker Endpoint
@@ -76,15 +75,57 @@ may prefer to exclude them:
 ```
 
 
-### Measurements & Fields:
+### Metrics:
 
 Every effort was made to preserve the names based on the JSON response from the
 docker API.
 
-Note that the docker_container_cpu metric may appear multiple times per collection,
-based on the availability of per-cpu stats on your system.
+- docker
+  - tags:
+    - unit
+    - engine_host
+    - server_version
+  - fields:
+    - n_used_file_descriptors
+    - n_cpus
+    - n_containers
+    - n_containers_running
+    - n_containers_stopped
+    - n_containers_paused
+    - n_images
+    - n_goroutines
+    - n_listener_events
+    - memory_total
+    - pool_blocksize
+
+- docker_data
+  - tags:
+    - unit
+    - engine_host
+    - server_version
+  - fields:
+    - available
+    - total
+    - used
+
+- docker_metadata
+  - tags:
+    - unit
+    - engine_host
+    - server_version
+  - fields:
+    - available
+    - total
+    - used
 
 - docker_container_mem
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_version
+  - fields:
     - total_pgmafault
     - cache
     - mapped_file
@@ -119,7 +160,16 @@ based on the availability of per-cpu stats on your system.
     - failcnt
     - limit
     - container_id
+
 - docker_container_cpu
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_version
+    - cpu
+  - fields:
     - throttling_periods
     - throttling_throttled_periods
     - throttling_throttled_time
@@ -129,7 +179,16 @@ based on the availability of per-cpu stats on your system.
     - usage_total
     - usage_percent
     - container_id
+
 - docker_container_net
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_version
+    - network
+  - fields:
     - rx_dropped
     - rx_bytes
     - rx_errors
@@ -139,7 +198,16 @@ based on the availability of per-cpu stats on your system.
     - tx_errors
     - tx_bytes
     - container_id
+
 - docker_container_blkio
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_version
+    - device
+  - fields:
     - io_service_bytes_recursive_async
     - io_service_bytes_recursive_read
     - io_service_bytes_recursive_sync
@@ -151,118 +219,38 @@ based on the availability of per-cpu stats on your system.
     - io_serviced_recursive_total
     - io_serviced_recursive_write
     - container_id
-- docker_
-    - n_used_file_descriptors
-    - n_cpus
-    - n_containers
-    - n_containers_running
-    - n_containers_stopped
-    - n_containers_paused
-    - n_images
-    - n_goroutines
-    - n_listener_events
-    - memory_total
-    - pool_blocksize
-- docker_data
-    - available
-    - total
-    - used
-- docker_metadata
-    - available
-    - total
-    - used
-- docker_swarm
-    - tasks_desired
-    - tasks_running
 
-
-### Tags:
-#### Docker Engine tags
-- docker (memory_total)
-    - unit=bytes
-    - engine_host
-- docker (pool_blocksize)
-    - unit=bytes
-    - engine_host
-- docker_data
-    - unit=bytes
-    - engine_host
-- docker_metadata
-    - unit=bytes
-    - engine_host
-
-#### Docker Container tags
-- Tags on all containers:
+- docker_container_health
+  - tags:
     - engine_host
+    - server_version
     - container_image
     - container_name
     - container_version
-- docker_container_mem specific:
-- docker_container_cpu specific:
-    - cpu
-- docker_container_net specific:
-    - network
-- docker_container_blkio specific:
-    - device
-- docker_container_health specific:
-    - health_status
-    - failing_streak
-- docker_swarm specific:
+  - fields:
+  	- health_status (string)
+  	- failing_streak (integer)
+
+- docker_swarm
+  - tags:
     - service_id
     - service_name
     - service_mode
+  - fields:
+    - tasks_desired
+    - tasks_running
 
 ### Example Output:
 
 ```
-% ./telegraf --config ~/ws/telegraf.conf --input-filter docker --test
-* Plugin: docker, Collection 1
-> docker n_cpus=8i 1456926671065383978
-> docker n_used_file_descriptors=15i 1456926671065383978
-> docker n_containers=7i 1456926671065383978
-> docker n_containers_running=7i 1456926671065383978
-> docker n_containers_stopped=3i 1456926671065383978
-> docker n_containers_paused=0i 1456926671065383978
-> docker n_images=152i 1456926671065383978
-> docker n_goroutines=36i 1456926671065383978
-> docker n_listener_events=0i 1456926671065383978
-> docker,unit=bytes memory_total=18935443456i 1456926671065383978
-> docker,unit=bytes pool_blocksize=65540i 1456926671065383978
-> docker_data,unit=bytes available=24340000000i,total=107400000000i,used=14820000000i 1456926671065383978
-> docker_metadata,unit=bytes available=2126999999i,total=2146999999i,used=20420000i 145692667106538
-> docker_container_mem,
-container_image=spotify/kafka,container_name=kafka \
-active_anon=52568064i,active_file=6926336i,cache=12038144i,fail_count=0i,\
-hierarchical_memory_limit=9223372036854771712i,inactive_anon=52707328i,\
-inactive_file=5111808i,limit=1044578304i,mapped_file=10301440i,\
-max_usage=140656640i,pgfault=63762i,pgmajfault=2837i,pgpgin=73355i,\
-pgpgout=45736i,rss=105275392i,rss_huge=4194304i,total_active_anon=52568064i,\
-total_active_file=6926336i,total_cache=12038144i,total_inactive_anon=52707328i,\
-total_inactive_file=5111808i,total_mapped_file=10301440i,total_pgfault=63762i,\
-total_pgmafault=0i,total_pgpgin=73355i,total_pgpgout=45736i,\
-total_rss=105275392i,total_rss_huge=4194304i,total_unevictable=0i,\
-total_writeback=0i,unevictable=0i,usage=117440512i,writeback=0i 1453409536840126713
-> docker_container_cpu,
-container_image=spotify/kafka,container_name=kafka,cpu=cpu-total \
-throttling_periods=0i,throttling_throttled_periods=0i,\
-throttling_throttled_time=0i,usage_in_kernelmode=440000000i,\
-usage_in_usermode=2290000000i,usage_system=84795360000000i,\
-usage_total=6628208865i 1453409536840126713
-> docker_container_cpu,
-container_image=spotify/kafka,container_name=kafka,cpu=cpu0 \
-usage_total=6628208865i 1453409536840126713
-> docker_container_net,\
-container_image=spotify/kafka,container_name=kafka,network=eth0 \
-rx_bytes=7468i,rx_dropped=0i,rx_errors=0i,rx_packets=94i,tx_bytes=946i,\
-tx_dropped=0i,tx_errors=0i,tx_packets=13i 1453409536840126713
-> docker_container_blkio,
-container_image=spotify/kafka,container_name=kafka,device=8:0 \
-io_service_bytes_recursive_async=80216064i,io_service_bytes_recursive_read=79925248i,\
-io_service_bytes_recursive_sync=77824i,io_service_bytes_recursive_total=80293888i,\
-io_service_bytes_recursive_write=368640i,io_serviced_recursive_async=6562i,\
-io_serviced_recursive_read=6492i,io_serviced_recursive_sync=37i,\
-io_serviced_recursive_total=6599i,io_serviced_recursive_write=107i 1453409536840126713
->docker_swarm,
-service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test,\
-tasks_desired=3,tasks_running=3 1508968160000000000
+docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce n_containers=6i,n_containers_paused=0i,n_containers_running=1i,n_containers_stopped=5i,n_cpus=2i,n_goroutines=41i,n_images=2i,n_listener_events=0i,n_used_file_descriptors=27i 1524002041000000000
+docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce,unit=bytes memory_total=2101661696i 1524002041000000000
+docker_container_mem,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce active_anon=8327168i,active_file=2314240i,cache=27402240i,container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",hierarchical_memory_limit=9223372036854771712i,inactive_anon=0i,inactive_file=25088000i,limit=2101661696i,mapped_file=20582400i,max_usage=36646912i,pgfault=4193i,pgmajfault=214i,pgpgin=9243i,pgpgout=520i,rss=8327168i,rss_huge=0i,total_active_anon=8327168i,total_active_file=2314240i,total_cache=27402240i,total_inactive_anon=0i,total_inactive_file=25088000i,total_mapped_file=20582400i,total_pgfault=4193i,total_pgmajfault=214i,total_pgpgin=9243i,total_pgpgout=520i,total_rss=8327168i,total_rss_huge=0i,total_unevictable=0i,total_writeback=0i,unevictable=0i,usage=36528128i,usage_percent=0.4342225020025297,writeback=0i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu-total,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",throttling_periods=0i,throttling_throttled_periods=0i,throttling_throttled_time=0i,usage_in_kernelmode=40000000i,usage_in_usermode=100000000i,usage_percent=0,usage_system=6394210000000i,usage_total=117319068i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=20825265i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu1,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=96493803i 1524002042000000000
+docker_container_net,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,network=eth0,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",rx_bytes=1576i,rx_dropped=0i,rx_errors=0i,rx_packets=20i,tx_bytes=0i,tx_dropped=0i,tx_errors=0i,tx_packets=0i 1524002042000000000
+docker_container_blkio,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,device=254:0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",io_service_bytes_recursive_async=27398144i,io_service_bytes_recursive_read=27398144i,io_service_bytes_recursive_sync=0i,io_service_bytes_recursive_total=27398144i,io_service_bytes_recursive_write=0i,io_serviced_recursive_async=529i,io_serviced_recursive_read=529i,io_serviced_recursive_sync=0i,io_serviced_recursive_total=529i,io_serviced_recursive_write=0i 1524002042000000000
+docker_container_health,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce failing_streak=0i,health_status="healthy" 1524007529000000000
+docker_swarm,service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test tasks_desired=3,tasks_running=3 1508968160000000000
 ```
diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go
index a021b59c4..b66ad009d 100644
--- a/plugins/inputs/docker/client.go
+++ b/plugins/inputs/docker/client.go
@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	version        string
+	version        = "1.24"
 	defaultHeaders = map[string]string{"User-Agent": "engine-api-cli-1.0"}
 )
 
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index de7723893..b0b9b8cf2 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -54,6 +54,7 @@ type Docker struct {
 	client          Client
 	httpClient      *http.Client
 	engine_host     string
+	serverVersion   string
 	filtersCreated  bool
 	labelFilter     filter.Filter
 	containerFilter filter.Filter
@@ -301,7 +302,14 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 	if err != nil {
 		return err
 	}
+
 	d.engine_host = info.Name
+	d.serverVersion = info.ServerVersion
+
+	tags := map[string]string{
+		"engine_host":    d.engine_host,
+		"server_version": d.serverVersion,
+	}
 
 	fields := map[string]interface{}{
 		"n_cpus":                  info.NCPU,
@@ -315,15 +323,13 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 		"n_listener_events":       info.NEventsListener,
 	}
 	// Add metrics
-	acc.AddFields("docker",
-		fields,
-		map[string]string{"engine_host": d.engine_host},
-		now)
+	acc.AddFields("docker", fields, tags, now)
 	acc.AddFields("docker",
 		map[string]interface{}{"memory_total": info.MemTotal},
-		map[string]string{"unit": "bytes", "engine_host": d.engine_host},
+		tags,
 		now)
 	// Get storage metrics
+	tags["unit"] = "bytes"
 	for _, rawData := range info.DriverStatus {
 		// Try to convert string to int (bytes)
 		value, err := parseSize(rawData[1])
@@ -335,7 +341,7 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 			// pool blocksize
 			acc.AddFields("docker",
 				map[string]interface{}{"pool_blocksize": value},
-				map[string]string{"unit": "bytes", "engine_host": d.engine_host},
+				tags,
 				now)
 		} else if strings.HasPrefix(name, "data_space_") {
 			// data space
@@ -348,16 +354,10 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 		}
 	}
 	if len(dataFields) > 0 {
-		acc.AddFields("docker_data",
-			dataFields,
-			map[string]string{"unit": "bytes", "engine_host": d.engine_host},
-			now)
+		acc.AddFields("docker_data", dataFields, tags, now)
 	}
 	if len(metadataFields) > 0 {
-		acc.AddFields("docker_metadata",
-			metadataFields,
-			map[string]string{"unit": "bytes", "engine_host": d.engine_host},
-			now)
+		acc.AddFields("docker_metadata", metadataFields, tags, now)
 	}
 	return nil
 }
@@ -388,6 +388,7 @@ func (d *Docker) gatherContainer(
 
 	tags := map[string]string{
 		"engine_host":       d.engine_host,
+		"server_version":    d.serverVersion,
 		"container_name":    cname,
 		"container_image":   imageName,
 		"container_version": imageVersion,
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 0bc5d33d4..4b9d00c80 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -615,7 +615,10 @@ func TestDockerGatherInfo(t *testing.T) {
 			"n_images":                int(199),
 			"n_goroutines":            int(39),
 		},
-		map[string]string{"engine_host": "absol"},
+		map[string]string{
+			"engine_host":    "absol",
+			"server_version": "17.09.0-ce",
+		},
 	)
 
 	acc.AssertContainsTaggedFields(t,
@@ -626,8 +629,9 @@ func TestDockerGatherInfo(t *testing.T) {
 			"available": int64(36530000000),
 		},
 		map[string]string{
-			"unit":        "bytes",
-			"engine_host": "absol",
+			"unit":           "bytes",
+			"engine_host":    "absol",
+			"server_version": "17.09.0-ce",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
@@ -648,6 +652,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
+			"server_version":    "17.09.0-ce",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
@@ -670,6 +675,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"ENVVAR7":           "ENVVAR8=ENVVAR9",
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
+			"server_version":    "17.09.0-ce",
 		},
 	)
 }
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
index 8042461db..42a0b888f 100644
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -55,6 +55,7 @@ var info = types.Info{
 	DockerRootDir:     "/var/lib/docker",
 	NoProxy:           "",
 	BridgeNfIP6tables: true,
+	ServerVersion:     "17.09.0-ce",
 }
 
 var containerList = []types.Container{
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index cefe8b787..03e92538b 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -65,8 +65,15 @@ func (a *Accumulator) AddFields(
 	if a.Discard {
 		return
 	}
-	if tags == nil {
-		tags = map[string]string{}
+
+	tagsCopy := map[string]string{}
+	for k, v := range tags {
+		tagsCopy[k] = v
+	}
+
+	fieldsCopy := map[string]interface{}{}
+	for k, v := range fields {
+		fieldsCopy[k] = v
 	}
 
 	if len(fields) == 0 {
@@ -91,7 +98,7 @@ func (a *Accumulator) AddFields(
 	p := &Metric{
 		Measurement: measurement,
 		Fields:      fields,
-		Tags:        tags,
+		Tags:        tagsCopy,
 		Time:        t,
 	}
 

From 286f14f730a89fc67dc09f3a19ee6c525e1776e0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 23 Apr 2018 15:15:08 -0700
Subject: [PATCH 1114/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04b4625b..69a24b21d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@
 - [#3999](https://github.com/influxdata/telegraf/pull/3999): Skip files with leading `..` in config directory.
 - [#4021](https://github.com/influxdata/telegraf/pull/4021): Add TLS support to socket_writer and socket_listener plugins.
 - [#4025](https://github.com/influxdata/telegraf/pull/4025): Add snmp input option to strip non fixed length index suffixes.
+- [#4035](https://github.com/influxdata/telegraf/pull/4035): Add server version tag to docker input.
+
+### Bugfixes
+
+- [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
 
 ## v1.6.1 [2018-04-23]
 

From d3d8d52e2f1bfabc924faa5256647a8a0cc70c5a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Apr 2018 12:46:40 -0700
Subject: [PATCH 1115/1302] Fix links to jolokia example configs

---
 plugins/inputs/cassandra/README.md | 2 +-
 plugins/inputs/jolokia2/README.md  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/cassandra/README.md b/plugins/inputs/cassandra/README.md
index 2f3fd928b..86c6a65a3 100644
--- a/plugins/inputs/cassandra/README.md
+++ b/plugins/inputs/cassandra/README.md
@@ -1,7 +1,7 @@
 
 # Telegraf plugin: Cassandra
 
-### **Deprecated in version 1.7**: Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin with the [cassandra.conf](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/cassandra.conf) example configuration.
+### **Deprecated in version 1.7**: Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin with the [cassandra.conf](/plugins/inputs/jolokia2/examples/cassandra.conf) example configuration.
 
 #### Plugin arguments:
 - **context** string: Context root used for jolokia url
diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 15fbb233f..283c4a5e5 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -172,8 +172,8 @@ Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configuration
 
 ### Example Configurations:
 
-- [Java JVM](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/java.conf)
-- [Kafka](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/kafka.conf)
-- [Cassandra](/influxdata/telegraf/blob/master/plugins/inputs/jolokia2/examples/cassandra.conf)
+- [Java JVM](/plugins/inputs/jolokia2/examples/java.conf)
+- [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
+- [Cassandra](/plugins/inputs/jolokia2/examples/cassandra.conf)
 
 Please help improve this list and contribute new configuration files by opening an issue or pull request.

From 538baee8a4c9055c5e92d400061fab6626a8fcc1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Apr 2018 13:42:42 -0700
Subject: [PATCH 1116/1302] Fix nightly build

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49bac606a..b016deae3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,7 +89,7 @@ workflows:
       - 'test-go-1.9':
           requires:
             - 'deps'
-      - 'test-go-1.9':
+      - 'test-go-1.10':
           requires:
             - 'deps'
       - 'nightly':
@@ -99,7 +99,7 @@ workflows:
             - 'test-go-1.10'
     triggers:
       - schedule:
-          cron: "0 18 * * *"
+          cron: "0 7 * * *"
           filters:
             branches:
               only:

From b8d5df2076d4960c94f8b48bb7102bf3839224f4 Mon Sep 17 00:00:00 2001
From: Yosuke Hara <yousuke.hara@gmail.com>
Date: Wed, 25 Apr 2018 06:14:31 +0900
Subject: [PATCH 1117/1302] Add support for LeoFS v1.4 to leofs input (#4044)

---
 plugins/inputs/leofs/README.md     | 251 +++++++++++++++++++++++++++++
 plugins/inputs/leofs/leofs.go      |  13 ++
 plugins/inputs/leofs/leofs_test.go |  68 ++++----
 3 files changed, 304 insertions(+), 28 deletions(-)
 create mode 100644 plugins/inputs/leofs/README.md

diff --git a/plugins/inputs/leofs/README.md b/plugins/inputs/leofs/README.md
new file mode 100644
index 000000000..bd028e65a
--- /dev/null
+++ b/plugins/inputs/leofs/README.md
@@ -0,0 +1,251 @@
+# LeoFS Input Plugin
+
+The LeoFS plugin gathers metrics of LeoGateway, LeoManager, and LeoStorage using SNMP. See [LeoFS Documentation / System Administration / System Monitoring](https://leo-project.net/leofs/docs/admin/system_admin/monitoring/).
+
+## Configuration:
+
+```toml
+# Sample Config:
+
+[[inputs.leofs]]
+        servers = ["127.0.0.1:4010"]
+```
+
+## Measurements & Fields:
+### Statistics specific to the internals of LeoManager
+#### Erlang VM
+
+- 1 min Statistics
+    - num_of_processes
+    - total_memory_usage
+    - system_memory_usage
+    - processes_memory_usage
+    - ets_memory_usage
+    - used_allocated_memory
+    - allocated_memory
+- 5 min Statistics
+    - num_of_processes_5min
+    - total_memory_usage_5min
+    - system_memory_usage_5min
+    - processes_memory_usage_5min
+    - ets_memory_usage_5min
+    - used_allocated_memory_5min
+    - allocated_memory_5min
+
+### Statistics specific to the internals of LeoStorage
+#### Erlang VM
+
+- 1 min Statistics
+    - num_of_processes
+    - total_memory_usage
+    - system_memory_usage
+    - processes_memory_usage
+    - ets_memory_usage
+    - used_allocated_memory
+    - allocated_memory
+- 5 min Statistics
+    - num_of_processes_5min
+    - total_memory_usage_5min
+    - system_memory_usage_5min
+    - processes_memory_usage_5min
+    - ets_memory_usage_5min
+    - used_allocated_memory_5min
+    - allocated_memory_5min
+
+#### Total Number of Requests
+
+- 1 min Statistics
+    - num_of_writes
+    - num_of_reads
+    - num_of_deletes
+- 5 min Statistics
+    - num_of_writes_5min
+    - num_of_reads_5min
+    - num_of_deletes_5min
+
+#### Total Number of Objects and Total Size of Objects
+
+- num_of_active_objects
+- total_objects
+- total_size_of_active_objects
+- total_size
+
+#### Total Number of MQ Messages
+
+- num_of_replication_messages,
+- num_of_sync-vnode_messages,
+- num_of_rebalance_messages,
+- mq_num_of_msg_recovery_node
+- mq_num_of_msg_deletion_dir
+- mq_num_of_msg_async_deletion_dir
+- mq_num_of_msg_req_deletion_dir
+- mq_mdcr_num_of_msg_req_comp_metadata
+- mq_mdcr_num_of_msg_req_sync_obj
+
+Note: The following items are available since LeoFS v1.4.0:
+
+- mq_num_of_msg_recovery_node
+- mq_num_of_msg_deletion_dir
+- mq_num_of_msg_async_deletion_dir
+- mq_num_of_msg_req_deletion_dir
+- mq_mdcr_num_of_msg_req_comp_metadata
+- mq_mdcr_num_of_msg_req_sync_obj
+
+#### Data Compaction
+
+- comp_state
+- comp_last_start_datetime
+- comp_last_end_datetime
+- comp_num_of_pending_targets
+- comp_num_of_ongoing_targets
+- comp_num_of_out_of_targets
+
+Note: The all items are available since LeoFS v1.4.0.
+
+### Statistics specific to the internals of LeoGateway
+#### Erlang VM
+
+- 1 min Statistics
+    - num_of_processes
+    - total_memory_usage
+    - system_memory_usage
+    - processes_memory_usage
+    - ets_memory_usage
+    - used_allocated_memory
+    - allocated_memory
+- 5 min Statistics
+    - num_of_processes_5min
+    - total_memory_usage_5min
+    - system_memory_usage_5min
+    - processes_memory_usage_5min
+    - ets_memory_usage_5min
+    - used_allocated_memory_5min
+    - allocated_memory_5min
+
+#### Total Number of Requests
+
+- 1 min Statistics
+    - num_of_writes
+    - num_of_reads
+    - num_of_deletes
+- 5 min Statistics
+    - num_of_writes_5min
+    - num_of_reads_5min
+    - num_of_deletes_5min
+
+#### Object Cache
+
+- count_of_cache-hit
+- count_of_cache-miss
+- total_of_files
+- total_cached_size
+
+
+### Tags:
+
+All measurements have the following tags:
+
+- node
+
+
+### Example output:
+
+#### LeoManager
+
+```bash
+$ ./telegraf --config ./plugins/inputs/leofs/leo_manager.conf --input-filter leofs --test
+> leofs, host=manager_0, node=manager_0@127.0.0.1
+  allocated_memory=78255445,
+  allocated_memory_5min=78159025,
+  ets_memory_usage=4611900,
+  ets_memory_usage_5min=4632599,
+  num_of_processes=223,
+  num_of_processes_5min=223,
+  processes_memory_usage=20201316,
+  processes_memory_usage_5min=20186559,
+  system_memory_usage=37172701,
+  system_memory_usage_5min=37189213,
+  total_memory_usage=57373373,
+  total_memory_usage_5min=57374653,
+  used_allocated_memory=67,
+  used_allocated_memory_5min=67
+  1524105758000000000
+```
+
+#### LeoStorage
+
+```bash
+$ ./telegraf --config ./plugins/inputs/leofs/leo_storage.conf --input-filter leofs --test
+> leofs,host=storage_0,node=storage_0@127.0.0.1
+  allocated_memory=63504384,
+  allocated_memory_5min=0,
+  comp_last_end_datetime=0,
+  comp_last_start_datetime=0,
+  comp_num_of_ongoing_targets=0,
+  comp_num_of_out_of_targets=0,
+  comp_num_of_pending_targets=8,
+  comp_state=0,
+  ets_memory_usage=3877824,
+  ets_memory_usage_5min=0,
+  mq_mdcr_num_of_msg_req_comp_metadata=0,
+  mq_mdcr_num_of_msg_req_sync_obj=0,
+  mq_num_of_msg_async_deletion_dir=0,
+  mq_num_of_msg_deletion_dir=0,
+  mq_num_of_msg_recovery_node=0,
+  mq_num_of_msg_req_deletion_dir=0,
+  num_of_active_objects=70,
+  num_of_deletes=0,
+  num_of_deletes_5min=0,
+  num_of_processes=577,
+  num_of_processes_5min=0,
+  num_of_reads=1,
+  num_of_reads_5min=0,
+  num_of_rebalance_messages=0,
+  num_of_replication_messages=0,
+  num_of_sync-vnode_messages=0,
+  num_of_writes=70,
+  num_of_writes_5min=0,
+  processes_memory_usage=20029464,
+  processes_memory_usage_5min=0,
+  system_memory_usage=25900472,
+  system_memory_usage_5min=0,
+  total_memory_usage=45920987,
+  total_memory_usage_5min=0,
+  total_objects=70,
+  total_size=2,
+  total_size_of_active_objects=2,
+  used_allocated_memory=69,
+  used_allocated_memory_5min=0
+  1524529826000000000
+```
+
+#### LeoGateway
+
+```
+$ ./telegraf --config ./plugins/inputs/leofs/leo_gateway.conf --input-filter leofs --test
+> leofs, host=gateway_0, node=gateway_0@127.0.0.1
+  allocated_memory=87941120,
+  allocated_memory_5min=88067672,
+  count_of_cache-hit=0,
+  count_of_cache-miss=0,
+  ets_memory_usage=4843497,
+  ets_memory_usage_5min=4841574,
+  num_of_deletes=0,
+  num_of_deletes_5min=0,
+  num_of_processes=555,
+  num_of_processes_5min=555,
+  num_of_reads=0,
+  num_of_reads_5min=0,
+  num_of_writes=0,
+  num_of_writes_5min=0,
+  processes_memory_usage=17388052,
+  processes_memory_usage_5min=17413928,
+  system_memory_usage=49531263,
+  system_memory_usage_5min=49577819,
+  total_cached_size=0,
+  total_memory_usage=66917393,
+  total_memory_usage_5min=66989469,
+  total_of_files=0,
+  used_allocated_memory=69,
+  used_allocated_memory_5min=69 1524105894000000000
+```
diff --git a/plugins/inputs/leofs/leofs.go b/plugins/inputs/leofs/leofs.go
index 9381eace8..7e5ae25d4 100644
--- a/plugins/inputs/leofs/leofs.go
+++ b/plugins/inputs/leofs/leofs.go
@@ -93,6 +93,19 @@ var KeyMapping = map[ServerType][]string{
 		"allocated_memory",
 		"used_allocated_memory_5min",
 		"allocated_memory_5min",
+		// following items are since LeoFS v1.4.0
+		"mq_num_of_msg_recovery_node",
+		"mq_num_of_msg_deletion_dir",
+		"mq_num_of_msg_async_deletion_dir",
+		"mq_num_of_msg_req_deletion_dir",
+		"mq_mdcr_num_of_msg_req_comp_metadata",
+		"mq_mdcr_num_of_msg_req_sync_obj",
+		"comp_state",
+		"comp_last_start_datetime",
+		"comp_last_end_datetime",
+		"comp_num_of_pending_targets",
+		"comp_num_of_ongoing_targets",
+		"comp_num_of_out_of_targets",
 	},
 	ServerTypeGateway: {
 		"num_of_processes",
diff --git a/plugins/inputs/leofs/leofs_test.go b/plugins/inputs/leofs/leofs_test.go
index f3699b8d9..f456a998e 100644
--- a/plugins/inputs/leofs/leofs_test.go
+++ b/plugins/inputs/leofs/leofs_test.go
@@ -42,34 +42,46 @@ package main
 
 import "fmt"
 
-const output = ` + "`" + `.1.3.6.1.4.1.35450.34.1.0 = STRING: "storage_0@127.0.0.1"
-.1.3.6.1.4.1.35450.34.2.0 = Gauge32: 512
-.1.3.6.1.4.1.35450.34.3.0 = Gauge32: 38126307
-.1.3.6.1.4.1.35450.34.4.0 = Gauge32: 22308716
-.1.3.6.1.4.1.35450.34.5.0 = Gauge32: 15816448
-.1.3.6.1.4.1.35450.34.6.0 = Gauge32: 5232008
-.1.3.6.1.4.1.35450.34.7.0 = Gauge32: 512
-.1.3.6.1.4.1.35450.34.8.0 = Gauge32: 38113176
-.1.3.6.1.4.1.35450.34.9.0 = Gauge32: 22313398
-.1.3.6.1.4.1.35450.34.10.0 = Gauge32: 15798779
-.1.3.6.1.4.1.35450.34.11.0 = Gauge32: 5237315
-.1.3.6.1.4.1.35450.34.12.0 = Gauge32: 191
-.1.3.6.1.4.1.35450.34.13.0 = Gauge32: 824
-.1.3.6.1.4.1.35450.34.14.0 = Gauge32: 0
-.1.3.6.1.4.1.35450.34.15.0 = Gauge32: 50105
-.1.3.6.1.4.1.35450.34.16.0 = Gauge32: 196654
-.1.3.6.1.4.1.35450.34.17.0 = Gauge32: 0
-.1.3.6.1.4.1.35450.34.18.0 = Gauge32: 2052
-.1.3.6.1.4.1.35450.34.19.0 = Gauge32: 50296
-.1.3.6.1.4.1.35450.34.20.0 = Gauge32: 35
-.1.3.6.1.4.1.35450.34.21.0 = Gauge32: 898
-.1.3.6.1.4.1.35450.34.22.0 = Gauge32: 0
-.1.3.6.1.4.1.35450.34.23.0 = Gauge32: 0
-.1.3.6.1.4.1.35450.34.24.0 = Gauge32: 0
-.1.3.6.1.4.1.35450.34.31.0 = Gauge32: 51
-.1.3.6.1.4.1.35450.34.32.0 = Gauge32: 53219328
-.1.3.6.1.4.1.35450.34.33.0 = Gauge32: 51
-.1.3.6.1.4.1.35450.34.34.0 = Gauge32: 53351083` + "`" +
+const output = ` + "`" + `.1.3.6.1.4.1.35450.56.1.0 = STRING: "storage_0@127.0.0.1"
+.1.3.6.1.4.1.35450.56.2.0 = Gauge32: 512
+.1.3.6.1.4.1.35450.56.3.0 = Gauge32: 38126307
+.1.3.6.1.4.1.35450.56.4.0 = Gauge32: 22308716
+.1.3.6.1.4.1.35450.56.5.0 = Gauge32: 15816448
+.1.3.6.1.4.1.35450.56.6.0 = Gauge32: 5232008
+.1.3.6.1.4.1.35450.56.7.0 = Gauge32: 512
+.1.3.6.1.4.1.35450.56.8.0 = Gauge32: 38113176
+.1.3.6.1.4.1.35450.56.9.0 = Gauge32: 22313398
+.1.3.6.1.4.1.35450.56.10.0 = Gauge32: 15798779
+.1.3.6.1.4.1.35450.56.11.0 = Gauge32: 5237315
+.1.3.6.1.4.1.35450.56.12.0 = Gauge32: 191
+.1.3.6.1.4.1.35450.56.13.0 = Gauge32: 824
+.1.3.6.1.4.1.35450.56.14.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.56.15.0 = Gauge32: 50105
+.1.3.6.1.4.1.35450.56.16.0 = Gauge32: 196654
+.1.3.6.1.4.1.35450.56.17.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.56.18.0 = Gauge32: 2052
+.1.3.6.1.4.1.35450.56.19.0 = Gauge32: 50296
+.1.3.6.1.4.1.35450.56.20.0 = Gauge32: 35
+.1.3.6.1.4.1.35450.56.21.0 = Gauge32: 898
+.1.3.6.1.4.1.35450.56.22.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.56.23.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.56.24.0 = Gauge32: 0
+.1.3.6.1.4.1.35450.56.31.0 = Gauge32: 51
+.1.3.6.1.4.1.35450.56.32.0 = Gauge32: 53219328
+.1.3.6.1.4.1.35450.56.33.0 = Gauge32: 51
+.1.3.6.1.4.1.35450.56.34.0 = Gauge32: 53351083
+.1.3.6.1.4.1.35450.56.41.0 = Gauge32: 101
+.1.3.6.1.4.1.35450.56.42.0 = Gauge32: 216
+.1.3.6.1.4.1.35450.56.43.0 = Gauge32: 313
+.1.3.6.1.4.1.35450.56.44.0 = Gauge32: 421
+.1.3.6.1.4.1.35450.56.45.0 = Gauge32: 597
+.1.3.6.1.4.1.35450.56.46.0 = Gauge32: 628
+.1.3.6.1.4.1.35450.56.51.0 = Gauge32: 1
+.1.3.6.1.4.1.35450.56.52.0 = Gauge32: 1522154118
+.1.3.6.1.4.1.35450.56.53.0 = Gauge32: 1522196496
+.1.3.6.1.4.1.35450.56.54.0 = Gauge32: 1
+.1.3.6.1.4.1.35450.56.55.0 = Gauge32: 7
+.1.3.6.1.4.1.35450.56.56.0 = Gauge32: 0` + "`" +
 	`
 func main() {
 	fmt.Println(output)

From c256f178701ae02ac415743ea33f731d58da8a05 Mon Sep 17 00:00:00 2001
From: Jack Zampolin <jack.zampolin@gmail.com>
Date: Tue, 24 Apr 2018 14:40:19 -0700
Subject: [PATCH 1118/1302] Fix timeout parsing error in nvidia_smi (#4070)

---
 plugins/inputs/nvidia_smi/nvidia_smi.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go
index 0cf9bd9e7..35e56c9b7 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -36,7 +36,7 @@ var (
 // NvidiaSMI holds the methods for this plugin
 type NvidiaSMI struct {
 	BinPath string
-	Timeout time.Duration
+	Timeout internal.Duration
 
 	metrics string
 }
@@ -81,7 +81,7 @@ func init() {
 	inputs.Add("nvidia_smi", func() telegraf.Input {
 		return &NvidiaSMI{
 			BinPath: "/usr/bin/nvidia-smi",
-			Timeout: 5 * time.Second,
+			Timeout: internal.Duration{Duration: 5 * time.Second},
 			metrics: metrics,
 		}
 	})
@@ -90,7 +90,7 @@ func init() {
 func (smi *NvidiaSMI) pollSMI() (string, error) {
 	// Construct and execute metrics query
 	opts := []string{"--format=noheader,nounits,csv", fmt.Sprintf("--query-gpu=%s", smi.metrics)}
-	ret, err := internal.CombinedOutputTimeout(exec.Command(smi.BinPath, opts...), smi.Timeout)
+	ret, err := internal.CombinedOutputTimeout(exec.Command(smi.BinPath, opts...), smi.Timeout.Duration)
 	if err != nil {
 		return "", err
 	}

From 535e9e9a68e5158cbd639ae46066a32fca4b4233 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 24 Apr 2018 14:18:12 -0700
Subject: [PATCH 1119/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a24b21d..c9dd4ab4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#4021](https://github.com/influxdata/telegraf/pull/4021): Add TLS support to socket_writer and socket_listener plugins.
 - [#4025](https://github.com/influxdata/telegraf/pull/4025): Add snmp input option to strip non fixed length index suffixes.
 - [#4035](https://github.com/influxdata/telegraf/pull/4035): Add server version tag to docker input.
+- [#4044](https://github.com/influxdata/telegraf/pull/4044): Add support for LeoFS 1.4 to leofs input.
 
 ### Bugfixes
 

From abdff033cc011e37c4eda8b78cf8913eb77e125a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 25 Apr 2018 13:46:16 -0700
Subject: [PATCH 1120/1302] Note options that only work with influxdb HTTP

---
 plugins/outputs/influxdb/README.md   | 8 +++++---
 plugins/outputs/influxdb/influxdb.go | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index bac25cf53..74f33748d 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -11,6 +11,7 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ##
   ## Multiple URLs can be specified for a single cluster, only ONE of the
   ## urls will be written to each interval.
+  # urls = ["unix:///var/run/influxdb.sock"]
   # urls = ["udp://127.0.0.1:8089"]
   # urls = ["http://127.0.0.1:8086"]
 
@@ -23,10 +24,11 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   # skip_database_creation = false
 
   ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.
+  ## the default retention policy.  Only takes effect when using HTTP.
   # retention_policy = ""
 
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
+  ## Only takes effect when using HTTP.
   # write_consistency = "any"
 
   ## Timeout for HTTP messages.
@@ -42,7 +44,7 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config
+  ## Optional SSL Config for use on HTTP connections.
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
   # ssl_key = "/etc/telegraf/key.pem"
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 12aa76ec4..d34e9e3e8 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -84,10 +84,11 @@ var sampleConfig = `
   # skip_database_creation = false
 
   ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.
+  ## the default retention policy.  Only takes effect when using HTTP.
   # retention_policy = ""
 
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
+  ## Only takes effect when using HTTP.
   # write_consistency = "any"
 
   ## Timeout for HTTP messages.
@@ -103,7 +104,7 @@ var sampleConfig = `
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config
+  ## Optional SSL Config for use on HTTP connections.
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
   # ssl_key = "/etc/telegraf/key.pem"

From 46a8bdbfe54c97190c82eaee46d9c3413c6ff20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20L=C3=B3pez?= <adrianlzt+github@gmail.com>
Date: Thu, 26 Apr 2018 03:59:42 +0200
Subject: [PATCH 1121/1302] Add parameter to force the interval of gather for
 sysstat (#4068)

---
 plugins/inputs/sysstat/sysstat.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
index 1daa85730..42ce89550 100644
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -33,6 +33,9 @@ type Sysstat struct {
 	// Sadc represents the path to the sadc collector utility.
 	Sadc string `toml:"sadc_path"`
 
+	// Force the execution time of sadc
+	SadcInterval internal.Duration `toml:"sadc_interval"`
+
 	// Sadf represents the path to the sadf cmd.
 	Sadf string `toml:"sadf_path"`
 
@@ -136,6 +139,11 @@ func (*Sysstat) SampleConfig() string {
 }
 
 func (s *Sysstat) Gather(acc telegraf.Accumulator) error {
+	if s.SadcInterval.Duration != 0 {
+		// Collect interval is calculated as interval - parseInterval
+		s.interval = int(s.SadcInterval.Duration.Seconds()) + parseInterval
+	}
+
 	if s.interval == 0 {
 		if firstTimestamp.IsZero() {
 			firstTimestamp = time.Now()

From 06671777e980039d9a0235be53325880fa9ea257 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 25 Apr 2018 19:02:00 -0700
Subject: [PATCH 1122/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9dd4ab4d..60628d2f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - [#4025](https://github.com/influxdata/telegraf/pull/4025): Add snmp input option to strip non fixed length index suffixes.
 - [#4035](https://github.com/influxdata/telegraf/pull/4035): Add server version tag to docker input.
 - [#4044](https://github.com/influxdata/telegraf/pull/4044): Add support for LeoFS 1.4 to leofs input.
+- [#4068](https://github.com/influxdata/telegraf/pull/4068): Add parameter to force the interval of gather for sysstat.
 
 ### Bugfixes
 

From ec47cab950cb733cb56b10ba50313f0d167fff01 Mon Sep 17 00:00:00 2001
From: Vincent Caron <vincent@zerodeux.net>
Date: Fri, 27 Apr 2018 23:55:10 +0200
Subject: [PATCH 1123/1302] Use same timestamp for fields in system input
 (#4078)

---
 plugins/inputs/system/system.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/inputs/system/system.go b/plugins/inputs/system/system.go
index fd204d6af..ad17c56ed 100644
--- a/plugins/inputs/system/system.go
+++ b/plugins/inputs/system/system.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/shirou/gopsutil/host"
 	"github.com/shirou/gopsutil/load"
@@ -43,7 +44,8 @@ func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
 		return err
 	}
 
-	acc.AddGauge("system", fields, nil)
+	now := time.Now()
+	acc.AddGauge("system", fields, nil, now)
 
 	hostinfo, err := host.Info()
 	if err != nil {
@@ -52,10 +54,10 @@ func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
 
 	acc.AddCounter("system", map[string]interface{}{
 		"uptime": hostinfo.Uptime,
-	}, nil)
+	}, nil, now)
 	acc.AddFields("system", map[string]interface{}{
 		"uptime_format": format_uptime(hostinfo.Uptime),
-	}, nil)
+	}, nil, now)
 
 	return nil
 }

From 908170b2078b1156bdf02535e5a50b7c53ae584d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 27 Apr 2018 14:56:31 -0700
Subject: [PATCH 1124/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60628d2f1..07b15c262 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,12 @@
 
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
 
+## v1.6.2 [unreleased]
+
+### Bugfixes
+
+- [#4078](https://github.com/influxdata/telegraf/pull/4078): Use same timestamp for fields in system input.
+
 ## v1.6.1 [2018-04-23]
 
 ### Bugfixes

From 1662b6feb9846573677eaa0ea20e212450ee5e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Bellon-Gervais?= <greggbg@gmail.com>
Date: Sat, 28 Apr 2018 00:12:59 +0200
Subject: [PATCH 1125/1302] Metrics values have same names as old cassandra
 plugin (#4080)

---
 .../inputs/jolokia2/examples/cassandra.conf    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/jolokia2/examples/cassandra.conf b/plugins/inputs/jolokia2/examples/cassandra.conf
index 3a419a6df..b8bb60980 100644
--- a/plugins/inputs/jolokia2/examples/cassandra.conf
+++ b/plugins/inputs/jolokia2/examples/cassandra.conf
@@ -10,6 +10,7 @@
     name  = "GarbageCollector"
     mbean = "java.lang:name=*,type=GarbageCollector"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
 [[inputs.jolokia2_agent]]
   urls = ["http://localhost:8778/jolokia"]
@@ -19,67 +20,76 @@
     name  = "Cache"
     mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=Cache"
     tag_keys = ["name", "scope"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "Client"
     mbean = "org.apache.cassandra.metrics:name=*,type=Client"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "ClientRequestMetrics"
     mbean = "org.apache.cassandra.metrics:name=*,type=ClientRequestMetrics"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "ClientRequest"
     mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=ClientRequest"
     tag_keys = ["name", "scope"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "ColumnFamily"
     mbean = "org.apache.cassandra.metrics:keyspace=*,name=*,scope=*,type=ColumnFamily"
     tag_keys = ["keyspace", "name", "scope"]
+    field_prefix = "$2_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "CommitLog"
     mbean = "org.apache.cassandra.metrics:name=*,type=CommitLog"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "Compaction"
     mbean = "org.apache.cassandra.metrics:name=*,type=Compaction"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "CQL"
     mbean = "org.apache.cassandra.metrics:name=*,type=CQL"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "DroppedMessage"
     mbean = "org.apache.cassandra.metrics:name=*,scope=*,type=DroppedMessage"
     tag_keys = ["name", "scope"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "FileCache"
     mbean = "org.apache.cassandra.metrics:name=*,type=FileCache"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "ReadRepair"
     mbean = "org.apache.cassandra.metrics:name=*,type=ReadRepair"
     tag_keys = ["name"]
-
-  [[inputs.jolokia2_agent.metric]]
-    name  = "HintedHandoffManager"
-    mbean = "org.apache.cassandra.metrics:type=HintedHandoffManager"
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "Storage"
     mbean = "org.apache.cassandra.metrics:name=*,type=Storage"
     tag_keys = ["name"]
+    field_prefix = "$1_"
 
   [[inputs.jolokia2_agent.metric]]
     name  = "ThreadPools"
     mbean = "org.apache.cassandra.metrics:name=*,path=*,scope=*,type=ThreadPools"
     tag_keys = ["name", "path", "scope"]
+    field_prefix = "$1_"

From 377547aa4cb0f0d64db42e52e5ca6e3d9a09fc4e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Apr 2018 16:15:21 -0700
Subject: [PATCH 1126/1302] Document one field per line requirement in
 logparser

---
 plugins/inputs/logparser/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 6c35a685a..cfa9d02b2 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -80,6 +80,8 @@ Timestamp modifiers can be used to convert captures to the timestamp of the
 parsed metric.  If no timestamp is parsed the metric will be created using the
 current time.
 
+You must capture at least one field per line.
+
 - Available modifiers:
   - string   (default if nothing is specified)
   - int

From 964856eb5f2a2ce2ee886f92a4dfc255532e99d3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 30 Apr 2018 17:48:45 -0700
Subject: [PATCH 1127/1302] Fix win_perf_counters to collect counters per
 instance (#4036)

---
 .../win_perf_counters/win_perf_counters.go    | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 7e3991d19..9a9e6b413 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -192,6 +192,14 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	var size uint32 = uint32(unsafe.Sizeof(PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
 	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
 
+	type InstanceGrouping struct {
+		name       string
+		instance   string
+		objectname string
+	}
+
+	var collectFields = make(map[InstanceGrouping]map[string]interface{})
+
 	// For iterate over the known metrics and get the samples.
 	for _, metric := range m.itemCache {
 		// collect
@@ -231,20 +239,22 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 					}
 
 					if add {
-						fields := make(map[string]interface{})
 						tags := make(map[string]string)
 						if s != "" {
 							tags["instance"] = s
 						}
 						tags["objectname"] = metric.objectName
-						fields[sanitizedChars.Replace(metric.counter)] =
-							float32(c.FmtValue.DoubleValue)
 
 						measurement := sanitizedChars.Replace(metric.measurement)
 						if measurement == "" {
 							measurement = "win_perf_counters"
 						}
-						acc.AddFields(measurement, fields, tags)
+						var instance = InstanceGrouping{measurement, s, metric.objectName}
+
+						if collectFields[instance] == nil {
+							collectFields[instance] = make(map[string]interface{})
+						}
+						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(c.FmtValue.DoubleValue)
 					}
 				}
 
@@ -257,6 +267,14 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
+	for instance, fields := range collectFields {
+		var tags = map[string]string{
+			"instance":   instance.instance,
+			"objectname": instance.objectname,
+		}
+		acc.AddFields(instance.name, fields, tags)
+	}
+
 	return nil
 }
 

From 92956104d629f705b96c3e542bd8e241af923c72 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Apr 2018 17:51:04 -0700
Subject: [PATCH 1128/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07b15c262..b7c64e7a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 ### Bugfixes
 
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
+- [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 
 ## v1.6.2 [unreleased]
 

From 076802224010b4baa85c0f6da96de633ee405c81 Mon Sep 17 00:00:00 2001
From: Mariusz Brzeski <marianob85@users.noreply.github.com>
Date: Tue, 1 May 2018 04:20:13 +0200
Subject: [PATCH 1129/1302] Support busybox ping in the ping input (#3877)

---
 plugins/inputs/ping/ping.go      | 23 +++++++++++++----------
 plugins/inputs/ping/ping_test.go | 28 +++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index 5de67322e..f347fa3d6 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -171,17 +171,17 @@ func (p *Ping) args(url string) []string {
 	// Build the ping command args based on toml config
 	args := []string{"-c", strconv.Itoa(p.Count), "-n", "-s", "16"}
 	if p.PingInterval > 0 {
-		args = append(args, "-i", strconv.FormatFloat(p.PingInterval, 'f', 1, 64))
+		args = append(args, "-i", strconv.FormatFloat(p.PingInterval, 'f', -1, 64))
 	}
 	if p.Timeout > 0 {
 		switch runtime.GOOS {
 		case "darwin":
-			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', 1, 64))
+			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
 		case "linux":
-			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', 1, 64))
+			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64))
 		default:
 			// Not sure the best option here, just assume GNU ping?
-			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', 1, 64))
+			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64))
 		}
 	}
 	if p.Deadline > 0 {
@@ -243,21 +243,24 @@ func processPingOutput(out string) (int, int, float64, float64, float64, float64
 			}
 		} else if strings.Contains(line, "min/avg/max") {
 			stats := strings.Split(line, " ")[3]
-			min, err = strconv.ParseFloat(strings.Split(stats, "/")[0], 64)
+			data := strings.Split(stats, "/")
+			min, err = strconv.ParseFloat(data[0], 64)
 			if err != nil {
 				return trans, recv, min, avg, max, stddev, err
 			}
-			avg, err = strconv.ParseFloat(strings.Split(stats, "/")[1], 64)
+			avg, err = strconv.ParseFloat(data[1], 64)
 			if err != nil {
 				return trans, recv, min, avg, max, stddev, err
 			}
-			max, err = strconv.ParseFloat(strings.Split(stats, "/")[2], 64)
+			max, err = strconv.ParseFloat(data[2], 64)
 			if err != nil {
 				return trans, recv, min, avg, max, stddev, err
 			}
-			stddev, err = strconv.ParseFloat(strings.Split(stats, "/")[3], 64)
-			if err != nil {
-				return trans, recv, min, avg, max, stddev, err
+			if len(data) == 4 {
+				stddev, err = strconv.ParseFloat(data[3], 64)
+				if err != nil {
+					return trans, recv, min, avg, max, stddev, err
+				}
 			}
 		}
 	}
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index 85f5ca079..9817d07c6 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -41,6 +41,19 @@ PING www.google.com (216.58.218.164) 56(84) bytes of data.
 rtt min/avg/max/mdev = 35.225/43.628/51.806/5.325 ms
 `
 
+// BusyBox v1.24.1 (2017-02-28 03:28:13 CET) multi-call binary
+var busyBoxPingOutput = `
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+64 bytes from 8.8.8.8: seq=0 ttl=56 time=22.559 ms
+64 bytes from 8.8.8.8: seq=1 ttl=56 time=15.810 ms
+64 bytes from 8.8.8.8: seq=2 ttl=56 time=16.262 ms
+64 bytes from 8.8.8.8: seq=3 ttl=56 time=15.815 ms
+
+--- 8.8.8.8 ping statistics ---
+4 packets transmitted, 4 packets received, 0% packet loss
+round-trip min/avg/max = 15.810/17.611/22.559 ms
+`
+
 // Fatal ping output (invalid argument)
 var fatalPingOutput = `
 ping: -i interval too short: Operation not permitted
@@ -65,6 +78,15 @@ func TestProcessPingOutput(t *testing.T) {
 	assert.InDelta(t, 43.628, avg, 0.001)
 	assert.InDelta(t, 51.806, max, 0.001)
 	assert.InDelta(t, 5.325, stddev, 0.001)
+
+	trans, rec, min, avg, max, stddev, err = processPingOutput(busyBoxPingOutput)
+	assert.NoError(t, err)
+	assert.Equal(t, 4, trans, "4 packets were transmitted")
+	assert.Equal(t, 4, rec, "4 packets were transmitted")
+	assert.InDelta(t, 15.810, min, 0.001)
+	assert.InDelta(t, 17.611, avg, 0.001)
+	assert.InDelta(t, 22.559, max, 0.001)
+	assert.InDelta(t, -1.0, stddev, 0.001)
 }
 
 // Test that processPingOutput returns an error when 'ping' fails to run, such
@@ -106,7 +128,7 @@ func TestArgs(t *testing.T) {
 			"12000.0", "www.google.com"}
 	default:
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12.0", "www.google.com"}
+			"12", "www.google.com"}
 	}
 
 	p.Deadline = 24
@@ -117,7 +139,7 @@ func TestArgs(t *testing.T) {
 			"12000.0", "-t", "24", "www.google.com"}
 	default:
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12.0", "-w", "24", "www.google.com"}
+			"12", "-w", "24", "www.google.com"}
 	}
 
 	sort.Strings(actual)
@@ -133,7 +155,7 @@ func TestArgs(t *testing.T) {
 			"12000.0", "-t", "24", "-i", "1.2", "www.google.com"}
 	default:
 		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12.0", "-w", "24", "-i", "1.2", "www.google.com"}
+			"12", "-w", "24", "-i", "1.2", "www.google.com"}
 	}
 	sort.Strings(actual)
 	sort.Strings(expected)

From f094f83da54cb1c5523835cf28f6466e126ba838 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 30 Apr 2018 19:21:12 -0700
Subject: [PATCH 1130/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c64e7a2..813ac0373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [#4035](https://github.com/influxdata/telegraf/pull/4035): Add server version tag to docker input.
 - [#4044](https://github.com/influxdata/telegraf/pull/4044): Add support for LeoFS 1.4 to leofs input.
 - [#4068](https://github.com/influxdata/telegraf/pull/4068): Add parameter to force the interval of gather for sysstat.
+- [#3877](https://github.com/influxdata/telegraf/pull/3877): Support busybox ping in the ping input.
 
 ### Bugfixes
 

From 83345ec2b30a287e37efa5229da617ba279751aa Mon Sep 17 00:00:00 2001
From: Craig Thayer <cthayer@craigthayer.com>
Date: Tue, 1 May 2018 11:58:15 -0700
Subject: [PATCH 1131/1302] Add input plugin for McRouter (#4077)

---
 plugins/inputs/all/all.go                |   1 +
 plugins/inputs/mcrouter/README.md        | 103 ++++++++
 plugins/inputs/mcrouter/mcrouter.go      | 286 +++++++++++++++++++++++
 plugins/inputs/mcrouter/mcrouter_test.go | 250 ++++++++++++++++++++
 4 files changed, 640 insertions(+)
 create mode 100644 plugins/inputs/mcrouter/README.md
 create mode 100644 plugins/inputs/mcrouter/mcrouter.go
 create mode 100644 plugins/inputs/mcrouter/mcrouter_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 440d1e9a5..f4a630ecc 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -50,6 +50,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
 	_ "github.com/influxdata/telegraf/plugins/inputs/lustre2"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mailchimp"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mcrouter"
 	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mesos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/minecraft"
diff --git a/plugins/inputs/mcrouter/README.md b/plugins/inputs/mcrouter/README.md
new file mode 100644
index 000000000..05c259786
--- /dev/null
+++ b/plugins/inputs/mcrouter/README.md
@@ -0,0 +1,103 @@
+# Mcrouter Input Plugin
+
+This plugin gathers statistics data from a Mcrouter server.
+
+### Configuration:
+
+```toml
+# Read metrics from one or many mcrouter servers.
+[[inputs.mcrouter]]
+  ## An array of address to gather stats about. Specify an ip or hostname
+  ## with port. ie tcp://localhost:11211, tcp://10.0.0.1:11211, etc.
+  servers = ["tcp://localhost:11211", "unix:///var/run/mcrouter.sock"]
+
+  ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+  # timeout = "5s"
+```
+
+### Measurements & Fields:
+
+The fields from this plugin are gathered in the *mcrouter* measurement.
+
+Description of gathered fields can be found [here](https://github.com/facebook/mcrouter/wiki/Stats-list).
+
+Fields:
+
+* uptime
+* num_servers
+* num_servers_new
+* num_servers_up
+* num_servers_down
+* num_servers_closed
+* num_clients
+* num_suspect_servers
+* destination_batches_sum
+* destination_requests_sum
+* outstanding_route_get_reqs_queued
+* outstanding_route_update_reqs_queued
+* outstanding_route_get_avg_queue_size
+* outstanding_route_update_avg_queue_size
+* outstanding_route_get_avg_wait_time_sec
+* outstanding_route_update_avg_wait_time_sec
+* retrans_closed_connections
+* destination_pending_reqs
+* destination_inflight_reqs
+* destination_batch_size
+* asynclog_requests
+* proxy_reqs_processing
+* proxy_reqs_waiting
+* client_queue_notify_period
+* rusage_system
+* rusage_user
+* ps_num_minor_faults
+* ps_num_major_faults
+* ps_user_time_sec
+* ps_system_time_sec
+* ps_vsize
+* ps_rss
+* fibers_allocated
+* fibers_pool_size
+* fibers_stack_high_watermark
+* successful_client_connections
+* duration_us
+* destination_max_pending_reqs
+* destination_max_inflight_reqs
+* retrans_per_kbyte_max
+* cmd_get_count
+* cmd_delete_out
+* cmd_lease_get
+* cmd_set
+* cmd_get_out_all
+* cmd_get_out
+* cmd_lease_set_count
+* cmd_other_out_all
+* cmd_lease_get_out
+* cmd_set_count
+* cmd_lease_set_out
+* cmd_delete_count
+* cmd_other
+* cmd_delete
+* cmd_get
+* cmd_lease_set
+* cmd_set_out
+* cmd_lease_get_count
+* cmd_other_out
+* cmd_lease_get_out_all
+* cmd_set_out_all
+* cmd_other_count
+* cmd_delete_out_all
+* cmd_lease_set_out_all
+
+### Tags:
+
+* Mcrouter measurements have the following tags:
+    - server (the host name from which metrics are gathered)
+
+
+
+### Example Output:
+
+```
+$ ./telegraf --config telegraf.conf --input-filter mcrouter --test
+mcrouter,server=localhost:11211 uptime=166,num_servers=1,num_servers_new=1,num_servers_up=0,num_servers_down=0,num_servers_closed=0,num_clients=1,num_suspect_servers=0,destination_batches_sum=0,destination_requests_sum=0,outstanding_route_get_reqs_queued=0,outstanding_route_update_reqs_queued=0,outstanding_route_get_avg_queue_size=0,outstanding_route_update_avg_queue_size=0,outstanding_route_get_avg_wait_time_sec=0,outstanding_route_update_avg_wait_time_sec=0,retrans_closed_connections=0,destination_pending_reqs=0,destination_inflight_reqs=0,destination_batch_size=0,asynclog_requests=0,proxy_reqs_processing=1,proxy_reqs_waiting=0,client_queue_notify_period=0,rusage_system=0.040966,rusage_user=0.020483,ps_num_minor_faults=2490,ps_num_major_faults=11,ps_user_time_sec=0.02,ps_system_time_sec=0.04,ps_vsize=697741312,ps_rss=10563584,fibers_allocated=0,fibers_pool_size=0,fibers_stack_high_watermark=0,successful_client_connections=18,duration_us=0,destination_max_pending_reqs=0,destination_max_inflight_reqs=0,retrans_per_kbyte_max=0,cmd_get_count=0,cmd_delete_out=0,cmd_lease_get=0,cmd_set=0,cmd_get_out_all=0,cmd_get_out=0,cmd_lease_set_count=0,cmd_other_out_all=0,cmd_lease_get_out=0,cmd_set_count=0,cmd_lease_set_out=0,cmd_delete_count=0,cmd_other=0,cmd_delete=0,cmd_get=0,cmd_lease_set=0,cmd_set_out=0,cmd_lease_get_count=0,cmd_other_out=0,cmd_lease_get_out_all=0,cmd_set_out_all=0,cmd_other_count=0,cmd_delete_out_all=0,cmd_lease_set_out_all=0 1453831884664956455
+```
diff --git a/plugins/inputs/mcrouter/mcrouter.go b/plugins/inputs/mcrouter/mcrouter.go
new file mode 100644
index 000000000..1ae5c79ea
--- /dev/null
+++ b/plugins/inputs/mcrouter/mcrouter.go
@@ -0,0 +1,286 @@
+package mcrouter
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"net"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+// Mcrouter is a mcrouter plugin
+type Mcrouter struct {
+	Servers []string
+	Timeout internal.Duration
+}
+
+// enum for statType
+type statType int
+
+const (
+	typeInt   statType = iota
+	typeFloat statType = iota
+)
+
+var sampleConfig = `
+  ## An array of address to gather stats about. Specify an ip or hostname
+  ## with port. ie tcp://localhost:11211, tcp://10.0.0.1:11211, etc.
+	servers = ["tcp://localhost:11211", "unix:///var/run/mcrouter.sock"]
+
+	## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+  # timeout = "5s"
+`
+
+var defaultTimeout = 5 * time.Second
+
+var defaultServerURL = url.URL{
+	Scheme: "tcp",
+	Host:   "localhost:11211",
+}
+
+// The list of metrics that should be sent
+var sendMetrics = map[string]statType{
+	"uptime":                                     typeInt,
+	"num_servers":                                typeInt,
+	"num_servers_new":                            typeInt,
+	"num_servers_up":                             typeInt,
+	"num_servers_down":                           typeInt,
+	"num_servers_closed":                         typeInt,
+	"num_clients":                                typeInt,
+	"num_suspect_servers":                        typeInt,
+	"destination_batches_sum":                    typeInt,
+	"destination_requests_sum":                   typeInt,
+	"outstanding_route_get_reqs_queued":          typeInt,
+	"outstanding_route_update_reqs_queued":       typeInt,
+	"outstanding_route_get_avg_queue_size":       typeInt,
+	"outstanding_route_update_avg_queue_size":    typeInt,
+	"outstanding_route_get_avg_wait_time_sec":    typeInt,
+	"outstanding_route_update_avg_wait_time_sec": typeInt,
+	"retrans_closed_connections":                 typeInt,
+	"destination_pending_reqs":                   typeInt,
+	"destination_inflight_reqs":                  typeInt,
+	"destination_batch_size":                     typeInt,
+	"asynclog_requests":                          typeInt,
+	"proxy_reqs_processing":                      typeInt,
+	"proxy_reqs_waiting":                         typeInt,
+	"client_queue_notify_period":                 typeInt,
+	"rusage_system":                              typeFloat,
+	"rusage_user":                                typeFloat,
+	"ps_num_minor_faults":                        typeInt,
+	"ps_num_major_faults":                        typeInt,
+	"ps_user_time_sec":                           typeFloat,
+	"ps_system_time_sec":                         typeFloat,
+	"ps_vsize":                                   typeInt,
+	"ps_rss":                                     typeInt,
+	"fibers_allocated":                           typeInt,
+	"fibers_pool_size":                           typeInt,
+	"fibers_stack_high_watermark":                typeInt,
+	"successful_client_connections":              typeInt,
+	"duration_us":                                typeInt,
+	"destination_max_pending_reqs":               typeInt,
+	"destination_max_inflight_reqs":              typeInt,
+	"retrans_per_kbyte_max":                      typeInt,
+	"cmd_get_count":                              typeInt,
+	"cmd_delete_out":                             typeInt,
+	"cmd_lease_get":                              typeInt,
+	"cmd_set":                                    typeInt,
+	"cmd_get_out_all":                            typeInt,
+	"cmd_get_out":                                typeInt,
+	"cmd_lease_set_count":                        typeInt,
+	"cmd_other_out_all":                          typeInt,
+	"cmd_lease_get_out":                          typeInt,
+	"cmd_set_count":                              typeInt,
+	"cmd_lease_set_out":                          typeInt,
+	"cmd_delete_count":                           typeInt,
+	"cmd_other":                                  typeInt,
+	"cmd_delete":                                 typeInt,
+	"cmd_get":                                    typeInt,
+	"cmd_lease_set":                              typeInt,
+	"cmd_set_out":                                typeInt,
+	"cmd_lease_get_count":                        typeInt,
+	"cmd_other_out":                              typeInt,
+	"cmd_lease_get_out_all":                      typeInt,
+	"cmd_set_out_all":                            typeInt,
+	"cmd_other_count":                            typeInt,
+	"cmd_delete_out_all":                         typeInt,
+	"cmd_lease_set_out_all":                      typeInt,
+}
+
+// SampleConfig returns sample configuration message
+func (m *Mcrouter) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns description of Mcrouter plugin
+func (m *Mcrouter) Description() string {
+	return "Read metrics from one or many mcrouter servers"
+}
+
+// Gather reads stats from all configured servers accumulates stats
+func (m *Mcrouter) Gather(acc telegraf.Accumulator) error {
+	ctx := context.Background()
+
+	if m.Timeout.Duration < 1*time.Second {
+		m.Timeout.Duration = defaultTimeout
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, m.Timeout.Duration)
+	defer cancel()
+
+	if len(m.Servers) == 0 {
+		m.Servers = []string{defaultServerURL.String()}
+	}
+
+	for _, serverAddress := range m.Servers {
+		acc.AddError(m.gatherServer(ctx, serverAddress, acc))
+	}
+
+	return nil
+}
+
+// ParseAddress parses an address string into 'host:port' and 'protocol' parts
+func (m *Mcrouter) ParseAddress(address string) (string, string, error) {
+	var protocol string
+	var host string
+	var port string
+
+	u, parseError := url.Parse(address)
+
+	if parseError != nil {
+		return "", "", fmt.Errorf("Invalid server address")
+	}
+
+	if u.Scheme != "tcp" && u.Scheme != "unix" {
+		return "", "", fmt.Errorf("Invalid server protocol")
+	}
+
+	protocol = u.Scheme
+
+	if protocol == "unix" {
+		if u.Path == "" {
+			return "", "", fmt.Errorf("Invalid unix socket path")
+		}
+
+		address = u.Path
+	} else {
+		if u.Host == "" {
+			return "", "", fmt.Errorf("Invalid host")
+		}
+
+		host = u.Hostname()
+		port = u.Port()
+
+		if host == "" {
+			host = defaultServerURL.Hostname()
+		}
+
+		if port == "" {
+			port = defaultServerURL.Port()
+		}
+
+		address = host + ":" + port
+	}
+
+	return address, protocol, nil
+}
+
+func (m *Mcrouter) gatherServer(ctx context.Context, address string, acc telegraf.Accumulator) error {
+	var conn net.Conn
+	var err error
+	var protocol string
+	var dialer net.Dialer
+
+	address, protocol, err = m.ParseAddress(address)
+
+	conn, err = dialer.DialContext(ctx, protocol, address)
+
+	if err != nil {
+		return err
+	}
+
+	defer conn.Close()
+
+	// Extend connection
+	deadline, ok := ctx.Deadline()
+
+	if ok {
+		conn.SetDeadline(deadline)
+	}
+
+	// Read and write buffer
+	reader := bufio.NewReader(conn)
+	scanner := bufio.NewScanner(reader)
+
+	// Send command
+	if _, err := fmt.Fprint(conn, "stats\r\n"); err != nil {
+		return err
+	}
+
+	values, err := parseResponse(scanner)
+
+	if err != nil {
+		return err
+	}
+
+	// Add server address as a tag
+	tags := map[string]string{"server": address}
+
+	// Process values
+	fields := make(map[string]interface{})
+	for key, sType := range sendMetrics {
+		if value, ok := values[key]; ok {
+			switch sType {
+			case typeInt:
+				if v, errParse := strconv.ParseInt(value, 10, 64); errParse == nil {
+					fields[key] = v
+				}
+			case typeFloat:
+				if v, errParse := strconv.ParseFloat(value, 64); errParse == nil {
+					fields[key] = v
+				}
+			default:
+			}
+		}
+	}
+	acc.AddFields("mcrouter", fields, tags)
+	return nil
+}
+
+func parseResponse(r *bufio.Scanner) (map[string]string, error) {
+	values := make(map[string]string)
+
+	for r.Scan() {
+		// Read line
+		line := r.Text()
+
+		// Done
+		if line == "END" {
+			break
+		}
+
+		// Read values
+		s := strings.SplitN(line, " ", 3)
+
+		if len(s) != 3 || s[0] != "STAT" {
+			return nil, fmt.Errorf("unexpected line in stats response: %s", line)
+		}
+
+		// Save values
+		values[s[1]] = s[2]
+	}
+
+	return values, nil
+}
+
+func init() {
+	inputs.Add("mcrouter", func() telegraf.Input {
+		return &Mcrouter{}
+	})
+}
diff --git a/plugins/inputs/mcrouter/mcrouter_test.go b/plugins/inputs/mcrouter/mcrouter_test.go
new file mode 100644
index 000000000..e17c13b6d
--- /dev/null
+++ b/plugins/inputs/mcrouter/mcrouter_test.go
@@ -0,0 +1,250 @@
+package mcrouter
+
+import (
+	"bufio"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAddressParsing(t *testing.T) {
+	m := &Mcrouter{
+		Servers: []string{"tcp://" + testutil.GetLocalHost()},
+	}
+
+	var acceptTests = [][3]string{
+		{"tcp://localhost:8086", "localhost:8086", "tcp"},
+		{"tcp://localhost", "localhost:" + defaultServerURL.Port(), "tcp"},
+		{"tcp://localhost:", "localhost:" + defaultServerURL.Port(), "tcp"},
+		{"tcp://:8086", defaultServerURL.Hostname() + ":8086", "tcp"},
+		{"tcp://:", defaultServerURL.Host, "tcp"},
+	}
+
+	var rejectTests = []string{
+		"tcp://",
+	}
+
+	for _, args := range acceptTests {
+		address, protocol, err := m.ParseAddress(args[0])
+
+		assert.Nil(t, err, args[0])
+		assert.True(t, address == args[1], args[0])
+		assert.True(t, protocol == args[2], args[0])
+	}
+
+	for _, addr := range rejectTests {
+		address, protocol, err := m.ParseAddress(addr)
+
+		assert.NotNil(t, err, addr)
+		assert.Empty(t, address, addr)
+		assert.Empty(t, protocol, addr)
+	}
+}
+
+func TestMcrouterGeneratesMetrics(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	m := &Mcrouter{
+		Servers: []string{"tcp://" + testutil.GetLocalHost()},
+	}
+
+	var acc testutil.Accumulator
+
+	err := acc.GatherError(m.Gather)
+	require.NoError(t, err)
+
+	intMetrics := []string{"uptime", "num_servers", "num_servers_new", "num_servers_up",
+		"num_servers_down", "num_servers_closed", "num_clients",
+		"num_suspect_servers", "destination_batches_sum", "destination_requests_sum",
+		"outstanding_route_get_reqs_queued", "outstanding_route_update_reqs_queued",
+		"outstanding_route_get_avg_queue_size", "outstanding_route_update_avg_queue_size",
+		"outstanding_route_get_avg_wait_time_sec", "outstanding_route_update_avg_wait_time_sec",
+		"retrans_closed_connections", "destination_pending_reqs", "destination_inflight_reqs",
+		"destination_batch_size", "asynclog_requests", "proxy_reqs_processing",
+		"proxy_reqs_waiting", "client_queue_notify_period",
+		"ps_num_minor_faults", "ps_num_major_faults",
+		"ps_vsize", "ps_rss", "fibers_allocated", "fibers_pool_size", "fibers_stack_high_watermark",
+		"successful_client_connections", "duration_us", "destination_max_pending_reqs",
+		"destination_max_inflight_reqs", "retrans_per_kbyte_max", "cmd_get_count", "cmd_delete_out",
+		"cmd_lease_get", "cmd_set", "cmd_get_out_all", "cmd_get_out", "cmd_lease_set_count",
+		"cmd_other_out_all", "cmd_lease_get_out", "cmd_set_count", "cmd_lease_set_out",
+		"cmd_delete_count", "cmd_other", "cmd_delete", "cmd_get", "cmd_lease_set", "cmd_set_out",
+		"cmd_lease_get_count", "cmd_other_out", "cmd_lease_get_out_all", "cmd_set_out_all",
+		"cmd_other_count", "cmd_delete_out_all", "cmd_lease_set_out_all"}
+
+	floatMetrics := []string{"rusage_system", "rusage_user", "ps_user_time_sec", "ps_system_time_sec"}
+
+	for _, metric := range intMetrics {
+		assert.True(t, acc.HasInt64Field("mcrouter", metric), metric)
+	}
+
+	for _, metric := range floatMetrics {
+		assert.True(t, acc.HasFloatField("mcrouter", metric), metric)
+	}
+}
+
+func TestMcrouterParseMetrics(t *testing.T) {
+	r := bufio.NewReader(strings.NewReader(mcrouterStats))
+	scanner := bufio.NewScanner(r)
+	values, err := parseResponse(scanner)
+	require.NoError(t, err, "Error parsing mcrouter response")
+
+	tests := []struct {
+		key   string
+		value string
+	}{
+		{"uptime", "166"},
+		{"num_servers", "1"},
+		{"num_servers_new", "1"},
+		{"num_servers_up", "0"},
+		{"num_servers_down", "0"},
+		{"num_servers_closed", "0"},
+		{"num_clients", "1"},
+		{"num_suspect_servers", "0"},
+		{"destination_batches_sum", "0"},
+		{"destination_requests_sum", "0"},
+		{"outstanding_route_get_reqs_queued", "0"},
+		{"outstanding_route_update_reqs_queued", "0"},
+		{"outstanding_route_get_avg_queue_size", "0"},
+		{"outstanding_route_update_avg_queue_size", "0"},
+		{"outstanding_route_get_avg_wait_time_sec", "0"},
+		{"outstanding_route_update_avg_wait_time_sec", "0"},
+		{"retrans_closed_connections", "0"},
+		{"destination_pending_reqs", "0"},
+		{"destination_inflight_reqs", "0"},
+		{"destination_batch_size", "0"},
+		{"asynclog_requests", "0"},
+		{"proxy_reqs_processing", "1"},
+		{"proxy_reqs_waiting", "0"},
+		{"client_queue_notify_period", "0"},
+		{"rusage_system", "0.040966"},
+		{"rusage_user", "0.020483"},
+		{"ps_num_minor_faults", "2490"},
+		{"ps_num_major_faults", "11"},
+		{"ps_user_time_sec", "0.02"},
+		{"ps_system_time_sec", "0.04"},
+		{"ps_vsize", "697741312"},
+		{"ps_rss", "10563584"},
+		{"fibers_allocated", "0"},
+		{"fibers_pool_size", "0"},
+		{"fibers_stack_high_watermark", "0"},
+		{"successful_client_connections", "18"},
+		{"duration_us", "0"},
+		{"destination_max_pending_reqs", "0"},
+		{"destination_max_inflight_reqs", "0"},
+		{"retrans_per_kbyte_max", "0"},
+		{"cmd_get_count", "0"},
+		{"cmd_delete_out", "0"},
+		{"cmd_lease_get", "0"},
+		{"cmd_set", "0"},
+		{"cmd_get_out_all", "0"},
+		{"cmd_get_out", "0"},
+		{"cmd_lease_set_count", "0"},
+		{"cmd_other_out_all", "0"},
+		{"cmd_lease_get_out", "0"},
+		{"cmd_set_count", "0"},
+		{"cmd_lease_set_out", "0"},
+		{"cmd_delete_count", "0"},
+		{"cmd_other", "0"},
+		{"cmd_delete", "0"},
+		{"cmd_get", "0"},
+		{"cmd_lease_set", "0"},
+		{"cmd_set_out", "0"},
+		{"cmd_lease_get_count", "0"},
+		{"cmd_other_out", "0"},
+		{"cmd_lease_get_out_all", "0"},
+		{"cmd_set_out_all", "0"},
+		{"cmd_other_count", "0"},
+		{"cmd_delete_out_all", "0"},
+		{"cmd_lease_set_out_all", "0"},
+	}
+
+	for _, test := range tests {
+		value, ok := values[test.key]
+		if !ok {
+			t.Errorf("Did not find key for metric %s in values", test.key)
+			continue
+		}
+		if value != test.value {
+			t.Errorf("Metric: %s, Expected: %s, actual: %s",
+				test.key, test.value, value)
+		}
+	}
+}
+
+var mcrouterStats = `STAT version 36.0.0 mcrouter
+STAT commandargs --port 11211 --config-file /etc/mcrouter/mcrouter.json --async-dir /var/spool/mcrouter --log-path /var/log/mcrouter/mcrouter.log --stats-root /var/mcrouter/stats --server-timeout 100 --reset-inactive-connection-interval 10000 --proxy-threads auto
+STAT pid 21357
+STAT parent_pid 1
+STAT time 1524673265
+STAT uptime 166
+STAT num_servers 1
+STAT num_servers_new 1
+STAT num_servers_up 0
+STAT num_servers_down 0
+STAT num_servers_closed 0
+STAT num_clients 1
+STAT num_suspect_servers 0
+STAT destination_batches_sum 0
+STAT destination_requests_sum 0
+STAT outstanding_route_get_reqs_queued 0
+STAT outstanding_route_update_reqs_queued 0
+STAT outstanding_route_get_avg_queue_size 0
+STAT outstanding_route_update_avg_queue_size 0
+STAT outstanding_route_get_avg_wait_time_sec 0
+STAT outstanding_route_update_avg_wait_time_sec 0
+STAT retrans_closed_connections 0
+STAT destination_pending_reqs 0
+STAT destination_inflight_reqs 0
+STAT destination_batch_size 0
+STAT asynclog_requests 0
+STAT proxy_reqs_processing 1
+STAT proxy_reqs_waiting 0
+STAT client_queue_notify_period 0
+STAT rusage_system 0.040966
+STAT rusage_user 0.020483
+STAT ps_num_minor_faults 2490
+STAT ps_num_major_faults 11
+STAT ps_user_time_sec 0.02
+STAT ps_system_time_sec 0.04
+STAT ps_vsize 697741312
+STAT ps_rss 10563584
+STAT fibers_allocated 0
+STAT fibers_pool_size 0
+STAT fibers_stack_high_watermark 0
+STAT successful_client_connections 18
+STAT duration_us 0
+STAT destination_max_pending_reqs 0
+STAT destination_max_inflight_reqs 0
+STAT retrans_per_kbyte_max 0
+STAT cmd_get_count 0
+STAT cmd_delete_out 0
+STAT cmd_lease_get 0
+STAT cmd_set 0
+STAT cmd_get_out_all 0
+STAT cmd_get_out 0
+STAT cmd_lease_set_count 0
+STAT cmd_other_out_all 0
+STAT cmd_lease_get_out 0
+STAT cmd_set_count 0
+STAT cmd_lease_set_out 0
+STAT cmd_delete_count 0
+STAT cmd_other 0
+STAT cmd_delete 0
+STAT cmd_get 0
+STAT cmd_lease_set 0
+STAT cmd_set_out 0
+STAT cmd_lease_get_count 0
+STAT cmd_other_out 0
+STAT cmd_lease_get_out_all 0
+STAT cmd_set_out_all 0
+STAT cmd_other_count 0
+STAT cmd_delete_out_all 0
+STAT cmd_lease_set_out_all 0
+END
+`

From c03e8918a2de917152cb5e3fc26a849ac3ff86b4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 1 May 2018 12:01:08 -0700
Subject: [PATCH 1132/1302] Update changelog, add mcrouter to README

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 813ac0373..70c2f656f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### New Inputs
 
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
+- [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
 - [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
 
 ### Features
@@ -23,6 +24,7 @@
 - [#4044](https://github.com/influxdata/telegraf/pull/4044): Add support for LeoFS 1.4 to leofs input.
 - [#4068](https://github.com/influxdata/telegraf/pull/4068): Add parameter to force the interval of gather for sysstat.
 - [#3877](https://github.com/influxdata/telegraf/pull/3877): Support busybox ping in the ping input.
+- [#4077](https://github.com/influxdata/telegraf/pull/4077): Add input plugin for McRouter.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index d1691698a..90ec48579 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,7 @@ configuration options.
 * [leofs](./plugins/inputs/leofs)
 * [lustre2](./plugins/inputs/lustre2)
 * [mailchimp](./plugins/inputs/mailchimp)
+* [mcrouter](./plugins/inputs/mcrouter)
 * [memcached](./plugins/inputs/memcached)
 * [mesos](./plugins/inputs/mesos)
 * [minecraft](./plugins/inputs/minecraft)

From cff7ee8edf4b1a1c14950e1b054aa8096616be10 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 1 May 2018 18:56:39 -0700
Subject: [PATCH 1133/1302] Fix handling of uint64 in datadog output (#4091)

---
 plugins/outputs/datadog/datadog.go      | 10 +++-------
 plugins/outputs/datadog/datadog_test.go | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/datadog/datadog.go b/plugins/outputs/datadog/datadog.go
index 92d31e128..2ab3dcd58 100644
--- a/plugins/outputs/datadog/datadog.go
+++ b/plugins/outputs/datadog/datadog.go
@@ -179,13 +179,9 @@ func verifyValue(v interface{}) bool {
 
 func (p *Point) setValue(v interface{}) error {
 	switch d := v.(type) {
-	case int:
-		p[1] = float64(int(d))
-	case int32:
-		p[1] = float64(int32(d))
 	case int64:
-		p[1] = float64(int64(d))
-	case float32:
+		p[1] = float64(d)
+	case uint64:
 		p[1] = float64(d)
 	case float64:
 		p[1] = float64(d)
@@ -195,7 +191,7 @@ func (p *Point) setValue(v interface{}) error {
 			p[1] = float64(1)
 		}
 	default:
-		return fmt.Errorf("undeterminable type")
+		return fmt.Errorf("undeterminable field type: %T", v)
 	}
 	return nil
 }
diff --git a/plugins/outputs/datadog/datadog_test.go b/plugins/outputs/datadog/datadog_test.go
index 6a97bad5f..045bf4b43 100644
--- a/plugins/outputs/datadog/datadog_test.go
+++ b/plugins/outputs/datadog/datadog_test.go
@@ -168,6 +168,30 @@ func TestBuildPoint(t *testing.T) {
 			},
 			nil,
 		},
+		{
+			testutil.TestMetric(int64(0), "test int64"),
+			Point{
+				float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
+				0.0,
+			},
+			nil,
+		},
+		{
+			testutil.TestMetric(uint64(0), "test uint64"),
+			Point{
+				float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
+				0.0,
+			},
+			nil,
+		},
+		{
+			testutil.TestMetric(true, "test bool"),
+			Point{
+				float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
+				1.0,
+			},
+			nil,
+		},
 	}
 	for _, tt := range tagtests {
 		pt, err := buildMetrics(tt.ptIn)

From fd64487be5d06153d2b7adde53bad312939fa754 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 1 May 2018 18:57:26 -0700
Subject: [PATCH 1134/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70c2f656f..84ad2c191 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 ### Bugfixes
 
 - [#4078](https://github.com/influxdata/telegraf/pull/4078): Use same timestamp for fields in system input.
+- [#4091](https://github.com/influxdata/telegraf/pull/4091): Fix handling of uint64 in datadog output.
 
 ## v1.6.1 [2018-04-23]
 

From 239333ad906b8977e44d100d24187834ecce31b8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 2 May 2018 11:49:29 -0700
Subject: [PATCH 1135/1302] Remove dead link from logparser sample config

---
 plugins/inputs/logparser/logparser.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index fd5a41f7f..cb9e1e8b6 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -70,7 +70,6 @@ const sampleConfig = `
   # watch_method = "inotify"
 
   ## Parse logstash-style "grok" patterns:
-  ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
   [inputs.logparser.grok]
     ## This is a list of patterns to check the given log file(s) for.
     ## Note that adding patterns here increases processing time. The most

From c1d4b0b15483c76a9d92d2685bf6f0979e70032e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 2 May 2018 11:50:11 -0700
Subject: [PATCH 1136/1302] Update telegraf.conf

---
 etc/telegraf.conf | 107 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 27 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index da826a1c7..2ef4fe2e4 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -101,10 +101,11 @@
   # skip_database_creation = false
 
   ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.
+  ## the default retention policy.  Only takes effect when using HTTP.
   # retention_policy = ""
 
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all"
+  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
+  ## Only takes effect when using HTTP.
   # write_consistency = "any"
 
   ## Timeout for HTTP messages.
@@ -120,7 +121,7 @@
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config
+  ## Optional SSL Config for use on HTTP connections.
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
   # ssl_key = "/etc/telegraf/key.pem"
@@ -694,6 +695,13 @@
 #   # address = "unix:///tmp/telegraf.sock"
 #   # address = "unixgram:///tmp/telegraf.sock"
 #
+#   ## Optional SSL Config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Use SSL but skip chain & host verification
+#   # insecure_skip_verify = false
+#
 #   ## Period between keep alive probes.
 #   ## Only applies to TCP sockets.
 #   ## 0 disables keep alive probes.
@@ -952,24 +960,6 @@
 #   # bond_interfaces = ["bond0"]
 
 
-# # Read Cassandra metrics through Jolokia
-# [[inputs.cassandra]]
-#   # This is the context root used to compose the jolokia url
-#   context = "/jolokia/read"
-#   ## List of cassandra servers exposing jolokia read service
-#   servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
-#   ## List of metrics collected on above servers
-#   ## Each metric consists of a jmx path.
-#   ## This will collect all heap memory usage metrics from the jvm and
-#   ## ReadLatency metrics for all keyspaces and tables.
-#   ## "type=Table" in the query works with Cassandra3.0. Older versions might
-#   ## need to use "type=ColumnFamily"
-#   metrics  = [
-#     "/java.lang:type=Memory/HeapMemoryUsage",
-#     "/org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"
-#   ]
-
-
 # # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
 # [[inputs.ceph]]
 #   ## This is the recommended interval to poll.  Too frequent and you will lose
@@ -1363,6 +1353,20 @@
 #   use_sudo = false
 
 
+# # Read devices value(s) from a Fibaro controller
+# [[inputs.fibaro]]
+#   ## Required Fibaro controller address/hostname.
+#   ## Note: at the time of writing this plugin, Fibaro only implemented http - no https available
+#   url = "http://<controller>:80"
+#
+#   ## Required credentials to access the API (http://<controller/api/<component>)
+#   username = "<username>"
+#   password = "<password>"
+#
+#   ## Amount of time allowed to complete the HTTP request
+#   # timeout = "5s"
+
+
 # # Read stats about given file(s)
 # [[inputs.filestat]]
 #   ## Files to gather stats about.
@@ -1801,13 +1805,13 @@
 #   ## Add proxy targets to query
 #   # default_target_username = ""
 #   # default_target_password = ""
-#   [[inputs.jolokia_proxy.target]]
+#   [[inputs.jolokia2_proxy.target]]
 #     url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
-# 	# username = ""
-# 	# password = ""
+#     # username = ""
+#     # password = ""
 #
 #   ## Add metrics to read
-#   [[inputs.jolokia_proxy.metric]]
+#   [[inputs.jolokia2_proxy.metric]]
 #     name  = "java_runtime"
 #     mbean = "java.lang:type=Runtime"
 #     paths = ["Uptime"]
@@ -1896,6 +1900,16 @@
 #   # campaign_id = ""
 
 
+# # Read metrics from one or many mcrouter servers
+# [[inputs.mcrouter]]
+#   ## An array of address to gather stats about. Specify an ip or hostname
+#   ## with port. ie tcp://localhost:11211, tcp://10.0.0.1:11211, etc.
+# 	servers = ["tcp://localhost:11211", "unix:///var/run/mcrouter.sock"]
+#
+# 	## Timeout for metric collections from all servers.  Minimum timeout is "1s".
+#   # timeout = "5s"
+
+
 # # Read metrics from one or many memcached servers
 # [[inputs.memcached]]
 #   ## An array of address to gather stats about. Specify an ip on hostname
@@ -1960,7 +1974,9 @@
 #   ##   mongodb://user:auth_key@10.10.3.30:27017,
 #   ##   mongodb://10.10.3.33:18832,
 #   servers = ["mongodb://127.0.0.1:27017"]
-#   gather_perdb_stats = false
+#
+#   ## When true, collect per database stats
+#   # gather_perdb_stats = false
 #
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -2151,6 +2167,15 @@
 #   dns_lookup = true
 
 
+# # Pulls statistics from nvidia GPUs attached to the host
+# [[inputs.nvidia_smi]]
+# ## Optional: path to nvidia-smi binary, defaults to $PATH via exec.LookPath
+# # bin_path = /usr/bin/nvidia-smi
+#
+# ## Optional: timeout for GPU polling
+# # timeout = 5s
+
+
 # # OpenLDAP cn=Monitor plugin
 # [[inputs.openldap]]
 #   host = "localhost"
@@ -2908,6 +2933,28 @@
 #   data_format = "influx"
 
 
+# # Read Cassandra metrics through Jolokia
+# [[inputs.cassandra]]
+#   ## DEPRECATED: The cassandra plugin has been deprecated.  Please use the
+#   ## jolokia2 plugin instead.
+#   ##
+#   ## see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
+#
+#   context = "/jolokia/read"
+#   ## List of cassandra servers exposing jolokia read service
+#   servers = ["myuser:mypassword@10.10.10.1:8778","10.10.10.2:8778",":8778"]
+#   ## List of metrics collected on above servers
+#   ## Each metric consists of a jmx path.
+#   ## This will collect all heap memory usage metrics from the jvm and
+#   ## ReadLatency metrics for all keyspaces and tables.
+#   ## "type=Table" in the query works with Cassandra3.0. Older versions might
+#   ## need to use "type=ColumnFamily"
+#   metrics  = [
+#     "/java.lang:type=Memory/HeapMemoryUsage",
+#     "/org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"
+#   ]
+
+
 # # Influx HTTP write listener
 # [[inputs.http_listener]]
 #   ## Address and port to host HTTP listener on
@@ -3017,7 +3064,6 @@
 #   # watch_method = "inotify"
 #
 #   ## Parse logstash-style "grok" patterns:
-#   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
 #   [inputs.logparser.grok]
 #     ## This is a list of patterns to check the given log file(s) for.
 #     ## Note that adding patterns here increases processing time. The most
@@ -3257,6 +3303,13 @@
 #   ## 0 (default) is unlimited.
 #   # read_timeout = "30s"
 #
+#   ## Optional TLS configuration.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key  = "/etc/telegraf/key.pem"
+#   ## Enables client authentication if set.
+#   # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+#
 #   ## Maximum socket buffer size in bytes.
 #   ## For stream sockets, once the buffer fills up, the sender will start backing up.
 #   ## For datagram sockets, once the buffer fills up, metrics will start dropping.

From 9647ea88eafab45063909825e1a491d509b0e3b8 Mon Sep 17 00:00:00 2001
From: Daniel Meiners <mail+github@dmeiners.de>
Date: Thu, 3 May 2018 20:40:28 +0200
Subject: [PATCH 1137/1302] Ignore UTF8 BOM in JSON parser (#4099)

---
 plugins/parsers/json/parser.go      |  5 +++++
 plugins/parsers/json/parser_test.go | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index ecf9996af..8a3d15be7 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -12,6 +12,10 @@ import (
 	"github.com/influxdata/telegraf/metric"
 )
 
+var (
+	utf8BOM = []byte("\xef\xbb\xbf")
+)
+
 type JSONParser struct {
 	MetricName  string
 	TagKeys     []string
@@ -68,6 +72,7 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 
 func (p *JSONParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 	buf = bytes.TrimSpace(buf)
+	buf = bytes.TrimPrefix(buf, utf8BOM)
 	if len(buf) == 0 {
 		return make([]telegraf.Metric, 0), nil
 	}
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
index f21961787..c4f946364 100644
--- a/plugins/parsers/json/parser_test.go
+++ b/plugins/parsers/json/parser_test.go
@@ -428,3 +428,15 @@ func TestParseArrayWithTagKeys(t *testing.T) {
 		"othertag": "baz",
 	}, metrics[1].Tags())
 }
+
+var jsonBOM = []byte("\xef\xbb\xbf[{\"value\":17}]")
+
+func TestHttpJsonBOM(t *testing.T) {
+	parser := JSONParser{
+		MetricName: "json_test",
+	}
+
+	// Most basic vanilla test
+	_, err := parser.Parse(jsonBOM)
+	assert.NoError(t, err)
+}

From 2fb3f7a585b6d93338b8a83f27bf1a179487f8f9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 3 May 2018 11:41:18 -0700
Subject: [PATCH 1138/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ad2c191..9216cb762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 
 - [#4078](https://github.com/influxdata/telegraf/pull/4078): Use same timestamp for fields in system input.
 - [#4091](https://github.com/influxdata/telegraf/pull/4091): Fix handling of uint64 in datadog output.
+- [#4099](https://github.com/influxdata/telegraf/pull/4099): Ignore UTF8 BOM in JSON parser.
 
 ## v1.6.1 [2018-04-23]
 

From c125cb1d27a56314d7a247d4522c0ea0a6287874 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 3 May 2018 12:32:53 -0700
Subject: [PATCH 1139/1302] Update gopsutil version

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 79e0c98f4..6f3d0ae85 100644
--- a/Godeps
+++ b/Godeps
@@ -66,7 +66,7 @@ github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
 github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
 github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil a5c2888e464b14fa882c2a059e0f95716bd45cf1
+github.com/shirou/gopsutil c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
 github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d

From 2108582b43c62e4ef26ef09b77ccc6f5aad7636e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 3 May 2018 17:22:49 -0700
Subject: [PATCH 1140/1302] Clarify max_retry option in kafka output

---
 plugins/outputs/kafka/README.md | 45 +++++++++++++++++----------------
 plugins/outputs/kafka/kafka.go  | 11 ++++----
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index b112c09cd..eec727573 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -1,8 +1,9 @@
-# Kafka Producer Output Plugin
+# Kafka Output Plugin
 
 This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.html) acting a Kafka Producer.
 
-```
+### Configuration:
+```toml
 [[outputs.kafka]]
   ## URLs of kafka brokers
   brokers = ["localhost:9092"]
@@ -45,7 +46,7 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ##  0 : No compression
   ##  1 : Gzip compression
   ##  2 : Snappy compression
-  compression_codec = 0
+  # compression_codec = 0
 
   ##  RequiredAcks is used in Produce Requests to tell the broker how many
   ##  replica acknowledgements it must see before responding
@@ -61,10 +62,11 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ##       received the data. This option provides the best durability, we
   ##       guarantee that no messages will be lost as long as at least one in
   ##       sync replica remains.
-  required_acks = -1
+  # required_acks = -1
 
-  ##  The total number of times to retry sending a message
-  max_retry = 3
+  ## The maximum number of times to retry sending a metric before failing
+  ## until the next flush.
+  # max_retry = 3
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -77,24 +79,23 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   # sasl_username = "kafka"
   # sasl_password = "secret"
 
-  data_format = "influx"
+  ## Data format to output.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  # data_format = "influx"
 ```
 
-### Required parameters:
+#### `max_retry`
 
-* `brokers`: List of strings, this is for speaking to a cluster of `kafka` brokers. On each flush interval, Telegraf will randomly choose one of the urls to write to. Each URL should just include host and port e.g. -> `["{host}:{port}","{host2}:{port2}"]`
-* `topic`: The `kafka` topic to publish to.
+This option controls the number of retries per message no acknowledgement is
+received from the broker before notification of failure is displayed.  When
+this option greater than `0` can reduce latency and duplicate messages in the
+case of transient errors, but may also increase the load on the broker during
+periods of downtime.
+
+The option is similar to the
+[retries](https://kafka.apache.org/documentation/#producerconfigs) Producer
+option in the Java Kafka Producer.
 
-### Optional parameters:
 
-* `routing_tag`: If this tag exists, its value will be used as the routing key
-* `compression_codec`: What level of compression to use: `0` -> no compression, `1` -> gzip compression, `2` -> snappy compression
-* `required_acks`: a setting for how may `acks` required from the `kafka` broker cluster.
-* `max_retry`: Max number of times to retry failed write
-* `ssl_ca`: SSL CA
-* `ssl_cert`: SSL CERT
-* `ssl_key`: SSL key
-* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
-* `data_format`: [About Telegraf data formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md)
-* `topic_suffix`: Which, if any, method of calculating `kafka` topic suffix to use.
-For examples, please refer to sample configuration.
\ No newline at end of file
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index ce88d0a48..8094d4334 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -113,7 +113,7 @@ var sampleConfig = `
   ##  0 : No compression
   ##  1 : Gzip compression
   ##  2 : Snappy compression
-  compression_codec = 0
+  # compression_codec = 0
 
   ##  RequiredAcks is used in Produce Requests to tell the broker how many
   ##  replica acknowledgements it must see before responding
@@ -129,10 +129,11 @@ var sampleConfig = `
   ##       received the data. This option provides the best durability, we
   ##       guarantee that no messages will be lost as long as at least one in
   ##       sync replica remains.
-  required_acks = -1
+  # required_acks = -1
 
-  ##  The total number of times to retry sending a message
-  max_retry = 3
+  ## The maximum number of times to retry sending a metric before failing
+  ## until the next flush.
+  # max_retry = 3
 
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
@@ -149,7 +150,7 @@ var sampleConfig = `
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "influx"
+  # data_format = "influx"
 `
 
 func ValidateTopicSuffixMethod(method string) error {

From fd63591b15e860660616d5b6594dabc894c5d76f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 3 May 2018 17:26:01 -0700
Subject: [PATCH 1141/1302] Fix grammar

---
 plugins/outputs/kafka/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index eec727573..b548deaa0 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -88,11 +88,11 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
 
 #### `max_retry`
 
-This option controls the number of retries per message no acknowledgement is
-received from the broker before notification of failure is displayed.  When
-this option greater than `0` can reduce latency and duplicate messages in the
-case of transient errors, but may also increase the load on the broker during
-periods of downtime.
+This option controls the retries before notification of failure is displayed
+per message when no acknowledgement is received from the broker.  When this
+option is greater than `0` it can reduce message latency and duplicate
+messages in the case of transient errors, but may also increase the load on
+the broker during periods of downtime.
 
 The option is similar to the
 [retries](https://kafka.apache.org/documentation/#producerconfigs) Producer

From 757e23a5f27ab578150bd07fd561fa76d42073b9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 14:08:23 -0700
Subject: [PATCH 1142/1302] Remove -i flag from `make telegraf`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5dd0f5171..c670ee2a3 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ deps:
 	gdm restore
 
 telegraf:
-	go build -i -ldflags "$(LDFLAGS)" ./cmd/telegraf
+	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
 go-install:
 	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf

From 7c0754ebe5586a2c961bfc6ffa70f193fc328c1e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 14:16:21 -0700
Subject: [PATCH 1143/1302] Move usage string to internal to fix `go run`

---
 cmd/telegraf/telegraf.go                    | 3 ++-
 {cmd/telegraf => internal}/usage.go         | 4 ++--
 {cmd/telegraf => internal}/usage_windows.go | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {cmd/telegraf => internal}/usage.go (94%)
 rename {cmd/telegraf => internal}/usage_windows.go (95%)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index c38d88c3f..2e6ee3fe8 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -13,6 +13,7 @@ import (
 	"syscall"
 
 	"github.com/influxdata/telegraf/agent"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/config"
 	"github.com/influxdata/telegraf/logger"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/all"
@@ -192,7 +193,7 @@ func reloadLoop(
 }
 
 func usageExit(rc int) {
-	fmt.Println(usage)
+	fmt.Println(internal.Usage)
 	os.Exit(rc)
 }
 
diff --git a/cmd/telegraf/usage.go b/internal/usage.go
similarity index 94%
rename from cmd/telegraf/usage.go
rename to internal/usage.go
index 2d36ede94..4c00d8f83 100644
--- a/cmd/telegraf/usage.go
+++ b/internal/usage.go
@@ -1,8 +1,8 @@
 // +build !windows
 
-package main
+package internal
 
-const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
+const Usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
 
 Usage:
 
diff --git a/cmd/telegraf/usage_windows.go b/internal/usage_windows.go
similarity index 95%
rename from cmd/telegraf/usage_windows.go
rename to internal/usage_windows.go
index b09435b9a..109d309ed 100644
--- a/cmd/telegraf/usage_windows.go
+++ b/internal/usage_windows.go
@@ -1,8 +1,8 @@
 // +build windows
 
-package main
+package internal
 
-const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
+const Usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
 
 Usage:
 

From 3ae0c20200f193b5ed6f48fb6f248a542063892e Mon Sep 17 00:00:00 2001
From: Mauro Murari <mauroamurari@gmail.com>
Date: Fri, 4 May 2018 18:18:59 -0300
Subject: [PATCH 1144/1302] Fix platform not supported error in build.py
 (#4102)

---
 scripts/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.py b/scripts/build.py
index 209ced781..61f2b0dce 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -694,7 +694,7 @@ def main(args):
     orig_branch = get_current_branch()
 
     if args.platform not in supported_builds and args.platform != 'all':
-        logging.error("Invalid build platform: {}".format(target_platform))
+        logging.error("Invalid build platform: {}".format(args.platform))
         return 1
 
     build_output = {}

From 81620c69c59040f6d51b4d3e28f0192a0e359e16 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@users.noreply.github.com>
Date: Fri, 4 May 2018 23:20:34 +0200
Subject: [PATCH 1145/1302] Fix name_override example in mysql rreadme  (#4100)

---
 plugins/inputs/mysql/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index 588e7c076..a190c600d 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -114,7 +114,7 @@ style concurrently:
      servers = ["tcp(127.0.0.1:3306)/"]
 
    [[inputs.mysql]]
-     name_override = "_2"
+     name_suffix = "_v2"
      metric_version = 2
 
      servers = ["tcp(127.0.0.1:3306)/"]
@@ -141,7 +141,7 @@ measurement name.
      metric_version = 2
 
    [[inputs.mysql]]
-     name_override = "_2"
+     name_suffix = "_v2"
      metric_version = 2
 
      servers = ["tcp(127.0.0.1:3306)/"]

From 8b687a8e2137f8ce08fbbb127819756b3ea866d9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 14:31:16 -0700
Subject: [PATCH 1146/1302] Only lowercase mysql slave metrics with
 metric_version = 2

---
 plugins/inputs/mysql/mysql.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index a2be5848f..6e5a89e3b 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -608,7 +608,9 @@ func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc telegraf.Accumu
 		}
 		// range over columns, and try to parse values
 		for i, col := range cols {
-			col = strings.ToLower(col)
+			if m.MetricVersion >= 2 {
+				col = strings.ToLower(col)
+			}
 			if value, ok := m.parseValue(*vals[i].(*sql.RawBytes)); ok {
 				fields["slave_"+col] = value
 			}

From b2bb44363af5dafec036ef558e09c9a2fcabab4b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 14:39:31 -0700
Subject: [PATCH 1147/1302] Update kafka readme

---
 plugins/outputs/kafka/README.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index b548deaa0..93182ba08 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -88,14 +88,12 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
 
 #### `max_retry`
 
-This option controls the retries before notification of failure is displayed
-per message when no acknowledgement is received from the broker.  When this
-option is greater than `0` it can reduce message latency and duplicate
-messages in the case of transient errors, but may also increase the load on
-the broker during periods of downtime.
+This option controls the number of retries before a failure notification is
+displayed for each message when no acknowledgement is received from the
+broker. When the setting is greater than `0`, message latency can be reduced,
+duplicate messages can occur in cases of transient errors, and broker loads
+can increase during downtime.
 
 The option is similar to the
 [retries](https://kafka.apache.org/documentation/#producerconfigs) Producer
 option in the Java Kafka Producer.
-
-

From de355b76d6697f42336b9ac9df09c78697d711dc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 4 May 2018 16:33:23 -0700
Subject: [PATCH 1148/1302] Simplify testing with TLS (#4095)

---
 CHANGELOG.md                                  |   4 +
 etc/telegraf.conf                             | 335 +++++++++---------
 internal/internal.go                          |  92 -----
 internal/tls/config.go                        | 130 +++++++
 internal/tls/config_test.go                   | 226 ++++++++++++
 plugins/inputs/amqp_consumer/README.md        |  10 +-
 plugins/inputs/amqp_consumer/amqp_consumer.go |  24 +-
 plugins/inputs/apache/README.md               |  10 +-
 plugins/inputs/apache/apache.go               |  23 +-
 plugins/inputs/consul/README.md               |  10 +-
 plugins/inputs/consul/consul.go               |  26 +-
 plugins/inputs/dcos/README.md                 |   8 +-
 plugins/inputs/dcos/client_test.go            |  19 +-
 plugins/inputs/dcos/dcos.go                   |  18 +-
 plugins/inputs/docker/README.md               |  10 +-
 plugins/inputs/docker/docker.go               |  19 +-
 plugins/inputs/elasticsearch/README.md        |  10 +-
 plugins/inputs/elasticsearch/elasticsearch.go |  42 +--
 plugins/inputs/graylog/README.md              |  10 +-
 plugins/inputs/graylog/graylog.go             |  25 +-
 plugins/inputs/haproxy/README.md              |  10 +-
 plugins/inputs/haproxy/haproxy.go             |  30 +-
 plugins/inputs/http/README.md                 |  10 +-
 plugins/inputs/http/http.go                   |  24 +-
 plugins/inputs/http_listener/http_listener.go |  45 +--
 .../http_listener/http_listener_test.go       | 154 +-------
 plugins/inputs/http_response/README.md        |  10 +-
 plugins/inputs/http_response/http_response.go |  24 +-
 plugins/inputs/httpjson/README.md             |  10 +-
 plugins/inputs/httpjson/httpjson.go           |  24 +-
 plugins/inputs/influxdb/README.md             |  10 +-
 plugins/inputs/influxdb/influxdb.go           |  26 +-
 plugins/inputs/jolokia2/README.md             |  16 +-
 plugins/inputs/jolokia2/client.go             |  19 +-
 plugins/inputs/jolokia2/jolokia_agent.go      |  25 +-
 plugins/inputs/jolokia2/jolokia_proxy.go      |  33 +-
 plugins/inputs/kafka_consumer/README.md       |  10 +-
 .../inputs/kafka_consumer/kafka_consumer.go   |  24 +-
 plugins/inputs/kapacitor/README.md            |  10 +-
 plugins/inputs/kapacitor/kapacitor.go         |  27 +-
 plugins/inputs/kubernetes/kubernetes.go       |  24 +-
 plugins/inputs/mesos/README.md                |  10 +-
 plugins/inputs/mesos/mesos.go                 |  25 +-
 plugins/inputs/mongodb/README.md              |  10 +-
 plugins/inputs/mongodb/mongodb.go             |  27 +-
 plugins/inputs/mqtt_consumer/README.md        |  10 +-
 plugins/inputs/mqtt_consumer/mqtt_consumer.go |  24 +-
 plugins/inputs/mysql/README.md                |   8 +-
 plugins/inputs/mysql/mysql.go                 |  18 +-
 plugins/inputs/nginx/README.md                |  10 +-
 plugins/inputs/nginx/nginx.go                 |  29 +-
 plugins/inputs/openldap/README.md             |   2 +-
 plugins/inputs/openldap/openldap.go           |  10 +-
 plugins/inputs/prometheus/README.md           |  10 +-
 plugins/inputs/prometheus/prometheus.go       |  23 +-
 plugins/inputs/rabbitmq/README.md             |  10 +-
 plugins/inputs/rabbitmq/rabbitmq.go           |  23 +-
 .../inputs/socket_listener/socket_listener.go |  17 +-
 .../socket_listener/socket_listener_test.go   |  16 +-
 .../inputs/socket_listener/testdata/ca.pem    |  31 --
 .../socket_listener/testdata/client.key       |  27 --
 .../socket_listener/testdata/client.pem       |  24 --
 .../socket_listener/testdata/server.key       |  27 --
 .../socket_listener/testdata/server.pem       |  25 --
 plugins/inputs/tomcat/README.md               |  10 +-
 plugins/inputs/tomcat/tomcat.go               |  20 +-
 plugins/inputs/zookeeper/README.md            |   8 +-
 plugins/inputs/zookeeper/zookeeper.go         |  24 +-
 plugins/outputs/amqp/README.md                |  10 +-
 plugins/outputs/amqp/amqp.go                  |  23 +-
 plugins/outputs/elasticsearch/README.md       |  12 +-
 .../outputs/elasticsearch/elasticsearch.go    |  21 +-
 plugins/outputs/graphite/README.md            |  42 +--
 plugins/outputs/graphite/graphite.go          |  33 +-
 plugins/outputs/influxdb/README.md            |  10 +-
 plugins/outputs/influxdb/influxdb.go          |  24 +-
 plugins/outputs/influxdb/influxdb_test.go     |   7 +-
 plugins/outputs/kafka/README.md               |  10 +-
 plugins/outputs/kafka/kafka.go                |  33 +-
 plugins/outputs/mqtt/README.md                |  18 +-
 plugins/outputs/mqtt/mqtt.go                  |  24 +-
 plugins/outputs/nats/nats.go                  |  25 +-
 plugins/outputs/socket_writer/README.md       |  10 +-
 .../outputs/socket_writer/socket_writer.go    |  22 +-
 testutil/pki/cacert.pem                       |  12 +
 testutil/pki/cakey.pem                        |  16 +
 testutil/pki/clientcert.pem                   |  13 +
 testutil/pki/clientkey.pem                    |  15 +
 testutil/pki/servercert.pem                   |  13 +
 testutil/pki/serverkey.pem                    |  15 +
 {scripts => testutil/pki}/tls-certs.sh        |  18 +-
 testutil/tls.go                               |  86 +++++
 92 files changed, 1246 insertions(+), 1360 deletions(-)
 create mode 100644 internal/tls/config.go
 create mode 100644 internal/tls/config_test.go
 delete mode 100644 plugins/inputs/socket_listener/testdata/ca.pem
 delete mode 100644 plugins/inputs/socket_listener/testdata/client.key
 delete mode 100644 plugins/inputs/socket_listener/testdata/client.pem
 delete mode 100644 plugins/inputs/socket_listener/testdata/server.key
 delete mode 100644 plugins/inputs/socket_listener/testdata/server.pem
 create mode 100644 testutil/pki/cacert.pem
 create mode 100644 testutil/pki/cakey.pem
 create mode 100644 testutil/pki/clientcert.pem
 create mode 100644 testutil/pki/clientkey.pem
 create mode 100644 testutil/pki/servercert.pem
 create mode 100644 testutil/pki/serverkey.pem
 rename {scripts => testutil/pki}/tls-certs.sh (81%)
 create mode 100644 testutil/tls.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9216cb762..d109ad090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
   an [example configuration](./plugins/inputs/jolokia2/examples) to help you
   get started.
 
+- For plugins supporting TLS, you can now specify the certificate and keys
+  using `tls_ca`, `tls_cert`, `tls_key`.  These options behave the same as
+  the, now deprecated, `ssl` forms.
+
 ### New Inputs
 
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 2ef4fe2e4..97a14727c 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -121,11 +121,11 @@
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config for use on HTTP connections.
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config for use on HTTP connections.
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Proxy override, if unset values the standard proxy environment
@@ -184,11 +184,11 @@
 #   ## to 5s. 0s means no timeout (not recommended).
 #   # timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
@@ -284,11 +284,11 @@
 #   # default_tag_value = "none"
 #   index_name = "telegraf-%Y.%m.%d" # required.
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Template Config
@@ -327,11 +327,11 @@
 #   ## timeout in seconds for the write connection to graphite
 #   timeout = 2
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -420,11 +420,11 @@
 #   ##  The total number of times to retry sending a message
 #   max_retry = 3
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Optional SASL Config
@@ -536,11 +536,11 @@
 #   ## client ID, if not set a random ID is generated
 #   # client_id = ""
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
@@ -560,11 +560,11 @@
 #   ## NATS subject for producer messages
 #   subject = "telegraf"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Data format to output.
@@ -695,11 +695,11 @@
 #   # address = "unix:///tmp/telegraf.sock"
 #   # address = "unixgram:///tmp/telegraf.sock"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Period between keep alive probes.
@@ -928,11 +928,11 @@
 #   ## Maximum time to receive response.
 #   # response_timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1112,11 +1112,11 @@
 #   ## Data centre to query the health checks from
 #   # datacentre = ""
 #
-#   ## SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## If false, skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = true
 
 
@@ -1173,10 +1173,10 @@
 #   ## Maximum time to receive a response from cluster.
 #   # response_timeout = "20s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
 #   ## If false, skip chain & host verification
 #   # insecure_skip_verify = true
 #
@@ -1261,11 +1261,11 @@
 #   docker_label_include = []
 #   docker_label_exclude = []
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1317,11 +1317,11 @@
 #   ## "breaker". Per default, all stats are gathered.
 #   # node_stats = ["jvm", "http"]
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1428,11 +1428,11 @@
 #   username = ""
 #   password = ""
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1456,11 +1456,11 @@
 #   ## field names.
 #   # keep_field_names = false
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1497,11 +1497,11 @@
 #   ## Tag all metrics with the url
 #   # tag_url = true
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Amount of time allowed to complete the HTTP request
@@ -1541,11 +1541,11 @@
 #   # response_string_match = "ok"
 #   # response_string_match = "\".*_status\".?:.?\"up\""
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## HTTP Request Headers (all values must be strings)
@@ -1581,11 +1581,11 @@
 #   #   "my_tag_2"
 #   # ]
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## HTTP parameters (all values must be strings).  For "GET" requests, data
@@ -1613,11 +1613,11 @@
 #     "http://localhost:8086/debug/vars"
 #   ]
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## http request & header timeout
@@ -1771,10 +1771,10 @@
 #   # password = ""
 #   # response_timeout = "5s"
 #
-#   ## Optional SSL config
-#   # ssl_ca   = "/var/private/ca.pem"
-#   # ssl_cert = "/var/private/client.pem"
-#   # ssl_key  = "/var/private/client-key.pem"
+#   ## Optional TLS config
+#   # tls_ca   = "/var/private/ca.pem"
+#   # tls_cert = "/var/private/client.pem"
+#   # tls_key  = "/var/private/client-key.pem"
 #   # insecure_skip_verify = false
 #
 #   ## Add metrics to read
@@ -1796,10 +1796,10 @@
 #   # password = ""
 #   # response_timeout = "5s"
 #
-#   ## Optional SSL config
-#   # ssl_ca   = "/var/private/ca.pem"
-#   # ssl_cert = "/var/private/client.pem"
-#   # ssl_key  = "/var/private/client-key.pem"
+#   ## Optional TLS config
+#   # tls_ca   = "/var/private/ca.pem"
+#   # tls_cert = "/var/private/client.pem"
+#   # tls_key  = "/var/private/client-key.pem"
 #   # insecure_skip_verify = false
 #
 #   ## Add proxy targets to query
@@ -1828,11 +1828,11 @@
 #   ## Time limit for http requests
 #   timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1852,11 +1852,11 @@
 #   ## Set response_timeout (default 5 seconds)
 #   # response_timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = /path/to/cafile
-#   # ssl_cert = /path/to/certfile
-#   # ssl_key = /path/to/keyfile
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = /path/to/cafile
+#   # tls_cert = /path/to/certfile
+#   # tls_key = /path/to/keyfile
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1948,11 +1948,11 @@
 #   #   "messages",
 #   # ]
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -1978,11 +1978,11 @@
 #   ## When true, collect per database stats
 #   # gather_perdb_stats = false
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -2061,10 +2061,12 @@
 #   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
 #   interval_slow                   = "30m"
 #
-#   ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
-#   ssl_ca = "/etc/telegraf/ca.pem"
-#   ssl_cert = "/etc/telegraf/cert.pem"
-#   ssl_key = "/etc/telegraf/key.pem"
+#   ## Optional TLS Config (will be used if tls=custom parameter specified in server uri)
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Provides metrics about the state of a NATS server
@@ -2124,10 +2126,11 @@
 #   # An array of Nginx stub_status URI to gather stats.
 #   urls = ["http://localhost/server_status"]
 #
-#   # TLS/SSL configuration
-#   ssl_ca = "/etc/telegraf/ca.pem"
-#   ssl_cert = "/etc/telegraf/cert.cer"
-#   ssl_key = "/etc/telegraf/key.key"
+#   ## Optional TLS Config
+#   tls_ca = "/etc/telegraf/ca.pem"
+#   tls_cert = "/etc/telegraf/cert.cer"
+#   tls_key = "/etc/telegraf/key.key"
+#   ## Use TLS but skip chain & host verification
 #   insecure_skip_verify = false
 #
 #   # HTTP response timeout (default: 5s)
@@ -2190,7 +2193,7 @@
 #   insecure_skip_verify = false
 #
 #   # Path to PEM-encoded Root certificate to use to verify server certificate
-#   ssl_ca = "/etc/ssl/certs.pem"
+#   tls_ca = "/etc/ssl/certs.pem"
 #
 #   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
 #   bind_dn = ""
@@ -2341,11 +2344,11 @@
 #   ## Specify timeout duration for slower prometheus clients (default is 3s)
 #   # response_timeout = "3s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = /path/to/cafile
-#   # ssl_cert = /path/to/certfile
-#   # ssl_key = /path/to/keyfile
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = /path/to/cafile
+#   # tls_cert = /path/to/certfile
+#   # tls_key = /path/to/keyfile
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -2365,11 +2368,11 @@
 #   # username = "guest"
 #   # password = "guest"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Optional request timeouts
@@ -2798,11 +2801,11 @@
 #   ## Request timeout
 #   # timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
 
@@ -2886,11 +2889,11 @@
 #   ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
 #   # timeout = "5s"
 #
-#   ## Optional SSL Config
-#   # enable_ssl = true
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
+#   ## Optional TLS Config
+#   # enable_tls = true
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
 #   ## If false, skip chain & host verification
 #   # insecure_skip_verify = true
 
@@ -2919,11 +2922,11 @@
 #   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Data format to consume.
@@ -2994,11 +2997,11 @@
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Optional SASL Config
@@ -3124,11 +3127,11 @@
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
-#   ## Optional SSL Config
-#   # ssl_ca = "/etc/telegraf/ca.pem"
-#   # ssl_cert = "/etc/telegraf/cert.pem"
-#   # ssl_key = "/etc/telegraf/key.pem"
-#   ## Use SSL but skip chain & host verification
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
 #   ## Data format to consume.
diff --git a/internal/internal.go b/internal/internal.go
index 3227832c9..d86b32d26 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -4,11 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/rand"
-	"crypto/tls"
-	"crypto/x509"
 	"errors"
-	"fmt"
-	"io/ioutil"
 	"log"
 	"math/big"
 	"os"
@@ -112,94 +108,6 @@ func RandomString(n int) string {
 	return string(bytes)
 }
 
-// GetTLSConfig gets a tls.Config object from the given certs, key, and CA files
-// for use with a client.
-// The full path to each file must be provided.
-// Returns a nil pointer if all files are blank and InsecureSkipVerify=false.
-func GetTLSConfig(
-	SSLCert, SSLKey, SSLCA string,
-	InsecureSkipVerify bool,
-) (*tls.Config, error) {
-	if SSLCert == "" && SSLKey == "" && SSLCA == "" && !InsecureSkipVerify {
-		return nil, nil
-	}
-
-	t := &tls.Config{
-		InsecureSkipVerify: InsecureSkipVerify,
-	}
-
-	if SSLCA != "" {
-		caCert, err := ioutil.ReadFile(SSLCA)
-		if err != nil {
-			return nil, errors.New(fmt.Sprintf("Could not load TLS CA: %s",
-				err))
-		}
-
-		caCertPool := x509.NewCertPool()
-		caCertPool.AppendCertsFromPEM(caCert)
-		t.RootCAs = caCertPool
-	}
-
-	if SSLCert != "" && SSLKey != "" {
-		cert, err := tls.LoadX509KeyPair(SSLCert, SSLKey)
-		if err != nil {
-			return nil, errors.New(fmt.Sprintf(
-				"Could not load TLS client key/certificate from %s:%s: %s",
-				SSLKey, SSLCert, err))
-		}
-
-		t.Certificates = []tls.Certificate{cert}
-		t.BuildNameToCertificate()
-	}
-
-	// will be nil by default if nothing is provided
-	return t, nil
-}
-
-// GetServerTLSConfig gets a tls.Config object from the given certs, key, and one or more CA files
-// for use with a server.
-// The full path to each file must be provided.
-// Returns a nil pointer if all files are blank.
-func GetServerTLSConfig(
-	TLSCert, TLSKey string,
-	TLSAllowedCACerts []string,
-) (*tls.Config, error) {
-	if TLSCert == "" && TLSKey == "" && len(TLSAllowedCACerts) == 0 {
-		return nil, nil
-	}
-
-	t := &tls.Config{}
-
-	if len(TLSAllowedCACerts) != 0 {
-		caCertPool := x509.NewCertPool()
-		for _, cert := range TLSAllowedCACerts {
-			c, err := ioutil.ReadFile(cert)
-			if err != nil {
-				return nil, errors.New(fmt.Sprintf("Could not load TLS CA: %s",
-					err))
-			}
-			caCertPool.AppendCertsFromPEM(c)
-		}
-		t.ClientCAs = caCertPool
-		t.ClientAuth = tls.RequireAndVerifyClientCert
-	}
-
-	if TLSCert != "" && TLSKey != "" {
-		cert, err := tls.LoadX509KeyPair(TLSCert, TLSKey)
-		if err != nil {
-			return nil, errors.New(fmt.Sprintf(
-				"Could not load TLS client key/certificate from %s:%s: %s",
-				TLSKey, TLSCert, err))
-		}
-
-		t.Certificates = []tls.Certificate{cert}
-	}
-
-	t.BuildNameToCertificate()
-
-	return t, nil
-}
-
 // SnakeCase converts the given string to snake case following the Golang format:
 // acronyms are converted to lower-case and preceded by an underscore.
 func SnakeCase(in string) string {
diff --git a/internal/tls/config.go b/internal/tls/config.go
new file mode 100644
index 000000000..25c0678d4
--- /dev/null
+++ b/internal/tls/config.go
@@ -0,0 +1,130 @@
+package tls
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"io/ioutil"
+)
+
+// ClientConfig represents the standard client TLS config.
+type ClientConfig struct {
+	TLSCA              string `toml:"tls_ca"`
+	TLSCert            string `toml:"tls_cert"`
+	TLSKey             string `toml:"tls_key"`
+	InsecureSkipVerify bool   `toml:"insecure_skip_verify"`
+
+	// Deprecated in 1.7; use TLS variables above
+	SSLCA   string `toml:"ssl_ca"`
+	SSLCert string `toml:"ssl_cert"`
+	SSLKey  string `toml:"ssl_ca"`
+}
+
+// ServerConfig represents the standard server TLS config.
+type ServerConfig struct {
+	TLSCert           string   `toml:"tls_cert"`
+	TLSKey            string   `toml:"tls_key"`
+	TLSAllowedCACerts []string `toml:"tls_allowed_cacerts"`
+}
+
+// TLSConfig returns a tls.Config, may be nil without error if TLS is not
+// configured.
+func (c *ClientConfig) TLSConfig() (*tls.Config, error) {
+	// Support deprecated variable names
+	if c.TLSCA == "" && c.SSLCA != "" {
+		c.TLSCA = c.SSLCA
+	}
+	if c.TLSCert == "" && c.SSLCert != "" {
+		c.TLSCert = c.SSLCert
+	}
+	if c.TLSKey == "" && c.SSLKey != "" {
+		c.TLSKey = c.SSLKey
+	}
+
+	// TODO: return default tls.Config; plugins should not call if they don't
+	// want TLS, this will require using another option to determine.  In the
+	// case of an HTTP plugin, you could use `https`.  Other plugins may need
+	// the dedicated option `TLSEnable`.
+	if c.TLSCA == "" && c.TLSKey == "" && c.TLSCert == "" && !c.InsecureSkipVerify {
+		return nil, nil
+	}
+
+	tlsConfig := &tls.Config{
+		InsecureSkipVerify: c.InsecureSkipVerify,
+		Renegotiation:      tls.RenegotiateNever,
+	}
+
+	if c.TLSCA != "" {
+		pool, err := makeCertPool([]string{c.TLSCA})
+		if err != nil {
+			return nil, err
+		}
+		tlsConfig.RootCAs = pool
+	}
+
+	if c.TLSCert != "" && c.TLSKey != "" {
+		err := loadCertificate(tlsConfig, c.TLSCert, c.TLSKey)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return tlsConfig, nil
+}
+
+// TLSConfig returns a tls.Config, may be nil without error if TLS is not
+// configured.
+func (c *ServerConfig) TLSConfig() (*tls.Config, error) {
+	if c.TLSCert == "" && c.TLSKey == "" && len(c.TLSAllowedCACerts) == 0 {
+		return nil, nil
+	}
+
+	tlsConfig := &tls.Config{}
+
+	if len(c.TLSAllowedCACerts) != 0 {
+		pool, err := makeCertPool(c.TLSAllowedCACerts)
+		if err != nil {
+			return nil, err
+		}
+		tlsConfig.ClientCAs = pool
+		tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
+	}
+
+	if c.TLSCert != "" && c.TLSKey != "" {
+		err := loadCertificate(tlsConfig, c.TLSCert, c.TLSKey)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return tlsConfig, nil
+}
+
+func makeCertPool(certFiles []string) (*x509.CertPool, error) {
+	pool := x509.NewCertPool()
+	for _, certFile := range certFiles {
+		pem, err := ioutil.ReadFile(certFile)
+		if err != nil {
+			return nil, fmt.Errorf(
+				"could not read certificate %q: %v", certFile, err)
+		}
+		ok := pool.AppendCertsFromPEM(pem)
+		if !ok {
+			return nil, fmt.Errorf(
+				"could not parse any PEM certificates %q: %v", certFile, err)
+		}
+	}
+	return pool, nil
+}
+
+func loadCertificate(config *tls.Config, certFile, keyFile string) error {
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return fmt.Errorf(
+			"could not load keypair %s:%s: %v", certFile, keyFile, err)
+	}
+
+	config.Certificates = []tls.Certificate{cert}
+	config.BuildNameToCertificate()
+	return nil
+}
diff --git a/internal/tls/config_test.go b/internal/tls/config_test.go
new file mode 100644
index 000000000..31a70d9a1
--- /dev/null
+++ b/internal/tls/config_test.go
@@ -0,0 +1,226 @@
+package tls_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var pki = testutil.NewPKI("../../testutil/pki")
+
+func TestClientConfig(t *testing.T) {
+	tests := []struct {
+		name   string
+		client tls.ClientConfig
+		expNil bool
+		expErr bool
+	}{
+		{
+			name:   "unset",
+			client: tls.ClientConfig{},
+			expNil: true,
+		},
+		{
+			name: "success",
+			client: tls.ClientConfig{
+				TLSCA:   pki.CACertPath(),
+				TLSCert: pki.ClientCertPath(),
+				TLSKey:  pki.ClientKeyPath(),
+			},
+		},
+		{
+			name: "invalid ca",
+			client: tls.ClientConfig{
+				TLSCA:   pki.ClientKeyPath(),
+				TLSCert: pki.ClientCertPath(),
+				TLSKey:  pki.ClientKeyPath(),
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "missing ca is okay",
+			client: tls.ClientConfig{
+				TLSCert: pki.ClientCertPath(),
+				TLSKey:  pki.ClientKeyPath(),
+			},
+		},
+		{
+			name: "invalid cert",
+			client: tls.ClientConfig{
+				TLSCA:   pki.CACertPath(),
+				TLSCert: pki.ClientKeyPath(),
+				TLSKey:  pki.ClientKeyPath(),
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "missing cert skips client keypair",
+			client: tls.ClientConfig{
+				TLSCA:  pki.CACertPath(),
+				TLSKey: pki.ClientKeyPath(),
+			},
+			expNil: false,
+			expErr: false,
+		},
+		{
+			name: "missing key skips client keypair",
+			client: tls.ClientConfig{
+				TLSCA:   pki.CACertPath(),
+				TLSCert: pki.ClientCertPath(),
+			},
+			expNil: false,
+			expErr: false,
+		},
+		{
+			name: "support deprecated ssl field names",
+			client: tls.ClientConfig{
+				SSLCA:   pki.CACertPath(),
+				SSLCert: pki.ClientCertPath(),
+				SSLKey:  pki.ClientKeyPath(),
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tlsConfig, err := tt.client.TLSConfig()
+			if !tt.expNil {
+				require.NotNil(t, tlsConfig)
+			} else {
+				require.Nil(t, tlsConfig)
+			}
+
+			if !tt.expErr {
+				require.NoError(t, err)
+			} else {
+				require.Error(t, err)
+			}
+		})
+	}
+}
+
+func TestServerConfig(t *testing.T) {
+	tests := []struct {
+		name   string
+		server tls.ServerConfig
+		expNil bool
+		expErr bool
+	}{
+		{
+			name:   "unset",
+			server: tls.ServerConfig{},
+			expNil: true,
+		},
+		{
+			name: "success",
+			server: tls.ServerConfig{
+				TLSCert:           pki.ServerCertPath(),
+				TLSKey:            pki.ServerKeyPath(),
+				TLSAllowedCACerts: []string{pki.CACertPath()},
+			},
+		},
+		{
+			name: "invalid ca",
+			server: tls.ServerConfig{
+				TLSCert:           pki.ServerCertPath(),
+				TLSKey:            pki.ServerKeyPath(),
+				TLSAllowedCACerts: []string{pki.ServerKeyPath()},
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "missing allowed ca is okay",
+			server: tls.ServerConfig{
+				TLSCert: pki.ServerCertPath(),
+				TLSKey:  pki.ServerKeyPath(),
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "invalid cert",
+			server: tls.ServerConfig{
+				TLSCert:           pki.ServerKeyPath(),
+				TLSKey:            pki.ServerKeyPath(),
+				TLSAllowedCACerts: []string{pki.CACertPath()},
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "missing cert",
+			server: tls.ServerConfig{
+				TLSKey:            pki.ServerKeyPath(),
+				TLSAllowedCACerts: []string{pki.CACertPath()},
+			},
+			expNil: true,
+			expErr: true,
+		},
+		{
+			name: "missing key",
+			server: tls.ServerConfig{
+				TLSCert:           pki.ServerCertPath(),
+				TLSAllowedCACerts: []string{pki.CACertPath()},
+			},
+			expNil: true,
+			expErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tlsConfig, err := tt.server.TLSConfig()
+			if !tt.expNil {
+				require.NotNil(t, tlsConfig)
+			}
+			if !tt.expErr {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestConnect(t *testing.T) {
+	clientConfig := tls.ClientConfig{
+		TLSCA:   pki.CACertPath(),
+		TLSCert: pki.ClientCertPath(),
+		TLSKey:  pki.ClientKeyPath(),
+	}
+
+	serverConfig := tls.ServerConfig{
+		TLSCert:           pki.ServerCertPath(),
+		TLSKey:            pki.ServerKeyPath(),
+		TLSAllowedCACerts: []string{pki.CACertPath()},
+	}
+
+	serverTLSConfig, err := serverConfig.TLSConfig()
+	require.NoError(t, err)
+
+	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+	ts.TLS = serverTLSConfig
+
+	ts.StartTLS()
+	defer ts.Close()
+
+	clientTLSConfig, err := clientConfig.TLSConfig()
+	require.NoError(t, err)
+
+	client := http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: clientTLSConfig,
+		},
+		Timeout: 10 * time.Second,
+	}
+
+	resp, err := client.Get(ts.URL)
+	require.NoError(t, err)
+	require.Equal(t, 200, resp.StatusCode)
+}
diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index 11084bedc..a14e2c8b0 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -32,11 +32,11 @@ The following defaults are known to work with RabbitMQ:
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to consume.
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index c96272fa7..48458a0b7 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -10,7 +10,7 @@ import (
 	"github.com/streadway/amqp"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
@@ -31,14 +31,7 @@ type AMQPConsumer struct {
 
 	// AMQP Auth method
 	AuthMethod string
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	parser parsers.Parser
 	conn   *amqp.Connection
@@ -78,11 +71,11 @@ func (a *AMQPConsumer) SampleConfig() string {
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to consume.
@@ -108,8 +101,7 @@ func (a *AMQPConsumer) Gather(_ telegraf.Accumulator) error {
 
 func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
 	// make new tls config
-	tls, err := internal.GetTLSConfig(
-		a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
+	tls, err := a.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/apache/README.md b/plugins/inputs/apache/README.md
index 0edac3166..b8822edeb 100644
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -21,11 +21,11 @@ Typically, the `mod_status` module is configured to expose a page at the `/serve
   ## Maximum time to receive response.
   # response_timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index a3df105bb..a04d1bbb8 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -21,14 +22,7 @@ type Apache struct {
 	Username        string
 	Password        string
 	ResponseTimeout internal.Duration
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client *http.Client
 }
@@ -46,11 +40,11 @@ var sampleConfig = `
   ## Maximum time to receive response.
   # response_timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -98,8 +92,7 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 }
 
 func (n *Apache) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+	tlsCfg, err := n.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index 7e68a4931..42e1a1336 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -27,11 +27,11 @@ report those stats already using StatsD protocol if needed.
   ## Data centre to query the health checks from
   # datacentre = ""
 
-  ## SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## If false, skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = true
 ```
 
diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index bfd9b4340..fe9bde1db 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -16,15 +16,7 @@ type Consul struct {
 	Username   string
 	Password   string
 	Datacentre string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	// client used to connect to Consul agnet
 	client *api.Client
@@ -47,11 +39,11 @@ var sampleConfig = `
   ## Data centre to query the health checks from
   # datacentre = ""
 
-  ## SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## If false, skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = true
 `
 
@@ -89,9 +81,7 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
 		}
 	}
 
-	tlsCfg, err := internal.GetTLSConfig(
-		c.SSLCert, c.SSLKey, c.SSLCA, c.InsecureSkipVerify)
-
+	tlsCfg, err := c.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/dcos/README.md b/plugins/inputs/dcos/README.md
index 967c376a7..790590aea 100644
--- a/plugins/inputs/dcos/README.md
+++ b/plugins/inputs/dcos/README.md
@@ -54,10 +54,10 @@ your database.
   ## Maximum time to receive a response from cluster.
   # response_timeout = "20s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
   ## If false, skip chain & host verification
   # insecure_skip_verify = true
 
diff --git a/plugins/inputs/dcos/client_test.go b/plugins/inputs/dcos/client_test.go
index 3b8d93e37..1b563c63f 100644
--- a/plugins/inputs/dcos/client_test.go
+++ b/plugins/inputs/dcos/client_test.go
@@ -9,26 +9,11 @@ import (
 	"testing"
 
 	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 
-const (
-	privateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCwlGyzVp9cqtwiNCgCnaR0kilPZhr4xFBcnXxvQ8/uzOHaWKxj
-XWR38cKR3gPh5+4iSmzMdo3HDJM5ks6imXGnp+LPOA5iNewnpLNs7UxA2arwKH/6
-4qIaAXAtf5jE46wZIMgc2EW9wGL3dxC0JY8EXPpBFB/3J8gADkorFR8lwwIDAQAB
-AoGBAJaFHxfMmjHK77U0UnrQWFSKFy64cftmlL4t/Nl3q7L68PdIKULWZIMeEWZ4
-I0UZiFOwr4em83oejQ1ByGSwekEuiWaKUI85IaHfcbt+ogp9hY/XbOEo56OPQUAd
-bEZv1JqJOqta9Ug1/E1P9LjEEyZ5F5ubx7813rxAE31qKtKJAkEA1zaMlCWIr+Rj
-hGvzv5rlHH3wbOB4kQFXO4nqj3J/ttzR5QiJW24STMDcbNngFlVcDVju56LrNTiD
-dPh9qvl7nwJBANILguR4u33OMksEZTYB7nQZSurqXsq6382zH7pTl29ANQTROHaM
-PKC8dnDWq8RGTqKuvWblIzzGIKqIMovZo10CQC96T0UXirITFolOL3XjvAuvFO1Q
-EAkdXJs77805m0dCK+P1IChVfiAEpBw3bKJArpAbQIlFfdI953JUp5SieU0CQEub
-BSSEKMjh/cxu6peEHnb/262vayuCFKkQPu1sxWewLuVrAe36EKCy9dcsDmv5+rgo
-Odjdxc9Madm4aKlaT6kCQQCpAgeblDrrxTrNQ+Typzo37PlnQrvI+0EceAUuJ72G
-P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
------END RSA PRIVATE KEY-----`
-)
+var privateKey = testutil.NewPKI("../../../testutil/pki").ReadServerKey()
 
 func TestLogin(t *testing.T) {
 	ts := httptest.NewServer(http.NotFoundHandler())
diff --git a/plugins/inputs/dcos/dcos.go b/plugins/inputs/dcos/dcos.go
index 91370b81f..e37bf996b 100644
--- a/plugins/inputs/dcos/dcos.go
+++ b/plugins/inputs/dcos/dcos.go
@@ -13,6 +13,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -56,11 +57,7 @@ type DCOS struct {
 
 	MaxConnections  int
 	ResponseTimeout internal.Duration
-
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool   `toml:"insecure_skip_verify"`
+	tls.ClientConfig
 
 	client Client
 	creds  Credentials
@@ -107,10 +104,10 @@ var sampleConfig = `
   ## Maximum time to receive a response from cluster.
   # response_timeout = "20s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
   ## If false, skip chain & host verification
   # insecure_skip_verify = true
 
@@ -351,8 +348,7 @@ func (d *DCOS) init() error {
 }
 
 func (d *DCOS) createClient() (Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		d.SSLCert, d.SSLKey, d.SSLCA, d.InsecureSkipVerify)
+	tlsCfg, err := d.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index b93b4a036..87b5e65d1 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -53,11 +53,11 @@ to gather stats from the [Engine API](https://docs.docker.com/engine/api/v1.24/)
   ## Which environment variables should we use as a tag
   tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index b0b9b8cf2..a59b9f7fa 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -20,6 +20,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -43,10 +44,7 @@ type Docker struct {
 	ContainerStateInclude []string `toml:"container_state_include"`
 	ContainerStateExclude []string `toml:"container_state_exclude"`
 
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool
+	tlsint.ClientConfig
 
 	newEnvClient func() (Client, error)
 	newClient    func(string, *tls.Config) (Client, error)
@@ -115,11 +113,11 @@ var sampleConfig = `
   docker_label_include = []
   docker_label_exclude = []
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -136,8 +134,7 @@ func (d *Docker) Gather(acc telegraf.Accumulator) error {
 		if d.Endpoint == "ENV" {
 			c, err = d.newEnvClient()
 		} else {
-			tlsConfig, err := internal.GetTLSConfig(
-				d.SSLCert, d.SSLKey, d.SSLCA, d.InsecureSkipVerify)
+			tlsConfig, err := d.ClientConfig.TLSConfig()
 			if err != nil {
 				return err
 			}
diff --git a/plugins/inputs/elasticsearch/README.md b/plugins/inputs/elasticsearch/README.md
index 09ae15cc3..e88c3f4d6 100644
--- a/plugins/inputs/elasticsearch/README.md
+++ b/plugins/inputs/elasticsearch/README.md
@@ -38,11 +38,11 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
   ## "breaker". Per default, all stats are gathered.
   # node_stats = ["jvm", "http"]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 1f548a0e0..eee8d4182 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -3,16 +3,18 @@ package elasticsearch
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 	"io/ioutil"
 	"net/http"
 	"regexp"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
 
 // mask for masking username/password from error messages
@@ -108,28 +110,26 @@ const sampleConfig = `
   ## "breaker". Per default, all stats are gathered.
   # node_stats = ["jvm", "http"]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
 // Elasticsearch is a plugin to read stats from one or many Elasticsearch
 // servers.
 type Elasticsearch struct {
-	Local                   bool
-	Servers                 []string
-	HttpTimeout             internal.Duration
-	ClusterHealth           bool
-	ClusterHealthLevel      string
-	ClusterStats            bool
-	NodeStats               []string
-	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
-	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
-	SSLKey                  string `toml:"ssl_key"`  // Path to cert key file
-	InsecureSkipVerify      bool   // Use SSL but skip chain & host verification
+	Local              bool
+	Servers            []string
+	HttpTimeout        internal.Duration
+	ClusterHealth      bool
+	ClusterHealthLevel string
+	ClusterStats       bool
+	NodeStats          []string
+	tls.ClientConfig
+
 	client                  *http.Client
 	catMasterResponseTokens []string
 	isMaster                bool
@@ -227,7 +227,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 }
 
 func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(e.SSLCert, e.SSLKey, e.SSLCA, e.InsecureSkipVerify)
+	tlsCfg, err := e.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/graylog/README.md b/plugins/inputs/graylog/README.md
index 6d4aa6131..6ab4a70c4 100644
--- a/plugins/inputs/graylog/README.md
+++ b/plugins/inputs/graylog/README.md
@@ -44,11 +44,11 @@ Note: if namespace end point specified metrics array will be ignored for that ca
   username = ""
   password = ""
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/graylog/graylog.go b/plugins/inputs/graylog/graylog.go
index 6dcc9b979..8e580480d 100644
--- a/plugins/inputs/graylog/graylog.go
+++ b/plugins/inputs/graylog/graylog.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -35,15 +35,7 @@ type GrayLog struct {
 	Metrics  []string
 	Username string
 	Password string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client HTTPClient
 }
@@ -111,11 +103,11 @@ var sampleConfig = `
   username = ""
   password = ""
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -132,8 +124,7 @@ func (h *GrayLog) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
 	if h.client.HTTPClient() == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
+		tlsCfg, err := h.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/haproxy/README.md b/plugins/inputs/haproxy/README.md
index 50bd4b3da..35b59524d 100644
--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@@ -28,11 +28,11 @@ or [HTTP statistics page](https://cbonte.github.io/haproxy-dconv/1.9/management.
   ## field names.
   # keep_field_names = false
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go
index 81783cf2b..19087a978 100644
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@@ -14,27 +14,18 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 //CSV format: https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1
 
 type haproxy struct {
-	Servers []string
+	Servers        []string
+	KeepFieldNames bool
+	tls.ClientConfig
 
 	client *http.Client
-
-	KeepFieldNames bool
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
 }
 
 var sampleConfig = `
@@ -56,11 +47,11 @@ var sampleConfig = `
   ## field names.
   # keep_field_names = false
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -144,8 +135,7 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	}
 
 	if g.client == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			g.SSLCert, g.SSLKey, g.SSLCA, g.InsecureSkipVerify)
+		tlsCfg, err := g.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/http/README.md b/plugins/inputs/http/README.md
index 2c0441364..25d3d2b2d 100644
--- a/plugins/inputs/http/README.md
+++ b/plugins/inputs/http/README.md
@@ -23,11 +23,11 @@ The HTTP input plugin collects metrics from one or more HTTP(S) endpoints.  The
   # username = "username"
   # password = "pa$$word"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Amount of time allowed to complete the HTTP request
diff --git a/plugins/inputs/http/http.go b/plugins/inputs/http/http.go
index 16e776cd0..c9c3460be 100644
--- a/plugins/inputs/http/http.go
+++ b/plugins/inputs/http/http.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
@@ -24,15 +25,7 @@ type HTTP struct {
 	// HTTP Basic Auth Credentials
 	Username string
 	Password string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	Timeout internal.Duration
 
@@ -62,11 +55,11 @@ var sampleConfig = `
   ## Tag all metrics with the url
   # tag_url = true
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Amount of time allowed to complete the HTTP request
@@ -97,8 +90,7 @@ func (h *HTTP) Gather(acc telegraf.Accumulator) error {
 	}
 
 	if h.client == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
+		tlsCfg, err := h.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index bda4ce463..595c74ed2 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -5,9 +5,7 @@ import (
 	"compress/gzip"
 	"crypto/subtle"
 	"crypto/tls"
-	"crypto/x509"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -16,6 +14,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/selfstat"
@@ -43,9 +42,7 @@ type HTTPListener struct {
 	MaxLineSize    int
 	Port           int
 
-	TlsAllowedCacerts []string
-	TlsCert           string
-	TlsKey            string
+	tlsint.ServerConfig
 
 	BasicUsername string
 	BasicPassword string
@@ -158,7 +155,10 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.acc = acc
 	h.pool = NewPool(200, h.MaxLineSize)
 
-	tlsConf := h.getTLSConfig()
+	tlsConf, err := h.ServerConfig.TLSConfig()
+	if err != nil {
+		return err
+	}
 
 	server := &http.Server{
 		Addr:         h.ServiceAddress,
@@ -168,7 +168,6 @@ func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 		TLSConfig:    tlsConf,
 	}
 
-	var err error
 	var listener net.Listener
 	if tlsConf != nil {
 		listener, err = tls.Listen("tcp", h.ServiceAddress, tlsConf)
@@ -372,38 +371,6 @@ func badRequest(res http.ResponseWriter) {
 	res.Write([]byte(`{"error":"http: bad request"}`))
 }
 
-func (h *HTTPListener) getTLSConfig() *tls.Config {
-	tlsConf := &tls.Config{
-		InsecureSkipVerify: false,
-		Renegotiation:      tls.RenegotiateNever,
-	}
-
-	if len(h.TlsCert) == 0 || len(h.TlsKey) == 0 {
-		return nil
-	}
-
-	cert, err := tls.LoadX509KeyPair(h.TlsCert, h.TlsKey)
-	if err != nil {
-		return nil
-	}
-	tlsConf.Certificates = []tls.Certificate{cert}
-
-	if h.TlsAllowedCacerts != nil {
-		tlsConf.ClientAuth = tls.RequireAndVerifyClientCert
-		clientPool := x509.NewCertPool()
-		for _, ca := range h.TlsAllowedCacerts {
-			c, err := ioutil.ReadFile(ca)
-			if err != nil {
-				continue
-			}
-			clientPool.AppendCertsFromPEM(c)
-		}
-		tlsConf.ClientCAs = clientPool
-	}
-
-	return tlsConf
-}
-
 func (h *HTTPListener) AuthenticateIfSet(handler http.HandlerFunc, res http.ResponseWriter, req *http.Request) {
 	if h.BasicUsername != "" && h.BasicPassword != "" {
 		reqUsername, reqPassword, ok := req.BasicAuth()
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
index 7f6ab406c..7c6cdf728 100644
--- a/plugins/inputs/http_listener/http_listener_test.go
+++ b/plugins/inputs/http_listener/http_listener_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/tls"
 	"crypto/x509"
-	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -34,86 +33,12 @@ cpu_load_short,host=server06 value=12.0 1422568543702900257
 
 	emptyMsg = ""
 
-	serviceRootPEM = `-----BEGIN CERTIFICATE-----
-MIIBxzCCATCgAwIBAgIJAJb7HqN2BzWWMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
-BAMMC1RlbGVncmFmIENBMB4XDTE3MTEwNDA0MzEwN1oXDTI3MTEwMjA0MzEwN1ow
-FjEUMBIGA1UEAwwLVGVsZWdyYWYgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANbkUkK6JQC3rbLcXhLJTS9SX6uXyFwl7bUfpAN5Hm5EqfvG3PnLrogfTGLr
-Tq5CRAu/gbbdcMoL9TLv/aaDVnrpV0FslKhqYmkOgT28bdmA7Qtr539aQpMKCfcW
-WCnoMcBD5u5h9MsRqpdq+0Mjlsf1H2hSf07jHk5R1T4l8RMXAgMBAAGjHTAbMAwG
-A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4GBANSrwvpU
-t8ihIhpHqgJZ34DM92CZZ3ZHmH/KyqlnuGzjjpnVZiXVrLDTOzrA0ziVhmefY29w
-roHjENbFm54HW97ogxeURuO8HRHIVh2U0rkyVxOfGZiUdINHqsZdSnDY07bzCtSr
-Z/KsfWXM5llD1Ig1FyBHpKjyUvfzr73sjm/4
------END CERTIFICATE-----`
-	serviceCertPEM = `-----BEGIN CERTIFICATE-----
-MIIBzzCCATigAwIBAgIBATANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
-Z3JhZiBDQTAeFw0xNzExMDQwNDMxMDdaFw0yNzExMDIwNDMxMDdaMBQxEjAQBgNV
-BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsJRss1af
-XKrcIjQoAp2kdJIpT2Ya+MRQXJ18b0PP7szh2lisY11kd/HCkd4D4efuIkpszHaN
-xwyTOZLOoplxp6fizzgOYjXsJ6SzbO1MQNmq8Ch/+uKiGgFwLX+YxOOsGSDIHNhF
-vcBi93cQtCWPBFz6QRQf9yfIAA5KKxUfJcMCAwEAAaMvMC0wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBSAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
-gYEAiC3WI4y9vfYz53gw7FKnNK7BBdwRc43x7Pd+5J/cclWyUZPdmcj1UNmv/3rj
-2qcMmX06UdgPoHppzNAJePvMVk0vjMBUe9MmYlafMz0h4ma/it5iuldXwmejFcdL
-6wWQp7gVTileCEmq9sNvfQN1FmT3EWf4IMdO2MNat/1If0g=
------END CERTIFICATE-----`
-	serviceKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCwlGyzVp9cqtwiNCgCnaR0kilPZhr4xFBcnXxvQ8/uzOHaWKxj
-XWR38cKR3gPh5+4iSmzMdo3HDJM5ks6imXGnp+LPOA5iNewnpLNs7UxA2arwKH/6
-4qIaAXAtf5jE46wZIMgc2EW9wGL3dxC0JY8EXPpBFB/3J8gADkorFR8lwwIDAQAB
-AoGBAJaFHxfMmjHK77U0UnrQWFSKFy64cftmlL4t/Nl3q7L68PdIKULWZIMeEWZ4
-I0UZiFOwr4em83oejQ1ByGSwekEuiWaKUI85IaHfcbt+ogp9hY/XbOEo56OPQUAd
-bEZv1JqJOqta9Ug1/E1P9LjEEyZ5F5ubx7813rxAE31qKtKJAkEA1zaMlCWIr+Rj
-hGvzv5rlHH3wbOB4kQFXO4nqj3J/ttzR5QiJW24STMDcbNngFlVcDVju56LrNTiD
-dPh9qvl7nwJBANILguR4u33OMksEZTYB7nQZSurqXsq6382zH7pTl29ANQTROHaM
-PKC8dnDWq8RGTqKuvWblIzzGIKqIMovZo10CQC96T0UXirITFolOL3XjvAuvFO1Q
-EAkdXJs77805m0dCK+P1IChVfiAEpBw3bKJArpAbQIlFfdI953JUp5SieU0CQEub
-BSSEKMjh/cxu6peEHnb/262vayuCFKkQPu1sxWewLuVrAe36EKCy9dcsDmv5+rgo
-Odjdxc9Madm4aKlaT6kCQQCpAgeblDrrxTrNQ+Typzo37PlnQrvI+0EceAUuJ72G
-P0a+YZUeHNRqT2pPN9lMTAZGGi3CtcF2XScbLNEBeXge
------END RSA PRIVATE KEY-----`
-	clientRootPEM = serviceRootPEM
-	clientCertPEM = `-----BEGIN CERTIFICATE-----
-MIIBzjCCATegAwIBAgIBAjANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtUZWxl
-Z3JhZiBDQTAeFw0xNzExMDQwNDMxMDdaFw0yNzExMDIwNDMxMDdaMBMxETAPBgNV
-BAMMCHRlbGVncmFmMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDP2IMqyOqI
-sJjwBprrz8WPzmlrpyYikQ4XSCSJB3DSTIO+igqMpBUTj3vLlOzsHfVVot1WRqc6
-3esM4JE92rc6S73xi4g8L/r8cPIHW4hvFJdMti4UkJBWim8ArSbFqnZjcR19G3tG
-LUOiXAUG3nWzMzoEsPruvV1dkKRbJVE4MwIDAQABoy8wLTAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOB
-gQCHxMk38XNxL9nPFBYo3JqITJCFswu6/NLHwDBXCuZKl53rUuFWduiO+1OuScKQ
-sQ79W0jHsWRKGOUFrF5/Gdnh8AlkVaITVlcmhdAOFCEbeGpeEvLuuK6grckPitxy
-bRF5oM4TCLKKAha60Ir41rk2bomZM9+NZu+Bm+csDqCoxQ==
------END CERTIFICATE-----`
-	clientKeyPEM = `-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDP2IMqyOqIsJjwBprrz8WPzmlrpyYikQ4XSCSJB3DSTIO+igqM
-pBUTj3vLlOzsHfVVot1WRqc63esM4JE92rc6S73xi4g8L/r8cPIHW4hvFJdMti4U
-kJBWim8ArSbFqnZjcR19G3tGLUOiXAUG3nWzMzoEsPruvV1dkKRbJVE4MwIDAQAB
-AoGAFzb/r4+xYoMXEfgq5ZvXXTCY5cVNpR6+jCsqqYODPnn9XRLeCsdo8z5bfWms
-7NKLzHzca/6IPzL6Rf3vOxFq1YyIZfYVHH+d63/9blAm3Iajjp1W2yW5aj9BJjTb
-nm6F0RfuW/SjrZ9IXxTZhSpCklPmUzVZpzvwV3KGeVTVCEECQQDoavCeOwLuqDpt
-0aM9GMFUpOU7kLPDuicSwCDaTae4kN2rS17Zki41YXe8A8+509IEN7mK09Vq9HxY
-SX6EmV1FAkEA5O9QcCHEa8P12EmUC8oqD2bjq6o7JjUIRlKinwZTlooMJYZw98gA
-FVSngTUvLVCVIvSdjldXPOGgfYiccTZrFwJAfHS3gKOtAEuJbkEyHodhD4h1UB4+
-hPLr9Xh4ny2yQH0ilpV3px5GLEOTMFUCKUoqTiPg8VxaDjn5U/WXED5n2QJAR4J1
-NsFlcGACj+/TvacFYlA6N2nyFeokzoqLX28Ddxdh2erXqJ4hYIhT1ik9tkLggs2z
-1T1084BquCuO6lIcOwJBALX4xChoMUF9k0IxSQzlz//seQYDkQNsE7y9IgAOXkzp
-RaR4pzgPbnKj7atG+2dBnffWfE+1Mcy0INDAO6WxPg0=
------END RSA PRIVATE KEY-----`
-
 	basicUsername = "test-username-please-ignore"
 	basicPassword = "super-secure-password!"
 )
 
 var (
-	initClient           sync.Once
-	client               *http.Client
-	initServiceCertFiles sync.Once
-	allowedCAFiles       []string
-	serviceCAFiles       []string
-	serviceCertFile      string
-	serviceKeyFile       string
+	pki = testutil.NewPKI("../../../testutil/pki")
 )
 
 func newTestHTTPListener() *HTTPListener {
@@ -132,74 +57,25 @@ func newTestHTTPAuthListener() *HTTPListener {
 }
 
 func newTestHTTPSListener() *HTTPListener {
-	initServiceCertFiles.Do(func() {
-		acaf, err := ioutil.TempFile("", "allowedCAFile.crt")
-		if err != nil {
-			panic(err)
-		}
-		defer acaf.Close()
-		_, err = io.Copy(acaf, bytes.NewReader([]byte(clientRootPEM)))
-		allowedCAFiles = []string{acaf.Name()}
-
-		scaf, err := ioutil.TempFile("", "serviceCAFile.crt")
-		if err != nil {
-			panic(err)
-		}
-		defer scaf.Close()
-		_, err = io.Copy(scaf, bytes.NewReader([]byte(serviceRootPEM)))
-		serviceCAFiles = []string{scaf.Name()}
-
-		scf, err := ioutil.TempFile("", "serviceCertFile.crt")
-		if err != nil {
-			panic(err)
-		}
-		defer scf.Close()
-		_, err = io.Copy(scf, bytes.NewReader([]byte(serviceCertPEM)))
-		serviceCertFile = scf.Name()
-
-		skf, err := ioutil.TempFile("", "serviceKeyFile.crt")
-		if err != nil {
-			panic(err)
-		}
-		defer skf.Close()
-		_, err = io.Copy(skf, bytes.NewReader([]byte(serviceKeyPEM)))
-		serviceKeyFile = skf.Name()
-	})
-
 	listener := &HTTPListener{
-		ServiceAddress:    "localhost:0",
-		TlsAllowedCacerts: allowedCAFiles,
-		TlsCert:           serviceCertFile,
-		TlsKey:            serviceKeyFile,
-		TimeFunc:          time.Now,
+		ServiceAddress: "localhost:0",
+		ServerConfig:   *pki.TLSServerConfig(),
+		TimeFunc:       time.Now,
 	}
 
 	return listener
 }
 
 func getHTTPSClient() *http.Client {
-	initClient.Do(func() {
-		cas := x509.NewCertPool()
-		cas.AppendCertsFromPEM([]byte(serviceRootPEM))
-		clientCert, err := tls.X509KeyPair([]byte(clientCertPEM), []byte(clientKeyPEM))
-		if err != nil {
-			panic(err)
-		}
-		client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					RootCAs:            cas,
-					Certificates:       []tls.Certificate{clientCert},
-					MinVersion:         tls.VersionTLS12,
-					MaxVersion:         tls.VersionTLS12,
-					CipherSuites:       []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
-					Renegotiation:      tls.RenegotiateNever,
-					InsecureSkipVerify: false,
-				},
-			},
-		}
-	})
-	return client
+	tlsConfig, err := pki.TLSClientConfig().TLSConfig()
+	if err != nil {
+		panic(err)
+	}
+	return &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsConfig,
+		},
+	}
 }
 
 func createURL(listener *HTTPListener, scheme string, path string, rawquery string) string {
@@ -214,14 +90,14 @@ func createURL(listener *HTTPListener, scheme string, path string, rawquery stri
 
 func TestWriteHTTPSNoClientAuth(t *testing.T) {
 	listener := newTestHTTPSListener()
-	listener.TlsAllowedCacerts = nil
+	listener.TLSAllowedCACerts = nil
 
 	acc := &testutil.Accumulator{}
 	require.NoError(t, listener.Start(acc))
 	defer listener.Stop()
 
 	cas := x509.NewCertPool()
-	cas.AppendCertsFromPEM([]byte(serviceRootPEM))
+	cas.AppendCertsFromPEM([]byte(pki.ReadServerCert()))
 	noClientAuthClient := &http.Client{
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{
diff --git a/plugins/inputs/http_response/README.md b/plugins/inputs/http_response/README.md
index 69b477ed4..4ccd236a5 100644
--- a/plugins/inputs/http_response/README.md
+++ b/plugins/inputs/http_response/README.md
@@ -32,11 +32,11 @@ This input plugin checks HTTP/HTTPS connections.
   # response_string_match = "ok"
   # response_string_match = "\".*_status\".?:.?\"up\""
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Request Headers (all values must be strings)
diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go
index 9dcf9394a..1f1f68707 100644
--- a/plugins/inputs/http_response/http_response.go
+++ b/plugins/inputs/http_response/http_response.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -29,15 +30,7 @@ type HTTPResponse struct {
 	Headers             map[string]string
 	FollowRedirects     bool
 	ResponseStringMatch string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	compiledStringMatch *regexp.Regexp
 	client              *http.Client
@@ -74,11 +67,11 @@ var sampleConfig = `
   # response_string_match = "ok"
   # response_string_match = "\".*_status\".?:.?\"up\""
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Request Headers (all values must be strings)
@@ -113,8 +106,7 @@ func getProxyFunc(http_proxy string) func(*http.Request) (*url.URL, error) {
 // CreateHttpClient creates an http client which will timeout at the specified
 // timeout period and can follow redirects if specified
 func (h *HTTPResponse) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
+	tlsCfg, err := h.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/httpjson/README.md b/plugins/inputs/httpjson/README.md
index e3ef83c87..19fe01445 100644
--- a/plugins/inputs/httpjson/README.md
+++ b/plugins/inputs/httpjson/README.md
@@ -34,11 +34,11 @@ Deprecated (1.6): use the [http](../http) input.
   #   "my_tag_2"
   # ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Request Parameters (all values must be strings).  For "GET" requests, data
diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go
index bfa35752b..c7324dee4 100644
--- a/plugins/inputs/httpjson/httpjson.go
+++ b/plugins/inputs/httpjson/httpjson.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
@@ -29,15 +30,7 @@ type HttpJson struct {
 	ResponseTimeout internal.Duration
 	Parameters      map[string]string
 	Headers         map[string]string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client HTTPClient
 }
@@ -100,11 +93,11 @@ var sampleConfig = `
   #   "my_tag_2"
   # ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP parameters (all values must be strings).  For "GET" requests, data
@@ -133,8 +126,7 @@ func (h *HttpJson) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
 	if h.client.HTTPClient() == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			h.SSLCert, h.SSLKey, h.SSLCA, h.InsecureSkipVerify)
+		tlsCfg, err := h.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/influxdb/README.md b/plugins/inputs/influxdb/README.md
index 852393165..2bab123f8 100644
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -20,11 +20,11 @@ InfluxDB-formatted endpoints. See below for more information.
     "http://localhost:8086/debug/vars"
   ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## http request & header timeout
diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go
index 811f4ce56..0bb3ead5e 100644
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -10,21 +10,14 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type InfluxDB struct {
-	URLs []string `toml:"urls"`
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
+	URLs    []string `toml:"urls"`
 	Timeout internal.Duration
+	tls.ClientConfig
 
 	client *http.Client
 }
@@ -45,11 +38,11 @@ func (*InfluxDB) SampleConfig() string {
     "http://localhost:8086/debug/vars"
   ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## http request & header timeout
@@ -63,8 +56,7 @@ func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
 	}
 
 	if i.client == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
+		tlsCfg, err := i.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 283c4a5e5..441ede226 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -18,14 +18,14 @@ The `jolokia2_agent` input plugin reads JMX metrics from one or more [Jolokia ag
     paths = ["Uptime"]
 ```
 
-Optionally, specify SSL options for communicating with agents:
+Optionally, specify TLS options for communicating with agents:
 
 ```toml
 [[inputs.jolokia2_agent]]
   urls = ["https://agent:8080/jolokia"]
-  ssl_ca   = "/var/private/ca.pem"
-  ssl_cert = "/var/private/client.pem"
-  ssl_key  = "/var/private/client-key.pem"
+  tls_ca   = "/var/private/ca.pem"
+  tls_cert = "/var/private/client.pem"
+  tls_key  = "/var/private/client-key.pem"
   #insecure_skip_verify = false
 
   [[inputs.jolokia2_agent.metric]]
@@ -55,15 +55,15 @@ The `jolokia2_proxy` input plugin reads JMX metrics from one or more _targets_ b
     paths = ["Uptime"]
 ```
 
-Optionally, specify SSL options for communicating with proxies:
+Optionally, specify TLS options for communicating with proxies:
 
 ```toml
 [[inputs.jolokia2_proxy]]
   url = "https://proxy:8080/jolokia"
 
-  ssl_ca   = "/var/private/ca.pem"
-  ssl_cert = "/var/private/client.pem"
-  ssl_key  = "/var/private/client-key.pem"
+  tls_ca   = "/var/private/ca.pem"
+  tls_cert = "/var/private/client.pem"
+  tls_key  = "/var/private/client-key.pem"
   #insecure_skip_verify = false
 
   #default_target_username = ""
diff --git a/plugins/inputs/jolokia2/client.go b/plugins/inputs/jolokia2/client.go
index aa9a8f87b..9f5de15d8 100644
--- a/plugins/inputs/jolokia2/client.go
+++ b/plugins/inputs/jolokia2/client.go
@@ -10,7 +10,7 @@ import (
 	"path"
 	"time"
 
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 )
 
 type Client struct {
@@ -20,15 +20,11 @@ type Client struct {
 }
 
 type ClientConfig struct {
-	ResponseTimeout    time.Duration
-	Username           string
-	Password           string
-	SSLCA              string
-	SSLCert            string
-	SSLKey             string
-	InsecureSkipVerify bool
-
-	ProxyConfig *ProxyConfig
+	ResponseTimeout time.Duration
+	Username        string
+	Password        string
+	ProxyConfig     *ProxyConfig
+	tls.ClientConfig
 }
 
 type ProxyConfig struct {
@@ -100,8 +96,7 @@ type jolokiaResponse struct {
 }
 
 func NewClient(url string, config *ClientConfig) (*Client, error) {
-	tlsConfig, err := internal.GetTLSConfig(
-		config.SSLCert, config.SSLKey, config.SSLCA, config.InsecureSkipVerify)
+	tlsConfig, err := config.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
index 1042da9d9..f1d58e681 100644
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/tls"
 )
 
 type JolokiaAgent struct {
@@ -18,10 +19,7 @@ type JolokiaAgent struct {
 	Password        string
 	ResponseTimeout time.Duration `toml:"response_timeout"`
 
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	Metrics  []MetricConfig `toml:"metric"`
 	gatherer *Gatherer
@@ -39,10 +37,10 @@ func (ja *JolokiaAgent) SampleConfig() string {
   # password = ""
   # response_timeout = "5s"
 
-  ## Optional SSL config
-  # ssl_ca   = "/var/private/ca.pem"
-  # ssl_cert = "/var/private/client.pem"
-  # ssl_key  = "/var/private/client-key.pem"
+  ## Optional TLS config
+  # tls_ca   = "/var/private/ca.pem"
+  # tls_cert = "/var/private/client.pem"
+  # tls_key  = "/var/private/client-key.pem"
   # insecure_skip_verify = false
 
   ## Add metrics to read
@@ -101,12 +99,9 @@ func (ja *JolokiaAgent) createMetrics() []Metric {
 
 func (ja *JolokiaAgent) createClient(url string) (*Client, error) {
 	return NewClient(url, &ClientConfig{
-		Username:           ja.Username,
-		Password:           ja.Password,
-		ResponseTimeout:    ja.ResponseTimeout,
-		SSLCA:              ja.SSLCA,
-		SSLCert:            ja.SSLCert,
-		SSLKey:             ja.SSLKey,
-		InsecureSkipVerify: ja.InsecureSkipVerify,
+		Username:        ja.Username,
+		Password:        ja.Password,
+		ResponseTimeout: ja.ResponseTimeout,
+		ClientConfig:    ja.ClientConfig,
 	})
 }
diff --git a/plugins/inputs/jolokia2/jolokia_proxy.go b/plugins/inputs/jolokia2/jolokia_proxy.go
index c9474871f..40909dcce 100644
--- a/plugins/inputs/jolokia2/jolokia_proxy.go
+++ b/plugins/inputs/jolokia2/jolokia_proxy.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/tls"
 )
 
 type JolokiaProxy struct {
@@ -16,13 +17,10 @@ type JolokiaProxy struct {
 	DefaultTargetUsername string
 	Targets               []JolokiaProxyTargetConfig `toml:"target"`
 
-	Username           string
-	Password           string
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool
-	ResponseTimeout    time.Duration `toml:"response_timeout"`
+	Username        string
+	Password        string
+	ResponseTimeout time.Duration `toml:"response_timeout"`
+	tls.ClientConfig
 
 	Metrics  []MetricConfig `toml:"metric"`
 	client   *Client
@@ -47,10 +45,10 @@ func (jp *JolokiaProxy) SampleConfig() string {
   # password = ""
   # response_timeout = "5s"
 
-  ## Optional SSL config
-  # ssl_ca   = "/var/private/ca.pem"
-  # ssl_cert = "/var/private/client.pem"
-  # ssl_key  = "/var/private/client-key.pem"
+  ## Optional TLS config
+  # tls_ca   = "/var/private/ca.pem"
+  # tls_cert = "/var/private/client.pem"
+  # tls_key  = "/var/private/client-key.pem"
   # insecure_skip_verify = false
 
   ## Add proxy targets to query
@@ -117,13 +115,10 @@ func (jp *JolokiaProxy) createClient() (*Client, error) {
 	}
 
 	return NewClient(jp.URL, &ClientConfig{
-		Username:           jp.Username,
-		Password:           jp.Password,
-		ResponseTimeout:    jp.ResponseTimeout,
-		SSLCA:              jp.SSLCA,
-		SSLCert:            jp.SSLCert,
-		SSLKey:             jp.SSLKey,
-		InsecureSkipVerify: jp.InsecureSkipVerify,
-		ProxyConfig:        proxyConfig,
+		Username:        jp.Username,
+		Password:        jp.Password,
+		ResponseTimeout: jp.ResponseTimeout,
+		ClientConfig:    jp.ClientConfig,
+		ProxyConfig:     proxyConfig,
 	})
 }
diff --git a/plugins/inputs/kafka_consumer/README.md b/plugins/inputs/kafka_consumer/README.md
index 695001274..67dbb539e 100644
--- a/plugins/inputs/kafka_consumer/README.md
+++ b/plugins/inputs/kafka_consumer/README.md
@@ -22,11 +22,11 @@ and use the old zookeeper connection method.
   ## Offset (must be either "oldest" or "newest")
   offset = "oldest"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional SASL Config
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go
index 4e4715617..bf74dd5ab 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 
@@ -23,14 +23,7 @@ type Kafka struct {
 
 	Cluster *cluster.Consumer
 
-	// Verify Kafka SSL Certificate
-	InsecureSkipVerify bool
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
+	tls.ClientConfig
 
 	// SASL Username
 	SASLUsername string `toml:"sasl_username"`
@@ -67,11 +60,11 @@ var sampleConfig = `
   ## topic(s) to consume
   topics = ["telegraf"]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional SASL Config
@@ -116,8 +109,7 @@ func (k *Kafka) Start(acc telegraf.Accumulator) error {
 	config := cluster.NewConfig()
 	config.Consumer.Return.Errors = true
 
-	tlsConfig, err := internal.GetTLSConfig(
-		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	tlsConfig, err := k.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/kapacitor/README.md b/plugins/inputs/kapacitor/README.md
index ae5b365da..2ff4eab88 100644
--- a/plugins/inputs/kapacitor/README.md
+++ b/plugins/inputs/kapacitor/README.md
@@ -15,11 +15,11 @@ The Kapacitor plugin will collect metrics from the given Kapacitor instances.
   ## Time limit for http requests
   timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/kapacitor/kapacitor.go b/plugins/inputs/kapacitor/kapacitor.go
index ea0ca055b..f20b98774 100644
--- a/plugins/inputs/kapacitor/kapacitor.go
+++ b/plugins/inputs/kapacitor/kapacitor.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -17,18 +18,9 @@ const (
 )
 
 type Kapacitor struct {
-	URLs []string `toml:"urls"`
-
+	URLs    []string `toml:"urls"`
 	Timeout internal.Duration
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client *http.Client
 }
@@ -48,11 +40,11 @@ func (*Kapacitor) SampleConfig() string {
   ## Time limit for http requests
   timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 }
@@ -82,8 +74,7 @@ func (k *Kapacitor) Gather(acc telegraf.Accumulator) error {
 }
 
 func (k *Kapacitor) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	tlsCfg, err := k.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/kubernetes/kubernetes.go b/plugins/inputs/kubernetes/kubernetes.go
index 9d07d6a42..870524a80 100644
--- a/plugins/inputs/kubernetes/kubernetes.go
+++ b/plugins/inputs/kubernetes/kubernetes.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -21,18 +22,11 @@ type Kubernetes struct {
 	// Bearer Token authorization file path
 	BearerToken string `toml:"bearer_token"`
 
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
-
 	// HTTP Timeout specified as a string - 3s, 1m, 1h
 	ResponseTimeout internal.Duration
 
+	tls.ClientConfig
+
 	RoundTripper http.RoundTripper
 }
 
@@ -46,11 +40,11 @@ var sampleConfig = `
   ## Set response_timeout (default 5 seconds)
   # response_timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = /path/to/cafile
-  # ssl_cert = /path/to/certfile
-  # ssl_key = /path/to/keyfile
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = /path/to/cafile
+  # tls_cert = /path/to/certfile
+  # tls_key = /path/to/keyfile
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -101,7 +95,7 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) err
 	var token []byte
 	var resp *http.Response
 
-	tlsCfg, err := internal.GetTLSConfig(k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	tlsCfg, err := k.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/mesos/README.md b/plugins/inputs/mesos/README.md
index 46df267aa..b18908b8a 100644
--- a/plugins/inputs/mesos/README.md
+++ b/plugins/inputs/mesos/README.md
@@ -36,11 +36,11 @@ For more information, please check the [Mesos Observability Metrics](http://meso
   #   "messages",
   # ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/mesos/mesos.go b/plugins/inputs/mesos/mesos.go
index 5b0697cab..15e2bfccb 100644
--- a/plugins/inputs/mesos/mesos.go
+++ b/plugins/inputs/mesos/mesos.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
@@ -33,15 +33,7 @@ type Mesos struct {
 	Slaves     []string
 	SlaveCols  []string `toml:"slave_collections"`
 	//SlaveTasks bool
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	initialized bool
 	client      *http.Client
@@ -83,11 +75,11 @@ var sampleConfig = `
   #   "messages",
   # ]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -216,8 +208,7 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 }
 
 func (m *Mesos) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+	tlsCfg, err := m.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index 48c01a590..a78d7b954 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -14,11 +14,11 @@
   ## When true, collect per database stats
   # gather_perdb_stats = false
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go
index e6b811e54..895667dee 100644
--- a/plugins/inputs/mongodb/mongodb.go
+++ b/plugins/inputs/mongodb/mongodb.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
 )
@@ -22,15 +22,7 @@ type MongoDB struct {
 	Ssl              Ssl
 	mongos           map[string]*Server
 	GatherPerdbStats bool
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tlsint.ClientConfig
 }
 
 type Ssl struct {
@@ -49,11 +41,11 @@ var sampleConfig = `
   ## When true, collect per database stats
   # gather_perdb_stats = false
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -134,7 +126,7 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 		var tlsConfig *tls.Config
 
 		if m.Ssl.Enabled {
-			// Deprecated SSL config
+			// Deprecated TLS config
 			tlsConfig = &tls.Config{}
 			if len(m.Ssl.CaCerts) > 0 {
 				roots := x509.NewCertPool()
@@ -149,8 +141,7 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 				tlsConfig.InsecureSkipVerify = true
 			}
 		} else {
-			tlsConfig, err = internal.GetTLSConfig(
-				m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+			tlsConfig, err = m.ClientConfig.TLSConfig()
 			if err != nil {
 				return err
 			}
diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md
index 2889bde59..df7869a86 100644
--- a/plugins/inputs/mqtt_consumer/README.md
+++ b/plugins/inputs/mqtt_consumer/README.md
@@ -36,11 +36,11 @@ The plugin expects messages in the
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to consume.
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
index 6903f654d..58074af79 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 
@@ -33,15 +34,7 @@ type MQTTConsumer struct {
 
 	PersistentSession bool
 	ClientID          string `toml:"client_id"`
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	sync.Mutex
 	client mqtt.Client
@@ -83,11 +76,11 @@ var sampleConfig = `
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to consume.
@@ -236,8 +229,7 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 		opts.SetClientID(m.ClientID)
 	}
 
-	tlsCfg, err := internal.GetTLSConfig(
-		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+	tlsCfg, err := m.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index a190c600d..564d75e61 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -82,10 +82,10 @@ This plugin gathers the statistic data from MySQL server
   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
   interval_slow                             = "30m"
 
-  ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
-  ssl_ca = "/etc/telegraf/ca.pem"
-  ssl_cert = "/etc/telegraf/cert.pem"
-  ssl_key = "/etc/telegraf/key.pem"
+  ## Optional TLS Config (will be used if tls=custom parameter specified in server uri)
+  tls_ca = "/etc/telegraf/ca.pem"
+  tls_cert = "/etc/telegraf/cert.pem"
+  tls_key = "/etc/telegraf/key.pem"
 ```
 
 #### Metric Version
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 6e5a89e3b..063452b7c 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/inputs/mysql/v1"
 
@@ -38,10 +38,8 @@ type Mysql struct {
 	GatherFileEventsStats               bool     `toml:"gather_file_events_stats"`
 	GatherPerfEventsStatements          bool     `toml:"gather_perf_events_statements"`
 	IntervalSlow                        string   `toml:"interval_slow"`
-	SSLCA                               string   `toml:"ssl_ca"`
-	SSLCert                             string   `toml:"ssl_cert"`
-	SSLKey                              string   `toml:"ssl_key"`
 	MetricVersion                       int      `toml:"metric_version"`
+	tls.ClientConfig
 }
 
 var sampleConfig = `
@@ -118,10 +116,12 @@ var sampleConfig = `
   ## Some queries we may want to run less often (such as SHOW GLOBAL VARIABLES)
   interval_slow                   = "30m"
 
-  ## Optional SSL Config (will be used if tls=custom parameter specified in server uri)
-  ssl_ca = "/etc/telegraf/ca.pem"
-  ssl_cert = "/etc/telegraf/cert.pem"
-  ssl_key = "/etc/telegraf/key.pem"
+  ## Optional TLS Config (will be used if tls=custom parameter specified in server uri)
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 var defaultTimeout = time.Second * time.Duration(5)
@@ -161,7 +161,7 @@ func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 		m.InitMysql()
 	}
 
-	tlsConfig, err := internal.GetTLSConfig(m.SSLCert, m.SSLKey, m.SSLCA, false)
+	tlsConfig, err := m.ClientConfig.TLSConfig()
 	if err != nil {
 		return fmt.Errorf("registering TLS config: %s", err)
 	}
diff --git a/plugins/inputs/nginx/README.md b/plugins/inputs/nginx/README.md
index 819501ea7..7b5215dc3 100644
--- a/plugins/inputs/nginx/README.md
+++ b/plugins/inputs/nginx/README.md
@@ -8,11 +8,11 @@
   ## An array of Nginx stub_status URI to gather stats.
   urls = ["http://localhost/server_status"]
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP response timeout (default: 5s)
diff --git a/plugins/inputs/nginx/nginx.go b/plugins/inputs/nginx/nginx.go
index 3880dd91d..1a1a115d3 100644
--- a/plugins/inputs/nginx/nginx.go
+++ b/plugins/inputs/nginx/nginx.go
@@ -13,34 +13,28 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Nginx struct {
-	// List of status URLs
-	Urls []string
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to client cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	Urls            []string
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
 	// HTTP client
 	client *http.Client
-	// Response timeout
-	ResponseTimeout internal.Duration
 }
 
 var sampleConfig = `
   # An array of Nginx stub_status URI to gather stats.
   urls = ["http://localhost/server_status"]
 
-  # TLS/SSL configuration
-  ssl_ca = "/etc/telegraf/ca.pem"
-  ssl_cert = "/etc/telegraf/cert.cer"
-  ssl_key = "/etc/telegraf/key.key"
+  ## Optional TLS Config
+  tls_ca = "/etc/telegraf/ca.pem"
+  tls_cert = "/etc/telegraf/cert.cer"
+  tls_key = "/etc/telegraf/key.key"
+  ## Use TLS but skip chain & host verification
   insecure_skip_verify = false
 
   # HTTP response timeout (default: 5s)
@@ -87,8 +81,7 @@ func (n *Nginx) Gather(acc telegraf.Accumulator) error {
 }
 
 func (n *Nginx) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+	tlsCfg, err := n.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index 44e751f5e..aac600219 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -20,7 +20,7 @@ To use this plugin you must enable the [monitoring](https://www.openldap.org/dev
   insecure_skip_verify = false
 
   # Path to PEM-encoded Root certificate to use to verify server certificate
-  ssl_ca = "/etc/ssl/certs.pem"
+  tls_ca = "/etc/ssl/certs.pem"
 
   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
   bind_dn = ""
diff --git a/plugins/inputs/openldap/openldap.go b/plugins/inputs/openldap/openldap.go
index e413ecbed..8a423ba51 100644
--- a/plugins/inputs/openldap/openldap.go
+++ b/plugins/inputs/openldap/openldap.go
@@ -8,7 +8,7 @@ import (
 	"gopkg.in/ldap.v2"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -36,7 +36,7 @@ const sampleConfig string = `
   insecure_skip_verify = false
 
   # Path to PEM-encoded Root certificate to use to verify server certificate
-  ssl_ca = "/etc/ssl/certs.pem"
+  tls_ca = "/etc/ssl/certs.pem"
 
   # dn/password to bind with. If bind_dn is empty, an anonymous bind is performed.
   bind_dn = ""
@@ -85,7 +85,11 @@ func (o *Openldap) Gather(acc telegraf.Accumulator) error {
 	var l *ldap.Conn
 	if o.Ssl != "" {
 		// build tls config
-		tlsConfig, err := internal.GetTLSConfig("", "", o.SslCa, o.InsecureSkipVerify)
+		clientTLSConfig := tls.ClientConfig{
+			SSLCA:              o.SslCa,
+			InsecureSkipVerify: o.InsecureSkipVerify,
+		}
+		tlsConfig, err := clientTLSConfig.TLSConfig()
 		if err != nil {
 			acc.AddError(err)
 			return nil
diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index ac7405014..227f3f737 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -20,11 +20,11 @@ in Prometheus format.
   ## Specify timeout duration for slower prometheus clients (default is 3s)
   # response_timeout = "3s"
 
-  ## Optional SSL Config
-  # ssl_ca = /path/to/cafile
-  # ssl_cert = /path/to/certfile
-  # ssl_key = /path/to/keyfile
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = /path/to/cafile
+  # tls_cert = /path/to/certfile
+  # tls_key = /path/to/keyfile
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 2a8a6b284..23709790f 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -30,14 +31,7 @@ type Prometheus struct {
 
 	ResponseTimeout internal.Duration `toml:"response_timeout"`
 
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client *http.Client
 }
@@ -55,11 +49,11 @@ var sampleConfig = `
   ## Specify timeout duration for slower prometheus clients (default is 3s)
   # response_timeout = "3s"
 
-  ## Optional SSL Config
-  # ssl_ca = /path/to/cafile
-  # ssl_cert = /path/to/certfile
-  # ssl_key = /path/to/keyfile
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = /path/to/cafile
+  # tls_cert = /path/to/certfile
+  # tls_key = /path/to/keyfile
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -167,8 +161,7 @@ var client = &http.Client{
 }
 
 func (p *Prometheus) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := internal.GetTLSConfig(
-		p.SSLCert, p.SSLKey, p.SSLCA, p.InsecureSkipVerify)
+	tlsCfg, err := p.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 5dae5e091..ae6dac6f1 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -16,11 +16,11 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   # username = "guest"
   # password = "guest"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional request timeouts
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index e0d12c3db..49dabe1b5 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -11,6 +11,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -37,14 +38,7 @@ type RabbitMQ struct {
 	Name     string
 	Username string
 	Password string
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	ResponseHeaderTimeout internal.Duration `toml:"header_timeout"`
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
@@ -175,11 +169,11 @@ var sampleConfig = `
   # username = "guest"
   # password = "guest"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional request timeouts
@@ -223,8 +217,7 @@ func (r *RabbitMQ) Description() string {
 // Gather ...
 func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
 	if r.Client == nil {
-		tlsCfg, err := internal.GetTLSConfig(
-			r.SSLCert, r.SSLKey, r.SSLCA, r.InsecureSkipVerify)
+		tlsCfg, err := r.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 076e1f4b8..daab84952 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 )
@@ -161,14 +162,12 @@ func (psl *packetSocketListener) listen() {
 }
 
 type SocketListener struct {
-	ServiceAddress    string             `toml:"service_address"`
-	MaxConnections    int                `toml:"max_connections"`
-	ReadBufferSize    int                `toml:"read_buffer_size"`
-	ReadTimeout       *internal.Duration `toml:"read_timeout"`
-	TLSAllowedCACerts []string           `toml:"tls_allowed_cacerts"`
-	TLSCert           string             `toml:"tls_cert"`
-	TLSKey            string             `toml:"tls_key"`
-	KeepAlivePeriod   *internal.Duration `toml:"keep_alive_period"`
+	ServiceAddress  string             `toml:"service_address"`
+	MaxConnections  int                `toml:"max_connections"`
+	ReadBufferSize  int                `toml:"read_buffer_size"`
+	ReadTimeout     *internal.Duration `toml:"read_timeout"`
+	KeepAlivePeriod *internal.Duration `toml:"keep_alive_period"`
+	tlsint.ServerConfig
 
 	parsers.Parser
 	telegraf.Accumulator
@@ -259,7 +258,7 @@ func (sl *SocketListener) Start(acc telegraf.Accumulator) error {
 			l   net.Listener
 		)
 
-		tlsCfg, err := internal.GetServerTLSConfig(sl.TLSCert, sl.TLSKey, sl.TLSAllowedCACerts)
+		tlsCfg, err := sl.ServerConfig.TLSConfig()
 		if err != nil {
 			return nil
 		}
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index b647e724f..65ee0db94 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -9,12 +9,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+var pki = testutil.NewPKI("../../../testutil/pki")
+
 // testEmptyLog is a helper function to ensure no data is written to log.
 // Should be called at the start of the test, and returns a function which should run at the end.
 func testEmptyLog(t *testing.T) func() {
@@ -32,16 +33,14 @@ func TestSocketListener_tcp_tls(t *testing.T) {
 
 	sl := newSocketListener()
 	sl.ServiceAddress = "tcp://127.0.0.1:0"
-	sl.TLSCert = "testdata/server.pem"
-	sl.TLSKey = "testdata/server.key"
-	sl.TLSAllowedCACerts = []string{"testdata/ca.pem"}
+	sl.ServerConfig = *pki.TLSServerConfig()
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()
 
-	tlsCfg, err := internal.GetTLSConfig("testdata/client.pem", "testdata/client.key", "testdata/ca.pem", true)
+	tlsCfg, err := pki.TLSClientConfig().TLSConfig()
 	require.NoError(t, err)
 
 	secureClient, err := tls.Dial("tcp", sl.Closer.(net.Listener).Addr().String(), tlsCfg)
@@ -55,16 +54,15 @@ func TestSocketListener_unix_tls(t *testing.T) {
 
 	sl := newSocketListener()
 	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
-	sl.TLSCert = "testdata/server.pem"
-	sl.TLSKey = "testdata/server.key"
-	sl.TLSAllowedCACerts = []string{"testdata/ca.pem"}
+	sl.ServerConfig = *pki.TLSServerConfig()
 
 	acc := &testutil.Accumulator{}
 	err := sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()
 
-	tlsCfg, err := internal.GetTLSConfig("testdata/client.pem", "testdata/client.key", "testdata/ca.pem", true)
+	tlsCfg, err := pki.TLSClientConfig().TLSConfig()
+	tlsCfg.InsecureSkipVerify = true
 	require.NoError(t, err)
 
 	secureClient, err := tls.Dial("unix", "/tmp/telegraf_test.sock", tlsCfg)
diff --git a/plugins/inputs/socket_listener/testdata/ca.pem b/plugins/inputs/socket_listener/testdata/ca.pem
deleted file mode 100644
index d3b6d9a14..000000000
--- a/plugins/inputs/socket_listener/testdata/ca.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFVTCCAz2gAwIBAgIJAOhLvwv6zUf+MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsG
-A1UECgwEVGVzdDAeFw0xODA0MTcwNDIwNDZaFw0yMTAyMDQwNDIwNDZaMEExCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEN
-MAsGA1UECgwEVGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKwE
-Xy814CDH03G3Fg2/XSpYZXVMzwp6oq/bUe3iLhkOpA6C4+j07AxAAa22qEPlvYkb
-W7oxVJiL0ih1od2FeAxvroBTmjG54j/Syb8OeQsZaJLNp1rRmwYGBIVi284ScaIc
-dn+2bfmfpSLjK3SbU5XygtwIE3gh/B7x02UJRNJmJ1faRT2CfTeg/56xnTE4bcR5
-HRrlojoN5laJngowLWAEAvWljCR8oge+ciNYB3xoK8Hgc9+WgTy95G1RBCNkaFFI
-73nrcHl6dGOH9UgIqfbHJYxNEarI3o/JAr8DIBS0W4r8r4aY4JQ4LoN3bg4mLHQq
-THKkVW5hyBeWe47qmlL0m4F6/+mzVi95NAWG2BQDCZJAWJNc+PbSRHi81838m7ff
-O4rixd/F53LUUas8/zVca3vtv+XjOHZzIQLIy1bM4MhzpHlRcSmS9kqxxZ3S70e3
-ZIWFdM0iRrtlBbJeoHIJRDpgPRYIWdRc6XotljTTi6/lN4Bj/0NK4E3iONcDsscN
-kiqEHRAWZ4ptCqdVPgYR0S096Fx6OaC3ASODE0Cjb18ylZQRsQi8TiYSihGzuoio
-wJwSLdIifDbbSUkjT1384cA/HsOjFQ9xHXYa6cQnAg3TUZyG1lAMJyFWYke+rxmG
-srfL/EtIzgbzmEOC5anQjA2pdgUO9Pk2SinJaMApAgMBAAGjUDBOMB0GA1UdDgQW
-BBQNJctDLjj8bVKNCYANaOcboPQnmzAfBgNVHSMEGDAWgBQNJctDLjj8bVKNCYAN
-aOcboPQnmzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQATSr26Kc8g
-3l2zuccoKWM57DQcgRmzSYwEOKA2jn3FWmrAdwozEIkLaTK0OXz0zh2dZxh9V3GR
-w0WFCynbGNy/9s33MSi+zIWJOU/MZvt6zGE5CTcTgZ+u5IZyvSubMkPcwQi3Yvcg
-AHmWzpF42kT2J5C5MfrSU65hrhPX7hT/CUoV3gN7oxFzj+/ED4kgNorO8SUUJCmq
-DJNFbjgsD63EhnvAhn1AeM35GmKdl2enEKqcZsRkE4ZLpU7ibrThEm1aOQuJUtHk
-gDAx49QMdQpWnxWxnfoiwpLu7ufR7ls8O9oA8ZJux/SVHEmtkOdRsuMtY5MElFZg
-dANlQsdFWDko4ixaxFYzppuPNnRlqjGNnaEFJrNc2KR0Dxgmp28Yh2VyLd4r3fLT
-nLVBYF8KzFchUdXYYPNBXwAf/N52jGfugDx8snLxOfzxoUZ4y64qMCpYhntGgBJ1
-Rrk2trcn3Dw19gi8p3ylbdoz/Ch1INDDrO35pd0bZpcwASc/UNU72W5v2kGL0H7o
-nJzgtrqeHcoIzNBmBhHlMlnTF5GMfrYGsf5d30KyKv7UL6qJTvT641dpKpB/FFrk
-y3AQbKmKRDI+aVzeOlwdy/eJAwt7FikD4bR9GZ4PBX9n9jd4u/PHZNfxtgzplqo1
-oy7kJv0cB/vRKOblmn/vPUfTFtAX7M3GkQ==
------END CERTIFICATE-----
diff --git a/plugins/inputs/socket_listener/testdata/client.key b/plugins/inputs/socket_listener/testdata/client.key
deleted file mode 100644
index 285a27478..000000000
--- a/plugins/inputs/socket_listener/testdata/client.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAmRuY+9Gg5V4e9hCd2mYek1jKeoaZijz89EPvox78XzoGdxPf
-RoukUcTVS9VWN7HyJBjRA9P+KuHI9dX47skxyxH53uXZvRmGQAJBY4cE07JHvGkZ
-eK1heXoWlBzYtivckha7bLBfn1ttAzcFCblUfJdzsn9XDuC4Jfn4oSaKn1o8Rzy1
-KRvyLgvsYxMA/XzhyBzVMyoUOulye7EZx4f+AwSNmNHD4OgtxxPofrrMOtXZ2tC6
-xNOexIZXbsB9dyrUW+4pWXYaadU7fl2V+arAJj+NVxV+3tmGGjmd1MiIypPx6BbP
-g7xH20nJ/Y0U6V7gklZpYO1i84RbtR/kqBgi9QIDAQABAoIBAEONJJM+KyHnw/tG
-246HbcgO7c7fYhDW1bgj3S/4NNsC6+VP1Dv40nftQzphFtgd37rDZDyvJL3gvlyQ
-mnMoO5rgBIGuocHH6C6HkDgMUznft7zOFhnjTVVeY2XX0FmXwoqGEw1iR940ZUV8
-2fEvXrJV1AsWGeALj9PZlTPsoE6rv5sUk9Lh3wCD73m7GSg7DzBRE+6bBze8Lmwn
-ZzTvmimhgPJw8LR5rRpYbDbhAJLAfgA7/yPgYEPxA/ffry6Ba4epj8tVNUNOAcOf
-PURF+uuIF7RceI2PkdvoNuQyVR5oxQUPUfidfVK5ClUmnHECSgb/FFnYC+nU2vSi
-IAnmC6ECgYEAyrUFHyxxuIQAiinjBxa0OQ3ynvMxDnF/+zvWe8536Y61lz9dblKb
-0xvFhpOEMfiG/zFdZdWJ+xdq7VQVNMHu4USoskG8sZs5zImMTu50kuDNln7xYqVf
-SUuN1U7cp7JouI1qkZAOsytPfAgZN/83hLObd07lAvL44jKYaHVeMmkCgYEAwVxZ
-wKXpboHwQawA+4ubsnZ36IlOk21/+FlGJiDg/LB643BS+QhgVNxuB2gL1gOCYkhl
-6BBcIhWMvZOIIo5uwnv4fQ+WfFwntU9POFViZgbZvkitQtorB7MXc/NU2BDrNYx2
-TBCiRn/9BaZ4fziW8I3Fx3xQ3rKDBXrexmrJQq0CgYEAvYGQYT12r47Qxlo0gcsL
-AA/3E/y9jwgzItglQ6eZ2ULup5C4s0wNm8Zp2s+Mlf8HjgpDi9Gf5ptU/r1N+f2Y
-awd6QvRMCSraVUr+Xkh1uV7rNNhGqPd75pT460OH7EtRtb+XsrAf3gcOjyEvGnfC
-GpCjNl4OobwvS6ELdRTM1IkCgYAHUGX4uo3k5zdeVJJI8ZP3ITIR8retLfQsQbw8
-jvvTsx1C4ynQT7fNHfVvhEkGVGWnMBPivlOt2mDTfvQkUnzwEF5q5J8NnzLFUfWu
-LNSnBVVRNFCRec0s4mJduXOZJLKw+No0sGBjCE5a21wte8eB2+sCS7qHYftAxtAM
-c1eflQKBgQDGTFsMvpM8BEPTreinTllFBdjeYchcdY/Ov9DZ3mMVopjAWRD81MKM
-zM1RCqwLkgv9FvF79B1FLJ1Inr8e/XIGdcrhE1a4sZdIWdqTWQ4xFrlDgxCquq66
-da09WVBRdvq2kVLAMaBViH2/GP1G4ZV9a8+JHuWKj+Arrr52Qeazjw==
------END RSA PRIVATE KEY-----
diff --git a/plugins/inputs/socket_listener/testdata/client.pem b/plugins/inputs/socket_listener/testdata/client.pem
deleted file mode 100644
index d741e6518..000000000
--- a/plugins/inputs/socket_listener/testdata/client.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEEjCCAfoCCQCmcronmMSqXTANBgkqhkiG9w0BAQsFADBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoM
-BFRlc3QwHhcNMTgwNDE3MDQyNDMwWhcNNDUwOTAyMDQyNDMwWjBVMQswCQYDVQQG
-EwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xITAfBgNV
-BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJkbmPvRoOVeHvYQndpmHpNYynqGmYo8/PRD76Me/F86BncT
-30aLpFHE1UvVVjex8iQY0QPT/irhyPXV+O7JMcsR+d7l2b0ZhkACQWOHBNOyR7xp
-GXitYXl6FpQc2LYr3JIWu2ywX59bbQM3BQm5VHyXc7J/Vw7guCX5+KEmip9aPEc8
-tSkb8i4L7GMTAP184cgc1TMqFDrpcnuxGceH/gMEjZjRw+DoLccT6H66zDrV2drQ
-usTTnsSGV27AfXcq1FvuKVl2GmnVO35dlfmqwCY/jVcVft7Zhho5ndTIiMqT8egW
-z4O8R9tJyf2NFOle4JJWaWDtYvOEW7Uf5KgYIvUCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAgEACJkccOvBavtagiMQc9OLsbo0PkHv7Qk9uTm5Sg9+LjLGUsu+3WLjAAmj
-YScHyGbvQzXlwpgo8JuwY0lMNoPfwGuydlJPfOBCbaoAqFp6Vpc/E49J9YovCsqa
-2HJUJeuxpf6SiH1Vc1SECjzwzKo03t8ul7t7SNVqA0r9fV4I936FlJOeQ4d5U+Wv
-H7c2LmAqbHi2Mwf+m+W6ziOvzp+szspcP2gJDX7hsKEtIlqmHYm2bzZ4fsCuU9xN
-3quewBVQUOuParO632yaLgzpGmfzzxLmCPO84lxarJKCxjHG2Q2l30TO/wA44m+r
-Wd17HpCT3PkCDG5eSNCSnYqfLm8DE1hLGfHiXxKmrgU94q4wvwVGOlcYa+CQeP9Q
-ZW3Tj0Axz0Mqlg1iLLo12+Z/yocSY2nFnFntBFT4qBKNCeD0xH3PxC0HJdK66xBv
-MVDE/OE2hBtTTts+vC9yjx4W8thtMSA4VCOgtt5sHjt3ZekiYYh5VZK47Bx/a0uc
-8CouRdyppWyPp/cNC+PcGW3YnXpAkxe/bSY/qgfK5kmbeOf+HzvZAIwAH/d9VK0g
-AoLNp46eP6U2E2lVvtc/HJ1C/gsiC/1TSIq/kBbYtuIJjhhH3u6IVet7WSD22Akv
-o5gOpcoKwy8IPDRC5lJEAAVYUKt7ORo2en3OVg6I4FaQmeBFp5s=
------END CERTIFICATE-----
diff --git a/plugins/inputs/socket_listener/testdata/server.key b/plugins/inputs/socket_listener/testdata/server.key
deleted file mode 100644
index 4ad8e642f..000000000
--- a/plugins/inputs/socket_listener/testdata/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAzkEDLijGOqXNQPAqUjOz5TLuM28SENauknLtcfIyEN/N6PwZ
-re5DjokxtDPp+c9yP/9qtn7+dBfdUXg2Mu7HQz8lAKniir2ZH+axkjp5LUE6vYJd
-I1W8lOOc0kXDjozBetgriE0jkgc3v9oDBbLhN5waKR86jpQaNkfnI7/4U3yrlymK
-yaT3uD6L1ldUJubdQ/xc1HxdmX8VewBnkK1urYyiRbju2iL9YmtSM72yWXvFsD1O
-I4fP/XuiaymicBmXKL4cu6KYdfn1qeLAV3U35xG597M031WmR5o67rc63sqs+Q//
-V3dbGqnFXRMkLhoOnuKK0DD28ujY1kctbNQWVQIDAQABAoIBAHFxFJy41H7BXulO
-rxhTU6jGoHktqBQW4CGwkKTRf3QEhK6WqlEd8Y5eKzZgL1q1HLPSehEyPCYCUjpT
-EgxlhLeZ7XI1/mIs8iG3swconimj7Pj60Nt0dqq1njWRJYQsKua0Kw1m0B+rVKBy
-+qKRxondlA32HTD6iIg+eAUTuzO/KzimZcyL9hiT/g6aN9k0H5+qURi8dO7VV8fD
-zvP8Y+oOGLwW2ccp+ZjFQizjTOkL4lgldr0hsGQXZJNHL94fA7jPdAxAUbnTicMJ
-oXM++L3eCwIVabipGxxlqCMj9Dn8yfbQvRGzP2e76QDeROYZHX4osH6vLcZEjx9i
-tJ4J+ekCgYEA82kKzkSKmFo4gZxnqAywlfZ2X2PADuMmHdqdiDFwt54orlMlKf/b
-wVSvN/djLXwvFHuyzFmJeMFSHKFkYVTOsh8kPSETAIGkcJEMHD3viYn7DwjkQudY
-vB/FpBWSiDT0T7qDUCzW3iMbx/JvTUSp7uO4ZuwOu6t6v3PEZwIChQ8CgYEA2Ov9
-FXHmm7sS54HgvZd6Wk8zLMLIDnyMmECjtYOasJ9c40yQHpRlXsb+Dzn/2xhMMwth
-Bln2hIiJ/e+G0bzFu4x0cItRPOQeRNyz5Pal8EsATeUwcX4KRKOZaUpDkV6XV1L0
-r/HSk/wed+90B74sGoJY1qsFflOATIUVs7SIllsCgYEAwhGSB/sl9WqZet1U1+um
-LyqeHlfNnREGJu9Sgm/Iyt1S2gp4qw/QCkiWmyym6nEEqHQnjj4lGR4pdaJIAkI3
-ulSR9BsWp2S10voSicHn5eUZQld4hs8lNHiwf66jce2mjJrMb3QQrHOZhsWIcDa6
-tjjhoU28QWzrJRIMGYTEtYkCgYA17NSJlDsj06mra5oXB6Ue9jlekz1wfH3nC4qn
-AQRfi/5ncw0QzQs2OHnIBz8XlD69IcMI9SxXXioPuo/la+wr54q6v6d+X6c2rzb5
-YGd4CO0WcDdOv2qGDbWBezi41q8AwlqZsqAKsc5ROnG5ywjjviufkfxXnyJx41O1
-zNd3qQKBgGEy+EwUXD5iGeQxdCDnd6iVu14SoBscHO5SpIeDu3DIhnu+7gPq2VMg
-Vp9j/iNVtEA3HyYCOeXc2rz9Di1wwt3YijED4birLAkC5YW6YB9rmLMfCNc1EyLh
-BKAkUQN3D+XCN4pXdbKvbkOcfYRUHoD+pPBjRYH020OtPBUc6Wkl
------END RSA PRIVATE KEY-----
diff --git a/plugins/inputs/socket_listener/testdata/server.pem b/plugins/inputs/socket_listener/testdata/server.pem
deleted file mode 100644
index 96cfa0b00..000000000
--- a/plugins/inputs/socket_listener/testdata/server.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEJjCCAg4CCQCmcronmMSqXDANBgkqhkiG9w0BAQsFADBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoM
-BFRlc3QwHhcNMTgwNDE3MDQyNDAwWhcNNDUwOTAyMDQyNDAwWjBpMQswCQYDVQQG
-EwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xITAfBgNV
-BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJMTI3LjAuMC4x
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkEDLijGOqXNQPAqUjOz
-5TLuM28SENauknLtcfIyEN/N6PwZre5DjokxtDPp+c9yP/9qtn7+dBfdUXg2Mu7H
-Qz8lAKniir2ZH+axkjp5LUE6vYJdI1W8lOOc0kXDjozBetgriE0jkgc3v9oDBbLh
-N5waKR86jpQaNkfnI7/4U3yrlymKyaT3uD6L1ldUJubdQ/xc1HxdmX8VewBnkK1u
-rYyiRbju2iL9YmtSM72yWXvFsD1OI4fP/XuiaymicBmXKL4cu6KYdfn1qeLAV3U3
-5xG597M031WmR5o67rc63sqs+Q//V3dbGqnFXRMkLhoOnuKK0DD28ujY1kctbNQW
-VQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQCVgzqFrehoRAMFLMEL8avfokYtsSYc
-50Yug4Es0ISo/PRWGeUnv8k1inyE3Y1iR/gbN5n/yjLXJKEflan6BuqGuukfr2eA
-fRdDCyPvzQLABdxCx2n6ByQFxj92z82tizf35R2OMuHHWzTckta+7s5EvxwIiUsd
-rUuXp+0ltJzlYYW9xTGFiJO9hAbRgMgZiwL8F7ayic8GmLQ1eRK/DfKDCOH3afeX
-MNN5FulgjqNyhXHF33vwgIJynGDg2JEhkWjB1DkUAxll0+SMQoYyVGZVrQSGbGw1
-JhOLc8C8bTzfK3qcJDuyldvjiut+To+lpu76R0u0+sn+wxQFL1uCWuAbMJgGsJgM
-ARavu2XDeae9X+e8MgJuN1FYS3tihBplPjMJD3UYRybRvHAvQh26BZ7Ch3JNSNST
-AL2l5T7JKU+XaWWeo+crV+AnGIJyqyh9Su/n97PEoZoEMGH4Kcl/n/w2Jms60+5s
-K0FK2OGNL42ddUfQiVL9CwYQQo70hydjsIo1x8S6+tSFLMAAysQEToSjfAA6qxDu
-fgGVMuIYHo0rSkpTVsHVwru08Z5o4m+XDAK0iHalZ4knKsO0lJ+9l7vFnQHlzwt7
-JTjDhnyOKWPIANeWf3PrHPWE7kKpFVBqFBzOvWLJuxDu5NlgLo1PFahsahTqB9bz
-qwUyMg/oYWnwqw==
------END CERTIFICATE-----
diff --git a/plugins/inputs/tomcat/README.md b/plugins/inputs/tomcat/README.md
index 3baf68556..1399a3157 100644
--- a/plugins/inputs/tomcat/README.md
+++ b/plugins/inputs/tomcat/README.md
@@ -19,11 +19,11 @@ See the [Tomcat documentation](https://tomcat.apache.org/tomcat-9.0-doc/manager-
   ## Request timeout
   # timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
 
diff --git a/plugins/inputs/tomcat/tomcat.go b/plugins/inputs/tomcat/tomcat.go
index dd3c03ce3..40ae7de81 100644
--- a/plugins/inputs/tomcat/tomcat.go
+++ b/plugins/inputs/tomcat/tomcat.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -63,11 +64,7 @@ type Tomcat struct {
 	Username string
 	Password string
 	Timeout  internal.Duration
-
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client  *http.Client
 	request *http.Request
@@ -84,11 +81,11 @@ var sampleconfig = `
   ## Request timeout
   # timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -191,8 +188,7 @@ func (s *Tomcat) Gather(acc telegraf.Accumulator) error {
 }
 
 func (s *Tomcat) createHttpClient() (*http.Client, error) {
-	tlsConfig, err := internal.GetTLSConfig(
-		s.SSLCert, s.SSLKey, s.SSLCA, s.InsecureSkipVerify)
+	tlsConfig, err := s.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/inputs/zookeeper/README.md b/plugins/inputs/zookeeper/README.md
index 99abbc227..d54caae44 100644
--- a/plugins/inputs/zookeeper/README.md
+++ b/plugins/inputs/zookeeper/README.md
@@ -18,11 +18,11 @@ The zookeeper plugin collects variables outputted from the 'mntr' command
   ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
   # timeout = "5s"
 
-  ## Optional SSL Config
+  ## Optional TLS Config
   # enable_ssl = true
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
   ## If false, skip chain & host verification
   # insecure_skip_verify = true
 ```
diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go
index 1c60e368a..20e7aee01 100644
--- a/plugins/inputs/zookeeper/zookeeper.go
+++ b/plugins/inputs/zookeeper/zookeeper.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -21,11 +22,9 @@ type Zookeeper struct {
 	Servers []string
 	Timeout internal.Duration
 
-	EnableSSL          bool   `toml:"enable_ssl"`
-	SSLCA              string `toml:"ssl_ca"`
-	SSLCert            string `toml:"ssl_cert"`
-	SSLKey             string `toml:"ssl_key"`
-	InsecureSkipVerify bool   `toml:"insecure_skip_verify"`
+	EnableTLS bool `toml:"enable_tls"`
+	EnableSSL bool `toml:"enable_ssl"` // deprecated in 1.7; use enable_tls
+	tlsint.ClientConfig
 
 	initialized bool
 	tlsConfig   *tls.Config
@@ -42,11 +41,11 @@ var sampleConfig = `
   ## Timeout for metric collections from all servers.  Minimum timeout is "1s".
   # timeout = "5s"
 
-  ## Optional SSL Config
-  # enable_ssl = true
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
+  ## Optional TLS Config
+  # enable_tls = true
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
   ## If false, skip chain & host verification
   # insecure_skip_verify = true
 `
@@ -65,7 +64,7 @@ func (z *Zookeeper) Description() string {
 
 func (z *Zookeeper) dial(ctx context.Context, addr string) (net.Conn, error) {
 	var dialer net.Dialer
-	if z.EnableSSL {
+	if z.EnableTLS || z.EnableSSL {
 		deadline, ok := ctx.Deadline()
 		if ok {
 			dialer.Deadline = deadline
@@ -81,8 +80,7 @@ func (z *Zookeeper) Gather(acc telegraf.Accumulator) error {
 	ctx := context.Background()
 
 	if !z.initialized {
-		tlsConfig, err := internal.GetTLSConfig(
-			z.SSLCert, z.SSLKey, z.SSLCA, z.InsecureSkipVerify)
+		tlsConfig, err := z.ClientConfig.TLSConfig()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 834074436..ea17fe769 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -42,11 +42,11 @@ For an introduction to AMQP see:
   ## to 5s. 0s means no timeout (not recommended).
   # timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to output.
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index fed1edfe4..f2bfb7ac7 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 
@@ -43,14 +44,7 @@ type AMQP struct {
 	// Valid options are "transient" and "persistent". default: "transient"
 	DeliveryMode string
 
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	sync.Mutex
 	c *client
@@ -99,11 +93,11 @@ var sampleConfig = `
   ## to 5s. 0s means no timeout (not recommended).
   # timeout = "5s"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to output.
@@ -137,8 +131,7 @@ func (q *AMQP) Connect() error {
 
 	var connection *amqp.Connection
 	// make new tls config
-	tls, err := internal.GetTLSConfig(
-		q.SSLCert, q.SSLKey, q.SSLCA, q.InsecureSkipVerify)
+	tls, err := q.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md
index b0d2e6f9b..11f3c1385 100644
--- a/plugins/outputs/elasticsearch/README.md
+++ b/plugins/outputs/elasticsearch/README.md
@@ -180,11 +180,11 @@ This plugin will format the events in the following way:
   # default_tag_value = "none"
   index_name = "telegraf-%Y.%m.%d" # required.
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Template Config
@@ -230,4 +230,4 @@ Integer values collected that are bigger than 2^63 and smaller than 1e21 (or in
 
 The correct field mapping will be created on the telegraf index as soon as a supported JSON value is received by Elasticsearch, and subsequent insertions will work because the field mapping will already exist.
 
-This issue is caused by the way Elasticsearch tries to detect integer fields, and by how golang encodes numbers in JSON. There is no clear workaround for this at the moment.
\ No newline at end of file
+This issue is caused by the way Elasticsearch tries to detect integer fields, and by how golang encodes numbers in JSON. There is no clear workaround for this at the moment.
diff --git a/plugins/outputs/elasticsearch/elasticsearch.go b/plugins/outputs/elasticsearch/elasticsearch.go
index 326def1d1..56169135a 100644
--- a/plugins/outputs/elasticsearch/elasticsearch.go
+++ b/plugins/outputs/elasticsearch/elasticsearch.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"gopkg.in/olivere/elastic.v5"
 )
@@ -28,11 +29,9 @@ type Elasticsearch struct {
 	ManageTemplate      bool
 	TemplateName        string
 	OverwriteTemplate   bool
-	SSLCA               string `toml:"ssl_ca"`   // Path to CA file
-	SSLCert             string `toml:"ssl_cert"` // Path to host cert file
-	SSLKey              string `toml:"ssl_key"`  // Path to cert key file
-	InsecureSkipVerify  bool   // Use SSL but skip chain & host verification
-	Client              *elastic.Client
+	tls.ClientConfig
+
+	Client *elastic.Client
 }
 
 var sampleConfig = `
@@ -69,11 +68,11 @@ var sampleConfig = `
   # default_tag_value = "none"
   index_name = "telegraf-%Y.%m.%d" # required.
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Template Config
@@ -96,7 +95,7 @@ func (a *Elasticsearch) Connect() error {
 
 	var clientOptions []elastic.ClientOptionFunc
 
-	tlsCfg, err := internal.GetTLSConfig(a.SSLCert, a.SSLKey, a.SSLCA, a.InsecureSkipVerify)
+	tlsCfg, err := a.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/outputs/graphite/README.md b/plugins/outputs/graphite/README.md
index 1b173962f..216c09ca0 100644
--- a/plugins/outputs/graphite/README.md
+++ b/plugins/outputs/graphite/README.md
@@ -20,42 +20,10 @@ via raw TCP.
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 ```
-
-Parameters:
-
-    Servers  []string
-    Prefix   string
-    Timeout  int
-    Template string
-
-    // Path to CA file
-    SSLCA string
-    // Path to host cert file
-    SSLCert string
-    // Path to cert key file
-    SSLKey string
-    // Skip SSL verification
-    InsecureSkipVerify bool
-
-### Required parameters:
-
-* `servers`: List of strings, ["mygraphiteserver:2003"].
-* `prefix`: String use to prefix all sent metrics.
-* `timeout`: Connection timeout in seconds.
-* `template`: Template for graphite output format, see
-https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-for more details.
-
-### Optional parameters:
-
-* `ssl_ca`: SSL CA
-* `ssl_cert`: SSL CERT
-* `ssl_key`: SSL key
-* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 7bad4be07..4346c50d8 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -22,18 +22,7 @@ type Graphite struct {
 	Template string
 	Timeout  int
 	conns    []net.Conn
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Skip SSL verification
-	InsecureSkipVerify bool
-
-	// tls config
-	tlsConfig *tls.Config
+	tlsint.ClientConfig
 }
 
 var sampleConfig = `
@@ -49,11 +38,11 @@ var sampleConfig = `
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 `
 
@@ -67,9 +56,7 @@ func (g *Graphite) Connect() error {
 	}
 
 	// Set tls config
-	var err error
-	g.tlsConfig, err = internal.GetTLSConfig(
-		g.SSLCert, g.SSLKey, g.SSLCA, g.InsecureSkipVerify)
+	tlsConfig, err := g.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
@@ -82,8 +69,8 @@ func (g *Graphite) Connect() error {
 
 		// Get secure connection if tls config is set
 		var conn net.Conn
-		if g.tlsConfig != nil {
-			conn, err = tls.DialWithDialer(&d, "tcp", server, g.tlsConfig)
+		if tlsConfig != nil {
+			conn, err = tls.DialWithDialer(&d, "tcp", server, tlsConfig)
 		} else {
 			conn, err = d.Dial("tcp", server)
 		}
diff --git a/plugins/outputs/influxdb/README.md b/plugins/outputs/influxdb/README.md
index 74f33748d..aed96e463 100644
--- a/plugins/outputs/influxdb/README.md
+++ b/plugins/outputs/influxdb/README.md
@@ -44,11 +44,11 @@ This InfluxDB output plugin writes metrics to the [InfluxDB](https://github.com/
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config for use on HTTP connections.
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config for use on HTTP connections.
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Proxy override, if unset values the standard proxy environment
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index d34e9e3e8..f80722bc3 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers/influx"
 )
@@ -46,15 +47,7 @@ type InfluxDB struct {
 	ContentEncoding      string            `toml:"content_encoding"`
 	SkipDatabaseCreation bool              `toml:"skip_database_creation"`
 	InfluxUintSupport    bool              `toml:"influx_uint_support"`
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	Precision string // precision deprecated in 1.0; value is ignored
 
@@ -104,11 +97,11 @@ var sampleConfig = `
   ## UDP payload size is the maximum packet size to send.
   # udp_payload = 512
 
-  ## Optional SSL Config for use on HTTP connections.
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config for use on HTTP connections.
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## HTTP Proxy override, if unset values the standard proxy environment
@@ -245,8 +238,7 @@ func (i *InfluxDB) udpClient(url *url.URL) (Client, error) {
 }
 
 func (i *InfluxDB) httpClient(ctx context.Context, url *url.URL, proxy *url.URL) (Client, error) {
-	tlsConfig, err := internal.GetTLSConfig(
-		i.SSLCert, i.SSLKey, i.SSLCA, i.InsecureSkipVerify)
+	tlsConfig, err := i.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index eeef97618..3ec10989e 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs/influxdb"
 	"github.com/stretchr/testify/require"
@@ -104,8 +105,10 @@ func TestConnectHTTPConfig(t *testing.T) {
 		HTTPHeaders: map[string]string{
 			"x": "y",
 		},
-		ContentEncoding:    "gzip",
-		InsecureSkipVerify: true,
+		ContentEncoding: "gzip",
+		ClientConfig: tls.ClientConfig{
+			InsecureSkipVerify: true,
+		},
 
 		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
 			actual = config
diff --git a/plugins/outputs/kafka/README.md b/plugins/outputs/kafka/README.md
index 93182ba08..196e2e914 100644
--- a/plugins/outputs/kafka/README.md
+++ b/plugins/outputs/kafka/README.md
@@ -68,11 +68,11 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
   ## until the next flush.
   # max_retry = 3
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional SASL Config
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index 8094d4334..716e06c44 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 
@@ -36,7 +36,7 @@ type (
 		// MaxRetry Tag
 		MaxRetry int
 
-		// Legacy SSL config options
+		// Legacy TLS config options
 		// TLS client certificate
 		Certificate string
 		// TLS client key
@@ -44,15 +44,7 @@ type (
 		// TLS certificate authority
 		CA string
 
-		// Path to CA file
-		SSLCA string `toml:"ssl_ca"`
-		// Path to host cert file
-		SSLCert string `toml:"ssl_cert"`
-		// Path to cert key file
-		SSLKey string `toml:"ssl_key"`
-
-		// Skip SSL verification
-		InsecureSkipVerify bool
+		tlsint.ClientConfig
 
 		// SASL Username
 		SASLUsername string `toml:"sasl_username"`
@@ -135,11 +127,11 @@ var sampleConfig = `
   ## until the next flush.
   # max_retry = 3
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Optional SASL Config
@@ -201,13 +193,12 @@ func (k *Kafka) Connect() error {
 
 	// Legacy support ssl config
 	if k.Certificate != "" {
-		k.SSLCert = k.Certificate
-		k.SSLCA = k.CA
-		k.SSLKey = k.Key
+		k.TLSCert = k.Certificate
+		k.TLSCA = k.CA
+		k.TLSKey = k.Key
 	}
 
-	tlsConfig, err := internal.GetTLSConfig(
-		k.SSLCert, k.SSLKey, k.SSLCA, k.InsecureSkipVerify)
+	tlsConfig, err := k.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/outputs/mqtt/README.md b/plugins/outputs/mqtt/README.md
index 21987c30c..53483d967 100644
--- a/plugins/outputs/mqtt/README.md
+++ b/plugins/outputs/mqtt/README.md
@@ -22,12 +22,12 @@ This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt
 
   ## Timeout for write operations. default: 5s
   # timeout = "5s"
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
 
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to output.
@@ -45,8 +45,8 @@ This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt
 * `password`: The password to connect MQTT server.
 * `client_id`: The unique client id to connect MQTT server. If this paramater is not set then a random ID is generated.
 * `timeout`: Timeout for write operations. default: 5s
-* `ssl_ca`: SSL CA
-* `ssl_cert`: SSL CERT
-* `ssl_key`: SSL key
-* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)
+* `tls_ca`: TLS CA
+* `tls_cert`: TLS CERT
+* `tls_key`: TLS key
+* `insecure_skip_verify`: Use TLS but skip chain & host verification (default: false)
 * `data_format`: [About Telegraf data formats](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md)
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index eea7b6088..1c700332e 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 
@@ -32,11 +33,11 @@ var sampleConfig = `
   ## client ID, if not set a random ID is generated
   # client_id = ""
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to output.
@@ -55,15 +56,7 @@ type MQTT struct {
 	TopicPrefix string
 	QoS         int    `toml:"qos"`
 	ClientID    string `toml:"client_id"`
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	client paho.Client
 	opts   *paho.ClientOptions
@@ -174,8 +167,7 @@ func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 		opts.SetClientID("Telegraf-Output-" + internal.RandomString(5))
 	}
 
-	tlsCfg, err := internal.GetTLSConfig(
-		m.SSLCert, m.SSLKey, m.SSLCA, m.InsecureSkipVerify)
+	tlsCfg, err := m.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/outputs/nats/nats.go b/plugins/outputs/nats/nats.go
index d97c4688d..a664bc1bb 100644
--- a/plugins/outputs/nats/nats.go
+++ b/plugins/outputs/nats/nats.go
@@ -6,7 +6,7 @@ import (
 	nats_client "github.com/nats-io/nats"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -19,15 +19,7 @@ type NATS struct {
 	Password string
 	// NATS subject to publish metrics to
 	Subject string
-
-	// Path to CA file
-	SSLCA string `toml:"ssl_ca"`
-	// Path to host cert file
-	SSLCert string `toml:"ssl_cert"`
-	// Path to cert key file
-	SSLKey string `toml:"ssl_key"`
-	// Use SSL but skip chain & host verification
-	InsecureSkipVerify bool
+	tls.ClientConfig
 
 	conn       *nats_client.Conn
 	serializer serializers.Serializer
@@ -42,11 +34,11 @@ var sampleConfig = `
   ## NATS subject for producer messages
   subject = "telegraf"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Data format to output.
@@ -79,8 +71,7 @@ func (n *NATS) Connect() error {
 	}
 
 	// override TLS, if it was specified
-	tlsConfig, err := internal.GetTLSConfig(
-		n.SSLCert, n.SSLKey, n.SSLCA, n.InsecureSkipVerify)
+	tlsConfig, err := n.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/plugins/outputs/socket_writer/README.md b/plugins/outputs/socket_writer/README.md
index 8e28c5f88..149cda2a6 100644
--- a/plugins/outputs/socket_writer/README.md
+++ b/plugins/outputs/socket_writer/README.md
@@ -19,11 +19,11 @@ It can output data in any of the [supported output formats](https://github.com/i
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Period between keep alive probes.
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 382aad266..7c4660bc8 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -10,17 +10,15 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
 
 type SocketWriter struct {
-	Address            string
-	KeepAlivePeriod    *internal.Duration
-	SSLCA              string
-	SSLCert            string
-	SSLKey             string
-	InsecureSkipVerify bool
+	Address         string
+	KeepAlivePeriod *internal.Duration
+	tlsint.ClientConfig
 
 	serializers.Serializer
 
@@ -45,11 +43,11 @@ func (sw *SocketWriter) SampleConfig() string {
   # address = "unix:///tmp/telegraf.sock"
   # address = "unixgram:///tmp/telegraf.sock"
 
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
   ## Period between keep alive probes.
@@ -76,7 +74,7 @@ func (sw *SocketWriter) Connect() error {
 		return fmt.Errorf("invalid address: %s", sw.Address)
 	}
 
-	tlsCfg, err := internal.GetTLSConfig(sw.SSLCert, sw.SSLKey, sw.SSLCA, sw.InsecureSkipVerify)
+	tlsCfg, err := sw.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
diff --git a/testutil/pki/cacert.pem b/testutil/pki/cacert.pem
new file mode 100644
index 000000000..b0a47334e
--- /dev/null
+++ b/testutil/pki/cacert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0TCCATqgAwIBAgIJAMgbq6rkA4b/MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
+BAMMEFRlbGVncmFmIFRlc3QgQ0EwHhcNMTgwNTAzMDEwNTI5WhcNMjgwNDMwMDEw
+NTI5WjAbMRkwFwYDVQQDDBBUZWxlZ3JhZiBUZXN0IENBMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDTySxyXeyQQjCOtNQ/7cKtXN91sp4B1k7whPKBO6yXEFFR
+rYaw76xY5CTTPTJaAPBJ+amHPdPGfmGq6yX10tjAaWQQYV26Axngfpti6F14ci0/
+X/sTay8ii/4Du5DRr9f9rHVimPASR1fkgK+IFhXnONn1R+pNbHYmGS4OVNyoPwID
+AQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOBgQA9v3eMU33q+bGPEd65kKQcVddPEFdSqmuUJMeO2VQmUFc/ejkP48u42eDK
+Y1GAR+209XgkuWItEBH8HJysOU2plunuIPXpnPcxyP30tpFVLaWzWTQvUehhYpfQ
+C0v9Re3jdLfLORxiaAPyyKogMpAQrjGX+u1aMSOCkcTD2Hjvbw==
+-----END CERTIFICATE-----
diff --git a/testutil/pki/cakey.pem b/testutil/pki/cakey.pem
new file mode 100644
index 000000000..3606c89be
--- /dev/null
+++ b/testutil/pki/cakey.pem
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANPJLHJd7JBCMI60
+1D/twq1c33WyngHWTvCE8oE7rJcQUVGthrDvrFjkJNM9MloA8En5qYc908Z+Yarr
+JfXS2MBpZBBhXboDGeB+m2LoXXhyLT9f+xNrLyKL/gO7kNGv1/2sdWKY8BJHV+SA
+r4gWFec42fVH6k1sdiYZLg5U3Kg/AgMBAAECgYA2PCtssk7Vdo3WzcoZAPs8yC7V
+hkNedxJKF9G+dJizKtOYVhbLEuWQ8gPYMLDHSbw/RXc7kgK8rzq1uXhEJpWo4THD
+CUUlxGRu3gt94202hbnEnV93Kix4hP98qpv1jPErlx2KywsRPTegMnUAZ2xeI564
+yYwDITqXALa/PqRqSQJBAPPZQeRDtBSfEjZFJS3IgUkmN3RJn4rJz+6D0ahgXPga
+YAYVe8SJyj2epLJP2aOBzrqBSUVkVGg8qOG5w+ibebsCQQDeVuUzYOffthO5f1Hl
+LvdEmfaHjXI0Q+grOnDjNRcvQaCDYYkC9JewBQmnpFrd85rN/Leo0gQ5Yyxp/ja5
+gPFNAkAFwn/38FF0mz1G4uM57Z6AJ9LvgD2wfYvXym1NWNlZUuYpvqApyEdqpTCm
+tZQidJJ5fUxJw1DrFWO30Td7axC5AkEAjSbRX6rXyhiHsS35SexlInI0Jp5PsIqj
+7D2vyS69R0z8oCvdlbi+TAsGtB0Navbqgnc8Cbs630vsuGWhTGdlyQJBAKqQ2gYw
++WeXH77FP8yDQOjpFw80tSyXVykT0Am75RF3sQ1OIn0o0DLhE+he0crb2n8g3FJh
+WyxmGkbTDelSG20=
+-----END PRIVATE KEY-----
diff --git a/testutil/pki/clientcert.pem b/testutil/pki/clientcert.pem
new file mode 100644
index 000000000..9e5b60807
--- /dev/null
+++ b/testutil/pki/clientcert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB+TCCAWKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDDBBUZWxl
+Z3JhZiBUZXN0IENBMB4XDTE4MDUwMzAxMDUyOVoXDTI4MDQzMDAxMDUyOVowHTEb
+MBkGA1UEAwwSY2xpZW50LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDX7Plvu0MJtA9TrusYtQnAogsdiYJZd9wfFIjH5FxE3SWJ4KAIE+yR
+WRqcqX8XnpieQLaNsfXhDPWLkWngTDydk4NO/jlAQk0e6+9+NeiZ2ViIHmtXERb9
+CyiiWUmo+YCd69lhzSEIMK9EPBSDHQTgQMtEfGak03G5rx3MCakE1QIDAQABo0sw
+STAJBgNVHRMEAjAAMAsGA1UdDwQEAwIHgDAaBgNVHREEEzARgglsb2NhbGhvc3SH
+BH8AAAEwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADgYEAVry0
+L07oTN+FMLncY/Be9BzFB3b3mnbxbZr58OgI4WHuOeYBuvDI033FIIIzpwb8XYpG
+HJkZlSbviqq19lAh/Cktl35BCNrA6Uc+dgW7QWhnYS2tZandVTo/8FFstJTNiiLw
+uiz/Hr3mRXUIDi5OygJHY1IZr8hFTOOJY+0ws3E=
+-----END CERTIFICATE-----
diff --git a/testutil/pki/clientkey.pem b/testutil/pki/clientkey.pem
new file mode 100644
index 000000000..cc11e20ea
--- /dev/null
+++ b/testutil/pki/clientkey.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDX7Plvu0MJtA9TrusYtQnAogsdiYJZd9wfFIjH5FxE3SWJ4KAI
+E+yRWRqcqX8XnpieQLaNsfXhDPWLkWngTDydk4NO/jlAQk0e6+9+NeiZ2ViIHmtX
+ERb9CyiiWUmo+YCd69lhzSEIMK9EPBSDHQTgQMtEfGak03G5rx3MCakE1QIDAQAB
+AoGAOjRU4Lt3zKvO3d3u3ZAfet+zY1jn3DolCfO9EzUJcj6ymcIFIWhNgrikJcrC
+yZkkxrPnAbcQ8oNNxTuDcMTcKZbnyUnlQj5NtVuty5Q+zgf3/Q2pRhaE+TwrpOJ+
+ETtVp9R/PrPN2NC5wPo289fPNWFYkd4DPbdWZp5AJHz1XYECQQD3kKpinJxMYp9F
+Q1Qj1OkxGln0KPgdqRYjjW/rXI4/hUodfg+xXWHPFSGj3AgEjQIvuengbOAeH3qo
+wF1uxVTlAkEA30hXM3EbboMCDQzNRNkkV9EiZ0MZXhj1aIGl+sQZOmOeFdcdjGkD
+dsA42nmaYqXCD9KAvc+S/tGJaa0Qg0VhMQJAb2+TAqh0Qn3yK39PFIH2JcAy1ZDL
+fq5p5L75rfwPm9AnuHbSIYhjSo+8gMG+ai3+2fTZrcfUajrJP8S3SfFRcQJBANQQ
+POHatxcKzlPeqMaPBXlyY553mAxK4CnVmPLGdL+EBYzwtlu5EVUj09uMSxkOHXYx
+k5yzHQVvtXbsrBZBOsECQBJLlkMjJmXrIIdLPmHQWL3bm9MMg1PqzupSEwz6cyrG
+uIIm/X91pDyxCHaKYWp38FXBkYAgohI8ow5/sgRvU5w=
+-----END RSA PRIVATE KEY-----
diff --git a/testutil/pki/servercert.pem b/testutil/pki/servercert.pem
new file mode 100644
index 000000000..886219517
--- /dev/null
+++ b/testutil/pki/servercert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB+TCCAWKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDDBBUZWxl
+Z3JhZiBUZXN0IENBMB4XDTE4MDUwMzAxMDUyOVoXDTI4MDQzMDAxMDUyOVowHTEb
+MBkGA1UEAwwSc2VydmVyLmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDTBmLJ0pBFUxnPkkx38sBnOKvs+OinVqxTnVcc1iCyQJQleB37uY6D
+L55mSsPvnad/oDpyGpHt4RVtrhmyC6ptSrWLyk7mraeAo30Cooqr5tA9A+6yj0ij
+ySLlYimTMQy8tbnVNWLwKbxgT9N4NlUzwyqxLWUMfRzLfmefqzk5bQIDAQABo0sw
+STAJBgNVHRMEAjAAMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATALBgNVHQ8E
+BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADgYEATNnM
+ol0s29lJ+WkP+HUFtKaXxQ+kXLADqfhsk2G1/kZAVRHsYUDlJ+GkHnWIHlg/ggIP
+JS+z44iwMPOtzJQI7MvAFYVKpYAEdIFTjXf6GafLjUfoXYi0vwHoVJHtQu3Kpm9L
+Ugm02h0ycIadN8RdWAAFUf6XpVKUJa0YYLuyaXY=
+-----END CERTIFICATE-----
diff --git a/testutil/pki/serverkey.pem b/testutil/pki/serverkey.pem
new file mode 100644
index 000000000..363f5d9af
--- /dev/null
+++ b/testutil/pki/serverkey.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDTBmLJ0pBFUxnPkkx38sBnOKvs+OinVqxTnVcc1iCyQJQleB37
+uY6DL55mSsPvnad/oDpyGpHt4RVtrhmyC6ptSrWLyk7mraeAo30Cooqr5tA9A+6y
+j0ijySLlYimTMQy8tbnVNWLwKbxgT9N4NlUzwyqxLWUMfRzLfmefqzk5bQIDAQAB
+AoGBALWQAgFJxM2QwV1hr59oYnitPudmBa6smRpb/q6V4Y3cmFpgrdN+hIqEtxGl
+9E0+5PWfI4o3KCV2itxSdlNFTDyqTZkM+BT8PPKISzAewkdqnKjbWgAmluzOJH4O
+hc1zBfIOuT5+cfx5JR5/j9BhWVC7BJ+EiREkd/Z8ZnAMeItVAkEA8bhcC+8luiFQ
+6kytXx2XfbKKh4Q99+KEQHqSGeuHZOcnWfjX99jo67CIxpwBRENslpZOw78fBmi4
+4kf8j+dgLwJBAN99zyRxYzKc8TSsy/fF+3V/Ex75HYGGS/eOWcwPFXpGNA63hIa8
+fJ/2pDnLzCqLZ9vWdBF39NtkacJS7bo6XSMCQQCZgN2bipSn3k53bJhRJga1gXOt
+2dJMoGIiXHR513QVJSJ9ZaUpNWu9eU9y6VF4m2TTQMLmVnIKbOi0csi2TlZrAkAi
+7URsC5RXGpPPiZmutTAhIqTYWFI2JcjFfWenLkxK+aG1ExURAW/wh9kOdz0HARZQ
+Eum8uSR5DO5CQjeIvQpFAkAgZJXAwRxuts/p1EoLuPCJTaDkIY2vc0AJzzr5nuAs
+pyjnLYCYqSBUJ+3nDDBqNYpgxCJddzmjNxGuO7mef9Ue
+-----END RSA PRIVATE KEY-----
diff --git a/scripts/tls-certs.sh b/testutil/pki/tls-certs.sh
similarity index 81%
rename from scripts/tls-certs.sh
rename to testutil/pki/tls-certs.sh
index b37d6541a..55075df4b 100644
--- a/scripts/tls-certs.sh
+++ b/testutil/pki/tls-certs.sh
@@ -46,21 +46,31 @@ keyUsage = keyCertSign, cRLSign
 [ client_ca_extensions ]
 basicConstraints = CA:false
 keyUsage = digitalSignature
+subjectAltName = @client_alt_names
 extendedKeyUsage = 1.3.6.1.5.5.7.3.2
 
+[ client_alt_names ]
+DNS.1 = localhost
+IP.1 = 127.0.0.1
+
 [ server_ca_extensions ]
 basicConstraints = CA:false
-keyUsage = keyEncipherment
+subjectAltName = @server_alt_names
+keyUsage = keyEncipherment, digitalSignature
 extendedKeyUsage = 1.3.6.1.5.5.7.3.1
+
+[ server_alt_names ]
+DNS.1 = localhost
+IP.1 = 127.0.0.1
 EOF
-openssl req -x509 -config ./openssl.conf -days 3650 -newkey rsa:1024 -out ./certs/cacert.pem -keyout ./private/cakey.pem -subj "/CN=Telegraf CA/" -nodes &&
+openssl req -x509 -config ./openssl.conf -days 3650 -newkey rsa:1024 -out ./certs/cacert.pem -keyout ./private/cakey.pem -subj "/CN=Telegraf Test CA/" -nodes &&
 
 # Create server keypair
 openssl genrsa -out ./private/serverkey.pem 1024 &&
-openssl req -new -key ./private/serverkey.pem -out ./certs/servercsr.pem -outform PEM -subj "/CN=localhost/O=server/" &&
+openssl req -new -key ./private/serverkey.pem -out ./certs/servercsr.pem -outform PEM -subj "/CN=server.localdomain/O=server/" &&
 openssl ca -config ./openssl.conf -in ./certs/servercsr.pem -out ./certs/servercert.pem -notext -batch -extensions server_ca_extensions &&
 
 # Create client keypair
 openssl genrsa -out ./private/clientkey.pem 1024 &&
-openssl req -new -key ./private/clientkey.pem -out ./certs/clientcsr.pem -outform PEM -subj "/CN=telegraf/O=client/" &&
+openssl req -new -key ./private/clientkey.pem -out ./certs/clientcsr.pem -outform PEM -subj "/CN=client.localdomain/O=client/" &&
 openssl ca -config ./openssl.conf -in ./certs/clientcsr.pem -out ./certs/clientcert.pem -notext -batch -extensions client_ca_extensions
diff --git a/testutil/tls.go b/testutil/tls.go
new file mode 100644
index 000000000..4f7fc012a
--- /dev/null
+++ b/testutil/tls.go
@@ -0,0 +1,86 @@
+package testutil
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+
+	"github.com/influxdata/telegraf/internal/tls"
+)
+
+type pki struct {
+	path string
+}
+
+func NewPKI(path string) *pki {
+	return &pki{path: path}
+}
+
+func (p *pki) TLSClientConfig() *tls.ClientConfig {
+	return &tls.ClientConfig{
+		TLSCA:   p.CACertPath(),
+		TLSCert: p.ClientCertPath(),
+		TLSKey:  p.ClientKeyPath(),
+	}
+}
+
+func (p *pki) TLSServerConfig() *tls.ServerConfig {
+	return &tls.ServerConfig{
+		TLSAllowedCACerts: []string{p.CACertPath()},
+		TLSCert:           p.ServerCertPath(),
+		TLSKey:            p.ServerKeyPath(),
+	}
+}
+
+func (p *pki) ReadCACert() string {
+	return readCertificate(p.CACertPath())
+}
+
+func (p *pki) CACertPath() string {
+	return path.Join(p.path, "cacert.pem")
+}
+
+func (p *pki) ReadClientCert() string {
+	return readCertificate(p.ClientCertPath())
+}
+
+func (p *pki) ClientCertPath() string {
+	return path.Join(p.path, "clientcert.pem")
+}
+
+func (p *pki) ReadClientKey() string {
+	return readCertificate(p.ClientKeyPath())
+}
+
+func (p *pki) ClientKeyPath() string {
+	return path.Join(p.path, "clientkey.pem")
+}
+
+func (p *pki) ReadServerCert() string {
+	return readCertificate(p.ServerCertPath())
+}
+
+func (p *pki) ServerCertPath() string {
+	return path.Join(p.path, "servercert.pem")
+}
+
+func (p *pki) ReadServerKey() string {
+	return readCertificate(p.ServerKeyPath())
+}
+
+func (p *pki) ServerKeyPath() string {
+	return path.Join(p.path, "serverkey.pem")
+}
+
+func readCertificate(filename string) string {
+	file, err := os.Open(filename)
+	if err != nil {
+		panic(fmt.Sprintf("opening %q: %v", filename, err))
+	}
+	octets, err := ioutil.ReadAll(file)
+	if err != nil {
+		panic(fmt.Sprintf("reading %q: %v", filename, err))
+	}
+	return string(octets)
+}

From 73c22a8189dd59ec8662187c4defa5e3502013e3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 4 May 2018 18:27:31 -0700
Subject: [PATCH 1149/1302] Add SerializeBatch method to the Serializer
 interface (#4107)

---
 docs/DATA_FORMATS_OUTPUT.md                   | 131 +++++++++---------
 plugins/outputs/influxdb/udp_test.go          |   7 +-
 plugins/serializers/graphite/graphite.go      |  16 +++
 plugins/serializers/graphite/graphite_test.go |  30 ++++
 plugins/serializers/influx/influx.go          |  11 ++
 plugins/serializers/influx/influx_test.go     |  21 +++
 plugins/serializers/json/json.go              |  68 +++++++--
 plugins/serializers/json/json_test.go         |  95 ++++++++++++-
 plugins/serializers/registry.go               |   7 +-
 9 files changed, 302 insertions(+), 84 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 5716b0aec..d21aca91d 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -1,35 +1,15 @@
-# Telegraf Output Data Formats
+# Output Data Formats
 
-Telegraf is able to serialize metrics into the following output data formats:
+In addition to output specific data formats, Telegraf supports a set of
+standard data formats that may be selected from when configuring many output
+plugins.
 
 1. [InfluxDB Line Protocol](#influx)
 1. [JSON](#json)
 1. [Graphite](#graphite)
 
-Telegraf metrics, like InfluxDB
-[points](https://docs.influxdata.com/influxdb/latest/concepts/glossary/#point),
-are a combination of four basic parts:
-
-1. Measurement Name
-1. Tags
-1. Fields
-1. Timestamp
-
-In InfluxDB line protocol, these 4 parts are easily defined in textual form:
-
-```
-measurement_name[,tag1=val1,...]  field1=val1[,field2=val2,...]  [timestamp]
-```
-
-For Telegraf outputs that write textual data (such as `kafka`, `mqtt`, and `file`),
-InfluxDB line protocol was originally the only available output format. But now
-we are normalizing telegraf metric "serializers" into a
-[plugin-like interface](https://github.com/influxdata/telegraf/tree/master/plugins/serializers)
-across all output plugins that can support it.
-You will be able to identify a plugin that supports different data formats
-by the presence of a `data_format`
-config option, for example, in the `file` output plugin:
-
+You will be able to identify the plugins with support by the presence of a
+`data_format` config option, for example, in the `file` output plugin:
 ```toml
 [[outputs.file]]
   ## Files to write to, "stdout" is a specially handled file.
@@ -40,22 +20,16 @@ config option, for example, in the `file` output plugin:
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
-
-  ## Additional configuration options go here
 ```
 
-Each data_format has an additional set of configuration options available, which
-I'll go over below.
+## Influx
 
-# Influx:
-
-The `influx` format outputs data as
+The `influx` data format outputs metrics using
 [InfluxDB Line Protocol](https://docs.influxdata.com/influxdb/latest/write_protocols/line_protocol_tutorial/).
-This is the recommended format to use unless another format is required for
+This is the recommended format unless another format is required for
 interoperability.
 
-### Influx Configuration:
-
+### Influx Configuration
 ```toml
 [[outputs.file]]
   ## Files to write to, "stdout" is a specially handled file.
@@ -82,7 +56,7 @@ interoperability.
   # influx_uint_support = false
 ```
 
-# Graphite:
+## Graphite
 
 The Graphite data format translates Telegraf metrics into _dot_ buckets. A
 template can be specified for the output of Telegraf metrics into Graphite
@@ -115,7 +89,7 @@ tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 Fields with string values will be skipped.  Boolean fields will be converted
 to 1 (true) or 0 (false).
 
-### Graphite Configuration:
+### Graphite Configuration
 
 ```toml
 [[outputs.file]]
@@ -134,27 +108,63 @@ to 1 (true) or 0 (false).
   template = "host.tags.measurement.field"
 ```
 
-# JSON:
-
-The JSON data format serialized Telegraf metrics in json format. The format is:
+## JSON
 
+The JSON output data format output for a single metric is in the
+form:
 ```json
 {
-   "fields":{
-      "field_1":30,
-      "field_2":4,
-      "field_N":59,
-      "n_images":660
-   },
-   "name":"docker",
-   "tags":{
-      "host":"raynor"
-   },
-   "timestamp":1458229140
+    "fields": {
+        "field_1": 30,
+        "field_2": 4,
+        "field_N": 59,
+        "n_images": 660
+    },
+    "name": "docker",
+    "tags": {
+        "host": "raynor"
+    },
+    "timestamp": 1458229140
 }
 ```
 
-### JSON Configuration:
+When an output plugin needs to emit multiple metrics at one time, it may use
+the batch format.  The use of batch format is determined by the plugin,
+reference the documentation for the specific plugin.
+```json
+{
+    "metrics": [
+        {
+            "fields": {
+                "field_1": 30,
+                "field_2": 4,
+                "field_N": 59,
+                "n_images": 660
+            },
+            "name": "docker",
+            "tags": {
+                "host": "raynor"
+            },
+            "timestamp": 1458229140
+        },
+        {
+            "fields": {
+                "field_1": 30,
+                "field_2": 4,
+                "field_N": 59,
+                "n_images": 660
+            },
+            "name": "docker",
+            "tags": {
+                "host": "raynor"
+            },
+            "timestamp": 1458229140
+        }
+    ]
+}
+```
+
+### JSON Configuration
 
 ```toml
 [[outputs.file]]
@@ -166,14 +176,9 @@ The JSON data format serialized Telegraf metrics in json format. The format is:
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "json"
-  json_timestamp_units = "1ns"
-```
 
-By default, the timestamp that is output in JSON data format serialized Telegraf
-metrics is in seconds. The precision of this timestamp can be adjusted for any output
-by adding the optional `json_timestamp_units` parameter to the configuration for
-that output. This parameter can be used to set the timestamp units to  nanoseconds (`ns`),
-microseconds (`us` or `µs`), milliseconds (`ms`), or seconds (`s`). Note that this
-parameter will be truncated to the nearest power of 10 that, so if the `json_timestamp_units`
-are set to `15ms` the timestamps for the JSON format serialized Telegraf metrics will be
-output in hundredths of a second (`10ms`).
+  ## The resolution to use for the metric timestamp.  Must be a duration string
+  ## such as "1ns", "1us", "1ms", "10ms", "1s".  Durations are truncated to
+  ## the power of 10 less than the specified units.
+  json_timestamp_units = "1s"
+```
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
index fd05c6905..017ee0be9 100644
--- a/plugins/outputs/influxdb/udp_test.go
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -66,13 +66,18 @@ func (d *MockDialer) DialContext(ctx context.Context, network string, address st
 }
 
 type MockSerializer struct {
-	SerializeF func(metric telegraf.Metric) ([]byte, error)
+	SerializeF      func(metric telegraf.Metric) ([]byte, error)
+	SerializeBatchF func(metrics []telegraf.Metric) ([]byte, error)
 }
 
 func (s *MockSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	return s.SerializeF(metric)
 }
 
+func (s *MockSerializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
+	return s.SerializeBatchF(metrics)
+}
+
 func TestUDP_NewUDPClientNoURL(t *testing.T) {
 	config := &influxdb.UDPConfig{}
 	_, err := influxdb.NewUDPClient(config)
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index 0f7fcd8f5..c06ba67ff 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -1,6 +1,7 @@
 package graphite
 
 import (
+	"bytes"
 	"fmt"
 	"math"
 	"regexp"
@@ -60,6 +61,21 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	return out, nil
 }
 
+func (s *GraphiteSerializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
+	var batch bytes.Buffer
+	for _, m := range metrics {
+		buf, err := s.Serialize(m)
+		if err != nil {
+			return nil, err
+		}
+		_, err = batch.Write(buf)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return batch.Bytes(), nil
+}
+
 func formatValue(value interface{}) string {
 	switch v := value.(type) {
 	case string:
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index e08f47593..85e7a6458 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 )
 
@@ -577,3 +578,32 @@ func TestClean(t *testing.T) {
 		})
 	}
 }
+
+func TestSerializeBatch(t *testing.T) {
+	now := time.Unix(1234567890, 0)
+	tests := []struct {
+		name        string
+		metric_name string
+		tags        map[string]string
+		fields      map[string]interface{}
+		expected    string
+	}{
+		{
+			"Base metric",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"localhost.cpu.usage_busy 8.5 1234567890\nlocalhost.cpu.usage_busy 8.5 1234567890\n",
+		},
+	}
+
+	s := GraphiteSerializer{}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(tt.metric_name, tt.tags, tt.fields, now)
+			assert.NoError(t, err)
+			actual, _ := s.SerializeBatch([]telegraf.Metric{m, m})
+			require.Equal(t, tt.expected, string(actual))
+		})
+	}
+}
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 819701c2e..f052c9c93 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -102,6 +102,17 @@ func (s *Serializer) Serialize(m telegraf.Metric) ([]byte, error) {
 	return out, nil
 }
 
+func (s *Serializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
+	var batch bytes.Buffer
+	for _, m := range metrics {
+		_, err := s.Write(&batch, m)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return batch.Bytes(), nil
+}
+
 func (s *Serializer) Write(w io.Writer, m telegraf.Metric) (int, error) {
 	err := s.writeMetric(w, m)
 	return s.bytesWritten, err
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index dca56dcf7..74bffe5e4 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -447,3 +447,24 @@ func BenchmarkSerializer(b *testing.B) {
 		})
 	}
 }
+
+func TestSerialize_SerializeBatch(t *testing.T) {
+	m := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 42.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+
+	metrics := []telegraf.Metric{m, m}
+
+	serializer := NewSerializer()
+	serializer.SetFieldSortOrder(SortFields)
+	output, err := serializer.SerializeBatch(metrics)
+	require.NoError(t, err)
+	require.Equal(t, []byte("cpu value=42 0\ncpu value=42 0\n"), output)
+}
diff --git a/plugins/serializers/json/json.go b/plugins/serializers/json/json.go
index f988bf40e..bfb84f9a7 100644
--- a/plugins/serializers/json/json.go
+++ b/plugins/serializers/json/json.go
@@ -1,29 +1,26 @@
 package json
 
 import (
-	ejson "encoding/json"
+	"encoding/json"
 	"time"
 
 	"github.com/influxdata/telegraf"
 )
 
-type JsonSerializer struct {
+type serializer struct {
 	TimestampUnits time.Duration
 }
 
-func (s *JsonSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
-	m := make(map[string]interface{})
-	units_nanoseconds := s.TimestampUnits.Nanoseconds()
-	// if the units passed in were less than or equal to zero,
-	// then serialize the timestamp in seconds (the default)
-	if units_nanoseconds <= 0 {
-		units_nanoseconds = 1000000000
+func NewSerializer(timestampUnits time.Duration) (*serializer, error) {
+	s := &serializer{
+		TimestampUnits: truncateDuration(timestampUnits),
 	}
-	m["tags"] = metric.Tags()
-	m["fields"] = metric.Fields()
-	m["name"] = metric.Name()
-	m["timestamp"] = metric.Time().UnixNano() / units_nanoseconds
-	serialized, err := ejson.Marshal(m)
+	return s, nil
+}
+
+func (s *serializer) Serialize(metric telegraf.Metric) ([]byte, error) {
+	m := s.createObject(metric)
+	serialized, err := json.Marshal(m)
 	if err != nil {
 		return []byte{}, err
 	}
@@ -31,3 +28,46 @@ func (s *JsonSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 
 	return serialized, nil
 }
+
+func (s *serializer) SerializeBatch(metrics []telegraf.Metric) ([]byte, error) {
+	objects := make([]interface{}, 0, len(metrics))
+	for _, metric := range metrics {
+		m := s.createObject(metric)
+		objects = append(objects, m)
+	}
+
+	obj := map[string]interface{}{
+		"metrics": objects,
+	}
+
+	serialized, err := json.Marshal(obj)
+	if err != nil {
+		return []byte{}, err
+	}
+	return serialized, nil
+}
+
+func (s *serializer) createObject(metric telegraf.Metric) map[string]interface{} {
+	m := make(map[string]interface{}, 4)
+	m["tags"] = metric.Tags()
+	m["fields"] = metric.Fields()
+	m["name"] = metric.Name()
+	m["timestamp"] = metric.Time().UnixNano() / int64(s.TimestampUnits)
+	return m
+}
+
+func truncateDuration(units time.Duration) time.Duration {
+	// Default precision is 1s
+	if units <= 0 {
+		return time.Second
+	}
+
+	// Search for the power of ten less than the duration
+	d := time.Nanosecond
+	for {
+		if d*10 > units {
+			return d
+		}
+		d = d * 10
+	}
+}
diff --git a/plugins/serializers/json/json_test.go b/plugins/serializers/json/json_test.go
index e44952b6f..82990b747 100644
--- a/plugins/serializers/json/json_test.go
+++ b/plugins/serializers/json/json_test.go
@@ -6,10 +6,19 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 )
 
+func MustMetric(v telegraf.Metric, err error) telegraf.Metric {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
 func TestSerializeMetricFloat(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
@@ -21,7 +30,7 @@ func TestSerializeMetricFloat(t *testing.T) {
 	m, err := metric.New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 
-	s := JsonSerializer{}
+	s, _ := NewSerializer(0)
 	var buf []byte
 	buf, err = s.Serialize(m)
 	assert.NoError(t, err)
@@ -29,6 +38,63 @@ func TestSerializeMetricFloat(t *testing.T) {
 	assert.Equal(t, string(expS), string(buf))
 }
 
+func TestSerialize_TimestampUnits(t *testing.T) {
+	tests := []struct {
+		name           string
+		timestampUnits time.Duration
+		expected       string
+	}{
+		{
+			name:           "default of 1s",
+			timestampUnits: 0,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":1525478795}`,
+		},
+		{
+			name:           "1ns",
+			timestampUnits: 1 * time.Nanosecond,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":1525478795123456789}`,
+		},
+		{
+			name:           "1ms",
+			timestampUnits: 1 * time.Millisecond,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":1525478795123}`,
+		},
+		{
+			name:           "10ms",
+			timestampUnits: 10 * time.Millisecond,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":152547879512}`,
+		},
+		{
+			name:           "15ms is reduced to 10ms",
+			timestampUnits: 15 * time.Millisecond,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":152547879512}`,
+		},
+		{
+			name:           "65ms is reduced to 10ms",
+			timestampUnits: 65 * time.Millisecond,
+			expected:       `{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":152547879512}`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m := MustMetric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(1525478795, 123456789),
+				),
+			)
+			s, _ := NewSerializer(tt.timestampUnits)
+			actual, err := s.Serialize(m)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected+"\n", string(actual))
+		})
+	}
+}
+
 func TestSerializeMetricInt(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
@@ -40,7 +106,7 @@ func TestSerializeMetricInt(t *testing.T) {
 	m, err := metric.New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 
-	s := JsonSerializer{}
+	s, _ := NewSerializer(0)
 	var buf []byte
 	buf, err = s.Serialize(m)
 	assert.NoError(t, err)
@@ -60,7 +126,7 @@ func TestSerializeMetricString(t *testing.T) {
 	m, err := metric.New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 
-	s := JsonSerializer{}
+	s, _ := NewSerializer(0)
 	var buf []byte
 	buf, err = s.Serialize(m)
 	assert.NoError(t, err)
@@ -81,7 +147,7 @@ func TestSerializeMultiFields(t *testing.T) {
 	m, err := metric.New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 
-	s := JsonSerializer{}
+	s, _ := NewSerializer(0)
 	var buf []byte
 	buf, err = s.Serialize(m)
 	assert.NoError(t, err)
@@ -101,10 +167,29 @@ func TestSerializeMetricWithEscapes(t *testing.T) {
 	m, err := metric.New("My CPU", tags, fields, now)
 	assert.NoError(t, err)
 
-	s := JsonSerializer{}
+	s, _ := NewSerializer(0)
 	buf, err := s.Serialize(m)
 	assert.NoError(t, err)
 
 	expS := []byte(fmt.Sprintf(`{"fields":{"U,age=Idle":90},"name":"My CPU","tags":{"cpu tag":"cpu0"},"timestamp":%d}`, now.Unix()) + "\n")
 	assert.Equal(t, string(expS), string(buf))
 }
+
+func TestSerializeBatch(t *testing.T) {
+	m := MustMetric(
+		metric.New(
+			"cpu",
+			map[string]string{},
+			map[string]interface{}{
+				"value": 42.0,
+			},
+			time.Unix(0, 0),
+		),
+	)
+
+	metrics := []telegraf.Metric{m, m}
+	s, _ := NewSerializer(0)
+	buf, err := s.SerializeBatch(metrics)
+	require.NoError(t, err)
+	require.Equal(t, []byte(`{"metrics":[{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":0},{"fields":{"value":42},"name":"cpu","tags":{},"timestamp":0}]}`), buf)
+}
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 431112b20..59050d089 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -25,6 +25,11 @@ type Serializer interface {
 	// separate metrics should be separated by a newline, and there should be
 	// a newline at the end of the buffer.
 	Serialize(metric telegraf.Metric) ([]byte, error)
+
+	// SerializeBatch takes an array of telegraf metric and serializes it into
+	// a byte buffer.  This method is not required to be suitable for use with
+	// line oriented framing.
+	SerializeBatch(metrics []telegraf.Metric) ([]byte, error)
 }
 
 // Config is a struct that covers the data types needed for all serializer types,
@@ -72,7 +77,7 @@ func NewSerializer(config *Config) (Serializer, error) {
 }
 
 func NewJsonSerializer(timestampUnits time.Duration) (Serializer, error) {
-	return &json.JsonSerializer{TimestampUnits: timestampUnits}, nil
+	return json.NewSerializer(timestampUnits)
 }
 
 func NewInfluxSerializerConfig(config *Config) (Serializer, error) {

From 4c35a56edda3b378566154967f1203a0bd8d3f34 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 18:31:45 -0700
Subject: [PATCH 1150/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d109ad090..edb40a257 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
 - [#4078](https://github.com/influxdata/telegraf/pull/4078): Use same timestamp for fields in system input.
 - [#4091](https://github.com/influxdata/telegraf/pull/4091): Fix handling of uint64 in datadog output.
 - [#4099](https://github.com/influxdata/telegraf/pull/4099): Ignore UTF8 BOM in JSON parser.
+- [#4104](https://github.com/influxdata/telegraf/issues/4104): Fix case for slave metrics in mysql input.
 
 ## v1.6.1 [2018-04-23]
 

From ac9b308cee772d8ebea991545ff5a4298c9ab68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jaber?= <germanjaber@gmail.com>
Date: Fri, 4 May 2018 20:40:05 -0500
Subject: [PATCH 1151/1302] Add topk processor plugin (#4096)

---
 plugins/processors/all/all.go        |   1 +
 plugins/processors/topk/README.md    |  74 ++++
 plugins/processors/topk/test_sets.go | 163 ++++++++
 plugins/processors/topk/topk.go      | 432 ++++++++++++++++++++++
 plugins/processors/topk/topk_test.go | 532 +++++++++++++++++++++++++++
 5 files changed, 1202 insertions(+)
 create mode 100644 plugins/processors/topk/README.md
 create mode 100644 plugins/processors/topk/test_sets.go
 create mode 100644 plugins/processors/topk/topk.go
 create mode 100644 plugins/processors/topk/topk_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index 1eecbfa7e..f14014e29 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -3,4 +3,5 @@ package all
 import (
 	_ "github.com/influxdata/telegraf/plugins/processors/override"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
+	_ "github.com/influxdata/telegraf/plugins/processors/topk"
 )
diff --git a/plugins/processors/topk/README.md b/plugins/processors/topk/README.md
new file mode 100644
index 000000000..9c9e48af9
--- /dev/null
+++ b/plugins/processors/topk/README.md
@@ -0,0 +1,74 @@
+# TopK Processor Plugin
+
+The TopK processor plugin is a filter designed to get the top series over a period of time. It can be tweaked to do its top k computation over a period of time, so spikes can be smoothed out.
+
+This processor goes through these steps when processing a batch of metrics:
+
+  1. Groups metrics in buckets using their tags and name as key
+  2. Aggregates each of the selected fields for each bucket by the selected aggregation function (sum, mean, etc)
+  3. Orders the buckets by one of the generated aggregations, returns all metrics in the top `K` buckets, then reorders the buckets by the next of the generated aggregations, returns all metrics in the top `K` buckets, etc, etc, etc, until it runs out of fields.
+
+The plugin makes sure not to duplicate metrics
+
+Note that depending on the amount of metrics on each computed bucket, more than `K` metrics may be returned
+
+### Configuration:
+
+```toml
+[[processors.topk]]
+  ## How many seconds between aggregations
+  # period = 10
+
+  ## How many top metrics to return
+  # k = 10
+
+  ## Over which tags should the aggregation be done. Globs can be specified, in
+  ## which case any tag matching the glob will aggregated over. If set to an
+  ## empty list is no aggregation over tags is done
+  # group_by = ['*']
+
+  ## Over which fields are the top k are calculated
+  # fields = ["value"]
+
+  ## What aggregation to use. Options: sum, mean, min, max
+  # aggregation = "mean"
+
+  ## Instead of the top k largest metrics, return the bottom k lowest metrics
+  # bottomk = false
+
+  ## The plugin assigns each metric a GroupBy tag generated from its name and
+  ## tags. If this setting is different than "" the plugin will add a
+  ## tag (which name will be the value of this setting) to each metric with
+  ## the value of the calculated GroupBy tag. Useful for debugging
+  # add_groupby_tag = ""
+
+  ## These settings provide a way to know the position of each metric in
+  ## the top k. The 'add_rank_field' setting allows to specify for which
+  ## fields the position is required. If the list is non empty, then a field
+  ## will be added to each and every metric for each string present in this
+  ## setting. This field will contain the ranking of the group that
+  ## the metric belonged to when aggregated over that field.
+  ## The name of the field will be set to the name of the aggregation field,
+  ## suffixed with the string '_topk_rank'
+  # add_rank_fields = []
+
+  ## These settings provide a way to know what values the plugin is generating
+  ## when aggregating metrics. The 'add_agregate_field' setting allows to
+  ## specify for which fields the final aggregation value is required. If the
+  ## list is non empty, then a field will be added to each every metric for
+  ## each field present in this setting. This field will contain
+  ## the computed aggregation for the group that the metric belonged to when
+  ## aggregated over that field.
+  ## The name of the field will be set to the name of the aggregation field,
+  ## suffixed with the string '_topk_aggregate'
+  # add_aggregate_fields = []
+```
+
+### Tags:
+
+This processor does not add tags by default. But the setting `add_groupby_tag` will add a tag if set to anything other than ""
+
+
+### Fields:
+
+This processor does not add fields by default. But the settings `add_rank_fields` and `add_aggregation_fields` will add one or several fields if set to anything other than ""
diff --git a/plugins/processors/topk/test_sets.go b/plugins/processors/topk/test_sets.go
new file mode 100644
index 000000000..aea2c44c8
--- /dev/null
+++ b/plugins/processors/topk/test_sets.go
@@ -0,0 +1,163 @@
+package topk
+
+import (
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"time"
+)
+
+///// Test set 1 /////
+var metric11, _ = metric.New(
+	"m1",
+	map[string]string{"tag_name": "tag_value1"},
+	map[string]interface{}{
+		"a": float64(15.3),
+		"b": float64(40),
+	},
+	time.Now(),
+)
+
+var metric12, _ = metric.New(
+	"m1",
+	map[string]string{"tag_name": "tag_value1"},
+	map[string]interface{}{
+		"a": float64(50),
+	},
+	time.Now(),
+)
+
+var metric13, _ = metric.New(
+	"m1",
+	map[string]string{"tag_name": "tag_value1"},
+	map[string]interface{}{
+		"a": float64(0.3),
+		"c": float64(400),
+	},
+	time.Now(),
+)
+
+var metric14, _ = metric.New(
+	"m1",
+	map[string]string{"tag_name": "tag_value1"},
+	map[string]interface{}{
+		"a": float64(24.12),
+		"b": float64(40),
+	},
+	time.Now(),
+)
+
+var metric15, _ = metric.New(
+	"m1",
+	map[string]string{"tag_name": "tag_value1"},
+	map[string]interface{}{
+		"a": float64(50.5),
+		"h": float64(1),
+		"u": float64(2.4),
+	},
+	time.Now(),
+)
+
+var MetricsSet1 = []telegraf.Metric{metric11, metric12, metric13, metric14, metric15}
+
+///// Test set 2 /////
+var metric21, _ = metric.New(
+	"metric1",
+	map[string]string{
+		"id":   "1",
+		"tag1": "ONE",
+		"tag2": "FIVE",
+		"tag3": "SIX",
+		"tag4": "EIGHT",
+	},
+	map[string]interface{}{
+		"value": float64(31.31),
+		"A":     float64(95.36),
+		"C":     float64(72.41),
+	},
+	time.Now(),
+)
+
+var metric22, _ = metric.New(
+	"metric1",
+	map[string]string{
+		"id":   "2",
+		"tag1": "TWO",
+		"tag2": "FOUR",
+		"tag3": "THREE",
+		"tag4": "EIGHT",
+	},
+	map[string]interface{}{
+		"value": float64(59.43),
+		"A":     float64(0.6),
+	},
+	time.Now(),
+)
+
+var metric23, _ = metric.New(
+	"metric1",
+	map[string]string{
+		"id":   "3",
+		"tag1": "TWO",
+		"tag2": "FOUR",
+		"tag3": "SIX",
+		"tag5": "TEN",
+	},
+	map[string]interface{}{
+		"value": float64(74.18),
+		"A":     float64(77.42),
+		"B":     float64(60.96),
+	},
+	time.Now(),
+)
+
+var metric24, _ = metric.New(
+	"metric2",
+	map[string]string{
+		"id":   "4",
+		"tag1": "ONE",
+		"tag2": "FIVE",
+		"tag3": "THREE",
+	},
+	map[string]interface{}{
+		"value": float64(72),
+		"B":     float64(22.1),
+		"C":     float64(30.8),
+	},
+	time.Now(),
+)
+
+var metric25, _ = metric.New(
+	"metric2",
+	map[string]string{
+		"id":   "5",
+		"tag1": "TWO",
+		"tag2": "FOUR",
+		"tag3": "SEVEN",
+		"tag4": "NINE",
+	},
+	map[string]interface{}{
+		"value": float64(87.92),
+		"B":     float64(81.55),
+		"C":     float64(45.1),
+	},
+	time.Now(),
+)
+
+var metric26, _ = metric.New(
+	"metric2",
+	map[string]string{
+		"id":   "6",
+		"tag1": "TWO",
+		"tag2": "FIVE",
+		"tag3": "SEVEN",
+		"tag4": "NINE",
+	},
+	map[string]interface{}{
+		"value": float64(75.3),
+		"A":     float64(29.45),
+		"C":     float64(4.86),
+	},
+	time.Now(),
+)
+
+var MetricsSet2 = []telegraf.Metric{metric21, metric22, metric23, metric24, metric25, metric26}
diff --git a/plugins/processors/topk/topk.go b/plugins/processors/topk/topk.go
new file mode 100644
index 000000000..8a52fa8d4
--- /dev/null
+++ b/plugins/processors/topk/topk.go
@@ -0,0 +1,432 @@
+package topk
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"sort"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+type TopK struct {
+	Period             internal.Duration
+	K                  int
+	GroupBy            []string `toml:"group_by"`
+	Fields             []string
+	Aggregation        string
+	Bottomk            bool
+	AddGroupByTag      string   `toml:"add_groupby_tag"`
+	AddRankFields      []string `toml:"add_rank_fields"`
+	AddAggregateFields []string `toml:"add_aggregate_fields"`
+
+	cache           map[string][]telegraf.Metric
+	tagsGlobs       filter.Filter
+	rankFieldSet    map[string]bool
+	aggFieldSet     map[string]bool
+	lastAggregation time.Time
+}
+
+func New() *TopK {
+	// Create object
+	topk := TopK{}
+
+	// Setup defaults
+	topk.Period = internal.Duration{Duration: time.Second * time.Duration(10)}
+	topk.K = 10
+	topk.Fields = []string{"value"}
+	topk.Aggregation = "mean"
+	topk.GroupBy = []string{"*"}
+	topk.AddGroupByTag = ""
+	topk.AddRankFields = []string{""}
+	topk.AddAggregateFields = []string{""}
+
+	// Initialize cache
+	topk.Reset()
+
+	return &topk
+}
+
+var sampleConfig = `
+  ## How many seconds between aggregations
+  # period = 10
+
+  ## How many top metrics to return
+  # k = 10
+
+  ## Over which tags should the aggregation be done. Globs can be specified, in
+  ## which case any tag matching the glob will aggregated over. If set to an
+  ## empty list is no aggregation over tags is done
+  # group_by = ['*']
+
+  ## Over which fields are the top k are calculated
+  # fields = ["value"]
+
+  ## What aggregation to use. Options: sum, mean, min, max
+  # aggregation = "mean"
+
+  ## Instead of the top k largest metrics, return the bottom k lowest metrics
+  # bottomk = false
+
+  ## The plugin assigns each metric a GroupBy tag generated from its name and
+  ## tags. If this setting is different than "" the plugin will add a
+  ## tag (which name will be the value of this setting) to each metric with
+  ## the value of the calculated GroupBy tag. Useful for debugging
+  # add_groupby_tag = ""          
+
+  ## These settings provide a way to know the position of each metric in
+  ## the top k. The 'add_rank_field' setting allows to specify for which
+  ## fields the position is required. If the list is non empty, then a field
+  ## will be added to each and every metric for each string present in this 
+  ## setting. This field will contain the ranking of the group that
+  ## the metric belonged to when aggregated over that field.
+  ## The name of the field will be set to the name of the aggregation field,
+  ## suffixed with the string '_topk_rank'
+  # add_rank_fields = []
+
+  ## These settings provide a way to know what values the plugin is generating
+  ## when aggregating metrics. The 'add_agregate_field' setting allows to
+  ## specify for which fields the final aggregation value is required. If the
+  ## list is non empty, then a field will be added to each every metric for
+  ## each field present in this setting. This field will contain
+  ## the computed aggregation for the group that the metric belonged to when
+  ## aggregated over that field.
+  ## The name of the field will be set to the name of the aggregation field,
+  ## suffixed with the string '_topk_aggregate'
+  # add_aggregate_fields = []
+`
+
+type MetricAggregation struct {
+	groupbykey string
+	values     map[string]float64
+}
+
+func sortMetrics(metrics []MetricAggregation, field string, reverse bool) {
+	less := func(i, j int) bool {
+		iv := metrics[i].values[field]
+		jv := metrics[j].values[field]
+		if iv < jv {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	if reverse {
+		sort.SliceStable(metrics, less)
+	} else {
+		sort.SliceStable(metrics, func(i, j int) bool { return !less(i, j) })
+	}
+}
+
+func (t *TopK) SampleConfig() string {
+	return sampleConfig
+}
+
+func (t *TopK) Reset() {
+	t.cache = make(map[string][]telegraf.Metric)
+	t.lastAggregation = time.Now()
+}
+
+func (t *TopK) Description() string {
+	return "Print all metrics that pass through this filter."
+}
+
+func (t *TopK) generateGroupByKey(m telegraf.Metric) (string, error) {
+	// Create the filter.Filter objects if they have not been created
+	if t.tagsGlobs == nil && len(t.GroupBy) > 0 {
+		var err error
+		t.tagsGlobs, err = filter.Compile(t.GroupBy)
+		if err != nil {
+			return "", fmt.Errorf("could not compile pattern: %v %v", t.GroupBy, err)
+		}
+	}
+
+	groupkey := m.Name() + "&"
+
+	if len(t.GroupBy) > 0 {
+		tags := m.Tags()
+		keys := make([]string, 0, len(tags))
+		for tag, value := range tags {
+			if t.tagsGlobs.Match(tag) {
+				keys = append(keys, tag+"="+value+"&")
+			}
+		}
+		// Sorting the selected tags is necessary because dictionaries
+		// do not ensure any specific or deterministic ordering
+		sort.SliceStable(keys, func(i, j int) bool { return keys[i] < keys[j] })
+		for _, str := range keys {
+			groupkey += str
+		}
+	}
+
+	return groupkey, nil
+}
+
+func (t *TopK) groupBy(m telegraf.Metric) {
+	// Generate the metric group key
+	groupkey, err := t.generateGroupByKey(m)
+	if err != nil {
+		// If we could not generate the groupkey, fail hard
+		// by dropping this and all subsequent metrics
+		log.Printf("E! [processors.topk]: could not generate group key: %v", err)
+		return
+	}
+
+	// Initialize the key with an empty list if necessary
+	if _, ok := t.cache[groupkey]; !ok {
+		t.cache[groupkey] = make([]telegraf.Metric, 0, 10)
+	}
+
+	// Append the metric to the corresponding key list
+	t.cache[groupkey] = append(t.cache[groupkey], m)
+
+	// Add the generated groupby key tag to the metric if requested
+	if t.AddGroupByTag != "" {
+		m.AddTag(t.AddGroupByTag, groupkey)
+	}
+}
+
+func (t *TopK) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	// Init any internal datastructures that are not initialized yet
+	if t.rankFieldSet == nil {
+		t.rankFieldSet = make(map[string]bool)
+		for _, f := range t.AddRankFields {
+			t.rankFieldSet[f] = true
+		}
+	}
+	if t.aggFieldSet == nil {
+		t.aggFieldSet = make(map[string]bool)
+		for _, f := range t.AddAggregateFields {
+			t.aggFieldSet[f] = true
+		}
+	}
+
+	// Add the metrics received to our internal cache
+	for _, m := range in {
+
+		// Check if the metric has any of the fields over wich we are aggregating
+		hasField := false
+		for _, f := range t.Fields {
+			if m.HasField(f) {
+				hasField = true
+				break
+			}
+		}
+		if !hasField {
+			continue
+		}
+
+		// Add the metric to the internal cache
+		t.groupBy(m)
+	}
+
+	// If enough time has passed
+	elapsed := time.Since(t.lastAggregation)
+	if elapsed >= t.Period.Duration {
+		return t.push()
+	}
+
+	return []telegraf.Metric{}
+}
+
+func min(a, b int) int {
+	if a > b {
+		return b
+	}
+	return a
+}
+
+func convert(in interface{}) (float64, bool) {
+	switch v := in.(type) {
+	case float64:
+		return v, true
+	case int64:
+		return float64(v), true
+	case uint64:
+		return float64(v), true
+	default:
+		return 0, false
+	}
+}
+
+func (t *TopK) push() []telegraf.Metric {
+	// Generate aggregations list using the selected fields
+	aggregations := make([]MetricAggregation, 0, 100)
+	aggregator, err := t.getAggregationFunction(t.Aggregation)
+	if err != nil {
+		// If we could not generate the aggregation
+		// function, fail hard by dropping all metrics
+		log.Printf("E! [processors.topk]: %v", err)
+		return []telegraf.Metric{}
+	}
+	for k, ms := range t.cache {
+		aggregations = append(aggregations, MetricAggregation{groupbykey: k, values: aggregator(ms, t.Fields)})
+	}
+
+	// The return value that will hold the returned metrics
+	var ret []telegraf.Metric = make([]telegraf.Metric, 0, 0)
+
+	// Get the top K metrics for each field and add them to the return value
+	addedKeys := make(map[string]bool)
+	groupTag := t.AddGroupByTag
+	for _, field := range t.Fields {
+
+		// Sort the aggregations
+		sortMetrics(aggregations, field, t.Bottomk)
+
+		// Create a one dimentional list with the top K metrics of each key
+		for i, ag := range aggregations[0:min(t.K, len(aggregations))] {
+
+			// Check whether of not we need to add fields of tags to the selected metrics
+			if len(t.aggFieldSet) != 0 || len(t.rankFieldSet) != 0 || groupTag != "" {
+				for _, m := range t.cache[ag.groupbykey] {
+
+					// Add the aggregation final value if requested
+					_, addAggField := t.aggFieldSet[field]
+					if addAggField && m.HasField(field) {
+						m.AddField(field+"_topk_aggregate", ag.values[field])
+					}
+
+					// Add the rank relative to the current field if requested
+					_, addRankField := t.rankFieldSet[field]
+					if addRankField && m.HasField(field) {
+						m.AddField(field+"_topk_rank", i+1)
+					}
+				}
+			}
+
+			// Add metrics if we have not already appended them to the return value
+			_, ok := addedKeys[ag.groupbykey]
+			if !ok {
+				ret = append(ret, t.cache[ag.groupbykey]...)
+				addedKeys[ag.groupbykey] = true
+			}
+		}
+	}
+
+	t.Reset()
+
+	return ret
+}
+
+// Function that generates the aggregation functions
+func (t *TopK) getAggregationFunction(aggOperation string) (func([]telegraf.Metric, []string) map[string]float64, error) {
+
+	// This is a function aggregates a set of metrics using a given aggregation function
+	var aggregator = func(ms []telegraf.Metric, fields []string, f func(map[string]float64, float64, string)) map[string]float64 {
+		agg := make(map[string]float64)
+		// Compute the sums of the selected fields over all the measurements collected for this metric
+		for _, m := range ms {
+			for _, field := range fields {
+				fieldVal, ok := m.Fields()[field]
+				if !ok {
+					continue // Skip if this metric doesn't have this field set
+				}
+				val, ok := convert(fieldVal)
+				if !ok {
+					log.Printf("Cannot convert value '%s' from metric '%s' with tags '%s'",
+						m.Fields()[field], m.Name(), m.Tags())
+					continue
+				}
+				f(agg, val, field)
+			}
+		}
+		return agg
+	}
+
+	switch aggOperation {
+	case "sum":
+		return func(ms []telegraf.Metric, fields []string) map[string]float64 {
+			sum := func(agg map[string]float64, val float64, field string) {
+				agg[field] += val
+			}
+			return aggregator(ms, fields, sum)
+		}, nil
+
+	case "min":
+		return func(ms []telegraf.Metric, fields []string) map[string]float64 {
+			min := func(agg map[string]float64, val float64, field string) {
+				// If this field has not been set, set it to the maximum float64
+				_, ok := agg[field]
+				if !ok {
+					agg[field] = math.MaxFloat64
+				}
+
+				// Check if we've found a new minimum
+				if agg[field] > val {
+					agg[field] = val
+				}
+			}
+			return aggregator(ms, fields, min)
+		}, nil
+
+	case "max":
+		return func(ms []telegraf.Metric, fields []string) map[string]float64 {
+			max := func(agg map[string]float64, val float64, field string) {
+				// If this field has not been set, set it to the minimum float64
+				_, ok := agg[field]
+				if !ok {
+					agg[field] = -math.MaxFloat64
+				}
+
+				// Check if we've found a new maximum
+				if agg[field] < val {
+					agg[field] = val
+				}
+			}
+			return aggregator(ms, fields, max)
+		}, nil
+
+	case "mean":
+		return func(ms []telegraf.Metric, fields []string) map[string]float64 {
+			mean := make(map[string]float64)
+			meanCounters := make(map[string]float64)
+			// Compute the sums of the selected fields over all the measurements collected for this metric
+			for _, m := range ms {
+				for _, field := range fields {
+					fieldVal, ok := m.Fields()[field]
+					if !ok {
+						continue // Skip if this metric doesn't have this field set
+					}
+					val, ok := convert(fieldVal)
+					if !ok {
+						log.Printf("Cannot convert value '%s' from metric '%s' with tags '%s'",
+							m.Fields()[field], m.Name(), m.Tags())
+						continue
+					}
+					mean[field] += val
+					meanCounters[field] += 1
+				}
+			}
+			// Divide by the number of recorded measurements collected for every field
+			noMeasurementsFound := true // Canary to check if no field with values was found, so we can return nil
+			for k, _ := range mean {
+				if meanCounters[k] == 0 {
+					mean[k] = 0
+					continue
+				}
+				mean[k] = mean[k] / meanCounters[k]
+				noMeasurementsFound = noMeasurementsFound && false
+			}
+
+			if noMeasurementsFound {
+				return nil
+			}
+			return mean
+		}, nil
+
+	default:
+		return nil, fmt.Errorf("Unknown aggregation function '%s'. No metrics will be processed", t.Aggregation)
+	}
+}
+
+func init() {
+	processors.Add("topk", func() telegraf.Processor {
+		return New()
+	})
+}
diff --git a/plugins/processors/topk/topk_test.go b/plugins/processors/topk/topk_test.go
new file mode 100644
index 000000000..2f5844448
--- /dev/null
+++ b/plugins/processors/topk/topk_test.go
@@ -0,0 +1,532 @@
+package topk
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+)
+
+// Key, value pair that represents a telegraf.Metric Field
+type field struct {
+	key string
+	val interface{}
+}
+
+func fieldList(fields ...field) []field {
+	return fields
+}
+
+// Key, value pair that represents a telegraf.Metric Tag
+type tag struct {
+	key string
+	val string
+}
+
+func tagList(tags ...tag) []tag {
+	return tags
+}
+
+// Abstraction of a change in a single metric
+type metricChange struct {
+	newFields []field // Fieldsthat should be added to the metric
+	newTags   []tag   // Tags that should be added to the metric
+
+	runHash bool // Sometimes the metrics' HashID must be run so reflect.DeepEqual works
+	// This happens because telegraf.Metric mantains an internal cache of
+	// its hash value that is set when HashID() is called for the first time
+}
+
+// Generate a new set of metrics from a set of changes. This is used to generate an answer which will be
+// compare against the output of the processor
+// NOTE: A `changeSet` is a map where the keys are the indices of the metrics to keep, and the values
+//       are list of new tags and fields to be added to the metric in that index.
+//       THE ORDERING OF THE NEW TAGS AND FIELDS MATTERS. When using reflect.DeepEqual to compare metrics,
+//       comparing metrics that have the same fields/tags added in different orders will return false, although
+//       they are semantically equal.
+//       Therefore the fields and tags must be in the same order that the processor would add them
+func generateAns(input []telegraf.Metric, changeSet map[int]metricChange) []telegraf.Metric {
+	answer := []telegraf.Metric{}
+
+	// For every input metric, we check if there is a change we need to apply
+	// If there is no change for a given input metric, the metric is dropped
+	for i, metric := range input {
+		change, ok := changeSet[i]
+		if ok {
+			// Deep copy the metric
+			newMetric := metric.Copy()
+
+			// Add new fields
+			if change.newFields != nil {
+				for _, p := range change.newFields {
+					newMetric.AddField(p.key, p.val)
+				}
+			}
+
+			// Add new tags
+			if change.newTags != nil {
+				for _, p := range change.newTags {
+					newMetric.AddTag(p.key, p.val)
+				}
+			}
+
+			// Run the hash function if required
+			if change.runHash {
+				newMetric.HashID()
+			}
+
+			answer = append(answer, newMetric)
+		}
+	}
+
+	return answer
+}
+
+func deepCopy(a []telegraf.Metric) []telegraf.Metric {
+	ret := make([]telegraf.Metric, 0, len(a))
+	for _, m := range a {
+		ret = append(ret, m.Copy())
+	}
+
+	return ret
+}
+
+func belongs(m telegraf.Metric, ms []telegraf.Metric) bool {
+	for _, i := range ms {
+		if reflect.DeepEqual(i, m) {
+			return true
+		}
+	}
+	return false
+}
+
+func subSet(a []telegraf.Metric, b []telegraf.Metric) bool {
+	subset := true
+	for _, m := range a {
+		if !belongs(m, b) {
+			subset = false
+			break
+		}
+	}
+	return subset
+}
+
+func equalSets(l1 []telegraf.Metric, l2 []telegraf.Metric) bool {
+	return subSet(l1, l2) && subSet(l2, l1)
+}
+
+func createDuration(t int) internal.Duration {
+	return internal.Duration{Duration: time.Second * time.Duration(t)}
+}
+
+func runAndCompare(topk *TopK, metrics []telegraf.Metric, answer []telegraf.Metric, testID string, t *testing.T) {
+	// Sleep for `period`, otherwise the processor will only
+	// cache the metrics, but it will not process them
+	time.Sleep(topk.Period.Duration)
+
+	// Run the processor
+	ret := topk.Apply(metrics...)
+	topk.Reset()
+
+	// The returned set mut be equal to the answer set
+	if !equalSets(ret, answer) {
+		t.Error("\nExpected metrics for", testID, ":\n",
+			answer, "\nReturned metrics:\n", ret)
+	}
+}
+
+// Smoke tests
+func TestTopkAggregatorsSmokeTests(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.Fields = []string{"a"}
+	topk.GroupBy = []string{"tag_name"}
+
+	aggregators := []string{"mean", "sum", "max", "min"}
+
+	//The answer is equal to the original set for these particual scenarios
+	input := MetricsSet1
+	answer := MetricsSet1
+
+	for _, ag := range aggregators {
+		topk.Aggregation = ag
+
+		runAndCompare(&topk, input, answer, "SmokeAggregator_"+ag, t)
+	}
+}
+
+// AddAggregateFields + Mean aggregator
+func TestTopkMeanAddAggregateFields(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.Aggregation = "mean"
+	topk.AddAggregateFields = []string{"a"}
+	topk.Fields = []string{"a"}
+	topk.GroupBy = []string{"tag_name"}
+
+	// Get the input
+	input := deepCopy(MetricsSet1)
+
+	// Generate the answer
+	chng := fieldList(field{"a_topk_aggregate", float64(28.044)})
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: chng},
+		1: metricChange{newFields: chng},
+		2: metricChange{newFields: chng},
+		3: metricChange{newFields: chng},
+		4: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "MeanAddAggregateFields test", t)
+}
+
+// AddAggregateFields + Sum aggregator
+func TestTopkSumAddAggregateFields(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.Aggregation = "sum"
+	topk.AddAggregateFields = []string{"a"}
+	topk.Fields = []string{"a"}
+	topk.GroupBy = []string{"tag_name"}
+
+	// Get the input
+	input := deepCopy(MetricsSet1)
+
+	// Generate the answer
+	chng := fieldList(field{"a_topk_aggregate", float64(140.22)})
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: chng},
+		1: metricChange{newFields: chng},
+		2: metricChange{newFields: chng},
+		3: metricChange{newFields: chng},
+		4: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "SumAddAggregateFields test", t)
+}
+
+// AddAggregateFields + Max aggregator
+func TestTopkMaxAddAggregateFields(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.Aggregation = "max"
+	topk.AddAggregateFields = []string{"a"}
+	topk.Fields = []string{"a"}
+	topk.GroupBy = []string{"tag_name"}
+
+	// Get the input
+	input := deepCopy(MetricsSet1)
+
+	// Generate the answer
+	chng := fieldList(field{"a_topk_aggregate", float64(50.5)})
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: chng},
+		1: metricChange{newFields: chng},
+		2: metricChange{newFields: chng},
+		3: metricChange{newFields: chng},
+		4: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "MaxAddAggregateFields test", t)
+}
+
+// AddAggregateFields + Min aggregator
+func TestTopkMinAddAggregateFields(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.Aggregation = "min"
+	topk.AddAggregateFields = []string{"a"}
+	topk.Fields = []string{"a"}
+	topk.GroupBy = []string{"tag_name"}
+
+	// Get the input
+	input := deepCopy(MetricsSet1)
+
+	// Generate the answer
+	chng := fieldList(field{"a_topk_aggregate", float64(0.3)})
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: chng},
+		1: metricChange{newFields: chng},
+		2: metricChange{newFields: chng},
+		3: metricChange{newFields: chng},
+		4: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "MinAddAggregateFields test", t)
+}
+
+// GroupBy
+func TestTopkGroupby1(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 3
+	topk.Aggregation = "sum"
+	topk.AddAggregateFields = []string{"value"}
+	topk.GroupBy = []string{"tag[13]"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		2: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(74.18)})},
+		3: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(72)})},
+		4: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
+		5: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy test 1", t)
+}
+func TestTopkGroupby2(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 3
+	topk.Aggregation = "mean"
+	topk.AddAggregateFields = []string{"value"}
+	topk.GroupBy = []string{"tag1"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	chng1 := fieldList(field{"value_topk_aggregate", float64(66.805)})
+	chng2 := fieldList(field{"value_topk_aggregate", float64(72)})
+	chng3 := fieldList(field{"value_topk_aggregate", float64(81.61)})
+	changeSet := map[int]metricChange{
+		1: metricChange{newFields: chng1},
+		2: metricChange{newFields: chng1},
+		3: metricChange{newFields: chng2},
+		4: metricChange{newFields: chng3},
+		5: metricChange{newFields: chng3},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy test 2", t)
+}
+func TestTopkGroupby3(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 1
+	topk.Aggregation = "min"
+	topk.AddAggregateFields = []string{"value"}
+	topk.GroupBy = []string{"tag4"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	chng := fieldList(field{"value_topk_aggregate", float64(75.3)})
+	changeSet := map[int]metricChange{
+		4: metricChange{newFields: chng},
+		5: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy test 3", t)
+}
+
+// GroupBy + Fields
+func TestTopkGroupbyFields1(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 4 // This settings generate less than 3 groups
+	topk.Aggregation = "mean"
+	topk.AddAggregateFields = []string{"A"}
+	topk.GroupBy = []string{"tag1", "tag2"}
+	topk.Fields = []string{"A"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
+		1: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
+		2: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
+		5: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(29.45)})},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy Fields test 1", t)
+}
+
+func TestTopkGroupbyFields2(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 2
+	topk.Aggregation = "sum"
+	topk.AddAggregateFields = []string{"B", "C"}
+	topk.GroupBy = []string{"tag1", "tag3"}
+	topk.Fields = []string{"B", "C"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: fieldList(field{"C_topk_aggregate", float64(72.41)})},
+		2: metricChange{newFields: fieldList(field{"B_topk_aggregate", float64(60.96)})},
+		4: metricChange{newFields: fieldList(field{"B_topk_aggregate", float64(81.55)}, field{"C_topk_aggregate", float64(49.96)})},
+		5: metricChange{newFields: fieldList(field{"C_topk_aggregate", float64(49.96)})},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy Fields test 2", t)
+}
+
+// GroupBy metric name
+func TestTopkGroupbyMetricName1(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 1
+	topk.Aggregation = "sum"
+	topk.AddAggregateFields = []string{"value"}
+	topk.GroupBy = []string{}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	chng := fieldList(field{"value_topk_aggregate", float64(235.22000000000003)})
+	changeSet := map[int]metricChange{
+		3: metricChange{newFields: chng},
+		4: metricChange{newFields: chng},
+		5: metricChange{newFields: chng},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy by metric name test 1", t)
+}
+
+func TestTopkGroupbyMetricName2(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 2
+	topk.Aggregation = "sum"
+	topk.AddAggregateFields = []string{"A", "value"}
+	topk.GroupBy = []string{"tag[12]"}
+	topk.Fields = []string{"A", "value"}
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		0: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
+		1: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
+		2: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
+		4: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(87.92)})},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupBy by metric name test 2", t)
+}
+
+// BottomK
+func TestTopkBottomk(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 3
+	topk.Aggregation = "sum"
+	topk.GroupBy = []string{"tag1", "tag3"}
+	topk.Bottomk = true
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		0: metricChange{},
+		1: metricChange{},
+		3: metricChange{},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "Bottom k test", t)
+}
+
+// GroupByKeyTag
+func TestTopkGroupByKeyTag(t *testing.T) {
+
+	// Build the processor
+	var topk TopK
+	topk = *New()
+	topk.Period = createDuration(1)
+	topk.K = 3
+	topk.Aggregation = "sum"
+	topk.GroupBy = []string{"tag1", "tag3"}
+	topk.AddGroupByTag = "gbt"
+
+	// Get the input
+	input := deepCopy(MetricsSet2)
+
+	// Generate the answer
+	changeSet := map[int]metricChange{
+		2: metricChange{newTags: tagList(tag{"gbt", "metric1&tag1=TWO&tag3=SIX&"})},
+		3: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=ONE&tag3=THREE&"})},
+		4: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
+		5: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
+	}
+	answer := generateAns(input, changeSet)
+
+	// Run the test
+	runAndCompare(&topk, input, answer, "GroupByKeyTag test", t)
+}

From d96bcac3ecc6a6ca56c3bc097d10247cc5e6c5ff Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 4 May 2018 18:42:36 -0700
Subject: [PATCH 1152/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 README.md    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb40a257..12ad65d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
 - [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
 
+### New Processors
+
+- [topk](./plugins/processors/topk/README.md) - Contributed by @mirath
+
 ### Features
 
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
@@ -29,6 +33,7 @@
 - [#4068](https://github.com/influxdata/telegraf/pull/4068): Add parameter to force the interval of gather for sysstat.
 - [#3877](https://github.com/influxdata/telegraf/pull/3877): Support busybox ping in the ping input.
 - [#4077](https://github.com/influxdata/telegraf/pull/4077): Add input plugin for McRouter.
+- [#4096](https://github.com/influxdata/telegraf/pull/4096): Add topk processor plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 90ec48579..6fbe80276 100644
--- a/README.md
+++ b/README.md
@@ -266,8 +266,9 @@ formats may be used with input plugins supporting the `data_format` option:
 
 ## Processor Plugins
 
-* [printer](./plugins/processors/printer)
 * [override](./plugins/processors/override)
+* [printer](./plugins/processors/printer)
+* [topk](./plugins/processors/topk)
 
 ## Aggregator Plugins
 

From 2fe167b8a7807f320edc75a9820a9745685432ef Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 7 May 2018 11:38:09 -0700
Subject: [PATCH 1153/1302] Update issue templates (#4116)

---
 .github/ISSUE_TEMPLATE/Bug_report.md      | 24 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/Feature_request.md | 17 ++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/Bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/Feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 000000000..b84aad767
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+### Relevant telegraf.conf:
+
+### System info:
+
+[Include Telegraf version, operating system name, and other relevant details]
+
+### Steps to reproduce:
+
+1. ...
+2. ...
+
+### Expected behavior:
+
+### Actual behavior:
+
+### Additional info:
+
+[Include gist of relevant config, logs, etc.]
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 000000000..84d45fcd6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## Feature Request
+
+Opening a feature request kicks off a discussion.
+
+### Proposal:
+
+### Current behavior:
+
+### Desired behavior:
+
+### Use case: [Why is this important (helps with prioritizing requests)]

From 21167a62326a9273e5fbdeb5f94267b5973acbb6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 May 2018 11:43:23 -0700
Subject: [PATCH 1154/1302] Remove combined issue template

---
 .github/ISSUE_TEMPLATE.md | 44 ---------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f4190e3ec..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,44 +0,0 @@
-## Directions
-
-GitHub Issues are reserved for actionable bug reports and feature requests.
-General questions should be asked at the [InfluxData Community](https://community.influxdata.com) site.
-
-Before opening an issue, search for similar bug reports or feature requests on GitHub Issues.
-If no similar issue can be found, fill out either the "Bug Report" or the "Feature Request" section below.
-Erase the other section and everything on and above this line.
-
-*Please note, the quickest way to fix a bug is to open a Pull Request.*
-
-## Bug report
-
-### Relevant telegraf.conf:
-
-### System info:
-
-[Include Telegraf version, operating system name, and other relevant details]
-
-### Steps to reproduce:
-
-1. ...
-2. ...
-
-### Expected behavior:
-
-### Actual behavior:
-
-### Additional info:
-
-[Include gist of relevant config, logs, etc.]
-
-
-## Feature Request
-
-Opening a feature request kicks off a discussion.
-
-### Proposal:
-
-### Current behavior:
-
-### Desired behavior:
-
-### Use case: [Why is this important (helps with prioritizing requests)]

From 4790a21c0484aef0ed660ac895ac42a18a3d5b48 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake@gnu.space>
Date: Mon, 7 May 2018 18:00:24 -0400
Subject: [PATCH 1155/1302] Add cursor metrics to mongodb input (#4114)

---
 plugins/inputs/mongodb/README.md            |  6 +++-
 plugins/inputs/mongodb/mongodb_data.go      |  4 +++
 plugins/inputs/mongodb/mongodb_data_test.go |  8 +++++
 plugins/inputs/mongodb/mongostat.go         | 36 ++++++++++++++++++---
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/mongodb/README.md b/plugins/inputs/mongodb/README.md
index a78d7b954..96852d724 100644
--- a/plugins/inputs/mongodb/README.md
+++ b/plugins/inputs/mongodb/README.md
@@ -48,6 +48,10 @@ Error in input [mongodb]: not authorized on admin to execute command { serverSta
     - active_reads (integer)
     - active_writes (integer)
     - commands_per_sec (integer)
+    - cursor_timed_out (integer)
+    - cursor_no_timeout (integer)
+    - cursor_pinned (integer)
+    - cursor_total (integer)
     - deletes_per_sec (integer)
     - flushes_per_sec (integer)
     - getmores_per_sec (integer)
@@ -120,7 +124,7 @@ Error in input [mongodb]: not authorized on admin to execute command { serverSta
 
 ### Example Output:
 ```
-mongodb,hostname=127.0.0.1:27017 active_reads=0i,active_writes=0i,commands_per_sec=6i,deletes_per_sec=0i,flushes_per_sec=0i,getmores_per_sec=1i,inserts_per_sec=0i,jumbo_chunks=0i,member_status="PRI",net_in_bytes=851i,net_out_bytes=23904i,open_connections=6i,percent_cache_dirty=0,percent_cache_used=0,queries_per_sec=2i,queued_reads=0i,queued_writes=0i,repl_commands_per_sec=0i,repl_deletes_per_sec=0i,repl_getmores_per_sec=0i,repl_inserts_per_sec=0i,repl_lag=0i,repl_queries_per_sec=0i,repl_updates_per_sec=0i,resident_megabytes=67i,state="PRIMARY",total_available=0i,total_created=0i,total_in_use=0i,total_refreshing=0i,ttl_deletes_per_sec=0i,ttl_passes_per_sec=0i,updates_per_sec=0i,vsize_megabytes=729i,wtcache_app_threads_page_read_count=4i,wtcache_app_threads_page_read_time=18i,wtcache_app_threads_page_write_count=6i,wtcache_bytes_read_into=10075i,wtcache_bytes_written_from=115711i,wtcache_current_bytes=86038i,wtcache_max_bytes_configured=1073741824i,wtcache_pages_evicted_by_app_thread=0i,wtcache_pages_queued_for_eviction=0i,wtcache_server_evicting_pages=0i,wtcache_tracked_dirty_bytes=0i,wtcache_worker_thread_evictingpages=0i 1522798796000000000
+mongodb,hostname=127.0.0.1:27017 active_reads=0i,active_writes=0i,commands_per_sec=6i,cursor_no_timeout=0i,cursor_pinned=0i,cursor_timed_out=0i,cursor_total=0i,deletes_per_sec=0i,flushes_per_sec=0i,getmores_per_sec=1i,inserts_per_sec=0i,jumbo_chunks=0i,member_status="PRI",net_in_bytes=851i,net_out_bytes=23904i,open_connections=6i,percent_cache_dirty=0,percent_cache_used=0,queries_per_sec=2i,queued_reads=0i,queued_writes=0i,repl_commands_per_sec=0i,repl_deletes_per_sec=0i,repl_getmores_per_sec=0i,repl_inserts_per_sec=0i,repl_lag=0i,repl_queries_per_sec=0i,repl_updates_per_sec=0i,resident_megabytes=67i,state="PRIMARY",total_available=0i,total_created=0i,total_in_use=0i,total_refreshing=0i,ttl_deletes_per_sec=0i,ttl_passes_per_sec=0i,updates_per_sec=0i,vsize_megabytes=729i,wtcache_app_threads_page_read_count=4i,wtcache_app_threads_page_read_time=18i,wtcache_app_threads_page_write_count=6i,wtcache_bytes_read_into=10075i,wtcache_bytes_written_from=115711i,wtcache_current_bytes=86038i,wtcache_max_bytes_configured=1073741824i,wtcache_pages_evicted_by_app_thread=0i,wtcache_pages_queued_for_eviction=0i,wtcache_server_evicting_pages=0i,wtcache_tracked_dirty_bytes=0i,wtcache_worker_thread_evictingpages=0i 1522798796000000000
 mongodb_db_stats,db_name=local,hostname=127.0.0.1:27017 avg_obj_size=818.625,collections=5i,data_size=6549i,index_size=86016i,indexes=4i,num_extents=0i,objects=8i,ok=1i,storage_size=118784i,type="db_stat" 1522799074000000000
 mongodb_shard_stats,hostname=127.0.0.1:27017,in_use=3i,available=3i,created=4i,refreshing=0i 1522799074000000000
 ```
diff --git a/plugins/inputs/mongodb/mongodb_data.go b/plugins/inputs/mongodb/mongodb_data.go
index 9b4aa7580..19c15bd37 100644
--- a/plugins/inputs/mongodb/mongodb_data.go
+++ b/plugins/inputs/mongodb/mongodb_data.go
@@ -49,6 +49,10 @@ var DefaultStats = map[string]string{
 	"open_connections":    "NumConnections",
 	"ttl_deletes_per_sec": "DeletedDocuments",
 	"ttl_passes_per_sec":  "Passes",
+	"cursor_timed_out":    "TimedOutC",
+	"cursor_no_timeout":   "NoTimeoutC",
+	"cursor_pinned":       "PinnedC",
+	"cursor_total":        "TotalC",
 }
 
 var DefaultReplStats = map[string]string{
diff --git a/plugins/inputs/mongodb/mongodb_data_test.go b/plugins/inputs/mongodb/mongodb_data_test.go
index 21541dd95..56256e062 100644
--- a/plugins/inputs/mongodb/mongodb_data_test.go
+++ b/plugins/inputs/mongodb/mongodb_data_test.go
@@ -34,6 +34,10 @@ func TestAddNonReplStats(t *testing.T) {
 			NumConnections:   0,
 			Passes:           0,
 			DeletedDocuments: 0,
+			TimedOutC:        0,
+			NoTimeoutC:       0,
+			PinnedC:          0,
+			TotalC:           0,
 		},
 		tags,
 	)
@@ -211,6 +215,10 @@ func TestStateTag(t *testing.T) {
 		"total_available":       int64(0),
 		"total_created":         int64(0),
 		"total_refreshing":      int64(0),
+		"cursor_timed_out":      int64(0),
+		"cursor_no_timeout":     int64(0),
+		"cursor_pinned":         int64(0),
+		"cursor_total":          int64(0),
 	}
 	acc.AssertContainsTaggedFields(t, "mongodb", fields, stateTags)
 }
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index 92f2bb2f9..bb4158053 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -289,7 +289,8 @@ type OpcountStats struct {
 
 // MetricsStats stores information related to metrics
 type MetricsStats struct {
-	TTL *TTLStats `bson:"ttl"`
+	TTL    *TTLStats    `bson:"ttl"`
+	Cursor *CursorStats `bson:"cursor"`
 }
 
 // TTLStats stores information related to documents with a ttl index.
@@ -298,6 +299,19 @@ type TTLStats struct {
 	Passes           int64 `bson:"passes"`
 }
 
+// CursorStats stores information related to cursor metrics.
+type CursorStats struct {
+	TimedOut int64            `bson:"timedOut"`
+	Open     *OpenCursorStats `bson:"open"`
+}
+
+// OpenCursorStats stores information related to open cursor metrics
+type OpenCursorStats struct {
+	NoTimeout int64 `bson:"noTimeout"`
+	Pinned    int64 `bson:"pinned"`
+	Total     int64 `bson:"total"`
+}
+
 // ReadWriteLockTimes stores time spent holding read/write locks.
 type ReadWriteLockTimes struct {
 	Read       int64 `bson:"R"`
@@ -439,6 +453,10 @@ type StatLine struct {
 	// TTL fields
 	Passes, DeletedDocuments int64
 
+	// Cursor fields
+	TimedOutC                   int64
+	NoTimeoutC, PinnedC, TotalC int64
+
 	// Collection locks (3.0 mmap only)
 	CollectionLocks *CollectionLockStatus
 
@@ -582,9 +600,19 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		returnVal.Command = diff(newStat.Opcounters.Command, oldStat.Opcounters.Command, sampleSecs)
 	}
 
-	if newStat.Metrics != nil && newStat.Metrics.TTL != nil && oldStat.Metrics != nil && oldStat.Metrics.TTL != nil {
-		returnVal.Passes = diff(newStat.Metrics.TTL.Passes, oldStat.Metrics.TTL.Passes, sampleSecs)
-		returnVal.DeletedDocuments = diff(newStat.Metrics.TTL.DeletedDocuments, oldStat.Metrics.TTL.DeletedDocuments, sampleSecs)
+	if newStat.Metrics != nil && oldStat.Metrics != nil {
+		if newStat.Metrics.TTL != nil && oldStat.Metrics.TTL != nil {
+			returnVal.Passes = diff(newStat.Metrics.TTL.Passes, oldStat.Metrics.TTL.Passes, sampleSecs)
+			returnVal.DeletedDocuments = diff(newStat.Metrics.TTL.DeletedDocuments, oldStat.Metrics.TTL.DeletedDocuments, sampleSecs)
+		}
+		if newStat.Metrics.Cursor != nil && oldStat.Metrics.Cursor != nil {
+			returnVal.TimedOutC = diff(newStat.Metrics.Cursor.TimedOut, oldStat.Metrics.Cursor.TimedOut, sampleSecs)
+			if newStat.Metrics.Cursor.Open != nil && oldStat.Metrics.Cursor.Open != nil {
+				returnVal.NoTimeoutC = diff(newStat.Metrics.Cursor.Open.NoTimeout, oldStat.Metrics.Cursor.Open.NoTimeout, sampleSecs)
+				returnVal.PinnedC = diff(newStat.Metrics.Cursor.Open.Pinned, oldStat.Metrics.Cursor.Open.Pinned, sampleSecs)
+				returnVal.TotalC = diff(newStat.Metrics.Cursor.Open.Total, oldStat.Metrics.Cursor.Open.Total, sampleSecs)
+			}
+		}
 	}
 
 	if newStat.OpcountersRepl != nil && oldStat.OpcountersRepl != nil {

From cff2aa1863791dcabdfeddafca4715e79f9fd800 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 May 2018 15:01:40 -0700
Subject: [PATCH 1156/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12ad65d38..c7a739321 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - [#3877](https://github.com/influxdata/telegraf/pull/3877): Support busybox ping in the ping input.
 - [#4077](https://github.com/influxdata/telegraf/pull/4077): Add input plugin for McRouter.
 - [#4096](https://github.com/influxdata/telegraf/pull/4096): Add topk processor plugin.
+- [#4114](https://github.com/influxdata/telegraf/pull/4114): Add cursor metrics to mongodb input.
 
 ### Bugfixes
 

From ce58926feb0dbedbfec7b0962551738e7de98ab1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 May 2018 15:12:01 -0700
Subject: [PATCH 1157/1302] Run apt-get update in release.sh

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index 8ac0156da..41b95db01 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -20,6 +20,7 @@ run gzip telegraf -c > "$ARTIFACT_DIR/telegraf.gz"
 
 # RPM is used to build packages for Enterprise Linux hosts.
 # Boto is used to upload packages to S3.
+run sudo apt-get update
 run sudo apt-get install -y rpm python-boto ruby ruby-dev autoconf libtool
 run sudo gem install fpm
 

From c16ecaa124984c7eed4706d84b13e6c069c712b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 7 May 2018 18:18:01 -0700
Subject: [PATCH 1158/1302] Don't report 0ms on timeout in dns_query (#4118)

---
 plugins/inputs/dns_query/README.md    | 42 ++++++++++-----------------
 plugins/inputs/dns_query/dns_query.go | 38 ++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/plugins/inputs/dns_query/README.md b/plugins/inputs/dns_query/README.md
index 6110f5a7d..766d9811f 100644
--- a/plugins/inputs/dns_query/README.md
+++ b/plugins/inputs/dns_query/README.md
@@ -3,9 +3,8 @@
 The DNS plugin gathers dns query times in miliseconds - like [Dig](https://en.wikipedia.org/wiki/Dig_\(command\))
 
 ### Configuration:
-
-```
-# Sample Config:
+```toml
+# Query given DNS server and gives statistics
 [[inputs.dns_query]]
   ## servers to query
   servers = ["8.8.8.8"]
@@ -27,29 +26,20 @@ The DNS plugin gathers dns query times in miliseconds - like [Dig](https://en.wi
   # timeout = 2
 ```
 
-For querying more than one record type make:
+### Metrics:
+
+- dns_query
+  - tags:
+    - server
+    - domain
+    - record_type
+    - result
+  - fields:
+    - query_time_ms (float)
+    - result_code (int, success = 0, timeout = 1, error = 2)
+
+### Example Output:
 
 ```
-[[inputs.dns_query]]
-  domains = ["mjasion.pl"]
-  servers = ["8.8.8.8", "8.8.4.4"]
-  record_type = "A"
-
-[[inputs.dns_query]]
-  domains = ["mjasion.pl"]
-  servers = ["8.8.8.8", "8.8.4.4"]
-  record_type = "MX"
-```
-
-### Tags:
-
-- server
-- domain
-- record_type
-
-### Example output:
-
-```
-telegraf --input-filter dns_query --test
-> dns_query,domain=mjasion.pl,record_type=A,server=8.8.8.8 query_time_ms=67.189842 1456082743585760680
+dns_query,domain=mjasion.pl,record_type=A,server=8.8.8.8 query_time_ms=67.189842 1456082743585760680
 ```
diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go
index 04ce8328d..98fcc09c2 100644
--- a/plugins/inputs/dns_query/dns_query.go
+++ b/plugins/inputs/dns_query/dns_query.go
@@ -13,6 +13,14 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+type ResultType uint64
+
+const (
+	Success ResultType = 0
+	Timeout            = 1
+	Error              = 2
+)
+
 type DnsQuery struct {
 	// Domains or subdomains to query
 	Domains []string
@@ -66,15 +74,24 @@ func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 
 	for _, domain := range d.Domains {
 		for _, server := range d.Servers {
-			dnsQueryTime, err := d.getDnsQueryTime(domain, server)
-			acc.AddError(err)
+			fields := make(map[string]interface{}, 2)
 			tags := map[string]string{
 				"server":      server,
 				"domain":      domain,
 				"record_type": d.RecordType,
 			}
 
-			fields := map[string]interface{}{"query_time_ms": dnsQueryTime}
+			dnsQueryTime, err := d.getDnsQueryTime(domain, server)
+			if err == nil {
+				setResult(Success, fields, tags)
+				fields["query_time_ms"] = dnsQueryTime
+			} else if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
+				setResult(Timeout, fields, tags)
+			} else if err != nil {
+				setResult(Error, fields, tags)
+				acc.AddError(err)
+			}
+
 			acc.AddFields("dns_query", fields, tags)
 		}
 	}
@@ -165,6 +182,21 @@ func (d *DnsQuery) parseRecordType() (uint16, error) {
 	return recordType, error
 }
 
+func setResult(result ResultType, fields map[string]interface{}, tags map[string]string) {
+	var tag string
+	switch result {
+	case Success:
+		tag = "success"
+	case Timeout:
+		tag = "timeout"
+	case Error:
+		tag = "error"
+	}
+
+	tags["result"] = tag
+	fields["result_code"] = uint64(result)
+}
+
 func init() {
 	inputs.Add("dns_query", func() telegraf.Input {
 		return &DnsQuery{}

From 1c6cfcfbab9739358a9a457ac8980043a5d3a7d0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 May 2018 18:19:55 -0700
Subject: [PATCH 1159/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a739321..491b2b558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
+- [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 
 ## v1.6.2 [unreleased]
 

From 339c5d0312b05d04461d27403b20de78e7ba6195 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 7 May 2018 18:41:05 -0700
Subject: [PATCH 1160/1302] Add instructions on how to repair windows
 performance counters

---
 plugins/inputs/win_perf_counters/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index 8627d02fd..242d76f3b 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -334,3 +334,16 @@ if any of the combinations of ObjectName/Instances/Counters are invalid.
     Measurement = "win_dotnet_security"
     #IncludeTotal=false #Set to true to include _Total instance when querying for all (*).
 ```
+
+## Troubleshooting
+
+If no metrics are emitted even with the default config, you may need to repair
+your performance counters.
+
+1. Launch Command Prompt as Administrator (right click Runs As Administrator).
+1. Drop into the C:\WINDOWS\System32 directory by typing `C:` then `cd \Windows\System32`
+1. Rebuild your counter values, which may take a few moments so please be
+   patient, by running:
+   ```
+   lodctr /r
+   ```

From b11468757ceab4e424a425a686c4bd72bf358fc3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 8 May 2018 12:10:25 -0700
Subject: [PATCH 1161/1302] Add uint/bool support to cratedb output (#4117)

---
 docker-compose.yml                      | 24 ++++++++++++------------
 plugins/outputs/cratedb/cratedb.go      | 19 +++++++++++++++----
 plugins/outputs/cratedb/cratedb_test.go |  8 ++++----
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7dd3feeb4..822d7fff1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -79,15 +79,15 @@ services:
       - "389:389"
       - "636:636"
   crate:
-   image: crate/crate
-   ports:
-    - "4200:4200"
-    - "4230:4230"
-   command:
-    - crate
-    - -Cnetwork.host=0.0.0.0
-    - -Ctransport.host=localhost
-    - -Clicense.enterprise=false
-   environment:
-    - CRATE_HEAP_SIZE=128m
-    - JAVA_OPTS='-Xms256m -Xmx256m'
+    image: crate/crate
+    ports:
+      - "4200:4200"
+      - "4230:4230"
+      - "5432:5432"
+    command:
+      - crate
+      - -Cnetwork.host=0.0.0.0
+      - -Ctransport.host=localhost
+      - -Clicense.enterprise=false
+    environment:
+      - CRATE_HEAP_SIZE=128m
diff --git a/plugins/outputs/cratedb/cratedb.go b/plugins/outputs/cratedb/cratedb.go
index 5a5987c77..01213011f 100644
--- a/plugins/outputs/cratedb/cratedb.go
+++ b/plugins/outputs/cratedb/cratedb.go
@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -16,6 +17,8 @@ import (
 	_ "github.com/jackc/pgx/stdlib"
 )
 
+const MaxInt64 = int64(^uint64(0) >> 1)
+
 type CrateDB struct {
 	URL         string
 	Timeout     internal.Duration
@@ -115,11 +118,19 @@ func escapeValue(val interface{}) (string, error) {
 	switch t := val.(type) {
 	case string:
 		return escapeString(t, `'`), nil
-	// We don't handle uint, uint32 and uint64 here because CrateDB doesn't
-	// seem to support unsigned types. But it seems like input plugins don't
-	// produce those types, so it's hopefully ok.
-	case int, int32, int64, float32, float64:
+	case int64, float64:
 		return fmt.Sprint(t), nil
+	case uint64:
+		// The long type is the largest integer type in CrateDB and is the
+		// size of a signed int64.  If our value is too large send the largest
+		// possible value.
+		if t <= uint64(MaxInt64) {
+			return strconv.FormatInt(int64(t), 10), nil
+		} else {
+			return strconv.FormatInt(MaxInt64, 10), nil
+		}
+	case bool:
+		return strconv.FormatBool(t), nil
 	case time.Time:
 		// see https://crate.io/docs/crate/reference/sql/data_types.html#timestamp
 		return escapeValue(t.Format("2006-01-02T15:04:05.999-0700"))
diff --git a/plugins/outputs/cratedb/cratedb_test.go b/plugins/outputs/cratedb/cratedb_test.go
index be1d889c0..0cd93e827 100644
--- a/plugins/outputs/cratedb/cratedb_test.go
+++ b/plugins/outputs/cratedb/cratedb_test.go
@@ -111,12 +111,12 @@ func Test_escapeValue(t *testing.T) {
 		{`foo`, `'foo'`},
 		{`foo'bar 'yeah`, `'foo''bar ''yeah'`},
 		// int types
-		{123, `123`}, // int
 		{int64(123), `123`},
-		{int32(123), `123`},
+		{uint64(123), `123`},
+		{uint64(MaxInt64) + 1, `9223372036854775807`},
+		{true, `true`},
+		{false, `false`},
 		// float types
-		{123.456, `123.456`},
-		{float32(123.456), `123.456`}, // floating point SNAFU
 		{float64(123.456), `123.456`},
 		// time.Time
 		{time.Date(2017, 8, 7, 16, 44, 52, 123*1000*1000, time.FixedZone("Dreamland", 5400)), `'2017-08-07T16:44:52.123+0130'`},

From 2a2cc3212f89a104cea6010ef9d267f292fec6ec Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 8 May 2018 12:12:03 -0700
Subject: [PATCH 1162/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 491b2b558..ec26d1b04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,7 @@
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 
-## v1.6.2 [unreleased]
+## v1.6.2 [2018-05-08]
 
 ### Bugfixes
 
@@ -50,6 +50,7 @@
 - [#4091](https://github.com/influxdata/telegraf/pull/4091): Fix handling of uint64 in datadog output.
 - [#4099](https://github.com/influxdata/telegraf/pull/4099): Ignore UTF8 BOM in JSON parser.
 - [#4104](https://github.com/influxdata/telegraf/issues/4104): Fix case for slave metrics in mysql input.
+- [#4110](https://github.com/influxdata/telegraf/issues/4110): Fix uint support in cratedb output.
 
 ## v1.6.1 [2018-04-23]
 

From 2bf2b51039192609c54387b27ab081b20286c060 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 8 May 2018 13:11:12 -0700
Subject: [PATCH 1163/1302] Skip fields that report "not supported" in
 nvidia-smi (#4123)

---
 plugins/inputs/nvidia_smi/nvidia_smi.go      | 9 +++++++--
 plugins/inputs/nvidia_smi/nvidia_smi_test.go | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go
index 35e56c9b7..efac941b9 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -125,15 +125,20 @@ func parseLine(line string) (map[string]string, map[string]interface{}, error) {
 	// Make sure there are as many metrics in the line as there were queried.
 	if len(met) == len(metricNames) {
 		for i, m := range metricNames {
+			col := strings.TrimSpace(met[i])
 
 			// First handle the tags
 			if m[1] == "tag" {
-				tags[m[0]] = strings.TrimSpace(met[i])
+				tags[m[0]] = col
+				continue
+			}
+
+			if strings.Contains(col, "[Not Supported]") {
 				continue
 			}
 
 			// Then parse the integers out of the fields
-			out, err := strconv.ParseInt(strings.TrimSpace(met[i]), 10, 64)
+			out, err := strconv.ParseInt(col, 10, 64)
 			if err != nil {
 				return tags, fields, err
 			}
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi_test.go b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
index 62ddee3b8..573a69b19 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi_test.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
@@ -2,6 +2,8 @@ package nvidia_smi
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestParseLineStandard(t *testing.T) {
@@ -33,3 +35,10 @@ func TestParseLineBad(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestParseLineNotSupported(t *testing.T) {
+	line := "[Not Supported], 7606, 0, 7606, P0, 38, Tesla P4, GPU-xxx, Default, 0, 0, 0\n"
+	_, fields, err := parseLine(line)
+	require.NoError(t, err)
+	require.Equal(t, nil, fields["fan_speed"])
+}

From 5953db88df68d89235cebe121371160346f9559d Mon Sep 17 00:00:00 2001
From: Randy Coburn <morfien101@gmail.com>
Date: Wed, 9 May 2018 00:07:15 +0100
Subject: [PATCH 1164/1302] Add tag/integer pair for result to net_response
 (#3455)

---
 plugins/inputs/net_response/README.md         |  20 ++--
 plugins/inputs/net_response/net_response.go   | 103 +++++++++++------
 .../inputs/net_response/net_response_test.go  | 104 +++++++++++++++---
 3 files changed, 171 insertions(+), 56 deletions(-)

diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index 01c681b55..50dbc9f87 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -59,7 +59,9 @@ It can also check response text.
 
 - net_response
     - response_time (float, seconds)
-    - result_type (string) # success, timeout, connection_failed, read_failed, string_mismatch
+    - success (int) # success 0, failure 1
+    - result_code (int) # success = 0, Failure = 1
+    - [**DEPRECATED**] result_type (string) # success, timeout, connection_failed, read_failed, string_mismatch
     - [**DEPRECATED**] string_found (boolean)
 
 ### Tags:
@@ -68,16 +70,16 @@ It can also check response text.
     - server
     - port
     - protocol
+    - result_text (string) # This will contain the text from the now deprecated result_type
 
 ### Example Output:
 
 ```
-$ ./telegraf --config telegraf.conf --input-filter net_response --test
-net_response,server=influxdata.com,port=8080,protocol=tcp,host=localhost result_type="timeout" 1499310361000000000
-net_response,server=influxdata.com,port=443,protocol=tcp,host=localhost result_type="success",response_time=0.088703864 1499310361000000000
-net_response,protocol=tcp,host=localhost,server=this.domain.does.not.exist,port=443 result_type="connection_failed" 1499310361000000000
-net_response,protocol=udp,host=localhost,server=influxdata.com,port=8080 result_type="read_failed" 1499310362000000000
-net_response,port=31338,protocol=udp,host=localhost,server=localhost result_type="string_mismatch",string_found=false,response_time=0.00242682 1499310362000000000
-net_response,protocol=udp,host=localhost,server=localhost,port=31338 response_time=0.001128598,result_type="success",string_found=true 1499310362000000000
-net_response,server=this.domain.does.not.exist,port=443,protocol=udp,host=localhost result_type="connection_failed" 1499310362000000000
+net_response,server=influxdata.com,port=8080,protocol=tcp,host=localhost,result_text="timeout" result_code=1i,result_type="timeout" 1499310361000000000
+net_response,server=influxdata.com,port=443,protocol=tcp,host=localhost,result_text="success" result_code=0i,result_type="success",response_time=0.088703864 1499310361000000000
+net_response,protocol=tcp,host=localhost,server=this.domain.does.not.exist,port=443,result_text="connection_failed" result_code=1i,result_type="connection_failed" 1499310361000000000
+net_response,protocol=udp,host=localhost,server=influxdata.com,port=8080,result_text="read_failed" result_code=1i,result_type="read_failed" 1499310362000000000
+net_response,port=31338,protocol=udp,host=localhost,server=localhost,result_text="string_mismatch" result_code=1i,result_type="string_mismatch",string_found=false,response_time=0.00242682 1499310362000000000
+net_response,protocol=udp,host=localhost,server=localhost,port=31338,result_text="success" response_time=0.001128598,result_code=0i,result_type="success",string_found=true 1499310362000000000
+net_response,server=this.domain.does.not.exist,port=443,protocol=udp,host=localhost,result_text="connection_failed" result_code=1i,result_type="connection_failed" 1499310362000000000
 ```
diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
index 75d0a328a..75986843f 100644
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -13,7 +13,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-// NetResponses struct
+// NetResponse struct
 type NetResponse struct {
 	Address     string
 	Timeout     internal.Duration
@@ -23,8 +23,11 @@ type NetResponse struct {
 	Protocol    string
 }
 
-func (_ *NetResponse) Description() string {
-	return "TCP or UDP 'ping' given url and collect response time in seconds"
+var description = "TCP or UDP 'ping' given url and collect response time in seconds"
+
+// Description will return a short string to explain what the plugin does.
+func (*NetResponse) Description() string {
+	return description
 }
 
 var sampleConfig = `
@@ -49,13 +52,17 @@ var sampleConfig = `
   # expect = "ssh"
 `
 
-func (_ *NetResponse) SampleConfig() string {
+// SampleConfig will return a complete configuration example with details about each field.
+func (*NetResponse) SampleConfig() string {
 	return sampleConfig
 }
 
-func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
-	// Prepare fields
-	fields := make(map[string]interface{})
+// TCPGather will execute if there are TCP tests defined in the configuration.
+// It will return a map[string]interface{} for fields and a map[string]string for tags
+func (n *NetResponse) TCPGather() (tags map[string]string, fields map[string]interface{}) {
+	// Prepare returns
+	tags = make(map[string]string)
+	fields = make(map[string]interface{})
 	// Start Timer
 	start := time.Now()
 	// Connecting
@@ -65,11 +72,15 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 	// Handle error
 	if err != nil {
 		if e, ok := err.(net.Error); ok && e.Timeout() {
+			tags["result_text"] = "timeout"
+			fields["result_code"] = 1
 			fields["result_type"] = "timeout"
 		} else {
+			tags["result_text"] = "connection_failed"
+			fields["result_code"] = 1
 			fields["result_type"] = "connection_failed"
 		}
-		return fields, nil
+		return tags, fields
 	}
 	defer conn.Close()
 	// Send string if needed
@@ -92,30 +103,42 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 		responseTime = time.Since(start).Seconds()
 		// Handle error
 		if err != nil {
+			tags["result_text"] = "read_failed"
+			fields["result_code"] = 1
 			fields["string_found"] = false
-			fields["result_type"] = "read_failed"
+			tags["result_type"] = "read_failed"
+			fields["success"] = 1
 		} else {
 			// Looking for string in answer
 			RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 			find := RegEx.FindString(string(data))
 			if find != "" {
+				tags["result_text"] = "success"
+				fields["result_code"] = 0
 				fields["result_type"] = "success"
 				fields["string_found"] = true
 			} else {
+				tags["result_text"] = "string_mismatch"
+				fields["result_code"] = 1
 				fields["result_type"] = "string_mismatch"
 				fields["string_found"] = false
 			}
 		}
 	} else {
+		tags["result_text"] = "success"
+		fields["result_code"] = 0
 		fields["result_type"] = "success"
 	}
 	fields["response_time"] = responseTime
-	return fields, nil
+	return tags, fields
 }
 
-func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
-	// Prepare fields
-	fields := make(map[string]interface{})
+// UDPGather will execute if there are UDP tests defined in the configuration.
+// It will return a map[string]interface{} for fields and a map[string]string for tags
+func (n *NetResponse) UDPGather() (tags map[string]string, fields map[string]interface{}) {
+	// Prepare returns
+	tags = make(map[string]string)
+	fields = make(map[string]interface{})
 	// Start Timer
 	start := time.Now()
 	// Resolving
@@ -125,8 +148,10 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 	conn, err := net.DialUDP("udp", LocalAddr, udpAddr)
 	// Handle error
 	if err != nil {
+		tags["result_text"] = "connection_failed"
+		fields["result_code"] = 1
 		fields["result_type"] = "connection_failed"
-		return fields, nil
+		return tags, fields
 	}
 	defer conn.Close()
 	// Send string
@@ -142,24 +167,35 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 	responseTime := time.Since(start).Seconds()
 	// Handle error
 	if err != nil {
+		tags["result_text"] = "read_failed"
+		fields["result_code"] = 1
 		fields["result_type"] = "read_failed"
-		return fields, nil
-	} else {
-		// Looking for string in answer
-		RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
-		find := RegEx.FindString(string(buf))
-		if find != "" {
-			fields["result_type"] = "success"
-			fields["string_found"] = true
-		} else {
-			fields["result_type"] = "string_mismatch"
-			fields["string_found"] = false
-		}
+		return tags, fields
 	}
+
+	// Looking for string in answer
+	RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
+	find := RegEx.FindString(string(buf))
+	if find != "" {
+		tags["result_text"] = "success"
+		fields["result_code"] = 0
+		fields["result_type"] = "success"
+		fields["string_found"] = true
+	} else {
+		tags["result_text"] = "string_mismatch"
+		fields["result_code"] = 1
+		fields["result_type"] = "string_mismatch"
+		fields["string_found"] = false
+	}
+
 	fields["response_time"] = responseTime
-	return fields, nil
+
+	return tags, fields
 }
 
+// Gather is called by telegraf when the plugin is executed on its interval.
+// It will call either UDPGather or TCPGather based on the configuration and
+// also fill an Accumulator that is supplied.
 func (n *NetResponse) Gather(acc telegraf.Accumulator) error {
 	// Set default values
 	if n.Timeout.Duration == 0 {
@@ -189,18 +225,23 @@ func (n *NetResponse) Gather(acc telegraf.Accumulator) error {
 	// Prepare data
 	tags := map[string]string{"server": host, "port": port}
 	var fields map[string]interface{}
+	var returnTags map[string]string
 	// Gather data
 	if n.Protocol == "tcp" {
-		fields, err = n.TcpGather()
+		returnTags, fields = n.TCPGather()
 		tags["protocol"] = "tcp"
 	} else if n.Protocol == "udp" {
-		fields, err = n.UdpGather()
+		returnTags, fields = n.UDPGather()
 		tags["protocol"] = "udp"
 	} else {
 		return errors.New("Bad protocol")
 	}
-	if err != nil {
-		return err
+	for key, value := range returnTags {
+		tags[key] = value
+	}
+	// Merge the tags
+	for k, v := range returnTags {
+		tags[k] = v
 	}
 	// Add metrics
 	acc.AddFields("net_response", fields, tags)
diff --git a/plugins/inputs/net_response/net_response_test.go b/plugins/inputs/net_response/net_response_test.go
index c7bfb579a..0f1ab2f71 100644
--- a/plugins/inputs/net_response/net_response_test.go
+++ b/plugins/inputs/net_response/net_response_test.go
@@ -13,6 +13,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestSample(t *testing.T) {
+	c := &NetResponse{}
+	output := c.SampleConfig()
+	if output != sampleConfig {
+		t.Error("Sample config doesn't match")
+	}
+}
+
+func TestDescription(t *testing.T) {
+	c := &NetResponse{}
+	output := c.Description()
+	if output != description {
+		t.Error("Description output is not correct")
+	}
+}
 func TestBadProtocol(t *testing.T) {
 	var acc testutil.Accumulator
 	// Init plugin
@@ -26,6 +41,50 @@ func TestBadProtocol(t *testing.T) {
 	assert.Equal(t, "Bad protocol", err1.Error())
 }
 
+func TestNoPort(t *testing.T) {
+	var acc testutil.Accumulator
+	c := NetResponse{
+		Protocol: "tcp",
+		Address:  ":",
+	}
+	err1 := c.Gather(&acc)
+	require.Error(t, err1)
+	assert.Equal(t, "Bad port", err1.Error())
+}
+
+func TestAddressOnly(t *testing.T) {
+	var acc testutil.Accumulator
+	c := NetResponse{
+		Protocol: "tcp",
+		Address:  "127.0.0.1",
+	}
+	err1 := c.Gather(&acc)
+	require.Error(t, err1)
+	assert.Equal(t, "address 127.0.0.1: missing port in address", err1.Error())
+}
+
+func TestSendExpectStrings(t *testing.T) {
+	var acc testutil.Accumulator
+	tc := NetResponse{
+		Protocol: "udp",
+		Address:  "127.0.0.1:7",
+		Send:     "",
+		Expect:   "toast",
+	}
+	uc := NetResponse{
+		Protocol: "udp",
+		Address:  "127.0.0.1:7",
+		Send:     "toast",
+		Expect:   "",
+	}
+	err1 := tc.Gather(&acc)
+	require.Error(t, err1)
+	assert.Equal(t, "Send string cannot be empty", err1.Error())
+	err2 := uc.Gather(&acc)
+	require.Error(t, err2)
+	assert.Equal(t, "Expected string cannot be empty", err2.Error())
+}
+
 func TestTCPError(t *testing.T) {
 	var acc testutil.Accumulator
 	// Init plugin
@@ -39,12 +98,14 @@ func TestTCPError(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_code": 1,
 			"result_type": "connection_failed",
 		},
 		map[string]string{
-			"server":   "",
-			"port":     "9999",
-			"protocol": "tcp",
+			"server":      "",
+			"port":        "9999",
+			"protocol":    "tcp",
+			"result_text": "connection_failed",
 		},
 	)
 }
@@ -77,13 +138,16 @@ func TestTCPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_code":   0,
 			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},
-		map[string]string{"server": "127.0.0.1",
-			"port":     "2004",
-			"protocol": "tcp",
+		map[string]string{
+			"result_text": "success",
+			"server":      "127.0.0.1",
+			"port":        "2004",
+			"protocol":    "tcp",
 		},
 	)
 	// Waiting TCPserver
@@ -118,20 +182,23 @@ func TestTCPOK2(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_code":   1,
 			"result_type":   "string_mismatch",
 			"string_found":  false,
 			"response_time": 1.0,
 		},
-		map[string]string{"server": "127.0.0.1",
-			"port":     "2004",
-			"protocol": "tcp",
+		map[string]string{
+			"result_text": "string_mismatch",
+			"server":      "127.0.0.1",
+			"port":        "2004",
+			"protocol":    "tcp",
 		},
 	)
 	// Waiting TCPserver
 	wg.Wait()
 }
 
-func TestUDPrror(t *testing.T) {
+func TestUDPError(t *testing.T) {
 	var acc testutil.Accumulator
 	// Init plugin
 	c := NetResponse{
@@ -151,13 +218,15 @@ func TestUDPrror(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_code":   1,
 			"result_type":   "read_failed",
 			"response_time": 1.0,
 		},
 		map[string]string{
-			"server":   "",
-			"port":     "9999",
-			"protocol": "udp",
+			"result_text": "read_failed",
+			"server":      "",
+			"port":        "9999",
+			"protocol":    "udp",
 		},
 	)
 }
@@ -190,13 +259,16 @@ func TestUDPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
+			"result_code":   0,
 			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},
-		map[string]string{"server": "127.0.0.1",
-			"port":     "2004",
-			"protocol": "udp",
+		map[string]string{
+			"result_text": "success",
+			"server":      "127.0.0.1",
+			"port":        "2004",
+			"protocol":    "udp",
 		},
 	)
 	// Waiting TCPserver

From 3ef28e332fe8dba93fd873542c16effb6cb4e54c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 8 May 2018 16:04:28 -0700
Subject: [PATCH 1165/1302] Use result and result_code in net_response

---
 plugins/inputs/net_response/README.md         | 70 +++++---------
 plugins/inputs/net_response/net_response.go   | 93 +++++++++++--------
 .../inputs/net_response/net_response_test.go  | 51 +++++-----
 3 files changed, 101 insertions(+), 113 deletions(-)

diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
index 50dbc9f87..1982ced0c 100644
--- a/plugins/inputs/net_response/README.md
+++ b/plugins/inputs/net_response/README.md
@@ -1,11 +1,12 @@
 # Network Response Input Plugin
 
-The input plugin test UDP/TCP connections response time.
-It can also check response text.
+The input plugin test UDP/TCP connections response time and can optional
+verify text in the response.
 
 ### Configuration:
 
-```
+```toml
+# Collect response time of a TCP or UDP connection
 [[inputs.net_response]]
   ## Protocol, must be "tcp" or "udp"
   ## NOTE: because the "udp" protocol does not respond to requests, it requires
@@ -13,11 +14,12 @@ It can also check response text.
   protocol = "tcp"
   ## Server address (default localhost)
   address = "localhost:80"
+
   ## Set timeout
-  timeout = "1s"
+  # timeout = "1s"
 
   ## Set read timeout (only used if expecting a response)
-  read_timeout = "1s"
+  # read_timeout = "1s"
 
   ## The following options are required for UDP checks. For TCP, they are
   ## optional. The plugin will send the given string to the server and then
@@ -27,59 +29,29 @@ It can also check response text.
   ## expected string in answer
   # expect = "ssh"
 
-[[inputs.net_response]]
-  protocol = "tcp"
-  address = ":80"
-
-# TCP or UDP 'ping' given url and collect response time in seconds
-[[inputs.net_response]]
-  ## Protocol, must be "tcp" or "udp"
-  protocol = "tcp"
-  ## Server address (default localhost)
-  address = "github.com:80"
-  ## Set timeout
-  timeout = "1s"
-
-  ## Optional string sent to the server
-  send = "ssh"
-  ## Optional expected string in answer
-  expect = "ssh"
-  ## Set read timeout (only used if expecting a response)
-  read_timeout = "1s"
-
-[[inputs.net_response]]
-  protocol = "udp"
-  address = "localhost:161"
-  timeout = "2s"
-  send = "hello server"
-  expect = "hello client"
+  ## Uncomment to remove deprecated fields; recommended for new deploys
+  # fieldexclude = ["result_type", "string_found"]
 ```
 
-### Measurements & Fields:
+### Metrics:
 
 - net_response
-    - response_time (float, seconds)
-    - success (int) # success 0, failure 1
-    - result_code (int) # success = 0, Failure = 1
-    - [**DEPRECATED**] result_type (string) # success, timeout, connection_failed, read_failed, string_mismatch
-    - [**DEPRECATED**] string_found (boolean)
-
-### Tags:
-
-- All measurements have the following tags:
+  - tags:
     - server
     - port
     - protocol
-    - result_text (string) # This will contain the text from the now deprecated result_type
+    - result
+  - fields:
+    - response_time (float, seconds)
+    - success (int) # success 0, failure 1
+    - result_code (int, success = 0, timeout = 1, connection_failed = 2, read_failed = 3, string_mismatch = 4)
+    - result_type (string) **DEPRECATED in 1.7; use result tag**
+    - string_found (boolean) **DEPRECATED in 1.4; use result tag**
 
 ### Example Output:
 
 ```
-net_response,server=influxdata.com,port=8080,protocol=tcp,host=localhost,result_text="timeout" result_code=1i,result_type="timeout" 1499310361000000000
-net_response,server=influxdata.com,port=443,protocol=tcp,host=localhost,result_text="success" result_code=0i,result_type="success",response_time=0.088703864 1499310361000000000
-net_response,protocol=tcp,host=localhost,server=this.domain.does.not.exist,port=443,result_text="connection_failed" result_code=1i,result_type="connection_failed" 1499310361000000000
-net_response,protocol=udp,host=localhost,server=influxdata.com,port=8080,result_text="read_failed" result_code=1i,result_type="read_failed" 1499310362000000000
-net_response,port=31338,protocol=udp,host=localhost,server=localhost,result_text="string_mismatch" result_code=1i,result_type="string_mismatch",string_found=false,response_time=0.00242682 1499310362000000000
-net_response,protocol=udp,host=localhost,server=localhost,port=31338,result_text="success" response_time=0.001128598,result_code=0i,result_type="success",string_found=true 1499310362000000000
-net_response,server=this.domain.does.not.exist,port=443,protocol=udp,host=localhost,result_text="connection_failed" result_code=1i,result_type="connection_failed" 1499310362000000000
+net_response,port=8086,protocol=tcp,result=success,server=localhost response_time=0.000092948,result_code=0i,result_type="success" 1525820185000000000
+net_response,port=8080,protocol=tcp,result=connection_failed,server=localhost result_code=2i,result_type="connection_failed" 1525820088000000000
+net_response,port=8080,protocol=udp,result=read_failed,server=localhost result_code=3i,result_type="read_failed",string_found=false 1525820088000000000
 ```
diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
index 75986843f..66511a319 100644
--- a/plugins/inputs/net_response/net_response.go
+++ b/plugins/inputs/net_response/net_response.go
@@ -13,6 +13,16 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
+type ResultType uint64
+
+const (
+	Success          ResultType = 0
+	Timeout                     = 1
+	ConnectionFailed            = 2
+	ReadFailed                  = 3
+	StringMismatch              = 4
+)
+
 // NetResponse struct
 type NetResponse struct {
 	Address     string
@@ -23,7 +33,7 @@ type NetResponse struct {
 	Protocol    string
 }
 
-var description = "TCP or UDP 'ping' given url and collect response time in seconds"
+var description = "Collect response time of a TCP or UDP connection"
 
 // Description will return a short string to explain what the plugin does.
 func (*NetResponse) Description() string {
@@ -37,11 +47,12 @@ var sampleConfig = `
   protocol = "tcp"
   ## Server address (default localhost)
   address = "localhost:80"
+
   ## Set timeout
-  timeout = "1s"
+  # timeout = "1s"
 
   ## Set read timeout (only used if expecting a response)
-  read_timeout = "1s"
+  # read_timeout = "1s"
 
   ## The following options are required for UDP checks. For TCP, they are
   ## optional. The plugin will send the given string to the server and then
@@ -50,6 +61,9 @@ var sampleConfig = `
   # send = "ssh"
   ## expected string in answer
   # expect = "ssh"
+
+  ## Uncomment to remove deprecated fields
+  # fieldexclude = ["result_type", "string_found"]
 `
 
 // SampleConfig will return a complete configuration example with details about each field.
@@ -72,13 +86,9 @@ func (n *NetResponse) TCPGather() (tags map[string]string, fields map[string]int
 	// Handle error
 	if err != nil {
 		if e, ok := err.(net.Error); ok && e.Timeout() {
-			tags["result_text"] = "timeout"
-			fields["result_code"] = 1
-			fields["result_type"] = "timeout"
+			setResult(Timeout, fields, tags, n.Expect)
 		} else {
-			tags["result_text"] = "connection_failed"
-			fields["result_code"] = 1
-			fields["result_type"] = "connection_failed"
+			setResult(ConnectionFailed, fields, tags, n.Expect)
 		}
 		return tags, fields
 	}
@@ -103,31 +113,19 @@ func (n *NetResponse) TCPGather() (tags map[string]string, fields map[string]int
 		responseTime = time.Since(start).Seconds()
 		// Handle error
 		if err != nil {
-			tags["result_text"] = "read_failed"
-			fields["result_code"] = 1
-			fields["string_found"] = false
-			tags["result_type"] = "read_failed"
-			fields["success"] = 1
+			setResult(ReadFailed, fields, tags, n.Expect)
 		} else {
 			// Looking for string in answer
 			RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 			find := RegEx.FindString(string(data))
 			if find != "" {
-				tags["result_text"] = "success"
-				fields["result_code"] = 0
-				fields["result_type"] = "success"
-				fields["string_found"] = true
+				setResult(Success, fields, tags, n.Expect)
 			} else {
-				tags["result_text"] = "string_mismatch"
-				fields["result_code"] = 1
-				fields["result_type"] = "string_mismatch"
-				fields["string_found"] = false
+				setResult(StringMismatch, fields, tags, n.Expect)
 			}
 		}
 	} else {
-		tags["result_text"] = "success"
-		fields["result_code"] = 0
-		fields["result_type"] = "success"
+		setResult(Success, fields, tags, n.Expect)
 	}
 	fields["response_time"] = responseTime
 	return tags, fields
@@ -148,9 +146,7 @@ func (n *NetResponse) UDPGather() (tags map[string]string, fields map[string]int
 	conn, err := net.DialUDP("udp", LocalAddr, udpAddr)
 	// Handle error
 	if err != nil {
-		tags["result_text"] = "connection_failed"
-		fields["result_code"] = 1
-		fields["result_type"] = "connection_failed"
+		setResult(ConnectionFailed, fields, tags, n.Expect)
 		return tags, fields
 	}
 	defer conn.Close()
@@ -167,9 +163,7 @@ func (n *NetResponse) UDPGather() (tags map[string]string, fields map[string]int
 	responseTime := time.Since(start).Seconds()
 	// Handle error
 	if err != nil {
-		tags["result_text"] = "read_failed"
-		fields["result_code"] = 1
-		fields["result_type"] = "read_failed"
+		setResult(ReadFailed, fields, tags, n.Expect)
 		return tags, fields
 	}
 
@@ -177,15 +171,9 @@ func (n *NetResponse) UDPGather() (tags map[string]string, fields map[string]int
 	RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 	find := RegEx.FindString(string(buf))
 	if find != "" {
-		tags["result_text"] = "success"
-		fields["result_code"] = 0
-		fields["result_type"] = "success"
-		fields["string_found"] = true
+		setResult(Success, fields, tags, n.Expect)
 	} else {
-		tags["result_text"] = "string_mismatch"
-		fields["result_code"] = 1
-		fields["result_type"] = "string_mismatch"
-		fields["string_found"] = false
+		setResult(StringMismatch, fields, tags, n.Expect)
 	}
 
 	fields["response_time"] = responseTime
@@ -248,6 +236,33 @@ func (n *NetResponse) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
+func setResult(result ResultType, fields map[string]interface{}, tags map[string]string, expect string) {
+	var tag string
+	switch result {
+	case Success:
+		tag = "success"
+	case Timeout:
+		tag = "timeout"
+	case ConnectionFailed:
+		tag = "connection_failed"
+	case ReadFailed:
+		tag = "read_failed"
+	case StringMismatch:
+		tag = "string_mismatch"
+	}
+
+	tags["result"] = tag
+	fields["result_code"] = uint64(result)
+
+	// deprecated in 1.7; use result tag
+	fields["result_type"] = tag
+
+	// deprecated in 1.4; use result tag
+	if expect != "" {
+		fields["string_found"] = result == Success
+	}
+}
+
 func init() {
 	inputs.Add("net_response", func() telegraf.Input {
 		return &NetResponse{}
diff --git a/plugins/inputs/net_response/net_response_test.go b/plugins/inputs/net_response/net_response_test.go
index 0f1ab2f71..ef4d0714a 100644
--- a/plugins/inputs/net_response/net_response_test.go
+++ b/plugins/inputs/net_response/net_response_test.go
@@ -98,14 +98,14 @@ func TestTCPError(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
-			"result_code": 1,
+			"result_code": uint64(2),
 			"result_type": "connection_failed",
 		},
 		map[string]string{
-			"server":      "",
-			"port":        "9999",
-			"protocol":    "tcp",
-			"result_text": "connection_failed",
+			"server":   "",
+			"port":     "9999",
+			"protocol": "tcp",
+			"result":   "connection_failed",
 		},
 	)
 }
@@ -138,16 +138,16 @@ func TestTCPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
-			"result_code":   0,
+			"result_code":   uint64(0),
 			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},
 		map[string]string{
-			"result_text": "success",
-			"server":      "127.0.0.1",
-			"port":        "2004",
-			"protocol":    "tcp",
+			"result":   "success",
+			"server":   "127.0.0.1",
+			"port":     "2004",
+			"protocol": "tcp",
 		},
 	)
 	// Waiting TCPserver
@@ -182,16 +182,16 @@ func TestTCPOK2(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
-			"result_code":   1,
+			"result_code":   uint64(4),
 			"result_type":   "string_mismatch",
 			"string_found":  false,
 			"response_time": 1.0,
 		},
 		map[string]string{
-			"result_text": "string_mismatch",
-			"server":      "127.0.0.1",
-			"port":        "2004",
-			"protocol":    "tcp",
+			"result":   "string_mismatch",
+			"server":   "127.0.0.1",
+			"port":     "2004",
+			"protocol": "tcp",
 		},
 	)
 	// Waiting TCPserver
@@ -218,15 +218,16 @@ func TestUDPError(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
-			"result_code":   1,
+			"result_code":   uint64(3),
 			"result_type":   "read_failed",
 			"response_time": 1.0,
+			"string_found":  false,
 		},
 		map[string]string{
-			"result_text": "read_failed",
-			"server":      "",
-			"port":        "9999",
-			"protocol":    "udp",
+			"result":   "read_failed",
+			"server":   "",
+			"port":     "9999",
+			"protocol": "udp",
 		},
 	)
 }
@@ -259,16 +260,16 @@ func TestUDPOK1(t *testing.T) {
 	acc.AssertContainsTaggedFields(t,
 		"net_response",
 		map[string]interface{}{
-			"result_code":   0,
+			"result_code":   uint64(0),
 			"result_type":   "success",
 			"string_found":  true,
 			"response_time": 1.0,
 		},
 		map[string]string{
-			"result_text": "success",
-			"server":      "127.0.0.1",
-			"port":        "2004",
-			"protocol":    "udp",
+			"result":   "success",
+			"server":   "127.0.0.1",
+			"port":     "2004",
+			"protocol": "udp",
 		},
 	)
 	// Waiting TCPserver

From 851efc9ca08ce45e1f4da6f7a4d63eb0b17f8a43 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 8 May 2018 16:40:42 -0700
Subject: [PATCH 1166/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec26d1b04..31497c653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - [#4077](https://github.com/influxdata/telegraf/pull/4077): Add input plugin for McRouter.
 - [#4096](https://github.com/influxdata/telegraf/pull/4096): Add topk processor plugin.
 - [#4114](https://github.com/influxdata/telegraf/pull/4114): Add cursor metrics to mongodb input.
+- [#3455](https://github.com/influxdata/telegraf/pull/3455): Add tag/integer pair for result to net_response.
 
 ### Bugfixes
 

From 1f296129184f4022fb8af006de7d8d591343dc5c Mon Sep 17 00:00:00 2001
From: Oleksandr Vilchynskyy <oleksandr.vilchynskyy@vivino.com>
Date: Wed, 9 May 2018 21:54:00 +0300
Subject: [PATCH 1167/1302] Update aerospike-client-go version to latest
 release (#4128)

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 6f3d0ae85..34fb3fe0c 100644
--- a/Godeps
+++ b/Godeps
@@ -1,5 +1,5 @@
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
+github.com/aerospike/aerospike-client-go 9701404f4c60a6ea256595d24bf318f721a7e8b8
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0

From 2add516eee879604c756e902dab8749ffba58d96 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 9 May 2018 11:56:59 -0700
Subject: [PATCH 1168/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31497c653..d3f450553 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,12 @@
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 
+## v1.6.3 [unreleased]
+
+### Bugfixes
+
+- [4127](https://github.com/influxdata/telegraf/issues/4127): Fix intermittent panic in aerospike input.
+
 ## v1.6.2 [2018-05-08]
 
 ### Bugfixes

From 5b599337a3bccade0ac8ee9d61e074e945d2fda3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 11 May 2018 17:47:38 -0700
Subject: [PATCH 1169/1302] Use internal.Duration for jolokia timeouts (#4136)

---
 plugins/inputs/jolokia2/jolokia_agent.go | 6 +++---
 plugins/inputs/jolokia2/jolokia_proxy.go | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
index f1d58e681..30852d62d 100644
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -3,9 +3,9 @@ package jolokia2
 import (
 	"fmt"
 	"sync"
-	"time"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/tls"
 )
 
@@ -17,7 +17,7 @@ type JolokiaAgent struct {
 	URLs            []string `toml:"urls"`
 	Username        string
 	Password        string
-	ResponseTimeout time.Duration `toml:"response_timeout"`
+	ResponseTimeout internal.Duration `toml:"response_timeout"`
 
 	tls.ClientConfig
 
@@ -101,7 +101,7 @@ func (ja *JolokiaAgent) createClient(url string) (*Client, error) {
 	return NewClient(url, &ClientConfig{
 		Username:        ja.Username,
 		Password:        ja.Password,
-		ResponseTimeout: ja.ResponseTimeout,
+		ResponseTimeout: ja.ResponseTimeout.Duration,
 		ClientConfig:    ja.ClientConfig,
 	})
 }
diff --git a/plugins/inputs/jolokia2/jolokia_proxy.go b/plugins/inputs/jolokia2/jolokia_proxy.go
index 40909dcce..7a921c083 100644
--- a/plugins/inputs/jolokia2/jolokia_proxy.go
+++ b/plugins/inputs/jolokia2/jolokia_proxy.go
@@ -1,9 +1,8 @@
 package jolokia2
 
 import (
-	"time"
-
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/tls"
 )
 
@@ -19,7 +18,7 @@ type JolokiaProxy struct {
 
 	Username        string
 	Password        string
-	ResponseTimeout time.Duration `toml:"response_timeout"`
+	ResponseTimeout internal.Duration `toml:"response_timeout"`
 	tls.ClientConfig
 
 	Metrics  []MetricConfig `toml:"metric"`
@@ -117,7 +116,7 @@ func (jp *JolokiaProxy) createClient() (*Client, error) {
 	return NewClient(jp.URL, &ClientConfig{
 		Username:        jp.Username,
 		Password:        jp.Password,
-		ResponseTimeout: jp.ResponseTimeout,
+		ResponseTimeout: jp.ResponseTimeout.Duration,
 		ClientConfig:    jp.ClientConfig,
 		ProxyConfig:     proxyConfig,
 	})

From 5030373a4cdb54b47de1c3fa4bd34396fc6085da Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 11 May 2018 17:48:27 -0700
Subject: [PATCH 1170/1302] Reuse transport on next interval in jolokia agent
 (#4137)

---
 plugins/inputs/jolokia2/jolokia_agent.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
index 30852d62d..fd2105d5f 100644
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -23,6 +23,7 @@ type JolokiaAgent struct {
 
 	Metrics  []MetricConfig `toml:"metric"`
 	gatherer *Gatherer
+	clients  []*Client
 }
 
 func (ja *JolokiaAgent) SampleConfig() string {
@@ -60,20 +61,27 @@ func (ja *JolokiaAgent) Gather(acc telegraf.Accumulator) error {
 		ja.gatherer = NewGatherer(ja.createMetrics())
 	}
 
+	// Initialize clients once
+	if ja.clients == nil {
+		ja.clients = make([]*Client, 0, len(ja.URLs))
+		for _, url := range ja.URLs {
+			client, err := ja.createClient(url)
+			if err != nil {
+				acc.AddError(fmt.Errorf("Unable to create client for %s: %v", url, err))
+				continue
+			}
+			ja.clients = append(ja.clients, client)
+		}
+	}
+
 	var wg sync.WaitGroup
 
-	for _, url := range ja.URLs {
-		client, err := ja.createClient(url)
-		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to create client for %s: %v", url, err))
-			continue
-		}
-
+	for _, client := range ja.clients {
 		wg.Add(1)
 		go func(client *Client) {
 			defer wg.Done()
 
-			err = ja.gatherer.Gather(client, acc)
+			err := ja.gatherer.Gather(client, acc)
 			if err != nil {
 				acc.AddError(fmt.Errorf("Unable to gather metrics for %s: %v", client.URL, err))
 			}

From 7e0e66486026bd4f1c23ca2fdbe2aa16de5a7da1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 11 May 2018 17:50:46 -0700
Subject: [PATCH 1171/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3f450553..62f82ce06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,8 @@
 ### Bugfixes
 
 - [4127](https://github.com/influxdata/telegraf/issues/4127): Fix intermittent panic in aerospike input.
+- [4130](https://github.com/influxdata/telegraf/issues/4130): Fix connection leak in jolokia2_agent
+- [4136](https://github.com/influxdata/telegraf/pull/4130): Fix jolokia2 timeout parsing.
 
 ## v1.6.2 [2018-05-08]
 

From fdd899e9d4fbe0662b51ca4cb0470de0e9473817 Mon Sep 17 00:00:00 2001
From: Ajay Kumar Chintala <nitk.ajay@gmail.com>
Date: Fri, 11 May 2018 17:58:19 -0700
Subject: [PATCH 1172/1302] Add service input plugin for OpenConfig streaming
 telemetry (#2292)

---
 Godeps                                        |    4 +-
 plugins/inputs/all/all.go                     |    1 +
 .../inputs/jti_openconfig_telemetry/README.md |   59 +
 .../auth/authentication_service.pb.go         |  182 +++
 .../auth/authentication_service.proto         |   48 +
 .../jti_openconfig_telemetry/collection.go    |   63 +
 .../jti_openconfig_telemetry/oc/oc.pb.go      | 1303 +++++++++++++++++
 .../jti_openconfig_telemetry/oc/oc.proto      |  319 ++++
 .../openconfig_telemetry.go                   |  422 ++++++
 .../openconfig_telemetry_test.go              |  225 +++
 10 files changed, 2625 insertions(+), 1 deletion(-)
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/README.md
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.proto
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/collection.go
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/oc/oc.proto
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry.go
 create mode 100644 plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry_test.go

diff --git a/Godeps b/Godeps
index 34fb3fe0c..12cf9cb92 100644
--- a/Godeps
+++ b/Godeps
@@ -83,9 +83,11 @@ github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
 github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
 golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d
+golang.org/x/net a337091b0525af65de94df2eb7e98bd9962dcbe2
 golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
 golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
+google.golang.org/genproto 11c7f9e547da6db876260ce49ea7536985904c9b
+google.golang.org/grpc de2209a968d48e8970546c8a710189f7461370f7
 gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
 gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
 gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index f4a630ecc..bb2316c95 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -42,6 +42,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
 	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia2"
+	_ "github.com/influxdata/telegraf/plugins/inputs/jti_openconfig_telemetry"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
diff --git a/plugins/inputs/jti_openconfig_telemetry/README.md b/plugins/inputs/jti_openconfig_telemetry/README.md
new file mode 100644
index 000000000..7c30aaa8d
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/README.md
@@ -0,0 +1,59 @@
+# JTI OpenConfig Telemetry Input Plugin
+
+This plugin reads Juniper Networks implementation of OpenConfig telemetry data from listed sensors using Junos Telemetry Interface. Refer to
+[openconfig.net](http://openconfig.net/) for more details about OpenConfig and [Junos Telemetry Interface (JTI)](https://www.juniper.net/documentation/en_US/junos/topics/concept/junos-telemetry-interface-oveview.html).
+
+### Configuration:
+
+```toml
+# Subscribe and receive OpenConfig Telemetry data using JTI
+[[inputs.jti_openconfig_telemetry]]
+  ## List of device addresses to collect telemetry from
+  servers = ["localhost:1883"]
+
+  ## Authentication details. Username and password are must if device expects
+  ## authentication. Client ID must be unique when connecting from multiple instances
+  ## of telegraf to the same device
+  username = "user"
+  password = "pass"
+  client_id = "telegraf"
+
+  ## Frequency to get data
+  sample_frequency = "1000ms"
+
+  ## Sensors to subscribe for
+  ## A identifier for each sensor can be provided in path by separating with space
+  ## Else sensor path will be used as identifier
+  ## When identifier is used, we can provide a list of space separated sensors.
+  ## A single subscription will be created with all these sensors and data will
+  ## be saved to measurement with this identifier name
+  sensors = [
+   "/interfaces/",
+   "collection /components/ /lldp",
+  ]
+
+  ## We allow specifying sensor group level reporting rate. To do this, specify the
+  ## reporting rate in Duration at the beginning of sensor paths / collection
+  ## name. For entries without reporting rate, we use configured sample frequency
+  sensors = [
+   "1000ms customReporting /interfaces /lldp",
+   "2000ms collection /components",
+   "/interfaces",
+  ]
+
+  ## x509 Certificate to use with TLS connection. If it is not provided, an insecure
+  ## channel will be opened with server
+  ssl_cert = "/etc/telegraf/cert.pem"
+
+  ## Delay between retry attempts of failed RPC calls or streams. Defaults to 1000ms.
+  ## Failed streams/calls will not be retried if 0 is provided
+  retry_delay = "1000ms"
+
+  ## To treat all string values as tags, set this to true
+  str_as_tags = false
+```
+
+### Tags:
+
+- All measurements are tagged appropriately using the identifier information
+  in incoming data
diff --git a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go
new file mode 100644
index 000000000..7ddeefaca
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go
@@ -0,0 +1,182 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: authentication_service.proto
+
+/*
+Package authentication is a generated protocol buffer package.
+
+It is generated from these files:
+	authentication_service.proto
+
+It has these top-level messages:
+	LoginRequest
+	LoginReply
+*/
+package authentication
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+// The request message containing the user's name, password and client id
+type LoginRequest struct {
+	UserName string `protobuf:"bytes,1,opt,name=user_name,json=userName" json:"user_name,omitempty"`
+	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	ClientId string `protobuf:"bytes,3,opt,name=client_id,json=clientId" json:"client_id,omitempty"`
+}
+
+func (m *LoginRequest) Reset()                    { *m = LoginRequest{} }
+func (m *LoginRequest) String() string            { return proto.CompactTextString(m) }
+func (*LoginRequest) ProtoMessage()               {}
+func (*LoginRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *LoginRequest) GetUserName() string {
+	if m != nil {
+		return m.UserName
+	}
+	return ""
+}
+
+func (m *LoginRequest) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+func (m *LoginRequest) GetClientId() string {
+	if m != nil {
+		return m.ClientId
+	}
+	return ""
+}
+
+// The response message containing the result of login attempt.
+// result value of true indicates success and false indicates
+// failure
+type LoginReply struct {
+	Result bool `protobuf:"varint,1,opt,name=result" json:"result,omitempty"`
+}
+
+func (m *LoginReply) Reset()                    { *m = LoginReply{} }
+func (m *LoginReply) String() string            { return proto.CompactTextString(m) }
+func (*LoginReply) ProtoMessage()               {}
+func (*LoginReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *LoginReply) GetResult() bool {
+	if m != nil {
+		return m.Result
+	}
+	return false
+}
+
+func init() {
+	proto.RegisterType((*LoginRequest)(nil), "authentication.LoginRequest")
+	proto.RegisterType((*LoginReply)(nil), "authentication.LoginReply")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for Login service
+
+type LoginClient interface {
+	LoginCheck(ctx context.Context, in *LoginRequest, opts ...grpc.CallOption) (*LoginReply, error)
+}
+
+type loginClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewLoginClient(cc *grpc.ClientConn) LoginClient {
+	return &loginClient{cc}
+}
+
+func (c *loginClient) LoginCheck(ctx context.Context, in *LoginRequest, opts ...grpc.CallOption) (*LoginReply, error) {
+	out := new(LoginReply)
+	err := grpc.Invoke(ctx, "/authentication.Login/LoginCheck", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for Login service
+
+type LoginServer interface {
+	LoginCheck(context.Context, *LoginRequest) (*LoginReply, error)
+}
+
+func RegisterLoginServer(s *grpc.Server, srv LoginServer) {
+	s.RegisterService(&_Login_serviceDesc, srv)
+}
+
+func _Login_LoginCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LoginRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(LoginServer).LoginCheck(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/authentication.Login/LoginCheck",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(LoginServer).LoginCheck(ctx, req.(*LoginRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Login_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "authentication.Login",
+	HandlerType: (*LoginServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "LoginCheck",
+			Handler:    _Login_LoginCheck_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "authentication_service.proto",
+}
+
+func init() { proto.RegisterFile("authentication_service.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 200 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x2c, 0x2d, 0xc9,
+	0x48, 0xcd, 0x2b, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x8b, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb,
+	0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0x95, 0x55, 0x4a, 0xe1, 0xe2,
+	0xf1, 0xc9, 0x4f, 0xcf, 0xcc, 0x0b, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x92, 0xe6, 0xe2,
+	0x2c, 0x2d, 0x4e, 0x2d, 0x8a, 0xcf, 0x4b, 0xcc, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c,
+	0xe2, 0x00, 0x09, 0xf8, 0x25, 0xe6, 0xa6, 0x0a, 0x49, 0x71, 0x71, 0x14, 0x24, 0x16, 0x17, 0x97,
+	0xe7, 0x17, 0xa5, 0x48, 0x30, 0x41, 0xe4, 0x60, 0x7c, 0x90, 0xc6, 0xe4, 0x9c, 0xcc, 0xd4, 0xbc,
+	0x92, 0xf8, 0xcc, 0x14, 0x09, 0x66, 0x88, 0x24, 0x44, 0xc0, 0x33, 0x45, 0x49, 0x85, 0x8b, 0x0b,
+	0x6a, 0x4b, 0x41, 0x4e, 0xa5, 0x90, 0x18, 0x17, 0x5b, 0x51, 0x6a, 0x71, 0x69, 0x4e, 0x09, 0xd8,
+	0x02, 0x8e, 0x20, 0x28, 0xcf, 0x28, 0x90, 0x8b, 0x15, 0xac, 0x4a, 0xc8, 0x03, 0xaa, 0xdc, 0x39,
+	0x23, 0x35, 0x39, 0x5b, 0x48, 0x46, 0x0f, 0xd5, 0xcd, 0x7a, 0xc8, 0x0e, 0x96, 0x92, 0xc2, 0x21,
+	0x5b, 0x90, 0x53, 0xa9, 0xc4, 0x90, 0xc4, 0x06, 0xf6, 0xb5, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff,
+	0x11, 0x57, 0x52, 0xd2, 0x15, 0x01, 0x00, 0x00,
+}
diff --git a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.proto b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.proto
new file mode 100644
index 000000000..a41e13a09
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.proto
@@ -0,0 +1,48 @@
+//
+// Copyrights (c) 2017, Juniper Networks, Inc.
+// All rights reserved.
+//
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+syntax = "proto3";
+
+package authentication;
+
+// The Login service definition.
+service Login {
+  rpc LoginCheck (LoginRequest) returns (LoginReply) {}
+}
+
+// The request message containing the user's name, password and client id
+message LoginRequest {
+  string user_name = 1;
+  string password   = 2;
+  string client_id = 3;
+}
+
+/*
+ * The response message containing the result of login attempt.
+ * result value of true indicates success and false indicates
+ * failure
+ */ 
+message LoginReply {
+  bool result = 1;
+}
diff --git a/plugins/inputs/jti_openconfig_telemetry/collection.go b/plugins/inputs/jti_openconfig_telemetry/collection.go
new file mode 100644
index 000000000..ffd9019f5
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/collection.go
@@ -0,0 +1,63 @@
+package jti_openconfig_telemetry
+
+import "sort"
+
+type DataGroup struct {
+	numKeys int
+	tags    map[string]string
+	data    map[string]interface{}
+}
+
+// Sort the data groups by number of keys
+type CollectionByKeys []DataGroup
+
+func (a CollectionByKeys) Len() int           { return len(a) }
+func (a CollectionByKeys) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a CollectionByKeys) Less(i, j int) bool { return a[i].numKeys < a[j].numKeys }
+
+// Checks to see if there is already a group with these tags and returns its index. Returns -1 if unavailable.
+func (a CollectionByKeys) IsAvailable(tags map[string]string) *DataGroup {
+	sort.Sort(CollectionByKeys(a))
+
+	// Iterate through all the groups and see if we have group with these tags
+	for _, group := range a {
+		// Since already sorted, match with only groups with N keys
+		if group.numKeys < len(tags) {
+			continue
+		} else if group.numKeys > len(tags) {
+			break
+		}
+
+		matchFound := true
+		for k, v := range tags {
+			if val, ok := group.tags[k]; ok {
+				if val != v {
+					matchFound = false
+					break
+				}
+			} else {
+				matchFound = false
+				break
+			}
+		}
+
+		if matchFound {
+			return &group
+		}
+	}
+	return nil
+}
+
+// Inserts into already existing group or creates a new group
+func (a CollectionByKeys) Insert(tags map[string]string, data map[string]interface{}) CollectionByKeys {
+	// If there is already a group with this set of tags, insert into it. Otherwise create a new group and insert
+	if group := a.IsAvailable(tags); group != nil {
+		for k, v := range data {
+			group.data[k] = v
+		}
+	} else {
+		a = append(a, DataGroup{len(tags), tags, data})
+	}
+
+	return a
+}
diff --git a/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go b/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go
new file mode 100644
index 000000000..a4cd76cc4
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go
@@ -0,0 +1,1303 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: oc.proto
+
+/*
+Package telemetry is a generated protocol buffer package.
+
+It is generated from these files:
+	oc.proto
+
+It has these top-level messages:
+	SubscriptionRequest
+	SubscriptionInput
+	Collector
+	Path
+	SubscriptionAdditionalConfig
+	SubscriptionReply
+	SubscriptionResponse
+	OpenConfigData
+	KeyValue
+	Delete
+	Eom
+	CancelSubscriptionRequest
+	CancelSubscriptionReply
+	GetSubscriptionsRequest
+	GetSubscriptionsReply
+	GetOperationalStateRequest
+	GetOperationalStateReply
+	DataEncodingRequest
+	DataEncodingReply
+*/
+package telemetry
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+// Result of the operation
+type ReturnCode int32
+
+const (
+	ReturnCode_SUCCESS               ReturnCode = 0
+	ReturnCode_NO_SUBSCRIPTION_ENTRY ReturnCode = 1
+	ReturnCode_UNKNOWN_ERROR         ReturnCode = 2
+)
+
+var ReturnCode_name = map[int32]string{
+	0: "SUCCESS",
+	1: "NO_SUBSCRIPTION_ENTRY",
+	2: "UNKNOWN_ERROR",
+}
+var ReturnCode_value = map[string]int32{
+	"SUCCESS":               0,
+	"NO_SUBSCRIPTION_ENTRY": 1,
+	"UNKNOWN_ERROR":         2,
+}
+
+func (x ReturnCode) String() string {
+	return proto.EnumName(ReturnCode_name, int32(x))
+}
+func (ReturnCode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+// Verbosity Level
+type VerbosityLevel int32
+
+const (
+	VerbosityLevel_DETAIL VerbosityLevel = 0
+	VerbosityLevel_TERSE  VerbosityLevel = 1
+	VerbosityLevel_BRIEF  VerbosityLevel = 2
+)
+
+var VerbosityLevel_name = map[int32]string{
+	0: "DETAIL",
+	1: "TERSE",
+	2: "BRIEF",
+}
+var VerbosityLevel_value = map[string]int32{
+	"DETAIL": 0,
+	"TERSE":  1,
+	"BRIEF":  2,
+}
+
+func (x VerbosityLevel) String() string {
+	return proto.EnumName(VerbosityLevel_name, int32(x))
+}
+func (VerbosityLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+// Encoding Type Supported
+type EncodingType int32
+
+const (
+	EncodingType_UNDEFINED EncodingType = 0
+	EncodingType_XML       EncodingType = 1
+	EncodingType_JSON_IETF EncodingType = 2
+	EncodingType_PROTO3    EncodingType = 3
+)
+
+var EncodingType_name = map[int32]string{
+	0: "UNDEFINED",
+	1: "XML",
+	2: "JSON_IETF",
+	3: "PROTO3",
+}
+var EncodingType_value = map[string]int32{
+	"UNDEFINED": 0,
+	"XML":       1,
+	"JSON_IETF": 2,
+	"PROTO3":    3,
+}
+
+func (x EncodingType) String() string {
+	return proto.EnumName(EncodingType_name, int32(x))
+}
+func (EncodingType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+// Message sent for a telemetry subscription request
+type SubscriptionRequest struct {
+	// Data associated with a telemetry subscription
+	Input *SubscriptionInput `protobuf:"bytes,1,opt,name=input" json:"input,omitempty"`
+	// List of data models paths and filters
+	// which are used in a telemetry operation.
+	PathList []*Path `protobuf:"bytes,2,rep,name=path_list,json=pathList" json:"path_list,omitempty"`
+	// The below configuration is not defined in Openconfig RPC.
+	// It is a proposed extension to configure additional
+	// subscription request features.
+	AdditionalConfig *SubscriptionAdditionalConfig `protobuf:"bytes,3,opt,name=additional_config,json=additionalConfig" json:"additional_config,omitempty"`
+}
+
+func (m *SubscriptionRequest) Reset()                    { *m = SubscriptionRequest{} }
+func (m *SubscriptionRequest) String() string            { return proto.CompactTextString(m) }
+func (*SubscriptionRequest) ProtoMessage()               {}
+func (*SubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *SubscriptionRequest) GetInput() *SubscriptionInput {
+	if m != nil {
+		return m.Input
+	}
+	return nil
+}
+
+func (m *SubscriptionRequest) GetPathList() []*Path {
+	if m != nil {
+		return m.PathList
+	}
+	return nil
+}
+
+func (m *SubscriptionRequest) GetAdditionalConfig() *SubscriptionAdditionalConfig {
+	if m != nil {
+		return m.AdditionalConfig
+	}
+	return nil
+}
+
+// Data associated with a telemetry subscription
+type SubscriptionInput struct {
+	// List of optional collector endpoints to send data for
+	// this subscription.
+	// If no collector destinations are specified, the collector
+	// destination is assumed to be the requester on the rpc channel.
+	CollectorList []*Collector `protobuf:"bytes,1,rep,name=collector_list,json=collectorList" json:"collector_list,omitempty"`
+}
+
+func (m *SubscriptionInput) Reset()                    { *m = SubscriptionInput{} }
+func (m *SubscriptionInput) String() string            { return proto.CompactTextString(m) }
+func (*SubscriptionInput) ProtoMessage()               {}
+func (*SubscriptionInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *SubscriptionInput) GetCollectorList() []*Collector {
+	if m != nil {
+		return m.CollectorList
+	}
+	return nil
+}
+
+// Collector endpoints to send data specified as an ip+port combination.
+type Collector struct {
+	// IP address of collector endpoint
+	Address string `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"`
+	// Transport protocol port number for the collector destination.
+	Port uint32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
+}
+
+func (m *Collector) Reset()                    { *m = Collector{} }
+func (m *Collector) String() string            { return proto.CompactTextString(m) }
+func (*Collector) ProtoMessage()               {}
+func (*Collector) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *Collector) GetAddress() string {
+	if m != nil {
+		return m.Address
+	}
+	return ""
+}
+
+func (m *Collector) GetPort() uint32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+// Data model path
+type Path struct {
+	// Data model path of interest
+	// Path specification for elements of OpenConfig data models
+	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	// Regular expression to be used in filtering state leaves
+	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	// If this is set to true, the target device will only send
+	// updates to the collector upon a change in data value
+	SuppressUnchanged bool `protobuf:"varint,3,opt,name=suppress_unchanged,json=suppressUnchanged" json:"suppress_unchanged,omitempty"`
+	// Maximum time in ms the target device may go without sending
+	// a message to the collector. If this time expires with
+	// suppress-unchanged set, the target device must send an update
+	// message regardless if the data values have changed.
+	MaxSilentInterval uint32 `protobuf:"varint,4,opt,name=max_silent_interval,json=maxSilentInterval" json:"max_silent_interval,omitempty"`
+	// Time in ms between collection and transmission of the
+	// specified data to the collector platform. The target device
+	// will sample the corresponding data (e.g,. a counter) and
+	// immediately send to the collector destination.
+	//
+	// If sample-frequency is set to 0, then the network device
+	// must emit an update upon every datum change.
+	SampleFrequency uint32 `protobuf:"varint,5,opt,name=sample_frequency,json=sampleFrequency" json:"sample_frequency,omitempty"`
+	// EOM needed for each walk cycle of this path?
+	//   For periodic sensor, applicable for each complete reap
+	//   For event sensor, applicable when initial dump is over
+	//     (same as EOS)
+	// This feature is not implemented currently.
+	NeedEom bool `protobuf:"varint,6,opt,name=need_eom,json=needEom" json:"need_eom,omitempty"`
+}
+
+func (m *Path) Reset()                    { *m = Path{} }
+func (m *Path) String() string            { return proto.CompactTextString(m) }
+func (*Path) ProtoMessage()               {}
+func (*Path) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *Path) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+func (m *Path) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *Path) GetSuppressUnchanged() bool {
+	if m != nil {
+		return m.SuppressUnchanged
+	}
+	return false
+}
+
+func (m *Path) GetMaxSilentInterval() uint32 {
+	if m != nil {
+		return m.MaxSilentInterval
+	}
+	return 0
+}
+
+func (m *Path) GetSampleFrequency() uint32 {
+	if m != nil {
+		return m.SampleFrequency
+	}
+	return 0
+}
+
+func (m *Path) GetNeedEom() bool {
+	if m != nil {
+		return m.NeedEom
+	}
+	return false
+}
+
+// Configure subscription request additional features.
+type SubscriptionAdditionalConfig struct {
+	// limit the number of records sent in the stream
+	LimitRecords int32 `protobuf:"varint,1,opt,name=limit_records,json=limitRecords" json:"limit_records,omitempty"`
+	// limit the time the stream remains open
+	LimitTimeSeconds int32 `protobuf:"varint,2,opt,name=limit_time_seconds,json=limitTimeSeconds" json:"limit_time_seconds,omitempty"`
+	// EOS needed for this subscription?
+	NeedEos bool `protobuf:"varint,3,opt,name=need_eos,json=needEos" json:"need_eos,omitempty"`
+}
+
+func (m *SubscriptionAdditionalConfig) Reset()                    { *m = SubscriptionAdditionalConfig{} }
+func (m *SubscriptionAdditionalConfig) String() string            { return proto.CompactTextString(m) }
+func (*SubscriptionAdditionalConfig) ProtoMessage()               {}
+func (*SubscriptionAdditionalConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *SubscriptionAdditionalConfig) GetLimitRecords() int32 {
+	if m != nil {
+		return m.LimitRecords
+	}
+	return 0
+}
+
+func (m *SubscriptionAdditionalConfig) GetLimitTimeSeconds() int32 {
+	if m != nil {
+		return m.LimitTimeSeconds
+	}
+	return 0
+}
+
+func (m *SubscriptionAdditionalConfig) GetNeedEos() bool {
+	if m != nil {
+		return m.NeedEos
+	}
+	return false
+}
+
+// 1. Reply data message sent out using out-of-band channel.
+type SubscriptionReply struct {
+	// Response message to a telemetry subscription creation or
+	// get request.
+	Response *SubscriptionResponse `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
+	// List of data models paths and filters
+	// which are used in a telemetry operation.
+	PathList []*Path `protobuf:"bytes,2,rep,name=path_list,json=pathList" json:"path_list,omitempty"`
+}
+
+func (m *SubscriptionReply) Reset()                    { *m = SubscriptionReply{} }
+func (m *SubscriptionReply) String() string            { return proto.CompactTextString(m) }
+func (*SubscriptionReply) ProtoMessage()               {}
+func (*SubscriptionReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *SubscriptionReply) GetResponse() *SubscriptionResponse {
+	if m != nil {
+		return m.Response
+	}
+	return nil
+}
+
+func (m *SubscriptionReply) GetPathList() []*Path {
+	if m != nil {
+		return m.PathList
+	}
+	return nil
+}
+
+// Response message to a telemetry subscription creation or get request.
+type SubscriptionResponse struct {
+	// Unique id for the subscription on the device. This is
+	// generated by the device and returned in a subscription
+	// request or when listing existing subscriptions
+	SubscriptionId uint32 `protobuf:"varint,1,opt,name=subscription_id,json=subscriptionId" json:"subscription_id,omitempty"`
+}
+
+func (m *SubscriptionResponse) Reset()                    { *m = SubscriptionResponse{} }
+func (m *SubscriptionResponse) String() string            { return proto.CompactTextString(m) }
+func (*SubscriptionResponse) ProtoMessage()               {}
+func (*SubscriptionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+
+func (m *SubscriptionResponse) GetSubscriptionId() uint32 {
+	if m != nil {
+		return m.SubscriptionId
+	}
+	return 0
+}
+
+// 2. Telemetry data send back on the same connection as the
+//    subscription request.
+type OpenConfigData struct {
+	// router name:export IP address
+	SystemId string `protobuf:"bytes,1,opt,name=system_id,json=systemId" json:"system_id,omitempty"`
+	// line card / RE (slot number)
+	ComponentId uint32 `protobuf:"varint,2,opt,name=component_id,json=componentId" json:"component_id,omitempty"`
+	// PFE (if applicable)
+	SubComponentId uint32 `protobuf:"varint,3,opt,name=sub_component_id,json=subComponentId" json:"sub_component_id,omitempty"`
+	// Path specification for elements of OpenConfig data models
+	Path string `protobuf:"bytes,4,opt,name=path" json:"path,omitempty"`
+	// Sequence number, monotonically increasing for each
+	// system_id, component_id, sub_component_id + path.
+	SequenceNumber uint64 `protobuf:"varint,5,opt,name=sequence_number,json=sequenceNumber" json:"sequence_number,omitempty"`
+	// timestamp (milliseconds since epoch)
+	Timestamp uint64 `protobuf:"varint,6,opt,name=timestamp" json:"timestamp,omitempty"`
+	// List of key-value pairs
+	Kv []*KeyValue `protobuf:"bytes,7,rep,name=kv" json:"kv,omitempty"`
+	// For delete. If filled, it indicates delete
+	Delete []*Delete `protobuf:"bytes,8,rep,name=delete" json:"delete,omitempty"`
+	// If filled, it indicates end of marker for the
+	// respective path in the list.
+	Eom []*Eom `protobuf:"bytes,9,rep,name=eom" json:"eom,omitempty"`
+	// If filled, it indicates end of sync for complete subscription
+	SyncResponse bool `protobuf:"varint,10,opt,name=sync_response,json=syncResponse" json:"sync_response,omitempty"`
+}
+
+func (m *OpenConfigData) Reset()                    { *m = OpenConfigData{} }
+func (m *OpenConfigData) String() string            { return proto.CompactTextString(m) }
+func (*OpenConfigData) ProtoMessage()               {}
+func (*OpenConfigData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+
+func (m *OpenConfigData) GetSystemId() string {
+	if m != nil {
+		return m.SystemId
+	}
+	return ""
+}
+
+func (m *OpenConfigData) GetComponentId() uint32 {
+	if m != nil {
+		return m.ComponentId
+	}
+	return 0
+}
+
+func (m *OpenConfigData) GetSubComponentId() uint32 {
+	if m != nil {
+		return m.SubComponentId
+	}
+	return 0
+}
+
+func (m *OpenConfigData) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+func (m *OpenConfigData) GetSequenceNumber() uint64 {
+	if m != nil {
+		return m.SequenceNumber
+	}
+	return 0
+}
+
+func (m *OpenConfigData) GetTimestamp() uint64 {
+	if m != nil {
+		return m.Timestamp
+	}
+	return 0
+}
+
+func (m *OpenConfigData) GetKv() []*KeyValue {
+	if m != nil {
+		return m.Kv
+	}
+	return nil
+}
+
+func (m *OpenConfigData) GetDelete() []*Delete {
+	if m != nil {
+		return m.Delete
+	}
+	return nil
+}
+
+func (m *OpenConfigData) GetEom() []*Eom {
+	if m != nil {
+		return m.Eom
+	}
+	return nil
+}
+
+func (m *OpenConfigData) GetSyncResponse() bool {
+	if m != nil {
+		return m.SyncResponse
+	}
+	return false
+}
+
+// Simple Key-value, where value could be one of scalar types
+type KeyValue struct {
+	// Key
+	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	// One of possible values
+	//
+	// Types that are valid to be assigned to Value:
+	//	*KeyValue_DoubleValue
+	//	*KeyValue_IntValue
+	//	*KeyValue_UintValue
+	//	*KeyValue_SintValue
+	//	*KeyValue_BoolValue
+	//	*KeyValue_StrValue
+	//	*KeyValue_BytesValue
+	Value isKeyValue_Value `protobuf_oneof:"value"`
+}
+
+func (m *KeyValue) Reset()                    { *m = KeyValue{} }
+func (m *KeyValue) String() string            { return proto.CompactTextString(m) }
+func (*KeyValue) ProtoMessage()               {}
+func (*KeyValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+
+type isKeyValue_Value interface {
+	isKeyValue_Value()
+}
+
+type KeyValue_DoubleValue struct {
+	DoubleValue float64 `protobuf:"fixed64,5,opt,name=double_value,json=doubleValue,oneof"`
+}
+type KeyValue_IntValue struct {
+	IntValue int64 `protobuf:"varint,6,opt,name=int_value,json=intValue,oneof"`
+}
+type KeyValue_UintValue struct {
+	UintValue uint64 `protobuf:"varint,7,opt,name=uint_value,json=uintValue,oneof"`
+}
+type KeyValue_SintValue struct {
+	SintValue int64 `protobuf:"zigzag64,8,opt,name=sint_value,json=sintValue,oneof"`
+}
+type KeyValue_BoolValue struct {
+	BoolValue bool `protobuf:"varint,9,opt,name=bool_value,json=boolValue,oneof"`
+}
+type KeyValue_StrValue struct {
+	StrValue string `protobuf:"bytes,10,opt,name=str_value,json=strValue,oneof"`
+}
+type KeyValue_BytesValue struct {
+	BytesValue []byte `protobuf:"bytes,11,opt,name=bytes_value,json=bytesValue,proto3,oneof"`
+}
+
+func (*KeyValue_DoubleValue) isKeyValue_Value() {}
+func (*KeyValue_IntValue) isKeyValue_Value()    {}
+func (*KeyValue_UintValue) isKeyValue_Value()   {}
+func (*KeyValue_SintValue) isKeyValue_Value()   {}
+func (*KeyValue_BoolValue) isKeyValue_Value()   {}
+func (*KeyValue_StrValue) isKeyValue_Value()    {}
+func (*KeyValue_BytesValue) isKeyValue_Value()  {}
+
+func (m *KeyValue) GetValue() isKeyValue_Value {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *KeyValue) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *KeyValue) GetDoubleValue() float64 {
+	if x, ok := m.GetValue().(*KeyValue_DoubleValue); ok {
+		return x.DoubleValue
+	}
+	return 0
+}
+
+func (m *KeyValue) GetIntValue() int64 {
+	if x, ok := m.GetValue().(*KeyValue_IntValue); ok {
+		return x.IntValue
+	}
+	return 0
+}
+
+func (m *KeyValue) GetUintValue() uint64 {
+	if x, ok := m.GetValue().(*KeyValue_UintValue); ok {
+		return x.UintValue
+	}
+	return 0
+}
+
+func (m *KeyValue) GetSintValue() int64 {
+	if x, ok := m.GetValue().(*KeyValue_SintValue); ok {
+		return x.SintValue
+	}
+	return 0
+}
+
+func (m *KeyValue) GetBoolValue() bool {
+	if x, ok := m.GetValue().(*KeyValue_BoolValue); ok {
+		return x.BoolValue
+	}
+	return false
+}
+
+func (m *KeyValue) GetStrValue() string {
+	if x, ok := m.GetValue().(*KeyValue_StrValue); ok {
+		return x.StrValue
+	}
+	return ""
+}
+
+func (m *KeyValue) GetBytesValue() []byte {
+	if x, ok := m.GetValue().(*KeyValue_BytesValue); ok {
+		return x.BytesValue
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*KeyValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _KeyValue_OneofMarshaler, _KeyValue_OneofUnmarshaler, _KeyValue_OneofSizer, []interface{}{
+		(*KeyValue_DoubleValue)(nil),
+		(*KeyValue_IntValue)(nil),
+		(*KeyValue_UintValue)(nil),
+		(*KeyValue_SintValue)(nil),
+		(*KeyValue_BoolValue)(nil),
+		(*KeyValue_StrValue)(nil),
+		(*KeyValue_BytesValue)(nil),
+	}
+}
+
+func _KeyValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*KeyValue)
+	// value
+	switch x := m.Value.(type) {
+	case *KeyValue_DoubleValue:
+		b.EncodeVarint(5<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
+	case *KeyValue_IntValue:
+		b.EncodeVarint(6<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.IntValue))
+	case *KeyValue_UintValue:
+		b.EncodeVarint(7<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.UintValue))
+	case *KeyValue_SintValue:
+		b.EncodeVarint(8<<3 | proto.WireVarint)
+		b.EncodeZigzag64(uint64(x.SintValue))
+	case *KeyValue_BoolValue:
+		t := uint64(0)
+		if x.BoolValue {
+			t = 1
+		}
+		b.EncodeVarint(9<<3 | proto.WireVarint)
+		b.EncodeVarint(t)
+	case *KeyValue_StrValue:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.StrValue)
+	case *KeyValue_BytesValue:
+		b.EncodeVarint(11<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.BytesValue)
+	case nil:
+	default:
+		return fmt.Errorf("KeyValue.Value has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _KeyValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*KeyValue)
+	switch tag {
+	case 5: // value.double_value
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Value = &KeyValue_DoubleValue{math.Float64frombits(x)}
+		return true, err
+	case 6: // value.int_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Value = &KeyValue_IntValue{int64(x)}
+		return true, err
+	case 7: // value.uint_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Value = &KeyValue_UintValue{x}
+		return true, err
+	case 8: // value.sint_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeZigzag64()
+		m.Value = &KeyValue_SintValue{int64(x)}
+		return true, err
+	case 9: // value.bool_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Value = &KeyValue_BoolValue{x != 0}
+		return true, err
+	case 10: // value.str_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Value = &KeyValue_StrValue{x}
+		return true, err
+	case 11: // value.bytes_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Value = &KeyValue_BytesValue{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _KeyValue_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*KeyValue)
+	// value
+	switch x := m.Value.(type) {
+	case *KeyValue_DoubleValue:
+		n += proto.SizeVarint(5<<3 | proto.WireFixed64)
+		n += 8
+	case *KeyValue_IntValue:
+		n += proto.SizeVarint(6<<3 | proto.WireVarint)
+		n += proto.SizeVarint(uint64(x.IntValue))
+	case *KeyValue_UintValue:
+		n += proto.SizeVarint(7<<3 | proto.WireVarint)
+		n += proto.SizeVarint(uint64(x.UintValue))
+	case *KeyValue_SintValue:
+		n += proto.SizeVarint(8<<3 | proto.WireVarint)
+		n += proto.SizeVarint(uint64(uint64(x.SintValue<<1) ^ uint64((int64(x.SintValue) >> 63))))
+	case *KeyValue_BoolValue:
+		n += proto.SizeVarint(9<<3 | proto.WireVarint)
+		n += 1
+	case *KeyValue_StrValue:
+		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.StrValue)))
+		n += len(x.StrValue)
+	case *KeyValue_BytesValue:
+		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.BytesValue)))
+		n += len(x.BytesValue)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message indicating delete for a particular path
+type Delete struct {
+	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+}
+
+func (m *Delete) Reset()                    { *m = Delete{} }
+func (m *Delete) String() string            { return proto.CompactTextString(m) }
+func (*Delete) ProtoMessage()               {}
+func (*Delete) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+
+func (m *Delete) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+// Message indicating EOM for a particular path
+type Eom struct {
+	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+}
+
+func (m *Eom) Reset()                    { *m = Eom{} }
+func (m *Eom) String() string            { return proto.CompactTextString(m) }
+func (*Eom) ProtoMessage()               {}
+func (*Eom) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+
+func (m *Eom) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+// Message sent for a telemetry subscription cancellation request
+type CancelSubscriptionRequest struct {
+	// Subscription identifier as returned by the device when
+	// subscription was requested
+	SubscriptionId uint32 `protobuf:"varint,1,opt,name=subscription_id,json=subscriptionId" json:"subscription_id,omitempty"`
+}
+
+func (m *CancelSubscriptionRequest) Reset()                    { *m = CancelSubscriptionRequest{} }
+func (m *CancelSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
+func (*CancelSubscriptionRequest) ProtoMessage()               {}
+func (*CancelSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+
+func (m *CancelSubscriptionRequest) GetSubscriptionId() uint32 {
+	if m != nil {
+		return m.SubscriptionId
+	}
+	return 0
+}
+
+// Reply to telemetry subscription cancellation request
+type CancelSubscriptionReply struct {
+	// Return code
+	Code ReturnCode `protobuf:"varint,1,opt,name=code,enum=telemetry.ReturnCode" json:"code,omitempty"`
+	// Return code string
+	CodeStr string `protobuf:"bytes,2,opt,name=code_str,json=codeStr" json:"code_str,omitempty"`
+}
+
+func (m *CancelSubscriptionReply) Reset()                    { *m = CancelSubscriptionReply{} }
+func (m *CancelSubscriptionReply) String() string            { return proto.CompactTextString(m) }
+func (*CancelSubscriptionReply) ProtoMessage()               {}
+func (*CancelSubscriptionReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+
+func (m *CancelSubscriptionReply) GetCode() ReturnCode {
+	if m != nil {
+		return m.Code
+	}
+	return ReturnCode_SUCCESS
+}
+
+func (m *CancelSubscriptionReply) GetCodeStr() string {
+	if m != nil {
+		return m.CodeStr
+	}
+	return ""
+}
+
+// Message sent for a telemetry get request
+type GetSubscriptionsRequest struct {
+	// Subscription identifier as returned by the device when
+	// subscription was requested
+	// --- or ---
+	// 0xFFFFFFFF for all subscription identifiers
+	SubscriptionId uint32 `protobuf:"varint,1,opt,name=subscription_id,json=subscriptionId" json:"subscription_id,omitempty"`
+}
+
+func (m *GetSubscriptionsRequest) Reset()                    { *m = GetSubscriptionsRequest{} }
+func (m *GetSubscriptionsRequest) String() string            { return proto.CompactTextString(m) }
+func (*GetSubscriptionsRequest) ProtoMessage()               {}
+func (*GetSubscriptionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+
+func (m *GetSubscriptionsRequest) GetSubscriptionId() uint32 {
+	if m != nil {
+		return m.SubscriptionId
+	}
+	return 0
+}
+
+// Reply to telemetry subscription get request
+type GetSubscriptionsReply struct {
+	// List of current telemetry subscriptions
+	SubscriptionList []*SubscriptionReply `protobuf:"bytes,1,rep,name=subscription_list,json=subscriptionList" json:"subscription_list,omitempty"`
+}
+
+func (m *GetSubscriptionsReply) Reset()                    { *m = GetSubscriptionsReply{} }
+func (m *GetSubscriptionsReply) String() string            { return proto.CompactTextString(m) }
+func (*GetSubscriptionsReply) ProtoMessage()               {}
+func (*GetSubscriptionsReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+
+func (m *GetSubscriptionsReply) GetSubscriptionList() []*SubscriptionReply {
+	if m != nil {
+		return m.SubscriptionList
+	}
+	return nil
+}
+
+// Message sent for telemetry agent operational states request
+type GetOperationalStateRequest struct {
+	// Per-subscription_id level operational state can be requested.
+	//
+	// Subscription identifier as returned by the device when
+	// subscription was requested
+	// --- or ---
+	// 0xFFFFFFFF for all subscription identifiers including agent-level
+	// operational stats
+	// --- or ---
+	// If subscription_id is not present then sent only agent-level
+	// operational stats
+	SubscriptionId uint32 `protobuf:"varint,1,opt,name=subscription_id,json=subscriptionId" json:"subscription_id,omitempty"`
+	// Control verbosity of the output
+	Verbosity VerbosityLevel `protobuf:"varint,2,opt,name=verbosity,enum=telemetry.VerbosityLevel" json:"verbosity,omitempty"`
+}
+
+func (m *GetOperationalStateRequest) Reset()                    { *m = GetOperationalStateRequest{} }
+func (m *GetOperationalStateRequest) String() string            { return proto.CompactTextString(m) }
+func (*GetOperationalStateRequest) ProtoMessage()               {}
+func (*GetOperationalStateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+
+func (m *GetOperationalStateRequest) GetSubscriptionId() uint32 {
+	if m != nil {
+		return m.SubscriptionId
+	}
+	return 0
+}
+
+func (m *GetOperationalStateRequest) GetVerbosity() VerbosityLevel {
+	if m != nil {
+		return m.Verbosity
+	}
+	return VerbosityLevel_DETAIL
+}
+
+// Reply to telemetry agent operational states request
+type GetOperationalStateReply struct {
+	// List of key-value pairs where
+	//     key      = operational state definition
+	//     value    = operational state value
+	Kv []*KeyValue `protobuf:"bytes,1,rep,name=kv" json:"kv,omitempty"`
+}
+
+func (m *GetOperationalStateReply) Reset()                    { *m = GetOperationalStateReply{} }
+func (m *GetOperationalStateReply) String() string            { return proto.CompactTextString(m) }
+func (*GetOperationalStateReply) ProtoMessage()               {}
+func (*GetOperationalStateReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+
+func (m *GetOperationalStateReply) GetKv() []*KeyValue {
+	if m != nil {
+		return m.Kv
+	}
+	return nil
+}
+
+// Message sent for a data encoding request
+type DataEncodingRequest struct {
+}
+
+func (m *DataEncodingRequest) Reset()                    { *m = DataEncodingRequest{} }
+func (m *DataEncodingRequest) String() string            { return proto.CompactTextString(m) }
+func (*DataEncodingRequest) ProtoMessage()               {}
+func (*DataEncodingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+
+// Reply to data encodings supported request
+type DataEncodingReply struct {
+	EncodingList []EncodingType `protobuf:"varint,1,rep,packed,name=encoding_list,json=encodingList,enum=telemetry.EncodingType" json:"encoding_list,omitempty"`
+}
+
+func (m *DataEncodingReply) Reset()                    { *m = DataEncodingReply{} }
+func (m *DataEncodingReply) String() string            { return proto.CompactTextString(m) }
+func (*DataEncodingReply) ProtoMessage()               {}
+func (*DataEncodingReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+
+func (m *DataEncodingReply) GetEncodingList() []EncodingType {
+	if m != nil {
+		return m.EncodingList
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*SubscriptionRequest)(nil), "telemetry.SubscriptionRequest")
+	proto.RegisterType((*SubscriptionInput)(nil), "telemetry.SubscriptionInput")
+	proto.RegisterType((*Collector)(nil), "telemetry.Collector")
+	proto.RegisterType((*Path)(nil), "telemetry.Path")
+	proto.RegisterType((*SubscriptionAdditionalConfig)(nil), "telemetry.SubscriptionAdditionalConfig")
+	proto.RegisterType((*SubscriptionReply)(nil), "telemetry.SubscriptionReply")
+	proto.RegisterType((*SubscriptionResponse)(nil), "telemetry.SubscriptionResponse")
+	proto.RegisterType((*OpenConfigData)(nil), "telemetry.OpenConfigData")
+	proto.RegisterType((*KeyValue)(nil), "telemetry.KeyValue")
+	proto.RegisterType((*Delete)(nil), "telemetry.Delete")
+	proto.RegisterType((*Eom)(nil), "telemetry.Eom")
+	proto.RegisterType((*CancelSubscriptionRequest)(nil), "telemetry.CancelSubscriptionRequest")
+	proto.RegisterType((*CancelSubscriptionReply)(nil), "telemetry.CancelSubscriptionReply")
+	proto.RegisterType((*GetSubscriptionsRequest)(nil), "telemetry.GetSubscriptionsRequest")
+	proto.RegisterType((*GetSubscriptionsReply)(nil), "telemetry.GetSubscriptionsReply")
+	proto.RegisterType((*GetOperationalStateRequest)(nil), "telemetry.GetOperationalStateRequest")
+	proto.RegisterType((*GetOperationalStateReply)(nil), "telemetry.GetOperationalStateReply")
+	proto.RegisterType((*DataEncodingRequest)(nil), "telemetry.DataEncodingRequest")
+	proto.RegisterType((*DataEncodingReply)(nil), "telemetry.DataEncodingReply")
+	proto.RegisterEnum("telemetry.ReturnCode", ReturnCode_name, ReturnCode_value)
+	proto.RegisterEnum("telemetry.VerbosityLevel", VerbosityLevel_name, VerbosityLevel_value)
+	proto.RegisterEnum("telemetry.EncodingType", EncodingType_name, EncodingType_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for OpenConfigTelemetry service
+
+type OpenConfigTelemetryClient interface {
+	// Request an inline subscription for data at the specified path.
+	// The device should send telemetry data back on the same
+	// connection as the subscription request.
+	TelemetrySubscribe(ctx context.Context, in *SubscriptionRequest, opts ...grpc.CallOption) (OpenConfigTelemetry_TelemetrySubscribeClient, error)
+	// Terminates and removes an exisiting telemetry subscription
+	CancelTelemetrySubscription(ctx context.Context, in *CancelSubscriptionRequest, opts ...grpc.CallOption) (*CancelSubscriptionReply, error)
+	// Get the list of current telemetry subscriptions from the
+	// target. This command returns a list of existing subscriptions
+	// not including those that are established via configuration.
+	GetTelemetrySubscriptions(ctx context.Context, in *GetSubscriptionsRequest, opts ...grpc.CallOption) (*GetSubscriptionsReply, error)
+	// Get Telemetry Agent Operational States
+	GetTelemetryOperationalState(ctx context.Context, in *GetOperationalStateRequest, opts ...grpc.CallOption) (*GetOperationalStateReply, error)
+	// Return the set of data encodings supported by the device for
+	// telemetry data
+	GetDataEncodings(ctx context.Context, in *DataEncodingRequest, opts ...grpc.CallOption) (*DataEncodingReply, error)
+}
+
+type openConfigTelemetryClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewOpenConfigTelemetryClient(cc *grpc.ClientConn) OpenConfigTelemetryClient {
+	return &openConfigTelemetryClient{cc}
+}
+
+func (c *openConfigTelemetryClient) TelemetrySubscribe(ctx context.Context, in *SubscriptionRequest, opts ...grpc.CallOption) (OpenConfigTelemetry_TelemetrySubscribeClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_OpenConfigTelemetry_serviceDesc.Streams[0], c.cc, "/telemetry.OpenConfigTelemetry/telemetrySubscribe", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &openConfigTelemetryTelemetrySubscribeClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type OpenConfigTelemetry_TelemetrySubscribeClient interface {
+	Recv() (*OpenConfigData, error)
+	grpc.ClientStream
+}
+
+type openConfigTelemetryTelemetrySubscribeClient struct {
+	grpc.ClientStream
+}
+
+func (x *openConfigTelemetryTelemetrySubscribeClient) Recv() (*OpenConfigData, error) {
+	m := new(OpenConfigData)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *openConfigTelemetryClient) CancelTelemetrySubscription(ctx context.Context, in *CancelSubscriptionRequest, opts ...grpc.CallOption) (*CancelSubscriptionReply, error) {
+	out := new(CancelSubscriptionReply)
+	err := grpc.Invoke(ctx, "/telemetry.OpenConfigTelemetry/cancelTelemetrySubscription", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *openConfigTelemetryClient) GetTelemetrySubscriptions(ctx context.Context, in *GetSubscriptionsRequest, opts ...grpc.CallOption) (*GetSubscriptionsReply, error) {
+	out := new(GetSubscriptionsReply)
+	err := grpc.Invoke(ctx, "/telemetry.OpenConfigTelemetry/getTelemetrySubscriptions", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *openConfigTelemetryClient) GetTelemetryOperationalState(ctx context.Context, in *GetOperationalStateRequest, opts ...grpc.CallOption) (*GetOperationalStateReply, error) {
+	out := new(GetOperationalStateReply)
+	err := grpc.Invoke(ctx, "/telemetry.OpenConfigTelemetry/getTelemetryOperationalState", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *openConfigTelemetryClient) GetDataEncodings(ctx context.Context, in *DataEncodingRequest, opts ...grpc.CallOption) (*DataEncodingReply, error) {
+	out := new(DataEncodingReply)
+	err := grpc.Invoke(ctx, "/telemetry.OpenConfigTelemetry/getDataEncodings", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for OpenConfigTelemetry service
+
+type OpenConfigTelemetryServer interface {
+	// Request an inline subscription for data at the specified path.
+	// The device should send telemetry data back on the same
+	// connection as the subscription request.
+	TelemetrySubscribe(*SubscriptionRequest, OpenConfigTelemetry_TelemetrySubscribeServer) error
+	// Terminates and removes an exisiting telemetry subscription
+	CancelTelemetrySubscription(context.Context, *CancelSubscriptionRequest) (*CancelSubscriptionReply, error)
+	// Get the list of current telemetry subscriptions from the
+	// target. This command returns a list of existing subscriptions
+	// not including those that are established via configuration.
+	GetTelemetrySubscriptions(context.Context, *GetSubscriptionsRequest) (*GetSubscriptionsReply, error)
+	// Get Telemetry Agent Operational States
+	GetTelemetryOperationalState(context.Context, *GetOperationalStateRequest) (*GetOperationalStateReply, error)
+	// Return the set of data encodings supported by the device for
+	// telemetry data
+	GetDataEncodings(context.Context, *DataEncodingRequest) (*DataEncodingReply, error)
+}
+
+func RegisterOpenConfigTelemetryServer(s *grpc.Server, srv OpenConfigTelemetryServer) {
+	s.RegisterService(&_OpenConfigTelemetry_serviceDesc, srv)
+}
+
+func _OpenConfigTelemetry_TelemetrySubscribe_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(SubscriptionRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(OpenConfigTelemetryServer).TelemetrySubscribe(m, &openConfigTelemetryTelemetrySubscribeServer{stream})
+}
+
+type OpenConfigTelemetry_TelemetrySubscribeServer interface {
+	Send(*OpenConfigData) error
+	grpc.ServerStream
+}
+
+type openConfigTelemetryTelemetrySubscribeServer struct {
+	grpc.ServerStream
+}
+
+func (x *openConfigTelemetryTelemetrySubscribeServer) Send(m *OpenConfigData) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _OpenConfigTelemetry_CancelTelemetrySubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelSubscriptionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OpenConfigTelemetryServer).CancelTelemetrySubscription(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/telemetry.OpenConfigTelemetry/CancelTelemetrySubscription",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OpenConfigTelemetryServer).CancelTelemetrySubscription(ctx, req.(*CancelSubscriptionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _OpenConfigTelemetry_GetTelemetrySubscriptions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSubscriptionsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OpenConfigTelemetryServer).GetTelemetrySubscriptions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/telemetry.OpenConfigTelemetry/GetTelemetrySubscriptions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OpenConfigTelemetryServer).GetTelemetrySubscriptions(ctx, req.(*GetSubscriptionsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _OpenConfigTelemetry_GetTelemetryOperationalState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetOperationalStateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OpenConfigTelemetryServer).GetTelemetryOperationalState(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/telemetry.OpenConfigTelemetry/GetTelemetryOperationalState",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OpenConfigTelemetryServer).GetTelemetryOperationalState(ctx, req.(*GetOperationalStateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _OpenConfigTelemetry_GetDataEncodings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DataEncodingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OpenConfigTelemetryServer).GetDataEncodings(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/telemetry.OpenConfigTelemetry/GetDataEncodings",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OpenConfigTelemetryServer).GetDataEncodings(ctx, req.(*DataEncodingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _OpenConfigTelemetry_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "telemetry.OpenConfigTelemetry",
+	HandlerType: (*OpenConfigTelemetryServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "cancelTelemetrySubscription",
+			Handler:    _OpenConfigTelemetry_CancelTelemetrySubscription_Handler,
+		},
+		{
+			MethodName: "getTelemetrySubscriptions",
+			Handler:    _OpenConfigTelemetry_GetTelemetrySubscriptions_Handler,
+		},
+		{
+			MethodName: "getTelemetryOperationalState",
+			Handler:    _OpenConfigTelemetry_GetTelemetryOperationalState_Handler,
+		},
+		{
+			MethodName: "getDataEncodings",
+			Handler:    _OpenConfigTelemetry_GetDataEncodings_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "telemetrySubscribe",
+			Handler:       _OpenConfigTelemetry_TelemetrySubscribe_Handler,
+			ServerStreams: true,
+		},
+	},
+	Metadata: "oc.proto",
+}
+
+func init() { proto.RegisterFile("oc.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 1254 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
+	0x17, 0x15, 0x25, 0xd9, 0x12, 0xaf, 0x7e, 0x42, 0x8d, 0xe3, 0x2f, 0xb2, 0xa3, 0xaf, 0x71, 0xe8,
+	0x16, 0x71, 0x82, 0xd4, 0x28, 0x94, 0x45, 0x51, 0xa4, 0x40, 0x10, 0xcb, 0x74, 0xac, 0xc6, 0x95,
+	0xdc, 0xa1, 0x9c, 0xb6, 0x2b, 0x82, 0x22, 0x27, 0x36, 0x11, 0xfe, 0x95, 0x33, 0x12, 0xc2, 0x4d,
+	0x9e, 0xa0, 0xe8, 0x9b, 0x75, 0xdd, 0x97, 0xe8, 0x23, 0x74, 0x51, 0xcc, 0x90, 0x94, 0x46, 0x89,
+	0x94, 0x34, 0x2b, 0x91, 0xe7, 0x9e, 0xb9, 0xf7, 0xcc, 0xbd, 0x67, 0x86, 0x82, 0x7a, 0xe4, 0x1c,
+	0xc7, 0x49, 0xc4, 0x22, 0xa4, 0x32, 0xe2, 0x93, 0x80, 0xb0, 0x24, 0xd5, 0xff, 0x54, 0x60, 0xc7,
+	0x9c, 0x4d, 0xa9, 0x93, 0x78, 0x31, 0xf3, 0xa2, 0x10, 0x93, 0xdf, 0x66, 0x84, 0x32, 0xd4, 0x87,
+	0x2d, 0x2f, 0x8c, 0x67, 0xac, 0xab, 0x1c, 0x28, 0x47, 0x8d, 0x7e, 0xef, 0x78, 0xb1, 0xe4, 0x58,
+	0xa6, 0x0f, 0x39, 0x07, 0x67, 0x54, 0xf4, 0x18, 0xd4, 0xd8, 0x66, 0x37, 0x96, 0xef, 0x51, 0xd6,
+	0x2d, 0x1f, 0x54, 0x8e, 0x1a, 0xfd, 0x5b, 0xd2, 0xba, 0x4b, 0x9b, 0xdd, 0xe0, 0x3a, 0x67, 0x5c,
+	0x78, 0x94, 0xa1, 0x09, 0x74, 0x6c, 0xd7, 0xf5, 0x78, 0x16, 0xdb, 0xb7, 0x9c, 0x28, 0x7c, 0xed,
+	0x5d, 0x77, 0x2b, 0xa2, 0xda, 0x83, 0x0d, 0xd5, 0x9e, 0x2f, 0xf8, 0x03, 0x41, 0xc7, 0x9a, 0xfd,
+	0x1e, 0xa2, 0x5f, 0x42, 0xe7, 0x03, 0x7d, 0xe8, 0x29, 0xb4, 0x9d, 0xc8, 0xf7, 0x89, 0xc3, 0xa2,
+	0x24, 0x53, 0xa7, 0x08, 0x75, 0xb7, 0xa5, 0x3a, 0x83, 0x82, 0x80, 0x5b, 0x0b, 0x2e, 0xd7, 0xa9,
+	0x7f, 0x07, 0xea, 0x22, 0x86, 0xba, 0x50, 0xb3, 0x5d, 0x37, 0x21, 0x94, 0x8a, 0xc6, 0xa8, 0xb8,
+	0x78, 0x45, 0x08, 0xaa, 0x71, 0x94, 0xf0, 0x7d, 0x2b, 0x47, 0x2d, 0x2c, 0x9e, 0xf5, 0xbf, 0x14,
+	0xa8, 0xf2, 0x5d, 0x8b, 0xa0, 0xcd, 0x6e, 0xf2, 0x35, 0xe2, 0x19, 0xfd, 0x0f, 0xb6, 0x5f, 0x7b,
+	0x3e, 0x23, 0x89, 0x58, 0xa2, 0xe2, 0xfc, 0x0d, 0x7d, 0x0d, 0x88, 0xce, 0xe2, 0x98, 0x27, 0xb5,
+	0x66, 0xa1, 0x73, 0x63, 0x87, 0xd7, 0xc4, 0x15, 0x8d, 0xa9, 0xe3, 0x4e, 0x11, 0xb9, 0x2a, 0x02,
+	0xe8, 0x18, 0x76, 0x02, 0xfb, 0xad, 0x45, 0x3d, 0x9f, 0x84, 0xcc, 0xf2, 0x42, 0x46, 0x92, 0xb9,
+	0xed, 0x77, 0xab, 0x42, 0x46, 0x27, 0xb0, 0xdf, 0x9a, 0x22, 0x32, 0xcc, 0x03, 0xe8, 0x21, 0x68,
+	0xd4, 0x0e, 0x62, 0x9f, 0x58, 0xaf, 0x13, 0x3e, 0xeb, 0xd0, 0x49, 0xbb, 0x5b, 0x82, 0x7c, 0x2b,
+	0xc3, 0xcf, 0x0a, 0x18, 0xed, 0x41, 0x3d, 0x24, 0xc4, 0xb5, 0x48, 0x14, 0x74, 0xb7, 0x45, 0xfd,
+	0x1a, 0x7f, 0x37, 0xa2, 0x40, 0xff, 0x5d, 0x81, 0xde, 0xc7, 0x26, 0x83, 0x0e, 0xa1, 0xe5, 0x7b,
+	0x81, 0xc7, 0xac, 0x84, 0x38, 0x51, 0xe2, 0x66, 0xed, 0xda, 0xc2, 0x4d, 0x01, 0xe2, 0x0c, 0x43,
+	0x8f, 0x01, 0x65, 0x24, 0xe6, 0x05, 0xc4, 0xa2, 0xc4, 0x89, 0x42, 0x97, 0x8a, 0x76, 0x6c, 0x61,
+	0x4d, 0x44, 0x26, 0x5e, 0x40, 0xcc, 0x0c, 0x97, 0xe4, 0xd0, 0xbc, 0x1d, 0xb9, 0x1c, 0xaa, 0xbf,
+	0x5b, 0x9d, 0x3a, 0x26, 0xb1, 0x9f, 0xa2, 0xa7, 0x50, 0x4f, 0x08, 0x8d, 0xa3, 0x90, 0x92, 0xdc,
+	0xc5, 0xf7, 0x36, 0xf8, 0x0a, 0xe7, 0x34, 0xbc, 0x58, 0xf0, 0x79, 0x5e, 0xd6, 0x9f, 0xc1, 0xed,
+	0x75, 0xf9, 0xd0, 0x03, 0xb8, 0x45, 0x25, 0xdc, 0xf2, 0x5c, 0xa1, 0xa4, 0x85, 0xdb, 0x32, 0x3c,
+	0x74, 0xf5, 0xbf, 0xcb, 0xd0, 0x1e, 0xc7, 0x24, 0xcc, 0xba, 0x77, 0x6a, 0x33, 0x1b, 0xdd, 0x05,
+	0x95, 0xa6, 0x94, 0x91, 0xa0, 0x58, 0xa5, 0xe2, 0x7a, 0x06, 0x0c, 0x5d, 0x74, 0x1f, 0x9a, 0x4e,
+	0x14, 0xc4, 0x51, 0x28, 0x86, 0xee, 0xe6, 0xae, 0x6b, 0x2c, 0xb0, 0xa1, 0x8b, 0x8e, 0x40, 0xa3,
+	0xb3, 0xa9, 0xb5, 0x42, 0xab, 0x2c, 0x8a, 0x0f, 0x24, 0x66, 0xe1, 0xce, 0xaa, 0xe4, 0x4e, 0xae,
+	0x3c, 0xf3, 0x01, 0xb1, 0xc2, 0x59, 0x30, 0x25, 0x89, 0x70, 0x49, 0x15, 0xb7, 0x0b, 0x78, 0x24,
+	0x50, 0xd4, 0x03, 0x95, 0x4f, 0x8f, 0x32, 0x3b, 0x88, 0x85, 0x4b, 0xaa, 0x78, 0x09, 0xa0, 0x43,
+	0x28, 0xbf, 0x99, 0x77, 0x6b, 0xa2, 0x7f, 0x3b, 0x52, 0xff, 0x5e, 0x92, 0xf4, 0x95, 0xed, 0xcf,
+	0x08, 0x2e, 0xbf, 0x99, 0xa3, 0x87, 0xb0, 0xed, 0x12, 0x9f, 0x30, 0xd2, 0xad, 0x0b, 0x62, 0x47,
+	0x22, 0x9e, 0x8a, 0x00, 0xce, 0x09, 0xe8, 0x00, 0x2a, 0xdc, 0x8d, 0xaa, 0xe0, 0xb5, 0x25, 0x9e,
+	0x11, 0x05, 0x98, 0x87, 0xb8, 0xf1, 0x68, 0x1a, 0x3a, 0xd6, 0x62, 0xf4, 0x20, 0xac, 0xd2, 0xe4,
+	0x60, 0x31, 0x17, 0xfd, 0x8f, 0x32, 0xd4, 0x0b, 0x09, 0x48, 0x83, 0xca, 0x1b, 0x92, 0xe6, 0x2d,
+	0xe6, 0x8f, 0xe8, 0x10, 0x9a, 0x6e, 0x34, 0x9b, 0xfa, 0xc4, 0x9a, 0x73, 0x86, 0xd8, 0xb9, 0x72,
+	0x5e, 0xc2, 0x8d, 0x0c, 0xcd, 0x96, 0xfd, 0x1f, 0x54, 0x2f, 0x64, 0x39, 0x83, 0x6f, 0xbc, 0x72,
+	0x5e, 0xc2, 0x75, 0x2f, 0x64, 0x59, 0xf8, 0x1e, 0xc0, 0x6c, 0x19, 0xaf, 0xf1, 0xc6, 0x9c, 0x97,
+	0xb0, 0x3a, 0x93, 0x09, 0x74, 0x49, 0xa8, 0x1f, 0x28, 0x47, 0x88, 0x13, 0xa8, 0x4c, 0x98, 0x46,
+	0x91, 0x9f, 0x13, 0x54, 0xbe, 0x0d, 0x4e, 0xe0, 0xd8, 0x42, 0x01, 0x65, 0x49, 0x1e, 0xe7, 0xdb,
+	0x54, 0xb9, 0x02, 0xca, 0x92, 0x2c, 0x7c, 0x1f, 0x1a, 0xd3, 0x94, 0x11, 0x9a, 0x13, 0x1a, 0x07,
+	0xca, 0x51, 0xf3, 0xbc, 0x84, 0x41, 0x80, 0x82, 0x72, 0x52, 0x83, 0x2d, 0x11, 0xd4, 0x7b, 0xb0,
+	0x9d, 0x75, 0x7a, 0xdd, 0x55, 0xa5, 0xef, 0x41, 0xc5, 0x88, 0x82, 0xb5, 0xa1, 0x53, 0xd8, 0x1b,
+	0xd8, 0xa1, 0x43, 0xfc, 0x75, 0x1f, 0x91, 0xff, 0x6c, 0x7f, 0x0b, 0xee, 0xac, 0xcb, 0xc2, 0x4f,
+	0xf1, 0x43, 0xa8, 0x3a, 0x91, 0x9b, 0x9d, 0xe0, 0x76, 0x7f, 0x57, 0x1a, 0x39, 0x26, 0x6c, 0x96,
+	0x84, 0x83, 0xc8, 0x25, 0x58, 0x50, 0xf8, 0x05, 0xc1, 0x7f, 0x2d, 0xca, 0x8a, 0x3b, 0xb5, 0xc6,
+	0xdf, 0x4d, 0x96, 0xe8, 0x27, 0x70, 0xe7, 0x05, 0x61, 0x72, 0x76, 0xfa, 0xd9, 0x22, 0xa7, 0xb0,
+	0xfb, 0x61, 0x0e, 0x2e, 0x71, 0x08, 0x9d, 0x95, 0x0c, 0xd2, 0x17, 0xa6, 0xb7, 0xf1, 0xc6, 0x89,
+	0xfd, 0x14, 0x6b, 0xf2, 0x32, 0x71, 0x91, 0xbc, 0x83, 0xfd, 0x17, 0x84, 0x8d, 0x63, 0x92, 0xd8,
+	0xd9, 0x75, 0x6a, 0x32, 0x9b, 0x91, 0xcf, 0x95, 0x8a, 0xbe, 0x05, 0x75, 0x4e, 0x92, 0x69, 0x44,
+	0x3d, 0x96, 0x8a, 0x56, 0xb4, 0xfb, 0x7b, 0x92, 0x92, 0x57, 0x45, 0xec, 0x82, 0xcc, 0x89, 0x8f,
+	0x97, 0x5c, 0xfd, 0x19, 0x74, 0xd7, 0xd6, 0xe7, 0xdb, 0xcc, 0xce, 0xb2, 0xf2, 0xd1, 0xb3, 0xac,
+	0xef, 0xc2, 0x0e, 0xbf, 0xbd, 0x8c, 0xd0, 0x89, 0x5c, 0x2f, 0xbc, 0xce, 0x95, 0xeb, 0x3f, 0x41,
+	0x67, 0x15, 0xe6, 0x09, 0xbf, 0x87, 0x16, 0xc9, 0x81, 0x65, 0xcf, 0xda, 0xfd, 0x3b, 0xf2, 0xb1,
+	0xce, 0xe3, 0x93, 0x34, 0x26, 0xb8, 0x59, 0xb0, 0x79, 0xab, 0x1e, 0xbd, 0x00, 0x58, 0x3a, 0x00,
+	0x35, 0xa0, 0x66, 0x5e, 0x0d, 0x06, 0x86, 0x69, 0x6a, 0x25, 0xb4, 0x07, 0xbb, 0xa3, 0xb1, 0x65,
+	0x5e, 0x9d, 0x98, 0x03, 0x3c, 0xbc, 0x9c, 0x0c, 0xc7, 0x23, 0xcb, 0x18, 0x4d, 0xf0, 0xaf, 0x9a,
+	0x82, 0x3a, 0xd0, 0xba, 0x1a, 0xbd, 0x1c, 0x8d, 0x7f, 0x1e, 0x59, 0x06, 0xc6, 0x63, 0xac, 0x95,
+	0x1f, 0xf5, 0xa1, 0xbd, 0xda, 0x10, 0x04, 0xb0, 0x7d, 0x6a, 0x4c, 0x9e, 0x0f, 0x2f, 0xb4, 0x12,
+	0x52, 0x61, 0x6b, 0x62, 0x60, 0xd3, 0xd0, 0x14, 0xfe, 0x78, 0x82, 0x87, 0xc6, 0x99, 0x56, 0x7e,
+	0xf4, 0x1c, 0x9a, 0xb2, 0x34, 0xd4, 0x02, 0xf5, 0x6a, 0x74, 0x6a, 0x9c, 0x0d, 0x47, 0xc6, 0xa9,
+	0x56, 0x42, 0x35, 0xa8, 0xfc, 0xf2, 0xe3, 0x85, 0xa6, 0x70, 0xfc, 0x07, 0x73, 0x3c, 0xb2, 0x86,
+	0xc6, 0xe4, 0x4c, 0x2b, 0xf3, 0xc4, 0x97, 0x78, 0x3c, 0x19, 0x3f, 0xd1, 0x2a, 0xfd, 0x7f, 0x2a,
+	0xb0, 0xb3, 0xbc, 0xf2, 0x27, 0xc5, 0x96, 0x91, 0x09, 0x68, 0xb1, 0xff, 0xdc, 0x32, 0x53, 0x82,
+	0xbe, 0xd8, 0x68, 0x24, 0xd1, 0xe0, 0x7d, 0x79, 0xbc, 0xab, 0x1f, 0x12, 0xbd, 0xf4, 0x8d, 0x82,
+	0x3c, 0xb8, 0xeb, 0x88, 0x03, 0x36, 0x79, 0x2f, 0xb5, 0x48, 0x82, 0xbe, 0x94, 0xff, 0x08, 0x6d,
+	0x3a, 0xce, 0xfb, 0xfa, 0x27, 0x58, 0xb1, 0x9f, 0xea, 0x25, 0xe4, 0xc0, 0xde, 0x35, 0x61, 0x6b,
+	0xeb, 0x50, 0x24, 0xa7, 0xd8, 0x70, 0x20, 0xf7, 0x0f, 0x3e, 0xca, 0xc9, 0x8a, 0xf8, 0xd0, 0x93,
+	0x8b, 0xbc, 0x6f, 0x58, 0xf4, 0xd5, 0x6a, 0x8e, 0x0d, 0x07, 0x6a, 0xff, 0xf0, 0x53, 0xb4, 0xac,
+	0x1a, 0x06, 0xed, 0x9a, 0x30, 0xd9, 0xc0, 0x74, 0x65, 0x20, 0x6b, 0x1c, 0xbf, 0xdf, 0xdb, 0x18,
+	0x17, 0x39, 0xa7, 0xdb, 0xe2, 0xaf, 0xf8, 0x93, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xe3,
+	0x4f, 0x0d, 0x96, 0x0b, 0x00, 0x00,
+}
diff --git a/plugins/inputs/jti_openconfig_telemetry/oc/oc.proto b/plugins/inputs/jti_openconfig_telemetry/oc/oc.proto
new file mode 100644
index 000000000..38ce9b422
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/oc/oc.proto
@@ -0,0 +1,319 @@
+//
+// Copyrights (c) 2016, Juniper Networks, Inc.
+// All rights reserved.
+//
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+//
+// Nitin Kumar          04/07/2016
+// Abbas Sakarwala      04/07/2016
+//
+// This file defines the Openconfig Telemetry RPC APIs (for gRPC).
+//
+// https://github.com/openconfig/public/blob/master/release/models/rpc/openconfig-rpc-api.yang
+//
+// Version 1.0
+//
+
+syntax = "proto3";
+
+package telemetry;
+
+// Interface exported by Agent
+service OpenConfigTelemetry {
+    // Request an inline subscription for data at the specified path.
+    // The device should send telemetry data back on the same
+    // connection as the subscription request.
+    rpc telemetrySubscribe(SubscriptionRequest)                     returns (stream OpenConfigData) {}
+
+    // Terminates and removes an exisiting telemetry subscription
+    rpc cancelTelemetrySubscription(CancelSubscriptionRequest)      returns (CancelSubscriptionReply) {}
+
+    // Get the list of current telemetry subscriptions from the
+    // target. This command returns a list of existing subscriptions
+    // not including those that are established via configuration.
+    rpc getTelemetrySubscriptions(GetSubscriptionsRequest)          returns (GetSubscriptionsReply) {}
+
+    // Get Telemetry Agent Operational States
+    rpc getTelemetryOperationalState(GetOperationalStateRequest)    returns (GetOperationalStateReply) {}
+
+    // Return the set of data encodings supported by the device for
+    // telemetry data
+    rpc getDataEncodings(DataEncodingRequest)                       returns (DataEncodingReply) {}
+}
+
+// Message sent for a telemetry subscription request
+message SubscriptionRequest {
+    // Data associated with a telemetry subscription
+    SubscriptionInput input                                 = 1;
+
+    // List of data models paths and filters
+    // which are used in a telemetry operation.
+    repeated Path path_list                                 = 2;
+
+    // The below configuration is not defined in Openconfig RPC.
+    // It is a proposed extension to configure additional
+    // subscription request features.
+    SubscriptionAdditionalConfig additional_config          = 3;
+}
+
+// Data associated with a telemetry subscription
+message SubscriptionInput {
+    // List of optional collector endpoints to send data for
+    // this subscription.
+    // If no collector destinations are specified, the collector
+    // destination is assumed to be the requester on the rpc channel.
+    repeated Collector  collector_list                      = 1;
+}
+
+// Collector endpoints to send data specified as an ip+port combination.
+message Collector {
+    // IP address of collector endpoint
+    string address                                          = 1;
+
+    // Transport protocol port number for the collector destination.
+    uint32 port                                             = 2;
+}
+
+// Data model path
+message Path {
+    // Data model path of interest
+    // Path specification for elements of OpenConfig data models
+    string path                                             = 1;
+
+    // Regular expression to be used in filtering state leaves
+    string filter                                           = 2;
+
+    // If this is set to true, the target device will only send
+    // updates to the collector upon a change in data value
+    bool suppress_unchanged                                 = 3;
+
+    // Maximum time in ms the target device may go without sending
+    // a message to the collector. If this time expires with
+    // suppress-unchanged set, the target device must send an update
+    // message regardless if the data values have changed.
+    uint32 max_silent_interval                              = 4;
+
+    // Time in ms between collection and transmission of the
+    // specified data to the collector platform. The target device
+    // will sample the corresponding data (e.g,. a counter) and
+    // immediately send to the collector destination.
+    //
+    // If sample-frequency is set to 0, then the network device
+    // must emit an update upon every datum change.
+    uint32 sample_frequency                                 = 5;
+
+    // EOM needed for each walk cycle of this path?
+    //   For periodic sensor, applicable for each complete reap
+    //   For event sensor, applicable when initial dump is over 
+    //     (same as EOS)
+    // This feature is not implemented currently.
+    bool need_eom                                           = 6;
+}
+
+// Configure subscription request additional features.
+message SubscriptionAdditionalConfig {
+    // limit the number of records sent in the stream
+    int32 limit_records                                     = 1;
+
+    // limit the time the stream remains open
+    int32 limit_time_seconds                                = 2;
+
+    // EOS needed for this subscription?
+    bool need_eos                                           = 3;
+}
+
+// Reply to inline subscription for data at the specified path is done in
+// two-folds.
+// 1. Reply data message sent out using out-of-band channel.
+// 2. Telemetry data send back on the same connection as the
+//    subscription request.
+
+// 1. Reply data message sent out using out-of-band channel.
+message SubscriptionReply {
+    // Response message to a telemetry subscription creation or
+    // get request.
+    SubscriptionResponse response                           = 1;
+
+    // List of data models paths and filters
+    // which are used in a telemetry operation.
+    repeated Path path_list                                 = 2;
+}
+
+// Response message to a telemetry subscription creation or get request.
+message SubscriptionResponse {
+    // Unique id for the subscription on the device. This is
+    // generated by the device and returned in a subscription
+    // request or when listing existing subscriptions
+    uint32 subscription_id = 1;
+}
+
+// 2. Telemetry data send back on the same connection as the
+//    subscription request.
+message OpenConfigData {
+    // router name:export IP address
+    string system_id                                        = 1;
+
+    // line card / RE (slot number)
+    uint32 component_id                                     = 2;
+
+    // PFE (if applicable)
+    uint32 sub_component_id                                 = 3;
+
+    // Path specification for elements of OpenConfig data models
+    string path                                             = 4;
+
+    // Sequence number, monotonically increasing for each
+    // system_id, component_id, sub_component_id + path.
+    uint64 sequence_number                                  = 5;
+
+    // timestamp (milliseconds since epoch)
+    uint64 timestamp                                        = 6;
+
+    // List of key-value pairs
+    repeated KeyValue kv                                    = 7;
+
+    // For delete. If filled, it indicates delete
+    repeated Delete delete                                  = 8;
+
+    // If filled, it indicates end of marker for the
+    // respective path in the list.
+    repeated Eom eom                                        = 9; 
+
+    // If filled, it indicates end of sync for complete subscription
+    bool sync_response                                      = 10;
+}
+
+// Simple Key-value, where value could be one of scalar types
+message KeyValue {
+    // Key
+    string key                                              =  1;
+
+    // One of possible values
+    oneof value {
+        double double_value                                 =  5;
+        int64  int_value                                    =  6;
+        uint64 uint_value                                   =  7;
+        sint64 sint_value                                   =  8;
+        bool   bool_value                                   =  9;
+        string str_value                                    = 10;
+        bytes  bytes_value                                  = 11;
+    }
+}
+
+// Message indicating delete for a particular path
+message Delete {
+    string path                                             = 1;
+}
+
+// Message indicating EOM for a particular path
+message Eom {
+    string path                                             = 1; 
+}
+
+// Message sent for a telemetry subscription cancellation request
+message CancelSubscriptionRequest {
+    // Subscription identifier as returned by the device when
+    // subscription was requested
+    uint32 subscription_id                                  = 1;
+}
+
+// Reply to telemetry subscription cancellation request
+message CancelSubscriptionReply {
+    // Return code
+    ReturnCode code                                         = 1;
+
+    // Return code string
+    string     code_str                                     = 2;
+};
+
+// Result of the operation
+enum ReturnCode {
+    SUCCESS                                                 = 0;
+    NO_SUBSCRIPTION_ENTRY                                   = 1;
+    UNKNOWN_ERROR                                           = 2;
+}
+
+// Message sent for a telemetry get request
+message GetSubscriptionsRequest {
+    // Subscription identifier as returned by the device when
+    // subscription was requested
+    // --- or ---
+    // 0xFFFFFFFF for all subscription identifiers
+    uint32 subscription_id                                  = 1;
+}
+
+// Reply to telemetry subscription get request
+message GetSubscriptionsReply {
+    // List of current telemetry subscriptions
+    repeated SubscriptionReply subscription_list            = 1;
+}
+
+// Message sent for telemetry agent operational states request
+message GetOperationalStateRequest {
+    // Per-subscription_id level operational state can be requested.
+    //
+    // Subscription identifier as returned by the device when
+    // subscription was requested
+    // --- or ---
+    // 0xFFFFFFFF for all subscription identifiers including agent-level
+    // operational stats
+    // --- or ---
+    // If subscription_id is not present then sent only agent-level
+    // operational stats
+    uint32 subscription_id                                  = 1;
+
+    // Control verbosity of the output
+    VerbosityLevel verbosity                                = 2;
+}
+
+// Verbosity Level
+enum VerbosityLevel {
+    DETAIL                                                  = 0;
+    TERSE                                                   = 1;
+    BRIEF                                                   = 2;
+}
+
+// Reply to telemetry agent operational states request
+message GetOperationalStateReply {
+    // List of key-value pairs where
+    //     key      = operational state definition
+    //     value    = operational state value
+    repeated KeyValue kv                                    = 1;
+}
+
+// Message sent for a data encoding request
+message DataEncodingRequest {
+}
+
+// Reply to data encodings supported request
+message DataEncodingReply {
+    repeated EncodingType  encoding_list                    = 1;
+}
+
+// Encoding Type Supported
+enum EncodingType {
+    UNDEFINED                                               = 0;
+    XML                                                     = 1;
+    JSON_IETF                                               = 2;
+    PROTO3                                                  = 3;
+}
+
diff --git a/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry.go b/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry.go
new file mode 100644
index 000000000..49a593a08
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry.go
@@ -0,0 +1,422 @@
+package jti_openconfig_telemetry
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"regexp"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/jti_openconfig_telemetry/auth"
+	"github.com/influxdata/telegraf/plugins/inputs/jti_openconfig_telemetry/oc"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/status"
+)
+
+type OpenConfigTelemetry struct {
+	Servers         []string
+	Sensors         []string
+	Username        string
+	Password        string
+	ClientID        string            `toml:"client_id"`
+	SampleFrequency internal.Duration `toml:"sample_frequency"`
+	SSLCert         string            `toml:"ssl_cert"`
+	StrAsTags       bool              `toml:"str_as_tags"`
+	RetryDelay      internal.Duration `toml:"retry_delay"`
+
+	sensorsConfig   []sensorConfig
+	grpcClientConns []*grpc.ClientConn
+	wg              *sync.WaitGroup
+}
+
+var (
+	// Regex to match and extract data points from path value in received key
+	keyPathRegex = regexp.MustCompile("\\/([^\\/]*)\\[([A-Za-z0-9\\-\\/]*\\=[^\\[]*)\\]")
+	sampleConfig = `
+  ## List of device addresses to collect telemetry from
+  servers = ["localhost:1883"]
+
+  ## Authentication details. Username and password are must if device expects 
+  ## authentication. Client ID must be unique when connecting from multiple instances 
+  ## of telegraf to the same device
+  username = "user"
+  password = "pass"
+  client_id = "telegraf"
+
+  ## Frequency to get data
+  sample_frequency = "1000ms"
+
+  ## Sensors to subscribe for
+  ## A identifier for each sensor can be provided in path by separating with space
+  ## Else sensor path will be used as identifier
+  ## When identifier is used, we can provide a list of space separated sensors. 
+  ## A single subscription will be created with all these sensors and data will 
+  ## be saved to measurement with this identifier name
+  sensors = [
+   "/interfaces/",
+   "collection /components/ /lldp",
+  ]
+
+  ## We allow specifying sensor group level reporting rate. To do this, specify the 
+  ## reporting rate in Duration at the beginning of sensor paths / collection 
+  ## name. For entries without reporting rate, we use configured sample frequency
+  sensors = [
+   "1000ms customReporting /interfaces /lldp",
+   "2000ms collection /components",
+   "/interfaces",
+  ]
+
+  ## x509 Certificate to use with TLS connection. If it is not provided, an insecure 
+  ## channel will be opened with server
+  ssl_cert = "/etc/telegraf/cert.pem"
+
+  ## Delay between retry attempts of failed RPC calls or streams. Defaults to 1000ms.
+  ## Failed streams/calls will not be retried if 0 is provided
+  retry_delay = "1000ms"
+
+  ## To treat all string values as tags, set this to true
+  str_as_tags = false
+`
+)
+
+func (m *OpenConfigTelemetry) SampleConfig() string {
+	return sampleConfig
+}
+
+func (m *OpenConfigTelemetry) Description() string {
+	return "Read JTI OpenConfig Telemetry from listed sensors"
+}
+
+func (m *OpenConfigTelemetry) Gather(acc telegraf.Accumulator) error {
+	return nil
+}
+
+func (m *OpenConfigTelemetry) Stop() {
+	for _, grpcClientConn := range m.grpcClientConns {
+		grpcClientConn.Close()
+	}
+	m.wg.Wait()
+}
+
+// Takes in XML path with predicates and returns list of tags+values along with a final
+// XML path without predicates. If /events/event[id=2]/attributes[key='message']/value
+// is given input, this function will emit /events/event/attributes/value as xmlpath and
+// { /events/event/@id=2, /events/event/attributes/@key='message' } as tags
+func spitTagsNPath(xmlpath string) (string, map[string]string) {
+	subs := keyPathRegex.FindAllStringSubmatch(xmlpath, -1)
+	tags := make(map[string]string)
+
+	// Given XML path, this will spit out final path without predicates
+	if len(subs) > 0 {
+		for _, sub := range subs {
+			tagKey := strings.Split(xmlpath, sub[0])[0] + "/" + strings.TrimSpace(sub[1]) + "/@"
+
+			// If we have multiple keys in give path like /events/event[id=2 and type=3]/,
+			// we must emit multiple tags
+			for _, kv := range strings.Split(sub[2], " and ") {
+				key := tagKey + strings.TrimSpace(strings.Split(kv, "=")[0])
+				tagValue := strings.Replace(strings.Split(kv, "=")[1], "'", "", -1)
+				tags[key] = tagValue
+			}
+
+			xmlpath = strings.Replace(xmlpath, sub[0], "/"+strings.TrimSpace(sub[1]), 1)
+		}
+	}
+
+	return xmlpath, tags
+}
+
+// Takes in a OC response, extracts tag information from keys and returns a
+// list of groups with unique sets of tags+values
+func (m *OpenConfigTelemetry) extractData(r *telemetry.OpenConfigData, grpcServer string) []DataGroup {
+	// Use empty prefix. We will update this when we iterate over key-value pairs
+	prefix := ""
+
+	dgroups := []DataGroup{}
+
+	for _, v := range r.Kv {
+		kv := make(map[string]interface{})
+
+		if v.Key == "__prefix__" {
+			prefix = v.GetStrValue()
+			continue
+		}
+
+		// Also, lets use prefix if there is one
+		xmlpath, finaltags := spitTagsNPath(prefix + v.Key)
+		finaltags["device"] = grpcServer
+
+		switch v.Value.(type) {
+		case *telemetry.KeyValue_StrValue:
+			// If StrAsTags is set, we treat all string values as tags
+			if m.StrAsTags {
+				finaltags[xmlpath] = v.GetStrValue()
+			} else {
+				kv[xmlpath] = v.GetStrValue()
+			}
+			break
+		case *telemetry.KeyValue_DoubleValue:
+			kv[xmlpath] = v.GetDoubleValue()
+			break
+		case *telemetry.KeyValue_IntValue:
+			kv[xmlpath] = v.GetIntValue()
+			break
+		case *telemetry.KeyValue_UintValue:
+			kv[xmlpath] = v.GetUintValue()
+			break
+		case *telemetry.KeyValue_SintValue:
+			kv[xmlpath] = v.GetSintValue()
+			break
+		case *telemetry.KeyValue_BoolValue:
+			kv[xmlpath] = v.GetBoolValue()
+			break
+		case *telemetry.KeyValue_BytesValue:
+			kv[xmlpath] = v.GetBytesValue()
+			break
+		}
+
+		// Insert other tags from message
+		finaltags["system_id"] = r.SystemId
+		finaltags["path"] = r.Path
+
+		// Insert derived key and value
+		dgroups = CollectionByKeys(dgroups).Insert(finaltags, kv)
+
+		// Insert data from message header
+		dgroups = CollectionByKeys(dgroups).Insert(finaltags,
+			map[string]interface{}{"_sequence": r.SequenceNumber})
+		dgroups = CollectionByKeys(dgroups).Insert(finaltags,
+			map[string]interface{}{"_timestamp": r.Timestamp})
+		dgroups = CollectionByKeys(dgroups).Insert(finaltags,
+			map[string]interface{}{"_component_id": r.ComponentId})
+		dgroups = CollectionByKeys(dgroups).Insert(finaltags,
+			map[string]interface{}{"_subcomponent_id": r.SubComponentId})
+	}
+
+	return dgroups
+}
+
+// Structure to hold sensors path list and measurement name
+type sensorConfig struct {
+	measurementName string
+	pathList        []*telemetry.Path
+}
+
+// Takes in sensor configuration and converts it into slice of sensorConfig objects
+func (m *OpenConfigTelemetry) splitSensorConfig() int {
+	var pathlist []*telemetry.Path
+	var measurementName string
+	var reportingRate uint32
+
+	m.sensorsConfig = make([]sensorConfig, 0)
+	for _, sensor := range m.Sensors {
+		spathSplit := strings.Fields(sensor)
+		reportingRate = uint32(m.SampleFrequency.Duration / time.Millisecond)
+
+		// Extract measurement name and custom reporting rate if specified. Custom
+		// reporting rate will be specified at the beginning of sensor list,
+		// followed by measurement name like "1000ms interfaces /interfaces"
+		// where 1000ms is the custom reporting rate and interfaces is the
+		// measurement name. If 1000ms is not given, we use global reporting rate
+		// from sample_frequency. if measurement name is not given, we use first
+		// sensor name as the measurement name. If first or the word after custom
+		// reporting rate doesn't start with /, we treat it as measurement name
+		// and exclude it from list of sensors to subscribe
+		duration, err := time.ParseDuration(spathSplit[0])
+		if err == nil {
+			reportingRate = uint32(duration / time.Millisecond)
+			spathSplit = spathSplit[1:]
+		}
+
+		if len(spathSplit) == 0 {
+			log.Printf("E! No sensors are specified")
+			continue
+		}
+
+		// Word after custom reporting rate is treated as measurement name
+		measurementName = spathSplit[0]
+
+		// If our word after custom reporting rate doesn't start with /, we treat
+		// it as measurement name. Else we treat it as sensor
+		if !strings.HasPrefix(measurementName, "/") {
+			spathSplit = spathSplit[1:]
+		}
+
+		if len(spathSplit) == 0 {
+			log.Printf("E! No valid sensors are specified")
+			continue
+		}
+
+		// Iterate over our sensors and create pathlist to subscribe
+		pathlist = make([]*telemetry.Path, 0)
+		for _, path := range spathSplit {
+			pathlist = append(pathlist, &telemetry.Path{Path: path,
+				SampleFrequency: reportingRate})
+		}
+
+		m.sensorsConfig = append(m.sensorsConfig, sensorConfig{
+			measurementName: measurementName, pathList: pathlist,
+		})
+
+	}
+
+	return len(m.sensorsConfig)
+}
+
+// Subscribes and collects OpenConfig telemetry data from given server
+func (m *OpenConfigTelemetry) collectData(ctx context.Context,
+	grpcServer string, grpcClientConn *grpc.ClientConn,
+	acc telegraf.Accumulator) error {
+	c := telemetry.NewOpenConfigTelemetryClient(grpcClientConn)
+	for _, sensor := range m.sensorsConfig {
+		m.wg.Add(1)
+		go func(ctx context.Context, sensor sensorConfig) {
+			defer m.wg.Done()
+
+			for {
+				stream, err := c.TelemetrySubscribe(ctx,
+					&telemetry.SubscriptionRequest{PathList: sensor.pathList})
+				if err != nil {
+					rpcStatus, _ := status.FromError(err)
+					// If service is currently unavailable and may come back later, retry
+					if rpcStatus.Code() != codes.Unavailable {
+						acc.AddError(fmt.Errorf("E! Could not subscribe to %s: %v", grpcServer,
+							err))
+						return
+					} else {
+						// Retry with delay. If delay is not provided, use default
+						if m.RetryDelay.Duration > 0 {
+							log.Printf("D! Retrying %s with timeout %v", grpcServer,
+								m.RetryDelay.Duration)
+							time.Sleep(m.RetryDelay.Duration)
+							continue
+						} else {
+							return
+						}
+					}
+				}
+				for {
+					r, err := stream.Recv()
+					if err != nil {
+						// If we encounter error in the stream, break so we can retry
+						// the connection
+						acc.AddError(fmt.Errorf("E! Failed to read from %s: %v", err, grpcServer))
+						break
+					}
+
+					log.Printf("D! Received from %s: %v", grpcServer, r)
+
+					// Create a point and add to batch
+					tags := make(map[string]string)
+
+					// Insert additional tags
+					tags["device"] = grpcServer
+
+					dgroups := m.extractData(r, grpcServer)
+
+					// Print final data collection
+					log.Printf("D! Available collection for %s is: %v", grpcServer, dgroups)
+
+					tnow := time.Now()
+					// Iterate through data groups and add them
+					for _, group := range dgroups {
+						if len(group.tags) == 0 {
+							acc.AddFields(sensor.measurementName, group.data, tags, tnow)
+						} else {
+							acc.AddFields(sensor.measurementName, group.data, group.tags, tnow)
+						}
+					}
+				}
+			}
+		}(ctx, sensor)
+	}
+
+	return nil
+}
+
+func (m *OpenConfigTelemetry) Start(acc telegraf.Accumulator) error {
+	// Build sensors config
+	if m.splitSensorConfig() == 0 {
+		return fmt.Errorf("E! No valid sensor configuration available")
+	}
+
+	// If SSL certificate is provided, use transport credentials
+	var err error
+	var transportCredentials credentials.TransportCredentials
+	if m.SSLCert != "" {
+		transportCredentials, err = credentials.NewClientTLSFromFile(m.SSLCert, "")
+		if err != nil {
+			return fmt.Errorf("E! Failed to read certificate: %v", err)
+		}
+	} else {
+		transportCredentials = nil
+	}
+
+	// Connect to given list of servers and start collecting data
+	var grpcClientConn *grpc.ClientConn
+	var wg sync.WaitGroup
+	ctx := context.Background()
+	m.wg = &wg
+	for _, server := range m.Servers {
+		// Extract device address and port
+		grpcServer, grpcPort, err := net.SplitHostPort(server)
+		if err != nil {
+			log.Printf("E! Invalid server address: %v", err)
+			continue
+		}
+
+		// If a certificate is provided, open a secure channel. Else open insecure one
+		if transportCredentials != nil {
+			grpcClientConn, err = grpc.Dial(server, grpc.WithTransportCredentials(transportCredentials))
+		} else {
+			grpcClientConn, err = grpc.Dial(server, grpc.WithInsecure())
+		}
+		if err != nil {
+			log.Printf("E! Failed to connect to %s: %v", server, err)
+		} else {
+			log.Printf("D! Opened a new gRPC session to %s on port %s", grpcServer, grpcPort)
+		}
+
+		// Add to the list of client connections
+		m.grpcClientConns = append(m.grpcClientConns, grpcClientConn)
+
+		if m.Username != "" && m.Password != "" && m.ClientID != "" {
+			lc := authentication.NewLoginClient(grpcClientConn)
+			loginReply, loginErr := lc.LoginCheck(ctx,
+				&authentication.LoginRequest{UserName: m.Username,
+					Password: m.Password, ClientId: m.ClientID})
+			if loginErr != nil {
+				log.Printf("E! Could not initiate login check for %s: %v", server, err)
+				continue
+			}
+
+			// Check if the user is authenticated. Bail if auth error
+			if !loginReply.Result {
+				log.Printf("E! Failed to authenticate the user for %s", server)
+				continue
+			}
+		}
+
+		// Subscribe and gather telemetry data
+		m.collectData(ctx, grpcServer, grpcClientConn, acc)
+	}
+
+	return nil
+}
+
+func init() {
+	inputs.Add("jti_openconfig_telemetry", func() telegraf.Input {
+		return &OpenConfigTelemetry{
+			RetryDelay: internal.Duration{Duration: time.Second},
+			StrAsTags:  false,
+		}
+	})
+}
diff --git a/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry_test.go b/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry_test.go
new file mode 100644
index 000000000..8b0abd883
--- /dev/null
+++ b/plugins/inputs/jti_openconfig_telemetry/openconfig_telemetry_test.go
@@ -0,0 +1,225 @@
+package jti_openconfig_telemetry
+
+import (
+	"log"
+	"net"
+	"os"
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs/jti_openconfig_telemetry/oc"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var cfg = &OpenConfigTelemetry{
+	Servers:         []string{"127.0.0.1:50051"},
+	SampleFrequency: internal.Duration{Duration: time.Second * 2},
+}
+
+var data = &telemetry.OpenConfigData{
+	Path: "/sensor",
+	Kv:   []*telemetry.KeyValue{{Key: "/sensor[tag='tagValue']/intKey", Value: &telemetry.KeyValue_IntValue{IntValue: 10}}},
+}
+
+var data_with_prefix = &telemetry.OpenConfigData{
+	Path: "/sensor_with_prefix",
+	Kv: []*telemetry.KeyValue{{Key: "__prefix__", Value: &telemetry.KeyValue_StrValue{StrValue: "/sensor/prefix/"}},
+		{Key: "intKey", Value: &telemetry.KeyValue_IntValue{IntValue: 10}}},
+}
+
+var data_with_multiple_tags = &telemetry.OpenConfigData{
+	Path: "/sensor_with_multiple_tags",
+	Kv: []*telemetry.KeyValue{{Key: "__prefix__", Value: &telemetry.KeyValue_StrValue{StrValue: "/sensor/prefix/"}},
+		{Key: "tagKey[tag='tagValue']/boolKey", Value: &telemetry.KeyValue_BoolValue{BoolValue: false}},
+		{Key: "intKey", Value: &telemetry.KeyValue_IntValue{IntValue: 10}}},
+}
+
+var data_with_string_values = &telemetry.OpenConfigData{
+	Path: "/sensor_with_string_values",
+	Kv: []*telemetry.KeyValue{{Key: "__prefix__", Value: &telemetry.KeyValue_StrValue{StrValue: "/sensor/prefix/"}},
+		{Key: "strKey[tag='tagValue']/strValue", Value: &telemetry.KeyValue_StrValue{StrValue: "10"}}},
+}
+
+type openConfigTelemetryServer struct {
+}
+
+func (s *openConfigTelemetryServer) TelemetrySubscribe(req *telemetry.SubscriptionRequest, stream telemetry.OpenConfigTelemetry_TelemetrySubscribeServer) error {
+	path := req.PathList[0].Path
+	if path == "/sensor" {
+		stream.Send(data)
+	} else if path == "/sensor_with_prefix" {
+		stream.Send(data_with_prefix)
+	} else if path == "/sensor_with_multiple_tags" {
+		stream.Send(data_with_multiple_tags)
+	} else if path == "/sensor_with_string_values" {
+		stream.Send(data_with_string_values)
+	}
+	return nil
+}
+
+func (s *openConfigTelemetryServer) CancelTelemetrySubscription(ctx context.Context, req *telemetry.CancelSubscriptionRequest) (*telemetry.CancelSubscriptionReply, error) {
+	return nil, nil
+}
+
+func (s *openConfigTelemetryServer) GetTelemetrySubscriptions(ctx context.Context, req *telemetry.GetSubscriptionsRequest) (*telemetry.GetSubscriptionsReply, error) {
+	return nil, nil
+}
+
+func (s *openConfigTelemetryServer) GetTelemetryOperationalState(ctx context.Context, req *telemetry.GetOperationalStateRequest) (*telemetry.GetOperationalStateReply, error) {
+	return nil, nil
+}
+
+func (s *openConfigTelemetryServer) GetDataEncodings(ctx context.Context, req *telemetry.DataEncodingRequest) (*telemetry.DataEncodingReply, error) {
+	return nil, nil
+}
+
+func newServer() *openConfigTelemetryServer {
+	s := new(openConfigTelemetryServer)
+	return s
+}
+
+func TestOpenConfigTelemetryData(t *testing.T) {
+	var acc testutil.Accumulator
+
+	cfg.Sensors = []string{"/sensor"}
+	err := cfg.Start(&acc)
+	require.NoError(t, err)
+
+	tags := map[string]string{
+		"device":       "127.0.0.1",
+		"/sensor/@tag": "tagValue",
+		"system_id":    "",
+		"path":         "/sensor",
+	}
+
+	fields := map[string]interface{}{
+		"/sensor/intKey":   int64(10),
+		"_sequence":        uint64(0),
+		"_timestamp":       uint64(0),
+		"_component_id":    uint32(0),
+		"_subcomponent_id": uint32(0),
+	}
+
+	// Give sometime for gRPC channel to be established
+	time.Sleep(2 * time.Second)
+
+	acc.AssertContainsTaggedFields(t, "/sensor", fields, tags)
+}
+
+func TestOpenConfigTelemetryDataWithPrefix(t *testing.T) {
+	var acc testutil.Accumulator
+	cfg.Sensors = []string{"/sensor_with_prefix"}
+	err := cfg.Start(&acc)
+	require.NoError(t, err)
+
+	tags := map[string]string{
+		"device":    "127.0.0.1",
+		"system_id": "",
+		"path":      "/sensor_with_prefix",
+	}
+
+	fields := map[string]interface{}{
+		"/sensor/prefix/intKey": int64(10),
+		"_sequence":             uint64(0),
+		"_timestamp":            uint64(0),
+		"_component_id":         uint32(0),
+		"_subcomponent_id":      uint32(0),
+	}
+
+	// Give sometime for gRPC channel to be established
+	time.Sleep(2 * time.Second)
+
+	acc.AssertContainsTaggedFields(t, "/sensor_with_prefix", fields, tags)
+}
+
+func TestOpenConfigTelemetryDataWithMultipleTags(t *testing.T) {
+	var acc testutil.Accumulator
+	cfg.Sensors = []string{"/sensor_with_multiple_tags"}
+	err := cfg.Start(&acc)
+	require.NoError(t, err)
+
+	tags1 := map[string]string{
+		"/sensor/prefix/tagKey/@tag": "tagValue",
+		"device":                     "127.0.0.1",
+		"system_id":                  "",
+		"path":                       "/sensor_with_multiple_tags",
+	}
+
+	fields1 := map[string]interface{}{
+		"/sensor/prefix/tagKey/boolKey": false,
+		"_sequence":                     uint64(0),
+		"_timestamp":                    uint64(0),
+		"_component_id":                 uint32(0),
+		"_subcomponent_id":              uint32(0),
+	}
+
+	tags2 := map[string]string{
+		"device":    "127.0.0.1",
+		"system_id": "",
+		"path":      "/sensor_with_multiple_tags",
+	}
+
+	fields2 := map[string]interface{}{
+		"/sensor/prefix/intKey": int64(10),
+		"_sequence":             uint64(0),
+		"_timestamp":            uint64(0),
+		"_component_id":         uint32(0),
+		"_subcomponent_id":      uint32(0),
+	}
+
+	// Give sometime for gRPC channel to be established
+	time.Sleep(2 * time.Second)
+
+	acc.AssertContainsTaggedFields(t, "/sensor_with_multiple_tags", fields1, tags1)
+	acc.AssertContainsTaggedFields(t, "/sensor_with_multiple_tags", fields2, tags2)
+}
+
+func TestOpenConfigTelemetryDataWithStringValues(t *testing.T) {
+	var acc testutil.Accumulator
+	cfg.Sensors = []string{"/sensor_with_string_values"}
+	err := cfg.Start(&acc)
+	require.NoError(t, err)
+
+	tags := map[string]string{
+		"/sensor/prefix/strKey/@tag": "tagValue",
+		"device":                     "127.0.0.1",
+		"system_id":                  "",
+		"path":                       "/sensor_with_string_values",
+	}
+
+	fields := map[string]interface{}{
+		"/sensor/prefix/strKey/strValue": "10",
+		"_sequence":                      uint64(0),
+		"_timestamp":                     uint64(0),
+		"_component_id":                  uint32(0),
+		"_subcomponent_id":               uint32(0),
+	}
+
+	// Give sometime for gRPC channel to be established
+	time.Sleep(2 * time.Second)
+
+	acc.AssertContainsTaggedFields(t, "/sensor_with_string_values", fields, tags)
+}
+
+func TestMain(m *testing.M) {
+	lis, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		log.Fatalf("Failed to listen: %v", err)
+	}
+
+	cfg.Servers = []string{lis.Addr().String()}
+
+	var opts []grpc.ServerOption
+	grpcServer := grpc.NewServer(opts...)
+	telemetry.RegisterOpenConfigTelemetryServer(grpcServer, newServer())
+	go func() {
+		grpcServer.Serve(lis)
+	}()
+	defer grpcServer.Stop()
+	os.Exit(m.Run())
+}

From 18db718d7fafa02820e2d32119e18a60d93427d0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 11 May 2018 18:16:52 -0700
Subject: [PATCH 1173/1302] Add jti_openconfig_telemetry to docs

---
 CHANGELOG.md                    | 1 +
 README.md                       | 1 +
 docs/LICENSE_OF_DEPENDENCIES.md | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f82ce06..9172f2959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### New Inputs
 
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
+- [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry/README.md) - Contributed by @ajhai
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
 - [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
 
diff --git a/README.md b/README.md
index 6fbe80276..be3d9064c 100644
--- a/README.md
+++ b/README.md
@@ -164,6 +164,7 @@ configuration options.
 * [ipset](./plugins/inputs/ipset)
 * [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
 * [jolokia2](./plugins/inputs/jolokia2) (java, cassandra, kafka)
+- [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry)
 * [kapacitor](./plugins/inputs/kapacitor)
 * [kubernetes](./plugins/inputs/kubernetes)
 * [leofs](./plugins/inputs/leofs)
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 4c9e2d616..07b7287e9 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -97,6 +97,8 @@ following works:
 - golang.org/x/net [BSD](https://go.googlesource.com/net/+/master/LICENSE)
 - golang.org/x/text [BSD](https://go.googlesource.com/text/+/master/LICENSE)
 - golang.org/x/sys [BSD](https://go.googlesource.com/sys/+/master/LICENSE)
+- google.golang.org/grpc [APACHE](https://github.com/google/grpc-go/blob/master/LICENSE)
+- google.golang.org/genproto [APACHE](https://github.com/google/go-genproto/blob/master/LICENSE)
 - gopkg.in/asn1-ber.v1 [MIT](https://github.com/go-asn1-ber/asn1-ber/blob/v1.2/LICENSE)
 - gopkg.in/dancannon/gorethink.v1 [APACHE](https://github.com/dancannon/gorethink/blob/v1.1.2/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)

From 558caf57defba484404216d48d9f0a15d867e242 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 11 May 2018 18:18:43 -0700
Subject: [PATCH 1174/1302] Update sample config

---
 etc/telegraf.conf | 118 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 8 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 97a14727c..3a7c6a790 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -399,7 +399,7 @@
 #   ##  0 : No compression
 #   ##  1 : Gzip compression
 #   ##  2 : Snappy compression
-#   compression_codec = 0
+#   # compression_codec = 0
 #
 #   ##  RequiredAcks is used in Produce Requests to tell the broker how many
 #   ##  replica acknowledgements it must see before responding
@@ -415,10 +415,11 @@
 #   ##       received the data. This option provides the best durability, we
 #   ##       guarantee that no messages will be lost as long as at least one in
 #   ##       sync replica remains.
-#   required_acks = -1
+#   # required_acks = -1
 #
-#   ##  The total number of times to retry sending a message
-#   max_retry = 3
+#   ## The maximum number of times to retry sending a metric before failing
+#   ## until the next flush.
+#   # max_retry = 3
 #
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
@@ -435,7 +436,7 @@
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
+#   # data_format = "influx"
 
 
 # # Configuration for the AWS Kinesis output.
@@ -776,6 +777,56 @@
 # [[processors.printer]]
 
 
+# # Print all metrics that pass through this filter.
+# [[processors.topk]]
+#   ## How many seconds between aggregations
+#   # period = 10
+#
+#   ## How many top metrics to return
+#   # k = 10
+#
+#   ## Over which tags should the aggregation be done. Globs can be specified, in
+#   ## which case any tag matching the glob will aggregated over. If set to an
+#   ## empty list is no aggregation over tags is done
+#   # group_by = ['*']
+#
+#   ## Over which fields are the top k are calculated
+#   # fields = ["value"]
+#
+#   ## What aggregation to use. Options: sum, mean, min, max
+#   # aggregation = "mean"
+#
+#   ## Instead of the top k largest metrics, return the bottom k lowest metrics
+#   # bottomk = false
+#
+#   ## The plugin assigns each metric a GroupBy tag generated from its name and
+#   ## tags. If this setting is different than "" the plugin will add a
+#   ## tag (which name will be the value of this setting) to each metric with
+#   ## the value of the calculated GroupBy tag. Useful for debugging
+#   # add_groupby_tag = ""
+#
+#   ## These settings provide a way to know the position of each metric in
+#   ## the top k. The 'add_rank_field' setting allows to specify for which
+#   ## fields the position is required. If the list is non empty, then a field
+#   ## will be added to each and every metric for each string present in this
+#   ## setting. This field will contain the ranking of the group that
+#   ## the metric belonged to when aggregated over that field.
+#   ## The name of the field will be set to the name of the aggregation field,
+#   ## suffixed with the string '_topk_rank'
+#   # add_rank_fields = []
+#
+#   ## These settings provide a way to know what values the plugin is generating
+#   ## when aggregating metrics. The 'add_agregate_field' setting allows to
+#   ## specify for which fields the final aggregation value is required. If the
+#   ## list is non empty, then a field will be added to each every metric for
+#   ## each field present in this setting. This field will contain
+#   ## the computed aggregation for the group that the metric belonged to when
+#   ## aggregated over that field.
+#   ## The name of the field will be set to the name of the aggregation field,
+#   ## suffixed with the string '_topk_aggregate'
+#   # add_aggregate_fields = []
+
+
 
 ###############################################################################
 #                            AGGREGATOR PLUGINS                               #
@@ -2093,7 +2144,7 @@
 #   ##
 
 
-# # TCP or UDP 'ping' given url and collect response time in seconds
+# # Collect response time of a TCP or UDP connection
 # [[inputs.net_response]]
 #   ## Protocol, must be "tcp" or "udp"
 #   ## NOTE: because the "udp" protocol does not respond to requests, it requires
@@ -2101,11 +2152,12 @@
 #   protocol = "tcp"
 #   ## Server address (default localhost)
 #   address = "localhost:80"
+#
 #   ## Set timeout
-#   timeout = "1s"
+#   # timeout = "1s"
 #
 #   ## Set read timeout (only used if expecting a response)
-#   read_timeout = "1s"
+#   # read_timeout = "1s"
 #
 #   ## The following options are required for UDP checks. For TCP, they are
 #   ## optional. The plugin will send the given string to the server and then
@@ -2114,6 +2166,9 @@
 #   # send = "ssh"
 #   ## expected string in answer
 #   # expect = "ssh"
+#
+#   ## Uncomment to remove deprecated fields
+#   # fieldexclude = ["result_type", "string_found"]
 
 
 # # Read TCP metrics such as established, time wait and sockets counts.
@@ -2990,6 +3045,53 @@
 #   # basic_password = "barfoo"
 
 
+# # Read JTI OpenConfig Telemetry from listed sensors
+# [[inputs.jti_openconfig_telemetry]]
+#   ## List of device addresses to collect telemetry from
+#   servers = ["localhost:1883"]
+#
+#   ## Authentication details. Username and password are must if device expects
+#   ## authentication. Client ID must be unique when connecting from multiple instances
+#   ## of telegraf to the same device
+#   username = "user"
+#   password = "pass"
+#   client_id = "telegraf"
+#
+#   ## Frequency to get data
+#   sample_frequency = "1000ms"
+#
+#   ## Sensors to subscribe for
+#   ## A identifier for each sensor can be provided in path by separating with space
+#   ## Else sensor path will be used as identifier
+#   ## When identifier is used, we can provide a list of space separated sensors.
+#   ## A single subscription will be created with all these sensors and data will
+#   ## be saved to measurement with this identifier name
+#   sensors = [
+#    "/interfaces/",
+#    "collection /components/ /lldp",
+#   ]
+#
+#   ## We allow specifying sensor group level reporting rate. To do this, specify the
+#   ## reporting rate in Duration at the beginning of sensor paths / collection
+#   ## name. For entries without reporting rate, we use configured sample frequency
+#   sensors = [
+#    "1000ms customReporting /interfaces /lldp",
+#    "2000ms collection /components",
+#    "/interfaces",
+#   ]
+#
+#   ## x509 Certificate to use with TLS connection. If it is not provided, an insecure
+#   ## channel will be opened with server
+#   ssl_cert = "/etc/telegraf/cert.pem"
+#
+#   ## Delay between retry attempts of failed RPC calls or streams. Defaults to 1000ms.
+#   ## Failed streams/calls will not be retried if 0 is provided
+#   retry_delay = "1000ms"
+#
+#   ## To treat all string values as tags, set this to true
+#   str_as_tags = false
+
+
 # # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer]]
 #   ## kafka servers

From 0af40a8a5d81eef8627ffccf9069f9bb4bd146cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 14 May 2018 11:00:03 -0700
Subject: [PATCH 1175/1302] Fix dropwizard parsing error for metrics that need
 escaped (#4142)

If the dropwizard parser cannot convert the metric name into a valid
line protocol series then we will accept the name as is.
---
 metric.go                                 |     2 +
 metric/metric.go                          |     4 +
 plugins/parsers/dropwizard/parser.go      |   143 +-
 plugins/parsers/dropwizard/parser_test.go |   191 +-
 plugins/parsers/influx/machine.go         | 16581 ++++++++++----------
 plugins/parsers/influx/machine.go.rl      |    22 +-
 plugins/parsers/influx/machine_test.go    |    77 +
 plugins/parsers/influx/parser.go          |     9 +
 plugins/parsers/influx/parser_test.go     |    80 +
 plugins/parsers/registry.go               |    37 +-
 10 files changed, 8949 insertions(+), 8197 deletions(-)

diff --git a/metric.go b/metric.go
index 970477403..b8da02931 100644
--- a/metric.go
+++ b/metric.go
@@ -54,6 +54,8 @@ type Metric interface {
 	AddField(key string, value interface{})
 	RemoveField(key string)
 
+	SetTime(t time.Time)
+
 	// HashID returns an unique identifier for the series.
 	HashID() uint64
 
diff --git a/metric/metric.go b/metric/metric.go
index 3249b56ad..077b3a314 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -202,6 +202,10 @@ func (m *metric) RemoveField(key string) {
 	}
 }
 
+func (m *metric) SetTime(t time.Time) {
+	m.tm = t
+}
+
 func (m *metric) Copy() telegraf.Metric {
 	m2 := &metric{
 		name:      m.name,
diff --git a/plugins/parsers/dropwizard/parser.go b/plugins/parsers/dropwizard/parser.go
index a6130acfd..95ce3bffd 100644
--- a/plugins/parsers/dropwizard/parser.go
+++ b/plugins/parsers/dropwizard/parser.go
@@ -1,7 +1,6 @@
 package dropwizard
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -10,6 +9,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/templating"
+	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/tidwall/gjson"
 )
@@ -19,8 +19,8 @@ var keyEscaper = strings.NewReplacer(" ", "\\ ", ",", "\\,", "=", "\\=")
 
 // Parser parses json inputs containing dropwizard metrics,
 // either top-level or embedded inside a json field.
-// This parser is using gjon for retrieving paths within the json file.
-type Parser struct {
+// This parser is using gjson for retrieving paths within the json file.
+type parser struct {
 
 	// an optional json path containing the metric registry object
 	// if left empty, the whole json object is parsed as a metric registry
@@ -45,15 +45,28 @@ type Parser struct {
 	// an optional map of default tags to use for metrics
 	DefaultTags map[string]string
 
-	// templating configuration
-	Separator string
-	Templates []string
-
+	separator      string
 	templateEngine *templating.Engine
+
+	timeFunc metric.TimeFunc
+
+	// seriesParser parses line protocol measurement + tags
+	seriesParser *influx.Parser
+}
+
+func NewParser() *parser {
+	handler := influx.NewMetricHandler()
+	seriesParser := influx.NewSeriesParser(handler)
+
+	parser := &parser{
+		timeFunc:     time.Now,
+		seriesParser: seriesParser,
+	}
+	return parser
 }
 
 // Parse parses the input bytes to an array of metrics
-func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
+func (p *parser) Parse(buf []byte) ([]telegraf.Metric, error) {
 
 	metrics := make([]telegraf.Metric, 0)
 
@@ -100,28 +113,38 @@ func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
 	return metrics, nil
 }
 
-// InitTemplating initializes the templating support
-func (p *Parser) InitTemplating() error {
-	if len(p.Templates) > 0 {
-		defaultTemplate, _ := templating.NewDefaultTemplateWithPattern("measurement*")
-		templateEngine, err := templating.NewEngine(p.Separator, defaultTemplate, p.Templates)
-		p.templateEngine = templateEngine
+func (p *parser) SetTemplates(separator string, templates []string) error {
+	if len(templates) == 0 {
+		p.templateEngine = nil
+		return nil
+	}
+
+	defaultTemplate, err := templating.NewDefaultTemplateWithPattern("measurement*")
+	if err != nil {
 		return err
 	}
+
+	templateEngine, err := templating.NewEngine(separator, defaultTemplate, templates)
+	if err != nil {
+		return err
+	}
+
+	p.separator = separator
+	p.templateEngine = templateEngine
 	return nil
 }
 
 // ParseLine is not supported by the dropwizard format
-func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
+func (p *parser) ParseLine(line string) (telegraf.Metric, error) {
 	return nil, fmt.Errorf("ParseLine not supported: %s, for data format: dropwizard", line)
 }
 
 // SetDefaultTags sets the default tags
-func (p *Parser) SetDefaultTags(tags map[string]string) {
+func (p *parser) SetDefaultTags(tags map[string]string) {
 	p.DefaultTags = tags
 }
 
-func (p *Parser) readTags(buf []byte) map[string]string {
+func (p *parser) readTags(buf []byte) map[string]string {
 
 	if p.TagsPath != "" {
 		var tagsBytes []byte
@@ -147,7 +170,7 @@ func (p *Parser) readTags(buf []byte) map[string]string {
 	return tags
 }
 
-func (p *Parser) parseTime(buf []byte) (time.Time, error) {
+func (p *parser) parseTime(buf []byte) (time.Time, error) {
 
 	if p.TimePath != "" {
 		timeFormat := p.TimeFormat
@@ -157,19 +180,19 @@ func (p *Parser) parseTime(buf []byte) (time.Time, error) {
 		timeString := gjson.GetBytes(buf, p.TimePath).String()
 		if timeString == "" {
 			err := fmt.Errorf("time not found in JSON path %s", p.TimePath)
-			return time.Now().UTC(), err
+			return p.timeFunc(), err
 		}
 		t, err := time.Parse(timeFormat, timeString)
 		if err != nil {
 			err = fmt.Errorf("time %s cannot be parsed with format %s, %s", timeString, timeFormat, err)
-			return time.Now().UTC(), err
+			return p.timeFunc(), err
 		}
 		return t.UTC(), nil
 	}
-	return time.Now().UTC(), nil
+	return p.timeFunc(), nil
 }
 
-func (p *Parser) unmarshalMetrics(buf []byte) (map[string]interface{}, error) {
+func (p *parser) unmarshalMetrics(buf []byte) (map[string]interface{}, error) {
 
 	var registryBytes []byte
 	if p.MetricRegistryPath != "" {
@@ -195,11 +218,8 @@ func (p *Parser) unmarshalMetrics(buf []byte) (map[string]interface{}, error) {
 	return jsonOut, nil
 }
 
-func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []telegraf.Metric, tm time.Time) []telegraf.Metric {
-
-	switch dwmsTyped := dwms.(type) {
-	case map[string]interface{}:
-		var metricsBuffer bytes.Buffer
+func (p *parser) readDWMetrics(metricType string, dwms interface{}, metrics []telegraf.Metric, tm time.Time) []telegraf.Metric {
+	if dwmsTyped, ok := dwms.(map[string]interface{}); ok {
 		for dwmName, dwmFields := range dwmsTyped {
 			measurementName := dwmName
 			tags := make(map[string]string)
@@ -207,59 +227,46 @@ func (p *Parser) readDWMetrics(metricType string, dwms interface{}, metrics []te
 			if p.templateEngine != nil {
 				measurementName, tags, fieldPrefix, _ = p.templateEngine.Apply(dwmName)
 				if len(fieldPrefix) > 0 {
-					fieldPrefix = fmt.Sprintf("%s%s", fieldPrefix, p.Separator)
+					fieldPrefix = fmt.Sprintf("%s%s", fieldPrefix, p.separator)
 				}
 			}
-			tags["metric_type"] = metricType
 
-			measurementWithTags := measurementName
-			for tagName, tagValue := range tags {
-				tagKeyValue := fmt.Sprintf("%s=%s", keyEscaper.Replace(tagName), keyEscaper.Replace(tagValue))
-				measurementWithTags = fmt.Sprintf("%s,%s", measurementWithTags, tagKeyValue)
+			parsed, err := p.seriesParser.Parse([]byte(measurementName))
+			var m telegraf.Metric
+			if err != nil || len(parsed) != 1 {
+				m, err = metric.New(measurementName, map[string]string{}, map[string]interface{}{}, tm)
+				if err != nil {
+					log.Printf("W! failed to create metric of type '%s': %s\n", metricType, err)
+					continue
+				}
+			} else {
+				m = parsed[0]
+				m.SetTime(tm)
 			}
 
-			fields := make([]string, 0)
-			switch t := dwmFields.(type) {
-			case map[string]interface{}: // json object
-				for fieldName, fieldValue := range t {
-					key := keyEscaper.Replace(fieldPrefix + fieldName)
-					switch v := fieldValue.(type) {
-					case float64:
-						fields = append(fields, fmt.Sprintf("%s=%f", key, v))
-					case string:
-						fields = append(fields, fmt.Sprintf("%s=\"%s\"", key, fieldEscaper.Replace(v)))
-					case bool:
-						fields = append(fields, fmt.Sprintf("%s=%t", key, v))
-					default: // ignore
+			m.AddTag("metric_type", metricType)
+			for k, v := range tags {
+				m.AddTag(k, v)
+			}
+
+			if fields, ok := dwmFields.(map[string]interface{}); ok {
+				for k, v := range fields {
+					switch v := v.(type) {
+					case float64, string, bool:
+						m.AddField(fieldPrefix+k, v)
+					default:
+						// ignore
 					}
 				}
-			default: // ignore
 			}
 
-			metricsBuffer.WriteString(fmt.Sprintf("%s,metric_type=%s ", measurementWithTags, metricType))
-			metricsBuffer.WriteString(strings.Join(fields, ","))
-			metricsBuffer.WriteString("\n")
+			metrics = append(metrics, m)
 		}
-
-		handler := influx.NewMetricHandler()
-		handler.SetTimeFunc(func() time.Time { return tm })
-		parser := influx.NewParser(handler)
-		newMetrics, err := parser.Parse(metricsBuffer.Bytes())
-		if err != nil {
-			log.Printf("W! failed to create metric of type '%s': %s\n", metricType, err)
-		}
-
-		return append(metrics, newMetrics...)
-	default:
-		return metrics
 	}
 
+	return metrics
 }
 
-func arraymap(vs []string, f func(string) string) []string {
-	vsm := make([]string, len(vs))
-	for i, v := range vs {
-		vsm[i] = f(v)
-	}
-	return vsm
+func (p *parser) SetTimeFunc(f metric.TimeFunc) {
+	p.timeFunc = f
 }
diff --git a/plugins/parsers/dropwizard/parser_test.go b/plugins/parsers/dropwizard/parser_test.go
index fa92f3c30..8ddcf7714 100644
--- a/plugins/parsers/dropwizard/parser_test.go
+++ b/plugins/parsers/dropwizard/parser_test.go
@@ -4,13 +4,19 @@ import (
 	"testing"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
 
 	"fmt"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
+var TimeFunc = func() time.Time {
+	return time.Unix(0, 0)
+}
+
 // validEmptyJSON is a valid dropwizard json document, but without any metrics
 const validEmptyJSON = `
 {
@@ -24,7 +30,7 @@ const validEmptyJSON = `
 `
 
 func TestParseValidEmptyJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	// Most basic vanilla test
 	metrics, err := parser.Parse([]byte(validEmptyJSON))
@@ -49,7 +55,7 @@ const validCounterJSON = `
 `
 
 func TestParseValidCounterJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validCounterJSON))
 	assert.NoError(t, err)
@@ -87,11 +93,10 @@ const validEmbeddedCounterJSON = `
 func TestParseValidEmbeddedCounterJSON(t *testing.T) {
 	timeFormat := "2006-01-02T15:04:05Z07:00"
 	metricTime, _ := time.Parse(timeFormat, "2017-02-22T15:33:03.662+03:00")
-	parser := Parser{
-		MetricRegistryPath: "metrics",
-		TagsPath:           "tags",
-		TimePath:           "time",
-	}
+	parser := NewParser()
+	parser.MetricRegistryPath = "metrics"
+	parser.TagsPath = "tags"
+	parser.TimePath = "time"
 
 	metrics, err := parser.Parse([]byte(validEmbeddedCounterJSON))
 	assert.NoError(t, err)
@@ -109,11 +114,10 @@ func TestParseValidEmbeddedCounterJSON(t *testing.T) {
 	assert.True(t, metricTime.Equal(metrics[0].Time()), fmt.Sprintf("%s should be equal to %s", metrics[0].Time(), metricTime))
 
 	// now test json tags through TagPathsMap
-	parser2 := Parser{
-		MetricRegistryPath: "metrics",
-		TagPathsMap:        map[string]string{"tag1": "tags.tag1"},
-		TimePath:           "time",
-	}
+	parser2 := NewParser()
+	parser2.MetricRegistryPath = "metrics"
+	parser2.TagPathsMap = map[string]string{"tag1": "tags.tag1"}
+	parser2.TimePath = "time"
 	metrics2, err2 := parser2.Parse([]byte(validEmbeddedCounterJSON))
 	assert.NoError(t, err2)
 	assert.Equal(t, map[string]string{"metric_type": "counter", "tag1": "green"}, metrics2[0].Tags())
@@ -141,7 +145,7 @@ const validMeterJSON1 = `
 `
 
 func TestParseValidMeterJSON1(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validMeterJSON1))
 	assert.NoError(t, err)
@@ -181,7 +185,7 @@ const validMeterJSON2 = `
 `
 
 func TestParseValidMeterJSON2(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validMeterJSON2))
 	assert.NoError(t, err)
@@ -215,7 +219,7 @@ const validGaugeJSON = `
 `
 
 func TestParseValidGaugeJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validGaugeJSON))
 	assert.NoError(t, err)
@@ -254,7 +258,7 @@ const validHistogramJSON = `
 `
 
 func TestParseValidHistogramJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validHistogramJSON))
 	assert.NoError(t, err)
@@ -309,7 +313,7 @@ const validTimerJSON = `
 `
 
 func TestParseValidTimerJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validTimerJSON))
 	assert.NoError(t, err)
@@ -360,7 +364,7 @@ const validAllJSON = `
 `
 
 func TestParseValidAllJSON(t *testing.T) {
-	parser := Parser{}
+	parser := NewParser()
 
 	metrics, err := parser.Parse([]byte(validAllJSON))
 	assert.NoError(t, err)
@@ -369,18 +373,19 @@ func TestParseValidAllJSON(t *testing.T) {
 
 func TestTagParsingProblems(t *testing.T) {
 	// giving a wrong path results in empty tags
-	parser1 := Parser{MetricRegistryPath: "metrics", TagsPath: "tags1"}
+	parser1 := NewParser()
+	parser1.MetricRegistryPath = "metrics"
+	parser1.TagsPath = "tags1"
 	metrics1, err1 := parser1.Parse([]byte(validEmbeddedCounterJSON))
 	assert.NoError(t, err1)
 	assert.Len(t, metrics1, 1)
 	assert.Equal(t, map[string]string{"metric_type": "counter"}, metrics1[0].Tags())
 
 	// giving a wrong TagsPath falls back to TagPathsMap
-	parser2 := Parser{
-		MetricRegistryPath: "metrics",
-		TagsPath:           "tags1",
-		TagPathsMap:        map[string]string{"tag1": "tags.tag1"},
-	}
+	parser2 := NewParser()
+	parser2.MetricRegistryPath = "metrics"
+	parser2.TagsPath = "tags1"
+	parser2.TagPathsMap = map[string]string{"tag1": "tags.tag1"}
 	metrics2, err2 := parser2.Parse([]byte(validEmbeddedCounterJSON))
 	assert.NoError(t, err2)
 	assert.Len(t, metrics2, 1)
@@ -425,23 +430,21 @@ const sampleTemplateJSON = `
 `
 
 func TestParseSampleTemplateJSON(t *testing.T) {
-	parser := Parser{
-		Separator: "_",
-		Templates: []string{
-			"jenkins.* measurement.metric.metric.field",
-			"vm.* measurement.measurement.pool.field",
-		},
-	}
-	parser.InitTemplating()
+	parser := NewParser()
+	err := parser.SetTemplates("_", []string{
+		"jenkins.* measurement.metric.metric.field",
+		"vm.* measurement.measurement.pool.field",
+	})
+	require.NoError(t, err)
 
 	metrics, err := parser.Parse([]byte(sampleTemplateJSON))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
-	assert.Len(t, metrics, 11)
+	require.Len(t, metrics, 11)
 
 	jenkinsMetric := search(metrics, "jenkins", nil, "")
-	assert.NotNil(t, jenkinsMetric, "the metrics should contain a jenkins measurement")
-	assert.Equal(t, map[string]interface{}{
+	require.NotNil(t, jenkinsMetric, "the metrics should contain a jenkins measurement")
+	require.Equal(t, map[string]interface{}{
 		"duration_count":  float64(1),
 		"duration_max":    float64(2),
 		"duration_mean":   float64(3),
@@ -454,21 +457,21 @@ func TestParseSampleTemplateJSON(t *testing.T) {
 		"duration_p999":   float64(10),
 		"duration_stddev": float64(11),
 	}, jenkinsMetric.Fields())
-	assert.Equal(t, map[string]string{"metric_type": "histogram", "metric": "job_building"}, jenkinsMetric.Tags())
+	require.Equal(t, map[string]string{"metric_type": "histogram", "metric": "job_building"}, jenkinsMetric.Tags())
 
 	vmMemoryHeapCommitted := search(metrics, "vm_memory", map[string]string{"pool": "heap"}, "committed_value")
-	assert.NotNil(t, vmMemoryHeapCommitted)
-	assert.Equal(t, map[string]interface{}{
+	require.NotNil(t, vmMemoryHeapCommitted)
+	require.Equal(t, map[string]interface{}{
 		"committed_value": float64(1),
 	}, vmMemoryHeapCommitted.Fields())
-	assert.Equal(t, map[string]string{"metric_type": "gauge", "pool": "heap"}, vmMemoryHeapCommitted.Tags())
+	require.Equal(t, map[string]string{"metric_type": "gauge", "pool": "heap"}, vmMemoryHeapCommitted.Tags())
 
 	vmMemoryNonHeapCommitted := search(metrics, "vm_memory", map[string]string{"pool": "non-heap"}, "committed_value")
-	assert.NotNil(t, vmMemoryNonHeapCommitted)
-	assert.Equal(t, map[string]interface{}{
+	require.NotNil(t, vmMemoryNonHeapCommitted)
+	require.Equal(t, map[string]interface{}{
 		"committed_value": float64(6),
 	}, vmMemoryNonHeapCommitted.Fields())
-	assert.Equal(t, map[string]string{"metric_type": "gauge", "pool": "non-heap"}, vmMemoryNonHeapCommitted.Tags())
+	require.Equal(t, map[string]string{"metric_type": "gauge", "pool": "non-heap"}, vmMemoryNonHeapCommitted.Tags())
 }
 
 func search(metrics []telegraf.Metric, name string, tags map[string]string, fieldName string) telegraf.Metric {
@@ -493,3 +496,105 @@ func containsAll(t1 map[string]string, t2 map[string]string) bool {
 	}
 	return true
 }
+
+func Metric(v telegraf.Metric, err error) telegraf.Metric {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
+func NoError(t *testing.T, err error) {
+	require.NoError(t, err)
+}
+
+func TestDropWizard(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   []byte
+		metrics []telegraf.Metric
+		errFunc func(t *testing.T, err error)
+	}{
+		{
+			name:  "minimal",
+			input: []byte(`{"version": "3.0.0", "counters": {"cpu": {"value": 42}}}`),
+			metrics: []telegraf.Metric{
+				Metric(
+					metric.New(
+						"cpu",
+						map[string]string{
+							"metric_type": "counter",
+						},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						TimeFunc(),
+					),
+				),
+			},
+			errFunc: NoError,
+		},
+		{
+			name:  "name with space unescaped",
+			input: []byte(`{"version": "3.0.0", "counters": {"hello world": {"value": 42}}}`),
+			metrics: []telegraf.Metric{
+				Metric(
+					metric.New(
+						"hello world",
+						map[string]string{
+							"metric_type": "counter",
+						},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						TimeFunc(),
+					),
+				),
+			},
+			errFunc: NoError,
+		},
+		{
+			name:  "name with space single slash escaped is not valid JSON",
+			input: []byte(`{"version": "3.0.0", "counters": {"hello\ world": {"value": 42}}}`),
+			errFunc: func(t *testing.T, err error) {
+				require.Error(t, err)
+			},
+		},
+		{
+			name:  "name with space double slash escape",
+			input: []byte(`{"version": "3.0.0", "counters": {"hello\\ world": {"value": 42}}}`),
+			metrics: []telegraf.Metric{
+				Metric(
+					metric.New(
+						"hello world",
+						map[string]string{
+							"metric_type": "counter",
+						},
+						map[string]interface{}{
+							"value": 42.0,
+						},
+						TimeFunc(),
+					),
+				),
+			},
+			errFunc: NoError,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			parser := NewParser()
+			parser.SetTimeFunc(TimeFunc)
+			metrics, err := parser.Parse(tt.input)
+			tt.errFunc(t, err)
+
+			require.Equal(t, len(tt.metrics), len(metrics))
+			for i, expected := range tt.metrics {
+				require.Equal(t, expected.Name(), metrics[i].Name())
+				require.Equal(t, expected.Tags(), metrics[i].Tags())
+				require.Equal(t, expected.Fields(), metrics[i].Fields())
+				require.Equal(t, expected.Time(), metrics[i].Time())
+			}
+		})
+	}
+}
diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
index f2931096a..fef7e2d38 100644
--- a/plugins/parsers/influx/machine.go
+++ b/plugins/parsers/influx/machine.go
@@ -15,21 +15,22 @@ var (
 )
 
 
-//line plugins/parsers/influx/machine.go.rl:224
+//line plugins/parsers/influx/machine.go.rl:226
 
 
 
 //line plugins/parsers/influx/machine.go:23
 const LineProtocol_start int = 1
-const LineProtocol_first_final int = 199
+const LineProtocol_first_final int = 206
 const LineProtocol_error int = 0
 
 const LineProtocol_en_main int = 1
 const LineProtocol_en_discard_line int = 195
 const LineProtocol_en_align int = 196
+const LineProtocol_en_series int = 199
 
 
-//line plugins/parsers/influx/machine.go.rl:227
+//line plugins/parsers/influx/machine.go.rl:229
 
 type Handler interface {
 	SetMeasurement(name []byte)
@@ -48,31 +49,60 @@ type machine struct {
 	p, pe, eof int
 	pb         int
 	handler    Handler
+	initState  int
 	err        error
 }
 
 func NewMachine(handler Handler) *machine {
 	m := &machine{
 		handler: handler,
+		initState: LineProtocol_en_align,
 	}
 
 	
-//line plugins/parsers/influx/machine.go.rl:254
-	
-//line plugins/parsers/influx/machine.go.rl:255
-	
-//line plugins/parsers/influx/machine.go.rl:256
-	
-//line plugins/parsers/influx/machine.go.rl:257
-	
 //line plugins/parsers/influx/machine.go.rl:258
 	
-//line plugins/parsers/influx/machine.go:71
+//line plugins/parsers/influx/machine.go.rl:259
+	
+//line plugins/parsers/influx/machine.go.rl:260
+	
+//line plugins/parsers/influx/machine.go.rl:261
+	
+//line plugins/parsers/influx/machine.go.rl:262
+	
+//line plugins/parsers/influx/machine.go:74
 	{
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:259
+//line plugins/parsers/influx/machine.go.rl:263
+
+	return m
+}
+
+func NewSeriesMachine(handler Handler) *machine {
+	m := &machine{
+		handler: handler,
+		initState: LineProtocol_en_series,
+	}
+
+	
+//line plugins/parsers/influx/machine.go.rl:274
+	
+//line plugins/parsers/influx/machine.go.rl:275
+	
+//line plugins/parsers/influx/machine.go.rl:276
+	
+//line plugins/parsers/influx/machine.go.rl:277
+	
+//line plugins/parsers/influx/machine.go.rl:278
+	
+//line plugins/parsers/influx/machine.go:101
+	{
+	 m.cs = LineProtocol_start
+	}
+
+//line plugins/parsers/influx/machine.go.rl:279
 
 	return m
 }
@@ -86,13 +116,13 @@ func (m *machine) SetData(data []byte) {
 	m.err = nil
 
 	
-//line plugins/parsers/influx/machine.go:90
+//line plugins/parsers/influx/machine.go:120
 	{
 	 m.cs = LineProtocol_start
 	}
 
-//line plugins/parsers/influx/machine.go.rl:272
-	m.cs = LineProtocol_en_align
+//line plugins/parsers/influx/machine.go.rl:292
+	m.cs = m.initState
 }
 
 // ParseLine parses a line of input and returns true if more data can be
@@ -108,7 +138,7 @@ func (m *machine) ParseLine() bool {
 	var yield bool
 
 	
-//line plugins/parsers/influx/machine.go:112
+//line plugins/parsers/influx/machine.go:142
 	{
 	if ( m.p) == ( m.pe) {
 		goto _test_eof
@@ -133,28 +163,14 @@ _again:
 		goto st6
 	case 7:
 		goto st7
-	case 199:
-		goto st199
-	case 200:
-		goto st200
-	case 201:
-		goto st201
-	case 8:
-		goto st8
-	case 202:
-		goto st202
-	case 203:
-		goto st203
-	case 204:
-		goto st204
-	case 205:
-		goto st205
 	case 206:
 		goto st206
 	case 207:
 		goto st207
 	case 208:
 		goto st208
+	case 8:
+		goto st8
 	case 209:
 		goto st209
 	case 210:
@@ -181,22 +197,8 @@ _again:
 		goto st220
 	case 221:
 		goto st221
-	case 9:
-		goto st9
-	case 10:
-		goto st10
-	case 11:
-		goto st11
-	case 12:
-		goto st12
-	case 13:
-		goto st13
 	case 222:
 		goto st222
-	case 14:
-		goto st14
-	case 15:
-		goto st15
 	case 223:
 		goto st223
 	case 224:
@@ -209,36 +211,64 @@ _again:
 		goto st227
 	case 228:
 		goto st228
+	case 9:
+		goto st9
+	case 10:
+		goto st10
+	case 11:
+		goto st11
+	case 12:
+		goto st12
+	case 13:
+		goto st13
 	case 229:
 		goto st229
+	case 14:
+		goto st14
+	case 15:
+		goto st15
 	case 230:
 		goto st230
 	case 231:
 		goto st231
+	case 232:
+		goto st232
+	case 233:
+		goto st233
+	case 234:
+		goto st234
+	case 235:
+		goto st235
+	case 236:
+		goto st236
+	case 237:
+		goto st237
+	case 238:
+		goto st238
 	case 16:
 		goto st16
 	case 17:
 		goto st17
 	case 18:
 		goto st18
-	case 232:
-		goto st232
+	case 239:
+		goto st239
 	case 19:
 		goto st19
 	case 20:
 		goto st20
 	case 21:
 		goto st21
-	case 233:
-		goto st233
+	case 240:
+		goto st240
 	case 22:
 		goto st22
 	case 23:
 		goto st23
-	case 234:
-		goto st234
-	case 235:
-		goto st235
+	case 241:
+		goto st241
+	case 242:
+		goto st242
 	case 24:
 		goto st24
 	case 25:
@@ -277,26 +307,12 @@ _again:
 		goto st41
 	case 42:
 		goto st42
-	case 236:
-		goto st236
-	case 237:
-		goto st237
-	case 43:
-		goto st43
-	case 238:
-		goto st238
-	case 239:
-		goto st239
-	case 240:
-		goto st240
-	case 241:
-		goto st241
-	case 242:
-		goto st242
 	case 243:
 		goto st243
 	case 244:
 		goto st244
+	case 43:
+		goto st43
 	case 245:
 		goto st245
 	case 246:
@@ -323,14 +339,10 @@ _again:
 		goto st256
 	case 257:
 		goto st257
-	case 44:
-		goto st44
 	case 258:
 		goto st258
 	case 259:
 		goto st259
-	case 45:
-		goto st45
 	case 260:
 		goto st260
 	case 261:
@@ -341,10 +353,14 @@ _again:
 		goto st263
 	case 264:
 		goto st264
+	case 44:
+		goto st44
 	case 265:
 		goto st265
 	case 266:
 		goto st266
+	case 45:
+		goto st45
 	case 267:
 		goto st267
 	case 268:
@@ -371,14 +387,28 @@ _again:
 		goto st278
 	case 279:
 		goto st279
+	case 280:
+		goto st280
+	case 281:
+		goto st281
+	case 282:
+		goto st282
+	case 283:
+		goto st283
+	case 284:
+		goto st284
+	case 285:
+		goto st285
+	case 286:
+		goto st286
 	case 46:
 		goto st46
 	case 47:
 		goto st47
 	case 48:
 		goto st48
-	case 280:
-		goto st280
+	case 287:
+		goto st287
 	case 49:
 		goto st49
 	case 50:
@@ -389,110 +419,110 @@ _again:
 		goto st52
 	case 53:
 		goto st53
-	case 281:
-		goto st281
-	case 54:
-		goto st54
-	case 282:
-		goto st282
-	case 55:
-		goto st55
-	case 283:
-		goto st283
-	case 284:
-		goto st284
-	case 285:
-		goto st285
-	case 286:
-		goto st286
-	case 287:
-		goto st287
 	case 288:
 		goto st288
+	case 54:
+		goto st54
 	case 289:
 		goto st289
+	case 55:
+		goto st55
 	case 290:
 		goto st290
 	case 291:
 		goto st291
+	case 292:
+		goto st292
+	case 293:
+		goto st293
+	case 294:
+		goto st294
+	case 295:
+		goto st295
+	case 296:
+		goto st296
+	case 297:
+		goto st297
+	case 298:
+		goto st298
 	case 56:
 		goto st56
 	case 57:
 		goto st57
 	case 58:
 		goto st58
-	case 292:
-		goto st292
+	case 299:
+		goto st299
 	case 59:
 		goto st59
 	case 60:
 		goto st60
 	case 61:
 		goto st61
-	case 293:
-		goto st293
+	case 300:
+		goto st300
 	case 62:
 		goto st62
 	case 63:
 		goto st63
-	case 294:
-		goto st294
-	case 295:
-		goto st295
+	case 301:
+		goto st301
+	case 302:
+		goto st302
 	case 64:
 		goto st64
 	case 65:
 		goto st65
 	case 66:
 		goto st66
-	case 296:
-		goto st296
+	case 303:
+		goto st303
 	case 67:
 		goto st67
 	case 68:
 		goto st68
-	case 297:
-		goto st297
-	case 298:
-		goto st298
-	case 299:
-		goto st299
-	case 300:
-		goto st300
-	case 301:
-		goto st301
-	case 302:
-		goto st302
-	case 303:
-		goto st303
 	case 304:
 		goto st304
 	case 305:
 		goto st305
+	case 306:
+		goto st306
+	case 307:
+		goto st307
+	case 308:
+		goto st308
+	case 309:
+		goto st309
+	case 310:
+		goto st310
+	case 311:
+		goto st311
+	case 312:
+		goto st312
 	case 69:
 		goto st69
 	case 70:
 		goto st70
 	case 71:
 		goto st71
-	case 306:
-		goto st306
+	case 313:
+		goto st313
 	case 72:
 		goto st72
 	case 73:
 		goto st73
 	case 74:
 		goto st74
-	case 307:
-		goto st307
+	case 314:
+		goto st314
 	case 75:
 		goto st75
 	case 76:
 		goto st76
-	case 308:
-		goto st308
-	case 309:
-		goto st309
+	case 315:
+		goto st315
+	case 316:
+		goto st316
 	case 77:
 		goto st77
 	case 78:
@@ -505,32 +535,16 @@ _again:
 		goto st81
 	case 82:
 		goto st82
-	case 310:
-		goto st310
-	case 311:
-		goto st311
-	case 312:
-		goto st312
-	case 313:
-		goto st313
-	case 83:
-		goto st83
-	case 314:
-		goto st314
-	case 315:
-		goto st315
-	case 316:
-		goto st316
 	case 317:
 		goto st317
-	case 84:
-		goto st84
 	case 318:
 		goto st318
 	case 319:
 		goto st319
 	case 320:
 		goto st320
+	case 83:
+		goto st83
 	case 321:
 		goto st321
 	case 322:
@@ -539,6 +553,8 @@ _again:
 		goto st323
 	case 324:
 		goto st324
+	case 84:
+		goto st84
 	case 325:
 		goto st325
 	case 326:
@@ -561,6 +577,20 @@ _again:
 		goto st334
 	case 335:
 		goto st335
+	case 336:
+		goto st336
+	case 337:
+		goto st337
+	case 338:
+		goto st338
+	case 339:
+		goto st339
+	case 340:
+		goto st340
+	case 341:
+		goto st341
+	case 342:
+		goto st342
 	case 85:
 		goto st85
 	case 86:
@@ -587,26 +617,12 @@ _again:
 		goto st96
 	case 97:
 		goto st97
-	case 336:
-		goto st336
-	case 337:
-		goto st337
-	case 98:
-		goto st98
-	case 338:
-		goto st338
-	case 339:
-		goto st339
-	case 340:
-		goto st340
-	case 341:
-		goto st341
-	case 342:
-		goto st342
 	case 343:
 		goto st343
 	case 344:
 		goto st344
+	case 98:
+		goto st98
 	case 345:
 		goto st345
 	case 346:
@@ -633,16 +649,10 @@ _again:
 		goto st356
 	case 357:
 		goto st357
-	case 99:
-		goto st99
-	case 100:
-		goto st100
 	case 358:
 		goto st358
 	case 359:
 		goto st359
-	case 101:
-		goto st101
 	case 360:
 		goto st360
 	case 361:
@@ -653,10 +663,16 @@ _again:
 		goto st363
 	case 364:
 		goto st364
+	case 99:
+		goto st99
+	case 100:
+		goto st100
 	case 365:
 		goto st365
 	case 366:
 		goto st366
+	case 101:
+		goto st101
 	case 367:
 		goto st367
 	case 368:
@@ -683,12 +699,26 @@ _again:
 		goto st378
 	case 379:
 		goto st379
-	case 102:
-		goto st102
 	case 380:
 		goto st380
 	case 381:
 		goto st381
+	case 382:
+		goto st382
+	case 383:
+		goto st383
+	case 384:
+		goto st384
+	case 385:
+		goto st385
+	case 386:
+		goto st386
+	case 102:
+		goto st102
+	case 387:
+		goto st387
+	case 388:
+		goto st388
 	case 103:
 		goto st103
 	case 104:
@@ -699,54 +729,54 @@ _again:
 		goto st106
 	case 107:
 		goto st107
-	case 382:
-		goto st382
+	case 389:
+		goto st389
 	case 108:
 		goto st108
 	case 109:
 		goto st109
-	case 383:
-		goto st383
-	case 384:
-		goto st384
-	case 385:
-		goto st385
-	case 386:
-		goto st386
-	case 387:
-		goto st387
-	case 388:
-		goto st388
-	case 389:
-		goto st389
 	case 390:
 		goto st390
 	case 391:
 		goto st391
+	case 392:
+		goto st392
+	case 393:
+		goto st393
+	case 394:
+		goto st394
+	case 395:
+		goto st395
+	case 396:
+		goto st396
+	case 397:
+		goto st397
+	case 398:
+		goto st398
 	case 110:
 		goto st110
 	case 111:
 		goto st111
 	case 112:
 		goto st112
-	case 392:
-		goto st392
+	case 399:
+		goto st399
 	case 113:
 		goto st113
 	case 114:
 		goto st114
 	case 115:
 		goto st115
-	case 393:
-		goto st393
+	case 400:
+		goto st400
 	case 116:
 		goto st116
 	case 117:
 		goto st117
-	case 394:
-		goto st394
-	case 395:
-		goto st395
+	case 401:
+		goto st401
+	case 402:
+		goto st402
 	case 118:
 		goto st118
 	case 119:
@@ -771,28 +801,14 @@ _again:
 		goto st128
 	case 129:
 		goto st129
-	case 396:
-		goto st396
-	case 397:
-		goto st397
-	case 398:
-		goto st398
-	case 130:
-		goto st130
-	case 399:
-		goto st399
-	case 400:
-		goto st400
-	case 401:
-		goto st401
-	case 402:
-		goto st402
 	case 403:
 		goto st403
 	case 404:
 		goto st404
 	case 405:
 		goto st405
+	case 130:
+		goto st130
 	case 406:
 		goto st406
 	case 407:
@@ -823,8 +839,6 @@ _again:
 		goto st419
 	case 420:
 		goto st420
-	case 131:
-		goto st131
 	case 421:
 		goto st421
 	case 422:
@@ -833,14 +847,14 @@ _again:
 		goto st423
 	case 424:
 		goto st424
-	case 132:
-		goto st132
 	case 425:
 		goto st425
 	case 426:
 		goto st426
 	case 427:
 		goto st427
+	case 131:
+		goto st131
 	case 428:
 		goto st428
 	case 429:
@@ -849,6 +863,8 @@ _again:
 		goto st430
 	case 431:
 		goto st431
+	case 132:
+		goto st132
 	case 432:
 		goto st432
 	case 433:
@@ -875,18 +891,10 @@ _again:
 		goto st443
 	case 444:
 		goto st444
-	case 133:
-		goto st133
-	case 134:
-		goto st134
-	case 135:
-		goto st135
 	case 445:
 		goto st445
 	case 446:
 		goto st446
-	case 136:
-		goto st136
 	case 447:
 		goto st447
 	case 448:
@@ -897,10 +905,18 @@ _again:
 		goto st450
 	case 451:
 		goto st451
+	case 133:
+		goto st133
+	case 134:
+		goto st134
+	case 135:
+		goto st135
 	case 452:
 		goto st452
 	case 453:
 		goto st453
+	case 136:
+		goto st136
 	case 454:
 		goto st454
 	case 455:
@@ -927,16 +943,12 @@ _again:
 		goto st465
 	case 466:
 		goto st466
-	case 137:
-		goto st137
 	case 467:
 		goto st467
 	case 468:
 		goto st468
 	case 469:
 		goto st469
-	case 138:
-		goto st138
 	case 470:
 		goto st470
 	case 471:
@@ -945,12 +957,16 @@ _again:
 		goto st472
 	case 473:
 		goto st473
+	case 137:
+		goto st137
 	case 474:
 		goto st474
 	case 475:
 		goto st475
 	case 476:
 		goto st476
+	case 138:
+		goto st138
 	case 477:
 		goto st477
 	case 478:
@@ -981,8 +997,6 @@ _again:
 		goto st490
 	case 491:
 		goto st491
-	case 139:
-		goto st139
 	case 492:
 		goto st492
 	case 493:
@@ -997,6 +1011,8 @@ _again:
 		goto st497
 	case 498:
 		goto st498
+	case 139:
+		goto st139
 	case 499:
 		goto st499
 	case 500:
@@ -1027,24 +1043,10 @@ _again:
 		goto st512
 	case 513:
 		goto st513
-	case 140:
-		goto st140
-	case 141:
-		goto st141
-	case 142:
-		goto st142
-	case 143:
-		goto st143
-	case 144:
-		goto st144
 	case 514:
 		goto st514
-	case 145:
-		goto st145
 	case 515:
 		goto st515
-	case 146:
-		goto st146
 	case 516:
 		goto st516
 	case 517:
@@ -1055,66 +1057,80 @@ _again:
 		goto st519
 	case 520:
 		goto st520
+	case 140:
+		goto st140
+	case 141:
+		goto st141
+	case 142:
+		goto st142
+	case 143:
+		goto st143
+	case 144:
+		goto st144
 	case 521:
 		goto st521
+	case 145:
+		goto st145
 	case 522:
 		goto st522
+	case 146:
+		goto st146
 	case 523:
 		goto st523
 	case 524:
 		goto st524
-	case 147:
-		goto st147
-	case 148:
-		goto st148
-	case 149:
-		goto st149
 	case 525:
 		goto st525
-	case 150:
-		goto st150
-	case 151:
-		goto st151
-	case 152:
-		goto st152
 	case 526:
 		goto st526
-	case 153:
-		goto st153
-	case 154:
-		goto st154
 	case 527:
 		goto st527
 	case 528:
 		goto st528
-	case 155:
-		goto st155
-	case 156:
-		goto st156
-	case 157:
-		goto st157
 	case 529:
 		goto st529
 	case 530:
 		goto st530
 	case 531:
 		goto st531
-	case 158:
-		goto st158
+	case 147:
+		goto st147
+	case 148:
+		goto st148
+	case 149:
+		goto st149
 	case 532:
 		goto st532
+	case 150:
+		goto st150
+	case 151:
+		goto st151
+	case 152:
+		goto st152
 	case 533:
 		goto st533
+	case 153:
+		goto st153
+	case 154:
+		goto st154
 	case 534:
 		goto st534
 	case 535:
 		goto st535
+	case 155:
+		goto st155
+	case 156:
+		goto st156
+	case 157:
+		goto st157
 	case 536:
 		goto st536
 	case 537:
 		goto st537
 	case 538:
 		goto st538
+	case 158:
+		goto st158
 	case 539:
 		goto st539
 	case 540:
@@ -1141,10 +1157,6 @@ _again:
 		goto st550
 	case 551:
 		goto st551
-	case 159:
-		goto st159
-	case 160:
-		goto st160
 	case 552:
 		goto st552
 	case 553:
@@ -1159,34 +1171,52 @@ _again:
 		goto st557
 	case 558:
 		goto st558
+	case 159:
+		goto st159
+	case 160:
+		goto st160
 	case 559:
 		goto st559
 	case 560:
 		goto st560
+	case 561:
+		goto st561
+	case 562:
+		goto st562
+	case 563:
+		goto st563
+	case 564:
+		goto st564
+	case 565:
+		goto st565
+	case 566:
+		goto st566
+	case 567:
+		goto st567
 	case 161:
 		goto st161
 	case 162:
 		goto st162
 	case 163:
 		goto st163
-	case 561:
-		goto st561
+	case 568:
+		goto st568
 	case 164:
 		goto st164
 	case 165:
 		goto st165
 	case 166:
 		goto st166
-	case 562:
-		goto st562
+	case 569:
+		goto st569
 	case 167:
 		goto st167
 	case 168:
 		goto st168
-	case 563:
-		goto st563
-	case 564:
-		goto st564
+	case 570:
+		goto st570
+	case 571:
+		goto st571
 	case 169:
 		goto st169
 	case 170:
@@ -1195,122 +1225,144 @@ _again:
 		goto st171
 	case 172:
 		goto st172
-	case 565:
-		goto st565
-	case 173:
-		goto st173
-	case 566:
-		goto st566
-	case 567:
-		goto st567
-	case 174:
-		goto st174
-	case 568:
-		goto st568
-	case 569:
-		goto st569
-	case 570:
-		goto st570
-	case 571:
-		goto st571
 	case 572:
 		goto st572
+	case 173:
+		goto st173
 	case 573:
 		goto st573
 	case 574:
 		goto st574
+	case 174:
+		goto st174
 	case 575:
 		goto st575
 	case 576:
 		goto st576
+	case 577:
+		goto st577
+	case 578:
+		goto st578
+	case 579:
+		goto st579
+	case 580:
+		goto st580
+	case 581:
+		goto st581
+	case 582:
+		goto st582
+	case 583:
+		goto st583
 	case 175:
 		goto st175
 	case 176:
 		goto st176
 	case 177:
 		goto st177
-	case 577:
-		goto st577
+	case 584:
+		goto st584
 	case 178:
 		goto st178
 	case 179:
 		goto st179
 	case 180:
 		goto st180
-	case 578:
-		goto st578
+	case 585:
+		goto st585
 	case 181:
 		goto st181
 	case 182:
 		goto st182
-	case 579:
-		goto st579
-	case 580:
-		goto st580
-	case 183:
-		goto st183
-	case 184:
-		goto st184
-	case 581:
-		goto st581
-	case 185:
-		goto st185
-	case 186:
-		goto st186
-	case 582:
-		goto st582
-	case 583:
-		goto st583
-	case 584:
-		goto st584
-	case 585:
-		goto st585
 	case 586:
 		goto st586
 	case 587:
 		goto st587
+	case 183:
+		goto st183
+	case 184:
+		goto st184
 	case 588:
 		goto st588
+	case 185:
+		goto st185
+	case 186:
+		goto st186
 	case 589:
 		goto st589
+	case 590:
+		goto st590
+	case 591:
+		goto st591
+	case 592:
+		goto st592
+	case 593:
+		goto st593
+	case 594:
+		goto st594
+	case 595:
+		goto st595
+	case 596:
+		goto st596
 	case 187:
 		goto st187
 	case 188:
 		goto st188
 	case 189:
 		goto st189
-	case 590:
-		goto st590
+	case 597:
+		goto st597
 	case 190:
 		goto st190
 	case 191:
 		goto st191
 	case 192:
 		goto st192
-	case 591:
-		goto st591
+	case 598:
+		goto st598
 	case 193:
 		goto st193
 	case 194:
 		goto st194
-	case 592:
-		goto st592
-	case 593:
-		goto st593
+	case 599:
+		goto st599
+	case 600:
+		goto st600
 	case 195:
 		goto st195
-	case 594:
-		goto st594
+	case 601:
+		goto st601
 	case 196:
 		goto st196
-	case 595:
-		goto st595
-	case 596:
-		goto st596
+	case 602:
+		goto st602
+	case 603:
+		goto st603
 	case 197:
 		goto st197
 	case 198:
 		goto st198
+	case 199:
+		goto st199
+	case 604:
+		goto st604
+	case 605:
+		goto st605
+	case 606:
+		goto st606
+	case 200:
+		goto st200
+	case 201:
+		goto st201
+	case 202:
+		goto st202
+	case 607:
+		goto st607
+	case 203:
+		goto st203
+	case 204:
+		goto st204
+	case 205:
+		goto st205
 	}
 
 	if ( m.p)++; ( m.p) == ( m.pe) {
@@ -1334,28 +1386,14 @@ _resume:
 		goto st_case_6
 	case 7:
 		goto st_case_7
-	case 199:
-		goto st_case_199
-	case 200:
-		goto st_case_200
-	case 201:
-		goto st_case_201
-	case 8:
-		goto st_case_8
-	case 202:
-		goto st_case_202
-	case 203:
-		goto st_case_203
-	case 204:
-		goto st_case_204
-	case 205:
-		goto st_case_205
 	case 206:
 		goto st_case_206
 	case 207:
 		goto st_case_207
 	case 208:
 		goto st_case_208
+	case 8:
+		goto st_case_8
 	case 209:
 		goto st_case_209
 	case 210:
@@ -1382,22 +1420,8 @@ _resume:
 		goto st_case_220
 	case 221:
 		goto st_case_221
-	case 9:
-		goto st_case_9
-	case 10:
-		goto st_case_10
-	case 11:
-		goto st_case_11
-	case 12:
-		goto st_case_12
-	case 13:
-		goto st_case_13
 	case 222:
 		goto st_case_222
-	case 14:
-		goto st_case_14
-	case 15:
-		goto st_case_15
 	case 223:
 		goto st_case_223
 	case 224:
@@ -1410,36 +1434,64 @@ _resume:
 		goto st_case_227
 	case 228:
 		goto st_case_228
+	case 9:
+		goto st_case_9
+	case 10:
+		goto st_case_10
+	case 11:
+		goto st_case_11
+	case 12:
+		goto st_case_12
+	case 13:
+		goto st_case_13
 	case 229:
 		goto st_case_229
+	case 14:
+		goto st_case_14
+	case 15:
+		goto st_case_15
 	case 230:
 		goto st_case_230
 	case 231:
 		goto st_case_231
+	case 232:
+		goto st_case_232
+	case 233:
+		goto st_case_233
+	case 234:
+		goto st_case_234
+	case 235:
+		goto st_case_235
+	case 236:
+		goto st_case_236
+	case 237:
+		goto st_case_237
+	case 238:
+		goto st_case_238
 	case 16:
 		goto st_case_16
 	case 17:
 		goto st_case_17
 	case 18:
 		goto st_case_18
-	case 232:
-		goto st_case_232
+	case 239:
+		goto st_case_239
 	case 19:
 		goto st_case_19
 	case 20:
 		goto st_case_20
 	case 21:
 		goto st_case_21
-	case 233:
-		goto st_case_233
+	case 240:
+		goto st_case_240
 	case 22:
 		goto st_case_22
 	case 23:
 		goto st_case_23
-	case 234:
-		goto st_case_234
-	case 235:
-		goto st_case_235
+	case 241:
+		goto st_case_241
+	case 242:
+		goto st_case_242
 	case 24:
 		goto st_case_24
 	case 25:
@@ -1478,26 +1530,12 @@ _resume:
 		goto st_case_41
 	case 42:
 		goto st_case_42
-	case 236:
-		goto st_case_236
-	case 237:
-		goto st_case_237
-	case 43:
-		goto st_case_43
-	case 238:
-		goto st_case_238
-	case 239:
-		goto st_case_239
-	case 240:
-		goto st_case_240
-	case 241:
-		goto st_case_241
-	case 242:
-		goto st_case_242
 	case 243:
 		goto st_case_243
 	case 244:
 		goto st_case_244
+	case 43:
+		goto st_case_43
 	case 245:
 		goto st_case_245
 	case 246:
@@ -1524,14 +1562,10 @@ _resume:
 		goto st_case_256
 	case 257:
 		goto st_case_257
-	case 44:
-		goto st_case_44
 	case 258:
 		goto st_case_258
 	case 259:
 		goto st_case_259
-	case 45:
-		goto st_case_45
 	case 260:
 		goto st_case_260
 	case 261:
@@ -1542,10 +1576,14 @@ _resume:
 		goto st_case_263
 	case 264:
 		goto st_case_264
+	case 44:
+		goto st_case_44
 	case 265:
 		goto st_case_265
 	case 266:
 		goto st_case_266
+	case 45:
+		goto st_case_45
 	case 267:
 		goto st_case_267
 	case 268:
@@ -1572,14 +1610,28 @@ _resume:
 		goto st_case_278
 	case 279:
 		goto st_case_279
+	case 280:
+		goto st_case_280
+	case 281:
+		goto st_case_281
+	case 282:
+		goto st_case_282
+	case 283:
+		goto st_case_283
+	case 284:
+		goto st_case_284
+	case 285:
+		goto st_case_285
+	case 286:
+		goto st_case_286
 	case 46:
 		goto st_case_46
 	case 47:
 		goto st_case_47
 	case 48:
 		goto st_case_48
-	case 280:
-		goto st_case_280
+	case 287:
+		goto st_case_287
 	case 49:
 		goto st_case_49
 	case 50:
@@ -1590,110 +1642,110 @@ _resume:
 		goto st_case_52
 	case 53:
 		goto st_case_53
-	case 281:
-		goto st_case_281
-	case 54:
-		goto st_case_54
-	case 282:
-		goto st_case_282
-	case 55:
-		goto st_case_55
-	case 283:
-		goto st_case_283
-	case 284:
-		goto st_case_284
-	case 285:
-		goto st_case_285
-	case 286:
-		goto st_case_286
-	case 287:
-		goto st_case_287
 	case 288:
 		goto st_case_288
+	case 54:
+		goto st_case_54
 	case 289:
 		goto st_case_289
+	case 55:
+		goto st_case_55
 	case 290:
 		goto st_case_290
 	case 291:
 		goto st_case_291
+	case 292:
+		goto st_case_292
+	case 293:
+		goto st_case_293
+	case 294:
+		goto st_case_294
+	case 295:
+		goto st_case_295
+	case 296:
+		goto st_case_296
+	case 297:
+		goto st_case_297
+	case 298:
+		goto st_case_298
 	case 56:
 		goto st_case_56
 	case 57:
 		goto st_case_57
 	case 58:
 		goto st_case_58
-	case 292:
-		goto st_case_292
+	case 299:
+		goto st_case_299
 	case 59:
 		goto st_case_59
 	case 60:
 		goto st_case_60
 	case 61:
 		goto st_case_61
-	case 293:
-		goto st_case_293
+	case 300:
+		goto st_case_300
 	case 62:
 		goto st_case_62
 	case 63:
 		goto st_case_63
-	case 294:
-		goto st_case_294
-	case 295:
-		goto st_case_295
+	case 301:
+		goto st_case_301
+	case 302:
+		goto st_case_302
 	case 64:
 		goto st_case_64
 	case 65:
 		goto st_case_65
 	case 66:
 		goto st_case_66
-	case 296:
-		goto st_case_296
+	case 303:
+		goto st_case_303
 	case 67:
 		goto st_case_67
 	case 68:
 		goto st_case_68
-	case 297:
-		goto st_case_297
-	case 298:
-		goto st_case_298
-	case 299:
-		goto st_case_299
-	case 300:
-		goto st_case_300
-	case 301:
-		goto st_case_301
-	case 302:
-		goto st_case_302
-	case 303:
-		goto st_case_303
 	case 304:
 		goto st_case_304
 	case 305:
 		goto st_case_305
+	case 306:
+		goto st_case_306
+	case 307:
+		goto st_case_307
+	case 308:
+		goto st_case_308
+	case 309:
+		goto st_case_309
+	case 310:
+		goto st_case_310
+	case 311:
+		goto st_case_311
+	case 312:
+		goto st_case_312
 	case 69:
 		goto st_case_69
 	case 70:
 		goto st_case_70
 	case 71:
 		goto st_case_71
-	case 306:
-		goto st_case_306
+	case 313:
+		goto st_case_313
 	case 72:
 		goto st_case_72
 	case 73:
 		goto st_case_73
 	case 74:
 		goto st_case_74
-	case 307:
-		goto st_case_307
+	case 314:
+		goto st_case_314
 	case 75:
 		goto st_case_75
 	case 76:
 		goto st_case_76
-	case 308:
-		goto st_case_308
-	case 309:
-		goto st_case_309
+	case 315:
+		goto st_case_315
+	case 316:
+		goto st_case_316
 	case 77:
 		goto st_case_77
 	case 78:
@@ -1706,32 +1758,16 @@ _resume:
 		goto st_case_81
 	case 82:
 		goto st_case_82
-	case 310:
-		goto st_case_310
-	case 311:
-		goto st_case_311
-	case 312:
-		goto st_case_312
-	case 313:
-		goto st_case_313
-	case 83:
-		goto st_case_83
-	case 314:
-		goto st_case_314
-	case 315:
-		goto st_case_315
-	case 316:
-		goto st_case_316
 	case 317:
 		goto st_case_317
-	case 84:
-		goto st_case_84
 	case 318:
 		goto st_case_318
 	case 319:
 		goto st_case_319
 	case 320:
 		goto st_case_320
+	case 83:
+		goto st_case_83
 	case 321:
 		goto st_case_321
 	case 322:
@@ -1740,6 +1776,8 @@ _resume:
 		goto st_case_323
 	case 324:
 		goto st_case_324
+	case 84:
+		goto st_case_84
 	case 325:
 		goto st_case_325
 	case 326:
@@ -1762,6 +1800,20 @@ _resume:
 		goto st_case_334
 	case 335:
 		goto st_case_335
+	case 336:
+		goto st_case_336
+	case 337:
+		goto st_case_337
+	case 338:
+		goto st_case_338
+	case 339:
+		goto st_case_339
+	case 340:
+		goto st_case_340
+	case 341:
+		goto st_case_341
+	case 342:
+		goto st_case_342
 	case 85:
 		goto st_case_85
 	case 86:
@@ -1788,26 +1840,12 @@ _resume:
 		goto st_case_96
 	case 97:
 		goto st_case_97
-	case 336:
-		goto st_case_336
-	case 337:
-		goto st_case_337
-	case 98:
-		goto st_case_98
-	case 338:
-		goto st_case_338
-	case 339:
-		goto st_case_339
-	case 340:
-		goto st_case_340
-	case 341:
-		goto st_case_341
-	case 342:
-		goto st_case_342
 	case 343:
 		goto st_case_343
 	case 344:
 		goto st_case_344
+	case 98:
+		goto st_case_98
 	case 345:
 		goto st_case_345
 	case 346:
@@ -1834,16 +1872,10 @@ _resume:
 		goto st_case_356
 	case 357:
 		goto st_case_357
-	case 99:
-		goto st_case_99
-	case 100:
-		goto st_case_100
 	case 358:
 		goto st_case_358
 	case 359:
 		goto st_case_359
-	case 101:
-		goto st_case_101
 	case 360:
 		goto st_case_360
 	case 361:
@@ -1854,10 +1886,16 @@ _resume:
 		goto st_case_363
 	case 364:
 		goto st_case_364
+	case 99:
+		goto st_case_99
+	case 100:
+		goto st_case_100
 	case 365:
 		goto st_case_365
 	case 366:
 		goto st_case_366
+	case 101:
+		goto st_case_101
 	case 367:
 		goto st_case_367
 	case 368:
@@ -1884,12 +1922,26 @@ _resume:
 		goto st_case_378
 	case 379:
 		goto st_case_379
-	case 102:
-		goto st_case_102
 	case 380:
 		goto st_case_380
 	case 381:
 		goto st_case_381
+	case 382:
+		goto st_case_382
+	case 383:
+		goto st_case_383
+	case 384:
+		goto st_case_384
+	case 385:
+		goto st_case_385
+	case 386:
+		goto st_case_386
+	case 102:
+		goto st_case_102
+	case 387:
+		goto st_case_387
+	case 388:
+		goto st_case_388
 	case 103:
 		goto st_case_103
 	case 104:
@@ -1900,54 +1952,54 @@ _resume:
 		goto st_case_106
 	case 107:
 		goto st_case_107
-	case 382:
-		goto st_case_382
+	case 389:
+		goto st_case_389
 	case 108:
 		goto st_case_108
 	case 109:
 		goto st_case_109
-	case 383:
-		goto st_case_383
-	case 384:
-		goto st_case_384
-	case 385:
-		goto st_case_385
-	case 386:
-		goto st_case_386
-	case 387:
-		goto st_case_387
-	case 388:
-		goto st_case_388
-	case 389:
-		goto st_case_389
 	case 390:
 		goto st_case_390
 	case 391:
 		goto st_case_391
+	case 392:
+		goto st_case_392
+	case 393:
+		goto st_case_393
+	case 394:
+		goto st_case_394
+	case 395:
+		goto st_case_395
+	case 396:
+		goto st_case_396
+	case 397:
+		goto st_case_397
+	case 398:
+		goto st_case_398
 	case 110:
 		goto st_case_110
 	case 111:
 		goto st_case_111
 	case 112:
 		goto st_case_112
-	case 392:
-		goto st_case_392
+	case 399:
+		goto st_case_399
 	case 113:
 		goto st_case_113
 	case 114:
 		goto st_case_114
 	case 115:
 		goto st_case_115
-	case 393:
-		goto st_case_393
+	case 400:
+		goto st_case_400
 	case 116:
 		goto st_case_116
 	case 117:
 		goto st_case_117
-	case 394:
-		goto st_case_394
-	case 395:
-		goto st_case_395
+	case 401:
+		goto st_case_401
+	case 402:
+		goto st_case_402
 	case 118:
 		goto st_case_118
 	case 119:
@@ -1972,28 +2024,14 @@ _resume:
 		goto st_case_128
 	case 129:
 		goto st_case_129
-	case 396:
-		goto st_case_396
-	case 397:
-		goto st_case_397
-	case 398:
-		goto st_case_398
-	case 130:
-		goto st_case_130
-	case 399:
-		goto st_case_399
-	case 400:
-		goto st_case_400
-	case 401:
-		goto st_case_401
-	case 402:
-		goto st_case_402
 	case 403:
 		goto st_case_403
 	case 404:
 		goto st_case_404
 	case 405:
 		goto st_case_405
+	case 130:
+		goto st_case_130
 	case 406:
 		goto st_case_406
 	case 407:
@@ -2024,8 +2062,6 @@ _resume:
 		goto st_case_419
 	case 420:
 		goto st_case_420
-	case 131:
-		goto st_case_131
 	case 421:
 		goto st_case_421
 	case 422:
@@ -2034,14 +2070,14 @@ _resume:
 		goto st_case_423
 	case 424:
 		goto st_case_424
-	case 132:
-		goto st_case_132
 	case 425:
 		goto st_case_425
 	case 426:
 		goto st_case_426
 	case 427:
 		goto st_case_427
+	case 131:
+		goto st_case_131
 	case 428:
 		goto st_case_428
 	case 429:
@@ -2050,6 +2086,8 @@ _resume:
 		goto st_case_430
 	case 431:
 		goto st_case_431
+	case 132:
+		goto st_case_132
 	case 432:
 		goto st_case_432
 	case 433:
@@ -2076,18 +2114,10 @@ _resume:
 		goto st_case_443
 	case 444:
 		goto st_case_444
-	case 133:
-		goto st_case_133
-	case 134:
-		goto st_case_134
-	case 135:
-		goto st_case_135
 	case 445:
 		goto st_case_445
 	case 446:
 		goto st_case_446
-	case 136:
-		goto st_case_136
 	case 447:
 		goto st_case_447
 	case 448:
@@ -2098,10 +2128,18 @@ _resume:
 		goto st_case_450
 	case 451:
 		goto st_case_451
+	case 133:
+		goto st_case_133
+	case 134:
+		goto st_case_134
+	case 135:
+		goto st_case_135
 	case 452:
 		goto st_case_452
 	case 453:
 		goto st_case_453
+	case 136:
+		goto st_case_136
 	case 454:
 		goto st_case_454
 	case 455:
@@ -2128,16 +2166,12 @@ _resume:
 		goto st_case_465
 	case 466:
 		goto st_case_466
-	case 137:
-		goto st_case_137
 	case 467:
 		goto st_case_467
 	case 468:
 		goto st_case_468
 	case 469:
 		goto st_case_469
-	case 138:
-		goto st_case_138
 	case 470:
 		goto st_case_470
 	case 471:
@@ -2146,12 +2180,16 @@ _resume:
 		goto st_case_472
 	case 473:
 		goto st_case_473
+	case 137:
+		goto st_case_137
 	case 474:
 		goto st_case_474
 	case 475:
 		goto st_case_475
 	case 476:
 		goto st_case_476
+	case 138:
+		goto st_case_138
 	case 477:
 		goto st_case_477
 	case 478:
@@ -2182,8 +2220,6 @@ _resume:
 		goto st_case_490
 	case 491:
 		goto st_case_491
-	case 139:
-		goto st_case_139
 	case 492:
 		goto st_case_492
 	case 493:
@@ -2198,6 +2234,8 @@ _resume:
 		goto st_case_497
 	case 498:
 		goto st_case_498
+	case 139:
+		goto st_case_139
 	case 499:
 		goto st_case_499
 	case 500:
@@ -2228,24 +2266,10 @@ _resume:
 		goto st_case_512
 	case 513:
 		goto st_case_513
-	case 140:
-		goto st_case_140
-	case 141:
-		goto st_case_141
-	case 142:
-		goto st_case_142
-	case 143:
-		goto st_case_143
-	case 144:
-		goto st_case_144
 	case 514:
 		goto st_case_514
-	case 145:
-		goto st_case_145
 	case 515:
 		goto st_case_515
-	case 146:
-		goto st_case_146
 	case 516:
 		goto st_case_516
 	case 517:
@@ -2256,66 +2280,80 @@ _resume:
 		goto st_case_519
 	case 520:
 		goto st_case_520
+	case 140:
+		goto st_case_140
+	case 141:
+		goto st_case_141
+	case 142:
+		goto st_case_142
+	case 143:
+		goto st_case_143
+	case 144:
+		goto st_case_144
 	case 521:
 		goto st_case_521
+	case 145:
+		goto st_case_145
 	case 522:
 		goto st_case_522
+	case 146:
+		goto st_case_146
 	case 523:
 		goto st_case_523
 	case 524:
 		goto st_case_524
-	case 147:
-		goto st_case_147
-	case 148:
-		goto st_case_148
-	case 149:
-		goto st_case_149
 	case 525:
 		goto st_case_525
-	case 150:
-		goto st_case_150
-	case 151:
-		goto st_case_151
-	case 152:
-		goto st_case_152
 	case 526:
 		goto st_case_526
-	case 153:
-		goto st_case_153
-	case 154:
-		goto st_case_154
 	case 527:
 		goto st_case_527
 	case 528:
 		goto st_case_528
-	case 155:
-		goto st_case_155
-	case 156:
-		goto st_case_156
-	case 157:
-		goto st_case_157
 	case 529:
 		goto st_case_529
 	case 530:
 		goto st_case_530
 	case 531:
 		goto st_case_531
-	case 158:
-		goto st_case_158
+	case 147:
+		goto st_case_147
+	case 148:
+		goto st_case_148
+	case 149:
+		goto st_case_149
 	case 532:
 		goto st_case_532
+	case 150:
+		goto st_case_150
+	case 151:
+		goto st_case_151
+	case 152:
+		goto st_case_152
 	case 533:
 		goto st_case_533
+	case 153:
+		goto st_case_153
+	case 154:
+		goto st_case_154
 	case 534:
 		goto st_case_534
 	case 535:
 		goto st_case_535
+	case 155:
+		goto st_case_155
+	case 156:
+		goto st_case_156
+	case 157:
+		goto st_case_157
 	case 536:
 		goto st_case_536
 	case 537:
 		goto st_case_537
 	case 538:
 		goto st_case_538
+	case 158:
+		goto st_case_158
 	case 539:
 		goto st_case_539
 	case 540:
@@ -2342,10 +2380,6 @@ _resume:
 		goto st_case_550
 	case 551:
 		goto st_case_551
-	case 159:
-		goto st_case_159
-	case 160:
-		goto st_case_160
 	case 552:
 		goto st_case_552
 	case 553:
@@ -2360,34 +2394,52 @@ _resume:
 		goto st_case_557
 	case 558:
 		goto st_case_558
+	case 159:
+		goto st_case_159
+	case 160:
+		goto st_case_160
 	case 559:
 		goto st_case_559
 	case 560:
 		goto st_case_560
+	case 561:
+		goto st_case_561
+	case 562:
+		goto st_case_562
+	case 563:
+		goto st_case_563
+	case 564:
+		goto st_case_564
+	case 565:
+		goto st_case_565
+	case 566:
+		goto st_case_566
+	case 567:
+		goto st_case_567
 	case 161:
 		goto st_case_161
 	case 162:
 		goto st_case_162
 	case 163:
 		goto st_case_163
-	case 561:
-		goto st_case_561
+	case 568:
+		goto st_case_568
 	case 164:
 		goto st_case_164
 	case 165:
 		goto st_case_165
 	case 166:
 		goto st_case_166
-	case 562:
-		goto st_case_562
+	case 569:
+		goto st_case_569
 	case 167:
 		goto st_case_167
 	case 168:
 		goto st_case_168
-	case 563:
-		goto st_case_563
-	case 564:
-		goto st_case_564
+	case 570:
+		goto st_case_570
+	case 571:
+		goto st_case_571
 	case 169:
 		goto st_case_169
 	case 170:
@@ -2396,122 +2448,144 @@ _resume:
 		goto st_case_171
 	case 172:
 		goto st_case_172
-	case 565:
-		goto st_case_565
-	case 173:
-		goto st_case_173
-	case 566:
-		goto st_case_566
-	case 567:
-		goto st_case_567
-	case 174:
-		goto st_case_174
-	case 568:
-		goto st_case_568
-	case 569:
-		goto st_case_569
-	case 570:
-		goto st_case_570
-	case 571:
-		goto st_case_571
 	case 572:
 		goto st_case_572
+	case 173:
+		goto st_case_173
 	case 573:
 		goto st_case_573
 	case 574:
 		goto st_case_574
+	case 174:
+		goto st_case_174
 	case 575:
 		goto st_case_575
 	case 576:
 		goto st_case_576
+	case 577:
+		goto st_case_577
+	case 578:
+		goto st_case_578
+	case 579:
+		goto st_case_579
+	case 580:
+		goto st_case_580
+	case 581:
+		goto st_case_581
+	case 582:
+		goto st_case_582
+	case 583:
+		goto st_case_583
 	case 175:
 		goto st_case_175
 	case 176:
 		goto st_case_176
 	case 177:
 		goto st_case_177
-	case 577:
-		goto st_case_577
+	case 584:
+		goto st_case_584
 	case 178:
 		goto st_case_178
 	case 179:
 		goto st_case_179
 	case 180:
 		goto st_case_180
-	case 578:
-		goto st_case_578
+	case 585:
+		goto st_case_585
 	case 181:
 		goto st_case_181
 	case 182:
 		goto st_case_182
-	case 579:
-		goto st_case_579
-	case 580:
-		goto st_case_580
-	case 183:
-		goto st_case_183
-	case 184:
-		goto st_case_184
-	case 581:
-		goto st_case_581
-	case 185:
-		goto st_case_185
-	case 186:
-		goto st_case_186
-	case 582:
-		goto st_case_582
-	case 583:
-		goto st_case_583
-	case 584:
-		goto st_case_584
-	case 585:
-		goto st_case_585
 	case 586:
 		goto st_case_586
 	case 587:
 		goto st_case_587
+	case 183:
+		goto st_case_183
+	case 184:
+		goto st_case_184
 	case 588:
 		goto st_case_588
+	case 185:
+		goto st_case_185
+	case 186:
+		goto st_case_186
 	case 589:
 		goto st_case_589
+	case 590:
+		goto st_case_590
+	case 591:
+		goto st_case_591
+	case 592:
+		goto st_case_592
+	case 593:
+		goto st_case_593
+	case 594:
+		goto st_case_594
+	case 595:
+		goto st_case_595
+	case 596:
+		goto st_case_596
 	case 187:
 		goto st_case_187
 	case 188:
 		goto st_case_188
 	case 189:
 		goto st_case_189
-	case 590:
-		goto st_case_590
+	case 597:
+		goto st_case_597
 	case 190:
 		goto st_case_190
 	case 191:
 		goto st_case_191
 	case 192:
 		goto st_case_192
-	case 591:
-		goto st_case_591
+	case 598:
+		goto st_case_598
 	case 193:
 		goto st_case_193
 	case 194:
 		goto st_case_194
-	case 592:
-		goto st_case_592
-	case 593:
-		goto st_case_593
+	case 599:
+		goto st_case_599
+	case 600:
+		goto st_case_600
 	case 195:
 		goto st_case_195
-	case 594:
-		goto st_case_594
+	case 601:
+		goto st_case_601
 	case 196:
 		goto st_case_196
-	case 595:
-		goto st_case_595
-	case 596:
-		goto st_case_596
+	case 602:
+		goto st_case_602
+	case 603:
+		goto st_case_603
 	case 197:
 		goto st_case_197
 	case 198:
 		goto st_case_198
+	case 199:
+		goto st_case_199
+	case 604:
+		goto st_case_604
+	case 605:
+		goto st_case_605
+	case 606:
+		goto st_case_606
+	case 200:
+		goto st_case_200
+	case 201:
+		goto st_case_201
+	case 202:
+		goto st_case_202
+	case 607:
+		goto st_case_607
+	case 203:
+		goto st_case_203
+	case 204:
+		goto st_case_204
+	case 205:
+		goto st_case_205
 	}
 	goto st_out
 	st1:
@@ -2549,7 +2623,7 @@ tr0:
 			goto _test_eof2
 		}
 	st_case_2:
-//line plugins/parsers/influx/machine.go:2553
+//line plugins/parsers/influx/machine.go:2627
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2585,7 +2659,7 @@ tr60:
 			goto _test_eof3
 		}
 	st_case_3:
-//line plugins/parsers/influx/machine.go:2589
+//line plugins/parsers/influx/machine.go:2663
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2617,7 +2691,7 @@ tr9:
 			goto _test_eof4
 		}
 	st_case_4:
-//line plugins/parsers/influx/machine.go:2621
+//line plugins/parsers/influx/machine.go:2695
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -2821,7 +2895,7 @@ tr216:
 	{( m.p)++; goto _out }
 
 	goto _again
-//line plugins/parsers/influx/machine.go:2825
+//line plugins/parsers/influx/machine.go:2899
 st_case_0:
 	st0:
 		 m.cs = 0
@@ -2837,7 +2911,7 @@ tr14:
 			goto _test_eof5
 		}
 	st_case_5:
-//line plugins/parsers/influx/machine.go:2841
+//line plugins/parsers/influx/machine.go:2915
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st6
@@ -2888,7 +2962,7 @@ tr25:
 			goto _test_eof7
 		}
 	st_case_7:
-//line plugins/parsers/influx/machine.go:2892
+//line plugins/parsers/influx/machine.go:2966
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -2910,84 +2984,84 @@ tr26:
 
 	m.handler.AddString(key, m.text())
 
-	goto st199
+	goto st206
 tr29:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st199
-	st199:
+	goto st206
+	st206:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof199
+			goto _test_eof206
 		}
-	st_case_199:
-//line plugins/parsers/influx/machine.go:2926
+	st_case_206:
+//line plugins/parsers/influx/machine.go:3000
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto st9
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st200
+			goto st207
 		}
 		goto tr101
-tr371:
+tr382:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st200
-tr377:
+	goto st207
+tr388:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
-	goto st200
-tr381:
+	goto st207
+tr392:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
-	goto st200
-tr385:
+	goto st207
+tr396:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st200
-	st200:
+	goto st207
+	st207:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof200
+			goto _test_eof207
 		}
-	st_case_200:
-//line plugins/parsers/influx/machine.go:2970
+	st_case_207:
+//line plugins/parsers/influx/machine.go:3044
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 45:
-			goto tr348
+			goto tr359
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr349
+				goto tr360
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st200
+			goto st207
 		}
 		goto tr31
-tr346:
-	 m.cs = 201
+tr357:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
@@ -2995,8 +3069,8 @@ tr346:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr351:
-	 m.cs = 201
+tr362:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
@@ -3008,8 +3082,8 @@ tr351:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr372:
-	 m.cs = 201
+tr383:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
@@ -3021,8 +3095,8 @@ tr372:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr378:
-	 m.cs = 201
+tr389:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -3034,8 +3108,8 @@ tr378:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr382:
-	 m.cs = 201
+tr393:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
@@ -3047,8 +3121,8 @@ tr382:
 	{( m.p)++; goto _out }
 
 	goto _again
-tr386:
-	 m.cs = 201
+tr397:
+	 m.cs = 208
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -3060,14 +3134,14 @@ tr386:
 	{( m.p)++; goto _out }
 
 	goto _again
-	st201:
+	st208:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof201
+			goto _test_eof208
 		}
-	st_case_201:
-//line plugins/parsers/influx/machine.go:3069
+	st_case_208:
+//line plugins/parsers/influx/machine.go:3143
 		goto tr1
-tr348:
+tr359:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -3078,208 +3152,30 @@ tr348:
 			goto _test_eof8
 		}
 	st_case_8:
-//line plugins/parsers/influx/machine.go:3082
+//line plugins/parsers/influx/machine.go:3156
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st202
+			goto st209
 		}
 		goto tr31
-tr349:
+tr360:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st202
-	st202:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof202
-		}
-	st_case_202:
-//line plugins/parsers/influx/machine.go:3098
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st204
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-tr350:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st203
-	st203:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof203
-		}
-	st_case_203:
-//line plugins/parsers/influx/machine.go:3127
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 13:
-			goto tr346
-		case 32:
-			goto st203
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st203
-		}
-		goto tr1
-	st204:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof204
-		}
-	st_case_204:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st205
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-	st205:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof205
-		}
-	st_case_205:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st206
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-	st206:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof206
-		}
-	st_case_206:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st207
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-	st207:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof207
-		}
-	st_case_207:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st208
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-	st208:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof208
-		}
-	st_case_208:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st209
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
+	goto st209
 	st209:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof209
 		}
 	st_case_209:
+//line plugins/parsers/influx/machine.go:3172
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st210
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto tr31
-	st210:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof210
-		}
-	st_case_210:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3287,9 +3183,33 @@ tr350:
 				goto st211
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
+tr361:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st210
+	st210:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof210
+		}
+	st_case_210:
+//line plugins/parsers/influx/machine.go:3201
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 13:
+			goto tr357
+		case 32:
+			goto st210
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st210
+		}
+		goto tr1
 	st211:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof211
@@ -3297,11 +3217,11 @@ tr350:
 	st_case_211:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3309,7 +3229,7 @@ tr350:
 				goto st212
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st212:
@@ -3319,11 +3239,11 @@ tr350:
 	st_case_212:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3331,7 +3251,7 @@ tr350:
 				goto st213
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st213:
@@ -3341,11 +3261,11 @@ tr350:
 	st_case_213:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3353,7 +3273,7 @@ tr350:
 				goto st214
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st214:
@@ -3363,11 +3283,11 @@ tr350:
 	st_case_214:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3375,7 +3295,7 @@ tr350:
 				goto st215
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st215:
@@ -3385,11 +3305,11 @@ tr350:
 	st_case_215:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3397,7 +3317,7 @@ tr350:
 				goto st216
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st216:
@@ -3407,11 +3327,11 @@ tr350:
 	st_case_216:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3419,7 +3339,7 @@ tr350:
 				goto st217
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st217:
@@ -3429,11 +3349,11 @@ tr350:
 	st_case_217:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3441,7 +3361,7 @@ tr350:
 				goto st218
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st218:
@@ -3451,11 +3371,11 @@ tr350:
 	st_case_218:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3463,7 +3383,7 @@ tr350:
 				goto st219
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st219:
@@ -3473,11 +3393,11 @@ tr350:
 	st_case_219:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3485,7 +3405,7 @@ tr350:
 				goto st220
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st220:
@@ -3495,11 +3415,11 @@ tr350:
 	st_case_220:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3507,7 +3427,7 @@ tr350:
 				goto st221
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto tr31
 	st221:
@@ -3517,35 +3437,189 @@ tr350:
 	st_case_221:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr350
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st222
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
 		}
 		goto tr31
-tr373:
+	st222:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof222
+		}
+	st_case_222:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st223
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st223:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof223
+		}
+	st_case_223:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st224
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st224:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof224
+		}
+	st_case_224:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st225
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st225:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof225
+		}
+	st_case_225:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st226
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st226:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof226
+		}
+	st_case_226:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st227
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st227:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof227
+		}
+	st_case_227:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st228
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto tr31
+	st228:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof228
+		}
+	st_case_228:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr361
+		}
+		goto tr31
+tr384:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st9
-tr379:
+tr390:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st9
-tr383:
+tr394:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st9
-tr387:
+tr398:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -3556,7 +3630,7 @@ tr387:
 			goto _test_eof9
 		}
 	st_case_9:
-//line plugins/parsers/influx/machine.go:3560
+//line plugins/parsers/influx/machine.go:3634
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr5
@@ -3587,7 +3661,7 @@ tr12:
 			goto _test_eof10
 		}
 	st_case_10:
-//line plugins/parsers/influx/machine.go:3591
+//line plugins/parsers/influx/machine.go:3665
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -3608,7 +3682,7 @@ tr27:
 			goto _test_eof11
 		}
 	st_case_11:
-//line plugins/parsers/influx/machine.go:3612
+//line plugins/parsers/influx/machine.go:3686
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st7
@@ -3627,15 +3701,15 @@ tr17:
 			goto _test_eof12
 		}
 	st_case_12:
-//line plugins/parsers/influx/machine.go:3631
+//line plugins/parsers/influx/machine.go:3705
 		switch ( m.data)[( m.p)] {
 		case 46:
 			goto st13
 		case 48:
-			goto st224
+			goto st231
 		}
 		if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st227
+			goto st234
 		}
 		goto tr5
 tr18:
@@ -3649,25 +3723,25 @@ tr18:
 			goto _test_eof13
 		}
 	st_case_13:
-//line plugins/parsers/influx/machine.go:3653
+//line plugins/parsers/influx/machine.go:3727
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st222
+			goto st229
 		}
 		goto tr5
-	st222:
+	st229:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof222
+			goto _test_eof229
 		}
-	st_case_222:
+	st_case_229:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr371
+			goto tr382
 		case 44:
-			goto tr373
+			goto tr384
 		case 69:
 			goto st14
 		case 101:
@@ -3676,10 +3750,10 @@ tr18:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st222
+				goto st229
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr371
+			goto tr382
 		}
 		goto tr101
 	st14:
@@ -3696,7 +3770,7 @@ tr18:
 			goto st15
 		}
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st223
+			goto st230
 		}
 		goto tr5
 	st15:
@@ -3705,237 +3779,23 @@ tr18:
 		}
 	st_case_15:
 		if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-			goto st223
+			goto st230
 		}
 		goto tr5
-	st223:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof223
-		}
-	st_case_223:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 13:
-			goto tr372
-		case 32:
-			goto tr371
-		case 44:
-			goto tr373
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st223
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr371
-		}
-		goto tr101
-	st224:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof224
-		}
-	st_case_224:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 13:
-			goto tr372
-		case 32:
-			goto tr371
-		case 44:
-			goto tr373
-		case 46:
-			goto st222
-		case 69:
-			goto st14
-		case 101:
-			goto st14
-		case 105:
-			goto st226
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st225
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr371
-		}
-		goto tr101
-	st225:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof225
-		}
-	st_case_225:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 13:
-			goto tr372
-		case 32:
-			goto tr371
-		case 44:
-			goto tr373
-		case 46:
-			goto st222
-		case 69:
-			goto st14
-		case 101:
-			goto st14
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st225
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr371
-		}
-		goto tr101
-	st226:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof226
-		}
-	st_case_226:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr378
-		case 13:
-			goto tr378
-		case 32:
-			goto tr377
-		case 44:
-			goto tr379
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr377
-		}
-		goto tr101
-	st227:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof227
-		}
-	st_case_227:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 13:
-			goto tr372
-		case 32:
-			goto tr371
-		case 44:
-			goto tr373
-		case 46:
-			goto st222
-		case 69:
-			goto st14
-		case 101:
-			goto st14
-		case 105:
-			goto st226
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st227
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr371
-		}
-		goto tr101
-tr19:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st228
-	st228:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof228
-		}
-	st_case_228:
-//line plugins/parsers/influx/machine.go:3860
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 13:
-			goto tr372
-		case 32:
-			goto tr371
-		case 44:
-			goto tr373
-		case 46:
-			goto st222
-		case 69:
-			goto st14
-		case 101:
-			goto st14
-		case 105:
-			goto st226
-		case 117:
-			goto st229
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st225
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr371
-		}
-		goto tr101
-	st229:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof229
-		}
-	st_case_229:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr382
-		case 13:
-			goto tr382
-		case 32:
-			goto tr381
-		case 44:
-			goto tr383
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr381
-		}
-		goto tr101
-tr20:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st230
 	st230:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof230
 		}
 	st_case_230:
-//line plugins/parsers/influx/machine.go:3920
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr371
+			goto tr382
 		case 44:
-			goto tr373
-		case 46:
-			goto st222
-		case 69:
-			goto st14
-		case 101:
-			goto st14
-		case 105:
-			goto st226
-		case 117:
-			goto st229
+			goto tr384
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -3943,7 +3803,221 @@ tr20:
 				goto st230
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr371
+			goto tr382
+		}
+		goto tr101
+	st231:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof231
+		}
+	st_case_231:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 13:
+			goto tr383
+		case 32:
+			goto tr382
+		case 44:
+			goto tr384
+		case 46:
+			goto st229
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st233
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st232
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr382
+		}
+		goto tr101
+	st232:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof232
+		}
+	st_case_232:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 13:
+			goto tr383
+		case 32:
+			goto tr382
+		case 44:
+			goto tr384
+		case 46:
+			goto st229
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st232
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr382
+		}
+		goto tr101
+	st233:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof233
+		}
+	st_case_233:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr389
+		case 13:
+			goto tr389
+		case 32:
+			goto tr388
+		case 44:
+			goto tr390
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr388
+		}
+		goto tr101
+	st234:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof234
+		}
+	st_case_234:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 13:
+			goto tr383
+		case 32:
+			goto tr382
+		case 44:
+			goto tr384
+		case 46:
+			goto st229
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st233
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st234
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr382
+		}
+		goto tr101
+tr19:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st235
+	st235:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof235
+		}
+	st_case_235:
+//line plugins/parsers/influx/machine.go:3934
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 13:
+			goto tr383
+		case 32:
+			goto tr382
+		case 44:
+			goto tr384
+		case 46:
+			goto st229
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st233
+		case 117:
+			goto st236
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st232
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr382
+		}
+		goto tr101
+	st236:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof236
+		}
+	st_case_236:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr393
+		case 13:
+			goto tr393
+		case 32:
+			goto tr392
+		case 44:
+			goto tr394
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr392
+		}
+		goto tr101
+tr20:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st237
+	st237:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof237
+		}
+	st_case_237:
+//line plugins/parsers/influx/machine.go:3994
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 13:
+			goto tr383
+		case 32:
+			goto tr382
+		case 44:
+			goto tr384
+		case 46:
+			goto st229
+		case 69:
+			goto st14
+		case 101:
+			goto st14
+		case 105:
+			goto st233
+		case 117:
+			goto st236
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st237
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr382
 		}
 		goto tr101
 tr21:
@@ -3951,29 +4025,29 @@ tr21:
 
 	m.pb = m.p
 
-	goto st231
-	st231:
+	goto st238
+	st238:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof231
+			goto _test_eof238
 		}
-	st_case_231:
-//line plugins/parsers/influx/machine.go:3961
+	st_case_238:
+//line plugins/parsers/influx/machine.go:4035
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr385
+			goto tr396
 		case 44:
-			goto tr387
+			goto tr398
 		case 65:
 			goto st16
 		case 97:
 			goto st19
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr385
+			goto tr396
 		}
 		goto tr101
 	st16:
@@ -4000,26 +4074,26 @@ tr21:
 		}
 	st_case_18:
 		if ( m.data)[( m.p)] == 69 {
-			goto st232
+			goto st239
 		}
 		goto tr5
-	st232:
+	st239:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof232
+			goto _test_eof239
 		}
-	st_case_232:
+	st_case_239:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr385
+			goto tr396
 		case 44:
-			goto tr387
+			goto tr398
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr385
+			goto tr396
 		}
 		goto tr101
 	st19:
@@ -4046,7 +4120,7 @@ tr21:
 		}
 	st_case_21:
 		if ( m.data)[( m.p)] == 101 {
-			goto st232
+			goto st239
 		}
 		goto tr5
 tr22:
@@ -4054,29 +4128,29 @@ tr22:
 
 	m.pb = m.p
 
-	goto st233
-	st233:
+	goto st240
+	st240:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof233
+			goto _test_eof240
 		}
-	st_case_233:
-//line plugins/parsers/influx/machine.go:4064
+	st_case_240:
+//line plugins/parsers/influx/machine.go:4138
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr385
+			goto tr396
 		case 44:
-			goto tr387
+			goto tr398
 		case 82:
 			goto st22
 		case 114:
 			goto st23
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr385
+			goto tr396
 		}
 		goto tr101
 	st22:
@@ -4102,27 +4176,27 @@ tr23:
 
 	m.pb = m.p
 
-	goto st234
-	st234:
+	goto st241
+	st241:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof234
+			goto _test_eof241
 		}
-	st_case_234:
-//line plugins/parsers/influx/machine.go:4112
+	st_case_241:
+//line plugins/parsers/influx/machine.go:4186
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr385
+			goto tr396
 		case 44:
-			goto tr387
+			goto tr398
 		case 97:
 			goto st19
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr385
+			goto tr396
 		}
 		goto tr101
 tr24:
@@ -4130,27 +4204,27 @@ tr24:
 
 	m.pb = m.p
 
-	goto st235
-	st235:
+	goto st242
+	st242:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof235
+			goto _test_eof242
 		}
-	st_case_235:
-//line plugins/parsers/influx/machine.go:4140
+	st_case_242:
+//line plugins/parsers/influx/machine.go:4214
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr385
+			goto tr396
 		case 44:
-			goto tr387
+			goto tr398
 		case 114:
 			goto st23
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr385
+			goto tr396
 		}
 		goto tr101
 tr11:
@@ -4164,7 +4238,7 @@ tr11:
 			goto _test_eof24
 		}
 	st_case_24:
-//line plugins/parsers/influx/machine.go:4168
+//line plugins/parsers/influx/machine.go:4242
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4196,7 +4270,7 @@ tr6:
 			goto _test_eof25
 		}
 	st_case_25:
-//line plugins/parsers/influx/machine.go:4200
+//line plugins/parsers/influx/machine.go:4274
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4228,7 +4302,7 @@ tr44:
 			goto _test_eof26
 		}
 	st_case_26:
-//line plugins/parsers/influx/machine.go:4232
+//line plugins/parsers/influx/machine.go:4306
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4270,7 +4344,7 @@ tr45:
 			goto _test_eof27
 		}
 	st_case_27:
-//line plugins/parsers/influx/machine.go:4274
+//line plugins/parsers/influx/machine.go:4348
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4308,7 +4382,7 @@ tr63:
 			goto _test_eof28
 		}
 	st_case_28:
-//line plugins/parsers/influx/machine.go:4312
+//line plugins/parsers/influx/machine.go:4386
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr52
@@ -4339,7 +4413,7 @@ tr51:
 			goto _test_eof29
 		}
 	st_case_29:
-//line plugins/parsers/influx/machine.go:4343
+//line plugins/parsers/influx/machine.go:4417
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr52
@@ -4370,7 +4444,7 @@ tr55:
 			goto _test_eof30
 		}
 	st_case_30:
-//line plugins/parsers/influx/machine.go:4374
+//line plugins/parsers/influx/machine.go:4448
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr52
@@ -4401,7 +4475,7 @@ tr57:
 			goto _test_eof31
 		}
 	st_case_31:
-//line plugins/parsers/influx/machine.go:4405
+//line plugins/parsers/influx/machine.go:4479
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -4433,7 +4507,7 @@ tr62:
 			goto _test_eof32
 		}
 	st_case_32:
-//line plugins/parsers/influx/machine.go:4437
+//line plugins/parsers/influx/machine.go:4511
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -4465,7 +4539,7 @@ tr65:
 			goto _test_eof33
 		}
 	st_case_33:
-//line plugins/parsers/influx/machine.go:4469
+//line plugins/parsers/influx/machine.go:4543
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -4507,7 +4581,7 @@ tr66:
 			goto _test_eof34
 		}
 	st_case_34:
-//line plugins/parsers/influx/machine.go:4511
+//line plugins/parsers/influx/machine.go:4585
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -4539,7 +4613,7 @@ tr67:
 			goto _test_eof35
 		}
 	st_case_35:
-//line plugins/parsers/influx/machine.go:4543
+//line plugins/parsers/influx/machine.go:4617
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4560,7 +4634,7 @@ tr58:
 			goto _test_eof36
 		}
 	st_case_36:
-//line plugins/parsers/influx/machine.go:4564
+//line plugins/parsers/influx/machine.go:4638
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4581,7 +4655,7 @@ tr53:
 			goto _test_eof37
 		}
 	st_case_37:
-//line plugins/parsers/influx/machine.go:4585
+//line plugins/parsers/influx/machine.go:4659
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -4602,7 +4676,7 @@ tr49:
 			goto _test_eof38
 		}
 	st_case_38:
-//line plugins/parsers/influx/machine.go:4606
+//line plugins/parsers/influx/machine.go:4680
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -4678,7 +4752,7 @@ tr80:
 			goto _test_eof40
 		}
 	st_case_40:
-//line plugins/parsers/influx/machine.go:4682
+//line plugins/parsers/influx/machine.go:4756
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -4726,7 +4800,7 @@ tr237:
 			goto _test_eof41
 		}
 	st_case_41:
-//line plugins/parsers/influx/machine.go:4730
+//line plugins/parsers/influx/machine.go:4804
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st41
@@ -4760,7 +4834,7 @@ tr92:
 			goto _test_eof42
 		}
 	st_case_42:
-//line plugins/parsers/influx/machine.go:4764
+//line plugins/parsers/influx/machine.go:4838
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -4790,13 +4864,13 @@ tr95:
 
 	m.handler.AddString(key, m.text())
 
-	goto st236
+	goto st243
 tr98:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st236
+	goto st243
 tr114:
 //line plugins/parsers/influx/machine.go.rl:104
 
@@ -4806,22 +4880,22 @@ tr114:
 
 	m.pb = m.p
 
-	goto st236
-	st236:
+	goto st243
+	st243:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof236
+			goto _test_eof243
 		}
-	st_case_236:
-//line plugins/parsers/influx/machine.go:4816
+	st_case_243:
+//line plugins/parsers/influx/machine.go:4890
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st237
+			goto st244
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto st9
 		case 61:
@@ -4830,27 +4904,27 @@ tr114:
 			goto st10
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st200
+			goto st207
 		}
 		goto st4
-	st237:
+	st244:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof237
+			goto _test_eof244
 		}
-	st_case_237:
+	st_case_244:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st237
+			goto st244
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto tr101
 		case 45:
-			goto tr393
+			goto tr404
 		case 61:
 			goto tr14
 		case 92:
@@ -4859,13 +4933,13 @@ tr114:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr394
+				goto tr405
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st200
+			goto st207
 		}
 		goto st4
-tr393:
+tr404:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -4876,7 +4950,7 @@ tr393:
 			goto _test_eof43
 		}
 	st_case_43:
-//line plugins/parsers/influx/machine.go:4880
+//line plugins/parsers/influx/machine.go:4954
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr101
@@ -4894,275 +4968,33 @@ tr393:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st238
+				goto st245
 			}
 		default:
 			goto tr101
 		}
 		goto st4
-tr394:
+tr405:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st238
-	st238:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof238
-		}
-	st_case_238:
-//line plugins/parsers/influx/machine.go:4915
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st240
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-tr395:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st239
-	st239:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof239
-		}
-	st_case_239:
-//line plugins/parsers/influx/machine.go:4952
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto st239
-		case 13:
-			goto tr346
-		case 32:
-			goto st203
-		case 44:
-			goto tr5
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st203
-		}
-		goto st4
-	st240:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof240
-		}
-	st_case_240:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st241
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-	st241:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof241
-		}
-	st_case_241:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st242
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-	st242:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof242
-		}
-	st_case_242:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st243
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-	st243:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof243
-		}
-	st_case_243:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st244
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-	st244:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof244
-		}
-	st_case_244:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st245
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
+	goto st245
 	st245:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof245
 		}
 	st_case_245:
+//line plugins/parsers/influx/machine.go:4989
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
-		case 44:
-			goto tr101
-		case 61:
-			goto tr14
-		case 92:
-			goto st10
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st246
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st4
-	st246:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof246
-		}
-	st_case_246:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr395
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5176,7 +5008,39 @@ tr395:
 				goto st247
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
+		}
+		goto st4
+tr406:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st246
+	st246:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof246
+		}
+	st_case_246:
+//line plugins/parsers/influx/machine.go:5026
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto st246
+		case 13:
+			goto tr357
+		case 32:
+			goto st210
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st210
 		}
 		goto st4
 	st247:
@@ -5186,13 +5050,13 @@ tr395:
 	st_case_247:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5206,7 +5070,7 @@ tr395:
 				goto st248
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st248:
@@ -5216,13 +5080,13 @@ tr395:
 	st_case_248:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5236,7 +5100,7 @@ tr395:
 				goto st249
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st249:
@@ -5246,13 +5110,13 @@ tr395:
 	st_case_249:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5266,7 +5130,7 @@ tr395:
 				goto st250
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st250:
@@ -5276,13 +5140,13 @@ tr395:
 	st_case_250:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5296,7 +5160,7 @@ tr395:
 				goto st251
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st251:
@@ -5306,13 +5170,13 @@ tr395:
 	st_case_251:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5326,7 +5190,7 @@ tr395:
 				goto st252
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st252:
@@ -5336,13 +5200,13 @@ tr395:
 	st_case_252:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5356,7 +5220,7 @@ tr395:
 				goto st253
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st253:
@@ -5366,13 +5230,13 @@ tr395:
 	st_case_253:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5386,7 +5250,7 @@ tr395:
 				goto st254
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st254:
@@ -5396,13 +5260,13 @@ tr395:
 	st_case_254:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5416,7 +5280,7 @@ tr395:
 				goto st255
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st255:
@@ -5426,13 +5290,13 @@ tr395:
 	st_case_255:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5446,7 +5310,7 @@ tr395:
 				goto st256
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st256:
@@ -5456,13 +5320,13 @@ tr395:
 	st_case_256:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5476,7 +5340,7 @@ tr395:
 				goto st257
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st4
 	st257:
@@ -5486,13 +5350,223 @@ tr395:
 	st_case_257:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr395
+			goto tr406
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st258
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st258:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof258
+		}
+	st_case_258:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st259
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st259:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof259
+		}
+	st_case_259:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st260
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st260:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof260
+		}
+	st_case_260:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st261
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st261:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof261
+		}
+	st_case_261:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st262
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st262:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof262
+		}
+	st_case_262:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st263
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st263:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof263
+		}
+	st_case_263:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr101
+		case 61:
+			goto tr14
+		case 92:
+			goto st10
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st264
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st4
+	st264:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof264
+		}
+	st_case_264:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr406
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
 		case 44:
 			goto tr101
 		case 61:
@@ -5501,7 +5575,7 @@ tr395:
 			goto st10
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr350
+			goto tr361
 		}
 		goto st4
 tr99:
@@ -5515,7 +5589,7 @@ tr99:
 			goto _test_eof44
 		}
 	st_case_44:
-//line plugins/parsers/influx/machine.go:5519
+//line plugins/parsers/influx/machine.go:5593
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -5552,95 +5626,95 @@ tr103:
 
 	m.handler.AddString(key, m.text())
 
-	goto st258
-	st258:
+	goto st265
+	st265:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof258
+			goto _test_eof265
 		}
-	st_case_258:
-//line plugins/parsers/influx/machine.go:5562
+	st_case_265:
+//line plugins/parsers/influx/machine.go:5636
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 12:
-			goto st200
+			goto st207
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr415
+			goto tr426
 		case 34:
 			goto tr26
 		case 44:
-			goto tr416
+			goto tr427
 		case 92:
 			goto tr27
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr415
+			goto tr426
 		}
 		goto tr25
-tr415:
+tr426:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st259
-tr441:
+	goto st266
+tr452:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st259
-tr446:
+	goto st266
+tr457:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
-	goto st259
-tr449:
+	goto st266
+tr460:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
-	goto st259
-tr452:
+	goto st266
+tr463:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
 
-	goto st259
-	st259:
+	goto st266
+	st266:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof259
+			goto _test_eof266
 		}
-	st_case_259:
-//line plugins/parsers/influx/machine.go:5618
+	st_case_266:
+//line plugins/parsers/influx/machine.go:5692
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 12:
-			goto st200
+			goto st207
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st259
+			goto st266
 		case 34:
 			goto tr29
 		case 45:
-			goto tr418
+			goto tr429
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr419
+				goto tr430
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st259
+			goto st266
 		}
 		goto st7
-tr418:
+tr429:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -5651,7 +5725,7 @@ tr418:
 			goto _test_eof45
 		}
 	st_case_45:
-//line plugins/parsers/influx/machine.go:5655
+//line plugins/parsers/influx/machine.go:5729
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr101
@@ -5663,259 +5737,33 @@ tr418:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st260
+				goto st267
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr101
 		}
 		goto st7
-tr419:
+tr430:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st260
-	st260:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof260
-		}
-	st_case_260:
-//line plugins/parsers/influx/machine.go:5684
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st262
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-tr420:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st261
-	st261:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof261
-		}
-	st_case_261:
-//line plugins/parsers/influx/machine.go:5719
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 12:
-			goto st203
-		case 13:
-			goto tr346
-		case 32:
-			goto st261
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto st261
-		}
-		goto st7
-	st262:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof262
-		}
-	st_case_262:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st263
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-	st263:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof263
-		}
-	st_case_263:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st264
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-	st264:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof264
-		}
-	st_case_264:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st265
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-	st265:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof265
-		}
-	st_case_265:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st266
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-	st266:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof266
-		}
-	st_case_266:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st267
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
+	goto st267
 	st267:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof267
 		}
 	st_case_267:
+//line plugins/parsers/influx/machine.go:5758
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
-		case 34:
-			goto tr29
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st268
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr420
-		}
-		goto st7
-	st268:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof268
-		}
-	st_case_268:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 12:
-			goto tr350
-		case 13:
-			goto tr351
-		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -5927,7 +5775,37 @@ tr420:
 				goto st269
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
+		}
+		goto st7
+tr431:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st268
+	st268:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof268
+		}
+	st_case_268:
+//line plugins/parsers/influx/machine.go:5793
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 12:
+			goto st210
+		case 13:
+			goto tr357
+		case 32:
+			goto st268
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto st268
 		}
 		goto st7
 	st269:
@@ -5937,13 +5815,13 @@ tr420:
 	st_case_269:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -5955,7 +5833,7 @@ tr420:
 				goto st270
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st270:
@@ -5965,13 +5843,13 @@ tr420:
 	st_case_270:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -5983,7 +5861,7 @@ tr420:
 				goto st271
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st271:
@@ -5993,13 +5871,13 @@ tr420:
 	st_case_271:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6011,7 +5889,7 @@ tr420:
 				goto st272
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st272:
@@ -6021,13 +5899,13 @@ tr420:
 	st_case_272:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6039,7 +5917,7 @@ tr420:
 				goto st273
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st273:
@@ -6049,13 +5927,13 @@ tr420:
 	st_case_273:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6067,7 +5945,7 @@ tr420:
 				goto st274
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st274:
@@ -6077,13 +5955,13 @@ tr420:
 	st_case_274:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6095,7 +5973,7 @@ tr420:
 				goto st275
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st275:
@@ -6105,13 +5983,13 @@ tr420:
 	st_case_275:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6123,7 +6001,7 @@ tr420:
 				goto st276
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st276:
@@ -6133,13 +6011,13 @@ tr420:
 	st_case_276:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6151,7 +6029,7 @@ tr420:
 				goto st277
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st277:
@@ -6161,13 +6039,13 @@ tr420:
 	st_case_277:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6179,7 +6057,7 @@ tr420:
 				goto st278
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st278:
@@ -6189,13 +6067,13 @@ tr420:
 	st_case_278:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
@@ -6207,7 +6085,7 @@ tr420:
 				goto st279
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr420
+			goto tr431
 		}
 		goto st7
 	st279:
@@ -6217,47 +6095,243 @@ tr420:
 	st_case_279:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 12:
-			goto tr350
+			goto tr361
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr420
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st280
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st280:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof280
+		}
+	st_case_280:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st281
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st281:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof281
+		}
+	st_case_281:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st282
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st282:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof282
+		}
+	st_case_282:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st283
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st283:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof283
+		}
+	st_case_283:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st284
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st284:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof284
+		}
+	st_case_284:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st285
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st285:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof285
+		}
+	st_case_285:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
+		case 34:
+			goto tr29
+		case 92:
+			goto st11
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st286
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr431
+		}
+		goto st7
+	st286:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof286
+		}
+	st_case_286:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 12:
+			goto tr361
+		case 13:
+			goto tr362
+		case 32:
+			goto tr431
 		case 34:
 			goto tr29
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr420
+			goto tr431
 		}
 		goto st7
-tr416:
+tr427:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st46
-tr458:
+tr469:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st46
-tr462:
+tr473:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st46
-tr464:
+tr475:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st46
-tr466:
+tr477:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -6268,7 +6342,7 @@ tr466:
 			goto _test_eof46
 		}
 	st_case_46:
-//line plugins/parsers/influx/machine.go:6272
+//line plugins/parsers/influx/machine.go:6346
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -6300,7 +6374,7 @@ tr113:
 			goto _test_eof47
 		}
 	st_case_47:
-//line plugins/parsers/influx/machine.go:6304
+//line plugins/parsers/influx/machine.go:6378
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -6332,7 +6406,7 @@ tr117:
 			goto _test_eof48
 		}
 	st_case_48:
-//line plugins/parsers/influx/machine.go:6336
+//line plugins/parsers/influx/machine.go:6410
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -6369,58 +6443,58 @@ tr119:
 
 	m.handler.AddString(key, m.text())
 
-	goto st280
-	st280:
+	goto st287
+	st287:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof280
+			goto _test_eof287
 		}
-	st_case_280:
-//line plugins/parsers/influx/machine.go:6379
+	st_case_287:
+//line plugins/parsers/influx/machine.go:6453
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 12:
-			goto st200
+			goto st207
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr415
+			goto tr426
 		case 34:
 			goto tr26
 		case 44:
-			goto tr440
+			goto tr451
 		case 92:
 			goto tr27
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr415
+			goto tr426
 		}
 		goto tr25
-tr440:
+tr451:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
 	goto st49
-tr442:
+tr453:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
 
 	goto st49
-tr447:
+tr458:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
 
 	goto st49
-tr450:
+tr461:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
 
 	goto st49
-tr453:
+tr464:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -6431,7 +6505,7 @@ tr453:
 			goto _test_eof49
 		}
 	st_case_49:
-//line plugins/parsers/influx/machine.go:6435
+//line plugins/parsers/influx/machine.go:6509
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -6463,7 +6537,7 @@ tr120:
 			goto _test_eof50
 		}
 	st_case_50:
-//line plugins/parsers/influx/machine.go:6467
+//line plugins/parsers/influx/machine.go:6541
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -6495,7 +6569,7 @@ tr123:
 			goto _test_eof51
 		}
 	st_case_51:
-//line plugins/parsers/influx/machine.go:6499
+//line plugins/parsers/influx/machine.go:6573
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -6538,7 +6612,7 @@ tr125:
 			goto _test_eof52
 		}
 	st_case_52:
-//line plugins/parsers/influx/machine.go:6542
+//line plugins/parsers/influx/machine.go:6616
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -6547,14 +6621,14 @@ tr125:
 		case 46:
 			goto st53
 		case 48:
-			goto st284
+			goto st291
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st287
+				goto st294
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
@@ -6571,7 +6645,7 @@ tr126:
 			goto _test_eof53
 		}
 	st_case_53:
-//line plugins/parsers/influx/machine.go:6575
+//line plugins/parsers/influx/machine.go:6649
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -6583,30 +6657,30 @@ tr126:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st281
+				goto st288
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
-	st281:
+	st288:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof281
+			goto _test_eof288
 		}
-	st_case_281:
+	st_case_288:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 12:
-			goto tr371
+			goto tr382
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr441
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr442
+			goto tr453
 		case 69:
 			goto st54
 		case 92:
@@ -6617,10 +6691,10 @@ tr126:
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st281
+				goto st288
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr441
+			goto tr452
 		}
 		goto st7
 	st54:
@@ -6643,7 +6717,7 @@ tr126:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st283
+				goto st290
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
@@ -6654,30 +6728,30 @@ tr137:
 
 	m.handler.AddString(key, m.text())
 
-	goto st282
-	st282:
+	goto st289
+	st289:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof282
+			goto _test_eof289
 		}
-	st_case_282:
-//line plugins/parsers/influx/machine.go:6664
+	st_case_289:
+//line plugins/parsers/influx/machine.go:6738
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto st9
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st223
+				goto st230
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st200
+			goto st207
 		}
 		goto tr101
 	st55:
@@ -6696,288 +6770,32 @@ tr137:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st283
+				goto st290
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
-	st283:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof283
-		}
-	st_case_283:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st283
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st284:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof284
-		}
-	st_case_284:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st281
-		case 69:
-			goto st54
-		case 92:
-			goto st11
-		case 101:
-			goto st54
-		case 105:
-			goto st286
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st285
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st285:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof285
-		}
-	st_case_285:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st281
-		case 69:
-			goto st54
-		case 92:
-			goto st11
-		case 101:
-			goto st54
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st285
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st286:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof286
-		}
-	st_case_286:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr378
-		case 12:
-			goto tr377
-		case 13:
-			goto tr378
-		case 32:
-			goto tr446
-		case 34:
-			goto tr29
-		case 44:
-			goto tr447
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr446
-		}
-		goto st7
-	st287:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof287
-		}
-	st_case_287:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st281
-		case 69:
-			goto st54
-		case 92:
-			goto st11
-		case 101:
-			goto st54
-		case 105:
-			goto st286
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st287
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-tr127:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st288
-	st288:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof288
-		}
-	st_case_288:
-//line plugins/parsers/influx/machine.go:6884
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr442
-		case 46:
-			goto st281
-		case 69:
-			goto st54
-		case 92:
-			goto st11
-		case 101:
-			goto st54
-		case 105:
-			goto st286
-		case 117:
-			goto st289
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st285
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st289:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof289
-		}
-	st_case_289:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr382
-		case 12:
-			goto tr381
-		case 13:
-			goto tr382
-		case 32:
-			goto tr449
-		case 34:
-			goto tr29
-		case 44:
-			goto tr450
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr449
-		}
-		goto st7
-tr128:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st290
 	st290:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof290
 		}
 	st_case_290:
-//line plugins/parsers/influx/machine.go:6956
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 12:
-			goto tr371
+			goto tr382
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr441
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr442
-		case 46:
-			goto st281
-		case 69:
-			goto st54
+			goto tr453
 		case 92:
 			goto st11
-		case 101:
-			goto st54
-		case 105:
-			goto st286
-		case 117:
-			goto st289
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
@@ -6985,7 +6803,263 @@ tr128:
 				goto st290
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr441
+			goto tr452
+		}
+		goto st7
+	st291:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof291
+		}
+	st_case_291:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 46:
+			goto st288
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st293
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st292
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st292:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof292
+		}
+	st_case_292:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 46:
+			goto st288
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st292
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st293:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof293
+		}
+	st_case_293:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr389
+		case 12:
+			goto tr388
+		case 13:
+			goto tr389
+		case 32:
+			goto tr457
+		case 34:
+			goto tr29
+		case 44:
+			goto tr458
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr457
+		}
+		goto st7
+	st294:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof294
+		}
+	st_case_294:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 46:
+			goto st288
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st293
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st294
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+tr127:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st295
+	st295:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof295
+		}
+	st_case_295:
+//line plugins/parsers/influx/machine.go:6958
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 46:
+			goto st288
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st293
+		case 117:
+			goto st296
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st292
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st296:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof296
+		}
+	st_case_296:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr393
+		case 12:
+			goto tr392
+		case 13:
+			goto tr393
+		case 32:
+			goto tr460
+		case 34:
+			goto tr29
+		case 44:
+			goto tr461
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr460
+		}
+		goto st7
+tr128:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st297
+	st297:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof297
+		}
+	st_case_297:
+//line plugins/parsers/influx/machine.go:7030
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr453
+		case 46:
+			goto st288
+		case 69:
+			goto st54
+		case 92:
+			goto st11
+		case 101:
+			goto st54
+		case 105:
+			goto st293
+		case 117:
+			goto st296
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st297
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
 		}
 		goto st7
 tr129:
@@ -6993,26 +7067,26 @@ tr129:
 
 	m.pb = m.p
 
-	goto st291
-	st291:
+	goto st298
+	st298:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof291
+			goto _test_eof298
 		}
-	st_case_291:
-//line plugins/parsers/influx/machine.go:7003
+	st_case_298:
+//line plugins/parsers/influx/machine.go:7077
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
+			goto tr464
 		case 65:
 			goto st56
 		case 92:
@@ -7021,7 +7095,7 @@ tr129:
 			goto st59
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st56:
@@ -7073,7 +7147,7 @@ tr129:
 		case 34:
 			goto tr29
 		case 69:
-			goto st292
+			goto st299
 		case 92:
 			goto st11
 		}
@@ -7081,29 +7155,29 @@ tr129:
 			goto tr5
 		}
 		goto st7
-	st292:
+	st299:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof292
+			goto _test_eof299
 		}
-	st_case_292:
+	st_case_299:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
+			goto tr464
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st59:
@@ -7157,7 +7231,7 @@ tr129:
 		case 92:
 			goto st11
 		case 101:
-			goto st292
+			goto st299
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7168,26 +7242,26 @@ tr130:
 
 	m.pb = m.p
 
-	goto st293
-	st293:
+	goto st300
+	st300:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof293
+			goto _test_eof300
 		}
-	st_case_293:
-//line plugins/parsers/influx/machine.go:7178
+	st_case_300:
+//line plugins/parsers/influx/machine.go:7252
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
+			goto tr464
 		case 82:
 			goto st62
 		case 92:
@@ -7196,7 +7270,7 @@ tr130:
 			goto st63
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st62:
@@ -7242,33 +7316,33 @@ tr131:
 
 	m.pb = m.p
 
-	goto st294
-	st294:
+	goto st301
+	st301:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof294
+			goto _test_eof301
 		}
-	st_case_294:
-//line plugins/parsers/influx/machine.go:7252
+	st_case_301:
+//line plugins/parsers/influx/machine.go:7326
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
+			goto tr464
 		case 92:
 			goto st11
 		case 97:
 			goto st59
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 tr132:
@@ -7276,33 +7350,33 @@ tr132:
 
 	m.pb = m.p
 
-	goto st295
-	st295:
+	goto st302
+	st302:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof295
+			goto _test_eof302
 		}
-	st_case_295:
-//line plugins/parsers/influx/machine.go:7286
+	st_case_302:
+//line plugins/parsers/influx/machine.go:7360
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr453
+			goto tr464
 		case 92:
 			goto st11
 		case 114:
 			goto st63
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 tr121:
@@ -7316,7 +7390,7 @@ tr121:
 			goto _test_eof64
 		}
 	st_case_64:
-//line plugins/parsers/influx/machine.go:7320
+//line plugins/parsers/influx/machine.go:7394
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st50
@@ -7343,7 +7417,7 @@ tr104:
 			goto _test_eof65
 		}
 	st_case_65:
-//line plugins/parsers/influx/machine.go:7347
+//line plugins/parsers/influx/machine.go:7421
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -7352,14 +7426,14 @@ tr104:
 		case 46:
 			goto st66
 		case 48:
-			goto st298
+			goto st305
 		case 92:
 			goto st11
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st301
+				goto st308
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
@@ -7376,7 +7450,7 @@ tr105:
 			goto _test_eof66
 		}
 	st_case_66:
-//line plugins/parsers/influx/machine.go:7380
+//line plugins/parsers/influx/machine.go:7454
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -7388,30 +7462,30 @@ tr105:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st296
+				goto st303
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
-	st296:
+	st303:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof296
+			goto _test_eof303
 		}
-	st_case_296:
+	st_case_303:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 12:
-			goto tr371
+			goto tr382
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr441
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr458
+			goto tr469
 		case 69:
 			goto st67
 		case 92:
@@ -7422,10 +7496,10 @@ tr105:
 		switch {
 		case ( m.data)[( m.p)] > 11:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st296
+				goto st303
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr441
+			goto tr452
 		}
 		goto st7
 	st67:
@@ -7448,7 +7522,7 @@ tr105:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st297
+				goto st304
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
@@ -7470,288 +7544,32 @@ tr105:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st297
+				goto st304
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr5
 		}
 		goto st7
-	st297:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof297
-		}
-	st_case_297:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr458
-		case 92:
-			goto st11
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st297
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st298:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof298
-		}
-	st_case_298:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr458
-		case 46:
-			goto st296
-		case 69:
-			goto st67
-		case 92:
-			goto st11
-		case 101:
-			goto st67
-		case 105:
-			goto st300
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st299
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st299:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof299
-		}
-	st_case_299:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr458
-		case 46:
-			goto st296
-		case 69:
-			goto st67
-		case 92:
-			goto st11
-		case 101:
-			goto st67
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st299
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st300:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof300
-		}
-	st_case_300:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr378
-		case 12:
-			goto tr377
-		case 13:
-			goto tr378
-		case 32:
-			goto tr446
-		case 34:
-			goto tr29
-		case 44:
-			goto tr462
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr446
-		}
-		goto st7
-	st301:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof301
-		}
-	st_case_301:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr458
-		case 46:
-			goto st296
-		case 69:
-			goto st67
-		case 92:
-			goto st11
-		case 101:
-			goto st67
-		case 105:
-			goto st300
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st301
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-tr106:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st302
-	st302:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof302
-		}
-	st_case_302:
-//line plugins/parsers/influx/machine.go:7658
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 12:
-			goto tr371
-		case 13:
-			goto tr372
-		case 32:
-			goto tr441
-		case 34:
-			goto tr29
-		case 44:
-			goto tr458
-		case 46:
-			goto st296
-		case 69:
-			goto st67
-		case 92:
-			goto st11
-		case 101:
-			goto st67
-		case 105:
-			goto st300
-		case 117:
-			goto st303
-		}
-		switch {
-		case ( m.data)[( m.p)] > 11:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st299
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr441
-		}
-		goto st7
-	st303:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof303
-		}
-	st_case_303:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr382
-		case 12:
-			goto tr381
-		case 13:
-			goto tr382
-		case 32:
-			goto tr449
-		case 34:
-			goto tr29
-		case 44:
-			goto tr464
-		case 92:
-			goto st11
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr449
-		}
-		goto st7
-tr107:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st304
 	st304:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof304
 		}
 	st_case_304:
-//line plugins/parsers/influx/machine.go:7730
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 12:
-			goto tr371
+			goto tr382
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr441
+			goto tr452
 		case 34:
 			goto tr29
 		case 44:
-			goto tr458
-		case 46:
-			goto st296
-		case 69:
-			goto st67
+			goto tr469
 		case 92:
 			goto st11
-		case 101:
-			goto st67
-		case 105:
-			goto st300
-		case 117:
-			goto st303
 		}
 		switch {
 		case ( m.data)[( m.p)] > 11:
@@ -7759,7 +7577,263 @@ tr107:
 				goto st304
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr441
+			goto tr452
+		}
+		goto st7
+	st305:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof305
+		}
+	st_case_305:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr469
+		case 46:
+			goto st303
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st307
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st306
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st306:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof306
+		}
+	st_case_306:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr469
+		case 46:
+			goto st303
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st306
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st307:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof307
+		}
+	st_case_307:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr389
+		case 12:
+			goto tr388
+		case 13:
+			goto tr389
+		case 32:
+			goto tr457
+		case 34:
+			goto tr29
+		case 44:
+			goto tr473
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr457
+		}
+		goto st7
+	st308:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof308
+		}
+	st_case_308:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr469
+		case 46:
+			goto st303
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st307
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st308
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+tr106:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st309
+	st309:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof309
+		}
+	st_case_309:
+//line plugins/parsers/influx/machine.go:7732
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr469
+		case 46:
+			goto st303
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st307
+		case 117:
+			goto st310
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st306
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
+		}
+		goto st7
+	st310:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof310
+		}
+	st_case_310:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr393
+		case 12:
+			goto tr392
+		case 13:
+			goto tr393
+		case 32:
+			goto tr460
+		case 34:
+			goto tr29
+		case 44:
+			goto tr475
+		case 92:
+			goto st11
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
+			goto tr460
+		}
+		goto st7
+tr107:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st311
+	st311:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof311
+		}
+	st_case_311:
+//line plugins/parsers/influx/machine.go:7804
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 12:
+			goto tr382
+		case 13:
+			goto tr383
+		case 32:
+			goto tr452
+		case 34:
+			goto tr29
+		case 44:
+			goto tr469
+		case 46:
+			goto st303
+		case 69:
+			goto st67
+		case 92:
+			goto st11
+		case 101:
+			goto st67
+		case 105:
+			goto st307
+		case 117:
+			goto st310
+		}
+		switch {
+		case ( m.data)[( m.p)] > 11:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st311
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr452
 		}
 		goto st7
 tr108:
@@ -7767,26 +7841,26 @@ tr108:
 
 	m.pb = m.p
 
-	goto st305
-	st305:
+	goto st312
+	st312:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof305
+			goto _test_eof312
 		}
-	st_case_305:
-//line plugins/parsers/influx/machine.go:7777
+	st_case_312:
+//line plugins/parsers/influx/machine.go:7851
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr466
+			goto tr477
 		case 65:
 			goto st69
 		case 92:
@@ -7795,7 +7869,7 @@ tr108:
 			goto st72
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st69:
@@ -7847,7 +7921,7 @@ tr108:
 		case 34:
 			goto tr29
 		case 69:
-			goto st306
+			goto st313
 		case 92:
 			goto st11
 		}
@@ -7855,29 +7929,29 @@ tr108:
 			goto tr5
 		}
 		goto st7
-	st306:
+	st313:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof306
+			goto _test_eof313
 		}
-	st_case_306:
+	st_case_313:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr466
+			goto tr477
 		case 92:
 			goto st11
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st72:
@@ -7931,7 +8005,7 @@ tr108:
 		case 92:
 			goto st11
 		case 101:
-			goto st306
+			goto st313
 		}
 		if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -7942,26 +8016,26 @@ tr109:
 
 	m.pb = m.p
 
-	goto st307
-	st307:
+	goto st314
+	st314:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof307
+			goto _test_eof314
 		}
-	st_case_307:
-//line plugins/parsers/influx/machine.go:7952
+	st_case_314:
+//line plugins/parsers/influx/machine.go:8026
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr466
+			goto tr477
 		case 82:
 			goto st75
 		case 92:
@@ -7970,7 +8044,7 @@ tr109:
 			goto st76
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 	st75:
@@ -8016,33 +8090,33 @@ tr110:
 
 	m.pb = m.p
 
-	goto st308
-	st308:
+	goto st315
+	st315:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof308
+			goto _test_eof315
 		}
-	st_case_308:
-//line plugins/parsers/influx/machine.go:8026
+	st_case_315:
+//line plugins/parsers/influx/machine.go:8100
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr466
+			goto tr477
 		case 92:
 			goto st11
 		case 97:
 			goto st72
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 tr111:
@@ -8050,33 +8124,33 @@ tr111:
 
 	m.pb = m.p
 
-	goto st309
-	st309:
+	goto st316
+	st316:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof309
+			goto _test_eof316
 		}
-	st_case_309:
-//line plugins/parsers/influx/machine.go:8060
+	st_case_316:
+//line plugins/parsers/influx/machine.go:8134
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 12:
-			goto tr385
+			goto tr396
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr452
+			goto tr463
 		case 34:
 			goto tr29
 		case 44:
-			goto tr466
+			goto tr477
 		case 92:
 			goto st11
 		case 114:
 			goto st76
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 11 {
-			goto tr452
+			goto tr463
 		}
 		goto st7
 tr115:
@@ -8090,7 +8164,7 @@ tr115:
 			goto _test_eof77
 		}
 	st_case_77:
-//line plugins/parsers/influx/machine.go:8094
+//line plugins/parsers/influx/machine.go:8168
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st47
@@ -8117,7 +8191,7 @@ tr96:
 			goto _test_eof78
 		}
 	st_case_78:
-//line plugins/parsers/influx/machine.go:8121
+//line plugins/parsers/influx/machine.go:8195
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st42
@@ -8144,7 +8218,7 @@ tr94:
 			goto _test_eof79
 		}
 	st_case_79:
-//line plugins/parsers/influx/machine.go:8148
+//line plugins/parsers/influx/machine.go:8222
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st41
@@ -8188,7 +8262,7 @@ tr82:
 			goto _test_eof80
 		}
 	st_case_80:
-//line plugins/parsers/influx/machine.go:8192
+//line plugins/parsers/influx/machine.go:8266
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -8222,7 +8296,7 @@ tr156:
 			goto _test_eof81
 		}
 	st_case_81:
-//line plugins/parsers/influx/machine.go:8226
+//line plugins/parsers/influx/machine.go:8300
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -8266,7 +8340,7 @@ tr157:
 			goto _test_eof82
 		}
 	st_case_82:
-//line plugins/parsers/influx/machine.go:8270
+//line plugins/parsers/influx/machine.go:8344
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -8298,52 +8372,52 @@ tr158:
 
 	m.handler.AddString(key, m.text())
 
-	goto st310
+	goto st317
 tr162:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st310
-	st310:
+	goto st317
+	st317:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof310
+			goto _test_eof317
 		}
-	st_case_310:
-//line plugins/parsers/influx/machine.go:8314
+	st_case_317:
+//line plugins/parsers/influx/machine.go:8388
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr472
+			goto tr483
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr471
+			goto tr482
 		case 44:
-			goto tr473
+			goto tr484
 		case 61:
 			goto tr49
 		case 92:
 			goto st84
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr471
+			goto tr482
 		}
 		goto st26
-tr471:
+tr482:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st311
-tr503:
+	goto st318
+tr514:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st311
-tr555:
+	goto st318
+tr566:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8352,8 +8426,8 @@ tr555:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st311
-tr561:
+	goto st318
+tr572:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8362,8 +8436,8 @@ tr561:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st311
-tr565:
+	goto st318
+tr576:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8372,8 +8446,8 @@ tr565:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st311
-tr569:
+	goto st318
+tr580:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -8382,8 +8456,8 @@ tr569:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st311
-tr780:
+	goto st318
+tr791:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8392,8 +8466,8 @@ tr780:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st311
-tr789:
+	goto st318
+tr800:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8402,8 +8476,8 @@ tr789:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st311
-tr794:
+	goto st318
+tr805:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8412,8 +8486,8 @@ tr794:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st311
-tr799:
+	goto st318
+tr810:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8422,26 +8496,26 @@ tr799:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st311
-	st311:
+	goto st318
+	st318:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof311
+			goto _test_eof318
 		}
-	st_case_311:
-//line plugins/parsers/influx/machine.go:8432
+	st_case_318:
+//line plugins/parsers/influx/machine.go:8506
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr475
+			goto tr486
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st311
+			goto st318
 		case 44:
 			goto tr101
 		case 45:
-			goto tr393
+			goto tr404
 		case 61:
 			goto tr101
 		case 92:
@@ -8450,37 +8524,37 @@ tr799:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr394
+				goto tr405
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st311
+			goto st318
 		}
 		goto tr9
-tr475:
+tr486:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st312
-	st312:
+	goto st319
+	st319:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof312
+			goto _test_eof319
 		}
-	st_case_312:
-//line plugins/parsers/influx/machine.go:8471
+	st_case_319:
+//line plugins/parsers/influx/machine.go:8545
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr475
+			goto tr486
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st311
+			goto st318
 		case 44:
 			goto tr101
 		case 45:
-			goto tr393
+			goto tr404
 		case 61:
 			goto tr14
 		case 92:
@@ -8489,19 +8563,19 @@ tr475:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr394
+				goto tr405
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st311
+			goto st318
 		}
 		goto tr9
-tr472:
+tr483:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st313
-tr476:
+	goto st320
+tr487:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -8510,26 +8584,26 @@ tr476:
 
 	m.pb = m.p
 
-	goto st313
-	st313:
+	goto st320
+	st320:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof313
+			goto _test_eof320
 		}
-	st_case_313:
-//line plugins/parsers/influx/machine.go:8520
+	st_case_320:
+//line plugins/parsers/influx/machine.go:8594
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr476
+			goto tr487
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr471
+			goto tr482
 		case 44:
 			goto tr7
 		case 45:
-			goto tr477
+			goto tr488
 		case 61:
 			goto tr49
 		case 92:
@@ -8538,13 +8612,13 @@ tr476:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr478
+				goto tr489
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr471
+			goto tr482
 		}
 		goto tr44
-tr477:
+tr488:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -8555,7 +8629,7 @@ tr477:
 			goto _test_eof83
 		}
 	st_case_83:
-//line plugins/parsers/influx/machine.go:8559
+//line plugins/parsers/influx/machine.go:8633
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr101
@@ -8575,400 +8649,33 @@ tr477:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st314
+				goto st321
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st26
-tr478:
+tr489:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st314
-	st314:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof314
-		}
-	st_case_314:
-//line plugins/parsers/influx/machine.go:8596
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st318
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-tr484:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st315
-tr512:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st315
-tr479:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st315
-tr509:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st315
-	st315:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof315
-		}
-	st_case_315:
-//line plugins/parsers/influx/machine.go:8659
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto tr483
-		case 13:
-			goto tr346
-		case 32:
-			goto st315
-		case 44:
-			goto tr5
-		case 61:
-			goto tr5
-		case 92:
-			goto tr12
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st315
-		}
-		goto tr9
-tr483:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st316
-	st316:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof316
-		}
-	st_case_316:
-//line plugins/parsers/influx/machine.go:8691
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto tr483
-		case 13:
-			goto tr346
-		case 32:
-			goto st315
-		case 44:
-			goto tr5
-		case 61:
-			goto tr14
-		case 92:
-			goto tr12
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st315
-		}
-		goto tr9
-tr485:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st317
-tr480:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st317
-	st317:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof317
-		}
-	st_case_317:
-//line plugins/parsers/influx/machine.go:8737
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto tr485
-		case 13:
-			goto tr346
-		case 32:
-			goto tr484
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto tr46
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr484
-		}
-		goto tr44
-tr46:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st84
-	st84:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof84
-		}
-	st_case_84:
-//line plugins/parsers/influx/machine.go:8769
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st26
-	st318:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof318
-		}
-	st_case_318:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st319
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-	st319:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof319
-		}
-	st_case_319:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st320
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-	st320:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof320
-		}
-	st_case_320:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st321
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
+	goto st321
 	st321:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof321
 		}
 	st_case_321:
+//line plugins/parsers/influx/machine.go:8670
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st322
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-	st322:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof322
-		}
-	st_case_322:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st323
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-	st323:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof323
-		}
-	st_case_323:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
-		case 44:
-			goto tr7
-		case 61:
-			goto tr49
-		case 92:
-			goto st84
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st324
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr479
-		}
-		goto st26
-	st324:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof324
-		}
-	st_case_324:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr480
-		case 13:
-			goto tr351
-		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -8982,7 +8689,164 @@ tr46:
 				goto st325
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
+		}
+		goto st26
+tr495:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st322
+tr523:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st322
+tr490:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st322
+tr520:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st322
+	st322:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof322
+		}
+	st_case_322:
+//line plugins/parsers/influx/machine.go:8733
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto tr494
+		case 13:
+			goto tr357
+		case 32:
+			goto st322
+		case 44:
+			goto tr5
+		case 61:
+			goto tr5
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st322
+		}
+		goto tr9
+tr494:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st323
+	st323:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof323
+		}
+	st_case_323:
+//line plugins/parsers/influx/machine.go:8765
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto tr494
+		case 13:
+			goto tr357
+		case 32:
+			goto st322
+		case 44:
+			goto tr5
+		case 61:
+			goto tr14
+		case 92:
+			goto tr12
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st322
+		}
+		goto tr9
+tr496:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st324
+tr491:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st324
+	st324:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof324
+		}
+	st_case_324:
+//line plugins/parsers/influx/machine.go:8811
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto tr496
+		case 13:
+			goto tr357
+		case 32:
+			goto tr495
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto tr46
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr495
+		}
+		goto tr44
+tr46:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st84
+	st84:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof84
+		}
+	st_case_84:
+//line plugins/parsers/influx/machine.go:8843
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
 		}
 		goto st26
 	st325:
@@ -8992,13 +8856,13 @@ tr46:
 	st_case_325:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9012,7 +8876,7 @@ tr46:
 				goto st326
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st326:
@@ -9022,13 +8886,13 @@ tr46:
 	st_case_326:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9042,7 +8906,7 @@ tr46:
 				goto st327
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st327:
@@ -9052,13 +8916,13 @@ tr46:
 	st_case_327:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9072,7 +8936,7 @@ tr46:
 				goto st328
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st328:
@@ -9082,13 +8946,13 @@ tr46:
 	st_case_328:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9102,7 +8966,7 @@ tr46:
 				goto st329
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st329:
@@ -9112,13 +8976,13 @@ tr46:
 	st_case_329:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9132,7 +8996,7 @@ tr46:
 				goto st330
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st330:
@@ -9142,13 +9006,13 @@ tr46:
 	st_case_330:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9162,7 +9026,7 @@ tr46:
 				goto st331
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st331:
@@ -9172,13 +9036,13 @@ tr46:
 	st_case_331:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9192,7 +9056,7 @@ tr46:
 				goto st332
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st332:
@@ -9202,13 +9066,13 @@ tr46:
 	st_case_332:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9222,7 +9086,7 @@ tr46:
 				goto st333
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st333:
@@ -9232,13 +9096,13 @@ tr46:
 	st_case_333:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9252,7 +9116,7 @@ tr46:
 				goto st334
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st334:
@@ -9262,13 +9126,13 @@ tr46:
 	st_case_334:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9282,7 +9146,7 @@ tr46:
 				goto st335
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr479
+			goto tr490
 		}
 		goto st26
 	st335:
@@ -9292,13 +9156,223 @@ tr46:
 	st_case_335:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr480
+			goto tr491
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr479
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st336
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st336:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof336
+		}
+	st_case_336:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st337
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st337:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof337
+		}
+	st_case_337:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st338
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st338:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof338
+		}
+	st_case_338:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st339
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st339:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof339
+		}
+	st_case_339:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st340
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st340:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof340
+		}
+	st_case_340:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st341
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st341:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof341
+		}
+	st_case_341:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
+		case 44:
+			goto tr7
+		case 61:
+			goto tr49
+		case 92:
+			goto st84
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st342
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr490
+		}
+		goto st26
+	st342:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof342
+		}
+	st_case_342:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr491
+		case 13:
+			goto tr362
+		case 32:
+			goto tr490
 		case 44:
 			goto tr7
 		case 61:
@@ -9307,22 +9381,22 @@ tr46:
 			goto st84
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr479
+			goto tr490
 		}
 		goto st26
-tr473:
+tr484:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
 	goto st85
-tr505:
+tr516:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
 	goto st85
-tr557:
+tr568:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9332,7 +9406,7 @@ tr557:
 	m.handler.AddFloat(key, m.text())
 
 	goto st85
-tr563:
+tr574:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9342,7 +9416,7 @@ tr563:
 	m.handler.AddInt(key, m.text())
 
 	goto st85
-tr567:
+tr578:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9352,7 +9426,7 @@ tr567:
 	m.handler.AddUint(key, m.text())
 
 	goto st85
-tr571:
+tr582:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9362,7 +9436,7 @@ tr571:
 	m.handler.AddBool(key, m.text())
 
 	goto st85
-tr784:
+tr795:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9372,7 +9446,7 @@ tr784:
 	m.handler.AddFloat(key, m.text())
 
 	goto st85
-tr809:
+tr820:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9382,7 +9456,7 @@ tr809:
 	m.handler.AddInt(key, m.text())
 
 	goto st85
-tr812:
+tr823:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9392,7 +9466,7 @@ tr812:
 	m.handler.AddUint(key, m.text())
 
 	goto st85
-tr815:
+tr826:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -9407,7 +9481,7 @@ tr815:
 			goto _test_eof85
 		}
 	st_case_85:
-//line plugins/parsers/influx/machine.go:9411
+//line plugins/parsers/influx/machine.go:9485
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr61
@@ -9438,7 +9512,7 @@ tr166:
 			goto _test_eof86
 		}
 	st_case_86:
-//line plugins/parsers/influx/machine.go:9442
+//line plugins/parsers/influx/machine.go:9516
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr61
@@ -9473,7 +9547,7 @@ tr169:
 			goto _test_eof87
 		}
 	st_case_87:
-//line plugins/parsers/influx/machine.go:9477
+//line plugins/parsers/influx/machine.go:9551
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr61
@@ -9524,7 +9598,7 @@ tr171:
 			goto _test_eof88
 		}
 	st_case_88:
-//line plugins/parsers/influx/machine.go:9528
+//line plugins/parsers/influx/machine.go:9602
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr181
@@ -9558,7 +9632,7 @@ tr180:
 			goto _test_eof89
 		}
 	st_case_89:
-//line plugins/parsers/influx/machine.go:9562
+//line plugins/parsers/influx/machine.go:9636
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -9602,7 +9676,7 @@ tr181:
 			goto _test_eof90
 		}
 	st_case_90:
-//line plugins/parsers/influx/machine.go:9606
+//line plugins/parsers/influx/machine.go:9680
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st90
@@ -9636,7 +9710,7 @@ tr192:
 			goto _test_eof91
 		}
 	st_case_91:
-//line plugins/parsers/influx/machine.go:9640
+//line plugins/parsers/influx/machine.go:9714
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -9668,7 +9742,7 @@ tr197:
 			goto _test_eof92
 		}
 	st_case_92:
-//line plugins/parsers/influx/machine.go:9672
+//line plugins/parsers/influx/machine.go:9746
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -9711,7 +9785,7 @@ tr195:
 			goto _test_eof93
 		}
 	st_case_93:
-//line plugins/parsers/influx/machine.go:9715
+//line plugins/parsers/influx/machine.go:9789
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st91
@@ -9738,7 +9812,7 @@ tr194:
 			goto _test_eof94
 		}
 	st_case_94:
-//line plugins/parsers/influx/machine.go:9742
+//line plugins/parsers/influx/machine.go:9816
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st90
@@ -9782,7 +9856,7 @@ tr182:
 			goto _test_eof95
 		}
 	st_case_95:
-//line plugins/parsers/influx/machine.go:9786
+//line plugins/parsers/influx/machine.go:9860
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -9816,7 +9890,7 @@ tr199:
 			goto _test_eof96
 		}
 	st_case_96:
-//line plugins/parsers/influx/machine.go:9820
+//line plugins/parsers/influx/machine.go:9894
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -9860,7 +9934,7 @@ tr200:
 			goto _test_eof97
 		}
 	st_case_97:
-//line plugins/parsers/influx/machine.go:9864
+//line plugins/parsers/influx/machine.go:9938
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -9892,46 +9966,46 @@ tr201:
 
 	m.handler.AddString(key, m.text())
 
-	goto st336
+	goto st343
 tr205:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st336
-	st336:
+	goto st343
+	st343:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof336
+			goto _test_eof343
 		}
-	st_case_336:
-//line plugins/parsers/influx/machine.go:9908
+	st_case_343:
+//line plugins/parsers/influx/machine.go:9982
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr504
+			goto tr515
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr503
+			goto tr514
 		case 44:
-			goto tr505
+			goto tr516
 		case 61:
 			goto tr14
 		case 92:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr503
+			goto tr514
 		}
 		goto st33
-tr504:
+tr515:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st337
-tr506:
+	goto st344
+tr517:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -9940,26 +10014,26 @@ tr506:
 
 	m.pb = m.p
 
-	goto st337
-	st337:
+	goto st344
+	st344:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof337
+			goto _test_eof344
 		}
-	st_case_337:
-//line plugins/parsers/influx/machine.go:9950
+	st_case_344:
+//line plugins/parsers/influx/machine.go:10024
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr506
+			goto tr517
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr503
+			goto tr514
 		case 44:
 			goto tr63
 		case 45:
-			goto tr507
+			goto tr518
 		case 61:
 			goto tr14
 		case 92:
@@ -9968,13 +10042,13 @@ tr506:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr508
+				goto tr519
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr503
+			goto tr514
 		}
 		goto tr65
-tr507:
+tr518:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -9985,7 +10059,7 @@ tr507:
 			goto _test_eof98
 		}
 	st_case_98:
-//line plugins/parsers/influx/machine.go:9989
+//line plugins/parsers/influx/machine.go:10063
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr207
@@ -10005,289 +10079,33 @@ tr507:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st338
+				goto st345
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr60
 		}
 		goto st33
-tr508:
+tr519:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st338
-	st338:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof338
-		}
-	st_case_338:
-//line plugins/parsers/influx/machine.go:10026
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st340
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-tr513:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st339
-tr510:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st339
-	st339:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof339
-		}
-	st_case_339:
-//line plugins/parsers/influx/machine.go:10077
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto tr513
-		case 13:
-			goto tr346
-		case 32:
-			goto tr512
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto tr67
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr512
-		}
-		goto tr65
-	st340:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof340
-		}
-	st_case_340:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st341
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-	st341:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof341
-		}
-	st_case_341:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st342
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-	st342:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof342
-		}
-	st_case_342:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st343
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-	st343:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof343
-		}
-	st_case_343:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st344
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-	st344:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof344
-		}
-	st_case_344:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st345
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
+	goto st345
 	st345:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof345
 		}
 	st_case_345:
+//line plugins/parsers/influx/machine.go:10100
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
-		case 44:
-			goto tr63
-		case 61:
-			goto tr14
-		case 92:
-			goto st35
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st346
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr509
-		}
-		goto st33
-	st346:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof346
-		}
-	st_case_346:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr510
-		case 13:
-			goto tr351
-		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10301,9 +10119,55 @@ tr510:
 				goto st347
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
+tr524:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st346
+tr521:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st346
+	st346:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof346
+		}
+	st_case_346:
+//line plugins/parsers/influx/machine.go:10151
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto tr524
+		case 13:
+			goto tr357
+		case 32:
+			goto tr523
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto tr67
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr523
+		}
+		goto tr65
 	st347:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof347
@@ -10311,13 +10175,13 @@ tr510:
 	st_case_347:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10331,7 +10195,7 @@ tr510:
 				goto st348
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st348:
@@ -10341,13 +10205,13 @@ tr510:
 	st_case_348:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10361,7 +10225,7 @@ tr510:
 				goto st349
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st349:
@@ -10371,13 +10235,13 @@ tr510:
 	st_case_349:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10391,7 +10255,7 @@ tr510:
 				goto st350
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st350:
@@ -10401,13 +10265,13 @@ tr510:
 	st_case_350:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10421,7 +10285,7 @@ tr510:
 				goto st351
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st351:
@@ -10431,13 +10295,13 @@ tr510:
 	st_case_351:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10451,7 +10315,7 @@ tr510:
 				goto st352
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st352:
@@ -10461,13 +10325,13 @@ tr510:
 	st_case_352:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10481,7 +10345,7 @@ tr510:
 				goto st353
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st353:
@@ -10491,13 +10355,13 @@ tr510:
 	st_case_353:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10511,7 +10375,7 @@ tr510:
 				goto st354
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st354:
@@ -10521,13 +10385,13 @@ tr510:
 	st_case_354:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10541,7 +10405,7 @@ tr510:
 				goto st355
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st355:
@@ -10551,13 +10415,13 @@ tr510:
 	st_case_355:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10571,7 +10435,7 @@ tr510:
 				goto st356
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st356:
@@ -10581,13 +10445,13 @@ tr510:
 	st_case_356:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10601,7 +10465,7 @@ tr510:
 				goto st357
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr509
+			goto tr520
 		}
 		goto st33
 	st357:
@@ -10611,13 +10475,223 @@ tr510:
 	st_case_357:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr510
+			goto tr521
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr509
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st358
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st358:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof358
+		}
+	st_case_358:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st359
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st359:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof359
+		}
+	st_case_359:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st360
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st360:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof360
+		}
+	st_case_360:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st361
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st361:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof361
+		}
+	st_case_361:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st362
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st362:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof362
+		}
+	st_case_362:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st363
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st363:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof363
+		}
+	st_case_363:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
+		case 44:
+			goto tr63
+		case 61:
+			goto tr14
+		case 92:
+			goto st35
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st364
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr520
+		}
+		goto st33
+	st364:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof364
+		}
+	st_case_364:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr521
+		case 13:
+			goto tr362
+		case 32:
+			goto tr520
 		case 44:
 			goto tr63
 		case 61:
@@ -10626,7 +10700,7 @@ tr510:
 			goto st35
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr509
+			goto tr520
 		}
 		goto st33
 tr190:
@@ -10650,7 +10724,7 @@ tr184:
 			goto _test_eof99
 		}
 	st_case_99:
-//line plugins/parsers/influx/machine.go:10654
+//line plugins/parsers/influx/machine.go:10728
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -10682,7 +10756,7 @@ tr209:
 			goto _test_eof100
 		}
 	st_case_100:
-//line plugins/parsers/influx/machine.go:10686
+//line plugins/parsers/influx/machine.go:10760
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -10712,28 +10786,28 @@ tr210:
 
 	m.handler.AddString(key, m.text())
 
-	goto st358
+	goto st365
 tr213:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st358
-	st358:
+	goto st365
+	st365:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof358
+			goto _test_eof365
 		}
-	st_case_358:
-//line plugins/parsers/influx/machine.go:10728
+	st_case_365:
+//line plugins/parsers/influx/machine.go:10802
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st359
+			goto st366
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto st9
 		case 61:
@@ -10742,27 +10816,27 @@ tr213:
 			goto st37
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st200
+			goto st207
 		}
 		goto st29
-	st359:
+	st366:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof359
+			goto _test_eof366
 		}
-	st_case_359:
+	st_case_366:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st359
+			goto st366
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto tr216
 		case 45:
-			goto tr532
+			goto tr543
 		case 61:
 			goto tr55
 		case 92:
@@ -10771,13 +10845,13 @@ tr213:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr533
+				goto tr544
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st200
+			goto st207
 		}
 		goto st29
-tr532:
+tr543:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -10788,7 +10862,7 @@ tr532:
 			goto _test_eof101
 		}
 	st_case_101:
-//line plugins/parsers/influx/machine.go:10792
+//line plugins/parsers/influx/machine.go:10866
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr216
@@ -10806,275 +10880,33 @@ tr532:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st360
+				goto st367
 			}
 		default:
 			goto tr216
 		}
 		goto st29
-tr533:
+tr544:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st360
-	st360:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof360
-		}
-	st_case_360:
-//line plugins/parsers/influx/machine.go:10827
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st362
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-tr534:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st361
-	st361:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof361
-		}
-	st_case_361:
-//line plugins/parsers/influx/machine.go:10864
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto st361
-		case 13:
-			goto tr346
-		case 32:
-			goto st203
-		case 44:
-			goto tr52
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st203
-		}
-		goto st29
-	st362:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof362
-		}
-	st_case_362:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st363
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-	st363:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof363
-		}
-	st_case_363:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st364
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-	st364:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof364
-		}
-	st_case_364:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st365
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-	st365:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof365
-		}
-	st_case_365:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st366
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-	st366:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof366
-		}
-	st_case_366:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st367
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
+	goto st367
 	st367:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof367
 		}
 	st_case_367:
+//line plugins/parsers/influx/machine.go:10901
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
-		case 44:
-			goto tr216
-		case 61:
-			goto tr55
-		case 92:
-			goto st37
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st368
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st29
-	st368:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof368
-		}
-	st_case_368:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr534
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11088,7 +10920,39 @@ tr534:
 				goto st369
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
+		}
+		goto st29
+tr545:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st368
+	st368:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof368
+		}
+	st_case_368:
+//line plugins/parsers/influx/machine.go:10938
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto st368
+		case 13:
+			goto tr357
+		case 32:
+			goto st210
+		case 44:
+			goto tr52
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st210
 		}
 		goto st29
 	st369:
@@ -11098,13 +10962,13 @@ tr534:
 	st_case_369:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11118,7 +10982,7 @@ tr534:
 				goto st370
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st370:
@@ -11128,13 +10992,13 @@ tr534:
 	st_case_370:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11148,7 +11012,7 @@ tr534:
 				goto st371
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st371:
@@ -11158,13 +11022,13 @@ tr534:
 	st_case_371:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11178,7 +11042,7 @@ tr534:
 				goto st372
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st372:
@@ -11188,13 +11052,13 @@ tr534:
 	st_case_372:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11208,7 +11072,7 @@ tr534:
 				goto st373
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st373:
@@ -11218,13 +11082,13 @@ tr534:
 	st_case_373:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11238,7 +11102,7 @@ tr534:
 				goto st374
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st374:
@@ -11248,13 +11112,13 @@ tr534:
 	st_case_374:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11268,7 +11132,7 @@ tr534:
 				goto st375
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st375:
@@ -11278,13 +11142,13 @@ tr534:
 	st_case_375:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11298,7 +11162,7 @@ tr534:
 				goto st376
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st376:
@@ -11308,13 +11172,13 @@ tr534:
 	st_case_376:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11328,7 +11192,7 @@ tr534:
 				goto st377
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st377:
@@ -11338,13 +11202,13 @@ tr534:
 	st_case_377:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11358,7 +11222,7 @@ tr534:
 				goto st378
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st378:
@@ -11368,13 +11232,13 @@ tr534:
 	st_case_378:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11388,7 +11252,7 @@ tr534:
 				goto st379
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st29
 	st379:
@@ -11398,13 +11262,223 @@ tr534:
 	st_case_379:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr534
+			goto tr545
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st380
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st380:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof380
+		}
+	st_case_380:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st381
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st381:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof381
+		}
+	st_case_381:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st382
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st382:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof382
+		}
+	st_case_382:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st383
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st383:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof383
+		}
+	st_case_383:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st384
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st384:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof384
+		}
+	st_case_384:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st385
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st385:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof385
+		}
+	st_case_385:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr216
+		case 61:
+			goto tr55
+		case 92:
+			goto st37
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st386
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st29
+	st386:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof386
+		}
+	st_case_386:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr545
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
 		case 44:
 			goto tr216
 		case 61:
@@ -11413,7 +11487,7 @@ tr534:
 			goto st37
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr350
+			goto tr361
 		}
 		goto st29
 tr214:
@@ -11427,7 +11501,7 @@ tr214:
 			goto _test_eof102
 		}
 	st_case_102:
-//line plugins/parsers/influx/machine.go:11431
+//line plugins/parsers/influx/machine.go:11505
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -11457,46 +11531,46 @@ tr183:
 
 	m.handler.AddString(key, m.text())
 
-	goto st380
+	goto st387
 tr189:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st380
-	st380:
+	goto st387
+	st387:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof380
+			goto _test_eof387
 		}
-	st_case_380:
-//line plugins/parsers/influx/machine.go:11473
+	st_case_387:
+//line plugins/parsers/influx/machine.go:11547
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr554
+			goto tr565
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr503
+			goto tr514
 		case 44:
-			goto tr505
+			goto tr516
 		case 61:
 			goto tr207
 		case 92:
 			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr503
+			goto tr514
 		}
 		goto st31
-tr554:
+tr565:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st381
-tr556:
+	goto st388
+tr567:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11505,8 +11579,8 @@ tr556:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st381
-tr562:
+	goto st388
+tr573:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11515,8 +11589,8 @@ tr562:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st381
-tr566:
+	goto st388
+tr577:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11525,8 +11599,8 @@ tr566:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st381
-tr570:
+	goto st388
+tr581:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -11535,26 +11609,26 @@ tr570:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st381
-	st381:
+	goto st388
+	st388:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof381
+			goto _test_eof388
 		}
-	st_case_381:
-//line plugins/parsers/influx/machine.go:11545
+	st_case_388:
+//line plugins/parsers/influx/machine.go:11619
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr506
+			goto tr517
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr503
+			goto tr514
 		case 44:
 			goto tr63
 		case 45:
-			goto tr507
+			goto tr518
 		case 61:
 			goto tr207
 		case 92:
@@ -11563,10 +11637,10 @@ tr570:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr508
+				goto tr519
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr503
+			goto tr514
 		}
 		goto tr65
 tr185:
@@ -11580,7 +11654,7 @@ tr185:
 			goto _test_eof103
 		}
 	st_case_103:
-//line plugins/parsers/influx/machine.go:11584
+//line plugins/parsers/influx/machine.go:11658
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st89
@@ -11607,7 +11681,7 @@ tr211:
 			goto _test_eof104
 		}
 	st_case_104:
-//line plugins/parsers/influx/machine.go:11611
+//line plugins/parsers/influx/machine.go:11685
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st100
@@ -11634,7 +11708,7 @@ tr202:
 			goto _test_eof105
 		}
 	st_case_105:
-//line plugins/parsers/influx/machine.go:11638
+//line plugins/parsers/influx/machine.go:11712
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st96
@@ -11661,7 +11735,7 @@ tr172:
 			goto _test_eof106
 		}
 	st_case_106:
-//line plugins/parsers/influx/machine.go:11665
+//line plugins/parsers/influx/machine.go:11739
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -11676,7 +11750,7 @@ tr172:
 		case 46:
 			goto st107
 		case 48:
-			goto st384
+			goto st391
 		case 61:
 			goto tr61
 		case 92:
@@ -11685,7 +11759,7 @@ tr172:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st387
+				goto st394
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr60
@@ -11702,7 +11776,7 @@ tr173:
 			goto _test_eof107
 		}
 	st_case_107:
-//line plugins/parsers/influx/machine.go:11706
+//line plugins/parsers/influx/machine.go:11780
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr61
@@ -11722,28 +11796,28 @@ tr173:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st382
+				goto st389
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr60
 		}
 		goto st31
-	st382:
+	st389:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof382
+			goto _test_eof389
 		}
-	st_case_382:
+	st_case_389:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr556
+			goto tr567
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr555
+			goto tr566
 		case 44:
-			goto tr557
+			goto tr568
 		case 61:
 			goto tr207
 		case 69:
@@ -11756,10 +11830,10 @@ tr173:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st382
+				goto st389
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr555
+			goto tr566
 		}
 		goto st31
 	st108:
@@ -11792,7 +11866,7 @@ tr173:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st383
+				goto st390
 			}
 		default:
 			goto st109
@@ -11822,288 +11896,32 @@ tr173:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st383
+				goto st390
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr60
 		}
 		goto st31
-	st383:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof383
-		}
-	st_case_383:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 11:
-			goto tr556
-		case 13:
-			goto tr372
-		case 32:
-			goto tr555
-		case 44:
-			goto tr557
-		case 61:
-			goto tr207
-		case 92:
-			goto st36
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st383
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr555
-		}
-		goto st31
-	st384:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof384
-		}
-	st_case_384:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 11:
-			goto tr556
-		case 13:
-			goto tr372
-		case 32:
-			goto tr555
-		case 44:
-			goto tr557
-		case 46:
-			goto st382
-		case 61:
-			goto tr207
-		case 69:
-			goto st108
-		case 92:
-			goto st36
-		case 101:
-			goto st108
-		case 105:
-			goto st386
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st385
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr555
-		}
-		goto st31
-	st385:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof385
-		}
-	st_case_385:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 11:
-			goto tr556
-		case 13:
-			goto tr372
-		case 32:
-			goto tr555
-		case 44:
-			goto tr557
-		case 46:
-			goto st382
-		case 61:
-			goto tr207
-		case 69:
-			goto st108
-		case 92:
-			goto st36
-		case 101:
-			goto st108
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st385
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr555
-		}
-		goto st31
-	st386:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof386
-		}
-	st_case_386:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr378
-		case 11:
-			goto tr562
-		case 13:
-			goto tr378
-		case 32:
-			goto tr561
-		case 44:
-			goto tr563
-		case 61:
-			goto tr207
-		case 92:
-			goto st36
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr561
-		}
-		goto st31
-	st387:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof387
-		}
-	st_case_387:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 11:
-			goto tr556
-		case 13:
-			goto tr372
-		case 32:
-			goto tr555
-		case 44:
-			goto tr557
-		case 46:
-			goto st382
-		case 61:
-			goto tr207
-		case 69:
-			goto st108
-		case 92:
-			goto st36
-		case 101:
-			goto st108
-		case 105:
-			goto st386
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st387
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr555
-		}
-		goto st31
-tr174:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st388
-	st388:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof388
-		}
-	st_case_388:
-//line plugins/parsers/influx/machine.go:12010
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr372
-		case 11:
-			goto tr556
-		case 13:
-			goto tr372
-		case 32:
-			goto tr555
-		case 44:
-			goto tr557
-		case 46:
-			goto st382
-		case 61:
-			goto tr207
-		case 69:
-			goto st108
-		case 92:
-			goto st36
-		case 101:
-			goto st108
-		case 105:
-			goto st386
-		case 117:
-			goto st389
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st385
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr555
-		}
-		goto st31
-	st389:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof389
-		}
-	st_case_389:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr382
-		case 11:
-			goto tr566
-		case 13:
-			goto tr382
-		case 32:
-			goto tr565
-		case 44:
-			goto tr567
-		case 61:
-			goto tr207
-		case 92:
-			goto st36
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr565
-		}
-		goto st31
-tr175:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st390
 	st390:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof390
 		}
 	st_case_390:
-//line plugins/parsers/influx/machine.go:12082
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr556
+			goto tr567
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr555
+			goto tr566
 		case 44:
-			goto tr557
-		case 46:
-			goto st382
+			goto tr568
 		case 61:
 			goto tr207
-		case 69:
-			goto st108
 		case 92:
 			goto st36
-		case 101:
-			goto st108
-		case 105:
-			goto st386
-		case 117:
-			goto st389
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
@@ -12111,7 +11929,263 @@ tr175:
 				goto st390
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr555
+			goto tr566
+		}
+		goto st31
+	st391:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof391
+		}
+	st_case_391:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 11:
+			goto tr567
+		case 13:
+			goto tr383
+		case 32:
+			goto tr566
+		case 44:
+			goto tr568
+		case 46:
+			goto st389
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st393
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st392
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr566
+		}
+		goto st31
+	st392:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof392
+		}
+	st_case_392:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 11:
+			goto tr567
+		case 13:
+			goto tr383
+		case 32:
+			goto tr566
+		case 44:
+			goto tr568
+		case 46:
+			goto st389
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st392
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr566
+		}
+		goto st31
+	st393:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof393
+		}
+	st_case_393:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr389
+		case 11:
+			goto tr573
+		case 13:
+			goto tr389
+		case 32:
+			goto tr572
+		case 44:
+			goto tr574
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr572
+		}
+		goto st31
+	st394:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof394
+		}
+	st_case_394:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 11:
+			goto tr567
+		case 13:
+			goto tr383
+		case 32:
+			goto tr566
+		case 44:
+			goto tr568
+		case 46:
+			goto st389
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st393
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st394
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr566
+		}
+		goto st31
+tr174:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st395
+	st395:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof395
+		}
+	st_case_395:
+//line plugins/parsers/influx/machine.go:12084
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 11:
+			goto tr567
+		case 13:
+			goto tr383
+		case 32:
+			goto tr566
+		case 44:
+			goto tr568
+		case 46:
+			goto st389
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st393
+		case 117:
+			goto st396
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st392
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr566
+		}
+		goto st31
+	st396:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof396
+		}
+	st_case_396:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr393
+		case 11:
+			goto tr577
+		case 13:
+			goto tr393
+		case 32:
+			goto tr576
+		case 44:
+			goto tr578
+		case 61:
+			goto tr207
+		case 92:
+			goto st36
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr576
+		}
+		goto st31
+tr175:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st397
+	st397:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof397
+		}
+	st_case_397:
+//line plugins/parsers/influx/machine.go:12156
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr383
+		case 11:
+			goto tr567
+		case 13:
+			goto tr383
+		case 32:
+			goto tr566
+		case 44:
+			goto tr568
+		case 46:
+			goto st389
+		case 61:
+			goto tr207
+		case 69:
+			goto st108
+		case 92:
+			goto st36
+		case 101:
+			goto st108
+		case 105:
+			goto st393
+		case 117:
+			goto st396
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st397
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr566
 		}
 		goto st31
 tr176:
@@ -12119,24 +12193,24 @@ tr176:
 
 	m.pb = m.p
 
-	goto st391
-	st391:
+	goto st398
+	st398:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof391
+			goto _test_eof398
 		}
-	st_case_391:
-//line plugins/parsers/influx/machine.go:12129
+	st_case_398:
+//line plugins/parsers/influx/machine.go:12203
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr570
+			goto tr581
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr569
+			goto tr580
 		case 44:
-			goto tr571
+			goto tr582
 		case 61:
 			goto tr207
 		case 65:
@@ -12147,7 +12221,7 @@ tr176:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr569
+			goto tr580
 		}
 		goto st31
 	st110:
@@ -12223,7 +12297,7 @@ tr176:
 		case 61:
 			goto tr61
 		case 69:
-			goto st392
+			goto st399
 		case 92:
 			goto st36
 		}
@@ -12231,29 +12305,29 @@ tr176:
 			goto tr60
 		}
 		goto st31
-	st392:
+	st399:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof392
+			goto _test_eof399
 		}
-	st_case_392:
+	st_case_399:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr570
+			goto tr581
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr569
+			goto tr580
 		case 44:
-			goto tr571
+			goto tr582
 		case 61:
 			goto tr207
 		case 92:
 			goto st36
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr569
+			goto tr580
 		}
 		goto st31
 	st113:
@@ -12331,7 +12405,7 @@ tr176:
 		case 92:
 			goto st36
 		case 101:
-			goto st392
+			goto st399
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr60
@@ -12342,24 +12416,24 @@ tr177:
 
 	m.pb = m.p
 
-	goto st393
-	st393:
+	goto st400
+	st400:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof393
+			goto _test_eof400
 		}
-	st_case_393:
-//line plugins/parsers/influx/machine.go:12352
+	st_case_400:
+//line plugins/parsers/influx/machine.go:12426
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr570
+			goto tr581
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr569
+			goto tr580
 		case 44:
-			goto tr571
+			goto tr582
 		case 61:
 			goto tr207
 		case 82:
@@ -12370,7 +12444,7 @@ tr177:
 			goto st117
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr569
+			goto tr580
 		}
 		goto st31
 	st116:
@@ -12432,24 +12506,24 @@ tr178:
 
 	m.pb = m.p
 
-	goto st394
-	st394:
+	goto st401
+	st401:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof394
+			goto _test_eof401
 		}
-	st_case_394:
-//line plugins/parsers/influx/machine.go:12442
+	st_case_401:
+//line plugins/parsers/influx/machine.go:12516
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr570
+			goto tr581
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr569
+			goto tr580
 		case 44:
-			goto tr571
+			goto tr582
 		case 61:
 			goto tr207
 		case 92:
@@ -12458,7 +12532,7 @@ tr178:
 			goto st113
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr569
+			goto tr580
 		}
 		goto st31
 tr179:
@@ -12466,24 +12540,24 @@ tr179:
 
 	m.pb = m.p
 
-	goto st395
-	st395:
+	goto st402
+	st402:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof395
+			goto _test_eof402
 		}
-	st_case_395:
-//line plugins/parsers/influx/machine.go:12476
+	st_case_402:
+//line plugins/parsers/influx/machine.go:12550
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr570
+			goto tr581
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr569
+			goto tr580
 		case 44:
-			goto tr571
+			goto tr582
 		case 61:
 			goto tr207
 		case 92:
@@ -12492,7 +12566,7 @@ tr179:
 			goto st117
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr569
+			goto tr580
 		}
 		goto st31
 tr167:
@@ -12506,7 +12580,7 @@ tr167:
 			goto _test_eof118
 		}
 	st_case_118:
-//line plugins/parsers/influx/machine.go:12510
+//line plugins/parsers/influx/machine.go:12584
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -12543,7 +12617,7 @@ tr239:
 			goto _test_eof119
 		}
 	st_case_119:
-//line plugins/parsers/influx/machine.go:12547
+//line plugins/parsers/influx/machine.go:12621
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -12575,7 +12649,7 @@ tr229:
 			goto _test_eof120
 		}
 	st_case_120:
-//line plugins/parsers/influx/machine.go:12579
+//line plugins/parsers/influx/machine.go:12653
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -12607,7 +12681,7 @@ tr232:
 			goto _test_eof121
 		}
 	st_case_121:
-//line plugins/parsers/influx/machine.go:12611
+//line plugins/parsers/influx/machine.go:12685
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -12639,7 +12713,7 @@ tr234:
 			goto _test_eof122
 		}
 	st_case_122:
-//line plugins/parsers/influx/machine.go:12643
+//line plugins/parsers/influx/machine.go:12717
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -12673,7 +12747,7 @@ tr238:
 			goto _test_eof123
 		}
 	st_case_123:
-//line plugins/parsers/influx/machine.go:12677
+//line plugins/parsers/influx/machine.go:12751
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -12707,7 +12781,7 @@ tr241:
 			goto _test_eof124
 		}
 	st_case_124:
-//line plugins/parsers/influx/machine.go:12711
+//line plugins/parsers/influx/machine.go:12785
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -12751,7 +12825,7 @@ tr242:
 			goto _test_eof125
 		}
 	st_case_125:
-//line plugins/parsers/influx/machine.go:12755
+//line plugins/parsers/influx/machine.go:12829
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -12785,7 +12859,7 @@ tr243:
 			goto _test_eof126
 		}
 	st_case_126:
-//line plugins/parsers/influx/machine.go:12789
+//line plugins/parsers/influx/machine.go:12863
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st124
@@ -12812,7 +12886,7 @@ tr235:
 			goto _test_eof127
 		}
 	st_case_127:
-//line plugins/parsers/influx/machine.go:12816
+//line plugins/parsers/influx/machine.go:12890
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st122
@@ -12839,7 +12913,7 @@ tr230:
 			goto _test_eof128
 		}
 	st_case_128:
-//line plugins/parsers/influx/machine.go:12843
+//line plugins/parsers/influx/machine.go:12917
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st120
@@ -12866,7 +12940,7 @@ tr163:
 			goto _test_eof129
 		}
 	st_case_129:
-//line plugins/parsers/influx/machine.go:12870
+//line plugins/parsers/influx/machine.go:12944
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -12911,40 +12985,40 @@ tr247:
 
 	m.handler.AddString(key, m.text())
 
-	goto st396
-	st396:
+	goto st403
+	st403:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof396
+			goto _test_eof403
 		}
-	st_case_396:
-//line plugins/parsers/influx/machine.go:12921
+	st_case_403:
+//line plugins/parsers/influx/machine.go:12995
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr576
+			goto tr587
 		case 11:
-			goto tr577
+			goto tr588
 		case 12:
-			goto tr471
+			goto tr482
 		case 32:
-			goto tr576
+			goto tr587
 		case 34:
 			goto tr83
 		case 44:
-			goto tr578
+			goto tr589
 		case 92:
 			goto tr85
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
+			goto tr357
 		}
 		goto tr80
-tr603:
+tr614:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st397
-tr576:
+	goto st404
+tr587:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -12953,14 +13027,14 @@ tr576:
 
 	m.pb = m.p
 
-	goto st397
-tr735:
+	goto st404
+tr746:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st397
-tr731:
+	goto st404
+tr742:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12969,8 +13043,8 @@ tr731:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st397
-tr763:
+	goto st404
+tr774:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -12979,28 +13053,28 @@ tr763:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st397
-tr767:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:92
-
-	m.handler.AddUint(key, m.text())
-
-	goto st397
-tr771:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:100
-
-	m.handler.AddBool(key, m.text())
-
-	goto st397
+	goto st404
 tr778:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:92
+
+	m.handler.AddUint(key, m.text())
+
+	goto st404
+tr782:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:100
+
+	m.handler.AddBool(key, m.text())
+
+	goto st404
+tr789:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13009,8 +13083,8 @@ tr778:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st397
-tr787:
+	goto st404
+tr798:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13019,8 +13093,8 @@ tr787:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st397
-tr792:
+	goto st404
+tr803:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13029,8 +13103,8 @@ tr792:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st397
-tr797:
+	goto st404
+tr808:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13039,28 +13113,28 @@ tr797:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st397
-	st397:
+	goto st404
+	st404:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof397
+			goto _test_eof404
 		}
-	st_case_397:
-//line plugins/parsers/influx/machine.go:13049
+	st_case_404:
+//line plugins/parsers/influx/machine.go:13123
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st397
+			goto st404
 		case 11:
-			goto tr580
+			goto tr591
 		case 12:
-			goto st311
+			goto st318
 		case 32:
-			goto st397
+			goto st404
 		case 34:
 			goto tr95
 		case 44:
 			goto st7
 		case 45:
-			goto tr581
+			goto tr592
 		case 61:
 			goto st7
 		case 92:
@@ -13069,39 +13143,39 @@ tr797:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr582
+				goto tr593
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr92
-tr580:
+tr591:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st398
-	st398:
+	goto st405
+	st405:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof398
+			goto _test_eof405
 		}
-	st_case_398:
-//line plugins/parsers/influx/machine.go:13090
+	st_case_405:
+//line plugins/parsers/influx/machine.go:13164
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st397
+			goto st404
 		case 11:
-			goto tr580
+			goto tr591
 		case 12:
-			goto st311
+			goto st318
 		case 32:
-			goto st397
+			goto st404
 		case 34:
 			goto tr95
 		case 44:
 			goto st7
 		case 45:
-			goto tr581
+			goto tr592
 		case 61:
 			goto tr99
 		case 92:
@@ -13110,13 +13184,13 @@ tr580:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr582
+				goto tr593
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr92
-tr581:
+tr592:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13127,7 +13201,7 @@ tr581:
 			goto _test_eof130
 		}
 	st_case_130:
-//line plugins/parsers/influx/machine.go:13131
+//line plugins/parsers/influx/machine.go:13205
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -13147,291 +13221,33 @@ tr581:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st399
+				goto st406
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr101
 		}
 		goto st42
-tr582:
+tr593:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st399
-	st399:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof399
-		}
-	st_case_399:
-//line plugins/parsers/influx/machine.go:13168
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st401
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-tr583:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st400
-	st400:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof400
-		}
-	st_case_400:
-//line plugins/parsers/influx/machine.go:13207
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st261
-		case 11:
-			goto st400
-		case 12:
-			goto st203
-		case 32:
-			goto st261
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto st42
-	st401:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof401
-		}
-	st_case_401:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st402
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-	st402:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof402
-		}
-	st_case_402:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st403
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-	st403:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof403
-		}
-	st_case_403:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st404
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-	st404:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof404
-		}
-	st_case_404:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st405
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-	st405:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof405
-		}
-	st_case_405:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st406
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
+	goto st406
 	st406:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof406
 		}
 	st_case_406:
+//line plugins/parsers/influx/machine.go:13242
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto st78
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st407
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st42
-	st407:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof407
-		}
-	st_case_407:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr583
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13447,7 +13263,41 @@ tr583:
 				goto st408
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
+		}
+		goto st42
+tr594:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st407
+	st407:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof407
+		}
+	st_case_407:
+//line plugins/parsers/influx/machine.go:13281
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st268
+		case 11:
+			goto st407
+		case 12:
+			goto st210
+		case 32:
+			goto st268
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
 		}
 		goto st42
 	st408:
@@ -13457,13 +13307,13 @@ tr583:
 	st_case_408:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13479,7 +13329,7 @@ tr583:
 				goto st409
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st409:
@@ -13489,13 +13339,13 @@ tr583:
 	st_case_409:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13511,7 +13361,7 @@ tr583:
 				goto st410
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st410:
@@ -13521,13 +13371,13 @@ tr583:
 	st_case_410:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13543,7 +13393,7 @@ tr583:
 				goto st411
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st411:
@@ -13553,13 +13403,13 @@ tr583:
 	st_case_411:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13575,7 +13425,7 @@ tr583:
 				goto st412
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st412:
@@ -13585,13 +13435,13 @@ tr583:
 	st_case_412:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13607,7 +13457,7 @@ tr583:
 				goto st413
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st413:
@@ -13617,13 +13467,13 @@ tr583:
 	st_case_413:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13639,7 +13489,7 @@ tr583:
 				goto st414
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st414:
@@ -13649,13 +13499,13 @@ tr583:
 	st_case_414:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13671,7 +13521,7 @@ tr583:
 				goto st415
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st415:
@@ -13681,13 +13531,13 @@ tr583:
 	st_case_415:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13703,7 +13553,7 @@ tr583:
 				goto st416
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st416:
@@ -13713,13 +13563,13 @@ tr583:
 	st_case_416:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13735,7 +13585,7 @@ tr583:
 				goto st417
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st417:
@@ -13745,13 +13595,13 @@ tr583:
 	st_case_417:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13767,7 +13617,7 @@ tr583:
 				goto st418
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st42
 	st418:
@@ -13777,13 +13627,237 @@ tr583:
 	st_case_418:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr583
+			goto tr594
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st419
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st419:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof419
+		}
+	st_case_419:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st420
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st420:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof420
+		}
+	st_case_420:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st421
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st421:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof421
+		}
+	st_case_421:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st422
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st422:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof422
+		}
+	st_case_422:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st423
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st423:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof423
+		}
+	st_case_423:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st424
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st424:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof424
+		}
+	st_case_424:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto st78
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st425
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st42
+	st425:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof425
+		}
+	st_case_425:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr594
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -13794,10 +13868,10 @@ tr583:
 			goto st78
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr351
+			goto tr362
 		}
 		goto st42
-tr577:
+tr588:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13806,8 +13880,8 @@ tr577:
 
 	m.pb = m.p
 
-	goto st419
-tr779:
+	goto st426
+tr790:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13816,8 +13890,8 @@ tr779:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st419
-tr788:
+	goto st426
+tr799:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13826,8 +13900,8 @@ tr788:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st419
-tr793:
+	goto st426
+tr804:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13836,8 +13910,8 @@ tr793:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st419
-tr798:
+	goto st426
+tr809:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13846,28 +13920,28 @@ tr798:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st419
-	st419:
+	goto st426
+	st426:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof419
+			goto _test_eof426
 		}
-	st_case_419:
-//line plugins/parsers/influx/machine.go:13856
+	st_case_426:
+//line plugins/parsers/influx/machine.go:13930
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr603
+			goto tr614
 		case 11:
-			goto tr604
+			goto tr615
 		case 12:
-			goto tr471
+			goto tr482
 		case 32:
-			goto tr603
+			goto tr614
 		case 34:
 			goto tr158
 		case 44:
 			goto tr90
 		case 45:
-			goto tr605
+			goto tr616
 		case 61:
 			goto st40
 		case 92:
@@ -13876,13 +13950,13 @@ tr798:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr606
+				goto tr617
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr156
-tr604:
+tr615:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -13891,28 +13965,28 @@ tr604:
 
 	m.pb = m.p
 
-	goto st420
-	st420:
+	goto st427
+	st427:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof420
+			goto _test_eof427
 		}
-	st_case_420:
-//line plugins/parsers/influx/machine.go:13901
+	st_case_427:
+//line plugins/parsers/influx/machine.go:13975
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr603
+			goto tr614
 		case 11:
-			goto tr604
+			goto tr615
 		case 12:
-			goto tr471
+			goto tr482
 		case 32:
-			goto tr603
+			goto tr614
 		case 34:
 			goto tr158
 		case 44:
 			goto tr90
 		case 45:
-			goto tr605
+			goto tr616
 		case 61:
 			goto tr163
 		case 92:
@@ -13921,13 +13995,13 @@ tr604:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr606
+				goto tr617
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr156
-tr605:
+tr616:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -13938,7 +14012,7 @@ tr605:
 			goto _test_eof131
 		}
 	st_case_131:
-//line plugins/parsers/influx/machine.go:13942
+//line plugins/parsers/influx/machine.go:14016
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -13960,426 +14034,33 @@ tr605:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st421
+				goto st428
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr101
 		}
 		goto st81
-tr606:
+tr617:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st421
-	st421:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof421
-		}
-	st_case_421:
-//line plugins/parsers/influx/machine.go:13981
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st425
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-tr612:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-	goto st422
-tr742:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st422
-tr607:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st422
-tr739:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st422
-	st422:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof422
-		}
-	st_case_422:
-//line plugins/parsers/influx/machine.go:14046
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st422
-		case 11:
-			goto tr611
-		case 12:
-			goto st315
-		case 32:
-			goto st422
-		case 34:
-			goto tr95
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr96
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr92
-tr611:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st423
-	st423:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof423
-		}
-	st_case_423:
-//line plugins/parsers/influx/machine.go:14080
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st422
-		case 11:
-			goto tr611
-		case 12:
-			goto st315
-		case 32:
-			goto st422
-		case 34:
-			goto tr95
-		case 44:
-			goto st7
-		case 61:
-			goto tr99
-		case 92:
-			goto tr96
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr92
-tr613:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st424
-tr608:
-//line plugins/parsers/influx/machine.go.rl:72
-
-	m.handler.SetMeasurement(m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st424
-	st424:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof424
-		}
-	st_case_424:
-//line plugins/parsers/influx/machine.go:14128
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr612
-		case 11:
-			goto tr613
-		case 12:
-			goto tr484
-		case 32:
-			goto tr612
-		case 34:
-			goto tr158
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto tr159
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr156
-tr159:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st132
-	st132:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof132
-		}
-	st_case_132:
-//line plugins/parsers/influx/machine.go:14162
-		switch ( m.data)[( m.p)] {
-		case 34:
-			goto st81
-		case 92:
-			goto st81
-		}
-		switch {
-		case ( m.data)[( m.p)] > 10:
-			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-				goto tr5
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr5
-		}
-		goto st26
-	st425:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof425
-		}
-	st_case_425:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st426
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-	st426:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof426
-		}
-	st_case_426:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st427
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-	st427:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof427
-		}
-	st_case_427:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st428
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
+	goto st428
 	st428:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof428
 		}
 	st_case_428:
+//line plugins/parsers/influx/machine.go:14055
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st429
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-	st429:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof429
-		}
-	st_case_429:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st430
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-	st430:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof430
-		}
-	st_case_430:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
-		case 34:
-			goto tr162
-		case 44:
-			goto tr90
-		case 61:
-			goto tr163
-		case 92:
-			goto st132
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st431
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st81
-	st431:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof431
-		}
-	st_case_431:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr607
-		case 11:
-			goto tr608
-		case 12:
-			goto tr479
-		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14395,9 +14076,178 @@ tr159:
 				goto st432
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
+tr623:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st429
+tr753:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st429
+tr618:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st429
+tr750:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st429
+	st429:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof429
+		}
+	st_case_429:
+//line plugins/parsers/influx/machine.go:14120
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st429
+		case 11:
+			goto tr622
+		case 12:
+			goto st322
+		case 32:
+			goto st429
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr96
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr92
+tr622:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st430
+	st430:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof430
+		}
+	st_case_430:
+//line plugins/parsers/influx/machine.go:14154
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st429
+		case 11:
+			goto tr622
+		case 12:
+			goto st322
+		case 32:
+			goto st429
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto tr99
+		case 92:
+			goto tr96
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr92
+tr624:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st431
+tr619:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st431
+	st431:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof431
+		}
+	st_case_431:
+//line plugins/parsers/influx/machine.go:14202
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr623
+		case 11:
+			goto tr624
+		case 12:
+			goto tr495
+		case 32:
+			goto tr623
+		case 34:
+			goto tr158
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto tr159
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr156
+tr159:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st132
+	st132:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof132
+		}
+	st_case_132:
+//line plugins/parsers/influx/machine.go:14236
+		switch ( m.data)[( m.p)] {
+		case 34:
+			goto st81
+		case 92:
+			goto st81
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr5
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr5
+		}
+		goto st26
 	st432:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof432
@@ -14405,13 +14255,13 @@ tr159:
 	st_case_432:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14427,7 +14277,7 @@ tr159:
 				goto st433
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st433:
@@ -14437,13 +14287,13 @@ tr159:
 	st_case_433:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14459,7 +14309,7 @@ tr159:
 				goto st434
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st434:
@@ -14469,13 +14319,13 @@ tr159:
 	st_case_434:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14491,7 +14341,7 @@ tr159:
 				goto st435
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st435:
@@ -14501,13 +14351,13 @@ tr159:
 	st_case_435:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14523,7 +14373,7 @@ tr159:
 				goto st436
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st436:
@@ -14533,13 +14383,13 @@ tr159:
 	st_case_436:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14555,7 +14405,7 @@ tr159:
 				goto st437
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st437:
@@ -14565,13 +14415,13 @@ tr159:
 	st_case_437:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14587,7 +14437,7 @@ tr159:
 				goto st438
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st438:
@@ -14597,13 +14447,13 @@ tr159:
 	st_case_438:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14619,7 +14469,7 @@ tr159:
 				goto st439
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st439:
@@ -14629,13 +14479,13 @@ tr159:
 	st_case_439:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14651,7 +14501,7 @@ tr159:
 				goto st440
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st440:
@@ -14661,13 +14511,13 @@ tr159:
 	st_case_440:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14683,7 +14533,7 @@ tr159:
 				goto st441
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st441:
@@ -14693,13 +14543,13 @@ tr159:
 	st_case_441:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14715,7 +14565,7 @@ tr159:
 				goto st442
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st81
 	st442:
@@ -14725,13 +14575,237 @@ tr159:
 	st_case_442:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr607
+			goto tr618
 		case 11:
-			goto tr608
+			goto tr619
 		case 12:
-			goto tr479
+			goto tr490
 		case 32:
-			goto tr607
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st443
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st443:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof443
+		}
+	st_case_443:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st444
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st444:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof444
+		}
+	st_case_444:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st445
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st445:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof445
+		}
+	st_case_445:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st446
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st446:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof446
+		}
+	st_case_446:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st447
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st447:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof447
+		}
+	st_case_447:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st448
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st448:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof448
+		}
+	st_case_448:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
+		case 34:
+			goto tr162
+		case 44:
+			goto tr90
+		case 61:
+			goto tr163
+		case 92:
+			goto st132
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st449
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st81
+	st449:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof449
+		}
+	st_case_449:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr618
+		case 11:
+			goto tr619
+		case 12:
+			goto tr490
+		case 32:
+			goto tr618
 		case 34:
 			goto tr162
 		case 44:
@@ -14742,7 +14816,7 @@ tr159:
 			goto st132
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr351
+			goto tr362
 		}
 		goto st81
 tr83:
@@ -14754,44 +14828,44 @@ tr83:
 
 	m.handler.AddString(key, m.text())
 
-	goto st443
+	goto st450
 tr89:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st443
-	st443:
+	goto st450
+	st450:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof443
+			goto _test_eof450
 		}
-	st_case_443:
-//line plugins/parsers/influx/machine.go:14770
+	st_case_450:
+//line plugins/parsers/influx/machine.go:14844
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr631
+			goto tr642
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr471
+			goto tr482
 		case 44:
-			goto tr473
+			goto tr484
 		case 92:
 			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr471
+			goto tr482
 		}
 		goto st2
-tr631:
+tr642:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
 
-	goto st444
-tr783:
+	goto st451
+tr794:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14800,8 +14874,8 @@ tr783:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st444
-tr808:
+	goto st451
+tr819:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14810,8 +14884,8 @@ tr808:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st444
-tr811:
+	goto st451
+tr822:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14820,8 +14894,8 @@ tr811:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st444
-tr814:
+	goto st451
+tr825:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14830,26 +14904,26 @@ tr814:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st444
-	st444:
+	goto st451
+	st451:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof444
+			goto _test_eof451
 		}
-	st_case_444:
-//line plugins/parsers/influx/machine.go:14840
+	st_case_451:
+//line plugins/parsers/influx/machine.go:14914
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr476
+			goto tr487
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr471
+			goto tr482
 		case 44:
 			goto tr7
 		case 45:
-			goto tr477
+			goto tr488
 		case 61:
 			goto st2
 		case 92:
@@ -14858,10 +14932,10 @@ tr814:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr478
+				goto tr489
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr471
+			goto tr482
 		}
 		goto tr44
 tr2:
@@ -14875,7 +14949,7 @@ tr2:
 			goto _test_eof133
 		}
 	st_case_133:
-//line plugins/parsers/influx/machine.go:14879
+//line plugins/parsers/influx/machine.go:14953
 		switch {
 		case ( m.data)[( m.p)] > 10:
 			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
@@ -14885,7 +14959,7 @@ tr2:
 			goto tr1
 		}
 		goto st2
-tr578:
+tr589:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14895,7 +14969,7 @@ tr578:
 	m.pb = m.p
 
 	goto st134
-tr733:
+tr744:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14905,7 +14979,7 @@ tr733:
 	m.handler.AddFloat(key, m.text())
 
 	goto st134
-tr765:
+tr776:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14915,7 +14989,7 @@ tr765:
 	m.handler.AddInt(key, m.text())
 
 	goto st134
-tr769:
+tr780:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14925,7 +14999,7 @@ tr769:
 	m.handler.AddUint(key, m.text())
 
 	goto st134
-tr773:
+tr784:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -14935,7 +15009,7 @@ tr773:
 	m.handler.AddBool(key, m.text())
 
 	goto st134
-tr781:
+tr792:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14945,7 +15019,7 @@ tr781:
 	m.handler.AddFloat(key, m.text())
 
 	goto st134
-tr790:
+tr801:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14955,7 +15029,7 @@ tr790:
 	m.handler.AddInt(key, m.text())
 
 	goto st134
-tr795:
+tr806:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14965,7 +15039,7 @@ tr795:
 	m.handler.AddUint(key, m.text())
 
 	goto st134
-tr800:
+tr811:
 //line plugins/parsers/influx/machine.go.rl:72
 
 	m.handler.SetMeasurement(m.text())
@@ -14980,7 +15054,7 @@ tr800:
 			goto _test_eof134
 		}
 	st_case_134:
-//line plugins/parsers/influx/machine.go:14984
+//line plugins/parsers/influx/machine.go:15058
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -15012,7 +15086,7 @@ tr258:
 			goto _test_eof135
 		}
 	st_case_135:
-//line plugins/parsers/influx/machine.go:15016
+//line plugins/parsers/influx/machine.go:15090
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -15042,28 +15116,28 @@ tr259:
 
 	m.handler.AddString(key, m.text())
 
-	goto st445
+	goto st452
 tr262:
 //line plugins/parsers/influx/machine.go.rl:104
 
 	m.handler.AddString(key, m.text())
 
-	goto st445
-	st445:
+	goto st452
+	st452:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof445
+			goto _test_eof452
 		}
-	st_case_445:
-//line plugins/parsers/influx/machine.go:15058
+	st_case_452:
+//line plugins/parsers/influx/machine.go:15132
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st446
+			goto st453
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto st9
 		case 61:
@@ -15072,27 +15146,27 @@ tr262:
 			goto st118
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st200
+			goto st207
 		}
 		goto st86
-	st446:
+	st453:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof446
+			goto _test_eof453
 		}
-	st_case_446:
+	st_case_453:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto st446
+			goto st453
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto st200
+			goto st207
 		case 44:
 			goto tr207
 		case 45:
-			goto tr633
+			goto tr644
 		case 61:
 			goto tr169
 		case 92:
@@ -15101,13 +15175,13 @@ tr262:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr634
+				goto tr645
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto st200
+			goto st207
 		}
 		goto st86
-tr633:
+tr644:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -15118,7 +15192,7 @@ tr633:
 			goto _test_eof136
 		}
 	st_case_136:
-//line plugins/parsers/influx/machine.go:15122
+//line plugins/parsers/influx/machine.go:15196
 		switch ( m.data)[( m.p)] {
 		case 32:
 			goto tr207
@@ -15136,275 +15210,33 @@ tr633:
 			}
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st447
+				goto st454
 			}
 		default:
 			goto tr207
 		}
 		goto st86
-tr634:
+tr645:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st447
-	st447:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof447
-		}
-	st_case_447:
-//line plugins/parsers/influx/machine.go:15157
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st449
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-tr635:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st448
-	st448:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof448
-		}
-	st_case_448:
-//line plugins/parsers/influx/machine.go:15194
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr346
-		case 11:
-			goto st448
-		case 13:
-			goto tr346
-		case 32:
-			goto st203
-		case 44:
-			goto tr61
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto st203
-		}
-		goto st86
-	st449:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof449
-		}
-	st_case_449:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st450
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-	st450:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof450
-		}
-	st_case_450:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st451
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-	st451:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof451
-		}
-	st_case_451:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st452
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-	st452:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof452
-		}
-	st_case_452:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st453
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-	st453:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof453
-		}
-	st_case_453:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st454
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
+	goto st454
 	st454:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof454
 		}
 	st_case_454:
+//line plugins/parsers/influx/machine.go:15231
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
-		case 44:
-			goto tr207
-		case 61:
-			goto tr169
-		case 92:
-			goto st118
-		}
-		switch {
-		case ( m.data)[( m.p)] > 12:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st455
-			}
-		case ( m.data)[( m.p)] >= 9:
-			goto tr350
-		}
-		goto st86
-	st455:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof455
-		}
-	st_case_455:
-		switch ( m.data)[( m.p)] {
-		case 10:
-			goto tr351
-		case 11:
-			goto tr635
-		case 13:
-			goto tr351
-		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15418,7 +15250,39 @@ tr635:
 				goto st456
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
+		}
+		goto st86
+tr646:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st455
+	st455:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof455
+		}
+	st_case_455:
+//line plugins/parsers/influx/machine.go:15268
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr357
+		case 11:
+			goto st455
+		case 13:
+			goto tr357
+		case 32:
+			goto st210
+		case 44:
+			goto tr61
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st210
 		}
 		goto st86
 	st456:
@@ -15428,13 +15292,13 @@ tr635:
 	st_case_456:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15448,7 +15312,7 @@ tr635:
 				goto st457
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st457:
@@ -15458,13 +15322,13 @@ tr635:
 	st_case_457:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15478,7 +15342,7 @@ tr635:
 				goto st458
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st458:
@@ -15488,13 +15352,13 @@ tr635:
 	st_case_458:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15508,7 +15372,7 @@ tr635:
 				goto st459
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st459:
@@ -15518,13 +15382,13 @@ tr635:
 	st_case_459:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15538,7 +15402,7 @@ tr635:
 				goto st460
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st460:
@@ -15548,13 +15412,13 @@ tr635:
 	st_case_460:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15568,7 +15432,7 @@ tr635:
 				goto st461
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st461:
@@ -15578,13 +15442,13 @@ tr635:
 	st_case_461:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15598,7 +15462,7 @@ tr635:
 				goto st462
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st462:
@@ -15608,13 +15472,13 @@ tr635:
 	st_case_462:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15628,7 +15492,7 @@ tr635:
 				goto st463
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st463:
@@ -15638,13 +15502,13 @@ tr635:
 	st_case_463:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15658,7 +15522,7 @@ tr635:
 				goto st464
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st464:
@@ -15668,13 +15532,13 @@ tr635:
 	st_case_464:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15688,7 +15552,7 @@ tr635:
 				goto st465
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st465:
@@ -15698,13 +15562,13 @@ tr635:
 	st_case_465:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15718,7 +15582,7 @@ tr635:
 				goto st466
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr350
+			goto tr361
 		}
 		goto st86
 	st466:
@@ -15728,13 +15592,223 @@ tr635:
 	st_case_466:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr351
+			goto tr362
 		case 11:
-			goto tr635
+			goto tr646
 		case 13:
-			goto tr351
+			goto tr362
 		case 32:
-			goto tr350
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st467
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st467:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof467
+		}
+	st_case_467:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st468
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st468:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof468
+		}
+	st_case_468:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st469
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st469:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof469
+		}
+	st_case_469:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st470
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st470:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof470
+		}
+	st_case_470:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st471
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st471:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof471
+		}
+	st_case_471:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st472
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st472:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof472
+		}
+	st_case_472:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
+		case 44:
+			goto tr207
+		case 61:
+			goto tr169
+		case 92:
+			goto st118
+		}
+		switch {
+		case ( m.data)[( m.p)] > 12:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st473
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr361
+		}
+		goto st86
+	st473:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof473
+		}
+	st_case_473:
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr362
+		case 11:
+			goto tr646
+		case 13:
+			goto tr362
+		case 32:
+			goto tr361
 		case 44:
 			goto tr207
 		case 61:
@@ -15743,7 +15817,7 @@ tr635:
 			goto st118
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr350
+			goto tr361
 		}
 		goto st86
 tr263:
@@ -15761,7 +15835,7 @@ tr263:
 			goto _test_eof137
 		}
 	st_case_137:
-//line plugins/parsers/influx/machine.go:15765
+//line plugins/parsers/influx/machine.go:15839
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -15810,42 +15884,42 @@ tr266:
 
 	m.handler.AddString(key, m.text())
 
-	goto st467
-	st467:
+	goto st474
+	st474:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof467
+			goto _test_eof474
 		}
-	st_case_467:
-//line plugins/parsers/influx/machine.go:15820
+	st_case_474:
+//line plugins/parsers/influx/machine.go:15894
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr655
+			goto tr666
 		case 11:
-			goto tr656
+			goto tr667
 		case 12:
-			goto tr503
+			goto tr514
 		case 32:
-			goto tr655
+			goto tr666
 		case 34:
 			goto tr183
 		case 44:
-			goto tr657
+			goto tr668
 		case 61:
 			goto tr25
 		case 92:
 			goto tr185
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
+			goto tr357
 		}
 		goto tr180
-tr682:
+tr693:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
 
-	goto st468
-tr655:
+	goto st475
+tr666:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15854,8 +15928,8 @@ tr655:
 
 	m.pb = m.p
 
-	goto st468
-tr710:
+	goto st475
+tr721:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15864,8 +15938,8 @@ tr710:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st468
-tr716:
+	goto st475
+tr727:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15874,8 +15948,8 @@ tr716:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st468
-tr720:
+	goto st475
+tr731:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15884,8 +15958,8 @@ tr720:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st468
-tr724:
+	goto st475
+tr735:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -15894,28 +15968,28 @@ tr724:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st468
-	st468:
+	goto st475
+	st475:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof468
+			goto _test_eof475
 		}
-	st_case_468:
-//line plugins/parsers/influx/machine.go:15904
+	st_case_475:
+//line plugins/parsers/influx/machine.go:15978
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st468
+			goto st475
 		case 11:
-			goto tr659
+			goto tr670
 		case 12:
-			goto st311
+			goto st318
 		case 32:
-			goto st468
+			goto st475
 		case 34:
 			goto tr95
 		case 44:
 			goto st7
 		case 45:
-			goto tr660
+			goto tr671
 		case 61:
 			goto st7
 		case 92:
@@ -15924,39 +15998,39 @@ tr724:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr661
+				goto tr672
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr192
-tr659:
+tr670:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st469
-	st469:
+	goto st476
+	st476:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof469
+			goto _test_eof476
 		}
-	st_case_469:
-//line plugins/parsers/influx/machine.go:15945
+	st_case_476:
+//line plugins/parsers/influx/machine.go:16019
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto st468
+			goto st475
 		case 11:
-			goto tr659
+			goto tr670
 		case 12:
-			goto st311
+			goto st318
 		case 32:
-			goto st468
+			goto st475
 		case 34:
 			goto tr95
 		case 44:
 			goto st7
 		case 45:
-			goto tr660
+			goto tr671
 		case 61:
 			goto tr197
 		case 92:
@@ -15965,13 +16039,13 @@ tr659:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr661
+				goto tr672
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr192
-tr660:
+tr671:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -15982,7 +16056,7 @@ tr660:
 			goto _test_eof138
 		}
 	st_case_138:
-//line plugins/parsers/influx/machine.go:15986
+//line plugins/parsers/influx/machine.go:16060
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -16002,291 +16076,33 @@ tr660:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st470
+				goto st477
 			}
 		case ( m.data)[( m.p)] >= 12:
 			goto tr101
 		}
 		goto st91
-tr661:
+tr672:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st470
-	st470:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof470
-		}
-	st_case_470:
-//line plugins/parsers/influx/machine.go:16023
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st472
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-tr662:
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st471
-	st471:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof471
-		}
-	st_case_471:
-//line plugins/parsers/influx/machine.go:16062
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st261
-		case 11:
-			goto st471
-		case 12:
-			goto st203
-		case 32:
-			goto st261
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto st91
-	st472:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof472
-		}
-	st_case_472:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st473
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-	st473:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof473
-		}
-	st_case_473:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st474
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-	st474:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof474
-		}
-	st_case_474:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st475
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-	st475:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof475
-		}
-	st_case_475:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st476
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-	st476:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof476
-		}
-	st_case_476:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st477
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
+	goto st477
 	st477:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof477
 		}
 	st_case_477:
+//line plugins/parsers/influx/machine.go:16097
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
-		case 34:
-			goto tr98
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto st93
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st478
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st91
-	st478:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof478
-		}
-	st_case_478:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr420
-		case 11:
-			goto tr662
-		case 12:
-			goto tr350
-		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16302,7 +16118,41 @@ tr662:
 				goto st479
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
+		}
+		goto st91
+tr673:
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st478
+	st478:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof478
+		}
+	st_case_478:
+//line plugins/parsers/influx/machine.go:16136
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st268
+		case 11:
+			goto st478
+		case 12:
+			goto st210
+		case 32:
+			goto st268
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
 		}
 		goto st91
 	st479:
@@ -16312,13 +16162,13 @@ tr662:
 	st_case_479:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16334,7 +16184,7 @@ tr662:
 				goto st480
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st480:
@@ -16344,13 +16194,13 @@ tr662:
 	st_case_480:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16366,7 +16216,7 @@ tr662:
 				goto st481
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st481:
@@ -16376,13 +16226,13 @@ tr662:
 	st_case_481:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16398,7 +16248,7 @@ tr662:
 				goto st482
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st482:
@@ -16408,13 +16258,13 @@ tr662:
 	st_case_482:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16430,7 +16280,7 @@ tr662:
 				goto st483
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st483:
@@ -16440,13 +16290,13 @@ tr662:
 	st_case_483:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16462,7 +16312,7 @@ tr662:
 				goto st484
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st484:
@@ -16472,13 +16322,13 @@ tr662:
 	st_case_484:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16494,7 +16344,7 @@ tr662:
 				goto st485
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st485:
@@ -16504,13 +16354,13 @@ tr662:
 	st_case_485:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16526,7 +16376,7 @@ tr662:
 				goto st486
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st486:
@@ -16536,13 +16386,13 @@ tr662:
 	st_case_486:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16558,7 +16408,7 @@ tr662:
 				goto st487
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st487:
@@ -16568,13 +16418,13 @@ tr662:
 	st_case_487:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16590,7 +16440,7 @@ tr662:
 				goto st488
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st488:
@@ -16600,13 +16450,13 @@ tr662:
 	st_case_488:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16622,7 +16472,7 @@ tr662:
 				goto st489
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st91
 	st489:
@@ -16632,13 +16482,237 @@ tr662:
 	st_case_489:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr420
+			goto tr431
 		case 11:
-			goto tr662
+			goto tr673
 		case 12:
-			goto tr350
+			goto tr361
 		case 32:
-			goto tr420
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st490
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st490:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof490
+		}
+	st_case_490:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st491
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st491:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof491
+		}
+	st_case_491:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st492
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st492:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof492
+		}
+	st_case_492:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st493
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st493:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof493
+		}
+	st_case_493:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st494
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st494:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof494
+		}
+	st_case_494:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st495
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st495:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof495
+		}
+	st_case_495:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
+		case 34:
+			goto tr98
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto st93
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st496
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st91
+	st496:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof496
+		}
+	st_case_496:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr431
+		case 11:
+			goto tr673
+		case 12:
+			goto tr361
+		case 32:
+			goto tr431
 		case 34:
 			goto tr98
 		case 44:
@@ -16649,10 +16723,10 @@ tr662:
 			goto st93
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr351
+			goto tr362
 		}
 		goto st91
-tr656:
+tr667:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16661,8 +16735,8 @@ tr656:
 
 	m.pb = m.p
 
-	goto st490
-tr711:
+	goto st497
+tr722:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16671,8 +16745,8 @@ tr711:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st490
-tr717:
+	goto st497
+tr728:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16681,8 +16755,8 @@ tr717:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st490
-tr721:
+	goto st497
+tr732:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16691,8 +16765,8 @@ tr721:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st490
-tr725:
+	goto st497
+tr736:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16701,28 +16775,28 @@ tr725:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st490
-	st490:
+	goto st497
+	st497:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof490
+			goto _test_eof497
 		}
-	st_case_490:
-//line plugins/parsers/influx/machine.go:16711
+	st_case_497:
+//line plugins/parsers/influx/machine.go:16785
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr682
+			goto tr693
 		case 11:
-			goto tr683
+			goto tr694
 		case 12:
-			goto tr503
+			goto tr514
 		case 32:
-			goto tr682
+			goto tr693
 		case 34:
 			goto tr201
 		case 44:
 			goto tr190
 		case 45:
-			goto tr684
+			goto tr695
 		case 61:
 			goto st7
 		case 92:
@@ -16731,13 +16805,13 @@ tr725:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr685
+				goto tr696
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr199
-tr683:
+tr694:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -16746,28 +16820,28 @@ tr683:
 
 	m.pb = m.p
 
-	goto st491
-	st491:
+	goto st498
+	st498:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof491
+			goto _test_eof498
 		}
-	st_case_491:
-//line plugins/parsers/influx/machine.go:16756
+	st_case_498:
+//line plugins/parsers/influx/machine.go:16830
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr682
+			goto tr693
 		case 11:
-			goto tr683
+			goto tr694
 		case 12:
-			goto tr503
+			goto tr514
 		case 32:
-			goto tr682
+			goto tr693
 		case 34:
 			goto tr201
 		case 44:
 			goto tr190
 		case 45:
-			goto tr684
+			goto tr695
 		case 61:
 			goto tr197
 		case 92:
@@ -16776,13 +16850,13 @@ tr683:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr685
+				goto tr696
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr199
-tr684:
+tr695:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -16793,7 +16867,7 @@ tr684:
 			goto _test_eof139
 		}
 	st_case_139:
-//line plugins/parsers/influx/machine.go:16797
+//line plugins/parsers/influx/machine.go:16871
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -16815,383 +16889,33 @@ tr684:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st492
+				goto st499
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr207
 		}
 		goto st96
-tr685:
+tr696:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st492
-	st492:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof492
-		}
-	st_case_492:
-//line plugins/parsers/influx/machine.go:16836
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st496
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-tr691:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-	goto st493
-tr686:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st493
-	st493:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof493
-		}
-	st_case_493:
-//line plugins/parsers/influx/machine.go:16885
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st493
-		case 11:
-			goto tr690
-		case 12:
-			goto st315
-		case 32:
-			goto st493
-		case 34:
-			goto tr95
-		case 44:
-			goto st7
-		case 61:
-			goto st7
-		case 92:
-			goto tr195
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr192
-tr690:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st494
-	st494:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof494
-		}
-	st_case_494:
-//line plugins/parsers/influx/machine.go:16919
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto st493
-		case 11:
-			goto tr690
-		case 12:
-			goto st315
-		case 32:
-			goto st493
-		case 34:
-			goto tr95
-		case 44:
-			goto st7
-		case 61:
-			goto tr197
-		case 92:
-			goto tr195
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr192
-tr692:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st495
-tr687:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st495
-	st495:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof495
-		}
-	st_case_495:
-//line plugins/parsers/influx/machine.go:16967
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr691
-		case 11:
-			goto tr692
-		case 12:
-			goto tr512
-		case 32:
-			goto tr691
-		case 34:
-			goto tr201
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto tr202
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr199
-	st496:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof496
-		}
-	st_case_496:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st497
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-	st497:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof497
-		}
-	st_case_497:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st498
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-	st498:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof498
-		}
-	st_case_498:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st499
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
+	goto st499
 	st499:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof499
 		}
 	st_case_499:
+//line plugins/parsers/influx/machine.go:16910
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st500
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-	st500:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof500
-		}
-	st_case_500:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st501
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-	st501:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof501
-		}
-	st_case_501:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
-		case 34:
-			goto tr205
-		case 44:
-			goto tr190
-		case 61:
-			goto tr197
-		case 92:
-			goto st105
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st502
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st96
-	st502:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof502
-		}
-	st_case_502:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr686
-		case 11:
-			goto tr687
-		case 12:
-			goto tr509
-		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17207,9 +16931,135 @@ tr687:
 				goto st503
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
+tr702:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st500
+tr697:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st500
+	st500:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof500
+		}
+	st_case_500:
+//line plugins/parsers/influx/machine.go:16959
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st500
+		case 11:
+			goto tr701
+		case 12:
+			goto st322
+		case 32:
+			goto st500
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto st7
+		case 92:
+			goto tr195
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr192
+tr701:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st501
+	st501:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof501
+		}
+	st_case_501:
+//line plugins/parsers/influx/machine.go:16993
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto st500
+		case 11:
+			goto tr701
+		case 12:
+			goto st322
+		case 32:
+			goto st500
+		case 34:
+			goto tr95
+		case 44:
+			goto st7
+		case 61:
+			goto tr197
+		case 92:
+			goto tr195
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr192
+tr703:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st502
+tr698:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st502
+	st502:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof502
+		}
+	st_case_502:
+//line plugins/parsers/influx/machine.go:17041
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr702
+		case 11:
+			goto tr703
+		case 12:
+			goto tr523
+		case 32:
+			goto tr702
+		case 34:
+			goto tr201
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto tr202
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr199
 	st503:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof503
@@ -17217,13 +17067,13 @@ tr687:
 	st_case_503:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17239,7 +17089,7 @@ tr687:
 				goto st504
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st504:
@@ -17249,13 +17099,13 @@ tr687:
 	st_case_504:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17271,7 +17121,7 @@ tr687:
 				goto st505
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st505:
@@ -17281,13 +17131,13 @@ tr687:
 	st_case_505:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17303,7 +17153,7 @@ tr687:
 				goto st506
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st506:
@@ -17313,13 +17163,13 @@ tr687:
 	st_case_506:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17335,7 +17185,7 @@ tr687:
 				goto st507
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st507:
@@ -17345,13 +17195,13 @@ tr687:
 	st_case_507:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17367,7 +17217,7 @@ tr687:
 				goto st508
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st508:
@@ -17377,13 +17227,13 @@ tr687:
 	st_case_508:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17399,7 +17249,7 @@ tr687:
 				goto st509
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st509:
@@ -17409,13 +17259,13 @@ tr687:
 	st_case_509:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17431,7 +17281,7 @@ tr687:
 				goto st510
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st510:
@@ -17441,13 +17291,13 @@ tr687:
 	st_case_510:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17463,7 +17313,7 @@ tr687:
 				goto st511
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st511:
@@ -17473,13 +17323,13 @@ tr687:
 	st_case_511:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17495,7 +17345,7 @@ tr687:
 				goto st512
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st512:
@@ -17505,13 +17355,13 @@ tr687:
 	st_case_512:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17527,7 +17377,7 @@ tr687:
 				goto st513
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st96
 	st513:
@@ -17537,13 +17387,237 @@ tr687:
 	st_case_513:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr686
+			goto tr697
 		case 11:
-			goto tr687
+			goto tr698
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr686
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st514
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st514:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof514
+		}
+	st_case_514:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st515
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st515:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof515
+		}
+	st_case_515:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st516
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st516:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof516
+		}
+	st_case_516:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st517
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st517:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof517
+		}
+	st_case_517:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st518
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st518:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof518
+		}
+	st_case_518:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st519
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st519:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof519
+		}
+	st_case_519:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
+		case 34:
+			goto tr205
+		case 44:
+			goto tr190
+		case 61:
+			goto tr197
+		case 92:
+			goto st105
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st520
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st96
+	st520:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof520
+		}
+	st_case_520:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr697
+		case 11:
+			goto tr698
+		case 12:
+			goto tr520
+		case 32:
+			goto tr697
 		case 34:
 			goto tr205
 		case 44:
@@ -17554,10 +17628,10 @@ tr687:
 			goto st105
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr351
+			goto tr362
 		}
 		goto st96
-tr657:
+tr668:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17567,7 +17641,7 @@ tr657:
 	m.pb = m.p
 
 	goto st140
-tr712:
+tr723:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17577,7 +17651,7 @@ tr712:
 	m.handler.AddFloat(key, m.text())
 
 	goto st140
-tr718:
+tr729:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17587,7 +17661,7 @@ tr718:
 	m.handler.AddInt(key, m.text())
 
 	goto st140
-tr722:
+tr733:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17597,7 +17671,7 @@ tr722:
 	m.handler.AddUint(key, m.text())
 
 	goto st140
-tr726:
+tr737:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -17612,7 +17686,7 @@ tr726:
 			goto _test_eof140
 		}
 	st_case_140:
-//line plugins/parsers/influx/machine.go:17616
+//line plugins/parsers/influx/machine.go:17690
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -17644,7 +17718,7 @@ tr277:
 			goto _test_eof141
 		}
 	st_case_141:
-//line plugins/parsers/influx/machine.go:17648
+//line plugins/parsers/influx/machine.go:17722
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -17680,7 +17754,7 @@ tr280:
 			goto _test_eof142
 		}
 	st_case_142:
-//line plugins/parsers/influx/machine.go:17684
+//line plugins/parsers/influx/machine.go:17758
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto st7
@@ -17731,7 +17805,7 @@ tr282:
 			goto _test_eof143
 		}
 	st_case_143:
-//line plugins/parsers/influx/machine.go:17735
+//line plugins/parsers/influx/machine.go:17809
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -17748,7 +17822,7 @@ tr282:
 		case 46:
 			goto st144
 		case 48:
-			goto st517
+			goto st524
 		case 61:
 			goto st7
 		case 92:
@@ -17757,7 +17831,7 @@ tr282:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st520
+				goto st527
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
@@ -17774,7 +17848,7 @@ tr283:
 			goto _test_eof144
 		}
 	st_case_144:
-//line plugins/parsers/influx/machine.go:17778
+//line plugins/parsers/influx/machine.go:17852
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr187
@@ -17796,30 +17870,30 @@ tr283:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st514
+				goto st521
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
 		}
 		goto st89
-	st514:
+	st521:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof514
+			goto _test_eof521
 		}
-	st_case_514:
+	st_case_521:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr710
+			goto tr721
 		case 11:
-			goto tr711
+			goto tr722
 		case 12:
-			goto tr555
+			goto tr566
 		case 32:
-			goto tr710
+			goto tr721
 		case 34:
 			goto tr189
 		case 44:
-			goto tr712
+			goto tr723
 		case 61:
 			goto st7
 		case 69:
@@ -17832,10 +17906,10 @@ tr283:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st514
+				goto st521
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
 		}
 		goto st89
 	st145:
@@ -17868,7 +17942,7 @@ tr283:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st516
+				goto st523
 			}
 		default:
 			goto st146
@@ -17879,24 +17953,24 @@ tr294:
 
 	m.handler.AddString(key, m.text())
 
-	goto st515
-	st515:
+	goto st522
+	st522:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof515
+			goto _test_eof522
 		}
-	st_case_515:
-//line plugins/parsers/influx/machine.go:17889
+	st_case_522:
+//line plugins/parsers/influx/machine.go:17963
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr554
+			goto tr565
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr503
+			goto tr514
 		case 44:
-			goto tr505
+			goto tr516
 		case 61:
 			goto tr207
 		case 92:
@@ -17905,10 +17979,10 @@ tr294:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st383
+				goto st390
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr503
+			goto tr514
 		}
 		goto st31
 	st146:
@@ -17937,304 +18011,34 @@ tr294:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st516
+				goto st523
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
 		}
 		goto st89
-	st516:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof516
-		}
-	st_case_516:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr710
-		case 11:
-			goto tr711
-		case 12:
-			goto tr555
-		case 32:
-			goto tr710
-		case 34:
-			goto tr189
-		case 44:
-			goto tr712
-		case 61:
-			goto st7
-		case 92:
-			goto st103
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st516
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st89
-	st517:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof517
-		}
-	st_case_517:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr710
-		case 11:
-			goto tr711
-		case 12:
-			goto tr555
-		case 32:
-			goto tr710
-		case 34:
-			goto tr189
-		case 44:
-			goto tr712
-		case 46:
-			goto st514
-		case 61:
-			goto st7
-		case 69:
-			goto st145
-		case 92:
-			goto st103
-		case 101:
-			goto st145
-		case 105:
-			goto st519
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st518
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st89
-	st518:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof518
-		}
-	st_case_518:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr710
-		case 11:
-			goto tr711
-		case 12:
-			goto tr555
-		case 32:
-			goto tr710
-		case 34:
-			goto tr189
-		case 44:
-			goto tr712
-		case 46:
-			goto st514
-		case 61:
-			goto st7
-		case 69:
-			goto st145
-		case 92:
-			goto st103
-		case 101:
-			goto st145
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st518
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st89
-	st519:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof519
-		}
-	st_case_519:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr716
-		case 11:
-			goto tr717
-		case 12:
-			goto tr561
-		case 32:
-			goto tr716
-		case 34:
-			goto tr189
-		case 44:
-			goto tr718
-		case 61:
-			goto st7
-		case 92:
-			goto st103
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr378
-		}
-		goto st89
-	st520:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof520
-		}
-	st_case_520:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr710
-		case 11:
-			goto tr711
-		case 12:
-			goto tr555
-		case 32:
-			goto tr710
-		case 34:
-			goto tr189
-		case 44:
-			goto tr712
-		case 46:
-			goto st514
-		case 61:
-			goto st7
-		case 69:
-			goto st145
-		case 92:
-			goto st103
-		case 101:
-			goto st145
-		case 105:
-			goto st519
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st520
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st89
-tr284:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st521
-	st521:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof521
-		}
-	st_case_521:
-//line plugins/parsers/influx/machine.go:18135
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr710
-		case 11:
-			goto tr711
-		case 12:
-			goto tr555
-		case 32:
-			goto tr710
-		case 34:
-			goto tr189
-		case 44:
-			goto tr712
-		case 46:
-			goto st514
-		case 61:
-			goto st7
-		case 69:
-			goto st145
-		case 92:
-			goto st103
-		case 101:
-			goto st145
-		case 105:
-			goto st519
-		case 117:
-			goto st522
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st518
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st89
-	st522:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof522
-		}
-	st_case_522:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr720
-		case 11:
-			goto tr721
-		case 12:
-			goto tr565
-		case 32:
-			goto tr720
-		case 34:
-			goto tr189
-		case 44:
-			goto tr722
-		case 61:
-			goto st7
-		case 92:
-			goto st103
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr382
-		}
-		goto st89
-tr285:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st523
 	st523:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof523
 		}
 	st_case_523:
-//line plugins/parsers/influx/machine.go:18211
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr710
+			goto tr721
 		case 11:
-			goto tr711
+			goto tr722
 		case 12:
-			goto tr555
+			goto tr566
 		case 32:
-			goto tr710
+			goto tr721
 		case 34:
 			goto tr189
 		case 44:
-			goto tr712
-		case 46:
-			goto st514
+			goto tr723
 		case 61:
 			goto st7
-		case 69:
-			goto st145
 		case 92:
 			goto st103
-		case 101:
-			goto st145
-		case 105:
-			goto st519
-		case 117:
-			goto st522
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -18242,7 +18046,277 @@ tr285:
 				goto st523
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
+		}
+		goto st89
+	st524:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof524
+		}
+	st_case_524:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr721
+		case 11:
+			goto tr722
+		case 12:
+			goto tr566
+		case 32:
+			goto tr721
+		case 34:
+			goto tr189
+		case 44:
+			goto tr723
+		case 46:
+			goto st521
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st526
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st525
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st89
+	st525:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof525
+		}
+	st_case_525:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr721
+		case 11:
+			goto tr722
+		case 12:
+			goto tr566
+		case 32:
+			goto tr721
+		case 34:
+			goto tr189
+		case 44:
+			goto tr723
+		case 46:
+			goto st521
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st525
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st89
+	st526:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof526
+		}
+	st_case_526:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr727
+		case 11:
+			goto tr728
+		case 12:
+			goto tr572
+		case 32:
+			goto tr727
+		case 34:
+			goto tr189
+		case 44:
+			goto tr729
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr389
+		}
+		goto st89
+	st527:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof527
+		}
+	st_case_527:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr721
+		case 11:
+			goto tr722
+		case 12:
+			goto tr566
+		case 32:
+			goto tr721
+		case 34:
+			goto tr189
+		case 44:
+			goto tr723
+		case 46:
+			goto st521
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st526
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st527
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st89
+tr284:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st528
+	st528:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof528
+		}
+	st_case_528:
+//line plugins/parsers/influx/machine.go:18209
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr721
+		case 11:
+			goto tr722
+		case 12:
+			goto tr566
+		case 32:
+			goto tr721
+		case 34:
+			goto tr189
+		case 44:
+			goto tr723
+		case 46:
+			goto st521
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st526
+		case 117:
+			goto st529
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st525
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st89
+	st529:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof529
+		}
+	st_case_529:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr731
+		case 11:
+			goto tr732
+		case 12:
+			goto tr576
+		case 32:
+			goto tr731
+		case 34:
+			goto tr189
+		case 44:
+			goto tr733
+		case 61:
+			goto st7
+		case 92:
+			goto st103
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr393
+		}
+		goto st89
+tr285:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st530
+	st530:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof530
+		}
+	st_case_530:
+//line plugins/parsers/influx/machine.go:18285
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr721
+		case 11:
+			goto tr722
+		case 12:
+			goto tr566
+		case 32:
+			goto tr721
+		case 34:
+			goto tr189
+		case 44:
+			goto tr723
+		case 46:
+			goto st521
+		case 61:
+			goto st7
+		case 69:
+			goto st145
+		case 92:
+			goto st103
+		case 101:
+			goto st145
+		case 105:
+			goto st526
+		case 117:
+			goto st529
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st530
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
 		}
 		goto st89
 tr286:
@@ -18250,26 +18324,26 @@ tr286:
 
 	m.pb = m.p
 
-	goto st524
-	st524:
+	goto st531
+	st531:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof524
+			goto _test_eof531
 		}
-	st_case_524:
-//line plugins/parsers/influx/machine.go:18260
+	st_case_531:
+//line plugins/parsers/influx/machine.go:18334
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr724
+			goto tr735
 		case 11:
-			goto tr725
+			goto tr736
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr724
+			goto tr735
 		case 34:
 			goto tr189
 		case 44:
-			goto tr726
+			goto tr737
 		case 61:
 			goto st7
 		case 65:
@@ -18280,7 +18354,7 @@ tr286:
 			goto st150
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st89
 	st147:
@@ -18362,7 +18436,7 @@ tr286:
 		case 61:
 			goto st7
 		case 69:
-			goto st525
+			goto st532
 		case 92:
 			goto st103
 		}
@@ -18370,31 +18444,31 @@ tr286:
 			goto tr61
 		}
 		goto st89
-	st525:
+	st532:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof525
+			goto _test_eof532
 		}
-	st_case_525:
+	st_case_532:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr724
+			goto tr735
 		case 11:
-			goto tr725
+			goto tr736
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr724
+			goto tr735
 		case 34:
 			goto tr189
 		case 44:
-			goto tr726
+			goto tr737
 		case 61:
 			goto st7
 		case 92:
 			goto st103
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st89
 	st150:
@@ -18478,7 +18552,7 @@ tr286:
 		case 92:
 			goto st103
 		case 101:
-			goto st525
+			goto st532
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr61
@@ -18489,26 +18563,26 @@ tr287:
 
 	m.pb = m.p
 
-	goto st526
-	st526:
+	goto st533
+	st533:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof526
+			goto _test_eof533
 		}
-	st_case_526:
-//line plugins/parsers/influx/machine.go:18499
+	st_case_533:
+//line plugins/parsers/influx/machine.go:18573
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr724
+			goto tr735
 		case 11:
-			goto tr725
+			goto tr736
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr724
+			goto tr735
 		case 34:
 			goto tr189
 		case 44:
-			goto tr726
+			goto tr737
 		case 61:
 			goto st7
 		case 82:
@@ -18519,7 +18593,7 @@ tr287:
 			goto st154
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st89
 	st153:
@@ -18585,26 +18659,26 @@ tr288:
 
 	m.pb = m.p
 
-	goto st527
-	st527:
+	goto st534
+	st534:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof527
+			goto _test_eof534
 		}
-	st_case_527:
-//line plugins/parsers/influx/machine.go:18595
+	st_case_534:
+//line plugins/parsers/influx/machine.go:18669
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr724
+			goto tr735
 		case 11:
-			goto tr725
+			goto tr736
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr724
+			goto tr735
 		case 34:
 			goto tr189
 		case 44:
-			goto tr726
+			goto tr737
 		case 61:
 			goto st7
 		case 92:
@@ -18613,7 +18687,7 @@ tr288:
 			goto st150
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st89
 tr289:
@@ -18621,26 +18695,26 @@ tr289:
 
 	m.pb = m.p
 
-	goto st528
-	st528:
+	goto st535
+	st535:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof528
+			goto _test_eof535
 		}
-	st_case_528:
-//line plugins/parsers/influx/machine.go:18631
+	st_case_535:
+//line plugins/parsers/influx/machine.go:18705
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr724
+			goto tr735
 		case 11:
-			goto tr725
+			goto tr736
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr724
+			goto tr735
 		case 34:
 			goto tr189
 		case 44:
-			goto tr726
+			goto tr737
 		case 61:
 			goto st7
 		case 92:
@@ -18649,7 +18723,7 @@ tr289:
 			goto st154
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st89
 tr278:
@@ -18663,7 +18737,7 @@ tr278:
 			goto _test_eof155
 		}
 	st_case_155:
-//line plugins/parsers/influx/machine.go:18667
+//line plugins/parsers/influx/machine.go:18741
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st141
@@ -18690,7 +18764,7 @@ tr267:
 			goto _test_eof156
 		}
 	st_case_156:
-//line plugins/parsers/influx/machine.go:18694
+//line plugins/parsers/influx/machine.go:18768
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -18707,7 +18781,7 @@ tr267:
 		case 46:
 			goto st157
 		case 48:
-			goto st553
+			goto st560
 		case 61:
 			goto st7
 		case 92:
@@ -18716,7 +18790,7 @@ tr267:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st556
+				goto st563
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
@@ -18733,7 +18807,7 @@ tr268:
 			goto _test_eof157
 		}
 	st_case_157:
-//line plugins/parsers/influx/machine.go:18737
+//line plugins/parsers/influx/machine.go:18811
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -18755,30 +18829,30 @@ tr268:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st529
+				goto st536
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
 		}
 		goto st122
-	st529:
+	st536:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof529
+			goto _test_eof536
 		}
-	st_case_529:
+	st_case_536:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr731
+			goto tr742
 		case 11:
-			goto tr732
+			goto tr743
 		case 12:
-			goto tr555
+			goto tr566
 		case 32:
-			goto tr731
+			goto tr742
 		case 34:
 			goto tr189
 		case 44:
-			goto tr733
+			goto tr744
 		case 61:
 			goto st7
 		case 69:
@@ -18791,13 +18865,13 @@ tr268:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st529
+				goto st536
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
 		}
 		goto st122
-tr732:
+tr743:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18806,8 +18880,8 @@ tr732:
 
 	m.handler.AddFloat(key, m.text())
 
-	goto st530
-tr764:
+	goto st537
+tr775:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18816,8 +18890,8 @@ tr764:
 
 	m.handler.AddInt(key, m.text())
 
-	goto st530
-tr768:
+	goto st537
+tr779:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18826,8 +18900,8 @@ tr768:
 
 	m.handler.AddUint(key, m.text())
 
-	goto st530
-tr772:
+	goto st537
+tr783:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18836,28 +18910,28 @@ tr772:
 
 	m.handler.AddBool(key, m.text())
 
-	goto st530
-	st530:
+	goto st537
+	st537:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof530
+			goto _test_eof537
 		}
-	st_case_530:
-//line plugins/parsers/influx/machine.go:18846
+	st_case_537:
+//line plugins/parsers/influx/machine.go:18920
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr735
+			goto tr746
 		case 11:
-			goto tr736
+			goto tr747
 		case 12:
-			goto tr503
+			goto tr514
 		case 32:
-			goto tr735
+			goto tr746
 		case 34:
 			goto tr201
 		case 44:
 			goto tr239
 		case 45:
-			goto tr737
+			goto tr748
 		case 61:
 			goto st7
 		case 92:
@@ -18866,13 +18940,13 @@ tr772:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr738
+				goto tr749
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr241
-tr736:
+tr747:
 //line plugins/parsers/influx/machine.go.rl:80
 
 	m.handler.AddTag(key, m.text())
@@ -18881,28 +18955,28 @@ tr736:
 
 	m.pb = m.p
 
-	goto st531
-	st531:
+	goto st538
+	st538:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof531
+			goto _test_eof538
 		}
-	st_case_531:
-//line plugins/parsers/influx/machine.go:18891
+	st_case_538:
+//line plugins/parsers/influx/machine.go:18965
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr735
+			goto tr746
 		case 11:
-			goto tr736
+			goto tr747
 		case 12:
-			goto tr503
+			goto tr514
 		case 32:
-			goto tr735
+			goto tr746
 		case 34:
 			goto tr201
 		case 44:
 			goto tr239
 		case 45:
-			goto tr737
+			goto tr748
 		case 61:
 			goto tr99
 		case 92:
@@ -18911,13 +18985,13 @@ tr736:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto tr738
+				goto tr749
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr346
+			goto tr357
 		}
 		goto tr241
-tr737:
+tr748:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
@@ -18928,7 +19002,7 @@ tr737:
 			goto _test_eof158
 		}
 	st_case_158:
-//line plugins/parsers/influx/machine.go:18932
+//line plugins/parsers/influx/machine.go:19006
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr237
@@ -18950,305 +19024,33 @@ tr737:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st532
+				goto st539
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr207
 		}
 		goto st124
-tr738:
+tr749:
 //line plugins/parsers/influx/machine.go.rl:18
 
 	m.pb = m.p
 
-	goto st532
-	st532:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof532
-		}
-	st_case_532:
-//line plugins/parsers/influx/machine.go:18971
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st534
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-tr743:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st533
-tr740:
-//line plugins/parsers/influx/machine.go.rl:80
-
-	m.handler.AddTag(key, m.text())
-
-//line plugins/parsers/influx/machine.go.rl:108
-
-	m.handler.SetTimestamp(m.text())
-
-	goto st533
-	st533:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof533
-		}
-	st_case_533:
-//line plugins/parsers/influx/machine.go:19024
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr742
-		case 11:
-			goto tr743
-		case 12:
-			goto tr512
-		case 32:
-			goto tr742
-		case 34:
-			goto tr201
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto tr243
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr346
-		}
-		goto tr241
-	st534:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof534
-		}
-	st_case_534:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st535
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-	st535:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof535
-		}
-	st_case_535:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st536
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-	st536:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof536
-		}
-	st_case_536:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st537
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-	st537:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof537
-		}
-	st_case_537:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st538
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-	st538:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof538
-		}
-	st_case_538:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st539
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
+	goto st539
 	st539:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof539
 		}
 	st_case_539:
+//line plugins/parsers/influx/machine.go:19045
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
-		case 34:
-			goto tr205
-		case 44:
-			goto tr239
-		case 61:
-			goto tr99
-		case 92:
-			goto st126
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st540
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr351
-		}
-		goto st124
-	st540:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof540
-		}
-	st_case_540:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr739
-		case 11:
-			goto tr740
-		case 12:
-			goto tr509
-		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19264,9 +19066,57 @@ tr740:
 				goto st541
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
+tr754:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st540
+tr751:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:108
+
+	m.handler.SetTimestamp(m.text())
+
+	goto st540
+	st540:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof540
+		}
+	st_case_540:
+//line plugins/parsers/influx/machine.go:19098
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr753
+		case 11:
+			goto tr754
+		case 12:
+			goto tr523
+		case 32:
+			goto tr753
+		case 34:
+			goto tr201
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto tr243
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr357
+		}
+		goto tr241
 	st541:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof541
@@ -19274,13 +19124,13 @@ tr740:
 	st_case_541:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19296,7 +19146,7 @@ tr740:
 				goto st542
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st542:
@@ -19306,13 +19156,13 @@ tr740:
 	st_case_542:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19328,7 +19178,7 @@ tr740:
 				goto st543
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st543:
@@ -19338,13 +19188,13 @@ tr740:
 	st_case_543:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19360,7 +19210,7 @@ tr740:
 				goto st544
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st544:
@@ -19370,13 +19220,13 @@ tr740:
 	st_case_544:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19392,7 +19242,7 @@ tr740:
 				goto st545
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st545:
@@ -19402,13 +19252,13 @@ tr740:
 	st_case_545:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19424,7 +19274,7 @@ tr740:
 				goto st546
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st546:
@@ -19434,13 +19284,13 @@ tr740:
 	st_case_546:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19456,7 +19306,7 @@ tr740:
 				goto st547
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st547:
@@ -19466,13 +19316,13 @@ tr740:
 	st_case_547:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19488,7 +19338,7 @@ tr740:
 				goto st548
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st548:
@@ -19498,13 +19348,13 @@ tr740:
 	st_case_548:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19520,7 +19370,7 @@ tr740:
 				goto st549
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st549:
@@ -19530,13 +19380,13 @@ tr740:
 	st_case_549:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19552,7 +19402,7 @@ tr740:
 				goto st550
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st550:
@@ -19562,13 +19412,13 @@ tr740:
 	st_case_550:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19584,7 +19434,7 @@ tr740:
 				goto st551
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st551:
@@ -19594,13 +19444,237 @@ tr740:
 	st_case_551:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr739
+			goto tr750
 		case 11:
-			goto tr740
+			goto tr751
 		case 12:
-			goto tr509
+			goto tr520
 		case 32:
-			goto tr739
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st552
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st552:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof552
+		}
+	st_case_552:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st553
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st553:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof553
+		}
+	st_case_553:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st554
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st554:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof554
+		}
+	st_case_554:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st555
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st555:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof555
+		}
+	st_case_555:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st556
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st556:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof556
+		}
+	st_case_556:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st557
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st557:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof557
+		}
+	st_case_557:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
+		case 34:
+			goto tr205
+		case 44:
+			goto tr239
+		case 61:
+			goto tr99
+		case 92:
+			goto st126
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st558
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr362
+		}
+		goto st124
+	st558:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof558
+		}
+	st_case_558:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr750
+		case 11:
+			goto tr751
+		case 12:
+			goto tr520
+		case 32:
+			goto tr750
 		case 34:
 			goto tr205
 		case 44:
@@ -19611,7 +19685,7 @@ tr740:
 			goto st126
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr351
+			goto tr362
 		}
 		goto st124
 	st159:
@@ -19644,7 +19718,7 @@ tr740:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st552
+				goto st559
 			}
 		default:
 			goto st160
@@ -19676,304 +19750,34 @@ tr740:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st552
+				goto st559
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr61
 		}
 		goto st122
-	st552:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof552
-		}
-	st_case_552:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr731
-		case 11:
-			goto tr732
-		case 12:
-			goto tr555
-		case 32:
-			goto tr731
-		case 34:
-			goto tr189
-		case 44:
-			goto tr733
-		case 61:
-			goto st7
-		case 92:
-			goto st127
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st552
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st122
-	st553:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof553
-		}
-	st_case_553:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr731
-		case 11:
-			goto tr732
-		case 12:
-			goto tr555
-		case 32:
-			goto tr731
-		case 34:
-			goto tr189
-		case 44:
-			goto tr733
-		case 46:
-			goto st529
-		case 61:
-			goto st7
-		case 69:
-			goto st159
-		case 92:
-			goto st127
-		case 101:
-			goto st159
-		case 105:
-			goto st555
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st122
-	st554:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof554
-		}
-	st_case_554:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr731
-		case 11:
-			goto tr732
-		case 12:
-			goto tr555
-		case 32:
-			goto tr731
-		case 34:
-			goto tr189
-		case 44:
-			goto tr733
-		case 46:
-			goto st529
-		case 61:
-			goto st7
-		case 69:
-			goto st159
-		case 92:
-			goto st127
-		case 101:
-			goto st159
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st122
-	st555:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof555
-		}
-	st_case_555:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr763
-		case 11:
-			goto tr764
-		case 12:
-			goto tr561
-		case 32:
-			goto tr763
-		case 34:
-			goto tr189
-		case 44:
-			goto tr765
-		case 61:
-			goto st7
-		case 92:
-			goto st127
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr378
-		}
-		goto st122
-	st556:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof556
-		}
-	st_case_556:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr731
-		case 11:
-			goto tr732
-		case 12:
-			goto tr555
-		case 32:
-			goto tr731
-		case 34:
-			goto tr189
-		case 44:
-			goto tr733
-		case 46:
-			goto st529
-		case 61:
-			goto st7
-		case 69:
-			goto st159
-		case 92:
-			goto st127
-		case 101:
-			goto st159
-		case 105:
-			goto st555
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st556
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st122
-tr269:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st557
-	st557:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof557
-		}
-	st_case_557:
-//line plugins/parsers/influx/machine.go:19874
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr731
-		case 11:
-			goto tr732
-		case 12:
-			goto tr555
-		case 32:
-			goto tr731
-		case 34:
-			goto tr189
-		case 44:
-			goto tr733
-		case 46:
-			goto st529
-		case 61:
-			goto st7
-		case 69:
-			goto st159
-		case 92:
-			goto st127
-		case 101:
-			goto st159
-		case 105:
-			goto st555
-		case 117:
-			goto st558
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st554
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st122
-	st558:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof558
-		}
-	st_case_558:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr767
-		case 11:
-			goto tr768
-		case 12:
-			goto tr565
-		case 32:
-			goto tr767
-		case 34:
-			goto tr189
-		case 44:
-			goto tr769
-		case 61:
-			goto st7
-		case 92:
-			goto st127
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr382
-		}
-		goto st122
-tr270:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st559
 	st559:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof559
 		}
 	st_case_559:
-//line plugins/parsers/influx/machine.go:19950
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr731
+			goto tr742
 		case 11:
-			goto tr732
+			goto tr743
 		case 12:
-			goto tr555
+			goto tr566
 		case 32:
-			goto tr731
+			goto tr742
 		case 34:
 			goto tr189
 		case 44:
-			goto tr733
-		case 46:
-			goto st529
+			goto tr744
 		case 61:
 			goto st7
-		case 69:
-			goto st159
 		case 92:
 			goto st127
-		case 101:
-			goto st159
-		case 105:
-			goto st555
-		case 117:
-			goto st558
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -19981,7 +19785,277 @@ tr270:
 				goto st559
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
+		}
+		goto st122
+	st560:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof560
+		}
+	st_case_560:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr566
+		case 32:
+			goto tr742
+		case 34:
+			goto tr189
+		case 44:
+			goto tr744
+		case 46:
+			goto st536
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st562
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st561
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st122
+	st561:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof561
+		}
+	st_case_561:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr566
+		case 32:
+			goto tr742
+		case 34:
+			goto tr189
+		case 44:
+			goto tr744
+		case 46:
+			goto st536
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st561
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st122
+	st562:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof562
+		}
+	st_case_562:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr774
+		case 11:
+			goto tr775
+		case 12:
+			goto tr572
+		case 32:
+			goto tr774
+		case 34:
+			goto tr189
+		case 44:
+			goto tr776
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr389
+		}
+		goto st122
+	st563:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof563
+		}
+	st_case_563:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr566
+		case 32:
+			goto tr742
+		case 34:
+			goto tr189
+		case 44:
+			goto tr744
+		case 46:
+			goto st536
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st562
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st563
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st122
+tr269:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st564
+	st564:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof564
+		}
+	st_case_564:
+//line plugins/parsers/influx/machine.go:19948
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr566
+		case 32:
+			goto tr742
+		case 34:
+			goto tr189
+		case 44:
+			goto tr744
+		case 46:
+			goto st536
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st562
+		case 117:
+			goto st565
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st561
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st122
+	st565:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof565
+		}
+	st_case_565:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr778
+		case 11:
+			goto tr779
+		case 12:
+			goto tr576
+		case 32:
+			goto tr778
+		case 34:
+			goto tr189
+		case 44:
+			goto tr780
+		case 61:
+			goto st7
+		case 92:
+			goto st127
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr393
+		}
+		goto st122
+tr270:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st566
+	st566:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof566
+		}
+	st_case_566:
+//line plugins/parsers/influx/machine.go:20024
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr742
+		case 11:
+			goto tr743
+		case 12:
+			goto tr566
+		case 32:
+			goto tr742
+		case 34:
+			goto tr189
+		case 44:
+			goto tr744
+		case 46:
+			goto st536
+		case 61:
+			goto st7
+		case 69:
+			goto st159
+		case 92:
+			goto st127
+		case 101:
+			goto st159
+		case 105:
+			goto st562
+		case 117:
+			goto st565
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st566
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
 		}
 		goto st122
 tr271:
@@ -19989,26 +20063,26 @@ tr271:
 
 	m.pb = m.p
 
-	goto st560
-	st560:
+	goto st567
+	st567:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof560
+			goto _test_eof567
 		}
-	st_case_560:
-//line plugins/parsers/influx/machine.go:19999
+	st_case_567:
+//line plugins/parsers/influx/machine.go:20073
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr782
 		case 11:
-			goto tr772
+			goto tr783
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr771
+			goto tr782
 		case 34:
 			goto tr189
 		case 44:
-			goto tr773
+			goto tr784
 		case 61:
 			goto st7
 		case 65:
@@ -20019,7 +20093,7 @@ tr271:
 			goto st164
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st122
 	st161:
@@ -20101,7 +20175,7 @@ tr271:
 		case 61:
 			goto st7
 		case 69:
-			goto st561
+			goto st568
 		case 92:
 			goto st127
 		}
@@ -20109,31 +20183,31 @@ tr271:
 			goto tr61
 		}
 		goto st122
-	st561:
+	st568:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof561
+			goto _test_eof568
 		}
-	st_case_561:
+	st_case_568:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr782
 		case 11:
-			goto tr772
+			goto tr783
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr771
+			goto tr782
 		case 34:
 			goto tr189
 		case 44:
-			goto tr773
+			goto tr784
 		case 61:
 			goto st7
 		case 92:
 			goto st127
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st122
 	st164:
@@ -20217,7 +20291,7 @@ tr271:
 		case 92:
 			goto st127
 		case 101:
-			goto st561
+			goto st568
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr61
@@ -20228,26 +20302,26 @@ tr272:
 
 	m.pb = m.p
 
-	goto st562
-	st562:
+	goto st569
+	st569:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof562
+			goto _test_eof569
 		}
-	st_case_562:
-//line plugins/parsers/influx/machine.go:20238
+	st_case_569:
+//line plugins/parsers/influx/machine.go:20312
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr782
 		case 11:
-			goto tr772
+			goto tr783
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr771
+			goto tr782
 		case 34:
 			goto tr189
 		case 44:
-			goto tr773
+			goto tr784
 		case 61:
 			goto st7
 		case 82:
@@ -20258,7 +20332,7 @@ tr272:
 			goto st168
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st122
 	st167:
@@ -20324,26 +20398,26 @@ tr273:
 
 	m.pb = m.p
 
-	goto st563
-	st563:
+	goto st570
+	st570:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof563
+			goto _test_eof570
 		}
-	st_case_563:
-//line plugins/parsers/influx/machine.go:20334
+	st_case_570:
+//line plugins/parsers/influx/machine.go:20408
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr782
 		case 11:
-			goto tr772
+			goto tr783
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr771
+			goto tr782
 		case 34:
 			goto tr189
 		case 44:
-			goto tr773
+			goto tr784
 		case 61:
 			goto st7
 		case 92:
@@ -20352,7 +20426,7 @@ tr273:
 			goto st164
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st122
 tr274:
@@ -20360,26 +20434,26 @@ tr274:
 
 	m.pb = m.p
 
-	goto st564
-	st564:
+	goto st571
+	st571:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof564
+			goto _test_eof571
 		}
-	st_case_564:
-//line plugins/parsers/influx/machine.go:20370
+	st_case_571:
+//line plugins/parsers/influx/machine.go:20444
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr771
+			goto tr782
 		case 11:
-			goto tr772
+			goto tr783
 		case 12:
-			goto tr569
+			goto tr580
 		case 32:
-			goto tr771
+			goto tr782
 		case 34:
 			goto tr189
 		case 44:
-			goto tr773
+			goto tr784
 		case 61:
 			goto st7
 		case 92:
@@ -20388,7 +20462,7 @@ tr274:
 			goto st168
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st122
 tr260:
@@ -20402,7 +20476,7 @@ tr260:
 			goto _test_eof169
 		}
 	st_case_169:
-//line plugins/parsers/influx/machine.go:20406
+//line plugins/parsers/influx/machine.go:20480
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st135
@@ -20429,7 +20503,7 @@ tr85:
 			goto _test_eof170
 		}
 	st_case_170:
-//line plugins/parsers/influx/machine.go:20433
+//line plugins/parsers/influx/machine.go:20507
 		switch ( m.data)[( m.p)] {
 		case 34:
 			goto st40
@@ -20456,7 +20530,7 @@ tr248:
 			goto _test_eof171
 		}
 	st_case_171:
-//line plugins/parsers/influx/machine.go:20460
+//line plugins/parsers/influx/machine.go:20534
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -20473,14 +20547,14 @@ tr248:
 		case 46:
 			goto st172
 		case 48:
-			goto st569
+			goto st576
 		case 92:
 			goto st170
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st572
+				goto st579
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr5
@@ -20497,7 +20571,7 @@ tr249:
 			goto _test_eof172
 		}
 	st_case_172:
-//line plugins/parsers/influx/machine.go:20501
+//line plugins/parsers/influx/machine.go:20575
 		switch ( m.data)[( m.p)] {
 		case 9:
 			goto tr87
@@ -20517,30 +20591,30 @@ tr249:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st565
+				goto st572
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr5
 		}
 		goto st40
-	st565:
+	st572:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof565
+			goto _test_eof572
 		}
-	st_case_565:
+	st_case_572:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr778
+			goto tr789
 		case 11:
-			goto tr779
+			goto tr790
 		case 12:
-			goto tr780
+			goto tr791
 		case 32:
-			goto tr778
+			goto tr789
 		case 34:
 			goto tr89
 		case 44:
-			goto tr781
+			goto tr792
 		case 69:
 			goto st173
 		case 92:
@@ -20551,10 +20625,10 @@ tr249:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st565
+				goto st572
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
 		}
 		goto st40
 	st173:
@@ -20585,7 +20659,7 @@ tr249:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st568
+				goto st575
 			}
 		default:
 			goto st174
@@ -20596,62 +20670,62 @@ tr318:
 
 	m.handler.AddString(key, m.text())
 
-	goto st566
-	st566:
+	goto st573
+	st573:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof566
+			goto _test_eof573
 		}
-	st_case_566:
-//line plugins/parsers/influx/machine.go:20606
+	st_case_573:
+//line plugins/parsers/influx/machine.go:20680
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr346
+			goto tr357
 		case 11:
-			goto tr631
+			goto tr642
 		case 13:
-			goto tr346
+			goto tr357
 		case 32:
-			goto tr471
+			goto tr482
 		case 44:
-			goto tr473
+			goto tr484
 		case 92:
 			goto st133
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st567
+				goto st574
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr471
+			goto tr482
 		}
 		goto st2
-	st567:
+	st574:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof567
+			goto _test_eof574
 		}
-	st_case_567:
+	st_case_574:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 92:
 			goto st133
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st567
+				goto st574
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
 	st174:
@@ -20678,288 +20752,32 @@ tr318:
 		switch {
 		case ( m.data)[( m.p)] > 13:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st568
+				goto st575
 			}
 		case ( m.data)[( m.p)] >= 10:
 			goto tr5
 		}
 		goto st40
-	st568:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof568
-		}
-	st_case_568:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr778
-		case 11:
-			goto tr779
-		case 12:
-			goto tr780
-		case 32:
-			goto tr778
-		case 34:
-			goto tr89
-		case 44:
-			goto tr781
-		case 92:
-			goto st170
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st568
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st40
-	st569:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof569
-		}
-	st_case_569:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr778
-		case 11:
-			goto tr779
-		case 12:
-			goto tr780
-		case 32:
-			goto tr778
-		case 34:
-			goto tr89
-		case 44:
-			goto tr781
-		case 46:
-			goto st565
-		case 69:
-			goto st173
-		case 92:
-			goto st170
-		case 101:
-			goto st173
-		case 105:
-			goto st571
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st570
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st40
-	st570:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof570
-		}
-	st_case_570:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr778
-		case 11:
-			goto tr779
-		case 12:
-			goto tr780
-		case 32:
-			goto tr778
-		case 34:
-			goto tr89
-		case 44:
-			goto tr781
-		case 46:
-			goto st565
-		case 69:
-			goto st173
-		case 92:
-			goto st170
-		case 101:
-			goto st173
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st570
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st40
-	st571:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof571
-		}
-	st_case_571:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr787
-		case 11:
-			goto tr788
-		case 12:
-			goto tr789
-		case 32:
-			goto tr787
-		case 34:
-			goto tr89
-		case 44:
-			goto tr790
-		case 92:
-			goto st170
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr378
-		}
-		goto st40
-	st572:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof572
-		}
-	st_case_572:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr778
-		case 11:
-			goto tr779
-		case 12:
-			goto tr780
-		case 32:
-			goto tr778
-		case 34:
-			goto tr89
-		case 44:
-			goto tr781
-		case 46:
-			goto st565
-		case 69:
-			goto st173
-		case 92:
-			goto st170
-		case 101:
-			goto st173
-		case 105:
-			goto st571
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st572
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st40
-tr250:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st573
-	st573:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof573
-		}
-	st_case_573:
-//line plugins/parsers/influx/machine.go:20866
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr778
-		case 11:
-			goto tr779
-		case 12:
-			goto tr780
-		case 32:
-			goto tr778
-		case 34:
-			goto tr89
-		case 44:
-			goto tr781
-		case 46:
-			goto st565
-		case 69:
-			goto st173
-		case 92:
-			goto st170
-		case 101:
-			goto st173
-		case 105:
-			goto st571
-		case 117:
-			goto st574
-		}
-		switch {
-		case ( m.data)[( m.p)] > 13:
-			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st570
-			}
-		case ( m.data)[( m.p)] >= 10:
-			goto tr372
-		}
-		goto st40
-	st574:
-		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof574
-		}
-	st_case_574:
-		switch ( m.data)[( m.p)] {
-		case 9:
-			goto tr792
-		case 11:
-			goto tr793
-		case 12:
-			goto tr794
-		case 32:
-			goto tr792
-		case 34:
-			goto tr89
-		case 44:
-			goto tr795
-		case 92:
-			goto st170
-		}
-		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr382
-		}
-		goto st40
-tr251:
-//line plugins/parsers/influx/machine.go.rl:18
-
-	m.pb = m.p
-
-	goto st575
 	st575:
 		if ( m.p)++; ( m.p) == ( m.pe) {
 			goto _test_eof575
 		}
 	st_case_575:
-//line plugins/parsers/influx/machine.go:20938
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr778
+			goto tr789
 		case 11:
-			goto tr779
+			goto tr790
 		case 12:
-			goto tr780
+			goto tr791
 		case 32:
-			goto tr778
+			goto tr789
 		case 34:
 			goto tr89
 		case 44:
-			goto tr781
-		case 46:
-			goto st565
-		case 69:
-			goto st173
+			goto tr792
 		case 92:
 			goto st170
-		case 101:
-			goto st173
-		case 105:
-			goto st571
-		case 117:
-			goto st574
 		}
 		switch {
 		case ( m.data)[( m.p)] > 13:
@@ -20967,7 +20785,263 @@ tr251:
 				goto st575
 			}
 		case ( m.data)[( m.p)] >= 10:
-			goto tr372
+			goto tr383
+		}
+		goto st40
+	st576:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof576
+		}
+	st_case_576:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr789
+		case 11:
+			goto tr790
+		case 12:
+			goto tr791
+		case 32:
+			goto tr789
+		case 34:
+			goto tr89
+		case 44:
+			goto tr792
+		case 46:
+			goto st572
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st578
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st577
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st40
+	st577:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof577
+		}
+	st_case_577:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr789
+		case 11:
+			goto tr790
+		case 12:
+			goto tr791
+		case 32:
+			goto tr789
+		case 34:
+			goto tr89
+		case 44:
+			goto tr792
+		case 46:
+			goto st572
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st577
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st40
+	st578:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof578
+		}
+	st_case_578:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr798
+		case 11:
+			goto tr799
+		case 12:
+			goto tr800
+		case 32:
+			goto tr798
+		case 34:
+			goto tr89
+		case 44:
+			goto tr801
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr389
+		}
+		goto st40
+	st579:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof579
+		}
+	st_case_579:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr789
+		case 11:
+			goto tr790
+		case 12:
+			goto tr791
+		case 32:
+			goto tr789
+		case 34:
+			goto tr89
+		case 44:
+			goto tr792
+		case 46:
+			goto st572
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st578
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st579
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st40
+tr250:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st580
+	st580:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof580
+		}
+	st_case_580:
+//line plugins/parsers/influx/machine.go:20940
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr789
+		case 11:
+			goto tr790
+		case 12:
+			goto tr791
+		case 32:
+			goto tr789
+		case 34:
+			goto tr89
+		case 44:
+			goto tr792
+		case 46:
+			goto st572
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st578
+		case 117:
+			goto st581
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st577
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
+		}
+		goto st40
+	st581:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof581
+		}
+	st_case_581:
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr803
+		case 11:
+			goto tr804
+		case 12:
+			goto tr805
+		case 32:
+			goto tr803
+		case 34:
+			goto tr89
+		case 44:
+			goto tr806
+		case 92:
+			goto st170
+		}
+		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+			goto tr393
+		}
+		goto st40
+tr251:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st582
+	st582:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof582
+		}
+	st_case_582:
+//line plugins/parsers/influx/machine.go:21012
+		switch ( m.data)[( m.p)] {
+		case 9:
+			goto tr789
+		case 11:
+			goto tr790
+		case 12:
+			goto tr791
+		case 32:
+			goto tr789
+		case 34:
+			goto tr89
+		case 44:
+			goto tr792
+		case 46:
+			goto st572
+		case 69:
+			goto st173
+		case 92:
+			goto st170
+		case 101:
+			goto st173
+		case 105:
+			goto st578
+		case 117:
+			goto st581
+		}
+		switch {
+		case ( m.data)[( m.p)] > 13:
+			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
+				goto st582
+			}
+		case ( m.data)[( m.p)] >= 10:
+			goto tr383
 		}
 		goto st40
 tr252:
@@ -20975,26 +21049,26 @@ tr252:
 
 	m.pb = m.p
 
-	goto st576
-	st576:
+	goto st583
+	st583:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof576
+			goto _test_eof583
 		}
-	st_case_576:
-//line plugins/parsers/influx/machine.go:20985
+	st_case_583:
+//line plugins/parsers/influx/machine.go:21059
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr797
+			goto tr808
 		case 11:
-			goto tr798
+			goto tr809
 		case 12:
-			goto tr799
+			goto tr810
 		case 32:
-			goto tr797
+			goto tr808
 		case 34:
 			goto tr89
 		case 44:
-			goto tr800
+			goto tr811
 		case 65:
 			goto st175
 		case 92:
@@ -21003,7 +21077,7 @@ tr252:
 			goto st178
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st40
 	st175:
@@ -21079,7 +21153,7 @@ tr252:
 		case 44:
 			goto tr90
 		case 69:
-			goto st577
+			goto st584
 		case 92:
 			goto st170
 		}
@@ -21087,29 +21161,29 @@ tr252:
 			goto tr5
 		}
 		goto st40
-	st577:
+	st584:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof577
+			goto _test_eof584
 		}
-	st_case_577:
+	st_case_584:
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr797
+			goto tr808
 		case 11:
-			goto tr798
+			goto tr809
 		case 12:
-			goto tr799
+			goto tr810
 		case 32:
-			goto tr797
+			goto tr808
 		case 34:
 			goto tr89
 		case 44:
-			goto tr800
+			goto tr811
 		case 92:
 			goto st170
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st40
 	st178:
@@ -21187,7 +21261,7 @@ tr252:
 		case 92:
 			goto st170
 		case 101:
-			goto st577
+			goto st584
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
 			goto tr5
@@ -21198,26 +21272,26 @@ tr253:
 
 	m.pb = m.p
 
-	goto st578
-	st578:
+	goto st585
+	st585:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof578
+			goto _test_eof585
 		}
-	st_case_578:
-//line plugins/parsers/influx/machine.go:21208
+	st_case_585:
+//line plugins/parsers/influx/machine.go:21282
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr797
+			goto tr808
 		case 11:
-			goto tr798
+			goto tr809
 		case 12:
-			goto tr799
+			goto tr810
 		case 32:
-			goto tr797
+			goto tr808
 		case 34:
 			goto tr89
 		case 44:
-			goto tr800
+			goto tr811
 		case 82:
 			goto st181
 		case 92:
@@ -21226,7 +21300,7 @@ tr253:
 			goto st182
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st40
 	st181:
@@ -21288,33 +21362,33 @@ tr254:
 
 	m.pb = m.p
 
-	goto st579
-	st579:
+	goto st586
+	st586:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof579
+			goto _test_eof586
 		}
-	st_case_579:
-//line plugins/parsers/influx/machine.go:21298
+	st_case_586:
+//line plugins/parsers/influx/machine.go:21372
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr797
+			goto tr808
 		case 11:
-			goto tr798
+			goto tr809
 		case 12:
-			goto tr799
+			goto tr810
 		case 32:
-			goto tr797
+			goto tr808
 		case 34:
 			goto tr89
 		case 44:
-			goto tr800
+			goto tr811
 		case 92:
 			goto st170
 		case 97:
 			goto st178
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st40
 tr255:
@@ -21322,33 +21396,33 @@ tr255:
 
 	m.pb = m.p
 
-	goto st580
-	st580:
+	goto st587
+	st587:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof580
+			goto _test_eof587
 		}
-	st_case_580:
-//line plugins/parsers/influx/machine.go:21332
+	st_case_587:
+//line plugins/parsers/influx/machine.go:21406
 		switch ( m.data)[( m.p)] {
 		case 9:
-			goto tr797
+			goto tr808
 		case 11:
-			goto tr798
+			goto tr809
 		case 12:
-			goto tr799
+			goto tr810
 		case 32:
-			goto tr797
+			goto tr808
 		case 34:
 			goto tr89
 		case 44:
-			goto tr800
+			goto tr811
 		case 92:
 			goto st170
 		case 114:
 			goto st182
 		}
 		if 10 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
-			goto tr386
+			goto tr397
 		}
 		goto st40
 tr72:
@@ -21362,7 +21436,7 @@ tr72:
 			goto _test_eof183
 		}
 	st_case_183:
-//line plugins/parsers/influx/machine.go:21366
+//line plugins/parsers/influx/machine.go:21440
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -21377,14 +21451,14 @@ tr72:
 		case 46:
 			goto st184
 		case 48:
-			goto st582
+			goto st589
 		case 92:
 			goto st133
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st585
+				goto st592
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
@@ -21401,7 +21475,7 @@ tr73:
 			goto _test_eof184
 		}
 	st_case_184:
-//line plugins/parsers/influx/machine.go:21405
+//line plugins/parsers/influx/machine.go:21479
 		switch ( m.data)[( m.p)] {
 		case 10:
 			goto tr5
@@ -21419,28 +21493,28 @@ tr73:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st581
+				goto st588
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-	st581:
+	st588:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof581
+			goto _test_eof588
 		}
-	st_case_581:
+	st_case_588:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 69:
 			goto st185
 		case 92:
@@ -21451,10 +21525,10 @@ tr73:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st581
+				goto st588
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
 	st185:
@@ -21485,7 +21559,7 @@ tr73:
 			}
 		case ( m.data)[( m.p)] > 45:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st567
+				goto st574
 			}
 		default:
 			goto st186
@@ -21513,30 +21587,30 @@ tr73:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st567
+				goto st574
 			}
 		case ( m.data)[( m.p)] >= 9:
 			goto tr4
 		}
 		goto st2
-	st582:
+	st589:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof582
+			goto _test_eof589
 		}
-	st_case_582:
+	st_case_589:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 46:
-			goto st581
+			goto st588
 		case 69:
 			goto st185
 		case 92:
@@ -21544,35 +21618,35 @@ tr73:
 		case 101:
 			goto st185
 		case 105:
-			goto st584
+			goto st591
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st583
+				goto st590
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
-	st583:
+	st590:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof583
+			goto _test_eof590
 		}
-	st_case_583:
+	st_case_590:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 46:
-			goto st581
+			goto st588
 		case 69:
 			goto st185
 		case 92:
@@ -21583,53 +21657,53 @@ tr73:
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st583
+				goto st590
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
-	st584:
+	st591:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof584
+			goto _test_eof591
 		}
-	st_case_584:
+	st_case_591:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr378
+			goto tr389
 		case 11:
-			goto tr808
+			goto tr819
 		case 13:
-			goto tr378
+			goto tr389
 		case 32:
-			goto tr789
+			goto tr800
 		case 44:
-			goto tr809
+			goto tr820
 		case 92:
 			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr789
+			goto tr800
 		}
 		goto st2
-	st585:
+	st592:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof585
+			goto _test_eof592
 		}
-	st_case_585:
+	st_case_592:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 46:
-			goto st581
+			goto st588
 		case 69:
 			goto st185
 		case 92:
@@ -21637,15 +21711,15 @@ tr73:
 		case 101:
 			goto st185
 		case 105:
-			goto st584
+			goto st591
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st585
+				goto st592
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
 tr74:
@@ -21653,26 +21727,26 @@ tr74:
 
 	m.pb = m.p
 
-	goto st586
-	st586:
+	goto st593
+	st593:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof586
+			goto _test_eof593
 		}
-	st_case_586:
-//line plugins/parsers/influx/machine.go:21663
+	st_case_593:
+//line plugins/parsers/influx/machine.go:21737
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 46:
-			goto st581
+			goto st588
 		case 69:
 			goto st185
 		case 92:
@@ -21680,40 +21754,40 @@ tr74:
 		case 101:
 			goto st185
 		case 105:
-			goto st584
+			goto st591
 		case 117:
-			goto st587
+			goto st594
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st583
+				goto st590
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
-	st587:
+	st594:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof587
+			goto _test_eof594
 		}
-	st_case_587:
+	st_case_594:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr382
+			goto tr393
 		case 11:
-			goto tr811
+			goto tr822
 		case 13:
-			goto tr382
+			goto tr393
 		case 32:
-			goto tr794
+			goto tr805
 		case 44:
-			goto tr812
+			goto tr823
 		case 92:
 			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr794
+			goto tr805
 		}
 		goto st2
 tr75:
@@ -21721,26 +21795,26 @@ tr75:
 
 	m.pb = m.p
 
-	goto st588
-	st588:
+	goto st595
+	st595:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof588
+			goto _test_eof595
 		}
-	st_case_588:
-//line plugins/parsers/influx/machine.go:21731
+	st_case_595:
+//line plugins/parsers/influx/machine.go:21805
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr372
+			goto tr383
 		case 11:
-			goto tr783
+			goto tr794
 		case 13:
-			goto tr372
+			goto tr383
 		case 32:
-			goto tr780
+			goto tr791
 		case 44:
-			goto tr784
+			goto tr795
 		case 46:
-			goto st581
+			goto st588
 		case 69:
 			goto st185
 		case 92:
@@ -21748,17 +21822,17 @@ tr75:
 		case 101:
 			goto st185
 		case 105:
-			goto st584
+			goto st591
 		case 117:
-			goto st587
+			goto st594
 		}
 		switch {
 		case ( m.data)[( m.p)] > 12:
 			if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 {
-				goto st588
+				goto st595
 			}
 		case ( m.data)[( m.p)] >= 9:
-			goto tr780
+			goto tr791
 		}
 		goto st2
 tr76:
@@ -21766,24 +21840,24 @@ tr76:
 
 	m.pb = m.p
 
-	goto st589
-	st589:
+	goto st596
+	st596:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof589
+			goto _test_eof596
 		}
-	st_case_589:
-//line plugins/parsers/influx/machine.go:21776
+	st_case_596:
+//line plugins/parsers/influx/machine.go:21850
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr814
+			goto tr825
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr799
+			goto tr810
 		case 44:
-			goto tr815
+			goto tr826
 		case 65:
 			goto st187
 		case 92:
@@ -21792,7 +21866,7 @@ tr76:
 			goto st190
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr799
+			goto tr810
 		}
 		goto st2
 	st187:
@@ -21862,7 +21936,7 @@ tr76:
 		case 44:
 			goto tr7
 		case 69:
-			goto st590
+			goto st597
 		case 92:
 			goto st133
 		}
@@ -21870,27 +21944,27 @@ tr76:
 			goto tr4
 		}
 		goto st2
-	st590:
+	st597:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof590
+			goto _test_eof597
 		}
-	st_case_590:
+	st_case_597:
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr814
+			goto tr825
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr799
+			goto tr810
 		case 44:
-			goto tr815
+			goto tr826
 		case 92:
 			goto st133
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr799
+			goto tr810
 		}
 		goto st2
 	st190:
@@ -21962,7 +22036,7 @@ tr76:
 		case 92:
 			goto st133
 		case 101:
-			goto st590
+			goto st597
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
 			goto tr4
@@ -21973,24 +22047,24 @@ tr77:
 
 	m.pb = m.p
 
-	goto st591
-	st591:
+	goto st598
+	st598:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof591
+			goto _test_eof598
 		}
-	st_case_591:
-//line plugins/parsers/influx/machine.go:21983
+	st_case_598:
+//line plugins/parsers/influx/machine.go:22057
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr814
+			goto tr825
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr799
+			goto tr810
 		case 44:
-			goto tr815
+			goto tr826
 		case 82:
 			goto st193
 		case 92:
@@ -21999,7 +22073,7 @@ tr77:
 			goto st194
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr799
+			goto tr810
 		}
 		goto st2
 	st193:
@@ -22057,31 +22131,31 @@ tr78:
 
 	m.pb = m.p
 
-	goto st592
-	st592:
+	goto st599
+	st599:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof592
+			goto _test_eof599
 		}
-	st_case_592:
-//line plugins/parsers/influx/machine.go:22067
+	st_case_599:
+//line plugins/parsers/influx/machine.go:22141
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr814
+			goto tr825
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr799
+			goto tr810
 		case 44:
-			goto tr815
+			goto tr826
 		case 92:
 			goto st133
 		case 97:
 			goto st190
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr799
+			goto tr810
 		}
 		goto st2
 tr79:
@@ -22089,31 +22163,31 @@ tr79:
 
 	m.pb = m.p
 
-	goto st593
-	st593:
+	goto st600
+	st600:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof593
+			goto _test_eof600
 		}
-	st_case_593:
-//line plugins/parsers/influx/machine.go:22099
+	st_case_600:
+//line plugins/parsers/influx/machine.go:22173
 		switch ( m.data)[( m.p)] {
 		case 10:
-			goto tr386
+			goto tr397
 		case 11:
-			goto tr814
+			goto tr825
 		case 13:
-			goto tr386
+			goto tr397
 		case 32:
-			goto tr799
+			goto tr810
 		case 44:
-			goto tr815
+			goto tr826
 		case 92:
 			goto st133
 		case 114:
 			goto st194
 		}
 		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
-			goto tr799
+			goto tr810
 		}
 		goto st2
 	st195:
@@ -22133,13 +22207,13 @@ tr338:
 
 	{goto st196 }
 
-	goto st594
-	st594:
+	goto st601
+	st601:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof594
+			goto _test_eof601
 		}
-	st_case_594:
-//line plugins/parsers/influx/machine.go:22143
+	st_case_601:
+//line plugins/parsers/influx/machine.go:22217
 		goto st0
 	st196:
 		if ( m.p)++; ( m.p) == ( m.pe) {
@@ -22169,13 +22243,13 @@ tr339:
 
 	{goto st1 }
 
-	goto st595
-	st595:
+	goto st602
+	st602:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof595
+			goto _test_eof602
 		}
-	st_case_595:
-//line plugins/parsers/influx/machine.go:22179
+	st_case_602:
+//line plugins/parsers/influx/machine.go:22253
 		goto st0
 tr341:
 //line plugins/parsers/influx/machine.go.rl:63
@@ -22184,13 +22258,13 @@ tr341:
 
 	{goto st1 }
 
-	goto st596
-	st596:
+	goto st603
+	st603:
 		if ( m.p)++; ( m.p) == ( m.pe) {
-			goto _test_eof596
+			goto _test_eof603
 		}
-	st_case_596:
-//line plugins/parsers/influx/machine.go:22194
+	st_case_603:
+//line plugins/parsers/influx/machine.go:22268
 		switch ( m.data)[( m.p)] {
 		case 11:
 			goto tr341
@@ -22233,6 +22307,338 @@ tr341:
 			goto st0
 		}
 		goto tr339
+	st199:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof199
+		}
+	st_case_199:
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto st0
+		case 35:
+			goto st0
+		case 44:
+			goto st0
+		case 92:
+			goto tr346
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st0
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st0
+		}
+		goto tr345
+tr345:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st604
+tr833:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st604
+	st604:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof604
+		}
+	st_case_604:
+//line plugins/parsers/influx/machine.go:22352
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr832
+		case 11:
+			goto tr833
+		case 13:
+			goto tr832
+		case 32:
+			goto tr831
+		case 44:
+			goto tr834
+		case 92:
+			goto st205
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr831
+		}
+		goto st604
+tr831:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st605
+tr838:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st605
+	st605:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof605
+		}
+	st_case_605:
+//line plugins/parsers/influx/machine.go:22388
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr837
+		case 13:
+			goto tr837
+		case 32:
+			goto st605
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto st605
+		}
+		goto st0
+tr837:
+	 m.cs = 606
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 196;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr832:
+	 m.cs = 606
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 196;
+	{( m.p)++; goto _out }
+
+	goto _again
+tr839:
+	 m.cs = 606
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 196;
+	{( m.p)++; goto _out }
+
+	goto _again
+	st606:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof606
+		}
+	st_case_606:
+//line plugins/parsers/influx/machine.go:22441
+		goto st0
+tr834:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+	goto st200
+tr841:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st200
+	st200:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof200
+		}
+	st_case_200:
+//line plugins/parsers/influx/machine.go:22460
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr52
+		case 44:
+			goto tr52
+		case 61:
+			goto tr52
+		case 92:
+			goto tr348
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto tr347
+tr347:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st201
+	st201:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof201
+		}
+	st_case_201:
+//line plugins/parsers/influx/machine.go:22491
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr52
+		case 44:
+			goto tr52
+		case 61:
+			goto tr350
+		case 92:
+			goto st204
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto st201
+tr350:
+//line plugins/parsers/influx/machine.go.rl:76
+
+	key = m.text()
+
+	goto st202
+	st202:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof202
+		}
+	st_case_202:
+//line plugins/parsers/influx/machine.go:22522
+		switch ( m.data)[( m.p)] {
+		case 32:
+			goto tr52
+		case 44:
+			goto tr52
+		case 61:
+			goto tr52
+		case 92:
+			goto tr353
+		}
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto tr352
+tr352:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st607
+tr840:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+	goto st607
+	st607:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof607
+		}
+	st_case_607:
+//line plugins/parsers/influx/machine.go:22559
+		switch ( m.data)[( m.p)] {
+		case 10:
+			goto tr839
+		case 11:
+			goto tr840
+		case 13:
+			goto tr839
+		case 32:
+			goto tr838
+		case 44:
+			goto tr841
+		case 61:
+			goto tr52
+		case 92:
+			goto st203
+		}
+		if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 {
+			goto tr838
+		}
+		goto st607
+tr353:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st203
+	st203:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof203
+		}
+	st_case_203:
+//line plugins/parsers/influx/machine.go:22591
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto st607
+tr348:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st204
+	st204:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof204
+		}
+	st_case_204:
+//line plugins/parsers/influx/machine.go:22612
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto tr52
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto tr52
+		}
+		goto st201
+tr346:
+//line plugins/parsers/influx/machine.go.rl:18
+
+	m.pb = m.p
+
+	goto st205
+	st205:
+		if ( m.p)++; ( m.p) == ( m.pe) {
+			goto _test_eof205
+		}
+	st_case_205:
+//line plugins/parsers/influx/machine.go:22633
+		switch {
+		case ( m.data)[( m.p)] > 10:
+			if 12 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 {
+				goto st0
+			}
+		case ( m.data)[( m.p)] >= 9:
+			goto st0
+		}
+		goto st604
 	st_out:
 	_test_eof1:  m.cs = 1; goto _test_eof
 	_test_eof2:  m.cs = 2; goto _test_eof
@@ -22241,17 +22647,10 @@ tr341:
 	_test_eof5:  m.cs = 5; goto _test_eof
 	_test_eof6:  m.cs = 6; goto _test_eof
 	_test_eof7:  m.cs = 7; goto _test_eof
-	_test_eof199:  m.cs = 199; goto _test_eof
-	_test_eof200:  m.cs = 200; goto _test_eof
-	_test_eof201:  m.cs = 201; goto _test_eof
-	_test_eof8:  m.cs = 8; goto _test_eof
-	_test_eof202:  m.cs = 202; goto _test_eof
-	_test_eof203:  m.cs = 203; goto _test_eof
-	_test_eof204:  m.cs = 204; goto _test_eof
-	_test_eof205:  m.cs = 205; goto _test_eof
 	_test_eof206:  m.cs = 206; goto _test_eof
 	_test_eof207:  m.cs = 207; goto _test_eof
 	_test_eof208:  m.cs = 208; goto _test_eof
+	_test_eof8:  m.cs = 8; goto _test_eof
 	_test_eof209:  m.cs = 209; goto _test_eof
 	_test_eof210:  m.cs = 210; goto _test_eof
 	_test_eof211:  m.cs = 211; goto _test_eof
@@ -22265,35 +22664,42 @@ tr341:
 	_test_eof219:  m.cs = 219; goto _test_eof
 	_test_eof220:  m.cs = 220; goto _test_eof
 	_test_eof221:  m.cs = 221; goto _test_eof
-	_test_eof9:  m.cs = 9; goto _test_eof
-	_test_eof10:  m.cs = 10; goto _test_eof
-	_test_eof11:  m.cs = 11; goto _test_eof
-	_test_eof12:  m.cs = 12; goto _test_eof
-	_test_eof13:  m.cs = 13; goto _test_eof
 	_test_eof222:  m.cs = 222; goto _test_eof
-	_test_eof14:  m.cs = 14; goto _test_eof
-	_test_eof15:  m.cs = 15; goto _test_eof
 	_test_eof223:  m.cs = 223; goto _test_eof
 	_test_eof224:  m.cs = 224; goto _test_eof
 	_test_eof225:  m.cs = 225; goto _test_eof
 	_test_eof226:  m.cs = 226; goto _test_eof
 	_test_eof227:  m.cs = 227; goto _test_eof
 	_test_eof228:  m.cs = 228; goto _test_eof
+	_test_eof9:  m.cs = 9; goto _test_eof
+	_test_eof10:  m.cs = 10; goto _test_eof
+	_test_eof11:  m.cs = 11; goto _test_eof
+	_test_eof12:  m.cs = 12; goto _test_eof
+	_test_eof13:  m.cs = 13; goto _test_eof
 	_test_eof229:  m.cs = 229; goto _test_eof
+	_test_eof14:  m.cs = 14; goto _test_eof
+	_test_eof15:  m.cs = 15; goto _test_eof
 	_test_eof230:  m.cs = 230; goto _test_eof
 	_test_eof231:  m.cs = 231; goto _test_eof
+	_test_eof232:  m.cs = 232; goto _test_eof
+	_test_eof233:  m.cs = 233; goto _test_eof
+	_test_eof234:  m.cs = 234; goto _test_eof
+	_test_eof235:  m.cs = 235; goto _test_eof
+	_test_eof236:  m.cs = 236; goto _test_eof
+	_test_eof237:  m.cs = 237; goto _test_eof
+	_test_eof238:  m.cs = 238; goto _test_eof
 	_test_eof16:  m.cs = 16; goto _test_eof
 	_test_eof17:  m.cs = 17; goto _test_eof
 	_test_eof18:  m.cs = 18; goto _test_eof
-	_test_eof232:  m.cs = 232; goto _test_eof
+	_test_eof239:  m.cs = 239; goto _test_eof
 	_test_eof19:  m.cs = 19; goto _test_eof
 	_test_eof20:  m.cs = 20; goto _test_eof
 	_test_eof21:  m.cs = 21; goto _test_eof
-	_test_eof233:  m.cs = 233; goto _test_eof
+	_test_eof240:  m.cs = 240; goto _test_eof
 	_test_eof22:  m.cs = 22; goto _test_eof
 	_test_eof23:  m.cs = 23; goto _test_eof
-	_test_eof234:  m.cs = 234; goto _test_eof
-	_test_eof235:  m.cs = 235; goto _test_eof
+	_test_eof241:  m.cs = 241; goto _test_eof
+	_test_eof242:  m.cs = 242; goto _test_eof
 	_test_eof24:  m.cs = 24; goto _test_eof
 	_test_eof25:  m.cs = 25; goto _test_eof
 	_test_eof26:  m.cs = 26; goto _test_eof
@@ -22313,16 +22719,9 @@ tr341:
 	_test_eof40:  m.cs = 40; goto _test_eof
 	_test_eof41:  m.cs = 41; goto _test_eof
 	_test_eof42:  m.cs = 42; goto _test_eof
-	_test_eof236:  m.cs = 236; goto _test_eof
-	_test_eof237:  m.cs = 237; goto _test_eof
-	_test_eof43:  m.cs = 43; goto _test_eof
-	_test_eof238:  m.cs = 238; goto _test_eof
-	_test_eof239:  m.cs = 239; goto _test_eof
-	_test_eof240:  m.cs = 240; goto _test_eof
-	_test_eof241:  m.cs = 241; goto _test_eof
-	_test_eof242:  m.cs = 242; goto _test_eof
 	_test_eof243:  m.cs = 243; goto _test_eof
 	_test_eof244:  m.cs = 244; goto _test_eof
+	_test_eof43:  m.cs = 43; goto _test_eof
 	_test_eof245:  m.cs = 245; goto _test_eof
 	_test_eof246:  m.cs = 246; goto _test_eof
 	_test_eof247:  m.cs = 247; goto _test_eof
@@ -22336,17 +22735,17 @@ tr341:
 	_test_eof255:  m.cs = 255; goto _test_eof
 	_test_eof256:  m.cs = 256; goto _test_eof
 	_test_eof257:  m.cs = 257; goto _test_eof
-	_test_eof44:  m.cs = 44; goto _test_eof
 	_test_eof258:  m.cs = 258; goto _test_eof
 	_test_eof259:  m.cs = 259; goto _test_eof
-	_test_eof45:  m.cs = 45; goto _test_eof
 	_test_eof260:  m.cs = 260; goto _test_eof
 	_test_eof261:  m.cs = 261; goto _test_eof
 	_test_eof262:  m.cs = 262; goto _test_eof
 	_test_eof263:  m.cs = 263; goto _test_eof
 	_test_eof264:  m.cs = 264; goto _test_eof
+	_test_eof44:  m.cs = 44; goto _test_eof
 	_test_eof265:  m.cs = 265; goto _test_eof
 	_test_eof266:  m.cs = 266; goto _test_eof
+	_test_eof45:  m.cs = 45; goto _test_eof
 	_test_eof267:  m.cs = 267; goto _test_eof
 	_test_eof268:  m.cs = 268; goto _test_eof
 	_test_eof269:  m.cs = 269; goto _test_eof
@@ -22360,90 +22759,90 @@ tr341:
 	_test_eof277:  m.cs = 277; goto _test_eof
 	_test_eof278:  m.cs = 278; goto _test_eof
 	_test_eof279:  m.cs = 279; goto _test_eof
+	_test_eof280:  m.cs = 280; goto _test_eof
+	_test_eof281:  m.cs = 281; goto _test_eof
+	_test_eof282:  m.cs = 282; goto _test_eof
+	_test_eof283:  m.cs = 283; goto _test_eof
+	_test_eof284:  m.cs = 284; goto _test_eof
+	_test_eof285:  m.cs = 285; goto _test_eof
+	_test_eof286:  m.cs = 286; goto _test_eof
 	_test_eof46:  m.cs = 46; goto _test_eof
 	_test_eof47:  m.cs = 47; goto _test_eof
 	_test_eof48:  m.cs = 48; goto _test_eof
-	_test_eof280:  m.cs = 280; goto _test_eof
+	_test_eof287:  m.cs = 287; goto _test_eof
 	_test_eof49:  m.cs = 49; goto _test_eof
 	_test_eof50:  m.cs = 50; goto _test_eof
 	_test_eof51:  m.cs = 51; goto _test_eof
 	_test_eof52:  m.cs = 52; goto _test_eof
 	_test_eof53:  m.cs = 53; goto _test_eof
-	_test_eof281:  m.cs = 281; goto _test_eof
-	_test_eof54:  m.cs = 54; goto _test_eof
-	_test_eof282:  m.cs = 282; goto _test_eof
-	_test_eof55:  m.cs = 55; goto _test_eof
-	_test_eof283:  m.cs = 283; goto _test_eof
-	_test_eof284:  m.cs = 284; goto _test_eof
-	_test_eof285:  m.cs = 285; goto _test_eof
-	_test_eof286:  m.cs = 286; goto _test_eof
-	_test_eof287:  m.cs = 287; goto _test_eof
 	_test_eof288:  m.cs = 288; goto _test_eof
+	_test_eof54:  m.cs = 54; goto _test_eof
 	_test_eof289:  m.cs = 289; goto _test_eof
+	_test_eof55:  m.cs = 55; goto _test_eof
 	_test_eof290:  m.cs = 290; goto _test_eof
 	_test_eof291:  m.cs = 291; goto _test_eof
+	_test_eof292:  m.cs = 292; goto _test_eof
+	_test_eof293:  m.cs = 293; goto _test_eof
+	_test_eof294:  m.cs = 294; goto _test_eof
+	_test_eof295:  m.cs = 295; goto _test_eof
+	_test_eof296:  m.cs = 296; goto _test_eof
+	_test_eof297:  m.cs = 297; goto _test_eof
+	_test_eof298:  m.cs = 298; goto _test_eof
 	_test_eof56:  m.cs = 56; goto _test_eof
 	_test_eof57:  m.cs = 57; goto _test_eof
 	_test_eof58:  m.cs = 58; goto _test_eof
-	_test_eof292:  m.cs = 292; goto _test_eof
+	_test_eof299:  m.cs = 299; goto _test_eof
 	_test_eof59:  m.cs = 59; goto _test_eof
 	_test_eof60:  m.cs = 60; goto _test_eof
 	_test_eof61:  m.cs = 61; goto _test_eof
-	_test_eof293:  m.cs = 293; goto _test_eof
+	_test_eof300:  m.cs = 300; goto _test_eof
 	_test_eof62:  m.cs = 62; goto _test_eof
 	_test_eof63:  m.cs = 63; goto _test_eof
-	_test_eof294:  m.cs = 294; goto _test_eof
-	_test_eof295:  m.cs = 295; goto _test_eof
+	_test_eof301:  m.cs = 301; goto _test_eof
+	_test_eof302:  m.cs = 302; goto _test_eof
 	_test_eof64:  m.cs = 64; goto _test_eof
 	_test_eof65:  m.cs = 65; goto _test_eof
 	_test_eof66:  m.cs = 66; goto _test_eof
-	_test_eof296:  m.cs = 296; goto _test_eof
+	_test_eof303:  m.cs = 303; goto _test_eof
 	_test_eof67:  m.cs = 67; goto _test_eof
 	_test_eof68:  m.cs = 68; goto _test_eof
-	_test_eof297:  m.cs = 297; goto _test_eof
-	_test_eof298:  m.cs = 298; goto _test_eof
-	_test_eof299:  m.cs = 299; goto _test_eof
-	_test_eof300:  m.cs = 300; goto _test_eof
-	_test_eof301:  m.cs = 301; goto _test_eof
-	_test_eof302:  m.cs = 302; goto _test_eof
-	_test_eof303:  m.cs = 303; goto _test_eof
 	_test_eof304:  m.cs = 304; goto _test_eof
 	_test_eof305:  m.cs = 305; goto _test_eof
+	_test_eof306:  m.cs = 306; goto _test_eof
+	_test_eof307:  m.cs = 307; goto _test_eof
+	_test_eof308:  m.cs = 308; goto _test_eof
+	_test_eof309:  m.cs = 309; goto _test_eof
+	_test_eof310:  m.cs = 310; goto _test_eof
+	_test_eof311:  m.cs = 311; goto _test_eof
+	_test_eof312:  m.cs = 312; goto _test_eof
 	_test_eof69:  m.cs = 69; goto _test_eof
 	_test_eof70:  m.cs = 70; goto _test_eof
 	_test_eof71:  m.cs = 71; goto _test_eof
-	_test_eof306:  m.cs = 306; goto _test_eof
+	_test_eof313:  m.cs = 313; goto _test_eof
 	_test_eof72:  m.cs = 72; goto _test_eof
 	_test_eof73:  m.cs = 73; goto _test_eof
 	_test_eof74:  m.cs = 74; goto _test_eof
-	_test_eof307:  m.cs = 307; goto _test_eof
+	_test_eof314:  m.cs = 314; goto _test_eof
 	_test_eof75:  m.cs = 75; goto _test_eof
 	_test_eof76:  m.cs = 76; goto _test_eof
-	_test_eof308:  m.cs = 308; goto _test_eof
-	_test_eof309:  m.cs = 309; goto _test_eof
+	_test_eof315:  m.cs = 315; goto _test_eof
+	_test_eof316:  m.cs = 316; goto _test_eof
 	_test_eof77:  m.cs = 77; goto _test_eof
 	_test_eof78:  m.cs = 78; goto _test_eof
 	_test_eof79:  m.cs = 79; goto _test_eof
 	_test_eof80:  m.cs = 80; goto _test_eof
 	_test_eof81:  m.cs = 81; goto _test_eof
 	_test_eof82:  m.cs = 82; goto _test_eof
-	_test_eof310:  m.cs = 310; goto _test_eof
-	_test_eof311:  m.cs = 311; goto _test_eof
-	_test_eof312:  m.cs = 312; goto _test_eof
-	_test_eof313:  m.cs = 313; goto _test_eof
-	_test_eof83:  m.cs = 83; goto _test_eof
-	_test_eof314:  m.cs = 314; goto _test_eof
-	_test_eof315:  m.cs = 315; goto _test_eof
-	_test_eof316:  m.cs = 316; goto _test_eof
 	_test_eof317:  m.cs = 317; goto _test_eof
-	_test_eof84:  m.cs = 84; goto _test_eof
 	_test_eof318:  m.cs = 318; goto _test_eof
 	_test_eof319:  m.cs = 319; goto _test_eof
 	_test_eof320:  m.cs = 320; goto _test_eof
+	_test_eof83:  m.cs = 83; goto _test_eof
 	_test_eof321:  m.cs = 321; goto _test_eof
 	_test_eof322:  m.cs = 322; goto _test_eof
 	_test_eof323:  m.cs = 323; goto _test_eof
 	_test_eof324:  m.cs = 324; goto _test_eof
+	_test_eof84:  m.cs = 84; goto _test_eof
 	_test_eof325:  m.cs = 325; goto _test_eof
 	_test_eof326:  m.cs = 326; goto _test_eof
 	_test_eof327:  m.cs = 327; goto _test_eof
@@ -22455,6 +22854,13 @@ tr341:
 	_test_eof333:  m.cs = 333; goto _test_eof
 	_test_eof334:  m.cs = 334; goto _test_eof
 	_test_eof335:  m.cs = 335; goto _test_eof
+	_test_eof336:  m.cs = 336; goto _test_eof
+	_test_eof337:  m.cs = 337; goto _test_eof
+	_test_eof338:  m.cs = 338; goto _test_eof
+	_test_eof339:  m.cs = 339; goto _test_eof
+	_test_eof340:  m.cs = 340; goto _test_eof
+	_test_eof341:  m.cs = 341; goto _test_eof
+	_test_eof342:  m.cs = 342; goto _test_eof
 	_test_eof85:  m.cs = 85; goto _test_eof
 	_test_eof86:  m.cs = 86; goto _test_eof
 	_test_eof87:  m.cs = 87; goto _test_eof
@@ -22468,16 +22874,9 @@ tr341:
 	_test_eof95:  m.cs = 95; goto _test_eof
 	_test_eof96:  m.cs = 96; goto _test_eof
 	_test_eof97:  m.cs = 97; goto _test_eof
-	_test_eof336:  m.cs = 336; goto _test_eof
-	_test_eof337:  m.cs = 337; goto _test_eof
-	_test_eof98:  m.cs = 98; goto _test_eof
-	_test_eof338:  m.cs = 338; goto _test_eof
-	_test_eof339:  m.cs = 339; goto _test_eof
-	_test_eof340:  m.cs = 340; goto _test_eof
-	_test_eof341:  m.cs = 341; goto _test_eof
-	_test_eof342:  m.cs = 342; goto _test_eof
 	_test_eof343:  m.cs = 343; goto _test_eof
 	_test_eof344:  m.cs = 344; goto _test_eof
+	_test_eof98:  m.cs = 98; goto _test_eof
 	_test_eof345:  m.cs = 345; goto _test_eof
 	_test_eof346:  m.cs = 346; goto _test_eof
 	_test_eof347:  m.cs = 347; goto _test_eof
@@ -22491,18 +22890,18 @@ tr341:
 	_test_eof355:  m.cs = 355; goto _test_eof
 	_test_eof356:  m.cs = 356; goto _test_eof
 	_test_eof357:  m.cs = 357; goto _test_eof
-	_test_eof99:  m.cs = 99; goto _test_eof
-	_test_eof100:  m.cs = 100; goto _test_eof
 	_test_eof358:  m.cs = 358; goto _test_eof
 	_test_eof359:  m.cs = 359; goto _test_eof
-	_test_eof101:  m.cs = 101; goto _test_eof
 	_test_eof360:  m.cs = 360; goto _test_eof
 	_test_eof361:  m.cs = 361; goto _test_eof
 	_test_eof362:  m.cs = 362; goto _test_eof
 	_test_eof363:  m.cs = 363; goto _test_eof
 	_test_eof364:  m.cs = 364; goto _test_eof
+	_test_eof99:  m.cs = 99; goto _test_eof
+	_test_eof100:  m.cs = 100; goto _test_eof
 	_test_eof365:  m.cs = 365; goto _test_eof
 	_test_eof366:  m.cs = 366; goto _test_eof
+	_test_eof101:  m.cs = 101; goto _test_eof
 	_test_eof367:  m.cs = 367; goto _test_eof
 	_test_eof368:  m.cs = 368; goto _test_eof
 	_test_eof369:  m.cs = 369; goto _test_eof
@@ -22516,38 +22915,45 @@ tr341:
 	_test_eof377:  m.cs = 377; goto _test_eof
 	_test_eof378:  m.cs = 378; goto _test_eof
 	_test_eof379:  m.cs = 379; goto _test_eof
-	_test_eof102:  m.cs = 102; goto _test_eof
 	_test_eof380:  m.cs = 380; goto _test_eof
 	_test_eof381:  m.cs = 381; goto _test_eof
+	_test_eof382:  m.cs = 382; goto _test_eof
+	_test_eof383:  m.cs = 383; goto _test_eof
+	_test_eof384:  m.cs = 384; goto _test_eof
+	_test_eof385:  m.cs = 385; goto _test_eof
+	_test_eof386:  m.cs = 386; goto _test_eof
+	_test_eof102:  m.cs = 102; goto _test_eof
+	_test_eof387:  m.cs = 387; goto _test_eof
+	_test_eof388:  m.cs = 388; goto _test_eof
 	_test_eof103:  m.cs = 103; goto _test_eof
 	_test_eof104:  m.cs = 104; goto _test_eof
 	_test_eof105:  m.cs = 105; goto _test_eof
 	_test_eof106:  m.cs = 106; goto _test_eof
 	_test_eof107:  m.cs = 107; goto _test_eof
-	_test_eof382:  m.cs = 382; goto _test_eof
+	_test_eof389:  m.cs = 389; goto _test_eof
 	_test_eof108:  m.cs = 108; goto _test_eof
 	_test_eof109:  m.cs = 109; goto _test_eof
-	_test_eof383:  m.cs = 383; goto _test_eof
-	_test_eof384:  m.cs = 384; goto _test_eof
-	_test_eof385:  m.cs = 385; goto _test_eof
-	_test_eof386:  m.cs = 386; goto _test_eof
-	_test_eof387:  m.cs = 387; goto _test_eof
-	_test_eof388:  m.cs = 388; goto _test_eof
-	_test_eof389:  m.cs = 389; goto _test_eof
 	_test_eof390:  m.cs = 390; goto _test_eof
 	_test_eof391:  m.cs = 391; goto _test_eof
+	_test_eof392:  m.cs = 392; goto _test_eof
+	_test_eof393:  m.cs = 393; goto _test_eof
+	_test_eof394:  m.cs = 394; goto _test_eof
+	_test_eof395:  m.cs = 395; goto _test_eof
+	_test_eof396:  m.cs = 396; goto _test_eof
+	_test_eof397:  m.cs = 397; goto _test_eof
+	_test_eof398:  m.cs = 398; goto _test_eof
 	_test_eof110:  m.cs = 110; goto _test_eof
 	_test_eof111:  m.cs = 111; goto _test_eof
 	_test_eof112:  m.cs = 112; goto _test_eof
-	_test_eof392:  m.cs = 392; goto _test_eof
+	_test_eof399:  m.cs = 399; goto _test_eof
 	_test_eof113:  m.cs = 113; goto _test_eof
 	_test_eof114:  m.cs = 114; goto _test_eof
 	_test_eof115:  m.cs = 115; goto _test_eof
-	_test_eof393:  m.cs = 393; goto _test_eof
+	_test_eof400:  m.cs = 400; goto _test_eof
 	_test_eof116:  m.cs = 116; goto _test_eof
 	_test_eof117:  m.cs = 117; goto _test_eof
-	_test_eof394:  m.cs = 394; goto _test_eof
-	_test_eof395:  m.cs = 395; goto _test_eof
+	_test_eof401:  m.cs = 401; goto _test_eof
+	_test_eof402:  m.cs = 402; goto _test_eof
 	_test_eof118:  m.cs = 118; goto _test_eof
 	_test_eof119:  m.cs = 119; goto _test_eof
 	_test_eof120:  m.cs = 120; goto _test_eof
@@ -22560,17 +22966,10 @@ tr341:
 	_test_eof127:  m.cs = 127; goto _test_eof
 	_test_eof128:  m.cs = 128; goto _test_eof
 	_test_eof129:  m.cs = 129; goto _test_eof
-	_test_eof396:  m.cs = 396; goto _test_eof
-	_test_eof397:  m.cs = 397; goto _test_eof
-	_test_eof398:  m.cs = 398; goto _test_eof
-	_test_eof130:  m.cs = 130; goto _test_eof
-	_test_eof399:  m.cs = 399; goto _test_eof
-	_test_eof400:  m.cs = 400; goto _test_eof
-	_test_eof401:  m.cs = 401; goto _test_eof
-	_test_eof402:  m.cs = 402; goto _test_eof
 	_test_eof403:  m.cs = 403; goto _test_eof
 	_test_eof404:  m.cs = 404; goto _test_eof
 	_test_eof405:  m.cs = 405; goto _test_eof
+	_test_eof130:  m.cs = 130; goto _test_eof
 	_test_eof406:  m.cs = 406; goto _test_eof
 	_test_eof407:  m.cs = 407; goto _test_eof
 	_test_eof408:  m.cs = 408; goto _test_eof
@@ -22586,19 +22985,19 @@ tr341:
 	_test_eof418:  m.cs = 418; goto _test_eof
 	_test_eof419:  m.cs = 419; goto _test_eof
 	_test_eof420:  m.cs = 420; goto _test_eof
-	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof421:  m.cs = 421; goto _test_eof
 	_test_eof422:  m.cs = 422; goto _test_eof
 	_test_eof423:  m.cs = 423; goto _test_eof
 	_test_eof424:  m.cs = 424; goto _test_eof
-	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof425:  m.cs = 425; goto _test_eof
 	_test_eof426:  m.cs = 426; goto _test_eof
 	_test_eof427:  m.cs = 427; goto _test_eof
+	_test_eof131:  m.cs = 131; goto _test_eof
 	_test_eof428:  m.cs = 428; goto _test_eof
 	_test_eof429:  m.cs = 429; goto _test_eof
 	_test_eof430:  m.cs = 430; goto _test_eof
 	_test_eof431:  m.cs = 431; goto _test_eof
+	_test_eof132:  m.cs = 132; goto _test_eof
 	_test_eof432:  m.cs = 432; goto _test_eof
 	_test_eof433:  m.cs = 433; goto _test_eof
 	_test_eof434:  m.cs = 434; goto _test_eof
@@ -22612,19 +23011,19 @@ tr341:
 	_test_eof442:  m.cs = 442; goto _test_eof
 	_test_eof443:  m.cs = 443; goto _test_eof
 	_test_eof444:  m.cs = 444; goto _test_eof
-	_test_eof133:  m.cs = 133; goto _test_eof
-	_test_eof134:  m.cs = 134; goto _test_eof
-	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof445:  m.cs = 445; goto _test_eof
 	_test_eof446:  m.cs = 446; goto _test_eof
-	_test_eof136:  m.cs = 136; goto _test_eof
 	_test_eof447:  m.cs = 447; goto _test_eof
 	_test_eof448:  m.cs = 448; goto _test_eof
 	_test_eof449:  m.cs = 449; goto _test_eof
 	_test_eof450:  m.cs = 450; goto _test_eof
 	_test_eof451:  m.cs = 451; goto _test_eof
+	_test_eof133:  m.cs = 133; goto _test_eof
+	_test_eof134:  m.cs = 134; goto _test_eof
+	_test_eof135:  m.cs = 135; goto _test_eof
 	_test_eof452:  m.cs = 452; goto _test_eof
 	_test_eof453:  m.cs = 453; goto _test_eof
+	_test_eof136:  m.cs = 136; goto _test_eof
 	_test_eof454:  m.cs = 454; goto _test_eof
 	_test_eof455:  m.cs = 455; goto _test_eof
 	_test_eof456:  m.cs = 456; goto _test_eof
@@ -22638,18 +23037,18 @@ tr341:
 	_test_eof464:  m.cs = 464; goto _test_eof
 	_test_eof465:  m.cs = 465; goto _test_eof
 	_test_eof466:  m.cs = 466; goto _test_eof
-	_test_eof137:  m.cs = 137; goto _test_eof
 	_test_eof467:  m.cs = 467; goto _test_eof
 	_test_eof468:  m.cs = 468; goto _test_eof
 	_test_eof469:  m.cs = 469; goto _test_eof
-	_test_eof138:  m.cs = 138; goto _test_eof
 	_test_eof470:  m.cs = 470; goto _test_eof
 	_test_eof471:  m.cs = 471; goto _test_eof
 	_test_eof472:  m.cs = 472; goto _test_eof
 	_test_eof473:  m.cs = 473; goto _test_eof
+	_test_eof137:  m.cs = 137; goto _test_eof
 	_test_eof474:  m.cs = 474; goto _test_eof
 	_test_eof475:  m.cs = 475; goto _test_eof
 	_test_eof476:  m.cs = 476; goto _test_eof
+	_test_eof138:  m.cs = 138; goto _test_eof
 	_test_eof477:  m.cs = 477; goto _test_eof
 	_test_eof478:  m.cs = 478; goto _test_eof
 	_test_eof479:  m.cs = 479; goto _test_eof
@@ -22665,7 +23064,6 @@ tr341:
 	_test_eof489:  m.cs = 489; goto _test_eof
 	_test_eof490:  m.cs = 490; goto _test_eof
 	_test_eof491:  m.cs = 491; goto _test_eof
-	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof492:  m.cs = 492; goto _test_eof
 	_test_eof493:  m.cs = 493; goto _test_eof
 	_test_eof494:  m.cs = 494; goto _test_eof
@@ -22673,6 +23071,7 @@ tr341:
 	_test_eof496:  m.cs = 496; goto _test_eof
 	_test_eof497:  m.cs = 497; goto _test_eof
 	_test_eof498:  m.cs = 498; goto _test_eof
+	_test_eof139:  m.cs = 139; goto _test_eof
 	_test_eof499:  m.cs = 499; goto _test_eof
 	_test_eof500:  m.cs = 500; goto _test_eof
 	_test_eof501:  m.cs = 501; goto _test_eof
@@ -22688,50 +23087,50 @@ tr341:
 	_test_eof511:  m.cs = 511; goto _test_eof
 	_test_eof512:  m.cs = 512; goto _test_eof
 	_test_eof513:  m.cs = 513; goto _test_eof
-	_test_eof140:  m.cs = 140; goto _test_eof
-	_test_eof141:  m.cs = 141; goto _test_eof
-	_test_eof142:  m.cs = 142; goto _test_eof
-	_test_eof143:  m.cs = 143; goto _test_eof
-	_test_eof144:  m.cs = 144; goto _test_eof
 	_test_eof514:  m.cs = 514; goto _test_eof
-	_test_eof145:  m.cs = 145; goto _test_eof
 	_test_eof515:  m.cs = 515; goto _test_eof
-	_test_eof146:  m.cs = 146; goto _test_eof
 	_test_eof516:  m.cs = 516; goto _test_eof
 	_test_eof517:  m.cs = 517; goto _test_eof
 	_test_eof518:  m.cs = 518; goto _test_eof
 	_test_eof519:  m.cs = 519; goto _test_eof
 	_test_eof520:  m.cs = 520; goto _test_eof
+	_test_eof140:  m.cs = 140; goto _test_eof
+	_test_eof141:  m.cs = 141; goto _test_eof
+	_test_eof142:  m.cs = 142; goto _test_eof
+	_test_eof143:  m.cs = 143; goto _test_eof
+	_test_eof144:  m.cs = 144; goto _test_eof
 	_test_eof521:  m.cs = 521; goto _test_eof
+	_test_eof145:  m.cs = 145; goto _test_eof
 	_test_eof522:  m.cs = 522; goto _test_eof
+	_test_eof146:  m.cs = 146; goto _test_eof
 	_test_eof523:  m.cs = 523; goto _test_eof
 	_test_eof524:  m.cs = 524; goto _test_eof
-	_test_eof147:  m.cs = 147; goto _test_eof
-	_test_eof148:  m.cs = 148; goto _test_eof
-	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof525:  m.cs = 525; goto _test_eof
-	_test_eof150:  m.cs = 150; goto _test_eof
-	_test_eof151:  m.cs = 151; goto _test_eof
-	_test_eof152:  m.cs = 152; goto _test_eof
 	_test_eof526:  m.cs = 526; goto _test_eof
-	_test_eof153:  m.cs = 153; goto _test_eof
-	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof527:  m.cs = 527; goto _test_eof
 	_test_eof528:  m.cs = 528; goto _test_eof
-	_test_eof155:  m.cs = 155; goto _test_eof
-	_test_eof156:  m.cs = 156; goto _test_eof
-	_test_eof157:  m.cs = 157; goto _test_eof
 	_test_eof529:  m.cs = 529; goto _test_eof
 	_test_eof530:  m.cs = 530; goto _test_eof
 	_test_eof531:  m.cs = 531; goto _test_eof
-	_test_eof158:  m.cs = 158; goto _test_eof
+	_test_eof147:  m.cs = 147; goto _test_eof
+	_test_eof148:  m.cs = 148; goto _test_eof
+	_test_eof149:  m.cs = 149; goto _test_eof
 	_test_eof532:  m.cs = 532; goto _test_eof
+	_test_eof150:  m.cs = 150; goto _test_eof
+	_test_eof151:  m.cs = 151; goto _test_eof
+	_test_eof152:  m.cs = 152; goto _test_eof
 	_test_eof533:  m.cs = 533; goto _test_eof
+	_test_eof153:  m.cs = 153; goto _test_eof
+	_test_eof154:  m.cs = 154; goto _test_eof
 	_test_eof534:  m.cs = 534; goto _test_eof
 	_test_eof535:  m.cs = 535; goto _test_eof
+	_test_eof155:  m.cs = 155; goto _test_eof
+	_test_eof156:  m.cs = 156; goto _test_eof
+	_test_eof157:  m.cs = 157; goto _test_eof
 	_test_eof536:  m.cs = 536; goto _test_eof
 	_test_eof537:  m.cs = 537; goto _test_eof
 	_test_eof538:  m.cs = 538; goto _test_eof
+	_test_eof158:  m.cs = 158; goto _test_eof
 	_test_eof539:  m.cs = 539; goto _test_eof
 	_test_eof540:  m.cs = 540; goto _test_eof
 	_test_eof541:  m.cs = 541; goto _test_eof
@@ -22745,8 +23144,6 @@ tr341:
 	_test_eof549:  m.cs = 549; goto _test_eof
 	_test_eof550:  m.cs = 550; goto _test_eof
 	_test_eof551:  m.cs = 551; goto _test_eof
-	_test_eof159:  m.cs = 159; goto _test_eof
-	_test_eof160:  m.cs = 160; goto _test_eof
 	_test_eof552:  m.cs = 552; goto _test_eof
 	_test_eof553:  m.cs = 553; goto _test_eof
 	_test_eof554:  m.cs = 554; goto _test_eof
@@ -22754,87 +23151,107 @@ tr341:
 	_test_eof556:  m.cs = 556; goto _test_eof
 	_test_eof557:  m.cs = 557; goto _test_eof
 	_test_eof558:  m.cs = 558; goto _test_eof
+	_test_eof159:  m.cs = 159; goto _test_eof
+	_test_eof160:  m.cs = 160; goto _test_eof
 	_test_eof559:  m.cs = 559; goto _test_eof
 	_test_eof560:  m.cs = 560; goto _test_eof
+	_test_eof561:  m.cs = 561; goto _test_eof
+	_test_eof562:  m.cs = 562; goto _test_eof
+	_test_eof563:  m.cs = 563; goto _test_eof
+	_test_eof564:  m.cs = 564; goto _test_eof
+	_test_eof565:  m.cs = 565; goto _test_eof
+	_test_eof566:  m.cs = 566; goto _test_eof
+	_test_eof567:  m.cs = 567; goto _test_eof
 	_test_eof161:  m.cs = 161; goto _test_eof
 	_test_eof162:  m.cs = 162; goto _test_eof
 	_test_eof163:  m.cs = 163; goto _test_eof
-	_test_eof561:  m.cs = 561; goto _test_eof
+	_test_eof568:  m.cs = 568; goto _test_eof
 	_test_eof164:  m.cs = 164; goto _test_eof
 	_test_eof165:  m.cs = 165; goto _test_eof
 	_test_eof166:  m.cs = 166; goto _test_eof
-	_test_eof562:  m.cs = 562; goto _test_eof
+	_test_eof569:  m.cs = 569; goto _test_eof
 	_test_eof167:  m.cs = 167; goto _test_eof
 	_test_eof168:  m.cs = 168; goto _test_eof
-	_test_eof563:  m.cs = 563; goto _test_eof
-	_test_eof564:  m.cs = 564; goto _test_eof
+	_test_eof570:  m.cs = 570; goto _test_eof
+	_test_eof571:  m.cs = 571; goto _test_eof
 	_test_eof169:  m.cs = 169; goto _test_eof
 	_test_eof170:  m.cs = 170; goto _test_eof
 	_test_eof171:  m.cs = 171; goto _test_eof
 	_test_eof172:  m.cs = 172; goto _test_eof
-	_test_eof565:  m.cs = 565; goto _test_eof
-	_test_eof173:  m.cs = 173; goto _test_eof
-	_test_eof566:  m.cs = 566; goto _test_eof
-	_test_eof567:  m.cs = 567; goto _test_eof
-	_test_eof174:  m.cs = 174; goto _test_eof
-	_test_eof568:  m.cs = 568; goto _test_eof
-	_test_eof569:  m.cs = 569; goto _test_eof
-	_test_eof570:  m.cs = 570; goto _test_eof
-	_test_eof571:  m.cs = 571; goto _test_eof
 	_test_eof572:  m.cs = 572; goto _test_eof
+	_test_eof173:  m.cs = 173; goto _test_eof
 	_test_eof573:  m.cs = 573; goto _test_eof
 	_test_eof574:  m.cs = 574; goto _test_eof
+	_test_eof174:  m.cs = 174; goto _test_eof
 	_test_eof575:  m.cs = 575; goto _test_eof
 	_test_eof576:  m.cs = 576; goto _test_eof
+	_test_eof577:  m.cs = 577; goto _test_eof
+	_test_eof578:  m.cs = 578; goto _test_eof
+	_test_eof579:  m.cs = 579; goto _test_eof
+	_test_eof580:  m.cs = 580; goto _test_eof
+	_test_eof581:  m.cs = 581; goto _test_eof
+	_test_eof582:  m.cs = 582; goto _test_eof
+	_test_eof583:  m.cs = 583; goto _test_eof
 	_test_eof175:  m.cs = 175; goto _test_eof
 	_test_eof176:  m.cs = 176; goto _test_eof
 	_test_eof177:  m.cs = 177; goto _test_eof
-	_test_eof577:  m.cs = 577; goto _test_eof
+	_test_eof584:  m.cs = 584; goto _test_eof
 	_test_eof178:  m.cs = 178; goto _test_eof
 	_test_eof179:  m.cs = 179; goto _test_eof
 	_test_eof180:  m.cs = 180; goto _test_eof
-	_test_eof578:  m.cs = 578; goto _test_eof
+	_test_eof585:  m.cs = 585; goto _test_eof
 	_test_eof181:  m.cs = 181; goto _test_eof
 	_test_eof182:  m.cs = 182; goto _test_eof
-	_test_eof579:  m.cs = 579; goto _test_eof
-	_test_eof580:  m.cs = 580; goto _test_eof
-	_test_eof183:  m.cs = 183; goto _test_eof
-	_test_eof184:  m.cs = 184; goto _test_eof
-	_test_eof581:  m.cs = 581; goto _test_eof
-	_test_eof185:  m.cs = 185; goto _test_eof
-	_test_eof186:  m.cs = 186; goto _test_eof
-	_test_eof582:  m.cs = 582; goto _test_eof
-	_test_eof583:  m.cs = 583; goto _test_eof
-	_test_eof584:  m.cs = 584; goto _test_eof
-	_test_eof585:  m.cs = 585; goto _test_eof
 	_test_eof586:  m.cs = 586; goto _test_eof
 	_test_eof587:  m.cs = 587; goto _test_eof
+	_test_eof183:  m.cs = 183; goto _test_eof
+	_test_eof184:  m.cs = 184; goto _test_eof
 	_test_eof588:  m.cs = 588; goto _test_eof
+	_test_eof185:  m.cs = 185; goto _test_eof
+	_test_eof186:  m.cs = 186; goto _test_eof
 	_test_eof589:  m.cs = 589; goto _test_eof
+	_test_eof590:  m.cs = 590; goto _test_eof
+	_test_eof591:  m.cs = 591; goto _test_eof
+	_test_eof592:  m.cs = 592; goto _test_eof
+	_test_eof593:  m.cs = 593; goto _test_eof
+	_test_eof594:  m.cs = 594; goto _test_eof
+	_test_eof595:  m.cs = 595; goto _test_eof
+	_test_eof596:  m.cs = 596; goto _test_eof
 	_test_eof187:  m.cs = 187; goto _test_eof
 	_test_eof188:  m.cs = 188; goto _test_eof
 	_test_eof189:  m.cs = 189; goto _test_eof
-	_test_eof590:  m.cs = 590; goto _test_eof
+	_test_eof597:  m.cs = 597; goto _test_eof
 	_test_eof190:  m.cs = 190; goto _test_eof
 	_test_eof191:  m.cs = 191; goto _test_eof
 	_test_eof192:  m.cs = 192; goto _test_eof
-	_test_eof591:  m.cs = 591; goto _test_eof
+	_test_eof598:  m.cs = 598; goto _test_eof
 	_test_eof193:  m.cs = 193; goto _test_eof
 	_test_eof194:  m.cs = 194; goto _test_eof
-	_test_eof592:  m.cs = 592; goto _test_eof
-	_test_eof593:  m.cs = 593; goto _test_eof
+	_test_eof599:  m.cs = 599; goto _test_eof
+	_test_eof600:  m.cs = 600; goto _test_eof
 	_test_eof195:  m.cs = 195; goto _test_eof
-	_test_eof594:  m.cs = 594; goto _test_eof
+	_test_eof601:  m.cs = 601; goto _test_eof
 	_test_eof196:  m.cs = 196; goto _test_eof
-	_test_eof595:  m.cs = 595; goto _test_eof
-	_test_eof596:  m.cs = 596; goto _test_eof
+	_test_eof602:  m.cs = 602; goto _test_eof
+	_test_eof603:  m.cs = 603; goto _test_eof
 	_test_eof197:  m.cs = 197; goto _test_eof
 	_test_eof198:  m.cs = 198; goto _test_eof
+	_test_eof199:  m.cs = 199; goto _test_eof
+	_test_eof604:  m.cs = 604; goto _test_eof
+	_test_eof605:  m.cs = 605; goto _test_eof
+	_test_eof606:  m.cs = 606; goto _test_eof
+	_test_eof200:  m.cs = 200; goto _test_eof
+	_test_eof201:  m.cs = 201; goto _test_eof
+	_test_eof202:  m.cs = 202; goto _test_eof
+	_test_eof607:  m.cs = 607; goto _test_eof
+	_test_eof203:  m.cs = 203; goto _test_eof
+	_test_eof204:  m.cs = 204; goto _test_eof
+	_test_eof205:  m.cs = 205; goto _test_eof
 
 	_test_eof: {}
 	if ( m.p) == ( m.eof) {
 		switch  m.cs {
-		case 199, 200, 201, 203, 236, 237, 239, 258, 259, 261, 280, 282, 310, 311, 312, 313, 315, 316, 317, 336, 337, 339, 358, 359, 361, 380, 381, 396, 397, 398, 400, 419, 420, 422, 423, 424, 443, 444, 445, 446, 448, 467, 468, 469, 471, 490, 491, 493, 494, 495, 515, 530, 531, 533, 566, 595, 596:
+		case 206, 207, 208, 210, 243, 244, 246, 265, 266, 268, 287, 289, 317, 318, 319, 320, 322, 323, 324, 343, 344, 346, 365, 366, 368, 387, 388, 403, 404, 405, 407, 426, 427, 429, 430, 431, 450, 451, 452, 453, 455, 474, 475, 476, 478, 497, 498, 500, 501, 502, 522, 537, 538, 540, 573, 602, 603, 605, 606:
 //line plugins/parsers/influx/machine.go.rl:22
 
 	yield = true
@@ -22867,7 +23284,7 @@ tr341:
 	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 28, 29, 30, 36, 37:
+		case 28, 29, 30, 36, 37, 200, 201, 202, 203, 204:
 //line plugins/parsers/influx/machine.go.rl:42
 
 	m.err = ErrTagParse
@@ -22901,7 +23318,29 @@ tr341:
 	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 226, 286, 300, 386, 519, 555, 571, 584:
+		case 604:
+//line plugins/parsers/influx/machine.go.rl:72
+
+	m.handler.SetMeasurement(m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 196;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 607:
+//line plugins/parsers/influx/machine.go.rl:80
+
+	m.handler.AddTag(key, m.text())
+
+//line plugins/parsers/influx/machine.go.rl:22
+
+	yield = true
+	 m.cs = 196;
+	{( m.p)++;  m.cs = 0; goto _out }
+
+		case 233, 293, 307, 393, 526, 562, 578, 591:
 //line plugins/parsers/influx/machine.go.rl:88
 
 	m.handler.AddInt(key, m.text())
@@ -22912,7 +23351,7 @@ tr341:
 	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 229, 289, 303, 389, 522, 558, 574, 587:
+		case 236, 296, 310, 396, 529, 565, 581, 594:
 //line plugins/parsers/influx/machine.go.rl:92
 
 	m.handler.AddUint(key, m.text())
@@ -22923,7 +23362,7 @@ tr341:
 	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 222, 223, 224, 225, 227, 228, 230, 281, 283, 284, 285, 287, 288, 290, 296, 297, 298, 299, 301, 302, 304, 382, 383, 384, 385, 387, 388, 390, 514, 516, 517, 518, 520, 521, 523, 529, 552, 553, 554, 556, 557, 559, 565, 567, 568, 569, 570, 572, 573, 575, 581, 582, 583, 585, 586, 588:
+		case 229, 230, 231, 232, 234, 235, 237, 288, 290, 291, 292, 294, 295, 297, 303, 304, 305, 306, 308, 309, 311, 389, 390, 391, 392, 394, 395, 397, 521, 523, 524, 525, 527, 528, 530, 536, 559, 560, 561, 563, 564, 566, 572, 574, 575, 576, 577, 579, 580, 582, 588, 589, 590, 592, 593, 595:
 //line plugins/parsers/influx/machine.go.rl:96
 
 	m.handler.AddFloat(key, m.text())
@@ -22934,7 +23373,7 @@ tr341:
 	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 231, 232, 233, 234, 235, 291, 292, 293, 294, 295, 305, 306, 307, 308, 309, 391, 392, 393, 394, 395, 524, 525, 526, 527, 528, 560, 561, 562, 563, 564, 576, 577, 578, 579, 580, 589, 590, 591, 592, 593:
+		case 238, 239, 240, 241, 242, 298, 299, 300, 301, 302, 312, 313, 314, 315, 316, 398, 399, 400, 401, 402, 531, 532, 533, 534, 535, 567, 568, 569, 570, 571, 583, 584, 585, 586, 587, 596, 597, 598, 599, 600:
 //line plugins/parsers/influx/machine.go.rl:100
 
 	m.handler.AddBool(key, m.text())
@@ -22945,7 +23384,7 @@ tr341:
 	 m.cs = 196;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-		case 202, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 238, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 260, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 314, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 338, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 360, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 399, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 421, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 447, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 470, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 492, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 532, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551:
+		case 209, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 245, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 267, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 321, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 345, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 367, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 406, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 428, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 454, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 477, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 499, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 539, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558:
 //line plugins/parsers/influx/machine.go.rl:108
 
 	m.handler.SetTimestamp(m.text())
@@ -23064,14 +23503,14 @@ tr341:
 	 m.cs = 195;
 	{( m.p)++;  m.cs = 0; goto _out }
 
-//line plugins/parsers/influx/machine.go:23068
+//line plugins/parsers/influx/machine.go:23507
 		}
 	}
 
 	_out: {}
 	}
 
-//line plugins/parsers/influx/machine.go.rl:288
+//line plugins/parsers/influx/machine.go.rl:308
 
 	// Even if there was an error, return true. On the next call to this
 	// function we will attempt to scan to the next line of input and recover.
diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
index df65a05d9..c8cf0bee9 100644
--- a/plugins/parsers/influx/machine.go.rl
+++ b/plugins/parsers/influx/machine.go.rl
@@ -221,6 +221,8 @@ discard_line :=
 # main machine.
 align :=
 	(space* comment)* space* measurement_start @hold_recover %eof(yield);
+
+series := measurement tagset $err(parse_error) eol;
 }%%
 
 %% write data;
@@ -242,12 +244,30 @@ type machine struct {
 	p, pe, eof int
 	pb         int
 	handler    Handler
+	initState  int
 	err        error
 }
 
 func NewMachine(handler Handler) *machine {
 	m := &machine{
 		handler: handler,
+		initState: LineProtocol_en_align,
+	}
+
+	%% access m.;
+	%% variable p m.p;
+	%% variable pe m.pe;
+	%% variable eof m.eof;
+	%% variable data m.data;
+	%% write init;
+
+	return m
+}
+
+func NewSeriesMachine(handler Handler) *machine {
+	m := &machine{
+		handler: handler,
+		initState: LineProtocol_en_series,
 	}
 
 	%% access m.;
@@ -269,7 +289,7 @@ func (m *machine) SetData(data []byte) {
 	m.err = nil
 
 	%% write init;
-	m.cs = LineProtocol_en_align
+	m.cs = m.initState
 }
 
 // ParseLine parses a line of input and returns true if more data can be
diff --git a/plugins/parsers/influx/machine_test.go b/plugins/parsers/influx/machine_test.go
index 6aabcb69a..1c617919b 100644
--- a/plugins/parsers/influx/machine_test.go
+++ b/plugins/parsers/influx/machine_test.go
@@ -1390,3 +1390,80 @@ func BenchmarkMachineProcstat(b *testing.B) {
 		}
 	}
 }
+
+func TestSeriesMachine(t *testing.T) {
+	var tests = []struct {
+		name    string
+		input   []byte
+		results []Result
+		err     error
+	}{
+		{
+			name:    "empty string",
+			input:   []byte(""),
+			results: nil,
+		},
+		{
+			name:  "no tags",
+			input: []byte("cpu"),
+			results: []Result{
+				Result{
+					Name:  Measurement,
+					Value: []byte("cpu"),
+				},
+			},
+		},
+		{
+			name:  "tags",
+			input: []byte("cpu,a=x,b=y"),
+			results: []Result{
+				Result{
+					Name:  Measurement,
+					Value: []byte("cpu"),
+				},
+				Result{
+					Name:  TagKey,
+					Value: []byte("a"),
+				},
+				Result{
+					Name:  TagValue,
+					Value: []byte("x"),
+				},
+				Result{
+					Name:  TagKey,
+					Value: []byte("b"),
+				},
+				Result{
+					Name:  TagValue,
+					Value: []byte("y"),
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := &TestingHandler{}
+			fsm := NewSeriesMachine(handler)
+			fsm.SetData(tt.input)
+
+			count := 0
+			for fsm.ParseLine() {
+				if fsm.Err() != nil {
+					handler.AddError(fsm.Err())
+				}
+				count++
+				if count > 20 {
+					break
+				}
+			}
+
+			if fsm.Err() != nil {
+				handler.AddError(fsm.Err())
+			}
+
+			results := handler.Results()
+			require.Equal(t, tt.results, results)
+		})
+	}
+}
diff --git a/plugins/parsers/influx/parser.go b/plugins/parsers/influx/parser.go
index 53acd5eff..0b16a2a39 100644
--- a/plugins/parsers/influx/parser.go
+++ b/plugins/parsers/influx/parser.go
@@ -38,6 +38,7 @@ type Parser struct {
 	handler *MetricHandler
 }
 
+// NewParser returns a Parser than accepts line protocol
 func NewParser(handler *MetricHandler) *Parser {
 	return &Parser{
 		machine: NewMachine(handler),
@@ -45,6 +46,14 @@ func NewParser(handler *MetricHandler) *Parser {
 	}
 }
 
+// NewSeriesParser returns a Parser than accepts a measurement and tagset
+func NewSeriesParser(handler *MetricHandler) *Parser {
+	return &Parser{
+		machine: NewSeriesMachine(handler),
+		handler: handler,
+	}
+}
+
 func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
 	p.Lock()
 	defer p.Unlock()
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index a885a7712..05a797442 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -616,3 +616,83 @@ func BenchmarkParser(b *testing.B) {
 		})
 	}
 }
+
+func TestSeriesParser(t *testing.T) {
+	var tests = []struct {
+		name      string
+		input     []byte
+		timeFunc  func() time.Time
+		precision time.Duration
+		metrics   []telegraf.Metric
+		err       error
+	}{
+		{
+			name:    "empty",
+			input:   []byte(""),
+			metrics: []telegraf.Metric{},
+		},
+		{
+			name:  "minimal",
+			input: []byte("cpu"),
+			metrics: []telegraf.Metric{
+				Metric(
+					metric.New(
+						"cpu",
+						map[string]string{},
+						map[string]interface{}{},
+						time.Unix(0, 0),
+					),
+				),
+			},
+		},
+		{
+			name:  "tags",
+			input: []byte("cpu,a=x,b=y"),
+			metrics: []telegraf.Metric{
+				Metric(
+					metric.New(
+						"cpu",
+						map[string]string{
+							"a": "x",
+							"b": "y",
+						},
+						map[string]interface{}{},
+						time.Unix(0, 0),
+					),
+				),
+			},
+		},
+		{
+			name:    "missing tag value",
+			input:   []byte("cpu,a="),
+			metrics: []telegraf.Metric{},
+			err: &ParseError{
+				Offset: 6,
+				msg:    ErrTagParse.Error(),
+				buf:    "cpu,a=",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := NewMetricHandler()
+			handler.SetTimeFunc(DefaultTime)
+			if tt.timeFunc != nil {
+				handler.SetTimeFunc(tt.timeFunc)
+			}
+			if tt.precision > 0 {
+				handler.SetTimePrecision(tt.precision)
+			}
+			parser := NewSeriesParser(handler)
+
+			metrics, err := parser.Parse(tt.input)
+			require.Equal(t, tt.err, err)
+
+			require.Equal(t, len(tt.metrics), len(metrics))
+			for i, expected := range tt.metrics {
+				require.Equal(t, expected.Name(), metrics[i].Name())
+				require.Equal(t, expected.Tags(), metrics[i].Tags())
+			}
+		})
+	}
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
index 177726dbb..58fce1722 100644
--- a/plugins/parsers/registry.go
+++ b/plugins/parsers/registry.go
@@ -26,11 +26,15 @@ type Parser interface {
 	// Parse takes a byte buffer separated by newlines
 	// ie, `cpu.usage.idle 90\ncpu.usage.busy 10`
 	// and parses it into telegraf metrics
+	//
+	// Must be thread-safe.
 	Parse(buf []byte) ([]telegraf.Metric, error)
 
 	// ParseLine takes a single string metric
 	// ie, "cpu.usage.idle 90"
 	// and parses it into a telegraf metric.
+	//
+	// Must be thread-safe.
 	ParseLine(line string) (telegraf.Metric, error)
 
 	// SetDefaultTags tells the parser to add all of the given tags
@@ -107,9 +111,15 @@ func NewParser(config *Config) (Parser, error) {
 		parser, err = NewCollectdParser(config.CollectdAuthFile,
 			config.CollectdSecurityLevel, config.CollectdTypesDB)
 	case "dropwizard":
-		parser, err = NewDropwizardParser(config.DropwizardMetricRegistryPath,
-			config.DropwizardTimePath, config.DropwizardTimeFormat, config.DropwizardTagsPath, config.DropwizardTagPathsMap, config.DefaultTags,
-			config.Separator, config.Templates)
+		parser, err = NewDropwizardParser(
+			config.DropwizardMetricRegistryPath,
+			config.DropwizardTimePath,
+			config.DropwizardTimeFormat,
+			config.DropwizardTagsPath,
+			config.DropwizardTagPathsMap,
+			config.DefaultTags,
+			config.Separator,
+			config.Templates)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
@@ -177,17 +187,16 @@ func NewDropwizardParser(
 	templates []string,
 
 ) (Parser, error) {
-	parser := &dropwizard.Parser{
-		MetricRegistryPath: metricRegistryPath,
-		TimePath:           timePath,
-		TimeFormat:         timeFormat,
-		TagsPath:           tagsPath,
-		TagPathsMap:        tagPathsMap,
-		DefaultTags:        defaultTags,
-		Separator:          separator,
-		Templates:          templates,
+	parser := dropwizard.NewParser()
+	parser.MetricRegistryPath = metricRegistryPath
+	parser.TimePath = timePath
+	parser.TimeFormat = timeFormat
+	parser.TagsPath = tagsPath
+	parser.TagPathsMap = tagPathsMap
+	parser.DefaultTags = defaultTags
+	err := parser.SetTemplates(separator, templates)
+	if err != nil {
+		return nil, err
 	}
-	err := parser.InitTemplating()
-
 	return parser, err
 }

From d19a33dd6f7a3d070484bfa66cc2fd45960dd3c0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 14 May 2018 11:01:24 -0700
Subject: [PATCH 1176/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9172f2959..2b738d180 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,8 +49,9 @@
 ### Bugfixes
 
 - [4127](https://github.com/influxdata/telegraf/issues/4127): Fix intermittent panic in aerospike input.
-- [4130](https://github.com/influxdata/telegraf/issues/4130): Fix connection leak in jolokia2_agent
+- [4130](https://github.com/influxdata/telegraf/issues/4130): Fix connection leak in jolokia2_agent.
 - [4136](https://github.com/influxdata/telegraf/pull/4130): Fix jolokia2 timeout parsing.
+- [4142](https://github.com/influxdata/telegraf/pull/4142): Fix error parsing dropwizard metrics.
 
 ## v1.6.2 [2018-05-08]
 

From 190a4128c57a7f1d83d48d4efcb3087ff645b125 Mon Sep 17 00:00:00 2001
From: Dark <ekdxhrl0096@gmail.com>
Date: Tue, 15 May 2018 09:15:40 +0900
Subject: [PATCH 1177/1302] Add HTTP output plugin (#2491)

---
 plugins/outputs/all/all.go        |   1 +
 plugins/outputs/http/README.md    |  28 ++++
 plugins/outputs/http/http.go      | 151 ++++++++++++++++++
 plugins/outputs/http/http_test.go | 244 ++++++++++++++++++++++++++++++
 4 files changed, 424 insertions(+)
 create mode 100644 plugins/outputs/http/README.md
 create mode 100644 plugins/outputs/http/http.go
 create mode 100644 plugins/outputs/http/http_test.go

diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 5e74eb796..94f5149b4 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -11,6 +11,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/file"
 	_ "github.com/influxdata/telegraf/plugins/outputs/graphite"
 	_ "github.com/influxdata/telegraf/plugins/outputs/graylog"
+	_ "github.com/influxdata/telegraf/plugins/outputs/http"
 	_ "github.com/influxdata/telegraf/plugins/outputs/influxdb"
 	_ "github.com/influxdata/telegraf/plugins/outputs/instrumental"
 	_ "github.com/influxdata/telegraf/plugins/outputs/kafka"
diff --git a/plugins/outputs/http/README.md b/plugins/outputs/http/README.md
new file mode 100644
index 000000000..b7dd75276
--- /dev/null
+++ b/plugins/outputs/http/README.md
@@ -0,0 +1,28 @@
+# HTTP Output Plugin
+
+This plugin writes to a HTTP Server using the `POST Method`.
+
+Data collected from telegraf is sent in the Request Body.
+
+### Configuration:
+
+```toml
+# Send telegraf metrics to HTTP Server(s)
+[[outputs.http]]
+  ## It requires a url name.
+  ## Will be transmitted telegraf metrics to the HTTP Server using the below URL.
+  ## Note that not support the HTTPS.
+  url = "http://127.0.0.1:8080/metric"
+  ## Configure dial timeout in seconds. Default : 3
+  timeout = 3
+  ## http_headers option can add a custom header to the request.
+  ## Content-Type is required http header in http plugin.
+  ## so content-type of HTTP specification (plain/text, application/json, etc...) must be filled out.
+  [outputs.http.headers]
+    Content-Type = "plain/text"
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+```
diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
new file mode 100644
index 000000000..e78031b8c
--- /dev/null
+++ b/plugins/outputs/http/http.go
@@ -0,0 +1,151 @@
+package http
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/influxdata/telegraf/plugins/serializers"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
+)
+
+var sampleConfig = `
+  ## It requires a url name.
+  ## Will be transmitted telegraf metrics to the HTTP Server using the below URL.
+  ## Note that not support the HTTPS.
+  url = "http://127.0.0.1:8080/metric"
+  ## Configure dial timeout in seconds. Default : 3
+  timeout = 3
+  ## http_headers option can add a custom header to the request.
+  ## Content-Type is required http header in http plugin.
+  ## so content-type of HTTP specification (plain/text, application/json, etc...) must be filled out.
+  [outputs.http.headers]
+    Content-Type = "plain/text"
+  ## Data format to output.
+  ## Each data format has it's own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "influx"
+`
+
+const (
+	POST = "POST"
+
+	DEFAULT_TIME_OUT = 3
+
+	CONTENT_TYPE = "content-type"
+)
+
+type Http struct {
+	// http required option
+	URL     string `toml:"url"`
+	Headers map[string]string
+
+	// Option with http default value
+	Timeout int `toml:"timeout"`
+
+	client     http.Client
+	serializer serializers.Serializer
+}
+
+func (h *Http) SetSerializer(serializer serializers.Serializer) {
+	h.serializer = serializer
+}
+
+// Connect to the Output
+func (h *Http) Connect() error {
+	h.client = http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
+		Timeout: time.Duration(h.Timeout) * time.Second,
+	}
+
+	var isValid bool
+
+	for k := range h.Headers {
+		if strings.ToLower(k) == CONTENT_TYPE {
+			isValid = true
+		}
+	}
+
+	if !isValid {
+		return fmt.Errorf("E! httpHeader require content-type!")
+	}
+
+	return nil
+}
+
+// Close is not implemented. Because http.Client not provided connection close policy. Instead, uses the response.Body.Close() pattern.
+func (h *Http) Close() error {
+	return nil
+}
+
+// Description A plugin that can transmit metrics over HTTP
+func (h *Http) Description() string {
+	return "A plugin that can transmit metrics over HTTP"
+}
+
+// SampleConfig provides sample example for developer
+func (h *Http) SampleConfig() string {
+	return sampleConfig
+}
+
+// Writes metrics over HTTP POST
+func (h *Http) Write(metrics []telegraf.Metric) error {
+	reqBody, err := h.serializer.SerializeBatch(metrics)
+
+	if err != nil {
+		return fmt.Errorf("E! Error serializing some metrics: %s", err.Error())
+	}
+
+	if err := h.write(reqBody); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (h *Http) write(reqBody []byte) error {
+	req, err := http.NewRequest(POST, h.URL, bytes.NewBuffer(reqBody))
+
+	for k, v := range h.Headers {
+		req.Header.Set(k, v)
+	}
+
+	resp, err := h.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	_, err = ioutil.ReadAll(resp.Body)
+
+	if err := h.isOk(resp, err); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (h *Http) isOk(resp *http.Response, err error) error {
+	if resp == nil || err != nil {
+		return fmt.Errorf("E! %s request failed! %s.", h.URL, err.Error())
+	}
+
+	if resp.StatusCode < 200 || resp.StatusCode > 209 {
+		return fmt.Errorf("received bad status code, %d\n", resp.StatusCode)
+	}
+
+	return nil
+}
+
+func init() {
+	outputs.Add("http", func() telegraf.Output {
+		return &Http{
+			Timeout: DEFAULT_TIME_OUT,
+		}
+	})
+}
diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go
new file mode 100644
index 000000000..aa9c68eba
--- /dev/null
+++ b/plugins/outputs/http/http_test.go
@@ -0,0 +1,244 @@
+package http
+
+import (
+	"fmt"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/serializers/graphite"
+	"github.com/influxdata/telegraf/plugins/serializers/json"
+	"github.com/stretchr/testify/assert"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+)
+
+var (
+	cpuTags = map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+
+	cpuField = map[string]interface{}{
+		"usage_idle": float64(91.5),
+	}
+
+	memTags = map[string]string{
+		"host":       "localhost",
+		"cpu":        "mem",
+		"datacenter": "us-west-2",
+	}
+
+	memField = map[string]interface{}{
+		"used": float64(91.5),
+	}
+
+	count int
+)
+
+type TestOkHandler struct {
+	T        *testing.T
+	Expected []string
+}
+
+// The handler gets a new variable each time it receives a request, so it fetches an expected string based on global variable.
+func (h TestOkHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	actual, _ := ioutil.ReadAll(r.Body)
+
+	assert.Equal(h.T, h.Expected[count], string(actual), fmt.Sprintf("%d Expected fail!", count))
+
+	count++
+
+	fmt.Fprint(w, "ok")
+}
+
+type TestNotFoundHandler struct {
+}
+
+func (h TestNotFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	http.NotFound(w, r)
+}
+
+func TestWriteAllInputMetric(t *testing.T) {
+	now := time.Now()
+
+	server := httptest.NewServer(&TestOkHandler{
+		T: t,
+		Expected: []string{
+			fmt.Sprintf("telegraf.cpu0.us-west-2.localhost.cpu.usage_idle 91.5 %d\ntelegraf.mem.us-west-2.localhost.mem.used 91.5 %d\n", now.Unix(), now.Unix()),
+		},
+	})
+	defer server.Close()
+	defer resetCount()
+
+	m1, _ := metric.New("cpu", cpuTags, cpuField, now)
+	m2, _ := metric.New("mem", memTags, memField, now)
+	metrics := []telegraf.Metric{m1, m2}
+
+	http := &Http{
+		URL: server.URL,
+		Headers: map[string]string{
+			"Content-Type": "plain/text",
+		},
+	}
+
+	http.SetSerializer(&graphite.GraphiteSerializer{
+		Prefix:   "telegraf",
+		Template: "tags.measurement.field",
+	})
+
+	http.Connect()
+	err := http.Write(metrics)
+
+	assert.NoError(t, err)
+}
+
+func TestHttpWriteWithUnexpected404StatusCode(t *testing.T) {
+	now := time.Now()
+
+	server := httptest.NewServer(&TestNotFoundHandler{})
+	defer server.Close()
+
+	m, _ := metric.New("cpu", cpuTags, cpuField, now)
+	metrics := []telegraf.Metric{m}
+
+	http := &Http{
+		URL: server.URL,
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+
+	http.SetSerializer(&graphite.GraphiteSerializer{
+		Prefix:   "telegraf",
+		Template: "tags.measurement.field",
+	})
+
+	http.Connect()
+	err := http.Write(metrics)
+
+	assert.Error(t, err)
+}
+
+func TestHttpWriteWithExpected404StatusCode(t *testing.T) {
+	now := time.Now()
+
+	server := httptest.NewServer(&TestNotFoundHandler{})
+	defer server.Close()
+
+	m, _ := metric.New("cpu", cpuTags, cpuField, now)
+	metrics := []telegraf.Metric{m}
+
+	http := &Http{
+		URL: server.URL,
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+
+	http.SetSerializer(&graphite.GraphiteSerializer{
+		Prefix:   "telegraf",
+		Template: "tags.measurement.field",
+	})
+
+	http.Connect()
+	err := http.Write(metrics)
+
+	assert.Error(t, err)
+}
+
+func TestHttpWriteWithIncorrectServerPort(t *testing.T) {
+	now := time.Now()
+
+	m, _ := metric.New("cpu", cpuTags, cpuField, now)
+	metrics := []telegraf.Metric{m}
+
+	http := &Http{
+		URL: "http://127.0.0.1:56879/incorrect/url",
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+
+	http.SetSerializer(&graphite.GraphiteSerializer{
+		Prefix:   "telegraf",
+		Template: "tags.measurement.field",
+	})
+
+	http.Connect()
+	err := http.Write(metrics)
+
+	assert.Error(t, err)
+}
+
+func TestHttpWriteWithHttpSerializer(t *testing.T) {
+	now := time.Now()
+
+	server := httptest.NewServer(&TestOkHandler{
+		T: t,
+		Expected: []string{
+			fmt.Sprintf("{\"metrics\":[{\"fields\":{\"usage_idle\":91.5},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\",\"datacenter\":\"us-west-2\",\"host\":\"localhost\"},\"timestamp\":%d},{\"fields\":{\"usage_idle\":91.5},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\",\"datacenter\":\"us-west-2\",\"host\":\"localhost\"},\"timestamp\":%d}]}", now.Unix(), now.Unix()),
+		},
+	})
+
+	defer server.Close()
+
+	http := &Http{
+		URL: server.URL,
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+	jsonSerializer, _ := json.NewSerializer(time.Second)
+	http.SetSerializer(jsonSerializer)
+
+	m1, _ := metric.New("cpu", cpuTags, cpuField, now)
+	m2, _ := metric.New("cpu", cpuTags, cpuField, now)
+	metrics := []telegraf.Metric{m1, m2}
+
+	http.Connect()
+	err := http.Write(metrics)
+
+	assert.Nil(t, err)
+}
+
+func TestHttpWithoutContentType(t *testing.T) {
+	http := &Http{
+		URL: "http://127.0.0.1:56879/correct/url",
+	}
+
+	err := http.Connect()
+
+	assert.Error(t, err)
+}
+
+func TestHttpWithContentType(t *testing.T) {
+	http := &Http{
+		URL: "http://127.0.0.1:56879/correct/url",
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+
+	err := http.Connect()
+
+	assert.Nil(t, err)
+}
+
+func TestImplementedInterfaceFunction(t *testing.T) {
+	http := &Http{
+		URL: "http://127.0.0.1:56879/incorrect/url",
+		Headers: map[string]string{
+			"Content-Type": "application/json",
+		},
+	}
+
+	assert.NotNil(t, http.SampleConfig())
+	assert.NotNil(t, http.Description())
+}
+
+func resetCount() {
+	count = 0
+}

From d5f57715dc80b4c5e8c001db39cd486ea6164e59 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 14 May 2018 17:11:44 -0700
Subject: [PATCH 1178/1302] Add method, basic auth, and tls support to http
 output

---
 plugins/outputs/http/README.md    |  43 ++-
 plugins/outputs/http/http.go      | 152 +++++-----
 plugins/outputs/http/http_test.go | 441 +++++++++++++++++-------------
 3 files changed, 351 insertions(+), 285 deletions(-)

diff --git a/plugins/outputs/http/README.md b/plugins/outputs/http/README.md
index b7dd75276..2af3fb27a 100644
--- a/plugins/outputs/http/README.md
+++ b/plugins/outputs/http/README.md
@@ -1,28 +1,41 @@
 # HTTP Output Plugin
 
-This plugin writes to a HTTP Server using the `POST Method`.
-
-Data collected from telegraf is sent in the Request Body.
+This plugin sends metrics in a HTTP message encoded using one of the output
+data formats.  For data_formats that support batching, metrics are sent in batch format.
 
 ### Configuration:
 
 ```toml
-# Send telegraf metrics to HTTP Server(s)
+# A plugin that can transmit metrics over HTTP
 [[outputs.http]]
-  ## It requires a url name.
-  ## Will be transmitted telegraf metrics to the HTTP Server using the below URL.
-  ## Note that not support the HTTPS.
+  ## URL is the address to send metrics to
   url = "http://127.0.0.1:8080/metric"
-  ## Configure dial timeout in seconds. Default : 3
-  timeout = 3
-  ## http_headers option can add a custom header to the request.
-  ## Content-Type is required http header in http plugin.
-  ## so content-type of HTTP specification (plain/text, application/json, etc...) must be filled out.
-  [outputs.http.headers]
-    Content-Type = "plain/text"
+
+  ## Timeout for HTTP message
+  # timeout = "5s"
+
+  ## HTTP method, one of: "POST" or "PUT"
+  # method = "POST"
+
+  ## HTTP Basic Auth credentials
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Additional HTTP headers
+  # [outputs.http.headers]
+  #   # Should be set manually to "application/json" for json data_format
+  #   Content-Type = "text/plain; charset=utf-8"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Data format to output.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "influx"
+  # data_format = "influx"
 ```
diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
index e78031b8c..4b769a467 100644
--- a/plugins/outputs/http/http.go
+++ b/plugins/outputs/http/http.go
@@ -3,103 +3,119 @@ package http
 import (
 	"bytes"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/outputs"
-	"github.com/influxdata/telegraf/plugins/serializers"
 	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/influxdata/telegraf/plugins/serializers"
 )
 
 var sampleConfig = `
-  ## It requires a url name.
-  ## Will be transmitted telegraf metrics to the HTTP Server using the below URL.
-  ## Note that not support the HTTPS.
+  ## URL is the address to send metrics to
   url = "http://127.0.0.1:8080/metric"
-  ## Configure dial timeout in seconds. Default : 3
-  timeout = 3
-  ## http_headers option can add a custom header to the request.
-  ## Content-Type is required http header in http plugin.
-  ## so content-type of HTTP specification (plain/text, application/json, etc...) must be filled out.
-  [outputs.http.headers]
-    Content-Type = "plain/text"
+
+  ## Timeout for HTTP message
+  # timeout = "5s"
+
+  ## HTTP method, one of: "POST" or "PUT"
+  # method = "POST"
+
+  ## HTTP Basic Auth credentials
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Additional HTTP headers
+  # [outputs.http.headers]
+  #   # Should be set to "application/json" for json data_format
+  #   Content-Type = "text/plain; charset=utf-8"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+
   ## Data format to output.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "influx"
+  # data_format = "influx"
 `
 
 const (
-	POST = "POST"
-
-	DEFAULT_TIME_OUT = 3
-
-	CONTENT_TYPE = "content-type"
+	defaultClientTimeout = 5 * time.Second
+	defaultContentType   = "text/plain; charset=utf-8"
+	defaultMethod        = http.MethodPost
 )
 
-type Http struct {
-	// http required option
-	URL     string `toml:"url"`
-	Headers map[string]string
+type HTTP struct {
+	URL      string            `toml:"url"`
+	Timeout  internal.Duration `toml:"timeout"`
+	Method   string            `toml:"method"`
+	Username string            `toml:"username"`
+	Password string            `toml:"password"`
+	Headers  map[string]string `toml:"headers"`
+	tls.ClientConfig
 
-	// Option with http default value
-	Timeout int `toml:"timeout"`
-
-	client     http.Client
+	client     *http.Client
 	serializer serializers.Serializer
 }
 
-func (h *Http) SetSerializer(serializer serializers.Serializer) {
+func (h *HTTP) SetSerializer(serializer serializers.Serializer) {
 	h.serializer = serializer
 }
 
-// Connect to the Output
-func (h *Http) Connect() error {
-	h.client = http.Client{
+func (h *HTTP) Connect() error {
+	if h.Method == "" {
+		h.Method = http.MethodPost
+	}
+	h.Method = strings.ToUpper(h.Method)
+	if h.Method != http.MethodPost && h.Method != http.MethodPut {
+		return fmt.Errorf("invalid method [%s] %s", h.URL, h.Method)
+	}
+
+	if h.Timeout.Duration == 0 {
+		h.Timeout.Duration = defaultClientTimeout
+	}
+
+	tlsCfg, err := h.ClientConfig.TLSConfig()
+	if err != nil {
+		return err
+	}
+
+	h.client = &http.Client{
 		Transport: &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: tlsCfg,
+			Proxy:           http.ProxyFromEnvironment,
 		},
-		Timeout: time.Duration(h.Timeout) * time.Second,
-	}
-
-	var isValid bool
-
-	for k := range h.Headers {
-		if strings.ToLower(k) == CONTENT_TYPE {
-			isValid = true
-		}
-	}
-
-	if !isValid {
-		return fmt.Errorf("E! httpHeader require content-type!")
+		Timeout: h.Timeout.Duration,
 	}
 
 	return nil
 }
 
-// Close is not implemented. Because http.Client not provided connection close policy. Instead, uses the response.Body.Close() pattern.
-func (h *Http) Close() error {
+func (h *HTTP) Close() error {
 	return nil
 }
 
-// Description A plugin that can transmit metrics over HTTP
-func (h *Http) Description() string {
+func (h *HTTP) Description() string {
 	return "A plugin that can transmit metrics over HTTP"
 }
 
-// SampleConfig provides sample example for developer
-func (h *Http) SampleConfig() string {
+func (h *HTTP) SampleConfig() string {
 	return sampleConfig
 }
 
-// Writes metrics over HTTP POST
-func (h *Http) Write(metrics []telegraf.Metric) error {
+func (h *HTTP) Write(metrics []telegraf.Metric) error {
 	reqBody, err := h.serializer.SerializeBatch(metrics)
-
 	if err != nil {
-		return fmt.Errorf("E! Error serializing some metrics: %s", err.Error())
+		return err
 	}
 
 	if err := h.write(reqBody); err != nil {
@@ -109,9 +125,10 @@ func (h *Http) Write(metrics []telegraf.Metric) error {
 	return nil
 }
 
-func (h *Http) write(reqBody []byte) error {
-	req, err := http.NewRequest(POST, h.URL, bytes.NewBuffer(reqBody))
+func (h *HTTP) write(reqBody []byte) error {
+	req, err := http.NewRequest(h.Method, h.URL, bytes.NewBuffer(reqBody))
 
+	req.Header.Set("Content-Type", defaultContentType)
 	for k, v := range h.Headers {
 		req.Header.Set(k, v)
 	}
@@ -123,20 +140,8 @@ func (h *Http) write(reqBody []byte) error {
 	defer resp.Body.Close()
 	_, err = ioutil.ReadAll(resp.Body)
 
-	if err := h.isOk(resp, err); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *Http) isOk(resp *http.Response, err error) error {
-	if resp == nil || err != nil {
-		return fmt.Errorf("E! %s request failed! %s.", h.URL, err.Error())
-	}
-
-	if resp.StatusCode < 200 || resp.StatusCode > 209 {
-		return fmt.Errorf("received bad status code, %d\n", resp.StatusCode)
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return fmt.Errorf("when writing to [%s] received status code: %d", h.URL, resp.StatusCode)
 	}
 
 	return nil
@@ -144,8 +149,9 @@ func (h *Http) isOk(resp *http.Response, err error) error {
 
 func init() {
 	outputs.Add("http", func() telegraf.Output {
-		return &Http{
-			Timeout: DEFAULT_TIME_OUT,
+		return &HTTP{
+			Timeout: internal.Duration{Duration: defaultClientTimeout},
+			Method:  defaultMethod,
 		}
 	})
 }
diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go
index aa9c68eba..1d511d85b 100644
--- a/plugins/outputs/http/http_test.go
+++ b/plugins/outputs/http/http_test.go
@@ -2,243 +2,290 @@ package http
 
 import (
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/plugins/serializers/graphite"
-	"github.com/influxdata/telegraf/plugins/serializers/json"
-	"github.com/stretchr/testify/assert"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/serializers/influx"
+	"github.com/stretchr/testify/require"
 )
 
-var (
-	cpuTags = map[string]string{
-		"host":       "localhost",
-		"cpu":        "cpu0",
-		"datacenter": "us-west-2",
-	}
-
-	cpuField = map[string]interface{}{
-		"usage_idle": float64(91.5),
-	}
-
-	memTags = map[string]string{
-		"host":       "localhost",
-		"cpu":        "mem",
-		"datacenter": "us-west-2",
-	}
-
-	memField = map[string]interface{}{
-		"used": float64(91.5),
-	}
-
-	count int
-)
-
-type TestOkHandler struct {
-	T        *testing.T
-	Expected []string
-}
-
-// The handler gets a new variable each time it receives a request, so it fetches an expected string based on global variable.
-func (h TestOkHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	actual, _ := ioutil.ReadAll(r.Body)
-
-	assert.Equal(h.T, h.Expected[count], string(actual), fmt.Sprintf("%d Expected fail!", count))
-
-	count++
-
-	fmt.Fprint(w, "ok")
-}
-
-type TestNotFoundHandler struct {
-}
-
-func (h TestNotFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	http.NotFound(w, r)
-}
-
-func TestWriteAllInputMetric(t *testing.T) {
-	now := time.Now()
-
-	server := httptest.NewServer(&TestOkHandler{
-		T: t,
-		Expected: []string{
-			fmt.Sprintf("telegraf.cpu0.us-west-2.localhost.cpu.usage_idle 91.5 %d\ntelegraf.mem.us-west-2.localhost.mem.used 91.5 %d\n", now.Unix(), now.Unix()),
+func getMetric() telegraf.Metric {
+	m, err := metric.New(
+		"cpu",
+		map[string]string{},
+		map[string]interface{}{
+			"value": 42.0,
 		},
-	})
-	defer server.Close()
-	defer resetCount()
+		time.Unix(0, 0),
+	)
+	if err != nil {
+		panic(err)
+	}
+	return m
+}
 
-	m1, _ := metric.New("cpu", cpuTags, cpuField, now)
-	m2, _ := metric.New("mem", memTags, memField, now)
-	metrics := []telegraf.Metric{m1, m2}
+func TestInvalidMethod(t *testing.T) {
+	plugin := &HTTP{
+		URL:    "",
+		Method: http.MethodGet,
+	}
 
-	http := &Http{
-		URL: server.URL,
-		Headers: map[string]string{
-			"Content-Type": "plain/text",
+	err := plugin.Connect()
+	require.Error(t, err)
+}
+
+func TestMethod(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	tests := []struct {
+		name           string
+		plugin         *HTTP
+		expectedMethod string
+		connectError   bool
+	}{
+		{
+			name: "default method is POST",
+			plugin: &HTTP{
+				URL:    u.String(),
+				Method: defaultMethod,
+			},
+			expectedMethod: http.MethodPost,
+		},
+		{
+			name: "put is okay",
+			plugin: &HTTP{
+				URL:    u.String(),
+				Method: http.MethodPut,
+			},
+			expectedMethod: http.MethodPut,
+		},
+		{
+			name: "get is invalid",
+			plugin: &HTTP{
+				URL:    u.String(),
+				Method: http.MethodGet,
+			},
+			connectError: true,
+		},
+		{
+			name: "method is case insensitive",
+			plugin: &HTTP{
+				URL:    u.String(),
+				Method: "poST",
+			},
+			expectedMethod: http.MethodPost,
 		},
 	}
 
-	http.SetSerializer(&graphite.GraphiteSerializer{
-		Prefix:   "telegraf",
-		Template: "tags.measurement.field",
-	})
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, tt.expectedMethod, r.Method)
+				w.WriteHeader(http.StatusOK)
+			})
 
-	http.Connect()
-	err := http.Write(metrics)
+			serializer := influx.NewSerializer()
+			tt.plugin.SetSerializer(serializer)
+			err = tt.plugin.Connect()
+			if tt.connectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
 
-	assert.NoError(t, err)
+			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
+			require.NoError(t, err)
+		})
+	}
 }
 
-func TestHttpWriteWithUnexpected404StatusCode(t *testing.T) {
-	now := time.Now()
+func TestStatusCode(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
 
-	server := httptest.NewServer(&TestNotFoundHandler{})
-	defer server.Close()
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
 
-	m, _ := metric.New("cpu", cpuTags, cpuField, now)
-	metrics := []telegraf.Metric{m}
-
-	http := &Http{
-		URL: server.URL,
-		Headers: map[string]string{
-			"Content-Type": "application/json",
+	tests := []struct {
+		name       string
+		plugin     *HTTP
+		statusCode int
+		errFunc    func(t *testing.T, err error)
+	}{
+		{
+			name: "success",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			statusCode: http.StatusOK,
+			errFunc: func(t *testing.T, err error) {
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "1xx status is an error",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			statusCode: 103,
+			errFunc: func(t *testing.T, err error) {
+				require.Error(t, err)
+			},
+		},
+		{
+			name: "3xx status is an error",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			statusCode: http.StatusMultipleChoices,
+			errFunc: func(t *testing.T, err error) {
+				require.Error(t, err)
+			},
+		},
+		{
+			name: "4xx status is an error",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			statusCode: http.StatusMultipleChoices,
+			errFunc: func(t *testing.T, err error) {
+				require.Error(t, err)
+			},
 		},
 	}
 
-	http.SetSerializer(&graphite.GraphiteSerializer{
-		Prefix:   "telegraf",
-		Template: "tags.measurement.field",
-	})
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(tt.statusCode)
+			})
 
-	http.Connect()
-	err := http.Write(metrics)
+			serializer := influx.NewSerializer()
+			tt.plugin.SetSerializer(serializer)
+			err = tt.plugin.Connect()
+			require.NoError(t, err)
 
-	assert.Error(t, err)
+			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
+			tt.errFunc(t, err)
+		})
+	}
 }
 
-func TestHttpWriteWithExpected404StatusCode(t *testing.T) {
-	now := time.Now()
+func TestContentType(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
 
-	server := httptest.NewServer(&TestNotFoundHandler{})
-	defer server.Close()
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
 
-	m, _ := metric.New("cpu", cpuTags, cpuField, now)
-	metrics := []telegraf.Metric{m}
-
-	http := &Http{
-		URL: server.URL,
-		Headers: map[string]string{
-			"Content-Type": "application/json",
+	tests := []struct {
+		name     string
+		plugin   *HTTP
+		expected string
+	}{
+		{
+			name: "default is text plain",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+			expected: defaultContentType,
+		},
+		{
+			name: "overwrite content_type",
+			plugin: &HTTP{
+				URL:     u.String(),
+				Headers: map[string]string{"Content-Type": "application/json"},
+			},
+			expected: "application/json",
 		},
 	}
 
-	http.SetSerializer(&graphite.GraphiteSerializer{
-		Prefix:   "telegraf",
-		Template: "tags.measurement.field",
-	})
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, tt.expected, r.Header.Get("Content-Type"))
+				w.WriteHeader(http.StatusOK)
+			})
 
-	http.Connect()
-	err := http.Write(metrics)
+			serializer := influx.NewSerializer()
+			tt.plugin.SetSerializer(serializer)
+			err = tt.plugin.Connect()
+			require.NoError(t, err)
 
-	assert.Error(t, err)
+			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
+			require.NoError(t, err)
+		})
+	}
 }
 
-func TestHttpWriteWithIncorrectServerPort(t *testing.T) {
-	now := time.Now()
+func TestBasicAuth(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
 
-	m, _ := metric.New("cpu", cpuTags, cpuField, now)
-	metrics := []telegraf.Metric{m}
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
 
-	http := &Http{
-		URL: "http://127.0.0.1:56879/incorrect/url",
-		Headers: map[string]string{
-			"Content-Type": "application/json",
+	tests := []struct {
+		name     string
+		plugin   *HTTP
+		username string
+		password string
+	}{
+		{
+			name: "default",
+			plugin: &HTTP{
+				URL: u.String(),
+			},
+		},
+		{
+			name: "username only",
+			plugin: &HTTP{
+				URL:      u.String(),
+				Username: "username",
+			},
+		},
+		{
+			name: "password only",
+			plugin: &HTTP{
+				URL:      u.String(),
+				Password: "pa$$word",
+			},
+		},
+		{
+			name: "username and password",
+			plugin: &HTTP{
+				URL:      u.String(),
+				Username: "username",
+				Password: "pa$$word",
+			},
 		},
 	}
 
-	http.SetSerializer(&graphite.GraphiteSerializer{
-		Prefix:   "telegraf",
-		Template: "tags.measurement.field",
-	})
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				username, password, _ := r.BasicAuth()
+				require.Equal(t, tt.username, username)
+				require.Equal(t, tt.password, password)
+				w.WriteHeader(http.StatusOK)
+			})
 
-	http.Connect()
-	err := http.Write(metrics)
+			serializer := influx.NewSerializer()
+			tt.plugin.SetSerializer(serializer)
+			err = tt.plugin.Connect()
+			require.NoError(t, err)
 
-	assert.Error(t, err)
-}
-
-func TestHttpWriteWithHttpSerializer(t *testing.T) {
-	now := time.Now()
-
-	server := httptest.NewServer(&TestOkHandler{
-		T: t,
-		Expected: []string{
-			fmt.Sprintf("{\"metrics\":[{\"fields\":{\"usage_idle\":91.5},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\",\"datacenter\":\"us-west-2\",\"host\":\"localhost\"},\"timestamp\":%d},{\"fields\":{\"usage_idle\":91.5},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\",\"datacenter\":\"us-west-2\",\"host\":\"localhost\"},\"timestamp\":%d}]}", now.Unix(), now.Unix()),
-		},
-	})
-
-	defer server.Close()
-
-	http := &Http{
-		URL: server.URL,
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-		},
+			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
+			require.NoError(t, err)
+		})
 	}
-	jsonSerializer, _ := json.NewSerializer(time.Second)
-	http.SetSerializer(jsonSerializer)
-
-	m1, _ := metric.New("cpu", cpuTags, cpuField, now)
-	m2, _ := metric.New("cpu", cpuTags, cpuField, now)
-	metrics := []telegraf.Metric{m1, m2}
-
-	http.Connect()
-	err := http.Write(metrics)
-
-	assert.Nil(t, err)
-}
-
-func TestHttpWithoutContentType(t *testing.T) {
-	http := &Http{
-		URL: "http://127.0.0.1:56879/correct/url",
-	}
-
-	err := http.Connect()
-
-	assert.Error(t, err)
-}
-
-func TestHttpWithContentType(t *testing.T) {
-	http := &Http{
-		URL: "http://127.0.0.1:56879/correct/url",
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-		},
-	}
-
-	err := http.Connect()
-
-	assert.Nil(t, err)
-}
-
-func TestImplementedInterfaceFunction(t *testing.T) {
-	http := &Http{
-		URL: "http://127.0.0.1:56879/incorrect/url",
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-		},
-	}
-
-	assert.NotNil(t, http.SampleConfig())
-	assert.NotNil(t, http.Description())
-}
-
-func resetCount() {
-	count = 0
 }

From 0eba72d2c088cdc37332f1805193255c97a1754e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 14 May 2018 17:19:49 -0700
Subject: [PATCH 1179/1302] Add http output to changelog/readme

---
 CHANGELOG.md | 4 ++++
 README.md    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b738d180..488487fc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,10 @@
 
 - [topk](./plugins/processors/topk/README.md) - Contributed by @mirath
 
+### New Outputs
+
+- [http](./plugins/outputs/http/README.md) - Contributed by @Dark0096
+
 ### Features
 
 - [#3964](https://github.com/influxdata/telegraf/pull/3964): Add repl_oplog_window_sec metric to mongodb input.
diff --git a/README.md b/README.md
index be3d9064c..03754232c 100644
--- a/README.md
+++ b/README.md
@@ -291,6 +291,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [file](./plugins/outputs/file)
 * [graphite](./plugins/outputs/graphite)
 * [graylog](./plugins/outputs/graylog)
+* [http](./plugins/outputs/http)
 * [instrumental](./plugins/outputs/instrumental)
 * [kafka](./plugins/outputs/kafka)
 * [librato](./plugins/outputs/librato)

From e45822e2e298c0af70a90071299c6bb074f05f49 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 15 May 2018 15:54:20 -0700
Subject: [PATCH 1180/1302] Fix librato output support for uint and bool
 (#4151)

---
 plugins/outputs/librato/librato.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go
index 244e8bd59..0603394ec 100644
--- a/plugins/outputs/librato/librato.go
+++ b/plugins/outputs/librato/librato.go
@@ -107,7 +107,6 @@ func (l *Librato) Write(metrics []telegraf.Metric) error {
 			for _, gauge := range gauges {
 				tempGauges = append(tempGauges, gauge)
 				log.Printf("D! Got a gauge: %v\n", gauge)
-
 			}
 		} else {
 			log.Printf("I! unable to build Gauge for %s, skipping\n", m.Name())
@@ -234,16 +233,18 @@ func verifyValue(v interface{}) bool {
 
 func (g *Gauge) setValue(v interface{}) error {
 	switch d := v.(type) {
-	case int:
-		g.Value = float64(int(d))
-	case int32:
-		g.Value = float64(int32(d))
 	case int64:
 		g.Value = float64(int64(d))
-	case float32:
+	case uint64:
 		g.Value = float64(d)
 	case float64:
 		g.Value = float64(d)
+	case bool:
+		if d {
+			g.Value = float64(1.0)
+		} else {
+			g.Value = float64(0.0)
+		}
 	default:
 		return fmt.Errorf("undeterminable type %+v", d)
 	}

From 99033241c47223c15fac146cefb6e0f9e5c6ffc7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 15 May 2018 15:55:38 -0700
Subject: [PATCH 1181/1302] Update changelog

---
 CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 488487fc7..22d48b2f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,10 +52,11 @@
 
 ### Bugfixes
 
-- [4127](https://github.com/influxdata/telegraf/issues/4127): Fix intermittent panic in aerospike input.
-- [4130](https://github.com/influxdata/telegraf/issues/4130): Fix connection leak in jolokia2_agent.
-- [4136](https://github.com/influxdata/telegraf/pull/4130): Fix jolokia2 timeout parsing.
-- [4142](https://github.com/influxdata/telegraf/pull/4142): Fix error parsing dropwizard metrics.
+- [#4127](https://github.com/influxdata/telegraf/issues/4127): Fix intermittent panic in aerospike input.
+- [#4130](https://github.com/influxdata/telegraf/issues/4130): Fix connection leak in jolokia2_agent.
+- [#4136](https://github.com/influxdata/telegraf/pull/4130): Fix jolokia2 timeout parsing.
+- [#4142](https://github.com/influxdata/telegraf/pull/4142): Fix error parsing dropwizard metrics.
+- [#4149](https://github.com/influxdata/telegraf/issues/4149): Fix librato output support for uint and bool.
 
 ## v1.6.2 [2018-05-08]
 

From 863af9d1d4375868d4cd2cd4cab7d53760167f7f Mon Sep 17 00:00:00 2001
From: Karol Zadora-Przylecki <karolz@microsoft.com>
Date: Tue, 15 May 2018 16:05:59 -0700
Subject: [PATCH 1182/1302] Add Microsoft Application Insights output plugin
 (#4010)

---
 Godeps                                        |   2 +
 plugins/outputs/all/all.go                    |   1 +
 .../outputs/application_insights/README.md    |  32 ++
 .../application_insights.go                   | 357 +++++++++++++
 .../application_insights_test.go              | 477 ++++++++++++++++++
 .../diagnostic_message_subscriber.go          |  12 +
 .../mocks/diagnostics_message_listener.go     |  12 +
 .../mocks/diagnostics_message_subscriber.go   |  27 +
 .../application_insights/mocks/transmitter.go |  32 ++
 .../application_insights/transmitter.go       |  19 +
 10 files changed, 971 insertions(+)
 create mode 100644 plugins/outputs/application_insights/README.md
 create mode 100644 plugins/outputs/application_insights/application_insights.go
 create mode 100644 plugins/outputs/application_insights/application_insights_test.go
 create mode 100644 plugins/outputs/application_insights/diagnostic_message_subscriber.go
 create mode 100644 plugins/outputs/application_insights/mocks/diagnostics_message_listener.go
 create mode 100644 plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go
 create mode 100644 plugins/outputs/application_insights/mocks/transmitter.go
 create mode 100644 plugins/outputs/application_insights/transmitter.go

diff --git a/Godeps b/Godeps
index 12cf9cb92..ff845abaa 100644
--- a/Godeps
+++ b/Godeps
@@ -1,3 +1,4 @@
+code.cloudfoundry.org/clock e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
 github.com/aerospike/aerospike-client-go 9701404f4c60a6ea256595d24bf318f721a7e8b8
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
@@ -41,6 +42,7 @@ github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
 github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
+github.com/Microsoft/ApplicationInsights-Go 3612f58550c1de70f1a110c78c830e55f29aa65d
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
 github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
diff --git a/plugins/outputs/all/all.go b/plugins/outputs/all/all.go
index 94f5149b4..037807c22 100644
--- a/plugins/outputs/all/all.go
+++ b/plugins/outputs/all/all.go
@@ -3,6 +3,7 @@ package all
 import (
 	_ "github.com/influxdata/telegraf/plugins/outputs/amon"
 	_ "github.com/influxdata/telegraf/plugins/outputs/amqp"
+	_ "github.com/influxdata/telegraf/plugins/outputs/application_insights"
 	_ "github.com/influxdata/telegraf/plugins/outputs/cloudwatch"
 	_ "github.com/influxdata/telegraf/plugins/outputs/cratedb"
 	_ "github.com/influxdata/telegraf/plugins/outputs/datadog"
diff --git a/plugins/outputs/application_insights/README.md b/plugins/outputs/application_insights/README.md
new file mode 100644
index 000000000..c5b925c2a
--- /dev/null
+++ b/plugins/outputs/application_insights/README.md
@@ -0,0 +1,32 @@
+# Application Insights Output Plugin
+
+This plugin writes telegraf metrics to Azure Application Insights
+
+## Configuration
+```
+[[outputs.application_insights]]
+  ## Instrumentation key of the Application Insights resource.
+  instrumentationKey = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+
+  ## Timeout on close. If not provided, will default to 5s. 0s means no timeout (not recommended).
+  # timeout = "5s"
+
+  ## Determines whether diagnostic logging (for Application Insights endpoint traffic) is enabled. Default is false.
+  # enable_diagnosic_logging = "true"
+
+  ## ContextTagSources dictionary instructs the Application Insights plugin to set Application Insights context tags using metric properties.
+  ## In this dictionary keys are Application Insights context tags to set, and values are names of metric properties to use as source of data.
+  ## For example:
+  # [outputs.application_insights.context_tag_sources]
+  # "ai.cloud.role" = "kubernetes_container_name"
+  # "ai.cloud.roleInstance" = "kubernetes_pod_name"
+  ## will set the ai.cloud.role context tag to the value of kubernetes_container_name property (if present), 
+  ## and the ai.cloud.roleInstance context tag to the value of kubernetes_pod_name property.
+  ## For list of all context tag keys see https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+```
+
+## Implementation notes
+- Every field in a metric will result in a separate metric telemetry. For example, the metric `foo,host=a first=42,second=43 1525293034000000000`
+will result in two metric telemetry records sent to Application Insights: first named `foo_first` and value of 42, and the secod named `foo_second` and a value of 43 (both having property `host` set to "a". \
+\
+The exception is a single-field metric with a value named `value`, in that case the single metric telemetry created will use just the whole metric name without the "value" suffix. For example, `bar,host=a value=23 1525293034000000000` will result in a telemetry named `bar` and value 23.
\ No newline at end of file
diff --git a/plugins/outputs/application_insights/application_insights.go b/plugins/outputs/application_insights/application_insights.go
new file mode 100644
index 000000000..895b8530b
--- /dev/null
+++ b/plugins/outputs/application_insights/application_insights.go
@@ -0,0 +1,357 @@
+package application_insights
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"time"
+	"unsafe"
+
+	"github.com/Microsoft/ApplicationInsights-Go/appinsights"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
+)
+
+type TelemetryTransmitter interface {
+	Track(appinsights.Telemetry)
+	Close() <-chan struct{}
+}
+
+type DiagnosticsMessageSubscriber interface {
+	Subscribe(appinsights.DiagnosticsMessageHandler) appinsights.DiagnosticsMessageListener
+}
+
+type ApplicationInsights struct {
+	InstrumentationKey      string
+	Timeout                 internal.Duration
+	EnableDiagnosticLogging bool
+	ContextTagSources       map[string]string
+	diagMsgSubscriber       DiagnosticsMessageSubscriber
+	transmitter             TelemetryTransmitter
+	diagMsgListener         appinsights.DiagnosticsMessageListener
+}
+
+const (
+	Error   = "E! "
+	Warning = "W! "
+	Info    = "I! "
+	Debug   = "D! "
+)
+
+var (
+	sampleConfig = `
+## Instrumentation key of the Application Insights resource.
+  instrumentation_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+
+## Timeout on close. If not provided, will default to 5s. 0s means no timeout (not recommended).
+# timeout = "5s"
+
+## Determines whether diagnostic logging (for Application Insights endpoint traffic) is enabled. Default is false.
+# enable_diagnosic_logging = "true"
+
+## ContextTagSources dictionary instructs the Application Insights plugin to set Application Insights context tags using metric properties.
+## In this dictionary keys are Application Insights context tags to set, and values are names of metric properties to use as source of data.
+## For example:
+# [outputs.application_insights.context_tag_sources]
+# "ai.cloud.role" = "kubernetes_container_name"
+# "ai.cloud.roleInstance" = "kubernetes_pod_name"
+## will set the ai.cloud.role context tag to the value of kubernetes_container_name property (if present), 
+## and the ai.cloud.roleInstance context tag to the value of kubernetes_pod_name property.
+## For list of all context tag keys see https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+`
+	is32Bit        bool
+	is32BitChecked bool
+)
+
+func (a *ApplicationInsights) SampleConfig() string {
+	return sampleConfig
+}
+
+func (a *ApplicationInsights) Description() string {
+	return "Send telegraf metrics to Azure Application Insights"
+}
+
+func (a *ApplicationInsights) Connect() error {
+	if a.InstrumentationKey == "" {
+		return fmt.Errorf("Instrumentation key is required")
+	}
+
+	if a.transmitter == nil {
+		a.transmitter = NewTransmitter(a.InstrumentationKey)
+	}
+
+	if a.EnableDiagnosticLogging && a.diagMsgSubscriber != nil {
+		a.diagMsgListener = a.diagMsgSubscriber.Subscribe(func(msg string) error {
+			logOutputMsg(Info, "%s", msg)
+			return nil
+		})
+	}
+
+	return nil
+}
+
+func (a *ApplicationInsights) Write(metrics []telegraf.Metric) error {
+	for _, metric := range metrics {
+		allMetricTelemetry := a.createTelemetry(metric)
+		for _, telemetry := range allMetricTelemetry {
+			a.transmitter.Track(telemetry)
+		}
+	}
+
+	return nil
+}
+
+func (a *ApplicationInsights) Close() error {
+	if a.diagMsgListener != nil {
+		// We want to listen to diagnostic messages during closing
+		// That is why we stop listening only after Close() ends (or a timeout occurs)
+		defer a.diagMsgListener.Remove()
+	}
+
+	if a.transmitter == nil {
+		return nil
+	}
+
+	select {
+	case <-a.transmitter.Close():
+		logOutputMsg(Info, "Closed")
+	case <-time.After(a.Timeout.Duration):
+		logOutputMsg(Warning, "Close operation timed out after %v", a.Timeout.Duration)
+	}
+
+	return nil
+}
+
+func (a *ApplicationInsights) createTelemetry(metric telegraf.Metric) []appinsights.Telemetry {
+	aggregateTelemetry, usedFields := a.createAggregateMetricTelemetry(metric)
+	if aggregateTelemetry != nil {
+		telemetry := a.createTelemetryForUnusedFields(metric, usedFields)
+		telemetry = append(telemetry, aggregateTelemetry)
+		return telemetry
+	}
+
+	fields := metric.Fields()
+	if len(fields) == 1 && metric.FieldList()[0].Key == "value" {
+		// Just use metric name as the telemetry name
+		telemetry := a.createSimpleMetricTelemetry(metric, "value", false)
+		if telemetry != nil {
+			return []appinsights.Telemetry{telemetry}
+		} else {
+			return nil
+		}
+	} else {
+		// AppInsights does not support multi-dimensional metrics at the moment, so we need to disambiguate resulting telemetry
+		// by adding field name as the telemetry name suffix
+		retval := a.createTelemetryForUnusedFields(metric, nil)
+		return retval
+	}
+}
+
+func (a *ApplicationInsights) createSimpleMetricTelemetry(metric telegraf.Metric, fieldName string, useFieldNameInTelemetryName bool) *appinsights.MetricTelemetry {
+	telemetryValue, err := getFloat64TelemetryPropertyValue([]string{fieldName}, metric, nil)
+	if err != nil {
+		return nil
+	}
+
+	var telemetryName string
+	if useFieldNameInTelemetryName {
+		telemetryName = metric.Name() + "_" + fieldName
+	} else {
+		telemetryName = metric.Name()
+	}
+	telemetry := appinsights.NewMetricTelemetry(telemetryName, telemetryValue)
+	telemetry.Properties = metric.Tags()
+	a.addContextTags(metric, telemetry)
+	telemetry.Timestamp = metric.Time()
+	return telemetry
+}
+
+func (a *ApplicationInsights) createAggregateMetricTelemetry(metric telegraf.Metric) (*appinsights.AggregateMetricTelemetry, []string) {
+	usedFields := make([]string, 0, 6) // We will use up to 6 fields
+
+	// Get the sum of all individual measurements(mandatory property)
+	telemetryValue, err := getFloat64TelemetryPropertyValue([]string{"sum", "value"}, metric, &usedFields)
+	if err != nil {
+		return nil, nil
+	}
+
+	// Get the count of measurements (mandatory property)
+	telemetryCount, err := getIntTelemetryPropertyValue([]string{"count", "samples"}, metric, &usedFields)
+	if err != nil {
+		return nil, nil
+	}
+
+	telemetry := appinsights.NewAggregateMetricTelemetry(metric.Name())
+	telemetry.Value = telemetryValue
+	telemetry.Count = telemetryCount
+	telemetry.Properties = metric.Tags()
+	a.addContextTags(metric, telemetry)
+	telemetry.Timestamp = metric.Time()
+
+	// We attempt to set min, max, variance and stddev fields but do not really care if they are not present--
+	// they are not essential for aggregate metric.
+	// By convention AppInsights prefers stddev over variance, so to be consistent, we test for stddev after testing for variance.
+	telemetry.Min, _ = getFloat64TelemetryPropertyValue([]string{"min"}, metric, &usedFields)
+	telemetry.Max, _ = getFloat64TelemetryPropertyValue([]string{"max"}, metric, &usedFields)
+	telemetry.Variance, _ = getFloat64TelemetryPropertyValue([]string{"variance"}, metric, &usedFields)
+	telemetry.StdDev, _ = getFloat64TelemetryPropertyValue([]string{"stddev"}, metric, &usedFields)
+
+	return telemetry, usedFields
+}
+
+func (a *ApplicationInsights) createTelemetryForUnusedFields(metric telegraf.Metric, usedFields []string) []appinsights.Telemetry {
+	fields := metric.Fields()
+	retval := make([]appinsights.Telemetry, 0, len(fields))
+
+	for fieldName := range fields {
+		if contains(usedFields, fieldName) {
+			continue
+		}
+
+		telemetry := a.createSimpleMetricTelemetry(metric, fieldName, true)
+		if telemetry != nil {
+			retval = append(retval, telemetry)
+		}
+	}
+
+	return retval
+}
+
+func (a *ApplicationInsights) addContextTags(metric telegraf.Metric, telemetry appinsights.Telemetry) {
+	for contextTagName, tagSourceName := range a.ContextTagSources {
+		if contextTagValue, found := metric.GetTag(tagSourceName); found {
+			telemetry.ContextTags()[contextTagName] = contextTagValue
+		}
+	}
+}
+
+func getFloat64TelemetryPropertyValue(
+	candidateFields []string,
+	metric telegraf.Metric,
+	usedFields *[]string) (float64, error) {
+
+	for _, fieldName := range candidateFields {
+		fieldValue, found := metric.GetField(fieldName)
+		if !found {
+			continue
+		}
+
+		metricValue, err := toFloat64(fieldValue)
+		if err != nil {
+			continue
+		}
+
+		if usedFields != nil {
+			*usedFields = append(*usedFields, fieldName)
+		}
+
+		return metricValue, nil
+	}
+
+	return 0.0, fmt.Errorf("No field from the candidate list was found in the metric")
+}
+
+func getIntTelemetryPropertyValue(
+	candidateFields []string,
+	metric telegraf.Metric,
+	usedFields *[]string) (int, error) {
+
+	for _, fieldName := range candidateFields {
+		fieldValue, found := metric.GetField(fieldName)
+		if !found {
+			continue
+		}
+
+		metricValue, err := toInt(fieldValue)
+		if err != nil {
+			continue
+		}
+
+		if usedFields != nil {
+			*usedFields = append(*usedFields, fieldName)
+		}
+
+		return metricValue, nil
+	}
+
+	return 0, fmt.Errorf("No field from the candidate list was found in the metric")
+}
+
+func contains(set []string, val string) bool {
+	for _, elem := range set {
+		if elem == val {
+			return true
+		}
+	}
+
+	return false
+}
+
+func toFloat64(value interface{}) (float64, error) {
+	// Out of all Golang numerical types Telegraf only uses int64, unit64 and float64 for fields
+	switch v := value.(type) {
+	case int64:
+		return float64(v), nil
+	case uint64:
+		return float64(v), nil
+	case float64:
+		return v, nil
+	}
+
+	return 0.0, fmt.Errorf("[%s] cannot be converted to a float64 value", value)
+}
+
+func toInt(value interface{}) (int, error) {
+	if !is32BitChecked {
+		is32BitChecked = true
+		var i int
+		if unsafe.Sizeof(i) == 4 {
+			is32Bit = true
+		} else {
+			is32Bit = false
+		}
+	}
+
+	// Out of all Golang numerical types Telegraf only uses int64, unit64 and float64 for fields
+	switch v := value.(type) {
+	case uint64:
+		if is32Bit {
+			if v > math.MaxInt32 {
+				return 0, fmt.Errorf("Value [%d] out of range of 32-bit integers", v)
+			}
+		} else {
+			if v > math.MaxInt64 {
+				return 0, fmt.Errorf("Value [%d] out of range of 64-bit integers", v)
+			}
+		}
+
+		return int(v), nil
+
+	case int64:
+		if is32Bit {
+			if v > math.MaxInt32 || v < math.MinInt32 {
+				return 0, fmt.Errorf("Value [%d] out of range of 32-bit integers", v)
+			}
+		}
+
+		return int(v), nil
+	}
+
+	return 0.0, fmt.Errorf("[%s] cannot be converted to an int value", value)
+}
+
+func logOutputMsg(level string, format string, v ...interface{}) {
+	log.Printf(level+"[outputs.application_insights] "+format, v...)
+}
+
+func init() {
+	outputs.Add("application_insights", func() telegraf.Output {
+		return &ApplicationInsights{
+			Timeout:           internal.Duration{Duration: time.Second * 5},
+			diagMsgSubscriber: diagnosticsMessageSubscriber{},
+			// It is very common to set Cloud.RoleName and Cloud.RoleInstance context properties, hence initial capacity of two
+			ContextTagSources: make(map[string]string, 2),
+		}
+	})
+}
diff --git a/plugins/outputs/application_insights/application_insights_test.go b/plugins/outputs/application_insights/application_insights_test.go
new file mode 100644
index 000000000..561e6c9f9
--- /dev/null
+++ b/plugins/outputs/application_insights/application_insights_test.go
@@ -0,0 +1,477 @@
+package application_insights
+
+import (
+	"math"
+	"testing"
+	"time"
+
+	"github.com/Microsoft/ApplicationInsights-Go/appinsights"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/outputs/application_insights/mocks"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestConnectFailsIfNoIkey(t *testing.T) {
+	assert := assert.New(t)
+
+	transmitter := new(mocks.Transmitter)
+	transmitter.On("Close").Return(closed)
+
+	ai := ApplicationInsights{
+		transmitter: transmitter,
+		// Very long timeout to ensure we do not rely on timeouts for closing the transmitter
+		Timeout: internal.Duration{Duration: time.Hour},
+	}
+
+	err := ai.Connect()
+	assert.Error(err)
+}
+
+func TestOutputCloseTimesOut(t *testing.T) {
+	assert := assert.New(t)
+
+	transmitter := new(mocks.Transmitter)
+	transmitter.On("Close").Return(unfinished)
+
+	ai := ApplicationInsights{
+		transmitter: transmitter,
+		Timeout:     internal.Duration{Duration: time.Millisecond * 50},
+	}
+
+	err := ai.Close()
+	assert.NoError(err)
+	transmitter.AssertCalled(t, "Close")
+}
+
+func TestCloseRemovesDiagMsgListener(t *testing.T) {
+	assert := assert.New(t)
+
+	transmitter := new(mocks.Transmitter)
+	transmitter.On("Close").Return(closed)
+
+	diagMsgListener := new(mocks.DiagnosticsMessageListener)
+	diagMsgListener.On("Remove")
+
+	diagMsgSubscriber := new(mocks.DiagnosticsMessageSubscriber)
+	diagMsgSubscriber.
+		On("Subscribe", mock.AnythingOfType("appinsights.DiagnosticsMessageHandler")).
+		Return(diagMsgListener)
+
+	ai := ApplicationInsights{
+		transmitter:             transmitter,
+		Timeout:                 internal.Duration{Duration: time.Hour},
+		EnableDiagnosticLogging: true,
+		diagMsgSubscriber:       diagMsgSubscriber,
+		InstrumentationKey:      "1234", // Fake, but necessary to enable tracking
+	}
+
+	err := ai.Connect()
+	assert.NoError(err)
+	diagMsgSubscriber.AssertCalled(t, "Subscribe", mock.AnythingOfType("appinsights.DiagnosticsMessageHandler"))
+
+	err = ai.Close()
+	assert.NoError(err)
+	transmitter.AssertCalled(t, "Close")
+	diagMsgListener.AssertCalled(t, "Remove")
+}
+
+func TestAggregateMetricCreated(t *testing.T) {
+	tests := []struct {
+		name                        string
+		fields                      map[string]interface{}
+		valueField                  string
+		countField                  string
+		additionalMetricValueFields []string
+	}{
+		{"value and count", map[string]interface{}{"value": 16.5, "count": 23}, "value", "count", nil},
+		{"value and samples", map[string]interface{}{"value": 16.5, "samples": 23}, "value", "samples", nil},
+		{"sum and count", map[string]interface{}{"sum": 16.5, "count": 23}, "sum", "count", nil},
+		{"sum and samples", map[string]interface{}{"samples": 23, "sum": 16.5}, "sum", "samples", nil},
+		{"value and count, sum is wrong type", map[string]interface{}{"sum": "J23", "value": 16.5, "count": 23}, "value", "count", nil},
+		{
+			"with aggregates",
+			map[string]interface{}{
+				"value":  16.5,
+				"count":  23,
+				"min":    -2.1,
+				"max":    34,
+				"stddev": 3.4,
+			},
+			"value",
+			"count",
+			nil,
+		},
+		{
+			"some aggregates with invalid values",
+			map[string]interface{}{
+				"value": 16.5,
+				"count": 23,
+				"min":   "min",
+				"max":   []float64{3.4, 5.6},
+				"stddev": struct {
+					name  string
+					value float64
+				}{"delta", 7.0},
+			},
+			"value",
+			"count",
+			nil,
+		},
+		{
+			"aggregate with additional fields",
+			map[string]interface{}{"value": 16.5, "samples": 23, "alpha": -34e12, "bravo": -3, "charlie": "charlie"},
+			"value",
+			"samples",
+			[]string{"alpha", "bravo"},
+		},
+	}
+
+	for _, tt := range tests {
+		tf := func(t *testing.T) {
+			assert := assert.New(t)
+			now := time.Now().UTC()
+
+			transmitter := new(mocks.Transmitter)
+			transmitter.On("Track", mock.Anything)
+			metricName := "ShouldBeAggregateMetric"
+
+			m, err := metric.New(
+				metricName,
+				nil, // tags
+				tt.fields,
+				now,
+			)
+			assert.NoError(err)
+
+			ai := ApplicationInsights{
+				transmitter:        transmitter,
+				InstrumentationKey: "1234", // Fake, but necessary to enable tracking
+			}
+
+			err = ai.Connect()
+			assert.NoError(err)
+
+			mSet := []telegraf.Metric{m}
+			ai.Write(mSet)
+			transmitter.AssertNumberOfCalls(t, "Track", 1+len(tt.additionalMetricValueFields))
+			var pAggregateTelemetry *appinsights.AggregateMetricTelemetry
+			assert.IsType(pAggregateTelemetry, transmitter.Calls[len(transmitter.Calls)-1].Arguments.Get(0), "Expected last telemetry to be AggregateMetricTelemetry")
+			aggregateTelemetry := transmitter.Calls[len(transmitter.Calls)-1].Arguments.Get(0).(*appinsights.AggregateMetricTelemetry)
+			verifyAggregateTelemetry(assert, m, tt.valueField, tt.countField, aggregateTelemetry)
+
+			verifyAdditionalTelemetry(assert, m, transmitter, tt.additionalMetricValueFields, metricName)
+		}
+
+		t.Run(tt.name, tf)
+	}
+}
+
+func TestSimpleMetricCreated(t *testing.T) {
+	tests := []struct {
+		name                        string
+		fields                      map[string]interface{}
+		primaryMetricValueField     string
+		additionalMetricValueFields []string
+	}{
+		{"just a single value field", map[string]interface{}{"value": 16.5}, "value", nil},
+		{"single field not named value", map[string]interface{}{"first": 32.9}, "first", nil},
+		{"value but no count", map[string]interface{}{"value": 16.5, "other": "bulba"}, "", []string{"value"}},
+		{"count but no value", map[string]interface{}{"v1": "v1Val", "count": 23}, "", []string{"count"}},
+		{"neither value nor count", map[string]interface{}{"v1": "alpha", "v2": 45.8}, "", []string{"v2"}},
+		{"value is of wrong type", map[string]interface{}{"value": "alpha", "count": 15}, "", []string{"count"}},
+		{"count is of wrong type", map[string]interface{}{"value": 23.77, "count": 7.5}, "", []string{"count", "value"}},
+		{"count is out of range", map[string]interface{}{"value": -98.45E4, "count": math.MaxUint64 - uint64(20)}, "", []string{"value", "count"}},
+		{"several additional fields", map[string]interface{}{"alpha": 10, "bravo": "bravo", "charlie": 30, "delta": 40.7}, "", []string{"alpha", "charlie", "delta"}},
+	}
+
+	for _, tt := range tests {
+		tf := func(t *testing.T) {
+			assert := assert.New(t)
+			now := time.Now().UTC()
+
+			transmitter := new(mocks.Transmitter)
+			transmitter.On("Track", mock.Anything)
+			metricName := "ShouldBeSimpleMetric"
+
+			m, err := metric.New(
+				metricName,
+				nil, // tags
+				tt.fields,
+				now,
+			)
+			assert.NoError(err)
+
+			ai := ApplicationInsights{
+				transmitter:        transmitter,
+				InstrumentationKey: "1234", // Fake, but necessary to enable tracking
+			}
+
+			err = ai.Connect()
+			assert.NoError(err)
+
+			mSet := []telegraf.Metric{m}
+			ai.Write(mSet)
+
+			expectedNumberOfCalls := len(tt.additionalMetricValueFields)
+			if tt.primaryMetricValueField != "" {
+				expectedNumberOfCalls++
+			}
+
+			transmitter.AssertNumberOfCalls(t, "Track", expectedNumberOfCalls)
+			if tt.primaryMetricValueField != "" {
+				var pMetricTelemetry *appinsights.MetricTelemetry
+				assert.IsType(pMetricTelemetry, transmitter.Calls[0].Arguments.Get(0), "First created telemetry should be simple MetricTelemetry")
+				metricTelemetry := transmitter.Calls[0].Arguments.Get(0).(*appinsights.MetricTelemetry)
+
+				var expectedTelemetryName string
+				if tt.primaryMetricValueField == "value" {
+					expectedTelemetryName = m.Name()
+				} else {
+					expectedTelemetryName = m.Name() + "_" + tt.primaryMetricValueField
+				}
+				verifySimpleTelemetry(assert, m, tt.primaryMetricValueField, expectedTelemetryName, metricTelemetry)
+			}
+
+			verifyAdditionalTelemetry(assert, m, transmitter, tt.additionalMetricValueFields, metricName)
+		}
+
+		t.Run(tt.name, tf)
+	}
+}
+
+func TestTagsAppliedToTelemetry(t *testing.T) {
+	tests := []struct {
+		name              string
+		fields            map[string]interface{}
+		tags              map[string]string
+		metricValueFields []string
+	}{
+		{
+			"value but no count",
+			map[string]interface{}{"value": 16.5, "alpha": 3.5, "bravo": 17},
+			map[string]string{"alpha": "a tag is not a field", "charlie": "charlie"},
+			[]string{"value", "alpha", "bravo"},
+		},
+	}
+
+	for _, tt := range tests {
+		tf := func(t *testing.T) {
+			assert := assert.New(t)
+			now := time.Now().UTC()
+
+			transmitter := new(mocks.Transmitter)
+			transmitter.On("Track", mock.Anything)
+			metricName := "ShouldBeSimpleMetric"
+
+			m, err := metric.New(
+				metricName,
+				tt.tags,
+				tt.fields,
+				now,
+			)
+			assert.NoError(err)
+
+			ai := ApplicationInsights{
+				transmitter:        transmitter,
+				InstrumentationKey: "1234", // Fake, but necessary to enable tracking
+			}
+
+			err = ai.Connect()
+			assert.NoError(err)
+
+			mSet := []telegraf.Metric{m}
+			ai.Write(mSet)
+			transmitter.AssertNumberOfCalls(t, "Track", len(tt.metricValueFields))
+			transmitter.AssertCalled(t, "Track", mock.AnythingOfType("*appinsights.MetricTelemetry"))
+
+			// Will verify that all original tags are present in telemetry.Properies map
+			verifyAdditionalTelemetry(assert, m, transmitter, tt.metricValueFields, metricName)
+		}
+
+		t.Run(tt.name, tf)
+	}
+}
+
+func TestContextTagsSetOnSimpleTelemetry(t *testing.T) {
+	assert := assert.New(t)
+	now := time.Now().UTC()
+
+	transmitter := new(mocks.Transmitter)
+	transmitter.On("Track", mock.Anything)
+
+	m, err := metric.New(
+		"SimpleMetric",
+		map[string]string{"kubernetes_container_name": "atcsvc", "kubernetes_pod_name": "bunkie17554"},
+		map[string]interface{}{"value": 23.0},
+		now,
+	)
+	assert.NoError(err)
+
+	ai := ApplicationInsights{
+		transmitter:        transmitter,
+		InstrumentationKey: "1234", // Fake, but necessary to enable tracking
+		ContextTagSources: map[string]string{
+			"ai.cloud.role":         "kubernetes_container_name",
+			"ai.cloud.roleInstance": "kubernetes_pod_name",
+			"ai.user.id":            "nonexistent",
+		},
+	}
+
+	err = ai.Connect()
+	assert.NoError(err)
+
+	mSet := []telegraf.Metric{m}
+	ai.Write(mSet)
+	transmitter.AssertNumberOfCalls(t, "Track", 1)
+	metricTelemetry := transmitter.Calls[0].Arguments.Get(0).(*appinsights.MetricTelemetry)
+	cloudTags := metricTelemetry.Tags.Cloud()
+	assert.Equal("atcsvc", cloudTags.GetRole())
+	assert.Equal("bunkie17554", cloudTags.GetRoleInstance())
+}
+
+func TestContextTagsSetOnAggregateTelemetry(t *testing.T) {
+	assert := assert.New(t)
+	now := time.Now().UTC()
+
+	transmitter := new(mocks.Transmitter)
+	transmitter.On("Track", mock.Anything)
+
+	m, err := metric.New(
+		"AggregateMetric",
+		map[string]string{"kubernetes_container_name": "atcsvc", "kubernetes_pod_name": "bunkie17554"},
+		map[string]interface{}{"value": 23.0, "count": 5},
+		now,
+	)
+	assert.NoError(err)
+
+	ai := ApplicationInsights{
+		transmitter:        transmitter,
+		InstrumentationKey: "1234", // Fake, but necessary to enable tracking
+		ContextTagSources: map[string]string{
+			"ai.cloud.role":         "kubernetes_container_name",
+			"ai.cloud.roleInstance": "kubernetes_pod_name",
+			"ai.user.id":            "nonexistent",
+		},
+	}
+
+	err = ai.Connect()
+	assert.NoError(err)
+
+	mSet := []telegraf.Metric{m}
+	ai.Write(mSet)
+	transmitter.AssertNumberOfCalls(t, "Track", 1)
+	metricTelemetry := transmitter.Calls[0].Arguments.Get(0).(*appinsights.AggregateMetricTelemetry)
+	cloudTags := metricTelemetry.Tags.Cloud()
+	assert.Equal("atcsvc", cloudTags.GetRole())
+	assert.Equal("bunkie17554", cloudTags.GetRoleInstance())
+}
+
+func closed() <-chan struct{} {
+	closed := make(chan struct{})
+	close(closed)
+	return closed
+}
+
+func unfinished() <-chan struct{} {
+	unfinished := make(chan struct{})
+	return unfinished
+}
+
+func verifyAggregateTelemetry(
+	assert *assert.Assertions,
+	metric telegraf.Metric,
+	valueField string,
+	countField string,
+	telemetry *appinsights.AggregateMetricTelemetry,
+) {
+
+	verifyAggregateField := func(fieldName string, telemetryValue float64) {
+		metricRawFieldValue, found := metric.Fields()[fieldName]
+		if !found {
+			return
+		}
+
+		if _, err := toFloat64(metricRawFieldValue); err == nil {
+			assert.EqualValues(metricRawFieldValue, telemetryValue, "Telemetry property %s does not match the metric field", fieldName)
+		}
+	}
+	assert.Equal(metric.Name(), telemetry.Name, "Telemetry name should be the same as metric name")
+	assert.EqualValues(metric.Fields()[valueField], telemetry.Value, "Telemetry value does not match metric value field")
+	assert.EqualValues(metric.Fields()[countField], telemetry.Count, "Telemetry sample count does not mach metric sample count field")
+	verifyAggregateField("min", telemetry.Min)
+	verifyAggregateField("max", telemetry.Max)
+	verifyAggregateField("stdev", telemetry.StdDev)
+	verifyAggregateField("variance", telemetry.Variance)
+	assert.Equal(metric.Time(), telemetry.Timestamp, "Telemetry and metric timestamps do not match")
+	assertMapContains(assert, metric.Tags(), telemetry.Properties)
+}
+
+func verifySimpleTelemetry(
+	assert *assert.Assertions,
+	metric telegraf.Metric,
+	valueField string,
+	expectedTelemetryName string,
+	telemetry *appinsights.MetricTelemetry,
+) {
+
+	assert.Equal(expectedTelemetryName, telemetry.Name, "Telemetry name is not what was expected")
+	assert.EqualValues(metric.Fields()[valueField], telemetry.Value, "Telemetry value does not match metric value field")
+	assert.Equal(metric.Time(), telemetry.Timestamp, "Telemetry and metric timestamps do not match")
+	assertMapContains(assert, metric.Tags(), telemetry.Properties)
+}
+
+func verifyAdditionalTelemetry(
+	assert *assert.Assertions,
+	metric telegraf.Metric,
+	transmitter *mocks.Transmitter,
+	additionalMetricValueFields []string,
+	telemetryNamePrefix string,
+) {
+	for _, fieldName := range additionalMetricValueFields {
+		expectedTelemetryName := telemetryNamePrefix + "_" + fieldName
+		telemetry := findTransmittedTelemetry(transmitter, expectedTelemetryName)
+		assert.NotNil(telemetry, "Expected telemetry named %s to be created, but could not find it", expectedTelemetryName)
+		if telemetry != nil {
+			verifySimpleTelemetry(assert, metric, fieldName, expectedTelemetryName, telemetry)
+		}
+	}
+}
+
+func findTransmittedTelemetry(transmitter *mocks.Transmitter, telemetryName string) *appinsights.MetricTelemetry {
+	for _, call := range transmitter.Calls {
+		telemetry, isMetricTelemetry := call.Arguments.Get(0).(*appinsights.MetricTelemetry)
+		if isMetricTelemetry && telemetry.Name == telemetryName {
+			return telemetry
+		}
+	}
+
+	return nil
+}
+
+func keys(m map[string]string) []string {
+	keys := make([]string, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+
+	return keys
+}
+
+func assertMapContains(assert *assert.Assertions, expected, actual map[string]string) {
+	if expected == nil && actual == nil {
+		return
+	}
+
+	assert.NotNil(expected, "Maps not equal: expected is nil but actual is not")
+	assert.NotNil(actual, "Maps not equal: actual is nil but expected is not")
+
+	for k, v := range expected {
+		av, ok := actual[k]
+		assert.True(ok, "Actual map does not contain a value for key '%s'", k)
+		assert.Equal(v, av, "The expected value for key '%s' is '%s' but the actual value is '%s", k, v, av)
+	}
+}
diff --git a/plugins/outputs/application_insights/diagnostic_message_subscriber.go b/plugins/outputs/application_insights/diagnostic_message_subscriber.go
new file mode 100644
index 000000000..789931910
--- /dev/null
+++ b/plugins/outputs/application_insights/diagnostic_message_subscriber.go
@@ -0,0 +1,12 @@
+package application_insights
+
+import (
+	"github.com/Microsoft/ApplicationInsights-Go/appinsights"
+)
+
+type diagnosticsMessageSubscriber struct {
+}
+
+func (ms diagnosticsMessageSubscriber) Subscribe(handler appinsights.DiagnosticsMessageHandler) appinsights.DiagnosticsMessageListener {
+	return appinsights.NewDiagnosticsMessageListener(handler)
+}
diff --git a/plugins/outputs/application_insights/mocks/diagnostics_message_listener.go b/plugins/outputs/application_insights/mocks/diagnostics_message_listener.go
new file mode 100644
index 000000000..65747c10c
--- /dev/null
+++ b/plugins/outputs/application_insights/mocks/diagnostics_message_listener.go
@@ -0,0 +1,12 @@
+package mocks
+
+import mock "github.com/stretchr/testify/mock"
+
+// DiagnosticsMessageSubscriber is an autogenerated mock type for the DiagnosticsMessageSubscriber type
+type DiagnosticsMessageListener struct {
+	mock.Mock
+}
+
+func (_m *DiagnosticsMessageListener) Remove() {
+	_m.Called()
+}
diff --git a/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go b/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go
new file mode 100644
index 000000000..ba7007d40
--- /dev/null
+++ b/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go
@@ -0,0 +1,27 @@
+// Code generated by mockery v1.0.0
+package mocks
+
+import appinsights "github.com/Microsoft/ApplicationInsights-Go/appinsights"
+
+import mock "github.com/stretchr/testify/mock"
+
+// DiagnosticsMessageSubscriber is an autogenerated mock type for the DiagnosticsMessageSubscriber type
+type DiagnosticsMessageSubscriber struct {
+	mock.Mock
+}
+
+// Subscribe provides a mock function with given fields: _a0
+func (_m *DiagnosticsMessageSubscriber) Subscribe(_a0 appinsights.DiagnosticsMessageHandler) appinsights.DiagnosticsMessageListener {
+	ret := _m.Called(_a0)
+
+	var r0 appinsights.DiagnosticsMessageListener
+	if rf, ok := ret.Get(0).(func(appinsights.DiagnosticsMessageHandler) appinsights.DiagnosticsMessageListener); ok {
+		r0 = rf(_a0)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(appinsights.DiagnosticsMessageListener)
+		}
+	}
+
+	return r0
+}
diff --git a/plugins/outputs/application_insights/mocks/transmitter.go b/plugins/outputs/application_insights/mocks/transmitter.go
new file mode 100644
index 000000000..5cc56fbb1
--- /dev/null
+++ b/plugins/outputs/application_insights/mocks/transmitter.go
@@ -0,0 +1,32 @@
+// Code generated by mockery v1.0.0
+package mocks
+
+import appinsights "github.com/Microsoft/ApplicationInsights-Go/appinsights"
+
+import mock "github.com/stretchr/testify/mock"
+
+// Transmitter is an autogenerated mock type for the Transmitter type
+type Transmitter struct {
+	mock.Mock
+}
+
+// Close provides a mock function with given fields:
+func (_m *Transmitter) Close() <-chan struct{} {
+	ret := _m.Called()
+
+	var r0 <-chan struct{}
+	if rf, ok := ret.Get(0).(func() <-chan struct{}); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(<-chan struct{})
+		}
+	}
+
+	return r0
+}
+
+// Track provides a mock function with given fields: _a0
+func (_m *Transmitter) Track(_a0 appinsights.Telemetry) {
+	_m.Called(_a0)
+}
diff --git a/plugins/outputs/application_insights/transmitter.go b/plugins/outputs/application_insights/transmitter.go
new file mode 100644
index 000000000..44bc1b806
--- /dev/null
+++ b/plugins/outputs/application_insights/transmitter.go
@@ -0,0 +1,19 @@
+package application_insights
+
+import "github.com/Microsoft/ApplicationInsights-Go/appinsights"
+
+type Transmitter struct {
+	client appinsights.TelemetryClient
+}
+
+func NewTransmitter(ikey string) *Transmitter {
+	return &Transmitter{client: appinsights.NewTelemetryClient(ikey)}
+}
+
+func (t *Transmitter) Track(telemetry appinsights.Telemetry) {
+	t.client.Track(telemetry)
+}
+
+func (t *Transmitter) Close() <-chan struct{} {
+	return t.client.Channel().Close(0)
+}

From 2948dec6f5bd772c6a7c86758d358eb8d29ba8e2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 15 May 2018 16:42:56 -0700
Subject: [PATCH 1183/1302] Update changelog and docs for application_insights
 plugin

---
 CHANGELOG.md                                  |  2 +
 README.md                                     |  1 +
 docs/LICENSE_OF_DEPENDENCIES.md               |  2 +
 .../outputs/application_insights/README.md    | 51 +++++++++++--------
 .../application_insights.go                   | 28 +++++-----
 5 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22d48b2f3..7ed1d2451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 ### New Outputs
 
 - [http](./plugins/outputs/http/README.md) - Contributed by @Dark0096
+- [application_insights](./plugins/outputs/application_insights/README.md): Contribute by @karolz-ms
 
 ### Features
 
@@ -41,6 +42,7 @@
 - [#4096](https://github.com/influxdata/telegraf/pull/4096): Add topk processor plugin.
 - [#4114](https://github.com/influxdata/telegraf/pull/4114): Add cursor metrics to mongodb input.
 - [#3455](https://github.com/influxdata/telegraf/pull/3455): Add tag/integer pair for result to net_response.
+- [#4010](https://github.com/influxdata/telegraf/pull/3455): Add application_insights output plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 03754232c..e453a4b53 100644
--- a/README.md
+++ b/README.md
@@ -282,6 +282,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [influxdb](./plugins/outputs/influxdb)
 * [amon](./plugins/outputs/amon)
 * [amqp](./plugins/outputs/amqp) (rabbitmq)
+* [application_insights](./plugins/outputs/application_insights)
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
 * [cratedb](./plugins/outputs/cratedb)
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 07b7287e9..0e4763027 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -3,6 +3,7 @@
 When distributed in a binary form, Telegraf may contain portions of the
 following works:
 
+- code.cloudfoundry.org/clock [APACHE](https://github.com/cloudfoundry/clock/blob/master/LICENSE)
 - collectd.org [MIT](https://github.com/collectd/go-collectd/blob/master/LICENSE)
 - github.com/aerospike/aerospike-client-go [APACHE](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
 - github.com/amir/raidman [PUBLIC DOMAIN](https://github.com/amir/raidman/blob/master/UNLICENSE)
@@ -51,6 +52,7 @@ following works:
 - github.com/kballard/go-shellquote [MIT](https://github.com/kballard/go-shellquote/blob/master/LICENSE)
 - github.com/lib/pq [MIT](https://github.com/lib/pq/blob/master/LICENSE.md)
 - github.com/matttproud/golang_protobuf_extensions [APACHE](https://github.com/matttproud/golang_protobuf_extensions/blob/master/LICENSE)
+- github.com/Microsoft/ApplicationInsights-Go [APACHE](https://github.com/Microsoft/ApplicationInsights-Go/blob/master/LICENSE)
 - github.com/Microsoft/go-winio [MIT](https://github.com/Microsoft/go-winio/blob/master/LICENSE)
 - github.com/miekg/dns [BSD](https://github.com/miekg/dns/blob/master/LICENSE)
 - github.com/naoina/go-stringutil [MIT](https://github.com/naoina/go-stringutil/blob/master/LICENSE)
diff --git a/plugins/outputs/application_insights/README.md b/plugins/outputs/application_insights/README.md
index c5b925c2a..08850a3e6 100644
--- a/plugins/outputs/application_insights/README.md
+++ b/plugins/outputs/application_insights/README.md
@@ -1,32 +1,43 @@
 # Application Insights Output Plugin
 
-This plugin writes telegraf metrics to Azure Application Insights
+This plugin writes telegraf metrics to [Azure Application Insights](https://azure.microsoft.com/en-us/services/application-insights/).
 
-## Configuration
-```
+### Configuration:
+```toml
 [[outputs.application_insights]]
   ## Instrumentation key of the Application Insights resource.
-  instrumentationKey = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+  instrumentation_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
 
-  ## Timeout on close. If not provided, will default to 5s. 0s means no timeout (not recommended).
+  ## Timeout for closing (default: 5s).
   # timeout = "5s"
 
-  ## Determines whether diagnostic logging (for Application Insights endpoint traffic) is enabled. Default is false.
-  # enable_diagnosic_logging = "true"
+  ## Enable additional diagnostic logging.
+  # enable_diagnosic_logging = false
 
-  ## ContextTagSources dictionary instructs the Application Insights plugin to set Application Insights context tags using metric properties.
-  ## In this dictionary keys are Application Insights context tags to set, and values are names of metric properties to use as source of data.
-  ## For example:
+  ## Context Tag Sources add Application Insights context tags to a tag value.
+  ##
+  ## For list of allowed context tag keys see:
+  ## https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
   # [outputs.application_insights.context_tag_sources]
-  # "ai.cloud.role" = "kubernetes_container_name"
-  # "ai.cloud.roleInstance" = "kubernetes_pod_name"
-  ## will set the ai.cloud.role context tag to the value of kubernetes_container_name property (if present), 
-  ## and the ai.cloud.roleInstance context tag to the value of kubernetes_pod_name property.
-  ## For list of all context tag keys see https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+  #   "ai.cloud.role" = "kubernetes_container_name"
+  #   "ai.cloud.roleInstance" = "kubernetes_pod_name"
 ```
 
-## Implementation notes
-- Every field in a metric will result in a separate metric telemetry. For example, the metric `foo,host=a first=42,second=43 1525293034000000000`
-will result in two metric telemetry records sent to Application Insights: first named `foo_first` and value of 42, and the secod named `foo_second` and a value of 43 (both having property `host` set to "a". \
-\
-The exception is a single-field metric with a value named `value`, in that case the single metric telemetry created will use just the whole metric name without the "value" suffix. For example, `bar,host=a value=23 1525293034000000000` will result in a telemetry named `bar` and value 23.
\ No newline at end of file
+
+### Metric Encoding:
+
+For each field an Application Insights Telemetry record is created named based
+on the measurement name and field.
+
+
+**Example:** Create the telemetry records `foo_first` and `foo_second`:
+```
+foo,host=a first=42,second=43 1525293034000000000
+```
+
+In the special case of a single field named `value`, a single telemetry record is created named using only the measurement name
+
+**Example:** Create a telemetry record `foo`:
+```
+bar,host=a value=42 1525293034000000000
+```
diff --git a/plugins/outputs/application_insights/application_insights.go b/plugins/outputs/application_insights/application_insights.go
index 895b8530b..26f3f8dc0 100644
--- a/plugins/outputs/application_insights/application_insights.go
+++ b/plugins/outputs/application_insights/application_insights.go
@@ -41,24 +41,22 @@ const (
 
 var (
 	sampleConfig = `
-## Instrumentation key of the Application Insights resource.
+  ## Instrumentation key of the Application Insights resource.
   instrumentation_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
 
-## Timeout on close. If not provided, will default to 5s. 0s means no timeout (not recommended).
-# timeout = "5s"
+  ## Timeout for closing (default: 5s).
+  # timeout = "5s"
 
-## Determines whether diagnostic logging (for Application Insights endpoint traffic) is enabled. Default is false.
-# enable_diagnosic_logging = "true"
+  ## Enable additional diagnostic logging.
+  # enable_diagnosic_logging = false
 
-## ContextTagSources dictionary instructs the Application Insights plugin to set Application Insights context tags using metric properties.
-## In this dictionary keys are Application Insights context tags to set, and values are names of metric properties to use as source of data.
-## For example:
-# [outputs.application_insights.context_tag_sources]
-# "ai.cloud.role" = "kubernetes_container_name"
-# "ai.cloud.roleInstance" = "kubernetes_pod_name"
-## will set the ai.cloud.role context tag to the value of kubernetes_container_name property (if present), 
-## and the ai.cloud.roleInstance context tag to the value of kubernetes_pod_name property.
-## For list of all context tag keys see https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+  ## Context Tag Sources add Application Insights context tags to a tag value.
+  ##
+  ## For list of allowed context tag keys see:
+  ## https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+  # [outputs.application_insights.context_tag_sources]
+  #   "ai.cloud.role" = "kubernetes_container_name"
+  #   "ai.cloud.roleInstance" = "kubernetes_pod_name"
 `
 	is32Bit        bool
 	is32BitChecked bool
@@ -69,7 +67,7 @@ func (a *ApplicationInsights) SampleConfig() string {
 }
 
 func (a *ApplicationInsights) Description() string {
-	return "Send telegraf metrics to Azure Application Insights"
+	return "Send metrics to Azure Application Insights"
 }
 
 func (a *ApplicationInsights) Connect() error {

From 6d73cb85cc7a96273a7f4708dabdb238598cd81c Mon Sep 17 00:00:00 2001
From: Leszek Charkiewicz <lcharkiewicz@users.noreply.github.com>
Date: Thu, 17 May 2018 23:24:51 +0200
Subject: [PATCH 1184/1302] Add consul service tags to metric (#4155)

---
 Godeps                               |  2 +-
 plugins/inputs/consul/README.md      |  5 ++++
 plugins/inputs/consul/consul.go      | 22 +++++++++++++++-
 plugins/inputs/consul/consul_test.go | 39 +++++++++++++++++++++++++---
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/Godeps b/Godeps
index ff845abaa..f44100c91 100644
--- a/Godeps
+++ b/Godeps
@@ -31,7 +31,7 @@ github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996
 github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f
+github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
 github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
diff --git a/plugins/inputs/consul/README.md b/plugins/inputs/consul/README.md
index 42e1a1336..f7dcdf362 100644
--- a/plugins/inputs/consul/README.md
+++ b/plugins/inputs/consul/README.md
@@ -33,6 +33,11 @@ report those stats already using StatsD protocol if needed.
   # tls_key = "/etc/telegraf/key.pem"
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = true
+
+  ## Consul checks' tag splitting
+  # When tags are formatted like "key:value" with ":" as a delimiter then
+  # they will be splitted and reported as proper key:value in Telegraf
+  # tag_delimiter = ":"
 ```
 
 ### Metrics:
diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go
index fe9bde1db..8649184dd 100644
--- a/plugins/inputs/consul/consul.go
+++ b/plugins/inputs/consul/consul.go
@@ -2,6 +2,7 @@ package consul
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/hashicorp/consul/api"
 	"github.com/influxdata/telegraf"
@@ -17,6 +18,7 @@ type Consul struct {
 	Password   string
 	Datacentre string
 	tls.ClientConfig
+	TagDelimiter string
 
 	// client used to connect to Consul agnet
 	client *api.Client
@@ -45,6 +47,11 @@ var sampleConfig = `
   # tls_key = "/etc/telegraf/key.pem"
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = true
+
+  ## Consul checks' tag splitting
+  # When tags are formatted like "key:value" with ":" as a delimiter then
+  # they will be splitted and reported as proper key:value in Telegraf
+  # tag_delimiter = ":"
 `
 
 func (c *Consul) Description() string {
@@ -86,7 +93,7 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
 		return nil, err
 	}
 
-	config.HttpClient.Transport = &http.Transport{
+	config.Transport = &http.Transport{
 		TLSClientConfig: tlsCfg,
 	}
 
@@ -111,6 +118,19 @@ func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.Healt
 		tags["service_name"] = check.ServiceName
 		tags["check_id"] = check.CheckID
 
+		for _, checkTag := range check.ServiceTags {
+			if c.TagDelimiter != "" {
+				splittedTag := strings.SplitN(checkTag, c.TagDelimiter, 2)
+				if len(splittedTag) == 1 {
+					tags[checkTag] = checkTag
+				} else if len(splittedTag) == 2 {
+					tags[splittedTag[0]] = splittedTag[1]
+				}
+			} else {
+				tags[checkTag] = checkTag
+			}
+		}
+
 		acc.AddFields("consul_health_checks", record, tags)
 	}
 }
diff --git a/plugins/inputs/consul/consul_test.go b/plugins/inputs/consul/consul_test.go
index bbb43d066..e3a7f2fdc 100644
--- a/plugins/inputs/consul/consul_test.go
+++ b/plugins/inputs/consul/consul_test.go
@@ -17,6 +17,7 @@ var sampleChecks = []*api.HealthCheck{
 		Output:      "OK",
 		ServiceID:   "foo.123",
 		ServiceName: "foo",
+		ServiceTags: []string{"bar", "env:sandbox", "tagkey:value:stillvalue"},
 	},
 }
 
@@ -31,9 +32,12 @@ func TestGatherHealthCheck(t *testing.T) {
 	}
 
 	expectedTags := map[string]string{
-		"node":         "localhost",
-		"service_name": "foo",
-		"check_id":     "foo.health123",
+		"node":                    "localhost",
+		"service_name":            "foo",
+		"check_id":                "foo.health123",
+		"bar":                     "bar",
+		"env:sandbox":             "env:sandbox",
+		"tagkey:value:stillvalue": "tagkey:value:stillvalue",
 	}
 
 	var acc testutil.Accumulator
@@ -43,3 +47,32 @@ func TestGatherHealthCheck(t *testing.T) {
 
 	acc.AssertContainsTaggedFields(t, "consul_health_checks", expectedFields, expectedTags)
 }
+
+func TestGatherHealthCheckWithDelimitedTags(t *testing.T) {
+	expectedFields := map[string]interface{}{
+		"check_name": "foo.health",
+		"status":     "passing",
+		"passing":    1,
+		"critical":   0,
+		"warning":    0,
+		"service_id": "foo.123",
+	}
+
+	expectedTags := map[string]string{
+		"node":         "localhost",
+		"service_name": "foo",
+		"check_id":     "foo.health123",
+		"bar":          "bar",
+		"env":          "sandbox",
+		"tagkey":       "value:stillvalue",
+	}
+
+	var acc testutil.Accumulator
+
+	consul := &Consul{
+		TagDelimiter: ":",
+	}
+	consul.GatherHealthCheck(&acc, sampleChecks)
+
+	acc.AssertContainsTaggedFields(t, "consul_health_checks", expectedFields, expectedTags)
+}

From cce4f520bd6a1f831282ca8a4d5ca52bc5e64b27 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 17 May 2018 14:25:35 -0700
Subject: [PATCH 1185/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed1d2451..193c8288e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
+- [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
 
 ## v1.6.3 [unreleased]
 

From b62f7a3c686e305322dfa9767859dfd73db6c631 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 4 Apr 2018 22:24:19 -0700
Subject: [PATCH 1186/1302] Return to using latest image file on appveyor

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7b464f6e0..a586d92fa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,3 @@
-image: Previous Visual Studio 2015
 version: "{build}"
 
 cache:

From 339cebbc213ebf5ca3f525a74bd8b05f5e807b2b Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 17 May 2018 15:19:17 -0700
Subject: [PATCH 1187/1302] Use -parallel=false in gdm to avoid issues on
 appveyor

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c670ee2a3..79adbcbbf 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ all:
 deps:
 	go get -u github.com/golang/lint/golint
 	go get github.com/sparrc/gdm
-	gdm restore
+	gdm restore --parallel=false
 
 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf

From 1a8786712c26f6b6e495af725b5ad96142911ed8 Mon Sep 17 00:00:00 2001
From: Feliksas The Lion <computershik@gmail.com>
Date: Sat, 19 May 2018 04:49:23 +0300
Subject: [PATCH 1188/1302] Added 3 important elasticsearch cluster health
 metrics (#4167)

---
 plugins/inputs/elasticsearch/elasticsearch.go | 48 +++++++++++--------
 plugins/inputs/elasticsearch/testdata_test.go | 31 +++++++-----
 2 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index eee8d4182..9875b68aa 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -40,17 +40,20 @@ type nodeStat struct {
 }
 
 type clusterHealth struct {
-	ClusterName         string                 `json:"cluster_name"`
-	Status              string                 `json:"status"`
-	TimedOut            bool                   `json:"timed_out"`
-	NumberOfNodes       int                    `json:"number_of_nodes"`
-	NumberOfDataNodes   int                    `json:"number_of_data_nodes"`
-	ActivePrimaryShards int                    `json:"active_primary_shards"`
-	ActiveShards        int                    `json:"active_shards"`
-	RelocatingShards    int                    `json:"relocating_shards"`
-	InitializingShards  int                    `json:"initializing_shards"`
-	UnassignedShards    int                    `json:"unassigned_shards"`
-	Indices             map[string]indexHealth `json:"indices"`
+	ClusterName                 string                 `json:"cluster_name"`
+	Status                      string                 `json:"status"`
+	TimedOut                    bool                   `json:"timed_out"`
+	NumberOfNodes               int                    `json:"number_of_nodes"`
+	NumberOfDataNodes           int                    `json:"number_of_data_nodes"`
+	ActivePrimaryShards         int                    `json:"active_primary_shards"`
+	ActiveShards                int                    `json:"active_shards"`
+	RelocatingShards            int                    `json:"relocating_shards"`
+	InitializingShards          int                    `json:"initializing_shards"`
+	UnassignedShards            int                    `json:"unassigned_shards"`
+	NumberOfPendingTasks        int                    `json:"number_of_pending_tasks"`
+	TaskMaxWaitingInQueueMillis int                    `json:"task_max_waiting_in_queue_millis"`
+	ActiveShardsPercentAsNumber float64                `json:"active_shards_percent_as_number"`
+	Indices                     map[string]indexHealth `json:"indices"`
 }
 
 type indexHealth struct {
@@ -323,16 +326,19 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 	}
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
-		"status":                healthStats.Status,
-		"status_code":           mapHealthStatusToCode(healthStats.Status),
-		"timed_out":             healthStats.TimedOut,
-		"number_of_nodes":       healthStats.NumberOfNodes,
-		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
-		"active_primary_shards": healthStats.ActivePrimaryShards,
-		"active_shards":         healthStats.ActiveShards,
-		"relocating_shards":     healthStats.RelocatingShards,
-		"initializing_shards":   healthStats.InitializingShards,
-		"unassigned_shards":     healthStats.UnassignedShards,
+		"status":                           healthStats.Status,
+		"status_code":                      mapHealthStatusToCode(healthStats.Status),
+		"timed_out":                        healthStats.TimedOut,
+		"number_of_nodes":                  healthStats.NumberOfNodes,
+		"number_of_data_nodes":             healthStats.NumberOfDataNodes,
+		"active_primary_shards":            healthStats.ActivePrimaryShards,
+		"active_shards":                    healthStats.ActiveShards,
+		"relocating_shards":                healthStats.RelocatingShards,
+		"initializing_shards":              healthStats.InitializingShards,
+		"unassigned_shards":                healthStats.UnassignedShards,
+		"number_of_pending_tasks":          healthStats.NumberOfPendingTasks,
+		"task_max_waiting_in_queue_millis": healthStats.TaskMaxWaitingInQueueMillis,
+		"active_shards_percent_as_number":  healthStats.ActiveShardsPercentAsNumber,
 	}
 	acc.AddFields(
 		"elasticsearch_cluster_health",
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index 8229fd66e..622abeaf8 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -11,7 +11,10 @@ const clusterHealthResponse = `
    "active_shards": 15,
    "relocating_shards": 0,
    "initializing_shards": 0,
-   "unassigned_shards": 0
+   "unassigned_shards": 0,
+   "number_of_pending_tasks": 0,
+   "task_max_waiting_in_queue_millis": 0,
+   "active_shards_percent_as_number": 100.0
 }
 `
 
@@ -27,6 +30,9 @@ const clusterHealthResponseWithIndices = `
    "relocating_shards": 0,
    "initializing_shards": 0,
    "unassigned_shards": 0,
+   "number_of_pending_tasks": 0,
+   "task_max_waiting_in_queue_millis": 0,
+   "active_shards_percent_as_number": 100.0,
    "indices": {
       "v1": {
          "status": "green",
@@ -53,16 +59,19 @@ const clusterHealthResponseWithIndices = `
 `
 
 var clusterHealthExpected = map[string]interface{}{
-	"status":                "green",
-	"status_code":           1,
-	"timed_out":             false,
-	"number_of_nodes":       3,
-	"number_of_data_nodes":  3,
-	"active_primary_shards": 5,
-	"active_shards":         15,
-	"relocating_shards":     0,
-	"initializing_shards":   0,
-	"unassigned_shards":     0,
+	"status":                           "green",
+	"status_code":                      1,
+	"timed_out":                        false,
+	"number_of_nodes":                  3,
+	"number_of_data_nodes":             3,
+	"active_primary_shards":            5,
+	"active_shards":                    15,
+	"relocating_shards":                0,
+	"initializing_shards":              0,
+	"unassigned_shards":                0,
+	"number_of_pending_tasks":          0,
+	"task_max_waiting_in_queue_millis": 0,
+	"active_shards_percent_as_number":  100.0,
 }
 
 var v1IndexExpected = map[string]interface{}{

From a688eefd1ce9d922bd8dc6e70b9bf0a5a573d150 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 18 May 2018 18:52:32 -0700
Subject: [PATCH 1189/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 193c8288e..21839b50b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [#4114](https://github.com/influxdata/telegraf/pull/4114): Add cursor metrics to mongodb input.
 - [#3455](https://github.com/influxdata/telegraf/pull/3455): Add tag/integer pair for result to net_response.
 - [#4010](https://github.com/influxdata/telegraf/pull/3455): Add application_insights output plugin.
+- [#4167](https://github.com/influxdata/telegraf/pull/4167): Added several important elasticsearch cluster health metrics.
 
 ### Bugfixes
 

From 81f5a41bc95d1defb865400242bc2ee8f1f61fbe Mon Sep 17 00:00:00 2001
From: jvrahav <rahavjvr@gmail.com>
Date: Sat, 19 May 2018 07:25:02 +0530
Subject: [PATCH 1190/1302] Add batch mode to mqtt output (#4094)

---
 etc/telegraf.conf              |  9 ++++----
 plugins/outputs/mqtt/README.md |  9 ++++++++
 plugins/outputs/mqtt/mqtt.go   | 39 +++++++++++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 3a7c6a790..ef0f95caf 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1791,19 +1791,19 @@
 #   ## List of metrics collected on above servers
 #   ## Each metric consists in a name, a jmx path and either
 #   ## a pass or drop slice attribute.
-#   ## This collect all heap memory usage metrics.
+#   ## This collect all heap memory usage metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "heap_memory_usage"
 #     mbean  = "java.lang:type=Memory"
 #     attribute = "HeapMemoryUsage"
 #
-#   ## This collect thread counts metrics.
+#   ## This collect thread counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "thread_count"
 #     mbean  = "java.lang:type=Threading"
 #     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
 #
-#   ## This collect number of class loaded/unloaded counts metrics.
+#   ## This collect number of class loaded/unloaded counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "class_count"
 #     mbean  = "java.lang:type=ClassLoading"
@@ -2259,7 +2259,7 @@
 #   reverse_metric_names = true
 
 
-# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
@@ -3561,4 +3561,3 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
-
diff --git a/plugins/outputs/mqtt/README.md b/plugins/outputs/mqtt/README.md
index 53483d967..716806783 100644
--- a/plugins/outputs/mqtt/README.md
+++ b/plugins/outputs/mqtt/README.md
@@ -30,6 +30,15 @@ This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## Batch messages in a topic
+  ## batch = false
+  ## Flag to determine if messages sent in a topic in a flush interval,
+  ## need to be batched into one message.
+  ## batch = true, batches the messages in a topic to one messages
+  ## batch = false, default behaviour
+  # batch = false
+
+
   ## Data format to output.
   data_format = "influx"
 ```
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 1c700332e..5228a083a 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -45,6 +45,15 @@ var sampleConfig = `
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
+
+  ## Batch messages in a topic
+  ## batch = false
+  ## Flag to determine if messages sent in a topic in a flush interval,
+  ## need to be batched into one message.
+  ## batch = true, batches the messages in a topic to one messages
+  ## batch = false, default behaviour
+  # batch = false
+
 `
 
 type MQTT struct {
@@ -57,6 +66,7 @@ type MQTT struct {
 	QoS         int    `toml:"qos"`
 	ClientID    string `toml:"client_id"`
 	tls.ClientConfig
+	BatchMessage bool `toml:"batch"`
 
 	client paho.Client
 	opts   *paho.ClientOptions
@@ -117,6 +127,8 @@ func (m *MQTT) Write(metrics []telegraf.Metric) error {
 		hostname = ""
 	}
 
+	metricsmap := make(map[string][]telegraf.Metric)
+
 	for _, metric := range metrics {
 		var t []string
 		if m.TopicPrefix != "" {
@@ -129,14 +141,31 @@ func (m *MQTT) Write(metrics []telegraf.Metric) error {
 		t = append(t, metric.Name())
 		topic := strings.Join(t, "/")
 
-		buf, err := m.serializer.Serialize(metric)
+		if m.BatchMessage {
+			metricsmap[topic] = append(metricsmap[topic], metric)
+		} else {
+			buf, err := m.serializer.Serialize(metric)
+
+			if err != nil {
+				return err
+			}
+
+			err = m.publish(topic, buf)
+			if err != nil {
+				return fmt.Errorf("Could not write to MQTT server, %s", err)
+			}
+		}
+	}
+
+	for key := range metricsmap {
+		buf, err := m.serializer.SerializeBatch(metricsmap[key])
+
 		if err != nil {
 			return err
 		}
-
-		err = m.publish(topic, buf)
-		if err != nil {
-			return fmt.Errorf("Could not write to MQTT server, %s", err)
+		publisherr := m.publish(key, buf)
+		if publisherr != nil {
+			return fmt.Errorf("Could not write to MQTT server, %s", publisherr)
 		}
 	}
 

From 3072b5a493de7cd62b9ce05fe8052aa31eb852e3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 18 May 2018 19:03:00 -0700
Subject: [PATCH 1191/1302] Update mqtt output docs and changelog

---
 CHANGELOG.md                   |  1 +
 etc/telegraf.conf              | 84 +++++++++++++++++++++++++++++++---
 plugins/outputs/mqtt/README.md | 14 +++---
 plugins/outputs/mqtt/mqtt.go   | 25 +++++-----
 4 files changed, 97 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21839b50b..68893bf6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [#3455](https://github.com/influxdata/telegraf/pull/3455): Add tag/integer pair for result to net_response.
 - [#4010](https://github.com/influxdata/telegraf/pull/3455): Add application_insights output plugin.
 - [#4167](https://github.com/influxdata/telegraf/pull/4167): Added several important elasticsearch cluster health metrics.
+- [#4094](https://github.com/influxdata/telegraf/pull/4094): Add batch mode to mqtt output.
 
 ### Bugfixes
 
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index ef0f95caf..1e7e8bed1 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -198,6 +198,26 @@
 #   data_format = "influx"
 
 
+# # Send metrics to Azure Application Insights
+# [[outputs.application_insights]]
+#   ## Instrumentation key of the Application Insights resource.
+#   instrumentation_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+#
+#   ## Timeout for closing (default: 5s).
+#   # timeout = "5s"
+#
+#   ## Enable additional diagnostic logging.
+#   # enable_diagnosic_logging = false
+#
+#   ## Context Tag Sources add Application Insights context tags to a tag value.
+#   ##
+#   ## For list of allowed context tag keys see:
+#   ## https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go
+#   # [outputs.application_insights.context_tag_sources]
+#   #   "ai.cloud.role" = "kubernetes_container_name"
+#   #   "ai.cloud.roleInstance" = "kubernetes_pod_name"
+
+
 # # Configuration for AWS CloudWatch output.
 # [[outputs.cloudwatch]]
 #   ## Amazon REGION
@@ -341,6 +361,40 @@
 #   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
 
 
+# # A plugin that can transmit metrics over HTTP
+# [[outputs.http]]
+#   ## URL is the address to send metrics to
+#   url = "http://127.0.0.1:8080/metric"
+#
+#   ## Timeout for HTTP message
+#   # timeout = "5s"
+#
+#   ## HTTP method, one of: "POST" or "PUT"
+#   # method = "POST"
+#
+#   ## HTTP Basic Auth credentials
+#   # username = "username"
+#   # password = "pa$$word"
+#
+#   ## Additional HTTP headers
+#   # [outputs.http.headers]
+#   #   # Should be set to "application/json" for json data_format
+#   #   Content-Type = "text/plain; charset=utf-8"
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Data format to output.
+#   ## Each data format has it's own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+#   # data_format = "influx"
+
+
 # # Configuration for sending metrics to an Instrumental project
 # [[outputs.instrumental]]
 #   ## Project API Token (required)
@@ -527,16 +581,22 @@
 #   ##   ex: prefix/web01.example.com/mem
 #   topic_prefix = "telegraf"
 #
+#   ## QoS policy for messages
+#   ##   0 = at most once
+#   ##   1 = at least once
+#   ##   2 = exactly once
+#   # qos = 2
+#
 #   ## username and password to connect MQTT server.
 #   # username = "telegraf"
 #   # password = "metricsmetricsmetricsmetrics"
 #
-#   ## Timeout for write operations. default: 5s
-#   # timeout = "5s"
-#
 #   ## client ID, if not set a random ID is generated
 #   # client_id = ""
 #
+#   ## Timeout for write operations. default: 5s
+#   # timeout = "5s"
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -544,6 +604,10 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## When true, metrics will be sent in one MQTT message per flush.  Otherwise,
+#   ## metrics are written one metric per MQTT message.
+#   # batch = false
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -1169,6 +1233,11 @@
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = true
+#
+#   ## Consul checks' tag splitting
+#   # When tags are formatted like "key:value" with ":" as a delimiter then
+#   # they will be splitted and reported as proper key:value in Telegraf
+#   # tag_delimiter = ":"
 
 
 # # Read metrics from one or many couchbase clusters
@@ -1791,19 +1860,19 @@
 #   ## List of metrics collected on above servers
 #   ## Each metric consists in a name, a jmx path and either
 #   ## a pass or drop slice attribute.
-#   ## This collect all heap memory usage metrics.
+#   ## This collect all heap memory usage metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "heap_memory_usage"
 #     mbean  = "java.lang:type=Memory"
 #     attribute = "HeapMemoryUsage"
 #
-#   ## This collect thread counts metrics.
+#   ## This collect thread counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "thread_count"
 #     mbean  = "java.lang:type=Threading"
 #     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
 #
-#   ## This collect number of class loaded/unloaded counts metrics.
+#   ## This collect number of class loaded/unloaded counts metrics.
 #   [[inputs.jolokia.metrics]]
 #     name = "class_count"
 #     mbean  = "java.lang:type=ClassLoading"
@@ -2259,7 +2328,7 @@
 #   reverse_metric_names = true
 
 
-# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
@@ -3561,3 +3630,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+
diff --git a/plugins/outputs/mqtt/README.md b/plugins/outputs/mqtt/README.md
index 716806783..14c166f9e 100644
--- a/plugins/outputs/mqtt/README.md
+++ b/plugins/outputs/mqtt/README.md
@@ -11,6 +11,9 @@ This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt
   topic_prefix = "telegraf"
 
   ## QoS policy for messages
+  ##   0 = at most once
+  ##   1 = at least once
+  ##   2 = exactly once
   qos = 2
 
   ## username and password to connect MQTT server.
@@ -30,17 +33,12 @@ This plugin writes to a [MQTT Broker](http://http://mqtt.org/) acting as a mqtt
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
-  ## Batch messages in a topic
-  ## batch = false
-  ## Flag to determine if messages sent in a topic in a flush interval,
-  ## need to be batched into one message.
-  ## batch = true, batches the messages in a topic to one messages
-  ## batch = false, default behaviour
+  ## When true, metrics will be sent in one MQTT message per flush.  Otherwise,
+  ## metrics are written one metric per MQTT message.
   # batch = false
 
-
   ## Data format to output.
-  data_format = "influx"
+  # data_format = "influx"
 ```
 
 ### Required parameters:
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 5228a083a..6231045b8 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -23,16 +23,22 @@ var sampleConfig = `
   ##   ex: prefix/web01.example.com/mem
   topic_prefix = "telegraf"
 
+  ## QoS policy for messages
+  ##   0 = at most once
+  ##   1 = at least once
+  ##   2 = exactly once
+  # qos = 2
+
   ## username and password to connect MQTT server.
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
-  ## Timeout for write operations. default: 5s
-  # timeout = "5s"
-
   ## client ID, if not set a random ID is generated
   # client_id = ""
 
+  ## Timeout for write operations. default: 5s
+  # timeout = "5s"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -40,20 +46,15 @@ var sampleConfig = `
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## When true, metrics will be sent in one MQTT message per flush.  Otherwise,
+  ## metrics are written one metric per MQTT message.
+  # batch = false
+
   ## Data format to output.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "influx"
-
-  ## Batch messages in a topic
-  ## batch = false
-  ## Flag to determine if messages sent in a topic in a flush interval,
-  ## need to be batched into one message.
-  ## batch = true, batches the messages in a topic to one messages
-  ## batch = false, default behaviour
-  # batch = false
-
 `
 
 type MQTT struct {

From 7f46aafcd625237bddcfa97fff54ca88722b7c5e Mon Sep 17 00:00:00 2001
From: Arkady Emelyanov <arkady-emelyanov@users.noreply.github.com>
Date: Mon, 21 May 2018 20:43:02 +0300
Subject: [PATCH 1192/1302] Fix waitgroup deadlock if url is incorrect in
 apache input (#4176)

---
 plugins/inputs/apache/apache.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index a04d1bbb8..1302e2d59 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -57,6 +57,8 @@ func (n *Apache) Description() string {
 }
 
 func (n *Apache) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
 	if len(n.Urls) == 0 {
 		n.Urls = []string{"http://localhost/server-status?auto"}
 	}
@@ -72,8 +74,6 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 		n.client = client
 	}
 
-	var wg sync.WaitGroup
-	wg.Add(len(n.Urls))
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
@@ -81,6 +81,7 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 			continue
 		}
 
+		wg.Add(1)
 		go func(addr *url.URL) {
 			defer wg.Done()
 			acc.AddError(n.gatherUrl(addr, acc))

From 61a0e500a8c427a7ab44e0d695780bb6c39c3c9a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 10:43:57 -0700
Subject: [PATCH 1193/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68893bf6c..6742c98c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - [#4136](https://github.com/influxdata/telegraf/pull/4130): Fix jolokia2 timeout parsing.
 - [#4142](https://github.com/influxdata/telegraf/pull/4142): Fix error parsing dropwizard metrics.
 - [#4149](https://github.com/influxdata/telegraf/issues/4149): Fix librato output support for uint and bool.
+- [#4176](https://github.com/influxdata/telegraf/pull/4176): Fix waitgroup deadlock if url is incorrect in apache input.
 
 ## v1.6.2 [2018-05-08]
 

From 1a407ceaf95fecfb50b94d65bae3a917f8cda1a6 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 21 May 2018 11:59:39 -0700
Subject: [PATCH 1194/1302] Add aurora input plugin (#4158)

---
 plugins/inputs/all/all.go            |   1 +
 plugins/inputs/aurora/README.md      |  63 ++++++
 plugins/inputs/aurora/aurora.go      | 280 +++++++++++++++++++++++++++
 plugins/inputs/aurora/aurora_test.go | 259 +++++++++++++++++++++++++
 testutil/accumulator.go              |   7 +
 5 files changed, 610 insertions(+)
 create mode 100644 plugins/inputs/aurora/README.md
 create mode 100644 plugins/inputs/aurora/aurora.go
 create mode 100644 plugins/inputs/aurora/aurora_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index bb2316c95..80db99bfb 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -4,6 +4,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
 	_ "github.com/influxdata/telegraf/plugins/inputs/amqp_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
+	_ "github.com/influxdata/telegraf/plugins/inputs/aurora"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bond"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
diff --git a/plugins/inputs/aurora/README.md b/plugins/inputs/aurora/README.md
new file mode 100644
index 000000000..cef7ac6c7
--- /dev/null
+++ b/plugins/inputs/aurora/README.md
@@ -0,0 +1,63 @@
+# Aurora Input Plugin
+
+The Aurora Input Plugin gathers metrics from [Apache Aurora](https://aurora.apache.org/) schedulers.
+
+For monitoring recommendations reference [Monitoring your Aurora cluster](https://aurora.apache.org/documentation/latest/operations/monitoring/)
+
+### Configuration:
+
+```toml
+[[inputs.aurora]]
+  ## Schedulers are the base addresses of your Aurora Schedulers
+  schedulers = ["http://127.0.0.1:8081"]
+
+  ## Set of role types to collect metrics from.
+  ##
+  ## The scheduler roles are checked each interval by contacting the
+  ## scheduler nodes; zookeeper is not contacted.
+  # roles = ["leader", "follower"]
+
+  ## Timeout is the max time for total network operations.
+  # timeout = "5s"
+
+  ## Username and password are sent using HTTP Basic Auth.
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+```
+
+### Metrics:
+
+- aurora
+  - tags:
+    - scheduler (URL of scheduler)
+    - role (leader or follower)
+  - fields:
+    - Numeric metrics are collected from the `/vars` endpoint; string fields
+      are not gathered.
+
+
+### Troubleshooting:
+
+Check the Scheduler role, the leader will return a 200 status:
+```
+curl -v http://127.0.0.1:8081/leaderhealth
+```
+
+Get available metrics:
+```
+curl http://127.0.0.1:8081/vars
+```
+
+### Example Output:
+
+The example output below has been trimmed.
+```
+> aurora,role=leader,scheduler=http://debian-stretch-aurora-coordinator-3.virt:8081 CronBatchWorker_batch_locked_events=0i,CronBatchWorker_batch_locked_events_per_sec=0,CronBatchWorker_batch_locked_nanos_per_event=0,CronBatchWorker_batch_locked_nanos_total=0i,CronBatchWorker_batch_locked_nanos_total_per_sec=0,CronBatchWorker_batch_unlocked_events=0i,CronBatchWorker_batch_unlocked_events_per_sec=0,CronBatchWorker_batch_unlocked_nanos_per_event=0,CronBatchWorker_batch_unlocked_nanos_total=0i,CronBatchWorker_batch_unlocked_nanos_total_per_sec=0,CronBatchWorker_batches_processed=0i,CronBatchWorker_items_processed=0i,CronBatchWorker_last_processed_batch_size=0i,CronBatchWorker_queue_size=0i,TaskEventBatchWorker_batch_locked_events=0i,TaskEventBatchWorker_batch_locked_events_per_sec=0,TaskEventBatchWorker_batch_locked_nanos_per_event=0,TaskEventBatchWorker_batch_locked_nanos_total=0i,TaskEventBatchWorker_batch_locked_nanos_total_per_sec=0,TaskEventBatchWorker_batch_unlocked_events=0i,TaskEventBatchWorker_batch_unlocked_events_per_sec=0,TaskEventBatchWorker_batch_unlocked_nanos_per_event=0,TaskEventBatchWorker_batch_unlocked_nanos_total=0i,TaskEventBatchWorker_batch_unlocked_nanos_total_per_sec=0,TaskEventBatchWorker_batches_processed=0i,TaskEventBatchWorker_items_processed=0i,TaskEventBatchWorker_last_processed_batch_size=0i,TaskEventBatchWorker_queue_size=0i,TaskGroupBatchWorker_batch_locked_events=0i,TaskGroupBatchWorker_batch_locked_events_per_sec=0,TaskGroupBatchWorker_batch_locked_nanos_per_event=0,TaskGroupBatchWorker_batch_locked_nanos_total=0i,TaskGroupBatchWorker_batch_locked_nanos_total_per_sec=0,TaskGroupBatchWorker_batch_unlocked_events=0i,TaskGroupBatchWorker_batch_unlocked_events_per_sec=0,TaskGroupBatchWorker_batch_unlocked_nanos_per_event=0,TaskGroupBatchWorker_batch_unlocked_nanos_total=0i,TaskGroupBatchWorker_batch_unlocked_nanos_total_per_sec=0,TaskGroupBatchWorker_batches_processed=0i,TaskGroupBatchWorker_items_processed=0i,TaskGroupBatchWorker_last_processed_batch_size=0i,TaskGroupBatchWorker_queue_size=0i,assigner_launch_failures=0i,async_executor_uncaught_exceptions=0i,async_tasks_completed=1i,cron_job_collisions=0i,cron_job_concurrent_runs=0i,cron_job_launch_failures=0i,cron_job_misfires=0i,cron_job_parse_failures=0i,cron_job_triggers=0i,cron_jobs_loaded=1i,empty_slots_dedicated_large=0i,empty_slots_dedicated_medium=0i,empty_slots_dedicated_revocable_large=0i,empty_slots_dedicated_revocable_medium=0i,empty_slots_dedicated_revocable_small=0i,empty_slots_dedicated_revocable_xlarge=0i,empty_slots_dedicated_small=0i,empty_slots_dedicated_xlarge=0i,empty_slots_large=0i,empty_slots_medium=0i,empty_slots_revocable_large=0i,empty_slots_revocable_medium=0i,empty_slots_revocable_small=0i,empty_slots_revocable_xlarge=0i,empty_slots_small=0i,empty_slots_xlarge=0i,event_bus_dead_events=0i,event_bus_exceptions=1i,framework_registered=1i,globally_banned_offers_size=0i,http_200_responses_events=55i,http_200_responses_events_per_sec=0,http_200_responses_nanos_per_event=0,http_200_responses_nanos_total=310416694i,http_200_responses_nanos_total_per_sec=0,job_update_delete_errors=0i,job_update_recovery_errors=0i,job_update_state_change_errors=0i,job_update_store_delete_all_events=1i,job_update_store_delete_all_events_per_sec=0,job_update_store_delete_all_nanos_per_event=0,job_update_store_delete_all_nanos_total=1227254i,job_update_store_delete_all_nanos_total_per_sec=0,job_update_store_fetch_details_query_events=74i,job_update_store_fetch_details_query_events_per_sec=0,job_update_store_fetch_details_query_nanos_per_event=0,job_update_store_fetch_details_query_nanos_total=24643149i,job_update_store_fetch_details_query_nanos_total_per_sec=0,job_update_store_prune_history_events=59i,job_update_store_prune_history_events_per_sec=0,job_update_store_prune_history_nanos_per_event=0,job_update_store_prune_history_nanos_total=262868218i,job_update_store_prune_history_nanos_total_per_sec=0,job_updates_pruned=0i,jvm_available_processors=2i,jvm_class_loaded_count=6707i,jvm_class_total_loaded_count=6732i,jvm_class_unloaded_count=25i,jvm_gc_PS_MarkSweep_collection_count=2i,jvm_gc_PS_MarkSweep_collection_time_ms=223i,jvm_gc_PS_Scavenge_collection_count=27i,jvm_gc_PS_Scavenge_collection_time_ms=1691i,jvm_gc_collection_count=29i,jvm_gc_collection_time_ms=1914i,jvm_memory_free_mb=65i,jvm_memory_heap_mb_committed=157i,jvm_memory_heap_mb_max=446i,jvm_memory_heap_mb_used=91i,jvm_memory_max_mb=446i,jvm_memory_mb_total=157i,jvm_memory_non_heap_mb_committed=50i,jvm_memory_non_heap_mb_max=0i,jvm_memory_non_heap_mb_used=49i,jvm_threads_active=47i,jvm_threads_daemon=28i,jvm_threads_peak=48i,jvm_threads_started=62i,jvm_time_ms=1526530686927i,jvm_uptime_secs=79947i,log_entry_serialize_events=16i,log_entry_serialize_events_per_sec=0,log_entry_serialize_nanos_per_event=0,log_entry_serialize_nanos_total=4815321i,log_entry_serialize_nanos_total_per_sec=0,log_manager_append_events=16i,log_manager_append_events_per_sec=0,log_manager_append_nanos_per_event=0,log_manager_append_nanos_total=506453428i,log_manager_append_nanos_total_per_sec=0,log_manager_deflate_events=14i,log_manager_deflate_events_per_sec=0,log_manager_deflate_nanos_per_event=0,log_manager_deflate_nanos_total=21010565i,log_manager_deflate_nanos_total_per_sec=0 1526530687000000000
+```
diff --git a/plugins/inputs/aurora/aurora.go b/plugins/inputs/aurora/aurora.go
new file mode 100644
index 000000000..9a5cafa53
--- /dev/null
+++ b/plugins/inputs/aurora/aurora.go
@@ -0,0 +1,280 @@
+package aurora
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+type RoleType int
+
+const (
+	Unknown RoleType = iota
+	Leader
+	Follower
+)
+
+func (r RoleType) String() string {
+	switch r {
+	case Leader:
+		return "leader"
+	case Follower:
+		return "follower"
+	default:
+		return "unknown"
+	}
+}
+
+var (
+	defaultTimeout = 5 * time.Second
+	defaultRoles   = []string{"leader", "follower"}
+)
+
+type Vars map[string]interface{}
+
+type Aurora struct {
+	Schedulers []string          `toml:"schedulers"`
+	Roles      []string          `toml:"roles"`
+	Timeout    internal.Duration `toml:"timeout"`
+	Username   string            `toml:"username"`
+	Password   string            `toml:"password"`
+	tls.ClientConfig
+
+	client *http.Client
+	urls   []*url.URL
+}
+
+var sampleConfig = `
+  ## Schedulers are the base addresses of your Aurora Schedulers
+  schedulers = ["http://127.0.0.1:8081"]
+
+  ## Set of role types to collect metrics from.
+  ##
+  ## The scheduler roles are checked each interval by contacting the
+  ## scheduler nodes; zookeeper is not contacted.
+  # roles = ["leader", "follower"]
+
+  ## Timeout is the max time for total network operations.
+  # timeout = "5s"
+
+  ## Username and password are sent using HTTP Basic Auth.
+  # username = "username"
+  # password = "pa$$word"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+`
+
+func (a *Aurora) SampleConfig() string {
+	return sampleConfig
+}
+
+func (a *Aurora) Description() string {
+	return "Gather metrics from Apache Aurora schedulers"
+}
+
+func (a *Aurora) Gather(acc telegraf.Accumulator) error {
+	if a.client == nil {
+		err := a.initialize()
+		if err != nil {
+			return err
+		}
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), a.Timeout.Duration)
+	defer cancel()
+
+	var wg sync.WaitGroup
+	for _, u := range a.urls {
+		wg.Add(1)
+		go func(u *url.URL) {
+			defer wg.Done()
+			role, err := a.gatherRole(ctx, u)
+			if err != nil {
+				acc.AddError(fmt.Errorf("%s: %v", u, err))
+				return
+			}
+
+			if !a.roleEnabled(role) {
+				return
+			}
+
+			err = a.gatherScheduler(ctx, u, role, acc)
+			if err != nil {
+				acc.AddError(fmt.Errorf("%s: %v", u, err))
+			}
+		}(u)
+	}
+	wg.Wait()
+
+	return nil
+}
+
+func (a *Aurora) initialize() error {
+	tlsCfg, err := a.ClientConfig.TLSConfig()
+	if err != nil {
+		return err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
+			TLSClientConfig: tlsCfg,
+		},
+	}
+
+	urls := make([]*url.URL, 0, len(a.Schedulers))
+	for _, s := range a.Schedulers {
+		loc, err := url.Parse(s)
+		if err != nil {
+			return err
+		}
+
+		urls = append(urls, loc)
+	}
+
+	if a.Timeout.Duration < time.Second {
+		a.Timeout.Duration = defaultTimeout
+	}
+
+	if len(a.Roles) == 0 {
+		a.Roles = defaultRoles
+	}
+
+	a.client = client
+	a.urls = urls
+	return nil
+}
+
+func (a *Aurora) roleEnabled(role RoleType) bool {
+	if len(a.Roles) == 0 {
+		return true
+	}
+
+	for _, v := range a.Roles {
+		if role.String() == v {
+			return true
+		}
+	}
+	return false
+}
+
+func (a *Aurora) gatherRole(ctx context.Context, origin *url.URL) (RoleType, error) {
+	loc := *origin
+	loc.Path = "leaderhealth"
+	req, err := http.NewRequest("GET", loc.String(), nil)
+	if err != nil {
+		return Unknown, err
+	}
+
+	if a.Username != "" || a.Password != "" {
+		req.SetBasicAuth(a.Username, a.Password)
+	}
+	req.Header.Add("Accept", "text/plain")
+
+	resp, err := a.client.Do(req.WithContext(ctx))
+	if err != nil {
+		return Unknown, err
+	}
+	resp.Body.Close()
+
+	switch resp.StatusCode {
+	case http.StatusOK:
+		return Leader, nil
+	case http.StatusBadGateway:
+		fallthrough
+	case http.StatusServiceUnavailable:
+		return Follower, nil
+	default:
+		return Unknown, fmt.Errorf("%v", resp.Status)
+	}
+}
+
+func (a *Aurora) gatherScheduler(
+	ctx context.Context, origin *url.URL, role RoleType, acc telegraf.Accumulator,
+) error {
+	loc := *origin
+	loc.Path = "vars.json"
+	req, err := http.NewRequest("GET", loc.String(), nil)
+	if err != nil {
+		return err
+	}
+
+	if a.Username != "" || a.Password != "" {
+		req.SetBasicAuth(a.Username, a.Password)
+	}
+	req.Header.Add("Accept", "application/json")
+
+	resp, err := a.client.Do(req.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%v", resp.Status)
+	}
+
+	var vars Vars
+	decoder := json.NewDecoder(resp.Body)
+	decoder.UseNumber()
+	err = decoder.Decode(&vars)
+	if err != nil {
+		return fmt.Errorf("decoding response: %v", err)
+	}
+
+	var fields = make(map[string]interface{}, len(vars))
+	for k, v := range vars {
+		switch v := v.(type) {
+		case json.Number:
+			// Aurora encodes numbers as you would specify them as a literal,
+			// use this to determine if a value is a float or int.
+			if strings.ContainsAny(v.String(), ".eE") {
+				fv, err := v.Float64()
+				if err != nil {
+					acc.AddError(err)
+					continue
+				}
+				fields[k] = fv
+			} else {
+				fi, err := v.Int64()
+				if err != nil {
+					acc.AddError(err)
+					continue
+				}
+				fields[k] = fi
+			}
+		default:
+			continue
+		}
+	}
+
+	acc.AddFields("aurora",
+		fields,
+		map[string]string{
+			"scheduler": origin.String(),
+			"role":      role.String(),
+		},
+	)
+	return nil
+}
+
+func init() {
+	inputs.Add("aurora", func() telegraf.Input {
+		return &Aurora{}
+	})
+}
diff --git a/plugins/inputs/aurora/aurora_test.go b/plugins/inputs/aurora/aurora_test.go
new file mode 100644
index 000000000..6e2c004f2
--- /dev/null
+++ b/plugins/inputs/aurora/aurora_test.go
@@ -0,0 +1,259 @@
+package aurora
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+type (
+	TestHandlerFunc func(t *testing.T, w http.ResponseWriter, r *http.Request)
+	CheckFunc       func(t *testing.T, err error, acc *testutil.Accumulator)
+)
+
+func TestAurora(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	tests := []struct {
+		name         string
+		plugin       *Aurora
+		schedulers   []string
+		roles        []string
+		leaderhealth TestHandlerFunc
+		varsjson     TestHandlerFunc
+		check        CheckFunc
+	}{
+		{
+			name: "minimal",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				body := `{
+					"variable_scrape_events": 2958,
+					"variable_scrape_events_per_sec": 1.0,
+					"variable_scrape_micros_per_event": 1484.0,
+					"variable_scrape_micros_total": 4401084,
+					"variable_scrape_micros_total_per_sec": 1485.0
+				}`
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.Equal(t, 1, len(acc.Metrics))
+				acc.AssertContainsTaggedFields(t,
+					"aurora",
+					map[string]interface{}{
+						"variable_scrape_events":               int64(2958),
+						"variable_scrape_events_per_sec":       1.0,
+						"variable_scrape_micros_per_event":     1484.0,
+						"variable_scrape_micros_total":         int64(4401084),
+						"variable_scrape_micros_total_per_sec": 1485.0,
+					},
+					map[string]string{
+						"scheduler": u.String(),
+						"role":      "leader",
+					},
+				)
+			},
+		},
+		{
+			name:  "disabled role",
+			roles: []string{"leader"},
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusServiceUnavailable)
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.NoError(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "no metrics available",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("{}"))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.NoError(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "string metrics skipped",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				body := `{
+					"foo": "bar"
+				}`
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.NoError(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "float64 unparseable",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				// too large
+				body := `{
+					"foo": 1e309
+				}`
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.Error(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "int64 unparseable",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				// too large
+				body := `{
+					"foo": 9223372036854775808
+				}`
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.Error(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "bad json",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				body := `{]`
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.Error(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+		{
+			name: "wrong status code",
+			leaderhealth: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+			},
+			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
+				body := `{
+					"value": 42
+				}`
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte(body))
+			},
+			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
+				require.NoError(t, err)
+				require.Error(t, acc.FirstError())
+				require.Equal(t, 0, len(acc.Metrics))
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				switch r.URL.Path {
+				case "/leaderhealth":
+					tt.leaderhealth(t, w, r)
+				case "/vars.json":
+					tt.varsjson(t, w, r)
+				default:
+					w.WriteHeader(http.StatusNotFound)
+				}
+			})
+
+			var acc testutil.Accumulator
+			plugin := &Aurora{}
+			plugin.Schedulers = []string{u.String()}
+			plugin.Roles = tt.roles
+			err := plugin.Gather(&acc)
+			tt.check(t, err, &acc)
+		})
+	}
+}
+
+func TestBasicAuth(t *testing.T) {
+	ts := httptest.NewServer(http.NotFoundHandler())
+	defer ts.Close()
+
+	u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
+	require.NoError(t, err)
+
+	tests := []struct {
+		name     string
+		username string
+		password string
+	}{
+		{
+			name: "no auth",
+		},
+		{
+			name:     "basic auth",
+			username: "username",
+			password: "pa$$word",
+		},
+		{
+			name:     "username only",
+			username: "username",
+		},
+		{
+			name:     "password only",
+			password: "pa$$word",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				username, password, _ := r.BasicAuth()
+				require.Equal(t, tt.username, username)
+				require.Equal(t, tt.password, password)
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("{}"))
+			})
+
+			var acc testutil.Accumulator
+			plugin := &Aurora{}
+			plugin.Schedulers = []string{u.String()}
+			plugin.Username = tt.username
+			plugin.Password = tt.password
+			err := plugin.Gather(&acc)
+			require.NoError(t, err)
+		})
+	}
+}
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 03e92538b..8784cc1db 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -42,6 +42,13 @@ func (a *Accumulator) NMetrics() uint64 {
 	return atomic.LoadUint64(&a.nMetrics)
 }
 
+func (a *Accumulator) FirstError() error {
+	if len(a.Errors) == 0 {
+		return nil
+	}
+	return a.Errors[0]
+}
+
 func (a *Accumulator) ClearMetrics() {
 	a.Lock()
 	defer a.Unlock()

From 45c1a45f4a7511fcaa72283a1b7c99183ec4d91a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 12:01:58 -0700
Subject: [PATCH 1195/1302] Add aurora input to changelog and readme

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6742c98c4..fffd1d3cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### New Inputs
 
+- [aurora](./plugins/inputs/aurora/README.md) - Contributed by @influxdata
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
 - [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry/README.md) - Contributed by @ajhai
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
@@ -45,6 +46,7 @@
 - [#4010](https://github.com/influxdata/telegraf/pull/3455): Add application_insights output plugin.
 - [#4167](https://github.com/influxdata/telegraf/pull/4167): Added several important elasticsearch cluster health metrics.
 - [#4094](https://github.com/influxdata/telegraf/pull/4094): Add batch mode to mqtt output.
+- [#4158](https://github.com/influxdata/telegraf/pull/4158): Add aurora input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index e453a4b53..3275a6796 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,7 @@ configuration options.
 * [aerospike](./plugins/inputs/aerospike)
 * [amqp_consumer](./plugins/inputs/amqp_consumer) (rabbitmq)
 * [apache](./plugins/inputs/apache)
+* [aurora](./plugins/inputs/aurora)
 * [aws cloudwatch](./plugins/inputs/cloudwatch)
 * [bcache](./plugins/inputs/bcache)
 * [bond](./plugins/inputs/bond)

From 3be9cad309c5e733bfbeca09c3caecb1ee5f21c9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 12:43:52 -0700
Subject: [PATCH 1196/1302] Set release date for 1.6.3

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fffd1d3cc..7d22ec6c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,7 @@
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 - [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
 
-## v1.6.3 [unreleased]
+## v1.6.3 [2018-05-21]
 
 ### Bugfixes
 

From ccc4a85fd643ff8699b2d61b96fc20ad2addab92 Mon Sep 17 00:00:00 2001
From: Alexander Shepelin <Brightcor@gmail.com>
Date: Tue, 22 May 2018 01:46:10 +0300
Subject: [PATCH 1197/1302] Add regex processor plugin (#3839)

---
 plugins/processors/all/all.go          |   1 +
 plugins/processors/regex/README.md     |  46 +++++
 plugins/processors/regex/regex.go      | 110 ++++++++++
 plugins/processors/regex/regex_test.go | 273 +++++++++++++++++++++++++
 4 files changed, 430 insertions(+)
 create mode 100644 plugins/processors/regex/README.md
 create mode 100644 plugins/processors/regex/regex.go
 create mode 100644 plugins/processors/regex/regex_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index f14014e29..c15f76391 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -3,5 +3,6 @@ package all
 import (
 	_ "github.com/influxdata/telegraf/plugins/processors/override"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
+	_ "github.com/influxdata/telegraf/plugins/processors/regex"
 	_ "github.com/influxdata/telegraf/plugins/processors/topk"
 )
diff --git a/plugins/processors/regex/README.md b/plugins/processors/regex/README.md
new file mode 100644
index 000000000..c9eec037b
--- /dev/null
+++ b/plugins/processors/regex/README.md
@@ -0,0 +1,46 @@
+# Regex Processor Plugin
+
+The `regex` plugin transforms tag and field values with regex pattern. If `result_key` parameter is present, it can produce new tags and fields from existing ones.
+
+### Configuration:
+
+```toml
+[[processors.regex]]
+  namepass = ["nginx_requests"]
+
+  # Tag and field conversions defined in a separate sub-tables
+  [[processors.regex.tags]]
+    ## Tag to change
+    key = "resp_code"
+    ## Regular expression to match on a tag value
+    pattern = "^(\\d)\\d\\d$"
+    ## Pattern for constructing a new value (${1} represents first subgroup)
+    replacement = "${1}xx"
+
+  [[processors.regex.fields]]
+    key = "request"
+    ## All the power of the Go regular expressions available here
+    ## For example, named subgroups
+    pattern = "^/api(?P<method>/[\\w/]+)\\S*"
+    replacement = "${method}"
+    ## If result_key is present, a new field will be created
+    ## instead of changing existing field
+    result_key = "method"
+
+  # Multiple conversions may be applied for one field sequentially
+  # Let's extract one more value
+  [[processors.regex.fields]]
+    key = "request"
+    pattern = ".*category=(\\w+).*"
+    replacement = "${1}"
+    result_key = "search_category"
+```
+
+### Tags:
+
+No tags are applied by this processor.
+
+### Example Output:
+```
+nginx_requests,verb=GET,resp_code=2xx request="/api/search/?category=plugins&q=regex&sort=asc",method="/search/",search_category="plugins",referrer="-",ident="-",http_version=1.1,agent="UserAgent",client_ip="127.0.0.1",auth="-",resp_bytes=270i 1519652321000000000
+```
diff --git a/plugins/processors/regex/regex.go b/plugins/processors/regex/regex.go
new file mode 100644
index 000000000..3282406c8
--- /dev/null
+++ b/plugins/processors/regex/regex.go
@@ -0,0 +1,110 @@
+package regex
+
+import (
+	"regexp"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+type Regex struct {
+	Tags       []converter
+	Fields     []converter
+	regexCache map[string]*regexp.Regexp
+}
+
+type converter struct {
+	Key         string
+	Pattern     string
+	Replacement string
+	ResultKey   string
+}
+
+const sampleConfig = `
+  ## Tag and field conversions defined in a separate sub-tables
+  # [[processors.regex.tags]]
+  #   ## Tag to change
+  #   key = "resp_code"
+  #   ## Regular expression to match on a tag value
+  #   pattern = "^(\\d)\\d\\d$"
+  #   ## Pattern for constructing a new value (${1} represents first subgroup)
+  #   replacement = "${1}xx"
+
+  # [[processors.regex.fields]]
+  #   key = "request"
+  #   ## All the power of the Go regular expressions available here
+  #   ## For example, named subgroups
+  #   pattern = "^/api(?P<method>/[\\w/]+)\\S*" 
+  #   replacement = "${method}"
+  #   ## If result_key is present, a new field will be created
+  #   ## instead of changing existing field
+  #   result_key = "method"
+
+  ## Multiple conversions may be applied for one field sequentially
+  ## Let's extract one more value
+  # [[processors.regex.fields]]
+  #   key = "request"
+  #   pattern = ".*category=(\\w+).*"
+  #   replacement = "${1}"
+  #   result_key = "search_category"
+`
+
+func NewRegex() *Regex {
+	return &Regex{
+		regexCache: make(map[string]*regexp.Regexp),
+	}
+}
+
+func (r *Regex) SampleConfig() string {
+	return sampleConfig
+}
+
+func (r *Regex) Description() string {
+	return "Transforms tag and field values with regex pattern"
+}
+
+func (r *Regex) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	for _, metric := range in {
+		for _, converter := range r.Tags {
+			if value, ok := metric.GetTag(converter.Key); ok {
+				metric.AddTag(r.convert(converter, value))
+			}
+		}
+
+		for _, converter := range r.Fields {
+			if value, ok := metric.GetField(converter.Key); ok {
+				switch value := value.(type) {
+				case string:
+					metric.AddField(r.convert(converter, value))
+				}
+			}
+		}
+	}
+
+	return in
+}
+
+func (r *Regex) convert(c converter, src string) (string, string) {
+	regex, compiled := r.regexCache[c.Pattern]
+	if !compiled {
+		regex = regexp.MustCompile(c.Pattern)
+		r.regexCache[c.Pattern] = regex
+	}
+
+	value := ""
+	if c.ResultKey == "" || regex.MatchString(src) {
+		value = regex.ReplaceAllString(src, c.Replacement)
+	}
+
+	if c.ResultKey != "" {
+		return c.ResultKey, value
+	}
+
+	return c.Key, value
+}
+
+func init() {
+	processors.Add("regex", func() telegraf.Processor {
+		return NewRegex()
+	})
+}
diff --git a/plugins/processors/regex/regex_test.go b/plugins/processors/regex/regex_test.go
new file mode 100644
index 000000000..e7c15e5aa
--- /dev/null
+++ b/plugins/processors/regex/regex_test.go
@@ -0,0 +1,273 @@
+package regex
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/assert"
+)
+
+func newM1() telegraf.Metric {
+	m1, _ := metric.New("access_log",
+		map[string]string{
+			"verb":      "GET",
+			"resp_code": "200",
+		},
+		map[string]interface{}{
+			"request": "/users/42/",
+		},
+		time.Now(),
+	)
+	return m1
+}
+
+func newM2() telegraf.Metric {
+	m2, _ := metric.New("access_log",
+		map[string]string{
+			"verb":      "GET",
+			"resp_code": "200",
+		},
+		map[string]interface{}{
+			"request":       "/api/search/?category=plugins&q=regex&sort=asc",
+			"ignore_number": int64(200),
+			"ignore_bool":   true,
+		},
+		time.Now(),
+	)
+	return m2
+}
+
+func TestFieldConversions(t *testing.T) {
+	tests := []struct {
+		message        string
+		converter      converter
+		expectedFields map[string]interface{}
+	}{
+		{
+			message: "Should change existing field",
+			converter: converter{
+				Key:         "request",
+				Pattern:     "^/users/\\d+/$",
+				Replacement: "/users/{id}/",
+			},
+			expectedFields: map[string]interface{}{
+				"request": "/users/{id}/",
+			},
+		},
+		{
+			message: "Should add new field",
+			converter: converter{
+				Key:         "request",
+				Pattern:     "^/users/\\d+/$",
+				Replacement: "/users/{id}/",
+				ResultKey:   "normalized_request",
+			},
+			expectedFields: map[string]interface{}{
+				"request":            "/users/42/",
+				"normalized_request": "/users/{id}/",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		regex := NewRegex()
+		regex.Fields = []converter{
+			test.converter,
+		}
+
+		processed := regex.Apply(newM1())
+
+		expectedTags := map[string]string{
+			"verb":      "GET",
+			"resp_code": "200",
+		}
+
+		assert.Equal(t, test.expectedFields, processed[0].Fields(), test.message)
+		assert.Equal(t, expectedTags, processed[0].Tags(), "Should not change tags")
+		assert.Equal(t, "access_log", processed[0].Name(), "Should not change name")
+	}
+}
+
+func TestTagConversions(t *testing.T) {
+	tests := []struct {
+		message      string
+		converter    converter
+		expectedTags map[string]string
+	}{
+		{
+			message: "Should change existing tag",
+			converter: converter{
+				Key:         "resp_code",
+				Pattern:     "^(\\d)\\d\\d$",
+				Replacement: "${1}xx",
+			},
+			expectedTags: map[string]string{
+				"verb":      "GET",
+				"resp_code": "2xx",
+			},
+		},
+		{
+			message: "Should add new tag",
+			converter: converter{
+				Key:         "resp_code",
+				Pattern:     "^(\\d)\\d\\d$",
+				Replacement: "${1}xx",
+				ResultKey:   "resp_code_group",
+			},
+			expectedTags: map[string]string{
+				"verb":            "GET",
+				"resp_code":       "200",
+				"resp_code_group": "2xx",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		regex := NewRegex()
+		regex.Tags = []converter{
+			test.converter,
+		}
+
+		processed := regex.Apply(newM1())
+
+		expectedFields := map[string]interface{}{
+			"request": "/users/42/",
+		}
+
+		assert.Equal(t, expectedFields, processed[0].Fields(), test.message, "Should not change fields")
+		assert.Equal(t, test.expectedTags, processed[0].Tags(), test.message)
+		assert.Equal(t, "access_log", processed[0].Name(), "Should not change name")
+	}
+}
+
+func TestMultipleConversions(t *testing.T) {
+	regex := NewRegex()
+	regex.Tags = []converter{
+		{
+			Key:         "resp_code",
+			Pattern:     "^(\\d)\\d\\d$",
+			Replacement: "${1}xx",
+			ResultKey:   "resp_code_group",
+		},
+		{
+			Key:         "resp_code_group",
+			Pattern:     "2xx",
+			Replacement: "OK",
+			ResultKey:   "resp_code_text",
+		},
+	}
+	regex.Fields = []converter{
+		{
+			Key:         "request",
+			Pattern:     "^/api(?P<method>/[\\w/]+)\\S*",
+			Replacement: "${method}",
+			ResultKey:   "method",
+		},
+		{
+			Key:         "request",
+			Pattern:     ".*category=(\\w+).*",
+			Replacement: "${1}",
+			ResultKey:   "search_category",
+		},
+	}
+
+	processed := regex.Apply(newM2())
+
+	expectedFields := map[string]interface{}{
+		"request":         "/api/search/?category=plugins&q=regex&sort=asc",
+		"method":          "/search/",
+		"search_category": "plugins",
+		"ignore_number":   int64(200),
+		"ignore_bool":     true,
+	}
+	expectedTags := map[string]string{
+		"verb":            "GET",
+		"resp_code":       "200",
+		"resp_code_group": "2xx",
+		"resp_code_text":  "OK",
+	}
+
+	assert.Equal(t, expectedFields, processed[0].Fields())
+	assert.Equal(t, expectedTags, processed[0].Tags())
+}
+
+func TestNoMatches(t *testing.T) {
+	tests := []struct {
+		message        string
+		converter      converter
+		expectedFields map[string]interface{}
+	}{
+		{
+			message: "Should not change anything if there is no field with given key",
+			converter: converter{
+				Key:         "not_exists",
+				Pattern:     "\\.*",
+				Replacement: "x",
+			},
+			expectedFields: map[string]interface{}{
+				"request": "/users/42/",
+			},
+		},
+		{
+			message: "Should not change anything if regex doesn't match",
+			converter: converter{
+				Key:         "request",
+				Pattern:     "not_match",
+				Replacement: "x",
+			},
+			expectedFields: map[string]interface{}{
+				"request": "/users/42/",
+			},
+		},
+		{
+			message: "Should emit empty string when result_key given but regex doesn't match",
+			converter: converter{
+				Key:         "request",
+				Pattern:     "not_match",
+				Replacement: "x",
+				ResultKey:   "new_field",
+			},
+			expectedFields: map[string]interface{}{
+				"request":   "/users/42/",
+				"new_field": "",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		regex := NewRegex()
+		regex.Fields = []converter{
+			test.converter,
+		}
+
+		processed := regex.Apply(newM1())
+
+		assert.Equal(t, test.expectedFields, processed[0].Fields(), test.message)
+	}
+}
+
+func BenchmarkConversions(b *testing.B) {
+	regex := NewRegex()
+	regex.Tags = []converter{
+		{
+			Key:         "resp_code",
+			Pattern:     "^(\\d)\\d\\d$",
+			Replacement: "${1}xx",
+			ResultKey:   "resp_code_group",
+		},
+	}
+	regex.Fields = []converter{
+		{
+			Key:         "request",
+			Pattern:     "^/users/\\d+/$",
+			Replacement: "/users/{id}/",
+		},
+	}
+
+	for n := 0; n < b.N; n++ {
+		processed := regex.Apply(newM1())
+		_ = processed
+	}
+}

From 703be4f12472ae4eb922c685be6b5a919b93bb40 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 15:48:22 -0700
Subject: [PATCH 1198/1302] Add regex processor to readme and changelog

---
 CHANGELOG.md | 2 ++
 README.md    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d22ec6c7..a05136d85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 ### New Processors
 
+- [regex](./plugins/processors/regex/README.md) - Contributed by @44px
 - [topk](./plugins/processors/topk/README.md) - Contributed by @mirath
 
 ### New Outputs
@@ -47,6 +48,7 @@
 - [#4167](https://github.com/influxdata/telegraf/pull/4167): Added several important elasticsearch cluster health metrics.
 - [#4094](https://github.com/influxdata/telegraf/pull/4094): Add batch mode to mqtt output.
 - [#4158](https://github.com/influxdata/telegraf/pull/4158): Add aurora input plugin.
+- [#3839](https://github.com/influxdata/telegraf/pull/3839): Add regex processor plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 3275a6796..d4d19db0f 100644
--- a/README.md
+++ b/README.md
@@ -270,6 +270,7 @@ formats may be used with input plugins supporting the `data_format` option:
 
 * [override](./plugins/processors/override)
 * [printer](./plugins/processors/printer)
+* [regex](./plugins/processors/regex)
 * [topk](./plugins/processors/topk)
 
 ## Aggregator Plugins

From 7660315e4517003f4821643fc0869d9565d10760 Mon Sep 17 00:00:00 2001
From: Pavel Boev <rascal@rascal.su>
Date: Tue, 22 May 2018 01:59:56 +0300
Subject: [PATCH 1199/1302] Add support for Graphite 1.1.x tags (#4165)

---
 docs/DATA_FORMATS_OUTPUT.md                   |  46 +++
 plugins/outputs/graphite/README.md            |   9 +
 plugins/outputs/graphite/graphite.go          |   7 +-
 plugins/outputs/graphite/graphite_test.go     |  90 +++++
 plugins/outputs/instrumental/instrumental.go  |   2 +-
 plugins/serializers/graphite/graphite.go      |  94 ++++-
 plugins/serializers/graphite/graphite_test.go | 345 ++++++++++++++++++
 plugins/serializers/registry.go               |  12 +-
 8 files changed, 581 insertions(+), 24 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index d21aca91d..f8d8cf466 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -89,6 +89,15 @@ tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 Fields with string values will be skipped.  Boolean fields will be converted
 to 1 (true) or 0 (false).
 
+With enable `graphite_tag_support` option following influx metric -> graphite conversion would happen:
+
+```
+cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
+=>
+cpu.usage_user;cpu=cpu-total;dc=us-east-1;host=tars 0.89 1455320690
+cpu.usage_idle;cpu=cpu-total;dc=us-east-1;host=tars 98.09 1455320690
+```
+
 ### Graphite Configuration
 
 ```toml
@@ -106,6 +115,43 @@ to 1 (true) or 0 (false).
   prefix = "telegraf"
   # graphite template
   template = "host.tags.measurement.field"
+  # Enable Graphite tags support
+  # Defaults to "false"
+  graphite_tag_support = true
+```
+
+
+## Graphite 1.1
+
+The Graphite11 data format translates Telegraf metrics into Graphite protocol which supports storing data using tags to identify each series. [Graphite Tag Support](http://graphite.readthedocs.io/en/latest/tags.html)
+
+Which means the following influx metric -> graphite 1.1.x conversion would happen:
+
+```
+cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
+=>
+cpu.usage_user;cpu=cpu-total;dc=us-east-1;host=tars 0.89 1455320690
+cpu.usage_idle;cpu=cpu-total;dc=us-east-1;host=tars 98.09 1455320690
+```
+
+Fields with string values will be skipped.  Boolean fields will be converted
+to 1 (true) or 0 (false).
+
+### Graphite Configuration
+
+```toml
+[[outputs.file]]
+  ## Files to write to, "stdout" is a specially handled file.
+  files = ["stdout", "/tmp/metrics.out"]
+
+  ## Data format to output.
+  ## Each data format has its own unique set of configuration options, read
+  ## more about them here:
+  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
+  data_format = "graphite11"
+
+  # prefix each graphite bucket
+  prefix = "telegraf"
 ```
 
 ## JSON
diff --git a/plugins/outputs/graphite/README.md b/plugins/outputs/graphite/README.md
index 216c09ca0..c54f07bb1 100644
--- a/plugins/outputs/graphite/README.md
+++ b/plugins/outputs/graphite/README.md
@@ -3,6 +3,11 @@
 This plugin writes to [Graphite](http://graphite.readthedocs.org/en/latest/index.html)
 via raw TCP.
 
+<aside class="notice">
+When `graphite_tag_support` is enabled, `name` as tag name is reserved for graphite metric and will be replaced with `_name`.
+</aside>
+
+
 ## Configuration:
 
 ```toml
@@ -17,6 +22,10 @@ via raw TCP.
   ## Graphite output template
   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   template = "host.tags.measurement.field"
+  ## Enable Graphite tags support
+  ## see http://graphite.readthedocs.io/en/latest/tags.html 
+  ## Defaults to "false"
+  # graphite_tag_support = true
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 4346c50d8..8931dbe0a 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -16,6 +16,7 @@ import (
 )
 
 type Graphite struct {
+	GraphiteTagSupport bool
 	// URL is only for backwards compatibility
 	Servers  []string
 	Prefix   string
@@ -35,6 +36,10 @@ var sampleConfig = `
   ## Graphite output template
   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   template = "host.tags.measurement.field"
+  ## Enable Graphite tags support
+  ## see http://graphite.readthedocs.io/en/latest/tags.html 
+  ## Defaults to "false"
+  # graphite_tag_support = true
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 
@@ -129,7 +134,7 @@ func checkEOF(conn net.Conn) {
 func (g *Graphite) Write(metrics []telegraf.Metric) error {
 	// Prepare data
 	var batch []byte
-	s, err := serializers.NewGraphiteSerializer(g.Prefix, g.Template)
+	s, err := serializers.NewGraphiteSerializer(g.Prefix, g.Template, g.GraphiteTagSupport)
 	if err != nil {
 		return err
 	}
diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go
index 485829fec..3857236e5 100644
--- a/plugins/outputs/graphite/graphite_test.go
+++ b/plugins/outputs/graphite/graphite_test.go
@@ -98,6 +98,66 @@ func TestGraphiteOK(t *testing.T) {
 	g.Close()
 }
 
+func TestGraphiteOkWithTags(t *testing.T) {
+	var wg sync.WaitGroup
+	// Start TCP server
+	wg.Add(1)
+	t.Log("Starting server")
+	TCPServer1WithTags(t, &wg)
+
+	// Init plugin
+	g := Graphite{
+		Prefix:             "my.prefix",
+		GraphiteTagSupport: true,
+	}
+
+	// Init metrics
+	m1, _ := metric.New(
+		"mymeasurement",
+		map[string]string{"host": "192.168.0.1"},
+		map[string]interface{}{"myfield": float64(3.14)},
+		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	m2, _ := metric.New(
+		"mymeasurement",
+		map[string]string{"host": "192.168.0.1"},
+		map[string]interface{}{"value": float64(3.14)},
+		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+	m3, _ := metric.New(
+		"my_measurement",
+		map[string]string{"host": "192.168.0.1"},
+		map[string]interface{}{"value": float64(3.14)},
+		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
+	)
+
+	// Prepare point list
+	metrics := []telegraf.Metric{m1}
+	metrics2 := []telegraf.Metric{m2, m3}
+	err1 := g.Connect()
+	require.NoError(t, err1)
+	// Send Data
+	t.Log("Send first data")
+	err2 := g.Write(metrics)
+	require.NoError(t, err2)
+
+	// Waiting TCPserver, should reconnect and resend
+	wg.Wait()
+	t.Log("Finished Waiting for first data")
+	var wg2 sync.WaitGroup
+	// Start TCP server
+	wg2.Add(1)
+	TCPServer2WithTags(t, &wg2)
+	//Write but expect an error, but reconnect
+	err3 := g.Write(metrics2)
+	t.Log("Finished writing second data, it should have reconnected automatically")
+
+	require.NoError(t, err3)
+	t.Log("Finished writing third data")
+	wg2.Wait()
+	g.Close()
+}
+
 func TCPServer1(t *testing.T, wg *sync.WaitGroup) {
 	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
 	go func() {
@@ -127,3 +187,33 @@ func TCPServer2(t *testing.T, wg *sync.WaitGroup) {
 		tcpServer.Close()
 	}()
 }
+
+func TCPServer1WithTags(t *testing.T, wg *sync.WaitGroup) {
+	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
+	go func() {
+		defer wg.Done()
+		conn, _ := (tcpServer).Accept()
+		reader := bufio.NewReader(conn)
+		tp := textproto.NewReader(reader)
+		data1, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.mymeasurement.myfield;host=192.168.0.1 3.14 1289430000", data1)
+		conn.Close()
+		tcpServer.Close()
+	}()
+}
+
+func TCPServer2WithTags(t *testing.T, wg *sync.WaitGroup) {
+	tcpServer, _ := net.Listen("tcp", "127.0.0.1:2003")
+	go func() {
+		defer wg.Done()
+		conn2, _ := (tcpServer).Accept()
+		reader := bufio.NewReader(conn2)
+		tp := textproto.NewReader(reader)
+		data2, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.mymeasurement;host=192.168.0.1 3.14 1289430000", data2)
+		data3, _ := tp.ReadLine()
+		assert.Equal(t, "my.prefix.my_measurement;host=192.168.0.1 3.14 1289430000", data3)
+		conn2.Close()
+		tcpServer.Close()
+	}()
+}
diff --git a/plugins/outputs/instrumental/instrumental.go b/plugins/outputs/instrumental/instrumental.go
index 7c52d312b..117c9d434 100644
--- a/plugins/outputs/instrumental/instrumental.go
+++ b/plugins/outputs/instrumental/instrumental.go
@@ -85,7 +85,7 @@ func (i *Instrumental) Write(metrics []telegraf.Metric) error {
 		}
 	}
 
-	s, err := serializers.NewGraphiteSerializer(i.Prefix, i.Template)
+	s, err := serializers.NewGraphiteSerializer(i.Prefix, i.Template, false)
 	if err != nil {
 		return err
 	}
diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go
index c06ba67ff..d02b0e26b 100644
--- a/plugins/serializers/graphite/graphite.go
+++ b/plugins/serializers/graphite/graphite.go
@@ -30,8 +30,9 @@ var (
 )
 
 type GraphiteSerializer struct {
-	Prefix   string
-	Template string
+	Prefix     string
+	Template   string
+	TagSupport bool
 }
 
 func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
@@ -40,23 +41,42 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
 	// Convert UnixNano to Unix timestamps
 	timestamp := metric.Time().UnixNano() / 1000000000
 
-	bucket := SerializeBucketName(metric.Name(), metric.Tags(), s.Template, s.Prefix)
-	if bucket == "" {
-		return out, nil
-	}
-
-	for fieldName, value := range metric.Fields() {
-		fieldValue := formatValue(value)
-		if fieldValue == "" {
-			continue
+	switch s.TagSupport {
+	case true:
+		for fieldName, value := range metric.Fields() {
+			fieldValue := formatValue(value)
+			if fieldValue == "" {
+				continue
+			}
+			bucket := SerializeBucketNameWithTags(metric.Name(), metric.Tags(), s.Prefix, fieldName)
+			metricString := fmt.Sprintf("%s %s %d\n",
+				// insert "field" section of template
+				bucket,
+				//bucket,
+				fieldValue,
+				timestamp)
+			point := []byte(metricString)
+			out = append(out, point...)
+		}
+	default:
+		bucket := SerializeBucketName(metric.Name(), metric.Tags(), s.Template, s.Prefix)
+		if bucket == "" {
+			return out, nil
+		}
+
+		for fieldName, value := range metric.Fields() {
+			fieldValue := formatValue(value)
+			if fieldValue == "" {
+				continue
+			}
+			metricString := fmt.Sprintf("%s %s %d\n",
+				// insert "field" section of template
+				sanitize(InsertField(bucket, fieldName)),
+				fieldValue,
+				timestamp)
+			point := []byte(metricString)
+			out = append(out, point...)
 		}
-		metricString := fmt.Sprintf("%s %s %d\n",
-			// insert "field" section of template
-			sanitize(InsertField(bucket, fieldName)),
-			fieldValue,
-			timestamp)
-		point := []byte(metricString)
-		out = append(out, point...)
 	}
 	return out, nil
 }
@@ -165,6 +185,44 @@ func SerializeBucketName(
 	return prefix + "." + strings.Join(out, ".")
 }
 
+// SerializeBucketNameWithTags will take the given measurement name and tags and
+// produce a graphite bucket. It will use the Graphite11Serializer.
+// http://graphite.readthedocs.io/en/latest/tags.html
+func SerializeBucketNameWithTags(
+	measurement string,
+	tags map[string]string,
+	prefix string,
+	field string,
+) string {
+	var out string
+	var tagsCopy []string
+	for k, v := range tags {
+		if k == "name" {
+			k = "_name"
+		}
+		tagsCopy = append(tagsCopy, sanitize(k+"="+v))
+	}
+	sort.Strings(tagsCopy)
+
+	if prefix != "" {
+		out = prefix + "."
+	}
+
+	out += measurement
+
+	if field != "value" {
+		out += "." + field
+	}
+
+	out = sanitize(out)
+
+	if len(tagsCopy) > 0 {
+		out += ";" + strings.Join(tagsCopy, ";")
+	}
+
+	return out
+}
+
 // InsertField takes the bucket string from SerializeBucketName and replaces the
 // FIELDNAME portion. If fieldName == "value", it will simply delete the
 // FIELDNAME portion.
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index 85e7a6458..e72ed7a30 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -87,6 +87,35 @@ func TestSerializeMetricNoHost(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeMetricNoHostWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(91.5),
+		"usage_busy": float64(8.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu.usage_idle;cpu=cpu0;datacenter=us-west-2 91.5 %d", now.Unix()),
+		fmt.Sprintf("cpu.usage_busy;cpu=cpu0;datacenter=us-west-2 8.5 %d", now.Unix()),
+	}
+	sort.Strings(mS)
+	sort.Strings(expS)
+	assert.Equal(t, expS, mS)
+}
+
 func TestSerializeMetricHost(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
@@ -115,6 +144,36 @@ func TestSerializeMetricHost(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeMetricHostWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(91.5),
+		"usage_busy": float64(8.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu.usage_idle;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()),
+		fmt.Sprintf("cpu.usage_busy;cpu=cpu0;datacenter=us-west-2;host=localhost 8.5 %d", now.Unix()),
+	}
+	sort.Strings(mS)
+	sort.Strings(expS)
+	assert.Equal(t, expS, mS)
+}
+
 // test that a field named "value" gets ignored.
 func TestSerializeValueField(t *testing.T) {
 	now := time.Now()
@@ -140,6 +199,32 @@ func TestSerializeValueField(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeValueFieldWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"value": float64(91.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()),
+	}
+	assert.Equal(t, expS, mS)
+}
+
 // test that a field named "value" gets ignored in middle of template.
 func TestSerializeValueField2(t *testing.T) {
 	now := time.Now()
@@ -189,6 +274,28 @@ func TestSerializeValueString(t *testing.T) {
 	assert.Equal(t, "", mS[0])
 }
 
+func TestSerializeValueStringWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"value": "asdasd",
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+	assert.Equal(t, "", mS[0])
+}
+
 func TestSerializeValueBoolean(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
@@ -219,6 +326,36 @@ func TestSerializeValueBoolean(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeValueBooleanWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"enabled":  true,
+		"disabled": false,
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu.enabled;cpu=cpu0;datacenter=us-west-2;host=localhost 1 %d", now.Unix()),
+		fmt.Sprintf("cpu.disabled;cpu=cpu0;datacenter=us-west-2;host=localhost 0 %d", now.Unix()),
+	}
+	sort.Strings(mS)
+	sort.Strings(expS)
+	assert.Equal(t, expS, mS)
+}
+
 func TestSerializeValueUnsigned(t *testing.T) {
 	now := time.Unix(0, 0)
 	tags := map[string]string{}
@@ -262,6 +399,32 @@ func TestSerializeFieldWithSpaces(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeFieldWithSpacesWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		`field\ with\ spaces`: float64(91.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu.field_with_spaces;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()),
+	}
+	assert.Equal(t, expS, mS)
+}
+
 // test that tags with spaces get fixed.
 func TestSerializeTagWithSpaces(t *testing.T) {
 	now := time.Now()
@@ -289,6 +452,32 @@ func TestSerializeTagWithSpaces(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeTagWithSpacesWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        `cpu\ 0`,
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		`field_with_spaces`: float64(91.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("cpu.field_with_spaces;cpu=cpu_0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()),
+	}
+	assert.Equal(t, expS, mS)
+}
+
 // test that a field named "value" gets ignored at beginning of template.
 func TestSerializeValueField3(t *testing.T) {
 	now := time.Now()
@@ -371,6 +560,37 @@ func TestSerializeMetricPrefix(t *testing.T) {
 	assert.Equal(t, expS, mS)
 }
 
+func TestSerializeMetricPrefixWithTagSupport(t *testing.T) {
+	now := time.Now()
+	tags := map[string]string{
+		"host":       "localhost",
+		"cpu":        "cpu0",
+		"datacenter": "us-west-2",
+	}
+	fields := map[string]interface{}{
+		"usage_idle": float64(91.5),
+		"usage_busy": float64(8.5),
+	}
+	m, err := metric.New("cpu", tags, fields, now)
+	assert.NoError(t, err)
+
+	s := GraphiteSerializer{
+		Prefix:     "prefix",
+		TagSupport: true,
+	}
+	buf, _ := s.Serialize(m)
+	mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
+	assert.NoError(t, err)
+
+	expS := []string{
+		fmt.Sprintf("prefix.cpu.usage_idle;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()),
+		fmt.Sprintf("prefix.cpu.usage_busy;cpu=cpu0;datacenter=us-west-2;host=localhost 8.5 %d", now.Unix()),
+	}
+	sort.Strings(mS)
+	sort.Strings(expS)
+	assert.Equal(t, expS, mS)
+}
+
 func TestSerializeBucketNameNoHost(t *testing.T) {
 	now := time.Now()
 	tags := map[string]string{
@@ -579,6 +799,100 @@ func TestClean(t *testing.T) {
 	}
 }
 
+func TestCleanWithTagsSupport(t *testing.T) {
+	now := time.Unix(1234567890, 0)
+	tests := []struct {
+		name        string
+		metric_name string
+		tags        map[string]string
+		fields      map[string]interface{}
+		expected    string
+	}{
+		{
+			"Base metric",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"cpu.usage_busy;host=localhost 8.5 1234567890\n",
+		},
+		{
+			"Dot and whitespace in tags",
+			"cpu",
+			map[string]string{"host": "localhost", "label.dot and space": "value with.dot"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"cpu.usage_busy;host=localhost;label.dot_and_space=value_with.dot 8.5 1234567890\n",
+		},
+		{
+			"Field with space",
+			"system",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"uptime_format": "20 days, 23:26"},
+			"", // yes nothing. graphite don't serialize string fields
+		},
+		{
+			"Allowed punct",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "-_:="},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"cpu.usage_busy;host=localhost;tag=-_:= 10 1234567890\n",
+		},
+		{
+			"Special conversions to hyphen",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "/@*"},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"cpu.usage_busy;host=localhost;tag=--- 10 1234567890\n",
+		},
+		{
+			"Special drop chars",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": `\no slash`},
+			map[string]interface{}{"usage_busy": float64(10)},
+			"cpu.usage_busy;host=localhost;tag=no_slash 10 1234567890\n",
+		},
+		{
+			"Empty tag & value field",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"value": float64(10)},
+			"cpu;host=localhost 10 1234567890\n",
+		},
+		{
+			"Unicode Letters allowed",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "μnicodε_letters"},
+			map[string]interface{}{"value": float64(10)},
+			"cpu;host=localhost;tag=μnicodε_letters 10 1234567890\n",
+		},
+		{
+			"Other Unicode not allowed",
+			"cpu",
+			map[string]string{"host": "localhost", "tag": "“☢”"},
+			map[string]interface{}{"value": float64(10)},
+			"cpu;host=localhost;tag=___ 10 1234567890\n",
+		},
+		{
+			"Newline in tags",
+			"cpu",
+			map[string]string{"host": "localhost", "label": "some\nthing\nwith\nnewline"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"cpu.usage_busy;host=localhost;label=some_thing_with_newline 8.5 1234567890\n",
+		},
+	}
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(tt.metric_name, tt.tags, tt.fields, now)
+			assert.NoError(t, err)
+			actual, _ := s.Serialize(m)
+			require.Equal(t, tt.expected, string(actual))
+		})
+	}
+}
+
 func TestSerializeBatch(t *testing.T) {
 	now := time.Unix(1234567890, 0)
 	tests := []struct {
@@ -607,3 +921,34 @@ func TestSerializeBatch(t *testing.T) {
 		})
 	}
 }
+
+func TestSerializeBatchWithTagsSupport(t *testing.T) {
+	now := time.Unix(1234567890, 0)
+	tests := []struct {
+		name        string
+		metric_name string
+		tags        map[string]string
+		fields      map[string]interface{}
+		expected    string
+	}{
+		{
+			"Base metric",
+			"cpu",
+			map[string]string{"host": "localhost"},
+			map[string]interface{}{"usage_busy": float64(8.5)},
+			"cpu.usage_busy;host=localhost 8.5 1234567890\ncpu.usage_busy;host=localhost 8.5 1234567890\n",
+		},
+	}
+
+	s := GraphiteSerializer{
+		TagSupport: true,
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := metric.New(tt.metric_name, tt.tags, tt.fields, now)
+			assert.NoError(t, err)
+			actual, _ := s.SerializeBatch([]telegraf.Metric{m, m})
+			require.Equal(t, tt.expected, string(actual))
+		})
+	}
+}
diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go
index 59050d089..277d33206 100644
--- a/plugins/serializers/registry.go
+++ b/plugins/serializers/registry.go
@@ -38,6 +38,9 @@ type Config struct {
 	// Dataformat can be one of: influx, graphite, or json
 	DataFormat string
 
+	// Support tags in graphite protocol
+	GraphiteTagSupport bool
+
 	// Maximum line length in bytes; influx format only
 	InfluxMaxLineBytes int
 
@@ -67,7 +70,7 @@ func NewSerializer(config *Config) (Serializer, error) {
 	case "influx":
 		serializer, err = NewInfluxSerializerConfig(config)
 	case "graphite":
-		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template)
+		serializer, err = NewGraphiteSerializer(config.Prefix, config.Template, config.GraphiteTagSupport)
 	case "json":
 		serializer, err = NewJsonSerializer(config.TimestampUnits)
 	default:
@@ -102,9 +105,10 @@ func NewInfluxSerializer() (Serializer, error) {
 	return influx.NewSerializer(), nil
 }
 
-func NewGraphiteSerializer(prefix, template string) (Serializer, error) {
+func NewGraphiteSerializer(prefix, template string, tag_support bool) (Serializer, error) {
 	return &graphite.GraphiteSerializer{
-		Prefix:   prefix,
-		Template: template,
+		Prefix:     prefix,
+		Template:   template,
+		TagSupport: tag_support,
 	}, nil
 }

From 0d21296aede9c9b8f5ab08c3986a4c9bd327b13c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 16:39:15 -0700
Subject: [PATCH 1200/1302] Expose graphite_tag_support option in graphite
 output data format

---
 internal/config/config.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/internal/config/config.go b/internal/config/config.go
index 4c6ed5624..e7a008f4b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1409,6 +1409,18 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 		}
 	}
 
+	if node, ok := tbl.Fields["graphite_tag_support"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if b, ok := kv.Value.(*ast.Boolean); ok {
+				var err error
+				c.GraphiteTagSupport, err = b.Boolean()
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+
 	if node, ok := tbl.Fields["json_timestamp_units"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1428,6 +1440,7 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
 	delete(tbl.Fields, "influx_max_line_bytes")
 	delete(tbl.Fields, "influx_sort_fields")
 	delete(tbl.Fields, "influx_uint_support")
+	delete(tbl.Fields, "graphite_tag_support")
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "prefix")
 	delete(tbl.Fields, "template")

From 6a21e23bcc8a21d8fe76f07f0f92a94a0ffad017 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 16:39:33 -0700
Subject: [PATCH 1201/1302] Update graphite output dataf format docs

---
 docs/DATA_FORMATS_OUTPUT.md          | 67 ++++++++++------------------
 plugins/outputs/graphite/README.md   | 14 +++---
 plugins/outputs/graphite/graphite.go |  6 +--
 3 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index f8d8cf466..f4e41c254 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -58,9 +58,15 @@ interoperability.
 
 ## Graphite
 
-The Graphite data format translates Telegraf metrics into _dot_ buckets. A
-template can be specified for the output of Telegraf metrics into Graphite
-buckets. The default template is:
+The Graphite data format is translated from Telegraf Metrics using either the
+template pattern or tag support method.  You can select between the two
+methods using the [`graphite_tag_support`](#graphite-tag-support) option.  When set, the tag support
+method is used, otherwise the [`template` pattern](#template-pattern) is used.
+
+#### Template Pattern
+
+The `template` option describes how Telegraf traslates metrics into _dot_
+buckets.  The default template is:
 
 ```
 template = "host.tags.measurement.field"
@@ -77,7 +83,7 @@ tag keys are filled.
 1. _measurement_ is a special keyword that outputs the measurement name.
 1. _field_ is a special keyword that outputs the field name.
 
-Which means the following influx metric -> graphite conversion would happen:
+**Example Conversion**:
 
 ```
 cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
@@ -89,8 +95,17 @@ tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690
 Fields with string values will be skipped.  Boolean fields will be converted
 to 1 (true) or 0 (false).
 
-With enable `graphite_tag_support` option following influx metric -> graphite conversion would happen:
+#### Graphite Tag Support
 
+When the `graphite_tag_support` option is enabled, the template pattern is not
+used.  Instead, tags are encoded using
+[Graphite tag support](http://graphite.readthedocs.io/en/latest/tags.html)
+added in Graphite 1.1.  The `metric_path` is a combination of the optional
+`prefix` option, measurement name, and field name.
+
+The tag `name` is reserved by Graphite, any conflicting tags and will be encoded as `_name`.
+
+**Example Conversion**:
 ```
 cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
 =>
@@ -111,47 +126,13 @@ cpu.usage_idle;cpu=cpu-total;dc=us-east-1;host=tars 98.09 1455320690
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "graphite"
 
-  # prefix each graphite bucket
+  ## Prefix added to each graphite bucket
   prefix = "telegraf"
-  # graphite template
+  ## Graphite template pattern
   template = "host.tags.measurement.field"
-  # Enable Graphite tags support
-  # Defaults to "false"
-  graphite_tag_support = true
-```
 
-
-## Graphite 1.1
-
-The Graphite11 data format translates Telegraf metrics into Graphite protocol which supports storing data using tags to identify each series. [Graphite Tag Support](http://graphite.readthedocs.io/en/latest/tags.html)
-
-Which means the following influx metric -> graphite 1.1.x conversion would happen:
-
-```
-cpu,cpu=cpu-total,dc=us-east-1,host=tars usage_idle=98.09,usage_user=0.89 1455320660004257758
-=>
-cpu.usage_user;cpu=cpu-total;dc=us-east-1;host=tars 0.89 1455320690
-cpu.usage_idle;cpu=cpu-total;dc=us-east-1;host=tars 98.09 1455320690
-```
-
-Fields with string values will be skipped.  Boolean fields will be converted
-to 1 (true) or 0 (false).
-
-### Graphite Configuration
-
-```toml
-[[outputs.file]]
-  ## Files to write to, "stdout" is a specially handled file.
-  files = ["stdout", "/tmp/metrics.out"]
-
-  ## Data format to output.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "graphite11"
-
-  # prefix each graphite bucket
-  prefix = "telegraf"
+  ## Support Graphite tags, recommended to enable when using Graphite 1.1 or later.
+  # graphite_tag_support = false
 ```
 
 ## JSON
diff --git a/plugins/outputs/graphite/README.md b/plugins/outputs/graphite/README.md
index c54f07bb1..878eb8048 100644
--- a/plugins/outputs/graphite/README.md
+++ b/plugins/outputs/graphite/README.md
@@ -3,12 +3,10 @@
 This plugin writes to [Graphite](http://graphite.readthedocs.org/en/latest/index.html)
 via raw TCP.
 
-<aside class="notice">
-When `graphite_tag_support` is enabled, `name` as tag name is reserved for graphite metric and will be replaced with `_name`.
-</aside>
+For details on the translation between Telegraf Metrics and Graphite output,
+see the [Graphite Data Format](../../../docs/DATA_FORMATS_OUTPUT.md)
 
-
-## Configuration:
+### Configuration:
 
 ```toml
 # Configuration for Graphite server to send metrics to
@@ -22,10 +20,10 @@ When `graphite_tag_support` is enabled, `name` as tag name is reserved for graph
   ## Graphite output template
   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   template = "host.tags.measurement.field"
+
   ## Enable Graphite tags support
-  ## see http://graphite.readthedocs.io/en/latest/tags.html 
-  ## Defaults to "false"
-  # graphite_tag_support = true
+  # graphite_tag_support = false
+
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 
diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go
index 8931dbe0a..c26c1587f 100644
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -36,10 +36,10 @@ var sampleConfig = `
   ## Graphite output template
   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   template = "host.tags.measurement.field"
+
   ## Enable Graphite tags support
-  ## see http://graphite.readthedocs.io/en/latest/tags.html 
-  ## Defaults to "false"
-  # graphite_tag_support = true
+  # graphite_tag_support = false
+
   ## timeout in seconds for the write connection to graphite
   timeout = 2
 

From 795c8057ad648f7434af1f9d6e7bb30587038978 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 21 May 2018 16:40:30 -0700
Subject: [PATCH 1202/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05136d85..dcbea951f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - [#4094](https://github.com/influxdata/telegraf/pull/4094): Add batch mode to mqtt output.
 - [#4158](https://github.com/influxdata/telegraf/pull/4158): Add aurora input plugin.
 - [#3839](https://github.com/influxdata/telegraf/pull/3839): Add regex processor plugin.
+- [#4165](https://github.com/influxdata/telegraf/pull/4165): Add support for Graphite 1.1 tags.
 
 ### Bugfixes
 

From daacfc6368d4f2e3393363e5321b2f82c2d9046e Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 22 May 2018 13:59:59 -0700
Subject: [PATCH 1203/1302] Add timeout option to sensors input (#4162)

---
 plugins/inputs/sensors/README.md       |  3 +++
 plugins/inputs/sensors/sensors.go      | 24 +++++++++++++++---------
 plugins/inputs/sensors/sensors_test.go |  2 ++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/sensors/README.md b/plugins/inputs/sensors/README.md
index 62497d074..9075bda72 100644
--- a/plugins/inputs/sensors/README.md
+++ b/plugins/inputs/sensors/README.md
@@ -12,6 +12,9 @@ This plugin collects sensor metrics with the `sensors` executable from the lm-se
   ## Remove numbers from field names.
   ## If true, a field name like 'temp1_input' will be changed to 'temp_input'.
   # remove_numbers = true
+
+  ## Timeout is the maximum amount of time that the sensors command can run.
+  # timeout = "5s"
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/sensors/sensors.go b/plugins/inputs/sensors/sensors.go
index 1caf6ba59..864da8121 100644
--- a/plugins/inputs/sensors/sensors.go
+++ b/plugins/inputs/sensors/sensors.go
@@ -17,12 +17,14 @@ import (
 )
 
 var (
-	execCommand = exec.Command // execCommand is used to mock commands in tests.
-	numberRegp  = regexp.MustCompile("[0-9]+")
+	execCommand    = exec.Command // execCommand is used to mock commands in tests.
+	numberRegp     = regexp.MustCompile("[0-9]+")
+	defaultTimeout = internal.Duration{Duration: 5 * time.Second}
 )
 
 type Sensors struct {
-	RemoveNumbers bool `toml:"remove_numbers"`
+	RemoveNumbers bool              `toml:"remove_numbers"`
+	Timeout       internal.Duration `toml:"timeout"`
 	path          string
 }
 
@@ -35,6 +37,9 @@ func (*Sensors) SampleConfig() string {
   ## Remove numbers from field names.
   ## If true, a field name like 'temp1_input' will be changed to 'temp_input'.
   # remove_numbers = true
+
+  ## Timeout is the maximum amount of time that the sensors command can run.
+  # timeout = "5s"
 `
 
 }
@@ -55,7 +60,7 @@ func (s *Sensors) parse(acc telegraf.Accumulator) error {
 	fields := map[string]interface{}{}
 	chip := ""
 	cmd := execCommand(s.path, "-A", "-u")
-	out, err := internal.CombinedOutputTimeout(cmd, time.Second*5)
+	out, err := internal.CombinedOutputTimeout(cmd, s.Timeout.Duration)
 	if err != nil {
 		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
 	}
@@ -99,9 +104,15 @@ func (s *Sensors) parse(acc telegraf.Accumulator) error {
 	return nil
 }
 
+// snake converts string to snake case
+func snake(input string) string {
+	return strings.ToLower(strings.Replace(strings.TrimSpace(input), " ", "_", -1))
+}
+
 func init() {
 	s := Sensors{
 		RemoveNumbers: true,
+		Timeout:       defaultTimeout,
 	}
 	path, _ := exec.LookPath("sensors")
 	if len(path) > 0 {
@@ -111,8 +122,3 @@ func init() {
 		return &s
 	})
 }
-
-// snake converts string to snake case
-func snake(input string) string {
-	return strings.ToLower(strings.Replace(strings.TrimSpace(input), " ", "_", -1))
-}
diff --git a/plugins/inputs/sensors/sensors_test.go b/plugins/inputs/sensors/sensors_test.go
index 7e6cac95a..2a24fa6f9 100644
--- a/plugins/inputs/sensors/sensors_test.go
+++ b/plugins/inputs/sensors/sensors_test.go
@@ -14,6 +14,7 @@ import (
 func TestGatherDefault(t *testing.T) {
 	s := Sensors{
 		RemoveNumbers: true,
+		Timeout:       defaultTimeout,
 		path:          "sensors",
 	}
 	// overwriting exec commands with mock commands
@@ -154,6 +155,7 @@ func TestGatherDefault(t *testing.T) {
 func TestGatherNotRemoveNumbers(t *testing.T) {
 	s := Sensors{
 		RemoveNumbers: false,
+		Timeout:       defaultTimeout,
 		path:          "sensors",
 	}
 	// overwriting exec commands with mock commands

From a86c2d54ad7f9bcd147c1fad042bbdfc06df89a3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 May 2018 14:00:52 -0700
Subject: [PATCH 1204/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcbea951f..e9542118a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 - [#4158](https://github.com/influxdata/telegraf/pull/4158): Add aurora input plugin.
 - [#3839](https://github.com/influxdata/telegraf/pull/3839): Add regex processor plugin.
 - [#4165](https://github.com/influxdata/telegraf/pull/4165): Add support for Graphite 1.1 tags.
+- [#4162](https://github.com/influxdata/telegraf/pull/4162): Add timeout option to sensors input.
 
 ### Bugfixes
 

From fd22b1ef1ffe82ec5d13c6e4fdd056976ec81dba Mon Sep 17 00:00:00 2001
From: Arkady Emelyanov <arkady-emelyanov@users.noreply.github.com>
Date: Wed, 23 May 2018 00:10:41 +0300
Subject: [PATCH 1205/1302] Add burrow input plugin (#3489)

---
 README.md                                     |   1 +
 plugins/inputs/all/all.go                     |   1 +
 plugins/inputs/burrow/README.md               |  98 ++++
 plugins/inputs/burrow/burrow.go               | 485 ++++++++++++++++++
 plugins/inputs/burrow/burrow_test.go          | 285 ++++++++++
 plugins/inputs/burrow/testdata/error.json     |  11 +
 plugins/inputs/burrow/testdata/v3_kafka.json  |  11 +
 .../v3_kafka_clustername1_consumer.json       |  11 +
 ...afka_clustername1_consumer_group1_lag.json |  90 ++++
 .../testdata/v3_kafka_clustername1_topic.json |  11 +
 .../v3_kafka_clustername1_topic_topicA.json   |  13 +
 11 files changed, 1017 insertions(+)
 create mode 100644 plugins/inputs/burrow/README.md
 create mode 100644 plugins/inputs/burrow/burrow.go
 create mode 100644 plugins/inputs/burrow/burrow_test.go
 create mode 100644 plugins/inputs/burrow/testdata/error.json
 create mode 100644 plugins/inputs/burrow/testdata/v3_kafka.json
 create mode 100644 plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer.json
 create mode 100644 plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
 create mode 100644 plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic.json
 create mode 100644 plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic_topicA.json

diff --git a/README.md b/README.md
index d4d19db0f..8ae242b5c 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ configuration options.
 * [bcache](./plugins/inputs/bcache)
 * [bond](./plugins/inputs/bond)
 * [cassandra](./plugins/inputs/cassandra) (deprecated, use [jolokia2](./plugins/inputs/jolokia2))
+* [burrow](./plugins/inputs/burrow)
 * [ceph](./plugins/inputs/ceph)
 * [cgroup](./plugins/inputs/cgroup)
 * [chrony](./plugins/inputs/chrony)
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 80db99bfb..239cf6e11 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -7,6 +7,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/aurora"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/bond"
+	_ "github.com/influxdata/telegraf/plugins/inputs/burrow"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cassandra"
 	_ "github.com/influxdata/telegraf/plugins/inputs/ceph"
 	_ "github.com/influxdata/telegraf/plugins/inputs/cgroup"
diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md
new file mode 100644
index 000000000..039cff8c4
--- /dev/null
+++ b/plugins/inputs/burrow/README.md
@@ -0,0 +1,98 @@
+# Telegraf Plugin: Burrow
+
+Collect Kafka topic, consumer and partition status
+via [Burrow](https://github.com/linkedin/Burrow) HTTP [API](https://github.com/linkedin/Burrow/wiki/HTTP-Endpoint).
+
+Supported Burrow version: `1.x`
+
+### Configuration
+
+```
+  ## Burrow API endpoints in format "schema://host:port".
+  ## Default is "http://localhost:8000".
+  servers = ["http://localhost:8000"]
+
+  ## Override Burrow API prefix.
+  ## Useful when Burrow is behind reverse-proxy.
+  # api_prefix = "/v3/kafka"
+
+  ## Maximum time to receive response.
+  # response_timeout = "5s"
+
+  ## Limit per-server concurrent connections.
+  ## Useful in case of large number of topics or consumer groups.
+  # concurrent_connections = 20
+
+  ## Filter clusters, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # clusters_include = []
+  # clusters_exclude = []
+
+  ## Filter consumer groups, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # groups_include = []
+  # groups_exclude = []
+
+  ## Filter topics, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # topics_include = []
+  # topics_exclude = []
+
+  ## Credentials for basic HTTP authentication.
+  # username = ""
+  # password = ""
+
+  ## Optional SSL config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  # insecure_skip_verify = false
+```
+
+### Partition Status mappings
+
+* `OK` = 1
+* `NOT_FOUND` = 2
+* `WARN` = 3
+* `ERR` = 4
+* `STOP` = 5
+* `STALL` = 6
+
+> unknown value will be mapped to 0
+
+### Fields
+
+* `burrow_group` (one event per each consumer group)
+  - status (string, see Partition Status mappings)
+  - status_code (int, `1..6`, see Partition status mappings)
+  - parition_count (int, `number of partitions`)
+  - total_lag (int64, `totallag`)
+  - lag (int64, `maxlag.current_lag || 0`)
+
+* `burrow_partition` (one event per each topic partition)
+  - status (string, see Partition Status mappings)
+  - status_code (int, `1..6`, see Partition status mappings)
+  - lag (int64, `current_lag || 0`)
+  - offset (int64, `end.timestamp`)
+  - timestamp (int64, `end.timestamp`)
+
+* `burrow_topic` (one event per topic offset)
+  - offset (int64)
+
+
+### Tags
+
+* `burrow_group`
+  - cluster (string)
+  - group (string)
+
+* `burrow_partition`
+  - cluster (string)
+  - group (string)
+  - topic (string)
+  - partition (int)
+
+* `burrow_topic`
+  - cluster (string)
+  - topic (string)
+  - partition (int)
diff --git a/plugins/inputs/burrow/burrow.go b/plugins/inputs/burrow/burrow.go
new file mode 100644
index 000000000..88fdb4b7f
--- /dev/null
+++ b/plugins/inputs/burrow/burrow.go
@@ -0,0 +1,485 @@
+package burrow
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const (
+	defaultBurrowPrefix          = "/v3/kafka"
+	defaultConcurrentConnections = 20
+	defaultResponseTimeout       = time.Second * 5
+	defaultServer                = "http://localhost:8000"
+)
+
+const configSample = `
+  ## Burrow API endpoints in format "schema://host:port".
+  ## Default is "http://localhost:8000".
+  servers = ["http://localhost:8000"]
+
+  ## Override Burrow API prefix.
+  ## Useful when Burrow is behind reverse-proxy.
+  # api_prefix = "/v3/kafka"
+
+  ## Maximum time to receive response.
+  # response_timeout = "5s"
+
+  ## Limit per-server concurrent connections.
+  ## Useful in case of large number of topics or consumer groups.
+  # concurrent_connections = 20
+
+  ## Filter clusters, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # clusters_include = []
+  # clusters_exclude = []
+
+  ## Filter consumer groups, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # groups_include = []
+  # groups_exclude = []
+
+  ## Filter topics, default is no filtering.
+  ## Values can be specified as glob patterns.
+  # topics_include = []
+  # topics_exclude = []
+
+  ## Credentials for basic HTTP authentication.
+  # username = ""
+  # password = ""
+
+  ## Optional SSL config
+  # ssl_ca = "/etc/telegraf/ca.pem"
+  # ssl_cert = "/etc/telegraf/cert.pem"
+  # ssl_key = "/etc/telegraf/key.pem"
+  # insecure_skip_verify = false
+`
+
+type (
+	burrow struct {
+		tls.ClientConfig
+
+		Servers               []string
+		Username              string
+		Password              string
+		ResponseTimeout       internal.Duration
+		ConcurrentConnections int
+
+		APIPrefix       string `toml:"api_prefix"`
+		ClustersExclude []string
+		ClustersInclude []string
+		GroupsExclude   []string
+		GroupsInclude   []string
+		TopicsExclude   []string
+		TopicsInclude   []string
+
+		client         *http.Client
+		filterClusters filter.Filter
+		filterGroups   filter.Filter
+		filterTopics   filter.Filter
+	}
+
+	// response
+	apiResponse struct {
+		Clusters []string          `json:"clusters"`
+		Groups   []string          `json:"consumers"`
+		Topics   []string          `json:"topics"`
+		Offsets  []int64           `json:"offsets"`
+		Status   apiStatusResponse `json:"status"`
+	}
+
+	// response: status field
+	apiStatusResponse struct {
+		Partitions     []apiStatusResponseLag `json:"partitions"`
+		Status         string                 `json:"status"`
+		PartitionCount int                    `json:"partition_count"`
+		Maxlag         *apiStatusResponseLag  `json:"maxlag"`
+		TotalLag       int64                  `json:"totallag"`
+	}
+
+	// response: lag field
+	apiStatusResponseLag struct {
+		Topic      string                   `json:"topic"`
+		Partition  int32                    `json:"partition"`
+		Status     string                   `json:"status"`
+		Start      apiStatusResponseLagItem `json:"start"`
+		End        apiStatusResponseLagItem `json:"end"`
+		CurrentLag int64                    `json:"current_lag"`
+	}
+
+	// response: lag field item
+	apiStatusResponseLagItem struct {
+		Offset    int64 `json:"offset"`
+		Timestamp int64 `json:"timestamp"`
+		Lag       int64 `json:"lag"`
+	}
+)
+
+func init() {
+	inputs.Add("burrow", func() telegraf.Input {
+		return &burrow{}
+	})
+}
+
+func (b *burrow) SampleConfig() string {
+	return configSample
+}
+
+func (b *burrow) Description() string {
+	return "Collect Kafka topics and consumers status from Burrow HTTP API."
+}
+
+func (b *burrow) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	if len(b.Servers) == 0 {
+		b.Servers = []string{defaultServer}
+	}
+
+	if b.client == nil {
+		b.setDefaults()
+		if err := b.compileGlobs(); err != nil {
+			return err
+		}
+		c, err := b.createClient()
+		if err != nil {
+			return err
+		}
+		b.client = c
+	}
+
+	for _, addr := range b.Servers {
+		u, err := url.Parse(addr)
+		if err != nil {
+			acc.AddError(fmt.Errorf("unable to parse address '%s': %s", addr, err))
+			continue
+		}
+		if u.Path == "" {
+			u.Path = b.APIPrefix
+		}
+
+		wg.Add(1)
+		go func(u *url.URL) {
+			defer wg.Done()
+			acc.AddError(b.gatherServer(u, acc))
+		}(u)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (b *burrow) setDefaults() {
+	if b.APIPrefix == "" {
+		b.APIPrefix = defaultBurrowPrefix
+	}
+	if b.ConcurrentConnections < 1 {
+		b.ConcurrentConnections = defaultConcurrentConnections
+	}
+	if b.ResponseTimeout.Duration < time.Second {
+		b.ResponseTimeout = internal.Duration{
+			Duration: defaultResponseTimeout,
+		}
+	}
+}
+
+func (b *burrow) compileGlobs() error {
+	var err error
+
+	// compile glob patterns
+	b.filterClusters, err = filter.NewIncludeExcludeFilter(b.ClustersInclude, b.ClustersExclude)
+	if err != nil {
+		return err
+	}
+	b.filterGroups, err = filter.NewIncludeExcludeFilter(b.GroupsInclude, b.GroupsExclude)
+	if err != nil {
+		return err
+	}
+	b.filterTopics, err = filter.NewIncludeExcludeFilter(b.TopicsInclude, b.TopicsExclude)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (b *burrow) createClient() (*http.Client, error) {
+	tlsCfg, err := b.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: b.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+func (b *burrow) getResponse(u *url.URL) (*apiResponse, error) {
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+	if b.Username != "" {
+		req.SetBasicAuth(b.Username, b.Password)
+	}
+
+	res, err := b.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("wrong response: %d", res.StatusCode)
+	}
+
+	ares := &apiResponse{}
+	dec := json.NewDecoder(res.Body)
+
+	return ares, dec.Decode(ares)
+}
+
+func (b *burrow) gatherServer(src *url.URL, acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	r, err := b.getResponse(src)
+	if err != nil {
+		return err
+	}
+
+	guard := make(chan struct{}, b.ConcurrentConnections)
+	for _, cluster := range r.Clusters {
+		if !b.filterClusters.Match(cluster) {
+			continue
+		}
+
+		wg.Add(1)
+		go func(cluster string) {
+			defer wg.Done()
+
+			// fetch topic list
+			// endpoint: <api_prefix>/(cluster)/topic
+			ut := appendPathToURL(src, cluster, "topic")
+			b.gatherTopics(guard, ut, cluster, acc)
+		}(cluster)
+
+		wg.Add(1)
+		go func(cluster string) {
+			defer wg.Done()
+
+			// fetch consumer group list
+			// endpoint: <api_prefix>/(cluster)/consumer
+			uc := appendPathToURL(src, cluster, "consumer")
+			b.gatherGroups(guard, uc, cluster, acc)
+		}(cluster)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (b *burrow) gatherTopics(guard chan struct{}, src *url.URL, cluster string, acc telegraf.Accumulator) {
+	var wg sync.WaitGroup
+
+	r, err := b.getResponse(src)
+	if err != nil {
+		acc.AddError(err)
+		return
+	}
+
+	for _, topic := range r.Topics {
+		if !b.filterTopics.Match(topic) {
+			continue
+		}
+
+		guard <- struct{}{}
+		wg.Add(1)
+
+		go func(topic string) {
+			defer func() {
+				<-guard
+				wg.Done()
+			}()
+
+			// fetch topic offsets
+			// endpoint: <api_prefix>/<cluster>/topic/<topic>
+			tu := appendPathToURL(src, topic)
+			tr, err := b.getResponse(tu)
+			if err != nil {
+				acc.AddError(err)
+				return
+			}
+
+			b.genTopicMetrics(tr, cluster, topic, acc)
+		}(topic)
+	}
+
+	wg.Wait()
+}
+
+func (b *burrow) genTopicMetrics(r *apiResponse, cluster, topic string, acc telegraf.Accumulator) {
+	for i, offset := range r.Offsets {
+		tags := map[string]string{
+			"cluster":   cluster,
+			"topic":     topic,
+			"partition": strconv.Itoa(i),
+		}
+
+		acc.AddFields(
+			"burrow_topic",
+			map[string]interface{}{
+				"offset": offset,
+			},
+			tags,
+		)
+	}
+}
+
+func (b *burrow) gatherGroups(guard chan struct{}, src *url.URL, cluster string, acc telegraf.Accumulator) {
+	var wg sync.WaitGroup
+
+	r, err := b.getResponse(src)
+	if err != nil {
+		acc.AddError(err)
+		return
+	}
+
+	for _, group := range r.Groups {
+		if !b.filterGroups.Match(group) {
+			continue
+		}
+
+		guard <- struct{}{}
+		wg.Add(1)
+
+		go func(group string) {
+			defer func() {
+				<-guard
+				wg.Done()
+			}()
+
+			// fetch consumer group status
+			// endpoint: <api_prefix>/<cluster>/consumer/<group>/lag
+			gl := appendPathToURL(src, group, "lag")
+			gr, err := b.getResponse(gl)
+			if err != nil {
+				acc.AddError(err)
+				return
+			}
+
+			b.genGroupStatusMetrics(gr, cluster, group, acc)
+			b.genGroupLagMetrics(gr, cluster, group, acc)
+		}(group)
+	}
+
+	wg.Wait()
+}
+
+func (b *burrow) genGroupStatusMetrics(r *apiResponse, cluster, group string, acc telegraf.Accumulator) {
+	partitionCount := r.Status.PartitionCount
+	if partitionCount == 0 {
+		partitionCount = len(r.Status.Partitions)
+	}
+
+	// get max timestamp and offset from partitions list
+	offset := int64(0)
+	timestamp := int64(0)
+	for _, partition := range r.Status.Partitions {
+		if partition.End.Offset > offset {
+			offset = partition.End.Offset
+		}
+		if partition.End.Timestamp > timestamp {
+			timestamp = partition.End.Timestamp
+		}
+	}
+
+	lag := int64(0)
+	if r.Status.Maxlag != nil {
+		lag = r.Status.Maxlag.CurrentLag
+	}
+
+	acc.AddFields(
+		"burrow_group",
+		map[string]interface{}{
+			"status":          r.Status.Status,
+			"status_code":     mapStatusToCode(r.Status.Status),
+			"partition_count": partitionCount,
+			"total_lag":       r.Status.TotalLag,
+			"lag":             lag,
+			"offset":          offset,
+			"timestamp":       timestamp,
+		},
+		map[string]string{
+			"cluster": cluster,
+			"group":   group,
+		},
+	)
+}
+
+func (b *burrow) genGroupLagMetrics(r *apiResponse, cluster, group string, acc telegraf.Accumulator) {
+	for _, partition := range r.Status.Partitions {
+		acc.AddFields(
+			"burrow_partition",
+			map[string]interface{}{
+				"status":      partition.Status,
+				"status_code": mapStatusToCode(partition.Status),
+				"lag":         partition.CurrentLag,
+				"offset":      partition.End.Offset,
+				"timestamp":   partition.End.Timestamp,
+			},
+			map[string]string{
+				"cluster":   cluster,
+				"group":     group,
+				"topic":     partition.Topic,
+				"partition": strconv.FormatInt(int64(partition.Partition), 10),
+			},
+		)
+	}
+}
+
+func appendPathToURL(src *url.URL, parts ...string) *url.URL {
+	dst := new(url.URL)
+	*dst = *src
+
+	for i, part := range parts {
+		parts[i] = url.PathEscape(part)
+	}
+
+	ext := strings.Join(parts, "/")
+	dst.Path = fmt.Sprintf("%s/%s", src.Path, ext)
+	return dst
+}
+
+func mapStatusToCode(src string) int {
+	switch src {
+	case "OK":
+		return 1
+	case "NOT_FOUND":
+		return 2
+	case "WARN":
+		return 3
+	case "ERR":
+		return 4
+	case "STOP":
+		return 5
+	case "STALL":
+		return 6
+	default:
+		return 0
+	}
+}
diff --git a/plugins/inputs/burrow/burrow_test.go b/plugins/inputs/burrow/burrow_test.go
new file mode 100644
index 000000000..9b3f4a0a9
--- /dev/null
+++ b/plugins/inputs/burrow/burrow_test.go
@@ -0,0 +1,285 @@
+package burrow
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+// remap uri to json file, eg: /v3/kafka -> ./testdata/v3_kafka.json
+func getResponseJSON(requestURI string) ([]byte, int) {
+	uri := strings.TrimLeft(requestURI, "/")
+	mappedFile := strings.Replace(uri, "/", "_", -1)
+	jsonFile := fmt.Sprintf("./testdata/%s.json", mappedFile)
+
+	code := 200
+	_, err := os.Stat(jsonFile)
+	if err != nil {
+		code = 404
+		jsonFile = "./testdata/error.json"
+	}
+
+	// respond with file
+	b, _ := ioutil.ReadFile(jsonFile)
+	return b, code
+}
+
+// return mocked HTTP server
+func getHTTPServer() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		body, code := getResponseJSON(r.RequestURI)
+		w.WriteHeader(code)
+		w.Header().Set("Content-Type", "application/json")
+		w.Write(body)
+	}))
+}
+
+// return mocked HTTP server with basic auth
+func getHTTPServerBasicAuth() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
+
+		username, password, authOK := r.BasicAuth()
+		if authOK == false {
+			http.Error(w, "Not authorized", 401)
+			return
+		}
+
+		if username != "test" && password != "test" {
+			http.Error(w, "Not authorized", 401)
+			return
+		}
+
+		// ok, continue
+		body, code := getResponseJSON(r.RequestURI)
+		w.WriteHeader(code)
+		w.Header().Set("Content-Type", "application/json")
+		w.Write(body)
+	}))
+}
+
+// test burrow_topic measurement
+func TestBurrowTopic(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{Servers: []string{s.URL}}
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	fields := []map[string]interface{}{
+		// topicA
+		{"offset": int64(459178195)},
+		{"offset": int64(459178022)},
+		{"offset": int64(456491598)},
+	}
+	tags := []map[string]string{
+		// topicA
+		{"cluster": "clustername1", "topic": "topicA", "partition": "0"},
+		{"cluster": "clustername1", "topic": "topicA", "partition": "1"},
+		{"cluster": "clustername1", "topic": "topicA", "partition": "2"},
+	}
+
+	require.Empty(t, acc.Errors)
+	require.Equal(t, true, acc.HasMeasurement("burrow_topic"))
+	for i := 0; i < len(fields); i++ {
+		acc.AssertContainsTaggedFields(t, "burrow_topic", fields[i], tags[i])
+	}
+}
+
+// test burrow_partition measurement
+func TestBurrowPartition(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers: []string{s.URL},
+	}
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	fields := []map[string]interface{}{
+		{
+			"status":      "OK",
+			"status_code": 1,
+			"lag":         int64(0),
+			"offset":      int64(431323195),
+			"timestamp":   int64(1515609490008),
+		},
+		{
+			"status":      "OK",
+			"status_code": 1,
+			"lag":         int64(0),
+			"offset":      int64(431322962),
+			"timestamp":   int64(1515609490008),
+		},
+		{
+			"status":      "OK",
+			"status_code": 1,
+			"lag":         int64(0),
+			"offset":      int64(428636563),
+			"timestamp":   int64(1515609490008),
+		},
+	}
+	tags := []map[string]string{
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2"},
+	}
+
+	require.Empty(t, acc.Errors)
+	require.Equal(t, true, acc.HasMeasurement("burrow_partition"))
+
+	for i := 0; i < len(fields); i++ {
+		acc.AssertContainsTaggedFields(t, "burrow_partition", fields[i], tags[i])
+	}
+}
+
+// burrow_group
+func TestBurrowGroup(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers: []string{s.URL},
+	}
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	fields := []map[string]interface{}{
+		{
+			"status":          "OK",
+			"status_code":     1,
+			"partition_count": 3,
+			"total_lag":       int64(0),
+			"lag":             int64(0),
+			"offset":          int64(431323195),
+			"timestamp":       int64(1515609490008),
+		},
+	}
+
+	tags := []map[string]string{
+		{"cluster": "clustername1", "group": "group1"},
+	}
+
+	require.Empty(t, acc.Errors)
+	require.Equal(t, true, acc.HasMeasurement("burrow_group"))
+
+	for i := 0; i < len(fields); i++ {
+		acc.AssertContainsTaggedFields(t, "burrow_group", fields[i], tags[i])
+	}
+}
+
+// collect from multiple servers
+func TestMultipleServers(t *testing.T) {
+	s1 := getHTTPServer()
+	defer s1.Close()
+
+	s2 := getHTTPServer()
+	defer s2.Close()
+
+	plugin := &burrow{
+		Servers: []string{s1.URL, s2.URL},
+	}
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	require.Exactly(t, 14, len(acc.Metrics))
+	require.Empty(t, acc.Errors)
+}
+
+// collect multiple times
+func TestMultipleRuns(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers: []string{s.URL},
+	}
+	for i := 0; i < 4; i++ {
+		acc := &testutil.Accumulator{}
+		plugin.Gather(acc)
+
+		require.Exactly(t, 7, len(acc.Metrics))
+		require.Empty(t, acc.Errors)
+	}
+}
+
+// collect from http basic auth server
+func TestBasicAuthConfig(t *testing.T) {
+	s := getHTTPServerBasicAuth()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers:  []string{s.URL},
+		Username: "test",
+		Password: "test",
+	}
+
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	require.Exactly(t, 7, len(acc.Metrics))
+	require.Empty(t, acc.Errors)
+}
+
+// collect from whitelisted clusters
+func TestFilterClusters(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers:         []string{s.URL},
+		ClustersInclude: []string{"wrongname*"}, // clustername1 -> no match
+	}
+
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	// no match by cluster
+	require.Exactly(t, 0, len(acc.Metrics))
+	require.Empty(t, acc.Errors)
+}
+
+// collect from whitelisted groups
+func TestFilterGroups(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers:       []string{s.URL},
+		GroupsInclude: []string{"group?"}, // group1 -> match
+		TopicsExclude: []string{"*"},      // exclude all
+	}
+
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	require.Exactly(t, 4, len(acc.Metrics))
+	require.Empty(t, acc.Errors)
+}
+
+// collect from whitelisted topics
+func TestFilterTopics(t *testing.T) {
+	s := getHTTPServer()
+	defer s.Close()
+
+	plugin := &burrow{
+		Servers:       []string{s.URL},
+		TopicsInclude: []string{"topic?"}, // topicA -> match
+		GroupsExclude: []string{"*"},      // exclude all
+	}
+
+	acc := &testutil.Accumulator{}
+	plugin.Gather(acc)
+
+	require.Exactly(t, 3, len(acc.Metrics))
+	require.Empty(t, acc.Errors)
+}
diff --git a/plugins/inputs/burrow/testdata/error.json b/plugins/inputs/burrow/testdata/error.json
new file mode 100644
index 000000000..f70b863e6
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/error.json
@@ -0,0 +1,11 @@
+{
+  "error": true,
+  "message": "Detailed error message",
+  "request": {
+    "uri": "/invalid/request",
+    "host": "responding.host.example.com",
+    "cluster": "",
+    "group": "",
+    "topic": ""
+  }
+}
diff --git a/plugins/inputs/burrow/testdata/v3_kafka.json b/plugins/inputs/burrow/testdata/v3_kafka.json
new file mode 100644
index 000000000..dfc4d0444
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/v3_kafka.json
@@ -0,0 +1,11 @@
+{
+  "error": false,
+  "message": "cluster list returned",
+  "clusters": [
+    "clustername1"
+  ],
+  "request": {
+    "url": "/v3/kafka",
+    "host": "example.com"
+  }
+}
diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer.json
new file mode 100644
index 000000000..f16226444
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer.json
@@ -0,0 +1,11 @@
+{
+  "error": false,
+  "message": "consumer list returned",
+  "consumers": [
+    "group1"
+  ],
+  "request": {
+    "url": "/v3/kafka/clustername1/consumer",
+    "host": "example.com"
+  }
+}
diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
new file mode 100644
index 000000000..21205a663
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
@@ -0,0 +1,90 @@
+{
+  "error": false,
+  "message": "consumer status returned",
+  "status": {
+    "cluster": "clustername1",
+    "group": "group1",
+    "status": "OK",
+    "complete": 1,
+    "partitions": [
+      {
+        "topic": "topicA",
+        "partition": 0,
+        "owner": "kafka",
+        "status": "OK",
+        "start": {
+          "offset": 431323195,
+          "timestamp": 1515609445004,
+          "lag": 0
+        },
+        "end": {
+          "offset": 431323195,
+          "timestamp": 1515609490008,
+          "lag": 0
+        },
+        "current_lag": 0,
+        "complete": 1
+      },
+      {
+        "topic": "topicA",
+        "partition": 1,
+        "owner": "kafka",
+        "status": "OK",
+        "start": {
+          "offset": 431322962,
+          "timestamp": 1515609445004,
+          "lag": 0
+        },
+        "end": {
+          "offset": 431322962,
+          "timestamp": 1515609490008,
+          "lag": 0
+        },
+        "current_lag": 0,
+        "complete": 1
+      },
+      {
+        "topic": "topicA",
+        "partition": 2,
+        "owner": "kafka",
+        "status": "OK",
+        "start": {
+          "offset": 428636563,
+          "timestamp": 1515609445004,
+          "lag": 0
+        },
+        "end": {
+          "offset": 428636563,
+          "timestamp": 1515609490008,
+          "lag": 0
+        },
+        "current_lag": 0,
+        "complete": 1
+      }
+    ],
+    "partition_count": 3,
+    "maxlag": {
+      "topic": "topicA",
+      "partition": 0,
+      "owner": "kafka",
+      "status": "OK",
+      "start": {
+        "offset": 431323195,
+        "timestamp": 1515609445004,
+        "lag": 0
+      },
+      "end": {
+        "offset": 431323195,
+        "timestamp": 1515609490008,
+        "lag": 0
+      },
+      "current_lag": 0,
+      "complete": 1
+    },
+    "totallag": 0
+  },
+  "request": {
+    "url": "/v3/kafka/clustername1/consumer/group1/lag",
+    "host": "example.com"
+  }
+}
diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic.json
new file mode 100644
index 000000000..9bd21a14e
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic.json
@@ -0,0 +1,11 @@
+{
+  "error": false,
+  "message": "topic list returned",
+  "topics": [
+    "topicA"
+  ],
+  "request": {
+    "url": "/v3/kafka/clustername1/topic",
+    "host": "example.com"
+  }
+}
diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic_topicA.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic_topicA.json
new file mode 100644
index 000000000..38a3cee0a
--- /dev/null
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_topic_topicA.json
@@ -0,0 +1,13 @@
+{
+  "error": false,
+  "message": "topic offsets returned",
+  "offsets": [
+    459178195,
+    459178022,
+    456491598
+  ],
+  "request": {
+    "url": "/v3/kafka/clustername1/topic/topicA",
+    "host": "example.com"
+  }
+}

From 089eb2c8d6059ee149f55a093a0983bb2f133ac4 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 May 2018 14:53:21 -0700
Subject: [PATCH 1206/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9542118a..26f0e8cd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### New Inputs
 
 - [aurora](./plugins/inputs/aurora/README.md) - Contributed by @influxdata
+- [burrow](./plugins/inputs/burrow/README.md) - Contributed by @arkady-emelyanov
 - [fibaro](./plugins/inputs/fibaro/README.md) - Contributed by @dynek
 - [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry/README.md) - Contributed by @ajhai
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
@@ -51,6 +52,7 @@
 - [#3839](https://github.com/influxdata/telegraf/pull/3839): Add regex processor plugin.
 - [#4165](https://github.com/influxdata/telegraf/pull/4165): Add support for Graphite 1.1 tags.
 - [#4162](https://github.com/influxdata/telegraf/pull/4162): Add timeout option to sensors input.
+- [#3489](https://github.com/influxdata/telegraf/pull/3489): Add burrow input plugin.
 
 ### Bugfixes
 

From 697d8ceae5659efeb4190dc55196832831ae45b9 Mon Sep 17 00:00:00 2001
From: arterforyou <arterforyou1206@gmail.com>
Date: Thu, 24 May 2018 02:19:50 +0800
Subject: [PATCH 1207/1302] Add tengine input plugin (#4160)

---
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/tengine/README.md       |  82 ++++++
 plugins/inputs/tengine/tengine.go      | 338 +++++++++++++++++++++++++
 plugins/inputs/tengine/tengine_test.go |  97 +++++++
 4 files changed, 518 insertions(+)
 create mode 100644 plugins/inputs/tengine/README.md
 create mode 100644 plugins/inputs/tengine/tengine.go
 create mode 100644 plugins/inputs/tengine/tengine_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 239cf6e11..cba156f69 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -102,6 +102,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
+	_ "github.com/influxdata/telegraf/plugins/inputs/tengine"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
diff --git a/plugins/inputs/tengine/README.md b/plugins/inputs/tengine/README.md
new file mode 100644
index 000000000..b83a0611b
--- /dev/null
+++ b/plugins/inputs/tengine/README.md
@@ -0,0 +1,82 @@
+# Telegraf Plugin: Tengine
+
+### Configuration:
+
+```
+# Read Tengine's basic status information (ngx_http_reqstat_module)
+[[inputs.tengine]]
+  ## An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## HTTP response timeout (default: 5s)
+  response_timeout = "5s"
+```
+
+### Measurements & Fields:
+
+- Measurement
+    - bytes_in total number of bytes received from client
+    - bytes_out total number of bytes sent to client
+    - conn_total total number of accepted connections
+    - req_total total number of processed requests
+    - http_2xx total number of 2xx requests
+    - http_3xx total number of 3xx requests
+    - http_4xx total number of 4xx requests
+    - http_5xx total number of 5xx requests
+    - http_other_status total number of other requests
+    - rt accumulation or rt
+    - ups_req total number of requests calling for upstream
+    - ups_rt accumulation or upstream rt
+    - ups_tries total number of times calling for upstream
+    - http_200 total number of 200 requests
+    - http_206 total number of 206 requests
+    - http_302 total number of 302 requests
+    - http_304 total number of 304 requests
+    - http_403 total number of 403 requests
+    - http_404 total number of 404 requests
+    - http_416 total number of 416 requests
+    - http_499 total number of 499 requests
+    - http_500 total number of 500 requests
+    - http_502 total number of 502 requests
+    - http_503 total number of 503 requests
+    - http_504 total number of 504 requests
+    - http_508 total number of 508 requests
+    - http_other_detail_status total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx
+    - http_ups_5xx total number of requests of upstream 5xx
+### Tags:
+
+- All measurements have the following tags:
+    - port
+    - server
+    - server_name
+
+### Example Output:
+
+Using this configuration:
+```
+[[inputs.tengine]]
+  ## An array of tengine req_status_show URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+```
+
+When run with:
+```
+./telegraf --config telegraf.conf --input-filter tengine --test
+```
+
+It produces:
+```
+* Plugin: tengine, Collection 1
+> tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
+```
diff --git a/plugins/inputs/tengine/tengine.go b/plugins/inputs/tengine/tengine.go
new file mode 100644
index 000000000..a9a899825
--- /dev/null
+++ b/plugins/inputs/tengine/tengine.go
@@ -0,0 +1,338 @@
+package tengine
+
+import (
+	"bufio"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"io"
+)
+
+type Tengine struct {
+	Urls            []string
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
+	// HTTP client
+	client *http.Client
+}
+
+var sampleConfig = `
+  # An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  ## Optional TLS Config
+  tls_ca = "/etc/telegraf/ca.pem"
+  tls_cert = "/etc/telegraf/cert.cer"
+  tls_key = "/etc/telegraf/key.key"
+  ## Use TLS but skip chain & host verification
+  insecure_skip_verify = false
+
+  # HTTP response timeout (default: 5s)
+  response_timeout = "5s"
+`
+
+func (n *Tengine) SampleConfig() string {
+	return sampleConfig
+}
+
+func (n *Tengine) Description() string {
+	return "Read Tengine's basic status information (ngx_http_reqstat_module)"
+}
+
+func (n *Tengine) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	// Create an HTTP client that is re-used for each
+	// collection interval
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
+	for _, u := range n.Urls {
+		addr, err := url.Parse(u)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
+		}
+
+		wg.Add(1)
+		go func(addr *url.URL) {
+			defer wg.Done()
+			acc.AddError(n.gatherUrl(addr, acc))
+		}(addr)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (n *Tengine) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := n.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	if n.ResponseTimeout.Duration < time.Second {
+		n.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: n.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+type TengineSatus struct {
+	host                     string
+	bytes_in                 uint64
+	bytes_out                uint64
+	conn_total               uint64
+	req_total                uint64
+	http_2xx                 uint64
+	http_3xx                 uint64
+	http_4xx                 uint64
+	http_5xx                 uint64
+	http_other_status        uint64
+	rt                       uint64
+	ups_req                  uint64
+	ups_rt                   uint64
+	ups_tries                uint64
+	http_200                 uint64
+	http_206                 uint64
+	http_302                 uint64
+	http_304                 uint64
+	http_403                 uint64
+	http_404                 uint64
+	http_416                 uint64
+	http_499                 uint64
+	http_500                 uint64
+	http_502                 uint64
+	http_503                 uint64
+	http_504                 uint64
+	http_508                 uint64
+	http_other_detail_status uint64
+	http_ups_4xx             uint64
+	http_ups_5xx             uint64
+}
+
+func (n *Tengine) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
+	var tenginestatus TengineSatus
+	resp, err := n.client.Get(addr.String())
+	if err != nil {
+		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
+	}
+	r := bufio.NewReader(resp.Body)
+
+	for {
+		line, err := r.ReadString('\n')
+
+		if err != nil || io.EOF == err {
+			break
+		}
+		line_split := strings.Split(strings.TrimSpace(line), ",")
+		if len(line_split) != 30 {
+			continue
+		}
+		tenginestatus.host = line_split[0]
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_in, err = strconv.ParseUint(line_split[1], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_out, err = strconv.ParseUint(line_split[2], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.conn_total, err = strconv.ParseUint(line_split[3], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.req_total, err = strconv.ParseUint(line_split[4], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_2xx, err = strconv.ParseUint(line_split[5], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_3xx, err = strconv.ParseUint(line_split[6], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_4xx, err = strconv.ParseUint(line_split[7], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_5xx, err = strconv.ParseUint(line_split[8], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_status, err = strconv.ParseUint(line_split[9], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.rt, err = strconv.ParseUint(line_split[10], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_req, err = strconv.ParseUint(line_split[11], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_rt, err = strconv.ParseUint(line_split[12], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_tries, err = strconv.ParseUint(line_split[13], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_200, err = strconv.ParseUint(line_split[14], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_206, err = strconv.ParseUint(line_split[15], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_302, err = strconv.ParseUint(line_split[16], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_304, err = strconv.ParseUint(line_split[17], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_403, err = strconv.ParseUint(line_split[18], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_404, err = strconv.ParseUint(line_split[19], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_416, err = strconv.ParseUint(line_split[20], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_499, err = strconv.ParseUint(line_split[21], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_500, err = strconv.ParseUint(line_split[22], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_502, err = strconv.ParseUint(line_split[23], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_503, err = strconv.ParseUint(line_split[24], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_504, err = strconv.ParseUint(line_split[25], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_508, err = strconv.ParseUint(line_split[26], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_detail_status, err = strconv.ParseUint(line_split[27], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_4xx, err = strconv.ParseUint(line_split[28], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_5xx, err = strconv.ParseUint(line_split[29], 10, 64)
+		if err != nil {
+			return err
+		}
+		tags := getTags(addr, tenginestatus.host)
+		fields := map[string]interface{}{
+			"bytes_in":                 tenginestatus.bytes_in,
+			"bytes_out":                tenginestatus.bytes_out,
+			"conn_total":               tenginestatus.conn_total,
+			"req_total":                tenginestatus.req_total,
+			"http_2xx":                 tenginestatus.http_2xx,
+			"http_3xx":                 tenginestatus.http_3xx,
+			"http_4xx":                 tenginestatus.http_4xx,
+			"http_5xx":                 tenginestatus.http_5xx,
+			"http_other_status":        tenginestatus.http_other_status,
+			"rt":                       tenginestatus.rt,
+			"ups_req":                  tenginestatus.ups_req,
+			"ups_rt":                   tenginestatus.ups_rt,
+			"ups_tries":                tenginestatus.ups_tries,
+			"http_200":                 tenginestatus.http_200,
+			"http_206":                 tenginestatus.http_206,
+			"http_302":                 tenginestatus.http_302,
+			"http_304":                 tenginestatus.http_304,
+			"http_403":                 tenginestatus.http_403,
+			"http_404":                 tenginestatus.http_404,
+			"http_416":                 tenginestatus.http_416,
+			"http_499":                 tenginestatus.http_499,
+			"http_500":                 tenginestatus.http_500,
+			"http_502":                 tenginestatus.http_502,
+			"http_503":                 tenginestatus.http_503,
+			"http_504":                 tenginestatus.http_504,
+			"http_508":                 tenginestatus.http_508,
+			"http_other_detail_status": tenginestatus.http_other_detail_status,
+			"http_ups_4xx":             tenginestatus.http_ups_4xx,
+			"http_ups_5xx":             tenginestatus.http_ups_5xx,
+		}
+		acc.AddFields("tengine", fields, tags)
+	}
+
+	return nil
+}
+
+// Get tag(s) for the tengine plugin
+func getTags(addr *url.URL, server_name string) map[string]string {
+	h := addr.Host
+	host, port, err := net.SplitHostPort(h)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	return map[string]string{"server": host, "port": port, "server_name": server_name}
+}
+
+func init() {
+	inputs.Add("tengine", func() telegraf.Input {
+		return &Tengine{}
+	})
+}
diff --git a/plugins/inputs/tengine/tengine_test.go b/plugins/inputs/tengine/tengine_test.go
new file mode 100644
index 000000000..317820bb2
--- /dev/null
+++ b/plugins/inputs/tengine/tengine_test.go
@@ -0,0 +1,97 @@
+package tengine
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const tengineSampleResponse = `127.0.0.1,784,1511,2,2,1,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0`
+
+// Verify that tengine tags are properly parsed based on the server
+func TestTengineTags(t *testing.T) {
+	urls := []string{"http://localhost/us", "http://localhost:80/us"}
+	var addr *url.URL
+	for _, url1 := range urls {
+		addr, _ = url.Parse(url1)
+		tagMap := getTags(addr, "127.0.0.1")
+		assert.Contains(t, tagMap["server"], "localhost")
+	}
+}
+
+func TestTengineGeneratesMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rsp string
+		rsp = tengineSampleResponse
+		fmt.Fprintln(w, rsp)
+	}))
+	defer ts.Close()
+
+	n := &Tengine{
+		Urls: []string{fmt.Sprintf("%s/us", ts.URL)},
+	}
+
+	var acc_tengine testutil.Accumulator
+
+	err_tengine := acc_tengine.GatherError(n.Gather)
+
+	require.NoError(t, err_tengine)
+
+	fields_tengine := map[string]interface{}{
+		"bytes_in":                 uint64(784),
+		"bytes_out":                uint64(1511),
+		"conn_total":               uint64(2),
+		"req_total":                uint64(2),
+		"http_2xx":                 uint64(1),
+		"http_3xx":                 uint64(0),
+		"http_4xx":                 uint64(1),
+		"http_5xx":                 uint64(0),
+		"http_other_status":        uint64(0),
+		"rt":                       uint64(0),
+		"ups_req":                  uint64(0),
+		"ups_rt":                   uint64(0),
+		"ups_tries":                uint64(0),
+		"http_200":                 uint64(1),
+		"http_206":                 uint64(0),
+		"http_302":                 uint64(0),
+		"http_304":                 uint64(0),
+		"http_403":                 uint64(0),
+		"http_404":                 uint64(1),
+		"http_416":                 uint64(0),
+		"http_499":                 uint64(0),
+		"http_500":                 uint64(0),
+		"http_502":                 uint64(0),
+		"http_503":                 uint64(0),
+		"http_504":                 uint64(0),
+		"http_508":                 uint64(0),
+		"http_other_detail_status": uint64(0),
+		"http_ups_4xx":             uint64(0),
+		"http_ups_5xx":             uint64(0),
+	}
+
+	addr, err := url.Parse(ts.URL)
+	if err != nil {
+		panic(err)
+	}
+
+	host, port, err := net.SplitHostPort(addr.Host)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	tags := map[string]string{"server": host, "port": port, "server_name": "127.0.0.1"}
+	acc_tengine.AssertContainsTaggedFields(t, "tengine", fields_tengine, tags)
+}

From 8826cdc423caa2555fb78d2f30f437579e02862c Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 11:58:22 -0700
Subject: [PATCH 1208/1302] Revert "Add tengine input plugin (#4160)"

This reverts commit 697d8ceae5659efeb4190dc55196832831ae45b9.
---
 plugins/inputs/all/all.go              |   1 -
 plugins/inputs/tengine/README.md       |  82 ------
 plugins/inputs/tengine/tengine.go      | 338 -------------------------
 plugins/inputs/tengine/tengine_test.go |  97 -------
 4 files changed, 518 deletions(-)
 delete mode 100644 plugins/inputs/tengine/README.md
 delete mode 100644 plugins/inputs/tengine/tengine.go
 delete mode 100644 plugins/inputs/tengine/tengine_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index cba156f69..239cf6e11 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -102,7 +102,6 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tengine"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
diff --git a/plugins/inputs/tengine/README.md b/plugins/inputs/tengine/README.md
deleted file mode 100644
index b83a0611b..000000000
--- a/plugins/inputs/tengine/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Telegraf Plugin: Tengine
-
-### Configuration:
-
-```
-# Read Tengine's basic status information (ngx_http_reqstat_module)
-[[inputs.tengine]]
-  ## An array of Tengine reqstat module URI to gather stats.
-  urls = ["http://127.0.0.1/us"]
-
-  ## Optional TLS Config
-  # tls_ca = "/etc/telegraf/ca.pem"
-  # tls_cert = "/etc/telegraf/cert.pem"
-  # tls_key = "/etc/telegraf/key.pem"
-  ## Use TLS but skip chain & host verification
-  # insecure_skip_verify = false
-
-  ## HTTP response timeout (default: 5s)
-  response_timeout = "5s"
-```
-
-### Measurements & Fields:
-
-- Measurement
-    - bytes_in total number of bytes received from client
-    - bytes_out total number of bytes sent to client
-    - conn_total total number of accepted connections
-    - req_total total number of processed requests
-    - http_2xx total number of 2xx requests
-    - http_3xx total number of 3xx requests
-    - http_4xx total number of 4xx requests
-    - http_5xx total number of 5xx requests
-    - http_other_status total number of other requests
-    - rt accumulation or rt
-    - ups_req total number of requests calling for upstream
-    - ups_rt accumulation or upstream rt
-    - ups_tries total number of times calling for upstream
-    - http_200 total number of 200 requests
-    - http_206 total number of 206 requests
-    - http_302 total number of 302 requests
-    - http_304 total number of 304 requests
-    - http_403 total number of 403 requests
-    - http_404 total number of 404 requests
-    - http_416 total number of 416 requests
-    - http_499 total number of 499 requests
-    - http_500 total number of 500 requests
-    - http_502 total number of 502 requests
-    - http_503 total number of 503 requests
-    - http_504 total number of 504 requests
-    - http_508 total number of 508 requests
-    - http_other_detail_status total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx
-    - http_ups_5xx total number of requests of upstream 5xx
-### Tags:
-
-- All measurements have the following tags:
-    - port
-    - server
-    - server_name
-
-### Example Output:
-
-Using this configuration:
-```
-[[inputs.tengine]]
-  ## An array of tengine req_status_show URI to gather stats.
-  urls = ["http://127.0.0.1/us"]
-```
-
-When run with:
-```
-./telegraf --config telegraf.conf --input-filter tengine --test
-```
-
-It produces:
-```
-* Plugin: tengine, Collection 1
-> tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
-```
diff --git a/plugins/inputs/tengine/tengine.go b/plugins/inputs/tengine/tengine.go
deleted file mode 100644
index a9a899825..000000000
--- a/plugins/inputs/tengine/tengine.go
+++ /dev/null
@@ -1,338 +0,0 @@
-package tengine
-
-import (
-	"bufio"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/internal/tls"
-	"github.com/influxdata/telegraf/plugins/inputs"
-	"io"
-)
-
-type Tengine struct {
-	Urls            []string
-	ResponseTimeout internal.Duration
-	tls.ClientConfig
-
-	// HTTP client
-	client *http.Client
-}
-
-var sampleConfig = `
-  # An array of Tengine reqstat module URI to gather stats.
-  urls = ["http://127.0.0.1/us"]
-
-  ## Optional TLS Config
-  tls_ca = "/etc/telegraf/ca.pem"
-  tls_cert = "/etc/telegraf/cert.cer"
-  tls_key = "/etc/telegraf/key.key"
-  ## Use TLS but skip chain & host verification
-  insecure_skip_verify = false
-
-  # HTTP response timeout (default: 5s)
-  response_timeout = "5s"
-`
-
-func (n *Tengine) SampleConfig() string {
-	return sampleConfig
-}
-
-func (n *Tengine) Description() string {
-	return "Read Tengine's basic status information (ngx_http_reqstat_module)"
-}
-
-func (n *Tengine) Gather(acc telegraf.Accumulator) error {
-	var wg sync.WaitGroup
-
-	// Create an HTTP client that is re-used for each
-	// collection interval
-	if n.client == nil {
-		client, err := n.createHttpClient()
-		if err != nil {
-			return err
-		}
-		n.client = client
-	}
-
-	for _, u := range n.Urls {
-		addr, err := url.Parse(u)
-		if err != nil {
-			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
-			continue
-		}
-
-		wg.Add(1)
-		go func(addr *url.URL) {
-			defer wg.Done()
-			acc.AddError(n.gatherUrl(addr, acc))
-		}(addr)
-	}
-
-	wg.Wait()
-	return nil
-}
-
-func (n *Tengine) createHttpClient() (*http.Client, error) {
-	tlsCfg, err := n.ClientConfig.TLSConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	if n.ResponseTimeout.Duration < time.Second {
-		n.ResponseTimeout.Duration = time.Second * 5
-	}
-
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: tlsCfg,
-		},
-		Timeout: n.ResponseTimeout.Duration,
-	}
-
-	return client, nil
-}
-
-type TengineSatus struct {
-	host                     string
-	bytes_in                 uint64
-	bytes_out                uint64
-	conn_total               uint64
-	req_total                uint64
-	http_2xx                 uint64
-	http_3xx                 uint64
-	http_4xx                 uint64
-	http_5xx                 uint64
-	http_other_status        uint64
-	rt                       uint64
-	ups_req                  uint64
-	ups_rt                   uint64
-	ups_tries                uint64
-	http_200                 uint64
-	http_206                 uint64
-	http_302                 uint64
-	http_304                 uint64
-	http_403                 uint64
-	http_404                 uint64
-	http_416                 uint64
-	http_499                 uint64
-	http_500                 uint64
-	http_502                 uint64
-	http_503                 uint64
-	http_504                 uint64
-	http_508                 uint64
-	http_other_detail_status uint64
-	http_ups_4xx             uint64
-	http_ups_5xx             uint64
-}
-
-func (n *Tengine) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
-	var tenginestatus TengineSatus
-	resp, err := n.client.Get(addr.String())
-	if err != nil {
-		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
-	}
-	r := bufio.NewReader(resp.Body)
-
-	for {
-		line, err := r.ReadString('\n')
-
-		if err != nil || io.EOF == err {
-			break
-		}
-		line_split := strings.Split(strings.TrimSpace(line), ",")
-		if len(line_split) != 30 {
-			continue
-		}
-		tenginestatus.host = line_split[0]
-		if err != nil {
-			return err
-		}
-		tenginestatus.bytes_in, err = strconv.ParseUint(line_split[1], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.bytes_out, err = strconv.ParseUint(line_split[2], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.conn_total, err = strconv.ParseUint(line_split[3], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.req_total, err = strconv.ParseUint(line_split[4], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_2xx, err = strconv.ParseUint(line_split[5], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_3xx, err = strconv.ParseUint(line_split[6], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_4xx, err = strconv.ParseUint(line_split[7], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_5xx, err = strconv.ParseUint(line_split[8], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_other_status, err = strconv.ParseUint(line_split[9], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.rt, err = strconv.ParseUint(line_split[10], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.ups_req, err = strconv.ParseUint(line_split[11], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.ups_rt, err = strconv.ParseUint(line_split[12], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.ups_tries, err = strconv.ParseUint(line_split[13], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_200, err = strconv.ParseUint(line_split[14], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_206, err = strconv.ParseUint(line_split[15], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_302, err = strconv.ParseUint(line_split[16], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_304, err = strconv.ParseUint(line_split[17], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_403, err = strconv.ParseUint(line_split[18], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_404, err = strconv.ParseUint(line_split[19], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_416, err = strconv.ParseUint(line_split[20], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_499, err = strconv.ParseUint(line_split[21], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_500, err = strconv.ParseUint(line_split[22], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_502, err = strconv.ParseUint(line_split[23], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_503, err = strconv.ParseUint(line_split[24], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_504, err = strconv.ParseUint(line_split[25], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_508, err = strconv.ParseUint(line_split[26], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_other_detail_status, err = strconv.ParseUint(line_split[27], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_ups_4xx, err = strconv.ParseUint(line_split[28], 10, 64)
-		if err != nil {
-			return err
-		}
-		tenginestatus.http_ups_5xx, err = strconv.ParseUint(line_split[29], 10, 64)
-		if err != nil {
-			return err
-		}
-		tags := getTags(addr, tenginestatus.host)
-		fields := map[string]interface{}{
-			"bytes_in":                 tenginestatus.bytes_in,
-			"bytes_out":                tenginestatus.bytes_out,
-			"conn_total":               tenginestatus.conn_total,
-			"req_total":                tenginestatus.req_total,
-			"http_2xx":                 tenginestatus.http_2xx,
-			"http_3xx":                 tenginestatus.http_3xx,
-			"http_4xx":                 tenginestatus.http_4xx,
-			"http_5xx":                 tenginestatus.http_5xx,
-			"http_other_status":        tenginestatus.http_other_status,
-			"rt":                       tenginestatus.rt,
-			"ups_req":                  tenginestatus.ups_req,
-			"ups_rt":                   tenginestatus.ups_rt,
-			"ups_tries":                tenginestatus.ups_tries,
-			"http_200":                 tenginestatus.http_200,
-			"http_206":                 tenginestatus.http_206,
-			"http_302":                 tenginestatus.http_302,
-			"http_304":                 tenginestatus.http_304,
-			"http_403":                 tenginestatus.http_403,
-			"http_404":                 tenginestatus.http_404,
-			"http_416":                 tenginestatus.http_416,
-			"http_499":                 tenginestatus.http_499,
-			"http_500":                 tenginestatus.http_500,
-			"http_502":                 tenginestatus.http_502,
-			"http_503":                 tenginestatus.http_503,
-			"http_504":                 tenginestatus.http_504,
-			"http_508":                 tenginestatus.http_508,
-			"http_other_detail_status": tenginestatus.http_other_detail_status,
-			"http_ups_4xx":             tenginestatus.http_ups_4xx,
-			"http_ups_5xx":             tenginestatus.http_ups_5xx,
-		}
-		acc.AddFields("tengine", fields, tags)
-	}
-
-	return nil
-}
-
-// Get tag(s) for the tengine plugin
-func getTags(addr *url.URL, server_name string) map[string]string {
-	h := addr.Host
-	host, port, err := net.SplitHostPort(h)
-	if err != nil {
-		host = addr.Host
-		if addr.Scheme == "http" {
-			port = "80"
-		} else if addr.Scheme == "https" {
-			port = "443"
-		} else {
-			port = ""
-		}
-	}
-	return map[string]string{"server": host, "port": port, "server_name": server_name}
-}
-
-func init() {
-	inputs.Add("tengine", func() telegraf.Input {
-		return &Tengine{}
-	})
-}
diff --git a/plugins/inputs/tengine/tengine_test.go b/plugins/inputs/tengine/tengine_test.go
deleted file mode 100644
index 317820bb2..000000000
--- a/plugins/inputs/tengine/tengine_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package tengine
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const tengineSampleResponse = `127.0.0.1,784,1511,2,2,1,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0`
-
-// Verify that tengine tags are properly parsed based on the server
-func TestTengineTags(t *testing.T) {
-	urls := []string{"http://localhost/us", "http://localhost:80/us"}
-	var addr *url.URL
-	for _, url1 := range urls {
-		addr, _ = url.Parse(url1)
-		tagMap := getTags(addr, "127.0.0.1")
-		assert.Contains(t, tagMap["server"], "localhost")
-	}
-}
-
-func TestTengineGeneratesMetrics(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var rsp string
-		rsp = tengineSampleResponse
-		fmt.Fprintln(w, rsp)
-	}))
-	defer ts.Close()
-
-	n := &Tengine{
-		Urls: []string{fmt.Sprintf("%s/us", ts.URL)},
-	}
-
-	var acc_tengine testutil.Accumulator
-
-	err_tengine := acc_tengine.GatherError(n.Gather)
-
-	require.NoError(t, err_tengine)
-
-	fields_tengine := map[string]interface{}{
-		"bytes_in":                 uint64(784),
-		"bytes_out":                uint64(1511),
-		"conn_total":               uint64(2),
-		"req_total":                uint64(2),
-		"http_2xx":                 uint64(1),
-		"http_3xx":                 uint64(0),
-		"http_4xx":                 uint64(1),
-		"http_5xx":                 uint64(0),
-		"http_other_status":        uint64(0),
-		"rt":                       uint64(0),
-		"ups_req":                  uint64(0),
-		"ups_rt":                   uint64(0),
-		"ups_tries":                uint64(0),
-		"http_200":                 uint64(1),
-		"http_206":                 uint64(0),
-		"http_302":                 uint64(0),
-		"http_304":                 uint64(0),
-		"http_403":                 uint64(0),
-		"http_404":                 uint64(1),
-		"http_416":                 uint64(0),
-		"http_499":                 uint64(0),
-		"http_500":                 uint64(0),
-		"http_502":                 uint64(0),
-		"http_503":                 uint64(0),
-		"http_504":                 uint64(0),
-		"http_508":                 uint64(0),
-		"http_other_detail_status": uint64(0),
-		"http_ups_4xx":             uint64(0),
-		"http_ups_5xx":             uint64(0),
-	}
-
-	addr, err := url.Parse(ts.URL)
-	if err != nil {
-		panic(err)
-	}
-
-	host, port, err := net.SplitHostPort(addr.Host)
-	if err != nil {
-		host = addr.Host
-		if addr.Scheme == "http" {
-			port = "80"
-		} else if addr.Scheme == "https" {
-			port = "443"
-		} else {
-			port = ""
-		}
-	}
-	tags := map[string]string{"server": host, "port": port, "server_name": "127.0.0.1"}
-	acc_tengine.AssertContainsTaggedFields(t, "tengine", fields_tengine, tags)
-}

From 83b03ecb185933ec0c1b695330601dfdcc173bba Mon Sep 17 00:00:00 2001
From: Rodrigo Pereira <rodrigoborgespereira@gmail.com>
Date: Wed, 23 May 2018 20:03:49 +0100
Subject: [PATCH 1209/1302] Add option to unbound module to use threads as tags
  (#3969)

---
 plugins/inputs/unbound/README.md       | 18 ++++-
 plugins/inputs/unbound/unbound.go      | 82 ++++++++++++++++------
 plugins/inputs/unbound/unbound_test.go | 94 +++++++++++++++++++++++++-
 3 files changed, 170 insertions(+), 24 deletions(-)

diff --git a/plugins/inputs/unbound/README.md b/plugins/inputs/unbound/README.md
index b2cf3d799..ff2b03af3 100644
--- a/plugins/inputs/unbound/README.md
+++ b/plugins/inputs/unbound/README.md
@@ -22,6 +22,11 @@ This plugin gathers stats from [Unbound - a validating, recursive, and caching D
    ## IP of server to connect to, read from unbound conf default, optionally ':port'
    ## Will lookup IP if given a hostname
    server = "127.0.0.1:8953"
+
+   ## Output thread related values in a separate measurement "unbound_threads", with additional tag
+   ## "thread" identifying the thread number (0 ... the number of configured threads)
+   ## By default, thread related metrics are output as additional fields in measurement "unbound" 
+   thread_as_tag = false
 ```
 
 ### Measurements & Fields:
@@ -129,7 +134,7 @@ telegraf ALL=(ALL) NOPASSWD: /usr/sbin/unbound-control
 
 Please use the solution you see as most appropriate.
 
-### Example Output:
+### Example Output (default):
 
 ```
  telegraf --config etc/telegraf.conf --input-filter unbound --test
@@ -137,3 +142,14 @@ Please use the solution you see as most appropriate.
 > unbound,host=localhost total_num_cachehits=0,total_num_prefetch=0,total_requestlist_avg=0,total_requestlist_max=0,total_recursion_time_median=0,total_num_queries=0,total_requestlist_overwritten=0,total_requestlist_current_all=0,time_up=159185.583967,total_num_recursivereplies=0,total_requestlist_exceeded=0,total_requestlist_current_user=0,total_recursion_time_avg=0,total_tcpusage=0,total_num_cachemiss=0 1510130793000000000
 
 ```
+
+### Example Output (with thread_as_tag = true, unbound configured with num_threads: 2)
+
+```
+ telegraf --config etc/telegraf.conf --input-filter unbound --test
+* Plugin: inputs.unbound, Collection 1
+> unbound,host=localhost total_requestlist_avg=0,total_requestlist_exceeded=0,total_requestlist_overwritten=0,total_requestlist_current_user=0,total_recursion_time_avg=0.029186,total_tcpusage=0,total_num_queries=51,total_num_queries_ip_ratelimited=0,total_num_recursivereplies=6,total_requestlist_max=0,time_now=1522804978.784814,time_elapsed=310.435217,total_num_cachemiss=6,total_num_zero_ttl=0,time_up=310.435217,total_num_cachehits=45,total_num_prefetch=0,total_requestlist_current_all=0,total_recursion_time_median=0.016384 1522804979000000000
+> unbound_threads,host=localhost,thread=0 num_queries_ip_ratelimited=0,requestlist_current_user=0,recursion_time_avg=0.029186,num_prefetch=0,requestlist_overwritten=0,requestlist_exceeded=0,requestlist_current_all=0,tcpusage=0,num_cachehits=37,num_cachemiss=6,num_recursivereplies=6,requestlist_avg=0,num_queries=43,num_zero_ttl=0,requestlist_max=0,recursion_time_median=0.032768 1522804979000000000
+> unbound_threads,host=localhost,thread=1 num_zero_ttl=0,recursion_time_avg=0,num_queries_ip_ratelimited=0,num_cachehits=8,num_prefetch=0,requestlist_exceeded=0,recursion_time_median=0,tcpusage=0,num_cachemiss=0,num_recursivereplies=0,requestlist_max=0,requestlist_overwritten=0,requestlist_current_user=0,num_queries=8,requestlist_avg=0,requestlist_current_all=0 1522804979000000000
+
+```
\ No newline at end of file
diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
index 798879664..21eee33a3 100644
--- a/plugins/inputs/unbound/unbound.go
+++ b/plugins/inputs/unbound/unbound.go
@@ -17,14 +17,15 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, Timeout internal.Duration, UseSudo bool, Server string) (*bytes.Buffer, error)
+type runner func(cmdName string, Timeout internal.Duration, UseSudo bool, Server string, ThreadAsTag bool) (*bytes.Buffer, error)
 
 // Unbound is used to store configuration values
 type Unbound struct {
-	Binary  string
-	Timeout internal.Duration
-	UseSudo bool
-	Server  string
+	Binary      string
+	Timeout     internal.Duration
+	UseSudo     bool
+	Server      string
+	ThreadAsTag bool
 
 	filter filter.Filter
 	run    runner
@@ -45,12 +46,18 @@ var sampleConfig = `
 
   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
-  
+
   ## IP of server to connect to, read from unbound conf default, optionally ':port'
   ## Will lookup IP if given a hostname
   server = "127.0.0.1:8953"
+
+  ## Output thread related values in a separate measurement "unbound_threads", with additional tag
+  ## "thread" identifying the thread number (0 ... the number of configured threads)
+  ## By default, thread related metrics are output as additional fields in a single metric point
+  thread_as_tag = false
 `
 
+// Description displays what this plugin is about
 func (s *Unbound) Description() string {
 	return "A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver"
 }
@@ -61,7 +68,7 @@ func (s *Unbound) SampleConfig() string {
 }
 
 // Shell out to unbound_stat and return the output
-func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Server string) (*bytes.Buffer, error) {
+func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Server string, ThreadAsTag bool) (*bytes.Buffer, error) {
 	cmdArgs := []string{"stats_noreset"}
 
 	if Server != "" {
@@ -113,19 +120,21 @@ func unboundRunner(cmdName string, Timeout internal.Duration, UseSudo bool, Serv
 func (s *Unbound) Gather(acc telegraf.Accumulator) error {
 
 	// Always exclude histrogram statistics
-	stat_excluded := []string{"histogram.*"}
-	filter_excluded, err := filter.Compile(stat_excluded)
+	statExcluded := []string{"histogram.*"}
+	filterExcluded, err := filter.Compile(statExcluded)
 	if err != nil {
 		return err
 	}
 
-	out, err := s.run(s.Binary, s.Timeout, s.UseSudo, s.Server)
+	out, err := s.run(s.Binary, s.Timeout, s.UseSudo, s.Server, s.ThreadAsTag)
 	if err != nil {
 		return fmt.Errorf("error gathering metrics: %s", err)
 	}
 
 	// Process values
 	fields := make(map[string]interface{})
+	fieldsThreads := make(map[string]map[string]interface{})
+
 	scanner := bufio.NewScanner(out)
 	for scanner.Scan() {
 
@@ -140,32 +149,65 @@ func (s *Unbound) Gather(acc telegraf.Accumulator) error {
 		value := cols[1]
 
 		// Filter value
-		if filter_excluded.Match(stat) {
+		if filterExcluded.Match(stat) {
 			continue
 		}
 
-		field := strings.Replace(stat, ".", "_", -1)
-
-		fields[field], err = strconv.ParseFloat(value, 64)
+		fieldValue, err := strconv.ParseFloat(value, 64)
 		if err != nil {
-			acc.AddError(fmt.Errorf("Expected a numerical value for %s = %v\n",
+			acc.AddError(fmt.Errorf("Expected a numerical value for %s = %v",
 				stat, value))
+			continue
 		}
+
+		// is this a thread related value?
+		if s.ThreadAsTag && strings.HasPrefix(stat, "thread") {
+			// split the stat
+			statTokens := strings.Split(stat, ".")
+			// make sure we split something
+			if len(statTokens) > 1 {
+				// set the thread identifier
+				threadID := strings.TrimPrefix(statTokens[0], "thread")
+				// make sure we have a proper thread ID
+				if _, err = strconv.Atoi(threadID); err == nil {
+					// create new slice without the thread identifier (skip first token)
+					threadTokens := statTokens[1:]
+					// re-define stat
+					field := strings.Join(threadTokens[:], "_")
+					if fieldsThreads[threadID] == nil {
+						fieldsThreads[threadID] = make(map[string]interface{})
+					}
+					fieldsThreads[threadID][field] = fieldValue
+				}
+			}
+		} else {
+			field := strings.Replace(stat, ".", "_", -1)
+			fields[field] = fieldValue
+		}
+
 	}
 
 	acc.AddFields("unbound", fields, nil)
 
+	if s.ThreadAsTag && len(fieldsThreads) > 0 {
+		for thisThreadID, thisThreadFields := range fieldsThreads {
+			thisThreadTag := map[string]string{"thread": thisThreadID}
+			acc.AddFields("unbound_threads", thisThreadFields, thisThreadTag)
+		}
+	}
+
 	return nil
 }
 
 func init() {
 	inputs.Add("unbound", func() telegraf.Input {
 		return &Unbound{
-			run:     unboundRunner,
-			Binary:  defaultBinary,
-			Timeout: defaultTimeout,
-			UseSudo: false,
-			Server:  "",
+			run:         unboundRunner,
+			Binary:      defaultBinary,
+			Timeout:     defaultTimeout,
+			UseSudo:     false,
+			Server:      "",
+			ThreadAsTag: false,
 		}
 	})
 }
diff --git a/plugins/inputs/unbound/unbound_test.go b/plugins/inputs/unbound/unbound_test.go
index b1e042307..b1d6206c3 100644
--- a/plugins/inputs/unbound/unbound_test.go
+++ b/plugins/inputs/unbound/unbound_test.go
@@ -12,8 +12,8 @@ import (
 
 var TestTimeout = internal.Duration{Duration: time.Second}
 
-func UnboundControl(output string, Timeout internal.Duration, useSudo bool, Server string) func(string, internal.Duration, bool, string) (*bytes.Buffer, error) {
-	return func(string, internal.Duration, bool, string) (*bytes.Buffer, error) {
+func UnboundControl(output string, Timeout internal.Duration, useSudo bool, Server string, ThreadAsTag bool) func(string, internal.Duration, bool, string, bool) (*bytes.Buffer, error) {
+	return func(string, internal.Duration, bool, string, bool) (*bytes.Buffer, error) {
 		return bytes.NewBuffer([]byte(output)), nil
 	}
 }
@@ -21,7 +21,7 @@ func UnboundControl(output string, Timeout internal.Duration, useSudo bool, Serv
 func TestParseFullOutput(t *testing.T) {
 	acc := &testutil.Accumulator{}
 	v := &Unbound{
-		run: UnboundControl(fullOutput, TestTimeout, true, ""),
+		run: UnboundControl(fullOutput, TestTimeout, true, "", false),
 	}
 	err := v.Gather(acc)
 
@@ -35,6 +35,26 @@ func TestParseFullOutput(t *testing.T) {
 	acc.AssertContainsFields(t, "unbound", parsedFullOutput)
 }
 
+func TestParseFullOutputThreadAsTag(t *testing.T) {
+	acc := &testutil.Accumulator{}
+	v := &Unbound{
+		run:         UnboundControl(fullOutput, TestTimeout, true, "", true),
+		ThreadAsTag: true,
+	}
+	err := v.Gather(acc)
+
+	assert.NoError(t, err)
+
+	assert.True(t, acc.HasMeasurement("unbound"))
+	assert.True(t, acc.HasMeasurement("unbound_threads"))
+
+	assert.Len(t, acc.Metrics, 2)
+	assert.Equal(t, acc.NFields(), 63)
+
+	acc.AssertContainsFields(t, "unbound", parsedFullOutputThreadAsTagMeasurementUnbound)
+	acc.AssertContainsFields(t, "unbound_threads", parsedFullOutputThreadAsTagMeasurementUnboundThreads)
+}
+
 var parsedFullOutput = map[string]interface{}{
 	"thread0_num_queries":              float64(11907596),
 	"thread0_num_cachehits":            float64(11489288),
@@ -101,6 +121,74 @@ var parsedFullOutput = map[string]interface{}{
 	"unwanted_replies":                 float64(0),
 }
 
+var parsedFullOutputThreadAsTagMeasurementUnboundThreads = map[string]interface{}{
+	"num_queries":              float64(11907596),
+	"num_cachehits":            float64(11489288),
+	"num_cachemiss":            float64(418308),
+	"num_prefetch":             float64(0),
+	"num_recursivereplies":     float64(418308),
+	"requestlist_avg":          float64(0.400229),
+	"requestlist_max":          float64(11),
+	"requestlist_overwritten":  float64(0),
+	"requestlist_exceeded":     float64(0),
+	"requestlist_current_all":  float64(0),
+	"requestlist_current_user": float64(0),
+	"recursion_time_avg":       float64(0.015020),
+	"recursion_time_median":    float64(0.00292343),
+}
+var parsedFullOutputThreadAsTagMeasurementUnbound = map[string]interface{}{
+	"total_num_queries":              float64(11907596),
+	"total_num_cachehits":            float64(11489288),
+	"total_num_cachemiss":            float64(418308),
+	"total_num_prefetch":             float64(0),
+	"total_num_recursivereplies":     float64(418308),
+	"total_requestlist_avg":          float64(0.400229),
+	"total_requestlist_max":          float64(11),
+	"total_requestlist_overwritten":  float64(0),
+	"total_requestlist_exceeded":     float64(0),
+	"total_requestlist_current_all":  float64(0),
+	"total_requestlist_current_user": float64(0),
+	"total_recursion_time_avg":       float64(0.015020),
+	"total_recursion_time_median":    float64(0.00292343),
+	"time_now":                       float64(1509968734.735180),
+	"time_up":                        float64(1472897.672099),
+	"time_elapsed":                   float64(1472897.672099),
+	"mem_total_sbrk":                 float64(7462912),
+	"mem_cache_rrset":                float64(285056),
+	"mem_cache_message":              float64(320000),
+	"mem_mod_iterator":               float64(16532),
+	"mem_mod_validator":              float64(112097),
+	"num_query_type_A":               float64(7062688),
+	"num_query_type_PTR":             float64(43097),
+	"num_query_type_TXT":             float64(2998),
+	"num_query_type_AAAA":            float64(4499711),
+	"num_query_type_SRV":             float64(5691),
+	"num_query_type_ANY":             float64(293411),
+	"num_query_class_IN":             float64(11907596),
+	"num_query_opcode_QUERY":         float64(11907596),
+	"num_query_tcp":                  float64(293411),
+	"num_query_ipv6":                 float64(0),
+	"num_query_flags_QR":             float64(0),
+	"num_query_flags_AA":             float64(0),
+	"num_query_flags_TC":             float64(0),
+	"num_query_flags_RD":             float64(11907596),
+	"num_query_flags_RA":             float64(0),
+	"num_query_flags_Z":              float64(0),
+	"num_query_flags_AD":             float64(1),
+	"num_query_flags_CD":             float64(0),
+	"num_query_edns_present":         float64(6202),
+	"num_query_edns_DO":              float64(6201),
+	"num_answer_rcode_NOERROR":       float64(11857463),
+	"num_answer_rcode_SERVFAIL":      float64(17),
+	"num_answer_rcode_NXDOMAIN":      float64(50116),
+	"num_answer_rcode_nodata":        float64(3914360),
+	"num_answer_secure":              float64(44289),
+	"num_answer_bogus":               float64(1),
+	"num_rrset_bogus":                float64(0),
+	"unwanted_queries":               float64(0),
+	"unwanted_replies":               float64(0),
+}
+
 var fullOutput = `thread0.num.queries=11907596
 thread0.num.cachehits=11489288
 thread0.num.cachemiss=418308

From 54728f54c65a5f8a838cdd5b7ced6b02a5f8f520 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 12:22:25 -0700
Subject: [PATCH 1210/1302] Update unbound README

---
 plugins/inputs/unbound/README.md  | 161 +++++++++++++++---------------
 plugins/inputs/unbound/unbound.go |  33 +++---
 2 files changed, 94 insertions(+), 100 deletions(-)

diff --git a/plugins/inputs/unbound/README.md b/plugins/inputs/unbound/README.md
index ff2b03af3..4f1f862bb 100644
--- a/plugins/inputs/unbound/README.md
+++ b/plugins/inputs/unbound/README.md
@@ -1,56 +1,78 @@
 # Unbound Input Plugin
 
-This plugin gathers stats from [Unbound - a validating, recursive, and caching DNS resolver](https://www.unbound.net/)
+This plugin gathers stats from [Unbound](https://www.unbound.net/) -
+a validating, recursive, and caching DNS resolver.
 
 ### Configuration:
 
 ```toml
- # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
- [[inputs.unbound]]
-   ## If running as a restricted user you can prepend sudo for additional access:
-   #use_sudo = false
+# A plugin to collect stats from the Unbound DNS resolver
+[[inputs.unbound]]
+  ## Address of server to connect to, read from unbound conf default, optionally ':port'
+  ## Will lookup IP if given a hostname
+  server = "127.0.0.1:8953"
 
-   ## The default location of the unbound-control binary can be overridden with:
-   binary = "/usr/sbin/unbound-control"
+  ## If running as a restricted user you can prepend sudo for additional access:
+  # use_sudo = false
 
-   ## The default timeout of 1s can be overriden with:
-   #timeout = "1s"
+  ## The default location of the unbound-control binary can be overridden with:
+  # binary = "/usr/sbin/unbound-control"
 
-   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep only specific fields
-   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
+  ## The default timeout of 1s can be overriden with:
+  # timeout = "1s"
 
-   ## IP of server to connect to, read from unbound conf default, optionally ':port'
-   ## Will lookup IP if given a hostname
-   server = "127.0.0.1:8953"
-
-   ## Output thread related values in a separate measurement "unbound_threads", with additional tag
-   ## "thread" identifying the thread number (0 ... the number of configured threads)
-   ## By default, thread related metrics are output as additional fields in measurement "unbound" 
-   thread_as_tag = false
+  ## When set to true, thread metrics are tagged with the thread id.
+  ##
+  ## The default is false for backwards compatibility, and will be change to
+  ## true in a future version.  It is recommended to set to true on new
+  ## deployments.
+  thread_as_tag = false
 ```
 
-### Measurements & Fields:
+#### Permissions:
 
-This is the full list of stats provided by unbound-control and potentially collected by telegram
-depending of your unbound configuration. Histogram related statistics will never be collected,
+It's important to note that this plugin references unbound-control, which may require additional permissions to execute successfully.
+Depending on the user/group permissions of the telegraf user executing this plugin, you may need to alter the group membership, set facls, or use sudo.
+
+**Group membership (Recommended)**:
+```bash
+$ groups telegraf
+telegraf : telegraf
+
+$ usermod -a -G unbound telegraf
+
+$ groups telegraf
+telegraf : telegraf unbound
+```
+
+**Sudo privileges**:
+If you use this method, you will need the following in your telegraf config:
+```toml
+[[inputs.unbound]]
+  use_sudo = true
+```
+
+You will also need to update your sudoers file:
+```bash
+$ visudo
+# Add the following line:
+telegraf ALL=(ALL) NOPASSWD: /usr/sbin/unbound-control
+```
+
+Please use the solution you see as most appropriate.
+
+### Metrics:
+
+This is the full list of stats provided by unbound-control and potentially collected
+depending of your unbound configuration.  Histogram related statistics will never be collected,
 extended statistics can also be imported ("extended-statistics: yes" in unbound configuration).
 In the output, the dots in the unbound-control stat name are replaced by underscores(see
 https://www.unbound.net/documentation/unbound-control.html for details).
 
+Shown metrics are with `thread_as_tag` enabled.
+
 - unbound
-    thread0_num_queries
-    thread0_num_cachehits
-    thread0_num_cachemiss
-    thread0_num_prefetch
-    thread0_num_recursivereplies
-    thread0_requestlist_avg
-    thread0_requestlist_max
-    thread0_requestlist_overwritten
-    thread0_requestlist_exceeded
-    thread0_requestlist_current_all
-    thread0_requestlist_current_user
-    thread0_recursion_time_avg
-    thread0_recursion_time_median
+  - fields:
     total_num_queries
     total_num_cachehits
     total_num_cachemiss
@@ -102,54 +124,27 @@ https://www.unbound.net/documentation/unbound-control.html for details).
     unwanted_queries
     unwanted_replies
 
-### Permissions:
+- unbound_thread
+  - tags:
+    - thread
+  - fields:
+    - num_queries
+    - num_cachehits
+    - num_cachemiss
+    - num_prefetch
+    - num_recursivereplies
+    - requestlist_avg
+    - requestlist_max
+    - requestlist_overwritten
+    - requestlist_exceeded
+    - requestlist_current_all
+    - requestlist_current_user
+    - recursion_time_avg
+    - recursion_time_median
 
-It's important to note that this plugin references unbound-control, which may require additional permissions to execute successfully.
-Depending on the user/group permissions of the telegraf user executing this plugin, you may need to alter the group membership, set facls, or use sudo.
-
-**Group membership (Recommended)**:
-```bash
-$ groups telegraf
-telegraf : telegraf
-
-$ usermod -a -G unbound telegraf
-
-$ groups telegraf
-telegraf : telegraf unbound
+### Example Output:
 ```
-
-**Sudo privileges**:
-If you use this method, you will need the following in your telegraf config:
-```toml
-[[inputs.unbound]]
-  use_sudo = true
+unbound,host=localhost total_requestlist_avg=0,total_requestlist_exceeded=0,total_requestlist_overwritten=0,total_requestlist_current_user=0,total_recursion_time_avg=0.029186,total_tcpusage=0,total_num_queries=51,total_num_queries_ip_ratelimited=0,total_num_recursivereplies=6,total_requestlist_max=0,time_now=1522804978.784814,time_elapsed=310.435217,total_num_cachemiss=6,total_num_zero_ttl=0,time_up=310.435217,total_num_cachehits=45,total_num_prefetch=0,total_requestlist_current_all=0,total_recursion_time_median=0.016384 1522804979000000000
+unbound_threads,host=localhost,thread=0 num_queries_ip_ratelimited=0,requestlist_current_user=0,recursion_time_avg=0.029186,num_prefetch=0,requestlist_overwritten=0,requestlist_exceeded=0,requestlist_current_all=0,tcpusage=0,num_cachehits=37,num_cachemiss=6,num_recursivereplies=6,requestlist_avg=0,num_queries=43,num_zero_ttl=0,requestlist_max=0,recursion_time_median=0.032768 1522804979000000000
+unbound_threads,host=localhost,thread=1 num_zero_ttl=0,recursion_time_avg=0,num_queries_ip_ratelimited=0,num_cachehits=8,num_prefetch=0,requestlist_exceeded=0,recursion_time_median=0,tcpusage=0,num_cachemiss=0,num_recursivereplies=0,requestlist_max=0,requestlist_overwritten=0,requestlist_current_user=0,num_queries=8,requestlist_avg=0,requestlist_current_all=0 1522804979000000000
 ```
-
-You will also need to update your sudoers file:
-```bash
-$ visudo
-# Add the following line:
-telegraf ALL=(ALL) NOPASSWD: /usr/sbin/unbound-control
-```
-
-Please use the solution you see as most appropriate.
-
-### Example Output (default):
-
-```
- telegraf --config etc/telegraf.conf --input-filter unbound --test
-* Plugin: inputs.unbound, Collection 1
-> unbound,host=localhost total_num_cachehits=0,total_num_prefetch=0,total_requestlist_avg=0,total_requestlist_max=0,total_recursion_time_median=0,total_num_queries=0,total_requestlist_overwritten=0,total_requestlist_current_all=0,time_up=159185.583967,total_num_recursivereplies=0,total_requestlist_exceeded=0,total_requestlist_current_user=0,total_recursion_time_avg=0,total_tcpusage=0,total_num_cachemiss=0 1510130793000000000
-
-```
-
-### Example Output (with thread_as_tag = true, unbound configured with num_threads: 2)
-
-```
- telegraf --config etc/telegraf.conf --input-filter unbound --test
-* Plugin: inputs.unbound, Collection 1
-> unbound,host=localhost total_requestlist_avg=0,total_requestlist_exceeded=0,total_requestlist_overwritten=0,total_requestlist_current_user=0,total_recursion_time_avg=0.029186,total_tcpusage=0,total_num_queries=51,total_num_queries_ip_ratelimited=0,total_num_recursivereplies=6,total_requestlist_max=0,time_now=1522804978.784814,time_elapsed=310.435217,total_num_cachemiss=6,total_num_zero_ttl=0,time_up=310.435217,total_num_cachehits=45,total_num_prefetch=0,total_requestlist_current_all=0,total_recursion_time_median=0.016384 1522804979000000000
-> unbound_threads,host=localhost,thread=0 num_queries_ip_ratelimited=0,requestlist_current_user=0,recursion_time_avg=0.029186,num_prefetch=0,requestlist_overwritten=0,requestlist_exceeded=0,requestlist_current_all=0,tcpusage=0,num_cachehits=37,num_cachemiss=6,num_recursivereplies=6,requestlist_avg=0,num_queries=43,num_zero_ttl=0,requestlist_max=0,recursion_time_median=0.032768 1522804979000000000
-> unbound_threads,host=localhost,thread=1 num_zero_ttl=0,recursion_time_avg=0,num_queries_ip_ratelimited=0,num_cachehits=8,num_prefetch=0,requestlist_exceeded=0,recursion_time_median=0,tcpusage=0,num_cachemiss=0,num_recursivereplies=0,requestlist_max=0,requestlist_overwritten=0,requestlist_current_user=0,num_queries=8,requestlist_avg=0,requestlist_current_all=0 1522804979000000000
-
-```
\ No newline at end of file
diff --git a/plugins/inputs/unbound/unbound.go b/plugins/inputs/unbound/unbound.go
index 21eee33a3..31a6d5005 100644
--- a/plugins/inputs/unbound/unbound.go
+++ b/plugins/inputs/unbound/unbound.go
@@ -35,31 +35,30 @@ var defaultBinary = "/usr/sbin/unbound-control"
 var defaultTimeout = internal.Duration{Duration: time.Second}
 
 var sampleConfig = `
-  ## If running as a restricted user you can prepend sudo for additional access:
-  #use_sudo = false
-
-  ## The default location of the unbound-control binary can be overridden with:
-  binary = "/usr/sbin/unbound-control"
-
-  ## The default timeout of 1s can be overriden with:
-  timeout = "1s"
-
-  ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
-  fieldpass = ["total_*", "num_*","time_up", "mem_*"]
-
-  ## IP of server to connect to, read from unbound conf default, optionally ':port'
+  ## Address of server to connect to, read from unbound conf default, optionally ':port'
   ## Will lookup IP if given a hostname
   server = "127.0.0.1:8953"
 
-  ## Output thread related values in a separate measurement "unbound_threads", with additional tag
-  ## "thread" identifying the thread number (0 ... the number of configured threads)
-  ## By default, thread related metrics are output as additional fields in a single metric point
+  ## If running as a restricted user you can prepend sudo for additional access:
+  # use_sudo = false
+
+  ## The default location of the unbound-control binary can be overridden with:
+  # binary = "/usr/sbin/unbound-control"
+
+  ## The default timeout of 1s can be overriden with:
+  # timeout = "1s"
+
+  ## When set to true, thread metrics are tagged with the thread id.
+  ##
+  ## The default is false for backwards compatibility, and will be change to
+  ## true in a future version.  It is recommended to set to true on new
+  ## deployments.
   thread_as_tag = false
 `
 
 // Description displays what this plugin is about
 func (s *Unbound) Description() string {
-	return "A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver"
+	return "A plugin to collect stats from the Unbound DNS resolver"
 }
 
 // SampleConfig displays configuration instructions

From fbf09409e96af5c0afcedaed30439310502eff25 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 12:26:17 -0700
Subject: [PATCH 1211/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26f0e8cd5..770db93e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - [#4165](https://github.com/influxdata/telegraf/pull/4165): Add support for Graphite 1.1 tags.
 - [#4162](https://github.com/influxdata/telegraf/pull/4162): Add timeout option to sensors input.
 - [#3489](https://github.com/influxdata/telegraf/pull/3489): Add burrow input plugin.
+- [#3969](https://github.com/influxdata/telegraf/pull/3969): Add option to unbound module to use threads as tags.
 
 ### Bugfixes
 

From dbd02ebb744c3954687b000df675bd08235ffd05 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 23 May 2018 14:28:17 -0700
Subject: [PATCH 1212/1302] Add support for TLS and username/password auth to
 aerospike input (#4183)

---
 plugins/inputs/aerospike/README.md    | 21 +++++++++++++
 plugins/inputs/aerospike/aerospike.go | 43 +++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/aerospike/README.md b/plugins/inputs/aerospike/README.md
index 149c6aa2b..56775d908 100644
--- a/plugins/inputs/aerospike/README.md
+++ b/plugins/inputs/aerospike/README.md
@@ -9,6 +9,27 @@ The metric names, to make it less complicated in querying, have replaced all `-`
 
 All metrics are attempted to be cast to integers, then booleans, then strings.
 
+### Configuration:
+```toml
+# Read stats from aerospike server(s)
+[[inputs.aerospike]]
+  ## Aerospike servers to connect to (with port)
+  ## This plugin will query all namespaces the aerospike
+  ## server has configured and get stats for them.
+  servers = ["localhost:3000"]
+
+  # username = "telegraf"
+  # password = "pa$$word"
+
+  ## Optional TLS Config
+  # enable_tls = false
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
+```
+
 ### Measurements:
 
 The aerospike metrics are under two measurement names:
diff --git a/plugins/inputs/aerospike/aerospike.go b/plugins/inputs/aerospike/aerospike.go
index f77fdf10e..3caee7e7d 100644
--- a/plugins/inputs/aerospike/aerospike.go
+++ b/plugins/inputs/aerospike/aerospike.go
@@ -1,6 +1,7 @@
 package aerospike
 
 import (
+	"crypto/tls"
 	"errors"
 	"log"
 	"net"
@@ -10,13 +11,24 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	tlsint "github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
 	as "github.com/aerospike/aerospike-client-go"
 )
 
 type Aerospike struct {
-	Servers []string
+	Servers []string `toml:"servers"`
+
+	Username string `toml:"username"`
+	Password string `toml:"password"`
+
+	EnableTLS bool `toml:"enable_tls"`
+	EnableSSL bool `toml:"enable_ssl"` // deprecated in 1.7; use enable_tls
+	tlsint.ClientConfig
+
+	initialized bool
+	tlsConfig   *tls.Config
 }
 
 var sampleConfig = `
@@ -24,6 +36,17 @@ var sampleConfig = `
   ## This plugin will query all namespaces the aerospike
   ## server has configured and get stats for them.
   servers = ["localhost:3000"]
+
+  # username = "telegraf"
+  # password = "pa$$word"
+
+  ## Optional TLS Config
+  # enable_tls = false
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## If false, skip chain & host verification
+  # insecure_skip_verify = true
  `
 
 func (a *Aerospike) SampleConfig() string {
@@ -35,6 +58,18 @@ func (a *Aerospike) Description() string {
 }
 
 func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
+	if !a.initialized {
+		tlsConfig, err := a.ClientConfig.TLSConfig()
+		if err != nil {
+			return err
+		}
+		if tlsConfig == nil && (a.EnableTLS || a.EnableSSL) {
+			tlsConfig = &tls.Config{}
+		}
+		a.tlsConfig = tlsConfig
+		a.initialized = true
+	}
+
 	if len(a.Servers) == 0 {
 		return a.gatherServer("127.0.0.1:3000", acc)
 	}
@@ -63,7 +98,11 @@ func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) erro
 		iport = 3000
 	}
 
-	c, err := as.NewClient(host, iport)
+	policy := as.NewClientPolicy()
+	policy.User = a.Username
+	policy.Password = a.Password
+	policy.TlsConfig = a.tlsConfig
+	c, err := as.NewClientWithPolicy(policy, host, iport)
 	if err != nil {
 		return err
 	}

From f417cec0366904fbc55b79c1b8b6788ca2bfe479 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 14:28:59 -0700
Subject: [PATCH 1213/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 770db93e5..9cd6710c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 - [#4162](https://github.com/influxdata/telegraf/pull/4162): Add timeout option to sensors input.
 - [#3489](https://github.com/influxdata/telegraf/pull/3489): Add burrow input plugin.
 - [#3969](https://github.com/influxdata/telegraf/pull/3969): Add option to unbound module to use threads as tags.
+- [#4183](https://github.com/influxdata/telegraf/pull/4183): Add support for TLS and username/password auth to aerospike input.
 
 ### Bugfixes
 

From 7f93911f43b5db0e680a247cdee938a9c945feb0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 23 May 2018 14:29:57 -0700
Subject: [PATCH 1214/1302] Add converter processor (#4178)

---
 plugins/processors/all/all.go                 |   1 +
 plugins/processors/converter/README.md        |  57 +++
 plugins/processors/converter/converter.go     | 430 ++++++++++++++++
 .../processors/converter/converter_test.go    | 479 ++++++++++++++++++
 4 files changed, 967 insertions(+)
 create mode 100644 plugins/processors/converter/README.md
 create mode 100644 plugins/processors/converter/converter.go
 create mode 100644 plugins/processors/converter/converter_test.go

diff --git a/plugins/processors/all/all.go b/plugins/processors/all/all.go
index c15f76391..a19e469a9 100644
--- a/plugins/processors/all/all.go
+++ b/plugins/processors/all/all.go
@@ -1,6 +1,7 @@
 package all
 
 import (
+	_ "github.com/influxdata/telegraf/plugins/processors/converter"
 	_ "github.com/influxdata/telegraf/plugins/processors/override"
 	_ "github.com/influxdata/telegraf/plugins/processors/printer"
 	_ "github.com/influxdata/telegraf/plugins/processors/regex"
diff --git a/plugins/processors/converter/README.md b/plugins/processors/converter/README.md
new file mode 100644
index 000000000..69c2cc275
--- /dev/null
+++ b/plugins/processors/converter/README.md
@@ -0,0 +1,57 @@
+# Converter Processor
+
+The converter processor is used to change the type of tag or field values.  In
+addition to changing field types it can convert fields to tags and vis versa.
+
+Values that cannot be converted are dropped.
+
+**Note:** When converting tags to fields, take care not to ensure the series is still
+uniquely identifiable.  Fields with the same series key (measurement + tags)
+will overwrite one another.
+
+### Configuration:
+```toml
+# Convert values to another metric value type
+[processors.converter]
+  ## Tags to convert
+  ##
+  ## The table key determines the target type, and the array of key-values
+  ## select the keys to convert.  The array may contain globs.
+  ##   <target-type> = [<tag-key>...]
+  [processors.converter.tags]
+    string = []
+    integer = []
+    unsigned = []
+    boolean = []
+    float = []
+
+  ## Fields to convert
+  ##
+  ## The table key determines the target type, and the array of key-values
+  ## select the keys to convert.  The array may contain globs.
+  ##   <target-type> = [<field-key>...]
+  [processors.converter.fields]
+    tag = []
+    string = []
+    integer = []
+    unsigned = []
+    boolean = []
+    float = []
+```
+
+### Examples:
+
+```toml
+[processors.converter]
+  [processors.converter.tags]
+    string = ["port"]
+
+  [processors.converter.fields]
+    integer = ["scboard_*"]
+    tag = ["ParseServerConfigGeneration"]
+```
+
+```diff
+- apache,port=80,server=debian-stretch-apache BusyWorkers=1,BytesPerReq=0,BytesPerSec=0,CPUChildrenSystem=0,CPUChildrenUser=0,CPULoad=0.00995025,CPUSystem=0.01,CPUUser=0.01,ConnsAsyncClosing=0,ConnsAsyncKeepAlive=0,ConnsAsyncWriting=0,ConnsTotal=0,IdleWorkers=49,Load1=0.01,Load15=0,Load5=0,ParentServerConfigGeneration=3,ParentServerMPMGeneration=2,ReqPerSec=0.00497512,ServerUptimeSeconds=201,TotalAccesses=1,TotalkBytes=0,Uptime=201,scboard_closing=0,scboard_dnslookup=0,scboard_finishing=0,scboard_idle_cleanup=0,scboard_keepalive=0,scboard_logging=0,scboard_open=100,scboard_reading=0,scboard_sending=1,scboard_starting=0,scboard_waiting=49 1502489900000000000
++ apache,server=debian-stretch-apache,ParentServerConfigGeneration=3 port="80",BusyWorkers=1,BytesPerReq=0,BytesPerSec=0,CPUChildrenSystem=0,CPUChildrenUser=0,CPULoad=0.00995025,CPUSystem=0.01,CPUUser=0.01,ConnsAsyncClosing=0,ConnsAsyncKeepAlive=0,ConnsAsyncWriting=0,ConnsTotal=0,IdleWorkers=49,Load1=0.01,Load15=0,Load5=0,ParentServerMPMGeneration=2,ReqPerSec=0.00497512,ServerUptimeSeconds=201,TotalAccesses=1,TotalkBytes=0,Uptime=201,scboard_closing=0i,scboard_dnslookup=0i,scboard_finishing=0i,scboard_idle_cleanup=0i,scboard_keepalive=0i,scboard_logging=0i,scboard_open=100i,scboard_reading=0i,scboard_sending=1i,scboard_starting=0i,scboard_waiting=49i 1502489900000000000
+```
diff --git a/plugins/processors/converter/converter.go b/plugins/processors/converter/converter.go
new file mode 100644
index 000000000..50fd195e0
--- /dev/null
+++ b/plugins/processors/converter/converter.go
@@ -0,0 +1,430 @@
+package converter
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"strconv"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/filter"
+	"github.com/influxdata/telegraf/plugins/processors"
+)
+
+var sampleConfig = `
+  ## Tags to convert
+  ##
+  ## The table key determines the target type, and the array of key-values
+  ## select the keys to convert.  The array may contain globs.
+  ##   <target-type> = [<tag-key>...]
+  [processors.converter.tags]
+    string = []
+    integer = []
+    unsigned = []
+    boolean = []
+    float = []
+
+  ## Fields to convert
+  ##
+  ## The table key determines the target type, and the array of key-values
+  ## select the keys to convert.  The array may contain globs.
+  ##   <target-type> = [<field-key>...]
+  [processors.converter.fields]
+    tag = []
+    string = []
+    integer = []
+    unsigned = []
+    boolean = []
+    float = []
+`
+
+type Conversion struct {
+	Tag      []string `toml:"tag"`
+	String   []string `toml:"string"`
+	Integer  []string `toml:"integer"`
+	Unsigned []string `toml:"unsigned"`
+	Boolean  []string `toml:"boolean"`
+	Float    []string `toml:"float"`
+}
+
+type Converter struct {
+	Tags   *Conversion `toml:"tags"`
+	Fields *Conversion `toml:"fields"`
+
+	initialized      bool
+	tagConversions   *ConversionFilter
+	fieldConversions *ConversionFilter
+}
+
+type ConversionFilter struct {
+	Tag      filter.Filter
+	String   filter.Filter
+	Integer  filter.Filter
+	Unsigned filter.Filter
+	Boolean  filter.Filter
+	Float    filter.Filter
+}
+
+func (p *Converter) SampleConfig() string {
+	return sampleConfig
+}
+
+func (p *Converter) Description() string {
+	return "Convert values to another metric value type"
+}
+
+func (p *Converter) Apply(metrics ...telegraf.Metric) []telegraf.Metric {
+	if !p.initialized {
+		err := p.compile()
+		if err != nil {
+			logPrintf("initialization error: %v\n", err)
+			return metrics
+		}
+	}
+
+	for _, metric := range metrics {
+		p.convertTags(metric)
+		p.convertFields(metric)
+	}
+	return metrics
+}
+
+func (p *Converter) compile() error {
+	tf, err := compileFilter(p.Tags)
+	if err != nil {
+		return err
+	}
+
+	ff, err := compileFilter(p.Fields)
+	if err != nil {
+		return err
+	}
+
+	if tf == nil && ff == nil {
+		return fmt.Errorf("no filters found")
+	}
+
+	p.tagConversions = tf
+	p.fieldConversions = ff
+	p.initialized = true
+	return nil
+}
+
+func compileFilter(conv *Conversion) (*ConversionFilter, error) {
+	if conv == nil {
+		return nil, nil
+	}
+
+	var err error
+	cf := &ConversionFilter{}
+	cf.Tag, err = filter.Compile(conv.Tag)
+	if err != nil {
+		return nil, err
+	}
+
+	cf.String, err = filter.Compile(conv.String)
+	if err != nil {
+		return nil, err
+	}
+
+	cf.Integer, err = filter.Compile(conv.Integer)
+	if err != nil {
+		return nil, err
+	}
+
+	cf.Unsigned, err = filter.Compile(conv.Unsigned)
+	if err != nil {
+		return nil, err
+	}
+
+	cf.Boolean, err = filter.Compile(conv.Boolean)
+	if err != nil {
+		return nil, err
+	}
+
+	cf.Float, err = filter.Compile(conv.Float)
+	if err != nil {
+		return nil, err
+	}
+
+	return cf, nil
+}
+
+// convertTags converts tags into fields
+func (p *Converter) convertTags(metric telegraf.Metric) {
+	if p.tagConversions == nil {
+		return
+	}
+
+	for key, value := range metric.Tags() {
+		if p.tagConversions.String != nil && p.tagConversions.String.Match(key) {
+			metric.RemoveTag(key)
+			metric.AddField(key, value)
+			continue
+		}
+
+		if p.tagConversions.Integer != nil && p.tagConversions.Integer.Match(key) {
+			v, ok := toInteger(value)
+			if !ok {
+				metric.RemoveTag(key)
+				logPrintf("error converting to integer [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveTag(key)
+			metric.AddField(key, v)
+		}
+
+		if p.tagConversions.Unsigned != nil && p.tagConversions.Unsigned.Match(key) {
+			v, ok := toUnsigned(value)
+			if !ok {
+				metric.RemoveTag(key)
+				logPrintf("error converting to unsigned [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveTag(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.tagConversions.Boolean != nil && p.tagConversions.Boolean.Match(key) {
+			v, ok := toBool(value)
+			if !ok {
+				metric.RemoveTag(key)
+				logPrintf("error converting to boolean [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveTag(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.tagConversions.Float != nil && p.tagConversions.Float.Match(key) {
+			v, ok := toFloat(value)
+			if !ok {
+				metric.RemoveTag(key)
+				logPrintf("error converting to float [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveTag(key)
+			metric.AddField(key, v)
+			continue
+		}
+	}
+}
+
+// convertFields converts fields into tags or other field types
+func (p *Converter) convertFields(metric telegraf.Metric) {
+	if p.fieldConversions == nil {
+		return
+	}
+
+	for key, value := range metric.Fields() {
+		if p.fieldConversions.Tag != nil && p.fieldConversions.Tag.Match(key) {
+			v, ok := toString(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to tag [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddTag(key, v)
+			continue
+		}
+
+		if p.fieldConversions.Float != nil && p.fieldConversions.Float.Match(key) {
+			v, ok := toFloat(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to integer [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.fieldConversions.Integer != nil && p.fieldConversions.Integer.Match(key) {
+			v, ok := toInteger(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to integer [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.fieldConversions.Unsigned != nil && p.fieldConversions.Unsigned.Match(key) {
+			v, ok := toUnsigned(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to unsigned [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.fieldConversions.Boolean != nil && p.fieldConversions.Boolean.Match(key) {
+			v, ok := toBool(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to bool [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddField(key, v)
+			continue
+		}
+
+		if p.fieldConversions.String != nil && p.fieldConversions.String.Match(key) {
+			v, ok := toString(value)
+			if !ok {
+				metric.RemoveField(key)
+				logPrintf("error converting to string [%T]: %v\n", value, value)
+				continue
+			}
+
+			metric.RemoveField(key)
+			metric.AddField(key, v)
+			continue
+		}
+	}
+}
+
+func toBool(v interface{}) (bool, bool) {
+	switch value := v.(type) {
+	case int64, uint64, float64:
+		if value != 0 {
+			return true, true
+		} else {
+			return false, false
+		}
+	case bool:
+		return value, true
+	case string:
+		result, err := strconv.ParseBool(value)
+		return result, err == nil
+	}
+	return false, false
+}
+
+func toInteger(v interface{}) (int64, bool) {
+	switch value := v.(type) {
+	case int64:
+		return value, true
+	case uint64:
+		if value <= uint64(math.MaxInt64) {
+			return int64(value), true
+		} else {
+			return math.MaxInt64, true
+		}
+	case float64:
+		if value < float64(math.MinInt64) {
+			return math.MinInt64, true
+		} else if value > float64(math.MaxInt64) {
+			return math.MaxInt64, true
+		} else {
+			return int64(value), true
+		}
+	case bool:
+		if value {
+			return 1, true
+		} else {
+			return 0, true
+		}
+	case string:
+		result, err := strconv.ParseInt(value, 10, 64)
+		return result, err == nil
+	}
+	return 0, false
+}
+
+func toUnsigned(v interface{}) (uint64, bool) {
+	switch value := v.(type) {
+	case uint64:
+		return value, true
+	case int64:
+		if value < 0 {
+			return 0, true
+		} else {
+			return uint64(value), true
+		}
+	case float64:
+		if value < 0.0 {
+			return 0, true
+		} else if value > float64(math.MaxUint64) {
+			return math.MaxUint64, true
+		} else {
+			return uint64(value), true
+		}
+	case bool:
+		if value {
+			return 1, true
+		} else {
+			return 0, true
+		}
+	case string:
+		result, err := strconv.ParseUint(value, 10, 64)
+		return result, err == nil
+	}
+	return 0, false
+}
+
+func toFloat(v interface{}) (float64, bool) {
+	switch value := v.(type) {
+	case int64:
+		return float64(value), true
+	case uint64:
+		return float64(value), true
+	case float64:
+		return value, true
+	case bool:
+		if value {
+			return 1.0, true
+		} else {
+			return 0.0, true
+		}
+	case string:
+		result, err := strconv.ParseFloat(value, 64)
+		return result, err == nil
+	}
+	return 0.0, false
+}
+
+func toString(v interface{}) (string, bool) {
+	switch value := v.(type) {
+	case int64:
+		return strconv.FormatInt(value, 10), true
+	case uint64:
+		return strconv.FormatUint(value, 10), true
+	case float64:
+		return strconv.FormatFloat(value, 'f', -1, 64), true
+	case bool:
+		return strconv.FormatBool(value), true
+	case string:
+		return value, true
+	}
+	return "", false
+}
+
+func logPrintf(format string, v ...interface{}) {
+	log.Printf("D! [processors.converter] "+format, v...)
+}
+
+func init() {
+	processors.Add("converter", func() telegraf.Processor {
+		return &Converter{}
+	})
+}
diff --git a/plugins/processors/converter/converter_test.go b/plugins/processors/converter/converter_test.go
new file mode 100644
index 000000000..76839760d
--- /dev/null
+++ b/plugins/processors/converter/converter_test.go
@@ -0,0 +1,479 @@
+package converter
+
+import (
+	"math"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/stretchr/testify/require"
+)
+
+func Metric(v telegraf.Metric, err error) telegraf.Metric {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
+func TestConverter(t *testing.T) {
+	tests := []struct {
+		name      string
+		converter *Converter
+		input     telegraf.Metric
+		expected  telegraf.Metric
+	}{
+		{
+			name:      "empty",
+			converter: &Converter{},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"value": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from tag",
+			converter: &Converter{
+				Tags: &Conversion{
+					String:   []string{"string"},
+					Integer:  []string{"int"},
+					Unsigned: []string{"uint"},
+					Boolean:  []string{"bool"},
+					Float:    []string{"float"},
+					Tag:      []string{"tag"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"float":  "42",
+						"int":    "42",
+						"uint":   "42",
+						"bool":   "true",
+						"string": "howdy",
+						"tag":    "tag",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"tag": "tag",
+					},
+					map[string]interface{}{
+						"float":  42.0,
+						"int":    int64(42),
+						"uint":   uint64(42),
+						"bool":   true,
+						"string": "howdy",
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from tag unconvertible",
+			converter: &Converter{
+				Tags: &Conversion{
+					Integer:  []string{"int"},
+					Unsigned: []string{"uint"},
+					Boolean:  []string{"bool"},
+					Float:    []string{"float"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"float": "a",
+						"int":   "b",
+						"uint":  "c",
+						"bool":  "maybe",
+					},
+					map[string]interface{}{},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from string field",
+			converter: &Converter{
+				Fields: &Conversion{
+					String:   []string{"a"},
+					Integer:  []string{"b"},
+					Unsigned: []string{"c"},
+					Boolean:  []string{"d"},
+					Float:    []string{"e"},
+					Tag:      []string{"f"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a": "howdy",
+						"b": "42",
+						"c": "42",
+						"d": "true",
+						"e": "42.0",
+						"f": "foo",
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"f": "foo",
+					},
+					map[string]interface{}{
+						"a": "howdy",
+						"b": int64(42),
+						"c": uint64(42),
+						"d": true,
+						"e": 42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from string field unconvertible",
+			converter: &Converter{
+				Fields: &Conversion{
+					Integer:  []string{"a"},
+					Unsigned: []string{"b"},
+					Boolean:  []string{"c"},
+					Float:    []string{"d"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a": "a",
+						"b": "b",
+						"c": "c",
+						"d": "d",
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from integer field",
+			converter: &Converter{
+				Fields: &Conversion{
+					String:   []string{"a"},
+					Integer:  []string{"b"},
+					Unsigned: []string{"c", "negative_uint"},
+					Boolean:  []string{"d"},
+					Float:    []string{"e"},
+					Tag:      []string{"f"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a":             int64(42),
+						"b":             int64(42),
+						"c":             int64(42),
+						"d":             int64(42),
+						"e":             int64(42),
+						"f":             int64(42),
+						"negative_uint": int64(-42),
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"f": "42",
+					},
+					map[string]interface{}{
+						"a":             "42",
+						"b":             int64(42),
+						"c":             uint64(42),
+						"d":             true,
+						"e":             42.0,
+						"negative_uint": uint64(0),
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from unsigned field",
+			converter: &Converter{
+				Fields: &Conversion{
+					String:   []string{"a"},
+					Integer:  []string{"b", "overflow_int"},
+					Unsigned: []string{"c"},
+					Boolean:  []string{"d"},
+					Float:    []string{"e"},
+					Tag:      []string{"f"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a":            uint64(42),
+						"b":            uint64(42),
+						"c":            uint64(42),
+						"d":            uint64(42),
+						"e":            uint64(42),
+						"f":            uint64(42),
+						"overflow_int": uint64(math.MaxUint64),
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"f": "42",
+					},
+					map[string]interface{}{
+						"a":            "42",
+						"b":            int64(42),
+						"c":            uint64(42),
+						"d":            true,
+						"e":            42.0,
+						"overflow_int": int64(math.MaxInt64),
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "out of range for unsigned",
+			converter: &Converter{
+				Fields: &Conversion{
+					Unsigned: []string{"a", "b"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a": int64(-42),
+						"b": math.MaxFloat64,
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a": uint64(0),
+						"b": uint64(math.MaxUint64),
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "boolean field",
+			converter: &Converter{
+				Fields: &Conversion{
+					String:   []string{"a", "af"},
+					Integer:  []string{"b", "bf"},
+					Unsigned: []string{"c", "cf"},
+					Boolean:  []string{"d", "df"},
+					Float:    []string{"e", "ef"},
+					Tag:      []string{"f", "ff"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a":  true,
+						"b":  true,
+						"c":  true,
+						"d":  true,
+						"e":  true,
+						"f":  true,
+						"af": false,
+						"bf": false,
+						"cf": false,
+						"df": false,
+						"ef": false,
+						"ff": false,
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"f":  "true",
+						"ff": "false",
+					},
+					map[string]interface{}{
+						"a":  "true",
+						"af": "false",
+						"b":  int64(1),
+						"bf": int64(0),
+						"c":  uint64(1),
+						"cf": uint64(0),
+						"d":  true,
+						"df": false,
+						"e":  1.0,
+						"ef": 0.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "from float field",
+			converter: &Converter{
+				Fields: &Conversion{
+					String:   []string{"a"},
+					Integer:  []string{"b", "too_large_int", "too_small_int"},
+					Unsigned: []string{"c", "negative_uint", "too_large_uint", "too_small_uint"},
+					Boolean:  []string{"d"},
+					Float:    []string{"e"},
+					Tag:      []string{"f"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"a":              42.0,
+						"b":              42.0,
+						"c":              42.0,
+						"d":              42.0,
+						"e":              42.0,
+						"f":              42.0,
+						"too_large_int":  math.MaxFloat64,
+						"too_large_uint": math.MaxFloat64,
+						"too_small_int":  -math.MaxFloat64,
+						"too_small_uint": -math.MaxFloat64,
+						"negative_uint":  -42.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{
+						"f": "42",
+					},
+					map[string]interface{}{
+						"a":              "42",
+						"b":              int64(42),
+						"c":              uint64(42),
+						"d":              true,
+						"e":              42.0,
+						"too_large_int":  int64(math.MaxInt64),
+						"too_large_uint": uint64(math.MaxUint64),
+						"too_small_int":  int64(math.MinInt64),
+						"too_small_uint": uint64(0),
+						"negative_uint":  uint64(0),
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+		{
+			name: "globbing",
+			converter: &Converter{
+				Fields: &Conversion{
+					Integer: []string{"int_*"},
+				},
+			},
+			input: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"int_a":   "1",
+						"int_b":   "2",
+						"float_a": 1.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+			expected: Metric(
+				metric.New(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"int_a":   int64(1),
+						"int_b":   int64(2),
+						"float_a": 1.0,
+					},
+					time.Unix(0, 0),
+				),
+			),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			metrics := tt.converter.Apply(tt.input)
+
+			require.Equal(t, 1, len(metrics))
+			require.Equal(t, tt.expected.Name(), metrics[0].Name())
+			require.Equal(t, tt.expected.Tags(), metrics[0].Tags())
+			require.Equal(t, tt.expected.Fields(), metrics[0].Fields())
+			require.Equal(t, tt.expected.Time(), metrics[0].Time())
+		})
+	}
+}

From 44e3b9bee31b0fc5537e7c4cf85769ae697eb009 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 14:30:55 -0700
Subject: [PATCH 1215/1302] Update changelog

---
 CHANGELOG.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd6710c8..0ecb57c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 
 ### New Processors
 
+- [converter](./plugins/processors/converter/README.md) - Contributed by @influxdata
 - [regex](./plugins/processors/regex/README.md) - Contributed by @44px
 - [topk](./plugins/processors/topk/README.md) - Contributed by @mirath
 
diff --git a/README.md b/README.md
index 8ae242b5c..3b1355a4f 100644
--- a/README.md
+++ b/README.md
@@ -269,6 +269,7 @@ formats may be used with input plugins supporting the `data_format` option:
 
 ## Processor Plugins
 
+* [converter](./plugins/processors/converter)
 * [override](./plugins/processors/override)
 * [printer](./plugins/processors/printer)
 * [regex](./plugins/processors/regex)

From 14d97e5416ef8c401fd11aafd0b44a26ad21f261 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 23 May 2018 16:37:14 -0700
Subject: [PATCH 1216/1302] Add special syslog timestamp parser that uses
 current year (#4190)

Previously it was impossible to parse syslog timestamps without the date
being reported as year 0, due to the year not being specified
---
 plugins/inputs/logparser/README.md         |  1 +
 plugins/inputs/logparser/grok/grok.go      | 17 +++++++++++++++++
 plugins/inputs/logparser/grok/grok_test.go | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index cfa9d02b2..7a1df8bc8 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -104,6 +104,7 @@ You must capture at least one field per line.
   - ts-httpd         ("02/Jan/2006:15:04:05 -0700")
   - ts-epoch         (seconds since unix epoch, may contain decimal)
   - ts-epochnano     (nanoseconds since unix epoch)
+  - ts-syslog        ("Jan 02 15:04:05", parsed time is set to the current year)
   - ts-"CUSTOM"
 
 CUSTOM time layouts must be within quotes and be the representation of the
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 47d4ecdf5..57d8691cf 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -32,6 +32,7 @@ var timeLayouts = map[string]string{
 	// will get handled in the ParseLine function.
 	"ts-epoch":     "EPOCH",
 	"ts-epochnano": "EPOCH_NANO",
+	"ts-syslog":    "SYSLOG_TIMESTAMP",
 	"ts":           "GENERIC_TIMESTAMP", // try parsing all known timestamp layouts.
 }
 
@@ -44,6 +45,7 @@ const (
 	DROP              = "drop"
 	EPOCH             = "EPOCH"
 	EPOCH_NANO        = "EPOCH_NANO"
+	SYSLOG_TIMESTAMP  = "SYSLOG_TIMESTAMP"
 	GENERIC_TIMESTAMP = "GENERIC_TIMESTAMP"
 )
 
@@ -112,6 +114,7 @@ type Parser struct {
 	// layouts.
 	foundTsLayouts []string
 
+	timeFunc func() time.Time
 	g        *grok.Grok
 	tsModder *tsModder
 }
@@ -174,6 +177,10 @@ func (p *Parser) Compile() error {
 		p.loc, _ = time.LoadLocation("UTC")
 	}
 
+	if p.timeFunc == nil {
+		p.timeFunc = time.Now
+	}
+
 	return p.compileCustomPatterns()
 }
 
@@ -285,6 +292,16 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 			} else {
 				timestamp = time.Unix(0, iv)
 			}
+		case SYSLOG_TIMESTAMP:
+			ts, err := time.ParseInLocation("Jan 02 15:04:05", v, p.loc)
+			if err == nil {
+				if ts.Year() == 0 {
+					ts = ts.AddDate(timestamp.Year(), 0, 0)
+				}
+				timestamp = ts
+			} else {
+				log.Printf("E! Error parsing %s to time layout [%s]: %s", v, t, err)
+			}
 		case GENERIC_TIMESTAMP:
 			var foundTs bool
 			// first try timestamp layouts that we've already found
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index a585140f6..1008ce941 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -970,3 +970,15 @@ func TestNewlineInPatterns(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, m)
 }
+
+func TestSyslogTimestampParser(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{`%{SYSLOGTIMESTAMP:timestamp:ts-syslog} value=%{NUMBER:value:int}`},
+		timeFunc: func() time.Time { return time.Date(2018, time.April, 1, 0, 0, 0, 0, nil) },
+	}
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("Sep 25 09:01:55 value=42")
+	require.NoError(t, err)
+	require.NotNil(t, m)
+	require.Equal(t, 2018, m.Time().Year())
+}

From 50d721ae0573dafcc3594cb727bab7c3610736e4 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Thu, 24 May 2018 14:58:43 -0400
Subject: [PATCH 1217/1302] Add additional examples for jolokia2 (#4191)

---
 .../inputs/jolokia2/examples/activemq.conf    | 57 +++++++++++++
 .../inputs/jolokia2/examples/bitbucket.conf   | 39 +++++++++
 .../jolokia2/examples/hadooop-hdfs.conf       | 85 +++++++++++++++++++
 plugins/inputs/jolokia2/examples/jboss.conf   | 59 +++++++++++++
 plugins/inputs/jolokia2/examples/tomcat.conf  | 65 ++++++++++++++
 .../inputs/jolokia2/examples/weblogic.conf    | 56 ++++++++++++
 6 files changed, 361 insertions(+)
 create mode 100644 plugins/inputs/jolokia2/examples/activemq.conf
 create mode 100644 plugins/inputs/jolokia2/examples/bitbucket.conf
 create mode 100644 plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
 create mode 100644 plugins/inputs/jolokia2/examples/jboss.conf
 create mode 100644 plugins/inputs/jolokia2/examples/tomcat.conf
 create mode 100644 plugins/inputs/jolokia2/examples/weblogic.conf

diff --git a/plugins/inputs/jolokia2/examples/activemq.conf b/plugins/inputs/jolokia2/examples/activemq.conf
new file mode 100644
index 000000000..b851cd54d
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/activemq.conf
@@ -0,0 +1,57 @@
+## Jolokia is bundled with ActiveMQ
+
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8161/api/jolokia"]
+  name_prefix = "activemq."
+  username = "admin"
+  password = "admin"
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### ACTIVEMQ
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "queue"
+    mbean    = "org.apache.activemq:brokerName=*,destinationName=*,destinationType=Queue,type=Broker"
+    paths    = ["QueueSize","EnqueueCount","ConsumerCount","DispatchCount","DequeueCount","ProducerCount","InFlightCount"]
+    tag_keys = ["brokerName","destinationName"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "topic"
+    mbean    = "org.apache.activemq:brokerName=*,destinationName=*,destinationType=Topic,type=Broker"
+    paths    = ["ProducerCount","DequeueCount","ConsumerCount","QueueSize","EnqueueCount"]
+    tag_keys = ["brokerName","destinationName"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "broker"
+    mbean    = "org.apache.activemq:brokerName=*,type=Broker"
+    paths    = ["TotalConsumerCount","TotalMessageCount","TotalEnqueueCount","TotalDequeueCount","MemoryLimit","MemoryPercentUsage","StoreLimit","StorePercentUsage","TempPercentUsage","TempLimit"]
+    tag_keys = ["brokerName"]
diff --git a/plugins/inputs/jolokia2/examples/bitbucket.conf b/plugins/inputs/jolokia2/examples/bitbucket.conf
new file mode 100644
index 000000000..c53614ec4
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/bitbucket.conf
@@ -0,0 +1,39 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "bitbucket."
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_operatingsystem"
+    mbean = "java.lang:type=OperatingSystem"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_thread"
+    mbean = "java.lang:type=Threading"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_class_loading"
+    mbean = "java.lang:type=ClassLoading"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory_pool"
+    mbean = "java.lang:type=MemoryPool,name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "webhooks"
+    mbean = "com.atlassian.webhooks:name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "atlassian"
+    mbean = "com.atlassian.bitbucket:name=*"
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "thread_pools"
+    mbean = "com.atlassian.bitbucket.thread-pools:name=*"
diff --git a/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf b/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
new file mode 100644
index 000000000..0b14e0d8c
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/hadooop-hdfs.conf
@@ -0,0 +1,85 @@
+################
+# NAMENODE     #
+################
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8778/jolokia"]
+  name_prefix = "hadoop.hdfs.namenode."
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSNamesystem"
+    mbean = "Hadoop:name=FSNamesystem,service=NameNode"
+    paths = ["CapacityTotal", "CapacityRemaining", "CapacityUsedNonDFS", "NumLiveDataNodes", "NumDeadDataNodes", "NumInMaintenanceDeadDataNodes", "NumDecomDeadDataNodes"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSNamesystemState"
+    mbean = "Hadoop:name=FSNamesystemState,service=NameNode"
+    paths = ["VolumeFailuresTotal", "UnderReplicatedBlocks", "BlocksTotal"]
+  
+  [[inputs.jolokia2_agent.metric]]
+    name = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad", "SystemLoadAverage", "SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_garbage_collector"
+    mbean = "java.lang:name=*,type=GarbageCollector"
+    paths = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory_pool"
+    mbean = "java.lang:name=*,type=MemoryPool"
+    paths = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys = ["name"]
+    tag_prefix = "pool_"
+
+
+################
+# DATANODE     #
+################
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:7778/jolokia"]
+  name_prefix = "hadoop.hdfs.datanode."
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "FSDatasetState"
+    mbean = "Hadoop:name=FSDatasetState,service=DataNode"
+    paths = ["Capacity", "DfsUsed", "Remaining", "NumBlocksFailedToUnCache", "NumBlocksFailedToCache", "NumBlocksCached"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad", "SystemLoadAverage", "SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_garbage_collector"
+    mbean = "java.lang:name=*,type=GarbageCollector"
+    paths = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name = "jvm_memory_pool"
+    mbean = "java.lang:name=*,type=MemoryPool"
+    paths = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys = ["name"]
+    tag_prefix = "pool_"
diff --git a/plugins/inputs/jolokia2/examples/jboss.conf b/plugins/inputs/jolokia2/examples/jboss.conf
new file mode 100644
index 000000000..a65d2a5b9
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/jboss.conf
@@ -0,0 +1,59 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "jboss."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### JBOSS
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "connectors.http"
+    mbean    = "jboss.as:https-listener=*,server=*,subsystem=undertow"
+    paths    = ["bytesReceived","bytesSent","errorCount","requestCount"]
+    tag_keys = ["server","https-listener"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "connectors.http"
+    mbean    = "jboss.as:http-listener=*,server=*,subsystem=undertow"
+    paths    = ["bytesReceived","bytesSent","errorCount","requestCount"]
+    tag_keys = ["server","http-listener"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "datasource.jdbc"
+    mbean    = "jboss.as:data-source=*,statistics=jdbc,subsystem=datasources"
+    paths    = ["PreparedStatementCacheAccessCount","PreparedStatementCacheHitCount","PreparedStatementCacheMissCount"]
+    tag_keys = ["data-source"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "datasource.pool"
+    mbean    = "jboss.as:data-source=*,statistics=pool,subsystem=datasources"
+    paths    = ["AvailableCount","ActiveCount","MaxUsedCount"]
+    tag_keys = ["data-source"]
diff --git a/plugins/inputs/jolokia2/examples/tomcat.conf b/plugins/inputs/jolokia2/examples/tomcat.conf
new file mode 100644
index 000000000..d642d766f
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/tomcat.conf
@@ -0,0 +1,65 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "tomcat."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### TOMCAT
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "GlobalRequestProcessor"
+    mbean    = "Catalina:name=*,type=GlobalRequestProcessor"
+    paths    = ["requestCount","bytesReceived","bytesSent","processingTime","errorCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "JspMonitor"
+    mbean    = "Catalina:J2EEApplication=*,J2EEServer=*,WebModule=*,name=jsp,type=JspMonitor"
+    paths    = ["jspReloadCount","jspCount","jspUnloadCount"]
+    tag_keys = ["J2EEApplication","J2EEServer","WebModule"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "ThreadPool"
+    mbean    = "Catalina:name=*,type=ThreadPool"
+    paths    = ["maxThreads","currentThreadCount","currentThreadsBusy"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "Servlet"
+    mbean    = "Catalina:J2EEApplication=*,J2EEServer=*,WebModule=*,j2eeType=Servlet,name=*"
+    paths    = ["processingTime","errorCount","requestCount"]
+    tag_keys = ["name","J2EEApplication","J2EEServer","WebModule"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "Cache"
+    mbean    = "Catalina:context=*,host=*,name=Cache,type=WebResourceRoot"
+    paths    = ["hitCount","lookupCount"]
+    tag_keys = ["context","host"]
diff --git a/plugins/inputs/jolokia2/examples/weblogic.conf b/plugins/inputs/jolokia2/examples/weblogic.conf
new file mode 100644
index 000000000..c19475268
--- /dev/null
+++ b/plugins/inputs/jolokia2/examples/weblogic.conf
@@ -0,0 +1,56 @@
+[[inputs.jolokia2_agent]]
+  urls = ["http://localhost:8080/jolokia"]
+  name_prefix = "weblogic."
+
+  ### JVM Generic
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "OperatingSystem"
+    mbean = "java.lang:type=OperatingSystem"
+    paths = ["ProcessCpuLoad","SystemLoadAverage","SystemCpuLoad"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_runtime"
+    mbean = "java.lang:type=Runtime"
+    paths = ["Uptime"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name  = "jvm_memory"
+    mbean = "java.lang:type=Memory"
+    paths = ["HeapMemoryUsage", "NonHeapMemoryUsage", "ObjectPendingFinalizationCount"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name     = "jvm_garbage_collector"
+    mbean    = "java.lang:name=*,type=GarbageCollector"
+    paths    = ["CollectionTime", "CollectionCount"]
+    tag_keys = ["name"]
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "jvm_memory_pool"
+    mbean      = "java.lang:name=*,type=MemoryPool"
+    paths      = ["Usage", "PeakUsage", "CollectionUsage"]
+    tag_keys   = ["name"]
+    tag_prefix = "pool_"
+
+  ### WLS
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "JTARuntime"
+    mbean      = "com.bea:Name=JTARuntime,ServerRuntime=*,Type=JTARuntime"
+    paths      = ["SecondsActiveTotalCount","TransactionRolledBackTotalCount","TransactionRolledBackSystemTotalCount","TransactionRolledBackAppTotalCount","TransactionRolledBackResourceTotalCount","TransactionHeuristicsTotalCount","TransactionAbandonedTotalCount","TransactionTotalCount","TransactionRolledBackTimeoutTotalCount","ActiveTransactionsTotalCount","TransactionCommittedTotalCount"]
+    tag_keys   = ["ServerRuntime"]
+    tag_prefix = "wls_"
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "ThreadPoolRuntime"
+    mbean      = "com.bea:Name=ThreadPoolRuntime,ServerRuntime=*,Type=ThreadPoolRuntime"
+    paths      = ["StuckThreadCount","CompletedRequestCount","ExecuteThreadTotalCount","ExecuteThreadIdleCount","StandbyThreadCount","Throughput","HoggingThreadCount","PendingUserRequestCount"]
+    tag_keys   = ["ServerRuntime"]
+    tag_prefix = "wls_"
+
+  [[inputs.jolokia2_agent.metric]]
+    name       = "JMSRuntime"
+    mbean      = "com.bea:Name=*.jms,ServerRuntime=*,Type=JMSRuntime"
+    paths      = ["ConnectionsCurrentCount","ConnectionsHighCount","ConnectionsTotalCount","JMSServersCurrentCount","JMSServersHighCount","JMSServersTotalCount"]
+    tag_keys   = ["name","ServerRuntime"]
+    tag_prefix = "wls_"

From f3f753310f55eebcf77fe0d17446bd1ea2cdf9f7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 16:38:22 -0700
Subject: [PATCH 1218/1302] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecb57c5e..aaf80274d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,7 +56,8 @@
 - [#3489](https://github.com/influxdata/telegraf/pull/3489): Add burrow input plugin.
 - [#3969](https://github.com/influxdata/telegraf/pull/3969): Add option to unbound module to use threads as tags.
 - [#4183](https://github.com/influxdata/telegraf/pull/4183): Add support for TLS and username/password auth to aerospike input.
-
+- [#4190](https://github.com/influxdata/telegraf/pull/4190): Add special syslog timestamp parser to grok parser that uses current year.
+-
 ### Bugfixes
 
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.

From ce3b367dacd415d5b9fbe3be104e671fe51546af Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 24 May 2018 12:02:20 -0700
Subject: [PATCH 1219/1302] Add jolokia2 example configs to list in readme

---
 plugins/inputs/jolokia2/README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 441ede226..1efc59f1f 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -172,8 +172,14 @@ Both `jolokia2_agent` and `jolokia2_proxy` plugins support default configuration
 
 ### Example Configurations:
 
-- [Java JVM](/plugins/inputs/jolokia2/examples/java.conf)
-- [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
+- [ActiveMQ](/plugins/inputs/jolokia2/examples/activemq.conf)
+- [BitBucket](/plugins/inputs/jolokia2/examples/bitbucket.conf)
 - [Cassandra](/plugins/inputs/jolokia2/examples/cassandra.conf)
+- [Hadoop-HDFS](/plugins/inputs/jolokia2/examples/hadoop-hdfs.conf)
+- [Java JVM](/plugins/inputs/jolokia2/examples/java.conf)
+- [JBoss](/plugins/inputs/jolokia2/examples/jboss.conf)
+- [Kafka](/plugins/inputs/jolokia2/examples/kafka.conf)
+- [Tomcat](/plugins/inputs/jolokia2/examples/tomcat.conf)
+- [Weblogic](/plugins/inputs/jolokia2/examples/weblogic.conf)
 
 Please help improve this list and contribute new configuration files by opening an issue or pull request.

From 010e4f5b0b5a50f7e7274fdea9ddcaf25df125a0 Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Fri, 25 May 2018 03:25:06 +0200
Subject: [PATCH 1220/1302] Fix wildcard and other issues with
 win_perf_counters (#4189)

---
 plugins/inputs/win_perf_counters/README.md    |  85 +-
 plugins/inputs/win_perf_counters/pdh.go       | 143 ++-
 .../win_perf_counters/performance_query.go    | 189 ++++
 .../win_perf_counters/win_perf_counters.go    | 262 +++---
 .../win_perf_counters_integration_test.go     | 592 ++++++++++++
 .../win_perf_counters_test.go                 | 860 ++++++++----------
 6 files changed, 1502 insertions(+), 629 deletions(-)
 create mode 100644 plugins/inputs/win_perf_counters/performance_query.go
 create mode 100644 plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index 242d76f3b..f986a278f 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -1,19 +1,24 @@
 # win_perf_counters readme
 
-The way this plugin works is that on load of Telegraf,
-the plugin will be handed configuration from Telegraf.
-This configuration is parsed and then tested for validity such as
-if the Object, Instance and Counter existing.
-If it does not match at startup, it will not be fetched.
-Exceptions to this are in cases where you query for all instances "*".
-By default the plugin does not return _Total
-when it is querying for all (*) as this is redundant.
+Input plugin to read Performance Counters on Windows operating systems.
+
+Configuration is parsed and then tested for validity such as
+whether the Object, Instance and Counter exist on Telegraf startup.
+
+Counter paths are refreshed periodically, see [CountersRefreshInterval](#countersrefreshinterval)
+configuration parameter for more info.
+
+Wildcards can be used in instance and counter names. Partial wildcards are supported only
+in instance names on Windows Vista and newer.
+
+In case of query for all instances `["*"]`, the plugin does not return the instance `_Total`
+by default. See [IncludeTotal](#includetotal) for more info.
 
 ## Basics
 
 The examples contained in this file have been found on the internet
 as counters used when performance monitoring
- Active Directory and IIS in perticular.
+ Active Directory and IIS in particular.
  There are a lot other good objects to monitor, if you know what to look for.
  This file is likely to be updated in the future with more examples for
  useful configurations for separate scenarios.
@@ -29,9 +34,23 @@ Bool, if set to `true` will print out all matching performance objects.
 Example:
 `PrintValid=true`
 
+#### CountersRefreshInterval
+
+Configured counters are matched against available counters at the interval
+specified by the `CountersRefreshInterval` parameter. Default value is `1m` (1 minute).
+
+If wildcards are used in instance or counter names, they are expanded at this point.
+
+Setting `CountersRefreshInterval` too low (order of seconds) can cause Telegraf to create
+a high CPU load.
+
+Set to `0s` to disable periodic refreshing.
+
 #### PreVistaSupport
 
-Bool, if set to `true` will use the localized PerfCounter interface that is present before Vista for backwards compatability.
+_Deprecated. Necessary features on Windows Vista and newer are checked dynamically_
+
+Bool, if set to `true` will use the localized PerfCounter interface that has been present since before Vista for backwards compatability.
 
 It is recommended NOT to use this on OSes starting with Vista and newer because it requires more configuration to use this than the newer interface present since Vista.
 
@@ -45,10 +64,10 @@ See Entry below.
 ### Entry
 A new configuration entry consists of the TOML header to start with,
 `[[inputs.win_perf_counters.object]]`.
-This must follow before other plugins configuration,
+This must follow before other plugin configurations,
 beneath the main win_perf_counters entry, `[[inputs.win_perf_counters]]`.
 
-Following this is 3 required key/value pairs and the three optional parameters and their usage.
+Following this are 3 required key/value pairs and the three optional parameters and their usage.
 
 #### ObjectName
 **Required**
@@ -60,37 +79,39 @@ Example: `ObjectName = "LogicalDisk"`
 #### Instances
 **Required**
 
-Instances (this is an array) is the instances of a counter you would like returned,
+Instances key (this is an array) is the instances of a counter you would like returned,
 it can be one or more values.
 
 Example, `Instances = ["C:","D:","E:"]` will return only for the instances
-C:, D: and E: where relevant. To get all instances of a Counter, use ["*"] only.
-By default any results containing _Total are stripped,
+C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only.
+By default any results containing `_Total` are stripped,
 unless this is specified as the wanted instance.
-Alternatively see the option IncludeTotal below.
+Alternatively see the option `IncludeTotal` below.
 
-Some Objects does not have instances to select from at all,
-here only one option is valid if you want data back,
+It is also possible to set partial wildcards, eg. `["chrome*"]`
+
+Some Objects do not have instances to select from at all.
+Here only one option is valid if you want data back,
 and that is to specify `Instances = ["------"]`.
 
 #### Counters
 **Required**
 
-Counters (this is an array) is the counters of the ObjectName
+Counters key (this is an array) is the counters of the ObjectName
 you would like returned, it can also be one or more values.
 
 Example: `Counters = ["% Idle Time", "% Disk Read Time", "% Disk Write Time"]`
 This must be specified for every counter you want the results of,
-it is not possible to ask for all counters in the ObjectName.
+or use `["*"]` for all the counters for object.
 
 #### Measurement
 *Optional*
 
-This key is optional, if it is not set it will be win_perf_counters.
+This key is optional, if it is not set it will be `win_perf_counters`.
 In InfluxDB this is the key by which the returned data is stored underneath,
 so for ordering your data in a good manner,
-this is a good key to set with where you want your IIS and Disk results stored,
-separate from Processor results.
+this is a good key to set with a value when you want your IIS and Disk results stored
+separately from Processor results.
 
 Example: `Measurement = "win_disk"
 
@@ -99,9 +120,9 @@ Example: `Measurement = "win_disk"
 
 This key is optional, it is a simple bool.
 If it is not set to true or included it is treated as false.
-This key only has an effect if Instances is set to "*"
-and you would also like all instances containg _Total returned,
-like "_Total", "0,_Total" and so on where applicable
+This key only has an effect if the Instances key is set to `["*"]`
+and you would also like all instances containing `_Total` returned,
+like `_Total`, `0,_Total` and so on where applicable
 (Processor Information is one example).
 
 #### WarnOnMissing
@@ -111,13 +132,13 @@ This key is optional, it is a simple bool.
 If it is not set to true or included it is treated as false.
 This only has an effect on the first execution of the plugin,
 it will print out any ObjectName/Instance/Counter combinations
-asked for that does not match. Useful when debugging new configurations.
+asked for that do not match. Useful when debugging new configurations.
 
 #### FailOnMissing
 *Internal*
 
-This key should not be used, it is for testing purposes only.
-It is a simple bool, if it is not set to true or included this is treaded as false.
+This key should not be used. It is for testing purposes only.
+It is a simple bool. If it is not set to true or included this is treated as false.
 If this is set to true, the plugin will abort and end prematurely
 if any of the combinations of ObjectName/Instances/Counters are invalid.
 
@@ -337,10 +358,14 @@ if any of the combinations of ObjectName/Instances/Counters are invalid.
 
 ## Troubleshooting
 
+If you are getting an error about an invalid counter, use the `typeperf` command to check the counter path
+on the command line.
+E.g. `typeperf "Process(chrome*)\% Processor Time"`
+
 If no metrics are emitted even with the default config, you may need to repair
 your performance counters.
 
-1. Launch Command Prompt as Administrator (right click Runs As Administrator).
+1. Launch the Command Prompt as Administrator (right click Runs As Administrator).
 1. Drop into the C:\WINDOWS\System32 directory by typing `C:` then `cd \Windows\System32`
 1. Rebuild your counter values, which may take a few moments so please be
    patient, by running:
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index a0b693506..edf6d0651 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -198,6 +198,51 @@ type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
 	FmtValue PDH_FMT_COUNTERVALUE_LONG
 }
 
+//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
+type PDH_COUNTER_INFO struct {
+	//Size of the structure, including the appended strings, in bytes.
+	DwLength uint32
+	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
+	//The counter type constants are defined in Winperf.h.
+	DwType uint32
+	//Counter version information. Not used.
+	CVersion uint32
+	//Counter status that indicates if the counter value is valid. For a list of possible values,
+	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
+	CStatus uint32
+	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
+	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
+	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
+	LScale int32
+	//Default scale factor as suggested by the counter's provider.
+	LDefaultScale int32
+	//The value passed in the dwUserData parameter when calling PdhAddCounter.
+	DwUserData *uint32
+	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
+	DwQueryUserData *uint32
+	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
+	SzFullPath *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
+	//The string follows this structure in memory.
+	SzMachineName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
+	SzObjectName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
+	//The string follows this structure in memory.
+	SzInstanceName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
+	//The string follows this structure in memory.
+	SzParentInstance *uint16 // pointer to a string
+	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
+	DwInstanceIndex uint32 // pointer to a string
+	//Null-terminated string that contains the counter name. The string follows this structure in memory.
+	SzCounterName *uint16 // pointer to a string
+	//Help text that describes the counter. Is NULL if the source is a log file.
+	SzExplainText *uint16 // pointer to a string
+	//Start of the string data that is appended to the structure.
+	DataBuffer *uint32 // pointer to an extra space
+}
+
 var (
 	// Library
 	libpdhDll *syscall.DLL
@@ -211,6 +256,8 @@ var (
 	pdh_GetFormattedCounterArrayW *syscall.Proc
 	pdh_OpenQuery                 *syscall.Proc
 	pdh_ValidatePathW             *syscall.Proc
+	pdh_ExpandWildCardPathW       *syscall.Proc
+	pdh_GetCounterInfoW           *syscall.Proc
 )
 
 func init() {
@@ -226,9 +273,11 @@ func init() {
 	pdh_GetFormattedCounterArrayW = libpdhDll.MustFindProc("PdhGetFormattedCounterArrayW")
 	pdh_OpenQuery = libpdhDll.MustFindProc("PdhOpenQuery")
 	pdh_ValidatePathW = libpdhDll.MustFindProc("PdhValidatePathW")
+	pdh_ExpandWildCardPathW = libpdhDll.MustFindProc("PdhExpandWildCardPathW")
+	pdh_GetCounterInfoW = libpdhDll.MustFindProc("PdhGetCounterInfoW")
 }
 
-// Adds the specified counter to the query. This is the internationalized version. Preferably, use the
+// PdhAddCounter adds the specified counter to the query. This is the internationalized version. Preferably, use the
 // function PdhAddEnglishCounter instead. hQuery is the query handle, which has been fetched by PdhOpenQuery.
 // szFullCounterPath is a full, internationalized counter path (this will differ per Windows language version).
 // dwUserData is a 'user-defined value', which becomes part of the counter information. To retrieve this value
@@ -277,7 +326,14 @@ func PdhAddCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintp
 	return uint32(ret)
 }
 
-// Adds the specified language-neutral counter to the query. See the PdhAddCounter function. This function only exists on
+// PdhAddEnglishCounterSupported returns true if PdhAddEnglishCounterW Win API function was found in pdh.dll.
+// PdhAddEnglishCounterW function is not supported on pre-Windows Vista systems
+
+func PdhAddEnglishCounterSupported() bool {
+	return pdh_AddEnglishCounterW != nil
+}
+
+// PdhAddEnglishCounter adds the specified language-neutral counter to the query. See the PdhAddCounter function. This function only exists on
 // Windows versions higher than Vista.
 func PdhAddEnglishCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserData uintptr, phCounter *PDH_HCOUNTER) uint32 {
 	if pdh_AddEnglishCounterW == nil {
@@ -294,7 +350,7 @@ func PdhAddEnglishCounter(hQuery PDH_HQUERY, szFullCounterPath string, dwUserDat
 	return uint32(ret)
 }
 
-// Closes all counters contained in the specified query, closes all handles related to the query,
+// PdhCloseQuery closes all counters contained in the specified query, closes all handles related to the query,
 // and frees all memory associated with the query.
 func PdhCloseQuery(hQuery PDH_HQUERY) uint32 {
 	ret, _, _ := pdh_CloseQuery.Call(uintptr(hQuery))
@@ -329,7 +385,7 @@ func PdhCollectQueryData(hQuery PDH_HQUERY) uint32 {
 	return uint32(ret)
 }
 
-// Formats the given hCounter using a 'double'. The result is set into the specialized union struct pValue.
+// PdhGetFormattedCounterValueDouble formats the given hCounter using a 'double'. The result is set into the specialized union struct pValue.
 // This function does not directly translate to a Windows counterpart due to union specialization tricks.
 func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32, pValue *PDH_FMT_COUNTERVALUE_DOUBLE) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterValue.Call(
@@ -341,7 +397,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 	return uint32(ret)
 }
 
-// Returns an array of formatted counter values. Use this function when you want to format the counter values of a
+// PdhGetFormattedCounterArrayDouble returns an array of formatted counter values. Use this function when you want to format the counter values of a
 // counter that contains a wildcard character for the instance name. The itemBuffer must a slice of type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE.
 // An example of how this function can be used:
 //
@@ -389,7 +445,7 @@ func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *ui
 	return uint32(ret)
 }
 
-// Creates a new query that is used to manage the collection of performance data.
+// PdhOpenQuery creates a new query that is used to manage the collection of performance data.
 // szDataSource is a null terminated string that specifies the name of the log file from which to
 // retrieve the performance data. If 0, performance data is collected from a real-time data source.
 // dwUserData is a user-defined value to associate with this query. To retrieve the user data later,
@@ -405,7 +461,51 @@ func PdhOpenQuery(szDataSource uintptr, dwUserData uintptr, phQuery *PDH_HQUERY)
 	return uint32(ret)
 }
 
-// Validates a path. Will return ERROR_SUCCESS when ok, or PDH_CSTATUS_BAD_COUNTERNAME when the path is
+//PdhExpandWildCardPath examines the specified computer or log file and returns those counter paths that match the given counter path which contains wildcard characters.
+//The general counter path format is as follows:
+//
+//\\computer\object(parent/instance#index)\counter
+//
+//The parent, instance, index, and counter components of the counter path may contain either a valid name or a wildcard character. The computer, parent, instance,
+// and index components are not necessary for all counters.
+//
+//The following is a list of the possible formats:
+//
+//\\computer\object(parent/instance#index)\counter
+//\\computer\object(parent/instance)\counter
+//\\computer\object(instance#index)\counter
+//\\computer\object(instance)\counter
+//\\computer\object\counter
+//\object(parent/instance#index)\counter
+//\object(parent/instance)\counter
+//\object(instance#index)\counter
+//\object(instance)\counter
+//\object\counter
+//Use an asterisk (*) as the wildcard character, for example, \object(*)\counter.
+//
+//If a wildcard character is specified in the parent name, all instances of the specified object that match the specified instance and counter fields will be returned.
+// For example, \object(*/instance)\counter.
+//
+//If a wildcard character is specified in the instance name, all instances of the specified object and parent object will be returned if all instance names
+// corresponding to the specified index match the wildcard character. For example, \object(parent/*)\counter. If the object does not contain an instance, an error occurs.
+//
+//If a wildcard character is specified in the counter name, all counters of the specified object are returned.
+//
+//Partial counter path string matches (for example, "pro*") are supported.
+func PdhExpandWildCardPath(szWildCardPath string, mszExpandedPathList *uint16, pcchPathListLength *uint32) uint32 {
+	ptxt, _ := syscall.UTF16PtrFromString(szWildCardPath)
+	flags := uint32(0) // expand instances and counters
+	ret, _, _ := pdh_ExpandWildCardPathW.Call(
+		uintptr(unsafe.Pointer(nil)), // search counters on local computer
+		uintptr(unsafe.Pointer(ptxt)),
+		uintptr(unsafe.Pointer(mszExpandedPathList)),
+		uintptr(unsafe.Pointer(pcchPathListLength)),
+		uintptr(unsafe.Pointer(&flags)))
+
+	return uint32(ret)
+}
+
+// PdhValidatePath validates a path. Will return ERROR_SUCCESS when ok, or PDH_CSTATUS_BAD_COUNTERNAME when the path is
 // erroneous.
 func PdhValidatePath(path string) uint32 {
 	ptxt, _ := syscall.UTF16PtrFromString(path)
@@ -414,13 +514,6 @@ func PdhValidatePath(path string) uint32 {
 	return uint32(ret)
 }
 
-func UTF16PtrToString(s *uint16) string {
-	if s == nil {
-		return ""
-	}
-	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
-}
-
 func PdhFormatError(msgId uint32) string {
 	var flags uint32 = windows.FORMAT_MESSAGE_FROM_HMODULE | windows.FORMAT_MESSAGE_ARGUMENT_ARRAY | windows.FORMAT_MESSAGE_IGNORE_INSERTS
 	buf := make([]uint16, 300)
@@ -430,3 +523,25 @@ func PdhFormatError(msgId uint32) string {
 	}
 	return fmt.Sprintf("(pdhErr=%d) %s", msgId, err.Error())
 }
+
+//Retrieves information about a counter, such as data size, counter type, path, and user-supplied data values
+//hCounter [in]
+//Handle of the counter from which you want to retrieve information. The PdhAddCounter function returns this handle.
+//
+//bRetrieveExplainText [in]
+//Determines whether explain text is retrieved. If you set this parameter to TRUE, the explain text for the counter is retrieved. If you set this parameter to FALSE, the field in the returned buffer is NULL.
+//
+//pdwBufferSize [in, out]
+//Size of the lpBuffer buffer, in bytes. If zero on input, the function returns PDH_MORE_DATA and sets this parameter to the required buffer size. If the buffer is larger than the required size, the function sets this parameter to the actual size of the buffer that was used. If the specified size on input is greater than zero but less than the required size, you should not rely on the returned size to reallocate the buffer.
+//
+//lpBuffer [out]
+//Caller-allocated buffer that receives a PDH_COUNTER_INFO structure. The structure is variable-length, because the string data is appended to the end of the fixed-format portion of the structure. This is done so that all data is returned in a single buffer allocated by the caller. Set to NULL if pdwBufferSize is zero.
+func PdhGetCounterInfo(hCounter PDH_HCOUNTER, bRetrieveExplainText int, pdwBufferSize *uint32, lpBuffer *byte) uint32 {
+	ret, _, _ := pdh_GetCounterInfoW.Call(
+		uintptr(hCounter),
+		uintptr(bRetrieveExplainText),
+		uintptr(unsafe.Pointer(pdwBufferSize)),
+		uintptr(unsafe.Pointer(lpBuffer)))
+
+	return uint32(ret)
+}
diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go
new file mode 100644
index 000000000..34f0d1a32
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -0,0 +1,189 @@
+// Go API over pdh syscalls
+// +build windows
+
+package win_perf_counters
+
+import (
+	"errors"
+	"syscall"
+	"unsafe"
+)
+
+//PerformanceQuery provides wrappers around Windows performance counters API for easy usage in GO
+type PerformanceQuery interface {
+	Open() error
+	Close() error
+	AddCounterToQuery(counterPath string) (PDH_HCOUNTER, error)
+	AddEnglishCounterToQuery(counterPath string) (PDH_HCOUNTER, error)
+	GetCounterPath(counterHandle PDH_HCOUNTER) (string, error)
+	ExpandWildCardPath(counterPath string) ([]string, error)
+	GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error)
+	CollectData() error
+	AddEnglishCounterSupported() bool
+}
+
+//PdhError represents error returned from Performance Counters API
+type PdhError struct {
+	ErrorCode uint32
+	errorText string
+}
+
+func (m *PdhError) Error() string {
+	return m.errorText
+}
+
+func NewPdhError(code uint32) error {
+	return &PdhError{
+		ErrorCode: code,
+		errorText: PdhFormatError(code),
+	}
+}
+
+//PerformanceQueryImpl is implementation of PerformanceQuery interface, which calls phd.dll functions
+type PerformanceQueryImpl struct {
+	query PDH_HQUERY
+}
+
+// Open creates a new counterPath that is used to manage the collection of performance data.
+// It returns counterPath handle used for subsequent calls for adding counters and querying data
+func (m *PerformanceQueryImpl) Open() error {
+	if m.query != 0 {
+		err := m.Close()
+		if err != nil {
+			return err
+		}
+	}
+	var handle PDH_HQUERY
+	ret := PdhOpenQuery(0, 0, &handle)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	m.query = handle
+	return nil
+}
+
+// Close closes the counterPath, releases associated counter handles and frees resources
+func (m *PerformanceQueryImpl) Close() error {
+	if m.query == 0 {
+		return errors.New("uninitialised query")
+	}
+	ret := PdhCloseQuery(m.query)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	m.query = 0
+	return nil
+}
+
+func (m *PerformanceQueryImpl) AddCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	var counterHandle PDH_HCOUNTER
+	if m.query == 0 {
+		return 0, errors.New("uninitialised query")
+	}
+	ret := PdhAddCounter(m.query, counterPath, 0, &counterHandle)
+	if ret != ERROR_SUCCESS {
+		return 0, NewPdhError(ret)
+	}
+	return counterHandle, nil
+}
+
+func (m *PerformanceQueryImpl) AddEnglishCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	var counterHandle PDH_HCOUNTER
+	if m.query == 0 {
+		return 0, errors.New("uninitialised query")
+	}
+	ret := PdhAddEnglishCounter(m.query, counterPath, 0, &counterHandle)
+	if ret != ERROR_SUCCESS {
+		return 0, NewPdhError(ret)
+	}
+	return counterHandle, nil
+}
+
+//GetCounterPath return counter information for given handle
+func (m *PerformanceQueryImpl) GetCounterPath(counterHandle PDH_HCOUNTER) (string, error) {
+	var bufSize uint32
+	var buff []byte
+
+	ret := PdhGetCounterInfo(counterHandle, 0, &bufSize, nil)
+	if ret == PDH_MORE_DATA {
+		buff = make([]byte, bufSize)
+		bufSize = uint32(len(buff))
+		ret = PdhGetCounterInfo(counterHandle, 0, &bufSize, &buff[0])
+		if ret == ERROR_SUCCESS {
+			ci := (*PDH_COUNTER_INFO)(unsafe.Pointer(&buff[0]))
+			return UTF16PtrToString(ci.SzFullPath), nil
+		}
+	}
+	return "", NewPdhError(ret)
+}
+
+// ExpandWildCardPath  examines local computer and returns those counter paths that match the given counter path which contains wildcard characters.
+func (m *PerformanceQueryImpl) ExpandWildCardPath(counterPath string) ([]string, error) {
+	var bufSize uint32
+	var buff []uint16
+
+	ret := PdhExpandWildCardPath(counterPath, nil, &bufSize)
+	if ret == PDH_MORE_DATA {
+		buff = make([]uint16, bufSize)
+		bufSize = uint32(len(buff))
+		ret = PdhExpandWildCardPath(counterPath, &buff[0], &bufSize)
+		if ret == ERROR_SUCCESS {
+			list := UTF16ToStringArray(buff)
+			return list, nil
+		}
+	}
+	return nil, NewPdhError(ret)
+}
+
+//GetFormattedCounterValueDouble computes a displayable value for the specified counter
+func (m *PerformanceQueryImpl) GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error) {
+	var counterType uint32
+	var value PDH_FMT_COUNTERVALUE_DOUBLE
+	ret := PdhGetFormattedCounterValueDouble(hCounter, &counterType, &value)
+	if ret == ERROR_SUCCESS {
+		if value.CStatus == PDH_CSTATUS_VALID_DATA || value.CStatus == PDH_CSTATUS_NEW_DATA {
+			return value.DoubleValue, nil
+		} else {
+			return 0, NewPdhError(value.CStatus)
+		}
+	} else {
+		return 0, NewPdhError(ret)
+	}
+}
+
+func (m *PerformanceQueryImpl) CollectData() error {
+	if m.query == 0 {
+		return errors.New("uninitialised query")
+	}
+	ret := PdhCollectQueryData(m.query)
+	if ret != ERROR_SUCCESS {
+		return NewPdhError(ret)
+	}
+	return nil
+}
+
+func (m *PerformanceQueryImpl) AddEnglishCounterSupported() bool {
+	return PdhAddEnglishCounterSupported()
+}
+
+// UTF16PtrToString converts Windows API LPTSTR (pointer to string) to go string
+func UTF16PtrToString(s *uint16) string {
+	if s == nil {
+		return ""
+	}
+	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
+}
+
+// UTF16ToStringArray converts list of Windows API NULL terminated strings  to go string array
+func UTF16ToStringArray(buf []uint16) []string {
+	var strings []string
+	nextLineStart := 0
+	stringLine := UTF16PtrToString(&buf[0])
+	for stringLine != "" {
+		strings = append(strings, stringLine)
+		nextLineStart += len(stringLine) + 1
+		remainingBuf := buf[nextLineStart:]
+		stringLine = UTF16PtrToString(&remainingBuf[0])
+	}
+	return strings
+}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 9a9e6b413..97c6e50c6 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -5,11 +5,13 @@ package win_perf_counters
 import (
 	"errors"
 	"fmt"
-	"strings"
-	"unsafe"
-
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"log"
+	"regexp"
+	"strings"
+	"time"
 )
 
 var sampleConfig = `
@@ -20,6 +22,8 @@ var sampleConfig = `
   ## agent, it will not be gathered.
   ## Settings:
   # PrintValid = false # Print All matching performance counters
+  # Period after which counters will be reread from configuration and wildcards in counter paths expanded
+  CountersRefreshInterval="1m"
 
   [[inputs.win_perf_counters.object]]
     # Processor usage, alternative to native, reports on a per core.
@@ -53,7 +57,7 @@ var sampleConfig = `
     Measurement = "win_system"
 
   [[inputs.win_perf_counters.object]]
-    # Example query where the Instance portion must be removed to get data back,
+    # Example counterPath where the Instance portion must be removed to get data back,
     # such as from the Memory object.
     ObjectName = "Memory"
     Counters = [
@@ -61,17 +65,20 @@ var sampleConfig = `
       "Page Faults/sec", "Pages/sec", "Transition Faults/sec",
       "Pool Nonpaged Bytes", "Pool Paged Bytes"
     ]
-    Instances = ["------"] # Use 6 x - to remove the Instance bit from the query.
+    Instances = ["------"] # Use 6 x - to remove the Instance bit from the counterPath.
     Measurement = "win_mem"
 `
 
 type Win_PerfCounters struct {
-	PrintValid      bool
-	PreVistaSupport bool
-	Object          []perfobject
+	PrintValid bool
+	//deprecated: determined dynamically
+	PreVistaSupport         bool
+	Object                  []perfobject
+	CountersRefreshInterval internal.Duration
 
-	configParsed bool
-	itemCache    []*item
+	lastRefreshed time.Time
+	counters      []*counter
+	query         PerformanceQuery
 }
 
 type perfobject struct {
@@ -84,56 +91,101 @@ type perfobject struct {
 	IncludeTotal  bool
 }
 
-type item struct {
-	query         string
+type counter struct {
+	counterPath   string
 	objectName    string
 	counter       string
 	instance      string
 	measurement   string
-	include_total bool
-	handle        PDH_HQUERY
+	includeTotal  bool
 	counterHandle PDH_HCOUNTER
 }
 
 var sanitizedChars = strings.NewReplacer("/sec", "_persec", "/Sec", "_persec",
 	" ", "_", "%", "Percent", `\`, "")
 
-func (m *Win_PerfCounters) AddItem(query string, objectName string, counter string, instance string,
-	measurement string, include_total bool) error {
+//General Counter path pattern is: \\computer\object(parent/instance#index)\counter
+//parent/instance#index part is skipped in single instance objects (e.g. Memory): \\computer\object\counter
 
-	var handle PDH_HQUERY
-	var counterHandle PDH_HCOUNTER
-	ret := PdhOpenQuery(0, 0, &handle)
-	if m.PreVistaSupport {
-		ret = PdhAddCounter(handle, query, 0, &counterHandle)
+var counterPathRE = regexp.MustCompile(`.*\\(.*)\\(.*)`)
+var objectInstanceRE = regexp.MustCompile(`(.*)\((.*)\)`)
+
+//extractObjectInstanceCounterFromQuery gets object name, instance name (if available) and counter name from counter path
+func extractObjectInstanceCounterFromQuery(query string) (object string, instance string, counter string, err error) {
+	pathParts := counterPathRE.FindAllStringSubmatch(query, -1)
+	if pathParts == nil || len(pathParts[0]) != 3 {
+		err = errors.New("Could not extract counter info from: " + query)
+		return
+	}
+	counter = pathParts[0][2]
+	//try to get instance name
+	objectInstanceParts := objectInstanceRE.FindAllStringSubmatch(pathParts[0][1], -1)
+	if objectInstanceParts == nil || len(objectInstanceParts[0]) != 3 {
+		object = pathParts[0][1]
 	} else {
-		ret = PdhAddEnglishCounter(handle, query, 0, &counterHandle)
+		object = objectInstanceParts[0][1]
+		instance = objectInstanceParts[0][2]
 	}
-
-	// Call PdhCollectQueryData one time to check existence of the counter
-	ret = PdhCollectQueryData(handle)
-	if ret != ERROR_SUCCESS {
-		PdhCloseQuery(handle)
-		return errors.New(PdhFormatError(ret))
-	}
-
-	newItem := &item{query, objectName, counter, instance, measurement,
-		include_total, handle, counterHandle}
-	m.itemCache = append(m.itemCache, newItem)
-
-	return nil
+	return
 }
 
 func (m *Win_PerfCounters) Description() string {
-	return "Input plugin to query Performance Counters on Windows operating systems"
+	return "Input plugin to counterPath Performance Counters on Windows operating systems"
 }
 
 func (m *Win_PerfCounters) SampleConfig() string {
 	return sampleConfig
 }
 
+func (m *Win_PerfCounters) AddItem(counterPath string, instance string, measurement string, includeTotal bool) error {
+	if !m.query.AddEnglishCounterSupported() {
+		_, err := m.query.AddCounterToQuery(counterPath)
+		if err != nil {
+			return err
+		}
+	} else {
+		counterHandle, err := m.query.AddEnglishCounterToQuery(counterPath)
+		if err != nil {
+			return err
+		}
+		counterPath, err = m.query.GetCounterPath(counterHandle)
+		if err != nil {
+			return err
+		}
+	}
+
+	counters, err := m.query.ExpandWildCardPath(counterPath)
+	if err != nil {
+		return err
+	}
+
+	for _, counterPath := range counters {
+		var err error
+		counterHandle, err := m.query.AddCounterToQuery(counterPath)
+
+		parsedObjectName, parsedInstance, parsedCounter, err := extractObjectInstanceCounterFromQuery(counterPath)
+		if err != nil {
+			return err
+		}
+
+		if parsedInstance == "_Total" && instance == "*" && !includeTotal {
+			continue
+		}
+
+		newItem := &counter{counterPath, parsedObjectName, parsedCounter, parsedInstance, measurement,
+			includeTotal, counterHandle}
+		m.counters = append(m.counters, newItem)
+
+		if m.PrintValid {
+			log.Printf("Valid: %s\n", counterPath)
+		}
+	}
+
+	return nil
+}
+
 func (m *Win_PerfCounters) ParseConfig() error {
-	var query string
+	var counterPath string
 
 	if len(m.Object) > 0 {
 		for _, PerfObject := range m.Object {
@@ -142,21 +194,16 @@ func (m *Win_PerfCounters) ParseConfig() error {
 					objectname := PerfObject.ObjectName
 
 					if instance == "------" {
-						query = "\\" + objectname + "\\" + counter
+						counterPath = "\\" + objectname + "\\" + counter
 					} else {
-						query = "\\" + objectname + "(" + instance + ")\\" + counter
+						counterPath = "\\" + objectname + "(" + instance + ")\\" + counter
 					}
 
-					err := m.AddItem(query, objectname, counter, instance,
-						PerfObject.Measurement, PerfObject.IncludeTotal)
+					err := m.AddItem(counterPath, instance, PerfObject.Measurement, PerfObject.IncludeTotal)
 
-					if err == nil {
-						if m.PrintValid {
-							fmt.Printf("Valid: %s\n", query)
-						}
-					} else {
+					if err != nil {
 						if PerfObject.FailOnMissing || PerfObject.WarnOnMissing {
-							fmt.Printf("Invalid query: '%s'. Error: %s", query, err.Error())
+							log.Printf("Invalid counterPath: '%s'. Error: %s\n", counterPath, err.Error())
 						}
 						if PerfObject.FailOnMissing {
 							return err
@@ -165,32 +212,39 @@ func (m *Win_PerfCounters) ParseConfig() error {
 				}
 			}
 		}
-
 		return nil
 	} else {
-		err := errors.New("No performance objects configured!")
+		err := errors.New("no performance objects configured")
 		return err
 	}
-}
 
-func (m *Win_PerfCounters) GetParsedItemsForTesting() []*item {
-	return m.itemCache
 }
 
 func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	// Parse the config once
-	if !m.configParsed {
-		err := m.ParseConfig()
-		m.configParsed = true
+	var err error
+
+	if m.lastRefreshed.IsZero() || (m.CountersRefreshInterval.Duration.Nanoseconds() > 0 && m.lastRefreshed.Add(m.CountersRefreshInterval.Duration).Before(time.Now())) {
+		m.counters = m.counters[:0]
+
+		err = m.query.Open()
 		if err != nil {
 			return err
 		}
-	}
 
-	var bufSize uint32
-	var bufCount uint32
-	var size uint32 = uint32(unsafe.Sizeof(PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
-	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
+		err = m.ParseConfig()
+		if err != nil {
+			return err
+		}
+		//some counters need two data samples before computing a value
+		err = m.query.CollectData()
+		if err != nil {
+			return err
+		}
+		m.lastRefreshed = time.Now()
+
+		time.Sleep(time.Second)
+	}
 
 	type InstanceGrouping struct {
 		name       string
@@ -200,78 +254,40 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 
 	var collectFields = make(map[InstanceGrouping]map[string]interface{})
 
+	err = m.query.CollectData()
+	if err != nil {
+		return err
+	}
 	// For iterate over the known metrics and get the samples.
-	for _, metric := range m.itemCache {
+	for _, metric := range m.counters {
 		// collect
-		ret := PdhCollectQueryData(metric.handle)
-		if ret == ERROR_SUCCESS {
-			ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle, &bufSize,
-				&bufCount, &emptyBuf[0]) // uses null ptr here according to MSDN.
-			if ret == PDH_MORE_DATA {
-				filledBuf := make([]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE, bufCount*size)
-				if len(filledBuf) == 0 {
-					continue
-				}
-				ret = PdhGetFormattedCounterArrayDouble(metric.counterHandle,
-					&bufSize, &bufCount, &filledBuf[0])
-				for i := 0; i < int(bufCount); i++ {
-					c := filledBuf[i]
-					var s string = UTF16PtrToString(c.SzName)
+		value, err := m.query.GetFormattedCounterValueDouble(metric.counterHandle)
+		if err == nil {
+			measurement := sanitizedChars.Replace(metric.measurement)
+			if measurement == "" {
+				measurement = "win_perf_counters"
+			}
 
-					var add bool
-
-					if metric.include_total {
-						// If IncludeTotal is set, include all.
-						add = true
-					} else if metric.instance == "*" && !strings.Contains(s, "_Total") {
-						// Catch if set to * and that it is not a '*_Total*' instance.
-						add = true
-					} else if metric.instance == s {
-						// Catch if we set it to total or some form of it
-						add = true
-					} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, s) {
-						// If you are using a multiple instance identifier such as "w3wp#1"
-						// phd.dll returns only the first 2 characters of the identifier.
-						add = true
-						s = metric.instance
-					} else if metric.instance == "------" {
-						add = true
-					}
-
-					if add {
-						tags := make(map[string]string)
-						if s != "" {
-							tags["instance"] = s
-						}
-						tags["objectname"] = metric.objectName
-
-						measurement := sanitizedChars.Replace(metric.measurement)
-						if measurement == "" {
-							measurement = "win_perf_counters"
-						}
-						var instance = InstanceGrouping{measurement, s, metric.objectName}
-
-						if collectFields[instance] == nil {
-							collectFields[instance] = make(map[string]interface{})
-						}
-						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(c.FmtValue.DoubleValue)
-					}
-				}
-
-				filledBuf = nil
-				// Need to at least set bufSize to zero, because if not, the function will not
-				// return PDH_MORE_DATA and will not set the bufSize.
-				bufCount = 0
-				bufSize = 0
+			var instance = InstanceGrouping{measurement, metric.instance, metric.objectName}
+			if collectFields[instance] == nil {
+				collectFields[instance] = make(map[string]interface{})
+			}
+			collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
+		} else {
+			//ignore invalid data from as some counters from process instances returns this sometimes
+			if phderr, ok := err.(*PdhError); ok && phderr.ErrorCode != PDH_INVALID_DATA && phderr.ErrorCode != PDH_CALC_NEGATIVE_VALUE {
+				return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
 			}
 		}
 	}
 
 	for instance, fields := range collectFields {
 		var tags = map[string]string{
-			"instance":   instance.instance,
 			"objectname": instance.objectname,
 		}
+		if len(instance.instance) > 0 {
+			tags["instance"] = instance.instance
+		}
 		acc.AddFields(instance.name, fields, tags)
 	}
 
@@ -279,5 +295,7 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("win_perf_counters", func() telegraf.Input { return &Win_PerfCounters{} })
+	inputs.Add("win_perf_counters", func() telegraf.Input {
+		return &Win_PerfCounters{query: &PerformanceQueryImpl{}, CountersRefreshInterval: internal.Duration{Duration: time.Second * 60}}
+	})
 }
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
new file mode 100644
index 000000000..7a1e5403e
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
@@ -0,0 +1,592 @@
+// +build windows
+
+package win_perf_counters
+
+import (
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"strings"
+)
+
+func TestWinPerformanceQueryImpl(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	var query PerformanceQuery
+	var hCounter PDH_HCOUNTER
+	var err error
+	query = &PerformanceQueryImpl{}
+
+	err = query.Close()
+	require.Error(t, err, "uninitialized query must return errors")
+
+	_, err = query.AddCounterToQuery("")
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	_, err = query.AddEnglishCounterToQuery("")
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	err = query.CollectData()
+	require.Error(t, err, "uninitialized query must return errors")
+	assert.True(t, strings.Contains(err.Error(), "uninitialised"))
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	counterPath := "\\Processor Information(_Total)\\% Processor Time"
+
+	hCounter, err = query.AddCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	err = query.Close()
+	require.NoError(t, err)
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	hCounter, err = query.AddEnglishCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	cp, err := query.GetCounterPath(hCounter)
+	require.NoError(t, err)
+	assert.True(t, strings.HasSuffix(cp, counterPath))
+
+	err = query.CollectData()
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+
+	_, err = query.GetFormattedCounterValueDouble(hCounter)
+	require.NoError(t, err)
+
+	counterPath = "\\Process(*)\\% Processor Time"
+	paths, err := query.ExpandWildCardPath(counterPath)
+	require.NoError(t, err)
+	require.NotNil(t, paths)
+	assert.True(t, len(paths) > 1)
+
+	counterPath = "\\Process(_Total)\\*"
+	paths, err = query.ExpandWildCardPath(counterPath)
+	require.NoError(t, err)
+	require.NotNil(t, paths)
+	assert.True(t, len(paths) > 1)
+}
+
+func TestWinPerfcountersConfigGet1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+}
+
+func TestWinPerfcountersConfigGet2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 1 {
+		require.NoError(t, nil)
+	} else if len(m.counters) == 0 {
+		var errorstring1 = "No results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 1 {
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet3(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 2)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+
+		var errorstring1 = "Too few results returned from the counterPath. " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet4(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,1"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+
+		var errorstring1 = "Too few results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+
+		var errorstring1 = "Too many results returned from the counterPath: " + string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet5(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 2)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,1"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 4 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 4 {
+		var errorstring1 = "Too few results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 4 {
+		var errorstring1 = "Too many results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigGet6(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "System"
+	instances[0] = "------"
+	counters[0] = "Context Switches/sec"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+}
+
+func TestWinPerfcountersConfigGet7(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 3)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+	counters[1] = "% Processor TimeERROR"
+	counters[2] = "% Idle Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		objectname,
+		counters,
+		instances,
+		measurement,
+		false,
+		false,
+		false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.NoError(t, err)
+
+	if len(m.counters) == 2 {
+		require.NoError(t, nil)
+	} else if len(m.counters) < 2 {
+		var errorstring1 = "Too few results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	} else if len(m.counters) > 2 {
+		var errorstring1 = "Too many results returned from the counterPath: " +
+			string(len(m.counters))
+		err2 := errors.New(errorstring1)
+		require.NoError(t, err2)
+	}
+}
+
+func TestWinPerfcountersConfigError1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor InformationERROR"
+	instances[0] = "_Total"
+	counters[0] = "% Processor Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersConfigError2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor"
+	instances[0] = "SuperERROR"
+	counters[0] = "% C1 Time"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	var acc testutil.Accumulator
+	err = m.Gather(&acc)
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersConfigError3(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "% Processor TimeERROR"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m.query.Open()
+
+	err := m.ParseConfig()
+	require.Error(t, err)
+}
+
+func TestWinPerfcountersCollect1(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	var instances = make([]string, 1)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	counters[0] = "Parking Status"
+
+	var expectedCounter = "Parking_Status"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	var acc testutil.Accumulator
+	err := m.Gather(&acc)
+	require.NoError(t, err)
+
+	time.Sleep(2000 * time.Millisecond)
+	err = m.Gather(&acc)
+	require.NoError(t, err)
+	assert.Len(t, acc.Metrics, 2)
+
+	for _, metric := range acc.Metrics {
+		_, ok := metric.Fields[expectedCounter]
+		assert.True(t, ok)
+	}
+
+}
+func TestWinPerfcountersCollect2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	var instances = make([]string, 2)
+	var counters = make([]string, 1)
+	var perfobjects = make([]perfobject, 1)
+
+	objectname := "Processor Information"
+	instances[0] = "_Total"
+	instances[1] = "0,0"
+	counters[0] = "Performance Limit Flags"
+
+	var expectedCounter = "Performance_Limit_Flags"
+
+	var measurement = "test"
+
+	PerfObject := perfobject{
+		ObjectName:    objectname,
+		Instances:     instances,
+		Counters:      counters,
+		Measurement:   measurement,
+		WarnOnMissing: false,
+		FailOnMissing: true,
+		IncludeTotal:  false,
+	}
+
+	perfobjects[0] = PerfObject
+
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	var acc testutil.Accumulator
+	err := m.Gather(&acc)
+	require.NoError(t, err)
+
+	time.Sleep(2000 * time.Millisecond)
+	err = m.Gather(&acc)
+	require.NoError(t, err)
+
+	assert.Len(t, acc.Metrics, 4)
+
+	for _, metric := range acc.Metrics {
+		_, ok := metric.Fields[expectedCounter]
+		assert.True(t, ok)
+	}
+
+}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
index a24cedae5..35fca4854 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -4,528 +4,462 @@ package win_perf_counters
 
 import (
 	"errors"
+	"fmt"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
-
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
-func TestWinPerfcountersConfigGet1(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "% Processor Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.NoError(t, err)
+type testCounter struct {
+	handle PDH_HCOUNTER
+	path   string
+	value  float64
+}
+type FakePerformanceQuery struct {
+	counters            map[string]testCounter
+	addEnglishSupported bool
+	expandPaths         map[string][]string
+	openCalled          bool
 }
 
-func TestWinPerfcountersConfigGet2(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "% Processor Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+func (m *FakePerformanceQuery) Open() error {
+	if m.openCalled {
+		err := m.Close()
+		if err != nil {
+			return err
+		}
 	}
+	m.openCalled = true
+	return nil
+}
 
-	perfobjects[0] = PerfObject
+func (m *FakePerformanceQuery) Close() error {
+	if !m.openCalled {
+		return errors.New("CloSe: uninitialised query")
+	}
+	m.openCalled = false
+	return nil
+}
 
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.NoError(t, err)
-
-	var parsedItems = m.GetParsedItemsForTesting()
-
-	if len(parsedItems) == 1 {
-		require.NoError(t, nil)
-	} else if len(parsedItems) == 0 {
-		var errorstring1 string = "No results returned from the query: " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	} else if len(parsedItems) > 1 {
-		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
+func (m *FakePerformanceQuery) AddCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	if !m.openCalled {
+		return 0, errors.New("AddCounterToQuery: uninitialised query")
+	}
+	if c, ok := m.counters[counterPath]; ok {
+		return c.handle, nil
+	} else {
+		return 0, errors.New(fmt.Sprintf("AddCounterToQuery: invalid counter path: %s", counterPath))
 	}
 }
 
-func TestWinPerfcountersConfigGet3(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 2)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "% Processor Time"
-	counters[1] = "% Idle Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+func (m *FakePerformanceQuery) AddEnglishCounterToQuery(counterPath string) (PDH_HCOUNTER, error) {
+	if !m.openCalled {
+		return 0, errors.New("AddEnglishCounterToQuery: uninitialised query")
 	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.NoError(t, err)
-
-	var parsedItems = m.GetParsedItemsForTesting()
-
-	if len(parsedItems) == 2 {
-		require.NoError(t, nil)
-	} else if len(parsedItems) < 2 {
-
-		var errorstring1 string = "Too few results returned from the query. " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	} else if len(parsedItems) > 2 {
-
-		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
+	if c, ok := m.counters[counterPath]; ok {
+		return c.handle, nil
+	} else {
+		return 0, fmt.Errorf("AddEnglishCounterToQuery: invalid counter path: %s", counterPath)
 	}
 }
 
-func TestWinPerfcountersConfigGet4(t *testing.T) {
-
-	var instances = make([]string, 2)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	instances[1] = "0,1"
-	counters[0] = "% Processor Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+func (m *FakePerformanceQuery) GetCounterPath(counterHandle PDH_HCOUNTER) (string, error) {
+	for _, counter := range m.counters {
+		if counter.handle == counterHandle {
+			return counter.path, nil
+		}
 	}
+	return "", fmt.Errorf("GetCounterPath: invalid handle: %d", counterHandle)
+}
 
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.NoError(t, err)
-
-	var parsedItems = m.GetParsedItemsForTesting()
-
-	if len(parsedItems) == 2 {
-		require.NoError(t, nil)
-	} else if len(parsedItems) < 2 {
-
-		var errorstring1 string = "Too few results returned from the query: " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	} else if len(parsedItems) > 2 {
-
-		var errorstring1 string = "Too many results returned from the query: " + string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
+func (m *FakePerformanceQuery) ExpandWildCardPath(counterPath string) ([]string, error) {
+	if e, ok := m.expandPaths[counterPath]; ok {
+		return e, nil
+	} else {
+		return []string{}, fmt.Errorf("ExpandWildCardPath: invalid counter path: %s", counterPath)
 	}
 }
 
-func TestWinPerfcountersConfigGet5(t *testing.T) {
-
-	var instances = make([]string, 2)
-	var counters = make([]string, 2)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	instances[1] = "0,1"
-	counters[0] = "% Processor Time"
-	counters[1] = "% Idle Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+func (m *FakePerformanceQuery) GetFormattedCounterValueDouble(counterHandle PDH_HCOUNTER) (float64, error) {
+	if !m.openCalled {
+		return 0, errors.New("GetFormattedCounterValueDouble: uninitialised query")
 	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.NoError(t, err)
-
-	var parsedItems = m.GetParsedItemsForTesting()
-
-	if len(parsedItems) == 4 {
-		require.NoError(t, nil)
-	} else if len(parsedItems) < 4 {
-		var errorstring1 string = "Too few results returned from the query: " +
-			string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	} else if len(parsedItems) > 4 {
-		var errorstring1 string = "Too many results returned from the query: " +
-			string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
+	for _, counter := range m.counters {
+		if counter.handle == counterHandle {
+			if counter.value > 0 {
+				return counter.value, nil
+			} else {
+				if counter.value == 0 {
+					return 0, NewPdhError(PDH_INVALID_DATA)
+				} else {
+					return 0, NewPdhError(PDH_CALC_NEGATIVE_VALUE)
+				}
+			}
+		}
 	}
+	return 0, fmt.Errorf("GetFormattedCounterValueDouble: invalid handle: %d", counterHandle)
 }
 
-func TestWinPerfcountersConfigGet6(t *testing.T) {
+func (m *FakePerformanceQuery) CollectData() error {
+	if !m.openCalled {
+		return errors.New("CollectData: uninitialised query")
+	}
+	return nil
+}
 
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "System"
-	instances[0] = "------"
-	counters[0] = "Context Switches/sec"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
+func (m *FakePerformanceQuery) AddEnglishCounterSupported() bool {
+	return m.addEnglishSupported
+}
 
+func createPerfObject(measurement string, object string, instances []string, counters []string, failOnMissing bool, includeTotal bool) []perfobject {
 	PerfObject := perfobject{
-		ObjectName:    objectname,
+		ObjectName:    object,
 		Instances:     instances,
 		Counters:      counters,
 		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+		WarnOnMissing: false,
+		FailOnMissing: failOnMissing,
+		IncludeTotal:  includeTotal,
 	}
+	perfobjects := []perfobject{PerfObject}
+	return perfobjects
+}
 
-	perfobjects[0] = PerfObject
+func createCounterMap(counterPaths []string, values []float64) map[string]testCounter {
+	counters := make(map[string]testCounter)
+	for i, cp := range counterPaths {
+		counters[cp] = testCounter{
+			PDH_HCOUNTER(i),
+			cp,
+			values[i],
+		}
+	}
+	return counters
+}
 
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
+func TestAddItemSimple(t *testing.T) {
+	var err error
+	cps1 := []string{"\\O(I)\\C"}
+	m := Win_PerfCounters{PrintValid: false, Object: nil, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1}),
+		expandPaths: map[string][]string{
+			cps1[0]: cps1,
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.AddItem(cps1[0], "I", "test", false)
+	require.NoError(t, err)
+	err = m.query.Close()
 	require.NoError(t, err)
 }
 
-func TestWinPerfcountersConfigGet7(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 3)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "% Processor Time"
-	counters[1] = "% Processor TimeERROR"
-	counters[2] = "% Idle Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = false
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
+func TestAddItemInvalidCountPath(t *testing.T) {
+	var err error
+	cps1 := []string{"\\O\\C"}
+	m := Win_PerfCounters{PrintValid: false, Object: nil, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1}),
+		expandPaths: map[string][]string{
+			cps1[0]: {"\\O/C"},
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
 	require.NoError(t, err)
-
-	var parsedItems = m.GetParsedItemsForTesting()
-
-	if len(parsedItems) == 2 {
-		require.NoError(t, nil)
-	} else if len(parsedItems) < 2 {
-		var errorstring1 string = "Too few results returned from the query: " +
-			string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	} else if len(parsedItems) > 2 {
-		var errorstring1 string = "Too many results returned from the query: " +
-			string(len(parsedItems))
-		err2 := errors.New(errorstring1)
-		require.NoError(t, err2)
-	}
-}
-
-func TestWinPerfcountersConfigError1(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor InformationERROR"
-	instances[0] = "_Total"
-	counters[0] = "% Processor Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
+	err = m.AddItem("\\O\\C", "*", "test", false)
 	require.Error(t, err)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
-func TestWinPerfcountersConfigError2(t *testing.T) {
+func TestParseConfigBasic(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"I1", "I2"}, []string{"C1", "C2"}, false, false)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1, 1.2, 1.3, 1.4}),
+		expandPaths: map[string][]string{
+			cps1[0]: {cps1[0]},
+			cps1[1]: {cps1[1]},
+			cps1[2]: {cps1[2]},
+			cps1[3]: {cps1[3]},
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 4)
+	err = m.query.Close()
+	require.NoError(t, err)
+}
 
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
+func TestParseConfigNoInstance(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"------"}, []string{"C1", "C2"}, false, false)
+	cps1 := []string{"\\O\\C1", "\\O\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1, 1.2}),
+		expandPaths: map[string][]string{
+			cps1[0]: {cps1[0]},
+			cps1[1]: {cps1[1]},
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	err = m.query.Close()
+	require.NoError(t, err)
+}
 
-	objectname := "Processor"
-	instances[0] = "SuperERROR"
-	counters[0] = "% C1 Time"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
+func TestParseConfigInvalidCounterError(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"I1", "I2"}, []string{"C1", "C2"}, true, false)
+	cps1 := []string{"\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1, 1.2, 1.3}),
+		expandPaths: map[string][]string{
+			cps1[0]: {cps1[0]},
+			cps1[1]: {cps1[1]},
+			cps1[2]: {cps1[2]},
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
 	require.Error(t, err)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
-func TestWinPerfcountersConfigError3(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "% Processor TimeERROR"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-
-	err := m.ParseConfig()
-	require.Error(t, err)
+func TestParseConfigInvalidCounterNoError(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"I1", "I2"}, []string{"C1", "C2"}, false, false)
+	cps1 := []string{"\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.1, 1.2, 1.3}),
+		expandPaths: map[string][]string{
+			cps1[0]: {cps1[0]},
+			cps1[1]: {cps1[1]},
+			cps1[2]: {cps1[2]},
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
-func TestWinPerfcountersCollect1(t *testing.T) {
-
-	var instances = make([]string, 1)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
-
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	counters[0] = "Parking Status"
-
-	var expectedCounter string = "Parking_Status"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
-	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-	var acc testutil.Accumulator
-	err := m.Gather(&acc)
+func TestParseConfigTotal(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"*"}, []string{"*"}, true, true)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(_Total)\\C1", "\\O(_Total)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\*": cps1,
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 4)
+	err = m.query.Close()
 	require.NoError(t, err)
 
-	time.Sleep(2000 * time.Millisecond)
-	err = m.Gather(&acc)
-
-	tags := map[string]string{
-		"instance":   instances[0],
-		"objectname": objectname,
-	}
-	fields := map[string]interface{}{
-		expectedCounter: float32(0),
-	}
-	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
+	perfObjects[0].IncludeTotal = false
 
+	m = Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\*": cps1,
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
-func TestWinPerfcountersCollect2(t *testing.T) {
 
-	var instances = make([]string, 2)
-	var counters = make([]string, 1)
-	var perfobjects = make([]perfobject, 1)
+func TestParseConfigExpand(t *testing.T) {
+	var err error
+	perfObjects := createPerfObject("m", "O", []string{"*"}, []string{"*"}, false, false)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\*": cps1,
+		},
+		addEnglishSupported: true,
+	}}
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 4)
+	err = m.query.Close()
+	require.NoError(t, err)
+}
 
-	objectname := "Processor Information"
-	instances[0] = "_Total"
-	instances[1] = "0,0"
-	counters[0] = "Performance Limit Flags"
-
-	var expectedCounter string = "Performance_Limit_Flags"
-
-	var measurement string = "test"
-	var warnonmissing bool = false
-	var failonmissing bool = true
-	var includetotal bool = false
-
-	PerfObject := perfobject{
-		ObjectName:    objectname,
-		Instances:     instances,
-		Counters:      counters,
-		Measurement:   measurement,
-		WarnOnMissing: warnonmissing,
-		FailOnMissing: failonmissing,
-		IncludeTotal:  includetotal,
+func TestSimpleGather(t *testing.T) {
+	var err error
+	if testing.Short() {
+		t.Skip("Skipping long taking test in short mode")
 	}
-
-	perfobjects[0] = PerfObject
-
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects}
-	var acc testutil.Accumulator
-	err := m.Gather(&acc)
+	measurement := "test"
+	perfObjects := createPerfObject(measurement, "O", []string{"I"}, []string{"C"}, false, false)
+	cp1 := "\\O(I)\\C"
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap([]string{cp1}, []float64{1.2}),
+		expandPaths: map[string][]string{
+			cp1: {cp1},
+		},
+		addEnglishSupported: false,
+	}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
 	require.NoError(t, err)
 
-	time.Sleep(2000 * time.Millisecond)
-	err = m.Gather(&acc)
-
-	tags := map[string]string{
-		"instance":   instances[0],
-		"objectname": objectname,
+	fields1 := map[string]interface{}{
+		"C": float32(1.2),
 	}
-	fields := map[string]interface{}{
-		expectedCounter: float32(0),
+	tags1 := map[string]string{
+		"instance":   "I",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+}
+
+func TestGatherInvalidDataIgnore(t *testing.T) {
+	var err error
+	if testing.Short() {
+		t.Skip("Skipping long taking test in short mode")
+	}
+	measurement := "test"
+	perfObjects := createPerfObject(measurement, "O", []string{"I"}, []string{"C1", "C2", "C3"}, false, false)
+	cps1 := []string{"\\O(I)\\C1", "\\O(I)\\C2", "\\O(I)\\C3"}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(cps1, []float64{1.2, -1, 0}),
+		expandPaths: map[string][]string{
+			cps1[0]: {cps1[0]},
+			cps1[1]: {cps1[1]},
+			cps1[2]: {cps1[2]},
+		},
+		addEnglishSupported: false,
+	}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	require.NoError(t, err)
+
+	fields1 := map[string]interface{}{
+		"C1": float32(1.2),
+	}
+	tags1 := map[string]string{
+		"instance":   "I",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+}
+
+func TestGatherRefreshing(t *testing.T) {
+	var err error
+	if testing.Short() {
+		t.Skip("Skipping long taking test in short mode")
+	}
+	measurement := "test"
+	perfObjects := createPerfObject(measurement, "O", []string{"*"}, []string{"*"}, false, false)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	fpm := &FakePerformanceQuery{
+		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\*": cps1,
+		},
+		addEnglishSupported: true,
+	}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	assert.Len(t, m.counters, 4)
+	require.NoError(t, err)
+	assert.Len(t, acc1.Metrics, 2)
+
+	fields1 := map[string]interface{}{
+		"C1": float32(1.1),
+		"C2": float32(1.2),
+	}
+	tags1 := map[string]string{
+		"instance":   "I1",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	fields2 := map[string]interface{}{
+		"C1": float32(1.3),
+		"C2": float32(1.4),
+	}
+	tags2 := map[string]string{
+		"instance":   "I2",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+	cps2 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2", "\\O(I3)\\C1", "\\O(I3)\\C2"}
+	fpm = &FakePerformanceQuery{
+		counters: createCounterMap(append(cps2, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 0}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\*": cps2,
+		},
+		addEnglishSupported: true,
+	}
+	m.query = fpm
+	fpm.Open()
+	var acc2 testutil.Accumulator
+
+	fields3 := map[string]interface{}{
+		"C1": float32(1.5),
+		"C2": float32(1.6),
+	}
+	tags3 := map[string]string{
+		"instance":   "I3",
+		"objectname": "O",
 	}
 
-	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
-	tags = map[string]string{
-		"instance":   instances[1],
-		"objectname": objectname,
-	}
-	fields = map[string]interface{}{
-		expectedCounter: float32(0),
-	}
-	acc.AssertContainsTaggedFields(t, measurement, fields, tags)
+	//test before elapsing CounterRefreshRate counters are not refreshed
+	err = m.Gather(&acc2)
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 4)
+	assert.Len(t, acc2.Metrics, 2)
+
+	acc2.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+	acc2.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+	acc2.AssertDoesNotContainsTaggedFields(t, measurement, fields3, tags3)
+	time.Sleep(m.CountersRefreshInterval.Duration)
+
+	var acc3 testutil.Accumulator
+	err = m.Gather(&acc3)
+	require.NoError(t, err)
+	assert.Len(t, acc3.Metrics, 3)
+
+	acc3.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+	acc3.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+
+	acc3.AssertContainsTaggedFields(t, measurement, fields3, tags3)
 
 }

From 2def31bc3d4c02adc948be9fa000630fb6cc3d60 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 24 May 2018 18:34:08 -0700
Subject: [PATCH 1221/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf80274d..c3388d8e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@
 - [#4036](https://github.com/influxdata/telegraf/pull/4036): Add all win_perf_counters fields for a series in a single metric.
 - [#4118](https://github.com/influxdata/telegraf/pull/4118): Report results of dns_query instead of 0ms on timeout.
 - [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
+- [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
+- [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
 
 ## v1.6.3 [2018-05-21]
 

From b78984554ce16fcabcb8f97137c9713616f3d25c Mon Sep 17 00:00:00 2001
From: Leonardo Di Donato <leodido@users.noreply.github.com>
Date: Fri, 25 May 2018 20:40:12 +0200
Subject: [PATCH 1222/1302] Add syslog input plugin (#4181)

---
 Godeps                                |   1 +
 plugins/inputs/all/all.go             |   1 +
 plugins/inputs/syslog/README.md       | 119 ++++++
 plugins/inputs/syslog/rfc5425_test.go | 520 ++++++++++++++++++++++++++
 plugins/inputs/syslog/rfc5426_test.go | 400 ++++++++++++++++++++
 plugins/inputs/syslog/syslog.go       | 419 +++++++++++++++++++++
 plugins/inputs/syslog/syslog_test.go  |  60 +++
 7 files changed, 1520 insertions(+)
 create mode 100644 plugins/inputs/syslog/README.md
 create mode 100644 plugins/inputs/syslog/rfc5425_test.go
 create mode 100644 plugins/inputs/syslog/rfc5426_test.go
 create mode 100644 plugins/inputs/syslog/syslog.go
 create mode 100644 plugins/inputs/syslog/syslog_test.go

diff --git a/Godeps b/Godeps
index f44100c91..70e6e7966 100644
--- a/Godeps
+++ b/Godeps
@@ -32,6 +32,7 @@ github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
+github.com/influxdata/go-syslog 84f3b60009444d298f97454feb1f20cf91d1fa6e
 github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index 239cf6e11..dd9a7b774 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -97,6 +97,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/solr"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
+	_ "github.com/influxdata/telegraf/plugins/inputs/syslog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
diff --git a/plugins/inputs/syslog/README.md b/plugins/inputs/syslog/README.md
new file mode 100644
index 000000000..010dab60d
--- /dev/null
+++ b/plugins/inputs/syslog/README.md
@@ -0,0 +1,119 @@
+# syslog input plugin
+
+Collects syslog messages as per RFC5425 or RFC5426.
+
+It can act as a syslog transport receiver over TLS (or TCP) - ie., RFC5425 - or over UDP - ie., RFC5426.
+
+This plugin listens for syslog messages following RFC5424 format. When received it parses them extracting metrics.
+
+### Configuration
+
+```toml
+[[inputs.syslog]]
+  ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+  ## Protocol, address and port to host the syslog receiver.
+  ## If no host is specified, then localhost is used.
+  ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+  server = "tcp://:6514"
+
+  ## TLS Config
+  # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+
+  ## Period between keep alive probes.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # keep_alive_period = "5m"
+
+  ## Maximum number of concurrent connections (default = 0).
+  ## 0 means unlimited.
+  ## Only applies to stream sockets (e.g. TCP).
+  # max_connections = 1024
+
+  ## Read timeout (default = 500ms).
+  ## 0 means unlimited.
+  # read_timeout = 500ms
+
+  ## Whether to parse in best effort mode or not (default = false).
+  ## By default best effort parsing is off.
+  # best_effort = false
+
+  ## Character to prepend to SD-PARAMs (default = "_").
+  ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+  ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+  ## For each combination a field is created.
+  ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+  # sdparam_separator = "_"
+```
+
+#### Other configs
+
+Other available configurations are:
+
+- `keep_alive_period`, `max_connections` for stream sockets
+- `read_timeout`
+- `best_effort` to tell the parser to work until it is able to do and extract partial but valid info (more [here](https://github.com/influxdata/go-syslog#best-effort-mode))
+- `sdparam_separator` to choose how to separate structured data param name from its structured data identifier
+
+### Metrics
+
+- syslog
+  - fields
+    - **version** (`uint16`)
+    - **severity_code** (`int`)
+    - **facility_code** (`int`)
+    - timestamp (`int`)
+    - procid (`string`)
+    - msgid (`string`)
+    - *sdid* (`bool`)
+    - *sdid . sdparam_separator . sdparam_name* (`string`)
+  - tags
+    - **severity** (`string`)
+    - **facility** (`string`)
+    - hostname (`string`)
+    - appname (`string`)
+
+The name of fields in _italic_ corresponds to their runtime value.
+
+The fields/tags which name is in **bold** will always be present when a valid Syslog message has been received.
+
+### RSYSLOG integration
+
+The following instructions illustrate how to configure a syslog transport sender as per RFC5425 - ie., using the octect framing technique - via RSYSLOG.
+
+Install `rsyslog`.
+
+Give it a configuration - ie., `/etc/rsyslog.conf`.
+
+```
+$ModLoad imuxsock  # provides support for local system logging
+$ModLoad imklog    # provides kernel logging support
+$ModLoad immark    # provides heart-beat logs
+$FileOwner root
+$FileGroup root
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+$WorkDirectory /var/spool/rsyslog # default location for work (spool) files
+$ActionQueueType LinkedList # use asynchronous processing
+$ActionQueueFileName srvrfwd # set file name, also enables disk mode
+$ActionResumeRetryCount -1 # infinite retries on insert failure
+$ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
+$IncludeConfig /etc/rsyslog.d/*.conf
+```
+
+Specify you want the octet framing technique enabled and the format of each syslog message to follow the RFC5424.
+
+Create a file - eg., `/etc/rsyslog.d/50-default.conf` - containing:
+
+```
+*.* @@(o)127.0.0.1:6514;RSYSLOG_SyslogProtocol23Format
+```
+
+To complete the TLS setup please refer to [rsyslog docs](https://www.rsyslog.com/doc/v8-stable/tutorials/tls.html).
+
+Notice that this configuration tells `rsyslog` to broadcast messages to `127.0.0.1>6514`.
+
+So you have to configure this plugin accordingly.
\ No newline at end of file
diff --git a/plugins/inputs/syslog/rfc5425_test.go b/plugins/inputs/syslog/rfc5425_test.go
new file mode 100644
index 000000000..cac2bf7e1
--- /dev/null
+++ b/plugins/inputs/syslog/rfc5425_test.go
@@ -0,0 +1,520 @@
+package syslog
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	pki = testutil.NewPKI("../../../testutil/pki")
+)
+
+type testCase5425 struct {
+	name           string
+	data           []byte
+	wantBestEffort []testutil.Metric
+	wantStrict     []testutil.Metric
+	werr           int // how many errors we expect in the strict mode?
+}
+
+func getTestCasesForRFC5425() []testCase5425 {
+	testCases := []testCase5425{
+		{
+			name: "1st/avg/ok",
+			data: []byte(`188 <29>1 2016-02-21T04:32:57+00:00 web1 someservice 2341 2 [origin][meta sequence="14125553" service="someservice"] "GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+						"procid":        "2341",
+						"msgid":         "2",
+						"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+						"origin":        true,
+						"meta_sequence": "14125553",
+						"meta_service":  "someservice",
+						"severity_code": 5,
+						"facility_code": 3,
+					},
+					Tags: map[string]string{
+						"severity": "notice",
+						"facility": "daemon",
+						"hostname": "web1",
+						"appname":  "someservice",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+						"procid":        "2341",
+						"msgid":         "2",
+						"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+						"origin":        true,
+						"meta_sequence": "14125553",
+						"meta_service":  "someservice",
+						"severity_code": 5,
+						"facility_code": 3,
+					},
+					Tags: map[string]string{
+						"severity": "notice",
+						"facility": "daemon",
+						"hostname": "web1",
+						"appname":  "someservice",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name: "1st/min/ok//2nd/min/ok",
+			data: []byte("16 <1>2 - - - - - -17 <4>11 - - - - - -"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(11),
+						"severity_code": 4,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "warning",
+						"facility": "kern",
+					},
+					Time: defaultTime.Add(time.Nanosecond),
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(11),
+						"severity_code": 4,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "warning",
+						"facility": "kern",
+					},
+					Time: defaultTime.Add(time.Nanosecond),
+				},
+			},
+		},
+		{
+			name: "1st/utf8/ok",
+			data: []byte("23 <1>1 - - - - - - hellø"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"message":       "hellø",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"message":       "hellø",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name: "1st/nl/ok", // newline
+			data: []byte("28 <1>3 - - - - - - hello\nworld"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(3),
+						"message":       "hello\nworld",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(3),
+						"message":       "hello\nworld",
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name:       "1st/uf/ko", // underflow (msglen less than provided octets)
+			data:       []byte("16 <1>2"),
+			wantStrict: nil,
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(2),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			werr: 1,
+		},
+		{
+			name: "1st/min/ok",
+			data: []byte("16 <1>1 - - - - - -"),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(1),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+		{
+			name:       "1st/uf/mf", // The first "underflow" message breaks also the second one
+			data:       []byte("16 <1>217 <11>1 - - - - - -"),
+			wantStrict: nil,
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       uint16(217),
+						"severity_code": 1,
+						"facility_code": 0,
+					},
+					Tags: map[string]string{
+						"severity": "alert",
+						"facility": "kern",
+					},
+					Time: defaultTime,
+				},
+			},
+			werr: 1,
+		},
+		// {
+		// 	name: "1st/of/ko", // overflow (msglen greather then max allowed octets)
+		// 	data: []byte(fmt.Sprintf("8193 <%d>%d %s %s %s %s %s 12 %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+		// 	want: []testutil.Metric{},
+		// },
+		{
+			name: "1st/max/ok",
+			data: []byte(fmt.Sprintf("8192 <%d>%d %s %s %s %s %s - %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+			wantStrict: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       maxV,
+						"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+						"message":       message7681,
+						"procid":        maxPID,
+						"msgid":         maxMID,
+						"facility_code": 23,
+						"severity_code": 7,
+					},
+					Tags: map[string]string{
+						"severity": "debug",
+						"facility": "local7",
+						"hostname": maxH,
+						"appname":  maxA,
+					},
+					Time: defaultTime,
+				},
+			},
+			wantBestEffort: []testutil.Metric{
+				testutil.Metric{
+					Measurement: "syslog",
+					Fields: map[string]interface{}{
+						"version":       maxV,
+						"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+						"message":       message7681,
+						"procid":        maxPID,
+						"msgid":         maxMID,
+						"facility_code": 23,
+						"severity_code": 7,
+					},
+					Tags: map[string]string{
+						"severity": "debug",
+						"facility": "local7",
+						"hostname": maxH,
+						"appname":  maxA,
+					},
+					Time: defaultTime,
+				},
+			},
+		},
+	}
+
+	return testCases
+}
+
+func newTCPSyslogReceiver(address string, keepAlive *internal.Duration, maxConn int, bestEffort bool) *Syslog {
+	d := &internal.Duration{
+		Duration: defaultReadTimeout,
+	}
+	s := &Syslog{
+		Address: address,
+		now: func() time.Time {
+			return defaultTime
+		},
+		ReadTimeout: d,
+		BestEffort:  bestEffort,
+		Separator:   "_",
+	}
+	if keepAlive != nil {
+		s.KeepAlivePeriod = keepAlive
+	}
+	if maxConn > 0 {
+		s.MaxConnections = maxConn
+	}
+
+	return s
+}
+
+func testStrictRFC5425(t *testing.T, protocol string, address string, wantTLS bool, keepAlive *internal.Duration) {
+	for _, tc := range getTestCasesForRFC5425() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Creation of a strict mode receiver
+			receiver := newTCPSyslogReceiver(protocol+"://"+address, keepAlive, 0, false)
+			require.NotNil(t, receiver)
+			if wantTLS {
+				receiver.ServerConfig = *pki.TLSServerConfig()
+			}
+			require.Equal(t, receiver.KeepAlivePeriod, keepAlive)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Connect
+			var conn net.Conn
+			var err error
+			if wantTLS {
+				config, e := pki.TLSClientConfig().TLSConfig()
+				require.NoError(t, e)
+				config.ServerName = "localhost"
+				conn, err = tls.Dial(protocol, address, config)
+			} else {
+				conn, err = net.Dial(protocol, address)
+				defer conn.Close()
+			}
+			require.NotNil(t, conn)
+			require.NoError(t, err)
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Write
+			conn.Write(tc.data)
+
+			// Wait that the the number of data points is accumulated
+			// Since the receiver is running concurrently
+			if tc.wantStrict != nil {
+				acc.Wait(len(tc.wantStrict))
+			}
+			// Wait the parsing error
+			acc.WaitError(tc.werr)
+
+			// Verify
+			if len(acc.Errors) != tc.werr {
+				t.Fatalf("Got unexpected errors. want error = %v, errors = %v\n", tc.werr, acc.Errors)
+			}
+			var got []testutil.Metric
+			for _, metric := range acc.Metrics {
+				got = append(got, *metric)
+			}
+			if !cmp.Equal(tc.wantStrict, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(tc.wantStrict, got))
+			}
+		})
+	}
+}
+
+func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTLS bool, keepAlive *internal.Duration) {
+	for _, tc := range getTestCasesForRFC5425() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Creation of a best effort mode receiver
+			receiver := newTCPSyslogReceiver(protocol+"://"+address, keepAlive, 0, true)
+			require.NotNil(t, receiver)
+			if wantTLS {
+				receiver.ServerConfig = *pki.TLSServerConfig()
+			}
+			require.Equal(t, receiver.KeepAlivePeriod, keepAlive)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Connect
+			var conn net.Conn
+			var err error
+			if wantTLS {
+				config, e := pki.TLSClientConfig().TLSConfig()
+				require.NoError(t, e)
+				config.ServerName = "localhost"
+				conn, err = tls.Dial(protocol, address, config)
+			} else {
+				conn, err = net.Dial(protocol, address)
+				defer conn.Close()
+			}
+			require.NotNil(t, conn)
+			require.NoError(t, err)
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Write
+			conn.Write(tc.data)
+
+			// Wait that the the number of data points is accumulated
+			// Since the receiver is running concurrently
+			if tc.wantBestEffort != nil {
+				acc.Wait(len(tc.wantBestEffort))
+			}
+
+			// Verify
+			var got []testutil.Metric
+			for _, metric := range acc.Metrics {
+				got = append(got, *metric)
+			}
+			if !cmp.Equal(tc.wantBestEffort, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(tc.wantBestEffort, got))
+			}
+		})
+	}
+}
+
+func TestStrict_tcp(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, false, nil)
+}
+
+func TestBestEffort_tcp(t *testing.T) {
+	testBestEffortRFC5425(t, "tcp", address, false, nil)
+}
+
+func TestStrict_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, nil)
+}
+
+func TestBestEffort_tcp_tls(t *testing.T) {
+	testBestEffortRFC5425(t, "tcp", address, true, nil)
+}
+
+func TestStrictWithKeepAlive_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, &internal.Duration{Duration: time.Minute})
+}
+
+func TestStrictWithZeroKeepAlive_tcp_tls(t *testing.T) {
+	testStrictRFC5425(t, "tcp", address, true, &internal.Duration{Duration: 0})
+}
+
+func TestStrict_unix(t *testing.T) {
+	testStrictRFC5425(t, "unix", "/tmp/telegraf_test.sock", false, nil)
+}
+
+func TestBestEffort_unix(t *testing.T) {
+	testBestEffortRFC5425(t, "unix", "/tmp/telegraf_test.sock", false, nil)
+}
+
+func TestStrict_unix_tls(t *testing.T) {
+	testStrictRFC5425(t, "unix", "/tmp/telegraf_test.sock", true, nil)
+}
+
+func TestBestEffort_unix_tls(t *testing.T) {
+	testBestEffortRFC5425(t, "unix", "/tmp/telegraf_test.sock", true, nil)
+}
diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
new file mode 100644
index 000000000..becd1c4b5
--- /dev/null
+++ b/plugins/inputs/syslog/rfc5426_test.go
@@ -0,0 +1,400 @@
+package syslog
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+type testCase5426 struct {
+	name           string
+	data           []byte
+	wantBestEffort *testutil.Metric
+	wantStrict     *testutil.Metric
+	werr           bool
+}
+
+func getTestCasesForRFC5426() []testCase5426 {
+	testCases := []testCase5426{
+		{
+			name: "empty",
+			data: []byte(""),
+			werr: true,
+		},
+		{
+			name: "complete",
+			data: []byte("<1>1 - - - - - - A"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"message":       "A",
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"message":       "A",
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "one/per/packet",
+			data: []byte("<1>3 - - - - - - A<1>4 - - - - - - B"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(3),
+					"message":       "A<1>4 - - - - - - B",
+					"severity_code": 1,
+					"facility_code": 0,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(3),
+					"message":       "A<1>4 - - - - - - B",
+					"severity_code": 1,
+					"facility_code": 0,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "average",
+			data: []byte(`<29>1 2016-02-21T04:32:57+00:00 web1 someservice 2341 2 [origin][meta sequence="14125553" service="someservice"] "GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+					"procid":        "2341",
+					"msgid":         "2",
+					"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+					"origin":        true,
+					"meta_sequence": "14125553",
+					"meta_service":  "someservice",
+					"severity_code": 5,
+					"facility_code": 3,
+				},
+				Tags: map[string]string{
+					"severity": "notice",
+					"facility": "daemon",
+					"hostname": "web1",
+					"appname":  "someservice",
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(1),
+					"timestamp":     time.Unix(1456029177, 0).UnixNano(),
+					"procid":        "2341",
+					"msgid":         "2",
+					"message":       `"GET /v1/ok HTTP/1.1" 200 145 "-" "hacheck 0.9.0" 24306 127.0.0.1:40124 575`,
+					"origin":        true,
+					"meta_sequence": "14125553",
+					"meta_service":  "someservice",
+					"severity_code": 5,
+					"facility_code": 3,
+				},
+				Tags: map[string]string{
+					"severity": "notice",
+					"facility": "daemon",
+					"hostname": "web1",
+					"appname":  "someservice",
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "max",
+			data: []byte(fmt.Sprintf("<%d>%d %s %s %s %s %s - %s", maxP, maxV, maxTS, maxH, maxA, maxPID, maxMID, message7681)),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       maxV,
+					"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+					"message":       message7681,
+					"procid":        maxPID,
+					"msgid":         maxMID,
+					"severity_code": 7,
+					"facility_code": 23,
+				},
+				Tags: map[string]string{
+					"severity": "debug",
+					"facility": "local7",
+					"hostname": maxH,
+					"appname":  maxA,
+				},
+				Time: defaultTime,
+			},
+			wantStrict: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       maxV,
+					"timestamp":     time.Unix(1514764799, 999999000).UnixNano(),
+					"message":       message7681,
+					"procid":        maxPID,
+					"msgid":         maxMID,
+					"severity_code": 7,
+					"facility_code": 23,
+				},
+				Tags: map[string]string{
+					"severity": "debug",
+					"facility": "local7",
+					"hostname": maxH,
+					"appname":  maxA,
+				},
+				Time: defaultTime,
+			},
+		},
+		{
+			name: "minimal/incomplete",
+			data: []byte("<1>2"),
+			wantBestEffort: &testutil.Metric{
+				Measurement: "syslog",
+				Fields: map[string]interface{}{
+					"version":       uint16(2),
+					"facility_code": 0,
+					"severity_code": 1,
+				},
+				Tags: map[string]string{
+					"severity": "alert",
+					"facility": "kern",
+				},
+				Time: defaultTime,
+			},
+			werr: true,
+		},
+	}
+
+	return testCases
+}
+
+func newUDPSyslogReceiver(address string, bestEffort bool) *Syslog {
+	return &Syslog{
+		Address: address,
+		now: func() time.Time {
+			return defaultTime
+		},
+		BestEffort: bestEffort,
+		Separator:  "_",
+	}
+}
+
+func testRFC5426(t *testing.T, protocol string, address string, bestEffort bool) {
+	for _, tc := range getTestCasesForRFC5426() {
+		t.Run(tc.name, func(t *testing.T) {
+			// Create receiver
+			receiver := newUDPSyslogReceiver(protocol+"://"+address, bestEffort)
+			acc := &testutil.Accumulator{}
+			require.NoError(t, receiver.Start(acc))
+			defer receiver.Stop()
+
+			// Clear
+			acc.ClearMetrics()
+			acc.Errors = make([]error, 0)
+
+			// Connect
+			conn, err := net.Dial(protocol, address)
+			require.NotNil(t, conn)
+			defer conn.Close()
+			require.Nil(t, err)
+
+			// Write
+			_, e := conn.Write(tc.data)
+			require.Nil(t, e)
+
+			// Waiting ...
+			if tc.wantStrict == nil && tc.werr || bestEffort && tc.werr {
+				acc.WaitError(1)
+			}
+			if tc.wantBestEffort != nil && bestEffort || tc.wantStrict != nil && !bestEffort {
+				acc.Wait(1) // RFC5426 mandates a syslog message per UDP packet
+			}
+
+			// Compare
+			var got *testutil.Metric
+			var want *testutil.Metric
+			if len(acc.Metrics) > 0 {
+				got = acc.Metrics[0]
+			}
+			if bestEffort {
+				want = tc.wantBestEffort
+			} else {
+				want = tc.wantStrict
+			}
+			if !cmp.Equal(want, got) {
+				t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, got))
+			}
+		})
+	}
+}
+
+func TestBestEffort_udp(t *testing.T) {
+	testRFC5426(t, "udp", address, true)
+}
+
+func TestStrict_udp(t *testing.T) {
+	testRFC5426(t, "udp", address, false)
+}
+
+func TestBestEffort_unixgram(t *testing.T) {
+	sockname := "/tmp/telegraf_test.sock"
+	os.Create(sockname)
+	testRFC5426(t, "unixgram", sockname, true)
+}
+
+func TestStrict_unixgram(t *testing.T) {
+	sockname := "/tmp/telegraf_test.sock"
+	os.Create(sockname)
+	testRFC5426(t, "unixgram", sockname, false)
+}
+
+func TestTimeIncrement_udp(t *testing.T) {
+	var i int64
+	atomic.StoreInt64(&i, 0)
+	getNow := func() time.Time {
+		if atomic.LoadInt64(&i)%2 == 0 {
+			return time.Unix(1, 0)
+		}
+		return time.Unix(1, 1)
+	}
+
+	// Create receiver
+	receiver := &Syslog{
+		Address:    "udp://" + address,
+		now:        getNow,
+		BestEffort: false,
+		Separator:  "_",
+	}
+	acc := &testutil.Accumulator{}
+	require.NoError(t, receiver.Start(acc))
+	defer receiver.Stop()
+
+	// Connect
+	conn, err := net.Dial("udp", address)
+	require.NotNil(t, conn)
+	defer conn.Close()
+	require.Nil(t, err)
+
+	// Write
+	_, e := conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want := &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow(),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+
+	// New one with different time
+	atomic.StoreInt64(&i, atomic.LoadInt64(&i)+1)
+
+	// Clear
+	acc.ClearMetrics()
+
+	// Write
+	_, e = conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want = &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow(),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+
+	// New one with same time as previous one
+
+	// Clear
+	acc.ClearMetrics()
+
+	// Write
+	_, e = conn.Write([]byte("<1>1 - - - - - -"))
+	require.Nil(t, e)
+
+	// Wait
+	acc.Wait(1)
+
+	want = &testutil.Metric{
+		Measurement: "syslog",
+		Fields: map[string]interface{}{
+			"version":       uint16(1),
+			"facility_code": 0,
+			"severity_code": 1,
+		},
+		Tags: map[string]string{
+			"severity": "alert",
+			"facility": "kern",
+		},
+		Time: getNow().Add(time.Nanosecond),
+	}
+
+	if !cmp.Equal(want, acc.Metrics[0]) {
+		t.Fatalf("Got (+) / Want (-)\n %s", cmp.Diff(want, acc.Metrics[0]))
+	}
+}
diff --git a/plugins/inputs/syslog/syslog.go b/plugins/inputs/syslog/syslog.go
new file mode 100644
index 000000000..21f6a770f
--- /dev/null
+++ b/plugins/inputs/syslog/syslog.go
@@ -0,0 +1,419 @@
+package syslog
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/go-syslog/rfc5424"
+	"github.com/influxdata/go-syslog/rfc5425"
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	tlsConfig "github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+)
+
+const defaultReadTimeout = time.Millisecond * 500
+const ipMaxPacketSize = 64 * 1024
+
+// Syslog is a syslog plugin
+type Syslog struct {
+	tlsConfig.ServerConfig
+	Address         string `toml:"server"`
+	KeepAlivePeriod *internal.Duration
+	ReadTimeout     *internal.Duration
+	MaxConnections  int
+	BestEffort      bool
+	Separator       string `toml:"sdparam_separator"`
+
+	now      func() time.Time
+	lastTime time.Time
+
+	mu sync.Mutex
+	wg sync.WaitGroup
+	io.Closer
+
+	isStream      bool
+	tcpListener   net.Listener
+	tlsConfig     *tls.Config
+	connections   map[string]net.Conn
+	connectionsMu sync.Mutex
+
+	udpListener net.PacketConn
+}
+
+var sampleConfig = `
+  ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+  ## Protocol, address and port to host the syslog receiver.
+  ## If no host is specified, then localhost is used.
+  ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+  server = "tcp://:6514"
+
+  ## TLS Config
+  # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+
+  ## Period between keep alive probes.
+  ## 0 disables keep alive probes.
+  ## Defaults to the OS configuration.
+  ## Only applies to stream sockets (e.g. TCP).
+  # keep_alive_period = "5m"
+
+  ## Maximum number of concurrent connections (default = 0).
+  ## 0 means unlimited.
+  ## Only applies to stream sockets (e.g. TCP).
+  # max_connections = 1024
+
+  ## Read timeout (default = 500ms).
+  ## 0 means unlimited.
+  # read_timeout = 500ms
+
+  ## Whether to parse in best effort mode or not (default = false).
+  ## By default best effort parsing is off.
+  # best_effort = false
+
+  ## Character to prepend to SD-PARAMs (default = "_").
+  ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+  ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+  ## For each combination a field is created.
+  ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+  # sdparam_separator = "_"
+`
+
+// SampleConfig returns sample configuration message
+func (s *Syslog) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the plugin description
+func (s *Syslog) Description() string {
+	return "Accepts syslog messages per RFC5425"
+}
+
+// Gather ...
+func (s *Syslog) Gather(_ telegraf.Accumulator) error {
+	return nil
+}
+
+// Start starts the service.
+func (s *Syslog) Start(acc telegraf.Accumulator) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	scheme, host, err := getAddressParts(s.Address)
+	if err != nil {
+		return err
+	}
+	s.Address = host
+
+	switch scheme {
+	case "tcp", "tcp4", "tcp6", "unix", "unixpacket":
+		s.isStream = true
+	case "udp", "udp4", "udp6", "ip", "ip4", "ip6", "unixgram":
+		s.isStream = false
+	default:
+		return fmt.Errorf("unknown protocol '%s' in '%s'", scheme, s.Address)
+	}
+
+	if scheme == "unix" || scheme == "unixpacket" || scheme == "unixgram" {
+		os.Remove(s.Address)
+	}
+
+	if s.isStream {
+		l, err := net.Listen(scheme, s.Address)
+		if err != nil {
+			return err
+		}
+		s.Closer = l
+		s.tcpListener = l
+		s.tlsConfig, err = s.TLSConfig()
+		if err != nil {
+			return err
+		}
+
+		s.wg.Add(1)
+		go s.listenStream(acc)
+	} else {
+		l, err := net.ListenPacket(scheme, s.Address)
+		if err != nil {
+			return err
+		}
+		s.Closer = l
+		s.udpListener = l
+
+		s.wg.Add(1)
+		go s.listenPacket(acc)
+	}
+
+	if scheme == "unix" || scheme == "unixpacket" || scheme == "unixgram" {
+		s.Closer = unixCloser{path: s.Address, closer: s.Closer}
+	}
+
+	return nil
+}
+
+// Stop cleans up all resources
+func (s *Syslog) Stop() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	if s.Closer != nil {
+		s.Close()
+	}
+	s.wg.Wait()
+}
+
+// getAddressParts returns the address scheme and host
+// it also sets defaults for them when missing
+// when the input address does not specify the protocol it returns an error
+func getAddressParts(a string) (string, string, error) {
+	parts := strings.SplitN(a, "://", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("missing protocol within address '%s'", a)
+	}
+
+	u, _ := url.Parse(a)
+	switch u.Scheme {
+	case "unix", "unixpacket", "unixgram":
+		return parts[0], parts[1], nil
+	}
+
+	var host string
+	if u.Hostname() != "" {
+		host = u.Hostname()
+	}
+	host += ":"
+	if u.Port() == "" {
+		host += "6514"
+	} else {
+		host += u.Port()
+	}
+
+	return u.Scheme, host, nil
+}
+
+func (s *Syslog) listenPacket(acc telegraf.Accumulator) {
+	defer s.wg.Done()
+	b := make([]byte, ipMaxPacketSize)
+	p := rfc5424.NewParser()
+	for {
+		n, _, err := s.udpListener.ReadFrom(b)
+		if err != nil {
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				acc.AddError(err)
+			}
+			break
+		}
+
+		if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+			s.udpListener.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+		}
+
+		message, err := p.Parse(b[:n], &s.BestEffort)
+		if message != nil {
+			acc.AddFields("syslog", fields(*message, s), tags(*message), s.time())
+		}
+		if err != nil {
+			acc.AddError(err)
+		}
+	}
+}
+
+func (s *Syslog) listenStream(acc telegraf.Accumulator) {
+	defer s.wg.Done()
+
+	s.connections = map[string]net.Conn{}
+
+	for {
+		conn, err := s.tcpListener.Accept()
+		if err != nil {
+			if !strings.HasSuffix(err.Error(), ": use of closed network connection") {
+				acc.AddError(err)
+			}
+			break
+		}
+		var tcpConn, _ = conn.(*net.TCPConn)
+		if s.tlsConfig != nil {
+			conn = tls.Server(conn, s.tlsConfig)
+		}
+
+		s.connectionsMu.Lock()
+		if s.MaxConnections > 0 && len(s.connections) >= s.MaxConnections {
+			s.connectionsMu.Unlock()
+			conn.Close()
+			continue
+		}
+		s.connections[conn.RemoteAddr().String()] = conn
+		s.connectionsMu.Unlock()
+
+		if err := s.setKeepAlive(tcpConn); err != nil {
+			acc.AddError(fmt.Errorf("unable to configure keep alive (%s): %s", s.Address, err))
+		}
+
+		go s.handle(conn, acc)
+	}
+
+	s.connectionsMu.Lock()
+	for _, c := range s.connections {
+		c.Close()
+	}
+	s.connectionsMu.Unlock()
+}
+
+func (s *Syslog) removeConnection(c net.Conn) {
+	s.connectionsMu.Lock()
+	delete(s.connections, c.RemoteAddr().String())
+	s.connectionsMu.Unlock()
+}
+
+func (s *Syslog) handle(conn net.Conn, acc telegraf.Accumulator) {
+	defer func() {
+		s.removeConnection(conn)
+		conn.Close()
+	}()
+
+	if s.ReadTimeout != nil && s.ReadTimeout.Duration > 0 {
+		conn.SetReadDeadline(time.Now().Add(s.ReadTimeout.Duration))
+	}
+
+	var p *rfc5425.Parser
+	if s.BestEffort {
+		p = rfc5425.NewParser(conn, rfc5425.WithBestEffort())
+	} else {
+		p = rfc5425.NewParser(conn)
+	}
+
+	p.ParseExecuting(func(r *rfc5425.Result) {
+		s.store(*r, acc)
+	})
+}
+
+func (s *Syslog) setKeepAlive(c *net.TCPConn) error {
+	if s.KeepAlivePeriod == nil {
+		return nil
+	}
+
+	if s.KeepAlivePeriod.Duration == 0 {
+		return c.SetKeepAlive(false)
+	}
+	if err := c.SetKeepAlive(true); err != nil {
+		return err
+	}
+	return c.SetKeepAlivePeriod(s.KeepAlivePeriod.Duration)
+}
+
+func (s *Syslog) store(res rfc5425.Result, acc telegraf.Accumulator) {
+	if res.Error != nil {
+		acc.AddError(res.Error)
+	}
+	if res.MessageError != nil {
+		acc.AddError(res.MessageError)
+	}
+	if res.Message != nil {
+		msg := *res.Message
+		acc.AddFields("syslog", fields(msg, s), tags(msg), s.time())
+	}
+}
+
+func tags(msg rfc5424.SyslogMessage) map[string]string {
+	ts := map[string]string{}
+
+	// Not checking assuming a minimally valid message
+	ts["severity"] = *msg.SeverityShortLevel()
+	ts["facility"] = *msg.FacilityLevel()
+
+	if msg.Hostname() != nil {
+		ts["hostname"] = *msg.Hostname()
+	}
+
+	if msg.Appname() != nil {
+		ts["appname"] = *msg.Appname()
+	}
+
+	return ts
+}
+
+func fields(msg rfc5424.SyslogMessage, s *Syslog) map[string]interface{} {
+	// Not checking assuming a minimally valid message
+	flds := map[string]interface{}{
+		"version": msg.Version(),
+	}
+	flds["severity_code"] = int(*msg.Severity())
+	flds["facility_code"] = int(*msg.Facility())
+
+	if msg.Timestamp() != nil {
+		flds["timestamp"] = (*msg.Timestamp()).UnixNano()
+	}
+
+	if msg.ProcID() != nil {
+		flds["procid"] = *msg.ProcID()
+	}
+
+	if msg.MsgID() != nil {
+		flds["msgid"] = *msg.MsgID()
+	}
+
+	if msg.Message() != nil {
+		flds["message"] = *msg.Message()
+	}
+
+	if msg.StructuredData() != nil {
+		for sdid, sdparams := range *msg.StructuredData() {
+			if len(sdparams) == 0 {
+				// When SD-ID does not have params we indicate its presence with a bool
+				flds[sdid] = true
+				continue
+			}
+			for name, value := range sdparams {
+				// Using whitespace as separator since it is not allowed by the grammar within SDID
+				flds[sdid+s.Separator+name] = value
+			}
+		}
+	}
+
+	return flds
+}
+
+type unixCloser struct {
+	path   string
+	closer io.Closer
+}
+
+func (uc unixCloser) Close() error {
+	err := uc.closer.Close()
+	os.Remove(uc.path) // ignore error
+	return err
+}
+
+func (s *Syslog) time() time.Time {
+	t := s.now()
+	if t == s.lastTime {
+		t = t.Add(time.Nanosecond)
+	}
+	s.lastTime = t
+	return t
+}
+
+func getNanoNow() time.Time {
+	return time.Unix(0, time.Now().UnixNano())
+}
+
+func init() {
+	receiver := &Syslog{
+		Address: ":6514",
+		now:     getNanoNow,
+		ReadTimeout: &internal.Duration{
+			Duration: defaultReadTimeout,
+		},
+		Separator: "_",
+	}
+
+	inputs.Add("syslog", func() telegraf.Input { return receiver })
+}
diff --git a/plugins/inputs/syslog/syslog_test.go b/plugins/inputs/syslog/syslog_test.go
new file mode 100644
index 000000000..8fa0d9c94
--- /dev/null
+++ b/plugins/inputs/syslog/syslog_test.go
@@ -0,0 +1,60 @@
+package syslog
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	address = ":6514"
+)
+
+var defaultTime = time.Unix(0, 0)
+var maxP = uint8(191)
+var maxV = uint16(999)
+var maxTS = "2017-12-31T23:59:59.999999+00:00"
+var maxH = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabc"
+var maxA = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdef"
+var maxPID = "abcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzabcdefghilmnopqrstuvzab"
+var maxMID = "abcdefghilmnopqrstuvzabcdefghilm"
+var message7681 = strings.Repeat("l", 7681)
+
+func TestAddress(t *testing.T) {
+	var err error
+	var rec *Syslog
+
+	rec = &Syslog{
+		Address: "localhost:6514",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.EqualError(t, err, "missing protocol within address 'localhost:6514'")
+	require.Error(t, err)
+
+	rec = &Syslog{
+		Address: "unsupported://example.com:6514",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.EqualError(t, err, "unknown protocol 'unsupported' in 'example.com:6514'")
+	require.Error(t, err)
+
+	rec = &Syslog{
+		Address: "unixgram:///tmp/telegraf.sock",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.NoError(t, err)
+	require.Equal(t, "/tmp/telegraf.sock", rec.Address)
+	rec.Stop()
+
+	// Default port is 6514
+	rec = &Syslog{
+		Address: "tcp://localhost",
+	}
+	err = rec.Start(&testutil.Accumulator{})
+	require.NoError(t, err)
+	require.Equal(t, "localhost:6514", rec.Address)
+	rec.Stop()
+}

From 1ac64596bf65716e9aa6752ba720ed4f3af758e9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 25 May 2018 14:33:57 -0700
Subject: [PATCH 1223/1302] Update syslog docs and add to changelog and readme

---
 CHANGELOG.md                    |  4 +-
 README.md                       |  1 +
 plugins/inputs/syslog/README.md | 89 +++++++++++++--------------------
 3 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3388d8e9..cb30a56d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [jti_openconfig_telemetry](./plugins/inputs/jti_openconfig_telemetry/README.md) - Contributed by @ajhai
 - [mcrouter](./plugins/inputs/mcrouter/README.md) - Contributed by @cthayer
 - [nvidia_smi](./plugins/inputs/nvidia_smi/README.md) - Contributed by @jackzampolin
+- [syslog](./plugins/inputs/syslog/README.md) - Contributed by @influxdata
 
 ### New Processors
 
@@ -57,7 +58,8 @@
 - [#3969](https://github.com/influxdata/telegraf/pull/3969): Add option to unbound module to use threads as tags.
 - [#4183](https://github.com/influxdata/telegraf/pull/4183): Add support for TLS and username/password auth to aerospike input.
 - [#4190](https://github.com/influxdata/telegraf/pull/4190): Add special syslog timestamp parser to grok parser that uses current year.
--
+- [#4181](https://github.com/influxdata/telegraf/pull/4181): Add syslog input plugin.
+
 ### Bugfixes
 
 - [#4018](https://github.com/influxdata/telegraf/pull/4018): Write to working file outputs if any files are not writeable.
diff --git a/README.md b/README.md
index 3b1355a4f..bf7084a49 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,7 @@ configuration options.
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [solr](./plugins/inputs/solr)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
+* [syslog](./plugins/inputs/syslog)
 * [teamspeak](./plugins/inputs/teamspeak)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
diff --git a/plugins/inputs/syslog/README.md b/plugins/inputs/syslog/README.md
index 010dab60d..107727947 100644
--- a/plugins/inputs/syslog/README.md
+++ b/plugins/inputs/syslog/README.md
@@ -1,10 +1,11 @@
-# syslog input plugin
+# Syslog Input Plugin
 
-Collects syslog messages as per RFC5425 or RFC5426.
+The syslog plugin listens for syslog messages transmitted over
+[UDP](https://tools.ietf.org/html/rfc5426) or
+[TCP](https://tools.ietf.org/html/rfc5425).
 
-It can act as a syslog transport receiver over TLS (or TCP) - ie., RFC5425 - or over UDP - ie., RFC5426.
-
-This plugin listens for syslog messages following RFC5424 format. When received it parses them extracting metrics.
+Syslog messages should be formatted according to
+[RFC 5424](https://tools.ietf.org/html/rfc5424).
 
 ### Configuration
 
@@ -48,72 +49,50 @@ This plugin listens for syslog messages following RFC5424 format. When received
   # sdparam_separator = "_"
 ```
 
-#### Other configs
+#### Best Effort
 
-Other available configurations are:
-
-- `keep_alive_period`, `max_connections` for stream sockets
-- `read_timeout`
-- `best_effort` to tell the parser to work until it is able to do and extract partial but valid info (more [here](https://github.com/influxdata/go-syslog#best-effort-mode))
-- `sdparam_separator` to choose how to separate structured data param name from its structured data identifier
+The [`best_effort`](https://github.com/influxdata/go-syslog#best-effort-mode)
+option instructs the parser to extract partial but valid info from syslog
+messages.  If unset only full messages will be collected.
 
 ### Metrics
 
 - syslog
-  - fields
-    - **version** (`uint16`)
-    - **severity_code** (`int`)
-    - **facility_code** (`int`)
-    - timestamp (`int`)
-    - procid (`string`)
-    - msgid (`string`)
-    - *sdid* (`bool`)
-    - *sdid . sdparam_separator . sdparam_name* (`string`)
   - tags
-    - **severity** (`string`)
-    - **facility** (`string`)
-    - hostname (`string`)
-    - appname (`string`)
+    - severity (string)
+    - facility (string)
+    - hostname (string)
+    - appname (string)
+  - fields
+    - version (integer)
+    - severity_code (integer)
+    - facility_code (integer)
+    - timestamp (integer)
+    - procid (string)
+    - msgid (string)
+    - sdid (bool)
+    - *Structured Data* (string)
 
-The name of fields in _italic_ corresponds to their runtime value.
+### Rsyslog Integration
 
-The fields/tags which name is in **bold** will always be present when a valid Syslog message has been received.
+Rsyslog can be configured to forward logging messages to Telegraf by configuring
+[remote logging](https://www.rsyslog.com/doc/v8-stable/configuration/actions.html#remote-machine).
 
-### RSYSLOG integration
-
-The following instructions illustrate how to configure a syslog transport sender as per RFC5425 - ie., using the octect framing technique - via RSYSLOG.
-
-Install `rsyslog`.
-
-Give it a configuration - ie., `/etc/rsyslog.conf`.
+Most system are setup with a configuration split between `/etc/rsyslog.conf`
+and the files in the `/etc/rsyslog.d/` directory, it is recommended to add the
+new configuration into the config directory to simplify updates to the main
+config file.
 
+Add the following lines to `/etc/rsyslog.d/50-telegraf.conf` making
+adjustments to the target address as needed:
 ```
-$ModLoad imuxsock  # provides support for local system logging
-$ModLoad imklog    # provides kernel logging support
-$ModLoad immark    # provides heart-beat logs
-$FileOwner root
-$FileGroup root
-$FileCreateMode 0640
-$DirCreateMode 0755
-$Umask 0022
-$WorkDirectory /var/spool/rsyslog # default location for work (spool) files
 $ActionQueueType LinkedList # use asynchronous processing
 $ActionQueueFileName srvrfwd # set file name, also enables disk mode
 $ActionResumeRetryCount -1 # infinite retries on insert failure
 $ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
-$IncludeConfig /etc/rsyslog.d/*.conf
-```
 
-Specify you want the octet framing technique enabled and the format of each syslog message to follow the RFC5424.
-
-Create a file - eg., `/etc/rsyslog.d/50-default.conf` - containing:
-
-```
+# forward over tcp with octet framing according to RFC 5425
 *.* @@(o)127.0.0.1:6514;RSYSLOG_SyslogProtocol23Format
 ```
 
-To complete the TLS setup please refer to [rsyslog docs](https://www.rsyslog.com/doc/v8-stable/tutorials/tls.html).
-
-Notice that this configuration tells `rsyslog` to broadcast messages to `127.0.0.1>6514`.
-
-So you have to configure this plugin accordingly.
\ No newline at end of file
+To complete TLS setup please refer to [rsyslog docs](https://www.rsyslog.com/doc/v8-stable/tutorials/tls.html).

From c8b68430f01c0750ec5e2f281c82c1dd059b5b4b Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Tue, 29 May 2018 20:34:00 +0200
Subject: [PATCH 1224/1302] Fix struct alignment in win_perf_counters for
 32-bit 386 arch (#4206)

---
 plugins/inputs/win_perf_counters/pdh.go       |  82 ------------
 plugins/inputs/win_perf_counters/pdh_386.go   | 121 ++++++++++++++++++
 plugins/inputs/win_perf_counters/pdh_amd64.go | 114 +++++++++++++++++
 3 files changed, 235 insertions(+), 82 deletions(-)
 create mode 100644 plugins/inputs/win_perf_counters/pdh_386.go
 create mode 100644 plugins/inputs/win_perf_counters/pdh_amd64.go

diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index edf6d0651..f637eb256 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -161,88 +161,6 @@ type (
 	PDH_HCOUNTER HANDLE // counter handle
 )
 
-// Union specialization for double values
-type PDH_FMT_COUNTERVALUE_DOUBLE struct {
-	CStatus     uint32
-	DoubleValue float64
-}
-
-// Union specialization for 64 bit integer values
-type PDH_FMT_COUNTERVALUE_LARGE struct {
-	CStatus    uint32
-	LargeValue int64
-}
-
-// Union specialization for long values
-type PDH_FMT_COUNTERVALUE_LONG struct {
-	CStatus   uint32
-	LongValue int32
-	padding   [4]byte
-}
-
-// Union specialization for double values, used by PdhGetFormattedCounterArrayDouble()
-type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
-}
-
-// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
-type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_LARGE
-}
-
-// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
-type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
-	SzName   *uint16 // pointer to a string
-	FmtValue PDH_FMT_COUNTERVALUE_LONG
-}
-
-//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
-type PDH_COUNTER_INFO struct {
-	//Size of the structure, including the appended strings, in bytes.
-	DwLength uint32
-	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
-	//The counter type constants are defined in Winperf.h.
-	DwType uint32
-	//Counter version information. Not used.
-	CVersion uint32
-	//Counter status that indicates if the counter value is valid. For a list of possible values,
-	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
-	CStatus uint32
-	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
-	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
-	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
-	LScale int32
-	//Default scale factor as suggested by the counter's provider.
-	LDefaultScale int32
-	//The value passed in the dwUserData parameter when calling PdhAddCounter.
-	DwUserData *uint32
-	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
-	DwQueryUserData *uint32
-	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
-	SzFullPath *uint16 // pointer to a string
-	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
-	//The string follows this structure in memory.
-	SzMachineName *uint16 // pointer to a string
-	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
-	SzObjectName *uint16 // pointer to a string
-	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
-	//The string follows this structure in memory.
-	SzInstanceName *uint16 // pointer to a string
-	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
-	//The string follows this structure in memory.
-	SzParentInstance *uint16 // pointer to a string
-	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
-	DwInstanceIndex uint32 // pointer to a string
-	//Null-terminated string that contains the counter name. The string follows this structure in memory.
-	SzCounterName *uint16 // pointer to a string
-	//Help text that describes the counter. Is NULL if the source is a log file.
-	SzExplainText *uint16 // pointer to a string
-	//Start of the string data that is appended to the structure.
-	DataBuffer *uint32 // pointer to an extra space
-}
-
 var (
 	// Library
 	libpdhDll *syscall.DLL
diff --git a/plugins/inputs/win_perf_counters/pdh_386.go b/plugins/inputs/win_perf_counters/pdh_386.go
new file mode 100644
index 000000000..134d15c8d
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/pdh_386.go
@@ -0,0 +1,121 @@
+// Copyright (c) 2010 The win Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The names of the authors may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This is the official list of 'win' authors for copyright purposes.
+//
+// Alexander Neumann <an2048@googlemail.com>
+// Joseph Watson <jtwatson@linux-consulting.us>
+// Kevin Pors <krpors@gmail.com>
+
+// +build windows
+
+package win_perf_counters
+
+// Union specialization for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	padding     [4]byte
+	DoubleValue float64
+}
+
+// Union specialization for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	padding    [4]byte
+	LargeValue int64
+}
+
+// Union specialization for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
+	SzName   *uint16
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
+}
+
+// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
+	SzName   *uint16 // pointer to a string
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_LARGE
+}
+
+// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
+	SzName   *uint16 // pointer to a string
+	padding  [4]byte
+	FmtValue PDH_FMT_COUNTERVALUE_LONG
+}
+
+//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
+type PDH_COUNTER_INFO struct {
+	//Size of the structure, including the appended strings, in bytes.
+	DwLength uint32
+	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
+	//The counter type constants are defined in Winperf.h.
+	DwType uint32
+	//Counter version information. Not used.
+	CVersion uint32
+	//Counter status that indicates if the counter value is valid. For a list of possible values,
+	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
+	CStatus uint32
+	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
+	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
+	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
+	LScale int32
+	//Default scale factor as suggested by the counter's provider.
+	LDefaultScale int32
+	//The value passed in the dwUserData parameter when calling PdhAddCounter.
+	DwUserData *uint32
+	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
+	DwQueryUserData *uint32
+	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
+	SzFullPath *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
+	//The string follows this structure in memory.
+	SzMachineName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
+	SzObjectName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
+	//The string follows this structure in memory.
+	SzInstanceName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
+	//The string follows this structure in memory.
+	SzParentInstance *uint16 // pointer to a string
+	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
+	DwInstanceIndex uint32 // pointer to a string
+	//Null-terminated string that contains the counter name. The string follows this structure in memory.
+	SzCounterName *uint16 // pointer to a string
+	//padding
+	Padding [4]byte
+	//Help text that describes the counter. Is NULL if the source is a log file.
+	SzExplainText *uint16 // pointer to a string
+	//Start of the string data that is appended to the structure.
+	DataBuffer [1]uint32 // pointer to an extra space
+}
diff --git a/plugins/inputs/win_perf_counters/pdh_amd64.go b/plugins/inputs/win_perf_counters/pdh_amd64.go
new file mode 100644
index 000000000..ff3b39335
--- /dev/null
+++ b/plugins/inputs/win_perf_counters/pdh_amd64.go
@@ -0,0 +1,114 @@
+// Copyright (c) 2010 The win Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The names of the authors may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This is the official list of 'win' authors for copyright purposes.
+//
+// Alexander Neumann <an2048@googlemail.com>
+// Joseph Watson <jtwatson@linux-consulting.us>
+// Kevin Pors <krpors@gmail.com>
+
+// +build windows
+
+package win_perf_counters
+
+// Union specialization for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	DoubleValue float64
+}
+
+// Union specialization for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	LargeValue int64
+}
+
+// Union specialization for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+type PDH_FMT_COUNTERVALUE_ITEM_DOUBLE struct {
+	SzName   *uint16
+	FmtValue PDH_FMT_COUNTERVALUE_DOUBLE
+}
+
+// Union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PDH_FMT_COUNTERVALUE_ITEM_LARGE struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LARGE
+}
+
+// Union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PDH_FMT_COUNTERVALUE_ITEM_LONG struct {
+	SzName   *uint16 // pointer to a string
+	FmtValue PDH_FMT_COUNTERVALUE_LONG
+}
+
+//PDH_COUNTER_INFO structure contains information describing the properties of a counter. This information also includes the counter path.
+type PDH_COUNTER_INFO struct {
+	//Size of the structure, including the appended strings, in bytes.
+	DwLength uint32
+	//Counter type. For a list of counter types, see the Counter Types section of the <a "href=http://go.microsoft.com/fwlink/p/?linkid=84422">Windows Server 2003 Deployment Kit</a>.
+	//The counter type constants are defined in Winperf.h.
+	DwType uint32
+	//Counter version information. Not used.
+	CVersion uint32
+	//Counter status that indicates if the counter value is valid. For a list of possible values,
+	//see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa371894(v=vs.85).aspx">Checking PDH Interface Return Values</a>.
+	CStatus uint32
+	//Scale factor to use when computing the displayable value of the counter. The scale factor is a power of ten.
+	//The valid range of this parameter is PDH_MIN_SCALE (–7) (the returned value is the actual value times 10–⁷) to
+	//PDH_MAX_SCALE (+7) (the returned value is the actual value times 10⁺⁷). A value of zero will set the scale to one, so that the actual value is returned
+	LScale int32
+	//Default scale factor as suggested by the counter's provider.
+	LDefaultScale int32
+	//The value passed in the dwUserData parameter when calling PdhAddCounter.
+	DwUserData *uint32
+	//The value passed in the dwUserData parameter when calling PdhOpenQuery.
+	DwQueryUserData *uint32
+	//Null-terminated string that specifies the full counter path. The string follows this structure in memory.
+	SzFullPath *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the computer specified in the counter path. Is NULL, if the path does not specify a computer.
+	//The string follows this structure in memory.
+	SzMachineName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the performance object specified in the counter path. The string follows this structure in memory.
+	SzObjectName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the object instance specified in the counter path. Is NULL, if the path does not specify an instance.
+	//The string follows this structure in memory.
+	SzInstanceName *uint16 // pointer to a string
+	//Null-terminated string that contains the name of the parent instance specified in the counter path. Is NULL, if the path does not specify a parent instance.
+	//The string follows this structure in memory.
+	SzParentInstance *uint16 // pointer to a string
+	//Instance index specified in the counter path. Is 0, if the path does not specify an instance index.
+	DwInstanceIndex uint32 // pointer to a string
+	//Null-terminated string that contains the counter name. The string follows this structure in memory.
+	SzCounterName *uint16 // pointer to a string
+	//Help text that describes the counter. Is NULL if the source is a log file.
+	SzExplainText *uint16 // pointer to a string
+	//Start of the string data that is appended to the structure.
+	DataBuffer [1]uint32 // pointer to an extra space
+}

From 59f0a5354fd95ecb85c7807d84e807d29454d1b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 29 May 2018 16:10:27 -0700
Subject: [PATCH 1225/1302] Log if connection is closed on write error

---
 plugins/outputs/socket_writer/socket_writer.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 7c4660bc8..8b0f56acc 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -137,6 +137,7 @@ func (sw *SocketWriter) Write(metrics []telegraf.Metric) error {
 				// permanent error. close the connection
 				sw.Close()
 				sw.Conn = nil
+				return fmt.Errorf("closing connection: %v", err)
 			}
 			return err
 		}

From 5ae2b02f5d48b1a1e672842a8f70bda1fefe4663 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Tue, 29 May 2018 22:03:37 -0400
Subject: [PATCH 1226/1302] Fix snmp overriding of auto-configured table fields
 (#4208)

Whenever the snmp plugin was configured with a table with automatic field
discovery, if one of those fields was explicitly overridden in the config and
the value of is_tag was changed, the field would be duplicated, once as a tag
& once as a field.

This change fixes the behavior so that if a field is explicitly configured,
automatic table field discovery doesn't touch it.
---
 CHANGELOG.md                               |  1 +
 plugins/inputs/snmp/snmp.go                | 12 +++++++++++-
 plugins/inputs/snmp/snmp_mocks_generate.go |  3 ++-
 plugins/inputs/snmp/snmp_mocks_test.go     |  5 +++--
 plugins/inputs/snmp/snmp_test.go           | 17 +++++++++++------
 plugins/inputs/snmp/testdata/test.mib      |  7 +++++++
 6 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb30a56d2..c343130dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
 - [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
+- [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
 
 ## v1.6.3 [2018-05-21]
 
diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go
index 9dcce12ad..50a3cb0ae 100644
--- a/plugins/inputs/snmp/snmp.go
+++ b/plugins/inputs/snmp/snmp.go
@@ -218,10 +218,20 @@ func (t *Table) initBuild() error {
 	if err != nil {
 		return err
 	}
+
 	if t.Name == "" {
 		t.Name = oidText
 	}
-	t.Fields = append(t.Fields, fields...)
+
+	knownOIDs := map[string]bool{}
+	for _, f := range t.Fields {
+		knownOIDs[f.Oid] = true
+	}
+	for _, f := range fields {
+		if !knownOIDs[f.Oid] {
+			t.Fields = append(t.Fields, f)
+		}
+	}
 
 	return nil
 }
diff --git a/plugins/inputs/snmp/snmp_mocks_generate.go b/plugins/inputs/snmp/snmp_mocks_generate.go
index c3c041279..c09dd0045 100644
--- a/plugins/inputs/snmp/snmp_mocks_generate.go
+++ b/plugins/inputs/snmp/snmp_mocks_generate.go
@@ -21,7 +21,7 @@ var mockedCommands = [][]string{
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", "1.0.0.1.1"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.1"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.1.0"},
-	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.4"},
+	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.0.0.0.1.5"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".1.2.3"},
 	{"snmptranslate", "-Td", "-Ob", ".iso.2.3"},
 	{"snmptranslate", "-Td", "-Ob", "-m", "all", ".999"},
@@ -30,6 +30,7 @@ var mockedCommands = [][]string{
 	{"snmptranslate", "-Td", "-Ob", "TEST::testTable"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::connections"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::latency"},
+	{"snmptranslate", "-Td", "-Ob", "TEST::description"},
 	{"snmptranslate", "-Td", "-Ob", "TEST::hostname"},
 	{"snmptranslate", "-Td", "-Ob", "IF-MIB::ifPhysAddress.1"},
 	{"snmptranslate", "-Td", "-Ob", "BRIDGE-MIB::dot1dTpFdbAddress.1"},
diff --git a/plugins/inputs/snmp/snmp_mocks_test.go b/plugins/inputs/snmp/snmp_mocks_test.go
index 2f67335d4..63a8a80ec 100644
--- a/plugins/inputs/snmp/snmp_mocks_test.go
+++ b/plugins/inputs/snmp/snmp_mocks_test.go
@@ -67,7 +67,7 @@ var mockedCommandResults = map[string]mockedCommandResult{
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x001.0.0.1.1":                   mockedCommandResult{stdout: "TEST::hostname\nhostname OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 1 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.1":                mockedCommandResult{stdout: "TEST::server\nserver OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.1.0":              mockedCommandResult{stdout: "TEST::server.0\nserver OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) server(1) 0 }\n", stderr: "", exitError: false},
-	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.4":                mockedCommandResult{stdout: "TEST::testTableEntry.4\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 4 }\n", stderr: "", exitError: false},
+	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.0.0.0.1.5":                mockedCommandResult{stdout: "TEST::testTableEntry.5\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 5 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.1.2.3":                      mockedCommandResult{stdout: "iso.2.3\niso OBJECT-TYPE\n  -- FROM\t#-1\n::= { iso(1) 2 3 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00.iso.2.3":                                 mockedCommandResult{stdout: "iso.2.3\niso OBJECT-TYPE\n  -- FROM\t#-1\n::= { iso(1) 2 3 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00-m\x00all\x00.999":                        mockedCommandResult{stdout: ".999\n [TRUNCATED]\n", stderr: "", exitError: false},
@@ -76,10 +76,11 @@ var mockedCommandResults = map[string]mockedCommandResult{
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::testTable":                          mockedCommandResult{stdout: "TEST::testTable\ntestTable OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 0 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::connections":                        mockedCommandResult{stdout: "TEST::connections\nconnections OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tINTEGER\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 2 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::latency":                            mockedCommandResult{stdout: "TEST::latency\nlatency OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 3 }\n", stderr: "", exitError: false},
+	"snmptranslate\x00-Td\x00-Ob\x00TEST::description":                        mockedCommandResult{stdout: "TEST::description\ndescription OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) testTable(0) testTableEntry(1) 4 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TEST::hostname":                           mockedCommandResult{stdout: "TEST::hostname\nhostname OBJECT-TYPE\n  -- FROM\tTEST\n  SYNTAX\tOCTET STRING\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n::= { iso(1) 0 testOID(0) 1 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00IF-MIB::ifPhysAddress.1":                  mockedCommandResult{stdout: "IF-MIB::ifPhysAddress.1\nifPhysAddress OBJECT-TYPE\n  -- FROM\tIF-MIB\n  -- TEXTUAL CONVENTION PhysAddress\n  SYNTAX\tOCTET STRING\n  DISPLAY-HINT\t\"1x:\"\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n  DESCRIPTION\t\"The interface's address at its protocol sub-layer.  For\n            example, for an 802.x interface, this object normally\n            contains a MAC address.  The interface's media-specific MIB\n            must define the bit and byte ordering and the format of the\n            value of this object.  For interfaces which do not have such\n            an address (e.g., a serial line), this object should contain\n            an octet string of zero length.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) interfaces(2) ifTable(2) ifEntry(1) ifPhysAddress(6) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00BRIDGE-MIB::dot1dTpFdbAddress.1":          mockedCommandResult{stdout: "BRIDGE-MIB::dot1dTpFdbAddress.1\ndot1dTpFdbAddress OBJECT-TYPE\n  -- FROM\tBRIDGE-MIB\n  -- TEXTUAL CONVENTION MacAddress\n  SYNTAX\tOCTET STRING (6) \n  DISPLAY-HINT\t\"1x:\"\n  MAX-ACCESS\tread-only\n  STATUS\tcurrent\n  DESCRIPTION\t\"A unicast MAC address for which the bridge has\n        forwarding and/or filtering information.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) dot1dBridge(17) dot1dTp(4) dot1dTpFdbTable(3) dot1dTpFdbEntry(1) dot1dTpFdbAddress(1) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00-Ob\x00TCP-MIB::tcpConnectionLocalAddress.1":     mockedCommandResult{stdout: "TCP-MIB::tcpConnectionLocalAddress.1\ntcpConnectionLocalAddress OBJECT-TYPE\n  -- FROM\tTCP-MIB\n  -- TEXTUAL CONVENTION InetAddress\n  SYNTAX\tOCTET STRING (0..255) \n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  DESCRIPTION\t\"The local IP address for this TCP connection.  The type\n            of this address is determined by the value of\n            tcpConnectionLocalAddressType.\n\n            As this object is used in the index for the\n            tcpConnectionTable, implementors should be\n            careful not to create entries that would result in OIDs\n            with more than 128 subidentifiers; otherwise the information\n            cannot be accessed by using SNMPv1, SNMPv2c, or SNMPv3.\"\n::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) tcp(6) tcpConnectionTable(19) tcpConnectionEntry(1) tcpConnectionLocalAddress(2) 1 }\n", stderr: "", exitError: false},
 	"snmptranslate\x00-Td\x00TEST::testTable.1":                               mockedCommandResult{stdout: "TEST::testTableEntry\ntestTableEntry OBJECT-TYPE\n  -- FROM\tTEST\n  MAX-ACCESS\tnot-accessible\n  STATUS\tcurrent\n  INDEX\t\t{ server }\n::= { iso(1) 0 testOID(0) testTable(0) 1 }\n", stderr: "", exitError: false},
-	"snmptable\x00-Ch\x00-Cl\x00-c\x00public\x00127.0.0.1\x00TEST::testTable": mockedCommandResult{stdout: "server connections latency \nTEST::testTable: No entries\n", stderr: "", exitError: false},
+	"snmptable\x00-Ch\x00-Cl\x00-c\x00public\x00127.0.0.1\x00TEST::testTable": mockedCommandResult{stdout: "server connections latency description \nTEST::testTable: No entries\n", stderr: "", exitError: false},
 }
diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
index 6ab28c335..c2e842a00 100644
--- a/plugins/inputs/snmp/snmp_test.go
+++ b/plugins/inputs/snmp/snmp_test.go
@@ -72,7 +72,7 @@ var tsc = &testSNMPConnection{
 		".1.0.0.0.1.3.1":     "0.456",
 		".1.0.0.0.1.3.2":     "0.000",
 		".1.0.0.0.1.3.3":     "9.999",
-		".1.0.0.0.1.4.0":     123456,
+		".1.0.0.0.1.5.0":     123456,
 		".1.0.0.1.1":         "baz",
 		".1.0.0.1.2":         234,
 		".1.0.0.1.3":         []byte("byte slice"),
@@ -159,19 +159,23 @@ func TestFieldInit(t *testing.T) {
 
 func TestTableInit(t *testing.T) {
 	tbl := Table{
-		Oid:    ".1.0.0.0",
-		Fields: []Field{{Oid: ".999", Name: "foo"}},
+		Oid: ".1.0.0.0",
+		Fields: []Field{
+			{Oid: ".999", Name: "foo"},
+			{Oid: "TEST::description", Name: "description", IsTag: true},
+		},
 	}
 	err := tbl.init()
 	require.NoError(t, err)
 
 	assert.Equal(t, "testTable", tbl.Name)
 
-	assert.Len(t, tbl.Fields, 4)
+	assert.Len(t, tbl.Fields, 5)
 	assert.Contains(t, tbl.Fields, Field{Oid: ".999", Name: "foo", initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
 	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
+	assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", IsTag: true, initialized: true})
 }
 
 func TestSnmpInit(t *testing.T) {
@@ -187,10 +191,11 @@ func TestSnmpInit(t *testing.T) {
 	err := s.init()
 	require.NoError(t, err)
 
-	assert.Len(t, s.Tables[0].Fields, 3)
+	assert.Len(t, s.Tables[0].Fields, 4)
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
 	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
+	assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", initialized: true})
 
 	assert.Equal(t, Field{
 		Oid:         ".1.0.0.1.1",
@@ -579,7 +584,7 @@ func TestGather(t *testing.T) {
 				Fields: []Field{
 					{
 						Name: "myOtherField",
-						Oid:  ".1.0.0.0.1.4",
+						Oid:  ".1.0.0.0.1.5",
 					},
 				},
 			},
diff --git a/plugins/inputs/snmp/testdata/test.mib b/plugins/inputs/snmp/testdata/test.mib
index d3246673b..7c3758d66 100644
--- a/plugins/inputs/snmp/testdata/test.mib
+++ b/plugins/inputs/snmp/testdata/test.mib
@@ -22,6 +22,7 @@ TestTableEntry ::=
 		server OCTET STRING,
 		connections  INTEGER,
 		latency  OCTET STRING,
+		description OCTET STRING,
 	}
 
 server OBJECT-TYPE
@@ -42,6 +43,12 @@ latency OBJECT-TYPE
 	STATUS current
 	::= { testTableEntry 3 }
 
+description OBJECT-TYPE
+	SYNTAX OCTET STRING
+	MAX-ACCESS read-only
+	STATUS current
+	::= { testTableEntry 4 }
+
 hostname OBJECT-TYPE
 	SYNTAX OCTET STRING
 	MAX-ACCESS read-only

From e0071f365acbd9471a50b4d01a0c33428dc0da07 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Thu, 31 May 2018 20:56:49 +0200
Subject: [PATCH 1227/1302] Print the enabled aggregator and processor plugins
 on startup (#4212)

---
 cmd/telegraf/telegraf.go  |  4 +++-
 internal/config/config.go | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 2e6ee3fe8..e3ab11028 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -166,8 +166,10 @@ func reloadLoop(
 		}()
 
 		log.Printf("I! Starting Telegraf %s\n", displayVersion())
-		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Loaded inputs: %s", strings.Join(c.InputNames(), " "))
+		log.Printf("I! Loaded aggregators: %s", strings.Join(c.AggregatorNames(), " "))
+		log.Printf("I! Loaded processors: %s", strings.Join(c.ProcessorNames(), " "))
+		log.Printf("I! Loaded outputs: %s", strings.Join(c.OutputNames(), " "))
 		log.Printf("I! Tags enabled: %s", c.ListTags())
 
 		if *fPidfile != "" {
diff --git a/internal/config/config.go b/internal/config/config.go
index e7a008f4b..8a31c271e 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -156,6 +156,24 @@ func (c *Config) InputNames() []string {
 	return name
 }
 
+// Outputs returns a list of strings of the configured aggregators.
+func (c *Config) AggregatorNames() []string {
+	var name []string
+	for _, aggregator := range c.Aggregators {
+		name = append(name, aggregator.Name())
+	}
+	return name
+}
+
+// Outputs returns a list of strings of the configured processors.
+func (c *Config) ProcessorNames() []string {
+	var name []string
+	for _, processor := range c.Processors {
+		name = append(name, processor.Name)
+	}
+	return name
+}
+
 // Outputs returns a list of strings of the configured outputs.
 func (c *Config) OutputNames() []string {
 	var name []string

From cabee8f8e00e24dbde9c4e7623aebe9116fadffb Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 30 May 2018 13:21:56 -0700
Subject: [PATCH 1228/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c343130dc..f880bdf9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - [#4183](https://github.com/influxdata/telegraf/pull/4183): Add support for TLS and username/password auth to aerospike input.
 - [#4190](https://github.com/influxdata/telegraf/pull/4190): Add special syslog timestamp parser to grok parser that uses current year.
 - [#4181](https://github.com/influxdata/telegraf/pull/4181): Add syslog input plugin.
+- [#4212](https://github.com/influxdata/telegraf/pull/4212): Print the enabled aggregator and processor plugins on startup.
 
 ### Bugfixes
 
@@ -68,6 +69,7 @@
 - [#4155](https://github.com/influxdata/telegraf/pull/4155): Add consul service tags to metric.
 - [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
+- [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
 - [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
 
 ## v1.6.3 [2018-05-21]

From 8b28f40cc08f938ffd49037969e94f7b4dfa5755 Mon Sep 17 00:00:00 2001
From: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
Date: Sat, 2 Jun 2018 00:47:40 +0700
Subject: [PATCH 1229/1302] Handle uint64 on cloudwatch output (#4219)

---
 plugins/outputs/cloudwatch/cloudwatch.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 783a21416..39b13cf29 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -177,6 +177,8 @@ func BuildMetricDatum(point telegraf.Metric) []*cloudwatch.MetricDatum {
 			value = float64(t)
 		case int64:
 			value = float64(t)
+		case uint64:
+			value = float64(t)
 		case float64:
 			value = t
 		case bool:

From b556eb8b2fd94fd10d6bfd3a8875ecba0afd2492 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 1 Jun 2018 10:51:23 -0700
Subject: [PATCH 1230/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f880bdf9b..f48dca678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,7 +70,13 @@
 - [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
 - [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
+
+## v1.6.4 [unreleased]
+
+### Bugfixes
+
 - [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
+- [#4218](https://github.com/influxdata/telegraf/issues/4218): Fix uint support in cloudwatch output.
 
 ## v1.6.3 [2018-05-21]
 

From 2cc2913d81499bc9dbbaea7f3413ccc2b7d87db9 Mon Sep 17 00:00:00 2001
From: Mike Gent <gent@vexpanse.net>
Date: Sun, 3 Jun 2018 17:52:00 -0500
Subject: [PATCH 1231/1302] Add static routing_key option to amqp output
 (#3994)

---
 etc/telegraf.conf              |  6 ++++--
 plugins/outputs/amqp/README.md | 17 +++++++++++++----
 plugins/outputs/amqp/amqp.go   | 10 +++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 1e7e8bed1..12baeb982 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -168,8 +168,11 @@
 #   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
 #   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
+#   ## Topic routing key
+#   # routing_key = ""
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, its value will be used as the routing key
+#   ##  and override routing_key config even if defined
 #   routing_tag = "host"
 #   ## Delivery Mode controls if a published message is persistent
 #   ## Valid options are "transient" and "persistent". default: "transient"
@@ -2328,7 +2331,7 @@
 #   reverse_metric_names = true
 
 
-# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
@@ -3630,4 +3633,3 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
-
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index ea17fe769..52a4ccbd1 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -2,12 +2,18 @@
 
 This plugin writes to a AMQP 0-9-1 Exchange, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
 
-Metrics are written to a topic exchange using tag, defined in configuration file as RoutingTag, as a routing key.
+Metrics are written to a topic exchange using a routing key defined by:
+1. The routing_key config defines a static value
+2. The routing_tag config defines a metric tag with a dynamic value, overriding the static routing_key if found
+3. If neither option is defined, or the tag is not found in a metric, then the empty routing key will be used
 
-If RoutingTag is empty, then empty routing key will be used.
-Metrics are grouped in batches by RoutingTag.
+Metrics are grouped in batches by the final routing key.
 
-This plugin doesn't bind exchange to a queue, so it should be done by consumer.
+This plugin doesn't bind exchange to a queue, so it should be done by consumer. The exchange is always defined as type: topic.
+To use it for distributing metrics equally among workers (type: direct), set the routing_key to a static value on the exchange,
+declare and bind a single queue with the same routing_key, and consume from the same queue in each worker.
+To use it to send metrics to many consumers at once (type: fanout), set the routing_key to "#" on the exchange, then declare, bind,
+and consume from individual queues in each worker.
 
 For an introduction to AMQP see:
 - https://www.rabbitmq.com/tutorials/amqp-concepts.html
@@ -26,8 +32,11 @@ For an introduction to AMQP see:
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
+  ## Topic routing key
+  # routing_key = ""
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
+  ##  and override routing_key config even if defined
   routing_tag = "host"
   ## Delivery Mode controls if a published message is persistent
   ## Valid options are "transient" and "persistent". default: "transient"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index f2bfb7ac7..bd3068eb8 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -30,7 +30,9 @@ type AMQP struct {
 	Exchange string
 	// AMQP Auth method
 	AuthMethod string
-	// Routing Key Tag
+	// Routing Key (static)
+	RoutingKey string `toml:"routing_key"`
+	// Routing Key from Tag
 	RoutingTag string `toml:"routing_tag"`
 	// InfluxDB database
 	Database string
@@ -77,8 +79,11 @@ var sampleConfig = `
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
+  ## Topic routing key
+  # routing_key = ""
   ## Telegraf tag to use as a routing key
   ##  ie, if this tag exists, its value will be used as the routing key
+  ##  and override routing_key config even if defined
   routing_tag = "host"
   ## Delivery Mode controls if a published message is persistent
   ## Valid options are "transient" and "persistent". default: "transient"
@@ -234,6 +239,9 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 
 	for _, metric := range metrics {
 		var key string
+		if q.RoutingKey != "" {
+			key = q.RoutingKey
+		}
 		if q.RoutingTag != "" {
 			if h, ok := metric.Tags()[q.RoutingTag]; ok {
 				key = h

From 312116c10103a8f09e2cba9038af5a73857ffa49 Mon Sep 17 00:00:00 2001
From: Mike Gent <gent@vexpanse.net>
Date: Sun, 3 Jun 2018 17:52:59 -0500
Subject: [PATCH 1232/1302] Add passive mode exchange declaration option to
 amqp consumer input (#3995)

---
 etc/telegraf.conf                             |  2 ++
 plugins/inputs/amqp_consumer/README.md        |  2 ++
 plugins/inputs/amqp_consumer/amqp_consumer.go | 34 ++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 12baeb982..41f244ec8 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -3036,6 +3036,8 @@
 #   url = "amqp://localhost:5672/influxdb"
 #   ## AMQP exchange
 #   exchange = "telegraf"
+#   ## Exchange passive mode
+#   exchange_passive = false
 #   ## AMQP queue name
 #   queue = "telegraf"
 #   ## Binding Key
diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index a14e2c8b0..c10a4410a 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -19,6 +19,8 @@ The following defaults are known to work with RabbitMQ:
   url = "amqp://localhost:5672/influxdb"
   ## AMQP exchange
   exchange = "telegraf"
+  ## Exchange passive mode
+  exchange_passive = false
   ## AMQP queue name
   queue = "telegraf"
   ## Binding Key
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 48458a0b7..6ed79f6c4 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -20,6 +20,8 @@ type AMQPConsumer struct {
 	URL string
 	// AMQP exchange
 	Exchange string
+	// Exchange passive mode
+	ExchangePassive bool
 	// Queue Name
 	Queue string
 	// Binding Key
@@ -58,6 +60,8 @@ func (a *AMQPConsumer) SampleConfig() string {
   url = "amqp://localhost:5672/influxdb"
   ## AMQP exchange
   exchange = "telegraf"
+  ## Exchange passive mode
+  exchange_passive = false
   ## AMQP queue name
   queue = "telegraf"
   ## Binding Key
@@ -174,15 +178,27 @@ func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, err
 		return nil, fmt.Errorf("Failed to open a channel: %s", err)
 	}
 
-	err = ch.ExchangeDeclare(
-		a.Exchange, // name
-		"topic",    // type
-		true,       // durable
-		false,      // auto-deleted
-		false,      // internal
-		false,      // no-wait
-		nil,        // arguments
-	)
+	if a.ExchangePassive == true {
+		err = ch.ExchangeDeclarePassive(
+			a.Exchange, // name
+			"topic",    // type
+			true,       // durable
+			false,      // auto-deleted
+			false,      // internal
+			false,      // no-wait
+			nil,        // arguments
+		)
+	} else {
+		err = ch.ExchangeDeclare(
+			a.Exchange, // name
+			"topic",    // type
+			true,       // durable
+			false,      // auto-deleted
+			false,      // internal
+			false,      // no-wait
+			nil,        // arguments
+		)
+	}
 	if err != nil {
 		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
 	}

From 90bcb5bc3ce3d642e87783d217edae0a84dcbc8f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 15:55:18 -0700
Subject: [PATCH 1233/1302] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f48dca678..2aca563bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,8 @@
 - [#4190](https://github.com/influxdata/telegraf/pull/4190): Add special syslog timestamp parser to grok parser that uses current year.
 - [#4181](https://github.com/influxdata/telegraf/pull/4181): Add syslog input plugin.
 - [#4212](https://github.com/influxdata/telegraf/pull/4212): Print the enabled aggregator and processor plugins on startup.
+- [#3994](https://github.com/influxdata/telegraf/pull/3994): Add static routing_key option to amqp output.
+- [#3995](https://github.com/influxdata/telegraf/pull/3995): Add passive mode exchange declaration option to amqp consumer input.
 
 ### Bugfixes
 

From fcea745e9978a9aaf2c7c11407ba70ebe7cad6a2 Mon Sep 17 00:00:00 2001
From: Dark <ekdxhrl0096@gmail.com>
Date: Mon, 4 Jun 2018 10:31:47 +0900
Subject: [PATCH 1234/1302] Change config to match toml parsing rule. (#4225)

---
 plugins/outputs/http/README.md | 10 +++++-----
 plugins/outputs/http/http.go   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/outputs/http/README.md b/plugins/outputs/http/README.md
index 2af3fb27a..5005e9f02 100644
--- a/plugins/outputs/http/README.md
+++ b/plugins/outputs/http/README.md
@@ -21,11 +21,6 @@ data formats.  For data_formats that support batching, metrics are sent in batch
   # username = "username"
   # password = "pa$$word"
 
-  ## Additional HTTP headers
-  # [outputs.http.headers]
-  #   # Should be set manually to "application/json" for json data_format
-  #   Content-Type = "text/plain; charset=utf-8"
-
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -38,4 +33,9 @@ data formats.  For data_formats that support batching, metrics are sent in batch
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   # data_format = "influx"
+  
+  ## Additional HTTP headers
+  # [outputs.http.headers]
+  #   # Should be set manually to "application/json" for json data_format
+  #   Content-Type = "text/plain; charset=utf-8"
 ```
diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
index 4b769a467..198aefe07 100644
--- a/plugins/outputs/http/http.go
+++ b/plugins/outputs/http/http.go
@@ -29,11 +29,6 @@ var sampleConfig = `
   # username = "username"
   # password = "pa$$word"
 
-  ## Additional HTTP headers
-  # [outputs.http.headers]
-  #   # Should be set to "application/json" for json data_format
-  #   Content-Type = "text/plain; charset=utf-8"
-
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
@@ -46,6 +41,11 @@ var sampleConfig = `
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   # data_format = "influx"
+  
+  ## Additional HTTP headers
+  # [outputs.http.headers]
+  #   # Should be set manually to "application/json" for json data_format
+  #   Content-Type = "text/plain; charset=utf-8"
 `
 
 const (

From e3f1d289084edf167978a305814690cba9e71a37 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 16:31:11 -0700
Subject: [PATCH 1235/1302] Allow configuration of amqp exchange type,
 durability, and arguments

---
 plugins/inputs/amqp_consumer/README.md        |  27 ++--
 plugins/inputs/amqp_consumer/amqp_consumer.go | 119 +++++++++++++-----
 plugins/outputs/amqp/README.md                |  21 +++-
 plugins/outputs/amqp/amqp.go                  | 109 +++++++++++++---
 4 files changed, 217 insertions(+), 59 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index c10a4410a..53d97d080 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -17,23 +17,36 @@ The following defaults are known to work with RabbitMQ:
 [[inputs.amqp_consumer]]
   ## AMQP url
   url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+
+  ## Exchange to declare and consume from.
   exchange = "telegraf"
-  ## Exchange passive mode
-  exchange_passive = false
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_args = { }
+  # exchange_args = {"hash_propery" = "timestamp"}
+
   ## AMQP queue name
   queue = "telegraf"
   ## Binding Key
   binding_key = "#"
 
-  ## Controls how many messages the server will try to keep on the network
-  ## for consumers before receiving delivery acks.
-  #prefetch_count = 50
+  ## Maximum number of messages server should give to the worker.
+  prefetch_count = 50
 
-  ## Auth method. PLAIN and EXTERNAL are supported.
+  ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 6ed79f6c4..ad0e3ce7b 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -18,10 +18,13 @@ import (
 // AMQPConsumer is the top level struct for this plugin
 type AMQPConsumer struct {
 	URL string
-	// AMQP exchange
-	Exchange string
-	// Exchange passive mode
-	ExchangePassive bool
+
+	Exchange           string            `toml:"exchange"`
+	ExchangeType       string            `toml:"exchange_type"`
+	ExchangeDurability string            `toml:"exchange_durability"`
+	ExchangePassive    bool              `toml:"exchange_passive"`
+	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
+
 	// Queue Name
 	Queue string
 	// Binding Key
@@ -50,7 +53,11 @@ func (a *externalAuth) Response() string {
 }
 
 const (
-	DefaultAuthMethod    = "PLAIN"
+	DefaultAuthMethod = "PLAIN"
+
+	DefaultExchangeType       = "topic"
+	DefaultExchangeDurability = "durable"
+
 	DefaultPrefetchCount = 50
 )
 
@@ -58,10 +65,23 @@ func (a *AMQPConsumer) SampleConfig() string {
 	return `
   ## AMQP url
   url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+
+  ## Exchange to declare and consume from.
   exchange = "telegraf"
-  ## Exchange passive mode
-  exchange_passive = false
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_args = { }
+  # exchange_args = {"hash_propery" = "timestamp"}
+
   ## AMQP queue name
   queue = "telegraf"
   ## Binding Key
@@ -178,29 +198,28 @@ func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, err
 		return nil, fmt.Errorf("Failed to open a channel: %s", err)
 	}
 
-	if a.ExchangePassive == true {
-		err = ch.ExchangeDeclarePassive(
-			a.Exchange, // name
-			"topic",    // type
-			true,       // durable
-			false,      // auto-deleted
-			false,      // internal
-			false,      // no-wait
-			nil,        // arguments
-		)
-	} else {
-		err = ch.ExchangeDeclare(
-			a.Exchange, // name
-			"topic",    // type
-			true,       // durable
-			false,      // auto-deleted
-			false,      // internal
-			false,      // no-wait
-			nil,        // arguments
-		)
+	var exchangeDurable = true
+	switch a.ExchangeDurability {
+	case "transient":
+		exchangeDurable = false
+	default:
+		exchangeDurable = true
 	}
+
+	exchangeArgs := make(amqp.Table, len(a.ExchangeArguments))
+	for k, v := range a.ExchangeArguments {
+		exchangeArgs[k] = v
+	}
+
+	err = declareExchange(
+		ch,
+		a.Exchange,
+		a.ExchangeType,
+		a.ExchangePassive,
+		exchangeDurable,
+		exchangeArgs)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to declare an exchange: %s", err)
+		return nil, err
 	}
 
 	q, err := ch.QueueDeclare(
@@ -252,6 +271,42 @@ func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, err
 	return msgs, err
 }
 
+func declareExchange(
+	channel *amqp.Channel,
+	exchangeName string,
+	exchangeType string,
+	exchangePassive bool,
+	exchangeDurable bool,
+	exchangeArguments amqp.Table,
+) error {
+	var err error
+	if exchangePassive {
+		err = channel.ExchangeDeclarePassive(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	} else {
+		err = channel.ExchangeDeclare(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	}
+	if err != nil {
+		return fmt.Errorf("error declaring exchange: %v", err)
+	}
+	return nil
+}
+
 // Read messages from queue and add them to the Accumulator
 func (a *AMQPConsumer) process(msgs <-chan amqp.Delivery, acc telegraf.Accumulator) {
 	defer a.wg.Done()
@@ -283,8 +338,10 @@ func (a *AMQPConsumer) Stop() {
 func init() {
 	inputs.Add("amqp_consumer", func() telegraf.Input {
 		return &AMQPConsumer{
-			AuthMethod:    DefaultAuthMethod,
-			PrefetchCount: DefaultPrefetchCount,
+			AuthMethod:         DefaultAuthMethod,
+			ExchangeType:       DefaultExchangeType,
+			ExchangeDurability: DefaultExchangeDurability,
+			PrefetchCount:      DefaultPrefetchCount,
 		}
 	})
 }
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 52a4ccbd1..bb66a030a 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -21,13 +21,28 @@ For an introduction to AMQP see:
 
 ### Configuration:
 
-```
+```toml
 # Configuration for the AMQP server to send metrics to
 [[outputs.amqp]]
   ## AMQP url
   url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+
+  ## Exchange to declare and publish to.
   exchange = "telegraf"
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_args = { }
+  # exchange_args = {"hash_propery" = "timestamp"}
+
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
@@ -40,7 +55,7 @@ For an introduction to AMQP see:
   routing_tag = "host"
   ## Delivery Mode controls if a published message is persistent
   ## Valid options are "transient" and "persistent". default: "transient"
-  # delivery_mode = "transient"
+  delivery_mode = "transient"
 
   ## InfluxDB retention policy
   # retention_policy = "default"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index bd3068eb8..8a3bcbd6c 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -26,8 +26,13 @@ type client struct {
 type AMQP struct {
 	// AMQP brokers to send metrics to
 	URL string
-	// AMQP exchange
-	Exchange string
+
+	Exchange           string            `toml:"exchange"`
+	ExchangeType       string            `toml:"exchange_type"`
+	ExchangeDurability string            `toml:"exchange_durability"`
+	ExchangePassive    bool              `toml:"exchange_passive"`
+	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
+
 	// AMQP Auth method
 	AuthMethod string
 	// Routing Key (static)
@@ -65,7 +70,11 @@ func (a *externalAuth) Response() string {
 }
 
 const (
-	DefaultAuthMethod      = "PLAIN"
+	DefaultAuthMethod = "PLAIN"
+
+	DefaultExchangeType       = "topic"
+	DefaultExchangeDurability = "durable"
+
 	DefaultRetentionPolicy = "default"
 	DefaultDatabase        = "telegraf"
 )
@@ -73,8 +82,23 @@ const (
 var sampleConfig = `
   ## AMQP url
   url = "amqp://localhost:5672/influxdb"
-  ## AMQP exchange
+
+  ## Exchange to declare and publish to.
   exchange = "telegraf"
+
+  ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+  # exchange_type = "topic"
+
+  ## If true, exchange will be passively declared.
+  # exchange_passive = false
+
+  ## Exchange durability can be either "transient" or "durable".
+  # exchange_durability = "durable"
+
+  ## Additional exchange arguments.
+  # exchange_args = { }
+  # exchange_args = {"hash_propery" = "timestamp"}
+
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
@@ -166,17 +190,28 @@ func (q *AMQP) Connect() error {
 		return fmt.Errorf("Failed to open a channel: %s", err)
 	}
 
-	err = channel.ExchangeDeclare(
-		q.Exchange, // name
-		"topic",    // type
-		true,       // durable
-		false,      // delete when unused
-		false,      // internal
-		false,      // no-wait
-		nil,        // arguments
-	)
+	var exchangeDurable = true
+	switch q.ExchangeDurability {
+	case "transient":
+		exchangeDurable = false
+	default:
+		exchangeDurable = true
+	}
+
+	exchangeArgs := make(amqp.Table, len(q.ExchangeArguments))
+	for k, v := range q.ExchangeArguments {
+		exchangeArgs[k] = v
+	}
+
+	err = declareExchange(
+		channel,
+		q.Exchange,
+		q.ExchangeType,
+		q.ExchangePassive,
+		exchangeDurable,
+		exchangeArgs)
 	if err != nil {
-		return fmt.Errorf("Failed to declare an exchange: %s", err)
+		return err
 	}
 
 	q.setClient(&client{
@@ -203,6 +238,42 @@ func (q *AMQP) Connect() error {
 	return nil
 }
 
+func declareExchange(
+	channel *amqp.Channel,
+	exchangeName string,
+	exchangeType string,
+	exchangePassive bool,
+	exchangeDurable bool,
+	exchangeArguments amqp.Table,
+) error {
+	var err error
+	if exchangePassive {
+		err = channel.ExchangeDeclarePassive(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	} else {
+		err = channel.ExchangeDeclare(
+			exchangeName,
+			exchangeType,
+			exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			exchangeArguments,
+		)
+	}
+	if err != nil {
+		return fmt.Errorf("error declaring exchange: %v", err)
+	}
+	return nil
+}
+
 func (q *AMQP) Close() error {
 	c := q.getClient()
 	if c == nil {
@@ -292,10 +363,12 @@ func (q *AMQP) setClient(c *client) {
 func init() {
 	outputs.Add("amqp", func() telegraf.Output {
 		return &AMQP{
-			AuthMethod:      DefaultAuthMethod,
-			Database:        DefaultDatabase,
-			RetentionPolicy: DefaultRetentionPolicy,
-			Timeout:         internal.Duration{Duration: time.Second * 5},
+			AuthMethod:         DefaultAuthMethod,
+			ExchangeType:       DefaultExchangeType,
+			ExchangeDurability: DefaultExchangeDurability,
+			Database:           DefaultDatabase,
+			RetentionPolicy:    DefaultRetentionPolicy,
+			Timeout:            internal.Duration{Duration: time.Second * 5},
 		}
 	})
 }

From 179bcfdcbb496b2ebdccc8ad954608427c69a7dd Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 17:05:33 -0700
Subject: [PATCH 1236/1302] Use list of brokers in amqp output and
 amqp_consumer

---
 plugins/inputs/amqp_consumer/README.md        | 14 +++-
 plugins/inputs/amqp_consumer/amqp_consumer.go | 66 +++++++++++++++----
 plugins/outputs/amqp/README.md                | 14 +++-
 plugins/outputs/amqp/amqp.go                  | 66 +++++++++++++++----
 4 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index 53d97d080..84661aec3 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -15,8 +15,18 @@ The following defaults are known to work with RabbitMQ:
 ```toml
 # AMQP consumer plugin
 [[inputs.amqp_consumer]]
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
+  ## Broker to consume from.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to consume from.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
 
   ## Exchange to declare and consume from.
   exchange = "telegraf"
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index ad0e3ce7b..d39c995c4 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -1,8 +1,10 @@
 package amqp_consumer
 
 import (
+	"errors"
 	"fmt"
 	"log"
+	"math/rand"
 	"strings"
 	"sync"
 	"time"
@@ -17,8 +19,10 @@ import (
 
 // AMQPConsumer is the top level struct for this plugin
 type AMQPConsumer struct {
-	URL string
-
+	URL                string            `toml:"url"` // deprecated in 1.7; use brokers
+	Brokers            []string          `toml:"brokers"`
+	Username           string            `toml:"username"`
+	Password           string            `toml:"password"`
 	Exchange           string            `toml:"exchange"`
 	ExchangeType       string            `toml:"exchange_type"`
 	ExchangeDurability string            `toml:"exchange_durability"`
@@ -55,6 +59,8 @@ func (a *externalAuth) Response() string {
 const (
 	DefaultAuthMethod = "PLAIN"
 
+	DefaultBroker = "amqp://localhost:5672/influxdb"
+
 	DefaultExchangeType       = "topic"
 	DefaultExchangeDurability = "durable"
 
@@ -63,8 +69,18 @@ const (
 
 func (a *AMQPConsumer) SampleConfig() string {
 	return `
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
+  ## Broker to consume from.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to consume from.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
 
   ## Exchange to declare and consume from.
   exchange = "telegraf"
@@ -130,16 +146,21 @@ func (a *AMQPConsumer) createConfig() (*amqp.Config, error) {
 		return nil, err
 	}
 
-	// parse auth method
-	var sasl []amqp.Authentication // nil by default
-
+	var auth []amqp.Authentication
 	if strings.ToUpper(a.AuthMethod) == "EXTERNAL" {
-		sasl = []amqp.Authentication{&externalAuth{}}
+		auth = []amqp.Authentication{&externalAuth{}}
+	} else if a.Username != "" || a.Password != "" {
+		auth = []amqp.Authentication{
+			&amqp.PlainAuth{
+				Username: a.Username,
+				Password: a.Password,
+			},
+		}
 	}
 
 	config := amqp.Config{
 		TLSClientConfig: tls,
-		SASL:            sasl, // if nil, it will be PLAIN
+		SASL:            auth, // if nil, it will be PLAIN
 	}
 	return &config, nil
 }
@@ -187,13 +208,29 @@ func (a *AMQPConsumer) Start(acc telegraf.Accumulator) error {
 }
 
 func (a *AMQPConsumer) connect(amqpConf *amqp.Config) (<-chan amqp.Delivery, error) {
-	conn, err := amqp.DialConfig(a.URL, *amqpConf)
-	if err != nil {
-		return nil, err
+	brokers := a.Brokers
+	if len(brokers) == 0 {
+		brokers = []string{a.URL}
 	}
-	a.conn = conn
 
-	ch, err := conn.Channel()
+	p := rand.Perm(len(brokers))
+	for _, n := range p {
+		broker := brokers[n]
+		log.Printf("D! [amqp_consumer] connecting to %q", broker)
+		conn, err := amqp.DialConfig(broker, *amqpConf)
+		if err == nil {
+			a.conn = conn
+			log.Printf("D! [amqp_consumer] connected to %q", broker)
+			break
+		}
+		log.Printf("D! [amqp_consumer] error connecting to %q", broker)
+	}
+
+	if a.conn == nil {
+		return nil, errors.New("could not connect to any broker")
+	}
+
+	ch, err := a.conn.Channel()
 	if err != nil {
 		return nil, fmt.Errorf("Failed to open a channel: %s", err)
 	}
@@ -338,6 +375,7 @@ func (a *AMQPConsumer) Stop() {
 func init() {
 	inputs.Add("amqp_consumer", func() telegraf.Input {
 		return &AMQPConsumer{
+			URL:                DefaultBroker,
 			AuthMethod:         DefaultAuthMethod,
 			ExchangeType:       DefaultExchangeType,
 			ExchangeDurability: DefaultExchangeDurability,
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index bb66a030a..ebc555142 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -24,8 +24,18 @@ For an introduction to AMQP see:
 ```toml
 # Configuration for the AMQP server to send metrics to
 [[outputs.amqp]]
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
+  ## Broker to publish to.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to publish to.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
 
   ## Exchange to declare and publish to.
   exchange = "telegraf"
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index 8a3bcbd6c..dfed5713b 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -1,8 +1,10 @@
 package amqp
 
 import (
+	"errors"
 	"fmt"
 	"log"
+	"math/rand"
 	"net"
 	"strings"
 	"sync"
@@ -24,9 +26,10 @@ type client struct {
 }
 
 type AMQP struct {
-	// AMQP brokers to send metrics to
-	URL string
-
+	URL                string            `toml:"url"` // deprecated in 1.7; use brokers
+	Brokers            []string          `toml:"brokers"`
+	Username           string            `toml:"username"`
+	Password           string            `toml:"password"`
 	Exchange           string            `toml:"exchange"`
 	ExchangeType       string            `toml:"exchange_type"`
 	ExchangeDurability string            `toml:"exchange_durability"`
@@ -72,6 +75,8 @@ func (a *externalAuth) Response() string {
 const (
 	DefaultAuthMethod = "PLAIN"
 
+	DefaultBroker = "amqp://localhost:5672/influxdb"
+
 	DefaultExchangeType       = "topic"
 	DefaultExchangeDurability = "durable"
 
@@ -80,8 +85,18 @@ const (
 )
 
 var sampleConfig = `
-  ## AMQP url
-  url = "amqp://localhost:5672/influxdb"
+  ## Broker to publish to.
+  ##   deprecated in 1.7; use the brokers option
+  # url = "amqp://localhost:5672/influxdb"
+
+  ## Brokers to publish to.  If multiple brokers are specified a random broker
+  ## will be selected anytime a connection is established.  This can be
+  ## helpful for load balancing when not using a dedicated load balancer.
+  brokers = ["amqp://localhost:5672/influxdb"]
+
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
 
   ## Exchange to declare and publish to.
   exchange = "telegraf"
@@ -158,31 +173,53 @@ func (q *AMQP) Connect() error {
 		"retention_policy": q.RetentionPolicy,
 	}
 
-	var connection *amqp.Connection
 	// make new tls config
 	tls, err := q.ClientConfig.TLSConfig()
 	if err != nil {
 		return err
 	}
 
-	// parse auth method
-	var sasl []amqp.Authentication // nil by default
-
+	var auth []amqp.Authentication
 	if strings.ToUpper(q.AuthMethod) == "EXTERNAL" {
-		sasl = []amqp.Authentication{&externalAuth{}}
+		auth = []amqp.Authentication{&externalAuth{}}
+	} else if q.Username != "" || q.Password != "" {
+		auth = []amqp.Authentication{
+			&amqp.PlainAuth{
+				Username: q.Username,
+				Password: q.Password,
+			},
+		}
+	}
+
+	brokers := q.Brokers
+	if len(brokers) == 0 {
+		brokers = []string{q.URL}
 	}
 
 	amqpConf := amqp.Config{
 		TLSClientConfig: tls,
-		SASL:            sasl, // if nil, it will be PLAIN
+		SASL:            auth, // if nil, it will be PLAIN
 		Dial: func(network, addr string) (net.Conn, error) {
 			return net.DialTimeout(network, addr, q.Timeout.Duration)
 		},
 	}
 
-	connection, err = amqp.DialConfig(q.URL, amqpConf)
-	if err != nil {
-		return err
+	var connection *amqp.Connection
+	p := rand.Perm(len(brokers))
+	for _, n := range p {
+		broker := brokers[n]
+		log.Printf("D! Output [amqp] connecting to %q", broker)
+		conn, err := amqp.DialConfig(broker, amqpConf)
+		if err == nil {
+			connection = conn
+			log.Printf("D! Output [amqp] connected to %q", broker)
+			break
+		}
+		log.Printf("D! Output [amqp] error connecting to %q", broker)
+	}
+
+	if connection == nil {
+		return errors.New("could not connect to any broker")
 	}
 
 	channel, err := connection.Channel()
@@ -363,6 +400,7 @@ func (q *AMQP) setClient(c *client) {
 func init() {
 	outputs.Add("amqp", func() telegraf.Output {
 		return &AMQP{
+			URL:                DefaultBroker,
 			AuthMethod:         DefaultAuthMethod,
 			ExchangeType:       DefaultExchangeType,
 			ExchangeDurability: DefaultExchangeDurability,

From da6ad34fc8376d04f3a4a9e28fcec2eaef8ba913 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 18:12:48 -0700
Subject: [PATCH 1237/1302] Add option to disconnect after a message limit is
 reached in amqp output

---
 plugins/inputs/amqp_consumer/README.md        |   2 +-
 plugins/inputs/amqp_consumer/amqp_consumer.go |   3 +-
 plugins/outputs/amqp/README.md                |  90 +--
 plugins/outputs/amqp/amqp.go                  | 581 +++++++++---------
 plugins/outputs/amqp/amqp_test.go             | 171 +++++-
 plugins/outputs/amqp/client.go                | 134 ++++
 6 files changed, 619 insertions(+), 362 deletions(-)
 create mode 100644 plugins/outputs/amqp/client.go

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index 84661aec3..e7701ad73 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -50,7 +50,7 @@ The following defaults are known to work with RabbitMQ:
   binding_key = "#"
 
   ## Maximum number of messages server should give to the worker.
-  prefetch_count = 50
+  # prefetch_count = 50
 
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index d39c995c4..1dde6fe23 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -100,11 +100,12 @@ func (a *AMQPConsumer) SampleConfig() string {
 
   ## AMQP queue name
   queue = "telegraf"
+
   ## Binding Key
   binding_key = "#"
 
   ## Maximum number of messages server should give to the worker.
-  prefetch_count = 50
+  # prefetch_count = 50
 
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index ebc555142..817eea673 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -2,27 +2,15 @@
 
 This plugin writes to a AMQP 0-9-1 Exchange, a promenent implementation of this protocol being [RabbitMQ](https://www.rabbitmq.com/).
 
-Metrics are written to a topic exchange using a routing key defined by:
-1. The routing_key config defines a static value
-2. The routing_tag config defines a metric tag with a dynamic value, overriding the static routing_key if found
-3. If neither option is defined, or the tag is not found in a metric, then the empty routing key will be used
-
-Metrics are grouped in batches by the final routing key.
-
-This plugin doesn't bind exchange to a queue, so it should be done by consumer. The exchange is always defined as type: topic.
-To use it for distributing metrics equally among workers (type: direct), set the routing_key to a static value on the exchange,
-declare and bind a single queue with the same routing_key, and consume from the same queue in each worker.
-To use it to send metrics to many consumers at once (type: fanout), set the routing_key to "#" on the exchange, then declare, bind,
-and consume from individual queues in each worker.
+This plugin does not bind the exchange to a queue.
 
 For an introduction to AMQP see:
 - https://www.rabbitmq.com/tutorials/amqp-concepts.html
 - https://www.rabbitmq.com/getstarted.html
 
 ### Configuration:
-
 ```toml
-# Configuration for the AMQP server to send metrics to
+# Publishes metrics to an AMQP broker
 [[outputs.amqp]]
   ## Broker to publish to.
   ##   deprecated in 1.7; use the brokers option
@@ -33,9 +21,10 @@ For an introduction to AMQP see:
   ## helpful for load balancing when not using a dedicated load balancer.
   brokers = ["amqp://localhost:5672/influxdb"]
 
-  ## Authentication credentials for the PLAIN auth_method.
-  # username = ""
-  # password = ""
+  ## Maximum messages to send over a connection.  Once this is reached, the
+  ## connection is closed and a new connection is made.  This can be helpful for
+  ## load balancing when not using a dedicated load balancer.
+  # max_messages = 0
 
   ## Exchange to declare and publish to.
   exchange = "telegraf"
@@ -44,36 +33,51 @@ For an introduction to AMQP see:
   # exchange_type = "topic"
 
   ## If true, exchange will be passively declared.
-  # exchange_passive = false
+  # exchange_declare_passive = false
 
-  ## Exchange durability can be either "transient" or "durable".
-  # exchange_durability = "durable"
+  ## If true, exchange will be created as a durable exchange.
+  # exchange_durable = true
 
   ## Additional exchange arguments.
   # exchange_args = { }
   # exchange_args = {"hash_propery" = "timestamp"}
 
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
+
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
-  ## Topic routing key
-  # routing_key = ""
-  ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, its value will be used as the routing key
-  ##  and override routing_key config even if defined
-  routing_tag = "host"
-  ## Delivery Mode controls if a published message is persistent
-  ## Valid options are "transient" and "persistent". default: "transient"
-  delivery_mode = "transient"
 
-  ## InfluxDB retention policy
-  # retention_policy = "default"
-  ## InfluxDB database
+  ## Metric tag to use as a routing key.
+  ##   ie, if this tag exists, its value will be used as the routing key
+  # routing_tag = "host"
+
+  ## Static routing key.  Used when no routing_tag is set or as a fallback
+  ## when the tag specified in routing tag is not found.
+  # routing_key = ""
+  # routing_key = "telegraf"
+
+  ## Delivery Mode controls if a published message is persistent.
+  ##   One of "transient" or "persistent".
+  # delivery_mode = "transient"
+
+  ## InfluxDB database added as a message header.
+  ##   deprecated in 1.7; use the headers option
   # database = "telegraf"
 
-  ## Write timeout, formatted as a string.  If not provided, will default
-  ## to 5s. 0s means no timeout (not recommended).
+  ## InfluxDB retention policy added as a message header
+  ##   deprecated in 1.7; use the headers option
+  # retention_policy = "default"
+
+  ## Static headers added to each published message.
+  # headers = { }
+  # headers = {"database" = "telegraf", "retention_policy" = "default"}
+
+  ## Connection timeout.  If not provided, will default to 5s.  0s means no
+  ## timeout (not recommended).
   # timeout = "5s"
 
   ## Optional TLS Config
@@ -83,9 +87,25 @@ For an introduction to AMQP see:
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## If true use batch serialization format instead of line based delimiting.
+  ## Only applies to data formats which are not line based such as JSON.
+  ## Recommended to set to true.
+  # use_batch_format = false
+
   ## Data format to output.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "influx"
+  # data_format = "influx"
 ```
+
+#### Routing
+
+If `routing_tag` is set, and the tag is defined on the metric, the value of
+the tag is used as the routing key.  Otherwise the value of `routing_key` is
+used directly.  If both are unset the empty string is used.
+
+Exchange types that do not use a routing key, `direct` and `header`, always
+use the empty string as the routing key.
+
+Metrics are published in batches based on the final routing key.
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index dfed5713b..faaa1027c 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -1,13 +1,10 @@
 package amqp
 
 import (
-	"errors"
+	"bytes"
 	"fmt"
 	"log"
-	"math/rand"
-	"net"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -19,70 +16,58 @@ import (
 	"github.com/streadway/amqp"
 )
 
-type client struct {
-	conn    *amqp.Connection
-	channel *amqp.Channel
-	headers amqp.Table
-}
-
-type AMQP struct {
-	URL                string            `toml:"url"` // deprecated in 1.7; use brokers
-	Brokers            []string          `toml:"brokers"`
-	Username           string            `toml:"username"`
-	Password           string            `toml:"password"`
-	Exchange           string            `toml:"exchange"`
-	ExchangeType       string            `toml:"exchange_type"`
-	ExchangeDurability string            `toml:"exchange_durability"`
-	ExchangePassive    bool              `toml:"exchange_passive"`
-	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
-
-	// AMQP Auth method
-	AuthMethod string
-	// Routing Key (static)
-	RoutingKey string `toml:"routing_key"`
-	// Routing Key from Tag
-	RoutingTag string `toml:"routing_tag"`
-	// InfluxDB database
-	Database string
-	// InfluxDB retention policy
-	RetentionPolicy string
-	// InfluxDB precision (DEPRECATED)
-	Precision string
-	// Connection timeout
-	Timeout internal.Duration
-	// Delivery Mode controls if a published message is persistent
-	// Valid options are "transient" and "persistent". default: "transient"
-	DeliveryMode string
-
-	tls.ClientConfig
-
-	sync.Mutex
-	c *client
-
-	deliveryMode uint8
-	serializer   serializers.Serializer
-}
+const (
+	DefaultURL             = "amqp://localhost:5672/influxdb"
+	DefaultAuthMethod      = "PLAIN"
+	DefaultExchangeType    = "topic"
+	DefaultRetentionPolicy = "default"
+	DefaultDatabase        = "telegraf"
+)
 
 type externalAuth struct{}
 
 func (a *externalAuth) Mechanism() string {
 	return "EXTERNAL"
 }
+
 func (a *externalAuth) Response() string {
 	return fmt.Sprintf("\000")
 }
 
-const (
-	DefaultAuthMethod = "PLAIN"
+type AMQP struct {
+	URL                string            `toml:"url"` // deprecated in 1.7; use brokers
+	Brokers            []string          `toml:"brokers"`
+	Exchange           string            `toml:"exchange"`
+	ExchangeType       string            `toml:"exchange_type"`
+	ExchangePassive    bool              `toml:"exchange_passive"`
+	ExchangeDurability string            `toml:"exchange_durability"`
+	ExchangeArguments  map[string]string `toml:"exchange_arguments"`
+	Username           string            `toml:"username"`
+	Password           string            `toml:"password"`
+	MaxMessages        int               `toml:"max_messages"`
+	AuthMethod         string            `toml:"auth_method"`
+	RoutingTag         string            `toml:"routing_tag"`
+	RoutingKey         string            `toml:"routing_key"`
+	DeliveryMode       string            `toml:"delivery_mode"`
+	Database           string            `toml:"database"`         // deprecated in 1.7; use headers
+	RetentionPolicy    string            `toml:"retention_policy"` // deprecated in 1.7; use headers
+	Precision          string            `toml:"precision"`        // deprecated; has no effect
+	Headers            map[string]string `toml:"headers"`
+	Timeout            internal.Duration `toml:"timeout"`
+	UseBatchFormat     bool              `toml:"use_batch_format"`
+	tls.ClientConfig
 
-	DefaultBroker = "amqp://localhost:5672/influxdb"
+	serializer   serializers.Serializer
+	connect      func(*ClientConfig) (Client, error)
+	client       Client
+	config       *ClientConfig
+	sentMessages int
+}
 
-	DefaultExchangeType       = "topic"
-	DefaultExchangeDurability = "durable"
-
-	DefaultRetentionPolicy = "default"
-	DefaultDatabase        = "telegraf"
-)
+type Client interface {
+	Publish(key string, body []byte) error
+	Close() error
+}
 
 var sampleConfig = `
   ## Broker to publish to.
@@ -94,9 +79,10 @@ var sampleConfig = `
   ## helpful for load balancing when not using a dedicated load balancer.
   brokers = ["amqp://localhost:5672/influxdb"]
 
-  ## Authentication credentials for the PLAIN auth_method.
-  # username = ""
-  # password = ""
+  ## Maximum messages to send over a connection.  Once this is reached, the
+  ## connection is closed and a new connection is made.  This can be helpful for
+  ## load balancing when not using a dedicated load balancer.
+  # max_messages = 0
 
   ## Exchange to declare and publish to.
   exchange = "telegraf"
@@ -105,36 +91,51 @@ var sampleConfig = `
   # exchange_type = "topic"
 
   ## If true, exchange will be passively declared.
-  # exchange_passive = false
+  # exchange_declare_passive = false
 
-  ## Exchange durability can be either "transient" or "durable".
-  # exchange_durability = "durable"
+  ## If true, exchange will be created as a durable exchange.
+  # exchange_durable = true
 
   ## Additional exchange arguments.
   # exchange_args = { }
   # exchange_args = {"hash_propery" = "timestamp"}
 
+  ## Authentication credentials for the PLAIN auth_method.
+  # username = ""
+  # password = ""
+
   ## Auth method. PLAIN and EXTERNAL are supported
   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
   ## described here: https://www.rabbitmq.com/plugins.html
   # auth_method = "PLAIN"
-  ## Topic routing key
-  # routing_key = ""
-  ## Telegraf tag to use as a routing key
-  ##  ie, if this tag exists, its value will be used as the routing key
-  ##  and override routing_key config even if defined
-  routing_tag = "host"
-  ## Delivery Mode controls if a published message is persistent
-  ## Valid options are "transient" and "persistent". default: "transient"
-  delivery_mode = "transient"
 
-  ## InfluxDB retention policy
-  # retention_policy = "default"
-  ## InfluxDB database
+  ## Metric tag to use as a routing key.
+  ##   ie, if this tag exists, its value will be used as the routing key
+  # routing_tag = "host"
+
+  ## Static routing key.  Used when no routing_tag is set or as a fallback
+  ## when the tag specified in routing tag is not found.
+  # routing_key = ""
+  # routing_key = "telegraf"
+
+  ## Delivery Mode controls if a published message is persistent.
+  ##   One of "transient" or "persistent".
+  # delivery_mode = "transient"
+
+  ## InfluxDB database added as a message header.
+  ##   deprecated in 1.7; use the headers option
   # database = "telegraf"
 
-  ## Write timeout, formatted as a string.  If not provided, will default
-  ## to 5s. 0s means no timeout (not recommended).
+  ## InfluxDB retention policy added as a message header
+  ##   deprecated in 1.7; use the headers option
+  # retention_policy = "default"
+
+  ## Static headers added to each published message.
+  # headers = { }
+  # headers = {"database" = "telegraf", "retention_policy" = "default"}
+
+  ## Connection timeout.  If not provided, will default to 5s.  0s means no
+  ## timeout (not recommended).
   # timeout = "5s"
 
   ## Optional TLS Config
@@ -144,40 +145,208 @@ var sampleConfig = `
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
 
+  ## If true use batch serialization format instead of line based delimiting.
+  ## Only applies to data formats which are not line based such as JSON.
+  ## Recommended to set to true.
+  # use_batch_format = false
+
   ## Data format to output.
   ## Each data format has its own unique set of configuration options, read
   ## more about them here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-  data_format = "influx"
+  # data_format = "influx"
 `
 
-func (a *AMQP) SetSerializer(serializer serializers.Serializer) {
-	a.serializer = serializer
+func (q *AMQP) SampleConfig() string {
+	return sampleConfig
+}
+
+func (q *AMQP) Description() string {
+	return "Publishes metrics to an AMQP broker"
+}
+
+func (q *AMQP) SetSerializer(serializer serializers.Serializer) {
+	q.serializer = serializer
 }
 
 func (q *AMQP) Connect() error {
-	switch q.DeliveryMode {
-	case "transient":
-		q.deliveryMode = amqp.Transient
-		break
-	case "persistent":
-		q.deliveryMode = amqp.Persistent
-		break
-	default:
-		q.deliveryMode = amqp.Transient
-		break
+	if q.config == nil {
+		config, err := q.makeClientConfig()
+		if err != nil {
+			return err
+		}
+		q.config = config
 	}
 
-	headers := amqp.Table{
-		"database":         q.Database,
-		"retention_policy": q.RetentionPolicy,
-	}
-
-	// make new tls config
-	tls, err := q.ClientConfig.TLSConfig()
+	client, err := q.connect(q.config)
 	if err != nil {
 		return err
 	}
+	q.client = client
+
+	return nil
+}
+
+func (q *AMQP) Close() error {
+	if q.client != nil {
+		return q.client.Close()
+	}
+	return nil
+}
+
+func (q *AMQP) routingKey(metric telegraf.Metric) string {
+	if q.RoutingTag != "" {
+		key, ok := metric.GetTag(q.RoutingTag)
+		if ok {
+			return key
+		}
+	}
+	return q.RoutingKey
+}
+
+func (q *AMQP) Write(metrics []telegraf.Metric) error {
+	batches := make(map[string][]telegraf.Metric)
+	if q.ExchangeType == "direct" || q.ExchangeType == "header" {
+		// Since the routing_key is ignored for these exchange types send as a
+		// single batch.
+		batches[""] = metrics
+	} else {
+		for _, metric := range metrics {
+			routingKey := q.routingKey(metric)
+			if _, ok := batches[routingKey]; !ok {
+				batches[routingKey] = make([]telegraf.Metric, 0)
+			}
+
+			batches[routingKey] = append(batches[routingKey], metric)
+		}
+	}
+
+	first := true
+	for key, metrics := range batches {
+		body, err := q.serialize(metrics)
+		if err != nil {
+			return err
+		}
+
+		err = q.publish(key, body)
+		if err != nil {
+			// If this is the first attempt to publish and the connection is
+			// closed, try to reconnect and retry once.
+			if aerr, ok := err.(*amqp.Error); first && ok && aerr == amqp.ErrClosed {
+				first = false
+				q.client = nil
+				err := q.publish(key, body)
+				if err != nil {
+					return err
+				}
+			} else {
+				q.client = nil
+				return err
+			}
+		}
+		first = false
+	}
+
+	if q.sentMessages >= q.MaxMessages && q.MaxMessages > 0 {
+		log.Printf("D! Output [amqp] sent MaxMessages; closing connection")
+		q.client = nil
+	}
+
+	return nil
+}
+
+func (q *AMQP) publish(key string, body []byte) error {
+	if q.client == nil {
+		client, err := q.connect(q.config)
+		if err != nil {
+			return err
+		}
+		q.sentMessages = 0
+		q.client = client
+	}
+
+	err := q.client.Publish(key, body)
+	if err != nil {
+		return err
+	}
+	q.sentMessages++
+	return nil
+}
+
+func (q *AMQP) serialize(metrics []telegraf.Metric) ([]byte, error) {
+	if q.UseBatchFormat {
+		return q.serializer.SerializeBatch(metrics)
+	} else {
+		var buf bytes.Buffer
+		for _, metric := range metrics {
+			octets, err := q.serializer.Serialize(metric)
+			if err != nil {
+				return nil, err
+			}
+			_, err = buf.Write(octets)
+			if err != nil {
+				return nil, err
+			}
+		}
+		body := buf.Bytes()
+		return body, nil
+	}
+}
+
+func (q *AMQP) makeClientConfig() (*ClientConfig, error) {
+	config := &ClientConfig{
+		exchange:        q.Exchange,
+		exchangeType:    q.ExchangeType,
+		exchangePassive: q.ExchangePassive,
+		timeout:         q.Timeout.Duration,
+	}
+
+	switch q.ExchangeDurability {
+	case "transient":
+		config.exchangeDurable = false
+	default:
+		config.exchangeDurable = true
+	}
+
+	config.brokers = q.Brokers
+	if len(config.brokers) == 0 {
+		config.brokers = []string{q.URL}
+	}
+
+	switch q.DeliveryMode {
+	case "transient":
+		config.deliveryMode = amqp.Transient
+	case "persistent":
+		config.deliveryMode = amqp.Persistent
+	default:
+		config.deliveryMode = amqp.Transient
+	}
+
+	if len(q.Headers) > 0 {
+		config.headers = make(amqp.Table, len(q.Headers))
+		for k, v := range q.Headers {
+			config.headers[k] = v
+		}
+	} else {
+		// Copy deprecated fields into message header
+		config.headers = amqp.Table{
+			"database":         q.Database,
+			"retention_policy": q.RetentionPolicy,
+		}
+	}
+
+	if len(q.ExchangeArguments) > 0 {
+		config.exchangeArguments = make(amqp.Table, len(q.ExchangeArguments))
+		for k, v := range q.ExchangeArguments {
+			config.exchangeArguments[k] = v
+		}
+	}
+
+	tlsConfig, err := q.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+	config.tlsConfig = tlsConfig
 
 	var auth []amqp.Authentication
 	if strings.ToUpper(q.AuthMethod) == "EXTERNAL" {
@@ -190,223 +359,25 @@ func (q *AMQP) Connect() error {
 			},
 		}
 	}
+	config.auth = auth
 
-	brokers := q.Brokers
-	if len(brokers) == 0 {
-		brokers = []string{q.URL}
-	}
-
-	amqpConf := amqp.Config{
-		TLSClientConfig: tls,
-		SASL:            auth, // if nil, it will be PLAIN
-		Dial: func(network, addr string) (net.Conn, error) {
-			return net.DialTimeout(network, addr, q.Timeout.Duration)
-		},
-	}
-
-	var connection *amqp.Connection
-	p := rand.Perm(len(brokers))
-	for _, n := range p {
-		broker := brokers[n]
-		log.Printf("D! Output [amqp] connecting to %q", broker)
-		conn, err := amqp.DialConfig(broker, amqpConf)
-		if err == nil {
-			connection = conn
-			log.Printf("D! Output [amqp] connected to %q", broker)
-			break
-		}
-		log.Printf("D! Output [amqp] error connecting to %q", broker)
-	}
-
-	if connection == nil {
-		return errors.New("could not connect to any broker")
-	}
-
-	channel, err := connection.Channel()
-	if err != nil {
-		return fmt.Errorf("Failed to open a channel: %s", err)
-	}
-
-	var exchangeDurable = true
-	switch q.ExchangeDurability {
-	case "transient":
-		exchangeDurable = false
-	default:
-		exchangeDurable = true
-	}
-
-	exchangeArgs := make(amqp.Table, len(q.ExchangeArguments))
-	for k, v := range q.ExchangeArguments {
-		exchangeArgs[k] = v
-	}
-
-	err = declareExchange(
-		channel,
-		q.Exchange,
-		q.ExchangeType,
-		q.ExchangePassive,
-		exchangeDurable,
-		exchangeArgs)
-	if err != nil {
-		return err
-	}
-
-	q.setClient(&client{
-		conn:    connection,
-		channel: channel,
-		headers: headers,
-	})
-
-	go func() {
-		err := <-connection.NotifyClose(make(chan *amqp.Error))
-		if err == nil {
-			return
-		}
-
-		q.setClient(nil)
-
-		log.Printf("I! Closing: %s", err)
-		log.Printf("I! Trying to reconnect")
-		for err := q.Connect(); err != nil; err = q.Connect() {
-			log.Println("E! ", err.Error())
-			time.Sleep(10 * time.Second)
-		}
-	}()
-	return nil
+	return config, nil
 }
 
-func declareExchange(
-	channel *amqp.Channel,
-	exchangeName string,
-	exchangeType string,
-	exchangePassive bool,
-	exchangeDurable bool,
-	exchangeArguments amqp.Table,
-) error {
-	var err error
-	if exchangePassive {
-		err = channel.ExchangeDeclarePassive(
-			exchangeName,
-			exchangeType,
-			exchangeDurable,
-			false, // delete when unused
-			false, // internal
-			false, // no-wait
-			exchangeArguments,
-		)
-	} else {
-		err = channel.ExchangeDeclare(
-			exchangeName,
-			exchangeType,
-			exchangeDurable,
-			false, // delete when unused
-			false, // internal
-			false, // no-wait
-			exchangeArguments,
-		)
-	}
-	if err != nil {
-		return fmt.Errorf("error declaring exchange: %v", err)
-	}
-	return nil
-}
-
-func (q *AMQP) Close() error {
-	c := q.getClient()
-	if c == nil {
-		return nil
-	}
-
-	err := c.conn.Close()
-	if err != nil && err != amqp.ErrClosed {
-		log.Printf("E! Error closing AMQP connection: %s", err)
-		return err
-	}
-	return nil
-}
-
-func (q *AMQP) SampleConfig() string {
-	return sampleConfig
-}
-
-func (q *AMQP) Description() string {
-	return "Configuration for the AMQP server to send metrics to"
-}
-
-func (q *AMQP) Write(metrics []telegraf.Metric) error {
-	if len(metrics) == 0 {
-		return nil
-	}
-
-	c := q.getClient()
-	if c == nil {
-		return fmt.Errorf("connection is not open")
-	}
-
-	outbuf := make(map[string][]byte)
-
-	for _, metric := range metrics {
-		var key string
-		if q.RoutingKey != "" {
-			key = q.RoutingKey
-		}
-		if q.RoutingTag != "" {
-			if h, ok := metric.Tags()[q.RoutingTag]; ok {
-				key = h
-			}
-		}
-
-		buf, err := q.serializer.Serialize(metric)
-		if err != nil {
-			return err
-		}
-
-		outbuf[key] = append(outbuf[key], buf...)
-	}
-
-	for key, buf := range outbuf {
-		// Note that since the channel is not in confirm mode, the absence of
-		// an error does not indicate successful delivery.
-		err := c.channel.Publish(
-			q.Exchange, // exchange
-			key,        // routing key
-			false,      // mandatory
-			false,      // immediate
-			amqp.Publishing{
-				Headers:      c.headers,
-				ContentType:  "text/plain",
-				Body:         buf,
-				DeliveryMode: q.deliveryMode,
-			})
-		if err != nil {
-			return fmt.Errorf("Failed to send AMQP message: %s", err)
-		}
-	}
-	return nil
-}
-
-func (q *AMQP) getClient() *client {
-	q.Lock()
-	defer q.Unlock()
-	return q.c
-}
-
-func (q *AMQP) setClient(c *client) {
-	q.Lock()
-	q.c = c
-	q.Unlock()
+func connect(config *ClientConfig) (Client, error) {
+	return Connect(config)
 }
 
 func init() {
 	outputs.Add("amqp", func() telegraf.Output {
 		return &AMQP{
-			URL:                DefaultBroker,
-			AuthMethod:         DefaultAuthMethod,
-			ExchangeType:       DefaultExchangeType,
-			ExchangeDurability: DefaultExchangeDurability,
-			Database:           DefaultDatabase,
-			RetentionPolicy:    DefaultRetentionPolicy,
-			Timeout:            internal.Duration{Duration: time.Second * 5},
+			URL:             DefaultURL,
+			ExchangeType:    DefaultExchangeType,
+			AuthMethod:      DefaultAuthMethod,
+			Database:        DefaultDatabase,
+			RetentionPolicy: DefaultRetentionPolicy,
+			Timeout:         internal.Duration{Duration: time.Second * 5},
+			connect:         connect,
 		}
 	})
 }
diff --git a/plugins/outputs/amqp/amqp_test.go b/plugins/outputs/amqp/amqp_test.go
index 66a082627..32a914528 100644
--- a/plugins/outputs/amqp/amqp_test.go
+++ b/plugins/outputs/amqp/amqp_test.go
@@ -2,30 +2,161 @@ package amqp
 
 import (
 	"testing"
+	"time"
 
-	"github.com/influxdata/telegraf/plugins/serializers"
-	"github.com/influxdata/telegraf/testutil"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/streadway/amqp"
 	"github.com/stretchr/testify/require"
 )
 
-func TestConnectAndWrite(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
+type MockClient struct {
+	PublishF func(key string, body []byte) error
+	CloseF   func() error
 
-	var url = "amqp://" + testutil.GetLocalHost() + ":5672/"
-	s, _ := serializers.NewInfluxSerializer()
-	q := &AMQP{
-		URL:        url,
-		Exchange:   "telegraf_test",
-		serializer: s,
-	}
+	PublishCallCount int
+	CloseCallCount   int
 
-	// Verify that we can connect to the AMQP broker
-	err := q.Connect()
-	require.NoError(t, err)
-
-	// Verify that we can successfully write data to the amqp broker
-	err = q.Write(testutil.MockMetrics())
-	require.NoError(t, err)
+	t *testing.T
+}
+
+func (c *MockClient) Publish(key string, body []byte) error {
+	c.PublishCallCount++
+	return c.PublishF(key, body)
+}
+
+func (c *MockClient) Close() error {
+	c.CloseCallCount++
+	return c.CloseF()
+}
+
+func MockConnect(config *ClientConfig) (Client, error) {
+	return &MockClient{}, nil
+}
+
+func NewMockClient() Client {
+	return &MockClient{
+		PublishF: func(key string, body []byte) error {
+			return nil
+		},
+		CloseF: func() error {
+			return nil
+		},
+	}
+}
+
+func TestConnect(t *testing.T) {
+	tests := []struct {
+		name    string
+		output  *AMQP
+		errFunc func(t *testing.T, output *AMQP, err error)
+	}{
+		{
+			name: "defaults",
+			output: &AMQP{
+				Brokers:            []string{DefaultURL},
+				ExchangeType:       DefaultExchangeType,
+				ExchangeDurability: "durable",
+				AuthMethod:         DefaultAuthMethod,
+				Database:           DefaultDatabase,
+				RetentionPolicy:    DefaultRetentionPolicy,
+				Timeout:            internal.Duration{Duration: time.Second * 5},
+				connect: func(config *ClientConfig) (Client, error) {
+					return NewMockClient(), nil
+				},
+			},
+			errFunc: func(t *testing.T, output *AMQP, err error) {
+				config := output.config
+				require.Equal(t, []string{DefaultURL}, config.brokers)
+				require.Equal(t, "", config.exchange)
+				require.Equal(t, "topic", config.exchangeType)
+				require.Equal(t, false, config.exchangePassive)
+				require.Equal(t, true, config.exchangeDurable)
+				require.Equal(t, amqp.Table(nil), config.exchangeArguments)
+				require.Equal(t, amqp.Table{
+					"database":         DefaultDatabase,
+					"retention_policy": DefaultRetentionPolicy,
+				}, config.headers)
+				require.Equal(t, amqp.Transient, config.deliveryMode)
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "headers overrides deprecated dbrp",
+			output: &AMQP{
+				Headers: map[string]string{
+					"foo": "bar",
+				},
+				connect: func(config *ClientConfig) (Client, error) {
+					return NewMockClient(), nil
+				},
+			},
+			errFunc: func(t *testing.T, output *AMQP, err error) {
+				config := output.config
+				require.Equal(t, amqp.Table{
+					"foo": "bar",
+				}, config.headers)
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "exchange args",
+			output: &AMQP{
+				ExchangeArguments: map[string]string{
+					"foo": "bar",
+				},
+				connect: func(config *ClientConfig) (Client, error) {
+					return NewMockClient(), nil
+				},
+			},
+			errFunc: func(t *testing.T, output *AMQP, err error) {
+				config := output.config
+				require.Equal(t, amqp.Table{
+					"foo": "bar",
+				}, config.exchangeArguments)
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "username password",
+			output: &AMQP{
+				URL:      "amqp://foo:bar@localhost",
+				Username: "telegraf",
+				Password: "pa$$word",
+				connect: func(config *ClientConfig) (Client, error) {
+					return NewMockClient(), nil
+				},
+			},
+			errFunc: func(t *testing.T, output *AMQP, err error) {
+				config := output.config
+				require.Equal(t, []amqp.Authentication{
+					&amqp.PlainAuth{
+						Username: "telegraf",
+						Password: "pa$$word",
+					},
+				}, config.auth)
+
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "url support",
+			output: &AMQP{
+				URL: DefaultURL,
+				connect: func(config *ClientConfig) (Client, error) {
+					return NewMockClient(), nil
+				},
+			},
+			errFunc: func(t *testing.T, output *AMQP, err error) {
+				config := output.config
+				require.Equal(t, []string{DefaultURL}, config.brokers)
+				require.NoError(t, err)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.output.Connect()
+			tt.errFunc(t, tt.output, err)
+		})
+	}
 }
diff --git a/plugins/outputs/amqp/client.go b/plugins/outputs/amqp/client.go
new file mode 100644
index 000000000..ba4e45162
--- /dev/null
+++ b/plugins/outputs/amqp/client.go
@@ -0,0 +1,134 @@
+package amqp
+
+import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"log"
+	"math/rand"
+	"net"
+	"time"
+
+	"github.com/streadway/amqp"
+)
+
+type ClientConfig struct {
+	brokers           []string
+	exchange          string
+	exchangeType      string
+	exchangePassive   bool
+	exchangeDurable   bool
+	exchangeArguments amqp.Table
+	headers           amqp.Table
+	deliveryMode      uint8
+	tlsConfig         *tls.Config
+	timeout           time.Duration
+	auth              []amqp.Authentication
+}
+
+type client struct {
+	conn    *amqp.Connection
+	channel *amqp.Channel
+	config  *ClientConfig
+}
+
+// Connect opens a connection to one of the brokers at random
+func Connect(config *ClientConfig) (*client, error) {
+	client := &client{
+		config: config,
+	}
+
+	p := rand.Perm(len(config.brokers))
+	for _, n := range p {
+		broker := config.brokers[n]
+		log.Printf("D! Output [amqp] connecting to %q", broker)
+		conn, err := amqp.DialConfig(
+			broker, amqp.Config{
+				TLSClientConfig: config.tlsConfig,
+				SASL:            config.auth, // if nil, it will be PLAIN taken from url
+				Dial: func(network, addr string) (net.Conn, error) {
+					return net.DialTimeout(network, addr, config.timeout)
+				},
+			})
+		if err == nil {
+			client.conn = conn
+			log.Printf("D! Output [amqp] connected to %q", broker)
+			break
+		}
+		log.Printf("D! Output [amqp] error connecting to %q", broker)
+	}
+
+	if client.conn == nil {
+		return nil, errors.New("could not connect to any broker")
+	}
+
+	channel, err := client.conn.Channel()
+	if err != nil {
+		return nil, fmt.Errorf("error opening channel: %v", err)
+	}
+	client.channel = channel
+
+	err = client.DeclareExchange()
+	if err != nil {
+		return nil, err
+	}
+
+	return client, nil
+}
+
+func (c *client) DeclareExchange() error {
+	var err error
+	if c.config.exchangePassive {
+		err = c.channel.ExchangeDeclarePassive(
+			c.config.exchange,
+			c.config.exchangeType,
+			c.config.exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			c.config.exchangeArguments,
+		)
+	} else {
+		err = c.channel.ExchangeDeclare(
+			c.config.exchange,
+			c.config.exchangeType,
+			c.config.exchangeDurable,
+			false, // delete when unused
+			false, // internal
+			false, // no-wait
+			c.config.exchangeArguments,
+		)
+	}
+	if err != nil {
+		return fmt.Errorf("error declaring exchange: %v", err)
+	}
+	return nil
+}
+
+func (c *client) Publish(key string, body []byte) error {
+	// Note that since the channel is not in confirm mode, the absence of
+	// an error does not indicate successful delivery.
+	return c.channel.Publish(
+		c.config.exchange, // exchange
+		key,               // routing key
+		false,             // mandatory
+		false,             // immediate
+		amqp.Publishing{
+			Headers:      c.config.headers,
+			ContentType:  "text/plain",
+			Body:         body,
+			DeliveryMode: c.config.deliveryMode,
+		})
+}
+
+func (c *client) Close() error {
+	if c.conn == nil {
+		return nil
+	}
+
+	err := c.conn.Close()
+	if err != nil && err != amqp.ErrClosed {
+		return err
+	}
+	return nil
+}

From a04cfee349567a2af6a98df74d65e384057d6524 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 18:42:08 -0700
Subject: [PATCH 1238/1302] Fix incorrect option name in amqp sample
 configuration

---
 plugins/inputs/amqp_consumer/README.md        | 4 ++--
 plugins/inputs/amqp_consumer/amqp_consumer.go | 4 ++--
 plugins/outputs/amqp/README.md                | 4 ++--
 plugins/outputs/amqp/amqp.go                  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/inputs/amqp_consumer/README.md b/plugins/inputs/amqp_consumer/README.md
index e7701ad73..bc42f9107 100644
--- a/plugins/inputs/amqp_consumer/README.md
+++ b/plugins/inputs/amqp_consumer/README.md
@@ -41,8 +41,8 @@ The following defaults are known to work with RabbitMQ:
   # exchange_durability = "durable"
 
   ## Additional exchange arguments.
-  # exchange_args = { }
-  # exchange_args = {"hash_propery" = "timestamp"}
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
 
   ## AMQP queue name
   queue = "telegraf"
diff --git a/plugins/inputs/amqp_consumer/amqp_consumer.go b/plugins/inputs/amqp_consumer/amqp_consumer.go
index 1dde6fe23..739ed76e4 100644
--- a/plugins/inputs/amqp_consumer/amqp_consumer.go
+++ b/plugins/inputs/amqp_consumer/amqp_consumer.go
@@ -95,8 +95,8 @@ func (a *AMQPConsumer) SampleConfig() string {
   # exchange_durability = "durable"
 
   ## Additional exchange arguments.
-  # exchange_args = { }
-  # exchange_args = {"hash_propery" = "timestamp"}
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
 
   ## AMQP queue name
   queue = "telegraf"
diff --git a/plugins/outputs/amqp/README.md b/plugins/outputs/amqp/README.md
index 817eea673..6002311f6 100644
--- a/plugins/outputs/amqp/README.md
+++ b/plugins/outputs/amqp/README.md
@@ -39,8 +39,8 @@ For an introduction to AMQP see:
   # exchange_durable = true
 
   ## Additional exchange arguments.
-  # exchange_args = { }
-  # exchange_args = {"hash_propery" = "timestamp"}
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
 
   ## Authentication credentials for the PLAIN auth_method.
   # username = ""
diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go
index faaa1027c..a69db1e6d 100644
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -97,8 +97,8 @@ var sampleConfig = `
   # exchange_durable = true
 
   ## Additional exchange arguments.
-  # exchange_args = { }
-  # exchange_args = {"hash_propery" = "timestamp"}
+  # exchange_arguments = { }
+  # exchange_arguments = {"hash_propery" = "timestamp"}
 
   ## Authentication credentials for the PLAIN auth_method.
   # username = ""

From df1fe7a2b4c270bdf75333195bd8a03a52fc75cc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Sun, 3 Jun 2018 19:43:06 -0700
Subject: [PATCH 1239/1302] Use random name for test sockets to avoid
 intermittent failure

---
 plugins/inputs/conntrack/conntrack_test.go    |  8 +++-
 .../socket_listener/socket_listener_test.go   | 39 +++++++++++++------
 plugins/inputs/syslog/rfc5425_test.go         | 27 +++++++++++--
 plugins/inputs/syslog/rfc5426_test.go         | 20 +++++++---
 plugins/inputs/syslog/syslog_test.go          | 12 +++++-
 plugins/outputs/file/file_test.go             | 10 +++++
 .../socket_writer/socket_writer_test.go       | 24 ++++++++----
 7 files changed, 106 insertions(+), 34 deletions(-)

diff --git a/plugins/inputs/conntrack/conntrack_test.go b/plugins/inputs/conntrack/conntrack_test.go
index c457006ac..9c144afe8 100644
--- a/plugins/inputs/conntrack/conntrack_test.go
+++ b/plugins/inputs/conntrack/conntrack_test.go
@@ -3,14 +3,15 @@
 package conntrack
 
 import (
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
 )
 
 func restoreDflts(savedFiles, savedDirs []string) {
@@ -39,6 +40,7 @@ func TestDefaultsUsed(t *testing.T) {
 
 	tmpFile, err := ioutil.TempFile(tmpdir, "ip_conntrack_count")
 	assert.NoError(t, err)
+	defer os.Remove(tmpFile.Name())
 
 	dfltDirs = []string{tmpdir}
 	fname := path.Base(tmpFile.Name())
@@ -63,6 +65,8 @@ func TestConfigsUsed(t *testing.T) {
 	cntFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_count")
 	maxFile, err := ioutil.TempFile(tmpdir, "nf_conntrack_max")
 	assert.NoError(t, err)
+	defer os.Remove(cntFile.Name())
+	defer os.Remove(maxFile.Name())
 
 	dfltDirs = []string{tmpdir}
 	cntFname := path.Base(cntFile.Name())
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
index 65ee0db94..4370ac577 100644
--- a/plugins/inputs/socket_listener/socket_listener_test.go
+++ b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -3,9 +3,11 @@ package socket_listener
 import (
 	"bytes"
 	"crypto/tls"
+	"io/ioutil"
 	"log"
 	"net"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -50,14 +52,17 @@ func TestSocketListener_tcp_tls(t *testing.T) {
 }
 
 func TestSocketListener_unix_tls(t *testing.T) {
-	defer testEmptyLog(t)()
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix_tls.sock")
 
 	sl := newSocketListener()
-	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unix://" + sock
 	sl.ServerConfig = *pki.TLSServerConfig()
 
 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()
 
@@ -65,7 +70,7 @@ func TestSocketListener_unix_tls(t *testing.T) {
 	tlsCfg.InsecureSkipVerify = true
 	require.NoError(t, err)
 
-	secureClient, err := tls.Dial("unix", "/tmp/telegraf_test.sock", tlsCfg)
+	secureClient, err := tls.Dial("unix", sock, tlsCfg)
 	require.NoError(t, err)
 
 	testSocketListener(t, sl, secureClient)
@@ -108,38 +113,48 @@ func TestSocketListener_udp(t *testing.T) {
 }
 
 func TestSocketListener_unix(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix.sock")
+
 	defer testEmptyLog(t)()
 
-	os.Create("/tmp/telegraf_test.sock")
+	os.Create(sock)
 	sl := newSocketListener()
-	sl.ServiceAddress = "unix:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unix://" + sock
 	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()
 
-	client, err := net.Dial("unix", "/tmp/telegraf_test.sock")
+	client, err := net.Dial("unix", sock)
 	require.NoError(t, err)
 
 	testSocketListener(t, sl, client)
 }
 
 func TestSocketListener_unixgram(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unixgram.sock")
+
 	defer testEmptyLog(t)()
 
-	os.Create("/tmp/telegraf_test.sock")
+	os.Create(sock)
 	sl := newSocketListener()
-	sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock"
+	sl.ServiceAddress = "unixgram://" + sock
 	sl.ReadBufferSize = 1024
 
 	acc := &testutil.Accumulator{}
-	err := sl.Start(acc)
+	err = sl.Start(acc)
 	require.NoError(t, err)
 	defer sl.Stop()
 
-	client, err := net.Dial("unixgram", "/tmp/telegraf_test.sock")
+	client, err := net.Dial("unixgram", sock)
 	require.NoError(t, err)
 
 	testSocketListener(t, sl, client)
diff --git a/plugins/inputs/syslog/rfc5425_test.go b/plugins/inputs/syslog/rfc5425_test.go
index cac2bf7e1..1b69e6023 100644
--- a/plugins/inputs/syslog/rfc5425_test.go
+++ b/plugins/inputs/syslog/rfc5425_test.go
@@ -3,7 +3,10 @@ package syslog
 import (
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
 	"net"
+	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -504,17 +507,33 @@ func TestStrictWithZeroKeepAlive_tcp_tls(t *testing.T) {
 }
 
 func TestStrict_unix(t *testing.T) {
-	testStrictRFC5425(t, "unix", "/tmp/telegraf_test.sock", false, nil)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unix.sock")
+	testStrictRFC5425(t, "unix", sock, false, nil)
 }
 
 func TestBestEffort_unix(t *testing.T) {
-	testBestEffortRFC5425(t, "unix", "/tmp/telegraf_test.sock", false, nil)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unix.sock")
+	testBestEffortRFC5425(t, "unix", sock, false, nil)
 }
 
 func TestStrict_unix_tls(t *testing.T) {
-	testStrictRFC5425(t, "unix", "/tmp/telegraf_test.sock", true, nil)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unix_tls.sock")
+	testStrictRFC5425(t, "unix", sock, true, nil)
 }
 
 func TestBestEffort_unix_tls(t *testing.T) {
-	testBestEffortRFC5425(t, "unix", "/tmp/telegraf_test.sock", true, nil)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unix_tls.sock")
+	testBestEffortRFC5425(t, "unix", sock, true, nil)
 }
diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
index becd1c4b5..cae465189 100644
--- a/plugins/inputs/syslog/rfc5426_test.go
+++ b/plugins/inputs/syslog/rfc5426_test.go
@@ -2,8 +2,10 @@ package syslog
 
 import (
 	"fmt"
+	"io/ioutil"
 	"net"
 	"os"
+	"path/filepath"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -274,15 +276,21 @@ func TestStrict_udp(t *testing.T) {
 }
 
 func TestBestEffort_unixgram(t *testing.T) {
-	sockname := "/tmp/telegraf_test.sock"
-	os.Create(sockname)
-	testRFC5426(t, "unixgram", sockname, true)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestBestEffort_unixgram.sock")
+	os.Create(sock)
+	testRFC5426(t, "unixgram", sock, true)
 }
 
 func TestStrict_unixgram(t *testing.T) {
-	sockname := "/tmp/telegraf_test.sock"
-	os.Create(sockname)
-	testRFC5426(t, "unixgram", sockname, false)
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "syslog.TestStrict_unixgram.sock")
+	os.Create(sock)
+	testRFC5426(t, "unixgram", sock, false)
 }
 
 func TestTimeIncrement_udp(t *testing.T) {
diff --git a/plugins/inputs/syslog/syslog_test.go b/plugins/inputs/syslog/syslog_test.go
index 8fa0d9c94..66568380e 100644
--- a/plugins/inputs/syslog/syslog_test.go
+++ b/plugins/inputs/syslog/syslog_test.go
@@ -1,6 +1,9 @@
 package syslog
 
 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -41,12 +44,17 @@ func TestAddress(t *testing.T) {
 	require.EqualError(t, err, "unknown protocol 'unsupported' in 'example.com:6514'")
 	require.Error(t, err)
 
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	defer os.RemoveAll(tmpdir)
+	require.NoError(t, err)
+	sock := filepath.Join(tmpdir, "syslog.TestAddress.sock")
+
 	rec = &Syslog{
-		Address: "unixgram:///tmp/telegraf.sock",
+		Address: "unixgram://" + sock,
 	}
 	err = rec.Start(&testutil.Accumulator{})
 	require.NoError(t, err)
-	require.Equal(t, "/tmp/telegraf.sock", rec.Address)
+	require.Equal(t, sock, rec.Address)
 	rec.Stop()
 
 	// Default port is 6514
diff --git a/plugins/outputs/file/file_test.go b/plugins/outputs/file/file_test.go
index a2f15fc08..f1e87853d 100644
--- a/plugins/outputs/file/file_test.go
+++ b/plugins/outputs/file/file_test.go
@@ -22,6 +22,7 @@ const (
 
 func TestFileExistingFile(t *testing.T) {
 	fh := createFile()
+	defer os.Remove(fh.Name())
 	s, _ := serializers.NewInfluxSerializer()
 	f := File{
 		Files:      []string{fh.Name()},
@@ -43,6 +44,7 @@ func TestFileExistingFile(t *testing.T) {
 func TestFileNewFile(t *testing.T) {
 	s, _ := serializers.NewInfluxSerializer()
 	fh := tmpFile()
+	defer os.Remove(fh)
 	f := File{
 		Files:      []string{fh},
 		serializer: s,
@@ -62,8 +64,11 @@ func TestFileNewFile(t *testing.T) {
 
 func TestFileExistingFiles(t *testing.T) {
 	fh1 := createFile()
+	defer os.Remove(fh1.Name())
 	fh2 := createFile()
+	defer os.Remove(fh2.Name())
 	fh3 := createFile()
+	defer os.Remove(fh3.Name())
 
 	s, _ := serializers.NewInfluxSerializer()
 	f := File{
@@ -88,8 +93,11 @@ func TestFileExistingFiles(t *testing.T) {
 func TestFileNewFiles(t *testing.T) {
 	s, _ := serializers.NewInfluxSerializer()
 	fh1 := tmpFile()
+	defer os.Remove(fh1)
 	fh2 := tmpFile()
+	defer os.Remove(fh2)
 	fh3 := tmpFile()
+	defer os.Remove(fh3)
 	f := File{
 		Files:      []string{fh1, fh2, fh3},
 		serializer: s,
@@ -111,7 +119,9 @@ func TestFileNewFiles(t *testing.T) {
 
 func TestFileBoth(t *testing.T) {
 	fh1 := createFile()
+	defer os.Remove(fh1.Name())
 	fh2 := tmpFile()
+	defer os.Remove(fh2)
 
 	s, _ := serializers.NewInfluxSerializer()
 	f := File{
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
index 0c5747d31..4d93469fa 100644
--- a/plugins/outputs/socket_writer/socket_writer_test.go
+++ b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -3,8 +3,10 @@ package socket_writer
 import (
 	"bufio"
 	"bytes"
+	"io/ioutil"
 	"net"
 	"os"
+	"path/filepath"
 	"sync"
 	"testing"
 
@@ -44,13 +46,16 @@ func TestSocketWriter_udp(t *testing.T) {
 }
 
 func TestSocketWriter_unix(t *testing.T) {
-	os.Remove("/tmp/telegraf_test.sock")
-	defer os.Remove("/tmp/telegraf_test.sock")
-	listener, err := net.Listen("unix", "/tmp/telegraf_test.sock")
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unix.sock")
+
+	listener, err := net.Listen("unix", sock)
 	require.NoError(t, err)
 
 	sw := newSocketWriter()
-	sw.Address = "unix:///tmp/telegraf_test.sock"
+	sw.Address = "unix://" + sock
 
 	err = sw.Connect()
 	require.NoError(t, err)
@@ -62,13 +67,16 @@ func TestSocketWriter_unix(t *testing.T) {
 }
 
 func TestSocketWriter_unixgram(t *testing.T) {
-	os.Remove("/tmp/telegraf_test.sock")
-	defer os.Remove("/tmp/telegraf_test.sock")
-	listener, err := net.ListenPacket("unixgram", "/tmp/telegraf_test.sock")
+	tmpdir, err := ioutil.TempDir("", "telegraf")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpdir)
+	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unixgram.sock")
+
+	listener, err := net.ListenPacket("unixgram", sock)
 	require.NoError(t, err)
 
 	sw := newSocketWriter()
-	sw.Address = "unixgram:///tmp/telegraf_test.sock"
+	sw.Address = "unixgram://" + sock
 
 	err = sw.Connect()
 	require.NoError(t, err)

From ff93c3c3268f47192fbb6110dad9126388d266b1 Mon Sep 17 00:00:00 2001
From: Mathur <mathuronit@users.noreply.github.com>
Date: Mon, 4 Jun 2018 12:51:57 -0500
Subject: [PATCH 1240/1302] Update burrow README.md (#4231)

---
 plugins/inputs/burrow/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md
index 039cff8c4..fe0b078ba 100644
--- a/plugins/inputs/burrow/README.md
+++ b/plugins/inputs/burrow/README.md
@@ -8,6 +8,7 @@ Supported Burrow version: `1.x`
 ### Configuration
 
 ```
+[[inputs.burrow]]
   ## Burrow API endpoints in format "schema://host:port".
   ## Default is "http://localhost:8000".
   servers = ["http://localhost:8000"]

From be8b87000cb1e47eec641b2b6f403204f1d3c1ba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 17:58:40 -0700
Subject: [PATCH 1241/1302] Remove test for empty metrics list from file output

---
 plugins/outputs/file/file.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go
index 5f2bf042f..0bbff2f64 100644
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -83,10 +83,6 @@ func (f *File) Description() string {
 }
 
 func (f *File) Write(metrics []telegraf.Metric) error {
-	if len(metrics) == 0 {
-		return nil
-	}
-
 	var writeErr error = nil
 	for _, metric := range metrics {
 		b, err := f.serializer.Serialize(metric)

From 9eab3572ff0ce21dcb6b6c2764037cebde6c3cb0 Mon Sep 17 00:00:00 2001
From: Phil Preston <philippreston@mac.com>
Date: Tue, 5 Jun 2018 01:58:20 +0100
Subject: [PATCH 1242/1302] Add counter fields to pf input (#4216)

---
 plugins/inputs/pf/README.md  | 15 ++++++++++
 plugins/inputs/pf/pf.go      | 58 +++++++++++++++++++++++++++++-------
 plugins/inputs/pf/pf_test.go | 46 +++++++++++++++++++++++-----
 3 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/plugins/inputs/pf/README.md b/plugins/inputs/pf/README.md
index ed058671b..2e70de5b7 100644
--- a/plugins/inputs/pf/README.md
+++ b/plugins/inputs/pf/README.md
@@ -31,6 +31,21 @@ telegraf ALL=(root) NOPASSWD: /sbin/pfctl -s info
     - searches (integer, count)
     - inserts (integer, count)
     - removals (integer, count)
+    - match (integer, count)
+    - bad-offset (integer, count)
+    - fragment (integer, count)
+    - short (integer, count)
+    - normalize (integer, count)
+    - memory (integer, count)
+    - bad-timestamp (integer, count)
+    - congestion (integer, count)
+    - ip-option (integer, count)
+    - proto-cksum (integer, count)
+    - state-mismatch (integer, count)
+    - state-insert (integer, count)
+    - state-limit (integer, count)
+    - src-limit (integer, count)
+    - synproxy (integer, count)
 
 ### Example Output:
 
diff --git a/plugins/inputs/pf/pf.go b/plugins/inputs/pf/pf.go
index 9712ee8a6..04b5f9d21 100644
--- a/plugins/inputs/pf/pf.go
+++ b/plugins/inputs/pf/pf.go
@@ -67,7 +67,7 @@ func errMissingData(tag string) error {
 
 type pfctlOutputStanza struct {
 	HeaderRE  *regexp.Regexp
-	ParseFunc func([]string, telegraf.Accumulator) error
+	ParseFunc func([]string, map[string]interface{}) error
 	Found     bool
 }
 
@@ -76,11 +76,16 @@ var pfctlOutputStanzas = []*pfctlOutputStanza{
 		HeaderRE:  regexp.MustCompile("^State Table"),
 		ParseFunc: parseStateTable,
 	},
+	&pfctlOutputStanza{
+		HeaderRE:  regexp.MustCompile("^Counters"),
+		ParseFunc: parseCounterTable,
+	},
 }
 
 var anyTableHeaderRE = regexp.MustCompile("^[A-Z]")
 
 func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error {
+	fields := make(map[string]interface{})
 	scanner := bufio.NewScanner(strings.NewReader(pfoutput))
 	for scanner.Scan() {
 		line := scanner.Text()
@@ -91,10 +96,14 @@ func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error
 				line = scanner.Text()
 				for !anyTableHeaderRE.MatchString(line) {
 					stanzaLines = append(stanzaLines, line)
-					scanner.Scan()
-					line = scanner.Text()
+					more := scanner.Scan()
+					if more {
+						line = scanner.Text()
+					} else {
+						break
+					}
 				}
-				if perr := s.ParseFunc(stanzaLines, acc); perr != nil {
+				if perr := s.ParseFunc(stanzaLines, fields); perr != nil {
 					return perr
 				}
 				s.Found = true
@@ -106,6 +115,8 @@ func (pf *PF) parsePfctlOutput(pfoutput string, acc telegraf.Accumulator) error
 			return errParseHeader
 		}
 	}
+
+	acc.AddFields(measurement, fields, make(map[string]string))
 	return nil
 }
 
@@ -124,11 +135,40 @@ var StateTable = []*Entry{
 
 var stateTableRE = regexp.MustCompile(`^  (.*?)\s+(\d+)`)
 
-func parseStateTable(lines []string, acc telegraf.Accumulator) error {
+func parseStateTable(lines []string, fields map[string]interface{}) error {
+	return storeFieldValues(lines, stateTableRE, fields, StateTable)
+}
+
+var CounterTable = []*Entry{
+	&Entry{"match", "match", -1},
+	&Entry{"bad-offset", "bad-offset", -1},
+	&Entry{"fragment", "fragment", -1},
+	&Entry{"short", "short", -1},
+	&Entry{"normalize", "normalize", -1},
+	&Entry{"memory", "memory", -1},
+	&Entry{"bad-timestamp", "bad-timestamp", -1},
+	&Entry{"congestion", "congestion", -1},
+	&Entry{"ip-option", "ip-option", -1},
+	&Entry{"proto-cksum", "proto-cksum", -1},
+	&Entry{"state-mismatch", "state-mismatch", -1},
+	&Entry{"state-insert", "state-insert", -1},
+	&Entry{"state-limit", "state-limit", -1},
+	&Entry{"src-limit", "src-limit", -1},
+	&Entry{"synproxy", "synproxy", -1},
+}
+
+var counterTableRE = regexp.MustCompile(`^  (.*?)\s+(\d+)`)
+
+func parseCounterTable(lines []string, fields map[string]interface{}) error {
+	return storeFieldValues(lines, counterTableRE, fields, CounterTable)
+}
+
+func storeFieldValues(lines []string, regex *regexp.Regexp, fields map[string]interface{}, entryTable []*Entry) error {
+
 	for _, v := range lines {
-		entries := stateTableRE.FindStringSubmatch(v)
+		entries := regex.FindStringSubmatch(v)
 		if entries != nil {
-			for _, f := range StateTable {
+			for _, f := range entryTable {
 				if f.PfctlTitle == entries[1] {
 					var err error
 					if f.Value, err = strconv.ParseInt(entries[2], 10, 64); err != nil {
@@ -139,15 +179,13 @@ func parseStateTable(lines []string, acc telegraf.Accumulator) error {
 		}
 	}
 
-	fields := make(map[string]interface{})
-	for _, v := range StateTable {
+	for _, v := range entryTable {
 		if v.Value == -1 {
 			return errMissingData(v.PfctlTitle)
 		}
 		fields[v.Field] = v.Value
 	}
 
-	acc.AddFields(measurement, fields, make(map[string]string))
 	return nil
 }
 
diff --git a/plugins/inputs/pf/pf_test.go b/plugins/inputs/pf/pf_test.go
index 233e72592..0b90d949a 100644
--- a/plugins/inputs/pf/pf_test.go
+++ b/plugins/inputs/pf/pf_test.go
@@ -152,10 +152,25 @@ Counters
 			measurements: []measurementResult{
 				measurementResult{
 					fields: map[string]interface{}{
-						"entries":  int64(2),
-						"searches": int64(11325),
-						"inserts":  int64(5),
-						"removals": int64(3)},
+						"entries":        int64(2),
+						"searches":       int64(11325),
+						"inserts":        int64(5),
+						"removals":       int64(3),
+						"match":          int64(11226),
+						"bad-offset":     int64(0),
+						"fragment":       int64(0),
+						"short":          int64(0),
+						"normalize":      int64(0),
+						"memory":         int64(0),
+						"bad-timestamp":  int64(0),
+						"congestion":     int64(0),
+						"ip-option":      int64(0),
+						"proto-cksum":    int64(0),
+						"state-mismatch": int64(0),
+						"state-insert":   int64(0),
+						"state-limit":    int64(0),
+						"src-limit":      int64(0),
+						"synproxy":       int64(0)},
 					tags: map[string]string{},
 				},
 			},
@@ -197,10 +212,25 @@ Counters
 			measurements: []measurementResult{
 				measurementResult{
 					fields: map[string]interface{}{
-						"entries":  int64(649),
-						"searches": int64(18421725761),
-						"inserts":  int64(156762508),
-						"removals": int64(156761859)},
+						"entries":        int64(649),
+						"searches":       int64(18421725761),
+						"inserts":        int64(156762508),
+						"removals":       int64(156761859),
+						"match":          int64(473002784),
+						"bad-offset":     int64(0),
+						"fragment":       int64(2729),
+						"short":          int64(107),
+						"normalize":      int64(1685),
+						"memory":         int64(101),
+						"bad-timestamp":  int64(0),
+						"congestion":     int64(0),
+						"ip-option":      int64(152301),
+						"proto-cksum":    int64(108),
+						"state-mismatch": int64(24393),
+						"state-insert":   int64(92),
+						"state-limit":    int64(0),
+						"src-limit":      int64(0),
+						"synproxy":       int64(0)},
 					tags: map[string]string{},
 				},
 			},

From 96abff0660c88ef51874cc14ac8c73e12753fcce Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 18:02:00 -0700
Subject: [PATCH 1243/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aca563bc..0d63a4629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - [#4212](https://github.com/influxdata/telegraf/pull/4212): Print the enabled aggregator and processor plugins on startup.
 - [#3994](https://github.com/influxdata/telegraf/pull/3994): Add static routing_key option to amqp output.
 - [#3995](https://github.com/influxdata/telegraf/pull/3995): Add passive mode exchange declaration option to amqp consumer input.
+- [#4216](https://github.com/influxdata/telegraf/pull/4216): Add counter fields to pf input.
 
 ### Bugfixes
 

From 449bd5c3b948ab9889155cae6df799c80b60fea0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 18:06:59 -0700
Subject: [PATCH 1244/1302] Fix misnamed option in varnish sample config

---
 plugins/inputs/varnish/README.md  | 2 +-
 plugins/inputs/varnish/varnish.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/varnish/README.md b/plugins/inputs/varnish/README.md
index 01ab7ac24..8949fe6db 100644
--- a/plugins/inputs/varnish/README.md
+++ b/plugins/inputs/varnish/README.md
@@ -20,7 +20,7 @@ This plugin gathers stats from [Varnish HTTP Cache](https://varnish-cache.org/)
 
    ## Optional name for the varnish instance (or working directory) to query
    ## Usually appened after -n in varnish cli
-   #name = instanceName
+   # instance_name = instanceName
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
index 7ceb7d250..f1c703971 100644
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -48,7 +48,7 @@ var sampleConfig = `
 
   ## Optional name for the varnish instance (or working directory) to query
   ## Usually appened after -n in varnish cli
-  #name = instanceName
+  # instance_name = instanceName
 `
 
 func (s *Varnish) Description() string {

From eb94bb29fd6ff1a714bde9d11e9f44ea6fe37b75 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 18:13:53 -0700
Subject: [PATCH 1245/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d63a4629..86a88fda2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@
 
 - [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
 - [#4218](https://github.com/influxdata/telegraf/issues/4218): Fix uint support in cloudwatch output.
+- [#4188](https://github.com/influxdata/telegraf/pull/4188): Fix documentation of instance_name option in varnish input.
 
 ## v1.6.3 [2018-05-21]
 

From 701e157ef06032c937940efc5b6933560f81deb3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 18:23:51 -0700
Subject: [PATCH 1246/1302] Revert "Update aerospike-client-go version to
 latest release (#4128)"

This reverts commit 1f296129184f4022fb8af006de7d8d591343dc5c.
---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 70e6e7966..4096d93af 100644
--- a/Godeps
+++ b/Godeps
@@ -1,6 +1,6 @@
 code.cloudfoundry.org/clock e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
 collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/aerospike/aerospike-client-go 9701404f4c60a6ea256595d24bf318f721a7e8b8
+github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
 github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
 github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
 github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0

From 2be32f0a80fb86249df0de4ae99d09171c4f63ac Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 4 Jun 2018 18:35:47 -0700
Subject: [PATCH 1247/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86a88fda2..ca91ef10c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
 - [#4203](https://github.com/influxdata/telegraf/issues/4203): Fix snmp overriding of auto-configured table fields.
 - [#4218](https://github.com/influxdata/telegraf/issues/4218): Fix uint support in cloudwatch output.
 - [#4188](https://github.com/influxdata/telegraf/pull/4188): Fix documentation of instance_name option in varnish input.
+- [#4195](https://github.com/influxdata/telegraf/pull/4195): Revert to previous aerospike library version due to memory leak.
 
 ## v1.6.3 [2018-05-21]
 

From 7332ce0e9560dce3ba2307d1dd1452cf1db43aad Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Jun 2018 11:40:03 -0700
Subject: [PATCH 1248/1302] Add go-syslog to dependencies licenses list

---
 docs/LICENSE_OF_DEPENDENCIES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 0e4763027..2d215984b 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -44,6 +44,7 @@ following works:
 - github.com/hashicorp/raft [MPL](https://github.com/hashicorp/raft/blob/master/LICENSE)
 - github.com/influxdata/tail [MIT](https://github.com/influxdata/tail/blob/master/LICENSE.txt)
 - github.com/influxdata/toml [MIT](https://github.com/influxdata/toml/blob/master/LICENSE)
+- github.com/influxdata/go-syslog [MIT](https://github.com/influxdata/go-syslog/blob/develop/LICENSE)
 - github.com/influxdata/wlog [MIT](https://github.com/influxdata/wlog/blob/master/LICENSE)
 - github.com/jackc/pgx [MIT](https://github.com/jackc/pgx/blob/master/LICENSE)
 - github.com/jmespath/go-jmespath [APACHE](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)

From 7103077b3f3f39b87dac6062779ded56042dccf1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Jun 2018 11:45:07 -0700
Subject: [PATCH 1249/1302] Update sample config

---
 etc/telegraf.conf | 352 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 306 insertions(+), 46 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 41f244ec8..dbf142c2f 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -158,33 +158,74 @@
 #   # timeout = "5s"
 
 
-# # Configuration for the AMQP server to send metrics to
+# # Publishes metrics to an AMQP broker
 # [[outputs.amqp]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
+#   ## Broker to publish to.
+#   ##   deprecated in 1.7; use the brokers option
+#   # url = "amqp://localhost:5672/influxdb"
+#
+#   ## Brokers to publish to.  If multiple brokers are specified a random broker
+#   ## will be selected anytime a connection is established.  This can be
+#   ## helpful for load balancing when not using a dedicated load balancer.
+#   brokers = ["amqp://localhost:5672/influxdb"]
+#
+#   ## Maximum messages to send over a connection.  Once this is reached, the
+#   ## connection is closed and a new connection is made.  This can be helpful for
+#   ## load balancing when not using a dedicated load balancer.
+#   # max_messages = 0
+#
+#   ## Exchange to declare and publish to.
 #   exchange = "telegraf"
+#
+#   ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+#   # exchange_type = "topic"
+#
+#   ## If true, exchange will be passively declared.
+#   # exchange_declare_passive = false
+#
+#   ## If true, exchange will be created as a durable exchange.
+#   # exchange_durable = true
+#
+#   ## Additional exchange arguments.
+#   # exchange_arguments = { }
+#   # exchange_arguments = {"hash_propery" = "timestamp"}
+#
+#   ## Authentication credentials for the PLAIN auth_method.
+#   # username = ""
+#   # password = ""
+#
 #   ## Auth method. PLAIN and EXTERNAL are supported
 #   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
 #   ## described here: https://www.rabbitmq.com/plugins.html
 #   # auth_method = "PLAIN"
-#   ## Topic routing key
-#   # routing_key = ""
-#   ## Telegraf tag to use as a routing key
-#   ##  ie, if this tag exists, its value will be used as the routing key
-#   ##  and override routing_key config even if defined
-#   routing_tag = "host"
-#   ## Delivery Mode controls if a published message is persistent
-#   ## Valid options are "transient" and "persistent". default: "transient"
-#   delivery_mode = "transient"
 #
-#   ## InfluxDB retention policy
-#   # retention_policy = "default"
-#   ## InfluxDB database
+#   ## Metric tag to use as a routing key.
+#   ##   ie, if this tag exists, its value will be used as the routing key
+#   # routing_tag = "host"
+#
+#   ## Static routing key.  Used when no routing_tag is set or as a fallback
+#   ## when the tag specified in routing tag is not found.
+#   # routing_key = ""
+#   # routing_key = "telegraf"
+#
+#   ## Delivery Mode controls if a published message is persistent.
+#   ##   One of "transient" or "persistent".
+#   # delivery_mode = "transient"
+#
+#   ## InfluxDB database added as a message header.
+#   ##   deprecated in 1.7; use the headers option
 #   # database = "telegraf"
 #
-#   ## Write timeout, formatted as a string.  If not provided, will default
-#   ## to 5s. 0s means no timeout (not recommended).
+#   ## InfluxDB retention policy added as a message header
+#   ##   deprecated in 1.7; use the headers option
+#   # retention_policy = "default"
+#
+#   ## Static headers added to each published message.
+#   # headers = { }
+#   # headers = {"database" = "telegraf", "retention_policy" = "default"}
+#
+#   ## Connection timeout.  If not provided, will default to 5s.  0s means no
+#   ## timeout (not recommended).
 #   # timeout = "5s"
 #
 #   ## Optional TLS Config
@@ -194,11 +235,16 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## If true use batch serialization format instead of line based delimiting.
+#   ## Only applies to data formats which are not line based such as JSON.
+#   ## Recommended to set to true.
+#   # use_batch_format = false
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
-#   data_format = "influx"
+#   # data_format = "influx"
 
 
 # # Send metrics to Azure Application Insights
@@ -347,6 +393,10 @@
 #   ## Graphite output template
 #   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   template = "host.tags.measurement.field"
+#
+#   ## Enable Graphite tags support
+#   # graphite_tag_support = false
+#
 #   ## timeout in seconds for the write connection to graphite
 #   timeout = 2
 #
@@ -379,11 +429,6 @@
 #   # username = "username"
 #   # password = "pa$$word"
 #
-#   ## Additional HTTP headers
-#   # [outputs.http.headers]
-#   #   # Should be set to "application/json" for json data_format
-#   #   Content-Type = "text/plain; charset=utf-8"
-#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -396,6 +441,11 @@
 #   ## more about them here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   # data_format = "influx"
+#
+#   ## Additional HTTP headers
+#   # [outputs.http.headers]
+#   #   # Should be set manually to "application/json" for json data_format
+#   #   Content-Type = "text/plain; charset=utf-8"
 
 
 # # Configuration for sending metrics to an Instrumental project
@@ -828,6 +878,34 @@
 #                            PROCESSOR PLUGINS                                #
 ###############################################################################
 
+# # Convert values to another metric value type
+# [[processors.converter]]
+#   ## Tags to convert
+#   ##
+#   ## The table key determines the target type, and the array of key-values
+#   ## select the keys to convert.  The array may contain globs.
+#   ##   <target-type> = [<tag-key>...]
+#   [processors.converter.tags]
+#     string = []
+#     integer = []
+#     unsigned = []
+#     boolean = []
+#     float = []
+#
+#   ## Fields to convert
+#   ##
+#   ## The table key determines the target type, and the array of key-values
+#   ## select the keys to convert.  The array may contain globs.
+#   ##   <target-type> = [<field-key>...]
+#   [processors.converter.fields]
+#     tag = []
+#     string = []
+#     integer = []
+#     unsigned = []
+#     boolean = []
+#     float = []
+
+
 # # Apply metric modifications using override semantics.
 # [[processors.override]]
 #   ## All modifications on inputs and aggregators can be overridden:
@@ -844,6 +922,36 @@
 # [[processors.printer]]
 
 
+# # Transforms tag and field values with regex pattern
+# [[processors.regex]]
+#   ## Tag and field conversions defined in a separate sub-tables
+#   # [[processors.regex.tags]]
+#   #   ## Tag to change
+#   #   key = "resp_code"
+#   #   ## Regular expression to match on a tag value
+#   #   pattern = "^(\\d)\\d\\d$"
+#   #   ## Pattern for constructing a new value (${1} represents first subgroup)
+#   #   replacement = "${1}xx"
+#
+#   # [[processors.regex.fields]]
+#   #   key = "request"
+#   #   ## All the power of the Go regular expressions available here
+#   #   ## For example, named subgroups
+#   #   pattern = "^/api(?P<method>/[\\w/]+)\\S*"
+#   #   replacement = "${method}"
+#   #   ## If result_key is present, a new field will be created
+#   #   ## instead of changing existing field
+#   #   result_key = "method"
+#
+#   ## Multiple conversions may be applied for one field sequentially
+#   ## Let's extract one more value
+#   # [[processors.regex.fields]]
+#   #   key = "request"
+#   #   pattern = ".*category=(\\w+).*"
+#   #   replacement = "${1}"
+#   #   result_key = "search_category"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.topk]]
 #   ## How many seconds between aggregations
@@ -1030,6 +1138,17 @@
 #   ## This plugin will query all namespaces the aerospike
 #   ## server has configured and get stats for them.
 #   servers = ["localhost:3000"]
+#
+#   # username = "telegraf"
+#   # password = "pa$$word"
+#
+#   ## Optional TLS Config
+#   # enable_tls = false
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
 
 
 # # Read Apache status information (mod_status)
@@ -1054,6 +1173,32 @@
 #   # insecure_skip_verify = false
 
 
+# # Gather metrics from Apache Aurora schedulers
+# [[inputs.aurora]]
+#   ## Schedulers are the base addresses of your Aurora Schedulers
+#   schedulers = ["http://127.0.0.1:8081"]
+#
+#   ## Set of role types to collect metrics from.
+#   ##
+#   ## The scheduler roles are checked each interval by contacting the
+#   ## scheduler nodes; zookeeper is not contacted.
+#   # roles = ["leader", "follower"]
+#
+#   ## Timeout is the max time for total network operations.
+#   # timeout = "5s"
+#
+#   ## Username and password are sent using HTTP Basic Auth.
+#   # username = "username"
+#   # password = "pa$$word"
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+
+
 # # Read metrics of bcache from stats_total and dirty_data
 # [[inputs.bcache]]
 #   ## Bcache sets path
@@ -1078,6 +1223,49 @@
 #   # bond_interfaces = ["bond0"]
 
 
+# # Collect Kafka topics and consumers status from Burrow HTTP API.
+# [[inputs.burrow]]
+#   ## Burrow API endpoints in format "schema://host:port".
+#   ## Default is "http://localhost:8000".
+#   servers = ["http://localhost:8000"]
+#
+#   ## Override Burrow API prefix.
+#   ## Useful when Burrow is behind reverse-proxy.
+#   # api_prefix = "/v3/kafka"
+#
+#   ## Maximum time to receive response.
+#   # response_timeout = "5s"
+#
+#   ## Limit per-server concurrent connections.
+#   ## Useful in case of large number of topics or consumer groups.
+#   # concurrent_connections = 20
+#
+#   ## Filter clusters, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # clusters_include = []
+#   # clusters_exclude = []
+#
+#   ## Filter consumer groups, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # groups_include = []
+#   # groups_exclude = []
+#
+#   ## Filter topics, default is no filtering.
+#   ## Values can be specified as glob patterns.
+#   # topics_include = []
+#   # topics_exclude = []
+#
+#   ## Credentials for basic HTTP authentication.
+#   # username = ""
+#   # password = ""
+#
+#   ## Optional SSL config
+#   # ssl_ca = "/etc/telegraf/ca.pem"
+#   # ssl_cert = "/etc/telegraf/cert.pem"
+#   # ssl_key = "/etc/telegraf/key.pem"
+#   # insecure_skip_verify = false
+
+
 # # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
 # [[inputs.ceph]]
 #   ## This is the recommended interval to poll.  Too frequent and you will lose
@@ -2331,7 +2519,7 @@
 #   reverse_metric_names = true
 
 
-# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
@@ -2599,6 +2787,9 @@
 #   ## Remove numbers from field names.
 #   ## If true, a field name like 'temp1_input' will be changed to 'temp_input'.
 #   # remove_numbers = true
+#
+#   ## Timeout is the maximum amount of time that the sensors command can run.
+#   # timeout = "5s"
 
 
 # # Read metrics from storage devices supporting S.M.A.R.T.
@@ -2950,23 +3141,27 @@
 #   pools = ["redis_pool", "mc_pool"]
 
 
-# # A plugin to collect stats from Unbound - a validating, recursive, and caching DNS resolver
+# # A plugin to collect stats from the Unbound DNS resolver
 # [[inputs.unbound]]
-#   ## If running as a restricted user you can prepend sudo for additional access:
-#   #use_sudo = false
-#
-#   ## The default location of the unbound-control binary can be overridden with:
-#   binary = "/usr/sbin/unbound-control"
-#
-#   ## The default timeout of 1s can be overriden with:
-#   timeout = "1s"
-#
-#   ## Use the builtin fielddrop/fieldpass telegraf filters in order to keep/remove specific fields
-#   fieldpass = ["total_*", "num_*","time_up", "mem_*"]
-#
-#   ## IP of server to connect to, read from unbound conf default, optionally ':port'
+#   ## Address of server to connect to, read from unbound conf default, optionally ':port'
 #   ## Will lookup IP if given a hostname
 #   server = "127.0.0.1:8953"
+#
+#   ## If running as a restricted user you can prepend sudo for additional access:
+#   # use_sudo = false
+#
+#   ## The default location of the unbound-control binary can be overridden with:
+#   # binary = "/usr/sbin/unbound-control"
+#
+#   ## The default timeout of 1s can be overriden with:
+#   # timeout = "1s"
+#
+#   ## When set to true, thread metrics are tagged with the thread id.
+#   ##
+#   ## The default is false for backwards compatibility, and will be change to
+#   ## true in a future version.  It is recommended to set to true on new
+#   ## deployments.
+#   thread_as_tag = false
 
 
 # # A plugin to collect stats from Varnish HTTP Cache
@@ -2985,7 +3180,7 @@
 #
 #   ## Optional name for the varnish instance (or working directory) to query
 #   ## Usually appened after -n in varnish cli
-#   #name = instanceName
+#   # instance_name = instanceName
 
 
 # # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
@@ -3032,19 +3227,43 @@
 
 # # AMQP consumer plugin
 # [[inputs.amqp_consumer]]
-#   ## AMQP url
-#   url = "amqp://localhost:5672/influxdb"
-#   ## AMQP exchange
+#   ## Broker to consume from.
+#   ##   deprecated in 1.7; use the brokers option
+#   # url = "amqp://localhost:5672/influxdb"
+#
+#   ## Brokers to consume from.  If multiple brokers are specified a random broker
+#   ## will be selected anytime a connection is established.  This can be
+#   ## helpful for load balancing when not using a dedicated load balancer.
+#   brokers = ["amqp://localhost:5672/influxdb"]
+#
+#   ## Authentication credentials for the PLAIN auth_method.
+#   # username = ""
+#   # password = ""
+#
+#   ## Exchange to declare and consume from.
 #   exchange = "telegraf"
-#   ## Exchange passive mode
-#   exchange_passive = false
+#
+#   ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
+#   # exchange_type = "topic"
+#
+#   ## If true, exchange will be passively declared.
+#   # exchange_passive = false
+#
+#   ## Exchange durability can be either "transient" or "durable".
+#   # exchange_durability = "durable"
+#
+#   ## Additional exchange arguments.
+#   # exchange_arguments = { }
+#   # exchange_arguments = {"hash_propery" = "timestamp"}
+#
 #   ## AMQP queue name
 #   queue = "telegraf"
+#
 #   ## Binding Key
 #   binding_key = "#"
 #
 #   ## Maximum number of messages server should give to the worker.
-#   prefetch_count = 50
+#   # prefetch_count = 50
 #
 #   ## Auth method. PLAIN and EXTERNAL are supported
 #   ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as
@@ -3565,6 +3784,46 @@
 #   percentile_limit = 1000
 
 
+# # Accepts syslog messages per RFC5425
+# [[inputs.syslog]]
+#   ## Specify an ip or hostname with port - eg., tcp://localhost:6514, tcp://10.0.0.1:6514
+#   ## Protocol, address and port to host the syslog receiver.
+#   ## If no host is specified, then localhost is used.
+#   ## If no port is specified, 6514 is used (RFC5425#section-4.1).
+#   server = "tcp://:6514"
+#
+#   ## TLS Config
+#   # tls_allowed_cacerts = ["/etc/telegraf/ca.pem"]
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#
+#   ## Period between keep alive probes.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   # keep_alive_period = "5m"
+#
+#   ## Maximum number of concurrent connections (default = 0).
+#   ## 0 means unlimited.
+#   ## Only applies to stream sockets (e.g. TCP).
+#   # max_connections = 1024
+#
+#   ## Read timeout (default = 500ms).
+#   ## 0 means unlimited.
+#   # read_timeout = 500ms
+#
+#   ## Whether to parse in best effort mode or not (default = false).
+#   ## By default best effort parsing is off.
+#   # best_effort = false
+#
+#   ## Character to prepend to SD-PARAMs (default = "_").
+#   ## A syslog message can contain multiple parameters and multiple identifiers within structured data section.
+#   ## Eg., [id1 name1="val1" name2="val2"][id2 name1="val1" nameA="valA"]
+#   ## For each combination a field is created.
+#   ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
+#   # sdparam_separator = "_"
+
+
 # # Stream a log file, like the tail -f command
 # [[inputs.tail]]
 #   ## files to tail.
@@ -3635,3 +3894,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+

From b1d77ade55bec760aeb7cb69024da28b623eaf21 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Jun 2018 11:46:55 -0700
Subject: [PATCH 1250/1302] Update master version to 1.8

---
 cmd/telegraf/telegraf.go | 2 +-
 scripts/build.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index e3ab11028..b21f223cf 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -58,7 +58,7 @@ var fService = flag.String("service", "",
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
-	nextVersion = "1.7.0"
+	nextVersion = "1.8.0"
 	version     string
 	commit      string
 	branch      string
diff --git a/scripts/build.py b/scripts/build.py
index 61f2b0dce..1da0122a5 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -95,7 +95,7 @@ supported_packages = {
     "freebsd": [ "tar" ]
 }
 
-next_version = '1.7.0'
+next_version = '1.8.0'
 
 ################
 #### Telegraf Functions

From 92a8f795f511b972e06c6290147a10b6cd5ec9c1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Jun 2018 12:11:15 -0700
Subject: [PATCH 1251/1302] Set 1.6.4 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca91ef10c..9ba4be711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,7 +74,7 @@
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
 - [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
 
-## v1.6.4 [unreleased]
+## v1.6.4 [2018-06-05]
 
 ### Bugfixes
 

From dfe7b5eec2d295eb9a7a33bfcabd27bba2a5d62c Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Wed, 6 Jun 2018 01:30:53 +0200
Subject: [PATCH 1252/1302] Don't skip metrics during startup in aggregate
 phase (#4230)

---
 agent/agent.go                        | 37 ++++++++++++++-------------
 internal/models/running_aggregator.go |  2 ++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index f5f23cd05..cfac6ab78 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -362,24 +362,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 	metricC := make(chan telegraf.Metric, 100)
 	aggC := make(chan telegraf.Metric, 100)
 
-	// Start all ServicePlugins
-	for _, input := range a.Config.Inputs {
-		input.SetDefaultTags(a.Config.Tags)
-		switch p := input.Input.(type) {
-		case telegraf.ServiceInput:
-			acc := NewAccumulator(input, metricC)
-			// Service input plugins should set their own precision of their
-			// metrics.
-			acc.SetPrecision(time.Nanosecond, 0)
-			if err := p.Start(acc); err != nil {
-				log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
-					input.Name(), err.Error())
-				return err
-			}
-			defer p.Stop()
-		}
-	}
-
 	// Round collection to nearest interval by sleeping
 	if a.Config.Agent.RoundInterval {
 		i := int64(a.Config.Agent.Interval.Duration)
@@ -419,6 +401,25 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		}(input, interval)
 	}
 
+	// Start all ServicePlugins inputs after all other
+	// plugins are loaded so that no metrics get dropped
+	for _, input := range a.Config.Inputs {
+		input.SetDefaultTags(a.Config.Tags)
+		switch p := input.Input.(type) {
+		case telegraf.ServiceInput:
+			acc := NewAccumulator(input, metricC)
+			// Service input plugins should set their own precision of their
+			// metrics.
+			acc.SetPrecision(time.Nanosecond, 0)
+			if err := p.Start(acc); err != nil {
+				log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
+					input.Name(), err.Error())
+				return err
+			}
+			defer p.Stop()
+		}
+	}
+
 	wg.Wait()
 	a.Close()
 	return nil
diff --git a/internal/models/running_aggregator.go b/internal/models/running_aggregator.go
index 8189a6667..8cb04e4f6 100644
--- a/internal/models/running_aggregator.go
+++ b/internal/models/running_aggregator.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"log"
 	"time"
 
 	"github.com/influxdata/telegraf"
@@ -153,6 +154,7 @@ func (r *RunningAggregator) Run(
 				m.Time().After(r.periodEnd.Add(truncation).Add(r.Config.Delay)) {
 				// the metric is outside the current aggregation period, so
 				// skip it.
+				log.Printf("D! aggregator: metric \"%s\" is not in the current timewindow, skipping", m.Name())
 				continue
 			}
 			r.add(m)

From 3ef4dff4ec60511da5a9dc920e103641036a1b65 Mon Sep 17 00:00:00 2001
From: Leszek Charkiewicz <lcharkiewicz@users.noreply.github.com>
Date: Wed, 6 Jun 2018 02:12:30 +0200
Subject: [PATCH 1253/1302] Add SSL/TLS support to Redis input (#4236)

---
 Godeps                         |  2 +-
 plugins/inputs/redis/README.md |  7 +++++++
 plugins/inputs/redis/redis.go  | 23 +++++++++++++++++++----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Godeps b/Godeps
index 4096d93af..5bc29b200 100644
--- a/Godeps
+++ b/Godeps
@@ -28,7 +28,7 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
 github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
 github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996
-github.com/go-redis/redis 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
+github.com/go-redis/redis 83fb42932f6145ce52df09860384a4653d2d332a
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index c68f6624e..da4e8b71a 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -14,6 +14,13 @@
   ## If no servers are specified, then localhost is used as the host.
   ## If no port is specified, 6379 is used
   servers = ["tcp://localhost:6379"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = true
 ```
 
 ### Measurements & Fields:
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 5c5238f5d..766463cfd 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -13,11 +13,13 @@ import (
 
 	"github.com/go-redis/redis"
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Redis struct {
 	Servers []string
+	tls.ClientConfig
 
 	clients     []Client
 	initialized bool
@@ -56,6 +58,13 @@ var sampleConfig = `
   ## If no servers are specified, then localhost is used as the host.
   ## If no port is specified, 6379 is used
   servers = ["tcp://localhost:6379"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = true
 `
 
 func (r *Redis) SampleConfig() string {
@@ -109,12 +118,18 @@ func (r *Redis) init(acc telegraf.Accumulator) error {
 			address = u.Host
 		}
 
+		tlsConfig, err := r.ClientConfig.TLSConfig()
+		if err != nil {
+			return err
+		}
+
 		client := redis.NewClient(
 			&redis.Options{
-				Addr:     address,
-				Password: password,
-				Network:  u.Scheme,
-				PoolSize: 1,
+				Addr:      address,
+				Password:  password,
+				Network:   u.Scheme,
+				PoolSize:  1,
+				TLSConfig: tlsConfig,
 			},
 		)
 

From 5f0cbd1255d8d0824469582b2d59fce40d8db0f0 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 5 Jun 2018 17:14:29 -0700
Subject: [PATCH 1254/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba4be711..1cf646da0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.8 [unreleased]
+
+### Features
+
+- [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
+
 ## v1.7 [unreleased]
 
 ### Release Notes

From a4214abfc4e052d15ed796dc7b9f8b9f3fa188d9 Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierref@pierref.org>
Date: Wed, 6 Jun 2018 22:44:26 +0200
Subject: [PATCH 1255/1302] Ignore more boring filesystems from disk plugin
 (#4244)

---
 etc/telegraf.conf                    | 2 +-
 etc/telegraf_windows.conf            | 2 +-
 plugins/inputs/system/DISK_README.md | 2 +-
 plugins/inputs/system/disk.go        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index dbf142c2f..f51e973df 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1077,7 +1077,7 @@
   # mount_points = ["/"]
 
   ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 
 
 # Read metrics about disk IO by device
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index ed5ce1fba..54b7ee0e1 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -242,7 +242,7 @@
 #
 #   ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
 #   ## present on /run, /var/run, /dev/shm or /dev).
-#   # ignore_fs = ["tmpfs", "devtmpfs"]
+#   # ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 
 
 # # Read metrics about disk IO by device
diff --git a/plugins/inputs/system/DISK_README.md b/plugins/inputs/system/DISK_README.md
index b647f8128..fa84264be 100644
--- a/plugins/inputs/system/DISK_README.md
+++ b/plugins/inputs/system/DISK_README.md
@@ -16,7 +16,7 @@ https://en.wikipedia.org/wiki/Df_(Unix) for more details.
   # mount_points = ["/"]
 
   ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 ```
 
 #### Docker container
diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go
index 864b28477..172261560 100644
--- a/plugins/inputs/system/disk.go
+++ b/plugins/inputs/system/disk.go
@@ -28,7 +28,7 @@ var diskSampleConfig = `
   # mount_points = ["/"]
 
   ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
 `
 
 func (_ *DiskStats) SampleConfig() string {

From 7fe6e2f5ae93d1a784fa4795fde92d2e342a3da7 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 6 Jun 2018 14:28:12 -0700
Subject: [PATCH 1256/1302] Use same flags for all bsd family ping varients
 (#4241)

---
 plugins/inputs/ping/ping.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
index f347fa3d6..492474786 100644
--- a/plugins/inputs/ping/ping.go
+++ b/plugins/inputs/ping/ping.go
@@ -175,7 +175,7 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Timeout > 0 {
 		switch runtime.GOOS {
-		case "darwin":
+		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
 		case "linux":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout, 'f', -1, 64))
@@ -186,7 +186,7 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Deadline > 0 {
 		switch runtime.GOOS {
-		case "darwin":
+		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-t", strconv.Itoa(p.Deadline))
 		case "linux":
 			args = append(args, "-w", strconv.Itoa(p.Deadline))
@@ -197,10 +197,10 @@ func (p *Ping) args(url string) []string {
 	}
 	if p.Interface != "" {
 		switch runtime.GOOS {
+		case "darwin", "freebsd", "netbsd", "openbsd":
+			args = append(args, "-S", p.Interface)
 		case "linux":
 			args = append(args, "-I", p.Interface)
-		case "freebsd", "darwin":
-			args = append(args, "-S", p.Interface)
 		default:
 			// Not sure the best option here, just assume GNU ping?
 			args = append(args, "-I", p.Interface)

From 229b6bd944d8019344e8c128482e1ffccec54617 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 6 Jun 2018 14:30:37 -0700
Subject: [PATCH 1257/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cf646da0..58b090beb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@
 - [#2879](https://github.com/influxdata/telegraf/issues/2879): Fix wildcards and multi instance processes in win_perf_counters.
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
 - [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
+- [#4227](https://github.com/influxdata/telegraf/issues/4227): Use same flags for all BSD family ping variants.
 
 ## v1.6.4 [2018-06-05]
 

From acba20af1a268e23dfe053e943d64e904e90d5b3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Wed, 6 Jun 2018 18:29:59 -0700
Subject: [PATCH 1258/1302] Fix TLS and SSL config option parsing (#4247)

---
 Godeps                                   |  2 +-
 internal/tls/config.go                   |  2 +-
 plugins/inputs/openldap/README.md        |  2 +-
 plugins/inputs/openldap/openldap.go      | 31 ++++++++++++++++--------
 plugins/inputs/openldap/openldap_test.go | 13 +++++-----
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Godeps b/Godeps
index 5bc29b200..00fdc835c 100644
--- a/Godeps
+++ b/Godeps
@@ -34,7 +34,7 @@ github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
 github.com/influxdata/go-syslog 84f3b60009444d298f97454feb1f20cf91d1fa6e
 github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
-github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f
+github.com/influxdata/toml 2a2e3012f7cfbef64091cc79776311e65dfa211b
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
 github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
 github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
diff --git a/internal/tls/config.go b/internal/tls/config.go
index 25c0678d4..ce7958343 100644
--- a/internal/tls/config.go
+++ b/internal/tls/config.go
@@ -17,7 +17,7 @@ type ClientConfig struct {
 	// Deprecated in 1.7; use TLS variables above
 	SSLCA   string `toml:"ssl_ca"`
 	SSLCert string `toml:"ssl_cert"`
-	SSLKey  string `toml:"ssl_ca"`
+	SSLKey  string `toml:"ssl_key"`
 }
 
 // ServerConfig represents the standard server TLS config.
diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index aac600219..619e845c7 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -14,7 +14,7 @@ To use this plugin you must enable the [monitoring](https://www.openldap.org/dev
   # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
   # note that port will likely need to be changed to 636 for ldaps
   # valid options: "" | "starttls" | "ldaps"
-  ssl = ""
+  tls = ""
 
   # skip peer certificate verification. Default is false.
   insecure_skip_verify = false
diff --git a/plugins/inputs/openldap/openldap.go b/plugins/inputs/openldap/openldap.go
index 8a423ba51..9e69c8a21 100644
--- a/plugins/inputs/openldap/openldap.go
+++ b/plugins/inputs/openldap/openldap.go
@@ -15,9 +15,11 @@ import (
 type Openldap struct {
 	Host               string
 	Port               int
-	Ssl                string
+	SSL                string `toml:"ssl"` // Deprecated in 1.7; use TLS
+	TLS                string `toml:"tls"`
 	InsecureSkipVerify bool
-	SslCa              string
+	SSLCA              string `toml:"ssl_ca"` // Deprecated in 1.7; use TLSCA
+	TLSCA              string `toml:"tls_ca"`
 	BindDn             string
 	BindPassword       string
 	ReverseMetricNames bool
@@ -30,7 +32,7 @@ const sampleConfig string = `
   # ldaps, starttls, or no encryption. default is an empty string, disabling all encryption.
   # note that port will likely need to be changed to 636 for ldaps
   # valid options: "" | "starttls" | "ldaps"
-  ssl = ""
+  tls = ""
 
   # skip peer certificate verification. Default is false.
   insecure_skip_verify = false
@@ -70,9 +72,11 @@ func NewOpenldap() *Openldap {
 	return &Openldap{
 		Host:               "localhost",
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
+		TLS:                "",
 		InsecureSkipVerify: false,
-		SslCa:              "",
+		SSLCA:              "",
+		TLSCA:              "",
 		BindDn:             "",
 		BindPassword:       "",
 		ReverseMetricNames: false,
@@ -81,12 +85,19 @@ func NewOpenldap() *Openldap {
 
 // gather metrics
 func (o *Openldap) Gather(acc telegraf.Accumulator) error {
+	if o.TLS == "" {
+		o.TLS = o.SSL
+	}
+	if o.TLSCA == "" {
+		o.TLSCA = o.SSLCA
+	}
+
 	var err error
 	var l *ldap.Conn
-	if o.Ssl != "" {
+	if o.TLS != "" {
 		// build tls config
 		clientTLSConfig := tls.ClientConfig{
-			SSLCA:              o.SslCa,
+			TLSCA:              o.TLSCA,
 			InsecureSkipVerify: o.InsecureSkipVerify,
 		}
 		tlsConfig, err := clientTLSConfig.TLSConfig()
@@ -94,13 +105,13 @@ func (o *Openldap) Gather(acc telegraf.Accumulator) error {
 			acc.AddError(err)
 			return nil
 		}
-		if o.Ssl == "ldaps" {
+		if o.TLS == "ldaps" {
 			l, err = ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port), tlsConfig)
 			if err != nil {
 				acc.AddError(err)
 				return nil
 			}
-		} else if o.Ssl == "starttls" {
+		} else if o.TLS == "starttls" {
 			l, err = ldap.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
 			if err != nil {
 				acc.AddError(err)
@@ -108,7 +119,7 @@ func (o *Openldap) Gather(acc telegraf.Accumulator) error {
 			}
 			err = l.StartTLS(tlsConfig)
 		} else {
-			acc.AddError(fmt.Errorf("Invalid setting for ssl: %s", o.Ssl))
+			acc.AddError(fmt.Errorf("Invalid setting for ssl: %s", o.TLS))
 			return nil
 		}
 	} else {
diff --git a/plugins/inputs/openldap/openldap_test.go b/plugins/inputs/openldap/openldap_test.go
index b33354ece..10835896f 100644
--- a/plugins/inputs/openldap/openldap_test.go
+++ b/plugins/inputs/openldap/openldap_test.go
@@ -1,10 +1,11 @@
 package openldap
 
 import (
-	"gopkg.in/ldap.v2"
 	"strconv"
 	"testing"
 
+	"gopkg.in/ldap.v2"
+
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -74,7 +75,7 @@ func TestOpenldapStartTLS(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "starttls",
+		SSL:                "starttls",
 		InsecureSkipVerify: true,
 	}
 
@@ -92,7 +93,7 @@ func TestOpenldapLDAPS(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               636,
-		Ssl:                "ldaps",
+		SSL:                "ldaps",
 		InsecureSkipVerify: true,
 	}
 
@@ -110,7 +111,7 @@ func TestOpenldapInvalidSSL(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               636,
-		Ssl:                "invalid",
+		SSL:                "invalid",
 		InsecureSkipVerify: true,
 	}
 
@@ -129,7 +130,7 @@ func TestOpenldapBind(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
 		InsecureSkipVerify: true,
 		BindDn:             "cn=manager,cn=config",
 		BindPassword:       "secret",
@@ -157,7 +158,7 @@ func TestOpenldapReverseMetrics(t *testing.T) {
 	o := &Openldap{
 		Host:               testutil.GetLocalHost(),
 		Port:               389,
-		Ssl:                "",
+		SSL:                "",
 		InsecureSkipVerify: true,
 		BindDn:             "cn=manager,cn=config",
 		BindPassword:       "secret",

From 11335f5feec295960b585eaf0fea165153d1398d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 7 Jun 2018 12:35:02 -0700
Subject: [PATCH 1259/1302] Restore tengine input plugin (#4160)

This reverts commit 8826cdc423caa2555fb78d2f30f437579e02862c.
---
 plugins/inputs/all/all.go              |   1 +
 plugins/inputs/tengine/README.md       |  82 ++++++
 plugins/inputs/tengine/tengine.go      | 338 +++++++++++++++++++++++++
 plugins/inputs/tengine/tengine_test.go |  97 +++++++
 4 files changed, 518 insertions(+)
 create mode 100644 plugins/inputs/tengine/README.md
 create mode 100644 plugins/inputs/tengine/tengine.go
 create mode 100644 plugins/inputs/tengine/tengine_test.go

diff --git a/plugins/inputs/all/all.go b/plugins/inputs/all/all.go
index dd9a7b774..b2be2be5a 100644
--- a/plugins/inputs/all/all.go
+++ b/plugins/inputs/all/all.go
@@ -103,6 +103,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
 	_ "github.com/influxdata/telegraf/plugins/inputs/teamspeak"
+	_ "github.com/influxdata/telegraf/plugins/inputs/tengine"
 	_ "github.com/influxdata/telegraf/plugins/inputs/tomcat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
 	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
diff --git a/plugins/inputs/tengine/README.md b/plugins/inputs/tengine/README.md
new file mode 100644
index 000000000..b83a0611b
--- /dev/null
+++ b/plugins/inputs/tengine/README.md
@@ -0,0 +1,82 @@
+# Telegraf Plugin: Tengine
+
+### Configuration:
+
+```
+# Read Tengine's basic status information (ngx_http_reqstat_module)
+[[inputs.tengine]]
+  ## An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+
+  ## HTTP response timeout (default: 5s)
+  response_timeout = "5s"
+```
+
+### Measurements & Fields:
+
+- Measurement
+    - bytes_in total number of bytes received from client
+    - bytes_out total number of bytes sent to client
+    - conn_total total number of accepted connections
+    - req_total total number of processed requests
+    - http_2xx total number of 2xx requests
+    - http_3xx total number of 3xx requests
+    - http_4xx total number of 4xx requests
+    - http_5xx total number of 5xx requests
+    - http_other_status total number of other requests
+    - rt accumulation or rt
+    - ups_req total number of requests calling for upstream
+    - ups_rt accumulation or upstream rt
+    - ups_tries total number of times calling for upstream
+    - http_200 total number of 200 requests
+    - http_206 total number of 206 requests
+    - http_302 total number of 302 requests
+    - http_304 total number of 304 requests
+    - http_403 total number of 403 requests
+    - http_404 total number of 404 requests
+    - http_416 total number of 416 requests
+    - http_499 total number of 499 requests
+    - http_500 total number of 500 requests
+    - http_502 total number of 502 requests
+    - http_503 total number of 503 requests
+    - http_504 total number of 504 requests
+    - http_508 total number of 508 requests
+    - http_other_detail_status total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx
+    - http_ups_5xx total number of requests of upstream 5xx
+### Tags:
+
+- All measurements have the following tags:
+    - port
+    - server
+    - server_name
+
+### Example Output:
+
+Using this configuration:
+```
+[[inputs.tengine]]
+  ## An array of tengine req_status_show URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+```
+
+When run with:
+```
+./telegraf --config telegraf.conf --input-filter tengine --test
+```
+
+It produces:
+```
+* Plugin: tengine, Collection 1
+> tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+ tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
+```
diff --git a/plugins/inputs/tengine/tengine.go b/plugins/inputs/tengine/tengine.go
new file mode 100644
index 000000000..a9a899825
--- /dev/null
+++ b/plugins/inputs/tengine/tengine.go
@@ -0,0 +1,338 @@
+package tengine
+
+import (
+	"bufio"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/internal/tls"
+	"github.com/influxdata/telegraf/plugins/inputs"
+	"io"
+)
+
+type Tengine struct {
+	Urls            []string
+	ResponseTimeout internal.Duration
+	tls.ClientConfig
+
+	// HTTP client
+	client *http.Client
+}
+
+var sampleConfig = `
+  # An array of Tengine reqstat module URI to gather stats.
+  urls = ["http://127.0.0.1/us"]
+
+  ## Optional TLS Config
+  tls_ca = "/etc/telegraf/ca.pem"
+  tls_cert = "/etc/telegraf/cert.cer"
+  tls_key = "/etc/telegraf/key.key"
+  ## Use TLS but skip chain & host verification
+  insecure_skip_verify = false
+
+  # HTTP response timeout (default: 5s)
+  response_timeout = "5s"
+`
+
+func (n *Tengine) SampleConfig() string {
+	return sampleConfig
+}
+
+func (n *Tengine) Description() string {
+	return "Read Tengine's basic status information (ngx_http_reqstat_module)"
+}
+
+func (n *Tengine) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
+	// Create an HTTP client that is re-used for each
+	// collection interval
+	if n.client == nil {
+		client, err := n.createHttpClient()
+		if err != nil {
+			return err
+		}
+		n.client = client
+	}
+
+	for _, u := range n.Urls {
+		addr, err := url.Parse(u)
+		if err != nil {
+			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
+			continue
+		}
+
+		wg.Add(1)
+		go func(addr *url.URL) {
+			defer wg.Done()
+			acc.AddError(n.gatherUrl(addr, acc))
+		}(addr)
+	}
+
+	wg.Wait()
+	return nil
+}
+
+func (n *Tengine) createHttpClient() (*http.Client, error) {
+	tlsCfg, err := n.ClientConfig.TLSConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	if n.ResponseTimeout.Duration < time.Second {
+		n.ResponseTimeout.Duration = time.Second * 5
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: tlsCfg,
+		},
+		Timeout: n.ResponseTimeout.Duration,
+	}
+
+	return client, nil
+}
+
+type TengineSatus struct {
+	host                     string
+	bytes_in                 uint64
+	bytes_out                uint64
+	conn_total               uint64
+	req_total                uint64
+	http_2xx                 uint64
+	http_3xx                 uint64
+	http_4xx                 uint64
+	http_5xx                 uint64
+	http_other_status        uint64
+	rt                       uint64
+	ups_req                  uint64
+	ups_rt                   uint64
+	ups_tries                uint64
+	http_200                 uint64
+	http_206                 uint64
+	http_302                 uint64
+	http_304                 uint64
+	http_403                 uint64
+	http_404                 uint64
+	http_416                 uint64
+	http_499                 uint64
+	http_500                 uint64
+	http_502                 uint64
+	http_503                 uint64
+	http_504                 uint64
+	http_508                 uint64
+	http_other_detail_status uint64
+	http_ups_4xx             uint64
+	http_ups_5xx             uint64
+}
+
+func (n *Tengine) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
+	var tenginestatus TengineSatus
+	resp, err := n.client.Get(addr.String())
+	if err != nil {
+		return fmt.Errorf("error making HTTP request to %s: %s", addr.String(), err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%s returned HTTP status %s", addr.String(), resp.Status)
+	}
+	r := bufio.NewReader(resp.Body)
+
+	for {
+		line, err := r.ReadString('\n')
+
+		if err != nil || io.EOF == err {
+			break
+		}
+		line_split := strings.Split(strings.TrimSpace(line), ",")
+		if len(line_split) != 30 {
+			continue
+		}
+		tenginestatus.host = line_split[0]
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_in, err = strconv.ParseUint(line_split[1], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.bytes_out, err = strconv.ParseUint(line_split[2], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.conn_total, err = strconv.ParseUint(line_split[3], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.req_total, err = strconv.ParseUint(line_split[4], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_2xx, err = strconv.ParseUint(line_split[5], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_3xx, err = strconv.ParseUint(line_split[6], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_4xx, err = strconv.ParseUint(line_split[7], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_5xx, err = strconv.ParseUint(line_split[8], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_status, err = strconv.ParseUint(line_split[9], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.rt, err = strconv.ParseUint(line_split[10], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_req, err = strconv.ParseUint(line_split[11], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_rt, err = strconv.ParseUint(line_split[12], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.ups_tries, err = strconv.ParseUint(line_split[13], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_200, err = strconv.ParseUint(line_split[14], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_206, err = strconv.ParseUint(line_split[15], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_302, err = strconv.ParseUint(line_split[16], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_304, err = strconv.ParseUint(line_split[17], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_403, err = strconv.ParseUint(line_split[18], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_404, err = strconv.ParseUint(line_split[19], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_416, err = strconv.ParseUint(line_split[20], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_499, err = strconv.ParseUint(line_split[21], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_500, err = strconv.ParseUint(line_split[22], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_502, err = strconv.ParseUint(line_split[23], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_503, err = strconv.ParseUint(line_split[24], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_504, err = strconv.ParseUint(line_split[25], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_508, err = strconv.ParseUint(line_split[26], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_other_detail_status, err = strconv.ParseUint(line_split[27], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_4xx, err = strconv.ParseUint(line_split[28], 10, 64)
+		if err != nil {
+			return err
+		}
+		tenginestatus.http_ups_5xx, err = strconv.ParseUint(line_split[29], 10, 64)
+		if err != nil {
+			return err
+		}
+		tags := getTags(addr, tenginestatus.host)
+		fields := map[string]interface{}{
+			"bytes_in":                 tenginestatus.bytes_in,
+			"bytes_out":                tenginestatus.bytes_out,
+			"conn_total":               tenginestatus.conn_total,
+			"req_total":                tenginestatus.req_total,
+			"http_2xx":                 tenginestatus.http_2xx,
+			"http_3xx":                 tenginestatus.http_3xx,
+			"http_4xx":                 tenginestatus.http_4xx,
+			"http_5xx":                 tenginestatus.http_5xx,
+			"http_other_status":        tenginestatus.http_other_status,
+			"rt":                       tenginestatus.rt,
+			"ups_req":                  tenginestatus.ups_req,
+			"ups_rt":                   tenginestatus.ups_rt,
+			"ups_tries":                tenginestatus.ups_tries,
+			"http_200":                 tenginestatus.http_200,
+			"http_206":                 tenginestatus.http_206,
+			"http_302":                 tenginestatus.http_302,
+			"http_304":                 tenginestatus.http_304,
+			"http_403":                 tenginestatus.http_403,
+			"http_404":                 tenginestatus.http_404,
+			"http_416":                 tenginestatus.http_416,
+			"http_499":                 tenginestatus.http_499,
+			"http_500":                 tenginestatus.http_500,
+			"http_502":                 tenginestatus.http_502,
+			"http_503":                 tenginestatus.http_503,
+			"http_504":                 tenginestatus.http_504,
+			"http_508":                 tenginestatus.http_508,
+			"http_other_detail_status": tenginestatus.http_other_detail_status,
+			"http_ups_4xx":             tenginestatus.http_ups_4xx,
+			"http_ups_5xx":             tenginestatus.http_ups_5xx,
+		}
+		acc.AddFields("tengine", fields, tags)
+	}
+
+	return nil
+}
+
+// Get tag(s) for the tengine plugin
+func getTags(addr *url.URL, server_name string) map[string]string {
+	h := addr.Host
+	host, port, err := net.SplitHostPort(h)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	return map[string]string{"server": host, "port": port, "server_name": server_name}
+}
+
+func init() {
+	inputs.Add("tengine", func() telegraf.Input {
+		return &Tengine{}
+	})
+}
diff --git a/plugins/inputs/tengine/tengine_test.go b/plugins/inputs/tengine/tengine_test.go
new file mode 100644
index 000000000..317820bb2
--- /dev/null
+++ b/plugins/inputs/tengine/tengine_test.go
@@ -0,0 +1,97 @@
+package tengine
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/influxdata/telegraf/testutil"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const tengineSampleResponse = `127.0.0.1,784,1511,2,2,1,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0`
+
+// Verify that tengine tags are properly parsed based on the server
+func TestTengineTags(t *testing.T) {
+	urls := []string{"http://localhost/us", "http://localhost:80/us"}
+	var addr *url.URL
+	for _, url1 := range urls {
+		addr, _ = url.Parse(url1)
+		tagMap := getTags(addr, "127.0.0.1")
+		assert.Contains(t, tagMap["server"], "localhost")
+	}
+}
+
+func TestTengineGeneratesMetrics(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rsp string
+		rsp = tengineSampleResponse
+		fmt.Fprintln(w, rsp)
+	}))
+	defer ts.Close()
+
+	n := &Tengine{
+		Urls: []string{fmt.Sprintf("%s/us", ts.URL)},
+	}
+
+	var acc_tengine testutil.Accumulator
+
+	err_tengine := acc_tengine.GatherError(n.Gather)
+
+	require.NoError(t, err_tengine)
+
+	fields_tengine := map[string]interface{}{
+		"bytes_in":                 uint64(784),
+		"bytes_out":                uint64(1511),
+		"conn_total":               uint64(2),
+		"req_total":                uint64(2),
+		"http_2xx":                 uint64(1),
+		"http_3xx":                 uint64(0),
+		"http_4xx":                 uint64(1),
+		"http_5xx":                 uint64(0),
+		"http_other_status":        uint64(0),
+		"rt":                       uint64(0),
+		"ups_req":                  uint64(0),
+		"ups_rt":                   uint64(0),
+		"ups_tries":                uint64(0),
+		"http_200":                 uint64(1),
+		"http_206":                 uint64(0),
+		"http_302":                 uint64(0),
+		"http_304":                 uint64(0),
+		"http_403":                 uint64(0),
+		"http_404":                 uint64(1),
+		"http_416":                 uint64(0),
+		"http_499":                 uint64(0),
+		"http_500":                 uint64(0),
+		"http_502":                 uint64(0),
+		"http_503":                 uint64(0),
+		"http_504":                 uint64(0),
+		"http_508":                 uint64(0),
+		"http_other_detail_status": uint64(0),
+		"http_ups_4xx":             uint64(0),
+		"http_ups_5xx":             uint64(0),
+	}
+
+	addr, err := url.Parse(ts.URL)
+	if err != nil {
+		panic(err)
+	}
+
+	host, port, err := net.SplitHostPort(addr.Host)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
+	tags := map[string]string{"server": host, "port": port, "server_name": "127.0.0.1"}
+	acc_tengine.AssertContainsTaggedFields(t, "tengine", fields_tengine, tags)
+}

From 8563238059ffd8357c8cdbfc2e0c1c9fdcc4cc31 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 11:51:45 -0700
Subject: [PATCH 1260/1302] Update tengine docs

---
 plugins/inputs/tengine/README.md  | 101 +++++++++++++-----------------
 plugins/inputs/tengine/tengine.go |  20 +++---
 2 files changed, 55 insertions(+), 66 deletions(-)

diff --git a/plugins/inputs/tengine/README.md b/plugins/inputs/tengine/README.md
index b83a0611b..9bc83c5d6 100644
--- a/plugins/inputs/tengine/README.md
+++ b/plugins/inputs/tengine/README.md
@@ -1,82 +1,71 @@
-# Telegraf Plugin: Tengine
+# Tengine Input Plugin
+
+The tengine plugin gathers metrics from the
+[Tengine Web Server](http://tengine.taobao.org/) via the
+[reqstat](http://tengine.taobao.org/document/http_reqstat.html) module.
 
 ### Configuration:
 
-```
+```toml
 # Read Tengine's basic status information (ngx_http_reqstat_module)
 [[inputs.tengine]]
   ## An array of Tengine reqstat module URI to gather stats.
   urls = ["http://127.0.0.1/us"]
 
+  ## HTTP response timeout (default: 5s)
+  # response_timeout = "5s"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
   # tls_key = "/etc/telegraf/key.pem"
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false
-
-  ## HTTP response timeout (default: 5s)
-  response_timeout = "5s"
 ```
 
-### Measurements & Fields:
+### Metrics:
 
 - Measurement
-    - bytes_in total number of bytes received from client
-    - bytes_out total number of bytes sent to client
-    - conn_total total number of accepted connections
-    - req_total total number of processed requests
-    - http_2xx total number of 2xx requests
-    - http_3xx total number of 3xx requests
-    - http_4xx total number of 4xx requests
-    - http_5xx total number of 5xx requests
-    - http_other_status total number of other requests
-    - rt accumulation or rt
-    - ups_req total number of requests calling for upstream
-    - ups_rt accumulation or upstream rt
-    - ups_tries total number of times calling for upstream
-    - http_200 total number of 200 requests
-    - http_206 total number of 206 requests
-    - http_302 total number of 302 requests
-    - http_304 total number of 304 requests
-    - http_403 total number of 403 requests
-    - http_404 total number of 404 requests
-    - http_416 total number of 416 requests
-    - http_499 total number of 499 requests
-    - http_500 total number of 500 requests
-    - http_502 total number of 502 requests
-    - http_503 total number of 503 requests
-    - http_504 total number of 504 requests
-    - http_508 total number of 508 requests
-    - http_other_detail_status total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx
-    - http_ups_5xx total number of requests of upstream 5xx
-### Tags:
-
-- All measurements have the following tags:
+  - tags:
     - port
     - server
     - server_name
+  - fields:
+    - bytes_in (integer, total number of bytes received from client)
+    - bytes_out (integer, total number of bytes sent to client)
+    - conn_total (integer, total number of accepted connections)
+    - req_total (integer, total number of processed requests)
+    - http_2xx (integer, total number of 2xx requests)
+    - http_3xx (integer, total number of 3xx requests)
+    - http_4xx (integer, total number of 4xx requests)
+    - http_5xx (integer, total number of 5xx requests)
+    - http_other_status (integer, total number of other requests)
+    - rt (integer, accumulation or rt)
+    - ups_req (integer, total number of requests calling for upstream)
+    - ups_rt (integer, accumulation or upstream rt)
+    - ups_tries (integer, total number of times calling for upstream)
+    - http_200 (integer, total number of 200 requests)
+    - http_206 (integer, total number of 206 requests)
+    - http_302 (integer, total number of 302 requests)
+    - http_304 (integer, total number of 304 requests)
+    - http_403 (integer, total number of 403 requests)
+    - http_404 (integer, total number of 404 requests)
+    - http_416 (integer, total number of 416 requests)
+    - http_499 (integer, total number of 499 requests)
+    - http_500 (integer, total number of 500 requests)
+    - http_502 (integer, total number of 502 requests)
+    - http_503 (integer, total number of 503 requests)
+    - http_504 (integer, total number of 504 requests)
+    - http_508 (integer, total number of 508 requests)
+    - http_other_detail_status (integer, total number of requests of other status codes*http_ups_4xx total number of requests of upstream 4xx)
+    - http_ups_5xx (integer, total number of requests of upstream 5xx)
 
 ### Example Output:
 
-Using this configuration:
 ```
-[[inputs.tengine]]
-  ## An array of tengine req_status_show URI to gather stats.
-  urls = ["http://127.0.0.1/us"]
-```
-
-When run with:
-```
-./telegraf --config telegraf.conf --input-filter tengine --test
-```
-
-It produces:
-```
-* Plugin: tengine, Collection 1
-> tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
- tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=localhost bytes_in=9129i,bytes_out=56334i,conn_total=14i,http_200=90i,http_206=0i,http_2xx=90i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=90i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=28.79.190.35.bc.googleusercontent.com bytes_in=1500i,bytes_out=3009i,conn_total=4i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=1i,http_416=0i,http_499=0i,http_4xx=3i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=4i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=www.google.com bytes_in=372i,bytes_out=786i,conn_total=1i,http_200=1i,http_206=0i,http_2xx=1i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=0i,http_416=0i,http_499=0i,http_4xx=0i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=1i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=35.190.79.28 bytes_in=4433i,bytes_out=10259i,conn_total=5i,http_200=3i,http_206=0i,http_2xx=3i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=11i,http_416=0i,http_499=0i,http_4xx=11i,http_500=0i,http_502=0i,http_503=0i,http_504=0i,http_508=0i,http_5xx=0i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=0i,http_ups_5xx=0i,req_total=14i,rt=0i,ups_req=0i,ups_rt=0i,ups_tries=0i 1526546308000000000
+tengine,host=gcp-thz-api-5,port=80,server=localhost,server_name=tenka-prod-api.txwy.tw bytes_in=3014397400i,bytes_out=14279992835i,conn_total=36844i,http_200=3177339i,http_206=0i,http_2xx=3177339i,http_302=0i,http_304=0i,http_3xx=0i,http_403=0i,http_404=123i,http_416=0i,http_499=0i,http_4xx=123i,http_500=17214i,http_502=4453i,http_503=80i,http_504=0i,http_508=0i,http_5xx=21747i,http_other_detail_status=0i,http_other_status=0i,http_ups_4xx=123i,http_ups_5xx=21747i,req_total=3199209i,rt=245874536i,ups_req=2685076i,ups_rt=245858217i,ups_tries=2685076i 1526546308000000000
 ```
diff --git a/plugins/inputs/tengine/tengine.go b/plugins/inputs/tengine/tengine.go
index a9a899825..1ee63740f 100644
--- a/plugins/inputs/tengine/tengine.go
+++ b/plugins/inputs/tengine/tengine.go
@@ -11,11 +11,12 @@ import (
 	"sync"
 	"time"
 
+	"io"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"io"
 )
 
 type Tengine struct {
@@ -23,7 +24,6 @@ type Tengine struct {
 	ResponseTimeout internal.Duration
 	tls.ClientConfig
 
-	// HTTP client
 	client *http.Client
 }
 
@@ -31,15 +31,15 @@ var sampleConfig = `
   # An array of Tengine reqstat module URI to gather stats.
   urls = ["http://127.0.0.1/us"]
 
-  ## Optional TLS Config
-  tls_ca = "/etc/telegraf/ca.pem"
-  tls_cert = "/etc/telegraf/cert.cer"
-  tls_key = "/etc/telegraf/key.key"
-  ## Use TLS but skip chain & host verification
-  insecure_skip_verify = false
-
   # HTTP response timeout (default: 5s)
-  response_timeout = "5s"
+  # response_timeout = "5s"
+
+  ## Optional TLS Config
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.cer"
+  # tls_key = "/etc/telegraf/key.key"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
 `
 
 func (n *Tengine) SampleConfig() string {

From cd9ad770386082d0739679a1b4e3627224e5c586 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 23 May 2018 11:57:47 -0700
Subject: [PATCH 1261/1302] Update changelog

---
 CHANGELOG.md | 7 +++++++
 README.md    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b090beb..95aa9cb3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 ## v1.8 [unreleased]
 
+### Release Notes
+
+### New Inputs
+
+- [tengine](./plugins/inputs/tengine/README.md) - Contirbuted by @ertaoxu
+
 ### Features
 
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
+- [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
 
 ## v1.7 [unreleased]
 
diff --git a/README.md b/README.md
index bf7084a49..aa415d1d2 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,7 @@ configuration options.
 * [sql server](./plugins/inputs/sqlserver) (microsoft)
 * [syslog](./plugins/inputs/syslog)
 * [teamspeak](./plugins/inputs/teamspeak)
+* [tengine](./plugins/inputs/tengine)
 * [tomcat](./plugins/inputs/tomcat)
 * [twemproxy](./plugins/inputs/twemproxy)
 * [unbound](./plugins/inputs/unbound)

From 58895d6b035790af7270491c8331164c7aa6ff79 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 8 Jun 2018 12:22:49 -0700
Subject: [PATCH 1262/1302] Update go-syslog version

Fix go-syslog overquota errors since latest version no longer uses LFS.
---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index 00fdc835c..6d2580222 100644
--- a/Godeps
+++ b/Godeps
@@ -32,7 +32,7 @@ github.com/go-redis/redis 83fb42932f6145ce52df09860384a4653d2d332a
 github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
 github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
-github.com/influxdata/go-syslog 84f3b60009444d298f97454feb1f20cf91d1fa6e
+github.com/influxdata/go-syslog eecd51df3ad85464a2bab9b7d3a45bc1e299059e
 github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
 github.com/influxdata/toml 2a2e3012f7cfbef64091cc79776311e65dfa211b
 github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec

From 87f711a19a5e25f7f598ea24662c77098f57fdab Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Fri, 8 Jun 2018 21:41:21 +0200
Subject: [PATCH 1263/1302] Fix panic with unicode counter names in
 win_perf_counters  (#4255)

---
 .../win_perf_counters/performance_query.go    |  2 +-
 .../win_perf_counters_test.go                 | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go
index 34f0d1a32..3c82c1cfc 100644
--- a/plugins/inputs/win_perf_counters/performance_query.go
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -181,7 +181,7 @@ func UTF16ToStringArray(buf []uint16) []string {
 	stringLine := UTF16PtrToString(&buf[0])
 	for stringLine != "" {
 		strings = append(strings, stringLine)
-		nextLineStart += len(stringLine) + 1
+		nextLineStart += len([]rune(stringLine)) + 1
 		remainingBuf := buf[nextLineStart:]
 		stringLine = UTF16PtrToString(&remainingBuf[0])
 	}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
index 35fca4854..41345a94e 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -463,3 +463,37 @@ func TestGatherRefreshing(t *testing.T) {
 	acc3.AssertContainsTaggedFields(t, measurement, fields3, tags3)
 
 }
+
+// list of nul terminated strings from WinAPI
+var unicodeStringListWithEnglishChars = []uint16{0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x28, 0x30, 0x20, 0x43, 0x3a, 0x29, 0x5c, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x51, 0x75, 0x65, 0x75, 0x65, 0x20, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x0, 0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x28, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x29, 0x5c, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x51, 0x75, 0x65, 0x75, 0x65, 0x20, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x0, 0x0}
+var unicodeStringListWithCzechChars = []uint16{0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x46, 0x79, 0x7a, 0x69, 0x63, 0x6b, 0xfd, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x28, 0x30, 0x20, 0x43, 0x3a, 0x29, 0x5c, 0x41, 0x6b, 0x74, 0x75, 0xe1, 0x6c, 0x6e, 0xed, 0x20, 0x64, 0xe9, 0x6c, 0x6b, 0x61, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x79, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x75, 0x0, 0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x46, 0x79, 0x7a, 0x69, 0x63, 0x6b, 0xfd, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x28, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x29, 0x5c, 0x41, 0x6b, 0x74, 0x75, 0xe1, 0x6c, 0x6e, 0xed, 0x20, 0x64, 0xe9, 0x6c, 0x6b, 0x61, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x79, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x75, 0x0, 0x0}
+var unicodeStringListSingleItem = []uint16{0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x28, 0x30, 0x20, 0x43, 0x3a, 0x29, 0x5c, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x51, 0x75, 0x65, 0x75, 0x65, 0x20, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x0, 0x0}
+var unicodeStringListNoItem = []uint16{0x0}
+
+var stringArrayWithEnglishChars = []string{
+	"\\\\T480\\PhysicalDisk(0 C:)\\Current Disk Queue Length",
+	"\\\\T480\\PhysicalDisk(_Total)\\Current Disk Queue Length",
+}
+var stringArrayWithCzechChars = []string{
+	"\\\\T480\\Fyzick\u00fd disk(0 C:)\\Aktu\u00e1ln\u00ed d\u00e9lka fronty disku",
+	"\\\\T480\\Fyzick\u00fd disk(_Total)\\Aktu\u00e1ln\u00ed d\u00e9lka fronty disku",
+}
+
+var stringArraySingleItem = []string{
+	"\\\\T480\\PhysicalDisk(0 C:)\\Current Disk Queue Length",
+}
+
+func TestUTF16ToStringArray(t *testing.T) {
+	singleItem := UTF16ToStringArray(unicodeStringListSingleItem)
+	assert.True(t, assert.ObjectsAreEqual(singleItem, stringArraySingleItem), "Not equal single arrays")
+
+	noItem := UTF16ToStringArray(unicodeStringListNoItem)
+	assert.Nil(t, noItem)
+
+	engStrings := UTF16ToStringArray(unicodeStringListWithEnglishChars)
+	assert.True(t, assert.ObjectsAreEqual(engStrings, stringArrayWithEnglishChars), "Not equal eng arrays")
+
+	czechStrings := UTF16ToStringArray(unicodeStringListWithCzechChars)
+	assert.True(t, assert.ObjectsAreEqual(czechStrings, stringArrayWithCzechChars), "Not equal czech arrays")
+
+}

From 1690f36b095e161ac133bd4dd234fcf176d24cd6 Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@bonitoo.io>
Date: Mon, 11 Jun 2018 20:10:53 +0200
Subject: [PATCH 1264/1302] Add option to enable wildcard expansion (#4265)

This is needed because wildcard expansion causes counters to be localized.
---
 plugins/inputs/win_perf_counters/README.md    |  29 +-
 plugins/inputs/win_perf_counters/pdh.go       |   2 +-
 .../win_perf_counters/performance_query.go    |  29 ++
 .../win_perf_counters/win_perf_counters.go    | 130 ++++++--
 .../win_perf_counters_integration_test.go     |  25 +-
 .../win_perf_counters_test.go                 | 312 +++++++++++++++++-
 6 files changed, 471 insertions(+), 56 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index f986a278f..422ef6a31 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -8,9 +8,6 @@ whether the Object, Instance and Counter exist on Telegraf startup.
 Counter paths are refreshed periodically, see [CountersRefreshInterval](#countersrefreshinterval)
 configuration parameter for more info.
 
-Wildcards can be used in instance and counter names. Partial wildcards are supported only
-in instance names on Windows Vista and newer.
-
 In case of query for all instances `["*"]`, the plugin does not return the instance `_Total`
 by default. See [IncludeTotal](#includetotal) for more info.
 
@@ -34,18 +31,36 @@ Bool, if set to `true` will print out all matching performance objects.
 Example:
 `PrintValid=true`
 
+#### UseWildcardsExpansion
+
+If `UseWildcardsExpansion` is set to true, wildcards can be used in instance name and counter name
+. 
+Partial wildcard (e.g. `chrome*`) is supported only in instance name on Windows Vista and newer. 
+
+On localized Windows, returned counters will be also localized. 
+
+It also returns instance indexes in instance names.
+
+If set to `false`, wildcards (not partial) in instance names can still be used, but instance indexes will not be returned in instance names.
+
+Example:
+`UseWildcardsExpansion=true`
+
 #### CountersRefreshInterval
 
 Configured counters are matched against available counters at the interval
 specified by the `CountersRefreshInterval` parameter. Default value is `1m` (1 minute).
 
-If wildcards are used in instance or counter names, they are expanded at this point.
+If wildcards are used in instance or counter names, they are expanded at this point, if the `UseWildcardsExpansion` param is set to `true`.
 
 Setting `CountersRefreshInterval` too low (order of seconds) can cause Telegraf to create
 a high CPU load.
 
 Set to `0s` to disable periodic refreshing.
 
+Example:
+`CountersRefreshInterval=1m`
+
 #### PreVistaSupport
 
 _Deprecated. Necessary features on Windows Vista and newer are checked dynamically_
@@ -88,7 +103,7 @@ By default any results containing `_Total` are stripped,
 unless this is specified as the wanted instance.
 Alternatively see the option `IncludeTotal` below.
 
-It is also possible to set partial wildcards, eg. `["chrome*"]`
+It is also possible to set partial wildcards, eg. `["chrome*"]`, if the `UseWildcardsExpansion` param is set to `true`
 
 Some Objects do not have instances to select from at all.
 Here only one option is valid if you want data back,
@@ -101,8 +116,8 @@ Counters key (this is an array) is the counters of the ObjectName
 you would like returned, it can also be one or more values.
 
 Example: `Counters = ["% Idle Time", "% Disk Read Time", "% Disk Write Time"]`
-This must be specified for every counter you want the results of,
-or use `["*"]` for all the counters for object.
+This must be specified for every counter you want the results of, or use `["*"]` for all the counters for object, 
+if the `UseWildcardsExpansion` param is set to `true`
 
 #### Measurement
 *Optional*
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index f637eb256..e6f7d5196 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -352,7 +352,7 @@ func PdhGetFormattedCounterValueDouble(hCounter PDH_HCOUNTER, lpdwType *uint32,
 //			time.Sleep(2000 * time.Millisecond)
 //		}
 //	}
-func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *PDH_FMT_COUNTERVALUE_ITEM_DOUBLE) uint32 {
+func PdhGetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
 	ret, _, _ := pdh_GetFormattedCounterArrayW.Call(
 		uintptr(hCounter),
 		uintptr(PDH_FMT_DOUBLE|PDH_FMT_NOCAP100),
diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go
index 3c82c1cfc..e2e2ed866 100644
--- a/plugins/inputs/win_perf_counters/performance_query.go
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -9,6 +9,12 @@ import (
 	"unsafe"
 )
 
+//PerformanceQuery is abstraction for PDH_FMT_COUNTERVALUE_ITEM_DOUBLE
+type CounterValue struct {
+	InstanceName string
+	Value        float64
+}
+
 //PerformanceQuery provides wrappers around Windows performance counters API for easy usage in GO
 type PerformanceQuery interface {
 	Open() error
@@ -18,6 +24,7 @@ type PerformanceQuery interface {
 	GetCounterPath(counterHandle PDH_HCOUNTER) (string, error)
 	ExpandWildCardPath(counterPath string) ([]string, error)
 	GetFormattedCounterValueDouble(hCounter PDH_HCOUNTER) (float64, error)
+	GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error)
 	CollectData() error
 	AddEnglishCounterSupported() bool
 }
@@ -151,6 +158,28 @@ func (m *PerformanceQueryImpl) GetFormattedCounterValueDouble(hCounter PDH_HCOUN
 	}
 }
 
+func (m *PerformanceQueryImpl) GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error) {
+	var buffSize uint32
+	var itemCount uint32
+	ret := PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, nil)
+	if ret == PDH_MORE_DATA {
+		buff := make([]byte, buffSize)
+		ret = PdhGetFormattedCounterArrayDouble(hCounter, &buffSize, &itemCount, &buff[0])
+		if ret == ERROR_SUCCESS {
+			items := (*[1 << 20]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE)(unsafe.Pointer(&buff[0]))[:itemCount]
+			values := make([]CounterValue, 0, itemCount)
+			for _, item := range items {
+				if item.FmtValue.CStatus == PDH_CSTATUS_VALID_DATA || item.FmtValue.CStatus == PDH_CSTATUS_NEW_DATA {
+					val := CounterValue{UTF16PtrToString(item.SzName), item.FmtValue.DoubleValue}
+					values = append(values, val)
+				}
+			}
+			return values, nil
+		}
+	}
+	return nil, NewPdhError(ret)
+}
+
 func (m *PerformanceQueryImpl) CollectData() error {
 	if m.query == 0 {
 		return errors.New("uninitialised query")
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 97c6e50c6..26f1d3486 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -22,6 +22,10 @@ var sampleConfig = `
   ## agent, it will not be gathered.
   ## Settings:
   # PrintValid = false # Print All matching performance counters
+  # If UseWildcardsExpansion params is set to true, wildcards (partial wildcards in instance names and wildcards in counters names) in configured counter paths will be expanded 
+  # and in case of localized Windows, counter paths will be also localized. It also returns instance indexes in instance names.
+  # If false, wildcards (not partial) in instance names will be still expanded, but instance indexes will not be returned in instance names.
+  #UseWildcardsExpansion = false
   # Period after which counters will be reread from configuration and wildcards in counter paths expanded
   CountersRefreshInterval="1m"
 
@@ -75,6 +79,7 @@ type Win_PerfCounters struct {
 	PreVistaSupport         bool
 	Object                  []perfobject
 	CountersRefreshInterval internal.Duration
+	UseWildcardsExpansion   bool
 
 	lastRefreshed time.Time
 	counters      []*counter
@@ -137,45 +142,59 @@ func (m *Win_PerfCounters) SampleConfig() string {
 	return sampleConfig
 }
 
-func (m *Win_PerfCounters) AddItem(counterPath string, instance string, measurement string, includeTotal bool) error {
+//objectName string, counter string, instance string, measurement string, include_total bool
+func (m *Win_PerfCounters) AddItem(counterPath string, objectName string, instance string, counterName string, measurement string, includeTotal bool) error {
+	var err error
+	var counterHandle PDH_HCOUNTER
 	if !m.query.AddEnglishCounterSupported() {
-		_, err := m.query.AddCounterToQuery(counterPath)
+		counterHandle, err = m.query.AddCounterToQuery(counterPath)
 		if err != nil {
 			return err
 		}
 	} else {
-		counterHandle, err := m.query.AddEnglishCounterToQuery(counterPath)
+		counterHandle, err = m.query.AddEnglishCounterToQuery(counterPath)
 		if err != nil {
 			return err
 		}
+
+	}
+
+	if m.UseWildcardsExpansion {
+		origInstance := instance
 		counterPath, err = m.query.GetCounterPath(counterHandle)
 		if err != nil {
 			return err
 		}
-	}
-
-	counters, err := m.query.ExpandWildCardPath(counterPath)
-	if err != nil {
-		return err
-	}
-
-	for _, counterPath := range counters {
-		var err error
-		counterHandle, err := m.query.AddCounterToQuery(counterPath)
-
-		parsedObjectName, parsedInstance, parsedCounter, err := extractObjectInstanceCounterFromQuery(counterPath)
+		counters, err := m.query.ExpandWildCardPath(counterPath)
 		if err != nil {
 			return err
 		}
 
-		if parsedInstance == "_Total" && instance == "*" && !includeTotal {
-			continue
-		}
+		for _, counterPath := range counters {
+			var err error
+			counterHandle, err := m.query.AddCounterToQuery(counterPath)
 
-		newItem := &counter{counterPath, parsedObjectName, parsedCounter, parsedInstance, measurement,
+			objectName, instance, counterName, err = extractObjectInstanceCounterFromQuery(counterPath)
+			if err != nil {
+				return err
+			}
+
+			if instance == "_Total" && origInstance == "*" && !includeTotal {
+				continue
+			}
+
+			newItem := &counter{counterPath, objectName, counterName, instance, measurement,
+				includeTotal, counterHandle}
+			m.counters = append(m.counters, newItem)
+
+			if m.PrintValid {
+				log.Printf("Valid: %s\n", counterPath)
+			}
+		}
+	} else {
+		newItem := &counter{counterPath, objectName, counterName, instance, measurement,
 			includeTotal, counterHandle}
 		m.counters = append(m.counters, newItem)
-
 		if m.PrintValid {
 			log.Printf("Valid: %s\n", counterPath)
 		}
@@ -199,7 +218,7 @@ func (m *Win_PerfCounters) ParseConfig() error {
 						counterPath = "\\" + objectname + "(" + instance + ")\\" + counter
 					}
 
-					err := m.AddItem(counterPath, instance, PerfObject.Measurement, PerfObject.IncludeTotal)
+					err := m.AddItem(counterPath, objectname, instance, counter, PerfObject.Measurement, PerfObject.IncludeTotal)
 
 					if err != nil {
 						if PerfObject.FailOnMissing || PerfObject.WarnOnMissing {
@@ -225,7 +244,9 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	var err error
 
 	if m.lastRefreshed.IsZero() || (m.CountersRefreshInterval.Duration.Nanoseconds() > 0 && m.lastRefreshed.Add(m.CountersRefreshInterval.Duration).Before(time.Now())) {
-		m.counters = m.counters[:0]
+		if m.counters != nil {
+			m.counters = m.counters[:0]
+		}
 
 		err = m.query.Open()
 		if err != nil {
@@ -261,22 +282,61 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	// For iterate over the known metrics and get the samples.
 	for _, metric := range m.counters {
 		// collect
-		value, err := m.query.GetFormattedCounterValueDouble(metric.counterHandle)
-		if err == nil {
-			measurement := sanitizedChars.Replace(metric.measurement)
-			if measurement == "" {
-				measurement = "win_perf_counters"
-			}
+		if m.UseWildcardsExpansion {
+			value, err := m.query.GetFormattedCounterValueDouble(metric.counterHandle)
+			if err == nil {
+				measurement := sanitizedChars.Replace(metric.measurement)
+				if measurement == "" {
+					measurement = "win_perf_counters"
+				}
 
-			var instance = InstanceGrouping{measurement, metric.instance, metric.objectName}
-			if collectFields[instance] == nil {
-				collectFields[instance] = make(map[string]interface{})
+				var instance = InstanceGrouping{measurement, metric.instance, metric.objectName}
+				if collectFields[instance] == nil {
+					collectFields[instance] = make(map[string]interface{})
+				}
+				collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
+			} else {
+				//ignore invalid data from as some counters from process instances returns this sometimes
+				if phderr, ok := err.(*PdhError); ok && phderr.ErrorCode != PDH_INVALID_DATA && phderr.ErrorCode != PDH_CALC_NEGATIVE_VALUE {
+					return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
+				}
 			}
-			collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(value)
 		} else {
-			//ignore invalid data from as some counters from process instances returns this sometimes
-			if phderr, ok := err.(*PdhError); ok && phderr.ErrorCode != PDH_INVALID_DATA && phderr.ErrorCode != PDH_CALC_NEGATIVE_VALUE {
-				return fmt.Errorf("error while getting value for counter %s: %v", metric.counterPath, err)
+			counterValues, err := m.query.GetFormattedCounterArrayDouble(metric.counterHandle)
+			if err == nil {
+				for _, cValue := range counterValues {
+					var add bool
+					if metric.includeTotal {
+						// If IncludeTotal is set, include all.
+						add = true
+					} else if metric.instance == "*" && !strings.Contains(cValue.InstanceName, "_Total") {
+						// Catch if set to * and that it is not a '*_Total*' instance.
+						add = true
+					} else if metric.instance == cValue.InstanceName {
+						// Catch if we set it to total or some form of it
+						add = true
+					} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, cValue.InstanceName) {
+						// If you are using a multiple instance identifier such as "w3wp#1"
+						// phd.dll returns only the first 2 characters of the identifier.
+						add = true
+						cValue.InstanceName = metric.instance
+					} else if metric.instance == "------" {
+						add = true
+					}
+
+					if add {
+						measurement := sanitizedChars.Replace(metric.measurement)
+						if measurement == "" {
+							measurement = "win_perf_counters"
+						}
+						var instance = InstanceGrouping{measurement, cValue.InstanceName, metric.objectName}
+
+						if collectFields[instance] == nil {
+							collectFields[instance] = make(map[string]interface{})
+						}
+						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(cValue.Value)
+					}
+				}
 			}
 		}
 	}
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
index 7a1e5403e..c5136d30b 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
@@ -81,6 +81,29 @@ func TestWinPerformanceQueryImpl(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, paths)
 	assert.True(t, len(paths) > 1)
+
+	err = query.Open()
+	require.NoError(t, err)
+
+	counterPath = "\\Process(*)\\% Processor Time"
+	hCounter, err = query.AddEnglishCounterToQuery(counterPath)
+	require.NoError(t, err)
+	assert.NotEqual(t, 0, hCounter)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	err = query.CollectData()
+	require.NoError(t, err)
+
+	arr, err := query.GetFormattedCounterArrayDouble(hCounter)
+	require.NoError(t, err)
+	assert.True(t, len(arr) > 0, "Too")
+
+	err = query.Close()
+	require.NoError(t, err)
+
 }
 
 func TestWinPerfcountersConfigGet1(t *testing.T) {
@@ -573,7 +596,7 @@ func TestWinPerfcountersCollect2(t *testing.T) {
 
 	perfobjects[0] = PerfObject
 
-	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}}
+	m := Win_PerfCounters{PrintValid: false, Object: perfobjects, query: &PerformanceQueryImpl{}, UseWildcardsExpansion: true}
 	var acc testutil.Accumulator
 	err := m.Gather(&acc)
 	require.NoError(t, err)
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
index 41345a94e..14aec375b 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -25,6 +25,14 @@ type FakePerformanceQuery struct {
 	openCalled          bool
 }
 
+func (m *testCounter) ToCounterValue() *CounterValue {
+	_, inst, _, _ := extractObjectInstanceCounterFromQuery(m.path)
+	if inst == "" {
+		inst = "--"
+	}
+	return &CounterValue{inst, m.value}
+}
+
 func (m *FakePerformanceQuery) Open() error {
 	if m.openCalled {
 		err := m.Close()
@@ -102,6 +110,48 @@ func (m *FakePerformanceQuery) GetFormattedCounterValueDouble(counterHandle PDH_
 	}
 	return 0, fmt.Errorf("GetFormattedCounterValueDouble: invalid handle: %d", counterHandle)
 }
+func (m *FakePerformanceQuery) findCounterByPath(counterPath string) *testCounter {
+	for _, c := range m.counters {
+		if c.path == counterPath {
+			return &c
+		}
+	}
+	return nil
+}
+
+func (m *FakePerformanceQuery) findCounterByHandle(counterHandle PDH_HCOUNTER) *testCounter {
+	for _, c := range m.counters {
+		if c.handle == counterHandle {
+			return &c
+		}
+	}
+	return nil
+}
+
+func (m *FakePerformanceQuery) GetFormattedCounterArrayDouble(hCounter PDH_HCOUNTER) ([]CounterValue, error) {
+	if !m.openCalled {
+		return nil, errors.New("GetFormattedCounterArrayDouble: uninitialised query")
+	}
+	for _, c := range m.counters {
+		if c.handle == hCounter {
+			if e, ok := m.expandPaths[c.path]; ok {
+				counters := make([]CounterValue, 0, len(e))
+				for _, p := range e {
+					counter := m.findCounterByPath(p)
+					if counter != nil && counter.value > 0 {
+						counters = append(counters, *counter.ToCounterValue())
+					} else {
+						return nil, fmt.Errorf("GetFormattedCounterArrayDouble: invalid counter : %s", p)
+					}
+				}
+				return counters, nil
+			} else {
+				return nil, fmt.Errorf("GetFormattedCounterArrayDouble: invalid counter : %d", hCounter)
+			}
+		}
+	}
+	return nil, fmt.Errorf("GetFormattedCounterArrayDouble: invalid counter : %d, no paths found", hCounter)
+}
 
 func (m *FakePerformanceQuery) CollectData() error {
 	if !m.openCalled {
@@ -152,7 +202,7 @@ func TestAddItemSimple(t *testing.T) {
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
-	err = m.AddItem(cps1[0], "I", "test", false)
+	err = m.AddItem(cps1[0], "O", "I", "c", "test", false)
 	require.NoError(t, err)
 	err = m.query.Close()
 	require.NoError(t, err)
@@ -161,7 +211,7 @@ func TestAddItemSimple(t *testing.T) {
 func TestAddItemInvalidCountPath(t *testing.T) {
 	var err error
 	cps1 := []string{"\\O\\C"}
-	m := Win_PerfCounters{PrintValid: false, Object: nil, query: &FakePerformanceQuery{
+	m := Win_PerfCounters{PrintValid: false, Object: nil, UseWildcardsExpansion: true, query: &FakePerformanceQuery{
 		counters: createCounterMap(cps1, []float64{1.1}),
 		expandPaths: map[string][]string{
 			cps1[0]: {"\\O/C"},
@@ -170,7 +220,7 @@ func TestAddItemInvalidCountPath(t *testing.T) {
 	}}
 	err = m.query.Open()
 	require.NoError(t, err)
-	err = m.AddItem("\\O\\C", "*", "test", false)
+	err = m.AddItem("\\O\\C", "O", "------", "C", "test", false)
 	require.Error(t, err)
 	err = m.query.Close()
 	require.NoError(t, err)
@@ -197,13 +247,24 @@ func TestParseConfigBasic(t *testing.T) {
 	assert.Len(t, m.counters, 4)
 	err = m.query.Close()
 	require.NoError(t, err)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 4)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
 func TestParseConfigNoInstance(t *testing.T) {
 	var err error
 	perfObjects := createPerfObject("m", "O", []string{"------"}, []string{"C1", "C2"}, false, false)
 	cps1 := []string{"\\O\\C1", "\\O\\C2"}
-	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, UseWildcardsExpansion: false, query: &FakePerformanceQuery{
 		counters: createCounterMap(cps1, []float64{1.1, 1.2}),
 		expandPaths: map[string][]string{
 			cps1[0]: {cps1[0]},
@@ -218,6 +279,17 @@ func TestParseConfigNoInstance(t *testing.T) {
 	assert.Len(t, m.counters, 2)
 	err = m.query.Close()
 	require.NoError(t, err)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
 func TestParseConfigInvalidCounterError(t *testing.T) {
@@ -239,6 +311,16 @@ func TestParseConfigInvalidCounterError(t *testing.T) {
 	require.Error(t, err)
 	err = m.query.Close()
 	require.NoError(t, err)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.Error(t, err)
+	err = m.query.Close()
+	require.NoError(t, err)
 }
 
 func TestParseConfigInvalidCounterNoError(t *testing.T) {
@@ -260,13 +342,24 @@ func TestParseConfigInvalidCounterNoError(t *testing.T) {
 	require.NoError(t, err)
 	err = m.query.Close()
 	require.NoError(t, err)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+
+	err = m.query.Open()
+	require.NoError(t, err)
+	err = m.ParseConfig()
+	require.NoError(t, err)
+	err = m.query.Close()
+	require.NoError(t, err)
+
 }
 
-func TestParseConfigTotal(t *testing.T) {
+func TestParseConfigTotalExpansion(t *testing.T) {
 	var err error
 	perfObjects := createPerfObject("m", "O", []string{"*"}, []string{"*"}, true, true)
 	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(_Total)\\C1", "\\O(_Total)\\C2"}
-	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+	m := Win_PerfCounters{PrintValid: false, UseWildcardsExpansion: true, Object: perfObjects, query: &FakePerformanceQuery{
 		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
@@ -283,7 +376,7 @@ func TestParseConfigTotal(t *testing.T) {
 
 	perfObjects[0].IncludeTotal = false
 
-	m = Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+	m = Win_PerfCounters{PrintValid: false, UseWildcardsExpansion: true, Object: perfObjects, query: &FakePerformanceQuery{
 		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
@@ -303,7 +396,7 @@ func TestParseConfigExpand(t *testing.T) {
 	var err error
 	perfObjects := createPerfObject("m", "O", []string{"*"}, []string{"*"}, false, false)
 	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
-	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: &FakePerformanceQuery{
+	m := Win_PerfCounters{PrintValid: false, UseWildcardsExpansion: true, Object: perfObjects, query: &FakePerformanceQuery{
 		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
 		expandPaths: map[string][]string{
 			"\\O(*)\\*": cps1,
@@ -346,6 +439,17 @@ func TestSimpleGather(t *testing.T) {
 		"objectname": "O",
 	}
 	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+	m.lastRefreshed = time.Time{}
+
+	var acc2 testutil.Accumulator
+
+	err = m.Gather(&acc2)
+	require.NoError(t, err)
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
 }
 
 func TestGatherInvalidDataIgnore(t *testing.T) {
@@ -377,15 +481,25 @@ func TestGatherInvalidDataIgnore(t *testing.T) {
 		"objectname": "O",
 	}
 	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	m.UseWildcardsExpansion = true
+	m.counters = nil
+	m.lastRefreshed = time.Time{}
+
+	var acc2 testutil.Accumulator
+	err = m.Gather(&acc2)
+	require.NoError(t, err)
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
 }
 
-func TestGatherRefreshing(t *testing.T) {
+//tests with expansion
+func TestGatherRefreshingWithExpansion(t *testing.T) {
 	var err error
 	if testing.Short() {
 		t.Skip("Skipping long taking test in short mode")
 	}
 	measurement := "test"
-	perfObjects := createPerfObject(measurement, "O", []string{"*"}, []string{"*"}, false, false)
+	perfObjects := createPerfObject(measurement, "O", []string{"*"}, []string{"*"}, true, false)
 	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
 	fpm := &FakePerformanceQuery{
 		counters: createCounterMap(append(cps1, "\\O(*)\\*"), []float64{1.1, 1.2, 1.3, 1.4, 0}),
@@ -394,7 +508,7 @@ func TestGatherRefreshing(t *testing.T) {
 		},
 		addEnglishSupported: true,
 	}
-	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, UseWildcardsExpansion: true, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
 	var acc1 testutil.Accumulator
 	err = m.Gather(&acc1)
 	assert.Len(t, m.counters, 4)
@@ -464,6 +578,181 @@ func TestGatherRefreshing(t *testing.T) {
 
 }
 
+func TestGatherRefreshingWithoutExpansion(t *testing.T) {
+	var err error
+	if testing.Short() {
+		t.Skip("Skipping long taking test in short mode")
+	}
+	measurement := "test"
+	perfObjects := createPerfObject(measurement, "O", []string{"*"}, []string{"C1", "C2"}, true, false)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2"}
+	fpm := &FakePerformanceQuery{
+		counters: createCounterMap(append([]string{"\\O(*)\\C1", "\\O(*)\\C2"}, cps1...), []float64{0, 0, 1.1, 1.2, 1.3, 1.4}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\C1": {cps1[0], cps1[2]},
+			"\\O(*)\\C2": {cps1[1], cps1[3]},
+		},
+		addEnglishSupported: true,
+	}
+	m := Win_PerfCounters{PrintValid: false, Object: perfObjects, UseWildcardsExpansion: false, query: fpm, CountersRefreshInterval: internal.Duration{Duration: time.Second * 10}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	assert.Len(t, m.counters, 2)
+	require.NoError(t, err)
+	assert.Len(t, acc1.Metrics, 2)
+
+	fields1 := map[string]interface{}{
+		"C1": float32(1.1),
+		"C2": float32(1.2),
+	}
+	tags1 := map[string]string{
+		"instance":   "I1",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	fields2 := map[string]interface{}{
+		"C1": float32(1.3),
+		"C2": float32(1.4),
+	}
+	tags2 := map[string]string{
+		"instance":   "I2",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+	//test finding new instance
+	cps2 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I2)\\C1", "\\O(I2)\\C2", "\\O(I3)\\C1", "\\O(I3)\\C2"}
+	fpm = &FakePerformanceQuery{
+		counters: createCounterMap(append([]string{"\\O(*)\\C1", "\\O(*)\\C2"}, cps2...), []float64{0, 0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\C1": {cps2[0], cps2[2], cps2[4]},
+			"\\O(*)\\C2": {cps2[1], cps2[3], cps2[5]},
+		},
+		addEnglishSupported: true,
+	}
+	m.query = fpm
+	fpm.Open()
+	var acc2 testutil.Accumulator
+
+	fields3 := map[string]interface{}{
+		"C1": float32(1.5),
+		"C2": float32(1.6),
+	}
+	tags3 := map[string]string{
+		"instance":   "I3",
+		"objectname": "O",
+	}
+
+	//test before elapsing CounterRefreshRate counters are not refreshed
+	err = m.Gather(&acc2)
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	assert.Len(t, acc2.Metrics, 3)
+
+	acc2.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+	acc2.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+	acc2.AssertContainsTaggedFields(t, measurement, fields3, tags3)
+	//test changed configuration
+	perfObjects = createPerfObject(measurement, "O", []string{"*"}, []string{"C1", "C2", "C3"}, true, false)
+	cps3 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(I1)\\C3", "\\O(I2)\\C1", "\\O(I2)\\C2", "\\O(I2)\\C3"}
+	fpm = &FakePerformanceQuery{
+		counters: createCounterMap(append([]string{"\\O(*)\\C1", "\\O(*)\\C2", "\\O(*)\\C3"}, cps3...), []float64{0, 0, 0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\C1": {cps3[0], cps3[3]},
+			"\\O(*)\\C2": {cps3[1], cps3[4]},
+			"\\O(*)\\C3": {cps3[2], cps3[5]},
+		},
+		addEnglishSupported: true,
+	}
+	m.query = fpm
+	m.Object = perfObjects
+
+	fpm.Open()
+
+	time.Sleep(m.CountersRefreshInterval.Duration)
+
+	var acc3 testutil.Accumulator
+	err = m.Gather(&acc3)
+	require.NoError(t, err)
+	assert.Len(t, acc3.Metrics, 2)
+	fields4 := map[string]interface{}{
+		"C1": float32(1.1),
+		"C2": float32(1.2),
+		"C3": float32(1.3),
+	}
+	tags4 := map[string]string{
+		"instance":   "I1",
+		"objectname": "O",
+	}
+	fields5 := map[string]interface{}{
+		"C1": float32(1.4),
+		"C2": float32(1.5),
+		"C3": float32(1.6),
+	}
+	tags5 := map[string]string{
+		"instance":   "I2",
+		"objectname": "O",
+	}
+
+	acc3.AssertContainsTaggedFields(t, measurement, fields4, tags4)
+	acc3.AssertContainsTaggedFields(t, measurement, fields5, tags5)
+
+}
+
+func TestGatherTotalNoExpansion(t *testing.T) {
+	var err error
+	measurement := "m"
+	perfObjects := createPerfObject(measurement, "O", []string{"*"}, []string{"C1", "C2"}, true, true)
+	cps1 := []string{"\\O(I1)\\C1", "\\O(I1)\\C2", "\\O(_Total)\\C1", "\\O(_Total)\\C2"}
+	m := Win_PerfCounters{PrintValid: false, UseWildcardsExpansion: false, Object: perfObjects, query: &FakePerformanceQuery{
+		counters: createCounterMap(append([]string{"\\O(*)\\C1", "\\O(*)\\C2"}, cps1...), []float64{0, 0, 1.1, 1.2, 1.3, 1.4}),
+		expandPaths: map[string][]string{
+			"\\O(*)\\C1": {cps1[0], cps1[2]},
+			"\\O(*)\\C2": {cps1[1], cps1[3]},
+		},
+		addEnglishSupported: true,
+	}}
+	var acc1 testutil.Accumulator
+	err = m.Gather(&acc1)
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	assert.Len(t, acc1.Metrics, 2)
+	fields1 := map[string]interface{}{
+		"C1": float32(1.1),
+		"C2": float32(1.2),
+	}
+	tags1 := map[string]string{
+		"instance":   "I1",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	fields2 := map[string]interface{}{
+		"C1": float32(1.3),
+		"C2": float32(1.4),
+	}
+	tags2 := map[string]string{
+		"instance":   "_Total",
+		"objectname": "O",
+	}
+	acc1.AssertContainsTaggedFields(t, measurement, fields2, tags2)
+
+	perfObjects[0].IncludeTotal = false
+
+	m.counters = nil
+	m.lastRefreshed = time.Time{}
+
+	var acc2 testutil.Accumulator
+	err = m.Gather(&acc2)
+	require.NoError(t, err)
+	assert.Len(t, m.counters, 2)
+	assert.Len(t, acc2.Metrics, 1)
+
+	acc2.AssertContainsTaggedFields(t, measurement, fields1, tags1)
+
+	acc2.AssertDoesNotContainsTaggedFields(t, measurement, fields2, tags2)
+}
+
 // list of nul terminated strings from WinAPI
 var unicodeStringListWithEnglishChars = []uint16{0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x28, 0x30, 0x20, 0x43, 0x3a, 0x29, 0x5c, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x51, 0x75, 0x65, 0x75, 0x65, 0x20, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x0, 0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x28, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x29, 0x5c, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x51, 0x75, 0x65, 0x75, 0x65, 0x20, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x0, 0x0}
 var unicodeStringListWithCzechChars = []uint16{0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x46, 0x79, 0x7a, 0x69, 0x63, 0x6b, 0xfd, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x28, 0x30, 0x20, 0x43, 0x3a, 0x29, 0x5c, 0x41, 0x6b, 0x74, 0x75, 0xe1, 0x6c, 0x6e, 0xed, 0x20, 0x64, 0xe9, 0x6c, 0x6b, 0x61, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x79, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x75, 0x0, 0x5c, 0x5c, 0x54, 0x34, 0x38, 0x30, 0x5c, 0x46, 0x79, 0x7a, 0x69, 0x63, 0x6b, 0xfd, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x28, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x29, 0x5c, 0x41, 0x6b, 0x74, 0x75, 0xe1, 0x6c, 0x6e, 0xed, 0x20, 0x64, 0xe9, 0x6c, 0x6b, 0x61, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x79, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x75, 0x0, 0x0}
@@ -495,5 +784,4 @@ func TestUTF16ToStringArray(t *testing.T) {
 
 	czechStrings := UTF16ToStringArray(unicodeStringListWithCzechChars)
 	assert.True(t, assert.ObjectsAreEqual(czechStrings, stringArrayWithCzechChars), "Not equal czech arrays")
-
 }

From 76ec90e66d411f284c116e490fc0f0093db00773 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 11:41:46 -0700
Subject: [PATCH 1265/1302] Update win_perf_counters README

---
 plugins/inputs/win_perf_counters/README.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index 422ef6a31..dd5dede4d 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -33,15 +33,15 @@ Example:
 
 #### UseWildcardsExpansion
 
-If `UseWildcardsExpansion` is set to true, wildcards can be used in instance name and counter name
-. 
-Partial wildcard (e.g. `chrome*`) is supported only in instance name on Windows Vista and newer. 
+If `UseWildcardsExpansion` is set to true, wildcards can be used in the
+instance name and the counter name.  When using localized Windows, counters
+will be also be localized.  Instance indexes will also be returned in the
+instance name.
 
-On localized Windows, returned counters will be also localized. 
+Partial wildcards (e.g. `chrome*`) are supported only in the instance name on Windows Vista and newer.
 
-It also returns instance indexes in instance names.
-
-If set to `false`, wildcards (not partial) in instance names can still be used, but instance indexes will not be returned in instance names.
+If disabled, wildcards (not partial) in instance names can still be used, but
+instance indexes will not be returned in the instance names.
 
 Example:
 `UseWildcardsExpansion=true`
@@ -116,8 +116,10 @@ Counters key (this is an array) is the counters of the ObjectName
 you would like returned, it can also be one or more values.
 
 Example: `Counters = ["% Idle Time", "% Disk Read Time", "% Disk Write Time"]`
-This must be specified for every counter you want the results of, or use `["*"]` for all the counters for object, 
-if the `UseWildcardsExpansion` param is set to `true`
+
+This must be specified for every counter you want the results of, or use
+`["*"]` for all the counters for object, if the `UseWildcardsExpansion` param
+is set to `true`
 
 #### Measurement
 *Optional*

From f64d6122946e97b0e3fb30c651959b5eaa6ae440 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 14:43:28 -0700
Subject: [PATCH 1266/1302] Reword converter description

---
 plugins/processors/converter/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/processors/converter/README.md b/plugins/processors/converter/README.md
index 69c2cc275..80c210aa4 100644
--- a/plugins/processors/converter/README.md
+++ b/plugins/processors/converter/README.md
@@ -1,7 +1,7 @@
 # Converter Processor
 
 The converter processor is used to change the type of tag or field values.  In
-addition to changing field types it can convert fields to tags and vis versa.
+addition to changing field types it can convert between fields and tags.
 
 Values that cannot be converted are dropped.
 

From d2e729dfaf3b5d20fcbdca0811b351ec5604306c Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Mon, 11 Jun 2018 17:54:08 -0400
Subject: [PATCH 1267/1302] Remove tags with empty values from Wavefront output
 (#4266)

---
 plugins/outputs/wavefront/wavefront.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
index 1e015c9f0..18c5a6495 100644
--- a/plugins/outputs/wavefront/wavefront.go
+++ b/plugins/outputs/wavefront/wavefront.go
@@ -180,6 +180,14 @@ func buildMetrics(m telegraf.Metric, w *Wavefront) []*MetricPoint {
 }
 
 func buildTags(mTags map[string]string, w *Wavefront) (string, map[string]string) {
+
+	// Remove all empty tags.
+	for k, v := range mTags {
+		if v == "" {
+			delete(mTags, k)
+		}
+	}
+
 	var source string
 	sourceTagFound := false
 

From 90eebd88afac044fe2330eebeb12462098471098 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 14:55:12 -0700
Subject: [PATCH 1268/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95aa9cb3c..9f38ccfc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
 - [#2468](https://github.com/influxdata/telegraf/issues/2468): Fix crash on 32-bit Windows in win_perf_counters.
 - [#4198](https://github.com/influxdata/telegraf/issues/4198): Fix win_perf_counters not collecting at every interval.
 - [#4227](https://github.com/influxdata/telegraf/issues/4227): Use same flags for all BSD family ping variants.
+- [#4266](https://github.com/influxdata/telegraf/issues/4266): Remove tags with empty values from Wavefront output.
 
 ## v1.6.4 [2018-06-05]
 

From dd2223ae1c36961cbd3541719e27ab2b8e9aa346 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 15:24:45 -0700
Subject: [PATCH 1269/1302] Use nats-io/go-nats instead of nats-io/nats

---
 Godeps                                        | 1 -
 plugins/inputs/nats_consumer/nats_consumer.go | 2 +-
 plugins/outputs/nats/nats.go                  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Godeps b/Godeps
index 6d2580222..cc80cb3b5 100644
--- a/Godeps
+++ b/Godeps
@@ -51,7 +51,6 @@ github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/gnatsd 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
 github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898
 github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
 github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f
 github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
diff --git a/plugins/inputs/nats_consumer/nats_consumer.go b/plugins/inputs/nats_consumer/nats_consumer.go
index a4a781699..cb3eb3017 100644
--- a/plugins/inputs/nats_consumer/nats_consumer.go
+++ b/plugins/inputs/nats_consumer/nats_consumer.go
@@ -8,7 +8,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
-	"github.com/nats-io/nats"
+	nats "github.com/nats-io/go-nats"
 )
 
 type natsError struct {
diff --git a/plugins/outputs/nats/nats.go b/plugins/outputs/nats/nats.go
index a664bc1bb..d9fdb0e88 100644
--- a/plugins/outputs/nats/nats.go
+++ b/plugins/outputs/nats/nats.go
@@ -3,7 +3,7 @@ package nats
 import (
 	"fmt"
 
-	nats_client "github.com/nats-io/nats"
+	nats_client "github.com/nats-io/go-nats"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/tls"

From 1ea18ffd0a5f4311e1c4516cf465d4b65862dd84 Mon Sep 17 00:00:00 2001
From: marcv81 <marc.venturini@gmail.com>
Date: Tue, 12 Jun 2018 07:06:26 +0800
Subject: [PATCH 1270/1302] Add power draw field to nvidia_smi plugin (#4262)

---
 plugins/inputs/nvidia_smi/README.md          |  1 +
 plugins/inputs/nvidia_smi/nvidia_smi.go      | 40 +++++++++++++-------
 plugins/inputs/nvidia_smi/nvidia_smi_test.go |  4 +-
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/plugins/inputs/nvidia_smi/README.md b/plugins/inputs/nvidia_smi/README.md
index 84b8527f2..3e8b84ba0 100644
--- a/plugins/inputs/nvidia_smi/README.md
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -27,6 +27,7 @@ This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvid
     - `memory_free` (integer, KB)
     - `memory_used` (integer, KB)
     - `memory_total` (integer, KB)
+    - `power_draw` (float, W)
     - `temperature_gpu` (integer, degrees C)
     - `utilization_gpu` (integer, percentage)
     - `utilization_memory` (integer, percentage)
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go
index efac941b9..84784b765 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi.go
@@ -16,20 +16,21 @@ import (
 
 var (
 	measurement = "nvidia_smi"
-	metrics     = "fan.speed,memory.total,memory.used,memory.free,pstate,temperature.gpu,name,uuid,compute_mode,utilization.gpu,utilization.memory,index"
+	metrics     = "fan.speed,memory.total,memory.used,memory.free,pstate,temperature.gpu,name,uuid,compute_mode,utilization.gpu,utilization.memory,index,power.draw"
 	metricNames = [][]string{
-		[]string{"fan_speed", "field"},
-		[]string{"memory_total", "field"},
-		[]string{"memory_used", "field"},
-		[]string{"memory_free", "field"},
+		[]string{"fan_speed", "integer"},
+		[]string{"memory_total", "integer"},
+		[]string{"memory_used", "integer"},
+		[]string{"memory_free", "integer"},
 		[]string{"pstate", "tag"},
-		[]string{"temperature_gpu", "field"},
+		[]string{"temperature_gpu", "integer"},
 		[]string{"name", "tag"},
 		[]string{"uuid", "tag"},
 		[]string{"compute_mode", "tag"},
-		[]string{"utilization_gpu", "field"},
-		[]string{"utilization_memory", "field"},
+		[]string{"utilization_gpu", "integer"},
+		[]string{"utilization_memory", "integer"},
 		[]string{"index", "tag"},
+		[]string{"power_draw", "float"},
 	}
 )
 
@@ -127,7 +128,7 @@ func parseLine(line string) (map[string]string, map[string]interface{}, error) {
 		for i, m := range metricNames {
 			col := strings.TrimSpace(met[i])
 
-			// First handle the tags
+			// Handle the tags
 			if m[1] == "tag" {
 				tags[m[0]] = col
 				continue
@@ -137,12 +138,23 @@ func parseLine(line string) (map[string]string, map[string]interface{}, error) {
 				continue
 			}
 
-			// Then parse the integers out of the fields
-			out, err := strconv.ParseInt(col, 10, 64)
-			if err != nil {
-				return tags, fields, err
+			// Parse the integers
+			if m[1] == "integer" {
+				out, err := strconv.ParseInt(col, 10, 64)
+				if err != nil {
+					return tags, fields, err
+				}
+				fields[m[0]] = out
+			}
+
+			// Parse the floats
+			if m[1] == "float" {
+				out, err := strconv.ParseFloat(col, 64)
+				if err != nil {
+					return tags, fields, err
+				}
+				fields[m[0]] = out
 			}
-			fields[m[0]] = out
 		}
 
 		// Return the tags and fields
diff --git a/plugins/inputs/nvidia_smi/nvidia_smi_test.go b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
index 573a69b19..87785fe87 100644
--- a/plugins/inputs/nvidia_smi/nvidia_smi_test.go
+++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestParseLineStandard(t *testing.T) {
-	line := "85, 8114, 553, 7561, P2, 61, GeForce GTX 1070 Ti, GPU-d1911b8a-f5c8-5e66-057c-486561269de8, Default, 100, 93, 1\n"
+	line := "85, 8114, 553, 7561, P2, 61, GeForce GTX 1070 Ti, GPU-d1911b8a-f5c8-5e66-057c-486561269de8, Default, 100, 93, 1, 0.0\n"
 	tags, fields, err := parseLine(line)
 	if err != nil {
 		t.Fail()
@@ -37,7 +37,7 @@ func TestParseLineBad(t *testing.T) {
 }
 
 func TestParseLineNotSupported(t *testing.T) {
-	line := "[Not Supported], 7606, 0, 7606, P0, 38, Tesla P4, GPU-xxx, Default, 0, 0, 0\n"
+	line := "[Not Supported], 7606, 0, 7606, P0, 38, Tesla P4, GPU-xxx, Default, 0, 0, 0, 0.0\n"
 	_, fields, err := parseLine(line)
 	require.NoError(t, err)
 	require.Equal(t, nil, fields["fan_speed"])

From d16530677dead654659959bc6c8f1d918e43ef18 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 16:07:23 -0700
Subject: [PATCH 1271/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f38ccfc8..012aa45a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
 - [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
+- [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
 
 ## v1.7 [unreleased]
 

From daddd8bbac3d16db5e3a09a19c265e42db6f0b7a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 11 Jun 2018 16:13:59 -0700
Subject: [PATCH 1272/1302] Use nats-io/go-nats instead of nats-io/nats in
 tests

---
 plugins/inputs/nats_consumer/nats_consumer_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go
index a6897b714..a0b84ff2e 100644
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/nats-io/nats"
+	nats "github.com/nats-io/go-nats"
 	"github.com/stretchr/testify/assert"
 )
 

From d2e00a32052d0f9e623db4730781940165fd7711 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 11:41:58 -0700
Subject: [PATCH 1273/1302] Set 1.7.0 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 012aa45a1..06ea0690a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 - [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
 - [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
 
-## v1.7 [unreleased]
+## v1.7 [2018-06-12]
 
 ### Release Notes
 

From a789f97febf54ef30397991d9b81501c366be048 Mon Sep 17 00:00:00 2001
From: Sambhav Kothari <sambhavs.email@gmail.com>
Date: Wed, 13 Jun 2018 02:26:13 +0530
Subject: [PATCH 1274/1302] Add support for solr 7 to the solr input (#4271)

---
 plugins/inputs/solr/README.md         |  2 +-
 plugins/inputs/solr/solr.go           | 54 +++++++++++-------------
 plugins/inputs/solr/solr_test.go      | 26 ++++++++++++
 plugins/inputs/solr/testdata7_test.go | 60 +++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 30 deletions(-)
 create mode 100644 plugins/inputs/solr/testdata7_test.go

diff --git a/plugins/inputs/solr/README.md b/plugins/inputs/solr/README.md
index 3162cfe04..67f4e06ae 100644
--- a/plugins/inputs/solr/README.md
+++ b/plugins/inputs/solr/README.md
@@ -5,7 +5,7 @@ The [solr](http://lucene.apache.org/solr/) plugin collects stats via the
 
 More about [performance statistics](https://cwiki.apache.org/confluence/display/solr/Performance+Statistics+Reference)
 
-Tested from 3.5 to 6.*
+Tested from 3.5 to 7.*
 
 ### Configuration:
 
diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go
index 36c3193ff..9b5ce9299 100644
--- a/plugins/inputs/solr/solr.go
+++ b/plugins/inputs/solr/solr.go
@@ -113,20 +113,7 @@ type Hitratio interface{}
 // Cache is an exported type that
 // contains cache metrics
 type Cache struct {
-	Stats struct {
-		CumulativeEvictions int64    `json:"cumulative_evictions"`
-		CumulativeHitratio  Hitratio `json:"cumulative_hitratio"`
-		CumulativeHits      int64    `json:"cumulative_hits"`
-		CumulativeInserts   int64    `json:"cumulative_inserts"`
-		CumulativeLookups   int64    `json:"cumulative_lookups"`
-		Evictions           int64    `json:"evictions"`
-		Hitratio            Hitratio `json:"hitratio"`
-		Hits                int64    `json:"hits"`
-		Inserts             int64    `json:"inserts"`
-		Lookups             int64    `json:"lookups"`
-		Size                int64    `json:"size"`
-		WarmupTime          int64    `json:"warmupTime"`
-	} `json:"stats"`
+	Stats map[string]interface{} `json:"stats"`
 }
 
 // NewSolr return a new instance of Solr
@@ -424,21 +411,30 @@ func addCacheMetricsToAcc(acc telegraf.Accumulator, core string, mBeansData *MBe
 		return err
 	}
 	for name, metrics := range cacheMetrics {
-		cumulativeHits := getFloat(metrics.Stats.CumulativeHitratio)
-		hitratio := getFloat(metrics.Stats.Hitratio)
-		coreFields := map[string]interface{}{
-			"cumulative_evictions": metrics.Stats.CumulativeEvictions,
-			"cumulative_hitratio":  cumulativeHits,
-			"cumulative_hits":      metrics.Stats.CumulativeHits,
-			"cumulative_inserts":   metrics.Stats.CumulativeInserts,
-			"cumulative_lookups":   metrics.Stats.CumulativeLookups,
-			"evictions":            metrics.Stats.Evictions,
-			"hitratio":             hitratio,
-			"hits":                 metrics.Stats.Hits,
-			"inserts":              metrics.Stats.Inserts,
-			"lookups":              metrics.Stats.Lookups,
-			"size":                 metrics.Stats.Size,
-			"warmup_time":          metrics.Stats.WarmupTime,
+		coreFields := make(map[string]interface{})
+		for key, value := range metrics.Stats {
+			splitKey := strings.Split(key, ".")
+			newKey := splitKey[len(splitKey)-1]
+			switch newKey {
+			case "cumulative_evictions",
+				"cumulative_hits",
+				"cumulative_inserts",
+				"cumulative_lookups",
+				"eviction",
+				"hits",
+				"inserts",
+				"lookups",
+				"size",
+				"evictions":
+				coreFields[newKey] = getInt(value)
+			case "hitratio",
+				"cumulative_hitratio":
+				coreFields[newKey] = getFloat(value)
+			case "warmupTime":
+				coreFields["warmup_time"] = getInt(value)
+			default:
+				continue
+			}
 		}
 		acc.AddFields(
 			"solr_cache",
diff --git a/plugins/inputs/solr/solr_test.go b/plugins/inputs/solr/solr_test.go
index b79f89602..270816909 100644
--- a/plugins/inputs/solr/solr_test.go
+++ b/plugins/inputs/solr/solr_test.go
@@ -43,6 +43,17 @@ func TestGatherStats(t *testing.T) {
 		map[string]string{"core": "main", "handler": "filterCache"})
 }
 
+func TestSolr7MbeansStats(t *testing.T) {
+	ts := createMockSolr7Server()
+	solr := NewSolr()
+	solr.Servers = []string{ts.URL}
+	var acc testutil.Accumulator
+	require.NoError(t, solr.Gather(&acc))
+	acc.AssertContainsTaggedFields(t, "solr_cache",
+		solr7CacheExpected,
+		map[string]string{"core": "main", "handler": "documentCache"})
+}
+
 func TestSolr3GatherStats(t *testing.T) {
 	ts := createMockSolr3Server()
 	solr := NewSolr()
@@ -150,3 +161,18 @@ func createMockSolr3Server() *httptest.Server {
 		}
 	}))
 }
+
+func createMockSolr7Server() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/solr/admin/cores") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, statusResponse)
+		} else if strings.Contains(r.URL.Path, "solr/main/admin") {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintln(w, mBeansSolr7Response)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintln(w, "nope")
+		}
+	}))
+}
diff --git a/plugins/inputs/solr/testdata7_test.go b/plugins/inputs/solr/testdata7_test.go
new file mode 100644
index 000000000..b58b3f131
--- /dev/null
+++ b/plugins/inputs/solr/testdata7_test.go
@@ -0,0 +1,60 @@
+package solr
+
+const mBeansSolr7Response = `
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":2
+   },
+   "solr-mbeans":[
+      "CORE",
+      {
+
+      },
+      "QUERYHANDLER",
+      {
+
+      },
+      "UPDATEHANDLER",
+      {
+
+      },
+      "CACHE",
+      {
+         "documentCache":{
+            "class":"org.apache.solr.search.LRUCache",
+            "description":"LRU Cache(maxSize=16384, initialSize=4096)",
+            "stats":{
+               "CACHE.searcher.documentCache.evictions": 141485,
+               "CACHE.searcher.documentCache.cumulative_lookups": 265132,
+               "CACHE.searcher.documentCache.hitratio": 0.44,
+               "CACHE.searcher.documentCache.size": 8192,
+               "CACHE.searcher.documentCache.cumulative_hitratio": 0.42,
+               "CACHE.searcher.documentCache.lookups": 1234,
+               "CACHE.searcher.documentCache.warmupTime": 1,
+               "CACHE.searcher.documentCache.inserts": 987,
+               "CACHE.searcher.documentCache.hits": 1111,
+               "CACHE.searcher.documentCache.cumulative_hits": 115364,
+               "CACHE.searcher.documentCache.cumulative_inserts": 149768,
+               "CACHE.searcher.documentCache.cumulative_evictions": 141486
+            }
+         }
+      }
+   ]
+}
+`
+
+var solr7CacheExpected = map[string]interface{}{
+	"evictions":            int64(141485),
+	"cumulative_evictions": int64(141486),
+	"cumulative_hitratio":  float64(0.42),
+	"cumulative_hits":      int64(115364),
+	"cumulative_inserts":   int64(149768),
+	"cumulative_lookups":   int64(265132),
+	"hitratio":             float64(0.44),
+	"hits":                 int64(1111),
+	"inserts":              int64(987),
+	"lookups":              int64(1234),
+	"size":                 int64(8192),
+	"warmup_time":          int64(1),
+}

From bf59bcf721be09f7caa3b488d5a2922c2e4562b5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 13:57:00 -0700
Subject: [PATCH 1275/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ea0690a..75571c7fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
 - [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
 - [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
+- [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
 
 ## v1.7 [2018-06-12]
 

From 70ffed3a4dd2bb73d23ea645e0bc09ff291177d6 Mon Sep 17 00:00:00 2001
From: marcv81 <marc.venturini@gmail.com>
Date: Wed, 13 Jun 2018 05:28:56 +0800
Subject: [PATCH 1276/1302] Fixed typos in nvidia_smi plugin doc (#4261)

---
 plugins/inputs/nvidia_smi/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/nvidia_smi/README.md b/plugins/inputs/nvidia_smi/README.md
index 3e8b84ba0..5d0cc99c6 100644
--- a/plugins/inputs/nvidia_smi/README.md
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -17,16 +17,16 @@ This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvid
 ### Metrics
 - measurement: `nvidia_smi`
   - tags
-    - `name` (type of GPU e.g. `GeForce GTX 170 Ti`)
+    - `name` (type of GPU e.g. `GeForce GTX 1070 Ti`)
     - `compute_mode` (The compute mode of the GPU e.g. `Default`)
     - `index` (The port index where the GPU is connected to the motherboard e.g. `1`)
     - `pstate` (Overclocking state for the GPU e.g. `P0`)
     - `uuid` (A unique identifier for the GPU e.g. `GPU-f9ba66fc-a7f5-94c5-da19-019ef2f9c665`)
   - fields
     - `fan_speed` (integer, percentage)
-    - `memory_free` (integer, KB)
-    - `memory_used` (integer, KB)
-    - `memory_total` (integer, KB)
+    - `memory_free` (integer, MiB)
+    - `memory_used` (integer, MiB)
+    - `memory_total` (integer, MiB)
     - `power_draw` (float, W)
     - `temperature_gpu` (integer, degrees C)
     - `utilization_gpu` (integer, percentage)

From 36df4c5ae54c67d1fdcbaf0e9b53f6c8fc2c4476 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 16:12:08 -0700
Subject: [PATCH 1277/1302] Fix grammar in converter processor documentation

---
 plugins/processors/converter/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/processors/converter/README.md b/plugins/processors/converter/README.md
index 80c210aa4..f69c8728e 100644
--- a/plugins/processors/converter/README.md
+++ b/plugins/processors/converter/README.md
@@ -5,7 +5,7 @@ addition to changing field types it can convert between fields and tags.
 
 Values that cannot be converted are dropped.
 
-**Note:** When converting tags to fields, take care not to ensure the series is still
+**Note:** When converting tags to fields, take care to ensure the series is still
 uniquely identifiable.  Fields with the same series key (measurement + tags)
 will overwrite one another.
 

From 40fac0a9b48232794ca4d2bc3a4b5ccc71c03ba8 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 12 Jun 2018 16:44:04 -0700
Subject: [PATCH 1278/1302] Treat sigterm as a clean shutdown signal (#4277)

---
 cmd/telegraf/telegraf.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index b21f223cf..57ff846cf 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -147,11 +147,11 @@ func reloadLoop(
 
 		shutdown := make(chan struct{})
 		signals := make(chan os.Signal)
-		signal.Notify(signals, os.Interrupt, syscall.SIGHUP)
+		signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGTERM)
 		go func() {
 			select {
 			case sig := <-signals:
-				if sig == os.Interrupt {
+				if sig == os.Interrupt || sig == syscall.SIGTERM {
 					close(shutdown)
 				}
 				if sig == syscall.SIGHUP {

From 30dc95fa7833e666d5373317d4888e8a0d16e257 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 16:46:27 -0700
Subject: [PATCH 1279/1302] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75571c7fb..b1fedc334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@
 - [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
 - [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
 
+## v1.7.1 [unreleased]
+
+### Bugfixes
+
+- [#4277](https://github.com/influxdata/telegraf/pull/4277): Treat sigterm as a clean shutdown signal.
+
 ## v1.7 [2018-06-12]
 
 ### Release Notes

From 886795063e76b5d3a02035ef9d49946ae173a48d Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 16:50:14 -0700
Subject: [PATCH 1280/1302] Fix typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fedc334..0db003bf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### New Inputs
 
-- [tengine](./plugins/inputs/tengine/README.md) - Contirbuted by @ertaoxu
+- [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 
 ### Features
 

From f217d12de52bff56d6e43e4e36bd1993935f69e0 Mon Sep 17 00:00:00 2001
From: Vlasta Hajek <vlastimil.hajek@gmail.com>
Date: Tue, 12 Jun 2018 15:20:00 +0200
Subject: [PATCH 1281/1302] Fix grammar issues in win_perf_counters readme

---
 plugins/inputs/win_perf_counters/README.md    | 52 ++++++++++---------
 .../win_perf_counters/win_perf_counters.go    | 11 ++--
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index dd5dede4d..a89efec0f 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -1,11 +1,11 @@
 # win_perf_counters readme
 
-Input plugin to read Performance Counters on Windows operating systems.
+This document presents the input plugin to read Performance Counters on Windows operating systems.
 
-Configuration is parsed and then tested for validity such as
+The configuration is parsed and then tested for validity, such as
 whether the Object, Instance and Counter exist on Telegraf startup.
 
-Counter paths are refreshed periodically, see [CountersRefreshInterval](#countersrefreshinterval)
+Counter paths are refreshed periodically, see the [CountersRefreshInterval](#countersrefreshinterval)
 configuration parameter for more info.
 
 In case of query for all instances `["*"]`, the plugin does not return the instance `_Total`
@@ -16,7 +16,7 @@ by default. See [IncludeTotal](#includetotal) for more info.
 The examples contained in this file have been found on the internet
 as counters used when performance monitoring
  Active Directory and IIS in particular.
- There are a lot other good objects to monitor, if you know what to look for.
+ There are a lot of other good objects to monitor, if you know what to look for.
  This file is likely to be updated in the future with more examples for
  useful configurations for separate scenarios.
 
@@ -49,14 +49,14 @@ Example:
 #### CountersRefreshInterval
 
 Configured counters are matched against available counters at the interval
-specified by the `CountersRefreshInterval` parameter. Default value is `1m` (1 minute).
+specified by the `CountersRefreshInterval` parameter. The default value is `1m` (1 minute).
 
 If wildcards are used in instance or counter names, they are expanded at this point, if the `UseWildcardsExpansion` param is set to `true`.
 
-Setting `CountersRefreshInterval` too low (order of seconds) can cause Telegraf to create
+Setting the `CountersRefreshInterval` too low (order of seconds) can cause Telegraf to create
 a high CPU load.
 
-Set to `0s` to disable periodic refreshing.
+Set it to `0s` to disable periodic refreshing.
 
 Example:
 `CountersRefreshInterval=1m`
@@ -65,7 +65,7 @@ Example:
 
 _Deprecated. Necessary features on Windows Vista and newer are checked dynamically_
 
-Bool, if set to `true` will use the localized PerfCounter interface that has been present since before Vista for backwards compatability.
+Bool, if set to `true`, the plugin will use the localized PerfCounter interface that has been present since before Vista for backwards compatability.
 
 It is recommended NOT to use this on OSes starting with Vista and newer because it requires more configuration to use this than the newer interface present since Vista.
 
@@ -77,12 +77,12 @@ Example for Windows Server 2003, this would be set to true:
 See Entry below.
 
 ### Entry
-A new configuration entry consists of the TOML header to start with,
+A new configuration entry consists of the TOML header starting with,
 `[[inputs.win_perf_counters.object]]`.
 This must follow before other plugin configurations,
 beneath the main win_perf_counters entry, `[[inputs.win_perf_counters]]`.
 
-Following this are 3 required key/value pairs and the three optional parameters and their usage.
+Following this are 3 required key/value pairs and three optional parameters and their usage.
 
 #### ObjectName
 **Required**
@@ -94,10 +94,12 @@ Example: `ObjectName = "LogicalDisk"`
 #### Instances
 **Required**
 
-Instances key (this is an array) is the instances of a counter you would like returned,
+The instances key (this is an array) declares the instances of a counter you would like returned,
 it can be one or more values.
 
-Example, `Instances = ["C:","D:","E:"]` will return only for the instances
+Example: `Instances = ["C:","D:","E:"]`
+
+This will return only for the instances
 C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only.
 By default any results containing `_Total` are stripped,
 unless this is specified as the wanted instance.
@@ -112,43 +114,43 @@ and that is to specify `Instances = ["------"]`.
 #### Counters
 **Required**
 
-Counters key (this is an array) is the counters of the ObjectName
+The Counters key (this is an array) declares the counters of the ObjectName
 you would like returned, it can also be one or more values.
 
 Example: `Counters = ["% Idle Time", "% Disk Read Time", "% Disk Write Time"]`
 
 This must be specified for every counter you want the results of, or use
-`["*"]` for all the counters for object, if the `UseWildcardsExpansion` param
-is set to `true`
+`["*"]` for all the counters of the object, if the `UseWildcardsExpansion` param
+is set to `true`.
 
 #### Measurement
 *Optional*
 
-This key is optional, if it is not set it will be `win_perf_counters`.
-In InfluxDB this is the key by which the returned data is stored underneath,
-so for ordering your data in a good manner,
+This key is optional. If it is not set it will be `win_perf_counters`.
+In InfluxDB this is the key underneath which the returned data is stored.
+So for ordering your data in a good manner,
 this is a good key to set with a value when you want your IIS and Disk results stored
 separately from Processor results.
 
-Example: `Measurement = "win_disk"
+Example: `Measurement = "win_disk"``
 
 #### IncludeTotal
 *Optional*
 
-This key is optional, it is a simple bool.
+This key is optional. It is a simple bool.
 If it is not set to true or included it is treated as false.
-This key only has an effect if the Instances key is set to `["*"]`
-and you would also like all instances containing `_Total` returned,
+This key only has effect if the Instances key is set to `["*"]`
+and you would also like all instances containing `_Total` to be returned,
 like `_Total`, `0,_Total` and so on where applicable
 (Processor Information is one example).
 
 #### WarnOnMissing
 *Optional*
 
-This key is optional, it is a simple bool.
+This key is optional. It is a simple bool.
 If it is not set to true or included it is treated as false.
-This only has an effect on the first execution of the plugin,
-it will print out any ObjectName/Instance/Counter combinations
+This only has effect on the first execution of the plugin.
+It will print out any ObjectName/Instance/Counter combinations
 asked for that do not match. Useful when debugging new configurations.
 
 #### FailOnMissing
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 26f1d3486..9ff5aefc4 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -5,13 +5,14 @@ package win_perf_counters
 import (
 	"errors"
 	"fmt"
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/inputs"
 	"log"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 var sampleConfig = `
@@ -22,9 +23,9 @@ var sampleConfig = `
   ## agent, it will not be gathered.
   ## Settings:
   # PrintValid = false # Print All matching performance counters
-  # If UseWildcardsExpansion params is set to true, wildcards (partial wildcards in instance names and wildcards in counters names) in configured counter paths will be expanded 
+  # If UseWildcardsExpansion params is set to true, wildcards (partial wildcards in instance names and wildcards in counters names) in configured counter paths will be expanded
   # and in case of localized Windows, counter paths will be also localized. It also returns instance indexes in instance names.
-  # If false, wildcards (not partial) in instance names will be still expanded, but instance indexes will not be returned in instance names.
+  # If false, wildcards (not partial) in instance names will still be expanded, but instance indexes will not be returned in instance names.
   #UseWildcardsExpansion = false
   # Period after which counters will be reread from configuration and wildcards in counter paths expanded
   CountersRefreshInterval="1m"

From f689463e8e05c0ebccd7716685e674ea723daf1f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 12 Jun 2018 18:37:50 -0700
Subject: [PATCH 1282/1302] Use linux/unix name only in `make install`

closes: #4278
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 79adbcbbf..981face45 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ go-install:
 
 install: telegraf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
-	cp $(TELEGRAF) $(DESTDIR)$(PREFIX)/bin/
+	cp telegraf $(DESTDIR)$(PREFIX)/bin/
 
 test:
 	go test -short ./...

From 4e69d10ff7976674abcaba7f1177471a80a31407 Mon Sep 17 00:00:00 2001
From: Arkady Emelyanov <arkady-emelyanov@users.noreply.github.com>
Date: Wed, 13 Jun 2018 23:05:27 +0300
Subject: [PATCH 1283/1302] Add owner tag on partitions in burrow input (#4281)

---
 plugins/inputs/burrow/README.md                             | 1 +
 plugins/inputs/burrow/burrow.go                             | 2 ++
 plugins/inputs/burrow/burrow_test.go                        | 6 +++---
 .../testdata/v3_kafka_clustername1_consumer_group1_lag.json | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md
index fe0b078ba..19073a6ef 100644
--- a/plugins/inputs/burrow/README.md
+++ b/plugins/inputs/burrow/README.md
@@ -92,6 +92,7 @@ Supported Burrow version: `1.x`
   - group (string)
   - topic (string)
   - partition (int)
+  - owner (string)
 
 * `burrow_topic`
   - cluster (string)
diff --git a/plugins/inputs/burrow/burrow.go b/plugins/inputs/burrow/burrow.go
index 88fdb4b7f..91e3ffe15 100644
--- a/plugins/inputs/burrow/burrow.go
+++ b/plugins/inputs/burrow/burrow.go
@@ -116,6 +116,7 @@ type (
 		Start      apiStatusResponseLagItem `json:"start"`
 		End        apiStatusResponseLagItem `json:"end"`
 		CurrentLag int64                    `json:"current_lag"`
+		Owner      string                   `json:"owner"`
 	}
 
 	// response: lag field item
@@ -447,6 +448,7 @@ func (b *burrow) genGroupLagMetrics(r *apiResponse, cluster, group string, acc t
 				"group":     group,
 				"topic":     partition.Topic,
 				"partition": strconv.FormatInt(int64(partition.Partition), 10),
+				"owner":     partition.Owner,
 			},
 		)
 	}
diff --git a/plugins/inputs/burrow/burrow_test.go b/plugins/inputs/burrow/burrow_test.go
index 9b3f4a0a9..5ea85798a 100644
--- a/plugins/inputs/burrow/burrow_test.go
+++ b/plugins/inputs/burrow/burrow_test.go
@@ -129,9 +129,9 @@ func TestBurrowPartition(t *testing.T) {
 		},
 	}
 	tags := []map[string]string{
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0"},
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1"},
-		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0", "owner": "kafka1"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1", "owner": "kafka2"},
+		{"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2", "owner": "kafka3"},
 	}
 
 	require.Empty(t, acc.Errors)
diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
index 21205a663..79d18cd66 100644
--- a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
+++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json
@@ -10,7 +10,7 @@
       {
         "topic": "topicA",
         "partition": 0,
-        "owner": "kafka",
+        "owner": "kafka1",
         "status": "OK",
         "start": {
           "offset": 431323195,
@@ -28,7 +28,7 @@
       {
         "topic": "topicA",
         "partition": 1,
-        "owner": "kafka",
+        "owner": "kafka2",
         "status": "OK",
         "start": {
           "offset": 431322962,
@@ -46,7 +46,7 @@
       {
         "topic": "topicA",
         "partition": 2,
-        "owner": "kafka",
+        "owner": "kafka3",
         "status": "OK",
         "start": {
           "offset": 428636563,

From 0dda9b8319050add72ab0b86a93a9c951ebc6583 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 13 Jun 2018 13:50:43 -0700
Subject: [PATCH 1284/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0db003bf2..5c0c77d03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [#4160](https://github.com/influxdata/telegraf/pull/4160): Add tengine input plugin.
 - [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
 - [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
+- [#4281](https://github.com/influxdata/telegraf/pull/4281): Add owner tag on partitions in burrow input.
 
 ## v1.7.1 [unreleased]
 

From 8482c40a911715b9d6e37ba01cd346939acb2933 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Thu, 14 Jun 2018 13:17:32 -0700
Subject: [PATCH 1285/1302] Fix selection of tags under nested objects in the
 JSON parser (#4284)

---
 plugins/parsers/json/parser.go      | 57 ++++++++++++++++++++++-------
 plugins/parsers/json/parser_test.go | 27 ++++++++++++++
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go
index 8a3d15be7..62d17c76a 100644
--- a/plugins/parsers/json/parser.go
+++ b/plugins/parsers/json/parser.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"log"
 	"strconv"
 	"strings"
 	"time"
@@ -44,25 +45,15 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 		tags[k] = v
 	}
 
-	for _, tag := range p.TagKeys {
-		switch v := jsonOut[tag].(type) {
-		case string:
-			tags[tag] = v
-		case bool:
-			tags[tag] = strconv.FormatBool(v)
-		case float64:
-			tags[tag] = strconv.FormatFloat(v, 'f', -1, 64)
-		}
-		delete(jsonOut, tag)
-	}
-
 	f := JSONFlattener{}
-	err := f.FlattenJSON("", jsonOut)
+	err := f.FullFlattenJSON("", jsonOut, true, true)
 	if err != nil {
 		return nil, err
 	}
 
-	metric, err := metric.New(p.MetricName, tags, f.Fields, time.Now().UTC())
+	tags, nFields := p.switchFieldToTag(tags, f.Fields)
+
+	metric, err := metric.New(p.MetricName, tags, nFields, time.Now().UTC())
 
 	if err != nil {
 		return nil, err
@@ -70,6 +61,43 @@ func (p *JSONParser) parseObject(metrics []telegraf.Metric, jsonOut map[string]i
 	return append(metrics, metric), nil
 }
 
+//will take in field map with strings and bools,
+//search for TagKeys that match fieldnames and add them to tags
+//will delete any strings/bools that shouldn't be fields
+//assumes that any non-numeric values in TagKeys should be displayed as tags
+func (p *JSONParser) switchFieldToTag(tags map[string]string, fields map[string]interface{}) (map[string]string, map[string]interface{}) {
+	for _, name := range p.TagKeys {
+		//switch any fields in tagkeys into tags
+		if fields[name] == nil {
+			continue
+		}
+		switch value := fields[name].(type) {
+		case string:
+			tags[name] = value
+			delete(fields, name)
+		case bool:
+			tags[name] = strconv.FormatBool(value)
+			delete(fields, name)
+		case float64:
+			tags[name] = strconv.FormatFloat(value, 'f', -1, 64)
+			delete(fields, name)
+		default:
+			log.Printf("E! [parsers.json] Unrecognized type %T", value)
+		}
+	}
+
+	//remove any additional string/bool values from fields
+	for k := range fields {
+		switch fields[k].(type) {
+		case string:
+			delete(fields, k)
+		case bool:
+			delete(fields, k)
+		}
+	}
+	return tags, fields
+}
+
 func (p *JSONParser) Parse(buf []byte) ([]telegraf.Metric, error) {
 	buf = bytes.TrimSpace(buf)
 	buf = bytes.TrimPrefix(buf, utf8BOM)
@@ -119,6 +147,7 @@ func (f *JSONFlattener) FlattenJSON(
 	if f.Fields == nil {
 		f.Fields = make(map[string]interface{})
 	}
+
 	return f.FullFlattenJSON(fieldname, v, false, false)
 }
 
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
index c4f946364..c26b209a2 100644
--- a/plugins/parsers/json/parser_test.go
+++ b/plugins/parsers/json/parser_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -440,3 +441,29 @@ func TestHttpJsonBOM(t *testing.T) {
 	_, err := parser.Parse(jsonBOM)
 	assert.NoError(t, err)
 }
+
+//for testing issue #4260
+func TestJSONParseNestedArray(t *testing.T) {
+	testString := `{
+	"total_devices": 5,
+	"total_threads": 10,
+	"shares": {
+	"total": 5,
+	"accepted": 5,
+	"rejected": 0,
+	"avg_find_time": 4,
+	"tester": "work",
+	"tester2": "don't want this",
+	"tester3": 7.93
+	}
+	}`
+
+	parser := JSONParser{
+		MetricName: "json_test",
+		TagKeys:    []string{"total_devices", "total_threads", "shares_tester", "shares_tester3"},
+	}
+
+	metrics, err := parser.Parse([]byte(testString))
+	require.NoError(t, err)
+	require.Equal(t, len(parser.TagKeys), len(metrics[0].Tags()))
+}

From 7781507c01dcb7fe2dd2ed14d58235d3b219afba Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 14 Jun 2018 13:18:31 -0700
Subject: [PATCH 1286/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0c77d03..6457c6d7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 ### Bugfixes
 
 - [#4277](https://github.com/influxdata/telegraf/pull/4277): Treat sigterm as a clean shutdown signal.
+- [#4284](https://github.com/influxdata/telegraf/pull/4284): Fix selection of tags under nested objects in the JSON parser.
 
 ## v1.7 [2018-06-12]
 

From 4e9e57e21011aa29e3c130a819d79c9c6b751e2a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Sun, 17 Jun 2018 18:50:14 -0700
Subject: [PATCH 1287/1302] Drop CI support for Go 1.8 (#4309)

Go 1.8 is no longer a supported version and the circleci/golang images
has been removed.
---
 .circleci/config.yml | 21 ++-------------------
 README.md            |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b016deae3..d53a0ec03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,15 +2,12 @@
 defaults:
   defaults: &defaults
     working_directory: '/go/src/github.com/influxdata/telegraf'
-  go-1_8: &go-1_8
-    docker:
-      - image: 'circleci/golang:1.8.7'
   go-1_9: &go-1_9
     docker:
-      - image: 'circleci/golang:1.9.5'
+      - image: 'circleci/golang:1.9.7'
   go-1_10: &go-1_10
     docker:
-      - image: 'circleci/golang:1.10.1'
+      - image: 'circleci/golang:1.10.3'
 
 version: 2
 jobs:
@@ -23,12 +20,6 @@ jobs:
           root: '/go/src'
           paths:
             - '*'
-  test-go-1.8:
-    <<: [ *defaults, *go-1_8 ]
-    steps:
-      - attach_workspace:
-          at: '/go/src'
-      - run: 'make test-ci'
   test-go-1.9:
     <<: [ *defaults, *go-1_9 ]
     steps:
@@ -66,9 +57,6 @@ workflows:
   build_and_release:
     jobs:
       - 'deps'
-      - 'test-go-1.8':
-          requires:
-            - 'deps'
       - 'test-go-1.9':
           requires:
             - 'deps'
@@ -77,15 +65,11 @@ workflows:
             - 'deps'
       - 'release':
           requires:
-            - 'test-go-1.8'
             - 'test-go-1.9'
             - 'test-go-1.10'
   nightly:
     jobs:
       - 'deps'
-      - 'test-go-1.8':
-          requires:
-            - 'deps'
       - 'test-go-1.9':
           requires:
             - 'deps'
@@ -94,7 +78,6 @@ workflows:
             - 'deps'
       - 'nightly':
           requires:
-            - 'test-go-1.8'
             - 'test-go-1.9'
             - 'test-go-1.10'
     triggers:
diff --git a/README.md b/README.md
index aa415d1d2..e5a6634d5 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 ### From Source:
 
-Telegraf requires golang version 1.8+, the Makefile requires GNU make.
+Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.
 
 Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
 which is installed by the Makefile if you don't have it already.

From 98d86df7975bc214f4a05f4796f087dd1defbf4e Mon Sep 17 00:00:00 2001
From: prashanthjbabu <prashanthjbabu@gmail.com>
Date: Tue, 19 Jun 2018 04:03:14 +0530
Subject: [PATCH 1288/1302] Add container status tag to docker input (#4259)

---
 plugins/inputs/docker/docker.go          | 17 +++++++++++++++++
 plugins/inputs/docker/docker_test.go     |  2 ++
 plugins/inputs/docker/docker_testdata.go |  6 ++++++
 3 files changed, 25 insertions(+)

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
index a59b9f7fa..aa1de7479 100644
--- a/plugins/inputs/docker/docker.go
+++ b/plugins/inputs/docker/docker.go
@@ -435,6 +435,23 @@ func (d *Docker) gatherContainer(
 			}
 		}
 	}
+	if info.State != nil {
+		tags["container_status"] = info.State.Status
+		statefields := map[string]interface{}{
+			"oomkilled": info.State.OOMKilled,
+			"pid":       info.State.Pid,
+			"exitcode":  info.State.ExitCode,
+		}
+		container_time, err := time.Parse(time.RFC3339, info.State.StartedAt)
+		if err == nil && !container_time.IsZero() {
+			statefields["started_at"] = container_time.UnixNano()
+		}
+		container_time, err = time.Parse(time.RFC3339, info.State.FinishedAt)
+		if err == nil && !container_time.IsZero() {
+			statefields["finished_at"] = container_time.UnixNano()
+		}
+		acc.AddFields("docker_container_status", statefields, tags, time.Now())
+	}
 
 	if info.State.Health != nil {
 		healthfields := map[string]interface{}{
diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go
index 4b9d00c80..d51c61c00 100644
--- a/plugins/inputs/docker/docker_test.go
+++ b/plugins/inputs/docker/docker_test.go
@@ -653,6 +653,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 			"server_version":    "17.09.0-ce",
+			"container_status":  "running",
 		},
 	)
 	acc.AssertContainsTaggedFields(t,
@@ -676,6 +677,7 @@ func TestDockerGatherInfo(t *testing.T) {
 			"label1":            "test_value_1",
 			"label2":            "test_value_2",
 			"server_version":    "17.09.0-ce",
+			"container_status":  "running",
 		},
 	)
 }
diff --git a/plugins/inputs/docker/docker_testdata.go b/plugins/inputs/docker/docker_testdata.go
index 42a0b888f..1168048a2 100644
--- a/plugins/inputs/docker/docker_testdata.go
+++ b/plugins/inputs/docker/docker_testdata.go
@@ -484,6 +484,12 @@ var containerInspect = types.ContainerJSON{
 				FailingStreak: 1,
 				Status:        "Unhealthy",
 			},
+			Status:     "running",
+			OOMKilled:  false,
+			Pid:        1234,
+			ExitCode:   0,
+			StartedAt:  "2018-06-14T05:48:53.266176036Z",
+			FinishedAt: "0001-01-01T00:00:00Z",
 		},
 	},
 }

From c98b58dacc9748740b6dfaa0d56c958ef5985cf2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Jun 2018 15:38:21 -0700
Subject: [PATCH 1289/1302] Update docker input documentation for container
 status

---
 plugins/inputs/docker/README.md | 34 ++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
index 87b5e65d1..a95fb61e9 100644
--- a/plugins/inputs/docker/README.md
+++ b/plugins/inputs/docker/README.md
@@ -124,6 +124,7 @@ docker API.
     - server_version
     - container_image
     - container_name
+    - container_status
     - container_version
   - fields:
     - total_pgmafault
@@ -167,6 +168,7 @@ docker API.
     - server_version
     - container_image
     - container_name
+    - container_status
     - container_version
     - cpu
   - fields:
@@ -186,6 +188,7 @@ docker API.
     - server_version
     - container_image
     - container_name
+    - container_status
     - container_version
     - network
   - fields:
@@ -205,6 +208,7 @@ docker API.
     - server_version
     - container_image
     - container_name
+    - container_status
     - container_version
     - device
   - fields:
@@ -226,11 +230,27 @@ docker API.
     - server_version
     - container_image
     - container_name
+    - container_status
     - container_version
   - fields:
   	- health_status (string)
   	- failing_streak (integer)
 
+- docker_container_status
+  - tags:
+    - engine_host
+    - server_version
+    - container_image
+    - container_name
+    - container_status
+    - container_version
+  - fields:
+    - oomkilled (boolean)
+    - pid (integer)
+    - exitcode (integer)
+    - started_at (integer)
+    - finished_at (integer)
+
 - docker_swarm
   - tags:
     - service_id
@@ -245,12 +265,12 @@ docker API.
 ```
 docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce n_containers=6i,n_containers_paused=0i,n_containers_running=1i,n_containers_stopped=5i,n_cpus=2i,n_goroutines=41i,n_images=2i,n_listener_events=0i,n_used_file_descriptors=27i 1524002041000000000
 docker,engine_host=debian-stretch-docker,server_version=17.09.0-ce,unit=bytes memory_total=2101661696i 1524002041000000000
-docker_container_mem,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce active_anon=8327168i,active_file=2314240i,cache=27402240i,container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",hierarchical_memory_limit=9223372036854771712i,inactive_anon=0i,inactive_file=25088000i,limit=2101661696i,mapped_file=20582400i,max_usage=36646912i,pgfault=4193i,pgmajfault=214i,pgpgin=9243i,pgpgout=520i,rss=8327168i,rss_huge=0i,total_active_anon=8327168i,total_active_file=2314240i,total_cache=27402240i,total_inactive_anon=0i,total_inactive_file=25088000i,total_mapped_file=20582400i,total_pgfault=4193i,total_pgmajfault=214i,total_pgpgin=9243i,total_pgpgout=520i,total_rss=8327168i,total_rss_huge=0i,total_unevictable=0i,total_writeback=0i,unevictable=0i,usage=36528128i,usage_percent=0.4342225020025297,writeback=0i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu-total,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",throttling_periods=0i,throttling_throttled_periods=0i,throttling_throttled_time=0i,usage_in_kernelmode=40000000i,usage_in_usermode=100000000i,usage_percent=0,usage_system=6394210000000i,usage_total=117319068i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=20825265i 1524002042000000000
-docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,cpu=cpu1,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=96493803i 1524002042000000000
-docker_container_net,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,network=eth0,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",rx_bytes=1576i,rx_dropped=0i,rx_errors=0i,rx_packets=20i,tx_bytes=0i,tx_dropped=0i,tx_errors=0i,tx_packets=0i 1524002042000000000
-docker_container_blkio,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,device=254:0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",io_service_bytes_recursive_async=27398144i,io_service_bytes_recursive_read=27398144i,io_service_bytes_recursive_sync=0i,io_service_bytes_recursive_total=27398144i,io_service_bytes_recursive_write=0i,io_serviced_recursive_async=529i,io_serviced_recursive_read=529i,io_serviced_recursive_sync=0i,io_serviced_recursive_total=529i,io_serviced_recursive_write=0i 1524002042000000000
-docker_container_health,container_image=telegraf,container_name=zen_ritchie,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce failing_streak=0i,health_status="healthy" 1524007529000000000
+docker_container_mem,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce active_anon=8327168i,active_file=2314240i,cache=27402240i,container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",hierarchical_memory_limit=9223372036854771712i,inactive_anon=0i,inactive_file=25088000i,limit=2101661696i,mapped_file=20582400i,max_usage=36646912i,pgfault=4193i,pgmajfault=214i,pgpgin=9243i,pgpgout=520i,rss=8327168i,rss_huge=0i,total_active_anon=8327168i,total_active_file=2314240i,total_cache=27402240i,total_inactive_anon=0i,total_inactive_file=25088000i,total_mapped_file=20582400i,total_pgfault=4193i,total_pgmajfault=214i,total_pgpgin=9243i,total_pgpgout=520i,total_rss=8327168i,total_rss_huge=0i,total_unevictable=0i,total_writeback=0i,unevictable=0i,usage=36528128i,usage_percent=0.4342225020025297,writeback=0i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu-total,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",throttling_periods=0i,throttling_throttled_periods=0i,throttling_throttled_time=0i,usage_in_kernelmode=40000000i,usage_in_usermode=100000000i,usage_percent=0,usage_system=6394210000000i,usage_total=117319068i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=20825265i 1524002042000000000
+docker_container_cpu,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,cpu=cpu1,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",usage_total=96493803i 1524002042000000000
+docker_container_net,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,network=eth0,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",rx_bytes=1576i,rx_dropped=0i,rx_errors=0i,rx_packets=20i,tx_bytes=0i,tx_dropped=0i,tx_errors=0i,tx_packets=0i 1524002042000000000
+docker_container_blkio,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,device=254:0,engine_host=debian-stretch-docker,server_version=17.09.0-ce container_id="adc4ba9593871bf2ab95f3ffde70d1b638b897bb225d21c2c9c84226a10a8cf4",io_service_bytes_recursive_async=27398144i,io_service_bytes_recursive_read=27398144i,io_service_bytes_recursive_sync=0i,io_service_bytes_recursive_total=27398144i,io_service_bytes_recursive_write=0i,io_serviced_recursive_async=529i,io_serviced_recursive_read=529i,io_serviced_recursive_sync=0i,io_serviced_recursive_total=529i,io_serviced_recursive_write=0i 1524002042000000000
+docker_container_health,container_image=telegraf,container_name=zen_ritchie,container_status=running,container_version=unknown,engine_host=debian-stretch-docker,server_version=17.09.0-ce failing_streak=0i,health_status="healthy" 1524007529000000000
 docker_swarm,service_id=xaup2o9krw36j2dy1mjx1arjw,service_mode=replicated,service_name=test tasks_desired=3,tasks_running=3 1508968160000000000
 ```

From 84e9a5c97e8b304121f52051ab5387ba54130786 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Jun 2018 15:40:00 -0700
Subject: [PATCH 1290/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6457c6d7d..9332d0927 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#4262](https://github.com/influxdata/telegraf/pull/4262): Add power draw field to nvidia_smi plugin.
 - [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
 - [#4281](https://github.com/influxdata/telegraf/pull/4281): Add owner tag on partitions in burrow input.
+- [#4259](https://github.com/influxdata/telegraf/pull/4259): Add container status tag to docker input.
 
 ## v1.7.1 [unreleased]
 

From 3ad10283efaa0601daf32c09a7e4c689337a1347 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Tue, 19 Jun 2018 03:06:11 +0200
Subject: [PATCH 1291/1302] Add valuecounter aggregator plugin (#3523)

---
 README.md                                     |   1 +
 plugins/aggregators/all/all.go                |   1 +
 plugins/aggregators/valuecounter/README.md    |  73 ++++++++++
 .../aggregators/valuecounter/valuecounter.go  | 108 +++++++++++++++
 .../valuecounter/valuecounter_test.go         | 126 ++++++++++++++++++
 5 files changed, 309 insertions(+)
 create mode 100644 plugins/aggregators/valuecounter/README.md
 create mode 100644 plugins/aggregators/valuecounter/valuecounter.go
 create mode 100644 plugins/aggregators/valuecounter/valuecounter_test.go

diff --git a/README.md b/README.md
index e5a6634d5..06dd74d94 100644
--- a/README.md
+++ b/README.md
@@ -282,6 +282,7 @@ formats may be used with input plugins supporting the `data_format` option:
 * [basicstats](./plugins/aggregators/basicstats)
 * [minmax](./plugins/aggregators/minmax)
 * [histogram](./plugins/aggregators/histogram)
+* [valuecounter](./plugins/aggregators/valuecounter)
 
 ## Output Plugins
 
diff --git a/plugins/aggregators/all/all.go b/plugins/aggregators/all/all.go
index 98aecb83f..ff1bbfc70 100644
--- a/plugins/aggregators/all/all.go
+++ b/plugins/aggregators/all/all.go
@@ -4,4 +4,5 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/aggregators/basicstats"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/histogram"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/minmax"
+	_ "github.com/influxdata/telegraf/plugins/aggregators/valuecounter"
 )
diff --git a/plugins/aggregators/valuecounter/README.md b/plugins/aggregators/valuecounter/README.md
new file mode 100644
index 000000000..3d132c3bb
--- /dev/null
+++ b/plugins/aggregators/valuecounter/README.md
@@ -0,0 +1,73 @@
+# ValueCounter Aggregator Plugin
+
+The valuecounter plugin counts the occurrence of values in fields and emits the
+counter once every 'period' seconds.
+
+A use case for the valuecounter plugin is when you are processing a HTTP access
+log (with the logparser input) and want to count the HTTP status codes.
+
+The fields which will be counted must be configured with the `fields`
+configuration directive. When no `fields` is provided the plugin will not count
+any fields. The results are emitted in fields in the format:
+`originalfieldname_fieldvalue = count`.
+
+Valuecounter only works on fields of the type int, bool or string. Float fields
+are being dropped to prevent the creating of too many fields.
+
+### Configuration:
+
+```toml
+[[aggregators.valuecounter]]
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+  ## The fields for which the values will be counted
+  fields = ["status"]
+```
+
+### Measurements & Fields:
+
+- measurement1
+    - field_value1
+    - field_value2
+
+### Tags:
+
+No tags are applied by this aggregator.
+
+### Example Output:
+
+Example for parsing a HTTP access log.
+
+telegraf.conf:
+```
+[[inputs.logparser]]
+  files = ["/tmp/tst.log"]
+  [inputs.logparser.grok]
+    patterns = ['%{DATA:url:tag} %{NUMBER:response:string}']
+    measurement = "access"
+
+[[aggregators.valuecounter]]
+  namepass = ["access"]
+  fields = ["response"]
+```
+
+/tmp/tst.log
+```
+/some/path 200
+/some/path 401
+/some/path 200
+```
+
+```
+$ telegraf --config telegraf.conf --quiet
+
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="200" 1511948755991487011
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="401" 1511948755991522282
+access,url=/some/path,path=/tmp/tst.log,host=localhost.localdomain response="200" 1511948755991531697
+
+access,path=/tmp/tst.log,host=localhost.localdomain,url=/some/path response_200=2i,response_401=1i 1511948761000000000
+```
diff --git a/plugins/aggregators/valuecounter/valuecounter.go b/plugins/aggregators/valuecounter/valuecounter.go
new file mode 100644
index 000000000..c43b7723b
--- /dev/null
+++ b/plugins/aggregators/valuecounter/valuecounter.go
@@ -0,0 +1,108 @@
+package valuecounter
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins/aggregators"
+)
+
+type aggregate struct {
+	name       string
+	tags       map[string]string
+	fieldCount map[string]int
+}
+
+// ValueCounter an aggregation plugin
+type ValueCounter struct {
+	cache  map[uint64]aggregate
+	Fields []string
+}
+
+// NewValueCounter create a new aggregation plugin which counts the occurances
+// of fields and emits the count.
+func NewValueCounter() telegraf.Aggregator {
+	vc := &ValueCounter{}
+	vc.Reset()
+	return vc
+}
+
+var sampleConfig = `
+  ## General Aggregator Arguments:
+  ## The period on which to flush & clear the aggregator.
+  period = "30s"
+  ## If true, the original metric will be dropped by the
+  ## aggregator and will not get sent to the output plugins.
+  drop_original = false
+  ## The fields for which the values will be counted
+  fields = []
+`
+
+// SampleConfig generates a sample config for the ValueCounter plugin
+func (vc *ValueCounter) SampleConfig() string {
+	return sampleConfig
+}
+
+// Description returns the description of the ValueCounter plugin
+func (vc *ValueCounter) Description() string {
+	return "Count the occurance of values in fields."
+}
+
+// Add is run on every metric which passes the plugin
+func (vc *ValueCounter) Add(in telegraf.Metric) {
+	id := in.HashID()
+
+	// Check if the cache already has an entry for this metric, if not create it
+	if _, ok := vc.cache[id]; !ok {
+		a := aggregate{
+			name:       in.Name(),
+			tags:       in.Tags(),
+			fieldCount: make(map[string]int),
+		}
+		vc.cache[id] = a
+	}
+
+	// Check if this metric has fields which we need to count, if so increment
+	// the count.
+	for fk, fv := range in.Fields() {
+		for _, cf := range vc.Fields {
+			if fk == cf {
+				// Do not process float types to prevent memory from blowing up
+				switch fv.(type) {
+				default:
+					log.Printf("I! Valuecounter: Unsupported field type. " +
+						"Must be an int, string or bool. Ignoring.")
+					continue
+				case uint64, int64, string, bool:
+				}
+				fn := fmt.Sprintf("%v_%v", fk, fv)
+				vc.cache[id].fieldCount[fn]++
+			}
+		}
+	}
+}
+
+// Push emits the counters
+func (vc *ValueCounter) Push(acc telegraf.Accumulator) {
+	for _, agg := range vc.cache {
+		fields := map[string]interface{}{}
+
+		for field, count := range agg.fieldCount {
+			fields[field] = count
+		}
+
+		acc.AddFields(agg.name, fields, agg.tags)
+	}
+}
+
+// Reset the cache, executed after each push
+func (vc *ValueCounter) Reset() {
+	vc.cache = make(map[uint64]aggregate)
+}
+
+func init() {
+	aggregators.Add("valuecounter", func() telegraf.Aggregator {
+		return NewValueCounter()
+	})
+}
diff --git a/plugins/aggregators/valuecounter/valuecounter_test.go b/plugins/aggregators/valuecounter/valuecounter_test.go
new file mode 100644
index 000000000..01c68c496
--- /dev/null
+++ b/plugins/aggregators/valuecounter/valuecounter_test.go
@@ -0,0 +1,126 @@
+package valuecounter
+
+import (
+	"testing"
+	"time"
+
+	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/testutil"
+)
+
+// Create a valuecounter with config
+func NewTestValueCounter(fields []string) telegraf.Aggregator {
+	vc := &ValueCounter{
+		Fields: fields,
+	}
+	vc.Reset()
+
+	return vc
+}
+
+var m1, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"status":    200,
+		"somefield": 20.1,
+		"foobar":    "bar",
+	},
+	time.Now(),
+)
+
+var m2, _ = metric.New("m1",
+	map[string]string{"foo": "bar"},
+	map[string]interface{}{
+		"status":    "OK",
+		"ignoreme":  "string",
+		"andme":     true,
+		"boolfield": false,
+	},
+	time.Now(),
+)
+
+func BenchmarkApply(b *testing.B) {
+	vc := NewTestValueCounter([]string{"status"})
+
+	for n := 0; n < b.N; n++ {
+		vc.Add(m1)
+		vc.Add(m2)
+	}
+}
+
+// Test basic functionality
+func TestBasic(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200": 2,
+		"status_OK":  1,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test with multiple fields to count
+func TestMultipleFields(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status", "somefield", "boolfield"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200":      2,
+		"status_OK":       2,
+		"boolfield_false": 2,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}
+
+// Test with a reset between two runs
+func TestWithReset(t *testing.T) {
+	vc := NewTestValueCounter([]string{"status"})
+	acc := testutil.Accumulator{}
+
+	vc.Add(m1)
+	vc.Add(m1)
+	vc.Add(m2)
+	vc.Push(&acc)
+
+	expectedFields := map[string]interface{}{
+		"status_200": 2,
+		"status_OK":  1,
+	}
+	expectedTags := map[string]string{
+		"foo": "bar",
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+
+	acc.ClearMetrics()
+	vc.Reset()
+
+	vc.Add(m2)
+	vc.Add(m2)
+	vc.Add(m1)
+	vc.Push(&acc)
+
+	expectedFields = map[string]interface{}{
+		"status_200": 1,
+		"status_OK":  2,
+	}
+	acc.AssertContainsTaggedFields(t, "m1", expectedFields, expectedTags)
+}

From b66eb2fec73a3ef57a9cc6fdc0171e95342359a2 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 18 Jun 2018 18:09:31 -0700
Subject: [PATCH 1292/1302] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9332d0927..e3398cacd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 
+### New Aggregators
+
+- [valuecounter](./plugins/aggregators/valuecounter/README.md) - Contributed by @piotr1212
+
 ### Features
 
 - [#4236](https://github.com/influxdata/telegraf/pull/4236): Add SSL/TLS support to redis input.
@@ -14,6 +18,7 @@
 - [#4271](https://github.com/influxdata/telegraf/pull/4271): Add support for solr 7 to the solr input.
 - [#4281](https://github.com/influxdata/telegraf/pull/4281): Add owner tag on partitions in burrow input.
 - [#4259](https://github.com/influxdata/telegraf/pull/4259): Add container status tag to docker input.
+- [#3523](https://github.com/influxdata/telegraf/pull/3523): Add valuecounter aggregator plugin.
 
 ## v1.7.1 [unreleased]
 

From 39206677f8e2248bf553a4d1079e51d958d266b8 Mon Sep 17 00:00:00 2001
From: maxunt <max.untrecht@gmail.com>
Date: Tue, 19 Jun 2018 11:47:13 -0700
Subject: [PATCH 1293/1302] Add new measurement with results of pgrep lookup to
 procstat input (#4307)

---
 internal/internal.go                     | 13 +++++++++++++
 plugins/inputs/procstat/pgrep.go         |  8 ++++++++
 plugins/inputs/procstat/procstat.go      | 23 +++++++++++++++++------
 plugins/inputs/procstat/procstat_test.go | 17 +++++++++++++++--
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/internal/internal.go b/internal/internal.go
index d86b32d26..adc4df820 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 	"unicode"
 )
@@ -193,3 +194,15 @@ func RandomSleep(max time.Duration, shutdown chan struct{}) {
 		return
 	}
 }
+
+// Exit status takes the error from exec.Command
+// and returns the exit status and true
+// if error is not exit status, will return 0 and false
+func ExitStatus(err error) (int, bool) {
+	if exiterr, ok := err.(*exec.ExitError); ok {
+		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+			return status.ExitStatus(), true
+		}
+	}
+	return 0, false
+}
diff --git a/plugins/inputs/procstat/pgrep.go b/plugins/inputs/procstat/pgrep.go
index cf0754e6d..703febaa9 100644
--- a/plugins/inputs/procstat/pgrep.go
+++ b/plugins/inputs/procstat/pgrep.go
@@ -6,6 +6,8 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+
+	"github.com/influxdata/telegraf/internal"
 )
 
 // Implemention of PIDGatherer that execs pgrep to find processes
@@ -62,6 +64,12 @@ func find(path string, args []string) ([]PID, error) {
 
 func run(path string, args []string) (string, error) {
 	out, err := exec.Command(path, args...).Output()
+
+	//if exit code 1, ie no processes found, do not return error
+	if i, _ := internal.ExitStatus(err); i == 1 {
+		return "", nil
+	}
+
 	if err != nil {
 		return "", fmt.Errorf("Error running %s: %s", path, err)
 	}
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 51f71f6a1..01505bdd0 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -97,7 +97,7 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
 		p.createProcess = defaultProcess
 	}
 
-	procs, err := p.updateProcesses(p.procs)
+	procs, err := p.updateProcesses(acc, p.procs)
 	if err != nil {
 		acc.AddError(fmt.Errorf("E! Error: procstat getting process, exe: [%s] pidfile: [%s] pattern: [%s] user: [%s] %s",
 			p.Exe, p.PidFile, p.Pattern, p.User, err.Error()))
@@ -230,8 +230,8 @@ func (p *Procstat) addMetrics(proc Process, acc telegraf.Accumulator) {
 }
 
 // Update monitored Processes
-func (p *Procstat) updateProcesses(prevInfo map[PID]Process) (map[PID]Process, error) {
-	pids, tags, err := p.findPids()
+func (p *Procstat) updateProcesses(acc telegraf.Accumulator, prevInfo map[PID]Process) (map[PID]Process, error) {
+	pids, tags, err := p.findPids(acc)
 	if err != nil {
 		return nil, err
 	}
@@ -281,9 +281,9 @@ func (p *Procstat) getPIDFinder() (PIDFinder, error) {
 }
 
 // Get matching PIDs and their initial tags
-func (p *Procstat) findPids() ([]PID, map[string]string, error) {
+func (p *Procstat) findPids(acc telegraf.Accumulator) ([]PID, map[string]string, error) {
 	var pids []PID
-	var tags map[string]string
+	tags := make(map[string]string)
 	var err error
 
 	f, err := p.getPIDFinder()
@@ -313,7 +313,18 @@ func (p *Procstat) findPids() ([]PID, map[string]string, error) {
 		err = fmt.Errorf("Either exe, pid_file, user, pattern, systemd_unit, or cgroup must be specified")
 	}
 
-	return pids, tags, err
+	rTags := make(map[string]string)
+	for k, v := range tags {
+		rTags[k] = v
+	}
+
+	//adds a metric with info on the pgrep query
+	fields := make(map[string]interface{})
+	tags["pid_finder"] = p.PidFinder
+	fields["pid_count"] = len(pids)
+	acc.AddFields("procstat_lookup", fields, tags)
+
+	return pids, rTags, err
 }
 
 // execCommand is so tests can mock out exec.Command usage.
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index d77391fc2..ff4b70060 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -343,7 +343,8 @@ func TestGather_systemdUnitPIDs(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{}, nil),
 		SystemdUnit:     "TestGather_systemdUnitPIDs",
 	}
-	pids, tags, err := p.findPids()
+	var acc testutil.Accumulator
+	pids, tags, err := p.findPids(&acc)
 	require.NoError(t, err)
 	assert.Equal(t, []PID{11408}, pids)
 	assert.Equal(t, "TestGather_systemdUnitPIDs", tags["systemd_unit"])
@@ -364,8 +365,20 @@ func TestGather_cgroupPIDs(t *testing.T) {
 		createPIDFinder: pidFinder([]PID{}, nil),
 		CGroup:          td,
 	}
-	pids, tags, err := p.findPids()
+	var acc testutil.Accumulator
+	pids, tags, err := p.findPids(&acc)
 	require.NoError(t, err)
 	assert.Equal(t, []PID{1234, 5678}, pids)
 	assert.Equal(t, td, tags["cgroup"])
 }
+
+func TestProcstatLookupMetric(t *testing.T) {
+	p := Procstat{
+		createPIDFinder: pidFinder([]PID{543}, nil),
+		Exe:             "-Gsys",
+	}
+	var acc testutil.Accumulator
+	err := acc.GatherError(p.Gather)
+	require.NoError(t, err)
+	require.Equal(t, len(p.procs)+1, len(acc.Metrics))
+}

From d7c756e9ff50db7ce28ab5388b8e4ab0786f4bdf Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 19 Jun 2018 11:48:08 -0700
Subject: [PATCH 1294/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3398cacd..bfb65f362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [#4281](https://github.com/influxdata/telegraf/pull/4281): Add owner tag on partitions in burrow input.
 - [#4259](https://github.com/influxdata/telegraf/pull/4259): Add container status tag to docker input.
 - [#3523](https://github.com/influxdata/telegraf/pull/3523): Add valuecounter aggregator plugin.
+- [#4307](https://github.com/influxdata/telegraf/pull/4307): Add new measurement with results of pgrep lookup to procstat input.
 
 ## v1.7.1 [unreleased]
 

From 1bd41ef3ced45cb2e688797476cb0b892b10c005 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Tue, 19 Jun 2018 12:55:38 -0600
Subject: [PATCH 1295/1302] Update vendoring to dep from gdm (#4314)

---
 .circleci/config.yml                          |   7 +
 .gitignore                                    |   1 +
 CONTRIBUTING.md                               |   6 +-
 Godeps                                        | 100 --
 Gopkg.lock                                    | 973 ++++++++++++++++++
 Gopkg.toml                                    | 243 +++++
 Makefile                                      |   4 +-
 README.md                                     |   2 +-
 appveyor.yml                                  |   1 +
 plugins/inputs/mysql/mysql_test.go            |   2 +-
 .../cmd/thrift_serialize/thrift_serialize.go  |   2 +-
 plugins/inputs/zipkin/codec/codec.go          |   2 +-
 plugins/inputs/zipkin/codec/jsonV1/jsonV1.go  |   2 +-
 plugins/inputs/zipkin/codec/thrift/thrift.go  |   2 +-
 .../inputs/zipkin/codec/thrift/thrift_test.go |   2 +-
 plugins/outputs/kinesis/kinesis_test.go       |   5 +-
 plugins/outputs/mqtt/mqtt.go                  |   2 +-
 scripts/build.py                              |  10 +-
 18 files changed, 1245 insertions(+), 121 deletions(-)
 delete mode 100644 Godeps
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d53a0ec03..122f28af0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,14 @@ jobs:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - checkout
+      - restore_cache:
+          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
       - run: 'make deps'
+      - save_cache:
+          name: 'vendored deps'
+          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          paths:
+            - './vendor'
       - persist_to_workspace:
           root: '/go/src'
           paths:
diff --git a/.gitignore b/.gitignore
index c584e6c14..4176a0413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /telegraf
 /telegraf.exe
 /telegraf.gz
+/vendor
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ded08cb54..cef8fa511 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,9 +30,9 @@ which can be found [on our website](http://influxdb.com/community/cla.html)
 
 Assuming you can already build the project, run these in the telegraf directory:
 
-1. `go get github.com/sparrc/gdm`
-1. `gdm restore`
-1. `GOOS=linux gdm save`
+1. `go get -u github.com/golang/dep/cmd/dep`
+2. `dep ensure`
+3. `dep ensure -add github.com/[dependency]/[new-package]`
 
 ## Input Plugins
 
diff --git a/Godeps b/Godeps
deleted file mode 100644
index cc80cb3b5..000000000
--- a/Godeps
+++ /dev/null
@@ -1,100 +0,0 @@
-code.cloudfoundry.org/clock e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
-collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
-github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c
-github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07
-github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/bsm/sarama-cluster abf039439f66c1ce78017f560b490612552f6472
-github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
-github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
-github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6
-github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/dgrijalva/jwt-go dbeaa9332f19a944acb5736b4456cfcc02140e29
-github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27
-github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c
-github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98
-github.com/eclipse/paho.mqtt.golang aff15770515e3c57fc6109da73d42b0d46f7f483
-github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
-github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a
-github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438
-github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
-github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
-github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7
-github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
-github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc
-github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996
-github.com/go-redis/redis 83fb42932f6145ce52df09860384a4653d2d332a
-github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034
-github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
-github.com/hashicorp/consul 5174058f0d2bda63fa5198ab96c33d9a909c58ed
-github.com/influxdata/go-syslog eecd51df3ad85464a2bab9b7d3a45bc1e299059e
-github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc
-github.com/influxdata/toml 2a2e3012f7cfbef64091cc79776311e65dfa211b
-github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
-github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413
-github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
-github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142
-github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
-github.com/Microsoft/ApplicationInsights-Go 3612f58550c1de70f1a110c78c830e55f29aa65d
-github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
-github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1
-github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
-github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e
-github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-github.com/nats-io/gnatsd 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
-github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898
-github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f
-github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f
-github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
-github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827
-github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
-github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df
-github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa
-github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d
-github.com/pmezard/go-difflib/difflib 792786c7400a136282c1664665ae0a8db921c6c2
-github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a
-github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4
-github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160
-github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693
-github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-github.com/shirou/gopsutil c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3
-github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
-github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65
-github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-github.com/soniah/gosnmp f15472a4cd6f6ea7929e4c7d9f163c49f059924f
-github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6
-github.com/stretchr/objx facf9a85c22f48d2f52f2380e4efce1768749a89
-github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71
-github.com/tidwall/gjson 0623bd8fbdbf97cc62b98d15108832851a658e59
-github.com/tidwall/match 173748da739a410c5b0b813b956f89ff94730b4c
-github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
-github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096
-github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a
-github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363
-golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-golang.org/x/net a337091b0525af65de94df2eb7e98bd9962dcbe2
-golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f
-golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3
-google.golang.org/genproto 11c7f9e547da6db876260ce49ea7536985904c9b
-google.golang.org/grpc de2209a968d48e8970546c8a710189f7461370f7
-gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d
-gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc
-gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659
-gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f
-gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655
-gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
-gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
-gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 000000000..194bb61e6
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,973 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "code.cloudfoundry.org/clock"
+  packages = ["."]
+  revision = "02e53af36e6c978af692887ed449b74026d76fec"
+
+[[projects]]
+  name = "collectd.org"
+  packages = [
+    "api",
+    "cdtime",
+    "network"
+  ]
+  revision = "2ce144541b8903101fb8f1483cc0497a68798122"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/Microsoft/ApplicationInsights-Go"
+  packages = [
+    "appinsights",
+    "appinsights/contracts"
+  ]
+  revision = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"
+  version = "v0.4.2"
+
+[[projects]]
+  name = "github.com/Microsoft/go-winio"
+  packages = ["."]
+  revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
+  version = "v0.4.7"
+
+[[projects]]
+  name = "github.com/Shopify/sarama"
+  packages = ["."]
+  revision = "35324cf48e33d8260e1c7c18854465a904ade249"
+  version = "v1.17.0"
+
+[[projects]]
+  name = "github.com/StackExchange/wmi"
+  packages = ["."]
+  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
+  version = "1.0.0"
+
+[[projects]]
+  name = "github.com/aerospike/aerospike-client-go"
+  packages = [
+    ".",
+    "internal/lua",
+    "internal/lua/resources",
+    "logger",
+    "pkg/bcrypt",
+    "pkg/ripemd160",
+    "types",
+    "types/atomic",
+    "types/particle_type",
+    "types/rand",
+    "utils/buffer"
+  ]
+  revision = "c10b5393e43bd60125aca6289c7b24879edb1787"
+  version = "v1.33.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/template"
+  packages = [
+    ".",
+    "parse"
+  ]
+  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/amir/raidman"
+  packages = [
+    ".",
+    "proto"
+  ]
+  revision = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/apache/thrift"
+  packages = ["lib/go/thrift"]
+  revision = "f5f430df56871bc937950274b2c86681d3db6e59"
+
+[[projects]]
+  name = "github.com/aws/aws-sdk-go"
+  packages = [
+    "aws",
+    "aws/awserr",
+    "aws/awsutil",
+    "aws/client",
+    "aws/client/metadata",
+    "aws/corehandlers",
+    "aws/credentials",
+    "aws/credentials/ec2rolecreds",
+    "aws/credentials/endpointcreds",
+    "aws/credentials/stscreds",
+    "aws/csm",
+    "aws/defaults",
+    "aws/ec2metadata",
+    "aws/endpoints",
+    "aws/request",
+    "aws/session",
+    "aws/signer/v4",
+    "internal/sdkio",
+    "internal/sdkrand",
+    "internal/shareddefaults",
+    "private/protocol",
+    "private/protocol/json/jsonutil",
+    "private/protocol/jsonrpc",
+    "private/protocol/query",
+    "private/protocol/query/queryutil",
+    "private/protocol/rest",
+    "private/protocol/xml/xmlutil",
+    "service/cloudwatch",
+    "service/kinesis",
+    "service/sts"
+  ]
+  revision = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"
+  version = "v1.14.8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/beorn7/perks"
+  packages = ["quantile"]
+  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
+
+[[projects]]
+  name = "github.com/bsm/sarama-cluster"
+  packages = ["."]
+  revision = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"
+  version = "v2.1.13"
+
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
+  version = "v2.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/go-couchbase"
+  packages = ["."]
+  revision = "16db1f1fe037412f12738fa4d8448c549c4edd77"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/gomemcached"
+  packages = [
+    ".",
+    "client"
+  ]
+  revision = "0da75df145308b9a4e6704d762ca9d9b77752efc"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/couchbase/goutils"
+  packages = [
+    "logging",
+    "scramsha"
+  ]
+  revision = "e865a1461c8ac0032bd37e2d4dab3289faea3873"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+  version = "v3.2.0"
+
+[[projects]]
+  name = "github.com/docker/distribution"
+  packages = [
+    "digest",
+    "reference"
+  ]
+  revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
+  version = "v2.6.2"
+
+[[projects]]
+  name = "github.com/docker/docker"
+  packages = [
+    "api/types",
+    "api/types/blkiodev",
+    "api/types/container",
+    "api/types/events",
+    "api/types/filters",
+    "api/types/mount",
+    "api/types/network",
+    "api/types/reference",
+    "api/types/registry",
+    "api/types/strslice",
+    "api/types/swarm",
+    "api/types/time",
+    "api/types/versions",
+    "api/types/volume",
+    "client",
+    "pkg/tlsconfig"
+  ]
+  revision = "eef6495eddab52828327aade186443681ed71a4e"
+  version = "v17.03.2-ce-rc1"
+
+[[projects]]
+  name = "github.com/docker/go-connections"
+  packages = [
+    "nat",
+    "sockets",
+    "tlsconfig"
+  ]
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/docker/go-units"
+  packages = ["."]
+  revision = "47565b4f722fb6ceae66b95f853feed578a4a51c"
+  version = "v0.3.3"
+
+[[projects]]
+  name = "github.com/eapache/go-resiliency"
+  packages = ["breaker"]
+  revision = "ea41b0fad31007accc7f806884dcdf3da98b79ce"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/eapache/go-xerial-snappy"
+  packages = ["."]
+  revision = "bb955e01b9346ac19dc29eb16586c90ded99a98c"
+
+[[projects]]
+  name = "github.com/eapache/queue"
+  packages = ["."]
+  revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/eclipse/paho.mqtt.golang"
+  packages = [
+    ".",
+    "packets"
+  ]
+  revision = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/go-ini/ini"
+  packages = ["."]
+  revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
+  version = "v1.37.0"
+
+[[projects]]
+  name = "github.com/go-logfmt/logfmt"
+  packages = ["."]
+  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/go-ole/go-ole"
+  packages = [
+    ".",
+    "oleutil"
+  ]
+  revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/go-redis/redis"
+  packages = [
+    ".",
+    "internal",
+    "internal/consistenthash",
+    "internal/hashtag",
+    "internal/pool",
+    "internal/proto",
+    "internal/singleflight",
+    "internal/util"
+  ]
+  revision = "83fb42932f6145ce52df09860384a4653d2d332a"
+  version = "v6.12.0"
+
+[[projects]]
+  name = "github.com/go-sql-driver/mysql"
+  packages = ["."]
+  revision = "d523deb1b23d913de5bdada721a6071e71283618"
+  version = "v1.4.0"
+
+[[projects]]
+  name = "github.com/gobwas/glob"
+  packages = [
+    ".",
+    "compiler",
+    "match",
+    "syntax",
+    "syntax/ast",
+    "syntax/lexer",
+    "util/runes",
+    "util/strings"
+  ]
+  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+  version = "v0.2.3"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = ["proto"]
+  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/golang/protobuf"
+  packages = [
+    "proto",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/timestamp"
+  ]
+  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
+
+[[projects]]
+  name = "github.com/google/go-cmp"
+  packages = [
+    "cmp",
+    "cmp/internal/diff",
+    "cmp/internal/function",
+    "cmp/internal/value"
+  ]
+  revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
+  version = "v0.2.0"
+
+[[projects]]
+  name = "github.com/gorilla/context"
+  packages = ["."]
+  revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/gorilla/mux"
+  packages = ["."]
+  revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
+  version = "v1.6.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hailocab/go-hostpool"
+  packages = ["."]
+  revision = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"
+
+[[projects]]
+  name = "github.com/hashicorp/consul"
+  packages = ["api"]
+  revision = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-cleanhttp"
+  packages = ["."]
+  revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-rootcerts"
+  packages = ["."]
+  revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"
+
+[[projects]]
+  name = "github.com/hashicorp/serf"
+  packages = ["coordinate"]
+  revision = "d6574a5bb1226678d7010325fb6c985db20ee458"
+  version = "v0.8.1"
+
+[[projects]]
+  name = "github.com/influxdata/go-syslog"
+  packages = [
+    "rfc5424",
+    "rfc5425"
+  ]
+  revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"
+  version = "v1.0.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/tail"
+  packages = [
+    ".",
+    "ratelimiter",
+    "util",
+    "watch",
+    "winfile"
+  ]
+  revision = "c43482518d410361b6c383d7aebce33d0471d7bc"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/toml"
+  packages = [
+    ".",
+    "ast"
+  ]
+  revision = "2a2e3012f7cfbef64091cc79776311e65dfa211b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/influxdata/wlog"
+  packages = ["."]
+  revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
+
+[[projects]]
+  name = "github.com/jackc/pgx"
+  packages = [
+    ".",
+    "chunkreader",
+    "internal/sanitize",
+    "pgio",
+    "pgproto3",
+    "pgtype",
+    "stdlib"
+  ]
+  revision = "da3231b0b66e2e74cdb779f1d46c5e958ba8be27"
+  version = "v3.1.0"
+
+[[projects]]
+  name = "github.com/jmespath/go-jmespath"
+  packages = ["."]
+  revision = "0b12d6b5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kardianos/osext"
+  packages = ["."]
+  revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kardianos/service"
+  packages = ["."]
+  revision = "615a14ed75099c9eaac6949e22ac2341bf9d3197"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kballard/go-shellquote"
+  packages = ["."]
+  revision = "95032a82bc518f77982ea72343cc1ade730072f0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/logfmt"
+  packages = ["."]
+  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mailru/easyjson"
+  packages = [
+    ".",
+    "buffer",
+    "jlexer",
+    "jwriter"
+  ]
+  revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"
+
+[[projects]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  packages = ["pbutil"]
+  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "github.com/miekg/dns"
+  packages = ["."]
+  revision = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"
+  version = "v1.0.8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/go-homedir"
+  packages = ["."]
+  revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+
+[[projects]]
+  name = "github.com/multiplay/go-ts3"
+  packages = ["."]
+  revision = "d0d44555495c8776880a17e439399e715a4ef319"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/naoina/go-stringutil"
+  packages = ["."]
+  revision = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/nats-io/gnatsd"
+  packages = [
+    "conf",
+    "logger",
+    "server",
+    "server/pse",
+    "util"
+  ]
+  revision = "add6d7930ae6d4bff8823b28999ea87bf1bfd23d"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/nats-io/go-nats"
+  packages = [
+    ".",
+    "encoders/builtin",
+    "util"
+  ]
+  revision = "062418ea1c2181f52dc0f954f6204370519a868b"
+  version = "v1.5.0"
+
+[[projects]]
+  name = "github.com/nats-io/nuid"
+  packages = ["."]
+  revision = "289cccf02c178dc782430d534e3c1f5b72af807f"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/nsqio/go-nsq"
+  packages = ["."]
+  revision = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+  version = "v1.0.7"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/opentracing-contrib/go-observer"
+  packages = ["."]
+  revision = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"
+
+[[projects]]
+  name = "github.com/opentracing/opentracing-go"
+  packages = [
+    ".",
+    "ext",
+    "log"
+  ]
+  revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/openzipkin/zipkin-go-opentracing"
+  packages = [
+    ".",
+    "flag",
+    "thrift/gen-go/scribe",
+    "thrift/gen-go/zipkincore",
+    "types",
+    "wire"
+  ]
+  revision = "26cf9707480e6b90e5eff22cf0bbf05319154232"
+  version = "v0.3.4"
+
+[[projects]]
+  name = "github.com/pierrec/lz4"
+  packages = [
+    ".",
+    "internal/xxh32"
+  ]
+  revision = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"
+  version = "v2.0.2"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/prometheus/client_golang"
+  packages = [
+    "prometheus",
+    "prometheus/promhttp"
+  ]
+  revision = "c5b7fccd204277076155f10851dad72b76a49317"
+  version = "v0.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/client_model"
+  packages = ["go"]
+  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/common"
+  packages = [
+    "expfmt",
+    "internal/bitbucket.org/ww/goautoneg",
+    "log",
+    "model"
+  ]
+  revision = "7600349dcfe1abd18d72d3a1770870d9800a7801"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/procfs"
+  packages = [
+    ".",
+    "internal/util",
+    "nfs",
+    "xfs"
+  ]
+  revision = "7d6f385de8bea29190f15ba9931442a0eaef9af7"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/rcrowley/go-metrics"
+  packages = ["."]
+  revision = "e2704e165165ec55d062f5919b4b29494e9fa790"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/samuel/go-zookeeper"
+  packages = ["zk"]
+  revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/shirou/gopsutil"
+  packages = [
+    "cpu",
+    "disk",
+    "host",
+    "internal/common",
+    "load",
+    "mem",
+    "net",
+    "process"
+  ]
+  revision = "eeb1d38d69593f121e060d24d17f7b1f0936b203"
+  version = "v2.18.05"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/shirou/w32"
+  packages = ["."]
+  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/soniah/gosnmp"
+  packages = ["."]
+  revision = "bcf840db66be7d64bf96c3c0e075c92e3d98f793"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/streadway/amqp"
+  packages = ["."]
+  revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"
+
+[[projects]]
+  name = "github.com/stretchr/objx"
+  packages = ["."]
+  revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"
+  version = "v0.1.1"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = [
+    "assert",
+    "mock",
+    "require"
+  ]
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"
+
+[[projects]]
+  name = "github.com/tidwall/gjson"
+  packages = ["."]
+  revision = "afaeb9562041a8018c74e006551143666aed08bf"
+  version = "v1.1.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tidwall/match"
+  packages = ["."]
+  revision = "1731857f09b1f38450e2c12409748407822dc6be"
+
+[[projects]]
+  name = "github.com/vjeantet/grok"
+  packages = ["."]
+  revision = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/wvanbergen/kafka"
+  packages = ["consumergroup"]
+  revision = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/wvanbergen/kazoo-go"
+  packages = ["."]
+  revision = "f72d8611297a7cf105da904c04198ad701a60101"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/yuin/gopher-lua"
+  packages = [
+    ".",
+    "ast",
+    "parse",
+    "pm"
+  ]
+  revision = "ca850f594eaafa5468da2bd53b865e4ee55be18b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/zensqlmonitor/go-mssqldb"
+  packages = ["."]
+  revision = "e8fbf836e44e86764eba398361d1825651709547"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = [
+    "bcrypt",
+    "blowfish",
+    "ed25519",
+    "ed25519/internal/edwards25519",
+    "md4",
+    "pbkdf2",
+    "ssh/terminal"
+  ]
+  revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "bpf",
+    "context",
+    "context/ctxhttp",
+    "html",
+    "html/atom",
+    "html/charset",
+    "http/httpguts",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/iana",
+    "internal/socket",
+    "internal/socks",
+    "internal/timeseries",
+    "ipv4",
+    "ipv6",
+    "proxy",
+    "trace",
+    "websocket"
+  ]
+  revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows",
+    "windows/registry",
+    "windows/svc",
+    "windows/svc/debug",
+    "windows/svc/eventlog",
+    "windows/svc/mgr"
+  ]
+  revision = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"
+
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "collate",
+    "collate/build",
+    "encoding",
+    "encoding/charmap",
+    "encoding/htmlindex",
+    "encoding/internal",
+    "encoding/internal/identifier",
+    "encoding/japanese",
+    "encoding/korean",
+    "encoding/simplifiedchinese",
+    "encoding/traditionalchinese",
+    "encoding/unicode",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "internal/utf8internal",
+    "language",
+    "runes",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = ["cloudsql"]
+  revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "google.golang.org/genproto"
+  packages = ["googleapis/rpc/status"]
+  revision = "32ee49c4dd805befd833990acba36cb75042378c"
+
+[[projects]]
+  name = "google.golang.org/grpc"
+  packages = [
+    ".",
+    "balancer",
+    "balancer/base",
+    "balancer/roundrobin",
+    "channelz",
+    "codes",
+    "connectivity",
+    "credentials",
+    "encoding",
+    "encoding/proto",
+    "grpclb/grpc_lb_v1/messages",
+    "grpclog",
+    "internal",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "resolver",
+    "resolver/dns",
+    "resolver/passthrough",
+    "stats",
+    "status",
+    "tap",
+    "transport"
+  ]
+  revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
+  version = "v1.12.2"
+
+[[projects]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  packages = ["."]
+  revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
+  version = "v2.2.6"
+
+[[projects]]
+  name = "gopkg.in/asn1-ber.v1"
+  packages = ["."]
+  revision = "379148ca0225df7a432012b8df0355c2a2063ac0"
+  version = "v1.2"
+
+[[projects]]
+  name = "gopkg.in/fatih/pool.v2"
+  packages = ["."]
+  revision = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"
+  version = "v2.0.0"
+
+[[projects]]
+  name = "gopkg.in/fsnotify.v1"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
+  version = "v1.4.7"
+
+[[projects]]
+  name = "gopkg.in/gorethink/gorethink.v3"
+  packages = [
+    ".",
+    "encoding",
+    "ql2",
+    "types"
+  ]
+  revision = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"
+  version = "v3.0.5"
+
+[[projects]]
+  name = "gopkg.in/ldap.v2"
+  packages = ["."]
+  revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
+  version = "v2.5.1"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/mgo.v2"
+  packages = [
+    ".",
+    "bson",
+    "internal/json",
+    "internal/sasl",
+    "internal/scram"
+  ]
+  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
+
+[[projects]]
+  name = "gopkg.in/olivere/elastic.v5"
+  packages = [
+    ".",
+    "config",
+    "uritemplates"
+  ]
+  revision = "b708306d715bea9b983685e94ab4602cdc9f988b"
+  version = "v5.0.69"
+
+[[projects]]
+  branch = "v1"
+  name = "gopkg.in/tomb.v1"
+  packages = ["."]
+  revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 000000000..78d3749a9
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,243 @@
+[[constraint]]
+  name = "collectd.org"
+  version = "0.3.0"
+
+[[constraint]]
+  name = "github.com/aerospike/aerospike-client-go"
+  version = "^1.33.0"
+
+[[constraint]]
+  name = "github.com/amir/raidman"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/apache/thrift"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "1.14.8"
+#  version = "1.8.39"
+
+[[constraint]]
+  name = "github.com/bsm/sarama-cluster"
+  version = "2.1.13"
+#  version = "2.1.10"
+
+[[constraint]]
+  name = "github.com/couchbase/go-couchbase"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.2.0"
+#  version = "3.1.0"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  version = "~17.03.2-ce"
+
+[[constraint]]
+  name = "github.com/docker/go-connections"
+  version = "0.3.0"
+#  version = "0.2.1"
+
+[[constraint]]
+  name = "github.com/eclipse/paho.mqtt.golang"
+  version = "~1.1.1"
+#  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/go-sql-driver/mysql"
+  version = "1.4.0"
+#  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/gobwas/glob"
+  version = "0.2.3"
+#  version = "0.2.2"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "1.1.0"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/google/go-cmp"
+  version = "0.2.0"
+#  version = "0.1.0"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.6.2"
+#  version = "1.6.1"
+
+[[constraint]]
+  name = "github.com/go-redis/redis"
+  version = "6.12.0"
+
+[[constraint]]
+  name = "github.com/hashicorp/consul"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/influxdata/go-syslog"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/influxdata/tail"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/influxdata/toml"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/influxdata/wlog"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/jackc/pgx"
+  version = "3.1.0"
+
+[[constraint]]
+  name = "github.com/kardianos/service"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/kballard/go-shellquote"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/Microsoft/ApplicationInsights-Go"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/miekg/dns"
+  version = "1.0.8"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/multiplay/go-ts3"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/nats-io/gnatsd"
+  version = "1.1.0"
+#  version = "1.0.4"
+
+[[constraint]]
+  name = "github.com/nats-io/go-nats"
+  version = "1.5.0"
+#  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/nsqio/go-nsq"
+  version = "1.0.7"
+
+[[constraint]]
+  name = "github.com/openzipkin/zipkin-go-opentracing"
+  version = "0.3.4"
+#  version = "0.3.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_model"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/prometheus/common"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/shirou/gopsutil"
+  version = "2.18.05"
+#  version = "2.18.04"
+
+[[constraint]]
+  name = "github.com/Shopify/sarama"
+  version = "1.17.0"
+#  version = "1.15.0"
+
+[[constraint]]
+  name = "github.com/soniah/gosnmp"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/StackExchange/wmi"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/streadway/amqp"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.2"
+#  version = "1.2.1"
+
+[[constraint]]
+  name = "github.com/tidwall/gjson"
+  version = "1.1.1"
+#  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/vjeantet/grok"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/wvanbergen/kafka"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/zensqlmonitor/go-mssqldb"
+  branch = "master"
+
+[[constraint]]
+  name = "golang.org/x/net"
+  branch = "master"
+
+[[constraint]]
+  name = "golang.org/x/sys"
+  branch = "master"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "1.12.2"
+#  version = "1.8.0"
+
+[[constraint]]
+  name = "gopkg.in/gorethink/gorethink.v3"
+  version = "3.0.5"
+
+[[constraint]]
+  name = "gopkg.in/ldap.v2"
+  version = "2.5.1"
+
+[[constraint]]
+  name = "gopkg.in/mgo.v2"
+  branch = "v2"
+
+[[constraint]]
+  name = "gopkg.in/olivere/elastic.v5"
+  version = "^5.0.69"
+#  version = "^6.1.23"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "^2.2.1"
+
+[[override]]
+  source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
+  name = "gopkg.in/fsnotify.v1"
diff --git a/Makefile b/Makefile
index 981face45..4d78ab1e1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ all:
 
 deps:
 	go get -u github.com/golang/lint/golint
-	go get github.com/sparrc/gdm
-	gdm restore --parallel=false
+	go get -u github.com/golang/dep/cmd/dep
+	dep ensure
 
 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
diff --git a/README.md b/README.md
index 06dd74d94..679e2847f 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 Telegraf requires golang version 1.9 or newer, the Makefile requires GNU make.
 
-Dependencies are managed with [gdm](https://github.com/sparrc/gdm),
+Dependencies are managed with [dep](https://github.com/golang/dep),
 which is installed by the Makefile if you don't have it already.
 
 1. [Install Go](https://golang.org/doc/install)
diff --git a/appveyor.yml b/appveyor.yml
index a586d92fa..76a5ab067 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,7 @@ install:
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go version
   - go env
+  - git config --system core.longpaths true
 
 build_script:
   - cmd: C:\GnuWin32\bin\make deps
diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
index 1820c9347..b4983ba0e 100644
--- a/plugins/inputs/mysql/mysql_test.go
+++ b/plugins/inputs/mysql/mysql_test.go
@@ -49,7 +49,7 @@ func TestMysqlGetDSNTag(t *testing.T) {
 		},
 		{
 			"tcp(localhost)/",
-			"localhost",
+			"localhost:3306",
 		},
 		{
 			"root:passwd@tcp(192.168.1.1:3306)/?tls=false",
diff --git a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
index 0d792f926..60bf1b51a 100644
--- a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
+++ b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
@@ -32,7 +32,7 @@ import (
 	"log"
 
 	"github.com/apache/thrift/lib/go/thrift"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 var (
diff --git a/plugins/inputs/zipkin/codec/codec.go b/plugins/inputs/zipkin/codec/codec.go
index 781aad72a..167b8ec24 100644
--- a/plugins/inputs/zipkin/codec/codec.go
+++ b/plugins/inputs/zipkin/codec/codec.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 //now is a mockable time for now
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
index 8c229b9f3..180348674 100644
--- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 // JSON decodes spans from  bodies `POST`ed to the spans endpoint
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift.go b/plugins/inputs/zipkin/codec/thrift/thrift.go
index b3fc94897..65a9e1488 100644
--- a/plugins/inputs/zipkin/codec/thrift/thrift.go
+++ b/plugins/inputs/zipkin/codec/thrift/thrift.go
@@ -10,7 +10,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
 
 	"github.com/apache/thrift/lib/go/thrift"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 // UnmarshalThrift converts raw bytes in thrift format to a slice of spans
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift_test.go b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
index 4b239fdb3..000ac628c 100644
--- a/plugins/inputs/zipkin/codec/thrift/thrift_test.go
+++ b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 func Test_endpointHost(t *testing.T) {
diff --git a/plugins/outputs/kinesis/kinesis_test.go b/plugins/outputs/kinesis/kinesis_test.go
index 281dbecb5..3c6321abd 100644
--- a/plugins/outputs/kinesis/kinesis_test.go
+++ b/plugins/outputs/kinesis/kinesis_test.go
@@ -59,7 +59,7 @@ func TestPartitionKey(t *testing.T) {
 	partitionKey := k.getPartitionKey(testPoint)
 	u, err := uuid.FromString(partitionKey)
 	assert.Nil(err, "Issue parsing UUID")
-	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
+	assert.Equal(byte(4), u.Version(), "PartitionKey should be UUIDv4")
 
 	k = KinesisOutput{
 		PartitionKey: "-",
@@ -72,6 +72,5 @@ func TestPartitionKey(t *testing.T) {
 	partitionKey = k.getPartitionKey(testPoint)
 	u, err = uuid.FromString(partitionKey)
 	assert.Nil(err, "Issue parsing UUID")
-	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
-
+	assert.Equal(byte(4), u.Version(), "PartitionKey should be UUIDv4")
 }
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 6231045b8..18e22daa6 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -184,7 +184,7 @@ func (m *MQTT) publish(topic string, body []byte) error {
 
 func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	opts := paho.NewClientOptions()
-	opts.KeepAlive = 0 * time.Second
+	opts.KeepAlive = 0
 
 	if m.Timeout.Duration < time.Second {
 		m.Timeout.Duration = 5 * time.Second
diff --git a/scripts/build.py b/scripts/build.py
index 1da0122a5..344ee48a8 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -155,12 +155,12 @@ def go_get(branch, update=False, no_uncommitted=False):
     if local_changes() and no_uncommitted:
         logging.error("There are uncommitted changes in the current directory.")
         return False
-    if not check_path_for("gdm"):
-        logging.info("Downloading `gdm`...")
-        get_command = "go get github.com/sparrc/gdm"
+    if not check_path_for("dep"):
+        logging.info("Downloading `dep`...")
+        get_command = "go get -u github.com/golang/dep/cmd/dep"
         run(get_command)
-    logging.info("Retrieving dependencies with `gdm`...")
-    run("{}/bin/gdm restore -v".format(os.environ.get("GOPATH",
+    logging.info("Retrieving dependencies with `dep`...")
+    run("{}/bin/dep ensure -v".format(os.environ.get("GOPATH",
         os.path.expanduser("~/go"))))
     return True
 

From 61e197d254f076dd7e72f4d22e2d3285cfc8e81d Mon Sep 17 00:00:00 2001
From: Ayrdrie <ayrdriepalmer@gmail.com>
Date: Thu, 21 Jun 2018 15:19:15 -0600
Subject: [PATCH 1296/1302] Add support for comma in logparser timestamp format
 (#4311)

---
 plugins/inputs/logparser/README.md         |  4 +++-
 plugins/inputs/logparser/grok/grok.go      |  3 +++
 plugins/inputs/logparser/grok/grok_test.go | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 7a1df8bc8..1caa3830c 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -108,7 +108,9 @@ You must capture at least one field per line.
   - ts-"CUSTOM"
 
 CUSTOM time layouts must be within quotes and be the representation of the
-"reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`
+"reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`.  
+To match a comma decimal point you can use a period.  For example `%{TIMESTAMP:timestamp:ts-"2006-01-02 15:04:05.000"}` can be used to match `"2018-01-02 15:04:05,000"`
+To match a comma decimal point you can use a period in the pattern string.
 See https://golang.org/pkg/time/#Parse for more details.
 
 Telegraf has many of its own [built-in patterns](./grok/patterns/influx-patterns),
diff --git a/plugins/inputs/logparser/grok/grok.go b/plugins/inputs/logparser/grok/grok.go
index 57d8691cf..766d149fe 100644
--- a/plugins/inputs/logparser/grok/grok.go
+++ b/plugins/inputs/logparser/grok/grok.go
@@ -335,6 +335,9 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 		case DROP:
 		// goodbye!
 		default:
+			// Replace commas with dot character
+			v = strings.Replace(v, ",", ".", -1)
+
 			ts, err := time.ParseInLocation(t, v, p.loc)
 			if err == nil {
 				timestamp = ts
diff --git a/plugins/inputs/logparser/grok/grok_test.go b/plugins/inputs/logparser/grok/grok_test.go
index 1008ce941..6a143bb7d 100644
--- a/plugins/inputs/logparser/grok/grok_test.go
+++ b/plugins/inputs/logparser/grok/grok_test.go
@@ -982,3 +982,21 @@ func TestSyslogTimestampParser(t *testing.T) {
 	require.NotNil(t, m)
 	require.Equal(t, 2018, m.Time().Year())
 }
+
+func TestReplaceTimestampComma(t *testing.T) {
+
+	p := &Parser{
+		Patterns: []string{`%{TIMESTAMP_ISO8601:timestamp:ts-"2006-01-02 15:04:05.000"} successfulMatches=%{NUMBER:value:int}`},
+	}
+
+	require.NoError(t, p.Compile())
+	m, err := p.ParseLine("2018-02-21 13:10:34,555 successfulMatches=1")
+	require.NoError(t, err)
+	require.NotNil(t, m)
+
+	require.Equal(t, 2018, m.Time().Year())
+	require.Equal(t, 13, m.Time().Hour())
+	require.Equal(t, 34, m.Time().Second())
+	//Convert Nanosecond to milisecond for compare
+	require.Equal(t, 555, m.Time().Nanosecond()/1000000)
+}

From 2a1feb6db9973bbb092be7d0cf8ab4ce7c6e4bef Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Jun 2018 14:20:35 -0700
Subject: [PATCH 1297/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb65f362..e56c91230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#4259](https://github.com/influxdata/telegraf/pull/4259): Add container status tag to docker input.
 - [#3523](https://github.com/influxdata/telegraf/pull/3523): Add valuecounter aggregator plugin.
 - [#4307](https://github.com/influxdata/telegraf/pull/4307): Add new measurement with results of pgrep lookup to procstat input.
+- [#4311](https://github.com/influxdata/telegraf/pull/4311): Add support for comma in logparser timestamp format.
 
 ## v1.7.1 [unreleased]
 

From 16454e25bad046fad13eaf670ab4973ddcd5b069 Mon Sep 17 00:00:00 2001
From: Patrick Hemmer <phemmer@users.noreply.github.com>
Date: Thu, 21 Jun 2018 19:01:38 -0400
Subject: [PATCH 1298/1302] Fix postfix input handling of multi-level queues
 (#4333)

---
 CHANGELOG.md                           |  1 +
 plugins/inputs/postfix/postfix.go      | 61 ++++++++------------------
 plugins/inputs/postfix/postfix_test.go | 21 ++++-----
 3 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e56c91230..672470a17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 
 - [#4277](https://github.com/influxdata/telegraf/pull/4277): Treat sigterm as a clean shutdown signal.
 - [#4284](https://github.com/influxdata/telegraf/pull/4284): Fix selection of tags under nested objects in the JSON parser.
+- [#4135](https://github.com/influxdata/telegraf/issues/4135): Fix postfix input handling multi-level queues.
 
 ## v1.7 [2018-06-12]
 
diff --git a/plugins/inputs/postfix/postfix.go b/plugins/inputs/postfix/postfix.go
index a33879760..8700362d0 100644
--- a/plugins/inputs/postfix/postfix.go
+++ b/plugins/inputs/postfix/postfix.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -28,36 +28,37 @@ func getQueueDirectory() (string, error) {
 	return strings.TrimSpace(string(qd)), nil
 }
 
-func qScan(path string) (int64, int64, int64, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	finfos, err := f.Readdir(-1)
-	f.Close()
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
+func qScan(path string, acc telegraf.Accumulator) (int64, int64, int64, error) {
 	var length, size int64
 	var oldest time.Time
-	for _, finfo := range finfos {
+	err := filepath.Walk(path, func(_ string, finfo os.FileInfo, err error) error {
+		if err != nil {
+			acc.AddError(fmt.Errorf("error scanning %s: %s", path, err))
+			return nil
+		}
+		if finfo.IsDir() {
+			return nil
+		}
+
 		length++
 		size += finfo.Size()
 
 		ctime := statCTime(finfo.Sys())
 		if ctime.IsZero() {
-			continue
+			return nil
 		}
 		if oldest.IsZero() || ctime.Before(oldest) {
 			oldest = ctime
 		}
+		return nil
+	})
+	if err != nil {
+		return 0, 0, 0, err
 	}
 	var age int64
 	if !oldest.IsZero() {
 		age = int64(time.Now().Sub(oldest) / time.Second)
-	} else if len(finfos) != 0 {
+	} else if length != 0 {
 		// system doesn't support ctime
 		age = -1
 	}
@@ -77,8 +78,8 @@ func (p *Postfix) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
-	for _, q := range []string{"active", "hold", "incoming", "maildrop"} {
-		length, size, age, err := qScan(path.Join(p.QueueDirectory, q))
+	for _, q := range []string{"active", "hold", "incoming", "maildrop", "deferred"} {
+		length, size, age, err := qScan(filepath.Join(p.QueueDirectory, q), acc)
 		if err != nil {
 			acc.AddError(fmt.Errorf("error scanning queue %s: %s", q, err))
 			continue
@@ -90,30 +91,6 @@ func (p *Postfix) Gather(acc telegraf.Accumulator) error {
 		acc.AddFields("postfix_queue", fields, map[string]string{"queue": q})
 	}
 
-	var dLength, dSize int64
-	dAge := int64(-1)
-	for _, q := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"} {
-		length, size, age, err := qScan(path.Join(p.QueueDirectory, "deferred", q))
-		if err != nil {
-			if os.IsNotExist(err) {
-				// the directories are created on first use
-				continue
-			}
-			acc.AddError(fmt.Errorf("error scanning queue deferred/%s: %s", q, err))
-			return nil
-		}
-		dLength += length
-		dSize += size
-		if age > dAge {
-			dAge = age
-		}
-	}
-	fields := map[string]interface{}{"length": dLength, "size": dSize}
-	if dAge != -1 {
-		fields["age"] = dAge
-	}
-	acc.AddFields("postfix_queue", fields, map[string]string{"queue": "deferred"})
-
 	return nil
 }
 
diff --git a/plugins/inputs/postfix/postfix_test.go b/plugins/inputs/postfix/postfix_test.go
index 75a6817a7..5dbc91d13 100644
--- a/plugins/inputs/postfix/postfix_test.go
+++ b/plugins/inputs/postfix/postfix_test.go
@@ -3,7 +3,7 @@ package postfix
 import (
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
@@ -16,19 +16,16 @@ func TestGather(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(td)
 
-	for _, q := range []string{"active", "hold", "incoming", "maildrop", "deferred"} {
-		require.NoError(t, os.Mkdir(path.Join(td, q), 0755))
-	}
-	for _, q := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "F"} { // "E" deliberately left off
-		require.NoError(t, os.Mkdir(path.Join(td, "deferred", q), 0755))
+	for _, q := range []string{"active", "hold", "incoming", "maildrop", "deferred/0/0", "deferred/F/F"} {
+		require.NoError(t, os.MkdirAll(filepath.FromSlash(td+"/"+q), 0755))
 	}
 
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "01"), []byte("abc"), 0644))
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "active", "02"), []byte("defg"), 0644))
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "hold", "01"), []byte("abc"), 0644))
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "incoming", "01"), []byte("abcd"), 0644))
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "deferred", "0", "01"), []byte("abc"), 0644))
-	require.NoError(t, ioutil.WriteFile(path.Join(td, "deferred", "F", "F1"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/active/01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/active/02"), []byte("defg"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/hold/01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/incoming/01"), []byte("abcd"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/deferred/0/0/01"), []byte("abc"), 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.FromSlash(td+"/deferred/F/F/F1"), []byte("abc"), 0644))
 
 	p := Postfix{
 		QueueDirectory: td,

From ee6e4b0afd5107d7ce8bcd9a9123a3f6129aae5f Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Jun 2018 17:46:58 -0700
Subject: [PATCH 1299/1302] Run windows tests with -short

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4d78ab1e1..8650df267 100644
--- a/Makefile
+++ b/Makefile
@@ -54,11 +54,11 @@ fmtcheck:
 	@echo '[INFO] done.'
 
 test-windows:
-	go test ./plugins/inputs/ping/...
-	go test ./plugins/inputs/win_perf_counters/...
-	go test ./plugins/inputs/win_services/...
-	go test ./plugins/inputs/procstat/...
-	go test ./plugins/inputs/ntpq/...
+	go test -short ./plugins/inputs/ping/...
+	go test -short ./plugins/inputs/win_perf_counters/...
+	go test -short ./plugins/inputs/win_services/...
+	go test -short ./plugins/inputs/procstat/...
+	go test -short ./plugins/inputs/ntpq/...
 
 # vet runs the Go source code static analysis tool `vet` to find
 # any common errors.

From 3f28add0250539f9a01f3d9b38c5478222924efd Mon Sep 17 00:00:00 2001
From: JongHyok Lee <wingsof@gmail.com>
Date: Fri, 22 Jun 2018 09:55:54 +0900
Subject: [PATCH 1300/1302] Added path tag to tail input plugin (#4292)

---
 plugins/inputs/tail/tail.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 86534da5f..0de2a344c 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -146,7 +146,11 @@ func (t *Tail) receiver(tailer *tail.Tail) {
 
 		m, err = t.parser.ParseLine(text)
 		if err == nil {
-			t.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
+			if m != nil {
+				tags := m.Tags()
+				tags["path"] = tailer.Filename
+				t.acc.AddFields(m.Name(), m.Fields(), tags, m.Time())
+			}
 		} else {
 			t.acc.AddError(fmt.Errorf("E! Malformed log line in %s: [%s], Error: %s\n",
 				tailer.Filename, line.Text, err))

From 523d761f34365c7ca2452b34403d6ae5215df076 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Jun 2018 17:59:31 -0700
Subject: [PATCH 1301/1302] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 672470a17..ab8c45ea0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - [#3523](https://github.com/influxdata/telegraf/pull/3523): Add valuecounter aggregator plugin.
 - [#4307](https://github.com/influxdata/telegraf/pull/4307): Add new measurement with results of pgrep lookup to procstat input.
 - [#4311](https://github.com/influxdata/telegraf/pull/4311): Add support for comma in logparser timestamp format.
+- [#4292](https://github.com/influxdata/telegraf/pull/4292): Add path tag to tail input plugin.
 
 ## v1.7.1 [unreleased]
 

From 23523ffd10bac33b0e40bad98bee4213049109ff Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 21 Jun 2018 18:02:34 -0700
Subject: [PATCH 1302/1302] Document path tag in tail input

---
 plugins/inputs/tail/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/tail/README.md b/plugins/inputs/tail/README.md
index 5d7253649..27cb6418e 100644
--- a/plugins/inputs/tail/README.md
+++ b/plugins/inputs/tail/README.md
@@ -1,4 +1,4 @@
-# tail Input Plugin
+# Tail Input Plugin
 
 The tail plugin "tails" a logfile and parses each log message.
 
@@ -49,3 +49,7 @@ The plugin expects messages in one of the
   data_format = "influx"
 ```
 
+### Metrics:
+
+Metrics are produced according to the `data_format` option.  Additionally a
+tag labeled `path` is added to the metric containing the filename being tailed.